diff options
Diffstat (limited to 'tools/script_disassembler')
| -rw-r--r-- | tools/script_disassembler/definitions.py | 3 | ||||
| -rw-r--r-- | tools/script_disassembler/script_disassembler.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py index 96104d05..0793db76 100644 --- a/tools/script_disassembler/definitions.py +++ b/tools/script_disassembler/definitions.py @@ -187,7 +187,8 @@ def get_script_pointer(barray): integers = struct.unpack('I', barray) val = integers[0] if val >= SCRIPTS_START and val <= SCRIPTS_END: - return 'script_' + (struct.pack('>I', val).hex()).upper() + return use_script_label(val) +# return 'script_' + (struct.pack('>I', val).hex()).upper() else: return '0x'+struct.pack('>I', val).hex() diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py index 19b171c8..3095533c 100644 --- a/tools/script_disassembler/script_disassembler.py +++ b/tools/script_disassembler/script_disassembler.py @@ -31,7 +31,7 @@ def print_rest_bytes(ctx): def disassemble_command(ctx: Context, add_all_annotations=False): global used_labels - if add_all_annotations or ctx.script_addr + ctx.ptr in used_labels: + if (add_all_annotations or ctx.script_addr + ctx.ptr in used_labels) and ctx.ptr != 0: # print offsets to debug when manually inserting labels print(f'{get_script_label(ctx.script_addr + ctx.ptr)}:') cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0] |