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_800F9280.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_800F9280.c')
| -rw-r--r-- | src/code/code_800F9280.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/code/code_800F9280.c b/src/code/code_800F9280.c index 381cdf611..075d609aa 100644 --- a/src/code/code_800F9280.c +++ b/src/code/code_800F9280.c @@ -2,9 +2,23 @@ #include "global.h" #include "ultra64/abi.h" -extern u8 sSeqCmdRdPos; -extern u8 sSeqCmdWrPos; -extern u8 D_80133410[]; +typedef struct { + u8 unk_0; + u8 unk_1; // importance? +} Struct_8016E320; + +Struct_8016E320 D_8016E320[4][5]; +u8 D_8016E348[4]; +u32 sAudioSeqCmds[0x100]; +unk_D_8016E750 D_8016E750[4]; + +u8 sSeqCmdWrPos = 0; +u8 sSeqCmdRdPos = 0; +u8 D_80133408 = 0; +u8 D_8013340C = 1; +u8 D_80133410[] = { 0, 1, 2, 3 }; +u8 gAudioSpecId = 0; +u8 D_80133418 = 0; // TODO: clean up these macros. They are similar to ones in code_800EC960.c but without casts. #define Audio_StartSeq(playerIdx, fadeTimer, seqId) \ @@ -81,12 +95,6 @@ typedef enum { CMDF } SeqCmdType; -typedef struct { - u8 unk_0; - u8 unk_1; // importance? -} Struct_8016E320; -extern Struct_8016E320 D_8016E320[][5]; // sorted by unk_1, descending - void Audio_ProcessSeqCmd(u32 cmd) { s32 pad[2]; u16 fadeTimer; |