From 4e0ce6c70a07a7cca0c41367f02de6ed2bf3f186 Mon Sep 17 00:00:00 2001 From: engineer124 Date: Wed, 17 Nov 2021 16:28:15 +1100 Subject: [PATCH] Fix bss file split --- src/code/code_801A5BD0.c | 31 ------------------------------- tools/disasm/files.txt | 2 +- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/src/code/code_801A5BD0.c b/src/code/code_801A5BD0.c index 0cafa50b1..32889dcb8 100644 --- a/src/code/code_801A5BD0.c +++ b/src/code/code_801A5BD0.c @@ -1,36 +1,5 @@ #include "global.h" -typedef struct { - /* 0x00 */ f32* posX; - /* 0x04 */ f32* posY; - /* 0x08 */ f32* posZ; - /* 0x0C */ f32* freqScale; - /* 0x10 */ f32* vol; - /* 0x14 */ s8* reverbAdd; - /* 0x18 */ f32 dist; - /* 0x1C */ u32 priority; // lower is more prioritized - /* 0x20 */ u16 sfxParams; - /* 0x22 */ u16 sfxId; - /* 0x25 */ u8 sfxUnk01; - /* 0x24 */ u8 sfxImportance; - /* 0x26 */ u8 state; // uses SfxState enum - /* 0x27 */ u8 freshness; - /* 0x28 */ u8 prev; - /* 0x29 */ u8 next; - /* 0x2A */ u8 channelIdx; - /* 0x2B */ u8 unk_2F; - /* 0x2C */ u8 token; -} SoundBankEntry; // size = 0x30 - -// gSoundBank -SoundBankEntry D_801FD710[9]; -SoundBankEntry D_801FD8C0[12]; -SoundBankEntry D_801FDB00[32]; -SoundBankEntry D_801FE100[20]; -SoundBankEntry D_801FE4C0[8]; -SoundBankEntry D_801FE640[3]; -SoundBankEntry D_801FE6D0[5]; - #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5BD0.s") #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5C28.s") diff --git a/tools/disasm/files.txt b/tools/disasm/files.txt index 8de402900..2ad71313b 100644 --- a/tools/disasm/files.txt +++ b/tools/disasm/files.txt @@ -716,7 +716,7 @@ 0x801FD140 : "audio_load", 0x801FD1F0 : "code_8019AF00", 0x801FD5A0 : "code_801A51F0", - 0x801FE7C0 : "code_801A5BD0", + 0x801FD710 : "code_801A5BD0", 0x801FFD00 : "code_801A7B10", 0x80208E90 : "code_801AA020", 0x80208EA0 : "gfxbuffers",