diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2024-12-21 01:41:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-21 12:41:28 +1100 |
| commit | 5a9c2871ed5f774c845a4f83d38bec5884b25f3e (patch) | |
| tree | 32dcc423423746a7f911a62865646ea0fa302218 /include | |
| parent | 047c505b96287d82dff47c105c909a9965fde9ac (diff) | |
Move gAudioTatumInit and gAudioHeapInitSizes to their own file, using data-with-rodata instead of const qualifiers (#1771)
* Do not qualify gAudioHeapInitSizes with const under AVOID_UB
* Move gAudioTatumInit and gAudioHeapInitSizes to their own file, move data to rodata
* Space
Diffstat (limited to 'include')
| -rw-r--r-- | include/variables.h | 6 | ||||
| -rw-r--r-- | include/z64audio.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/variables.h b/include/variables.h index 961b1a2f1..8ac8fcba9 100644 --- a/include/variables.h +++ b/include/variables.h @@ -36,8 +36,8 @@ extern AudioSpec gAudioSpecs[21]; // rodata extern const u16 gAudioEnvironmentalSfx[]; -extern const s16 gAudioTatumInit[]; -extern const AudioHeapInitSizes gAudioHeapInitSizes; +extern s16 gAudioTatumInit[]; +extern AudioHeapInitSizes gAudioHeapInitSizes; extern AudioTable gSoundFontTable; extern u8 gSequenceFontTable[]; extern u8 gSequenceTable[]; @@ -48,8 +48,6 @@ extern AudioTable gSampleBankTable; extern u64* gAudioSPDataPtr; extern u32 gAudioSPDataSize; -extern AudioContext gAudioCtx; // at 0x80200C70 - // other segments extern Mtx D_01000000; extern Gfx D_08000000[]; diff --git a/include/z64audio.h b/include/z64audio.h index 68fc2f8a4..8e53f2ece 100644 --- a/include/z64audio.h +++ b/include/z64audio.h @@ -261,4 +261,6 @@ typedef struct AudioContext { /* 0x81F4 */ UNK_TYPE1 unk_81F4[4]; } AudioContext; // size = 0x81F8 +extern AudioContext gAudioCtx; // at 0x80200C70 + #endif |