diff options
| author | cadmic <cadmic24@gmail.com> | 2024-12-04 16:44:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-04 19:44:16 -0500 |
| commit | b2d3c0523d92f9fcc3f85bb6a4643aea0fb2062b (patch) | |
| tree | b3018d792bf3aaf8583e19059a3e598e12080965 | |
| parent | 3a07abbfac1a3bfc7f2d5df38cce36b702366ee4 (diff) | |
Name asset extraction tools more consistently (#2316)
| -rw-r--r-- | Makefile | 11 | ||||
| -rwxr-xr-x | tools/extract_assets.py (renamed from extract_assets.py) | 2 | ||||
| -rw-r--r-- | tools/extract_audio.py (renamed from tools/audio_extraction.py) | 0 | ||||
| -rwxr-xr-x | tools/extract_text.py (renamed from tools/msgdis.py) | 0 |
4 files changed, 4 insertions, 9 deletions
@@ -235,7 +235,6 @@ PYTHON ?= $(VENV)/bin/python3 BUILD_DIR_REPLACE := sed -e 's|$$(BUILD_DIR)|$(BUILD_DIR)|g' # Audio tools -AUDIO_EXTRACT := $(PYTHON) tools/audio_extraction.py SAMPLECONV := tools/audio/sampleconv/sampleconv SBC := tools/audio/sbc SFC := tools/audio/sfc @@ -599,18 +598,14 @@ venv: $(PYTHON) -m pip install -U pip $(PYTHON) -m pip install -U -r requirements.txt -# TODO this is a temporary rule for testing audio, to be removed -setup-audio: - $(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml - setup: venv $(MAKE) -C tools $(PYTHON) tools/decompress_baserom.py $(VERSION) $(PYTHON) tools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 $(EXTRACTED_DIR)/baserom -v $(VERSION) $(PYTHON) tools/extract_incbins.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/incbin -v $(VERSION) - $(PYTHON) tools/msgdis.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/text -v $(VERSION) - $(PYTHON) extract_assets.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/assets -v $(VERSION) -j$(N_THREADS) - $(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml + $(PYTHON) tools/extract_text.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/text -v $(VERSION) + $(PYTHON) tools/extract_assets.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/assets -v $(VERSION) -j$(N_THREADS) + $(PYTHON) tools/extract_audio.py -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml disasm: $(RM) -r $(EXPECTED_DIR) diff --git a/extract_assets.py b/tools/extract_assets.py index acf01cb71..09519cb1e 100755 --- a/extract_assets.py +++ b/tools/extract_assets.py @@ -8,7 +8,7 @@ import time import multiprocessing from pathlib import Path -from tools import version_config +import version_config def SignalHandler(sig, frame): diff --git a/tools/audio_extraction.py b/tools/extract_audio.py index ab5d5b3fb..ab5d5b3fb 100644 --- a/tools/audio_extraction.py +++ b/tools/extract_audio.py diff --git a/tools/msgdis.py b/tools/extract_text.py index 3422988a6..3422988a6 100755 --- a/tools/msgdis.py +++ b/tools/extract_text.py |