diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-11 12:26:14 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-11 12:26:14 -0700 |
| commit | 4e0f27d789318d32e54e1c2b3e80307757e4f8a1 (patch) | |
| tree | 220b0503e178a763fb05be25ab1ff85d97b64759 | |
| parent | 622534ca73b22b73d9a5c3e865502c9f874ee0bf (diff) | |
| parent | f220d59d4aa7f11555c27d972a831d49f680406b (diff) | |
Merge pull request #25 from kanzure/fix-gbz80disasm-for-pokered
Be okay with blank labels in gbz80disasm
| -rw-r--r-- | pokemontools/gbz80disasm.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pokemontools/gbz80disasm.py b/pokemontools/gbz80disasm.py index 790388e..1fb9d85 100644 --- a/pokemontools/gbz80disasm.py +++ b/pokemontools/gbz80disasm.py @@ -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] |