mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-29 03:34:07 +00:00
Merge remote-tracking branch 'upstream/main' into gc-eu-mq-disasm
This commit is contained in:
commit
95891c11cd
3 changed files with 17 additions and 17 deletions
|
@ -3,17 +3,8 @@
|
|||
import argparse
|
||||
from pathlib import Path
|
||||
|
||||
try:
|
||||
import rabbitizer
|
||||
except ImportError:
|
||||
print("Missing dependency rabbitizer, install it with `python3 -m pip install 'rabbitizer>=1.0.0,<2.0.0'`")
|
||||
exit(1)
|
||||
|
||||
try:
|
||||
import mapfile_parser
|
||||
except ImportError:
|
||||
print("Missing dependency mapfile_parser, install it with `python3 -m pip install 'mapfile-parser>=1.2.1,<2.0.0'`")
|
||||
exit(1)
|
||||
import rabbitizer
|
||||
import mapfile_parser
|
||||
|
||||
|
||||
def decodeInstruction(bytesDiff: bytes, mapFile: mapfile_parser.MapFile) -> str:
|
||||
|
|
|
@ -2,5 +2,18 @@
|
|||
crunch64>=0.3.1,<1.0.0
|
||||
ipl3checksum>=1.2.0,<2.0.0
|
||||
|
||||
# Disassembly
|
||||
# asm-differ
|
||||
argcomplete
|
||||
colorama
|
||||
cxxfilt
|
||||
python-Levenshtein
|
||||
watchdog
|
||||
|
||||
# decomp-permuter
|
||||
pycparser
|
||||
toml
|
||||
|
||||
# tools
|
||||
mapfile-parser>=1.2.1,<2.0.0
|
||||
rabbitizer>=1.0.0,<2.0.0
|
||||
spimdisasm>=1.20.0,<2.0.0
|
||||
|
|
|
@ -3,11 +3,7 @@
|
|||
import argparse
|
||||
from pathlib import Path
|
||||
|
||||
try:
|
||||
import mapfile_parser
|
||||
except ImportError:
|
||||
print("Missing dependency mapfile_parser, install it with `python3 -m pip install 'mapfile-parser>=1.2.1,<2.0.0'`")
|
||||
exit(1)
|
||||
import mapfile_parser
|
||||
|
||||
|
||||
def symInfoMain():
|
||||
|
|
Loading…
Reference in a new issue