Skip to content

Commit

Permalink
Ports over OoT's version config (#1750)
Browse files Browse the repository at this point in the history
* Port over version_config from OoT

* extract_text

* remove need for calling by python modules

* Remove extract audio comment

* Newline

* pyyaml
  • Loading branch information
hensldm authored Dec 14, 2024
1 parent 01a1b11 commit 9e2ef99
Show file tree
Hide file tree
Showing 13 changed files with 1,771 additions and 1,631 deletions.
16 changes: 6 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ SCHC := $(PYTHON) tools/buildtools/schc.py
SCHC_FLAGS :=

# Audio tools
AUDIO_EXTRACT := $(PYTHON) tools/audio_extraction.py
SAMPLECONV := tools/audio/sampleconv/sampleconv
SBC := tools/audio/sbc
SFC := tools/audio/sfc
Expand Down Expand Up @@ -474,6 +473,7 @@ clean:
assetclean:
$(RM) -r $(EXTRACTED_DIR)/assets
$(RM) -r $(EXTRACTED_DIR)/text
$(RM) -r $(EXTRACTED_DIR)/.extracted-assets.json
$(RM) -r $(BUILD_DIR)/assets

distclean: assetclean clean
Expand All @@ -489,18 +489,14 @@ venv:

setup:
$(MAKE) -C tools
$(PYTHON) tools/buildtools/decompress_baserom.py -v $(VERSION)
$(PYTHON) tools/buildtools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 $(EXTRACTED_DIR)/baserom --dmadata-start `cat $(BASEROM_DIR)/dmadata_start.txt` --dmadata-names $(BASEROM_DIR)/dmadata_names.txt
$(PYTHON) tools/buildtools/extract_yars.py $(EXTRACTED_DIR)/baserom -v $(VERSION)

# TODO this is a temporary rule for testing audio, to be removed
setup-audio:
$(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml
$(PYTHON) tools/decompress_baserom.py -v $(VERSION)
$(PYTHON) tools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 $(EXTRACTED_DIR)/baserom -v $(VERSION)
$(PYTHON) tools/extract_yars.py $(EXTRACTED_DIR)/baserom -v $(VERSION)

assets:
$(PYTHON) tools/extract_assets.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/assets -j$(N_THREADS) -Z Wno-hardcoded-pointer -v $(VERSION)
$(PYTHON) tools/text/msgdis.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/text -v $(VERSION)
$(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_audio.py -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml

## Assembly generation
disasm:
Expand Down
18 changes: 18 additions & 0 deletions baseroms/n64-us/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
dmadata_start: 0x1A500
variables:
sMessageTableNES: 0x801C6B98
sMessageTableCredits: 0x801CFB08
gSoundFontTable: 0x801E1180
gSequenceFontTable: 0x801E1420
gSequenceTable: 0x801E1630
gSampleBankTable: 0x801E1E40
archives:
- map_i_static
- map_grand_static
- item_name_static
- map_name_static
- icon_item_static_yar
- icon_item_24_static_yar
- schedule_dma_static_yar
incbins:
assets:
Loading

0 comments on commit 9e2ef99

Please sign in to comment.