Skip to content

Commit

Permalink
advance forward when disassembling the rom
Browse files Browse the repository at this point in the history
  • Loading branch information
kanzure committed Jun 15, 2012
1 parent b19db1e commit 4b7ca69
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion extras/romstr.py
@@ -1,4 +1,6 @@
from gbz80disasm import opt_table, end_08_scripts_with, relative_jumps, relative_unconditional_jumps, call_commands
from ctypes import c_int8
from copy import copy, deepcopy

class RomStr(str):
""" Simple wrapper to prevent a giant rom from being shown on screen.
Expand Down Expand Up @@ -245,7 +247,7 @@ def parse(self):

# Check for relative jumps, construct the formatted asm line.
# Also set the usage of labels.
if current_byte in [0x18, 0x20] or current_byte in relative_jumps: # jr or jr nz
if current_byte in [0x18, 0x20] + relative_jumps: # jr or jr nz
print "debug5"

# generate a label for the byte we're jumping to
Expand Down Expand Up @@ -326,6 +328,9 @@ def parse(self):
asm_command["value"] = current_byte
keep_reading = False

# jump forward by a byte
offset += 1

# save this new command in the list
asm_commands[asm_command["address"]] = asm_command
self.asm_commands = asm_commands
Expand Down

0 comments on commit 4b7ca69

Please sign in to comment.