diff --git a/config/GMPJ01_00/config.yml b/config/GMPJ01_00/config.yml index 253a517d..441f226f 100644 --- a/config/GMPJ01_00/config.yml +++ b/config/GMPJ01_00/config.yml @@ -184,8 +184,8 @@ modules: links: [] - object: files/dll/m429Dll.rel - symbols: config/GMPJ01_00/rels/m429Dll/symbols.txt - splits: config/GMPJ01_00/rels/m429Dll/splits.txt + symbols: config/GMPE01_00/rels/m429Dll/symbols.txt + splits: config/GMPE01_00/rels/m429Dll/splits.txt links: [] - object: files/dll/m430Dll.rel diff --git a/configure.py b/configure.py index 0a9f3eba..7cc762cb 100644 --- a/configure.py +++ b/configure.py @@ -1064,7 +1064,7 @@ config.libs = [ Rel( "m429Dll", # Team Treasure Trek objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPP01_00", "GMPP01_02"), "REL/m429Dll/main.c"), + Object(Matching, "REL/m429Dll/main.c"), }, ), Rel( diff --git a/src/REL/m429Dll/main.c b/src/REL/m429Dll/main.c index f48c989e..e37af222 100644 --- a/src/REL/m429Dll/main.c +++ b/src/REL/m429Dll/main.c @@ -2396,8 +2396,8 @@ void fn_1_B01C(void) temp_f31 = lbl_1_bss_98[lbl_1_bss_28].x - temp_r30->unk4.x; temp_f30 = lbl_1_bss_98[lbl_1_bss_28].z - temp_r30->unk4.z; temp_r30->unk64 = atan2d(temp_f31, temp_f30); - omVibrate(temp_r31->unk114, 2 * REFRESH_RATE, 6, 6); - omVibrate(temp_r30->unk114, 2 * REFRESH_RATE, 6, 6); + omVibrate(temp_r31->unk114, (VERSION_JP ? 3 : 2) * REFRESH_RATE, 6, 6); + omVibrate(temp_r30->unk114, (VERSION_JP ? 3 : 2) * REFRESH_RATE, 6, 6); } void fn_1_B754(float *arg0, float arg1, float arg2, s32 arg3)