Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
2 changed files with 8 additions and 0 deletions
Showing only changes of commit d8cfadf51c - Show all commits

View File

@ -12,6 +12,7 @@ CLUT_4_COLOR_TRANS_FLAGS = simple-tim clut4 --color-trans
## Music tracks
INPUT += $(OUTPUT_DIR)/Evacuation_cdda.xa
INPUT += $(OUTPUT_DIR)/fox.xa
INPUT += $(OUTPUT_DIR)/apple.adpcm
## Images
INPUT += $(OUTPUT_DIR)/TexturePage.img
@ -36,6 +37,10 @@ $(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv $< -o $@ xa
$(OUTPUT_DIR)/%.adpcm: audio/temp/%.wav
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv $< -o $@ adpcm
$(OUTPUT_DIR)/%.xa: audio/%.wav
@mkdir -p $(OUTPUT_DIR)
jaby_engine_fconv $< -o $@ xa

View File

@ -44,6 +44,9 @@
<Channel>../assets/bin/fox.xa</Channel>
</InterleavedFile>
</Directory>
<Directory name = "SFX" hidden = "true">
<File name = "APPLE.ADP" lz4 = "none">../assets/bin/apple.adpcm</File>
</Directory>
</Filesystem>
<AudioTrack align = "true">../assets/audio/temp/breaking.wav</AudioTrack>
</PSXCD>