diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c index 742eeafb3..70ee68da1 100644 --- a/soh/src/code/audio_load.c +++ b/soh/src/code/audio_load.c @@ -575,7 +575,7 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) { while (numFonts > 0) { fontId = gAudioContext.sequenceFontTable[index++]; - if (gUseLegacySD) + // if (gUseLegacySD) AudioLoad_SyncLoadFont(fontId); numFonts--; @@ -890,7 +890,7 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo 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]; if (1) {} diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c index a91764138..9a67981ea 100644 --- a/soh/src/code/code_800EC960.c +++ b/soh/src/code/code_800EC960.c @@ -4420,8 +4420,6 @@ void func_800F5918(void) { void func_800F595C(u16 arg0) { u8 arg0b = arg0 & 0xFF; - return; // OTRTODO60 - if (sSeqFlags[arg0b] & 2) { Audio_PlayFanfare(arg0); } else if (sSeqFlags[arg0b] & 4) {