audio/external: match 800C5CB8, 800C3448, 800CB2C4, 800C35E8 (#359)

* Match funcs in audio/external.c

2 files changed, 22 insertions, 45 deletions

diff --git a/src/audio/external.c b/src/audio/external.c
index c97629da4..2823c5cd3 100644
--- a/src/audio/external.c
+++ b/src/audio/external.c
@@ -1087,21 +1087,13 @@ block_11:
 GLOBAL_ASM("asm/non_matchings/audio/external/func_800C2A2C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 extern u8 D_800EA1E4;
-extern ? D_80192CD0;
+extern u32 D_80192CD0[];
 
 void func_800C3448(s32 arg0) {
-    u8 temp_v0;
-
-    temp_v0 = D_800EA1E4;
-    *(&D_80192CD0 + (temp_v0 * 4)) = arg0;
-    D_800EA1E4 = temp_v0 + 1;
+    D_80192CD0[D_800EA1E4] = arg0;
+    D_800EA1E4 += 1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800C3448.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -1179,16 +1171,12 @@ s32 func_800C357C(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/audio/external/func_800C357C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80192CC6;
+extern unsigned char D_80192CC6[];
 
-void func_800C35E8(s32 arg0) {
-    *(&D_80192CC6 + (arg0 & 0xFF)) = 0;
+void func_800C35E8(u8 arg0) {
+    D_80192CC6[arg0] = 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800C35E8.s")
-#endif
+
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -2713,23 +2701,18 @@ void func_800C5C40(void) {
 GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5C40.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800C2474(); // extern
-void func_800C284C(u8, u8, u8, s32); // extern
-void func_800C3F70(); // extern
-void func_800C5A3C(); // extern
+extern void func_800C2474();
+extern void func_800C284C(u8, u8, u8, s32);
+extern void func_800C3F70();
+extern void func_800C5A3C();
 
 // game_audio_init?
 void func_800C5CB8(void) {
     func_800C2474();
     func_800C3F70();
     func_800C5A3C();
-    func_800C284C(2, 0, 255, 1);
+    func_800C284C(2, 0, 0xFF, 1);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5CB8.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c
@@ -5408,19 +5391,15 @@ void func_800CB14C(void) {
 GLOBAL_ASM("asm/non_matchings/audio/external/func_800CB14C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-//void func_800C1F8C(); // extern
-//void func_800C2274(?); // extern
-//void func_800C3478(); // extern
-//void func_800C3724(); // extern
-//void func_800C5848(); // extern
-//void func_800C59C4(); // extern
-//void func_800C8CCC(); // extern
-//void func_800CBC24(); // extern
+extern void func_800C2274(s32);                                 /* extern */
+extern void func_800C3478();                                  /* extern */
+extern void func_800C3724();                                  /* extern */
+extern void func_800C59C4();                                  /* extern */
+extern void func_800C8CCC();                                  /* extern */
+extern void func_800CBC24();                                  /* extern */
 
 // run audio?
-void func_800CB2C4(void) {
+void func_800CB2C4() {
     func_800C1F8C();
     func_800C3724();
     func_800C3478();
@@ -5430,6 +5409,4 @@ void func_800CB2C4(void) {
     func_800C2274(0);
     func_800CBC24();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CB2C4.s")
-#endif
+
diff --git a/src/audio/external.h b/src/audio/external.h
index 1a91f0712..5f934d4de 100644
--- a/src/audio/external.h
+++ b/src/audio/external.h
@@ -88,7 +88,7 @@ struct Unk_800EA06C {
 	/* 0x0D */ // u8 compilerPadding0[3];
 };
 
-void func_800C35E8(s32);
+void func_800C35E8(u8);
 u16 func_800C3508(s32);
 void func_800C5278(u8);
 void func_800CB14C(void);
@@ -148,7 +148,7 @@ void func_800CA49C(u8);
 void func_800CAACC(u8);
 void func_800CAEC4(u8, f32);
 void func_800CB134();
-void func_800CB2C4(void);
+void func_800CB2C4();
 void func_800C5CB8(void);
 
 // Based on SM64, this should be part of data.c's BSS section. Somehow.