From a198b8556b3c78218cb916e5cc18a278a9e6634b Mon Sep 17 00:00:00 2001 From: Archez Date: Sun, 17 Nov 2024 10:55:53 -0500 Subject: [PATCH] Fix ocarina start UB for Japas jam session (#1742) --- src/code/z_message.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/code/z_message.c b/src/code/z_message.c index 364cadc0c7..0ae0955ed2 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -4338,7 +4338,10 @@ void Message_DrawMain(PlayState* play, Gfx** gfxP) { if ((msgCtx->ocarinaAction == OCARINA_ACTION_PROMPT_EVAN_PART1_SECOND_HALF) || (msgCtx->ocarinaAction == OCARINA_ACTION_PROMPT_EVAN_PART2_SECOND_HALF)) { AudioOcarina_StartForSongCheck( - (1 << (OCARINA_ACTION_PROMPT_SONATA + msgCtx->ocarinaAction)) | 0x80000000, 4); + (1 << ((msgCtx->ocarinaAction - OCARINA_ACTION_PROMPT_EVAN_PART1_SECOND_HALF) + + OCARINA_SONG_EVAN_PART1)) | + 0x80000000, + 4); msgCtx->msgMode = MSGMODE_SONG_PROMPT; } else { if ((msgCtx->ocarinaAction >= OCARINA_ACTION_PROMPT_WIND_FISH_HUMAN) &&