Leahnaya/pokemon-reverse-engineering-tools
1
0
Fork 0
mirror of https://github.com/pret/pokemon-reverse-engineering-tools.git synced 2026-03-21 17:24:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

crystal: make PointerLabelParam output just a label

Browse Source 
to match the new from_asm handling
This commit is contained in:
yenatch 2013-12-04 01:12:45 -05:00
parent fef1cdd4f2
commit a401ebc620
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pokemontools/crystal.py
View File

@ -853,8 +853,6 @@ class PointerLabelParam(MultiByteParam):
# bank can be overriden
if "bank" in kwargs.keys():
if kwargs["bank"] != False and kwargs["bank"] != None and kwargs["bank"] in [True, "reverse"]:
# not +=1 because child classes set size=3 already
self.size = self.default_size + 1
self.given_bank = kwargs["bank"]
#if kwargs["bank"] not in [None, False, True, "reverse"]:
# raise Exception("bank cannot be: " + str(kwargs["bank"]))
@ -927,8 +925,11 @@ class PointerLabelParam(MultiByteParam):
bank_part = "$%.2x" % (pointers.calculate_bank(caddress))
else:
bank_part = "BANK("+label+")"
# for labels, expand bank_part at build time
if bank in ["reverse", True] and label:
return pointer_part
# return the asm based on the order the bytes were specified to be in
if bank == "reverse": # pointer, bank
elif bank == "reverse": # pointer, bank
return pointer_part+", "+bank_part
elif bank == True: # bank, pointer
return bank_part+", "+pointer_part
@ -944,6 +945,7 @@ class PointerLabelParam(MultiByteParam):
raise Exception("this should never happen")
class PointerLabelBeforeBank(PointerLabelParam):
size = 3
bank = True # bank appears first, see calculate_pointer_from_bytes_at
byte_type = 'db'
@ -952,6 +954,7 @@ class PointerLabelBeforeBank(PointerLabelParam):
return 'BANK({0})\n\tdw {0}'.format(value)
class PointerLabelAfterBank(PointerLabelParam):
size = 3
bank = "reverse" # bank appears last, see calculate_pointer_from_bytes_at
byte_type = 'dw'