From 24fe6fa810bcf913a6fd823bd60af822fe7abbad Mon Sep 17 00:00:00 2001 From: Javarooster-png Date: Wed, 15 May 2024 16:06:34 -0500 Subject: [PATCH] make init rabbitizer fix code from @AngheloAlf https://github.com/zeldaret/mm/pull/1606/files , makes it possible to build --- requirements.txt | 2 +- tools/disasm/disasm.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4da9e11f01f..a829dd6bc9f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ libyaz0>=0.5 colorama>=0.4.3 # disasm -rabbitizer>=1.0.0,<2.0.0 +rabbitizer>=1.3.0,<2.0.0 # Compression pyelftools>=0.26 diff --git a/tools/disasm/disasm.py b/tools/disasm/disasm.py index 78d66d337bd..f97cd17e226 100755 --- a/tools/disasm/disasm.py +++ b/tools/disasm/disasm.py @@ -1112,7 +1112,7 @@ def asm_header(section_name: str): def getImmOverride(insn: rabbitizer.Instruction): if insn.isBranch(): return f".L{insn.getBranchOffset() + insn.vram:08X}" - elif insn.isJump(): + elif insn.isJumpWithAddress(): return proper_name(insn.getInstrIndexAsVram(), in_data=False, is_symbol=True) elif insn.uniqueId == rabbitizer.InstrId.cpu_ori: