Merge pull request #339 from TwilitRealm/feature/restore-dolby-for-builds

Restore Warning Screen behind Toggle

include/dusk/settings.h

@@ -35,6 +35,7 @@ struct UserSettings {
         // QoL
         ConfigVar<bool> enableQuickTransform;
         ConfigVar<bool> hideTvSettingsScreen;
+        ConfigVar<bool> skipWarningScreen;
         ConfigVar<bool> biggerWallets;
         ConfigVar<bool> noReturnRupees;
         ConfigVar<bool> disableRupeeCutscenes;

src/d/d_s_logo.cpp

@@ -480,7 +480,7 @@ void dScnLogo_c::warningInDraw() {
 
     if (mTimer == 0) {
         mExecCommand = EXEC_WARNING_DISP;
-        mTimer = 30;
+        mTimer = 3510;
         field_0x20e = 30;
         field_0x210 = field_0x20e;
         field_0x212 = 1;
@@ -547,7 +547,7 @@ void dScnLogo_c::nintendoOutDraw() {
 
     if (mTimer == 0) {
         mExecCommand = EXEC_DOLBY_IN;
-        mTimer = 30;
+        mTimer = 90;
         mDoGph_gInf_c::startFadeIn(30);
     }
 }
@@ -1104,12 +1104,26 @@ int dScnLogo_c::create() {
     checkProgSelect();
     if (field_0x20a != 0) {
         mExecCommand = EXEC_PROG_IN;
-        mTimer = 1;
+        #if TARGET_PC
+        mTimer = dusk::getSettings().game.skipWarningScreen ? 1 : 30;
+        #else
+        mTimer = 30;
+        #endif
         field_0x218 = getProgressiveMode();
     } else {
         #if TARGET_PC
-        mTimer = 0; // Possibly unnecessary but just in case
-        mExecCommand = EXEC_DVD_WAIT;
+        if (dusk::getSettings().game.skipWarningScreen) {
+            mTimer = 0;  // Possibly unnecessary but just in case
+            mExecCommand = EXEC_DVD_WAIT;
+        } else {
+            if (mDoRst::getWarningDispFlag()) {
+                mTimer = 90;
+                mExecCommand = EXEC_NINTENDO_IN;
+            } else {
+                mTimer = 120;
+                mExecCommand = EXEC_WARNING_IN;
+            }
+        }
         #else
         if (mDoRst::getWarningDispFlag()) {
             mTimer = 90;

src/dusk/imgui/ImGuiFirstRunPreset.cpp

@@ -18,6 +18,7 @@ static void ApplyPresetClassic() {
 static void ApplyPresetHD() {
     auto& s = getSettings();
     s.game.hideTvSettingsScreen.setValue(true);
+    s.game.skipWarningScreen.setValue(true);
     s.game.noReturnRupees.setValue(true);
     s.game.disableRupeeCutscenes.setValue(true);
     s.game.noSwordRecoil.setValue(true);

src/dusk/imgui/ImGuiMenuEnhancements.cpp

@@ -53,6 +53,11 @@ namespace dusk {
                     ImGui::SetTooltip("Hides the TV calibration screen shown when loading a save.");
                 }
 
+                config::ImGuiCheckbox("Skip Warning Screen", getSettings().game.skipWarningScreen);
+                if (ImGui::IsItemHovered()) {
+                    ImGui::SetTooltip("Skips the warning screen shown when loading the game.");
+                }
+
                 config::ImGuiCheckbox("Instant Saves", getSettings().game.instantSaves);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Skip the delay when writing to the Memory Card.");

src/dusk/settings.cpp

@@ -23,6 +23,7 @@ UserSettings g_userSettings = {
         // Quality of Life
         .enableQuickTransform {"game.enableQuickTransform", false},
         .hideTvSettingsScreen {"game.hideTvSettingsScreen", false},
+        .skipWarningScreen {"game.skipWarningScreen", false},
         .biggerWallets {"game.biggerWallets", false},
         .noReturnRupees {"game.noReturnRupees", false},
         .disableRupeeCutscenes {"game.disableRupeeCutscenes", false},
@@ -92,6 +93,7 @@ void registerSettings() {
     // Game
     Register(g_userSettings.game.enableQuickTransform);
     Register(g_userSettings.game.hideTvSettingsScreen);
+    Register(g_userSettings.game.skipWarningScreen);
     Register(g_userSettings.game.biggerWallets);
     Register(g_userSettings.game.noReturnRupees);
     Register(g_userSettings.game.disableRupeeCutscenes);