diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-01-12 12:58:26 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-11 20:58:26 -0500 |
| commit | d3a8ade6bae030b587cfbe7aa2d76117d1e54a02 (patch) | |
| tree | d61ea977cec26c1fa1a5e97af6fe5c9d3d666619 /src/code/code_800F7260.c | |
| parent | 67f6b50de3d2679c066d2d9b5363a7140e7b9ee2 (diff) | |
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
Diffstat (limited to 'src/code/code_800F7260.c')
| -rw-r--r-- | src/code/code_800F7260.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/code/code_800F7260.c b/src/code/code_800F7260.c index b04dfb6cf..188f6d8b2 100644 --- a/src/code/code_800F7260.c +++ b/src/code/code_800F7260.c @@ -32,22 +32,24 @@ s32 D_8013338C = 0; char D_80133390[] = "SEQ H"; char D_80133398[] = " L"; -// bss -extern SoundRequest sSoundRequests[0x100]; -extern SoundBankEntry D_8016BAD0[9]; -extern SoundBankEntry D_8016BC80[12]; -extern SoundBankEntry D_8016BEC0[22]; -extern SoundBankEntry D_8016C2E0[20]; -extern SoundBankEntry D_8016C6A0[8]; -extern SoundBankEntry D_8016C820[3]; -extern SoundBankEntry D_8016C8B0[5]; -extern u8 sSoundBankListEnd[7]; -extern u8 sSoundBankFreeListStart[7]; -extern u8 sSoundBankUnused[7]; -extern u8 sCurSfxPlayerChannelIdx; -extern UnusedBankLerp sUnusedBankLerp[7]; - -// data +SoundBankEntry D_8016BAD0[9]; +SoundBankEntry D_8016BC80[12]; +SoundBankEntry D_8016BEC0[22]; +SoundBankEntry D_8016C2E0[20]; +SoundBankEntry D_8016C6A0[8]; +SoundBankEntry D_8016C820[3]; +SoundBankEntry D_8016C8B0[5]; +SoundRequest sSoundRequests[0x100]; +u8 sSoundBankListEnd[7]; +u8 sSoundBankFreeListStart[7]; +u8 sSoundBankUnused[7]; +ActiveSound gActiveSounds[7][3]; +u8 sCurSfxPlayerChannelIdx; +u8 gSoundBankMuted[7]; +UnusedBankLerp sUnusedBankLerp[7]; +u16 gAudioSfxSwapSource[10]; +u16 gAudioSfxSwapTarget[10]; +u8 gAudioSfxSwapMode[10]; // sSoundRequests ring buffer endpoints. read index <= write index, wrapping around mod 256. u8 sSoundRequestWriteIndex = 0; |