diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/script_extractor2.py | 24 | ||||
| -rw-r--r-- | tools/tcgdisasm.py | 24 |
2 files changed, 24 insertions, 24 deletions
diff --git a/tools/script_extractor2.py b/tools/script_extractor2.py index f69ced4..bb829f9 100755 --- a/tools/script_extractor2.py +++ b/tools/script_extractor2.py @@ -112,18 +112,18 @@ script_commands = { 0x55: { "name": "end_script_4", "params": [] }, 0x56: { "name": "end_script_5", "params": [] }, 0x57: { "name": "end_script_6", "params": [] }, - 0x58: { "name": "script_set_flag_value", "params": [ "event", "byte" ] }, - 0x59: { "name": "jump_if_flag_zero_1", "params": [ "event", "label" ] }, - 0x5a: { "name": "jump_if_flag_nonzero_1", "params": [ "event", "label" ] }, - 0x5b: { "name": "jump_if_flag_equal", "params": [ "event", "byte", "label" ] }, - 0x5c: { "name": "jump_if_flag_not_equal", "params": [ "event", "byte", "label" ] }, - 0x5d: { "name": "jump_if_flag_not_less_than", "params": [ "event", "byte", "label" ] }, - 0x5e: { "name": "jump_if_flag_less_than", "params": [ "event", "byte", "label" ] }, - 0x5f: { "name": "max_out_flag_value", "params": [ "event" ] }, - 0x60: { "name": "zero_out_flag_value", "params": [ "event" ] }, - 0x61: { "name": "jump_if_flag_nonzero_2", "params": [ "event", "label"] }, - 0x62: { "name": "jump_if_flag_zero_2", "params": [ "event", "label" ] }, - 0x63: { "name": "increment_flag_value", "params": [ "event" ] }, + 0x58: { "name": "set_event", "params": [ "event", "byte" ] }, + 0x59: { "name": "jump_if_event_zero", "params": [ "event", "label" ] }, + 0x5a: { "name": "jump_if_event_nonzero", "params": [ "event", "label" ] }, + 0x5b: { "name": "jump_if_event_equal", "params": [ "event", "byte", "label" ] }, + 0x5c: { "name": "jump_if_event_not_equal", "params": [ "event", "byte", "label" ] }, + 0x5d: { "name": "jump_if_event_greater_or_equal", "params": [ "event", "byte", "label" ] }, + 0x5e: { "name": "jump_if_event_less_than", "params": [ "event", "byte", "label" ] }, + 0x5f: { "name": "max_out_event_value", "params": [ "event" ] }, + 0x60: { "name": "zero_out_event_value", "params": [ "event" ] }, + 0x61: { "name": "jump_if_event_true", "params": [ "event", "label"] }, + 0x62: { "name": "jump_if_event_false", "params": [ "event", "label" ] }, + 0x63: { "name": "increment_event_value", "params": [ "event" ] }, 0x64: { "name": "end_script_7", "params": [] }, 0x65: { "name": "end_script_8", "params": [] }, 0x66: { "name": "end_script_9", "params": [] }, diff --git a/tools/tcgdisasm.py b/tools/tcgdisasm.py index 83d2af5..95db628 100644 --- a/tools/tcgdisasm.py +++ b/tools/tcgdisasm.py @@ -266,7 +266,7 @@ z80_table = [ ('db $fc', 2), # fc ('db $fd', 2), # fd ('cp ${:02x}', 1), # fe - ('debug_ret', 0), # ff + ('debug_nop', 0), # ff ] bit_ops_table = [ @@ -310,8 +310,8 @@ call_commands = [0xcd, 0xc4, 0xcc, 0xd4, 0xdc, 0xdf, 0xef] relative_jumps = [0x18, 0x20, 0x28, 0x30, 0x38] unconditional_jumps = [0xc3, 0x18] -# the flag macros found in bank 3. They db a byte after calling so need to be treated specially -flag_macros = [(0xca8f,"set_flag_value {}"),(0xcacd,"zero_flag_value {}"),(0xca84,"zero_flag_value2 {}"), (0xcac2,"max_flag_value {}"), (0xca69,"get_flag_value {}")] +# the event macros found in bank 3. They db a byte after calling so need to be treated specially +event_macros = [(0xca8f,"set_event_value {}"),(0xcacd,"set_event_false {}"),(0xca84,"set_event_zero {}"), (0xcac2,"max_event_value {}"), (0xca69,"get_event_value {}")] def asm_label(address): """ @@ -761,22 +761,22 @@ class Disassembler(object): # regular call or jump instructions target_label = self.find_label(local_target_offset, bank_id) - # handle the special flag macros - found_flag_macro = False + # handle the special event macros + found_event_macro = False if opcode_byte == 0xcd: - for flag_macro in flag_macros: - if flag_macro[0] == target_offset: - found_flag_macro = True - current_flag_macro = flag_macro - event_flag = "EVENT_FLAG_" + format(opcode_arg_3, "02X") - opcode_output_str = flag_macro[1].format(event_flag) + for event_macro in event_macros: + if event_macro[0] == target_offset: + found_event_macro = True + current_event_macro = event_macro + event_var = "EVENT_FLAG_" + format(opcode_arg_3, "02X") + opcode_output_str = event_macro[1].format(event_var) # we need to skip a byte since this macro takes one extra opcode_nargs+=1 break - if not found_flag_macro and opcode_byte in call_commands + absolute_jumps: + if not found_event_macro and opcode_byte in call_commands + absolute_jumps: if target_label is None: # if this is a call or jump opcode and the target label is not defined, create an undocumented label descriptor |