From 9e9f36e484b9c10db38ebdef968c2e57683608c4 Mon Sep 17 00:00:00 2001
From: gymnast86 <stock.joann@gmail.com>
Date: Fri, 8 May 2026 16:21:26 -0700
Subject: [PATCH] autoskip cutscenes when skip major cutscenes is on

---
 src/d/d_event.cpp                                     | 5 ++++-
 src/dusk/randomizer/game/randomizer_context.cpp       | 2 ++
 src/dusk/randomizer/game/randomizer_context.hpp       | 1 +
 src/dusk/randomizer/generator/data/settings_list.yaml | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp
index 73891276df..54d28384c5 100644
--- a/src/d/d_event.cpp
+++ b/src/d/d_event.cpp
@@ -878,7 +878,10 @@ bool dEvt_control_c::skipper() {
         }
 
         bool is_trig_skipbtn = mDoCPd_c::getTrigStart(PAD_1);
-        if (is_trig_skipbtn) {
+        // Automatically skip cutscenes in rando if Skip Major Cutscenes is on
+        if (is_trig_skipbtn IF_DUSK(||
+            (randomizer_IsActive() && canSkip &&
+             randomizer_GetContext().mSettings[RandomizerContext::SKIP_MAJOR_CUTSCENES] == RandomizerContext::ON))) {
             if (mSkipTimer > 0) {
                 mSkipTimer = -1;
 
diff --git a/src/dusk/randomizer/game/randomizer_context.cpp b/src/dusk/randomizer/game/randomizer_context.cpp
index 21de77b09d..43543d9846 100644
--- a/src/dusk/randomizer/game/randomizer_context.cpp
+++ b/src/dusk/randomizer/game/randomizer_context.cpp
@@ -274,6 +274,8 @@ int RandomizerContext::SettingToEnum(const std::string& settingName) {
         {"Hyrule Castle Big Key Hearts", HYRULE_BIG_KEY_HEARTS},
         {"Palace of Twilight Requirements", PALACE_OF_TWILIGHT_REQUIREMENTS},
         {"Skip Minor Cutscenes", SKIP_MINOR_CUTSCENES},
+        {"Skip Major Cutscenes", SKIP_MAJOR_CUTSCENES},
+
     };
 
     if (nameToEnum.contains(settingName)) {
diff --git a/src/dusk/randomizer/game/randomizer_context.hpp b/src/dusk/randomizer/game/randomizer_context.hpp
index 1f8ee08752..526e48b63f 100644
--- a/src/dusk/randomizer/game/randomizer_context.hpp
+++ b/src/dusk/randomizer/game/randomizer_context.hpp
@@ -72,6 +72,7 @@ public:
         HYRULE_BIG_KEY_DUNGEONS,
         PALACE_OF_TWILIGHT_REQUIREMENTS,
         SKIP_MINOR_CUTSCENES,
+        SKIP_MAJOR_CUTSCENES,
     };
 
     enum Options {
diff --git a/src/dusk/randomizer/generator/data/settings_list.yaml b/src/dusk/randomizer/generator/data/settings_list.yaml
index f627e53250..9aeed4c0b9 100644
--- a/src/dusk/randomizer/generator/data/settings_list.yaml
+++ b/src/dusk/randomizer/generator/data/settings_list.yaml
@@ -315,14 +315,15 @@
     - "On": description
 
 - Name: Skip Minor Cutscenes
-  Tracker Important: True
   Need In Game: True
+  Tracker Important: True
   Default Option: "Off"
   Options:
     - "Off": description
     - "On": description
 
 - Name: Skip Major Cutscenes
+  Need In Game: True
   Tracker Important: True
   Default Option: "Off"
   Options: