diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-09-07 16:03:00 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-07 15:03:00 -0700 |
| commit | e982c44721a76972de0e16a971e6447fc68f3f67 (patch) | |
| tree | fe34990095b96d48532b706b24bb7a3069ebafc1 /include | |
| parent | 3add37c3a081241a4015f0ea84b534965047ff82 (diff) | |
Import data + bss (#1676)
* extract gfxprint font data as blobs
* Remove font from fault_drawer out name
* audio heap bss
* audio sequence bss
* audio session config bss
* Move code_801D1E80 down in the spec
* Gfxprint don't just include generated c file
Diffstat (limited to 'include')
| -rw-r--r-- | include/sequence.h | 4 | ||||
| -rw-r--r-- | include/variables.h | 5 | ||||
| -rw-r--r-- | include/z64audio.h | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/include/sequence.h b/include/sequence.h index 2ec8ae53b..26a81658c 100644 --- a/include/sequence.h +++ b/include/sequence.h @@ -407,9 +407,9 @@ u8 func_801A3950(u8 seqPlayerIndex, u8 resetChannelIO); u8 func_801A39F8(void); s32 func_801A46F8(void); -extern SeqRequest sSeqRequests[][5]; +extern SeqRequest sSeqRequests[5][5]; extern u8 sNumSeqRequests[5]; extern u32 sAudioSeqCmds[0x100]; -extern ActiveSequence gActiveSeqs[]; +extern ActiveSequence gActiveSeqs[5]; #endif diff --git a/include/variables.h b/include/variables.h index 57a7077a1..961b1a2f1 100644 --- a/include/variables.h +++ b/include/variables.h @@ -48,11 +48,6 @@ extern AudioTable gSampleBankTable; extern u64* gAudioSPDataPtr; extern u32 gAudioSPDataSize; -extern s32 D_801FD120; - -extern u8 sResetAudioHeapTimer; -extern u16 sResetAudioHeapFadeReverbVolume; -extern u16 sResetAudioHeapFadeReverbVolumeStep; extern AudioContext gAudioCtx; // at 0x80200C70 // other segments diff --git a/include/z64audio.h b/include/z64audio.h index 41ae76775..68fc2f8a4 100644 --- a/include/z64audio.h +++ b/include/z64audio.h @@ -132,7 +132,7 @@ typedef struct { /* 0x48 */ char unk_48[0x8]; } AudioTask; // size = 0x50 -typedef struct { +typedef struct AudioContext { /* 0x0000 */ char unk_0000; /* 0x0001 */ s8 numSynthesisReverbs; /* 0x0002 */ u16 unk_2; // reads from audio spec unk_14, never used, always set to 0x7FFF |