falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update actor symbols (#124) 

* update actor symbols

* switch to baserom directory

Co-authored-by: Jared Collette <jcollette@4000v-udp25-l.eng.unimelb.edu.au>
This commit is contained in:
engineer124 2021-05-11 08:47:30 +10:00 committed by GitHub
parent 23d63852de
commit cf1da451aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/overlayhelpers/actor_symbols.py
View File

@ -710,7 +710,7 @@ def null_or_ptr(w):
# (name, vrom_st, vrom_end, vram_st, vram_end) # (name, vrom_st, vrom_end, vram_st, vram_end)
def read_actor_ovl_tbl(): def read_actor_ovl_tbl():
actortbl = [] actortbl = []
with open(repo + "decomp/code","rb") as codefile: with open(repo + "baserom/code","rb") as codefile:
codefile.seek(0x109510) # actor overlay table offset into code codefile.seek(0x109510) # actor overlay table offset into code
entry = as_word_list(codefile.read(0x20)) entry = as_word_list(codefile.read(0x20))
i = 0 i = 0
@ -730,10 +730,10 @@ def resolve_symbol(address):
for entry in actor_tbl: for entry in actor_tbl:
if address >= 0x80000000: if address >= 0x80000000:
if entry[3] <= address < entry[4]: if entry[3] <= address < entry[4]:
return repo + "decomp" + os.sep + entry[0], address - entry[3] return repo + "baserom/overlays" + os.sep + entry[0], address - entry[3]
else: else:
if entry[1] <= address < entry[2]: if entry[1] <= address < entry[2]:
return repo + "decomp" + os.sep + entry[0], address - entry[1] return repo + "baserom/overlays" + os.sep + entry[0], address - entry[1]
else: else:
return None, None return None, None