mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-27 22:59:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

audio/external: Match 800CAD40/800CAFC0/800CAC60 (#350)

Browse Source 
* audio/external: Match 800CAD40/800CAFC0

* Match func_800CAC60, mark unused arg0's as UNUSED
This commit is contained in:
Joshua Peisach
2023-08-08 13:40:30 -04:00
committed by GitHub
parent e7632b3227
commit fe36d4a738
5 changed files with 26 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio/external.c
+25 -57
View File
@@ -1231,7 +1231,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C3608.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_801930D0;
void func_800C36C4(s32 arg0, s32 arg1, u8 arg2, s8 arg3) {
void func_800C36C4(s32 arg0, u32 arg1, u8 arg2, s8 arg3) {
void *temp_v0;
temp_v0 = ((arg0 & 0xFF) * 0x24C) + &D_801930D0;
@@ -5143,52 +5143,35 @@ void func_800CAC08(void) {
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAC08.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C36C4(?, ?, ?, ?); // extern
void play_sound(?, ? *, ?, ? *, ? *, ? *); // extern
extern u8 D_800EA0F0;
extern u8 D_800EA108;
extern ? D_800EA10C;
extern u8 D_800EA10C[];
extern s8 D_800EA168;
extern ? D_800EA1C8;
extern ? D_800EA1D4;
extern ? D_800EA1DC;
void func_800CAC60(s32 arg0) {
void func_800CAC60(UNUSED s32 arg0) {
if ((D_800EA108 == 0) && (D_800EA0F0 == 0)) {
play_sound(SOUND_ACTION_EXPLOSION_2, &D_800EA1C8, 0, &D_800EA1D4, &D_800EA1D4, &D_800EA1DC);
if ((D_800EA10C.unk0 != 1) && (D_800EA10C.unk1 != 1)) {
func_800C36C4(0, 1, 0x37, 5);
play_sound(SOUND_ITEM_THUNDERBOLT, &D_800EA1C8, 0, &D_800EA1D4, &D_800EA1D4, &D_800EA1DC);
play_sound(SOUND_ACTION_EXPLOSION_2, D_800EA1C8, 0U, D_800EA1D4, D_800EA1D4, &D_800EA1DC);
if ((D_800EA10C[0] != 1) && (D_800EA10C[1] != 1)) {
func_800C36C4(0, 1, 0x37U, 5);
play_sound(SOUND_ITEM_THUNDERBOLT, D_800EA1C8, 0U, D_800EA1D4, D_800EA1D4, &D_800EA1DC);
D_800EA168 = 1;
}
}
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAC60.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C36C4(?, ?, ?, ?); // extern
void func_800C56F0(?); // extern
extern u8 D_800EA108;
extern u8 func_800C56F0(); /* extern */
extern s8 D_800EA168;
extern ? D_800EA170;
extern u8 D_800EA170[];
void func_800CAD40(s32 arg0) {
void func_800CAD40(UNUSED s32 arg0) {
if (D_800EA108 == 0) {
if ((D_800EA170.unk0 == 0) && (D_800EA170.unk1 == 0) && (D_800EA170.unk2 == 0) && (D_800EA170.unk3 == 0)) {
func_800C36C4(0, 1, 0x7F, 0x19);
if ((D_800EA170[0] == 0) && (D_800EA170[1] == 0) && (D_800EA170[2] == 0) && (D_800EA170[3] == 0)) {
func_800C36C4(0, 1, 0x7FU, 0x19);
}
func_800C56F0(0x5101C00C);
D_800EA168 = 0;
}
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAD40.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -5294,39 +5277,24 @@ block_4:
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAEC4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C36C4(?, ?, ?, ?); // extern
void func_800C8F80(u8, ?); // extern
void func_800C9060(u8, ?); // extern
extern ? D_800EA0EC;
extern u8 D_800EA108;
extern ? D_800EA170;
extern u8 D_800EA170[];
void func_800CAFC0(u8 arg0) {
u8 *temp_v1;
u8 temp_v0;
if (D_800EA108 == 0) {
temp_v1 = arg0 + &D_800EA0EC;
temp_v0 = *temp_v1;
if (temp_v0 != 0) {
if (temp_v0 == 2) {
*temp_v1 = 1;
goto block_4;
}
} else {
block_4:
func_800C36C4(0, 1, 0x55, 5);
func_800C9060(arg0, 0x19009E59);
func_800C8F80(arg0, 0x100FA4C);
*(&D_800EA170 + arg0) = 1;
switch(D_800EA0EC[arg0]) {
case 2:
D_800EA0EC[arg0] = 1;
case 0:
func_800C36C4(0, 1, 0x55U, 5);
func_800C9060(arg0, 0x19009E59U);
func_800C8F80(arg0, 0x0100FA4C);
D_800EA170[arg0] = 1;
break;
}
}
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAFC0.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
src/audio/external.h
+1 -1
View File
@@ -107,7 +107,7 @@ void func_800C1E2C(Camera*, Vec3f, struct Unk_8018EFD8*);
void func_800C1F8C();
f32 *func_800C21E8(Vec3f, u32);
void func_800C3448(s32);
void func_800C36C4(s32, s32, u8, s8);
void func_800C36C4(s32, u32, u8, s8);
void func_800C4084(u16);
void play_sound(u32, f32*, u8, f32*, f32*, u8*);
void func_800C41CC(u8, struct Unk_80191420*);