From ebbc4427fa41f220a54486e04703280fb27d3492 Mon Sep 17 00:00:00 2001
From: Miepee <38186597+Miepee@users.noreply.github.com>
Date: Sun, 24 Aug 2025 19:42:18 +0200
Subject: [PATCH 1/3] Remove anti softlock option

---
 src/mars_patcher/data/schema.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/mars_patcher/data/schema.json b/src/mars_patcher/data/schema.json
index 1cb0b73..f2a5290 100644
--- a/src/mars_patcher/data/schema.json
+++ b/src/mars_patcher/data/schema.json
@@ -586,11 +586,6 @@
             "description": "When enabled, lets you use Power Bombs without needing to collect Bomb Data.",
             "default": false
         },
-        "AntiSoftlockRoomEdits": {
-            "type": "boolean",
-            "description": "Changes room layouts when enabled to prevent some accidental softlocks.",
-            "default": false
-        },
         "AccessibilityPatches": {
             "type": "boolean",
             "description": "Whether to apply patches for better accessibility.",

From 61e846bbb45671d413b25947542d8f870dfc233d Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 24 Aug 2025 17:42:33 +0000
Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/mars_patcher/auto_generated_types.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/mars_patcher/auto_generated_types.py b/src/mars_patcher/auto_generated_types.py
index 2f0d946..11fad8a 100644
--- a/src/mars_patcher/auto_generated_types.py
+++ b/src/mars_patcher/auto_generated_types.py
@@ -626,9 +626,6 @@ class Marsschema(typ.TypedDict, total=False):
     PowerBombsWithoutBombs: bool = False
     """When enabled, lets you use Power Bombs without needing to collect Bomb Data."""
 
-    AntiSoftlockRoomEdits: bool = False
-    """Changes room layouts when enabled to prevent some accidental softlocks."""
-
     AccessibilityPatches: bool = False
     """Whether to apply patches for better accessibility."""
 

From c1a988a65bdbbce1e1c20c6bb6b2908386f6e30d Mon Sep 17 00:00:00 2001
From: Miepee <38186597+Miepee@users.noreply.github.com>
Date: Sun, 24 Aug 2025 19:44:00 +0200
Subject: [PATCH 3/3] remove more anti softlock code

---
 src/mars_patcher/misc_patches.py | 4 ----
 src/mars_patcher/patcher.py      | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/src/mars_patcher/misc_patches.py b/src/mars_patcher/misc_patches.py
index 3e52c37..99b6238 100644
--- a/src/mars_patcher/misc_patches.py
+++ b/src/mars_patcher/misc_patches.py
@@ -81,10 +81,6 @@ def apply_pbs_without_bombs(rom: Rom) -> None:
     apply_patch_in_asm_path(rom, "bombless_pbs.ips")
 
 
-def apply_anti_softlock_edits(rom: Rom) -> None:
-    apply_patch_in_asm_path(rom, "anti_softlock.ips")
-
-
 def apply_reveal_hidden_tiles(rom: Rom) -> None:
     rom.write_8(rom.read_ptr(ReservedConstants.REVEAL_HIDDEN_TILES_ADDR), 1)
 
diff --git a/src/mars_patcher/patcher.py b/src/mars_patcher/patcher.py
index 69df376..d6d4e24 100644
--- a/src/mars_patcher/patcher.py
+++ b/src/mars_patcher/patcher.py
@@ -16,7 +16,6 @@
 from mars_patcher.minimap import apply_base_minimap_edits, apply_minimap_edits
 from mars_patcher.misc_patches import (
     apply_accessibility_patch,
-    apply_anti_softlock_edits,
     apply_base_patch,
     apply_pbs_without_bombs,
     apply_reveal_hidden_tiles,
@@ -76,10 +75,6 @@ def patch(
     # Apply base asm patch first
     apply_base_patch(rom)
 
-    # Softlock edits need to be done early to prevent later edits messing things up.
-    if patch_data.get("AntiSoftlockRoomEdits"):
-        apply_anti_softlock_edits(rom)
-
     # Randomize palettes - palettes are randomized first in case the item
     # patcher needs to copy tilesets
     if "Palettes" in patch_data: