Decomp every func under 500 bytes (except audio) (#237)

src/code_80005FD0.c

@@ -4890,14 +4890,10 @@ block_20:
 GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000F124.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_8000F2BC(void *arg0, s32 arg1) {
-    bzero(arg0, arg1 * 8);
+// Delete track waypoints
+void func_8000F2BC(struct TrackWayPoint *arg0, s32 arg1) {
+    bzero(arg0, arg1 << 3);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000F2BC.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9
@@ -10547,16 +10543,11 @@ block_8:
 GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001933C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 extern s16 D_80164678;
 
 void func_8001968C(void) {
     D_80164678 = 3;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001968C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -10862,16 +10853,11 @@ void func_80019D2C(void *arg0, void *arg1, s32 arg2) {
 GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019D2C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 extern s16 D_801646CC;
 
 void func_80019DE4(void) {
     D_801646CC = 1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019DE4.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -11524,29 +11510,25 @@ void func_8001AB74(s32 arg0, s16 *arg1, s32 arg2) {
 GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001AB74.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_8001ABE0(s32 arg0, ? arg1) {
+void func_8001ABE0(s32 arg0, s32 arg1) {
 
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001ABE0.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_8001ABEC(void *arg0) {
-    s16 temp_v0;
+struct struct_801642D8 {
+    /* 0x0 */ u16 unk0;
+    /* 0x2 */ s16 ffff;
+    /* 0x4 */ s16 timer; // confirm?
+    /* 0x6 */ s16 laps; // confirm?
+    /* 0x8 */ s32 blank;
+    /* 0xC */ s32 unkC;
+};
 
-    temp_v0 = arg0->unk2;
-    if ((temp_v0 < 0) || (temp_v0 >= 0x64)) {
+void func_8001ABEC(struct struct_801642D8 *arg0) {
+    if ((arg0->ffff < 0) || (arg0->ffff >= 100)) {
         arg0->unk0 = 0;
-        arg0->unk4 = 0;
+        arg0->timer = 0;
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001ABEC.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909

src/code_80071F00.c

@@ -256,16 +256,26 @@ extern ? D_80165C70;
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80072354.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165CE3;
+// maybe struct_80165C18_entry (same size)
+// However, unk_000 needs to be s32. Could be an onion?
+struct struct_E0 {
+    union {
+        s8 s8;
+        s16 s16;
+    };
+    s16 unk2;
+    s8 unk4[0xDC];
+}; // Size 0xE0
 
-void func_80072388(s32 arg0, s8 arg1) {
-    *(&D_80165CE3 + (arg0 * 0xE0)) = arg1;
+extern struct struct_E0 D_80165CE3[];
+
+/**
+ * The s8's in this file are possibly just one big array
+ * (includes D_80165CE3, D_80165CEF)
+ **/
+void func_80072388(s32 arg0, s32 arg1) {
+    D_80165CE3[arg0].s8 = arg1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80072388.s")
-#endif
 
 void func_800723A4(s32 arg0, s32 arg1) {
     D_80165C18[arg0].unk_054 = 0;
@@ -298,16 +308,11 @@ void func_80072488(s32 arg0) {
     ++D_80165C18[arg0].unk_0A6;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165CEF;
+extern struct struct_E0 D_80165CEF[];
 
 void func_800724DC(s32 arg0) {
-    *(&D_80165CEF + (arg0 * 0xE0)) = 0;
+    D_80165CEF[arg0].s8 = 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800724DC.s")
-#endif
 
 void func_800724F8(s32 arg0, s32 arg1) {
     D_80165C18[arg0].unk_084[D_80165C18[arg0].unk_0D7] = arg1;
@@ -337,37 +342,33 @@ void func_800725E8(s32 arg0, s32 arg1, s32 arg2) {
     D_80165C18[arg0].unk_0A6 =  arg1;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800721E8(s32, ?); // extern
-? func_80072388(?); // extern
 s16 func_80072530(s32); // extern
-extern ? D_80165CBE;
+extern struct struct_E0 D_80165CBE[];
 
 void func_8007266C(s32 arg0) {
-    func_80072388(0);
+    func_80072388(arg0, 0);
     func_800721E8(arg0, 0x2000);
     func_800721E8(arg0, 8);
-    *(&D_80165CBE + (arg0 * 0xE0)) = func_80072530(arg0);
+    D_80165CBE[arg0].s16 = func_80072530(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007266C.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800721E8(s32, ?); // extern
-? func_80072388(?); // extern
-extern ? D_80165CBE;
 
 void func_800726CC(s32 arg0, s32 arg1) {
-    func_80072388(0);
+    func_80072388(arg0, 0);
     func_800721E8(arg0, 0x2000);
-    *(&D_80165CBE + (arg0 * 0xE0)) = arg1;
+    D_80165CBE[arg0].s16 = arg1;
+}
+
+UNUSED void func_8007271C(s32 arg0, s32 arg1) {
+    if (D_80165C18[arg0].unk_0CB == 0) {
+        D_80165C18[arg0].unk_0A6 = arg1;
+    }
+}
+
+UNUSED void func_80007274C(s32 arg0) {
+    if (D_80165CE3[arg0].s8 == 0) {
+        func_80072488(arg0);
+    }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800726CC.s")
-#endif
 
 s32 func_8007278C(s32 arg0, s32 arg1) {
     s32 phi_v1;
@@ -426,40 +427,35 @@ UNUSED s32 func_800728B0(s32 arg0, s32 arg1, s32 arg2) {
     return phi_a3;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165CBE;
-
-void func_80072950(s32 arg0, s32 arg1, s32 arg2, s16 arg3) {
+void func_80072950(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
     if (arg1 == arg2) {
-        *(&D_80165CBE + (arg0 * 0xE0)) = arg3;
+        D_80165CBE[arg0].s16 = arg3;
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80072950.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165CBA;
-
-void func_800729B4(s32 arg0, s16 arg1) {
-    *(&D_80165CBA + (arg0 * 0xE0)) = arg1;
+UNUSED void func_80072974(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
+    if (arg1 != arg2) {
+        D_80165CBE[arg0].s16 = arg3;
+    }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800729B4.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165CBC;
+extern struct struct_E0 D_80165CE4[];
 
-void func_800729D0(s32 arg0, s16 arg1) {
-    *(&D_80165CBC + (arg0 * 0xE0)) = arg1;
+UNUSED void func_80072998(s32 arg0) {
+        D_80165CE4[arg0].s8 = 0;
+}
+
+extern struct struct_E0 D_80165CBA[];
+
+void func_800729B4(s32 arg0, s32 arg1) {
+    D_80165CBA[arg0].s16 = arg1;
+}
+
+extern struct struct_E0 D_80165CBC[];
+
+void func_800729D0(s32 arg0, s32 arg1) {
+    D_80165CBC[arg0].s16 = arg1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800729D0.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -814,21 +810,16 @@ UNUSED void func_80073568() {
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165C18;
+//extern struct struct_E0 D_80165C18[];
 extern s32 D_8018D1EC;
 
 // separated from asm in code_80071F00/func_80073514.s
 UNUSED void func_80073570(s32 arg0) {
-    s16 *temp_v0;
-    s32 temp_t7;
-
-    temp_t7 = D_8018D1EC + 1;
-    D_8018D1EC = temp_t7;
-    if (temp_t7 == 5) {
+    D_8018D1EC++;
+    if (D_8018D1EC == 5) {
         D_8018D1EC = 0;
     }
-    temp_v0 = (arg0 * 0xE0) + 0xA6 + &D_80165C18;
-    *temp_v0 = (s16) (*temp_v0 + 1);
+    D_80165C18[arg0].unk_0A6++;
 }
 #else
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073570.s")
@@ -853,45 +844,24 @@ void func_80073654(s32 arg0) {
     ++D_80165C18[arg0].unk_0D6;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800721E8(?); // extern
-extern ? D_80165CEE;
+extern struct struct_E0 D_80165CEE[];
 
-// separated from asm in code_80071F00/func_80073654.s
 UNUSED void func_8007369C(s32 arg0, s32 arg1) {
-    func_800721E8(0x8000);
-    *(&D_80165CEE + (arg0 * 0xE0)) = (s8) arg1;
+    func_800721E8(arg0, 0x8000);
+    D_80165CEE[arg0].s8 = arg1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007369C.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800721E8(?); // extern
-extern ? D_80165CEE;
+extern struct struct_E0 D_80165CEE[];
 
 void func_800736E0(s32 arg0) {
-    func_800721E8(0x8000);
-    *(&D_80165CEE + (arg0 * 0xE0)) = 1;
+    func_800721E8(arg0, 0x8000);
+    D_80165CEE[arg0].s8 = 1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800736E0.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800721E8(?); // extern
-extern ? D_80165CEE;
 
 void func_80073720(s32 arg0) {
-    func_800721E8(0x8000);
-    *(&D_80165CEE + (arg0 * 0xE0)) = 0;
+    func_800721E8(arg0, 0x8000);
+    D_80165CEE[arg0].s8 = 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073720.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -926,33 +896,22 @@ s32 func_8007375C(s32 arg0, s32 arg1) {
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007375C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165CE7;
+extern struct struct_E0 D_80165CE7[];
 
-void func_80073800(s32 arg0, s8 arg1) {
-    *(&D_80165CE7 + (arg0 * 0xE0)) = arg1;
+void func_80073800(s32 arg0, s32 arg1) {
+    D_80165CE7[arg0].s8 = arg1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073800.s")
-#endif
 
 void func_8007381C(s32 arg0) {
     ++D_80165C18[arg0].unk_0DC;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80073800(?); // extern
-extern ? D_80165CF4;
+extern struct struct_E0 D_80165CF4[];
 
 void func_80073844(s32 arg0) {
-    func_80073800(0);
-    *(&D_80165CF4 + (arg0 * 0xE0)) = 1;
+    func_80073800(arg0, 0);
+    D_80165CF4[arg0].s8 = 1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073844.s")
-#endif
 
 void func_80073884(s32 arg0) {
     D_80165C18[arg0].unk_0DC = 0;
@@ -1161,33 +1120,26 @@ UNUSED s32 func_80073ED4(s32 arg0, u16* arg1, u16 arg2, s32 arg3) {
     return phi_t0;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165CE5;
+extern struct struct_E0 D_80165CE5[];
 
-void func_80073F90(s32 arg0, s8 arg1) {
-    *(&D_80165CE5 + (arg0 * 0xE0)) = arg1;
+void func_80073F90(s32 arg0, s32 arg1) {
+    D_80165CE5[arg0].s8 = arg1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073F90.s")
-#endif
 
 void func_80073FAC(s32 arg0) {
     ++D_80165C18[arg0].unk_0DB;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80073F90(?); // extern
-extern ? D_80165CF3;
+extern struct struct_E0 D_80165CF3[];
 
 void func_80073FD4(s32 arg0) {
-    func_80073F90(0);
-    *(&D_80165CF3 + (arg0 * 0xE0)) = 1;
+    func_80073F90(arg0, 0);
+    D_80165CF3[arg0].s8 = 1;
+}
+
+UNUSED void func_80074014(void) {
+
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073FD4.s")
-#endif
 
 s32 func_8007401C(s32 arg0, f32* arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, s32 arg6) {
     s32 phi_a3;
@@ -1324,19 +1276,19 @@ void func_800744CC(void) {
     }
 }
 
-void func_80074510(void* arg0, void* arg1, s32 arg2) {
+void func_80074510(uintptr_t devAddr, void * vaddr, size_t nbytes) {
     func_800744CC();
-    osPiStartDma(&gDmaIoMesg, OS_MESG_PRI_NORMAL, OS_READ, (uintptr_t) arg0, arg1, arg2, &gDmaMesgQueue);
+    osPiStartDma(&gDmaIoMesg, OS_MESG_PRI_NORMAL, OS_READ, devAddr, vaddr, nbytes, &gDmaMesgQueue);
     D_8018D224 = 1;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80074510(void *, s32); // extern
-extern ? _other_texturesSegmentRomStart;
+#ifdef NON_MATCHING
 
-void func_80074574(s32 arg0, u16 arg2, s32 arg3) {
-    func_80074510((arg0 & 0xFFFFFF) + &_other_texturesSegmentRomStart, arg2 * (arg3 & 0xFFFF));
+extern s8 _other_texturesSegmentRomStart[];
+
+void func_80074574(s32 arg0, u8 *arg1, u16 arg2, u16 arg3) {
+    if (1);
+    func_80074510(&_other_texturesSegmentRomStart[arg0 & 0xFFFFFF], (void *) (arg2 * arg3), arg3);
 }
 #else
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80074574.s")
@@ -1420,7 +1372,7 @@ void func_800747F0(s32 arg0) {
     if (temp_v0 != temp_v1->unkD3) {
         sp1C = temp_v1;
         sp24 = (temp_v0 * temp_v1->unkD9 * temp_v1->unkDA) + temp_v1->unk6C;
-        func_80074574(sp24, func_80074790(), temp_v1->unkD9, temp_v1->unkDA);
+        func_80074574(sp24, func_80074790(), temp_v1->unkD9, func_80074574->unkDA);
         temp_v1->unkD3 = temp_v1->unkD2;
         func_80074478(arg0);
     }
@@ -6109,16 +6061,9 @@ void func_8007B34C(s32 playerId) {
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B34C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8007B34C(); // extern
-
 void func_8007BB9C(void) {
     func_8007B34C();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BB9C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -6449,16 +6394,9 @@ void func_8007C2F8(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C2F8.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8007CC00(); // extern
-
 void func_8007C340(void) {
     func_8007CC00();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C340.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -9657,14 +9595,9 @@ void func_800810F4(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800810F4.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 void func_80081208(void) {
 
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081208.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
@@ -10913,16 +10846,9 @@ void func_80083018(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083018.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8008BF18(); // extern
-
-void func_80083060(void) {
-    func_8008BF18();
+void func_80083060(s32 arg0) {
+    func_8008BF18(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083060.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -11387,16 +11313,9 @@ void func_80083B0C(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083B0C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8008BF18(); // extern
-
-void func_80083BE4(void) {
-    func_8008BF18();
+void func_80083BE4(s32 arg0) {
+    func_8008BF18(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083BE4.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909

src/code_80071F00.h

@@ -16,13 +16,13 @@ void func_80072428(s32);
 void func_80072488(s32);
 void func_800724F8(s32, s32);
 s32  func_8007278C(s32, s32);
-void func_80073800(s32, s8);
+void func_80073800(s32, s32);
 void func_8007381C(s32);
 s32  func_800738A8(s32, s16*, s32, s32, s32, s32, s32);
 s32  func_80073A10(s32, s16*, s32, s32, s32, s32, s32);
 s32  func_80073B00(s32, s16*, s32, s32, s32, s32, s32);
 s32  func_80073B78(s32, s32, s16*, s32, s32, s32, s32, s32);
-void func_80073F90(s32, s8);
+void func_80073F90(s32, s32);
 void func_80073FAC(s32);
 s32  func_8007401C(s32, f32*, f32, f32, f32, s32, s32);
 s32  func_8007415C(s32, f32*, f32, f32, f32, s32, s32);

src/code_80086E70.c

@@ -33,16 +33,9 @@ void func_80086EAC(s32 arg0, s8 arg1, s16 arg2) {
 GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80086EAC.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80086E70(); // extern
-
 void func_80086EF0(void) {
     func_80086E70();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80086EF0.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307

src/code_80091750.c

@@ -3981,16 +3981,9 @@ loop_4:
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099184.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800996BC(?); // extern
-
-void func_8009969C(void) {
-    func_800996BC(1);
+void func_8009969C(s32 arg0) {
+    func_800996BC(arg0, 1);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009969C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 0ca3d5f5fa5e3d957908269ac1535e7d4f12bce9
@@ -4126,24 +4119,14 @@ void func_80099958(MkTexture *arg0, s32 arg1, s32 arg2) {
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099958.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 extern s32 D_8018E060;
 
+// Possibly a debug print function?
 void func_80099A70(void) {
-    s32 temp_v0;
-    s32 phi_v0;
-
+    s32 i;
     D_8018E060 = 0;
-    phi_v0 = 0;
-    do {
-        temp_v0 = phi_v0 + 4;
-        phi_v0 = temp_v0;
-    } while (temp_v0 != 0x10);
+    for (i = 0; i < 16; i++) { }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099A70.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda
@@ -4287,16 +4270,11 @@ loop_9:
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099AEC.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 extern s32 D_8018E0E8;
 
 void func_80099E54(void) {
     D_8018E0E8 = 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099E54.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda
@@ -5935,31 +5913,14 @@ void func_8009CBE4(s32 arg0, s32 arg1, s32 arg2) {
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CBE4.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009CBE4(?); // extern
-
-void func_8009CDDC(void) {
-    func_8009CBE4(0);
+void func_8009CDDC(s32 arg0, s32 arg1) {
+    func_8009CBE4(arg0, arg1, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CDDC.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009CBE4(?); // extern
-
-void func_8009CDFC(void) {
-    func_8009CBE4(1);
+void func_8009CDFC(s32 arg0, s32 arg1) {
+    func_8009CBE4(arg0, arg1, 1);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CDFC.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800C3448(?); // extern
 extern u8 gSoundMode;
 
 void func_8009CE1C(void) {
@@ -5967,9 +5928,6 @@ void func_8009CE1C(void) {
         func_800C3448(0xE0000002);
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CE1C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
@@ -6453,28 +6411,13 @@ void func_8009D77C(s32 arg0, s32 arg1, s32 arg2) {
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009D77C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009D77C(?); // extern
-
-void func_8009D958(void) {
-    func_8009D77C(0);
+void func_8009D958(s32 arg0, s32 arg1) {
+    func_8009D77C(arg0, arg1, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009D958.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009D77C(?); // extern
-
-void func_8009D978(void) {
-    func_8009D77C(1);
+void func_8009D978(s32 arg0, s32 arg1) {
+    func_8009D77C(arg0, arg1, 1);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009D978.s")
-#endif
-
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 s32 draw_box(s32, s32, s32, s32, s32, s32, s32, s32, s32); // extern
@@ -6713,27 +6656,13 @@ void func_8009DEF8(u32 arg0, s8 arg1) {
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DEF8.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009DEF8(?); // extern
-
-void func_8009DF4C(void) {
-    func_8009DEF8(1);
+void func_8009DF4C(s32 arg0) {
+    func_8009DEF8(arg0, 1);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DF4C.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009DEF8(?); // extern
-
-void func_8009DF6C(void) {
-    func_8009DEF8(8);
+void func_8009DF6C(s32 arg0) {
+    func_8009DEF8(arg0, 8);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DF6C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -6763,27 +6692,13 @@ void func_8009DF8C(u32 arg0, s8 arg1) {
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DF8C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009DF8C(?); // extern
-
-void func_8009DFE0(void) {
-    func_8009DF8C(2);
+void func_8009DFE0(s32 arg0) {
+    func_8009DF8C(arg0, 2);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DFE0.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009DF8C(?); // extern
-
-void func_8009E000(void) {
-    func_8009DF8C(7);
+void func_8009E000(s32 arg0) {
+    func_8009DF8C(arg0, 7);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E000.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -6886,70 +6801,40 @@ void func_8009E0F0(u32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E0F0.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009DFE0(?); // extern
 extern s32 D_8018EDE0;
 
 void func_8009E1C0(void) {
-    func_8009DFE0(0xA);
+    func_8009DFE0(10);
     D_8018EDE0 = 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E1C0.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009E000(?); // extern
 extern s32 D_8018EDE0;
 
 void func_8009E1E4(void) {
-    func_8009E000(0xA);
+    func_8009E000(10);
     D_8018EDE0 = 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E1E4.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009DFE0(?); // extern
 extern s32 D_8018EDE0;
 
 void func_8009E208(void) {
-    func_8009DFE0(0xA);
+    func_8009DFE0(10);
     D_8018EDE0 = 1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E208.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009DFE0(?); // extern
 extern s32 D_8018EDE0;
 
 void func_8009E230(void) {
-    func_8009DFE0(0xA);
+    func_8009DFE0(10);
     D_8018EDE0 = 2;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E230.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009DFE0(?); // extern
 extern s32 D_8018EDE0;
 
 void func_8009E258(void) {
-    func_8009DFE0(0xA);
+    func_8009DFE0(10);
     D_8018EDE0 = 3;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E258.s")
-#endif
 
 void func_8009DFE0(s32);
 extern s32 D_8018EDE0; //bss
@@ -7069,37 +6954,21 @@ void func_8009E2F0(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E2F0.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009E5FC(s32); // extern
-
+void func_8009E5FC(s32);
 void func_8009E5BC(void) {
-    s32 temp_s0;
-    s32 phi_s0;
-
-    phi_s0 = 0;
-    do {
-        func_8009E5FC(phi_s0);
-        temp_s0 = phi_s0 + 1;
-        phi_s0 = temp_s0;
-    } while (temp_s0 != 4);
+    s32 i;
+    for (i = 0; i < 4; i++) {
+        func_8009E5FC(i);
+    }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E5BC.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_8018E838;
-extern ? D_8018E840;
+extern s8 D_8018E838[];
+extern s32 D_8018E840[];
 
 void func_8009E5FC(s32 arg0) {
-    *(&D_8018E838 + arg0) = 1;
-    *(&D_8018E840 + (arg0 * 4)) = 0;
+    D_8018E838[arg0] = 1;
+    D_8018E840[arg0] = 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E5FC.s")
-#endif
 
 void func_8009E620(void) {
     s32 index;
@@ -12706,27 +12575,14 @@ block_119:
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A7A4C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800A7A4C(?); // extern
-
 void func_800A8230(void) {
     func_800A7A4C(0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A8230.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800A7A4C(?); // extern
 
 void func_800A8250(void) {
     func_800A7A4C(1);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A8250.s")
-#endif
+
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda