summaryrefslogtreecommitdiff
path: root/mm/src/code
diff options
context:
space:
mode:
authorGarrett Cox <garrettjcox@gmail.com>2025-01-05 21:56:04 -0600
committerGarrett Cox <garrettjcox@gmail.com>2025-01-05 21:56:04 -0600
commit5fdfd697f90e0cf7ab4ffa92b44047cb70671819 (patch)
treedac291fd0294d3255dd034e71e607a9a97d55789 /mm/src/code
parentf49d6245671d56a1611693fec41443bc65549c30 (diff)
parent4eae55bc269049ba11c9842ed942e83b4b31f460 (diff)
Merge branch 'develop' of garrettjoecox.github.com:garrettjoecox/2ship2harkinian into develop-rando
Diffstat (limited to 'mm/src/code')
-rw-r--r--mm/src/code/z_message.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/src/code/z_message.c b/mm/src/code/z_message.c
index 6c7756495..826802578 100644
--- a/mm/src/code/z_message.c
+++ b/mm/src/code/z_message.c
@@ -6031,7 +6031,8 @@ void Message_Update(PlayState* play) {
}
} else if (sLastPlayedSong == OCARINA_SONG_DOUBLE_TIME) {
if (interfaceCtx->restrictions.songOfDoubleTime == 0) {
- if ((CURRENT_DAY != 3) || (gSaveContext.save.isNight == 0)) {
+ if (GameInteractor_Should(VB_ALLOW_SONG_DOUBLE_TIME_ON_FINAL_NIGHT,
+ (CURRENT_DAY != 3) || (gSaveContext.save.isNight == 0))) {
if (GameInteractor_Should(VB_DISPLAY_SONG_OF_DOUBLE_TIME_PROMPT, true)) {
if (gSaveContext.save.isNight) {
Message_StartTextbox(play, D_801D0464[CURRENT_DAY - 1], NULL);