Skip to content

Don't fail on doors the asm marks as deleted #207

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
biosp4rk merged 2 commits into from
Dec 11, 2025
Merged

Don't fail on doors the asm marks as deleted #207

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
160080c
Don't fail on doors the asm marks as deleted
Miepee Dec 11, 2025
bae193e
Merge branch 'main' into asm-deleted-doors
Miepee Dec 11, 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
5 changes: 3 additions & 2 deletions src/mars_patcher/mf/door_locks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,18 @@ def factory() -> dict:
for door in range(256):
door_addr = area_addr + door * 0xC
door_properties = rom.read_8(door_addr)
door_type = DoorType(door_properties & 0xF)

# Check if at end of list
if door_properties == 0:
break

# Skip doors that mage marks as deleted
# Skip doors that mage or asm marks as deleted
room = rom.read_8(door_addr + 1)
if room == 0xFF:
continue

door_type = DoorType(door_properties & 0xF)

# Skip excluded doors and doors that aren't lockable/open hatches
lock = door_locks.get((area, door))
if (area, door) in EXCLUDED_DOORS or door_type not in [
Expand Down
Loading