diff --git a/asm/non_matchings/audio/external/func_800CA0A0.s b/asm/non_matchings/audio/external/func_800CA0A0.s deleted file mode 100644 index b0d6c95ed..000000000 --- a/asm/non_matchings/audio/external/func_800CA0A0.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_800CA0A0 -/* 0CACA0 800CA0A0 27BDFFF8 */ addiu $sp, $sp, -8 -/* 0CACA4 800CA0A4 240E0001 */ li $t6, 1 -/* 0CACA8 800CA0A8 3C01800F */ lui $at, %hi(D_800EA108) # $at, 0x800f -/* 0CACAC 800CA0AC A02EA108 */ sb $t6, %lo(D_800EA108)($at) -/* 0CACB0 800CA0B0 03E00008 */ jr $ra -/* 0CACB4 800CA0B4 27BD0008 */ addiu $sp, $sp, 8 diff --git a/asm/non_matchings/audio/external/func_800CA0B8.s b/asm/non_matchings/audio/external/func_800CA0B8.s deleted file mode 100644 index 06b22d958..000000000 --- a/asm/non_matchings/audio/external/func_800CA0B8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_800CA0B8 -/* 0CACB8 800CA0B8 27BDFFF8 */ addiu $sp, $sp, -8 -/* 0CACBC 800CA0BC 3C01800F */ lui $at, %hi(D_800EA108) # $at, 0x800f -/* 0CACC0 800CA0C0 A020A108 */ sb $zero, %lo(D_800EA108)($at) -/* 0CACC4 800CA0C4 03E00008 */ jr $ra -/* 0CACC8 800CA0C8 27BD0008 */ addiu $sp, $sp, 8 diff --git a/asm/non_matchings/audio/external/func_800CA0CC.s b/asm/non_matchings/audio/external/func_800CA0CC.s deleted file mode 100644 index d5c89f889..000000000 --- a/asm/non_matchings/audio/external/func_800CA0CC.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_800CA0CC -/* 0CACCC 800CA0CC 27BDFFF8 */ addiu $sp, $sp, -8 -/* 0CACD0 800CA0D0 240E0001 */ li $t6, 1 -/* 0CACD4 800CA0D4 3C01800F */ lui $at, %hi(D_800EA108) # $at, 0x800f -/* 0CACD8 800CA0D8 A02EA108 */ sb $t6, %lo(D_800EA108)($at) -/* 0CACDC 800CA0DC 03E00008 */ jr $ra -/* 0CACE0 800CA0E0 27BD0008 */ addiu $sp, $sp, 8 diff --git a/asm/non_matchings/audio/external/func_800CA270.s b/asm/non_matchings/audio/external/func_800CA270.s deleted file mode 100644 index 10dc55066..000000000 --- a/asm/non_matchings/audio/external/func_800CA270.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_800CA270 -/* 0CAE70 800CA270 27BDFFF8 */ addiu $sp, $sp, -8 -/* 0CAE74 800CA274 240E0001 */ li $t6, 1 -/* 0CAE78 800CA278 3C01800F */ lui $at, %hi(D_800EA0F4) # $at, 0x800f -/* 0CAE7C 800CA27C A02EA0F4 */ sb $t6, %lo(D_800EA0F4)($at) -/* 0CAE80 800CA280 03E00008 */ jr $ra -/* 0CAE84 800CA284 27BD0008 */ addiu $sp, $sp, 8 diff --git a/asm/non_matchings/audio/external/func_800CB134.s b/asm/non_matchings/audio/external/func_800CB134.s deleted file mode 100644 index e9d4a0851..000000000 --- a/asm/non_matchings/audio/external/func_800CB134.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_800CB134 -/* 0CBD34 800CB134 27BDFFF8 */ addiu $sp, $sp, -8 -/* 0CBD38 800CB138 240E0001 */ li $t6, 1 -/* 0CBD3C 800CB13C 3C01800F */ lui $at, %hi(D_800EA174) # $at, 0x800f -/* 0CBD40 800CB140 A42EA174 */ sh $t6, %lo(D_800EA174)($at) -/* 0CBD44 800CB144 03E00008 */ jr $ra -/* 0CBD48 800CB148 27BD0008 */ addiu $sp, $sp, 8 diff --git a/src/audio/external.c b/src/audio/external.c index c17d8e876..08cad046c 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -1,6 +1,7 @@ #include #include #include +#include "audio/external.h" GLOBAL_ASM("asm/non_matchings/audio/external/func_800C13F0.s") @@ -5526,38 +5527,23 @@ void func_800CA008(u8 arg0, u8 arg1) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA008.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s8 D_800EA108; - void func_800CA0A0(void) { + s32 pad; + if (pad){}; D_800EA108 = 1; } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA0A0.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s8 D_800EA108; void func_800CA0B8(void) { + s32 pad; + if (pad){}; D_800EA108 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA0B8.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s8 D_800EA108; void func_800CA0CC(void) { + s32 pad; + if (pad){}; D_800EA108 = 1; } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA0CC.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -5660,16 +5646,11 @@ void func_800CA24C(s32 arg0) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA24C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s8 D_800EA0F4; - void func_800CA270(void) { + s32 pad; + if (pad){}; D_800EA0F4 = 1; } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA270.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -6262,16 +6243,11 @@ void func_800CB064(u8 arg0) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800CB064.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s16 D_800EA174; - void func_800CB134(void) { + s32 pad; + if (pad){}; D_800EA174 = 1; } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CB134.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 diff --git a/src/audio/external.h b/src/audio/external.h new file mode 100644 index 000000000..ccb4f86c6 --- /dev/null +++ b/src/audio/external.h @@ -0,0 +1,16 @@ +#ifndef AUDIO_EXTERNAL_H +#define AUDIO_EXTERNAL_H + +#include "common_structs.h" + +void func_800CA0A0(); +void func_800CA0B8(); +void func_800CA0CC(); +void func_800CA270(); +void func_800CB134(); + +extern s8 D_800EA0F4; +extern s8 D_800EA108; +extern s16 D_800EA174; + +#endif