diff --git a/configure.py b/configure.py index b4ea02e2..a224261f 100644 --- a/configure.py +++ b/configure.py @@ -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', diff --git a/src/REL/m402Dll/main.c b/src/REL/m402Dll/main.c index 1d1995e8..0099633c 100755 --- a/src/REL/m402Dll/main.c +++ b/src/REL/m402Dll/main.c @@ -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) {