1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-27 03:24:45 +00:00

Merge remote-tracking branch 'upstream/main' into gc-eu-mq-disasm

This commit is contained in:
cadmic 2024-01-24 16:14:18 -08:00
commit 95891c11cd
3 changed files with 17 additions and 17 deletions

View file

@ -3,17 +3,8 @@
import argparse import argparse
from pathlib import Path from pathlib import Path
try: import rabbitizer
import rabbitizer import mapfile_parser
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)
def decodeInstruction(bytesDiff: bytes, mapFile: mapfile_parser.MapFile) -> str: def decodeInstruction(bytesDiff: bytes, mapFile: mapfile_parser.MapFile) -> str:

View file

@ -2,5 +2,18 @@
crunch64>=0.3.1,<1.0.0 crunch64>=0.3.1,<1.0.0
ipl3checksum>=1.2.0,<2.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 spimdisasm>=1.20.0,<2.0.0

View file

@ -3,11 +3,7 @@
import argparse import argparse
from pathlib import Path from pathlib import Path
try: import mapfile_parser
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)
def symInfoMain(): def symInfoMain():