Skip to content

Remove anti softlock option #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Miepee merged 3 commits into from
Aug 24, 2025
Merged

Remove anti softlock option #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebbc442
Remove anti softlock option
Miepee Aug 24, 2025
61e846b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 24, 2025
c1a988a
remove more anti softlock code
Miepee Aug 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/mars_patcher/auto_generated_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."""

Expand Down
5 changes: 0 additions & 5 deletions src/mars_patcher/data/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
4 changes: 0 additions & 4 deletions src/mars_patcher/misc_patches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions src/mars_patcher/patcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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:
Expand Down