summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorballoondude2 <55861555+balloondude2@users.noreply.github.com>2026-01-30 00:20:20 -0700
committerGitHub <noreply@github.com>2026-01-30 01:20:20 -0600
commitf443698eabd29808a158bbbb8ea94165e9328c84 (patch)
tree8a6e0e192a22b3674e9b6ccb127c409a3b34da69
parent4ed83dbf543dd50b667716b024865fea7a20cc3b (diff)
fix weirdness with playing a restricted song when Saria's song is available (#1522)
-rw-r--r--mm/2s2h/Rando/MiscBehavior/SariasSongHint.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/2s2h/Rando/MiscBehavior/SariasSongHint.cpp b/mm/2s2h/Rando/MiscBehavior/SariasSongHint.cpp
index bde8d62ed..c41cfbf3c 100644
--- a/mm/2s2h/Rando/MiscBehavior/SariasSongHint.cpp
+++ b/mm/2s2h/Rando/MiscBehavior/SariasSongHint.cpp
@@ -125,6 +125,8 @@ void Rando::MiscBehavior::SariasSongHint() {
}
playedSariasSongState = 0;
+ } else if (playedSariasSongState == 0) {
+ return;
}
CustomMessage::LoadCustomMessageIntoFont(entry);