crystal: make PointerLabelParam output just a label

to match the new from_asm handling

1 files changed, 6 insertions, 3 deletions

diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py
index 3385945..eed7c32 100644
--- a/pokemontools/crystal.py
+++ b/pokemontools/crystal.py
@@ -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'