diff options
| -rw-r--r-- | pokemontools/crystal.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py index 72d08a1..697960c 100644 --- a/pokemontools/crystal.py +++ b/pokemontools/crystal.py @@ -909,26 +909,29 @@ class PointerLabelParam(MultiByteParam): # setup output bytes if the label was not found if not label: - #pointer_part = (", ".join([(self.prefix+"%.2x")%x for x in reversed(self.bytes[1:])])) - pointer_part = self.prefix+("%.2x"%self.bytes[1])+("%.2x"%self.bytes[0]) + if bank == True: + lo, hi = self.bytes[1:3] + else: + lo, hi = self.bytes[0:2] + pointer_part = "{0}{1:2x}{2:2x}".format(self.prefix, hi, lo) # bank positioning matters! if bank == True or bank == "reverse": # bank, pointer # possibly use BANK(LABEL) if we know the bank - if not label: - bank_part = ((self.prefix+"%.2x")%bank) + if label: + bank_part = "BANK({})".format(label) else: - if "$" in label: + if "$" in pointer_part: if 0x4000 <= caddress <= 0x7FFF: #bank_part = "$%.2x" % (pointers.calculate_bank(self.parent.parent.address)) bank_part = "1" else: bank_part = "$%.2x" % (pointers.calculate_bank(caddress)) else: - bank_part = "BANK("+label+")" + bank_part = ((self.prefix+"%.2x")%bank) # for labels, expand bank_part at build time if bank in ["reverse", True] and label: - return pointer_part + return label # return the asm based on the order the bytes were specified to be in elif bank == "reverse": # pointer, bank return pointer_part+", "+bank_part @@ -7058,6 +7061,8 @@ def get_ram_label(address): """ returns a label assigned to a particular ram address """ + if not hasattr(wram, "wram_labels"): + setup_wram_labels() if address in wram.wram_labels.keys(): return wram.wram_labels[address][-1] return None @@ -7090,12 +7095,7 @@ def get_label_for(address): else: return "AlreadyParsedNoDefaultUnknownLabel_" + hex(address) - #return "NotYetParsed_"+hex(address) - if address > 0x7FFF: - value = 0x4000 + (address % 0x4000) - return "$%.2x"%(value) - else: - return "$%.2x"%(address) + return None # all_new_labels is a temporary replacement for all_labels, # at least until the two approaches are merged in the code base. |