diff --git a/mm/src/audio/code_8019AF00.c b/mm/src/audio/code_8019AF00.c index 039c8f5c5..379f3038d 100644 --- a/mm/src/audio/code_8019AF00.c +++ b/mm/src/audio/code_8019AF00.c @@ -5651,8 +5651,11 @@ void Audio_PlayFanfare(u16 seqId) { u32 outNumFonts; u8* prevFontId = AudioThread_GetFontsForSequence(prevSeqId & 0xFF, &outNumFonts); u8* fontId = AudioThread_GetFontsForSequence(seqId & 0xFF, &outNumFonts); - - if ((prevSeqId == NA_BGM_DISABLED) || (*prevFontId == *fontId)) { + // BENTODO + // #region 2S2H [Audio] TODO: Fixes fanfare crash, should/can be removed after audio is done + // if ((prevSeqId == NA_BGM_DISABLED) || (*prevFontId == *fontId)) { + if ((prevSeqId == NA_BGM_DISABLED) || (prevFontId != NULL && fontId != NULL && *prevFontId == *fontId)) { + // #endregion sFanfareState = 1; } else { sFanfareState = 5; diff --git a/mm/src/audio/lib/load.c b/mm/src/audio/lib/load.c index 95b0e5698..f19d6335a 100644 --- a/mm/src/audio/lib/load.c +++ b/mm/src/audio/lib/load.c @@ -488,6 +488,9 @@ void AudioLoad_AsyncLoadFont(s32 fontId, s32 arg1, s32 retData, OSMesgQueue* ret } u8* AudioLoad_GetFontsForSequence(s32 seqId, u32* outNumFonts) { + // BENTODO + *outNumFonts = 0; + return NULL; s32 index = ((u16*)gAudioCtx.sequenceFontTable)[seqId]; *outNumFonts = gAudioCtx.sequenceFontTable[index++];