From fe18f79b29df09b628aa044ddf3b2aaf9a1feb1a Mon Sep 17 00:00:00 2001
From: Jameriquiah <jordynhardyman12@gmail.com>
Date: Mon, 3 Aug 2026 07:14:51 -0400
Subject: [PATCH] match `func_800431FC` `func_800435E8`

---
 src/435D0.c | 31 ++++++++++++++++---------------
 src/435D0.h |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/435D0.c b/src/435D0.c
index 2f16a43..f063361 100644
--- a/src/435D0.c
+++ b/src/435D0.c
@@ -307,28 +307,33 @@ u8 func_800431DC(u32 arg0) {
     return 0;
 }
 
-#ifdef NON_MATCHING
 u8 func_800431FC(u32 arg0) {
     u8 temp_a0;
     u8 temp_a1;
     u8 temp_v0;
+    u8 temp_t9;
 
     temp_v0 = func_80044180(arg0);
     D_800FCD70[arg0].unk_03 = temp_v0;
     D_800FCD70[arg0].unk_04 = temp_v0;
+
     temp_v0 = func_80044180(arg0);
     temp_a0 = temp_v0 & 0xF0;
-    temp_a0 = (temp_a0 >> 4) & 0xFF;
-    temp_a1 = temp_a0 >> 1;
-    temp_v0 &= 0xF;
-    temp_a0 &= 1;
-    D_800FCD70[arg0].unk_00 = ((temp_a1 + temp_a0) * 0x10) | temp_a1;
-    D_800FCD70[arg0].unk_01 = (temp_v0 * 0x10) | temp_v0;
+    temp_a0 >>= 4;
+    temp_a1 = temp_a0;
+    temp_a1 >>= 1;
+    temp_t9 = temp_a0 & 1;
+    temp_a0 = temp_a1 + temp_t9;
+    temp_a0 <<= 4;
+    temp_t9 = temp_a0 | temp_a1;
+    D_800FCD70[arg0].unk_00 = temp_t9;
+
+    temp_t9 = temp_v0 & 0xF;
+    temp_v0 = temp_t9 << 4;
+    temp_v0 |= temp_t9;
+    D_800FCD70[arg0].unk_01 = temp_v0;
     return 0;
 }
-#else
-#pragma GLOBAL_ASM("asm/us/nonmatchings/435D0/func_800431FC.s")
-#endif
 
 u8 func_8004327C(u32 arg0) {
     UNUSED s32 pad;
@@ -427,8 +432,7 @@ u8 func_800435CC(u32 arg0, u8 arg1) {
     return 0;
 }
 
-#ifdef NON_MATCHING
-u8 func_800435E8(u32 arg0, u8 arg1) {
+s32 func_800435E8(u32 arg0, u8 arg1) {
     u8 sp27;
     u8 sp26;
     u8 sp25;
@@ -453,9 +457,6 @@ u8 func_800435E8(u32 arg0, u8 arg1) {
     }
     return var_v1;
 }
-#else
-#pragma GLOBAL_ASM("asm/us/nonmatchings/435D0/func_800435E8.s")
-#endif
 
 u8 func_80043708(u32 arg0, u8 arg1) {
     if (arg0 < 4) {
diff --git a/src/435D0.h b/src/435D0.h
index de1518e..5bff0b8 100644
--- a/src/435D0.h
+++ b/src/435D0.h
@@ -24,7 +24,7 @@ u8 func_800434E0(u32 arg0);
 u8 func_80043514(u32 arg0);
 u8 func_80043534(u32 arg0, u8 arg1);
 u8 func_800435CC(u32 arg0, u8 arg1);
-u8 func_800435E8(u32 arg0, u8 arg1);
+s32 func_800435E8(u32 arg0, u8 arg1);
 u8 func_80043708(u32 arg0, u8 arg1);
 u8 func_800437A0(u32 arg0, u8 arg1);
 s32 func_80043838(u32 arg0, u8 arg1);