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

Merge pull request #335 from gamemasterplc/main

Browse source 
Fix m417dll/water.c
This commit is contained in:
Liam Coleman 2024-06-05 11:33:09 -05:00 • committed by GitHub
commit 8b8654ded1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.py
View file

@ -956,7 +956,7 @@ config.libs = [
objects={ objects={
Object(Matching, "REL/executor.c"), Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m417Dll/main.c"), Object(Matching, "REL/m417Dll/main.c"),
Object(NonMatching, "REL/m417Dll/water.c"), Object(Matching, "REL/m417Dll/water.c"),
Object(Matching, "REL/m417Dll/player.c"), Object(Matching, "REL/m417Dll/player.c"),
Object(Matching, "REL/m417Dll/sequence.c"), Object(Matching, "REL/m417Dll/sequence.c"),
}, },

5
src/REL/m417Dll/water.c
View file

@ -437,7 +437,6 @@ void fn_1_3D58(omObjData *object)
fn_1_5E3C(object); fn_1_5E3C(object);
} }
#pragma dont_inline on
void fn_1_4BC8(float arg8, float arg9) void fn_1_4BC8(float arg8, float arg9)
{ {
float var_f30; float var_f30;
@ -475,8 +474,8 @@ void fn_1_4BC8(float arg8, float arg9)
return; return;
} }
} }
(void)var_r31;
} }
#pragma dont_inline reset
void fn_1_4E64(omObjData *object) void fn_1_4E64(omObjData *object)
{ {
@ -689,6 +688,8 @@ void fn_1_57B0(omObjData *object)
DCStoreRangeNoSync(lbl_1_bss_178.unk_6CC[lbl_1_bss_178.unk_6B4], 1080 * sizeof(GXColor)); DCStoreRangeNoSync(lbl_1_bss_178.unk_6CC[lbl_1_bss_178.unk_6B4], 1080 * sizeof(GXColor));
DCStoreRangeNoSync(lbl_1_bss_178.unk_6D4[lbl_1_bss_178.unk_6B4], 30 * 36 * sizeof(Vec2f)); DCStoreRangeNoSync(lbl_1_bss_178.unk_6D4[lbl_1_bss_178.unk_6B4], 30 * 36 * sizeof(Vec2f));
PPCSync(); PPCSync();
(void)var_r30;
(void)var_r30;
} }
void fn_1_5E3C(omObjData *object) void fn_1_5E3C(omObjData *object)