mirror of
https://github.com/zeldaret/mm.git
synced 2024-11-28 07:10:41 +00:00
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:
parent
23d63852de
commit
cf1da451aa
@ -710,7 +710,7 @@ def null_or_ptr(w):
|
||||
# (name, vrom_st, vrom_end, vram_st, vram_end)
|
||||
def read_actor_ovl_tbl():
|
||||
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
|
||||
entry = as_word_list(codefile.read(0x20))
|
||||
i = 0
|
||||
@ -730,10 +730,10 @@ def resolve_symbol(address):
|
||||
for entry in actor_tbl:
|
||||
if address >= 0x80000000:
|
||||
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:
|
||||
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:
|
||||
return None, None
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user