diff options
| author | Kevin Alexis Contreras <36680385+KiritoDv@users.noreply.github.com> | 2022-06-16 23:09:50 -0500 |
|---|---|---|
| committer | Kevin Alexis Contreras <36680385+KiritoDv@users.noreply.github.com> | 2022-06-16 23:09:50 -0500 |
| commit | bb90be6748a3ab41dc111b734b904b1e69bd60f7 (patch) | |
| tree | 7a732333ea37c9404569e993fe46daf2e2a9e807 /soh/src/code | |
| parent | 3cd5d75f6f0897a840878520a372c74112fa2d88 (diff) | |
| parent | bd68e29bfb9e4c0b6558a7d20d5c28c872659e4c (diff) | |
Merge branch 'zapd_audio_support' into zelda64
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/audio_load.c | 6 | ||||
| -rw-r--r-- | soh/src/code/audio_playback.c | 1 | ||||
| -rw-r--r-- | soh/src/code/audio_seqplayer.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c index 4749dff25..59749dff5 100644 --- a/soh/src/code/audio_load.c +++ b/soh/src/code/audio_load.c @@ -76,7 +76,8 @@ void* sUnusedHandler = NULL; s32 gAudioContextInitalized = false; -char* sequenceMap[512]; +char* sequenceMap[256]; +char* fontMap[256]; uintptr_t fontStart; uint32_t fontOffsets[8192]; @@ -389,6 +390,7 @@ SoundFontData* AudioLoad_SyncLoadSeqFonts(s32 seqId, u32* outDefaultFontId) { while (numFonts > 0) { fontId = gAudioContext.sequenceFontTable[index++]; + font = AudioLoad_SyncLoadFont(fontId); numFonts--; } @@ -609,6 +611,7 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) { } seqData = AudioLoad_SyncLoadSeq(seqId); + if (seqData == NULL) { return 0; } @@ -897,7 +900,6 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo SoundFontSound* sfx; s32 i; SoundFont* sf = NULL; - s32 numDrums = 0; s32 numInstruments = 0; s32 numSfx = 0; diff --git a/soh/src/code/audio_playback.c b/soh/src/code/audio_playback.c index ff2f4830a..a0773a642 100644 --- a/soh/src/code/audio_playback.c +++ b/soh/src/code/audio_playback.c @@ -356,6 +356,7 @@ Instrument* Audio_GetInstrumentInner(s32 fontId, s32 instId) { } + return inst; } diff --git a/soh/src/code/audio_seqplayer.c b/soh/src/code/audio_seqplayer.c index 95ad75061..6e33e94e1 100644 --- a/soh/src/code/audio_seqplayer.c +++ b/soh/src/code/audio_seqplayer.c @@ -5,7 +5,6 @@ extern bool gUseLegacySD; extern char* sequenceMap[256]; -char* fontMap[256]; #define PORTAMENTO_IS_SPECIAL(x) ((x).mode & 0x80) #define PORTAMENTO_MODE(x) ((x).mode & ~0x80) |