Skip to content
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.

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

Add hacks to handle z_message_PAL.[ro]data #8

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
13 changes: 12 additions & 1 deletion csvSplit.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,18 @@ def _split_fileSplits_withPrefix(game: str, seg: str, categoryPrefix: str):
f.write(f"offset,vram,.{section}\n")
for row in data:
offset, vram, filename = row
f.writelines(f"{offset:X},{vram:X},{filename}\n")
# z_message_PAL.data is included with .rodata in the
# spreadsheet, because that's where it's located in the ROM
if filename == 'z_message_PAL.data':
f.write("\n")
f.writelines(f"offset,vram,.data\n")
f.writelines(f"{offset:X},{vram:X},z_message_PAL\n")
elif filename == 'z_message_PAL.rodata':
f.write("\n")
f.writelines(f"offset,vram,.rodata\n")
f.writelines(f"{offset:X},{vram:X},z_message_PAL\n")
else:
f.writelines(f"{offset:X},{vram:X},{filename}\n")
cadmic marked this conversation as resolved.
Show resolved Hide resolved

def split_fileSplits(game: str, seg: str):
categoriesPrefixes = ["", "iQue."]
Expand Down
8 changes: 6 additions & 2 deletions oot/cpmd/tables/files_code.csv
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,12 @@ offset,vram,.rodata
12E420,8014B280,cosf
12E470,8014B2D0,libm_vals
12E480,8014B2E0,llcvt
12E490,8014B2F0,z_message_PAL.data
136F30,80153D90,z_message_PAL.rodata

offset,vram,.data
12E490,8014B2F0,z_message_PAL

offset,vram,.rodata
136F30,80153D90,z_message_PAL
137E90,80154CF0,z_game_over
137EF0,80154D50,z_construct
138270,801550D0,audio_tables.rodata
Expand Down