pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-19 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

use M(sym) in disasm_map

Browse Source
This commit is contained in:
Alex Bates 2020-10-21 03:54:40 +01:00
parent 6474bf4704
commit a85df352a4
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/disasm_map.py
View File

@ -13,7 +13,7 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
while len(midx) > 0:
struct = midx.pop(0)
name = struct["name"]
if name == "Script_Main": name = f"{map_name}_Main"
if name == "Script_Main": name = f"M(Main)"
#print(f"{offset:X} ({name}, start = {struct['start']:X}, len = {struct['length']:X})")
@ -26,26 +26,26 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
# format struct
if struct["type"].startswith("Script"):
out += disassemble_script(bytes, name, symbol_map)
out += disassemble_script(bytes, f"M({name})", symbol_map)
elif struct["type"] == "Padding":
# nops at end of file
bytes.seek(offset % 4, 1)
return out
elif struct["type"] == "EntryList":
out += f"EntryList {map_name}_entryList = {{"
out += f"EntryList M(entryList) = {{"
for i in range(0, struct["length"], 4 * 4):
x,y,z,yaw = unpack(">ffff", bytes.read(4 * 4))
out += f"\n {{ {x}f, {y}f, {z}f, {yaw}f }},"
out += f"\n}};\n"
elif struct["type"] == "Header":
out += f"MapConfig {map_name}_config = {{\n"
out += f"MapConfig M(config) = {{\n"
bytes.read(0x10)
main,entry_list,entry_count = unpack(">IIi", bytes.read(4 * 3))
out += f" .main = {map_name}_Main,\n"
out += f" .entryList = {map_name}_entryList,\n"
out += f" .entryCount = {entry_count},\n"
out += f" .main = M(Main)\n"
out += f" .entryList = M(entryList)\n"
out += f" .entryCount = {entry_count}, // prefer ENTRY_COUNT(M(entryList)) if it matches\n"
bytes.read(0x1C)
@ -55,7 +55,7 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
out += f"}};\n"
else: # unknown type of struct
out += f"s32 {name}[] = {{"
out += f"s32 M({name})[] = {{"
for i in range(0, struct["length"], 4):
if (i % 0x20) == 0:
out += f"\n "
@ -63,7 +63,7 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
word = int.from_bytes(bytes.read(4), byteorder="big")
if word in symbol_map:
out += f" {symbol_map[word]},"
out += f" M({symbol_map[word]}),"
else:
out += f" 0x{word:08X},"
@ -131,7 +131,13 @@ def parse_midx(file, prefix = ""):
return structs
def name_struct(s):
return s[1:].replace("???", "unk")
s = s[1:].replace("???", "unk")
# use ThisCase for scripts
if s.startswith("$Script"):
return s[0].upper() + s[1:]
return s[0].lower() + s[1:]
if __name__ == "__main__":
if len(sys.argv) == 1:
@ -145,7 +151,7 @@ if __name__ == "__main__":
area_name = area_name[:8]
with open(sys.argv[1], "r") as f:
midx = parse_midx(f, map_name + "_")
midx = parse_midx(f)
symbol_map = {}
for struct in midx:

2
tools/disasm_script.py
View File

@ -206,7 +206,7 @@ def disassemble(bytes, script_name = "script", symbol_map = {}):
indent += 1
elif opcode == 0x1C:
indent -= 1
write_line(f"SI_CASE_DEFAULT({var(argv[0])}),")
write_line(f"SI_CASE_DEFAULT(),")
indent += 1
elif opcode == 0x1D:
indent -= 1