From 61fb3214773d5d5e9d42abbbe959e4b91079fccd Mon Sep 17 00:00:00 2001
From: gamemasterplc <gamemasterplc@gmail.com>
Date: Sun, 18 Aug 2024 07:59:47 -0500
Subject: [PATCH 1/2] Fix record value type to be unsigned

---
 include/game/gamework.h | 4 ++--
 src/REL/m403Dll/main.c  | 2 +-
 src/REL/m405Dll/main.c  | 5 +----
 src/REL/m442Dll/main.c  | 7 +++----
 src/game/gamework.c     | 4 ++--
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/include/game/gamework.h b/include/game/gamework.h
index 081dd16b..0e3b4807 100644
--- a/include/game/gamework.h
+++ b/include/game/gamework.h
@@ -9,8 +9,8 @@ void GWInit(void);
 void GWGameStatReset(void);
 s32 GWMessSpeedGet(void);
 s32 GWMessDelayGet(void);
-void GWMGRecordSet(s32 index, s32 value);
-s32 GWMGRecordGet(s32 index);
+void GWMGRecordSet(s32 index, u32 value);
+u32 GWMGRecordGet(s32 index);
 void GWCharColorGet(s32 character, GXColor *color);
 void GWBoardPlayCountSet(s32 board, u8 value);
 void GWBoardPlayCountAdd(s32 board, u8 value);
diff --git a/src/REL/m403Dll/main.c b/src/REL/m403Dll/main.c
index d40fbf68..b3e32cfe 100755
--- a/src/REL/m403Dll/main.c
+++ b/src/REL/m403Dll/main.c
@@ -213,7 +213,7 @@ void ObjectSetup(void) {
     WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
     HuAudSndGrpSet(0x1C);
     lbl_1_bss_2 = 0;
-    if (GWMGRecordGet(9) == 0U) {
+    if (GWMGRecordGet(9) == 0) {
         GWMGRecordSet(9, 5);
     }
 }
diff --git a/src/REL/m405Dll/main.c b/src/REL/m405Dll/main.c
index fc733b71..4c4484bf 100755
--- a/src/REL/m405Dll/main.c
+++ b/src/REL/m405Dll/main.c
@@ -2288,10 +2288,7 @@ void fn_1_9288(omObjData *arg0) {
                     }
                     if (lbl_1_bss_7C >= 0 && !GWPlayerCfg[lbl_1_bss_7C].iscom && lbl_1_bss_738 > lbl_1_bss_73C) {
                         arg0->work[0] = 1007;
-                        lbl_1_bss_728 = 0.0f;
-                        lbl_1_bss_738 = lbl_1_bss_73C;
-                        GWMGRecordSet(0, lbl_1_bss_738);
-                        fn_1_580(lbl_1_bss_6E8, 7, lbl_1_bss_73C);
+                        fn_1_798(0);
                     }
                     lbl_1_bss_736 = -1;
                     lbl_1_bss_80 = 0.0f;
diff --git a/src/REL/m442Dll/main.c b/src/REL/m442Dll/main.c
index 267d7377..adad58c8 100644
--- a/src/REL/m442Dll/main.c
+++ b/src/REL/m442Dll/main.c
@@ -2,6 +2,8 @@
 #include "ext_math.h"
 #include "game/audio.h"
 #include "game/chrman.h"
+#include "game/gamework.h"
+
 #include "game/gamework_data.h"
 #include "game/hsfdraw.h"
 #include "game/hsfmotion.h"
@@ -123,9 +125,6 @@ typedef struct M442MainWork2 {
     /* 0x18 */ float unk_18;
 } M442MainWork2; /* size = 0x1C */
 
-void GWMGRecordSet(s32 index, s32 value);
-u32 GWMGRecordGet(s32 index);
-
 void fn_1_A30(omObjData *object);
 void fn_1_A90(Process *arg0);
 void fn_1_D9C(void);
@@ -250,7 +249,7 @@ void ObjectSetup(void)
     fn_1_A90(var_r31);
     fn_1_3E64(var_r31);
     fn_1_6BB4(var_r31);
-    if (!GWMGRecordGet(4)) {
+    if (GWMGRecordGet(4) == 0) {
         GWMGRecordSet(4, 0);
     }
     fn_1_91AC(var_r31, GWMGRecordGet(4));
diff --git a/src/game/gamework.c b/src/game/gamework.c
index 822bd129..371d8499 100644
--- a/src/game/gamework.c
+++ b/src/game/gamework.c
@@ -147,14 +147,14 @@ s32 GWMessDelayGet(void)
     return GWSystem.mess_delay;
 }
 
-void GWMGRecordSet(s32 index, s32 value)
+void GWMGRecordSet(s32 index, u32 value)
 {
     if(!_CheckFlag(FLAG_ID_MAKE(1, 12))) {
         GWGameStat.mg_record[index] = value;
     }
 }
 
-s32 GWMGRecordGet(s32 index)
+u32 GWMGRecordGet(s32 index)
 {
     return GWGameStat.mg_record[index];
 }

From d9e50622779259606fc43cd9a67b334f78c21182 Mon Sep 17 00:00:00 2001
From: gamemasterplc <gamemasterplc@gmail.com>
Date: Sun, 18 Aug 2024 08:01:00 -0500
Subject: [PATCH 2/2] Fix m403/main.c

---
 src/REL/m403Dll/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/REL/m403Dll/main.c b/src/REL/m403Dll/main.c
index b3e32cfe..3d143917 100755
--- a/src/REL/m403Dll/main.c
+++ b/src/REL/m403Dll/main.c
@@ -401,7 +401,7 @@ static void fn_1_82C(omObjData *arg0) {
                     lbl_1_bss_28 = 90;
                     break;
                 }
-                if (GWMGRecordGet(9) < lbl_1_bss_0 - 1) {
+                if ((s32)GWMGRecordGet(9) < lbl_1_bss_0 - 1) {
                     GWMGRecordSet(9, lbl_1_bss_0 - 1);
                     lbl_1_bss_30 = 8;
                     break;