diff options
Diffstat (limited to 'pokemontools/gbz80disasm.py')
| -rw-r--r-- | pokemontools/gbz80disasm.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pokemontools/gbz80disasm.py b/pokemontools/gbz80disasm.py index 790388e..a77e433 100644 --- a/pokemontools/gbz80disasm.py +++ b/pokemontools/gbz80disasm.py @@ -10,7 +10,7 @@ from ctypes import c_int8 import random import json -import config +import configuration import crystal import labels import wram @@ -631,7 +631,7 @@ class Disassembler(object): if local_address < 0x8000: for label_entry in self.labels.labels: if get_local_address(label_entry["address"]) == local_address: - if label_entry["bank"] == bank_id or label_entry["bank"] == 0: + if "bank" in label_entry and (label_entry["bank"] == bank_id or label_entry["bank"] == 0): return label_entry["label"] if local_address in self.wram.wram_labels.keys(): return self.wram.wram_labels[local_address][-1] @@ -929,7 +929,7 @@ class Disassembler(object): return (output, offset, last_hl_address, last_a_address, used_3d97) if __name__ == "__main__": - conf = config.Config() + conf = configuration.Config() disasm = Disassembler(conf) disasm.initialize() |