Skip to content

Fix Major Locations #144

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

Closed
zarakava wants to merge 1 commit into from
Closed

Fix Major Locations #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/mars_patcher/constants/reserved_space.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ReservedConstants:
PATCHER_FREE_SPACE_ADDR = 0x7D0000
PATCHER_FREE_SPACE_END = PATCHER_FREE_SPACE_ADDR + 0x20000
MINOR_LOCS_TABLE_ADDR = 0x7FF000
MAJOR_LOCS_ADDR = 0x7FF01C
MAJOR_LOCS_POINTER_ADDR = 0x7FF01C
TANK_INC_ADDR = 0x7FF046
TOTAL_METROID_COUNT_ADDR = 0x7FF04C
REQUIRED_METROID_COUNT_ADDR = 0x7FF04D
Expand Down
6 changes: 4 additions & 2 deletions src/mars_patcher/item_patcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
MINOR_LOCS_TABLE_ADDR = ReservedConstants.MINOR_LOCS_TABLE_ADDR
MINOR_LOCS_ARRAY_ADDR = ReservedConstants.MINOR_LOCS_ARRAY_ADDR
MINOR_LOC_SIZE = 0x8
MAJOR_LOCS_ADDR = ReservedConstants.MAJOR_LOCS_ADDR
MAJOR_LOCS_POINTER_ADDR = ReservedConstants.MAJOR_LOCS_POINTER_ADDR
MAJOR_LOC_SIZE = 0x2
TANK_INC_ADDR = ReservedConstants.TANK_INC_ADDR
REQUIRED_METROID_COUNT_ADDR = ReservedConstants.REQUIRED_METROID_COUNT_ADDR
Expand Down Expand Up @@ -163,7 +163,9 @@ def write_items(self) -> None:
if maj_loc.new_item != ItemType.UNDEFINED:
if maj_loc.new_item == ItemType.INFANT_METROID:
total_metroids += 1
addr = MAJOR_LOCS_ADDR + (maj_loc.major_src.value * MAJOR_LOC_SIZE)
addr = rom.read_ptr(MAJOR_LOCS_POINTER_ADDR) + (
maj_loc.major_src.value * MAJOR_LOC_SIZE
)
rom.write_8(addr, maj_loc.new_item.value)
# Handle item messages
if maj_loc.item_messages is not None:
Expand Down