Match a few small functions (#249)

* Match func_8000B820

* Match func_80011AB8

* Match a few small functions

3 files changed, 44 insertions, 93 deletions

diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c
index 3f2efb62c..bcc0b77a9 100644
--- a/src/code_80005FD0.c
+++ b/src/code_80005FD0.c
@@ -2127,7 +2127,7 @@ void func_800097E0(void) {
     func_8000EF20();
     D_8016337C++;
 
-    if (gCurrentCourseId == 20) { 
+    if (gCurrentCourseId == 20) {
         for (i = 0; i < 7; i++) {
             func_8000DF8C(i);
         }
@@ -3043,19 +3043,17 @@ s32 func_8000B7E4(s32 arg0, u16 wayPointIndex) {
     return 0;
 }
 
-#ifdef NEEDS_RODATA
 extern f32 D_800ECFD8;// = 1.1f;
 extern f32 D_800ECFDC;// = -1.1f;
 
-s32 func_8000B820(s32 playerId) {
-    if ((1.1f <= D_80163068[playerId]) || (D_80163068[playerId] <= -1.1f)) {
+s32 func_8000B820(s32 playerIndex) {
+    f32 value = D_80163068[playerIndex];
+    // Check if value between 1.1 and -1.1
+    if ((D_800ECFD8 <= value) || (value <= D_800ECFDC)) {
         return 1;
     }
     return 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000B820.s")
-#endif
 
 #ifdef NEEDS_RODATA
 extern f32 D_800ECFE0;// = 0.01f;
@@ -3069,7 +3067,7 @@ f32 func_8000B874(f32 posX, f32 posZ, u16 wayPointIndex, s32 pathIndex) {
     f32 math;
     struct TrackWayPoint *thing1;
     struct TrackWayPoint *thing2;
-    
+
     thing1 = &D_80164560[pathIndex][wayPointIndex];
     thing2 = &D_80164570[pathIndex][wayPointIndex];
 
@@ -4470,7 +4468,7 @@ extern struct unk_41F8 D_801641F8[];
 s32 func_8000ED14(s32, s16);
 s32 func_8000ED14(s32 arg0, s16 arg1) {
     s32 i;
-    s32 a2 = 0; 
+    s32 a2 = 0;
 
     for (i = 0; i < 8; i++) {
 
@@ -6068,37 +6066,22 @@ void func_80011A5C(void) {
 GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80011A5C.s")
 #endif
 
-//#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-
-// Probably a struct but it matches so good enough for now.
 extern s16 D_801632B8[];
 extern s16 D_801632D0[];
 extern s16 D_801632E8[];
 
-void func_80011AB8(s32 arg0) {
-    D_801632B8[arg0] = 0;
-    D_801632D0[arg0] = 0;
-    D_801632E8[arg0] = 0;
+
+void func_80011AB8(s32 index) {
+    D_801632B8[index] = 0;
+    D_801632D0[index] = 0;
+    D_801632E8[index] = 0;
 }
-//#else
-//GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80011AB8.s")
-//#endif
 
-//#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-//extern ? D_801632B8;
-//extern ? D_801632D0;
-//extern ? D_801632E8;
-
-void func_80011AE4(s32 arg0) {
-    D_801632B8[arg0] = 0;
-    D_801632D0[arg0] = 0;
-    D_801632E8[arg0] = 1;
-}
-//#else
-//GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80011AE4.s")
-//#endif
+void func_80011AE4(s32 index) {
+    D_801632B8[index] = 0;
+    D_801632D0[index] = 0;
+    D_801632E8[index] = 1;
+}
 
 #ifdef MIPS_TO_C
 //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9
diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c
index 6f51191f5..2b55306f9 100644
--- a/src/code_8006E9C0.c
+++ b/src/code_8006E9C0.c
@@ -3,7 +3,19 @@
 #include <defines.h>
 
 void func_8006EA5C(void);
+void func_8006ED60(void);
+s32 func_8006ED94(s32*, s32, s32, s32);
 extern s32 gScreenModeSelection;
+extern s32 gTextureLogoMarioKart64;
+extern s16 D_80165730;
+extern s16 D_80165738;
+extern s16 D_80165740;
+extern s16 D_80165748;
+extern s32 D_80165C18;
+extern s32 D_80183D5C;
+extern s8 D_8018EDF3;
+extern s32 D_8018D1E0;
+extern s32 D_8018D9B0;
 
 void func_8006E9C0(void) {
 
@@ -195,18 +207,10 @@ void func_8006EB10(void) {
 GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006EB10.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern void D_80165C18;
-extern s32 D_80183D5C;
-
-void func_8006ED60(void) {
+void func_8006ED60() {
     bzero(&D_80165C18, 0x1E140);
     D_80183D5C = -1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006ED60.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -234,19 +238,9 @@ u8 *func_8006ED94(s32 arg0, u8 *arg1, u32 arg2, s32 arg3) {
 GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006ED94.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-s32 func_8006ED94(? *, s32, ?, ?); // extern
-extern s32 D_8018D1E0;
-extern s32 D_8018D9B0;
-extern ? gTextureLogoMarioKart64;
-
 void func_8006EE44(void) {
     D_8018D1E0 = func_8006ED94(&gTextureLogoMarioKart64, D_8018D9B0, 0x79E1, 0x20000);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006EE44.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -1294,13 +1288,6 @@ void func_8007055C(void) {
 GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8007055C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern s16 D_80165730;
-extern s16 D_80165738;
-extern s16 D_80165740;
-extern s16 D_80165748;
-
 void func_80070714(void) {
     D_80165730 = 1;
     if (D_8018EDF3 == ONE_PLAYERS_SELECTED) {
@@ -1313,9 +1300,6 @@ void func_80070714(void) {
     D_80165740 = 0x1E;
     D_80165748 = 0xA;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070714.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
diff --git a/src/code_80086E70.c b/src/code_80086E70.c
index bb261d2d5..2ba66aa24 100644
--- a/src/code_80086E70.c
+++ b/src/code_80086E70.c
@@ -17,6 +17,9 @@ struct struct_E0 {
 }; // Size 0xE0
 extern struct struct_E0 D_80165CC6[];
 
+extern s16 D_8018CF68[];
+extern s32 gPlayerCountSelection1;
+
 void func_800721E8(s32, s32); // extern
 void func_80086E70(s32 arg0) {
     D_80165CC6[arg0].unk00.s16 = 1;// * 0xE0)) = 1;
@@ -1886,38 +1889,19 @@ s32 func_8008A890(struct UnkStruct8008A890 *arg0) {
     return func_802ABD40(arg0->value);
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern s16 D_8018CF68;
-
-? func_8008A8B0(s16 arg0, s16 arg1) {
-    s16 *temp_v0;
-    s16 temp_a0;
-    s32 temp_a2;
-    s16 *phi_v0;
-    ? phi_v1;
-    ? phi_v1_2;
-
-    temp_a2 = gPlayerCountSelection1;
-    phi_v1 = 0;
-    phi_v1_2 = 0;
-    if (temp_a2 > 0) {
-        phi_v0 = &D_8018CF68;
-        do {
-            temp_a0 = *phi_v0;
-            temp_v0 = phi_v0 + 2;
-            phi_v0 = temp_v0;
-            if ((temp_a0 >= arg0) && (arg1 >= temp_a0)) {
-                phi_v1_2 = 1;
-            }
-            phi_v1 = phi_v1_2;
-        } while (temp_v0 < ((temp_a2 * 2) + &D_8018CF68));
+s32 func_8008A8B0(s16 arg0, s16 arg1) {
+    s32 var_v1;
+    s16* var_v0;
+    s32 i;
+    var_v1 = 0;
+    for (i = 0; i < gPlayerCountSelection1; i++) {
+        var_v0 = &D_8018CF68[i];
+        if ((*var_v0 >= arg0) && (arg1 >= *var_v0)) {
+            var_v1 = 1;
+        }
     }
-    return phi_v1;
+    return var_v1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008A8B0.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307