From 970664d7f9689901ccd62df00371f7f3d1fcce99 Mon Sep 17 00:00:00 2001
From: Max Roncace <me@caseif.net>
Date: Tue, 17 Mar 2026 01:07:22 -0400
Subject: [PATCH] Add tweak to enable/disable TV settings screen

---
 include/d/d_s_name.h                     |  4 ++
 include/dusk/settings.h                  |  1 +
 src/d/d_s_name.cpp                       | 77 ++++++++++++++++--------
 src/dusk/imgui/ImGuiMenuEnhancements.cpp |  4 ++
 src/dusk/settings.cpp                    |  1 +
 5 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/include/d/d_s_name.h b/include/d/d_s_name.h
index 73d3d703be..72a44c02de 100644
--- a/include/d/d_s_name.h
+++ b/include/d/d_s_name.h
@@ -48,6 +48,7 @@ public:
     void FileSelectClose();
     void brightCheckOpen();
     void brightCheck();
+    void doPreLoadSetup();
     void changeGameScene();
 
     #if VERSION == VERSION_GCN_PAL
@@ -70,6 +71,9 @@ private:
     /* 0x41E */ u8 mWaitTimer;
     /* 0x41F */ u8 field_0x41f;
     /* 0x420 */ u8 field_0x420;
+#if TARGET_PC
+    bool mShowTvSettingsScreen;
+#endif
 };
 
 #endif /* D_S_D_S_NAME_H */
diff --git a/include/dusk/settings.h b/include/dusk/settings.h
index daba1287d8..db49560fff 100644
--- a/include/dusk/settings.h
+++ b/include/dusk/settings.h
@@ -27,6 +27,7 @@ struct UserSettings {
     struct {
         // QoL
         bool enableQuickTransform;
+        bool hideTvSettingsScreen;
 
         // Preferences
         bool enableMirrorMode;
diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp
index 5f22177654..e001d97c71 100644
--- a/src/d/d_s_name.cpp
+++ b/src/d/d_s_name.cpp
@@ -18,6 +18,12 @@
 #include "f_op/f_op_overlap_mng.h"
 #include "dusk/memory.h"
 
+#if TARGET_PC
+#define SHOW_TV_SETTINGS_SCREEN (this->mShowTvSettingsScreen)
+#else
+#define SHOW_TV_SETTINGS_SCREEN (1)
+#endif
+
 static dSn_HIO_c g_snHIO;
 
 #if VERSION == VERSION_GCN_PAL
@@ -293,13 +299,27 @@ void dScnName_c::FileSelectMain() {
 }
 
 void dScnName_c::FileSelectMainNormal() {
+#if TARGET_PC
+    mShowTvSettingsScreen = !dusk::getSettings().game.hideTvSettingsScreen;
+#endif
+
     switch(dFs_c->isSelectEnd()) {
     case 1:
-        mWaitTimer = 15;
-        mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor);
-        mDoGph_gInf_c::startFadeOut(15);
+        if (SHOW_TV_SETTINGS_SCREEN) {
+            mWaitTimer = 15;
+            mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor);
+            mDoGph_gInf_c::startFadeOut(15);
+        } else {
+            mWaitTimer = 1;
+        }
+
         mProc = dScnName_PROC_FileSelectClose;
         field_0x420 = 1;
+
+        if (!SHOW_TV_SETTINGS_SCREEN) {
+            mDoAud_seStart(Z2SE_ENTER_GAME, NULL, 0, 0);
+        }
+
         break;
     }
 }
@@ -308,12 +328,17 @@ void dScnName_c::FileSelectClose() {
     mWaitTimer--;
 
     if (mWaitTimer == 0) {
-        mProc = dScnName_PROC_BrightCheckOpen;
-        mWaitTimer = 15;
-        mDrawProc = 1;
-        mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor);
-        mDoGph_gInf_c::startFadeIn(15);
-        field_0x420 = 0;
+        if (SHOW_TV_SETTINGS_SCREEN) {
+            mProc = dScnName_PROC_BrightCheckOpen;
+            mWaitTimer = 15;
+            mDrawProc = 1;
+            mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor);
+            mDoGph_gInf_c::startFadeIn(15);
+            field_0x420 = 0;
+        } else {
+            doPreLoadSetup();
+            field_0x420 = 0;
+        }
     }
 }
 
@@ -330,24 +355,28 @@ void dScnName_c::brightCheck() {
     mBrightCheck->_move();
 
     if (mBrightCheck->isEnd()) {
-        dComIfGs_setSaveTotalTime(dComIfGs_getTotalTime());
-        dComIfGs_setSaveStartTime(OSGetTime());
-        mDoAud_bgmStop(45);
-
-        field_0x41f = 0;
-        mProc = dScnName_PROC_ChangeGameScene;
-
-        // Reset rupee "first-time collection" flags so the collection cutscene will play again
-        dComIfGs_offItemFirstBit(dItemNo_GREEN_RUPEE_e);
-        dComIfGs_offItemFirstBit(dItemNo_BLUE_RUPEE_e);
-        dComIfGs_offItemFirstBit(dItemNo_YELLOW_RUPEE_e);
-        dComIfGs_offItemFirstBit(dItemNo_RED_RUPEE_e);
-        dComIfGs_offItemFirstBit(dItemNo_PURPLE_RUPEE_e);
-        dComIfGs_offItemFirstBit(dItemNo_ORANGE_RUPEE_e);
-        dComIfGs_offItemFirstBit(dItemNo_SILVER_RUPEE_e);
+        doPreLoadSetup();
     }
 }
 
+void dScnName_c::doPreLoadSetup() {
+    dComIfGs_setSaveTotalTime(dComIfGs_getTotalTime());
+    dComIfGs_setSaveStartTime(OSGetTime());
+    mDoAud_bgmStop(45);
+
+    field_0x41f = 0;
+    mProc = dScnName_PROC_ChangeGameScene;
+
+    // Reset rupee "first-time collection" flags so the collection cutscene will play again
+    dComIfGs_offItemFirstBit(dItemNo_GREEN_RUPEE_e);
+    dComIfGs_offItemFirstBit(dItemNo_BLUE_RUPEE_e);
+    dComIfGs_offItemFirstBit(dItemNo_YELLOW_RUPEE_e);
+    dComIfGs_offItemFirstBit(dItemNo_RED_RUPEE_e);
+    dComIfGs_offItemFirstBit(dItemNo_PURPLE_RUPEE_e);
+    dComIfGs_offItemFirstBit(dItemNo_ORANGE_RUPEE_e);
+    dComIfGs_offItemFirstBit(dItemNo_SILVER_RUPEE_e);
+}
+
 void dScnName_c::changeGameScene() {
     if (!mDoRst::isReset() && !fopOvlpM_IsPeek()) {
         dComIfGs_gameStart();
diff --git a/src/dusk/imgui/ImGuiMenuEnhancements.cpp b/src/dusk/imgui/ImGuiMenuEnhancements.cpp
index eaf33a1908..eed938de69 100644
--- a/src/dusk/imgui/ImGuiMenuEnhancements.cpp
+++ b/src/dusk/imgui/ImGuiMenuEnhancements.cpp
@@ -11,6 +11,10 @@ namespace dusk {
         if (ImGui::BeginMenu("Enhancements")) {
             if (ImGui::BeginMenu("Quality of Life")) {
                 ImGui::Checkbox("Quick Transform (R+Y)", &getSettings().game.enableQuickTransform);
+                ImGui::Checkbox("Hide TV Settings Screen", &getSettings().game.hideTvSettingsScreen);
+                if (ImGui::IsItemHovered()) {
+                    ImGui::SetTooltip("Hides the TV calibration screen shown when loading a save");
+                }
                 ImGui::EndMenu();
             }
 
diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp
index 9a5bb20c8c..d1ba67b585 100644
--- a/src/dusk/settings.cpp
+++ b/src/dusk/settings.cpp
@@ -23,6 +23,7 @@ UserSettings g_userSettings = {
     .game = {
         // Quality of Life
         .enableQuickTransform = false,
+        .hideTvSettingsScreen = false,
 
         // Preferences
         .enableMirrorMode = false,