aboutsummaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorYamaArashi <devnull@localhost>2012-01-23 17:29:51 -0800
committerYamaArashi <devnull@localhost>2012-01-23 17:29:51 -0800
commit5115993d5a355dea49db1057da9cf673df7aba23 (patch)
treec03f96b2149378ca791885ebd175c640b822b773 /extras
parentmerge (diff)
parentmore addresses on labels (diff)
downloadpokeyellow-5115993d5a355dea49db1057da9cf673df7aba23.tar.gz
pokeyellow-5115993d5a355dea49db1057da9cf673df7aba23.tar.xz
pokeyellow-5115993d5a355dea49db1057da9cf673df7aba23.zip
merge
hg-commit-id: 179864ca89bf
Diffstat (limited to 'extras')
-rw-r--r--extras/gbz80disasm.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index 3769c2a6..99255c21 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -578,7 +578,8 @@ def find_label(local_address, bank_id=0):
for label_entry in all_labels:
if label_entry["local_pointer"].upper() == local_address:
- return label_entry["label"]
+ if label_entry["bank_id"] == bank_id:
+ return label_entry["label"]
return None
def random_asm_label():