kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #291 from gamemasterplc/main

Browse source 
Fix m402dll
This commit is contained in:
Liam Coleman 2024-05-05 06:58:17 -05:00 • committed by GitHub
commit 4c320d29a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure.py
View file

@ -299,7 +299,7 @@ def MusyX(objects, mw_version="GC/1.3.2", debug=False, major=1, minor=5, patch=4
def Rel(lib_name, objects):
return {
"lib": lib_name,
"mw_version": "GC/2.6",
"mw_version": "GC/1.3.2",
"cflags": cflags_rel,
"host": True,
"objects": objects,
@ -802,7 +802,7 @@ config.libs = [
),
Rel('m402Dll',
objects = {
Object(NonMatching, "REL/m402Dll/main.c"),
Object(Matching, "REL/m402Dll/main.c"),
}
),
Rel('m403Dll',

13
src/REL/m402Dll/main.c
View file

@ -542,7 +542,7 @@ static void fn_1_580(s32 *arg0, s32 arg1, s32 arg2) {
espBankSet(arg0[arg1 + 1], 10);
espBankSet(arg0[arg1 + 4], 11);
if (36000 <= arg2) { // TODO: not matching.
if (36000 <= arg2) {
arg2 = 35999;
}
var_r30 = arg2 / 3600;
@ -1243,7 +1243,8 @@ static void fn_1_43D8(omObjData *arg0) {
arg0->func = fn_1_3204;
}
break;
case 2011:
case 2010:
if (temp_r31->unk54 == lbl_1_bss_26) {
temp_r31->unk4C = 2012;
temp_r31->unk20 = 10.5f;
@ -1258,6 +1259,10 @@ static void fn_1_43D8(omObjData *arg0) {
fn_1_2B30(temp_r31, arg0, temp_r30);
}
break;
case 2011:
break;
case 2012:
temp_r31->unk1C -= temp_r31->unk20;
if (0.0f > temp_r31->unk1C) {
@ -1287,13 +1292,13 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk4C = 2011;
}
break;
case 0x7DE:
case 2014:
if (fn_1_2DBC(temp_r31, temp_r30) != 0) {
temp_r31->unk4C++;
temp_r31->unk50 = 120;
}
break;
case 0x7DF:
case 2015:
fn_1_313C(temp_r31, temp_r30);
temp_r31->unk50 -= 1.0f;
if (temp_r31->unk50 == 32) {