Convert .aif files to .wav (#883)

Makefile

@@ -80,7 +80,7 @@ include make_tools.mk
 SHA1SUM   := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
 GBAGFX    := tools/gbagfx/gbagfx$(EXE)
 RSFONT    := tools/rsfont/rsfont$(EXE)
-AIF2PCM   := tools/aif2pcm/aif2pcm$(EXE)
+WAV2AGB   := tools/wav2agb/wav2agb$(EXE)
 MID2AGB   := tools/mid2agb/mid2agb$(EXE)
 PREPROC   := tools/preproc/preproc$(EXE)
 SCANINC   := tools/scaninc/scaninc$(EXE)
@@ -321,11 +321,11 @@ generated: $(AUTO_GEN_TARGETS)
 
 #### Sound Rules ####
 
-sound/direct_sound_samples/cries/cry_%.bin: sound/direct_sound_samples/cries/cry_%.aif
-	$(AIF2PCM) $< $@ --compress
+sound/direct_sound_samples/cries/cry_%.bin: sound/direct_sound_samples/cries/cry_%.wav
+	$(WAV2AGB) -b -c -l 1 --no-pad $< $@
 
-sound/%.bin: sound/%.aif
-	$(AIF2PCM) $< $@
+sound/%.bin: sound/%.wav
+	$(WAV2AGB) -b $< $@
 
 sound/songs/%.s: sound/songs/%.mid
 	cd $(@D) && ../../$(MID2AGB) $(<F)

build_tools.sh

@@ -4,7 +4,7 @@ make -C tools/scaninc
 make -C tools/preproc
 make -C tools/bin2c
 make -C tools/rsfont
-make -C tools/aif2pcm
+make -C tools/wav2agb
 make -C tools/ramscrgen
 make -C tools/gbafix
 make -C tools/jsonproc

build_tools_mac.sh

@@ -4,7 +4,7 @@ make -C tools/scaninc CXX=clang++
 make -C tools/preproc CXX=clang++
 make -C tools/bin2c CXX=clang++
 make -C tools/rsfont CXX=clang++
-make -C tools/aif2pcm CXX=clang++
+make -C tools/wav2agb CXX=clang++
 make -C tools/ramscrgen CXX=clang++
 make -C tools/gbafix CXX=clang++
 make -C tools/jsonproc CXX=clang++

clean_tools.sh

@@ -4,6 +4,6 @@ make -C tools/scaninc clean
 make -C tools/preproc clean
 make -C tools/bin2c clean
 make -C tools/rsfont clean
-make -C tools/aif2pcm clean
+make -C tools/wav2agb clean
 make -C tools/ramscrgen clean
 make -C tools/gbafix clean

make_tools.mk

@@ -5,7 +5,7 @@ MAKEFLAGS += --no-print-directory
 
 # Inclusive list. If you don't want a tool to be built, don't add it here.
 TOOLS_DIR := tools
-TOOL_NAMES := aif2pcm bin2c gbafix gbagfx jsonproc mapjson mid2agb preproc ramscrgen rsfont scaninc
+TOOL_NAMES := bin2c gbafix gbagfx jsonproc mapjson mid2agb preproc ramscrgen rsfont scaninc wav2agb
 
 TOOLDIRS := $(TOOL_NAMES:%=$(TOOLS_DIR)/%)