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 /src/audio | |
| 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 'src/audio')
| -rw-r--r-- | src/audio/lib/heap.c | 3 | ||||
| -rw-r--r-- | src/audio/sequence.c | 8 | ||||
| -rw-r--r-- | src/audio/session_config.c | 8 |
3 files changed, 19 insertions, 0 deletions
diff --git a/src/audio/lib/heap.c b/src/audio/lib/heap.c index 0ebd3b0c8..11f1f2d93 100644 --- a/src/audio/lib/heap.c +++ b/src/audio/lib/heap.c @@ -1396,6 +1396,9 @@ typedef struct { /* 0xC */ u8 newMedium; } StorageChange; // size = 0x10 +s32 D_801FD120; +static s32 sBssPad[3]; + void AudioHeap_ChangeStorage(StorageChange* change, Sample* sample) { if ((sample != NULL) && ((sample->medium == change->newMedium) || (D_801FD120 != 1)) && ((sample->medium == MEDIUM_RAM) || (D_801FD120 != 0))) { diff --git a/src/audio/sequence.c b/src/audio/sequence.c index 7d37a0ae9..9cb3ac1b9 100644 --- a/src/audio/sequence.c +++ b/src/audio/sequence.c @@ -24,6 +24,14 @@ AudioSeq_ProcessSeqCmd((SEQCMD_OP_SET_SEQPLAYER_VOLUME << 28) | ((u8)(seqPlayerIndex) << 24) | \ ((u8)(duration) << 16) | ((u8)((volume)*127.0f))); +SeqRequest sSeqRequests[5][5]; +u8 sNumSeqRequests[5]; +u32 sAudioSeqCmds[0x100]; +ActiveSequence gActiveSeqs[5]; +u8 sResetAudioHeapTimer; +u16 sResetAudioHeapFadeReverbVolume; +u16 sResetAudioHeapFadeReverbVolumeStep; + u8 sSeqCmdWritePos = 0; u8 sSeqCmdReadPos = 0; u8 sStartSeqDisabled = 0; diff --git a/src/audio/session_config.c b/src/audio/session_config.c index 9d97222e8..e0309468f 100644 --- a/src/audio/session_config.c +++ b/src/audio/session_config.c @@ -1,6 +1,14 @@ #include "global.h" #include "buffers.h" +static s32 sBssPad[36]; +AudioContext gAudioCtx; +AudioCustomUpdateFunction gAudioCustomUpdateFunction; +AudioCustomSeqFunction gAudioCustomSeqFunction; +AudioCustomReverbFunction gAudioCustomReverbFunction; +AudioCustomSynthFunction gAudioCustomSynthFunction; +static s32 sBssPad2[3]; + const s16 gAudioTatumInit[] = { 0x1C00, // unused TATUMS_PER_BEAT, // gTatumsPerBeat |