diff options
| author | Philip Dubé <serprex@users.noreply.github.com> | 2026-02-28 23:51:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-28 23:51:13 +0000 |
| commit | b07c64ecf9e8f6e24173a75fe7e8ae04ee633248 (patch) | |
| tree | d0c8e43f037a4741d66af45205f0fb03d5530a7e /soh/src/code | |
| parent | a547d51abb93970e53fd22899ef36f0a870df110 (diff) | |
Fix song of storms cutscene (#6310)
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_demo.c | 4 | ||||
| -rw-r--r-- | soh/src/code/z_message_PAL.c | 18 |
2 files changed, 3 insertions, 19 deletions
diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c index b6ccedc7c..fda3cd061 100644 --- a/soh/src/code/z_demo.c +++ b/soh/src/code/z_demo.c @@ -728,7 +728,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 22: - if (GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true)) { + if (GameInteractor_Should(VB_GIVE_ITEM_SONG, true, ITEM_SONG_REQUIEM)) { Item_Give(play, ITEM_SONG_REQUIEM); } play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_EAST_EXIT; @@ -868,7 +868,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; break; case 47: - if (GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true)) { + if (GameInteractor_Should(VB_GIVE_ITEM_SONG, true, ITEM_SONG_NOCTURNE)) { Item_Give(play, ITEM_SONG_NOCTURNE); } Flags_SetEventChkInf(EVENTCHKINF_LEARNED_NOCTURNE_OF_SHADOW); diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index e682c3fd8..df7928eb5 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -3859,23 +3859,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { u8 songItemId = ITEM_SONG_MINUET + gOcarinaSongItemMap[msgCtx->ocarinaStaff->state]; - if ((songItemId == ITEM_SONG_MINUET && - GameInteractor_Should(VB_GIVE_ITEM_MINUET_OF_FOREST, true)) || - (songItemId == ITEM_SONG_BOLERO && GameInteractor_Should(VB_GIVE_ITEM_BOLERO_OF_FIRE, true)) || - (songItemId == ITEM_SONG_SERENADE && - GameInteractor_Should(VB_GIVE_ITEM_SERENADE_OF_WATER, true)) || - (songItemId == ITEM_SONG_REQUIEM && - GameInteractor_Should(VB_GIVE_ITEM_REQUIEM_OF_SPIRIT, true)) || - (songItemId == ITEM_SONG_NOCTURNE && - GameInteractor_Should(VB_GIVE_ITEM_NOCTURNE_OF_SHADOW, true)) || - (songItemId == ITEM_SONG_PRELUDE && - GameInteractor_Should(VB_GIVE_ITEM_PRELUDE_OF_LIGHT, true)) || - (songItemId == ITEM_SONG_LULLABY && GameInteractor_Should(VB_GIVE_ITEM_ZELDAS_LULLABY, true)) || - (songItemId == ITEM_SONG_EPONA && GameInteractor_Should(VB_GIVE_ITEM_EPONAS_SONG, true)) || - (songItemId == ITEM_SONG_SARIA && GameInteractor_Should(VB_GIVE_ITEM_SARIAS_SONG, true)) || - (songItemId == ITEM_SONG_SUN && GameInteractor_Should(VB_GIVE_ITEM_SUNS_SONG, true)) || - (songItemId == ITEM_SONG_TIME && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_TIME, true)) || - (songItemId == ITEM_SONG_STORMS && GameInteractor_Should(VB_GIVE_ITEM_SONG_OF_STORMS, true))) { + if (GameInteractor_Should(VB_GIVE_ITEM_SONG, true, songItemId)) { Item_Give(play, songItemId); } |