diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-08 19:48:38 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-09 08:35:37 +0100 |
| commit | a352ff972220ac5f8551a81cff4ed97d97cb164d (patch) | |
| tree | d3e55983714dd034c445c7a772cf347f79d1b0f8 /tools/script_disassembler | |
| parent | 5e2af32bb11f35dee966343959d955147c660204 (diff) | |
Readd void parameters
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] |