From 24fa3369d7fcc74ace67b56a717703bc823957c9 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Wed, 5 Jun 2024 11:30:36 -0500 Subject: [PATCH] Fix m417dll/water.c --- configure.py | 2 +- src/REL/m417Dll/water.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index fafe9b6d..ca93e8ba 100644 --- a/configure.py +++ b/configure.py @@ -956,7 +956,7 @@ config.libs = [ objects={ Object(Matching, "REL/executor.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/sequence.c"), }, diff --git a/src/REL/m417Dll/water.c b/src/REL/m417Dll/water.c index 765b268f..9127b22a 100644 --- a/src/REL/m417Dll/water.c +++ b/src/REL/m417Dll/water.c @@ -437,7 +437,6 @@ void fn_1_3D58(omObjData *object) fn_1_5E3C(object); } -#pragma dont_inline on void fn_1_4BC8(float arg8, float arg9) { float var_f30; @@ -475,8 +474,8 @@ void fn_1_4BC8(float arg8, float arg9) return; } } + (void)var_r31; } -#pragma dont_inline reset 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_6D4[lbl_1_bss_178.unk_6B4], 30 * 36 * sizeof(Vec2f)); PPCSync(); + (void)var_r30; + (void)var_r30; } void fn_1_5E3C(omObjData *object)