diff --git a/Makefile b/Makefile
index 26b1e4ca0..ef6a66de7 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ AUTO_GEN_TARGETS :=
 include make_tools.mk
 # Tool executables
 GFX       := $(TOOLS_DIR)/gbagfx/gbagfx$(EXE)
-AIF       := $(TOOLS_DIR)/aif2pcm/aif2pcm$(EXE)
+WAV2AGB   := $(TOOLS_DIR)/wav2agb/wav2agb$(EXE)
 MID       := $(TOOLS_DIR)/mid2agb/mid2agb$(EXE)
 SCANINC   := $(TOOLS_DIR)/scaninc/scaninc$(EXE)
 PREPROC   := $(TOOLS_DIR)/preproc/preproc$(EXE)
@@ -253,7 +253,7 @@ generated: $(AUTO_GEN_TARGETS)
 %.s:   ;
 %.png: ;
 %.pal: ;
-%.aif: ;
+%.wav: ;
 
 %.1bpp:   %.png  ; $(GFX) $< $@
 %.4bpp:   %.png  ; $(GFX) $< $@
diff --git a/audio_rules.mk b/audio_rules.mk
index 8eaed40b7..6b4e4afda 100644
--- a/audio_rules.mk
+++ b/audio_rules.mk
@@ -16,13 +16,13 @@ $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
 $(MID_BUILDDIR)/%.o: $(MID_ASM_DIR)/%.s
 	$(AS) $(ASFLAGS) -I sound -o $@ $<
 
-# Compressed cries
-$(CRY_BIN_DIR)/%.bin: $(CRY_SUBDIR)/%.aif 
-	$(AIF) $< $@ --compress
+$(CRY_BIN_DIR)/%.bin: $(CRY_SUBDIR)/%.wav
+# NOTE: If using ipatix's High Quality Audio Mixer, remove "--no-pad" below.
+	$(WAV2AGB) -b -c -l 1 --no-pad $< $@
 
 # Uncompressed sounds
-$(SOUND_BIN_DIR)/%.bin: sound/%.aif 
-	$(AIF) $< $@
+$(SOUND_BIN_DIR)/%.bin: sound/%.wav
+	$(WAV2AGB) -b $< $@
 
 # For each line in midi.cfg, we do some trickery to convert it into a make rule for the `.mid` file described on the line
 # Data following the colon in said file corresponds to arguments passed into mid2agb
diff --git a/make_tools.mk b/make_tools.mk
index ca8e9c863..d7b9315ad 100644
--- a/make_tools.mk
+++ b/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)/%)
 
diff --git a/sound/direct_sound_samples/bicycle_bell.aif b/sound/direct_sound_samples/bicycle_bell.aif
deleted file mode 100644
index 52191fa16..000000000
Binary files a/sound/direct_sound_samples/bicycle_bell.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/bicycle_bell.wav b/sound/direct_sound_samples/bicycle_bell.wav
new file mode 100644
index 000000000..92f963406
Binary files /dev/null and b/sound/direct_sound_samples/bicycle_bell.wav differ
diff --git a/sound/direct_sound_samples/classical_choir_voice_ahhs.aif b/sound/direct_sound_samples/classical_choir_voice_ahhs.aif
deleted file mode 100644
index 25d766a6b..000000000
Binary files a/sound/direct_sound_samples/classical_choir_voice_ahhs.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/classical_choir_voice_ahhs.wav b/sound/direct_sound_samples/classical_choir_voice_ahhs.wav
new file mode 100644
index 000000000..7e38d3a3f
Binary files /dev/null and b/sound/direct_sound_samples/classical_choir_voice_ahhs.wav differ
diff --git a/sound/direct_sound_samples/cries/abra.aif b/sound/direct_sound_samples/cries/abra.aif
deleted file mode 100644
index 7df4446db..000000000
Binary files a/sound/direct_sound_samples/cries/abra.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/abra.wav b/sound/direct_sound_samples/cries/abra.wav
new file mode 100644
index 000000000..14aba2d7a
Binary files /dev/null and b/sound/direct_sound_samples/cries/abra.wav differ
diff --git a/sound/direct_sound_samples/cries/absol.aif b/sound/direct_sound_samples/cries/absol.aif
deleted file mode 100644
index 884ab22b3..000000000
Binary files a/sound/direct_sound_samples/cries/absol.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/absol.wav b/sound/direct_sound_samples/cries/absol.wav
new file mode 100644
index 000000000..4a90ec5c0
Binary files /dev/null and b/sound/direct_sound_samples/cries/absol.wav differ
diff --git a/sound/direct_sound_samples/cries/aerodactyl.aif b/sound/direct_sound_samples/cries/aerodactyl.aif
deleted file mode 100644
index c0e40f6d1..000000000
Binary files a/sound/direct_sound_samples/cries/aerodactyl.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/aerodactyl.wav b/sound/direct_sound_samples/cries/aerodactyl.wav
new file mode 100644
index 000000000..95518884b
Binary files /dev/null and b/sound/direct_sound_samples/cries/aerodactyl.wav differ
diff --git a/sound/direct_sound_samples/cries/aggron.aif b/sound/direct_sound_samples/cries/aggron.aif
deleted file mode 100644
index b89ea1222..000000000
Binary files a/sound/direct_sound_samples/cries/aggron.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/aggron.wav b/sound/direct_sound_samples/cries/aggron.wav
new file mode 100644
index 000000000..bc75b2dbd
Binary files /dev/null and b/sound/direct_sound_samples/cries/aggron.wav differ
diff --git a/sound/direct_sound_samples/cries/aipom.aif b/sound/direct_sound_samples/cries/aipom.aif
deleted file mode 100644
index 5ca276de2..000000000
Binary files a/sound/direct_sound_samples/cries/aipom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/aipom.wav b/sound/direct_sound_samples/cries/aipom.wav
new file mode 100644
index 000000000..4d7bc829c
Binary files /dev/null and b/sound/direct_sound_samples/cries/aipom.wav differ
diff --git a/sound/direct_sound_samples/cries/alakazam.aif b/sound/direct_sound_samples/cries/alakazam.aif
deleted file mode 100644
index 920e2ff94..000000000
Binary files a/sound/direct_sound_samples/cries/alakazam.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/alakazam.wav b/sound/direct_sound_samples/cries/alakazam.wav
new file mode 100644
index 000000000..f397363d1
Binary files /dev/null and b/sound/direct_sound_samples/cries/alakazam.wav differ
diff --git a/sound/direct_sound_samples/cries/altaria.aif b/sound/direct_sound_samples/cries/altaria.aif
deleted file mode 100644
index 3e8e35e8e..000000000
Binary files a/sound/direct_sound_samples/cries/altaria.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/altaria.wav b/sound/direct_sound_samples/cries/altaria.wav
new file mode 100644
index 000000000..ca35cbf51
Binary files /dev/null and b/sound/direct_sound_samples/cries/altaria.wav differ
diff --git a/sound/direct_sound_samples/cries/ampharos.aif b/sound/direct_sound_samples/cries/ampharos.aif
deleted file mode 100644
index 4f6e255a0..000000000
Binary files a/sound/direct_sound_samples/cries/ampharos.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ampharos.wav b/sound/direct_sound_samples/cries/ampharos.wav
new file mode 100644
index 000000000..346b2aa48
Binary files /dev/null and b/sound/direct_sound_samples/cries/ampharos.wav differ
diff --git a/sound/direct_sound_samples/cries/anorith.aif b/sound/direct_sound_samples/cries/anorith.aif
deleted file mode 100644
index 96e87e919..000000000
Binary files a/sound/direct_sound_samples/cries/anorith.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/anorith.wav b/sound/direct_sound_samples/cries/anorith.wav
new file mode 100644
index 000000000..349ffacf0
Binary files /dev/null and b/sound/direct_sound_samples/cries/anorith.wav differ
diff --git a/sound/direct_sound_samples/cries/arbok.aif b/sound/direct_sound_samples/cries/arbok.aif
deleted file mode 100644
index 6ccace9f9..000000000
Binary files a/sound/direct_sound_samples/cries/arbok.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/arbok.wav b/sound/direct_sound_samples/cries/arbok.wav
new file mode 100644
index 000000000..cebc9e3e5
Binary files /dev/null and b/sound/direct_sound_samples/cries/arbok.wav differ
diff --git a/sound/direct_sound_samples/cries/arcanine.aif b/sound/direct_sound_samples/cries/arcanine.aif
deleted file mode 100644
index 61d802153..000000000
Binary files a/sound/direct_sound_samples/cries/arcanine.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/arcanine.wav b/sound/direct_sound_samples/cries/arcanine.wav
new file mode 100644
index 000000000..f6e3e3680
Binary files /dev/null and b/sound/direct_sound_samples/cries/arcanine.wav differ
diff --git a/sound/direct_sound_samples/cries/ariados.aif b/sound/direct_sound_samples/cries/ariados.aif
deleted file mode 100644
index 1748624fb..000000000
Binary files a/sound/direct_sound_samples/cries/ariados.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ariados.wav b/sound/direct_sound_samples/cries/ariados.wav
new file mode 100644
index 000000000..f059bcfc9
Binary files /dev/null and b/sound/direct_sound_samples/cries/ariados.wav differ
diff --git a/sound/direct_sound_samples/cries/armaldo.aif b/sound/direct_sound_samples/cries/armaldo.aif
deleted file mode 100644
index 756bf0842..000000000
Binary files a/sound/direct_sound_samples/cries/armaldo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/armaldo.wav b/sound/direct_sound_samples/cries/armaldo.wav
new file mode 100644
index 000000000..de1179566
Binary files /dev/null and b/sound/direct_sound_samples/cries/armaldo.wav differ
diff --git a/sound/direct_sound_samples/cries/aron.aif b/sound/direct_sound_samples/cries/aron.aif
deleted file mode 100644
index cce70b73b..000000000
Binary files a/sound/direct_sound_samples/cries/aron.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/aron.wav b/sound/direct_sound_samples/cries/aron.wav
new file mode 100644
index 000000000..35c69f8dc
Binary files /dev/null and b/sound/direct_sound_samples/cries/aron.wav differ
diff --git a/sound/direct_sound_samples/cries/articuno.aif b/sound/direct_sound_samples/cries/articuno.aif
deleted file mode 100644
index 4f237dd0f..000000000
Binary files a/sound/direct_sound_samples/cries/articuno.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/articuno.wav b/sound/direct_sound_samples/cries/articuno.wav
new file mode 100644
index 000000000..348fbcd2f
Binary files /dev/null and b/sound/direct_sound_samples/cries/articuno.wav differ
diff --git a/sound/direct_sound_samples/cries/azumarill.aif b/sound/direct_sound_samples/cries/azumarill.aif
deleted file mode 100644
index 18411f93c..000000000
Binary files a/sound/direct_sound_samples/cries/azumarill.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/azumarill.wav b/sound/direct_sound_samples/cries/azumarill.wav
new file mode 100644
index 000000000..f9e9ed89a
Binary files /dev/null and b/sound/direct_sound_samples/cries/azumarill.wav differ
diff --git a/sound/direct_sound_samples/cries/azurill.aif b/sound/direct_sound_samples/cries/azurill.aif
deleted file mode 100644
index 7f651c3d3..000000000
Binary files a/sound/direct_sound_samples/cries/azurill.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/azurill.wav b/sound/direct_sound_samples/cries/azurill.wav
new file mode 100644
index 000000000..65fa56e65
Binary files /dev/null and b/sound/direct_sound_samples/cries/azurill.wav differ
diff --git a/sound/direct_sound_samples/cries/bagon.aif b/sound/direct_sound_samples/cries/bagon.aif
deleted file mode 100644
index 3843fb9f4..000000000
Binary files a/sound/direct_sound_samples/cries/bagon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bagon.wav b/sound/direct_sound_samples/cries/bagon.wav
new file mode 100644
index 000000000..af36a96eb
Binary files /dev/null and b/sound/direct_sound_samples/cries/bagon.wav differ
diff --git a/sound/direct_sound_samples/cries/baltoy.aif b/sound/direct_sound_samples/cries/baltoy.aif
deleted file mode 100644
index 25e1a708a..000000000
Binary files a/sound/direct_sound_samples/cries/baltoy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/baltoy.wav b/sound/direct_sound_samples/cries/baltoy.wav
new file mode 100644
index 000000000..395954b56
Binary files /dev/null and b/sound/direct_sound_samples/cries/baltoy.wav differ
diff --git a/sound/direct_sound_samples/cries/banette.aif b/sound/direct_sound_samples/cries/banette.aif
deleted file mode 100644
index 23713f1b5..000000000
Binary files a/sound/direct_sound_samples/cries/banette.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/banette.wav b/sound/direct_sound_samples/cries/banette.wav
new file mode 100644
index 000000000..f030fb66c
Binary files /dev/null and b/sound/direct_sound_samples/cries/banette.wav differ
diff --git a/sound/direct_sound_samples/cries/barboach.aif b/sound/direct_sound_samples/cries/barboach.aif
deleted file mode 100644
index 4b9228259..000000000
Binary files a/sound/direct_sound_samples/cries/barboach.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/barboach.wav b/sound/direct_sound_samples/cries/barboach.wav
new file mode 100644
index 000000000..40539ce51
Binary files /dev/null and b/sound/direct_sound_samples/cries/barboach.wav differ
diff --git a/sound/direct_sound_samples/cries/bayleef.aif b/sound/direct_sound_samples/cries/bayleef.aif
deleted file mode 100644
index 8cef22df3..000000000
Binary files a/sound/direct_sound_samples/cries/bayleef.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bayleef.wav b/sound/direct_sound_samples/cries/bayleef.wav
new file mode 100644
index 000000000..754e6e6e6
Binary files /dev/null and b/sound/direct_sound_samples/cries/bayleef.wav differ
diff --git a/sound/direct_sound_samples/cries/beautifly.aif b/sound/direct_sound_samples/cries/beautifly.aif
deleted file mode 100644
index 0924b6c55..000000000
Binary files a/sound/direct_sound_samples/cries/beautifly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/beautifly.wav b/sound/direct_sound_samples/cries/beautifly.wav
new file mode 100644
index 000000000..f9c3f26a5
Binary files /dev/null and b/sound/direct_sound_samples/cries/beautifly.wav differ
diff --git a/sound/direct_sound_samples/cries/beedrill.aif b/sound/direct_sound_samples/cries/beedrill.aif
deleted file mode 100644
index 00d0bc96c..000000000
Binary files a/sound/direct_sound_samples/cries/beedrill.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/beedrill.wav b/sound/direct_sound_samples/cries/beedrill.wav
new file mode 100644
index 000000000..6ba426bae
Binary files /dev/null and b/sound/direct_sound_samples/cries/beedrill.wav differ
diff --git a/sound/direct_sound_samples/cries/beldum.aif b/sound/direct_sound_samples/cries/beldum.aif
deleted file mode 100644
index 76435a6a8..000000000
Binary files a/sound/direct_sound_samples/cries/beldum.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/beldum.wav b/sound/direct_sound_samples/cries/beldum.wav
new file mode 100644
index 000000000..5d6514af4
Binary files /dev/null and b/sound/direct_sound_samples/cries/beldum.wav differ
diff --git a/sound/direct_sound_samples/cries/bellossom.aif b/sound/direct_sound_samples/cries/bellossom.aif
deleted file mode 100644
index 86580df65..000000000
Binary files a/sound/direct_sound_samples/cries/bellossom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bellossom.wav b/sound/direct_sound_samples/cries/bellossom.wav
new file mode 100644
index 000000000..71680c16b
Binary files /dev/null and b/sound/direct_sound_samples/cries/bellossom.wav differ
diff --git a/sound/direct_sound_samples/cries/bellsprout.aif b/sound/direct_sound_samples/cries/bellsprout.aif
deleted file mode 100644
index cfdd7aed2..000000000
Binary files a/sound/direct_sound_samples/cries/bellsprout.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bellsprout.wav b/sound/direct_sound_samples/cries/bellsprout.wav
new file mode 100644
index 000000000..dc7da2e27
Binary files /dev/null and b/sound/direct_sound_samples/cries/bellsprout.wav differ
diff --git a/sound/direct_sound_samples/cries/blastoise.aif b/sound/direct_sound_samples/cries/blastoise.aif
deleted file mode 100644
index 76dac2bcc..000000000
Binary files a/sound/direct_sound_samples/cries/blastoise.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/blastoise.wav b/sound/direct_sound_samples/cries/blastoise.wav
new file mode 100644
index 000000000..fecb7733b
Binary files /dev/null and b/sound/direct_sound_samples/cries/blastoise.wav differ
diff --git a/sound/direct_sound_samples/cries/blaziken.aif b/sound/direct_sound_samples/cries/blaziken.aif
deleted file mode 100644
index 83e5ccf23..000000000
Binary files a/sound/direct_sound_samples/cries/blaziken.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/blaziken.wav b/sound/direct_sound_samples/cries/blaziken.wav
new file mode 100644
index 000000000..b7b663d8e
Binary files /dev/null and b/sound/direct_sound_samples/cries/blaziken.wav differ
diff --git a/sound/direct_sound_samples/cries/blissey.aif b/sound/direct_sound_samples/cries/blissey.aif
deleted file mode 100644
index 897eb3d69..000000000
Binary files a/sound/direct_sound_samples/cries/blissey.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/blissey.wav b/sound/direct_sound_samples/cries/blissey.wav
new file mode 100644
index 000000000..a5012768c
Binary files /dev/null and b/sound/direct_sound_samples/cries/blissey.wav differ
diff --git a/sound/direct_sound_samples/cries/breloom.aif b/sound/direct_sound_samples/cries/breloom.aif
deleted file mode 100644
index ea3f1bb66..000000000
Binary files a/sound/direct_sound_samples/cries/breloom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/breloom.wav b/sound/direct_sound_samples/cries/breloom.wav
new file mode 100644
index 000000000..49f57f53e
Binary files /dev/null and b/sound/direct_sound_samples/cries/breloom.wav differ
diff --git a/sound/direct_sound_samples/cries/bulbasaur.aif b/sound/direct_sound_samples/cries/bulbasaur.aif
deleted file mode 100644
index 040fb1df7..000000000
Binary files a/sound/direct_sound_samples/cries/bulbasaur.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bulbasaur.wav b/sound/direct_sound_samples/cries/bulbasaur.wav
new file mode 100644
index 000000000..77a2d1bd1
Binary files /dev/null and b/sound/direct_sound_samples/cries/bulbasaur.wav differ
diff --git a/sound/direct_sound_samples/cries/butterfree.aif b/sound/direct_sound_samples/cries/butterfree.aif
deleted file mode 100644
index f27616395..000000000
Binary files a/sound/direct_sound_samples/cries/butterfree.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/butterfree.wav b/sound/direct_sound_samples/cries/butterfree.wav
new file mode 100644
index 000000000..796a1afa9
Binary files /dev/null and b/sound/direct_sound_samples/cries/butterfree.wav differ
diff --git a/sound/direct_sound_samples/cries/cacnea.aif b/sound/direct_sound_samples/cries/cacnea.aif
deleted file mode 100644
index 4fd5acd36..000000000
Binary files a/sound/direct_sound_samples/cries/cacnea.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cacnea.wav b/sound/direct_sound_samples/cries/cacnea.wav
new file mode 100644
index 000000000..b2786069b
Binary files /dev/null and b/sound/direct_sound_samples/cries/cacnea.wav differ
diff --git a/sound/direct_sound_samples/cries/cacturne.aif b/sound/direct_sound_samples/cries/cacturne.aif
deleted file mode 100644
index d9fb8fda8..000000000
Binary files a/sound/direct_sound_samples/cries/cacturne.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cacturne.wav b/sound/direct_sound_samples/cries/cacturne.wav
new file mode 100644
index 000000000..34c452522
Binary files /dev/null and b/sound/direct_sound_samples/cries/cacturne.wav differ
diff --git a/sound/direct_sound_samples/cries/camerupt.aif b/sound/direct_sound_samples/cries/camerupt.aif
deleted file mode 100644
index 325df1220..000000000
Binary files a/sound/direct_sound_samples/cries/camerupt.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/camerupt.wav b/sound/direct_sound_samples/cries/camerupt.wav
new file mode 100644
index 000000000..95fdce357
Binary files /dev/null and b/sound/direct_sound_samples/cries/camerupt.wav differ
diff --git a/sound/direct_sound_samples/cries/carvanha.aif b/sound/direct_sound_samples/cries/carvanha.aif
deleted file mode 100644
index c7cdedf91..000000000
Binary files a/sound/direct_sound_samples/cries/carvanha.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/carvanha.wav b/sound/direct_sound_samples/cries/carvanha.wav
new file mode 100644
index 000000000..ae10c3b10
Binary files /dev/null and b/sound/direct_sound_samples/cries/carvanha.wav differ
diff --git a/sound/direct_sound_samples/cries/cascoon.aif b/sound/direct_sound_samples/cries/cascoon.aif
deleted file mode 100644
index 17eef0ee9..000000000
Binary files a/sound/direct_sound_samples/cries/cascoon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cascoon.wav b/sound/direct_sound_samples/cries/cascoon.wav
new file mode 100644
index 000000000..fff0be681
Binary files /dev/null and b/sound/direct_sound_samples/cries/cascoon.wav differ
diff --git a/sound/direct_sound_samples/cries/castform.aif b/sound/direct_sound_samples/cries/castform.aif
deleted file mode 100644
index c10745640..000000000
Binary files a/sound/direct_sound_samples/cries/castform.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/castform.wav b/sound/direct_sound_samples/cries/castform.wav
new file mode 100644
index 000000000..83748d45b
Binary files /dev/null and b/sound/direct_sound_samples/cries/castform.wav differ
diff --git a/sound/direct_sound_samples/cries/caterpie.aif b/sound/direct_sound_samples/cries/caterpie.aif
deleted file mode 100644
index b0b246b4f..000000000
Binary files a/sound/direct_sound_samples/cries/caterpie.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/caterpie.wav b/sound/direct_sound_samples/cries/caterpie.wav
new file mode 100644
index 000000000..ccdf1ba1a
Binary files /dev/null and b/sound/direct_sound_samples/cries/caterpie.wav differ
diff --git a/sound/direct_sound_samples/cries/celebi.aif b/sound/direct_sound_samples/cries/celebi.aif
deleted file mode 100644
index 9f9f3ea39..000000000
Binary files a/sound/direct_sound_samples/cries/celebi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/celebi.wav b/sound/direct_sound_samples/cries/celebi.wav
new file mode 100644
index 000000000..e217a99e8
Binary files /dev/null and b/sound/direct_sound_samples/cries/celebi.wav differ
diff --git a/sound/direct_sound_samples/cries/chansey.aif b/sound/direct_sound_samples/cries/chansey.aif
deleted file mode 100644
index d764c86ce..000000000
Binary files a/sound/direct_sound_samples/cries/chansey.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chansey.wav b/sound/direct_sound_samples/cries/chansey.wav
new file mode 100644
index 000000000..62d8e6cd9
Binary files /dev/null and b/sound/direct_sound_samples/cries/chansey.wav differ
diff --git a/sound/direct_sound_samples/cries/charizard.aif b/sound/direct_sound_samples/cries/charizard.aif
deleted file mode 100644
index 48321b792..000000000
Binary files a/sound/direct_sound_samples/cries/charizard.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/charizard.wav b/sound/direct_sound_samples/cries/charizard.wav
new file mode 100644
index 000000000..fbbf3c555
Binary files /dev/null and b/sound/direct_sound_samples/cries/charizard.wav differ
diff --git a/sound/direct_sound_samples/cries/charmander.aif b/sound/direct_sound_samples/cries/charmander.aif
deleted file mode 100644
index d72c0f9e0..000000000
Binary files a/sound/direct_sound_samples/cries/charmander.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/charmander.wav b/sound/direct_sound_samples/cries/charmander.wav
new file mode 100644
index 000000000..3d82aca2f
Binary files /dev/null and b/sound/direct_sound_samples/cries/charmander.wav differ
diff --git a/sound/direct_sound_samples/cries/charmeleon.aif b/sound/direct_sound_samples/cries/charmeleon.aif
deleted file mode 100644
index 8e84af0d8..000000000
Binary files a/sound/direct_sound_samples/cries/charmeleon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/charmeleon.wav b/sound/direct_sound_samples/cries/charmeleon.wav
new file mode 100644
index 000000000..a491f0586
Binary files /dev/null and b/sound/direct_sound_samples/cries/charmeleon.wav differ
diff --git a/sound/direct_sound_samples/cries/chikorita.aif b/sound/direct_sound_samples/cries/chikorita.aif
deleted file mode 100644
index 67ceafdc3..000000000
Binary files a/sound/direct_sound_samples/cries/chikorita.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chikorita.wav b/sound/direct_sound_samples/cries/chikorita.wav
new file mode 100644
index 000000000..65cb0c176
Binary files /dev/null and b/sound/direct_sound_samples/cries/chikorita.wav differ
diff --git a/sound/direct_sound_samples/cries/chimecho.aif b/sound/direct_sound_samples/cries/chimecho.aif
deleted file mode 100644
index 87ee2faee..000000000
Binary files a/sound/direct_sound_samples/cries/chimecho.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chimecho.wav b/sound/direct_sound_samples/cries/chimecho.wav
new file mode 100644
index 000000000..a063bf739
Binary files /dev/null and b/sound/direct_sound_samples/cries/chimecho.wav differ
diff --git a/sound/direct_sound_samples/cries/chinchou.aif b/sound/direct_sound_samples/cries/chinchou.aif
deleted file mode 100644
index 356475678..000000000
Binary files a/sound/direct_sound_samples/cries/chinchou.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chinchou.wav b/sound/direct_sound_samples/cries/chinchou.wav
new file mode 100644
index 000000000..882299682
Binary files /dev/null and b/sound/direct_sound_samples/cries/chinchou.wav differ
diff --git a/sound/direct_sound_samples/cries/clamperl.aif b/sound/direct_sound_samples/cries/clamperl.aif
deleted file mode 100644
index 7250bd703..000000000
Binary files a/sound/direct_sound_samples/cries/clamperl.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/clamperl.wav b/sound/direct_sound_samples/cries/clamperl.wav
new file mode 100644
index 000000000..6615de877
Binary files /dev/null and b/sound/direct_sound_samples/cries/clamperl.wav differ
diff --git a/sound/direct_sound_samples/cries/claydol.aif b/sound/direct_sound_samples/cries/claydol.aif
deleted file mode 100644
index b89772021..000000000
Binary files a/sound/direct_sound_samples/cries/claydol.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/claydol.wav b/sound/direct_sound_samples/cries/claydol.wav
new file mode 100644
index 000000000..037a9a406
Binary files /dev/null and b/sound/direct_sound_samples/cries/claydol.wav differ
diff --git a/sound/direct_sound_samples/cries/clefable.aif b/sound/direct_sound_samples/cries/clefable.aif
deleted file mode 100644
index 9c2d8c664..000000000
Binary files a/sound/direct_sound_samples/cries/clefable.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/clefable.wav b/sound/direct_sound_samples/cries/clefable.wav
new file mode 100644
index 000000000..09b0d19b8
Binary files /dev/null and b/sound/direct_sound_samples/cries/clefable.wav differ
diff --git a/sound/direct_sound_samples/cries/clefairy.aif b/sound/direct_sound_samples/cries/clefairy.aif
deleted file mode 100644
index c370c4a9b..000000000
Binary files a/sound/direct_sound_samples/cries/clefairy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/clefairy.wav b/sound/direct_sound_samples/cries/clefairy.wav
new file mode 100644
index 000000000..b447b700c
Binary files /dev/null and b/sound/direct_sound_samples/cries/clefairy.wav differ
diff --git a/sound/direct_sound_samples/cries/cleffa.aif b/sound/direct_sound_samples/cries/cleffa.aif
deleted file mode 100644
index b27cdeca9..000000000
Binary files a/sound/direct_sound_samples/cries/cleffa.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cleffa.wav b/sound/direct_sound_samples/cries/cleffa.wav
new file mode 100644
index 000000000..53d18df41
Binary files /dev/null and b/sound/direct_sound_samples/cries/cleffa.wav differ
diff --git a/sound/direct_sound_samples/cries/cloyster.aif b/sound/direct_sound_samples/cries/cloyster.aif
deleted file mode 100644
index b406deab0..000000000
Binary files a/sound/direct_sound_samples/cries/cloyster.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cloyster.wav b/sound/direct_sound_samples/cries/cloyster.wav
new file mode 100644
index 000000000..4fc766ae1
Binary files /dev/null and b/sound/direct_sound_samples/cries/cloyster.wav differ
diff --git a/sound/direct_sound_samples/cries/combusken.aif b/sound/direct_sound_samples/cries/combusken.aif
deleted file mode 100644
index 7d4b0d4cc..000000000
Binary files a/sound/direct_sound_samples/cries/combusken.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/combusken.wav b/sound/direct_sound_samples/cries/combusken.wav
new file mode 100644
index 000000000..8da9de64a
Binary files /dev/null and b/sound/direct_sound_samples/cries/combusken.wav differ
diff --git a/sound/direct_sound_samples/cries/corphish.aif b/sound/direct_sound_samples/cries/corphish.aif
deleted file mode 100644
index f0f5ca01e..000000000
Binary files a/sound/direct_sound_samples/cries/corphish.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/corphish.wav b/sound/direct_sound_samples/cries/corphish.wav
new file mode 100644
index 000000000..990029d33
Binary files /dev/null and b/sound/direct_sound_samples/cries/corphish.wav differ
diff --git a/sound/direct_sound_samples/cries/corsola.aif b/sound/direct_sound_samples/cries/corsola.aif
deleted file mode 100644
index 68e743bfd..000000000
Binary files a/sound/direct_sound_samples/cries/corsola.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/corsola.wav b/sound/direct_sound_samples/cries/corsola.wav
new file mode 100644
index 000000000..890208bc7
Binary files /dev/null and b/sound/direct_sound_samples/cries/corsola.wav differ
diff --git a/sound/direct_sound_samples/cries/cradily.aif b/sound/direct_sound_samples/cries/cradily.aif
deleted file mode 100644
index 197dc8d92..000000000
Binary files a/sound/direct_sound_samples/cries/cradily.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cradily.wav b/sound/direct_sound_samples/cries/cradily.wav
new file mode 100644
index 000000000..bb9d5bd42
Binary files /dev/null and b/sound/direct_sound_samples/cries/cradily.wav differ
diff --git a/sound/direct_sound_samples/cries/crawdaunt.aif b/sound/direct_sound_samples/cries/crawdaunt.aif
deleted file mode 100644
index a203ce2fb..000000000
Binary files a/sound/direct_sound_samples/cries/crawdaunt.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/crawdaunt.wav b/sound/direct_sound_samples/cries/crawdaunt.wav
new file mode 100644
index 000000000..e270a3179
Binary files /dev/null and b/sound/direct_sound_samples/cries/crawdaunt.wav differ
diff --git a/sound/direct_sound_samples/cries/crobat.aif b/sound/direct_sound_samples/cries/crobat.aif
deleted file mode 100644
index 75d039bd8..000000000
Binary files a/sound/direct_sound_samples/cries/crobat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/crobat.wav b/sound/direct_sound_samples/cries/crobat.wav
new file mode 100644
index 000000000..fdad8d4a6
Binary files /dev/null and b/sound/direct_sound_samples/cries/crobat.wav differ
diff --git a/sound/direct_sound_samples/cries/croconaw.aif b/sound/direct_sound_samples/cries/croconaw.aif
deleted file mode 100644
index afb7f3fdc..000000000
Binary files a/sound/direct_sound_samples/cries/croconaw.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/croconaw.wav b/sound/direct_sound_samples/cries/croconaw.wav
new file mode 100644
index 000000000..deb2a7003
Binary files /dev/null and b/sound/direct_sound_samples/cries/croconaw.wav differ
diff --git a/sound/direct_sound_samples/cries/cubone.aif b/sound/direct_sound_samples/cries/cubone.aif
deleted file mode 100644
index 170745da1..000000000
Binary files a/sound/direct_sound_samples/cries/cubone.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cubone.wav b/sound/direct_sound_samples/cries/cubone.wav
new file mode 100644
index 000000000..b198c2540
Binary files /dev/null and b/sound/direct_sound_samples/cries/cubone.wav differ
diff --git a/sound/direct_sound_samples/cries/cyndaquil.aif b/sound/direct_sound_samples/cries/cyndaquil.aif
deleted file mode 100644
index 4aa580199..000000000
Binary files a/sound/direct_sound_samples/cries/cyndaquil.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cyndaquil.wav b/sound/direct_sound_samples/cries/cyndaquil.wav
new file mode 100644
index 000000000..87921c52e
Binary files /dev/null and b/sound/direct_sound_samples/cries/cyndaquil.wav differ
diff --git a/sound/direct_sound_samples/cries/delcatty.aif b/sound/direct_sound_samples/cries/delcatty.aif
deleted file mode 100644
index dd665b110..000000000
Binary files a/sound/direct_sound_samples/cries/delcatty.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/delcatty.wav b/sound/direct_sound_samples/cries/delcatty.wav
new file mode 100644
index 000000000..dce5e73b7
Binary files /dev/null and b/sound/direct_sound_samples/cries/delcatty.wav differ
diff --git a/sound/direct_sound_samples/cries/delibird.aif b/sound/direct_sound_samples/cries/delibird.aif
deleted file mode 100644
index dbedc42d4..000000000
Binary files a/sound/direct_sound_samples/cries/delibird.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/delibird.wav b/sound/direct_sound_samples/cries/delibird.wav
new file mode 100644
index 000000000..7ccf645de
Binary files /dev/null and b/sound/direct_sound_samples/cries/delibird.wav differ
diff --git a/sound/direct_sound_samples/cries/deoxys.aif b/sound/direct_sound_samples/cries/deoxys.aif
deleted file mode 100644
index b9623b337..000000000
Binary files a/sound/direct_sound_samples/cries/deoxys.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/deoxys.wav b/sound/direct_sound_samples/cries/deoxys.wav
new file mode 100644
index 000000000..7ed0f65cc
Binary files /dev/null and b/sound/direct_sound_samples/cries/deoxys.wav differ
diff --git a/sound/direct_sound_samples/cries/dewgong.aif b/sound/direct_sound_samples/cries/dewgong.aif
deleted file mode 100644
index 72d69b773..000000000
Binary files a/sound/direct_sound_samples/cries/dewgong.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dewgong.wav b/sound/direct_sound_samples/cries/dewgong.wav
new file mode 100644
index 000000000..24af04411
Binary files /dev/null and b/sound/direct_sound_samples/cries/dewgong.wav differ
diff --git a/sound/direct_sound_samples/cries/diglett.aif b/sound/direct_sound_samples/cries/diglett.aif
deleted file mode 100644
index b116af7f2..000000000
Binary files a/sound/direct_sound_samples/cries/diglett.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/diglett.wav b/sound/direct_sound_samples/cries/diglett.wav
new file mode 100644
index 000000000..8eecd3bed
Binary files /dev/null and b/sound/direct_sound_samples/cries/diglett.wav differ
diff --git a/sound/direct_sound_samples/cries/ditto.aif b/sound/direct_sound_samples/cries/ditto.aif
deleted file mode 100644
index 2c797f4c4..000000000
Binary files a/sound/direct_sound_samples/cries/ditto.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ditto.wav b/sound/direct_sound_samples/cries/ditto.wav
new file mode 100644
index 000000000..bbd9d0280
Binary files /dev/null and b/sound/direct_sound_samples/cries/ditto.wav differ
diff --git a/sound/direct_sound_samples/cries/dodrio.aif b/sound/direct_sound_samples/cries/dodrio.aif
deleted file mode 100644
index 111d8bf3e..000000000
Binary files a/sound/direct_sound_samples/cries/dodrio.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dodrio.wav b/sound/direct_sound_samples/cries/dodrio.wav
new file mode 100644
index 000000000..e43a8a977
Binary files /dev/null and b/sound/direct_sound_samples/cries/dodrio.wav differ
diff --git a/sound/direct_sound_samples/cries/doduo.aif b/sound/direct_sound_samples/cries/doduo.aif
deleted file mode 100644
index 5700b91d9..000000000
Binary files a/sound/direct_sound_samples/cries/doduo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/doduo.wav b/sound/direct_sound_samples/cries/doduo.wav
new file mode 100644
index 000000000..065e9fd62
Binary files /dev/null and b/sound/direct_sound_samples/cries/doduo.wav differ
diff --git a/sound/direct_sound_samples/cries/donphan.aif b/sound/direct_sound_samples/cries/donphan.aif
deleted file mode 100644
index a41c124b1..000000000
Binary files a/sound/direct_sound_samples/cries/donphan.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/donphan.wav b/sound/direct_sound_samples/cries/donphan.wav
new file mode 100644
index 000000000..ba6caf5bd
Binary files /dev/null and b/sound/direct_sound_samples/cries/donphan.wav differ
diff --git a/sound/direct_sound_samples/cries/dragonair.aif b/sound/direct_sound_samples/cries/dragonair.aif
deleted file mode 100644
index 38c3955ef..000000000
Binary files a/sound/direct_sound_samples/cries/dragonair.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dragonair.wav b/sound/direct_sound_samples/cries/dragonair.wav
new file mode 100644
index 000000000..3fd2efee2
Binary files /dev/null and b/sound/direct_sound_samples/cries/dragonair.wav differ
diff --git a/sound/direct_sound_samples/cries/dragonite.aif b/sound/direct_sound_samples/cries/dragonite.aif
deleted file mode 100644
index d1e7b11cf..000000000
Binary files a/sound/direct_sound_samples/cries/dragonite.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dragonite.wav b/sound/direct_sound_samples/cries/dragonite.wav
new file mode 100644
index 000000000..8517e0da0
Binary files /dev/null and b/sound/direct_sound_samples/cries/dragonite.wav differ
diff --git a/sound/direct_sound_samples/cries/dratini.aif b/sound/direct_sound_samples/cries/dratini.aif
deleted file mode 100644
index 298497480..000000000
Binary files a/sound/direct_sound_samples/cries/dratini.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dratini.wav b/sound/direct_sound_samples/cries/dratini.wav
new file mode 100644
index 000000000..711c6b9a3
Binary files /dev/null and b/sound/direct_sound_samples/cries/dratini.wav differ
diff --git a/sound/direct_sound_samples/cries/drowzee.aif b/sound/direct_sound_samples/cries/drowzee.aif
deleted file mode 100644
index 0d53eb2ff..000000000
Binary files a/sound/direct_sound_samples/cries/drowzee.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/drowzee.wav b/sound/direct_sound_samples/cries/drowzee.wav
new file mode 100644
index 000000000..413210966
Binary files /dev/null and b/sound/direct_sound_samples/cries/drowzee.wav differ
diff --git a/sound/direct_sound_samples/cries/dugtrio.aif b/sound/direct_sound_samples/cries/dugtrio.aif
deleted file mode 100644
index dff573dfe..000000000
Binary files a/sound/direct_sound_samples/cries/dugtrio.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dugtrio.wav b/sound/direct_sound_samples/cries/dugtrio.wav
new file mode 100644
index 000000000..d159a2fae
Binary files /dev/null and b/sound/direct_sound_samples/cries/dugtrio.wav differ
diff --git a/sound/direct_sound_samples/cries/dunsparce.aif b/sound/direct_sound_samples/cries/dunsparce.aif
deleted file mode 100644
index 454617c05..000000000
Binary files a/sound/direct_sound_samples/cries/dunsparce.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dunsparce.wav b/sound/direct_sound_samples/cries/dunsparce.wav
new file mode 100644
index 000000000..5154546d1
Binary files /dev/null and b/sound/direct_sound_samples/cries/dunsparce.wav differ
diff --git a/sound/direct_sound_samples/cries/dusclops.aif b/sound/direct_sound_samples/cries/dusclops.aif
deleted file mode 100644
index de9657e4f..000000000
Binary files a/sound/direct_sound_samples/cries/dusclops.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dusclops.wav b/sound/direct_sound_samples/cries/dusclops.wav
new file mode 100644
index 000000000..81353887b
Binary files /dev/null and b/sound/direct_sound_samples/cries/dusclops.wav differ
diff --git a/sound/direct_sound_samples/cries/duskull.aif b/sound/direct_sound_samples/cries/duskull.aif
deleted file mode 100644
index d84ea274e..000000000
Binary files a/sound/direct_sound_samples/cries/duskull.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/duskull.wav b/sound/direct_sound_samples/cries/duskull.wav
new file mode 100644
index 000000000..eba8fc3ff
Binary files /dev/null and b/sound/direct_sound_samples/cries/duskull.wav differ
diff --git a/sound/direct_sound_samples/cries/dustox.aif b/sound/direct_sound_samples/cries/dustox.aif
deleted file mode 100644
index 56d8eb336..000000000
Binary files a/sound/direct_sound_samples/cries/dustox.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dustox.wav b/sound/direct_sound_samples/cries/dustox.wav
new file mode 100644
index 000000000..42f23c128
Binary files /dev/null and b/sound/direct_sound_samples/cries/dustox.wav differ
diff --git a/sound/direct_sound_samples/cries/eevee.aif b/sound/direct_sound_samples/cries/eevee.aif
deleted file mode 100644
index 8711a1470..000000000
Binary files a/sound/direct_sound_samples/cries/eevee.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/eevee.wav b/sound/direct_sound_samples/cries/eevee.wav
new file mode 100644
index 000000000..e21ce1f0e
Binary files /dev/null and b/sound/direct_sound_samples/cries/eevee.wav differ
diff --git a/sound/direct_sound_samples/cries/ekans.aif b/sound/direct_sound_samples/cries/ekans.aif
deleted file mode 100644
index 9eb396735..000000000
Binary files a/sound/direct_sound_samples/cries/ekans.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ekans.wav b/sound/direct_sound_samples/cries/ekans.wav
new file mode 100644
index 000000000..2ae3e4a18
Binary files /dev/null and b/sound/direct_sound_samples/cries/ekans.wav differ
diff --git a/sound/direct_sound_samples/cries/electabuzz.aif b/sound/direct_sound_samples/cries/electabuzz.aif
deleted file mode 100644
index 5abdb49b7..000000000
Binary files a/sound/direct_sound_samples/cries/electabuzz.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/electabuzz.wav b/sound/direct_sound_samples/cries/electabuzz.wav
new file mode 100644
index 000000000..b555d6631
Binary files /dev/null and b/sound/direct_sound_samples/cries/electabuzz.wav differ
diff --git a/sound/direct_sound_samples/cries/electrike.aif b/sound/direct_sound_samples/cries/electrike.aif
deleted file mode 100644
index 56c9666df..000000000
Binary files a/sound/direct_sound_samples/cries/electrike.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/electrike.wav b/sound/direct_sound_samples/cries/electrike.wav
new file mode 100644
index 000000000..8a210865b
Binary files /dev/null and b/sound/direct_sound_samples/cries/electrike.wav differ
diff --git a/sound/direct_sound_samples/cries/electrode.aif b/sound/direct_sound_samples/cries/electrode.aif
deleted file mode 100644
index cbd7f0971..000000000
Binary files a/sound/direct_sound_samples/cries/electrode.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/electrode.wav b/sound/direct_sound_samples/cries/electrode.wav
new file mode 100644
index 000000000..8f2852146
Binary files /dev/null and b/sound/direct_sound_samples/cries/electrode.wav differ
diff --git a/sound/direct_sound_samples/cries/elekid.aif b/sound/direct_sound_samples/cries/elekid.aif
deleted file mode 100644
index 839bdee17..000000000
Binary files a/sound/direct_sound_samples/cries/elekid.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/elekid.wav b/sound/direct_sound_samples/cries/elekid.wav
new file mode 100644
index 000000000..82a9a2f67
Binary files /dev/null and b/sound/direct_sound_samples/cries/elekid.wav differ
diff --git a/sound/direct_sound_samples/cries/entei.aif b/sound/direct_sound_samples/cries/entei.aif
deleted file mode 100644
index 56a740207..000000000
Binary files a/sound/direct_sound_samples/cries/entei.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/entei.wav b/sound/direct_sound_samples/cries/entei.wav
new file mode 100644
index 000000000..cf7e9c0c2
Binary files /dev/null and b/sound/direct_sound_samples/cries/entei.wav differ
diff --git a/sound/direct_sound_samples/cries/espeon.aif b/sound/direct_sound_samples/cries/espeon.aif
deleted file mode 100644
index 53dc62f4d..000000000
Binary files a/sound/direct_sound_samples/cries/espeon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/espeon.wav b/sound/direct_sound_samples/cries/espeon.wav
new file mode 100644
index 000000000..20743268e
Binary files /dev/null and b/sound/direct_sound_samples/cries/espeon.wav differ
diff --git a/sound/direct_sound_samples/cries/exeggcute.aif b/sound/direct_sound_samples/cries/exeggcute.aif
deleted file mode 100644
index 147912c2f..000000000
Binary files a/sound/direct_sound_samples/cries/exeggcute.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/exeggcute.wav b/sound/direct_sound_samples/cries/exeggcute.wav
new file mode 100644
index 000000000..bfd825f80
Binary files /dev/null and b/sound/direct_sound_samples/cries/exeggcute.wav differ
diff --git a/sound/direct_sound_samples/cries/exeggutor.aif b/sound/direct_sound_samples/cries/exeggutor.aif
deleted file mode 100644
index c0b9177bf..000000000
Binary files a/sound/direct_sound_samples/cries/exeggutor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/exeggutor.wav b/sound/direct_sound_samples/cries/exeggutor.wav
new file mode 100644
index 000000000..f2a0d6bed
Binary files /dev/null and b/sound/direct_sound_samples/cries/exeggutor.wav differ
diff --git a/sound/direct_sound_samples/cries/exploud.aif b/sound/direct_sound_samples/cries/exploud.aif
deleted file mode 100644
index 5b80870cc..000000000
Binary files a/sound/direct_sound_samples/cries/exploud.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/exploud.wav b/sound/direct_sound_samples/cries/exploud.wav
new file mode 100644
index 000000000..9b3cbf896
Binary files /dev/null and b/sound/direct_sound_samples/cries/exploud.wav differ
diff --git a/sound/direct_sound_samples/cries/farfetchd.aif b/sound/direct_sound_samples/cries/farfetchd.aif
deleted file mode 100644
index f1db556dc..000000000
Binary files a/sound/direct_sound_samples/cries/farfetchd.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/farfetchd.wav b/sound/direct_sound_samples/cries/farfetchd.wav
new file mode 100644
index 000000000..d090445d4
Binary files /dev/null and b/sound/direct_sound_samples/cries/farfetchd.wav differ
diff --git a/sound/direct_sound_samples/cries/fearow.aif b/sound/direct_sound_samples/cries/fearow.aif
deleted file mode 100644
index 74a76f6d4..000000000
Binary files a/sound/direct_sound_samples/cries/fearow.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/fearow.wav b/sound/direct_sound_samples/cries/fearow.wav
new file mode 100644
index 000000000..6ef7eadee
Binary files /dev/null and b/sound/direct_sound_samples/cries/fearow.wav differ
diff --git a/sound/direct_sound_samples/cries/feebas.aif b/sound/direct_sound_samples/cries/feebas.aif
deleted file mode 100644
index c386522f1..000000000
Binary files a/sound/direct_sound_samples/cries/feebas.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/feebas.wav b/sound/direct_sound_samples/cries/feebas.wav
new file mode 100644
index 000000000..a8f60a55f
Binary files /dev/null and b/sound/direct_sound_samples/cries/feebas.wav differ
diff --git a/sound/direct_sound_samples/cries/feraligatr.aif b/sound/direct_sound_samples/cries/feraligatr.aif
deleted file mode 100644
index 9fcd93cff..000000000
Binary files a/sound/direct_sound_samples/cries/feraligatr.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/feraligatr.wav b/sound/direct_sound_samples/cries/feraligatr.wav
new file mode 100644
index 000000000..d1da192f9
Binary files /dev/null and b/sound/direct_sound_samples/cries/feraligatr.wav differ
diff --git a/sound/direct_sound_samples/cries/flaaffy.aif b/sound/direct_sound_samples/cries/flaaffy.aif
deleted file mode 100644
index 93dfacfaf..000000000
Binary files a/sound/direct_sound_samples/cries/flaaffy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/flaaffy.wav b/sound/direct_sound_samples/cries/flaaffy.wav
new file mode 100644
index 000000000..a0cf3df06
Binary files /dev/null and b/sound/direct_sound_samples/cries/flaaffy.wav differ
diff --git a/sound/direct_sound_samples/cries/flareon.aif b/sound/direct_sound_samples/cries/flareon.aif
deleted file mode 100644
index 58d28e60a..000000000
Binary files a/sound/direct_sound_samples/cries/flareon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/flareon.wav b/sound/direct_sound_samples/cries/flareon.wav
new file mode 100644
index 000000000..6bd51168b
Binary files /dev/null and b/sound/direct_sound_samples/cries/flareon.wav differ
diff --git a/sound/direct_sound_samples/cries/flygon.aif b/sound/direct_sound_samples/cries/flygon.aif
deleted file mode 100644
index c8c377016..000000000
Binary files a/sound/direct_sound_samples/cries/flygon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/flygon.wav b/sound/direct_sound_samples/cries/flygon.wav
new file mode 100644
index 000000000..b6c5d90ba
Binary files /dev/null and b/sound/direct_sound_samples/cries/flygon.wav differ
diff --git a/sound/direct_sound_samples/cries/forretress.aif b/sound/direct_sound_samples/cries/forretress.aif
deleted file mode 100644
index 288dacbea..000000000
Binary files a/sound/direct_sound_samples/cries/forretress.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/forretress.wav b/sound/direct_sound_samples/cries/forretress.wav
new file mode 100644
index 000000000..3f704f65b
Binary files /dev/null and b/sound/direct_sound_samples/cries/forretress.wav differ
diff --git a/sound/direct_sound_samples/cries/furret.aif b/sound/direct_sound_samples/cries/furret.aif
deleted file mode 100644
index 6b4e9ce11..000000000
Binary files a/sound/direct_sound_samples/cries/furret.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/furret.wav b/sound/direct_sound_samples/cries/furret.wav
new file mode 100644
index 000000000..e3e4ec584
Binary files /dev/null and b/sound/direct_sound_samples/cries/furret.wav differ
diff --git a/sound/direct_sound_samples/cries/gardevoir.aif b/sound/direct_sound_samples/cries/gardevoir.aif
deleted file mode 100644
index a14780990..000000000
Binary files a/sound/direct_sound_samples/cries/gardevoir.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gardevoir.wav b/sound/direct_sound_samples/cries/gardevoir.wav
new file mode 100644
index 000000000..bd3a99acc
Binary files /dev/null and b/sound/direct_sound_samples/cries/gardevoir.wav differ
diff --git a/sound/direct_sound_samples/cries/gastly.aif b/sound/direct_sound_samples/cries/gastly.aif
deleted file mode 100644
index 93cef851d..000000000
Binary files a/sound/direct_sound_samples/cries/gastly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gastly.wav b/sound/direct_sound_samples/cries/gastly.wav
new file mode 100644
index 000000000..1bc2ff966
Binary files /dev/null and b/sound/direct_sound_samples/cries/gastly.wav differ
diff --git a/sound/direct_sound_samples/cries/gengar.aif b/sound/direct_sound_samples/cries/gengar.aif
deleted file mode 100644
index 379b5d37e..000000000
Binary files a/sound/direct_sound_samples/cries/gengar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gengar.wav b/sound/direct_sound_samples/cries/gengar.wav
new file mode 100644
index 000000000..9e8c24c28
Binary files /dev/null and b/sound/direct_sound_samples/cries/gengar.wav differ
diff --git a/sound/direct_sound_samples/cries/geodude.aif b/sound/direct_sound_samples/cries/geodude.aif
deleted file mode 100644
index 143b9031c..000000000
Binary files a/sound/direct_sound_samples/cries/geodude.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/geodude.wav b/sound/direct_sound_samples/cries/geodude.wav
new file mode 100644
index 000000000..f355fc7e1
Binary files /dev/null and b/sound/direct_sound_samples/cries/geodude.wav differ
diff --git a/sound/direct_sound_samples/cries/girafarig.aif b/sound/direct_sound_samples/cries/girafarig.aif
deleted file mode 100644
index 1dd5f93e2..000000000
Binary files a/sound/direct_sound_samples/cries/girafarig.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/girafarig.wav b/sound/direct_sound_samples/cries/girafarig.wav
new file mode 100644
index 000000000..d78162a29
Binary files /dev/null and b/sound/direct_sound_samples/cries/girafarig.wav differ
diff --git a/sound/direct_sound_samples/cries/glalie.aif b/sound/direct_sound_samples/cries/glalie.aif
deleted file mode 100644
index e4e896547..000000000
Binary files a/sound/direct_sound_samples/cries/glalie.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/glalie.wav b/sound/direct_sound_samples/cries/glalie.wav
new file mode 100644
index 000000000..bf35bd147
Binary files /dev/null and b/sound/direct_sound_samples/cries/glalie.wav differ
diff --git a/sound/direct_sound_samples/cries/gligar.aif b/sound/direct_sound_samples/cries/gligar.aif
deleted file mode 100644
index 4050f08b0..000000000
Binary files a/sound/direct_sound_samples/cries/gligar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gligar.wav b/sound/direct_sound_samples/cries/gligar.wav
new file mode 100644
index 000000000..8fa3efa6b
Binary files /dev/null and b/sound/direct_sound_samples/cries/gligar.wav differ
diff --git a/sound/direct_sound_samples/cries/gloom.aif b/sound/direct_sound_samples/cries/gloom.aif
deleted file mode 100644
index e930328ac..000000000
Binary files a/sound/direct_sound_samples/cries/gloom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gloom.wav b/sound/direct_sound_samples/cries/gloom.wav
new file mode 100644
index 000000000..abc408a0f
Binary files /dev/null and b/sound/direct_sound_samples/cries/gloom.wav differ
diff --git a/sound/direct_sound_samples/cries/golbat.aif b/sound/direct_sound_samples/cries/golbat.aif
deleted file mode 100644
index 11413df3a..000000000
Binary files a/sound/direct_sound_samples/cries/golbat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/golbat.wav b/sound/direct_sound_samples/cries/golbat.wav
new file mode 100644
index 000000000..20d2ecf5c
Binary files /dev/null and b/sound/direct_sound_samples/cries/golbat.wav differ
diff --git a/sound/direct_sound_samples/cries/goldeen.aif b/sound/direct_sound_samples/cries/goldeen.aif
deleted file mode 100644
index 81fd1ecdf..000000000
Binary files a/sound/direct_sound_samples/cries/goldeen.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/goldeen.wav b/sound/direct_sound_samples/cries/goldeen.wav
new file mode 100644
index 000000000..342df710c
Binary files /dev/null and b/sound/direct_sound_samples/cries/goldeen.wav differ
diff --git a/sound/direct_sound_samples/cries/golduck.aif b/sound/direct_sound_samples/cries/golduck.aif
deleted file mode 100644
index b6b71a7a4..000000000
Binary files a/sound/direct_sound_samples/cries/golduck.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/golduck.wav b/sound/direct_sound_samples/cries/golduck.wav
new file mode 100644
index 000000000..a9bf91b2d
Binary files /dev/null and b/sound/direct_sound_samples/cries/golduck.wav differ
diff --git a/sound/direct_sound_samples/cries/golem.aif b/sound/direct_sound_samples/cries/golem.aif
deleted file mode 100644
index 0d2c4515e..000000000
Binary files a/sound/direct_sound_samples/cries/golem.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/golem.wav b/sound/direct_sound_samples/cries/golem.wav
new file mode 100644
index 000000000..17ed6128e
Binary files /dev/null and b/sound/direct_sound_samples/cries/golem.wav differ
diff --git a/sound/direct_sound_samples/cries/gorebyss.aif b/sound/direct_sound_samples/cries/gorebyss.aif
deleted file mode 100644
index b7605062c..000000000
Binary files a/sound/direct_sound_samples/cries/gorebyss.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gorebyss.wav b/sound/direct_sound_samples/cries/gorebyss.wav
new file mode 100644
index 000000000..3d375f6dc
Binary files /dev/null and b/sound/direct_sound_samples/cries/gorebyss.wav differ
diff --git a/sound/direct_sound_samples/cries/granbull.aif b/sound/direct_sound_samples/cries/granbull.aif
deleted file mode 100644
index 146b3bd0c..000000000
Binary files a/sound/direct_sound_samples/cries/granbull.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/granbull.wav b/sound/direct_sound_samples/cries/granbull.wav
new file mode 100644
index 000000000..959793b72
Binary files /dev/null and b/sound/direct_sound_samples/cries/granbull.wav differ
diff --git a/sound/direct_sound_samples/cries/graveler.aif b/sound/direct_sound_samples/cries/graveler.aif
deleted file mode 100644
index 773994228..000000000
Binary files a/sound/direct_sound_samples/cries/graveler.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/graveler.wav b/sound/direct_sound_samples/cries/graveler.wav
new file mode 100644
index 000000000..6b8591406
Binary files /dev/null and b/sound/direct_sound_samples/cries/graveler.wav differ
diff --git a/sound/direct_sound_samples/cries/grimer.aif b/sound/direct_sound_samples/cries/grimer.aif
deleted file mode 100644
index 95eed1061..000000000
Binary files a/sound/direct_sound_samples/cries/grimer.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/grimer.wav b/sound/direct_sound_samples/cries/grimer.wav
new file mode 100644
index 000000000..092dfeed6
Binary files /dev/null and b/sound/direct_sound_samples/cries/grimer.wav differ
diff --git a/sound/direct_sound_samples/cries/groudon.aif b/sound/direct_sound_samples/cries/groudon.aif
deleted file mode 100644
index 62452b4d9..000000000
Binary files a/sound/direct_sound_samples/cries/groudon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/groudon.wav b/sound/direct_sound_samples/cries/groudon.wav
new file mode 100644
index 000000000..680d0ec04
Binary files /dev/null and b/sound/direct_sound_samples/cries/groudon.wav differ
diff --git a/sound/direct_sound_samples/cries/grovyle.aif b/sound/direct_sound_samples/cries/grovyle.aif
deleted file mode 100644
index 983bcfff3..000000000
Binary files a/sound/direct_sound_samples/cries/grovyle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/grovyle.wav b/sound/direct_sound_samples/cries/grovyle.wav
new file mode 100644
index 000000000..7e2f1acd0
Binary files /dev/null and b/sound/direct_sound_samples/cries/grovyle.wav differ
diff --git a/sound/direct_sound_samples/cries/growlithe.aif b/sound/direct_sound_samples/cries/growlithe.aif
deleted file mode 100644
index 134e29834..000000000
Binary files a/sound/direct_sound_samples/cries/growlithe.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/growlithe.wav b/sound/direct_sound_samples/cries/growlithe.wav
new file mode 100644
index 000000000..3f72ea6f9
Binary files /dev/null and b/sound/direct_sound_samples/cries/growlithe.wav differ
diff --git a/sound/direct_sound_samples/cries/grumpig.aif b/sound/direct_sound_samples/cries/grumpig.aif
deleted file mode 100644
index 97c372076..000000000
Binary files a/sound/direct_sound_samples/cries/grumpig.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/grumpig.wav b/sound/direct_sound_samples/cries/grumpig.wav
new file mode 100644
index 000000000..e9c8157e0
Binary files /dev/null and b/sound/direct_sound_samples/cries/grumpig.wav differ
diff --git a/sound/direct_sound_samples/cries/gulpin.aif b/sound/direct_sound_samples/cries/gulpin.aif
deleted file mode 100644
index f3043b422..000000000
Binary files a/sound/direct_sound_samples/cries/gulpin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gulpin.wav b/sound/direct_sound_samples/cries/gulpin.wav
new file mode 100644
index 000000000..d1ab06b6b
Binary files /dev/null and b/sound/direct_sound_samples/cries/gulpin.wav differ
diff --git a/sound/direct_sound_samples/cries/gyarados.aif b/sound/direct_sound_samples/cries/gyarados.aif
deleted file mode 100644
index 238b6d721..000000000
Binary files a/sound/direct_sound_samples/cries/gyarados.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gyarados.wav b/sound/direct_sound_samples/cries/gyarados.wav
new file mode 100644
index 000000000..6a4124085
Binary files /dev/null and b/sound/direct_sound_samples/cries/gyarados.wav differ
diff --git a/sound/direct_sound_samples/cries/hariyama.aif b/sound/direct_sound_samples/cries/hariyama.aif
deleted file mode 100644
index 1ac1f3f7e..000000000
Binary files a/sound/direct_sound_samples/cries/hariyama.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hariyama.wav b/sound/direct_sound_samples/cries/hariyama.wav
new file mode 100644
index 000000000..5567aae3a
Binary files /dev/null and b/sound/direct_sound_samples/cries/hariyama.wav differ
diff --git a/sound/direct_sound_samples/cries/haunter.aif b/sound/direct_sound_samples/cries/haunter.aif
deleted file mode 100644
index 60ec72171..000000000
Binary files a/sound/direct_sound_samples/cries/haunter.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/haunter.wav b/sound/direct_sound_samples/cries/haunter.wav
new file mode 100644
index 000000000..e22b1cfc1
Binary files /dev/null and b/sound/direct_sound_samples/cries/haunter.wav differ
diff --git a/sound/direct_sound_samples/cries/heracross.aif b/sound/direct_sound_samples/cries/heracross.aif
deleted file mode 100644
index a0734748f..000000000
Binary files a/sound/direct_sound_samples/cries/heracross.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/heracross.wav b/sound/direct_sound_samples/cries/heracross.wav
new file mode 100644
index 000000000..ed68648ba
Binary files /dev/null and b/sound/direct_sound_samples/cries/heracross.wav differ
diff --git a/sound/direct_sound_samples/cries/hitmonchan.aif b/sound/direct_sound_samples/cries/hitmonchan.aif
deleted file mode 100644
index 40479452c..000000000
Binary files a/sound/direct_sound_samples/cries/hitmonchan.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hitmonchan.wav b/sound/direct_sound_samples/cries/hitmonchan.wav
new file mode 100644
index 000000000..806d206d3
Binary files /dev/null and b/sound/direct_sound_samples/cries/hitmonchan.wav differ
diff --git a/sound/direct_sound_samples/cries/hitmonlee.aif b/sound/direct_sound_samples/cries/hitmonlee.aif
deleted file mode 100644
index 3a4bcddca..000000000
Binary files a/sound/direct_sound_samples/cries/hitmonlee.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hitmonlee.wav b/sound/direct_sound_samples/cries/hitmonlee.wav
new file mode 100644
index 000000000..e40d852b9
Binary files /dev/null and b/sound/direct_sound_samples/cries/hitmonlee.wav differ
diff --git a/sound/direct_sound_samples/cries/hitmontop.aif b/sound/direct_sound_samples/cries/hitmontop.aif
deleted file mode 100644
index 3fbee8041..000000000
Binary files a/sound/direct_sound_samples/cries/hitmontop.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hitmontop.wav b/sound/direct_sound_samples/cries/hitmontop.wav
new file mode 100644
index 000000000..652222dc6
Binary files /dev/null and b/sound/direct_sound_samples/cries/hitmontop.wav differ
diff --git a/sound/direct_sound_samples/cries/ho_oh.aif b/sound/direct_sound_samples/cries/ho_oh.aif
deleted file mode 100644
index 52f8dd307..000000000
Binary files a/sound/direct_sound_samples/cries/ho_oh.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ho_oh.wav b/sound/direct_sound_samples/cries/ho_oh.wav
new file mode 100644
index 000000000..acf881253
Binary files /dev/null and b/sound/direct_sound_samples/cries/ho_oh.wav differ
diff --git a/sound/direct_sound_samples/cries/hoothoot.aif b/sound/direct_sound_samples/cries/hoothoot.aif
deleted file mode 100644
index 59e685dcc..000000000
Binary files a/sound/direct_sound_samples/cries/hoothoot.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hoothoot.wav b/sound/direct_sound_samples/cries/hoothoot.wav
new file mode 100644
index 000000000..e7ca2f578
Binary files /dev/null and b/sound/direct_sound_samples/cries/hoothoot.wav differ
diff --git a/sound/direct_sound_samples/cries/hoppip.aif b/sound/direct_sound_samples/cries/hoppip.aif
deleted file mode 100644
index ea47877d0..000000000
Binary files a/sound/direct_sound_samples/cries/hoppip.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hoppip.wav b/sound/direct_sound_samples/cries/hoppip.wav
new file mode 100644
index 000000000..ab14fdaec
Binary files /dev/null and b/sound/direct_sound_samples/cries/hoppip.wav differ
diff --git a/sound/direct_sound_samples/cries/horsea.aif b/sound/direct_sound_samples/cries/horsea.aif
deleted file mode 100644
index e41eff4b1..000000000
Binary files a/sound/direct_sound_samples/cries/horsea.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/horsea.wav b/sound/direct_sound_samples/cries/horsea.wav
new file mode 100644
index 000000000..ab67381ed
Binary files /dev/null and b/sound/direct_sound_samples/cries/horsea.wav differ
diff --git a/sound/direct_sound_samples/cries/houndoom.aif b/sound/direct_sound_samples/cries/houndoom.aif
deleted file mode 100644
index 6fec16d39..000000000
Binary files a/sound/direct_sound_samples/cries/houndoom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/houndoom.wav b/sound/direct_sound_samples/cries/houndoom.wav
new file mode 100644
index 000000000..a34e4cda2
Binary files /dev/null and b/sound/direct_sound_samples/cries/houndoom.wav differ
diff --git a/sound/direct_sound_samples/cries/houndour.aif b/sound/direct_sound_samples/cries/houndour.aif
deleted file mode 100644
index 7431bbf29..000000000
Binary files a/sound/direct_sound_samples/cries/houndour.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/houndour.wav b/sound/direct_sound_samples/cries/houndour.wav
new file mode 100644
index 000000000..51310524a
Binary files /dev/null and b/sound/direct_sound_samples/cries/houndour.wav differ
diff --git a/sound/direct_sound_samples/cries/huntail.aif b/sound/direct_sound_samples/cries/huntail.aif
deleted file mode 100644
index f1d3b29d9..000000000
Binary files a/sound/direct_sound_samples/cries/huntail.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/huntail.wav b/sound/direct_sound_samples/cries/huntail.wav
new file mode 100644
index 000000000..b2e3f9985
Binary files /dev/null and b/sound/direct_sound_samples/cries/huntail.wav differ
diff --git a/sound/direct_sound_samples/cries/hypno.aif b/sound/direct_sound_samples/cries/hypno.aif
deleted file mode 100644
index 32672a3c3..000000000
Binary files a/sound/direct_sound_samples/cries/hypno.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hypno.wav b/sound/direct_sound_samples/cries/hypno.wav
new file mode 100644
index 000000000..4369110c2
Binary files /dev/null and b/sound/direct_sound_samples/cries/hypno.wav differ
diff --git a/sound/direct_sound_samples/cries/igglybuff.aif b/sound/direct_sound_samples/cries/igglybuff.aif
deleted file mode 100644
index 8de8394d5..000000000
Binary files a/sound/direct_sound_samples/cries/igglybuff.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/igglybuff.wav b/sound/direct_sound_samples/cries/igglybuff.wav
new file mode 100644
index 000000000..efec9bf4c
Binary files /dev/null and b/sound/direct_sound_samples/cries/igglybuff.wav differ
diff --git a/sound/direct_sound_samples/cries/illumise.aif b/sound/direct_sound_samples/cries/illumise.aif
deleted file mode 100644
index 75e03efc8..000000000
Binary files a/sound/direct_sound_samples/cries/illumise.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/illumise.wav b/sound/direct_sound_samples/cries/illumise.wav
new file mode 100644
index 000000000..6570492f7
Binary files /dev/null and b/sound/direct_sound_samples/cries/illumise.wav differ
diff --git a/sound/direct_sound_samples/cries/ivysaur.aif b/sound/direct_sound_samples/cries/ivysaur.aif
deleted file mode 100644
index ea474ff88..000000000
Binary files a/sound/direct_sound_samples/cries/ivysaur.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ivysaur.wav b/sound/direct_sound_samples/cries/ivysaur.wav
new file mode 100644
index 000000000..07d10c0e8
Binary files /dev/null and b/sound/direct_sound_samples/cries/ivysaur.wav differ
diff --git a/sound/direct_sound_samples/cries/jigglypuff.aif b/sound/direct_sound_samples/cries/jigglypuff.aif
deleted file mode 100644
index 780424b4f..000000000
Binary files a/sound/direct_sound_samples/cries/jigglypuff.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/jigglypuff.wav b/sound/direct_sound_samples/cries/jigglypuff.wav
new file mode 100644
index 000000000..d3e925fe9
Binary files /dev/null and b/sound/direct_sound_samples/cries/jigglypuff.wav differ
diff --git a/sound/direct_sound_samples/cries/jirachi.aif b/sound/direct_sound_samples/cries/jirachi.aif
deleted file mode 100644
index ea8a5c8ad..000000000
Binary files a/sound/direct_sound_samples/cries/jirachi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/jirachi.wav b/sound/direct_sound_samples/cries/jirachi.wav
new file mode 100644
index 000000000..43850cbaa
Binary files /dev/null and b/sound/direct_sound_samples/cries/jirachi.wav differ
diff --git a/sound/direct_sound_samples/cries/jolteon.aif b/sound/direct_sound_samples/cries/jolteon.aif
deleted file mode 100644
index 013369158..000000000
Binary files a/sound/direct_sound_samples/cries/jolteon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/jolteon.wav b/sound/direct_sound_samples/cries/jolteon.wav
new file mode 100644
index 000000000..8c5f8bea4
Binary files /dev/null and b/sound/direct_sound_samples/cries/jolteon.wav differ
diff --git a/sound/direct_sound_samples/cries/jumpluff.aif b/sound/direct_sound_samples/cries/jumpluff.aif
deleted file mode 100644
index 13b0fd315..000000000
Binary files a/sound/direct_sound_samples/cries/jumpluff.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/jumpluff.wav b/sound/direct_sound_samples/cries/jumpluff.wav
new file mode 100644
index 000000000..cce951b1f
Binary files /dev/null and b/sound/direct_sound_samples/cries/jumpluff.wav differ
diff --git a/sound/direct_sound_samples/cries/jynx.aif b/sound/direct_sound_samples/cries/jynx.aif
deleted file mode 100644
index 7394a48a2..000000000
Binary files a/sound/direct_sound_samples/cries/jynx.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/jynx.wav b/sound/direct_sound_samples/cries/jynx.wav
new file mode 100644
index 000000000..faacb1e95
Binary files /dev/null and b/sound/direct_sound_samples/cries/jynx.wav differ
diff --git a/sound/direct_sound_samples/cries/kabuto.aif b/sound/direct_sound_samples/cries/kabuto.aif
deleted file mode 100644
index 6ae9801b5..000000000
Binary files a/sound/direct_sound_samples/cries/kabuto.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kabuto.wav b/sound/direct_sound_samples/cries/kabuto.wav
new file mode 100644
index 000000000..448b17891
Binary files /dev/null and b/sound/direct_sound_samples/cries/kabuto.wav differ
diff --git a/sound/direct_sound_samples/cries/kabutops.aif b/sound/direct_sound_samples/cries/kabutops.aif
deleted file mode 100644
index f23778e57..000000000
Binary files a/sound/direct_sound_samples/cries/kabutops.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kabutops.wav b/sound/direct_sound_samples/cries/kabutops.wav
new file mode 100644
index 000000000..68cea3d4a
Binary files /dev/null and b/sound/direct_sound_samples/cries/kabutops.wav differ
diff --git a/sound/direct_sound_samples/cries/kadabra.aif b/sound/direct_sound_samples/cries/kadabra.aif
deleted file mode 100644
index bfcc18031..000000000
Binary files a/sound/direct_sound_samples/cries/kadabra.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kadabra.wav b/sound/direct_sound_samples/cries/kadabra.wav
new file mode 100644
index 000000000..d7030b27a
Binary files /dev/null and b/sound/direct_sound_samples/cries/kadabra.wav differ
diff --git a/sound/direct_sound_samples/cries/kakuna.aif b/sound/direct_sound_samples/cries/kakuna.aif
deleted file mode 100644
index 7c4e9d7a8..000000000
Binary files a/sound/direct_sound_samples/cries/kakuna.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kakuna.wav b/sound/direct_sound_samples/cries/kakuna.wav
new file mode 100644
index 000000000..f147428e3
Binary files /dev/null and b/sound/direct_sound_samples/cries/kakuna.wav differ
diff --git a/sound/direct_sound_samples/cries/kangaskhan.aif b/sound/direct_sound_samples/cries/kangaskhan.aif
deleted file mode 100644
index 643e81eb7..000000000
Binary files a/sound/direct_sound_samples/cries/kangaskhan.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kangaskhan.wav b/sound/direct_sound_samples/cries/kangaskhan.wav
new file mode 100644
index 000000000..eaf724462
Binary files /dev/null and b/sound/direct_sound_samples/cries/kangaskhan.wav differ
diff --git a/sound/direct_sound_samples/cries/kecleon.aif b/sound/direct_sound_samples/cries/kecleon.aif
deleted file mode 100644
index f27ae1832..000000000
Binary files a/sound/direct_sound_samples/cries/kecleon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kecleon.wav b/sound/direct_sound_samples/cries/kecleon.wav
new file mode 100644
index 000000000..96ab74ff2
Binary files /dev/null and b/sound/direct_sound_samples/cries/kecleon.wav differ
diff --git a/sound/direct_sound_samples/cries/kingdra.aif b/sound/direct_sound_samples/cries/kingdra.aif
deleted file mode 100644
index ade230c82..000000000
Binary files a/sound/direct_sound_samples/cries/kingdra.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kingdra.wav b/sound/direct_sound_samples/cries/kingdra.wav
new file mode 100644
index 000000000..2a47d1479
Binary files /dev/null and b/sound/direct_sound_samples/cries/kingdra.wav differ
diff --git a/sound/direct_sound_samples/cries/kingler.aif b/sound/direct_sound_samples/cries/kingler.aif
deleted file mode 100644
index a1d845f45..000000000
Binary files a/sound/direct_sound_samples/cries/kingler.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kingler.wav b/sound/direct_sound_samples/cries/kingler.wav
new file mode 100644
index 000000000..62418456d
Binary files /dev/null and b/sound/direct_sound_samples/cries/kingler.wav differ
diff --git a/sound/direct_sound_samples/cries/kirlia.aif b/sound/direct_sound_samples/cries/kirlia.aif
deleted file mode 100644
index 692e03e5f..000000000
Binary files a/sound/direct_sound_samples/cries/kirlia.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kirlia.wav b/sound/direct_sound_samples/cries/kirlia.wav
new file mode 100644
index 000000000..c7dd3078c
Binary files /dev/null and b/sound/direct_sound_samples/cries/kirlia.wav differ
diff --git a/sound/direct_sound_samples/cries/koffing.aif b/sound/direct_sound_samples/cries/koffing.aif
deleted file mode 100644
index 7ca9de088..000000000
Binary files a/sound/direct_sound_samples/cries/koffing.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/koffing.wav b/sound/direct_sound_samples/cries/koffing.wav
new file mode 100644
index 000000000..afa520c03
Binary files /dev/null and b/sound/direct_sound_samples/cries/koffing.wav differ
diff --git a/sound/direct_sound_samples/cries/krabby.aif b/sound/direct_sound_samples/cries/krabby.aif
deleted file mode 100644
index 6b7692f21..000000000
Binary files a/sound/direct_sound_samples/cries/krabby.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/krabby.wav b/sound/direct_sound_samples/cries/krabby.wav
new file mode 100644
index 000000000..0072ea777
Binary files /dev/null and b/sound/direct_sound_samples/cries/krabby.wav differ
diff --git a/sound/direct_sound_samples/cries/kyogre.aif b/sound/direct_sound_samples/cries/kyogre.aif
deleted file mode 100644
index 290948319..000000000
Binary files a/sound/direct_sound_samples/cries/kyogre.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kyogre.wav b/sound/direct_sound_samples/cries/kyogre.wav
new file mode 100644
index 000000000..00db984c6
Binary files /dev/null and b/sound/direct_sound_samples/cries/kyogre.wav differ
diff --git a/sound/direct_sound_samples/cries/lairon.aif b/sound/direct_sound_samples/cries/lairon.aif
deleted file mode 100644
index b487165bf..000000000
Binary files a/sound/direct_sound_samples/cries/lairon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lairon.wav b/sound/direct_sound_samples/cries/lairon.wav
new file mode 100644
index 000000000..574ffac74
Binary files /dev/null and b/sound/direct_sound_samples/cries/lairon.wav differ
diff --git a/sound/direct_sound_samples/cries/lanturn.aif b/sound/direct_sound_samples/cries/lanturn.aif
deleted file mode 100644
index dfeac1fbd..000000000
Binary files a/sound/direct_sound_samples/cries/lanturn.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lanturn.wav b/sound/direct_sound_samples/cries/lanturn.wav
new file mode 100644
index 000000000..6d8b21dd9
Binary files /dev/null and b/sound/direct_sound_samples/cries/lanturn.wav differ
diff --git a/sound/direct_sound_samples/cries/lapras.aif b/sound/direct_sound_samples/cries/lapras.aif
deleted file mode 100644
index 61de32408..000000000
Binary files a/sound/direct_sound_samples/cries/lapras.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lapras.wav b/sound/direct_sound_samples/cries/lapras.wav
new file mode 100644
index 000000000..d79819a97
Binary files /dev/null and b/sound/direct_sound_samples/cries/lapras.wav differ
diff --git a/sound/direct_sound_samples/cries/larvitar.aif b/sound/direct_sound_samples/cries/larvitar.aif
deleted file mode 100644
index 1ab0e1d5f..000000000
Binary files a/sound/direct_sound_samples/cries/larvitar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/larvitar.wav b/sound/direct_sound_samples/cries/larvitar.wav
new file mode 100644
index 000000000..e0e22cd6f
Binary files /dev/null and b/sound/direct_sound_samples/cries/larvitar.wav differ
diff --git a/sound/direct_sound_samples/cries/latias.aif b/sound/direct_sound_samples/cries/latias.aif
deleted file mode 100644
index 46f7235f3..000000000
Binary files a/sound/direct_sound_samples/cries/latias.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/latias.wav b/sound/direct_sound_samples/cries/latias.wav
new file mode 100644
index 000000000..87e6205ad
Binary files /dev/null and b/sound/direct_sound_samples/cries/latias.wav differ
diff --git a/sound/direct_sound_samples/cries/latios.aif b/sound/direct_sound_samples/cries/latios.aif
deleted file mode 100644
index b8ace2a30..000000000
Binary files a/sound/direct_sound_samples/cries/latios.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/latios.wav b/sound/direct_sound_samples/cries/latios.wav
new file mode 100644
index 000000000..1409dba11
Binary files /dev/null and b/sound/direct_sound_samples/cries/latios.wav differ
diff --git a/sound/direct_sound_samples/cries/ledian.aif b/sound/direct_sound_samples/cries/ledian.aif
deleted file mode 100644
index baefb5fa3..000000000
Binary files a/sound/direct_sound_samples/cries/ledian.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ledian.wav b/sound/direct_sound_samples/cries/ledian.wav
new file mode 100644
index 000000000..554829075
Binary files /dev/null and b/sound/direct_sound_samples/cries/ledian.wav differ
diff --git a/sound/direct_sound_samples/cries/ledyba.aif b/sound/direct_sound_samples/cries/ledyba.aif
deleted file mode 100644
index 4f26859a7..000000000
Binary files a/sound/direct_sound_samples/cries/ledyba.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ledyba.wav b/sound/direct_sound_samples/cries/ledyba.wav
new file mode 100644
index 000000000..e539c3d60
Binary files /dev/null and b/sound/direct_sound_samples/cries/ledyba.wav differ
diff --git a/sound/direct_sound_samples/cries/lickitung.aif b/sound/direct_sound_samples/cries/lickitung.aif
deleted file mode 100644
index ef889a275..000000000
Binary files a/sound/direct_sound_samples/cries/lickitung.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lickitung.wav b/sound/direct_sound_samples/cries/lickitung.wav
new file mode 100644
index 000000000..e830c9ad9
Binary files /dev/null and b/sound/direct_sound_samples/cries/lickitung.wav differ
diff --git a/sound/direct_sound_samples/cries/lileep.aif b/sound/direct_sound_samples/cries/lileep.aif
deleted file mode 100644
index ed8258eb7..000000000
Binary files a/sound/direct_sound_samples/cries/lileep.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lileep.wav b/sound/direct_sound_samples/cries/lileep.wav
new file mode 100644
index 000000000..f890086d3
Binary files /dev/null and b/sound/direct_sound_samples/cries/lileep.wav differ
diff --git a/sound/direct_sound_samples/cries/linoone.aif b/sound/direct_sound_samples/cries/linoone.aif
deleted file mode 100644
index 4e5e7d3b5..000000000
Binary files a/sound/direct_sound_samples/cries/linoone.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/linoone.wav b/sound/direct_sound_samples/cries/linoone.wav
new file mode 100644
index 000000000..b8c191bcd
Binary files /dev/null and b/sound/direct_sound_samples/cries/linoone.wav differ
diff --git a/sound/direct_sound_samples/cries/lombre.aif b/sound/direct_sound_samples/cries/lombre.aif
deleted file mode 100644
index abafe4321..000000000
Binary files a/sound/direct_sound_samples/cries/lombre.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lombre.wav b/sound/direct_sound_samples/cries/lombre.wav
new file mode 100644
index 000000000..6d7888619
Binary files /dev/null and b/sound/direct_sound_samples/cries/lombre.wav differ
diff --git a/sound/direct_sound_samples/cries/lotad.aif b/sound/direct_sound_samples/cries/lotad.aif
deleted file mode 100644
index 2596f4390..000000000
Binary files a/sound/direct_sound_samples/cries/lotad.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lotad.wav b/sound/direct_sound_samples/cries/lotad.wav
new file mode 100644
index 000000000..8e28b10f3
Binary files /dev/null and b/sound/direct_sound_samples/cries/lotad.wav differ
diff --git a/sound/direct_sound_samples/cries/loudred.aif b/sound/direct_sound_samples/cries/loudred.aif
deleted file mode 100644
index fed7ebec8..000000000
Binary files a/sound/direct_sound_samples/cries/loudred.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/loudred.wav b/sound/direct_sound_samples/cries/loudred.wav
new file mode 100644
index 000000000..ff8b2c810
Binary files /dev/null and b/sound/direct_sound_samples/cries/loudred.wav differ
diff --git a/sound/direct_sound_samples/cries/ludicolo.aif b/sound/direct_sound_samples/cries/ludicolo.aif
deleted file mode 100644
index 7cf670f38..000000000
Binary files a/sound/direct_sound_samples/cries/ludicolo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ludicolo.wav b/sound/direct_sound_samples/cries/ludicolo.wav
new file mode 100644
index 000000000..420ac5459
Binary files /dev/null and b/sound/direct_sound_samples/cries/ludicolo.wav differ
diff --git a/sound/direct_sound_samples/cries/lugia.aif b/sound/direct_sound_samples/cries/lugia.aif
deleted file mode 100644
index 45890a2fc..000000000
Binary files a/sound/direct_sound_samples/cries/lugia.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lugia.wav b/sound/direct_sound_samples/cries/lugia.wav
new file mode 100644
index 000000000..855920839
Binary files /dev/null and b/sound/direct_sound_samples/cries/lugia.wav differ
diff --git a/sound/direct_sound_samples/cries/lunatone.aif b/sound/direct_sound_samples/cries/lunatone.aif
deleted file mode 100644
index 42cbc5e3c..000000000
Binary files a/sound/direct_sound_samples/cries/lunatone.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lunatone.wav b/sound/direct_sound_samples/cries/lunatone.wav
new file mode 100644
index 000000000..8edd9a17e
Binary files /dev/null and b/sound/direct_sound_samples/cries/lunatone.wav differ
diff --git a/sound/direct_sound_samples/cries/luvdisc.aif b/sound/direct_sound_samples/cries/luvdisc.aif
deleted file mode 100644
index 3cc0cc744..000000000
Binary files a/sound/direct_sound_samples/cries/luvdisc.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/luvdisc.wav b/sound/direct_sound_samples/cries/luvdisc.wav
new file mode 100644
index 000000000..da1c84b80
Binary files /dev/null and b/sound/direct_sound_samples/cries/luvdisc.wav differ
diff --git a/sound/direct_sound_samples/cries/machamp.aif b/sound/direct_sound_samples/cries/machamp.aif
deleted file mode 100644
index ddeaf22c8..000000000
Binary files a/sound/direct_sound_samples/cries/machamp.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/machamp.wav b/sound/direct_sound_samples/cries/machamp.wav
new file mode 100644
index 000000000..b7e091dc7
Binary files /dev/null and b/sound/direct_sound_samples/cries/machamp.wav differ
diff --git a/sound/direct_sound_samples/cries/machoke.aif b/sound/direct_sound_samples/cries/machoke.aif
deleted file mode 100644
index 97065ee09..000000000
Binary files a/sound/direct_sound_samples/cries/machoke.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/machoke.wav b/sound/direct_sound_samples/cries/machoke.wav
new file mode 100644
index 000000000..5e0fc98bf
Binary files /dev/null and b/sound/direct_sound_samples/cries/machoke.wav differ
diff --git a/sound/direct_sound_samples/cries/machop.aif b/sound/direct_sound_samples/cries/machop.aif
deleted file mode 100644
index d92419e84..000000000
Binary files a/sound/direct_sound_samples/cries/machop.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/machop.wav b/sound/direct_sound_samples/cries/machop.wav
new file mode 100644
index 000000000..a34a0ccc8
Binary files /dev/null and b/sound/direct_sound_samples/cries/machop.wav differ
diff --git a/sound/direct_sound_samples/cries/magby.aif b/sound/direct_sound_samples/cries/magby.aif
deleted file mode 100644
index 12f3dc889..000000000
Binary files a/sound/direct_sound_samples/cries/magby.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/magby.wav b/sound/direct_sound_samples/cries/magby.wav
new file mode 100644
index 000000000..8b083206c
Binary files /dev/null and b/sound/direct_sound_samples/cries/magby.wav differ
diff --git a/sound/direct_sound_samples/cries/magcargo.aif b/sound/direct_sound_samples/cries/magcargo.aif
deleted file mode 100644
index bef0351c0..000000000
Binary files a/sound/direct_sound_samples/cries/magcargo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/magcargo.wav b/sound/direct_sound_samples/cries/magcargo.wav
new file mode 100644
index 000000000..6d97b90c1
Binary files /dev/null and b/sound/direct_sound_samples/cries/magcargo.wav differ
diff --git a/sound/direct_sound_samples/cries/magikarp.aif b/sound/direct_sound_samples/cries/magikarp.aif
deleted file mode 100644
index f4f9219c5..000000000
Binary files a/sound/direct_sound_samples/cries/magikarp.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/magikarp.wav b/sound/direct_sound_samples/cries/magikarp.wav
new file mode 100644
index 000000000..6c665d9e7
Binary files /dev/null and b/sound/direct_sound_samples/cries/magikarp.wav differ
diff --git a/sound/direct_sound_samples/cries/magmar.aif b/sound/direct_sound_samples/cries/magmar.aif
deleted file mode 100644
index b79c8b9a1..000000000
Binary files a/sound/direct_sound_samples/cries/magmar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/magmar.wav b/sound/direct_sound_samples/cries/magmar.wav
new file mode 100644
index 000000000..902c15bf2
Binary files /dev/null and b/sound/direct_sound_samples/cries/magmar.wav differ
diff --git a/sound/direct_sound_samples/cries/magnemite.aif b/sound/direct_sound_samples/cries/magnemite.aif
deleted file mode 100644
index ebb9103d9..000000000
Binary files a/sound/direct_sound_samples/cries/magnemite.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/magnemite.wav b/sound/direct_sound_samples/cries/magnemite.wav
new file mode 100644
index 000000000..4fdc93f29
Binary files /dev/null and b/sound/direct_sound_samples/cries/magnemite.wav differ
diff --git a/sound/direct_sound_samples/cries/magneton.aif b/sound/direct_sound_samples/cries/magneton.aif
deleted file mode 100644
index 53083ac62..000000000
Binary files a/sound/direct_sound_samples/cries/magneton.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/magneton.wav b/sound/direct_sound_samples/cries/magneton.wav
new file mode 100644
index 000000000..d69c27644
Binary files /dev/null and b/sound/direct_sound_samples/cries/magneton.wav differ
diff --git a/sound/direct_sound_samples/cries/makuhita.aif b/sound/direct_sound_samples/cries/makuhita.aif
deleted file mode 100644
index 38d7f4b44..000000000
Binary files a/sound/direct_sound_samples/cries/makuhita.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/makuhita.wav b/sound/direct_sound_samples/cries/makuhita.wav
new file mode 100644
index 000000000..79b055ef9
Binary files /dev/null and b/sound/direct_sound_samples/cries/makuhita.wav differ
diff --git a/sound/direct_sound_samples/cries/manectric.aif b/sound/direct_sound_samples/cries/manectric.aif
deleted file mode 100644
index 18a8f4666..000000000
Binary files a/sound/direct_sound_samples/cries/manectric.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/manectric.wav b/sound/direct_sound_samples/cries/manectric.wav
new file mode 100644
index 000000000..939fc1609
Binary files /dev/null and b/sound/direct_sound_samples/cries/manectric.wav differ
diff --git a/sound/direct_sound_samples/cries/mankey.aif b/sound/direct_sound_samples/cries/mankey.aif
deleted file mode 100644
index dda929d4c..000000000
Binary files a/sound/direct_sound_samples/cries/mankey.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mankey.wav b/sound/direct_sound_samples/cries/mankey.wav
new file mode 100644
index 000000000..ab15ac9af
Binary files /dev/null and b/sound/direct_sound_samples/cries/mankey.wav differ
diff --git a/sound/direct_sound_samples/cries/mantine.aif b/sound/direct_sound_samples/cries/mantine.aif
deleted file mode 100644
index d1840aafa..000000000
Binary files a/sound/direct_sound_samples/cries/mantine.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mantine.wav b/sound/direct_sound_samples/cries/mantine.wav
new file mode 100644
index 000000000..919242e8f
Binary files /dev/null and b/sound/direct_sound_samples/cries/mantine.wav differ
diff --git a/sound/direct_sound_samples/cries/mareep.aif b/sound/direct_sound_samples/cries/mareep.aif
deleted file mode 100644
index 2615b9def..000000000
Binary files a/sound/direct_sound_samples/cries/mareep.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mareep.wav b/sound/direct_sound_samples/cries/mareep.wav
new file mode 100644
index 000000000..386925f5d
Binary files /dev/null and b/sound/direct_sound_samples/cries/mareep.wav differ
diff --git a/sound/direct_sound_samples/cries/marill.aif b/sound/direct_sound_samples/cries/marill.aif
deleted file mode 100644
index 48d936e7d..000000000
Binary files a/sound/direct_sound_samples/cries/marill.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/marill.wav b/sound/direct_sound_samples/cries/marill.wav
new file mode 100644
index 000000000..93201d1c5
Binary files /dev/null and b/sound/direct_sound_samples/cries/marill.wav differ
diff --git a/sound/direct_sound_samples/cries/marowak.aif b/sound/direct_sound_samples/cries/marowak.aif
deleted file mode 100644
index 279381bb5..000000000
Binary files a/sound/direct_sound_samples/cries/marowak.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/marowak.wav b/sound/direct_sound_samples/cries/marowak.wav
new file mode 100644
index 000000000..7bddb4b34
Binary files /dev/null and b/sound/direct_sound_samples/cries/marowak.wav differ
diff --git a/sound/direct_sound_samples/cries/marshtomp.aif b/sound/direct_sound_samples/cries/marshtomp.aif
deleted file mode 100644
index c0106ff6c..000000000
Binary files a/sound/direct_sound_samples/cries/marshtomp.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/marshtomp.wav b/sound/direct_sound_samples/cries/marshtomp.wav
new file mode 100644
index 000000000..0caa959e2
Binary files /dev/null and b/sound/direct_sound_samples/cries/marshtomp.wav differ
diff --git a/sound/direct_sound_samples/cries/masquerain.aif b/sound/direct_sound_samples/cries/masquerain.aif
deleted file mode 100644
index 107bed2f7..000000000
Binary files a/sound/direct_sound_samples/cries/masquerain.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/masquerain.wav b/sound/direct_sound_samples/cries/masquerain.wav
new file mode 100644
index 000000000..b0c5372ae
Binary files /dev/null and b/sound/direct_sound_samples/cries/masquerain.wav differ
diff --git a/sound/direct_sound_samples/cries/mawile.aif b/sound/direct_sound_samples/cries/mawile.aif
deleted file mode 100644
index 81b252b57..000000000
Binary files a/sound/direct_sound_samples/cries/mawile.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mawile.wav b/sound/direct_sound_samples/cries/mawile.wav
new file mode 100644
index 000000000..9c54d40a4
Binary files /dev/null and b/sound/direct_sound_samples/cries/mawile.wav differ
diff --git a/sound/direct_sound_samples/cries/medicham.aif b/sound/direct_sound_samples/cries/medicham.aif
deleted file mode 100644
index dc85dd3b5..000000000
Binary files a/sound/direct_sound_samples/cries/medicham.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/medicham.wav b/sound/direct_sound_samples/cries/medicham.wav
new file mode 100644
index 000000000..be3668b17
Binary files /dev/null and b/sound/direct_sound_samples/cries/medicham.wav differ
diff --git a/sound/direct_sound_samples/cries/meditite.aif b/sound/direct_sound_samples/cries/meditite.aif
deleted file mode 100644
index 8ac680f79..000000000
Binary files a/sound/direct_sound_samples/cries/meditite.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/meditite.wav b/sound/direct_sound_samples/cries/meditite.wav
new file mode 100644
index 000000000..23db4f297
Binary files /dev/null and b/sound/direct_sound_samples/cries/meditite.wav differ
diff --git a/sound/direct_sound_samples/cries/meganium.aif b/sound/direct_sound_samples/cries/meganium.aif
deleted file mode 100644
index ea1e1aa51..000000000
Binary files a/sound/direct_sound_samples/cries/meganium.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/meganium.wav b/sound/direct_sound_samples/cries/meganium.wav
new file mode 100644
index 000000000..8f7920e93
Binary files /dev/null and b/sound/direct_sound_samples/cries/meganium.wav differ
diff --git a/sound/direct_sound_samples/cries/meowth.aif b/sound/direct_sound_samples/cries/meowth.aif
deleted file mode 100644
index aaf3825d5..000000000
Binary files a/sound/direct_sound_samples/cries/meowth.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/meowth.wav b/sound/direct_sound_samples/cries/meowth.wav
new file mode 100644
index 000000000..bebca1c27
Binary files /dev/null and b/sound/direct_sound_samples/cries/meowth.wav differ
diff --git a/sound/direct_sound_samples/cries/metagross.aif b/sound/direct_sound_samples/cries/metagross.aif
deleted file mode 100644
index b96e6647c..000000000
Binary files a/sound/direct_sound_samples/cries/metagross.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/metagross.wav b/sound/direct_sound_samples/cries/metagross.wav
new file mode 100644
index 000000000..5112b3afa
Binary files /dev/null and b/sound/direct_sound_samples/cries/metagross.wav differ
diff --git a/sound/direct_sound_samples/cries/metang.aif b/sound/direct_sound_samples/cries/metang.aif
deleted file mode 100644
index da544ce4d..000000000
Binary files a/sound/direct_sound_samples/cries/metang.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/metang.wav b/sound/direct_sound_samples/cries/metang.wav
new file mode 100644
index 000000000..700759d20
Binary files /dev/null and b/sound/direct_sound_samples/cries/metang.wav differ
diff --git a/sound/direct_sound_samples/cries/metapod.aif b/sound/direct_sound_samples/cries/metapod.aif
deleted file mode 100644
index ddba3ed44..000000000
Binary files a/sound/direct_sound_samples/cries/metapod.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/metapod.wav b/sound/direct_sound_samples/cries/metapod.wav
new file mode 100644
index 000000000..6df3b6aef
Binary files /dev/null and b/sound/direct_sound_samples/cries/metapod.wav differ
diff --git a/sound/direct_sound_samples/cries/mew.aif b/sound/direct_sound_samples/cries/mew.aif
deleted file mode 100644
index 2651b96ca..000000000
Binary files a/sound/direct_sound_samples/cries/mew.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mew.wav b/sound/direct_sound_samples/cries/mew.wav
new file mode 100644
index 000000000..e75fa95f3
Binary files /dev/null and b/sound/direct_sound_samples/cries/mew.wav differ
diff --git a/sound/direct_sound_samples/cries/mewtwo.aif b/sound/direct_sound_samples/cries/mewtwo.aif
deleted file mode 100644
index 8e1e6c7f1..000000000
Binary files a/sound/direct_sound_samples/cries/mewtwo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mewtwo.wav b/sound/direct_sound_samples/cries/mewtwo.wav
new file mode 100644
index 000000000..947984f67
Binary files /dev/null and b/sound/direct_sound_samples/cries/mewtwo.wav differ
diff --git a/sound/direct_sound_samples/cries/mightyena.aif b/sound/direct_sound_samples/cries/mightyena.aif
deleted file mode 100644
index 53a645edc..000000000
Binary files a/sound/direct_sound_samples/cries/mightyena.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mightyena.wav b/sound/direct_sound_samples/cries/mightyena.wav
new file mode 100644
index 000000000..0149976e2
Binary files /dev/null and b/sound/direct_sound_samples/cries/mightyena.wav differ
diff --git a/sound/direct_sound_samples/cries/milotic.aif b/sound/direct_sound_samples/cries/milotic.aif
deleted file mode 100644
index 93a14161b..000000000
Binary files a/sound/direct_sound_samples/cries/milotic.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/milotic.wav b/sound/direct_sound_samples/cries/milotic.wav
new file mode 100644
index 000000000..20db44692
Binary files /dev/null and b/sound/direct_sound_samples/cries/milotic.wav differ
diff --git a/sound/direct_sound_samples/cries/miltank.aif b/sound/direct_sound_samples/cries/miltank.aif
deleted file mode 100644
index ad8a41a45..000000000
Binary files a/sound/direct_sound_samples/cries/miltank.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/miltank.wav b/sound/direct_sound_samples/cries/miltank.wav
new file mode 100644
index 000000000..5f51f525b
Binary files /dev/null and b/sound/direct_sound_samples/cries/miltank.wav differ
diff --git a/sound/direct_sound_samples/cries/minun.aif b/sound/direct_sound_samples/cries/minun.aif
deleted file mode 100644
index a55aa5631..000000000
Binary files a/sound/direct_sound_samples/cries/minun.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/minun.wav b/sound/direct_sound_samples/cries/minun.wav
new file mode 100644
index 000000000..9e9a62f7e
Binary files /dev/null and b/sound/direct_sound_samples/cries/minun.wav differ
diff --git a/sound/direct_sound_samples/cries/misdreavus.aif b/sound/direct_sound_samples/cries/misdreavus.aif
deleted file mode 100644
index 39a09f4d0..000000000
Binary files a/sound/direct_sound_samples/cries/misdreavus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/misdreavus.wav b/sound/direct_sound_samples/cries/misdreavus.wav
new file mode 100644
index 000000000..f632986da
Binary files /dev/null and b/sound/direct_sound_samples/cries/misdreavus.wav differ
diff --git a/sound/direct_sound_samples/cries/moltres.aif b/sound/direct_sound_samples/cries/moltres.aif
deleted file mode 100644
index 2e038a3d7..000000000
Binary files a/sound/direct_sound_samples/cries/moltres.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/moltres.wav b/sound/direct_sound_samples/cries/moltres.wav
new file mode 100644
index 000000000..7173a8cad
Binary files /dev/null and b/sound/direct_sound_samples/cries/moltres.wav differ
diff --git a/sound/direct_sound_samples/cries/mr_mime.aif b/sound/direct_sound_samples/cries/mr_mime.aif
deleted file mode 100644
index ff870dbc4..000000000
Binary files a/sound/direct_sound_samples/cries/mr_mime.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mr_mime.wav b/sound/direct_sound_samples/cries/mr_mime.wav
new file mode 100644
index 000000000..23cf31053
Binary files /dev/null and b/sound/direct_sound_samples/cries/mr_mime.wav differ
diff --git a/sound/direct_sound_samples/cries/mudkip.aif b/sound/direct_sound_samples/cries/mudkip.aif
deleted file mode 100644
index e8fa5c212..000000000
Binary files a/sound/direct_sound_samples/cries/mudkip.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mudkip.wav b/sound/direct_sound_samples/cries/mudkip.wav
new file mode 100644
index 000000000..c965efe30
Binary files /dev/null and b/sound/direct_sound_samples/cries/mudkip.wav differ
diff --git a/sound/direct_sound_samples/cries/muk.aif b/sound/direct_sound_samples/cries/muk.aif
deleted file mode 100644
index f61ff4075..000000000
Binary files a/sound/direct_sound_samples/cries/muk.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/muk.wav b/sound/direct_sound_samples/cries/muk.wav
new file mode 100644
index 000000000..27cd6bdeb
Binary files /dev/null and b/sound/direct_sound_samples/cries/muk.wav differ
diff --git a/sound/direct_sound_samples/cries/murkrow.aif b/sound/direct_sound_samples/cries/murkrow.aif
deleted file mode 100644
index 4beddff1e..000000000
Binary files a/sound/direct_sound_samples/cries/murkrow.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/murkrow.wav b/sound/direct_sound_samples/cries/murkrow.wav
new file mode 100644
index 000000000..5da336fa9
Binary files /dev/null and b/sound/direct_sound_samples/cries/murkrow.wav differ
diff --git a/sound/direct_sound_samples/cries/natu.aif b/sound/direct_sound_samples/cries/natu.aif
deleted file mode 100644
index e6e38d5cc..000000000
Binary files a/sound/direct_sound_samples/cries/natu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/natu.wav b/sound/direct_sound_samples/cries/natu.wav
new file mode 100644
index 000000000..4a2c85317
Binary files /dev/null and b/sound/direct_sound_samples/cries/natu.wav differ
diff --git a/sound/direct_sound_samples/cries/nidoking.aif b/sound/direct_sound_samples/cries/nidoking.aif
deleted file mode 100644
index a0c86f9ab..000000000
Binary files a/sound/direct_sound_samples/cries/nidoking.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nidoking.wav b/sound/direct_sound_samples/cries/nidoking.wav
new file mode 100644
index 000000000..556b20bda
Binary files /dev/null and b/sound/direct_sound_samples/cries/nidoking.wav differ
diff --git a/sound/direct_sound_samples/cries/nidoqueen.aif b/sound/direct_sound_samples/cries/nidoqueen.aif
deleted file mode 100644
index 6c8f5254b..000000000
Binary files a/sound/direct_sound_samples/cries/nidoqueen.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nidoqueen.wav b/sound/direct_sound_samples/cries/nidoqueen.wav
new file mode 100644
index 000000000..7c23623a1
Binary files /dev/null and b/sound/direct_sound_samples/cries/nidoqueen.wav differ
diff --git a/sound/direct_sound_samples/cries/nidoran_f.aif b/sound/direct_sound_samples/cries/nidoran_f.aif
deleted file mode 100644
index b7c8a5317..000000000
Binary files a/sound/direct_sound_samples/cries/nidoran_f.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nidoran_f.wav b/sound/direct_sound_samples/cries/nidoran_f.wav
new file mode 100644
index 000000000..2997c2b57
Binary files /dev/null and b/sound/direct_sound_samples/cries/nidoran_f.wav differ
diff --git a/sound/direct_sound_samples/cries/nidoran_m.aif b/sound/direct_sound_samples/cries/nidoran_m.aif
deleted file mode 100644
index 08fc81c8b..000000000
Binary files a/sound/direct_sound_samples/cries/nidoran_m.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nidoran_m.wav b/sound/direct_sound_samples/cries/nidoran_m.wav
new file mode 100644
index 000000000..160ab71e7
Binary files /dev/null and b/sound/direct_sound_samples/cries/nidoran_m.wav differ
diff --git a/sound/direct_sound_samples/cries/nidorina.aif b/sound/direct_sound_samples/cries/nidorina.aif
deleted file mode 100644
index 91e293a50..000000000
Binary files a/sound/direct_sound_samples/cries/nidorina.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nidorina.wav b/sound/direct_sound_samples/cries/nidorina.wav
new file mode 100644
index 000000000..a46c41670
Binary files /dev/null and b/sound/direct_sound_samples/cries/nidorina.wav differ
diff --git a/sound/direct_sound_samples/cries/nidorino.aif b/sound/direct_sound_samples/cries/nidorino.aif
deleted file mode 100644
index 959351363..000000000
Binary files a/sound/direct_sound_samples/cries/nidorino.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nidorino.wav b/sound/direct_sound_samples/cries/nidorino.wav
new file mode 100644
index 000000000..38db59c2f
Binary files /dev/null and b/sound/direct_sound_samples/cries/nidorino.wav differ
diff --git a/sound/direct_sound_samples/cries/nincada.aif b/sound/direct_sound_samples/cries/nincada.aif
deleted file mode 100644
index 5f96bda50..000000000
Binary files a/sound/direct_sound_samples/cries/nincada.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nincada.wav b/sound/direct_sound_samples/cries/nincada.wav
new file mode 100644
index 000000000..dd5feb818
Binary files /dev/null and b/sound/direct_sound_samples/cries/nincada.wav differ
diff --git a/sound/direct_sound_samples/cries/ninetales.aif b/sound/direct_sound_samples/cries/ninetales.aif
deleted file mode 100644
index 70c8cf528..000000000
Binary files a/sound/direct_sound_samples/cries/ninetales.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ninetales.wav b/sound/direct_sound_samples/cries/ninetales.wav
new file mode 100644
index 000000000..f84b87436
Binary files /dev/null and b/sound/direct_sound_samples/cries/ninetales.wav differ
diff --git a/sound/direct_sound_samples/cries/ninjask.aif b/sound/direct_sound_samples/cries/ninjask.aif
deleted file mode 100644
index a6f07e8d3..000000000
Binary files a/sound/direct_sound_samples/cries/ninjask.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ninjask.wav b/sound/direct_sound_samples/cries/ninjask.wav
new file mode 100644
index 000000000..b61f4d37f
Binary files /dev/null and b/sound/direct_sound_samples/cries/ninjask.wav differ
diff --git a/sound/direct_sound_samples/cries/noctowl.aif b/sound/direct_sound_samples/cries/noctowl.aif
deleted file mode 100644
index fe2e63d45..000000000
Binary files a/sound/direct_sound_samples/cries/noctowl.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/noctowl.wav b/sound/direct_sound_samples/cries/noctowl.wav
new file mode 100644
index 000000000..ab705b6f2
Binary files /dev/null and b/sound/direct_sound_samples/cries/noctowl.wav differ
diff --git a/sound/direct_sound_samples/cries/nosepass.aif b/sound/direct_sound_samples/cries/nosepass.aif
deleted file mode 100644
index be65ba082..000000000
Binary files a/sound/direct_sound_samples/cries/nosepass.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nosepass.wav b/sound/direct_sound_samples/cries/nosepass.wav
new file mode 100644
index 000000000..1e15fb10d
Binary files /dev/null and b/sound/direct_sound_samples/cries/nosepass.wav differ
diff --git a/sound/direct_sound_samples/cries/numel.aif b/sound/direct_sound_samples/cries/numel.aif
deleted file mode 100644
index 55cce5f2c..000000000
Binary files a/sound/direct_sound_samples/cries/numel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/numel.wav b/sound/direct_sound_samples/cries/numel.wav
new file mode 100644
index 000000000..2d2d16f02
Binary files /dev/null and b/sound/direct_sound_samples/cries/numel.wav differ
diff --git a/sound/direct_sound_samples/cries/nuzleaf.aif b/sound/direct_sound_samples/cries/nuzleaf.aif
deleted file mode 100644
index d668f3fd3..000000000
Binary files a/sound/direct_sound_samples/cries/nuzleaf.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nuzleaf.wav b/sound/direct_sound_samples/cries/nuzleaf.wav
new file mode 100644
index 000000000..5efb6e806
Binary files /dev/null and b/sound/direct_sound_samples/cries/nuzleaf.wav differ
diff --git a/sound/direct_sound_samples/cries/octillery.aif b/sound/direct_sound_samples/cries/octillery.aif
deleted file mode 100644
index 75ee28ceb..000000000
Binary files a/sound/direct_sound_samples/cries/octillery.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/octillery.wav b/sound/direct_sound_samples/cries/octillery.wav
new file mode 100644
index 000000000..190d42c67
Binary files /dev/null and b/sound/direct_sound_samples/cries/octillery.wav differ
diff --git a/sound/direct_sound_samples/cries/oddish.aif b/sound/direct_sound_samples/cries/oddish.aif
deleted file mode 100644
index 6909a8dad..000000000
Binary files a/sound/direct_sound_samples/cries/oddish.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/oddish.wav b/sound/direct_sound_samples/cries/oddish.wav
new file mode 100644
index 000000000..de6855d36
Binary files /dev/null and b/sound/direct_sound_samples/cries/oddish.wav differ
diff --git a/sound/direct_sound_samples/cries/omanyte.aif b/sound/direct_sound_samples/cries/omanyte.aif
deleted file mode 100644
index 15ec2d1ef..000000000
Binary files a/sound/direct_sound_samples/cries/omanyte.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/omanyte.wav b/sound/direct_sound_samples/cries/omanyte.wav
new file mode 100644
index 000000000..3db237ac3
Binary files /dev/null and b/sound/direct_sound_samples/cries/omanyte.wav differ
diff --git a/sound/direct_sound_samples/cries/omastar.aif b/sound/direct_sound_samples/cries/omastar.aif
deleted file mode 100644
index e67d5d7fc..000000000
Binary files a/sound/direct_sound_samples/cries/omastar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/omastar.wav b/sound/direct_sound_samples/cries/omastar.wav
new file mode 100644
index 000000000..69a4ea868
Binary files /dev/null and b/sound/direct_sound_samples/cries/omastar.wav differ
diff --git a/sound/direct_sound_samples/cries/onix.aif b/sound/direct_sound_samples/cries/onix.aif
deleted file mode 100644
index aa8a16505..000000000
Binary files a/sound/direct_sound_samples/cries/onix.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/onix.wav b/sound/direct_sound_samples/cries/onix.wav
new file mode 100644
index 000000000..57da60141
Binary files /dev/null and b/sound/direct_sound_samples/cries/onix.wav differ
diff --git a/sound/direct_sound_samples/cries/paras.aif b/sound/direct_sound_samples/cries/paras.aif
deleted file mode 100644
index f9d69c21c..000000000
Binary files a/sound/direct_sound_samples/cries/paras.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/paras.wav b/sound/direct_sound_samples/cries/paras.wav
new file mode 100644
index 000000000..ba4a051c9
Binary files /dev/null and b/sound/direct_sound_samples/cries/paras.wav differ
diff --git a/sound/direct_sound_samples/cries/parasect.aif b/sound/direct_sound_samples/cries/parasect.aif
deleted file mode 100644
index d6d9433e9..000000000
Binary files a/sound/direct_sound_samples/cries/parasect.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/parasect.wav b/sound/direct_sound_samples/cries/parasect.wav
new file mode 100644
index 000000000..5ff6ac290
Binary files /dev/null and b/sound/direct_sound_samples/cries/parasect.wav differ
diff --git a/sound/direct_sound_samples/cries/pelipper.aif b/sound/direct_sound_samples/cries/pelipper.aif
deleted file mode 100644
index 26718f848..000000000
Binary files a/sound/direct_sound_samples/cries/pelipper.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pelipper.wav b/sound/direct_sound_samples/cries/pelipper.wav
new file mode 100644
index 000000000..665dbcac9
Binary files /dev/null and b/sound/direct_sound_samples/cries/pelipper.wav differ
diff --git a/sound/direct_sound_samples/cries/persian.aif b/sound/direct_sound_samples/cries/persian.aif
deleted file mode 100644
index 40b3a2c56..000000000
Binary files a/sound/direct_sound_samples/cries/persian.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/persian.wav b/sound/direct_sound_samples/cries/persian.wav
new file mode 100644
index 000000000..96acf8296
Binary files /dev/null and b/sound/direct_sound_samples/cries/persian.wav differ
diff --git a/sound/direct_sound_samples/cries/phanpy.aif b/sound/direct_sound_samples/cries/phanpy.aif
deleted file mode 100644
index 2fcab3c82..000000000
Binary files a/sound/direct_sound_samples/cries/phanpy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/phanpy.wav b/sound/direct_sound_samples/cries/phanpy.wav
new file mode 100644
index 000000000..4de13cafe
Binary files /dev/null and b/sound/direct_sound_samples/cries/phanpy.wav differ
diff --git a/sound/direct_sound_samples/cries/pichu.aif b/sound/direct_sound_samples/cries/pichu.aif
deleted file mode 100644
index de47bbab8..000000000
Binary files a/sound/direct_sound_samples/cries/pichu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pichu.wav b/sound/direct_sound_samples/cries/pichu.wav
new file mode 100644
index 000000000..d32510371
Binary files /dev/null and b/sound/direct_sound_samples/cries/pichu.wav differ
diff --git a/sound/direct_sound_samples/cries/pidgeot.aif b/sound/direct_sound_samples/cries/pidgeot.aif
deleted file mode 100644
index af400cdc6..000000000
Binary files a/sound/direct_sound_samples/cries/pidgeot.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pidgeot.wav b/sound/direct_sound_samples/cries/pidgeot.wav
new file mode 100644
index 000000000..f93ed9965
Binary files /dev/null and b/sound/direct_sound_samples/cries/pidgeot.wav differ
diff --git a/sound/direct_sound_samples/cries/pidgeotto.aif b/sound/direct_sound_samples/cries/pidgeotto.aif
deleted file mode 100644
index 7c71c8f3e..000000000
Binary files a/sound/direct_sound_samples/cries/pidgeotto.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pidgeotto.wav b/sound/direct_sound_samples/cries/pidgeotto.wav
new file mode 100644
index 000000000..8b40a41e9
Binary files /dev/null and b/sound/direct_sound_samples/cries/pidgeotto.wav differ
diff --git a/sound/direct_sound_samples/cries/pidgey.aif b/sound/direct_sound_samples/cries/pidgey.aif
deleted file mode 100644
index b9c3a5d2a..000000000
Binary files a/sound/direct_sound_samples/cries/pidgey.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pidgey.wav b/sound/direct_sound_samples/cries/pidgey.wav
new file mode 100644
index 000000000..34a1d1bd6
Binary files /dev/null and b/sound/direct_sound_samples/cries/pidgey.wav differ
diff --git a/sound/direct_sound_samples/cries/pikachu.aif b/sound/direct_sound_samples/cries/pikachu.aif
deleted file mode 100644
index 690bf5e1d..000000000
Binary files a/sound/direct_sound_samples/cries/pikachu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pikachu.wav b/sound/direct_sound_samples/cries/pikachu.wav
new file mode 100644
index 000000000..d5f68416f
Binary files /dev/null and b/sound/direct_sound_samples/cries/pikachu.wav differ
diff --git a/sound/direct_sound_samples/cries/piloswine.aif b/sound/direct_sound_samples/cries/piloswine.aif
deleted file mode 100644
index b1f34d3b5..000000000
Binary files a/sound/direct_sound_samples/cries/piloswine.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/piloswine.wav b/sound/direct_sound_samples/cries/piloswine.wav
new file mode 100644
index 000000000..4f181b7ec
Binary files /dev/null and b/sound/direct_sound_samples/cries/piloswine.wav differ
diff --git a/sound/direct_sound_samples/cries/pineco.aif b/sound/direct_sound_samples/cries/pineco.aif
deleted file mode 100644
index 80292bda0..000000000
Binary files a/sound/direct_sound_samples/cries/pineco.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pineco.wav b/sound/direct_sound_samples/cries/pineco.wav
new file mode 100644
index 000000000..70d841b9e
Binary files /dev/null and b/sound/direct_sound_samples/cries/pineco.wav differ
diff --git a/sound/direct_sound_samples/cries/pinsir.aif b/sound/direct_sound_samples/cries/pinsir.aif
deleted file mode 100644
index cf27a11de..000000000
Binary files a/sound/direct_sound_samples/cries/pinsir.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pinsir.wav b/sound/direct_sound_samples/cries/pinsir.wav
new file mode 100644
index 000000000..3d3dcc792
Binary files /dev/null and b/sound/direct_sound_samples/cries/pinsir.wav differ
diff --git a/sound/direct_sound_samples/cries/plusle.aif b/sound/direct_sound_samples/cries/plusle.aif
deleted file mode 100644
index d68984263..000000000
Binary files a/sound/direct_sound_samples/cries/plusle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/plusle.wav b/sound/direct_sound_samples/cries/plusle.wav
new file mode 100644
index 000000000..1b3cf8749
Binary files /dev/null and b/sound/direct_sound_samples/cries/plusle.wav differ
diff --git a/sound/direct_sound_samples/cries/politoed.aif b/sound/direct_sound_samples/cries/politoed.aif
deleted file mode 100644
index 38b1883b4..000000000
Binary files a/sound/direct_sound_samples/cries/politoed.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/politoed.wav b/sound/direct_sound_samples/cries/politoed.wav
new file mode 100644
index 000000000..6472a08f5
Binary files /dev/null and b/sound/direct_sound_samples/cries/politoed.wav differ
diff --git a/sound/direct_sound_samples/cries/poliwag.aif b/sound/direct_sound_samples/cries/poliwag.aif
deleted file mode 100644
index 8467f0540..000000000
Binary files a/sound/direct_sound_samples/cries/poliwag.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/poliwag.wav b/sound/direct_sound_samples/cries/poliwag.wav
new file mode 100644
index 000000000..d35c8f4d8
Binary files /dev/null and b/sound/direct_sound_samples/cries/poliwag.wav differ
diff --git a/sound/direct_sound_samples/cries/poliwhirl.aif b/sound/direct_sound_samples/cries/poliwhirl.aif
deleted file mode 100644
index f0851c693..000000000
Binary files a/sound/direct_sound_samples/cries/poliwhirl.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/poliwhirl.wav b/sound/direct_sound_samples/cries/poliwhirl.wav
new file mode 100644
index 000000000..0c59fbed6
Binary files /dev/null and b/sound/direct_sound_samples/cries/poliwhirl.wav differ
diff --git a/sound/direct_sound_samples/cries/poliwrath.aif b/sound/direct_sound_samples/cries/poliwrath.aif
deleted file mode 100644
index 8d19f1d86..000000000
Binary files a/sound/direct_sound_samples/cries/poliwrath.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/poliwrath.wav b/sound/direct_sound_samples/cries/poliwrath.wav
new file mode 100644
index 000000000..c32bd4485
Binary files /dev/null and b/sound/direct_sound_samples/cries/poliwrath.wav differ
diff --git a/sound/direct_sound_samples/cries/ponyta.aif b/sound/direct_sound_samples/cries/ponyta.aif
deleted file mode 100644
index 46feb123d..000000000
Binary files a/sound/direct_sound_samples/cries/ponyta.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ponyta.wav b/sound/direct_sound_samples/cries/ponyta.wav
new file mode 100644
index 000000000..911954226
Binary files /dev/null and b/sound/direct_sound_samples/cries/ponyta.wav differ
diff --git a/sound/direct_sound_samples/cries/poochyena.aif b/sound/direct_sound_samples/cries/poochyena.aif
deleted file mode 100644
index 3b464ce13..000000000
Binary files a/sound/direct_sound_samples/cries/poochyena.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/poochyena.wav b/sound/direct_sound_samples/cries/poochyena.wav
new file mode 100644
index 000000000..16cabc29c
Binary files /dev/null and b/sound/direct_sound_samples/cries/poochyena.wav differ
diff --git a/sound/direct_sound_samples/cries/porygon.aif b/sound/direct_sound_samples/cries/porygon.aif
deleted file mode 100644
index ced70b379..000000000
Binary files a/sound/direct_sound_samples/cries/porygon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/porygon.wav b/sound/direct_sound_samples/cries/porygon.wav
new file mode 100644
index 000000000..11dd528dd
Binary files /dev/null and b/sound/direct_sound_samples/cries/porygon.wav differ
diff --git a/sound/direct_sound_samples/cries/porygon2.aif b/sound/direct_sound_samples/cries/porygon2.aif
deleted file mode 100644
index c08a3caaf..000000000
Binary files a/sound/direct_sound_samples/cries/porygon2.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/porygon2.wav b/sound/direct_sound_samples/cries/porygon2.wav
new file mode 100644
index 000000000..5699d8e45
Binary files /dev/null and b/sound/direct_sound_samples/cries/porygon2.wav differ
diff --git a/sound/direct_sound_samples/cries/primeape.aif b/sound/direct_sound_samples/cries/primeape.aif
deleted file mode 100644
index a868b3120..000000000
Binary files a/sound/direct_sound_samples/cries/primeape.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/primeape.wav b/sound/direct_sound_samples/cries/primeape.wav
new file mode 100644
index 000000000..bcd98e6bb
Binary files /dev/null and b/sound/direct_sound_samples/cries/primeape.wav differ
diff --git a/sound/direct_sound_samples/cries/psyduck.aif b/sound/direct_sound_samples/cries/psyduck.aif
deleted file mode 100644
index d2d0612f2..000000000
Binary files a/sound/direct_sound_samples/cries/psyduck.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/psyduck.wav b/sound/direct_sound_samples/cries/psyduck.wav
new file mode 100644
index 000000000..bdc0d673e
Binary files /dev/null and b/sound/direct_sound_samples/cries/psyduck.wav differ
diff --git a/sound/direct_sound_samples/cries/pupitar.aif b/sound/direct_sound_samples/cries/pupitar.aif
deleted file mode 100644
index 7386636ce..000000000
Binary files a/sound/direct_sound_samples/cries/pupitar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pupitar.wav b/sound/direct_sound_samples/cries/pupitar.wav
new file mode 100644
index 000000000..5e797d420
Binary files /dev/null and b/sound/direct_sound_samples/cries/pupitar.wav differ
diff --git a/sound/direct_sound_samples/cries/quagsire.aif b/sound/direct_sound_samples/cries/quagsire.aif
deleted file mode 100644
index 1953d0e42..000000000
Binary files a/sound/direct_sound_samples/cries/quagsire.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/quagsire.wav b/sound/direct_sound_samples/cries/quagsire.wav
new file mode 100644
index 000000000..e4a8c0aad
Binary files /dev/null and b/sound/direct_sound_samples/cries/quagsire.wav differ
diff --git a/sound/direct_sound_samples/cries/quilava.aif b/sound/direct_sound_samples/cries/quilava.aif
deleted file mode 100644
index efe873229..000000000
Binary files a/sound/direct_sound_samples/cries/quilava.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/quilava.wav b/sound/direct_sound_samples/cries/quilava.wav
new file mode 100644
index 000000000..ef0bd7381
Binary files /dev/null and b/sound/direct_sound_samples/cries/quilava.wav differ
diff --git a/sound/direct_sound_samples/cries/qwilfish.aif b/sound/direct_sound_samples/cries/qwilfish.aif
deleted file mode 100644
index 268c5c89d..000000000
Binary files a/sound/direct_sound_samples/cries/qwilfish.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/qwilfish.wav b/sound/direct_sound_samples/cries/qwilfish.wav
new file mode 100644
index 000000000..0b11276de
Binary files /dev/null and b/sound/direct_sound_samples/cries/qwilfish.wav differ
diff --git a/sound/direct_sound_samples/cries/raichu.aif b/sound/direct_sound_samples/cries/raichu.aif
deleted file mode 100644
index e59ffbad4..000000000
Binary files a/sound/direct_sound_samples/cries/raichu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/raichu.wav b/sound/direct_sound_samples/cries/raichu.wav
new file mode 100644
index 000000000..4e5dbaeb4
Binary files /dev/null and b/sound/direct_sound_samples/cries/raichu.wav differ
diff --git a/sound/direct_sound_samples/cries/raikou.aif b/sound/direct_sound_samples/cries/raikou.aif
deleted file mode 100644
index a57a2365c..000000000
Binary files a/sound/direct_sound_samples/cries/raikou.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/raikou.wav b/sound/direct_sound_samples/cries/raikou.wav
new file mode 100644
index 000000000..fefeb1e3a
Binary files /dev/null and b/sound/direct_sound_samples/cries/raikou.wav differ
diff --git a/sound/direct_sound_samples/cries/ralts.aif b/sound/direct_sound_samples/cries/ralts.aif
deleted file mode 100644
index 0baef5760..000000000
Binary files a/sound/direct_sound_samples/cries/ralts.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ralts.wav b/sound/direct_sound_samples/cries/ralts.wav
new file mode 100644
index 000000000..4327c13a1
Binary files /dev/null and b/sound/direct_sound_samples/cries/ralts.wav differ
diff --git a/sound/direct_sound_samples/cries/rapidash.aif b/sound/direct_sound_samples/cries/rapidash.aif
deleted file mode 100644
index 920f510e4..000000000
Binary files a/sound/direct_sound_samples/cries/rapidash.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rapidash.wav b/sound/direct_sound_samples/cries/rapidash.wav
new file mode 100644
index 000000000..14ce75be7
Binary files /dev/null and b/sound/direct_sound_samples/cries/rapidash.wav differ
diff --git a/sound/direct_sound_samples/cries/raticate.aif b/sound/direct_sound_samples/cries/raticate.aif
deleted file mode 100644
index 01601cab5..000000000
Binary files a/sound/direct_sound_samples/cries/raticate.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/raticate.wav b/sound/direct_sound_samples/cries/raticate.wav
new file mode 100644
index 000000000..545ebfcf1
Binary files /dev/null and b/sound/direct_sound_samples/cries/raticate.wav differ
diff --git a/sound/direct_sound_samples/cries/rattata.aif b/sound/direct_sound_samples/cries/rattata.aif
deleted file mode 100644
index cb0e1f422..000000000
Binary files a/sound/direct_sound_samples/cries/rattata.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rattata.wav b/sound/direct_sound_samples/cries/rattata.wav
new file mode 100644
index 000000000..9e7a6b3cf
Binary files /dev/null and b/sound/direct_sound_samples/cries/rattata.wav differ
diff --git a/sound/direct_sound_samples/cries/rayquaza.aif b/sound/direct_sound_samples/cries/rayquaza.aif
deleted file mode 100644
index 6115e11d8..000000000
Binary files a/sound/direct_sound_samples/cries/rayquaza.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rayquaza.wav b/sound/direct_sound_samples/cries/rayquaza.wav
new file mode 100644
index 000000000..c4e50535f
Binary files /dev/null and b/sound/direct_sound_samples/cries/rayquaza.wav differ
diff --git a/sound/direct_sound_samples/cries/regice.aif b/sound/direct_sound_samples/cries/regice.aif
deleted file mode 100644
index 6fa23dd73..000000000
Binary files a/sound/direct_sound_samples/cries/regice.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/regice.wav b/sound/direct_sound_samples/cries/regice.wav
new file mode 100644
index 000000000..b65a79b4d
Binary files /dev/null and b/sound/direct_sound_samples/cries/regice.wav differ
diff --git a/sound/direct_sound_samples/cries/regirock.aif b/sound/direct_sound_samples/cries/regirock.aif
deleted file mode 100644
index ab2a47eb8..000000000
Binary files a/sound/direct_sound_samples/cries/regirock.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/regirock.wav b/sound/direct_sound_samples/cries/regirock.wav
new file mode 100644
index 000000000..0df3c1a72
Binary files /dev/null and b/sound/direct_sound_samples/cries/regirock.wav differ
diff --git a/sound/direct_sound_samples/cries/registeel.aif b/sound/direct_sound_samples/cries/registeel.aif
deleted file mode 100644
index f5374e5f0..000000000
Binary files a/sound/direct_sound_samples/cries/registeel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/registeel.wav b/sound/direct_sound_samples/cries/registeel.wav
new file mode 100644
index 000000000..0e2b21beb
Binary files /dev/null and b/sound/direct_sound_samples/cries/registeel.wav differ
diff --git a/sound/direct_sound_samples/cries/relicanth.aif b/sound/direct_sound_samples/cries/relicanth.aif
deleted file mode 100644
index 60af9cf4e..000000000
Binary files a/sound/direct_sound_samples/cries/relicanth.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/relicanth.wav b/sound/direct_sound_samples/cries/relicanth.wav
new file mode 100644
index 000000000..1a8c04473
Binary files /dev/null and b/sound/direct_sound_samples/cries/relicanth.wav differ
diff --git a/sound/direct_sound_samples/cries/remoraid.aif b/sound/direct_sound_samples/cries/remoraid.aif
deleted file mode 100644
index 16d3f1d65..000000000
Binary files a/sound/direct_sound_samples/cries/remoraid.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/remoraid.wav b/sound/direct_sound_samples/cries/remoraid.wav
new file mode 100644
index 000000000..0465e033f
Binary files /dev/null and b/sound/direct_sound_samples/cries/remoraid.wav differ
diff --git a/sound/direct_sound_samples/cries/rhydon.aif b/sound/direct_sound_samples/cries/rhydon.aif
deleted file mode 100644
index cfa709ee9..000000000
Binary files a/sound/direct_sound_samples/cries/rhydon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rhydon.wav b/sound/direct_sound_samples/cries/rhydon.wav
new file mode 100644
index 000000000..e4f024f31
Binary files /dev/null and b/sound/direct_sound_samples/cries/rhydon.wav differ
diff --git a/sound/direct_sound_samples/cries/rhyhorn.aif b/sound/direct_sound_samples/cries/rhyhorn.aif
deleted file mode 100644
index 47f344ba2..000000000
Binary files a/sound/direct_sound_samples/cries/rhyhorn.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rhyhorn.wav b/sound/direct_sound_samples/cries/rhyhorn.wav
new file mode 100644
index 000000000..10c6841f4
Binary files /dev/null and b/sound/direct_sound_samples/cries/rhyhorn.wav differ
diff --git a/sound/direct_sound_samples/cries/roselia.aif b/sound/direct_sound_samples/cries/roselia.aif
deleted file mode 100644
index 50b60b77b..000000000
Binary files a/sound/direct_sound_samples/cries/roselia.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/roselia.wav b/sound/direct_sound_samples/cries/roselia.wav
new file mode 100644
index 000000000..cd01f19f6
Binary files /dev/null and b/sound/direct_sound_samples/cries/roselia.wav differ
diff --git a/sound/direct_sound_samples/cries/sableye.aif b/sound/direct_sound_samples/cries/sableye.aif
deleted file mode 100644
index 1b3a9be30..000000000
Binary files a/sound/direct_sound_samples/cries/sableye.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sableye.wav b/sound/direct_sound_samples/cries/sableye.wav
new file mode 100644
index 000000000..9f32fbdd6
Binary files /dev/null and b/sound/direct_sound_samples/cries/sableye.wav differ
diff --git a/sound/direct_sound_samples/cries/salamence.aif b/sound/direct_sound_samples/cries/salamence.aif
deleted file mode 100644
index d2957809c..000000000
Binary files a/sound/direct_sound_samples/cries/salamence.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/salamence.wav b/sound/direct_sound_samples/cries/salamence.wav
new file mode 100644
index 000000000..1c426adfa
Binary files /dev/null and b/sound/direct_sound_samples/cries/salamence.wav differ
diff --git a/sound/direct_sound_samples/cries/sandshrew.aif b/sound/direct_sound_samples/cries/sandshrew.aif
deleted file mode 100644
index 6879be11d..000000000
Binary files a/sound/direct_sound_samples/cries/sandshrew.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sandshrew.wav b/sound/direct_sound_samples/cries/sandshrew.wav
new file mode 100644
index 000000000..8c324ed3d
Binary files /dev/null and b/sound/direct_sound_samples/cries/sandshrew.wav differ
diff --git a/sound/direct_sound_samples/cries/sandslash.aif b/sound/direct_sound_samples/cries/sandslash.aif
deleted file mode 100644
index ee4a458ed..000000000
Binary files a/sound/direct_sound_samples/cries/sandslash.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sandslash.wav b/sound/direct_sound_samples/cries/sandslash.wav
new file mode 100644
index 000000000..95bcdb869
Binary files /dev/null and b/sound/direct_sound_samples/cries/sandslash.wav differ
diff --git a/sound/direct_sound_samples/cries/sceptile.aif b/sound/direct_sound_samples/cries/sceptile.aif
deleted file mode 100644
index 7252cb85f..000000000
Binary files a/sound/direct_sound_samples/cries/sceptile.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sceptile.wav b/sound/direct_sound_samples/cries/sceptile.wav
new file mode 100644
index 000000000..32673bc77
Binary files /dev/null and b/sound/direct_sound_samples/cries/sceptile.wav differ
diff --git a/sound/direct_sound_samples/cries/scizor.aif b/sound/direct_sound_samples/cries/scizor.aif
deleted file mode 100644
index f1f7832ce..000000000
Binary files a/sound/direct_sound_samples/cries/scizor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/scizor.wav b/sound/direct_sound_samples/cries/scizor.wav
new file mode 100644
index 000000000..8196df16b
Binary files /dev/null and b/sound/direct_sound_samples/cries/scizor.wav differ
diff --git a/sound/direct_sound_samples/cries/scyther.aif b/sound/direct_sound_samples/cries/scyther.aif
deleted file mode 100644
index 2b8cbc104..000000000
Binary files a/sound/direct_sound_samples/cries/scyther.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/scyther.wav b/sound/direct_sound_samples/cries/scyther.wav
new file mode 100644
index 000000000..5b6ba415a
Binary files /dev/null and b/sound/direct_sound_samples/cries/scyther.wav differ
diff --git a/sound/direct_sound_samples/cries/seadra.aif b/sound/direct_sound_samples/cries/seadra.aif
deleted file mode 100644
index 2f60cce4a..000000000
Binary files a/sound/direct_sound_samples/cries/seadra.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/seadra.wav b/sound/direct_sound_samples/cries/seadra.wav
new file mode 100644
index 000000000..c68a68a19
Binary files /dev/null and b/sound/direct_sound_samples/cries/seadra.wav differ
diff --git a/sound/direct_sound_samples/cries/seaking.aif b/sound/direct_sound_samples/cries/seaking.aif
deleted file mode 100644
index e4fc7e70d..000000000
Binary files a/sound/direct_sound_samples/cries/seaking.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/seaking.wav b/sound/direct_sound_samples/cries/seaking.wav
new file mode 100644
index 000000000..6f2533e94
Binary files /dev/null and b/sound/direct_sound_samples/cries/seaking.wav differ
diff --git a/sound/direct_sound_samples/cries/sealeo.aif b/sound/direct_sound_samples/cries/sealeo.aif
deleted file mode 100644
index d9ea50026..000000000
Binary files a/sound/direct_sound_samples/cries/sealeo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sealeo.wav b/sound/direct_sound_samples/cries/sealeo.wav
new file mode 100644
index 000000000..ad01a5fed
Binary files /dev/null and b/sound/direct_sound_samples/cries/sealeo.wav differ
diff --git a/sound/direct_sound_samples/cries/seedot.aif b/sound/direct_sound_samples/cries/seedot.aif
deleted file mode 100644
index c37b769f8..000000000
Binary files a/sound/direct_sound_samples/cries/seedot.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/seedot.wav b/sound/direct_sound_samples/cries/seedot.wav
new file mode 100644
index 000000000..b4d74f65d
Binary files /dev/null and b/sound/direct_sound_samples/cries/seedot.wav differ
diff --git a/sound/direct_sound_samples/cries/seel.aif b/sound/direct_sound_samples/cries/seel.aif
deleted file mode 100644
index 84c4a0a94..000000000
Binary files a/sound/direct_sound_samples/cries/seel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/seel.wav b/sound/direct_sound_samples/cries/seel.wav
new file mode 100644
index 000000000..6e252b375
Binary files /dev/null and b/sound/direct_sound_samples/cries/seel.wav differ
diff --git a/sound/direct_sound_samples/cries/sentret.aif b/sound/direct_sound_samples/cries/sentret.aif
deleted file mode 100644
index 4aed7cd70..000000000
Binary files a/sound/direct_sound_samples/cries/sentret.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sentret.wav b/sound/direct_sound_samples/cries/sentret.wav
new file mode 100644
index 000000000..0c6746c45
Binary files /dev/null and b/sound/direct_sound_samples/cries/sentret.wav differ
diff --git a/sound/direct_sound_samples/cries/seviper.aif b/sound/direct_sound_samples/cries/seviper.aif
deleted file mode 100644
index 6a15dd6e2..000000000
Binary files a/sound/direct_sound_samples/cries/seviper.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/seviper.wav b/sound/direct_sound_samples/cries/seviper.wav
new file mode 100644
index 000000000..b467378f4
Binary files /dev/null and b/sound/direct_sound_samples/cries/seviper.wav differ
diff --git a/sound/direct_sound_samples/cries/sharpedo.aif b/sound/direct_sound_samples/cries/sharpedo.aif
deleted file mode 100644
index 1b02b56ce..000000000
Binary files a/sound/direct_sound_samples/cries/sharpedo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sharpedo.wav b/sound/direct_sound_samples/cries/sharpedo.wav
new file mode 100644
index 000000000..26c52b43c
Binary files /dev/null and b/sound/direct_sound_samples/cries/sharpedo.wav differ
diff --git a/sound/direct_sound_samples/cries/shedinja.aif b/sound/direct_sound_samples/cries/shedinja.aif
deleted file mode 100644
index 6d1d565f3..000000000
Binary files a/sound/direct_sound_samples/cries/shedinja.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shedinja.wav b/sound/direct_sound_samples/cries/shedinja.wav
new file mode 100644
index 000000000..956ae0be9
Binary files /dev/null and b/sound/direct_sound_samples/cries/shedinja.wav differ
diff --git a/sound/direct_sound_samples/cries/shelgon.aif b/sound/direct_sound_samples/cries/shelgon.aif
deleted file mode 100644
index 24f234ffe..000000000
Binary files a/sound/direct_sound_samples/cries/shelgon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shelgon.wav b/sound/direct_sound_samples/cries/shelgon.wav
new file mode 100644
index 000000000..7648d06f9
Binary files /dev/null and b/sound/direct_sound_samples/cries/shelgon.wav differ
diff --git a/sound/direct_sound_samples/cries/shellder.aif b/sound/direct_sound_samples/cries/shellder.aif
deleted file mode 100644
index b2ea85228..000000000
Binary files a/sound/direct_sound_samples/cries/shellder.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shellder.wav b/sound/direct_sound_samples/cries/shellder.wav
new file mode 100644
index 000000000..1fe4367d7
Binary files /dev/null and b/sound/direct_sound_samples/cries/shellder.wav differ
diff --git a/sound/direct_sound_samples/cries/shiftry.aif b/sound/direct_sound_samples/cries/shiftry.aif
deleted file mode 100644
index c91ece114..000000000
Binary files a/sound/direct_sound_samples/cries/shiftry.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shiftry.wav b/sound/direct_sound_samples/cries/shiftry.wav
new file mode 100644
index 000000000..533115f40
Binary files /dev/null and b/sound/direct_sound_samples/cries/shiftry.wav differ
diff --git a/sound/direct_sound_samples/cries/shroomish.aif b/sound/direct_sound_samples/cries/shroomish.aif
deleted file mode 100644
index 9e944ca20..000000000
Binary files a/sound/direct_sound_samples/cries/shroomish.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shroomish.wav b/sound/direct_sound_samples/cries/shroomish.wav
new file mode 100644
index 000000000..07658c880
Binary files /dev/null and b/sound/direct_sound_samples/cries/shroomish.wav differ
diff --git a/sound/direct_sound_samples/cries/shuckle.aif b/sound/direct_sound_samples/cries/shuckle.aif
deleted file mode 100644
index d835d2de6..000000000
Binary files a/sound/direct_sound_samples/cries/shuckle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shuckle.wav b/sound/direct_sound_samples/cries/shuckle.wav
new file mode 100644
index 000000000..bb196dbfe
Binary files /dev/null and b/sound/direct_sound_samples/cries/shuckle.wav differ
diff --git a/sound/direct_sound_samples/cries/shuppet.aif b/sound/direct_sound_samples/cries/shuppet.aif
deleted file mode 100644
index 1cd9a2f14..000000000
Binary files a/sound/direct_sound_samples/cries/shuppet.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shuppet.wav b/sound/direct_sound_samples/cries/shuppet.wav
new file mode 100644
index 000000000..6b043a277
Binary files /dev/null and b/sound/direct_sound_samples/cries/shuppet.wav differ
diff --git a/sound/direct_sound_samples/cries/silcoon.aif b/sound/direct_sound_samples/cries/silcoon.aif
deleted file mode 100644
index ff48950ad..000000000
Binary files a/sound/direct_sound_samples/cries/silcoon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/silcoon.wav b/sound/direct_sound_samples/cries/silcoon.wav
new file mode 100644
index 000000000..15827329e
Binary files /dev/null and b/sound/direct_sound_samples/cries/silcoon.wav differ
diff --git a/sound/direct_sound_samples/cries/skarmory.aif b/sound/direct_sound_samples/cries/skarmory.aif
deleted file mode 100644
index 88d3985a3..000000000
Binary files a/sound/direct_sound_samples/cries/skarmory.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/skarmory.wav b/sound/direct_sound_samples/cries/skarmory.wav
new file mode 100644
index 000000000..292497302
Binary files /dev/null and b/sound/direct_sound_samples/cries/skarmory.wav differ
diff --git a/sound/direct_sound_samples/cries/skiploom.aif b/sound/direct_sound_samples/cries/skiploom.aif
deleted file mode 100644
index 201744d12..000000000
Binary files a/sound/direct_sound_samples/cries/skiploom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/skiploom.wav b/sound/direct_sound_samples/cries/skiploom.wav
new file mode 100644
index 000000000..30f9c2666
Binary files /dev/null and b/sound/direct_sound_samples/cries/skiploom.wav differ
diff --git a/sound/direct_sound_samples/cries/skitty.aif b/sound/direct_sound_samples/cries/skitty.aif
deleted file mode 100644
index 7dc4578f4..000000000
Binary files a/sound/direct_sound_samples/cries/skitty.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/skitty.wav b/sound/direct_sound_samples/cries/skitty.wav
new file mode 100644
index 000000000..02aaa4fcb
Binary files /dev/null and b/sound/direct_sound_samples/cries/skitty.wav differ
diff --git a/sound/direct_sound_samples/cries/slaking.aif b/sound/direct_sound_samples/cries/slaking.aif
deleted file mode 100644
index b6a4160f3..000000000
Binary files a/sound/direct_sound_samples/cries/slaking.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/slaking.wav b/sound/direct_sound_samples/cries/slaking.wav
new file mode 100644
index 000000000..ef34d94d6
Binary files /dev/null and b/sound/direct_sound_samples/cries/slaking.wav differ
diff --git a/sound/direct_sound_samples/cries/slakoth.aif b/sound/direct_sound_samples/cries/slakoth.aif
deleted file mode 100644
index 0e4bbc3c3..000000000
Binary files a/sound/direct_sound_samples/cries/slakoth.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/slakoth.wav b/sound/direct_sound_samples/cries/slakoth.wav
new file mode 100644
index 000000000..d4588b3a2
Binary files /dev/null and b/sound/direct_sound_samples/cries/slakoth.wav differ
diff --git a/sound/direct_sound_samples/cries/slowbro.aif b/sound/direct_sound_samples/cries/slowbro.aif
deleted file mode 100644
index f74b753d2..000000000
Binary files a/sound/direct_sound_samples/cries/slowbro.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/slowbro.wav b/sound/direct_sound_samples/cries/slowbro.wav
new file mode 100644
index 000000000..fe03ab4cd
Binary files /dev/null and b/sound/direct_sound_samples/cries/slowbro.wav differ
diff --git a/sound/direct_sound_samples/cries/slowking.aif b/sound/direct_sound_samples/cries/slowking.aif
deleted file mode 100644
index 245a42023..000000000
Binary files a/sound/direct_sound_samples/cries/slowking.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/slowking.wav b/sound/direct_sound_samples/cries/slowking.wav
new file mode 100644
index 000000000..f80279628
Binary files /dev/null and b/sound/direct_sound_samples/cries/slowking.wav differ
diff --git a/sound/direct_sound_samples/cries/slowpoke.aif b/sound/direct_sound_samples/cries/slowpoke.aif
deleted file mode 100644
index 82b05a9a7..000000000
Binary files a/sound/direct_sound_samples/cries/slowpoke.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/slowpoke.wav b/sound/direct_sound_samples/cries/slowpoke.wav
new file mode 100644
index 000000000..b3a45bef0
Binary files /dev/null and b/sound/direct_sound_samples/cries/slowpoke.wav differ
diff --git a/sound/direct_sound_samples/cries/slugma.aif b/sound/direct_sound_samples/cries/slugma.aif
deleted file mode 100644
index fed42817c..000000000
Binary files a/sound/direct_sound_samples/cries/slugma.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/slugma.wav b/sound/direct_sound_samples/cries/slugma.wav
new file mode 100644
index 000000000..389bc8865
Binary files /dev/null and b/sound/direct_sound_samples/cries/slugma.wav differ
diff --git a/sound/direct_sound_samples/cries/smeargle.aif b/sound/direct_sound_samples/cries/smeargle.aif
deleted file mode 100644
index 00dbedead..000000000
Binary files a/sound/direct_sound_samples/cries/smeargle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/smeargle.wav b/sound/direct_sound_samples/cries/smeargle.wav
new file mode 100644
index 000000000..e206f8f61
Binary files /dev/null and b/sound/direct_sound_samples/cries/smeargle.wav differ
diff --git a/sound/direct_sound_samples/cries/smoochum.aif b/sound/direct_sound_samples/cries/smoochum.aif
deleted file mode 100644
index 4005b4ad4..000000000
Binary files a/sound/direct_sound_samples/cries/smoochum.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/smoochum.wav b/sound/direct_sound_samples/cries/smoochum.wav
new file mode 100644
index 000000000..a4abdde7e
Binary files /dev/null and b/sound/direct_sound_samples/cries/smoochum.wav differ
diff --git a/sound/direct_sound_samples/cries/sneasel.aif b/sound/direct_sound_samples/cries/sneasel.aif
deleted file mode 100644
index 54242a23f..000000000
Binary files a/sound/direct_sound_samples/cries/sneasel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sneasel.wav b/sound/direct_sound_samples/cries/sneasel.wav
new file mode 100644
index 000000000..da76aefb7
Binary files /dev/null and b/sound/direct_sound_samples/cries/sneasel.wav differ
diff --git a/sound/direct_sound_samples/cries/snorlax.aif b/sound/direct_sound_samples/cries/snorlax.aif
deleted file mode 100644
index f95128e3a..000000000
Binary files a/sound/direct_sound_samples/cries/snorlax.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/snorlax.wav b/sound/direct_sound_samples/cries/snorlax.wav
new file mode 100644
index 000000000..12e717be1
Binary files /dev/null and b/sound/direct_sound_samples/cries/snorlax.wav differ
diff --git a/sound/direct_sound_samples/cries/snorunt.aif b/sound/direct_sound_samples/cries/snorunt.aif
deleted file mode 100644
index 53b05b229..000000000
Binary files a/sound/direct_sound_samples/cries/snorunt.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/snorunt.wav b/sound/direct_sound_samples/cries/snorunt.wav
new file mode 100644
index 000000000..b4ecc4537
Binary files /dev/null and b/sound/direct_sound_samples/cries/snorunt.wav differ
diff --git a/sound/direct_sound_samples/cries/snubbull.aif b/sound/direct_sound_samples/cries/snubbull.aif
deleted file mode 100644
index bbba023fd..000000000
Binary files a/sound/direct_sound_samples/cries/snubbull.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/snubbull.wav b/sound/direct_sound_samples/cries/snubbull.wav
new file mode 100644
index 000000000..37cacda8f
Binary files /dev/null and b/sound/direct_sound_samples/cries/snubbull.wav differ
diff --git a/sound/direct_sound_samples/cries/solrock.aif b/sound/direct_sound_samples/cries/solrock.aif
deleted file mode 100644
index 64c71f289..000000000
Binary files a/sound/direct_sound_samples/cries/solrock.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/solrock.wav b/sound/direct_sound_samples/cries/solrock.wav
new file mode 100644
index 000000000..12f766af7
Binary files /dev/null and b/sound/direct_sound_samples/cries/solrock.wav differ
diff --git a/sound/direct_sound_samples/cries/spearow.aif b/sound/direct_sound_samples/cries/spearow.aif
deleted file mode 100644
index 7ce86ae29..000000000
Binary files a/sound/direct_sound_samples/cries/spearow.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/spearow.wav b/sound/direct_sound_samples/cries/spearow.wav
new file mode 100644
index 000000000..a64848136
Binary files /dev/null and b/sound/direct_sound_samples/cries/spearow.wav differ
diff --git a/sound/direct_sound_samples/cries/spheal.aif b/sound/direct_sound_samples/cries/spheal.aif
deleted file mode 100644
index fb6470210..000000000
Binary files a/sound/direct_sound_samples/cries/spheal.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/spheal.wav b/sound/direct_sound_samples/cries/spheal.wav
new file mode 100644
index 000000000..818caf8cd
Binary files /dev/null and b/sound/direct_sound_samples/cries/spheal.wav differ
diff --git a/sound/direct_sound_samples/cries/spinarak.aif b/sound/direct_sound_samples/cries/spinarak.aif
deleted file mode 100644
index 3c4c1eff1..000000000
Binary files a/sound/direct_sound_samples/cries/spinarak.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/spinarak.wav b/sound/direct_sound_samples/cries/spinarak.wav
new file mode 100644
index 000000000..3c4573132
Binary files /dev/null and b/sound/direct_sound_samples/cries/spinarak.wav differ
diff --git a/sound/direct_sound_samples/cries/spinda.aif b/sound/direct_sound_samples/cries/spinda.aif
deleted file mode 100644
index 0217573c7..000000000
Binary files a/sound/direct_sound_samples/cries/spinda.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/spinda.wav b/sound/direct_sound_samples/cries/spinda.wav
new file mode 100644
index 000000000..4481e3a88
Binary files /dev/null and b/sound/direct_sound_samples/cries/spinda.wav differ
diff --git a/sound/direct_sound_samples/cries/spoink.aif b/sound/direct_sound_samples/cries/spoink.aif
deleted file mode 100644
index 6cc9bf546..000000000
Binary files a/sound/direct_sound_samples/cries/spoink.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/spoink.wav b/sound/direct_sound_samples/cries/spoink.wav
new file mode 100644
index 000000000..36447fb84
Binary files /dev/null and b/sound/direct_sound_samples/cries/spoink.wav differ
diff --git a/sound/direct_sound_samples/cries/squirtle.aif b/sound/direct_sound_samples/cries/squirtle.aif
deleted file mode 100644
index 43a98a53d..000000000
Binary files a/sound/direct_sound_samples/cries/squirtle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/squirtle.wav b/sound/direct_sound_samples/cries/squirtle.wav
new file mode 100644
index 000000000..0cf32c6b6
Binary files /dev/null and b/sound/direct_sound_samples/cries/squirtle.wav differ
diff --git a/sound/direct_sound_samples/cries/stantler.aif b/sound/direct_sound_samples/cries/stantler.aif
deleted file mode 100644
index 36ba54658..000000000
Binary files a/sound/direct_sound_samples/cries/stantler.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/stantler.wav b/sound/direct_sound_samples/cries/stantler.wav
new file mode 100644
index 000000000..f59953beb
Binary files /dev/null and b/sound/direct_sound_samples/cries/stantler.wav differ
diff --git a/sound/direct_sound_samples/cries/starmie.aif b/sound/direct_sound_samples/cries/starmie.aif
deleted file mode 100644
index 7452a78f9..000000000
Binary files a/sound/direct_sound_samples/cries/starmie.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/starmie.wav b/sound/direct_sound_samples/cries/starmie.wav
new file mode 100644
index 000000000..e3ace4fcf
Binary files /dev/null and b/sound/direct_sound_samples/cries/starmie.wav differ
diff --git a/sound/direct_sound_samples/cries/staryu.aif b/sound/direct_sound_samples/cries/staryu.aif
deleted file mode 100644
index 6ab5584bf..000000000
Binary files a/sound/direct_sound_samples/cries/staryu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/staryu.wav b/sound/direct_sound_samples/cries/staryu.wav
new file mode 100644
index 000000000..c726206f4
Binary files /dev/null and b/sound/direct_sound_samples/cries/staryu.wav differ
diff --git a/sound/direct_sound_samples/cries/steelix.aif b/sound/direct_sound_samples/cries/steelix.aif
deleted file mode 100644
index aa05e2d4c..000000000
Binary files a/sound/direct_sound_samples/cries/steelix.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/steelix.wav b/sound/direct_sound_samples/cries/steelix.wav
new file mode 100644
index 000000000..8683e3d24
Binary files /dev/null and b/sound/direct_sound_samples/cries/steelix.wav differ
diff --git a/sound/direct_sound_samples/cries/sudowoodo.aif b/sound/direct_sound_samples/cries/sudowoodo.aif
deleted file mode 100644
index 1af7e18eb..000000000
Binary files a/sound/direct_sound_samples/cries/sudowoodo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sudowoodo.wav b/sound/direct_sound_samples/cries/sudowoodo.wav
new file mode 100644
index 000000000..48661df94
Binary files /dev/null and b/sound/direct_sound_samples/cries/sudowoodo.wav differ
diff --git a/sound/direct_sound_samples/cries/suicune.aif b/sound/direct_sound_samples/cries/suicune.aif
deleted file mode 100644
index 697732d68..000000000
Binary files a/sound/direct_sound_samples/cries/suicune.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/suicune.wav b/sound/direct_sound_samples/cries/suicune.wav
new file mode 100644
index 000000000..f675d8fdc
Binary files /dev/null and b/sound/direct_sound_samples/cries/suicune.wav differ
diff --git a/sound/direct_sound_samples/cries/sunflora.aif b/sound/direct_sound_samples/cries/sunflora.aif
deleted file mode 100644
index 126931adc..000000000
Binary files a/sound/direct_sound_samples/cries/sunflora.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sunflora.wav b/sound/direct_sound_samples/cries/sunflora.wav
new file mode 100644
index 000000000..613422881
Binary files /dev/null and b/sound/direct_sound_samples/cries/sunflora.wav differ
diff --git a/sound/direct_sound_samples/cries/sunkern.aif b/sound/direct_sound_samples/cries/sunkern.aif
deleted file mode 100644
index bede3bf95..000000000
Binary files a/sound/direct_sound_samples/cries/sunkern.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sunkern.wav b/sound/direct_sound_samples/cries/sunkern.wav
new file mode 100644
index 000000000..b183f9ee9
Binary files /dev/null and b/sound/direct_sound_samples/cries/sunkern.wav differ
diff --git a/sound/direct_sound_samples/cries/surskit.aif b/sound/direct_sound_samples/cries/surskit.aif
deleted file mode 100644
index 438b5b67a..000000000
Binary files a/sound/direct_sound_samples/cries/surskit.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/surskit.wav b/sound/direct_sound_samples/cries/surskit.wav
new file mode 100644
index 000000000..04b1be882
Binary files /dev/null and b/sound/direct_sound_samples/cries/surskit.wav differ
diff --git a/sound/direct_sound_samples/cries/swablu.aif b/sound/direct_sound_samples/cries/swablu.aif
deleted file mode 100644
index 066095f55..000000000
Binary files a/sound/direct_sound_samples/cries/swablu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/swablu.wav b/sound/direct_sound_samples/cries/swablu.wav
new file mode 100644
index 000000000..f24d34930
Binary files /dev/null and b/sound/direct_sound_samples/cries/swablu.wav differ
diff --git a/sound/direct_sound_samples/cries/swalot.aif b/sound/direct_sound_samples/cries/swalot.aif
deleted file mode 100644
index 518a9bf5a..000000000
Binary files a/sound/direct_sound_samples/cries/swalot.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/swalot.wav b/sound/direct_sound_samples/cries/swalot.wav
new file mode 100644
index 000000000..cfed97934
Binary files /dev/null and b/sound/direct_sound_samples/cries/swalot.wav differ
diff --git a/sound/direct_sound_samples/cries/swampert.aif b/sound/direct_sound_samples/cries/swampert.aif
deleted file mode 100644
index 56bd26405..000000000
Binary files a/sound/direct_sound_samples/cries/swampert.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/swampert.wav b/sound/direct_sound_samples/cries/swampert.wav
new file mode 100644
index 000000000..a06f15992
Binary files /dev/null and b/sound/direct_sound_samples/cries/swampert.wav differ
diff --git a/sound/direct_sound_samples/cries/swellow.aif b/sound/direct_sound_samples/cries/swellow.aif
deleted file mode 100644
index 2b94eb432..000000000
Binary files a/sound/direct_sound_samples/cries/swellow.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/swellow.wav b/sound/direct_sound_samples/cries/swellow.wav
new file mode 100644
index 000000000..637ff4654
Binary files /dev/null and b/sound/direct_sound_samples/cries/swellow.wav differ
diff --git a/sound/direct_sound_samples/cries/swinub.aif b/sound/direct_sound_samples/cries/swinub.aif
deleted file mode 100644
index dc68d62d8..000000000
Binary files a/sound/direct_sound_samples/cries/swinub.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/swinub.wav b/sound/direct_sound_samples/cries/swinub.wav
new file mode 100644
index 000000000..93eafa458
Binary files /dev/null and b/sound/direct_sound_samples/cries/swinub.wav differ
diff --git a/sound/direct_sound_samples/cries/taillow.aif b/sound/direct_sound_samples/cries/taillow.aif
deleted file mode 100644
index 8322a3224..000000000
Binary files a/sound/direct_sound_samples/cries/taillow.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/taillow.wav b/sound/direct_sound_samples/cries/taillow.wav
new file mode 100644
index 000000000..9f1bb25f4
Binary files /dev/null and b/sound/direct_sound_samples/cries/taillow.wav differ
diff --git a/sound/direct_sound_samples/cries/tangela.aif b/sound/direct_sound_samples/cries/tangela.aif
deleted file mode 100644
index c900b426d..000000000
Binary files a/sound/direct_sound_samples/cries/tangela.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tangela.wav b/sound/direct_sound_samples/cries/tangela.wav
new file mode 100644
index 000000000..023a0362f
Binary files /dev/null and b/sound/direct_sound_samples/cries/tangela.wav differ
diff --git a/sound/direct_sound_samples/cries/tauros.aif b/sound/direct_sound_samples/cries/tauros.aif
deleted file mode 100644
index 84fa9b317..000000000
Binary files a/sound/direct_sound_samples/cries/tauros.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tauros.wav b/sound/direct_sound_samples/cries/tauros.wav
new file mode 100644
index 000000000..a982d052d
Binary files /dev/null and b/sound/direct_sound_samples/cries/tauros.wav differ
diff --git a/sound/direct_sound_samples/cries/teddiursa.aif b/sound/direct_sound_samples/cries/teddiursa.aif
deleted file mode 100644
index ba5cb5bc3..000000000
Binary files a/sound/direct_sound_samples/cries/teddiursa.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/teddiursa.wav b/sound/direct_sound_samples/cries/teddiursa.wav
new file mode 100644
index 000000000..adc9b80d9
Binary files /dev/null and b/sound/direct_sound_samples/cries/teddiursa.wav differ
diff --git a/sound/direct_sound_samples/cries/tentacool.aif b/sound/direct_sound_samples/cries/tentacool.aif
deleted file mode 100644
index 332bec4b2..000000000
Binary files a/sound/direct_sound_samples/cries/tentacool.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tentacool.wav b/sound/direct_sound_samples/cries/tentacool.wav
new file mode 100644
index 000000000..cd8f5afc7
Binary files /dev/null and b/sound/direct_sound_samples/cries/tentacool.wav differ
diff --git a/sound/direct_sound_samples/cries/tentacruel.aif b/sound/direct_sound_samples/cries/tentacruel.aif
deleted file mode 100644
index e8ec1b14c..000000000
Binary files a/sound/direct_sound_samples/cries/tentacruel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tentacruel.wav b/sound/direct_sound_samples/cries/tentacruel.wav
new file mode 100644
index 000000000..dfbc8c7f0
Binary files /dev/null and b/sound/direct_sound_samples/cries/tentacruel.wav differ
diff --git a/sound/direct_sound_samples/cries/togepi.aif b/sound/direct_sound_samples/cries/togepi.aif
deleted file mode 100644
index 87ef6ef2d..000000000
Binary files a/sound/direct_sound_samples/cries/togepi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/togepi.wav b/sound/direct_sound_samples/cries/togepi.wav
new file mode 100644
index 000000000..e13355c55
Binary files /dev/null and b/sound/direct_sound_samples/cries/togepi.wav differ
diff --git a/sound/direct_sound_samples/cries/togetic.aif b/sound/direct_sound_samples/cries/togetic.aif
deleted file mode 100644
index 8aa18ac41..000000000
Binary files a/sound/direct_sound_samples/cries/togetic.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/togetic.wav b/sound/direct_sound_samples/cries/togetic.wav
new file mode 100644
index 000000000..957a45dc9
Binary files /dev/null and b/sound/direct_sound_samples/cries/togetic.wav differ
diff --git a/sound/direct_sound_samples/cries/torchic.aif b/sound/direct_sound_samples/cries/torchic.aif
deleted file mode 100644
index 185a79499..000000000
Binary files a/sound/direct_sound_samples/cries/torchic.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/torchic.wav b/sound/direct_sound_samples/cries/torchic.wav
new file mode 100644
index 000000000..39a2522b3
Binary files /dev/null and b/sound/direct_sound_samples/cries/torchic.wav differ
diff --git a/sound/direct_sound_samples/cries/torkoal.aif b/sound/direct_sound_samples/cries/torkoal.aif
deleted file mode 100644
index 9e56d3810..000000000
Binary files a/sound/direct_sound_samples/cries/torkoal.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/torkoal.wav b/sound/direct_sound_samples/cries/torkoal.wav
new file mode 100644
index 000000000..497e92af2
Binary files /dev/null and b/sound/direct_sound_samples/cries/torkoal.wav differ
diff --git a/sound/direct_sound_samples/cries/totodile.aif b/sound/direct_sound_samples/cries/totodile.aif
deleted file mode 100644
index dbf2179a7..000000000
Binary files a/sound/direct_sound_samples/cries/totodile.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/totodile.wav b/sound/direct_sound_samples/cries/totodile.wav
new file mode 100644
index 000000000..93c078847
Binary files /dev/null and b/sound/direct_sound_samples/cries/totodile.wav differ
diff --git a/sound/direct_sound_samples/cries/trapinch.aif b/sound/direct_sound_samples/cries/trapinch.aif
deleted file mode 100644
index 01664b72e..000000000
Binary files a/sound/direct_sound_samples/cries/trapinch.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/trapinch.wav b/sound/direct_sound_samples/cries/trapinch.wav
new file mode 100644
index 000000000..5cad4ad23
Binary files /dev/null and b/sound/direct_sound_samples/cries/trapinch.wav differ
diff --git a/sound/direct_sound_samples/cries/treecko.aif b/sound/direct_sound_samples/cries/treecko.aif
deleted file mode 100644
index a7416e8da..000000000
Binary files a/sound/direct_sound_samples/cries/treecko.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/treecko.wav b/sound/direct_sound_samples/cries/treecko.wav
new file mode 100644
index 000000000..0c982f840
Binary files /dev/null and b/sound/direct_sound_samples/cries/treecko.wav differ
diff --git a/sound/direct_sound_samples/cries/tropius.aif b/sound/direct_sound_samples/cries/tropius.aif
deleted file mode 100644
index bbb52787b..000000000
Binary files a/sound/direct_sound_samples/cries/tropius.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tropius.wav b/sound/direct_sound_samples/cries/tropius.wav
new file mode 100644
index 000000000..55de362aa
Binary files /dev/null and b/sound/direct_sound_samples/cries/tropius.wav differ
diff --git a/sound/direct_sound_samples/cries/typhlosion.aif b/sound/direct_sound_samples/cries/typhlosion.aif
deleted file mode 100644
index f0238d066..000000000
Binary files a/sound/direct_sound_samples/cries/typhlosion.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/typhlosion.wav b/sound/direct_sound_samples/cries/typhlosion.wav
new file mode 100644
index 000000000..f1759989d
Binary files /dev/null and b/sound/direct_sound_samples/cries/typhlosion.wav differ
diff --git a/sound/direct_sound_samples/cries/tyranitar.aif b/sound/direct_sound_samples/cries/tyranitar.aif
deleted file mode 100644
index 557f61769..000000000
Binary files a/sound/direct_sound_samples/cries/tyranitar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tyranitar.wav b/sound/direct_sound_samples/cries/tyranitar.wav
new file mode 100644
index 000000000..5bec5f727
Binary files /dev/null and b/sound/direct_sound_samples/cries/tyranitar.wav differ
diff --git a/sound/direct_sound_samples/cries/tyrogue.aif b/sound/direct_sound_samples/cries/tyrogue.aif
deleted file mode 100644
index e5065f58b..000000000
Binary files a/sound/direct_sound_samples/cries/tyrogue.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tyrogue.wav b/sound/direct_sound_samples/cries/tyrogue.wav
new file mode 100644
index 000000000..46d032063
Binary files /dev/null and b/sound/direct_sound_samples/cries/tyrogue.wav differ
diff --git a/sound/direct_sound_samples/cries/umbreon.aif b/sound/direct_sound_samples/cries/umbreon.aif
deleted file mode 100644
index 38129b1a7..000000000
Binary files a/sound/direct_sound_samples/cries/umbreon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/umbreon.wav b/sound/direct_sound_samples/cries/umbreon.wav
new file mode 100644
index 000000000..48f62064a
Binary files /dev/null and b/sound/direct_sound_samples/cries/umbreon.wav differ
diff --git a/sound/direct_sound_samples/cries/unown.aif b/sound/direct_sound_samples/cries/unown.aif
deleted file mode 100644
index 8339ccb6b..000000000
Binary files a/sound/direct_sound_samples/cries/unown.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/unown.wav b/sound/direct_sound_samples/cries/unown.wav
new file mode 100644
index 000000000..1956ecef7
Binary files /dev/null and b/sound/direct_sound_samples/cries/unown.wav differ
diff --git a/sound/direct_sound_samples/cries/unused_265.aif b/sound/direct_sound_samples/cries/unused_265.aif
deleted file mode 100644
index 7f5965f06..000000000
Binary files a/sound/direct_sound_samples/cries/unused_265.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/unused_265.wav b/sound/direct_sound_samples/cries/unused_265.wav
new file mode 100644
index 000000000..12c3d8640
Binary files /dev/null and b/sound/direct_sound_samples/cries/unused_265.wav differ
diff --git a/sound/direct_sound_samples/cries/unused_268.aif b/sound/direct_sound_samples/cries/unused_268.aif
deleted file mode 100644
index 5cae364c3..000000000
Binary files a/sound/direct_sound_samples/cries/unused_268.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/unused_268.wav b/sound/direct_sound_samples/cries/unused_268.wav
new file mode 100644
index 000000000..3501b24ef
Binary files /dev/null and b/sound/direct_sound_samples/cries/unused_268.wav differ
diff --git a/sound/direct_sound_samples/cries/ursaring.aif b/sound/direct_sound_samples/cries/ursaring.aif
deleted file mode 100644
index fcc748bd1..000000000
Binary files a/sound/direct_sound_samples/cries/ursaring.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ursaring.wav b/sound/direct_sound_samples/cries/ursaring.wav
new file mode 100644
index 000000000..b3d4a99cb
Binary files /dev/null and b/sound/direct_sound_samples/cries/ursaring.wav differ
diff --git a/sound/direct_sound_samples/cries/vaporeon.aif b/sound/direct_sound_samples/cries/vaporeon.aif
deleted file mode 100644
index 4967cfdeb..000000000
Binary files a/sound/direct_sound_samples/cries/vaporeon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vaporeon.wav b/sound/direct_sound_samples/cries/vaporeon.wav
new file mode 100644
index 000000000..8ec309485
Binary files /dev/null and b/sound/direct_sound_samples/cries/vaporeon.wav differ
diff --git a/sound/direct_sound_samples/cries/venomoth.aif b/sound/direct_sound_samples/cries/venomoth.aif
deleted file mode 100644
index bc291ec33..000000000
Binary files a/sound/direct_sound_samples/cries/venomoth.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/venomoth.wav b/sound/direct_sound_samples/cries/venomoth.wav
new file mode 100644
index 000000000..ab5179df6
Binary files /dev/null and b/sound/direct_sound_samples/cries/venomoth.wav differ
diff --git a/sound/direct_sound_samples/cries/venonat.aif b/sound/direct_sound_samples/cries/venonat.aif
deleted file mode 100644
index e89d87fa8..000000000
Binary files a/sound/direct_sound_samples/cries/venonat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/venonat.wav b/sound/direct_sound_samples/cries/venonat.wav
new file mode 100644
index 000000000..450c2bb22
Binary files /dev/null and b/sound/direct_sound_samples/cries/venonat.wav differ
diff --git a/sound/direct_sound_samples/cries/venusaur.aif b/sound/direct_sound_samples/cries/venusaur.aif
deleted file mode 100644
index 8a1f69e6e..000000000
Binary files a/sound/direct_sound_samples/cries/venusaur.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/venusaur.wav b/sound/direct_sound_samples/cries/venusaur.wav
new file mode 100644
index 000000000..fdd299ae2
Binary files /dev/null and b/sound/direct_sound_samples/cries/venusaur.wav differ
diff --git a/sound/direct_sound_samples/cries/vibrava.aif b/sound/direct_sound_samples/cries/vibrava.aif
deleted file mode 100644
index 3e3180219..000000000
Binary files a/sound/direct_sound_samples/cries/vibrava.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vibrava.wav b/sound/direct_sound_samples/cries/vibrava.wav
new file mode 100644
index 000000000..537010487
Binary files /dev/null and b/sound/direct_sound_samples/cries/vibrava.wav differ
diff --git a/sound/direct_sound_samples/cries/victreebel.aif b/sound/direct_sound_samples/cries/victreebel.aif
deleted file mode 100644
index d6e6a4fe9..000000000
Binary files a/sound/direct_sound_samples/cries/victreebel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/victreebel.wav b/sound/direct_sound_samples/cries/victreebel.wav
new file mode 100644
index 000000000..19f11202f
Binary files /dev/null and b/sound/direct_sound_samples/cries/victreebel.wav differ
diff --git a/sound/direct_sound_samples/cries/vigoroth.aif b/sound/direct_sound_samples/cries/vigoroth.aif
deleted file mode 100644
index fc414f33d..000000000
Binary files a/sound/direct_sound_samples/cries/vigoroth.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vigoroth.wav b/sound/direct_sound_samples/cries/vigoroth.wav
new file mode 100644
index 000000000..5d21bd23b
Binary files /dev/null and b/sound/direct_sound_samples/cries/vigoroth.wav differ
diff --git a/sound/direct_sound_samples/cries/vileplume.aif b/sound/direct_sound_samples/cries/vileplume.aif
deleted file mode 100644
index 723eec697..000000000
Binary files a/sound/direct_sound_samples/cries/vileplume.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vileplume.wav b/sound/direct_sound_samples/cries/vileplume.wav
new file mode 100644
index 000000000..7189097b1
Binary files /dev/null and b/sound/direct_sound_samples/cries/vileplume.wav differ
diff --git a/sound/direct_sound_samples/cries/volbeat.aif b/sound/direct_sound_samples/cries/volbeat.aif
deleted file mode 100644
index 6f765081e..000000000
Binary files a/sound/direct_sound_samples/cries/volbeat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/volbeat.wav b/sound/direct_sound_samples/cries/volbeat.wav
new file mode 100644
index 000000000..ae6375b95
Binary files /dev/null and b/sound/direct_sound_samples/cries/volbeat.wav differ
diff --git a/sound/direct_sound_samples/cries/voltorb.aif b/sound/direct_sound_samples/cries/voltorb.aif
deleted file mode 100644
index 96e3bff31..000000000
Binary files a/sound/direct_sound_samples/cries/voltorb.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/voltorb.wav b/sound/direct_sound_samples/cries/voltorb.wav
new file mode 100644
index 000000000..e303a3db7
Binary files /dev/null and b/sound/direct_sound_samples/cries/voltorb.wav differ
diff --git a/sound/direct_sound_samples/cries/vulpix.aif b/sound/direct_sound_samples/cries/vulpix.aif
deleted file mode 100644
index 20da23fb4..000000000
Binary files a/sound/direct_sound_samples/cries/vulpix.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vulpix.wav b/sound/direct_sound_samples/cries/vulpix.wav
new file mode 100644
index 000000000..71d58b0a7
Binary files /dev/null and b/sound/direct_sound_samples/cries/vulpix.wav differ
diff --git a/sound/direct_sound_samples/cries/wailmer.aif b/sound/direct_sound_samples/cries/wailmer.aif
deleted file mode 100644
index e8de91333..000000000
Binary files a/sound/direct_sound_samples/cries/wailmer.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wailmer.wav b/sound/direct_sound_samples/cries/wailmer.wav
new file mode 100644
index 000000000..ef43c515f
Binary files /dev/null and b/sound/direct_sound_samples/cries/wailmer.wav differ
diff --git a/sound/direct_sound_samples/cries/wailord.aif b/sound/direct_sound_samples/cries/wailord.aif
deleted file mode 100644
index 2c0468010..000000000
Binary files a/sound/direct_sound_samples/cries/wailord.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wailord.wav b/sound/direct_sound_samples/cries/wailord.wav
new file mode 100644
index 000000000..a7e9d89f6
Binary files /dev/null and b/sound/direct_sound_samples/cries/wailord.wav differ
diff --git a/sound/direct_sound_samples/cries/walrein.aif b/sound/direct_sound_samples/cries/walrein.aif
deleted file mode 100644
index 24c00a596..000000000
Binary files a/sound/direct_sound_samples/cries/walrein.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/walrein.wav b/sound/direct_sound_samples/cries/walrein.wav
new file mode 100644
index 000000000..0fa0c3108
Binary files /dev/null and b/sound/direct_sound_samples/cries/walrein.wav differ
diff --git a/sound/direct_sound_samples/cries/wartortle.aif b/sound/direct_sound_samples/cries/wartortle.aif
deleted file mode 100644
index 5dab7fd93..000000000
Binary files a/sound/direct_sound_samples/cries/wartortle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wartortle.wav b/sound/direct_sound_samples/cries/wartortle.wav
new file mode 100644
index 000000000..950f87d74
Binary files /dev/null and b/sound/direct_sound_samples/cries/wartortle.wav differ
diff --git a/sound/direct_sound_samples/cries/weedle.aif b/sound/direct_sound_samples/cries/weedle.aif
deleted file mode 100644
index 773c2c8ae..000000000
Binary files a/sound/direct_sound_samples/cries/weedle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/weedle.wav b/sound/direct_sound_samples/cries/weedle.wav
new file mode 100644
index 000000000..6a209fede
Binary files /dev/null and b/sound/direct_sound_samples/cries/weedle.wav differ
diff --git a/sound/direct_sound_samples/cries/weepinbell.aif b/sound/direct_sound_samples/cries/weepinbell.aif
deleted file mode 100644
index cdd61380a..000000000
Binary files a/sound/direct_sound_samples/cries/weepinbell.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/weepinbell.wav b/sound/direct_sound_samples/cries/weepinbell.wav
new file mode 100644
index 000000000..48f7225cf
Binary files /dev/null and b/sound/direct_sound_samples/cries/weepinbell.wav differ
diff --git a/sound/direct_sound_samples/cries/weezing.aif b/sound/direct_sound_samples/cries/weezing.aif
deleted file mode 100644
index 2e4a7fe13..000000000
Binary files a/sound/direct_sound_samples/cries/weezing.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/weezing.wav b/sound/direct_sound_samples/cries/weezing.wav
new file mode 100644
index 000000000..b5a7b189d
Binary files /dev/null and b/sound/direct_sound_samples/cries/weezing.wav differ
diff --git a/sound/direct_sound_samples/cries/whiscash.aif b/sound/direct_sound_samples/cries/whiscash.aif
deleted file mode 100644
index 219737f32..000000000
Binary files a/sound/direct_sound_samples/cries/whiscash.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/whiscash.wav b/sound/direct_sound_samples/cries/whiscash.wav
new file mode 100644
index 000000000..ebec93d18
Binary files /dev/null and b/sound/direct_sound_samples/cries/whiscash.wav differ
diff --git a/sound/direct_sound_samples/cries/whismur.aif b/sound/direct_sound_samples/cries/whismur.aif
deleted file mode 100644
index 4da92ca6a..000000000
Binary files a/sound/direct_sound_samples/cries/whismur.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/whismur.wav b/sound/direct_sound_samples/cries/whismur.wav
new file mode 100644
index 000000000..af3e3e0e3
Binary files /dev/null and b/sound/direct_sound_samples/cries/whismur.wav differ
diff --git a/sound/direct_sound_samples/cries/wigglytuff.aif b/sound/direct_sound_samples/cries/wigglytuff.aif
deleted file mode 100644
index 90aa90a23..000000000
Binary files a/sound/direct_sound_samples/cries/wigglytuff.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wigglytuff.wav b/sound/direct_sound_samples/cries/wigglytuff.wav
new file mode 100644
index 000000000..a6b632a6c
Binary files /dev/null and b/sound/direct_sound_samples/cries/wigglytuff.wav differ
diff --git a/sound/direct_sound_samples/cries/wingull.aif b/sound/direct_sound_samples/cries/wingull.aif
deleted file mode 100644
index 182ef18e6..000000000
Binary files a/sound/direct_sound_samples/cries/wingull.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wingull.wav b/sound/direct_sound_samples/cries/wingull.wav
new file mode 100644
index 000000000..4e158409a
Binary files /dev/null and b/sound/direct_sound_samples/cries/wingull.wav differ
diff --git a/sound/direct_sound_samples/cries/wobbuffet.aif b/sound/direct_sound_samples/cries/wobbuffet.aif
deleted file mode 100644
index 70ee1f704..000000000
Binary files a/sound/direct_sound_samples/cries/wobbuffet.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wobbuffet.wav b/sound/direct_sound_samples/cries/wobbuffet.wav
new file mode 100644
index 000000000..17e7464ad
Binary files /dev/null and b/sound/direct_sound_samples/cries/wobbuffet.wav differ
diff --git a/sound/direct_sound_samples/cries/wooper.aif b/sound/direct_sound_samples/cries/wooper.aif
deleted file mode 100644
index 51a6b627e..000000000
Binary files a/sound/direct_sound_samples/cries/wooper.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wooper.wav b/sound/direct_sound_samples/cries/wooper.wav
new file mode 100644
index 000000000..83c7e589d
Binary files /dev/null and b/sound/direct_sound_samples/cries/wooper.wav differ
diff --git a/sound/direct_sound_samples/cries/wurmple.aif b/sound/direct_sound_samples/cries/wurmple.aif
deleted file mode 100644
index 6442a4063..000000000
Binary files a/sound/direct_sound_samples/cries/wurmple.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wurmple.wav b/sound/direct_sound_samples/cries/wurmple.wav
new file mode 100644
index 000000000..b58d5007c
Binary files /dev/null and b/sound/direct_sound_samples/cries/wurmple.wav differ
diff --git a/sound/direct_sound_samples/cries/wynaut.aif b/sound/direct_sound_samples/cries/wynaut.aif
deleted file mode 100644
index 798732c74..000000000
Binary files a/sound/direct_sound_samples/cries/wynaut.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wynaut.wav b/sound/direct_sound_samples/cries/wynaut.wav
new file mode 100644
index 000000000..6febe26aa
Binary files /dev/null and b/sound/direct_sound_samples/cries/wynaut.wav differ
diff --git a/sound/direct_sound_samples/cries/xatu.aif b/sound/direct_sound_samples/cries/xatu.aif
deleted file mode 100644
index ac758fdbf..000000000
Binary files a/sound/direct_sound_samples/cries/xatu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/xatu.wav b/sound/direct_sound_samples/cries/xatu.wav
new file mode 100644
index 000000000..7c84f6572
Binary files /dev/null and b/sound/direct_sound_samples/cries/xatu.wav differ
diff --git a/sound/direct_sound_samples/cries/yanma.aif b/sound/direct_sound_samples/cries/yanma.aif
deleted file mode 100644
index df76534c5..000000000
Binary files a/sound/direct_sound_samples/cries/yanma.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/yanma.wav b/sound/direct_sound_samples/cries/yanma.wav
new file mode 100644
index 000000000..166b37361
Binary files /dev/null and b/sound/direct_sound_samples/cries/yanma.wav differ
diff --git a/sound/direct_sound_samples/cries/zangoose.aif b/sound/direct_sound_samples/cries/zangoose.aif
deleted file mode 100644
index ce1622043..000000000
Binary files a/sound/direct_sound_samples/cries/zangoose.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zangoose.wav b/sound/direct_sound_samples/cries/zangoose.wav
new file mode 100644
index 000000000..a1bdfa4fc
Binary files /dev/null and b/sound/direct_sound_samples/cries/zangoose.wav differ
diff --git a/sound/direct_sound_samples/cries/zapdos.aif b/sound/direct_sound_samples/cries/zapdos.aif
deleted file mode 100644
index a8d914d14..000000000
Binary files a/sound/direct_sound_samples/cries/zapdos.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zapdos.wav b/sound/direct_sound_samples/cries/zapdos.wav
new file mode 100644
index 000000000..58415b934
Binary files /dev/null and b/sound/direct_sound_samples/cries/zapdos.wav differ
diff --git a/sound/direct_sound_samples/cries/zigzagoon.aif b/sound/direct_sound_samples/cries/zigzagoon.aif
deleted file mode 100644
index 52b9bb4f4..000000000
Binary files a/sound/direct_sound_samples/cries/zigzagoon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zigzagoon.wav b/sound/direct_sound_samples/cries/zigzagoon.wav
new file mode 100644
index 000000000..ac0b68edc
Binary files /dev/null and b/sound/direct_sound_samples/cries/zigzagoon.wav differ
diff --git a/sound/direct_sound_samples/cries/zubat.aif b/sound/direct_sound_samples/cries/zubat.aif
deleted file mode 100644
index 45036d072..000000000
Binary files a/sound/direct_sound_samples/cries/zubat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zubat.wav b/sound/direct_sound_samples/cries/zubat.wav
new file mode 100644
index 000000000..dc0756a06
Binary files /dev/null and b/sound/direct_sound_samples/cries/zubat.wav differ
diff --git a/sound/direct_sound_samples/dance_drums_ride_bell.aif b/sound/direct_sound_samples/dance_drums_ride_bell.aif
deleted file mode 100644
index 743451262..000000000
Binary files a/sound/direct_sound_samples/dance_drums_ride_bell.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/dance_drums_ride_bell.wav b/sound/direct_sound_samples/dance_drums_ride_bell.wav
new file mode 100644
index 000000000..a79a5c26f
Binary files /dev/null and b/sound/direct_sound_samples/dance_drums_ride_bell.wav differ
diff --git a/sound/direct_sound_samples/drum_and_percussion_kick.aif b/sound/direct_sound_samples/drum_and_percussion_kick.aif
deleted file mode 100644
index b82e9c208..000000000
Binary files a/sound/direct_sound_samples/drum_and_percussion_kick.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/drum_and_percussion_kick.wav b/sound/direct_sound_samples/drum_and_percussion_kick.wav
new file mode 100644
index 000000000..49ba617f0
Binary files /dev/null and b/sound/direct_sound_samples/drum_and_percussion_kick.wav differ
diff --git a/sound/direct_sound_samples/ethnic_flavours_atarigane.aif b/sound/direct_sound_samples/ethnic_flavours_atarigane.aif
deleted file mode 100644
index 519c3b8a8..000000000
Binary files a/sound/direct_sound_samples/ethnic_flavours_atarigane.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/ethnic_flavours_atarigane.wav b/sound/direct_sound_samples/ethnic_flavours_atarigane.wav
new file mode 100644
index 000000000..d1fb2c1a4
Binary files /dev/null and b/sound/direct_sound_samples/ethnic_flavours_atarigane.wav differ
diff --git a/sound/direct_sound_samples/ethnic_flavours_hyoushigi.aif b/sound/direct_sound_samples/ethnic_flavours_hyoushigi.aif
deleted file mode 100644
index dcae315ec..000000000
Binary files a/sound/direct_sound_samples/ethnic_flavours_hyoushigi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/ethnic_flavours_hyoushigi.wav b/sound/direct_sound_samples/ethnic_flavours_hyoushigi.wav
new file mode 100644
index 000000000..18731f503
Binary files /dev/null and b/sound/direct_sound_samples/ethnic_flavours_hyoushigi.wav differ
diff --git a/sound/direct_sound_samples/ethnic_flavours_kotsuzumi.aif b/sound/direct_sound_samples/ethnic_flavours_kotsuzumi.aif
deleted file mode 100644
index b161f72ee..000000000
Binary files a/sound/direct_sound_samples/ethnic_flavours_kotsuzumi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/ethnic_flavours_kotsuzumi.wav b/sound/direct_sound_samples/ethnic_flavours_kotsuzumi.wav
new file mode 100644
index 000000000..5c99fedf3
Binary files /dev/null and b/sound/direct_sound_samples/ethnic_flavours_kotsuzumi.wav differ
diff --git a/sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.aif b/sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.aif
deleted file mode 100644
index fa33ba810..000000000
Binary files a/sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.wav b/sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.wav
new file mode 100644
index 000000000..c12ae6de3
Binary files /dev/null and b/sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.wav differ
diff --git a/sound/direct_sound_samples/register_noise.aif b/sound/direct_sound_samples/register_noise.aif
deleted file mode 100644
index e56c5c131..000000000
Binary files a/sound/direct_sound_samples/register_noise.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/register_noise.wav b/sound/direct_sound_samples/register_noise.wav
new file mode 100644
index 000000000..89d94e61c
Binary files /dev/null and b/sound/direct_sound_samples/register_noise.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_accordion.aif b/sound/direct_sound_samples/sc88pro_accordion.aif
deleted file mode 100644
index e4c024cf5..000000000
Binary files a/sound/direct_sound_samples/sc88pro_accordion.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_accordion.wav b/sound/direct_sound_samples/sc88pro_accordion.wav
new file mode 100644
index 000000000..f19a98d27
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_accordion.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_accordion_duplicate.aif b/sound/direct_sound_samples/sc88pro_accordion_duplicate.aif
deleted file mode 100644
index e4c024cf5..000000000
Binary files a/sound/direct_sound_samples/sc88pro_accordion_duplicate.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_accordion_duplicate.wav b/sound/direct_sound_samples/sc88pro_accordion_duplicate.wav
new file mode 100644
index 000000000..f19a98d27
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_accordion_duplicate.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_bubbles.aif b/sound/direct_sound_samples/sc88pro_bubbles.aif
deleted file mode 100644
index 89872bf55..000000000
Binary files a/sound/direct_sound_samples/sc88pro_bubbles.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_bubbles.wav b/sound/direct_sound_samples/sc88pro_bubbles.wav
new file mode 100644
index 000000000..d6e61596d
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_bubbles.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_fingered_bass.aif b/sound/direct_sound_samples/sc88pro_fingered_bass.aif
deleted file mode 100644
index ee52f958a..000000000
Binary files a/sound/direct_sound_samples/sc88pro_fingered_bass.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_fingered_bass.wav b/sound/direct_sound_samples/sc88pro_fingered_bass.wav
new file mode 100644
index 000000000..0e723b742
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_fingered_bass.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_flute.aif b/sound/direct_sound_samples/sc88pro_flute.aif
deleted file mode 100644
index f32c5a71e..000000000
Binary files a/sound/direct_sound_samples/sc88pro_flute.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_flute.wav b/sound/direct_sound_samples/sc88pro_flute.wav
new file mode 100644
index 000000000..409ce0f74
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_flute.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_french_horn_60.aif b/sound/direct_sound_samples/sc88pro_french_horn_60.aif
deleted file mode 100644
index 742c4385e..000000000
Binary files a/sound/direct_sound_samples/sc88pro_french_horn_60.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_french_horn_60.wav b/sound/direct_sound_samples/sc88pro_french_horn_60.wav
new file mode 100644
index 000000000..105c186a2
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_french_horn_60.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_french_horn_72.aif b/sound/direct_sound_samples/sc88pro_french_horn_72.aif
deleted file mode 100644
index b7f98929f..000000000
Binary files a/sound/direct_sound_samples/sc88pro_french_horn_72.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_french_horn_72.wav b/sound/direct_sound_samples/sc88pro_french_horn_72.wav
new file mode 100644
index 000000000..380d79630
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_french_horn_72.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_fretless_bass.aif b/sound/direct_sound_samples/sc88pro_fretless_bass.aif
deleted file mode 100644
index 737a7200f..000000000
Binary files a/sound/direct_sound_samples/sc88pro_fretless_bass.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_fretless_bass.wav b/sound/direct_sound_samples/sc88pro_fretless_bass.wav
new file mode 100644
index 000000000..f639d5ccf
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_fretless_bass.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_glockenspiel.aif b/sound/direct_sound_samples/sc88pro_glockenspiel.aif
deleted file mode 100644
index 22b8f1691..000000000
Binary files a/sound/direct_sound_samples/sc88pro_glockenspiel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_glockenspiel.wav b/sound/direct_sound_samples/sc88pro_glockenspiel.wav
new file mode 100644
index 000000000..4c9cbae14
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_glockenspiel.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_harp.aif b/sound/direct_sound_samples/sc88pro_harp.aif
deleted file mode 100644
index 083c45e3d..000000000
Binary files a/sound/direct_sound_samples/sc88pro_harp.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_harp.wav b/sound/direct_sound_samples/sc88pro_harp.wav
new file mode 100644
index 000000000..bdb176720
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_harp.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_jingle_bell.aif b/sound/direct_sound_samples/sc88pro_jingle_bell.aif
deleted file mode 100644
index 6d8330b86..000000000
Binary files a/sound/direct_sound_samples/sc88pro_jingle_bell.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_jingle_bell.wav b/sound/direct_sound_samples/sc88pro_jingle_bell.wav
new file mode 100644
index 000000000..1eb6b1de1
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_jingle_bell.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_mute_high_conga.aif b/sound/direct_sound_samples/sc88pro_mute_high_conga.aif
deleted file mode 100644
index 2e1bf9c64..000000000
Binary files a/sound/direct_sound_samples/sc88pro_mute_high_conga.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_mute_high_conga.wav b/sound/direct_sound_samples/sc88pro_mute_high_conga.wav
new file mode 100644
index 000000000..c009d7265
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_mute_high_conga.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_nylon_str_guitar.aif b/sound/direct_sound_samples/sc88pro_nylon_str_guitar.aif
deleted file mode 100644
index c1a575c12..000000000
Binary files a/sound/direct_sound_samples/sc88pro_nylon_str_guitar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_nylon_str_guitar.wav b/sound/direct_sound_samples/sc88pro_nylon_str_guitar.wav
new file mode 100644
index 000000000..7538f508a
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_nylon_str_guitar.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_open_low_conga.aif b/sound/direct_sound_samples/sc88pro_open_low_conga.aif
deleted file mode 100644
index 8e1cb620a..000000000
Binary files a/sound/direct_sound_samples/sc88pro_open_low_conga.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_open_low_conga.wav b/sound/direct_sound_samples/sc88pro_open_low_conga.wav
new file mode 100644
index 000000000..34a1e3f32
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_open_low_conga.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.aif b/sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.aif
deleted file mode 100644
index 56286e494..000000000
Binary files a/sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.wav b/sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.wav
new file mode 100644
index 000000000..c3f89f9c7
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_orchestra_snare.aif b/sound/direct_sound_samples/sc88pro_orchestra_snare.aif
deleted file mode 100644
index 3b30d894c..000000000
Binary files a/sound/direct_sound_samples/sc88pro_orchestra_snare.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_orchestra_snare.wav b/sound/direct_sound_samples/sc88pro_orchestra_snare.wav
new file mode 100644
index 000000000..96b10bb05
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_orchestra_snare.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_organ2.aif b/sound/direct_sound_samples/sc88pro_organ2.aif
deleted file mode 100644
index 6372bbc32..000000000
Binary files a/sound/direct_sound_samples/sc88pro_organ2.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_organ2.wav b/sound/direct_sound_samples/sc88pro_organ2.wav
new file mode 100644
index 000000000..bf6f2ba52
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_organ2.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_piano1_48.aif b/sound/direct_sound_samples/sc88pro_piano1_48.aif
deleted file mode 100644
index dd30ae441..000000000
Binary files a/sound/direct_sound_samples/sc88pro_piano1_48.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_piano1_48.wav b/sound/direct_sound_samples/sc88pro_piano1_48.wav
new file mode 100644
index 000000000..c7bcfca13
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_piano1_48.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_piano1_60.aif b/sound/direct_sound_samples/sc88pro_piano1_60.aif
deleted file mode 100644
index df4773522..000000000
Binary files a/sound/direct_sound_samples/sc88pro_piano1_60.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_piano1_60.wav b/sound/direct_sound_samples/sc88pro_piano1_60.wav
new file mode 100644
index 000000000..7199386c7
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_piano1_60.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_piano1_72.aif b/sound/direct_sound_samples/sc88pro_piano1_72.aif
deleted file mode 100644
index 81ebda139..000000000
Binary files a/sound/direct_sound_samples/sc88pro_piano1_72.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_piano1_72.wav b/sound/direct_sound_samples/sc88pro_piano1_72.wav
new file mode 100644
index 000000000..603006eb6
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_piano1_72.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_piano1_84.aif b/sound/direct_sound_samples/sc88pro_piano1_84.aif
deleted file mode 100644
index 8ec870f7b..000000000
Binary files a/sound/direct_sound_samples/sc88pro_piano1_84.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_piano1_84.wav b/sound/direct_sound_samples/sc88pro_piano1_84.wav
new file mode 100644
index 000000000..0d7637075
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_piano1_84.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_pizzicato_strings.aif b/sound/direct_sound_samples/sc88pro_pizzicato_strings.aif
deleted file mode 100644
index c30d477ee..000000000
Binary files a/sound/direct_sound_samples/sc88pro_pizzicato_strings.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_pizzicato_strings.wav b/sound/direct_sound_samples/sc88pro_pizzicato_strings.wav
new file mode 100644
index 000000000..6bb6bc74a
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_pizzicato_strings.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_rnd_kick.aif b/sound/direct_sound_samples/sc88pro_rnd_kick.aif
deleted file mode 100644
index d3caec2bf..000000000
Binary files a/sound/direct_sound_samples/sc88pro_rnd_kick.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_rnd_kick.wav b/sound/direct_sound_samples/sc88pro_rnd_kick.wav
new file mode 100644
index 000000000..b05d88a81
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_rnd_kick.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_rnd_snare.aif b/sound/direct_sound_samples/sc88pro_rnd_snare.aif
deleted file mode 100644
index 115ebd3f8..000000000
Binary files a/sound/direct_sound_samples/sc88pro_rnd_snare.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_rnd_snare.wav b/sound/direct_sound_samples/sc88pro_rnd_snare.wav
new file mode 100644
index 000000000..c00ee759f
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_rnd_snare.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_slap_bass.aif b/sound/direct_sound_samples/sc88pro_slap_bass.aif
deleted file mode 100644
index b709d3aee..000000000
Binary files a/sound/direct_sound_samples/sc88pro_slap_bass.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_slap_bass.wav b/sound/direct_sound_samples/sc88pro_slap_bass.wav
new file mode 100644
index 000000000..41d747259
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_slap_bass.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_square_wave.aif b/sound/direct_sound_samples/sc88pro_square_wave.aif
deleted file mode 100644
index 09e17f0ca..000000000
Binary files a/sound/direct_sound_samples/sc88pro_square_wave.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_square_wave.wav b/sound/direct_sound_samples/sc88pro_square_wave.wav
new file mode 100644
index 000000000..020dae03a
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_square_wave.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_string_ensemble_60.aif b/sound/direct_sound_samples/sc88pro_string_ensemble_60.aif
deleted file mode 100644
index bfaa5c196..000000000
Binary files a/sound/direct_sound_samples/sc88pro_string_ensemble_60.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_string_ensemble_60.wav b/sound/direct_sound_samples/sc88pro_string_ensemble_60.wav
new file mode 100644
index 000000000..26e9db076
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_string_ensemble_60.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_string_ensemble_72.aif b/sound/direct_sound_samples/sc88pro_string_ensemble_72.aif
deleted file mode 100644
index 17b03d91a..000000000
Binary files a/sound/direct_sound_samples/sc88pro_string_ensemble_72.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_string_ensemble_72.wav b/sound/direct_sound_samples/sc88pro_string_ensemble_72.wav
new file mode 100644
index 000000000..1699f831c
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_string_ensemble_72.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_string_ensemble_84.aif b/sound/direct_sound_samples/sc88pro_string_ensemble_84.aif
deleted file mode 100644
index ab3d5da53..000000000
Binary files a/sound/direct_sound_samples/sc88pro_string_ensemble_84.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_string_ensemble_84.wav b/sound/direct_sound_samples/sc88pro_string_ensemble_84.wav
new file mode 100644
index 000000000..5616d094a
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_string_ensemble_84.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_synth_bass.aif b/sound/direct_sound_samples/sc88pro_synth_bass.aif
deleted file mode 100644
index 81b82c41c..000000000
Binary files a/sound/direct_sound_samples/sc88pro_synth_bass.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_synth_bass.wav b/sound/direct_sound_samples/sc88pro_synth_bass.wav
new file mode 100644
index 000000000..5aa61ab8c
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_synth_bass.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_taiko.aif b/sound/direct_sound_samples/sc88pro_taiko.aif
deleted file mode 100644
index 2cb47ad90..000000000
Binary files a/sound/direct_sound_samples/sc88pro_taiko.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_taiko.wav b/sound/direct_sound_samples/sc88pro_taiko.wav
new file mode 100644
index 000000000..af0125336
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_taiko.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_tambourine.aif b/sound/direct_sound_samples/sc88pro_tambourine.aif
deleted file mode 100644
index 39ec57d29..000000000
Binary files a/sound/direct_sound_samples/sc88pro_tambourine.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_tambourine.wav b/sound/direct_sound_samples/sc88pro_tambourine.wav
new file mode 100644
index 000000000..016b2cc20
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_tambourine.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_timpani.aif b/sound/direct_sound_samples/sc88pro_timpani.aif
deleted file mode 100644
index 84829d634..000000000
Binary files a/sound/direct_sound_samples/sc88pro_timpani.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_timpani.wav b/sound/direct_sound_samples/sc88pro_timpani.wav
new file mode 100644
index 000000000..bed5f113a
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_timpani.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_timpani_with_snare.aif b/sound/direct_sound_samples/sc88pro_timpani_with_snare.aif
deleted file mode 100644
index 6147cf25c..000000000
Binary files a/sound/direct_sound_samples/sc88pro_timpani_with_snare.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_timpani_with_snare.wav b/sound/direct_sound_samples/sc88pro_timpani_with_snare.wav
new file mode 100644
index 000000000..8ab1862d0
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_timpani_with_snare.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_tr909_hand_clap.aif b/sound/direct_sound_samples/sc88pro_tr909_hand_clap.aif
deleted file mode 100644
index b11787ffc..000000000
Binary files a/sound/direct_sound_samples/sc88pro_tr909_hand_clap.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_tr909_hand_clap.wav b/sound/direct_sound_samples/sc88pro_tr909_hand_clap.wav
new file mode 100644
index 000000000..2e07040cb
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_tr909_hand_clap.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_trumpet_60.aif b/sound/direct_sound_samples/sc88pro_trumpet_60.aif
deleted file mode 100644
index fe5ac0067..000000000
Binary files a/sound/direct_sound_samples/sc88pro_trumpet_60.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_trumpet_60.wav b/sound/direct_sound_samples/sc88pro_trumpet_60.wav
new file mode 100644
index 000000000..0c857d971
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_trumpet_60.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_trumpet_72.aif b/sound/direct_sound_samples/sc88pro_trumpet_72.aif
deleted file mode 100644
index fb862d2fc..000000000
Binary files a/sound/direct_sound_samples/sc88pro_trumpet_72.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_trumpet_72.wav b/sound/direct_sound_samples/sc88pro_trumpet_72.wav
new file mode 100644
index 000000000..93a62dc0e
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_trumpet_72.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_trumpet_84.aif b/sound/direct_sound_samples/sc88pro_trumpet_84.aif
deleted file mode 100644
index f39c9fd79..000000000
Binary files a/sound/direct_sound_samples/sc88pro_trumpet_84.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_trumpet_84.wav b/sound/direct_sound_samples/sc88pro_trumpet_84.wav
new file mode 100644
index 000000000..12549376b
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_trumpet_84.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_tuba_39.aif b/sound/direct_sound_samples/sc88pro_tuba_39.aif
deleted file mode 100644
index f8862cebf..000000000
Binary files a/sound/direct_sound_samples/sc88pro_tuba_39.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_tuba_39.wav b/sound/direct_sound_samples/sc88pro_tuba_39.wav
new file mode 100644
index 000000000..c3b78eea5
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_tuba_39.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_tuba_51.aif b/sound/direct_sound_samples/sc88pro_tuba_51.aif
deleted file mode 100644
index 6adda7673..000000000
Binary files a/sound/direct_sound_samples/sc88pro_tuba_51.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_tuba_51.wav b/sound/direct_sound_samples/sc88pro_tuba_51.wav
new file mode 100644
index 000000000..fed8c72f4
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_tuba_51.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_tubular_bell.aif b/sound/direct_sound_samples/sc88pro_tubular_bell.aif
deleted file mode 100644
index 9d00ecae6..000000000
Binary files a/sound/direct_sound_samples/sc88pro_tubular_bell.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_tubular_bell.wav b/sound/direct_sound_samples/sc88pro_tubular_bell.wav
new file mode 100644
index 000000000..8c892236b
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_tubular_bell.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_wind.aif b/sound/direct_sound_samples/sc88pro_wind.aif
deleted file mode 100644
index 6b247df07..000000000
Binary files a/sound/direct_sound_samples/sc88pro_wind.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_wind.wav b/sound/direct_sound_samples/sc88pro_wind.wav
new file mode 100644
index 000000000..3856a4af1
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_wind.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_xylophone.aif b/sound/direct_sound_samples/sc88pro_xylophone.aif
deleted file mode 100644
index d9e2f840a..000000000
Binary files a/sound/direct_sound_samples/sc88pro_xylophone.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_xylophone.wav b/sound/direct_sound_samples/sc88pro_xylophone.wav
new file mode 100644
index 000000000..a08296baa
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_xylophone.wav differ
diff --git a/sound/direct_sound_samples/sd90_ambient_tom.aif b/sound/direct_sound_samples/sd90_ambient_tom.aif
deleted file mode 100644
index d6357accb..000000000
Binary files a/sound/direct_sound_samples/sd90_ambient_tom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_ambient_tom.wav b/sound/direct_sound_samples/sd90_ambient_tom.wav
new file mode 100644
index 000000000..6f390959f
Binary files /dev/null and b/sound/direct_sound_samples/sd90_ambient_tom.wav differ
diff --git a/sound/direct_sound_samples/sd90_classical_detuned_ep1_high.aif b/sound/direct_sound_samples/sd90_classical_detuned_ep1_high.aif
deleted file mode 100644
index 86ea0fa76..000000000
Binary files a/sound/direct_sound_samples/sd90_classical_detuned_ep1_high.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_classical_detuned_ep1_high.wav b/sound/direct_sound_samples/sd90_classical_detuned_ep1_high.wav
new file mode 100644
index 000000000..3c96f1cbc
Binary files /dev/null and b/sound/direct_sound_samples/sd90_classical_detuned_ep1_high.wav differ
diff --git a/sound/direct_sound_samples/sd90_classical_detuned_ep1_low.aif b/sound/direct_sound_samples/sd90_classical_detuned_ep1_low.aif
deleted file mode 100644
index 90359b459..000000000
Binary files a/sound/direct_sound_samples/sd90_classical_detuned_ep1_low.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_classical_detuned_ep1_low.wav b/sound/direct_sound_samples/sd90_classical_detuned_ep1_low.wav
new file mode 100644
index 000000000..39e25a89c
Binary files /dev/null and b/sound/direct_sound_samples/sd90_classical_detuned_ep1_low.wav differ
diff --git a/sound/direct_sound_samples/sd90_classical_distortion_guitar_high.aif b/sound/direct_sound_samples/sd90_classical_distortion_guitar_high.aif
deleted file mode 100644
index b0f0e82a1..000000000
Binary files a/sound/direct_sound_samples/sd90_classical_distortion_guitar_high.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_classical_distortion_guitar_high.wav b/sound/direct_sound_samples/sd90_classical_distortion_guitar_high.wav
new file mode 100644
index 000000000..097d91f73
Binary files /dev/null and b/sound/direct_sound_samples/sd90_classical_distortion_guitar_high.wav differ
diff --git a/sound/direct_sound_samples/sd90_classical_distortion_guitar_low.aif b/sound/direct_sound_samples/sd90_classical_distortion_guitar_low.aif
deleted file mode 100644
index aa97fe3ef..000000000
Binary files a/sound/direct_sound_samples/sd90_classical_distortion_guitar_low.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_classical_distortion_guitar_low.wav b/sound/direct_sound_samples/sd90_classical_distortion_guitar_low.wav
new file mode 100644
index 000000000..d281d7757
Binary files /dev/null and b/sound/direct_sound_samples/sd90_classical_distortion_guitar_low.wav differ
diff --git a/sound/direct_sound_samples/sd90_classical_oboe.aif b/sound/direct_sound_samples/sd90_classical_oboe.aif
deleted file mode 100644
index 83cb8c7d0..000000000
Binary files a/sound/direct_sound_samples/sd90_classical_oboe.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_classical_oboe.wav b/sound/direct_sound_samples/sd90_classical_oboe.wav
new file mode 100644
index 000000000..2b9e96afc
Binary files /dev/null and b/sound/direct_sound_samples/sd90_classical_oboe.wav differ
diff --git a/sound/direct_sound_samples/sd90_classical_overdrive_guitar.aif b/sound/direct_sound_samples/sd90_classical_overdrive_guitar.aif
deleted file mode 100644
index 6bdc1beab..000000000
Binary files a/sound/direct_sound_samples/sd90_classical_overdrive_guitar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_classical_overdrive_guitar.wav b/sound/direct_sound_samples/sd90_classical_overdrive_guitar.wav
new file mode 100644
index 000000000..7380be1e1
Binary files /dev/null and b/sound/direct_sound_samples/sd90_classical_overdrive_guitar.wav differ
diff --git a/sound/direct_sound_samples/sd90_classical_whistle.aif b/sound/direct_sound_samples/sd90_classical_whistle.aif
deleted file mode 100644
index 357e348a7..000000000
Binary files a/sound/direct_sound_samples/sd90_classical_whistle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_classical_whistle.wav b/sound/direct_sound_samples/sd90_classical_whistle.wav
new file mode 100644
index 000000000..61a58445b
Binary files /dev/null and b/sound/direct_sound_samples/sd90_classical_whistle.wav differ
diff --git a/sound/direct_sound_samples/sd90_cowbell.aif b/sound/direct_sound_samples/sd90_cowbell.aif
deleted file mode 100644
index 5f3819310..000000000
Binary files a/sound/direct_sound_samples/sd90_cowbell.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_cowbell.wav b/sound/direct_sound_samples/sd90_cowbell.wav
new file mode 100644
index 000000000..9c35bf654
Binary files /dev/null and b/sound/direct_sound_samples/sd90_cowbell.wav differ
diff --git a/sound/direct_sound_samples/sd90_enhanced_delay_shaku.aif b/sound/direct_sound_samples/sd90_enhanced_delay_shaku.aif
deleted file mode 100644
index 2ae1b3021..000000000
Binary files a/sound/direct_sound_samples/sd90_enhanced_delay_shaku.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_enhanced_delay_shaku.wav b/sound/direct_sound_samples/sd90_enhanced_delay_shaku.wav
new file mode 100644
index 000000000..d87fc68b2
Binary files /dev/null and b/sound/direct_sound_samples/sd90_enhanced_delay_shaku.wav differ
diff --git a/sound/direct_sound_samples/sd90_open_triangle.aif b/sound/direct_sound_samples/sd90_open_triangle.aif
deleted file mode 100644
index fb1ce68f0..000000000
Binary files a/sound/direct_sound_samples/sd90_open_triangle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_open_triangle.wav b/sound/direct_sound_samples/sd90_open_triangle.wav
new file mode 100644
index 000000000..92df2b307
Binary files /dev/null and b/sound/direct_sound_samples/sd90_open_triangle.wav differ
diff --git a/sound/direct_sound_samples/sd90_solo_snare.aif b/sound/direct_sound_samples/sd90_solo_snare.aif
deleted file mode 100644
index 3343a53a3..000000000
Binary files a/sound/direct_sound_samples/sd90_solo_snare.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_solo_snare.wav b/sound/direct_sound_samples/sd90_solo_snare.wav
new file mode 100644
index 000000000..ad5d87284
Binary files /dev/null and b/sound/direct_sound_samples/sd90_solo_snare.wav differ
diff --git a/sound/direct_sound_samples/sd90_special_scream_drive.aif b/sound/direct_sound_samples/sd90_special_scream_drive.aif
deleted file mode 100644
index 8b7a7da40..000000000
Binary files a/sound/direct_sound_samples/sd90_special_scream_drive.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_special_scream_drive.wav b/sound/direct_sound_samples/sd90_special_scream_drive.wav
new file mode 100644
index 000000000..8b4b563ac
Binary files /dev/null and b/sound/direct_sound_samples/sd90_special_scream_drive.wav differ
diff --git a/sound/direct_sound_samples/steinway_b_piano.aif b/sound/direct_sound_samples/steinway_b_piano.aif
deleted file mode 100644
index 3124e31a0..000000000
Binary files a/sound/direct_sound_samples/steinway_b_piano.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/steinway_b_piano.wav b/sound/direct_sound_samples/steinway_b_piano.wav
new file mode 100644
index 000000000..5a4d94b0a
Binary files /dev/null and b/sound/direct_sound_samples/steinway_b_piano.wav differ
diff --git a/sound/direct_sound_samples/trinity_30303_mega_bass.aif b/sound/direct_sound_samples/trinity_30303_mega_bass.aif
deleted file mode 100644
index c2c7e46ec..000000000
Binary files a/sound/direct_sound_samples/trinity_30303_mega_bass.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/trinity_30303_mega_bass.wav b/sound/direct_sound_samples/trinity_30303_mega_bass.wav
new file mode 100644
index 000000000..6ad677b7d
Binary files /dev/null and b/sound/direct_sound_samples/trinity_30303_mega_bass.wav differ
diff --git a/sound/direct_sound_samples/trinity_big_boned.aif b/sound/direct_sound_samples/trinity_big_boned.aif
deleted file mode 100644
index 75d17efdf..000000000
Binary files a/sound/direct_sound_samples/trinity_big_boned.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/trinity_big_boned.wav b/sound/direct_sound_samples/trinity_big_boned.wav
new file mode 100644
index 000000000..7f42b9fcd
Binary files /dev/null and b/sound/direct_sound_samples/trinity_big_boned.wav differ
diff --git a/sound/direct_sound_samples/trinity_cymbal_crash.aif b/sound/direct_sound_samples/trinity_cymbal_crash.aif
deleted file mode 100644
index 55b9f73ba..000000000
Binary files a/sound/direct_sound_samples/trinity_cymbal_crash.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/trinity_cymbal_crash.wav b/sound/direct_sound_samples/trinity_cymbal_crash.wav
new file mode 100644
index 000000000..c3e52d3e2
Binary files /dev/null and b/sound/direct_sound_samples/trinity_cymbal_crash.wav differ
diff --git a/sound/direct_sound_samples/unknown_close_hihat.aif b/sound/direct_sound_samples/unknown_close_hihat.aif
deleted file mode 100644
index 7ed48cd30..000000000
Binary files a/sound/direct_sound_samples/unknown_close_hihat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_close_hihat.wav b/sound/direct_sound_samples/unknown_close_hihat.wav
new file mode 100644
index 000000000..86774ce3c
Binary files /dev/null and b/sound/direct_sound_samples/unknown_close_hihat.wav differ
diff --git a/sound/direct_sound_samples/unknown_snare.aif b/sound/direct_sound_samples/unknown_snare.aif
deleted file mode 100644
index d8a81b503..000000000
Binary files a/sound/direct_sound_samples/unknown_snare.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_snare.wav b/sound/direct_sound_samples/unknown_snare.wav
new file mode 100644
index 000000000..03295e476
Binary files /dev/null and b/sound/direct_sound_samples/unknown_snare.wav differ
diff --git a/sound/direct_sound_samples/unknown_synth_snare.aif b/sound/direct_sound_samples/unknown_synth_snare.aif
deleted file mode 100644
index eec199f07..000000000
Binary files a/sound/direct_sound_samples/unknown_synth_snare.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_synth_snare.wav b/sound/direct_sound_samples/unknown_synth_snare.wav
new file mode 100644
index 000000000..774194423
Binary files /dev/null and b/sound/direct_sound_samples/unknown_synth_snare.wav differ
diff --git a/sound/direct_sound_samples/unused_guitar_separates_power_chord.aif b/sound/direct_sound_samples/unused_guitar_separates_power_chord.aif
deleted file mode 100644
index 83f997481..000000000
Binary files a/sound/direct_sound_samples/unused_guitar_separates_power_chord.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unused_guitar_separates_power_chord.wav b/sound/direct_sound_samples/unused_guitar_separates_power_chord.wav
new file mode 100644
index 000000000..c75373087
Binary files /dev/null and b/sound/direct_sound_samples/unused_guitar_separates_power_chord.wav differ
diff --git a/sound/direct_sound_samples/unused_heart_of_asia_indian_drum.aif b/sound/direct_sound_samples/unused_heart_of_asia_indian_drum.aif
deleted file mode 100644
index 2e67f1d73..000000000
Binary files a/sound/direct_sound_samples/unused_heart_of_asia_indian_drum.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unused_heart_of_asia_indian_drum.wav b/sound/direct_sound_samples/unused_heart_of_asia_indian_drum.wav
new file mode 100644
index 000000000..49d67a30f
Binary files /dev/null and b/sound/direct_sound_samples/unused_heart_of_asia_indian_drum.wav differ
diff --git a/sound/direct_sound_samples/unused_sc55_tom.aif b/sound/direct_sound_samples/unused_sc55_tom.aif
deleted file mode 100644
index 7d84c7b31..000000000
Binary files a/sound/direct_sound_samples/unused_sc55_tom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unused_sc55_tom.wav b/sound/direct_sound_samples/unused_sc55_tom.wav
new file mode 100644
index 000000000..b4c225827
Binary files /dev/null and b/sound/direct_sound_samples/unused_sc55_tom.wav differ
diff --git a/sound/direct_sound_samples/unused_sc88pro_unison_slap.aif b/sound/direct_sound_samples/unused_sc88pro_unison_slap.aif
deleted file mode 100644
index c0ce144f6..000000000
Binary files a/sound/direct_sound_samples/unused_sc88pro_unison_slap.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unused_sc88pro_unison_slap.wav b/sound/direct_sound_samples/unused_sc88pro_unison_slap.wav
new file mode 100644
index 000000000..690cbc918
Binary files /dev/null and b/sound/direct_sound_samples/unused_sc88pro_unison_slap.wav differ
diff --git a/sound/direct_sound_samples/unused_sd90_oboe.aif b/sound/direct_sound_samples/unused_sd90_oboe.aif
deleted file mode 100644
index 2a0ea2a26..000000000
Binary files a/sound/direct_sound_samples/unused_sd90_oboe.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unused_sd90_oboe.wav b/sound/direct_sound_samples/unused_sd90_oboe.wav
new file mode 100644
index 000000000..e7609ed53
Binary files /dev/null and b/sound/direct_sound_samples/unused_sd90_oboe.wav differ
diff --git a/sound/direct_sound_samples/wave_54.aif b/sound/direct_sound_samples/wave_54.aif
deleted file mode 100644
index ee6ff45b7..000000000
Binary files a/sound/direct_sound_samples/wave_54.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_54.wav b/sound/direct_sound_samples/wave_54.wav
new file mode 100644
index 000000000..75d05e7f4
Binary files /dev/null and b/sound/direct_sound_samples/wave_54.wav differ
diff --git a/sound/direct_sound_samples/wave_56.aif b/sound/direct_sound_samples/wave_56.aif
deleted file mode 100644
index 2e09d0822..000000000
Binary files a/sound/direct_sound_samples/wave_56.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_56.wav b/sound/direct_sound_samples/wave_56.wav
new file mode 100644
index 000000000..1a25b1fe1
Binary files /dev/null and b/sound/direct_sound_samples/wave_56.wav differ
diff --git a/sound/direct_sound_samples/wave_57.aif b/sound/direct_sound_samples/wave_57.aif
deleted file mode 100644
index 7c883ceb8..000000000
Binary files a/sound/direct_sound_samples/wave_57.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_57.wav b/sound/direct_sound_samples/wave_57.wav
new file mode 100644
index 000000000..1a64c4b25
Binary files /dev/null and b/sound/direct_sound_samples/wave_57.wav differ
diff --git a/sound/direct_sound_samples/wave_58.aif b/sound/direct_sound_samples/wave_58.aif
deleted file mode 100644
index 582755ef0..000000000
Binary files a/sound/direct_sound_samples/wave_58.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_58.wav b/sound/direct_sound_samples/wave_58.wav
new file mode 100644
index 000000000..a278be275
Binary files /dev/null and b/sound/direct_sound_samples/wave_58.wav differ
diff --git a/sound/direct_sound_samples/wave_61.aif b/sound/direct_sound_samples/wave_61.aif
deleted file mode 100644
index 22e5ce5e5..000000000
Binary files a/sound/direct_sound_samples/wave_61.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_61.wav b/sound/direct_sound_samples/wave_61.wav
new file mode 100644
index 000000000..dd5eee1d2
Binary files /dev/null and b/sound/direct_sound_samples/wave_61.wav differ
diff --git a/sound/direct_sound_samples/wave_62.aif b/sound/direct_sound_samples/wave_62.aif
deleted file mode 100644
index b481b1ee7..000000000
Binary files a/sound/direct_sound_samples/wave_62.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_62.wav b/sound/direct_sound_samples/wave_62.wav
new file mode 100644
index 000000000..396eb3e72
Binary files /dev/null and b/sound/direct_sound_samples/wave_62.wav differ
diff --git a/sound/direct_sound_samples/wave_64.aif b/sound/direct_sound_samples/wave_64.aif
deleted file mode 100644
index 556be0238..000000000
Binary files a/sound/direct_sound_samples/wave_64.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_64.wav b/sound/direct_sound_samples/wave_64.wav
new file mode 100644
index 000000000..b1e0a0d08
Binary files /dev/null and b/sound/direct_sound_samples/wave_64.wav differ
diff --git a/sound/direct_sound_samples/wave_65.aif b/sound/direct_sound_samples/wave_65.aif
deleted file mode 100644
index f85ca6420..000000000
Binary files a/sound/direct_sound_samples/wave_65.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_65.wav b/sound/direct_sound_samples/wave_65.wav
new file mode 100644
index 000000000..420ee23ce
Binary files /dev/null and b/sound/direct_sound_samples/wave_65.wav differ
diff --git a/sound/direct_sound_samples/wave_68.aif b/sound/direct_sound_samples/wave_68.aif
deleted file mode 100644
index 59624fc7d..000000000
Binary files a/sound/direct_sound_samples/wave_68.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_68.wav b/sound/direct_sound_samples/wave_68.wav
new file mode 100644
index 000000000..fd1ee4dd7
Binary files /dev/null and b/sound/direct_sound_samples/wave_68.wav differ
diff --git a/sound/direct_sound_samples/wave_72.aif b/sound/direct_sound_samples/wave_72.aif
deleted file mode 100644
index e0599eb36..000000000
Binary files a/sound/direct_sound_samples/wave_72.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_72.wav b/sound/direct_sound_samples/wave_72.wav
new file mode 100644
index 000000000..63cf6043c
Binary files /dev/null and b/sound/direct_sound_samples/wave_72.wav differ
diff --git a/sound/direct_sound_samples/wave_73.aif b/sound/direct_sound_samples/wave_73.aif
deleted file mode 100644
index a0fb49f89..000000000
Binary files a/sound/direct_sound_samples/wave_73.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_73.wav b/sound/direct_sound_samples/wave_73.wav
new file mode 100644
index 000000000..f2e648045
Binary files /dev/null and b/sound/direct_sound_samples/wave_73.wav differ
diff --git a/sound/direct_sound_samples/wave_77.aif b/sound/direct_sound_samples/wave_77.aif
deleted file mode 100644
index f87b207bc..000000000
Binary files a/sound/direct_sound_samples/wave_77.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/wave_77.wav b/sound/direct_sound_samples/wave_77.wav
new file mode 100644
index 000000000..9ee002792
Binary files /dev/null and b/sound/direct_sound_samples/wave_77.wav differ
diff --git a/tools/aif2pcm/.gitignore b/tools/aif2pcm/.gitignore
deleted file mode 100644
index 31531797e..000000000
--- a/tools/aif2pcm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-aif2pcm
-
diff --git a/tools/aif2pcm/Makefile b/tools/aif2pcm/Makefile
deleted file mode 100644
index dd48a8759..000000000
--- a/tools/aif2pcm/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-CC ?= gcc
-
-CFLAGS = -Wall -Wextra -Wno-switch -Werror -std=c11 -O2
-
-LIBS = -lm
-
-SRCS = main.c extended.c
-
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
-EXE :=
-endif
-
-.PHONY: all clean
-
-all: aif2pcm$(EXE)
-	@:
-
-aif2pcm$(EXE): $(SRCS)
-	$(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) $(LIBS)
-
-clean:
-	$(RM) aif2pcm aif2pcm.exe
diff --git a/tools/aif2pcm/extended.c b/tools/aif2pcm/extended.c
deleted file mode 100644
index 94449164b..000000000
--- a/tools/aif2pcm/extended.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*	$Id: extended.c,v 1.8 2006/12/23 11:17:49 toad32767 Exp $ */
-/*-
- * Copyright (c) 2005, 2006 by Marco Trillo <marcotrillo@gmail.com>
- *
- * Permission is hereby granted, free of charge, to any
- * person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the
- * Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice
- * shall be included in all copies or substantial portions of
- * the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <math.h>
-#include <string.h>
-#include <stdint.h>
-
-/*
- * Infinite & NAN values
- * for non-IEEE systems
- */
-#ifndef HUGE_VAL
-#ifdef HUGE
-#define INFINITE_VALUE	HUGE
-#define NAN_VALUE	HUGE
-#endif
-#else
-#define INFINITE_VALUE	HUGE_VAL
-#define NAN_VALUE	HUGE_VAL
-#endif
-
-/*
- * IEEE 754 Extended Precision
- *
- * Implementation here is the 80-bit extended precision
- * format of Motorola 68881, Motorola 68882 and Motorola
- * 68040 FPUs, as well as Intel 80x87 FPUs.
- *
- * See:
- *    http://www.freescale.com/files/32bit/doc/fact_sheet/BR509.pdf
- */
-/*
- * Exponent range: [-16383,16383]
- * Precision for mantissa: 64 bits with no hidden bit
- * Bias: 16383
- */
-
-/*
- * Write IEEE Extended Precision Numbers
- */
-void
-ieee754_write_extended(double in, uint8_t* out)
-{
-	int sgn, exp, shift;
-	double fraction, t;
-	unsigned int lexp, hexp;
-	unsigned long low, high;
-
-	if (in == 0.0) {
-		memset(out, 0, 10);
-		return;
-	}
-	if (in < 0.0) {
-		in = fabs(in);
-		sgn = 1;
-	} else
-		sgn = 0;
-
-	fraction = frexp(in, &exp);
-
-	if (exp == 0 || exp > 16384) {
-		if (exp > 16384) /* infinite value */
-			low = high = 0;
-		else {
-			low = 0x80000000;
-			high = 0;
-		}
-		exp = 32767;
-		goto done;
-	}
-	fraction = ldexp(fraction, 32);
-	t = floor(fraction);
-	low = (unsigned long) t;
-	fraction -= t;
-	t = floor(ldexp(fraction, 32));
-	high = (unsigned long) t;
-
-	/* Convert exponents < -16382 to -16382 (then they will be
-	 * stored as -16383) */
-	if (exp < -16382) {
-		shift = 0 - exp - 16382;
-		high >>= shift;
-		high |= (low << (32 - shift));
-		low >>= shift;
-		exp = -16382;
-	}
-	exp += 16383 - 1;	/* bias */
-
-done:
-	lexp = ((unsigned int) exp) >> 8;
-	hexp = ((unsigned int) exp) & 0xFF;
-
-	/* big endian */
-	out[0] = ((uint8_t) sgn) << 7;
-	out[0] |= (uint8_t) lexp;
-	out[1] = (uint8_t) hexp;
-	out[2] = (uint8_t) (low >> 24);
-	out[3] = (uint8_t) ((low >> 16) & 0xFF);
-	out[4] = (uint8_t) ((low >> 8) & 0xFF);
-	out[5] = (uint8_t) (low & 0xFF);
-	out[6] = (uint8_t) (high >> 24);
-	out[7] = (uint8_t) ((high >> 16) & 0xFF);
-	out[8] = (uint8_t) ((high >> 8) & 0xFF);
-	out[9] = (uint8_t) (high & 0xFF);
-
-	return;
-}
-
-
-/*
- * Read IEEE Extended Precision Numbers
- */
-double
-ieee754_read_extended(uint8_t* in)
-{
-	int sgn, exp;
-	unsigned long low, high;
-	double out;
-
-	/* Extract the components from the big endian buffer */
-	sgn = (int) (in[0] >> 7);
-	exp = ((int) (in[0] & 0x7F) << 8) | ((int) in[1]);
-	low = (((unsigned long) in[2]) << 24)
-		| (((unsigned long) in[3]) << 16)
-		| (((unsigned long) in[4]) << 8) | (unsigned long) in[5];
-	high = (((unsigned long) in[6]) << 24)
-		| (((unsigned long) in[7]) << 16)
-		| (((unsigned long) in[8]) << 8) | (unsigned long) in[9];
-
-	if (exp == 0 && low == 0 && high == 0)
-		return (sgn ? -0.0 : 0.0);
-
-	switch (exp) {
-	case 32767:
-		if (low == 0 && high == 0)
-			return (sgn ? -INFINITE_VALUE : INFINITE_VALUE);
-		else
-			return (sgn ? -NAN_VALUE : NAN_VALUE);
-	default:
-		exp -= 16383;	/* unbias exponent */
-
-	}
-
-	out = ldexp((double) low, -31 + exp);
-	out += ldexp((double) high, -63 + exp);
-
-	return (sgn ? -out : out);
-}
diff --git a/tools/aif2pcm/main.c b/tools/aif2pcm/main.c
deleted file mode 100644
index 0824b92da..000000000
--- a/tools/aif2pcm/main.c
+++ /dev/null
@@ -1,945 +0,0 @@
-// Copyright(c) 2016 huderlem
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <limits.h>
-
-/* extended.c */
-void ieee754_write_extended (double, uint8_t*);
-double ieee754_read_extended (uint8_t*);
-
-#ifdef _MSC_VER
-
-#define FATAL_ERROR(format, ...)           \
-do                                         \
-{                                          \
-	fprintf(stderr, format, __VA_ARGS__);  \
-	exit(1);                               \
-} while (0)
-
-#else
-
-#define FATAL_ERROR(format, ...)            \
-do                                          \
-{                                           \
-	fprintf(stderr, format, ##__VA_ARGS__); \
-	exit(1);                                \
-} while (0)
-
-#endif // _MSC_VER
-
-typedef struct {
-	unsigned long num_samples;
-	union {
-		uint8_t *samples8;
-		uint16_t *samples16;
-	};
-	uint8_t midi_note;
-	uint8_t sample_size;
-	bool has_loop;
-	unsigned long loop_offset;
-	double sample_rate;
-	unsigned long real_num_samples;
-} AifData;
-
-struct Bytes {
-	unsigned long length;
-	uint8_t *data;
-};
-
-struct Marker {
-	unsigned short id;
-	unsigned long position;
-	// don't care about the name
-};
-
-struct Bytes *read_bytearray(const char *filename)
-{
-	struct Bytes *bytes = malloc(sizeof(struct Bytes));
-	FILE *f = fopen(filename, "rb");
-	if (!f)
-	{
-		FATAL_ERROR("Failed to open '%s' for reading!\n", filename);
-	}
-	fseek(f, 0, SEEK_END);
-	bytes->length = ftell(f);
-	fseek(f, 0, SEEK_SET);
-	bytes->data = malloc(bytes->length);
-	unsigned long read = fread(bytes->data, bytes->length, 1, f);
-	fclose(f);
-	if (read <= 0)
-	{
-		FATAL_ERROR("Failed to read data from '%s'!\n", filename);
-	}
-	return bytes;
-}
-
-void write_bytearray(const char *filename, struct Bytes *bytes)
-{
-	FILE *f = fopen(filename, "wb");
-	if (!f)
-	{
-		FATAL_ERROR("Failed to open '%s' for writing!\n", filename);
-	}
-	fwrite(bytes->data, bytes->length, 1, f);
-	fclose(f);
-}
-
-void free_bytearray(struct Bytes *bytes)
-{
-	free(bytes->data);
-	free(bytes);
-}
-
-char *get_file_extension(char *filename)
-{
-	char *index = strrchr(filename, '.');
-	if (!index || index == filename)
-	{
-		return NULL;
-	}
-	return index + 1;
-}
-
-char *new_file_extension(char *filename, char *ext)
-{
-	char *index = strrchr(filename, '.');
-	if (!index || index == filename)
-	{
-		index = filename + strlen(filename);
-	}
-	int length = index - filename;
-	char *new_filename = malloc(length + 1 + strlen(ext) + 1);
-	if (new_filename)
-	{
-		strcpy(new_filename, filename);
-		new_filename[length] = '.';
-		strcpy(new_filename + length + 1, ext);
-	}
-	return new_filename;
-}
-
-void read_aif(struct Bytes *aif, AifData *aif_data)
-{
-	aif_data->has_loop = false;
-	aif_data->num_samples = 0;
-
-	unsigned long pos = 0;
-	char chunk_name[5]; chunk_name[4] = '\0';
-	char chunk_type[5]; chunk_type[4] = '\0';
-
-	// Check for FORM Chunk
-	memcpy(chunk_name, &aif->data[pos], 4);
-	pos += 4;
-	if (strcmp(chunk_name, "FORM") != 0)
-	{
-		FATAL_ERROR("Input .aif file has invalid header Chunk '%s'!\n", chunk_name);
-	}
-
-	// Read size of whole file.
-	unsigned long whole_chunk_size = aif->data[pos++] << 24;
-	whole_chunk_size |= (aif->data[pos++] << 16);
-	whole_chunk_size |= (aif->data[pos++] <<  8);
-	whole_chunk_size |= (uint8_t)aif->data[pos++];
-
-	unsigned long expected_whole_chunk_size = aif->length - 8;
-	if (whole_chunk_size != expected_whole_chunk_size)
-	{
-		FATAL_ERROR("FORM Chunk ckSize '%lu' doesn't match actual size '%lu'!\n", whole_chunk_size, expected_whole_chunk_size);
-	}
-
-	// Check for AIFF Form Type
-	memcpy(chunk_type, &aif->data[pos], 4);
-	pos += 4;
-	if (strcmp(chunk_type, "AIFF") != 0)
-	{
-		FATAL_ERROR("FORM Type is '%s', but it must be AIFF!", chunk_type);
-	}
-
-	struct Marker *markers = NULL;
-	unsigned short num_markers = 0, loop_start = 0, loop_end = 0;
-	unsigned long num_sample_frames = 0;
-
-	// Read all the Chunks to populate the AifData struct.
-	while ((pos + 8) < aif->length)
-	{
-		// Read Chunk id
-		memcpy(chunk_name, &aif->data[pos], 4);
-		pos += 4;
-
-		unsigned long chunk_size = (aif->data[pos++] << 24);
-		chunk_size |= (aif->data[pos++] << 16);
-		chunk_size |= (aif->data[pos++] <<  8);
-		chunk_size |=  aif->data[pos++];
-
-		if ((pos + chunk_size) > aif->length)
-		{
-			FATAL_ERROR("%s chunk at 0x%lx reached end of file before finishing\n", chunk_name, pos);
-		}
-
-		if (strcmp(chunk_name, "COMM") == 0)
-		{
-			short num_channels = (aif->data[pos++] << 8);
-			num_channels |= (uint8_t)aif->data[pos++];
-			if (num_channels != 1)
-			{
-				FATAL_ERROR("numChannels (%d) in the COMM Chunk must be 1!\n", num_channels);
-			}
-
-			num_sample_frames =  (aif->data[pos++] << 24);
-			num_sample_frames |= (aif->data[pos++] << 16);
-			num_sample_frames |= (aif->data[pos++] <<  8);
-			num_sample_frames |=  (uint8_t)aif->data[pos++];
-
-			aif_data->sample_size = (aif->data[pos++] << 8);
-			aif_data->sample_size |= (uint8_t)aif->data[pos++];
-			if (aif_data->sample_size != 8 && aif_data->sample_size != 16)
-			{
-				FATAL_ERROR("sampleSize (%d) in the COMM Chunk must be 8 or 16!\n", aif_data->sample_size);
-			}
-
-			double sample_rate = ieee754_read_extended((uint8_t*)(aif->data + pos));
-			pos += 10;
-
-			aif_data->sample_rate = sample_rate;
-
-			if (aif_data->num_samples == 0)
-			{
-				aif_data->num_samples = num_sample_frames;
-			}
-		}
-		else if (strcmp(chunk_name, "MARK") == 0)
-		{
-			num_markers = (aif->data[pos++] << 8);
-			num_markers |= (uint8_t)aif->data[pos++];
-
-			if (markers)
-			{
-				FATAL_ERROR("More than one MARK Chunk in file!\n");
-			}
-
-			markers = calloc(num_markers, sizeof(struct Marker));
-
-			// Read each marker.
-			for (int i = 0; i < num_markers; i++)
-			{
-				unsigned short marker_id = (aif->data[pos++] << 8);
-				marker_id |= (uint8_t)aif->data[pos++];
-
-				unsigned long marker_position = (aif->data[pos++] << 24);
-				marker_position |= (aif->data[pos++] << 16);
-				marker_position |= (aif->data[pos++] << 8);
-				marker_position |=  (uint8_t)aif->data[pos++];
-
-				// Marker name is a Pascal-style string.
-				uint8_t marker_name_size = aif->data[pos++];
-				// We don't actually need the marker name for anything anymore.
-				/*char *marker_name = (char *)malloc((marker_name_size + 1) * sizeof(char));
-				memcpy(marker_name, &aif->data[pos], marker_name_size);
-				marker_name[marker_name_size] = '\0';*/
-				pos += marker_name_size + !(marker_name_size & 1);
-
-				markers[i].id = marker_id;
-				markers[i].position = marker_position;
-			}
-		}
-		else if (strcmp(chunk_name, "INST") == 0)
-		{
-			uint8_t midi_note = (uint8_t)aif->data[pos++];
-
-			aif_data->midi_note = midi_note;
-
-			// Skip over data we don't need.
-			pos += 7;
-
-			unsigned short loop_type = (aif->data[pos++] << 8);
-			loop_type |= (uint8_t)aif->data[pos++];
-
-			if (loop_type)
-			{
-				loop_start = (aif->data[pos++] << 8);
-				loop_start |= (uint8_t)aif->data[pos++];
-
-				loop_end = (aif->data[pos++] << 8);
-				loop_end |= (uint8_t)aif->data[pos++];
-			}
-			else
-			{
-				// Skip NoLooping sustain loop.
-				pos += 4;
-			}
-
-			// Skip release loop, we don't need it.
-			pos += 6;
-		}
-		else if (strcmp(chunk_name, "SSND") == 0)
-		{
-			// Skip offset and blockSize
-			pos += 8;
-
-			unsigned long num_samples = chunk_size - 8;
-			if (aif_data->sample_size == 8)
-			{
-				uint8_t *sample_data = (uint8_t *)malloc(num_samples * sizeof(uint8_t));
-				memcpy(sample_data, &aif->data[pos], num_samples);
-
-				aif_data->samples8 = sample_data;
-				aif_data->real_num_samples = num_samples;
-			}
-			else
-			{
-				uint16_t *sample_data = (uint16_t *)malloc(num_samples * sizeof(uint16_t));
-				uint16_t *sample_data_swapped = (uint16_t *)malloc(num_samples * sizeof(uint16_t));
-				memcpy(sample_data, &aif->data[pos], num_samples);
-				for (long unsigned i = 0; i < num_samples; i++)
-				{
-					sample_data_swapped[i] = __builtin_bswap16(sample_data[i]);
-				}
-
-				aif_data->samples16 = sample_data_swapped;
-				aif_data->real_num_samples = num_samples;
-				free(sample_data);
-			}
-			pos += chunk_size - 8;
-		}
-		else
-		{
-			// Skip over unsupported chunks.
-			pos += chunk_size;
-		}
-	}
-
-	if (markers)
-	{
-		// Resolve loop points.
-		struct Marker *cur_marker = markers;
-
-		// Grab loop start point.
-		for (int i = 0; i < num_markers; i++, cur_marker++)
-		{
-			if (cur_marker->id == loop_start)
-			{
-				aif_data->loop_offset = cur_marker->position;
-				aif_data->has_loop = true;
-				break;
-			}
-		}
-
-		cur_marker = markers;
-
-		// Grab loop end point.
-		for (int i = 0; i < num_markers; i++, cur_marker++)
-		{
-			if (cur_marker->id == loop_end)
-			{
-				if (cur_marker->position < aif_data->loop_offset) {
-					aif_data->loop_offset = cur_marker->position;
-					aif_data->has_loop = true;
-				}
-				aif_data->num_samples = cur_marker->position;
-				break;
-			}
-		}
-
-		free(markers);
-	}
-}
-
-// This is a table of deltas between sample values in compressed PCM data.
-const int gDeltaEncodingTable[] = {
-	0, 1, 4, 9, 16, 25, 36, 49,
-	-64, -49, -36, -25, -16, -9, -4, -1,
-};
-
-#define POSITIVE_DELTAS_START 0
-#define POSITIVE_DELTAS_END 8
-
-#define NEGATIVE_DELTAS_START 8
-#define NEGATIVE_DELTAS_END 16
-
-struct Bytes *delta_decompress(struct Bytes *delta, unsigned int expected_length)
-{
-	struct Bytes *pcm = malloc(sizeof(struct Bytes));
-	pcm->length = expected_length;
-	pcm->data = malloc(pcm->length + 0x40);
-
-	uint8_t hi, lo;
-	unsigned int i = 0;
-	unsigned int j = 0;
-	int k;
-	int8_t base;
-	while (i < delta->length)
-	{
-		base = (int8_t)delta->data[i++];
-		pcm->data[j++] = (uint8_t)base;
-		if (i >= delta->length)
-		{
-			break;
-		}
-		if (j >= pcm->length)
-		{
-			break;
-		}
-		lo = delta->data[i] & 0xf;
-		base += gDeltaEncodingTable[lo];
-		pcm->data[j++] = base;
-		i++;
-		if (i >= delta->length)
-		{
-			break;
-		}
-		if (j >= pcm->length)
-		{
-			break;
-		}
-		for (k = 0; k < 31; k++)
-		{
-			hi = (delta->data[i] >> 4) & 0xf;
-			base += gDeltaEncodingTable[hi];
-			pcm->data[j++] = base;
-			if (j >= pcm->length)
-			{
-				break;
-			}
-			lo = delta->data[i] & 0xf;
-			base += gDeltaEncodingTable[lo];
-			pcm->data[j++] = base;
-			i++;
-			if (i >= delta->length)
-			{
-				break;
-			}
-			if (j >= pcm->length)
-			{
-				break;
-			}
-		}
-		if (j >= pcm->length)
-		{
-			break;
-		}
-	}
-
-	pcm->length = j;
-	return pcm;
-}
-
-#define U8_TO_S8(value) ((value) < 128 ? (value) : (value) - 256)
-#define ABS(value) ((value) >= 0 ? (value) : -(value))
-
-int get_delta_index(uint8_t sample, uint8_t prev_sample)
-{
-	int best_error = INT_MAX;
-	int best_index = -1;
-	int delta_table_start_index;
-	int delta_table_end_index;
-	int sample_signed = U8_TO_S8(sample);
-	int prev_sample_signed = U8_TO_S8(prev_sample);
-
-    // if we're going up (or equal), only choose positive deltas
-	if (prev_sample_signed <= sample_signed) {
-		delta_table_start_index = POSITIVE_DELTAS_START;
-		delta_table_end_index = POSITIVE_DELTAS_END;
-	} else {
-		delta_table_start_index = NEGATIVE_DELTAS_START;
-		delta_table_end_index = NEGATIVE_DELTAS_END;
-	}
-
-	for (int i = delta_table_start_index; i < delta_table_end_index; i++)
-	{
-		uint8_t new_sample = prev_sample + gDeltaEncodingTable[i];
-		int new_sample_signed = U8_TO_S8(new_sample);
-		int error = ABS(new_sample_signed - sample_signed);
-
-		if (error < best_error)
-		{
-			best_error = error;
-			best_index = i;
-		}
-	}
-
-	return best_index;
-}
-
-struct Bytes *delta_compress(struct Bytes *pcm)
-{
-	struct Bytes *delta = malloc(sizeof(struct Bytes));
-	// estimate the length so we can malloc
-	int num_blocks = pcm->length / 64;
-	delta->length = num_blocks * 33;
-
-	int extra = pcm->length % 64;
-	if (extra)
-	{
-		delta->length += 1;
-		extra -= 1;
-	}
-	if (extra)
-	{
-		delta->length += 1;
-		extra -= 1;
-	}
-	if (extra)
-	{
-		delta->length += (extra + 1) / 2;
-	}
-
-	delta->data = malloc(delta->length + 33);
-
-	unsigned int i = 0;
-	unsigned int j = 0;
-	int k;
-	uint8_t base;
-	int delta_index;
-
-	while (i < pcm->length)
-	{
-		base = pcm->data[i++];
-		delta->data[j++] = base;
-
-		if (i >= pcm->length)
-		{
-			break;
-		}
-		delta_index = get_delta_index(pcm->data[i++], base);
-		base += gDeltaEncodingTable[delta_index];
-		delta->data[j++] = delta_index;
-
-		for (k = 0; k < 31; k++)
-		{
-			if (i >= pcm->length)
-			{
-				break;
-			}
-			delta_index = get_delta_index(pcm->data[i++], base);
-			base += gDeltaEncodingTable[delta_index];
-			delta->data[j] = (delta_index << 4);
-
-			if (i >= pcm->length)
-			{
-				break;
-			}
-			delta_index = get_delta_index(pcm->data[i++], base);
-			base += gDeltaEncodingTable[delta_index];
-			delta->data[j++] |= delta_index;
-		}
-	}
-
-	delta->length = j;
-
-	return delta;
-}
-
-#define STORE_U32_LE(dest, value) \
-do { \
-	*(dest) = (value) & 0xff; \
-	*((dest) + 1) = ((value) >> 8) & 0xff; \
-	*((dest) + 2) = ((value) >> 16) & 0xff; \
-	*((dest) + 3) = ((value) >> 24) & 0xff; \
-} while (0)
-
-#define LOAD_U32_LE(var, src) \
-do { \
-	(var) = *(src); \
-	(var) |= (*((src) + 1) << 8); \
-	(var) |= (*((src) + 2) << 16); \
-	(var) |= (*((src) + 3) << 24); \
-} while (0)
-
-// Reads an .aif file and produces a .pcm file containing an array of 8-bit samples.
-void aif2pcm(const char *aif_filename, const char *pcm_filename, bool compress)
-{
-	struct Bytes *aif = read_bytearray(aif_filename);
-	AifData aif_data = {0};
-	read_aif(aif, &aif_data);
-
-	// Convert 16-bit to 8-bit if necessary
-	if (aif_data.sample_size == 16)
-	{
-		aif_data.real_num_samples /= 2;
-		uint8_t *converted_samples = malloc(aif_data.real_num_samples * sizeof(uint8_t));
-		for (unsigned long i = 0; i < aif_data.real_num_samples; i++)
-		{
-			converted_samples[i] = aif_data.samples16[i] >> 8;
-		}
-		free(aif_data.samples16);
-		aif_data.samples8 = converted_samples;
-	}
-
-	int header_size = 0x10;
-	struct Bytes *pcm;
-	struct Bytes output = {0,0};
-
-	if (compress)
-	{
-		struct Bytes *input = malloc(sizeof(struct Bytes));
-		input->data = aif_data.samples8;
-		input->length = aif_data.real_num_samples;
-		pcm = delta_compress(input);
-		free(input);
-	}
-	else
-	{
-		pcm = malloc(sizeof(struct Bytes));
-		pcm->data = aif_data.samples8;
-		pcm->length = aif_data.real_num_samples;
-	}
-	output.length = header_size + pcm->length;
-	output.data = malloc(output.length);
-
-	uint32_t pitch_adjust = (uint32_t)(aif_data.sample_rate * 1024);
-	uint32_t loop_offset = (uint32_t)(aif_data.loop_offset);
-	uint32_t adjusted_num_samples = (uint32_t)(aif_data.num_samples - 1);
-	uint32_t flags = 0;
-	if (aif_data.has_loop) flags |= 0x40000000;
-	if (compress) flags |= 1;
-	STORE_U32_LE(output.data + 0, flags);
-	STORE_U32_LE(output.data + 4, pitch_adjust);
-	STORE_U32_LE(output.data + 8, loop_offset);
-	STORE_U32_LE(output.data + 12, adjusted_num_samples);
-	memcpy(&output.data[header_size], pcm->data, pcm->length);
-	write_bytearray(pcm_filename, &output);
-
-	free(aif->data);
-	free(aif);
-	free(pcm);
-	free(output.data);
-	free(aif_data.samples8);
-}
-
-// Reads a .pcm file containing an array of 8-bit samples and produces an .aif file.
-// See http://www-mmsp.ece.mcgill.ca/documents/audioformats/aiff/Docs/AIFF-1.3.pdf for .aif file specification.
-void pcm2aif(const char *pcm_filename, const char *aif_filename, uint32_t base_note)
-{
-	struct Bytes *pcm = read_bytearray(pcm_filename);
-
-	AifData *aif_data = malloc(sizeof(AifData));
-
-	uint32_t flags;
-	LOAD_U32_LE(flags, pcm->data + 0);
-	aif_data->has_loop = flags & 0x40000000;
-	bool compressed = flags & 1;
-
-	uint32_t pitch_adjust;
-	LOAD_U32_LE(pitch_adjust, pcm->data + 4);
-	aif_data->sample_rate = pitch_adjust / 1024.0;
-
-	LOAD_U32_LE(aif_data->loop_offset, pcm->data + 8);
-	LOAD_U32_LE(aif_data->num_samples, pcm->data + 12);
-	aif_data->num_samples += 1;
-
-	if (compressed)
-	{
-		struct Bytes *delta = pcm;
-		uint8_t *pcm_data = pcm->data;
-		delta->length -= 0x10;
-		delta->data += 0x10;
-		pcm = delta_decompress(delta, aif_data->num_samples);
-		free(pcm_data);
-		free(delta);
-	}
-	else
-	{
-		pcm->length -= 0x10;
-		pcm->data += 0x10;
-	}
-
-	aif_data->samples8 = malloc(pcm->length);
-	memcpy(aif_data->samples8, pcm->data, pcm->length);
-
-	struct Bytes *aif = malloc(sizeof(struct Bytes));
-	aif->length = 54 + 60 + pcm->length;
-	aif->data = malloc(aif->length);
-
-	long pos = 0;
-
-	// First, write the FORM header chunk.
-	// FORM Chunk ckID
-	aif->data[pos++] = 'F';
-	aif->data[pos++] = 'O';
-	aif->data[pos++] = 'R';
-	aif->data[pos++] = 'M';
-
-	// FORM Chunk ckSize
-	unsigned long form_size = pos;
-	unsigned long data_size = aif->length - 8;
-	aif->data[pos++] = ((data_size >> 24) & 0xFF);
-	aif->data[pos++] = ((data_size >> 16) & 0xFF);
-	aif->data[pos++] = ((data_size >>  8) & 0xFF);
-	aif->data[pos++] = (data_size & 0xFF);
-
-	// FORM Chunk formType
-	aif->data[pos++] = 'A';
-	aif->data[pos++] = 'I';
-	aif->data[pos++] = 'F';
-	aif->data[pos++] = 'F';
-
-	// Next, write the Common Chunk
-	// Common Chunk ckID
-	aif->data[pos++] = 'C';
-	aif->data[pos++] = 'O';
-	aif->data[pos++] = 'M';
-	aif->data[pos++] = 'M';
-
-	// Common Chunk ckSize
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 18;
-
-	// Common Chunk numChannels
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 1;  // 1 channel
-
-	// Common Chunk numSampleFrames
-	aif->data[pos++] = ((aif_data->num_samples >> 24) & 0xFF);
-	aif->data[pos++] = ((aif_data->num_samples >> 16) & 0xFF);
-	aif->data[pos++] = ((aif_data->num_samples >> 8)  & 0xFF);
-	aif->data[pos++] = (aif_data->num_samples & 0xFF);
-
-	// Common Chunk sampleSize
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 8;  // 8 bits per sample
-
-	// Common Chunk sampleRate
-	//double sample_rate = pitch_adjust / 1024.0;
-	uint8_t sample_rate_buffer[10];
-	ieee754_write_extended(aif_data->sample_rate, sample_rate_buffer);
-	for (int i = 0; i < 10; i++)
-	{
-		aif->data[pos++] = sample_rate_buffer[i];
-	}
-
-	if (aif_data->has_loop)
-	{
-
-		// Marker Chunk ckID
-		aif->data[pos++] = 'M';
-		aif->data[pos++] = 'A';
-		aif->data[pos++] = 'R';
-		aif->data[pos++] = 'K';
-
-		// Marker Chunk ckSize
-		aif->data[pos++] = 0;
-		aif->data[pos++] = 0;
-		aif->data[pos++] = 0;
-		aif->data[pos++] = 12 + (aif_data->has_loop ? 12 : 0);
-
-		// Marker Chunk numMarkers
-		aif->data[pos++] = 0;
-		aif->data[pos++] = (aif_data->has_loop ? 2 : 1);
-
-		// Marker loop start
-		aif->data[pos++] = 0;
-		aif->data[pos++] = 1;  // id = 1
-
-		long loop_start = aif_data->loop_offset;
-		aif->data[pos++] = ((loop_start >> 24) & 0xFF);
-		aif->data[pos++] = ((loop_start >> 16) & 0xFF);
-		aif->data[pos++] = ((loop_start >> 8)  & 0xFF);
-		aif->data[pos++] = (loop_start & 0xFF);  // position
-
-		aif->data[pos++] = 5;  // pascal-style string length
-		aif->data[pos++] = 'S';
-		aif->data[pos++] = 'T';
-		aif->data[pos++] = 'A';
-		aif->data[pos++] = 'R';
-		aif->data[pos++] = 'T';  // markerName
-
-		// Marker loop end
-		aif->data[pos++] = 0;
-		aif->data[pos++] = (aif_data->has_loop ? 2 : 1);  // id = 2
-
-		long loop_end = aif_data->num_samples;
-		aif->data[pos++] = ((loop_end >> 24) & 0xFF);
-		aif->data[pos++] = ((loop_end >> 16) & 0xFF);
-		aif->data[pos++] = ((loop_end >> 8)  & 0xFF);
-		aif->data[pos++] = (loop_end & 0xFF);  // position
-
-		aif->data[pos++] = 3;  // pascal-style string length
-		aif->data[pos++] = 'E';
-		aif->data[pos++] = 'N';
-		aif->data[pos++] = 'D';
-	}
-
-	// Instrument Chunk ckID
-	aif->data[pos++] = 'I';
-	aif->data[pos++] = 'N';
-	aif->data[pos++] = 'S';
-	aif->data[pos++] = 'T';
-
-	// Instrument Chunk ckSize
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 20;
-
-	aif->data[pos++] = base_note;  // baseNote
-	aif->data[pos++] = 0;          // detune
-	aif->data[pos++] = 0;          // lowNote
-	aif->data[pos++] = 127;        // highNote
-	aif->data[pos++] = 1;          // lowVelocity
-	aif->data[pos++] = 127;        // highVelocity
-	aif->data[pos++] = 0;          // gain (hi)
-	aif->data[pos++] = 0;          // gain (lo)
-
-	// Instrument Chunk sustainLoop
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 1; // playMode = ForwardLooping
-
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 1;  // beginLoop marker id
-
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 2;  // endLoop marker id
-
-		// Instrument Chunk releaseLoop
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 1; // playMode = ForwardLooping
-
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 1;  // beginLoop marker id
-
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 2;  // endLoop marker id
-
-	// Finally, write the Sound Data Chunk
-	// Sound Data Chunk ckID
-	aif->data[pos++] = 'S';
-	aif->data[pos++] = 'S';
-	aif->data[pos++] = 'N';
-	aif->data[pos++] = 'D';
-
-	// Sound Data Chunk ckSize
-	unsigned long sound_data_size = pcm->length + 8;
-	aif->data[pos++] = ((sound_data_size >> 24) & 0xFF);
-	aif->data[pos++] = ((sound_data_size >> 16) & 0xFF);
-	aif->data[pos++] = ((sound_data_size >> 8)  & 0xFF);
-	aif->data[pos++] = (sound_data_size & 0xFF);
-
-	// Sound Data Chunk offset
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 0;
-
-	// Sound Data Chunk blockSize
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 0;
-	aif->data[pos++] = 0;
-
-	// Sound Data Chunk soundData
-	for (unsigned int i = 0; i < aif_data->loop_offset; i++)
-	{
-		aif->data[pos++] = aif_data->samples8[i];
-	}
-
-	int j = 0;
-	for (unsigned int i = aif_data->loop_offset; i < pcm->length; i++)
-	{
-		int pcm_index = aif_data->loop_offset + (j++ % (pcm->length - aif_data->loop_offset));
-		aif->data[pos++] = aif_data->samples8[pcm_index];
-	}
-
-	aif->length = pos;
-
-	// Go back and rewrite ckSize
-	data_size = aif->length - 8;
-	aif->data[form_size + 0] = ((data_size >> 24) & 0xFF);
-	aif->data[form_size + 1] = ((data_size >> 16) & 0xFF);
-	aif->data[form_size + 2] = ((data_size >>  8) & 0xFF);
-	aif->data[form_size + 3] = (data_size & 0xFF);
-
-	write_bytearray(aif_filename, aif);
-
-	free(aif->data);
-	free(aif);
-}
-
-void usage(void)
-{
-	fprintf(stderr, "Usage: aif2pcm bin_file [aif_file]\n");
-	fprintf(stderr, "       aif2pcm aif_file [bin_file] [--compress]\n");
-}
-
-int main(int argc, char **argv)
-{
-	if (argc < 2)
-	{
-		usage();
-		exit(1);
-	}
-
-	char *input_file = argv[1];
-	char *extension = get_file_extension(input_file);
-	char *output_file;
-	bool compressed = false;
-
-	if (argc > 3)
-	{
-		for (int i = 3; i < argc; i++)
-		{
-			if (strcmp(argv[i], "--compress") == 0)
-			{
-				compressed = true;
-			}
-		}
-	}
-
-	if (strcmp(extension, "aif") == 0 || strcmp(extension, "aiff") == 0)
-	{
-		if (argc >= 3)
-		{
-			output_file = argv[2];
-			aif2pcm(input_file, output_file, compressed);
-		}
-		else
-		{
-			output_file = new_file_extension(input_file, "bin");
-			aif2pcm(input_file, output_file, compressed);
-			free(output_file);
-		}
-	}
-	else if (strcmp(extension, "bin") == 0)
-	{
-		if (argc >= 3)
-		{
-			output_file = argv[2];
-			pcm2aif(input_file, output_file, 60);
-		}
-		else
-		{
-			output_file = new_file_extension(input_file, "aif");
-			pcm2aif(input_file, output_file, 60);
-			free(output_file);
-		}
-	}
-	else
-	{
-		FATAL_ERROR("Input file must be .aif or .bin: '%s'\n", input_file);
-	}
-
-	return 0;
-}
diff --git a/tools/wav2agb/.gitignore b/tools/wav2agb/.gitignore
new file mode 100644
index 000000000..271540565
--- /dev/null
+++ b/tools/wav2agb/.gitignore
@@ -0,0 +1,10 @@
+*.o
+*.exe
+*.s
+*.gba
+*.sdf
+
+wav2agb
+Debug
+Release
+.vs
diff --git a/tools/aif2pcm/LICENSE b/tools/wav2agb/LICENSE
similarity index 77%
rename from tools/aif2pcm/LICENSE
rename to tools/wav2agb/LICENSE
index 966b92bd6..d52bf8ee6 100644
--- a/tools/aif2pcm/LICENSE
+++ b/tools/wav2agb/LICENSE
@@ -1,5 +1,6 @@
-Copyright (c) 2016 huderlem
-Copyright (c) 2005, 2006 by Marco Trillo <marcotrillo@gmail.com>
+The MIT License (MIT)
+
+Copyright (c) 2016 ipatix
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -8,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/tools/wav2agb/Makefile b/tools/wav2agb/Makefile
new file mode 100644
index 000000000..a121730e9
--- /dev/null
+++ b/tools/wav2agb/Makefile
@@ -0,0 +1,33 @@
+GIT_VERSION := $(shell git describe --abbrev=7 --dirty --always --tags)
+
+CXX = g++
+STRIP = strip
+CXXFLAGS = -Wall -Wextra -Wconversion -std=c++17 -O2 -g -DGIT_VERSION=\"$(GIT_VERSION)\"
+EXE :=
+ifeq ($(OS),Windows_NT)
+  EXE := .exe
+endif
+BINARY = wav2agb$(EXE)
+
+SRC_FILES = $(wildcard *.cpp)
+OBJ_FILES = $(SRC_FILES:.cpp=.o)
+
+LDFLAGS :=
+
+ifneq (,$(RELEASE))
+  LDFLAGS += -static
+  CXXFLAGS += -flto
+endif
+
+.PHONY: clean clean
+all: $(BINARY)
+
+clean:
+	rm -f $(OBJ_FILES) $(BINARY)
+
+$(BINARY): $(OBJ_FILES)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
+	if [ $(RELEASE)x != x ]; then strip -s $@; fi
+
+%.o: %.cpp
+	$(CXX) -c -o $@ $< $(CXXFLAGS)
diff --git a/tools/wav2agb/README.md b/tools/wav2agb/README.md
new file mode 100644
index 000000000..86f266023
--- /dev/null
+++ b/tools/wav2agb/README.md
@@ -0,0 +1,29 @@
+# wav2agb
+"wav2agb" is a tool to convert standard .wav files to GBA compatible .s or .bin files.  Intended to convert .wav files for the use with the mp2k/m4a sound driver.
+
+This copy has been slightly modified from [ipatix's original implementation](https://github.com/ipatix/wav2agb) in the following ways:
+1. Support outputting `.bin` files with a command line option `-b, --binary`. (The original only supports outputting `.s` assembly files.)
+2. Support reading an override "pitch" value from a custom `agbp` RIFF chunk.
+   - This is needed to properly match some samples, due to float-point rounding errors when attempting to infer the pitch/sample rate from the .wav file's sample rate.
+   - If the custom `agbp` chunk isn't present, it will simply use the .wav's sample rate to calculate this "pitch" value.
+3. Optionally omits trailing padding from compressed output.
+
+Usage: 
+```
+Usage: wav2agb [options] <input.wav> [<output>]
+
+Options:
+-s, --symbol <sym>       | symbol name for wave header (default: file name)
+-l, --lookahead <amount> | DPCM compression lookahead 1..8 (default: 3)
+-c, --compress           | compress output with DPCM
+-f, --fast-compress      | compress output with DPCM fast
+--no-pad                 | omit trailing padding in compressed output
+-b, --binary             | output raw binary instead of assembly
+--loop-start <pos>       | override loop start (integer)
+--loop-end <pos>         | override loop end (integer)
+--tune <cents>           | override tuning (float)
+--key <key>              | override midi key (int)
+--rate <rate>            | override base samplerate (int)
+```
+
+Flag -c enables compression (only supported by Pokemon Games)
diff --git a/tools/wav2agb/converter.cpp b/tools/wav2agb/converter.cpp
new file mode 100644
index 000000000..c96135c14
--- /dev/null
+++ b/tools/wav2agb/converter.cpp
@@ -0,0 +1,462 @@
+#include "converter.h"
+
+#include <stdexcept>
+#include <fstream>
+#include <algorithm>
+#include <vector>
+
+#include <cmath>
+#include <cstdarg>
+#include <cassert>
+#include <cstring>
+#include <chrono>
+
+#include "wav_file.h"
+
+static void agb_out(std::ofstream& ofs, const char *msg, ...) {
+    char buf[256];
+    va_list args;
+    va_start(args, msg);
+    vsnprintf(buf, sizeof(buf), msg, args);
+    va_end(args);
+    ofs << buf;
+}
+
+static void data_write(std::ofstream& ofs, uint32_t& block_pos, int data, bool hex) {
+    if (block_pos++ == 0) {
+        if (hex)
+            agb_out(ofs, "\n    .byte   0x%02X", data);
+        else
+            agb_out(ofs, "\n    .byte   %4d", data);
+    } else {
+        if (hex)
+            agb_out(ofs, ", 0x%02X", data);
+        else
+            agb_out(ofs, ", %4d", data);
+    }
+    block_pos %= 16;
+}
+
+static void bin_write_u8(std::vector<uint8_t>& data, uint8_t value) {
+    data.push_back(value);
+}
+
+static void bin_write_u32_le(std::vector<uint8_t>& data, uint32_t value) {
+    data.push_back(static_cast<uint8_t>(value & 0xFF));
+    data.push_back(static_cast<uint8_t>((value >> 8) & 0xFF));
+    data.push_back(static_cast<uint8_t>((value >> 16) & 0xFF));
+    data.push_back(static_cast<uint8_t>((value >> 24) & 0xFF));
+}
+
+template<typename T>
+const T& clamp(const T& v, const T& lo, const T& hi) {
+    return (v < lo) ? lo : (hi < v) ? hi : v;
+}
+
+static void convert_uncompressed(wav_file& wf, std::ofstream& ofs)
+{
+    int loop_sample = 0;
+
+    uint32_t block_pos = 0;
+
+    for (size_t i = 0; i < wf.loopEnd; i++) {
+        double ds;
+        wf.readData(i, &ds, 1);
+        // TODO apply dither noise
+        int s = clamp(static_cast<int>(floor(ds * 128.0)), -128, 127);
+
+        if (wf.loopEnabled && i == wf.loopStart)
+            loop_sample = s;
+
+        data_write(ofs, block_pos, s, false);
+    }
+
+    data_write(ofs, block_pos, loop_sample, false);
+}
+
+static void convert_uncompressed_bin(wav_file& wf, std::vector<uint8_t>& data)
+{
+    for (size_t i = 0; i < wf.loopEnd; i++) {
+        double ds;
+        wf.readData(i, &ds, 1);
+        // TODO apply dither noise
+        int s = clamp(static_cast<int>(floor(ds * 128.0)), -128, 127);
+
+        bin_write_u8(data, static_cast<uint8_t>(s));
+    }
+
+    // Align to 4 bytes.
+    while (data.size() % 4 != 0) {
+        bin_write_u8(data, 0);
+    }
+}
+
+static uint32_t wav_loop_start;
+static bool wav_loop_start_override = false;
+static uint32_t wav_loop_end;
+static bool wav_loop_end_override = false;
+static double wav_tune;
+static bool wav_tune_override = false;
+static uint8_t wav_key;
+static bool wav_key_override = false;
+static uint32_t wav_rate;
+static bool wav_rate_override = false;
+
+static bool dpcm_verbose = false;
+static bool dpcm_lookahead_fast = false;
+static bool dpcm_include_padding = true;
+static size_t dpcm_enc_lookahead = 3;
+static const size_t DPCM_BLK_SIZE = 0x40;
+static const std::vector<int8_t> dpcmLookupTable = { 
+    0, 1, 4, 9, 16, 25, 36, 49, -64, -49, -36, -25, -16, -9, -4, -1 
+};
+static const std::vector<size_t> dpcmIndexTable = {
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+};
+static const std::vector<std::vector<size_t>> dpcmFastLookupTable = { 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, {8}, 
+    {8, 9}, {8, 9}, {8, 9}, {8, 9}, {8, 9}, {8, 9}, {8, 9}, {8, 9}, {8, 9}, {8, 9}, {8, 9}, {8, 9}, {8, 9}, {8, 9}, {9, 10}, {9, 10}, 
+    {9, 10}, {9, 10}, {9, 10}, {9, 10}, {9, 10}, {9, 10}, {9, 10}, {9, 10}, {9, 10}, {9, 10}, {9, 10}, {10, 11}, {10, 11}, {10, 11}, {10, 11}, {10, 11}, 
+    {10, 11}, {10, 11}, {10, 11}, {10, 11}, {10, 11}, {10, 11}, {11, 12}, {11, 12}, {11, 12}, {11, 12}, {11, 12}, {11, 12}, {11, 12}, {11, 12}, {11, 12}, {12, 13}, 
+    {12, 13}, {12, 13}, {12, 13}, {12, 13}, {12, 13}, {12, 13}, {13, 14}, {13, 14}, {13, 14}, {13, 14}, {13, 14}, {14, 15}, {14, 15}, {14, 15}, {0, 15}, {0, 1, 15}, 
+    {1, 0}, {1, 2}, {1, 2}, {2, 1}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {3, 2}, {3, 4}, {3, 4}, {3, 4}, {3, 4}, {3, 4}, {3, 4}, {4, 3}, 
+    {4, 5}, {4, 5}, {4, 5}, {4, 5}, {4, 5}, {4, 5}, {4, 5}, {4, 5}, {5, 4}, {5, 6}, {5, 6}, {5, 6}, {5, 6}, {5, 6}, {5, 6}, {5, 6}, 
+    {5, 6}, {5, 6}, {5, 6}, {6, 5}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, {6, 7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, 
+    {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}, {7}
+};
+
+static int squared(int x) { return x * x; }
+
+static void dpcm_lookahead(
+        int& minimumError, size_t& minimumErrorIndex,
+        const double *sampleBuf, const size_t lookahead, const int prevLevel)
+{
+    if (lookahead == 0) {
+        minimumError = 0;
+        return;
+    }
+
+    minimumError = std::numeric_limits<int>::max();
+    minimumErrorIndex = dpcmLookupTable.size();
+    const int s = clamp(static_cast<int>(floor(sampleBuf[0] * 128.0)), -128, 127);
+    const std::vector<size_t> indexCandicateSet = dpcm_lookahead_fast? dpcmFastLookupTable[s - prevLevel + 255]: dpcmIndexTable;
+
+    for (auto i : indexCandicateSet) {
+        int newLevel = prevLevel + dpcmLookupTable[i];
+
+        int recMinimumError;
+        size_t recMinimumErrorIndex;
+
+        // TODO apply dither noise
+        int errorEstimation = squared(s - newLevel);
+        if (errorEstimation >= minimumError)
+            continue;
+
+        dpcm_lookahead(recMinimumError, recMinimumErrorIndex,
+                sampleBuf + 1, lookahead - 1, newLevel);
+
+        // TODO weigh the error squared
+        int error = squared(s - newLevel) + recMinimumError;
+        if (error < minimumError) {
+            if (newLevel <= 127 && newLevel >= -128) {
+                minimumError = error;
+                minimumErrorIndex = i;
+            }
+        }
+    }
+}
+
+static double calculate_snr(const std::vector<double>& uncompressedData, const std::vector<int>& decompressedData)
+{
+    int sum_son = 0;
+    int sum_mum = 0;
+
+    assert(uncompressedData.size() == decompressedData.size());
+
+    for (size_t i = 0; i < uncompressedData.size(); i++) {
+        const int s = clamp(static_cast<int>(floor(uncompressedData[i] * 128.0)), -128, 127) + 128;
+        sum_son += s * s;
+        const int sub = decompressedData[i] + 128 - s;
+        sum_mum += sub * sub;
+    }
+
+    if (sum_mum == 0) {
+        return 100;
+    }
+
+    return 10 * std::log10((double)sum_son / sum_mum);
+}
+
+template<typename InitialSampleWriter, typename CompressedDataWriter>
+static void convert_dpcm_impl(wav_file& wf, InitialSampleWriter writeInitialSample, CompressedDataWriter writeCompressedData)
+{
+    int minimumError;
+    size_t minimumErrorIndex;
+
+    std::vector<double> uncompressedData;
+    std::vector<int> decompressedData;
+
+    const auto startTime = std::chrono::high_resolution_clock::now();
+
+    for (size_t i = 0; i < wf.loopEnd; i += DPCM_BLK_SIZE) {
+        double ds[DPCM_BLK_SIZE];
+        size_t samples_in_block = std::min(DPCM_BLK_SIZE, wf.loopEnd - i);
+        wf.readData(i, ds, samples_in_block);
+        // Pad remaining samples in block with zeros if needed
+        for (size_t j = samples_in_block; j < DPCM_BLK_SIZE; j++) {
+            ds[j] = 0.0;
+        }
+        if (dpcm_verbose) {
+            uncompressedData.insert(uncompressedData.end(), std::begin(ds), std::end(ds));
+        }
+        // TODO apply dither noise
+        int s = clamp(static_cast<int>(floor(ds[0] * 128.0)), -128, 127);
+
+        writeInitialSample(s);
+        if (dpcm_verbose) {
+            decompressedData.push_back(s);
+        }
+
+        size_t innerLoopCount = 1;
+        size_t samples_to_process = dpcm_include_padding ? DPCM_BLK_SIZE : samples_in_block;
+        uint8_t outData = 0;
+        size_t sampleBufReadLen;
+
+        goto initial_loop_enter;
+
+        do {
+            if (innerLoopCount >= samples_to_process)
+                break;
+            sampleBufReadLen = std::min(dpcm_enc_lookahead, DPCM_BLK_SIZE - innerLoopCount);
+            dpcm_lookahead(
+                    minimumError, minimumErrorIndex,
+                    &ds[innerLoopCount], sampleBufReadLen, s);
+            outData = static_cast<uint8_t>((minimumErrorIndex & 0xF) << 4);
+            s += dpcmLookupTable[minimumErrorIndex];
+            if (dpcm_verbose) {
+                decompressedData.push_back(s);
+            }
+            innerLoopCount += 1;
+initial_loop_enter:
+            if (innerLoopCount >= samples_to_process)
+                break;
+            sampleBufReadLen = std::min(dpcm_enc_lookahead, DPCM_BLK_SIZE - innerLoopCount);
+            dpcm_lookahead(
+                    minimumError, minimumErrorIndex,
+                    &ds[innerLoopCount], sampleBufReadLen, s);
+            outData |= static_cast<uint8_t>(minimumErrorIndex & 0xF);
+            s += dpcmLookupTable[minimumErrorIndex];
+            innerLoopCount += 1;
+            if (dpcm_verbose) {
+                decompressedData.push_back(s);
+            }
+            writeCompressedData(outData);
+        } while (innerLoopCount < DPCM_BLK_SIZE);
+    }
+
+    const auto endTime = std::chrono::high_resolution_clock::now();
+
+    if (dpcm_verbose) {
+        const auto dur = std::chrono::duration_cast<std::chrono::nanoseconds>(endTime - startTime);
+        const double durSecs = static_cast<double>(dur.count()) / 1000000000.0;
+        printf("SNR: %.2fdB, run time: %.2fs\n", calculate_snr(uncompressedData, decompressedData), durSecs);
+    }
+}
+
+static void convert_dpcm(wav_file& wf, std::ofstream& ofs)
+{
+    uint32_t block_pos = 0;
+    convert_dpcm_impl(wf,
+        [&](int s) { data_write(ofs, block_pos, s, false); },
+        [&](uint8_t outData) { data_write(ofs, block_pos, outData, true); });
+}
+
+static void convert_dpcm_bin(wav_file& wf, std::vector<uint8_t>& data)
+{
+    convert_dpcm_impl(wf,
+        [&](int s) { bin_write_u8(data, static_cast<uint8_t>(s)); },
+        [&](uint8_t outData) { bin_write_u8(data, outData); });
+}
+
+void enable_dpcm_verbose()
+{
+    dpcm_verbose = true;
+}
+
+void enable_dpcm_lookahead_fast()
+{
+    dpcm_lookahead_fast = true;
+}
+
+void disable_dpcm_padding()
+{
+    dpcm_include_padding = false;
+}
+
+void set_dpcm_lookahead(size_t lookahead)
+{
+    dpcm_enc_lookahead = clamp<size_t>(lookahead, 1, 8);
+}
+
+void set_wav_loop_start(uint32_t start)
+{
+    wav_loop_start = start;
+    wav_loop_start_override = true;
+}
+
+void set_wav_loop_end(uint32_t end)
+{
+    wav_loop_end = end;
+    wav_loop_end_override = true;
+}
+
+void set_wav_tune(double tune)
+{
+    wav_tune = tune;
+    wav_tune_override = true;
+}
+
+void set_wav_key(uint8_t key)
+{
+    wav_key = key;
+    wav_key_override = true;
+}
+
+void set_wav_rate(uint32_t rate)
+{
+    wav_rate = rate;
+    wav_rate_override = true;
+}
+
+void convert(const std::string& wav_file_str, const std::string& out_file_str,
+        const std::string& sym, cmp_type ct, out_type ot)
+{
+    wav_file wf(wav_file_str);
+
+    // check command line overrides
+    if (wav_loop_start_override) {
+        wf.loopStart = std::min(wav_loop_start, wf.loopEnd);
+        wf.loopEnabled = true;
+    }
+    if (wav_loop_end_override) {
+        wf.loopEnd = std::min(wav_loop_end, wf.loopEnd);
+    }
+    if (wav_tune_override) {
+        wf.tuning = wav_tune;
+    }
+    if (wav_key_override) {
+        wf.midiKey = wav_key;
+    }
+    if (wav_rate_override) {
+        wf.sampleRate = wav_rate;
+    }
+
+    uint8_t fmt;
+    if (ct == cmp_type::none)
+        fmt = 0;
+    else if (ct == cmp_type::dpcm)
+        fmt = 1;
+    else
+        throw std::runtime_error("convert: invalid compression type");
+
+    double pitch;
+    if (wf.midiKey == 60 && wf.tuning == 0.0) {
+        pitch = wf.sampleRate;
+    } else {
+        pitch = wf.sampleRate * pow(2.0, (60.0 - wf.midiKey) / 12.0 + wf.tuning / 1200.0);
+    }
+
+    uint32_t pitch_value;
+    if (wf.agbPitch != 0) {
+        pitch_value = wf.agbPitch;
+    } else {
+        pitch_value = static_cast<uint32_t>(pitch * 1024.0);
+    }
+
+    if (ot == out_type::binary) {
+        // Binary output mode
+        std::vector<uint8_t> bin_data;
+
+        // Write header (16 bytes)
+        // Bytes 0-3: flags (format in bit 0, loop in bit 30)
+        uint32_t flags = fmt;
+        if (wf.loopEnabled)
+            flags |= 0x40000000;
+        bin_write_u32_le(bin_data, flags);
+
+        // Bytes 4-7: pitch
+        bin_write_u32_le(bin_data, pitch_value);
+
+        // Bytes 8-11: loop start
+        bin_write_u32_le(bin_data, wf.loopStart);
+
+        // Bytes 12-15: loop end
+        // wf.loopEnd is the exclusive end position; binary format expects (end - 1)
+        bin_write_u32_le(bin_data, wf.loopEnd > 0 ? wf.loopEnd - 1 : 0);
+
+        // Write sample data
+        if (ct == cmp_type::none)
+            convert_uncompressed_bin(wf, bin_data);
+        else if (ct == cmp_type::dpcm)
+            convert_dpcm_bin(wf, bin_data);
+        else
+            throw std::runtime_error("convert: invalid compression type");
+
+        // Write binary file
+        std::ofstream fout(out_file_str, std::ios::out | std::ios::binary);
+        if (!fout.is_open()) {
+            perror("ofstream");
+            throw std::runtime_error("unable to open output file");
+        }
+        fout.write(reinterpret_cast<const char*>(bin_data.data()), bin_data.size());
+        fout.close();
+    } else {
+        // Assembly output mode
+        std::ofstream fout(out_file_str, std::ios::out);
+        if (!fout.is_open()) {
+            perror("ofstream");
+            throw std::runtime_error("unable to open output file");
+        }
+
+        agb_out(fout, "    .section .rodata\n");
+        agb_out(fout, "    .global %s\n", sym.c_str());
+        agb_out(fout, "    .align  2\n\n%s:\n\n", sym.c_str());
+
+        agb_out(fout, "    .byte   0x%X, 0x0, 0x0, 0x%X\n", fmt, wf.loopEnabled ? 0x40 : 0x0);
+        agb_out(fout, "    .word   0x%08X  @ Mid-C ~%f\n", pitch_value, pitch);
+        agb_out(fout, "    .word   %u, %u\n", wf.loopStart, wf.loopEnd);
+
+        if (ct == cmp_type::none)
+            convert_uncompressed(wf, fout);
+        else if (ct == cmp_type::dpcm)
+            convert_dpcm(wf, fout);
+        else
+            throw std::runtime_error("convert: invalid compression type");
+
+        agb_out(fout, "\n\n    .end\n");
+        fout.close();
+    }
+}
diff --git a/tools/wav2agb/converter.h b/tools/wav2agb/converter.h
new file mode 100644
index 000000000..df59ebe2d
--- /dev/null
+++ b/tools/wav2agb/converter.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <string>
+#include <algorithm>
+#include <cstdint>
+
+enum class cmp_type {
+    none, dpcm
+};
+
+enum class out_type {
+    assembly, binary
+};
+
+void enable_dpcm_verbose();
+void enable_dpcm_lookahead_fast();
+void disable_dpcm_padding();
+void set_dpcm_lookahead(size_t lookahead);
+void set_wav_loop_start(uint32_t start);
+void set_wav_loop_end(uint32_t end);
+void set_wav_tune(double tune);
+void set_wav_key(uint8_t key);
+void set_wav_rate(uint32_t rate);
+
+void convert(const std::string&, const std::string&,
+        const std::string& sym, cmp_type ct, out_type ot);
diff --git a/tools/wav2agb/test_fast_compress.sh b/tools/wav2agb/test_fast_compress.sh
new file mode 100644
index 000000000..3ef56b4d9
--- /dev/null
+++ b/tools/wav2agb/test_fast_compress.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+for l in $(seq 1 8)
+do
+    echo lookahead="$l":
+    wav2agb "$1" -c -l "$l" --verbose
+    echo lookahead="$l" fast:
+    wav2agb "$1" -f -l "$l" --verbose
+done
diff --git a/tools/wav2agb/wav2agb.cpp b/tools/wav2agb/wav2agb.cpp
new file mode 100644
index 000000000..be018abad
--- /dev/null
+++ b/tools/wav2agb/wav2agb.cpp
@@ -0,0 +1,213 @@
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cstdarg>
+#include <cassert>
+
+#include <string>
+
+#include "converter.h"
+
+static void usage() {
+    fprintf(stderr, "wav2agb\n");
+    fprintf(stderr, "\n");
+    fprintf(stderr, "Usage: wav2agb [options] <input.wav> [<output>]\n");
+    fprintf(stderr, "\n");
+    fprintf(stderr, "Options:\n");
+    fprintf(stderr, "-s, --symbol <sym>       | symbol name for wave header (default: file name)\n");
+    fprintf(stderr, "-l, --lookahead <amount> | DPCM compression lookahead 1..8 (default: 3)\n");
+    fprintf(stderr, "-c, --compress           | compress output with DPCM\n");
+    fprintf(stderr, "-f, --fast-compress      | compress output with DPCM fast\n");
+    fprintf(stderr, "--no-pad                 | omit trailing padding in compressed output\n");
+    fprintf(stderr, "-b, --binary             | output raw binary instead of assembly\n");
+    fprintf(stderr, "--loop-start <pos>       | override loop start (integer)\n");
+    fprintf(stderr, "--loop-end <pos>         | override loop end (integer)\n");
+    fprintf(stderr, "--tune <cents>           | override tuning (float)\n");
+    fprintf(stderr, "--key <key>              | override midi key (int)\n");
+    fprintf(stderr, "--rate <rate>            | override base samplerate (int)\n");
+    exit(1);
+}
+
+static void version() {
+    printf("wav2agb v1.1 (c) 2019 ipatix\n");
+    exit(0);
+}
+
+static void die(const char *msg, ...) {
+    va_list args;
+    va_start(args, msg);
+    vfprintf(stderr, msg, args);
+    va_end(args);
+    exit(1);
+}
+
+static void fix_str(std::string& str) {
+    // replaces all characters that are not alphanumerical
+    for (size_t i = 0; i < str.size(); i++) {
+        if (str[i] >= 'a' && str[i] <= 'z')
+            continue;
+        if (str[i] >= 'A' && str[i] <= 'Z')
+            continue;
+        if (str[i] >= '0' && str[i] <= '9' && i > 0)
+            continue;
+        str[i] = '_';
+    }
+}
+
+static char path_seperators[] = {
+    '/',
+#ifdef _WIN32
+    '\\',
+#endif
+    '\0'
+};
+
+static std::string filename_without_ext(const std::string& str) {
+    size_t last_path_seperator = 0;
+    char *sep = path_seperators;
+    while (*sep) {
+        size_t pos = str.find_last_of(*sep);
+        if (pos != std::string::npos)
+            last_path_seperator = std::max(pos, last_path_seperator);
+        sep += 1;
+    }
+    size_t file_ext_dot_pos = str.find_last_of('.');
+    if (file_ext_dot_pos == std::string::npos)
+        return std::string(str);
+    assert(file_ext_dot_pos != last_path_seperator);
+    if (file_ext_dot_pos > last_path_seperator)
+        return str.substr(0, file_ext_dot_pos);
+    return std::string(str);
+}
+
+static std::string filename_without_dir(const std::string& str) {
+    size_t last_path_seperator = 0;
+    bool path_seperator_found = false;
+    char *sep = path_seperators;
+    while (*sep) {
+        size_t pos = str.find_last_of(*sep);
+        if (pos != std::string::npos) {
+            last_path_seperator = std::max(pos, last_path_seperator);
+            path_seperator_found = true;
+        }
+        sep += 1;
+    }
+    if (str.size() > 0 && path_seperator_found) {
+        return str.substr(last_path_seperator + 1);
+    } else {
+        return std::string(str);
+    }
+}
+
+static cmp_type arg_compress = cmp_type::none;
+static out_type arg_output_type = out_type::assembly;
+static std::string arg_sym;
+static bool arg_input_file_read = false;
+static bool arg_output_file_read = false;
+static std::string arg_input_file;
+static std::string arg_output_file;
+
+int main(int argc, char *argv[]) {
+    try {
+        if (argc == 1)
+            usage();
+
+        for (int i = 1; i < argc; i++) {
+            std::string st(argv[i]);
+            if (st == "-s" || st == "--symbol") {
+                if (++i >= argc)
+                    die("-s: missing symbol name\n");
+                arg_sym = argv[i];
+                fix_str(arg_sym);
+            } else if (st == "-c" || st == "--compress") {
+                arg_compress = cmp_type::dpcm;
+            } else if (st == "-f" || st == "--compress-fast") {
+                arg_compress = cmp_type::dpcm;
+                enable_dpcm_lookahead_fast();
+            } else if (st == "--no-pad") {
+                disable_dpcm_padding();
+            } else if (st == "-b" || st == "--binary") {
+                arg_output_type = out_type::binary;
+            } else if (st == "--verbose") {
+                enable_dpcm_verbose();
+            } else if (st == "-l" || st == "--lookahead") {
+                if (++i >= argc)
+                    die("-l: missing parameter");
+                set_dpcm_lookahead(std::stoul(argv[i], nullptr, 10));
+            } else if (st == "--version") {
+                version();
+            } else if (st == "--loop-start") {
+                if (++i >= argc)
+                    die("--loop-start: missing parameter");
+                uint32_t start = static_cast<uint32_t>(std::stoul(argv[i], nullptr, 10));
+                set_wav_loop_start(start);
+            } else if (st == "--loop-end") {
+                if (++i >= argc)
+                    die("--loop-end: missing parameter");
+                uint32_t end = static_cast<uint32_t>(std::stoul(argv[i], nullptr, 10));
+                set_wav_loop_end(end);
+            } else if (st == "--tune") {
+                if (++i >= argc)
+                    die("--tune: missing parameter");
+                double tune = std::stod(argv[i], nullptr);
+                set_wav_tune(tune);
+            } else if (st == "--key") {
+                if (++i >= argc)
+                    die("--key: missing parameter");
+                int key = std::stoi(argv[i], nullptr, 10);
+                if (key < 0) key = 0;
+                if (key > 127) key = 127;
+                set_wav_key(static_cast<uint8_t>(key));
+            } else if (st == "--rate") {
+                if (++i >= argc)
+                    die("--rate: missing parameter");
+                uint32_t rate = static_cast<uint32_t>(std::stoul(argv[i], nullptr, 10));
+                set_wav_rate(rate);
+            } else {
+                if (st == "--") {
+                    if (++i >= argc)
+                        die("--: missing file name\n");
+                }
+                if (!arg_input_file_read) {
+                    arg_input_file = argv[i];
+                    if (arg_input_file.size() < 1)
+                        die("empty input file name\n");
+                    arg_input_file_read = true;
+                } else if (!arg_output_file_read) {
+                    arg_output_file = argv[i];
+                    if (arg_output_file.size() < 1)
+                        die("empty output file name\n");
+                    arg_output_file_read = true;
+                } else {
+                    die("Too many files specified\n");
+                }
+            }
+        }
+
+        // check arguments
+        if (!arg_input_file_read) {
+            die("No input file specified\n");
+        }
+
+        if (!arg_output_file_read) {
+            // create output file name if none is provided
+            if (arg_output_type == out_type::binary) {
+                arg_output_file = filename_without_ext(arg_input_file) + ".bin";
+            } else {
+                arg_output_file = filename_without_ext(arg_input_file) + ".s";
+            }
+            arg_output_file_read = true;
+        }
+
+        if (arg_sym.size() == 0) {
+            arg_sym = filename_without_dir(filename_without_ext(arg_output_file));
+            fix_str(arg_sym);
+        }
+
+        convert(arg_input_file, arg_output_file, arg_sym, arg_compress, arg_output_type);
+        return 0;
+    } catch (const std::exception& e) {
+        fprintf(stderr, "std lib error:\n%s\n", e.what());
+    }
+    return 1;
+}
diff --git a/tools/wav2agb/wav_file.cpp b/tools/wav2agb/wav_file.cpp
new file mode 100644
index 000000000..4b242c5c0
--- /dev/null
+++ b/tools/wav2agb/wav_file.cpp
@@ -0,0 +1,287 @@
+#include "wav_file.h"
+
+#include <stdexcept>
+#include <cerrno>
+#include <cstring>
+#include <algorithm>
+
+static uint32_t read_u32(std::ifstream& ifs)
+{
+    uint8_t lenBytes[4];
+    ifs.read(reinterpret_cast<char *>(lenBytes), sizeof(lenBytes));
+    uint32_t retval = lenBytes[0] | (lenBytes[1] << 8) | (lenBytes[2] << 16) | (lenBytes[3] << 24);
+    return retval;
+}
+
+//static uint16_t read_u16(std::ifstream& ifs)
+//{
+//    uint8_t lenBytes[2];
+//    ifs.read(reinterpret_cast<char *>(lenBytes), sizeof(lenBytes));
+//    uint16_t retval = uint16_t(lenBytes[0] | (lenBytes[1] << 8));
+//    return retval;
+//}
+
+static std::string read_str(std::ifstream& ifs, size_t len)
+{
+    std::vector<char> buf(len);
+    ifs.read(buf.data(), buf.size());
+    return std::string(buf.data(), buf.size());
+}
+
+static std::vector<uint8_t> read_arr(std::ifstream& ifs, size_t len)
+{
+    std::vector<uint8_t> buf(len);
+    ifs.read(reinterpret_cast<char *>(buf.data()), buf.size());
+    return buf;
+}
+
+static uint16_t arr_u16(const std::vector<uint8_t>& arr, size_t pos)
+{
+    uint16_t val = uint16_t(arr.at(pos) | (arr.at(pos + 1) << 8));
+    return val;
+}
+
+static uint32_t arr_u32(const std::vector<uint8_t>& arr, size_t pos)
+{
+    uint32_t val = uint32_t(arr.at(pos) | (arr.at(pos + 1) << 8) |
+            (arr.at(pos + 2) << 16) | (arr.at(pos + 3) << 24));
+    return val;
+}
+
+static const size_t loadChunkSize = 2048;
+
+uint32_t wav_file::fmt_size() const
+{
+    if (fmt == format_type::u8)
+        return 1;
+    else if (fmt == format_type::s16)
+        return 2;
+    else if (fmt == format_type::s24)
+        return 3;
+    else if (fmt == format_type::s32)
+        return 4;
+    else if (fmt == format_type::f32)
+        return 4;
+    else if (fmt == format_type::f64)
+        return 8;
+    else
+        throw std::runtime_error("INTERNAL ERROR: invalid format type");
+}
+
+wav_file::wav_file(const std::string& path) : loadBuffer(loadChunkSize)
+{
+    ifs.exceptions(std::ios::badbit | std::ios::eofbit);
+    ifs.open(path, std::ios::binary);
+    if (!ifs.good())
+        throw std::runtime_error("failed to open file: " + path + ", reason: " + strerror(errno));
+    if (!ifs.is_open())
+        throw std::runtime_error("failed to open file: " + path + ", reason: " + strerror(errno));
+
+    ifs.seekg(0, ifs.end);
+    std::streampos len = ifs.tellg();
+    ifs.seekg(0, ifs.beg);
+
+    std::string chunkId = read_str(ifs, 4);
+    if (chunkId != "RIFF")
+        throw std::runtime_error("RIFF ID invalid");
+    uint32_t mainChunkLen = read_u32(ifs);
+    if (mainChunkLen + 8 != len)
+        throw std::runtime_error("RIFF chunk len (=" +
+                std::to_string(mainChunkLen) +
+                ") doesn't match file len (=" +
+                std::to_string(len) +
+                ")");
+    std::string riffType = read_str(ifs, 4);
+    if (riffType != "WAVE")
+        throw std::runtime_error("WAVE ID invalid");
+
+    bool dataChunkFound = false;
+    bool fmtChunkFound = false;
+    // search all chunks
+    std::streampos curPos;
+    while ((curPos = ifs.tellg()) + std::streampos(8) <= len) {
+        chunkId = read_str(ifs, 4);
+        uint32_t chunkLen = read_u32(ifs);
+        if (curPos + std::streampos(8) + std::streampos(chunkLen) > len)
+            throw std::runtime_error("ERROR: chunk goes beyond end of file: offset=" + std::to_string(curPos));
+
+        if (chunkId == "fmt ") {
+            fmtChunkFound = true;
+            std::vector<uint8_t> fmtChunk = read_arr(ifs, chunkLen);
+            uint16_t fmtTag = arr_u16(fmtChunk, 0);
+            uint16_t numChannels = arr_u16(fmtChunk, 2);
+            if (numChannels != 1)
+                throw std::runtime_error("ERROR: input file is NOT mono");
+            this->sampleRate = arr_u32(fmtChunk, 4);
+            uint16_t block_align = arr_u16(fmtChunk, 12);
+            uint16_t bits_per_sample = arr_u16(fmtChunk, 14);
+            if (fmtTag == 1) {
+                // integer
+                if (block_align == 1 && bits_per_sample == 8)
+                    this->fmt = format_type::u8;
+                else if (block_align == 2 && bits_per_sample == 16)
+                    this->fmt = format_type::s16;
+                else if (block_align == 3 && bits_per_sample == 24)
+                    this->fmt = format_type::s24;
+                else if (block_align == 4 && bits_per_sample == 32)
+                    this->fmt = format_type::s32;
+                else
+                    throw std::runtime_error("ERROR: unsupported integer format combination");
+            } else if (fmtTag == 3) {
+                // float
+                if (block_align == 4 && bits_per_sample == 32)
+                    this->fmt = format_type::f32;
+                else if (block_align == 8 && bits_per_sample == 64)
+                    this->fmt = format_type::f64;
+                else
+                    throw std::runtime_error("ERROR: unsupported float format combination");
+            } else {
+                throw std::runtime_error("ERROR: unsupported format code: " + std::to_string(fmtTag));
+            }
+        } else if (chunkId == "data") {
+            dataChunkFound = true;
+            dataChunkPos = ifs.tellg();
+            dataChunkEndPos = dataChunkPos + std::streampos(chunkLen);
+            ifs.seekg(chunkLen, ifs.cur);
+        } else if (chunkId == "smpl") {
+            std::vector<uint8_t> smplChunk = read_arr(ifs, chunkLen);
+            uint32_t midiUnityNote = arr_u32(smplChunk, 12);
+            this->midiKey = static_cast<uint8_t>(std::min(midiUnityNote, 127u));
+            uint32_t midiPitchFraction = arr_u32(smplChunk, 16);
+            // the values below convert the uint32_t range to 0.0 to 100.0 range
+            this->tuning = static_cast<double>(midiPitchFraction) / (4294967296.0 * 100.0);
+            uint32_t numLoops = arr_u32(smplChunk, 28);
+            if (numLoops > 1)
+                throw std::runtime_error("ERROR: too many loops in smpl chunk");
+            if (numLoops == 1) {
+                uint32_t loopType = arr_u32(smplChunk, 36 + 4);
+                if (loopType != 0)
+                    throw std::runtime_error("ERROR: loop type not supported: " + std::to_string(loopType));
+                this->loopStart = arr_u32(smplChunk, 36 + 8);
+                // sampler chunks tell the last sample to be played (so including rather than excluding), thus +1
+                this->loopEnd = arr_u32(smplChunk, 36 + 12) + 1;
+                this->loopEnabled = true;
+            }
+        } else if (chunkId == "agbp") {
+            // Custom chunk: exact GBA pitch value (sample_rate * 1024)
+            // This allows perfect round-trip conversion without period-based precision loss
+            std::vector<uint8_t> agbpChunk = read_arr(ifs, chunkLen);
+            if (chunkLen >= 4) {
+                this->agbPitch = arr_u32(agbpChunk, 0);
+            }
+        } else {
+            //fprintf(stderr, "WARNING: ignoring unknown chunk type: <%s>\n", chunkId.c_str());
+            ifs.seekg(chunkLen, ifs.cur);
+        }
+
+        /* https://en.wikipedia.org/wiki/Resource_Interchange_File_Format#Explanation
+         * If chunk size is odd, skip the pad byte */
+        if ((chunkLen % 2) == 1)
+            ifs.seekg(1, ifs.cur);
+    }
+
+    if (!fmtChunkFound)
+        throw std::runtime_error("ERROR: fmt chunk not found");
+    if (!dataChunkFound)
+        throw std::runtime_error("ERROR: data chunk not found");
+
+    uint32_t numSamples = static_cast<uint32_t>(dataChunkEndPos - dataChunkPos) / fmt_size();
+    this->loopEnd = std::min(this->loopEnd, numSamples);
+}
+
+wav_file::~wav_file()
+{
+    ifs.close();
+}
+
+void wav_file::readData(size_t location, double *data, size_t len)
+{
+    while (len-- > 0) {
+        if (loadedChunk != location - (location % loadChunkSize)) {
+            loadedChunk = location - (location % loadChunkSize);
+
+            std::streampos blockpos = this->dataChunkPos + std::streampos(loadedChunk * fmt_size());
+            std::streampos endblockpos = this->dataChunkEndPos;
+            size_t actualChunkSize = std::min(loadChunkSize, static_cast<size_t>(endblockpos - blockpos) / fmt_size());
+
+            if (actualChunkSize == 0) {
+                std::fill(loadBuffer.begin(), loadBuffer.end(), 0.0);
+                goto load_sample;
+            }
+
+            ifs.seekg(blockpos, ifs.beg);
+            std::vector<uint8_t> ld(actualChunkSize * fmt_size());
+            ifs.read(reinterpret_cast<char *>(ld.data()), ld.size());
+
+            if (fmt == format_type::u8) {
+                for (size_t i = 0; i < actualChunkSize; i++) {
+                    loadBuffer[i] = (double(ld[i]) - 128.0) / 128.0;
+                }
+            } else if (fmt == format_type::s16) {
+                for (size_t i = 0; i < actualChunkSize; i++) {
+                    int32_t s =
+                        (ld[i * fmt_size() + 0] << 0) |
+                        (ld[i * fmt_size() + 1] << 8);
+                    s <<= 16;
+                    s >>= 16;
+                    loadBuffer[i] = double(s) / 32768.0;
+                }
+            } else if (fmt == format_type::s24) {
+                for (size_t i = 0; i < actualChunkSize; i++) {
+                    int32_t s =
+                        (ld[i * fmt_size() + 0] << 0) |
+                        (ld[i * fmt_size() + 1] << 8) |
+                        (ld[i * fmt_size() + 2] << 16);
+                    s <<= 8;
+                    s >>= 8;
+                    loadBuffer[i] = double(s) / 8388608.0;
+                }
+            } else if (fmt == format_type::s32) {
+                for (size_t i = 0; i < actualChunkSize; i++) {
+                    int32_t s =
+                        (ld[i * fmt_size() + 0] << 0) |
+                        (ld[i * fmt_size() + 1] << 8) |
+                        (ld[i * fmt_size() + 2] << 16) |
+                        (ld[i * fmt_size() + 3] << 24);
+                    loadBuffer[i] = double(s) / 2147483648.0;
+                }
+            } else if (fmt == format_type::f32) {
+                for (size_t i = 0; i < actualChunkSize; i++) {
+                    union {
+                        uint32_t s;
+                        float f;
+                    } u;
+                    u.s = 
+                        (ld[i * fmt_size() + 0] << 0) |
+                        (ld[i * fmt_size() + 1] << 8) |
+                        (ld[i * fmt_size() + 2] << 16) |
+                        (ld[i * fmt_size() + 3] << 24);
+                    loadBuffer[i] = u.f;
+                }
+            } else if (fmt == format_type::f64) {
+                for (size_t i = 0; i < actualChunkSize; i++) {
+                    union {
+                        uint64_t s;
+                        double d;
+                    } u;
+                    u.s = 
+                        (uint64_t(ld[i * fmt_size() + 0]) << 0) |
+                        (uint64_t(ld[i * fmt_size() + 1]) << 8) |
+                        (uint64_t(ld[i * fmt_size() + 2]) << 16) |
+                        (uint64_t(ld[i * fmt_size() + 3]) << 24) |
+                        (uint64_t(ld[i * fmt_size() + 4]) << 32) |
+                        (uint64_t(ld[i * fmt_size() + 5]) << 40) |
+                        (uint64_t(ld[i * fmt_size() + 6]) << 48) |
+                        (uint64_t(ld[i * fmt_size() + 7]) << 56);
+                    loadBuffer[i] = u.d;
+                }
+            }
+            for (size_t i = actualChunkSize; i < loadChunkSize; i++) {
+                loadBuffer[i] = 0.0;
+            }
+        }
+load_sample:
+        *data++ = loadBuffer[location % loadChunkSize];
+        location++;
+    }
+}
diff --git a/tools/wav2agb/wav_file.h b/tools/wav2agb/wav_file.h
new file mode 100644
index 000000000..b88da4eeb
--- /dev/null
+++ b/tools/wav2agb/wav_file.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <string>
+#include <fstream>
+#include <vector>
+#include <limits>
+#include <cstdint>
+
+#define WAV_INVALID_VAL 0xFFFFFFFFu
+
+class wav_file {
+public:
+    wav_file(const std::string& path);
+    ~wav_file();
+
+    void readData(size_t location, double *data, size_t len);
+private:
+    std::ifstream ifs;
+    std::streampos dataChunkPos;
+    std::streampos dataChunkEndPos;
+    size_t loadedChunk = WAV_INVALID_VAL;
+
+    std::vector<double> loadBuffer;
+    size_t loadBufferBlock = std::numeric_limits<size_t>::max();
+    enum class format_type {
+        u8, s16, s24, s32,
+        f32, f64,
+    } fmt;
+    uint32_t fmt_size() const;
+public:
+    uint32_t loopStart = 0; // samples
+    uint32_t loopEnd = std::numeric_limits<uint32_t>::max();   // samples
+    bool loopEnabled = false;
+    double tuning = 0.0;    // cents
+    uint8_t midiKey = 60;
+    uint32_t sampleRate;
+    uint32_t agbPitch = 0; // optional: exact GBA pitch value from 'agbp' chunk (0 = not present)
+};