Allow Better SoDT to work on Night of the Final Day (#913)

* Allow Better SoDT to work on Night of Final Day * -1 newline * lol oops * change SoDT VB name to be more descriptive * see if this fixes clang-format * Inline vanilla conditional with GI Should call * clang-format * *long exacerbated sigh*
HarbourMasters · Jan 3, 2025 · 0d1186b · 0d1186b
1 parent 297156a
commit 0d1186b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/mm/2s2h/Enhancements/Songs/BetterSongOfDoubleTime.cpp b/mm/2s2h/Enhancements/Songs/BetterSongOfDoubleTime.cpp
@@ -162,6 +162,8 @@ void RegisterBetterSongOfDoubleTime() {
         DrawTextRec(254.0f, 195.0f, 1.0f, 0, 0, 1.0f, 1.0f);
         CLOSE_DISPS(gPlayState->state.gfxCtx);
     });
+
+    COND_VB_SHOULD(VB_ALLOW_SONG_DOUBLE_TIME_ON_FINAL_NIGHT, CVAR, { *should = true; });
 }
 
 static RegisterShipInitFunc initFunc(RegisterBetterSongOfDoubleTime, { CVAR_NAME });
diff --git a/mm/2s2h/GameInteractor/GameInteractor.h b/mm/2s2h/GameInteractor/GameInteractor.h
@@ -81,6 +81,7 @@ typedef enum {
     VB_BE_HOOKSHOT_SURFACE,
     VB_DEKU_GUARD_SHOW_SEARCH_BALLS,
     VB_DISPLAY_SONG_OF_DOUBLE_TIME_PROMPT,
+    VB_ALLOW_SONG_DOUBLE_TIME_ON_FINAL_NIGHT
 } GIVanillaBehavior;
 
 typedef enum {

diff --git a/mm/src/code/z_message.c b/mm/src/code/z_message.c
@@ -6027,7 +6027,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);