Skip to content

MMBN6: Fixed generation issues #62

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
JTSenneker merged 1 commit into from
Dec 29, 2025
Merged

MMBN6: Fixed generation issues #62

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
6 changes: 3 additions & 3 deletions worlds/mmbn6/BN6RomUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ def generate_text_bytes(message) -> bytearray:
return bytearray(char_to_hex(c) for c in message)

def char_to_hex(c) -> int:
if c in charDict:
if c in charDict and 0 <= charDict[c] <= 255:
return charDict[c]
else:
# If the character doesn't exist, return the star character
return 0xE4E5
# If the character doesn't exist, or is out of range for a single byte value, return the star character
return 0x25

def generate_chip_get(chip, code, amt) -> bytearray:
chip_bytes = int16_to_byte_list_le(chip)
Expand Down
42 changes: 28 additions & 14 deletions worlds/mmbn6/Rom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,19 +339,33 @@ def get_base_rom_path(file_name: str = "", game_version: str = "") -> str:
return file_name


def get_base_rom_bytes(file_name: str = "") -> bytes:
base_rom_bytes = getattr(get_base_rom_bytes, "base_rom_bytes", None)
if not base_rom_bytes:
file_name = get_base_rom_path(file_name)
base_rom_bytes = bytes(open(file_name, "rb").read())

basemd5 = hashlib.md5()
basemd5.update(base_rom_bytes)
if CHECKSUM_GREG != basemd5.hexdigest() and CHECKSUM_FALZ != basemd5.hexdigest():
raise Exception('Supplied Base Rom does not match US GBA Gregar or US GBA Falzar Version.'
'Please provide the correct ROM version')

get_base_rom_bytes.base_rom_bytes = base_rom_bytes
def get_base_rom_bytes(file_name: str = "", game_version: str = "") -> bytes:
if game_version == "gregar":
base_rom_bytes = getattr(get_base_rom_bytes, "gregar_base_rom_bytes", None)
if not base_rom_bytes:
file_name = get_base_rom_path(file_name)
base_rom_bytes = bytes(open(file_name, "rb").read())

basemd5 = hashlib.md5()
basemd5.update(base_rom_bytes)
if CHECKSUM_GREG != basemd5.hexdigest():
raise Exception('Supplied Base Rom does not match US GBA Gregar.'
'Please provide the correct ROM version')

get_base_rom_bytes.gregar_base_rom_bytes = base_rom_bytes
else:
base_rom_bytes = getattr(get_base_rom_bytes, "falzar_base_rom_bytes", None)
if not base_rom_bytes:
file_name = get_base_rom_path(file_name)
base_rom_bytes = bytes(open(file_name, "rb").read())

basemd5 = hashlib.md5()
basemd5.update(base_rom_bytes)
if CHECKSUM_GREG != basemd5.hexdigest() and CHECKSUM_FALZ != basemd5.hexdigest():
raise Exception('Supplied Base Rom does not match US GBA Falzar Version.'
'Please provide the correct ROM version')

get_base_rom_bytes.falzar_base_rom_bytes = base_rom_bytes
return base_rom_bytes


Expand All @@ -362,7 +376,7 @@ def get_patched_rom_bytes(file_name: str = "", game_version: str = "") -> bytes:
Which should contain all changed text banks and assembly code
"""
import pkgutil
base_rom_bytes = get_base_rom_bytes(file_name)
base_rom_bytes = get_base_rom_bytes(file_name, game_version)
if game_version == "gregar":
patch_bytes = pkgutil.get_data(__name__, "data/bn6g-ap-patch.bsdiff")
else:
Expand Down
Loading