From 75dca46d4cbdd912327188f8a1373ceae480fa24 Mon Sep 17 00:00:00 2001
From: gamemasterplc <gamemasterplc@gmail.com>
Date: Tue, 9 Jul 2024 19:46:56 -0500
Subject: [PATCH] Match m442dll

---
 configure.py            |  4 ++--
 include/game/sprite.h   |  2 ++
 src/REL/m442Dll/main.c  |  8 ++++----
 src/REL/m442Dll/score.c | 36 +++++++++++++++++-------------------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/configure.py b/configure.py
index 774a1a68..afa18305 100644
--- a/configure.py
+++ b/configure.py
@@ -1155,8 +1155,8 @@ config.libs = [
         "m442Dll",
         objects={
             Object(Matching, "REL/executor.c"),
-            Object(NonMatching, "REL/m442Dll/main.c"),
-            Object(NonMatching, "REL/m442Dll/score.c"),
+            Object(Matching, "REL/m442Dll/main.c"),
+            Object(Matching, "REL/m442Dll/score.c"),
         },
     ),
     Rel(
diff --git a/include/game/sprite.h b/include/game/sprite.h
index d944cc74..5f503fcf 100644
--- a/include/game/sprite.h
+++ b/include/game/sprite.h
@@ -127,7 +127,9 @@ void AnimDebug(AnimData *anim);
 
 void HuSprDispInit(void);
 void HuSprDisp(HuSprite *sprite);
+#ifndef HUSPR_USE_OLD_DEFS
 void HuSprTexLoad(AnimData *anim, s16 bmp, s16 slot, GXTexWrapMode wrap_s, GXTexWrapMode wrap_t, GXTexFilter filter);
+#endif
 void HuSprExecLayerSet(s16 draw_no, s16 layer);
 
 #endif
\ No newline at end of file
diff --git a/src/REL/m442Dll/main.c b/src/REL/m442Dll/main.c
index 5ec03252..6188471b 100644
--- a/src/REL/m442Dll/main.c
+++ b/src/REL/m442Dll/main.c
@@ -1,4 +1,4 @@
-
+#define HUSPR_USE_OLD_DEFS
 #include "ext_math.h"
 #include "game/audio.h"
 #include "game/chrman.h"
@@ -190,8 +190,8 @@ omObjData *lbl_1_bss_11F3C;
 omObjData *lbl_1_bss_11F38;
 s32 lbl_1_bss_11F34;
 u32 lbl_1_bss_11F30;
-s32 lbl_1_bss_11F2C[4]; // TODO overlap
-s32 lbl_1_bss_11F28[4]; // TODO overlap
+s32 lbl_1_bss_11F2C[1];
+s32 lbl_1_bss_11F28[1];
 s32 lbl_1_bss_11F24;
 s32 lbl_1_bss_11F20;
 s16 lbl_1_bss_11F1C;
@@ -1544,7 +1544,7 @@ void fn_1_485C(ModelData *model, Mtx mtx)
         }
     }
     GXDrawDone();
-    fn_1_8520(&lbl_1_bss_C05C[0], 1); // TODO
+    fn_1_8520(&lbl_1_bss_C05C[0], 1);
 }
 
 GXColor lbl_1_data_1F0 = { 0xFF, 0xFF, 0xFF, 0x40 };
diff --git a/src/REL/m442Dll/score.c b/src/REL/m442Dll/score.c
index f6eb1d5e..08e37259 100644
--- a/src/REL/m442Dll/score.c
+++ b/src/REL/m442Dll/score.c
@@ -13,8 +13,8 @@ typedef void (*M442ScoreFunc)(void);
 
 M442ScoreFunc lbl_1_data_268[3] = { fn_1_970C, fn_1_9784, fn_1_980C };
 
-omObjData *lbl_1_bss_11F48;
 Process *lbl_1_bss_11F4C;
+omObjData *lbl_1_bss_11F48;
 
 typedef struct M442ScoreWork {
     /* 0x00 */ s32 unk_00;
@@ -103,25 +103,23 @@ s32 fn_1_9520(s32 arg0)
 
 void fn_1_9550(omObjData *arg0)
 {
-    s16 var_r31;
-    M442ScoreWork *var_r30;
+    s16 temp_r31;
+    M442ScoreWork* temp_r30;
 
-    var_r30 = lbl_1_bss_11F48->data;
-    lbl_1_data_268[var_r30->unk_00]();
-
-    var_r31 = var_r30->unk_08;
-    espBankSet(var_r30->unk_0C[0], var_r31 / 100);
-    var_r31 %= 100;
-    espBankSet(var_r30->unk_0C[1], var_r31 / 10);
-    var_r31 %= 10;
-    espBankSet(var_r30->unk_0C[2], var_r31);
-
-    var_r31 = var_r30->unk_0A;
-    espBankSet(var_r30->unk_0C[3], var_r31 / 100);
-    var_r31 %= 100;
-    espBankSet(var_r30->unk_0C[4], var_r31 / 10);
-    var_r31 %= 10;
-    espBankSet(var_r30->unk_0C[5], var_r31);
+    temp_r30 = lbl_1_bss_11F48->data;
+    lbl_1_data_268[temp_r30->unk_00]();
+    temp_r31 = temp_r30->unk_08;
+    espBankSet(temp_r30->unk_0C[0], temp_r31 / 100);
+    temp_r31 = (temp_r31 - ((temp_r31 / 100) * 100));
+    espBankSet(temp_r30->unk_0C[1], (temp_r31 / 10));
+    temp_r31 =  (temp_r31 - ((temp_r31 / 10) * 10));
+    espBankSet(temp_r30->unk_0C[2], temp_r31);
+    temp_r31 = temp_r30->unk_0A;
+    espBankSet(temp_r30->unk_0C[3], (temp_r31 / 100));
+    temp_r31 = (temp_r31 - ((temp_r31 / 100) * 100));
+    espBankSet(temp_r30->unk_0C[4],  (temp_r31 / 10));
+    temp_r31 = (temp_r31 - ((temp_r31 / 10) * 10));
+    espBankSet(temp_r30->unk_0C[5], temp_r31);
 }
 
 void fn_1_970C(void)