Skip to content

Use the common function to store navigation/hint text. #140

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
cluekitty merged 3 commits into from
Apr 18, 2025
Merged

Use the common function to store navigation/hint text. #140

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac49895
Use the common function to store navigation/hint text.
zarakava Apr 14, 2025
7a1c96a
Update navigation_text.py
zarakava Apr 14, 2025
9fd09c7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 14, 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
21 changes: 6 additions & 15 deletions src/mars_patcher/navigation_text.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
from mars_patcher.auto_generated_types import Hintlocks, MarsschemaNavstationlocksKey
from mars_patcher.rom import Rom

# Keep these in sync with base patch
HINT_TEXT_ADDR = 0x7F0000
HINT_TEXT_END = 0x7FF000


class NavRoom(Enum):
MAIN_DECK_WEST = 1
Expand Down Expand Up @@ -106,29 +102,24 @@ def from_json(cls, data: dict) -> NavigationText:
return cls(navigation_text)

def write(self, rom: Rom) -> None:
text_addr = HINT_TEXT_ADDR
for lang, lang_texts in self.navigation_text.items():
base_text_address = rom.read_ptr(navigation_text_ptrs(rom) + lang.value * 4)

# Info Text
for info_place, text in lang_texts["ShipText"].items():
encoded_text = encode_text(rom, MessageType.CONTINUOUS, text)
text_addr = rom.reserve_free_space(len(encoded_text) * 2)
rom.write_ptr(base_text_address + info_place.value * 4, text_addr)
rom.write_ptr(base_text_address + info_place.value * 4 + 4, text_addr)

encoded_text = encode_text(rom, MessageType.CONTINUOUS, text)
text_addr = rom.write_16_list(text_addr, encoded_text)
if text_addr >= HINT_TEXT_END:
raise ValueError("Attempted to write too much text to ROM.")
rom.write_16_list(text_addr, encoded_text)

# Navigation Text
for nav_room, text in lang_texts["NavigationTerminals"].items():
encoded_text = encode_text(rom, MessageType.CONTINUOUS, text)
text_addr = rom.reserve_free_space(len(encoded_text) * 2)
rom.write_ptr(base_text_address + nav_room.value * 8, text_addr)
rom.write_ptr(base_text_address + nav_room.value * 8 + 4, text_addr)

encoded_text = encode_text(rom, MessageType.CONTINUOUS, text)
text_addr = rom.write_16_list(text_addr, encoded_text)
if text_addr >= HINT_TEXT_END:
raise ValueError("Attempted to write too much text to ROM.")
rom.write_16_list(text_addr, encoded_text)

@classmethod
def apply_hint_security(
Expand Down