summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorballoondude2 <55861555+balloondude2@users.noreply.github.com>2026-07-05 18:40:12 -0600
committerGitHub <noreply@github.com>2026-07-05 19:40:12 -0500
commitf3906376dd47a6f7797674d3b76b0775d3353c88 (patch)
tree651c27a3405ec2cb0e52e4670fea2c092838b7bf
parentf4925599eaf5523ba9066a8df1f5afc4c5f87c1c (diff)
fix saria song playing instead of restricted song message (#1774)
-rw-r--r--mm/2s2h/Rando/MiscBehavior/SariasSongHint.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/2s2h/Rando/MiscBehavior/SariasSongHint.cpp b/mm/2s2h/Rando/MiscBehavior/SariasSongHint.cpp
index a85302580..e01ee97c6 100644
--- a/mm/2s2h/Rando/MiscBehavior/SariasSongHint.cpp
+++ b/mm/2s2h/Rando/MiscBehavior/SariasSongHint.cpp
@@ -68,10 +68,8 @@ void Rando::MiscBehavior::SariasSongHint() {
COND_VB_SHOULD(VB_SONG_AVAILABLE_TO_PLAY, shouldRegister, {
uint8_t* songIndex = va_arg(args, uint8_t*);
- // If the currently played song is Sun's Song, set it to be available to be played.
if (*songIndex == OCARINA_SONG_SARIAS && CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) {
*should = true;
- playedSariasSongState = 1;
}
});
@@ -99,6 +97,7 @@ void Rando::MiscBehavior::SariasSongHint() {
if (sLastPlayedSong == OCARINA_SONG_SARIAS) {
*should = true;
+ playedSariasSongState = 1;
Message_StartTextbox(gPlayState, 0x1B95, NULL);
gPlayState->msgCtx.ocarinaMode = OCARINA_MODE_PROCESS_RESTRICTED_SONG;
}