summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-11 17:36:17 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-11 17:36:17 -0600
commitea4fce81fa6f34362a3e89631ecb9ef6a855f28d (patch)
tree0dd345fec593e8e728a4a455a2973c3dd116e3a7 /extras
parent6d6c18a301fec9463ef417200a1d6f5d0fcb90ce (diff)
fix gbz80disasm to not treat $00 as the second byte of an opcode
hg-commit-id: 290296b59823
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 555013c3..8344e1c2 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -608,7 +608,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
#find out if there's a two byte key like this
temp_maybe = maybe_byte
temp_maybe += ( ord(rom[offset+1]) << 8)
- if temp_maybe in opt_table.keys():
+ if temp_maybe in opt_table.keys() and ord(rom[offset+1])!=0:
opstr = opt_table[temp_maybe][0].lower()
if "x" in opstr:
@@ -640,6 +640,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
current_byte_number += 2
offset += 2
+ print "next byte is: " + hex(ord(extract_maps.rom[offset]))
elif maybe_byte in opt_table.keys():
op_code = opt_table[maybe_byte]
op_code_type = op_code[1]