From d3a8ade6bae030b587cfbe7aa2d76117d1e54a02 Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Wed, 12 Jan 2022 12:58:26 +1100 Subject: Migrate Remaining Audio Data & Cleanup some Audio Data externs (#1097) * Import code_800F7260.bss.s * Import code_800F9280.data.s * format * cleanup externs * Move bss to next file * Move struct_8016E320 (BgmRequests) back to file * Move data to init_params, remove data pad (can't remove bss pad), ReverbSettings * remove extra spacing * Remove data/bss comments --- include/variables.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/variables.h b/include/variables.h index 24bac8021..429e1a775 100644 --- a/include/variables.h +++ b/include/variables.h @@ -210,14 +210,13 @@ extern volatile OSTime gRSPOtherTotalTime; extern volatile OSTime gRDPTotalTime; extern FaultThreadStruct gFaultStruct; -// data/code_800F7260.bss.s extern ActiveSound gActiveSounds[7][MAX_CHANNELS_PER_BANK]; // total size = 0xA8 extern u8 gSoundBankMuted[]; +extern u8 D_801333F0; +extern u8 gAudioSfxSwapOff; extern u16 gAudioSfxSwapSource[10]; extern u16 gAudioSfxSwapTarget[10]; extern u8 gAudioSfxSwapMode[10]; -extern u8 D_8016E348[4]; -extern u32 sAudioSeqCmds[0x100]; extern unk_D_8016E750 D_8016E750[4]; extern AudioContext gAudioContext; extern void(*D_801755D0)(void); -- cgit v1.2.3