mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-29 21:02:18 -05:00
Code Issues Projects Releases Wiki Activity

Fixed audio font loading

Browse Source
This commit is contained in:
Kevin Alexis Contreras 2022-06-02 17:52:58 -05:00
parent a4460c26ef
commit d42c0ca23f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/src/code/audio_load.c
View File

@ -575,7 +575,7 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
while (numFonts > 0) { while (numFonts > 0) {
fontId = gAudioContext.sequenceFontTable[index++]; fontId = gAudioContext.sequenceFontTable[index++];
if (gUseLegacySD) // if (gUseLegacySD)
AudioLoad_SyncLoadFont(fontId); AudioLoad_SyncLoadFont(fontId);
numFonts--; numFonts--;
@ -890,7 +890,7 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
void** ptrs = (void**)mem; void** ptrs = (void**)mem;
#define BASE_OFFSET(x) (void*)((u32)(x) + (u32)(mem)) #define BASE_OFFSET(x) (void*)((uintptr_t)(x) + (uintptr_t)(mem))
reloc2 = ptrs[0]; reloc2 = ptrs[0];
if (1) {} if (1) {}

2
soh/src/code/code_800EC960.c
View File

@ -4420,8 +4420,6 @@ void func_800F5918(void) {
void func_800F595C(u16 arg0) { void func_800F595C(u16 arg0) {
u8 arg0b = arg0 & 0xFF; u8 arg0b = arg0 & 0xFF;
return; // OTRTODO60
if (sSeqFlags[arg0b] & 2) { if (sSeqFlags[arg0b] & 2) {
Audio_PlayFanfare(arg0); Audio_PlayFanfare(arg0);
} else if (sSeqFlags[arg0b] & 4) { } else if (sSeqFlags[arg0b] & 4) {