From 00393ab4e163c84ae32e693a7331bd141e474cce Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 5 Dec 2020 22:00:52 -0500 Subject: [PATCH] 1 mas --- asm/nonmatchings/code_303c0_len_3e10/func_80057EB0.s | 12 ------------ asm/nonmatchings/code_31650/func_80057EB0.s | 12 ------------ src/audio.h | 7 ++++++- src/code_31650.c | 9 +++++---- 4 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 asm/nonmatchings/code_303c0_len_3e10/func_80057EB0.s delete mode 100644 asm/nonmatchings/code_31650/func_80057EB0.s diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057EB0.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057EB0.s deleted file mode 100644 index 4159ded706..0000000000 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057EB0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80057EB0 -/* 332B0 80057EB0 3C01800A */ lui $at, %hi(D_800A3FEC) -/* 332B4 80057EB4 A0203FEC */ sb $zero, %lo(D_800A3FEC)($at) -/* 332B8 80057EB8 3C01800A */ lui $at, %hi(D_800A3FEE) -/* 332BC 80057EBC A4203FEE */ sh $zero, %lo(D_800A3FEE)($at) -/* 332C0 80057EC0 3C01800A */ lui $at, %hi(D_800A3FE8) -/* 332C4 80057EC4 AC203FE8 */ sw $zero, %lo(D_800A3FE8)($at) -/* 332C8 80057EC8 03E00008 */ jr $ra -/* 332CC 80057ECC 00000000 */ nop diff --git a/asm/nonmatchings/code_31650/func_80057EB0.s b/asm/nonmatchings/code_31650/func_80057EB0.s deleted file mode 100644 index 4159ded706..0000000000 --- a/asm/nonmatchings/code_31650/func_80057EB0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80057EB0 -/* 332B0 80057EB0 3C01800A */ lui $at, %hi(D_800A3FEC) -/* 332B4 80057EB4 A0203FEC */ sb $zero, %lo(D_800A3FEC)($at) -/* 332B8 80057EB8 3C01800A */ lui $at, %hi(D_800A3FEE) -/* 332BC 80057EBC A4203FEE */ sh $zero, %lo(D_800A3FEE)($at) -/* 332C0 80057EC0 3C01800A */ lui $at, %hi(D_800A3FE8) -/* 332C4 80057EC4 AC203FE8 */ sw $zero, %lo(D_800A3FE8)($at) -/* 332C8 80057EC8 03E00008 */ jr $ra -/* 332CC 80057ECC 00000000 */ nop diff --git a/src/audio.h b/src/audio.h index 73a8679097..d3766ffb7f 100644 --- a/src/audio.h +++ b/src/audio.h @@ -273,7 +273,7 @@ typedef struct { } UnkStructFor8004DAA8; // size unknown extern UnkAl0* D_80078E54; -extern s8 D_80078181; +extern s8* D_80078181; extern s32* D_80078190; extern s32* D_800781D0; extern s32* D_80078544; @@ -292,6 +292,11 @@ extern UnkAl834* D_8009A628; extern UnkAl6CC* D_8009A640; extern UnkAlA9C* D_8009A664; +extern s32 D_800A3FE8; +extern s8 D_800A3FEC; +extern s16 D_800A3FEE; +extern s32 D_800A3FF0; + void al_LoadBKHeaders(UnkAl19E0* arg0, ALHeap* arg1); void func_8004B6D8(UnkAl6CC*, s32, s16, s16, u8); diff --git a/src/code_31650.c b/src/code_31650.c index f2c6fc9a7c..1a6916eda5 100644 --- a/src/code_31650.c +++ b/src/code_31650.c @@ -121,9 +121,6 @@ INCLUDE_ASM(s32, "code_31650", func_80057C54); INCLUDE_ASM(s32, "code_31650", func_80057D0C); -extern s16 D_800A3FEE; -extern s32 D_800A3FF0; - void func_80057DC8(s32 arg0) { s32* sym; if (arg0 < 2) { @@ -142,7 +139,11 @@ INCLUDE_ASM(void, "code_31650", func_80057E08, u8 arg0); INCLUDE_ASM(void, "code_31650", func_80057E5C, u8 arg0); -INCLUDE_ASM(void, "code_31650", func_80057EB0, void); +void func_80057EB0(void) { + D_800A3FEC = 0; + D_800A3FEE = 0; + D_800A3FE8 = 0; +} INCLUDE_ASM(s32, "code_31650", func_80057ED0);