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 --- data/code_800F7260.bss.s | 85 ------------------------------------- data/code_800F9280.data.s | 104 ---------------------------------------------- 2 files changed, 189 deletions(-) delete mode 100644 data/code_800F7260.bss.s delete mode 100644 data/code_800F9280.data.s (limited to 'data') diff --git a/data/code_800F7260.bss.s b/data/code_800F7260.bss.s deleted file mode 100644 index 7a55499e0..000000000 --- a/data/code_800F7260.bss.s +++ /dev/null @@ -1,85 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .bss - -.balign 16 - -glabel D_8016BAD0 - .space 0x1B0 - -glabel D_8016BC80 - .space 0x240 - -glabel D_8016BEC0 - .space 0x420 - -glabel D_8016C2E0 - .space 0x3C0 - -glabel D_8016C6A0 - .space 0x180 - -glabel D_8016C820 - .space 0x90 - -glabel D_8016C8B0 - .space 0xF0 - -glabel sSoundRequests - .space 0x1800 - -glabel sSoundBankListEnd - .space 0x8 - -glabel sSoundBankFreeListStart - .space 0x8 - -glabel sSoundBankUnused - .space 0x8 - -glabel gActiveSounds - .space 0xA8 - -glabel sCurSfxPlayerChannelIdx - .space 0x4 - -glabel gSoundBankMuted - .space 0xC - -glabel sUnusedBankLerp - .space 0x70 - -glabel gAudioSfxSwapSource - .space 0x18 - -glabel gAudioSfxSwapTarget - .space 0x18 - -glabel gAudioSfxSwapMode - .space 0x10 - -glabel D_8016E320 - .space 0x28 - -glabel D_8016E348 - .space 0x8 - -glabel sAudioSeqCmds - .space 0x400 - -glabel D_8016E750 - .space 0x990 - -glabel D_8016F0E0 # unused? - .space 0xA0 - -glabel gAudioContext - .space 0x6450 - -glabel D_801755D0 - .space 0x20 diff --git a/data/code_800F9280.data.s b/data/code_800F9280.data.s deleted file mode 100644 index a55ab4d8a..000000000 --- a/data/code_800F9280.data.s +++ /dev/null @@ -1,104 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel sSeqCmdWrPos - .incbin "baserom.z64", 0xBAA5A0, 0x4 - -glabel sSeqCmdRdPos - .incbin "baserom.z64", 0xBAA5A4, 0x4 - -glabel D_80133408 - .incbin "baserom.z64", 0xBAA5A8, 0x4 - -glabel D_8013340C - .incbin "baserom.z64", 0xBAA5AC, 0x4 - -glabel D_80133410 - .incbin "baserom.z64", 0xBAA5B0, 0x4 - -glabel gAudioSpecId - .incbin "baserom.z64", 0xBAA5B4, 0x4 - -glabel D_80133418 - .incbin "baserom.z64", 0xBAA5B8, 0x8 - -glabel D_80133420 - .incbin "baserom.z64", 0xBAA5C0, 0x48 - -glabel D_80133468 - .incbin "baserom.z64", 0xBAA608, 0x48 - -glabel D_801334B0 - .incbin "baserom.z64", 0xBAA650, 0x90 - -glabel D_80133540 - .incbin "baserom.z64", 0xBAA6E0, 0x48 - -glabel D_80133588 - .incbin "baserom.z64", 0xBAA728, 0x48 - -glabel D_801335D0 - .incbin "baserom.z64", 0xBAA770, 0x48 - -glabel D_80133618 - .incbin "baserom.z64", 0xBAA7B8, 0x48 - -glabel D_80133660 - .incbin "baserom.z64", 0xBAA800, 0x48 - -glabel D_801336A8 - .incbin "baserom.z64", 0xBAA848, 0x48 - -glabel D_801336F0 - .incbin "baserom.z64", 0xBAA890, 0x48 - -glabel D_80133738 - .incbin "baserom.z64", 0xBAA8D8, 0x90 - -glabel gAudioSpecs - .incbin "baserom.z64", 0xBAA968, 0xC - .word D_80133420 - .incbin "baserom.z64", 0xBAA978, 0x34 - .word D_80133468 - .incbin "baserom.z64", 0xBAA9B0, 0x34 - .word D_801334B0 - .incbin "baserom.z64", 0xBAA9E8, 0x34 - .word D_80133540 - .incbin "baserom.z64", 0xBAAA20, 0x34 - .word D_80133588 - .incbin "baserom.z64", 0xBAAA58, 0x34 - .word D_801335D0 - .incbin "baserom.z64", 0xBAAA90, 0x34 - .word D_80133618 - .incbin "baserom.z64", 0xBAAAC8, 0x34 - .word D_80133660 - .incbin "baserom.z64", 0xBAAB00, 0x34 - .word D_801336A8 - .incbin "baserom.z64", 0xBAAB38, 0x34 - .word D_80133660 - .incbin "baserom.z64", 0xBAAB70, 0x34 - .word D_801336F0 - .incbin "baserom.z64", 0xBAABA8, 0x34 - .word D_80133738 - .incbin "baserom.z64", 0xBAABE0, 0x34 - .word D_80133738 - .incbin "baserom.z64", 0xBAAC18, 0x34 - .word D_80133420 - .incbin "baserom.z64", 0xBAAC50, 0x34 - .word D_80133660 - .incbin "baserom.z64", 0xBAAC88, 0x34 - .word D_80133420 - .incbin "baserom.z64", 0xBAACC0, 0x34 - .word D_80133420 - .incbin "baserom.z64", 0xBAACF8, 0x34 - .word D_801334B0 - .incbin "baserom.z64", 0xBAAD30, 0x30 - \ No newline at end of file -- cgit v1.2.3