From 7c7ff0f2c16f7a19b79382dafe7e54e8d561b561 Mon Sep 17 00:00:00 2001
From: velcheran <106959590+velcheran@users.noreply.github.com>
Date: Sat, 18 Oct 2025 20:13:12 +0200
Subject: [PATCH 1/2] Update rogue_pop.asl

Added a reset condition for Any%
---
 rogue_pop.asl | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/rogue_pop.asl b/rogue_pop.asl
index 9a1b965..f8b421e 100644
--- a/rogue_pop.asl
+++ b/rogue_pop.asl
@@ -28,6 +28,7 @@ startup
     vars.is_fresh_file_mode = false;
     vars.just_created_file = false;
     vars.just_exited_oasis = false;
+    vars.just_entered_oasis = false;
 
     if (timer.CurrentTimingMethod != TimingMethod.GameTime) {
         DialogResult mbox = MessageBox.Show(timer.Form,
@@ -121,6 +122,7 @@ update
 onReset
 {
     vars.IGTValue = null;
+	vars.just_entered_oasis = false;
 }
 
 start
@@ -147,10 +149,24 @@ start
     return vars.is_fresh_file_mode || oasis_start;
 }
 
+reset
+{
+	if (vars.is_fresh_file_mode) {
+		return false;
+	} else {
+		vars.just_entered_oasis =
+			old.activeScene != vars.OASIS_SCENE &&
+			current.activeScene == vars.OASIS_SCENE;
+	
+		return vars.just_entered_oasis;
+	}
+}
+
 onStart
 {
     vars.just_exited_oasis = false;
     vars.just_created_file = false;
+    vars.just_entered_oasis = false;
 }
 
 isLoading

From e2e7888100094be286eda0ca46796a690d1ede3b Mon Sep 17 00:00:00 2001
From: Pranav G <pranavbtech@gmail.com>
Date: Sun, 19 Oct 2025 20:08:56 +0530
Subject: [PATCH 2/2] Rogue: Make oasis reset a setting, some tweaks

---
 rogue_pop.asl                  | 20 ++++++++------------
 settings/RoguePoP.Settings.xml |  1 +
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/rogue_pop.asl b/rogue_pop.asl
index f8b421e..d89b0b6 100644
--- a/rogue_pop.asl
+++ b/rogue_pop.asl
@@ -28,7 +28,6 @@ startup
     vars.is_fresh_file_mode = false;
     vars.just_created_file = false;
     vars.just_exited_oasis = false;
-    vars.just_entered_oasis = false;
 
     if (timer.CurrentTimingMethod != TimingMethod.GameTime) {
         DialogResult mbox = MessageBox.Show(timer.Form,
@@ -122,7 +121,6 @@ update
 onReset
 {
     vars.IGTValue = null;
-	vars.just_entered_oasis = false;
 }
 
 start
@@ -151,22 +149,20 @@ start
 
 reset
 {
-	if (vars.is_fresh_file_mode) {
-		return false;
-	} else {
-		vars.just_entered_oasis =
-			old.activeScene != vars.OASIS_SCENE &&
-			current.activeScene == vars.OASIS_SCENE;
-	
-		return vars.just_entered_oasis;
-	}
+    if (vars.is_fresh_file_mode) {
+        return false;
+    } else {
+        return
+            settings["oasis_reset"] &&
+            old.activeScene != vars.OASIS_SCENE &&
+            current.activeScene == vars.OASIS_SCENE;
+    }
 }
 
 onStart
 {
     vars.just_exited_oasis = false;
     vars.just_created_file = false;
-    vars.just_entered_oasis = false;
 }
 
 isLoading
diff --git a/settings/RoguePoP.Settings.xml b/settings/RoguePoP.Settings.xml
index 1ccefa5..2219e78 100644
--- a/settings/RoguePoP.Settings.xml
+++ b/settings/RoguePoP.Settings.xml
@@ -6,4 +6,5 @@
         <Setting Id="nogai_one" Label="Nogai, the Indomitable" State="true" />
         <Setting Id="final_split" Label="Nogai, the Broken" State="true" />
     </Setting>
+    <Setting Id="oasis_reset" Label="Automatic reset for runs that begin from Oasis" State="true" />
 </Settings>