diff --git a/Makefile b/Makefile
index ccfe64dcf4..8160f6e1e1 100644
--- a/Makefile
+++ b/Makefile
@@ -206,7 +206,7 @@ include make_tools.mk
 SMOLTM       := $(TOOLS_DIR)/compresSmol/compresSmolTilemap$(EXE)
 SMOL         := $(TOOLS_DIR)/compresSmol/compresSmol$(EXE)
 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)
@@ -421,7 +421,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 3fce08ed3a..70d4466409 100644
--- a/audio_rules.mk
+++ b/audio_rules.mk
@@ -20,16 +20,17 @@ $(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 cries
 $(CRY_BIN_DIR)/uncomp_%.bin: $(CRY_SUBDIR)/uncomp_%.aif 
 	$(AIF) $< $@
 
 # 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 8251768401..f0eb2d2962 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 trainerproc compresSmol
+TOOL_NAMES := bin2c gbafix gbagfx jsonproc mapjson mid2agb preproc ramscrgen rsfont scaninc trainerproc compresSmol wav2agb
 CHECK_TOOL_NAMES = patchelf mgba-rom-test-hydra
 
 TOOLDIRS := $(TOOL_NAMES:%=$(TOOLS_DIR)/%)
diff --git a/migration_scripts/1.14/bin_to_wav.py b/migration_scripts/1.14/bin_to_wav.py
new file mode 100644
index 0000000000..499c7666e2
--- /dev/null
+++ b/migration_scripts/1.14/bin_to_wav.py
@@ -0,0 +1,301 @@
+#!/usr/bin/env python3
+
+"""
+Converts .bin audio files (GBA format) to .wav files.
+Reads the binary format created by aif2pcm and generates WAV files
+that will produce identical binaries when processed by wav2agb -b.
+"""
+
+import struct
+import sys
+import os
+from typing import Optional
+
+# Delta encoding table used for compression/decompression
+# Matches the table in tools/aif2pcm/main.c
+DELTA_ENCODING_TABLE = [
+    0, 1, 4, 9, 16, 25, 36, 49,
+    -64, -49, -36, -25, -16, -9, -4, -1,
+]
+
+
+def delta_decompress(compressed_data: bytes, expected_length: int) -> bytes:
+    """
+    Decompress delta-encoded audio data.
+
+    Delta compression format (from tools/aif2pcm/main.c):
+    - Data is organized in blocks of up to 64 samples each
+    - Each block starts with a base sample value (1 byte)
+    - Followed by a delta index (4 bits) for the second sample
+    - Then 31 pairs of delta indices (4 bits each, packed into bytes)
+    - Delta indices reference DELTA_ENCODING_TABLE to get the actual delta value
+
+    Args:
+        compressed_data: The compressed audio data
+        expected_length: Expected length of decompressed data
+
+    Returns:
+        Decompressed audio data as bytes
+    """
+    pcm = bytearray(expected_length + 0x40)  # Extra buffer space
+
+    i = 0  # Input position
+    j = 0  # Output position
+
+    while i < len(compressed_data) and j < expected_length:
+        # Read base sample for this block
+        base = compressed_data[i]
+        # Convert to signed int8 for calculations
+        base_signed = base if base < 128 else base - 256
+        pcm[j] = base
+        i += 1
+        j += 1
+
+        if i >= len(compressed_data) or j >= expected_length:
+            break
+
+        # Read second sample using low nibble delta
+        lo = compressed_data[i] & 0xf
+        base_signed += DELTA_ENCODING_TABLE[lo]
+        pcm[j] = base_signed & 0xff
+        i += 1
+        j += 1
+
+        if i >= len(compressed_data) or j >= expected_length:
+            break
+
+        # Process up to 31 pairs of samples (62 samples total)
+        for k in range(31):
+            # High nibble
+            hi = (compressed_data[i] >> 4) & 0xf
+            base_signed += DELTA_ENCODING_TABLE[hi]
+            pcm[j] = base_signed & 0xff
+            j += 1
+
+            if j >= expected_length:
+                break
+
+            # Low nibble
+            lo = compressed_data[i] & 0xf
+            base_signed += DELTA_ENCODING_TABLE[lo]
+            pcm[j] = base_signed & 0xff
+            j += 1
+            i += 1
+
+            if i >= len(compressed_data):
+                break
+            if j >= expected_length:
+                break
+
+        if j >= expected_length:
+            break
+
+    return bytes(pcm[:j])
+
+
+def read_bin(bin_path: str) -> tuple:
+    """
+    Read a GBA audio .bin file and extract all data.
+
+    Binary format (little-endian):
+    - Bytes 0-3: flags (bit 0 = compression, bit 30 = loop enabled)
+    - Bytes 4-7: pitch value = sample_rate * 1024
+    - Bytes 8-11: loop start position
+    - Bytes 12-15: loop end position (stored as actual_end - 1)
+    - Remaining bytes: audio samples (8-bit signed)
+    """
+    with open(bin_path, 'rb') as f:
+        bin_data = f.read()
+
+    if len(bin_data) < 16:
+        raise ValueError(f"File too small: {len(bin_data)} bytes")
+
+    # Read header
+    flags = struct.unpack('<I', bin_data[0:4])[0]
+    pitch_value = struct.unpack('<I', bin_data[4:8])[0]
+    loop_start = struct.unpack('<I', bin_data[8:12])[0]
+    loop_end_stored = struct.unpack('<I', bin_data[12:16])[0]
+
+    # Extract flags
+    is_compressed = (flags & 0x01) != 0
+    is_looped = (flags & 0x40000000) != 0
+
+    # Calculate sample rate from pitch value
+    sample_rate = pitch_value / 1024.0
+
+    # Loop end is stored as (actual_end - 1) in binary format
+    # For the expected number of samples, we add 1
+    expected_num_samples = loop_end_stored + 1
+
+    # Read sample data (8-bit signed)
+    compressed_data = bin_data[16:]
+
+    if is_compressed:
+        # Decompress the data
+        # Note: delta_decompress may return fewer samples than expected if
+        # the compressed data is shorter (this matches aif2pcm behavior)
+        samples = delta_decompress(compressed_data, expected_num_samples)
+
+        # Pad samples to expected length if needed (matching aif2pcm behavior)
+        # This can happen when the compressed data is slightly short
+        if len(samples) < expected_num_samples:
+            # Pad with the last sample value
+            last_sample = samples[-1] if len(samples) > 0 else 0
+            padding = bytes([last_sample] * (expected_num_samples - len(samples)))
+            samples = samples + padding
+    else:
+        # For uncompressed data, only read expected_num_samples
+        # (ignore any trailing alignment padding in the .bin file)
+        samples = compressed_data[:expected_num_samples]
+
+    # For loop_end, use the expected number from the header
+    # This matches aif2pcm's behavior where the COMM chunk has the expected count
+    # even if the actual SSND data is shorter
+    loop_end = expected_num_samples if is_looped else 0
+
+    return sample_rate, is_looped, loop_start, loop_end, samples
+
+
+def write_wav(wav_path: str, sample_rate: float, is_looped: bool,
+              loop_start: int, loop_end: int, samples: bytes):
+    """
+    Write a .wav file with smpl chunk.
+    """
+    # WAV uses unsigned 8-bit, GBA bin uses signed 8-bit
+    # Convert signed (-128 to +127) to unsigned (0 to 255)
+    samples_unsigned = bytes((b + 128) & 0xFF for b in samples)
+
+    # For WAV fmt chunk, use integer sample rate
+    sample_rate_int = int(sample_rate)
+    num_channels = 1
+    bytes_per_sample = 1
+    bits_per_sample = 8
+    byte_rate = sample_rate_int * num_channels * bytes_per_sample
+    block_align = num_channels * bytes_per_sample
+
+    # Build fmt chunk
+    fmt_chunk = struct.pack('<HHIIHH',
+        1,                  # Audio format (1 = PCM)
+        num_channels,       # Number of channels
+        sample_rate_int,    # Sample rate (integer)
+        byte_rate,          # Byte rate
+        block_align,        # Block align
+        bits_per_sample     # Bits per sample
+    )
+
+    # Build smpl chunk
+    sample_period = int(1000000000.0 / sample_rate)
+
+    # MIDI note: default to 60 (C4) since we don't have this info in the bin
+    midi_note = 60
+
+    smpl_chunk = struct.pack('<IIIIIIII',
+        0,                      # Manufacturer
+        0,                      # Product
+        sample_period,          # Sample period (nanoseconds)
+        midi_note,              # MIDI unity note
+        0,                      # MIDI pitch fraction
+        0,                      # SMPTE format
+        0,                      # SMPTE offset
+        1 if is_looped else 0   # Num sample loops
+    )
+    smpl_chunk += struct.pack('<I', 0)  # Sampler data
+
+    # Add loop structure if loop exists
+    if is_looped:
+        # Loop end in binary is stored as (end - 1), so we already added 1 above
+        loop_end_inclusive = loop_end - 1
+        smpl_chunk += struct.pack('<IIIIII',
+            0,                      # Cue point ID
+            0,                      # Type (0 = forward loop)
+            loop_start,             # Start
+            loop_end_inclusive,     # End (inclusive)
+            0,                      # Fraction
+            0                       # Play count (0 = infinite)
+        )
+
+    # Build custom 'agbp' (AGB Pitch) chunk to store exact pitch value
+    # This avoids precision loss from period-based round-trip
+    # pitch_value = sample_rate * 1024 (GBA format)
+    pitch_value_int = int(sample_rate * 1024.0)
+    agbp_chunk = struct.pack('<I', pitch_value_int)
+
+    # Calculate sizes
+    data_chunk_size = len(samples_unsigned)
+    fmt_chunk_size = len(fmt_chunk)
+    smpl_chunk_size = len(smpl_chunk)
+    agbp_chunk_size = len(agbp_chunk)
+
+    # RIFF chunk size
+    riff_size = 4 + 8 + fmt_chunk_size + 8 + smpl_chunk_size + 8 + agbp_chunk_size + 8 + data_chunk_size
+
+    # Write WAV file
+    with open(wav_path, 'wb') as f:
+        # RIFF header
+        f.write(b'RIFF')
+        f.write(struct.pack('<I', riff_size))
+        f.write(b'WAVE')
+
+        # fmt chunk
+        f.write(b'fmt ')
+        f.write(struct.pack('<I', fmt_chunk_size))
+        f.write(fmt_chunk)
+
+        # smpl chunk
+        f.write(b'smpl')
+        f.write(struct.pack('<I', smpl_chunk_size))
+        f.write(smpl_chunk)
+
+        # agbp chunk (custom chunk for exact GBA pitch value)
+        f.write(b'agbp')
+        f.write(struct.pack('<I', agbp_chunk_size))
+        f.write(agbp_chunk)
+
+        # data chunk
+        f.write(b'data')
+        f.write(struct.pack('<I', data_chunk_size))
+        f.write(samples_unsigned)
+
+
+def convert_bin_to_wav(bin_path: str, wav_path: Optional[str] = None):
+    """Convert a single .bin file to .wav format"""
+    if wav_path is None:
+        wav_path = os.path.splitext(bin_path)[0] + '.wav'
+
+    print(f"Converting {bin_path} -> {wav_path}")
+
+    sample_rate, is_looped, loop_start, loop_end, samples = read_bin(bin_path)
+
+    print(f"  Sample rate: {sample_rate} Hz")
+    print(f"  Num samples: {len(samples)}")
+    if is_looped:
+        print(f"  Loop: {loop_start} -> {loop_end}")
+    else:
+        print(f"  Loop: None")
+
+    write_wav(wav_path, sample_rate, is_looped, loop_start, loop_end, samples)
+    print(f"  Done!")
+
+
+def main():
+    if len(sys.argv) < 2:
+        print("Usage: bin_to_wav.py <input.bin> [output.wav]")
+        print("   or: bin_to_wav.py <directory>  (converts all .bin files in directory)")
+        sys.exit(1)
+
+    input_path = sys.argv[1]
+
+    if os.path.isdir(input_path):
+        # Convert all .bin files in directory
+        for filename in sorted(os.listdir(input_path)):
+            if filename.lower().endswith('.bin'):
+                bin_path = os.path.join(input_path, filename)
+                convert_bin_to_wav(bin_path)
+    else:
+        # Convert single file
+        output_path = sys.argv[2] if len(sys.argv) > 2 else None
+        convert_bin_to_wav(input_path, output_path)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/sound/direct_sound_samples/bicycle_bell.aif b/sound/direct_sound_samples/bicycle_bell.aif
deleted file mode 100644
index 578a81c2f1..0000000000
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 0000000000..92f9634069
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 e8784682e4..0000000000
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 0000000000..7e38d3a3f7
Binary files /dev/null and b/sound/direct_sound_samples/classical_choir_voice_ahhs.wav differ
diff --git a/sound/direct_sound_samples/cries/abomasnow.aif b/sound/direct_sound_samples/cries/abomasnow.aif
deleted file mode 100644
index 83ef6b33ac..0000000000
Binary files a/sound/direct_sound_samples/cries/abomasnow.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/abomasnow.wav b/sound/direct_sound_samples/cries/abomasnow.wav
new file mode 100644
index 0000000000..a403166d2c
Binary files /dev/null and b/sound/direct_sound_samples/cries/abomasnow.wav differ
diff --git a/sound/direct_sound_samples/cries/abomasnow_mega.aif b/sound/direct_sound_samples/cries/abomasnow_mega.aif
deleted file mode 100644
index 1b6b0684cf..0000000000
Binary files a/sound/direct_sound_samples/cries/abomasnow_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/abomasnow_mega.wav b/sound/direct_sound_samples/cries/abomasnow_mega.wav
new file mode 100644
index 0000000000..6d825e5301
Binary files /dev/null and b/sound/direct_sound_samples/cries/abomasnow_mega.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 5c96619143..0000000000
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 0000000000..14aba2d7a5
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 81e81350d5..0000000000
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 0000000000..4a90ec5c01
Binary files /dev/null and b/sound/direct_sound_samples/cries/absol.wav differ
diff --git a/sound/direct_sound_samples/cries/absol_mega.aif b/sound/direct_sound_samples/cries/absol_mega.aif
deleted file mode 100644
index 415b6132f6..0000000000
Binary files a/sound/direct_sound_samples/cries/absol_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/absol_mega.wav b/sound/direct_sound_samples/cries/absol_mega.wav
new file mode 100644
index 0000000000..59ce8447a1
Binary files /dev/null and b/sound/direct_sound_samples/cries/absol_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/accelgor.aif b/sound/direct_sound_samples/cries/accelgor.aif
deleted file mode 100644
index 209c309c1e..0000000000
Binary files a/sound/direct_sound_samples/cries/accelgor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/accelgor.wav b/sound/direct_sound_samples/cries/accelgor.wav
new file mode 100644
index 0000000000..09d3b0bc77
Binary files /dev/null and b/sound/direct_sound_samples/cries/accelgor.wav differ
diff --git a/sound/direct_sound_samples/cries/aegislash.aif b/sound/direct_sound_samples/cries/aegislash.aif
deleted file mode 100644
index d2c48b5d62..0000000000
Binary files a/sound/direct_sound_samples/cries/aegislash.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/aegislash.wav b/sound/direct_sound_samples/cries/aegislash.wav
new file mode 100644
index 0000000000..33a1671947
Binary files /dev/null and b/sound/direct_sound_samples/cries/aegislash.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 d4bf14946d..0000000000
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 0000000000..95518884b9
Binary files /dev/null and b/sound/direct_sound_samples/cries/aerodactyl.wav differ
diff --git a/sound/direct_sound_samples/cries/aerodactyl_mega.aif b/sound/direct_sound_samples/cries/aerodactyl_mega.aif
deleted file mode 100644
index d323b09c59..0000000000
Binary files a/sound/direct_sound_samples/cries/aerodactyl_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/aerodactyl_mega.wav b/sound/direct_sound_samples/cries/aerodactyl_mega.wav
new file mode 100644
index 0000000000..2c6d876529
Binary files /dev/null and b/sound/direct_sound_samples/cries/aerodactyl_mega.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 a87adf8f84..0000000000
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 0000000000..bc75b2dbdd
Binary files /dev/null and b/sound/direct_sound_samples/cries/aggron.wav differ
diff --git a/sound/direct_sound_samples/cries/aggron_mega.aif b/sound/direct_sound_samples/cries/aggron_mega.aif
deleted file mode 100644
index 6772bdd5ee..0000000000
Binary files a/sound/direct_sound_samples/cries/aggron_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/aggron_mega.wav b/sound/direct_sound_samples/cries/aggron_mega.wav
new file mode 100644
index 0000000000..b679811f29
Binary files /dev/null and b/sound/direct_sound_samples/cries/aggron_mega.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 e40107f787..0000000000
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 0000000000..4d7bc829cd
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 d6b0126112..0000000000
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 0000000000..f397363d15
Binary files /dev/null and b/sound/direct_sound_samples/cries/alakazam.wav differ
diff --git a/sound/direct_sound_samples/cries/alakazam_mega.aif b/sound/direct_sound_samples/cries/alakazam_mega.aif
deleted file mode 100644
index be09f22777..0000000000
Binary files a/sound/direct_sound_samples/cries/alakazam_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/alakazam_mega.wav b/sound/direct_sound_samples/cries/alakazam_mega.wav
new file mode 100644
index 0000000000..1b33bbe646
Binary files /dev/null and b/sound/direct_sound_samples/cries/alakazam_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/alcremie.aif b/sound/direct_sound_samples/cries/alcremie.aif
deleted file mode 100644
index 4819688a6d..0000000000
Binary files a/sound/direct_sound_samples/cries/alcremie.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/alcremie.wav b/sound/direct_sound_samples/cries/alcremie.wav
new file mode 100644
index 0000000000..64870763a7
Binary files /dev/null and b/sound/direct_sound_samples/cries/alcremie.wav differ
diff --git a/sound/direct_sound_samples/cries/alomomola.aif b/sound/direct_sound_samples/cries/alomomola.aif
deleted file mode 100644
index 2e47a4083a..0000000000
Binary files a/sound/direct_sound_samples/cries/alomomola.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/alomomola.wav b/sound/direct_sound_samples/cries/alomomola.wav
new file mode 100644
index 0000000000..8b06465e2e
Binary files /dev/null and b/sound/direct_sound_samples/cries/alomomola.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 0aa89c8fcb..0000000000
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 0000000000..ca35cbf519
Binary files /dev/null and b/sound/direct_sound_samples/cries/altaria.wav differ
diff --git a/sound/direct_sound_samples/cries/altaria_mega.aif b/sound/direct_sound_samples/cries/altaria_mega.aif
deleted file mode 100644
index bf2a7daec2..0000000000
Binary files a/sound/direct_sound_samples/cries/altaria_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/altaria_mega.wav b/sound/direct_sound_samples/cries/altaria_mega.wav
new file mode 100644
index 0000000000..1ddbcc6aff
Binary files /dev/null and b/sound/direct_sound_samples/cries/altaria_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/amaura.aif b/sound/direct_sound_samples/cries/amaura.aif
deleted file mode 100644
index 813fcaddde..0000000000
Binary files a/sound/direct_sound_samples/cries/amaura.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/amaura.wav b/sound/direct_sound_samples/cries/amaura.wav
new file mode 100644
index 0000000000..cdd5ce160a
Binary files /dev/null and b/sound/direct_sound_samples/cries/amaura.wav differ
diff --git a/sound/direct_sound_samples/cries/ambipom.aif b/sound/direct_sound_samples/cries/ambipom.aif
deleted file mode 100644
index a767329e07..0000000000
Binary files a/sound/direct_sound_samples/cries/ambipom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ambipom.wav b/sound/direct_sound_samples/cries/ambipom.wav
new file mode 100644
index 0000000000..fc63ee7011
Binary files /dev/null and b/sound/direct_sound_samples/cries/ambipom.wav differ
diff --git a/sound/direct_sound_samples/cries/amoonguss.aif b/sound/direct_sound_samples/cries/amoonguss.aif
deleted file mode 100644
index d476e670bd..0000000000
Binary files a/sound/direct_sound_samples/cries/amoonguss.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/amoonguss.wav b/sound/direct_sound_samples/cries/amoonguss.wav
new file mode 100644
index 0000000000..e472803369
Binary files /dev/null and b/sound/direct_sound_samples/cries/amoonguss.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 7eed0aa9f6..0000000000
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 0000000000..346b2aa48b
Binary files /dev/null and b/sound/direct_sound_samples/cries/ampharos.wav differ
diff --git a/sound/direct_sound_samples/cries/ampharos_mega.aif b/sound/direct_sound_samples/cries/ampharos_mega.aif
deleted file mode 100644
index e24e628667..0000000000
Binary files a/sound/direct_sound_samples/cries/ampharos_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ampharos_mega.wav b/sound/direct_sound_samples/cries/ampharos_mega.wav
new file mode 100644
index 0000000000..284a01fba2
Binary files /dev/null and b/sound/direct_sound_samples/cries/ampharos_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/annihilape.aif b/sound/direct_sound_samples/cries/annihilape.aif
deleted file mode 100644
index 889c521929..0000000000
Binary files a/sound/direct_sound_samples/cries/annihilape.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/annihilape.wav b/sound/direct_sound_samples/cries/annihilape.wav
new file mode 100644
index 0000000000..c0232220b9
Binary files /dev/null and b/sound/direct_sound_samples/cries/annihilape.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 ac6c774e5d..0000000000
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 0000000000..349ffacf04
Binary files /dev/null and b/sound/direct_sound_samples/cries/anorith.wav differ
diff --git a/sound/direct_sound_samples/cries/appletun.aif b/sound/direct_sound_samples/cries/appletun.aif
deleted file mode 100644
index 46b6ab4fcc..0000000000
Binary files a/sound/direct_sound_samples/cries/appletun.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/appletun.wav b/sound/direct_sound_samples/cries/appletun.wav
new file mode 100644
index 0000000000..4cf9d895b2
Binary files /dev/null and b/sound/direct_sound_samples/cries/appletun.wav differ
diff --git a/sound/direct_sound_samples/cries/applin.aif b/sound/direct_sound_samples/cries/applin.aif
deleted file mode 100644
index 9e9a1de275..0000000000
Binary files a/sound/direct_sound_samples/cries/applin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/applin.wav b/sound/direct_sound_samples/cries/applin.wav
new file mode 100644
index 0000000000..55de4865de
Binary files /dev/null and b/sound/direct_sound_samples/cries/applin.wav differ
diff --git a/sound/direct_sound_samples/cries/araquanid.aif b/sound/direct_sound_samples/cries/araquanid.aif
deleted file mode 100644
index 86aac62b80..0000000000
Binary files a/sound/direct_sound_samples/cries/araquanid.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/araquanid.wav b/sound/direct_sound_samples/cries/araquanid.wav
new file mode 100644
index 0000000000..9c92577b4b
Binary files /dev/null and b/sound/direct_sound_samples/cries/araquanid.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 0be4b7e624..0000000000
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 0000000000..cebc9e3e56
Binary files /dev/null and b/sound/direct_sound_samples/cries/arbok.wav differ
diff --git a/sound/direct_sound_samples/cries/arboliva.aif b/sound/direct_sound_samples/cries/arboliva.aif
deleted file mode 100644
index 641491ff0e..0000000000
Binary files a/sound/direct_sound_samples/cries/arboliva.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/arboliva.wav b/sound/direct_sound_samples/cries/arboliva.wav
new file mode 100644
index 0000000000..c4ddb922d8
Binary files /dev/null and b/sound/direct_sound_samples/cries/arboliva.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 cdc942c49a..0000000000
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 0000000000..f6e3e36801
Binary files /dev/null and b/sound/direct_sound_samples/cries/arcanine.wav differ
diff --git a/sound/direct_sound_samples/cries/arceus.aif b/sound/direct_sound_samples/cries/arceus.aif
deleted file mode 100644
index 8496de2a17..0000000000
Binary files a/sound/direct_sound_samples/cries/arceus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/arceus.wav b/sound/direct_sound_samples/cries/arceus.wav
new file mode 100644
index 0000000000..5a33b4168b
Binary files /dev/null and b/sound/direct_sound_samples/cries/arceus.wav differ
diff --git a/sound/direct_sound_samples/cries/archaludon.aif b/sound/direct_sound_samples/cries/archaludon.aif
deleted file mode 100644
index 470afe8348..0000000000
Binary files a/sound/direct_sound_samples/cries/archaludon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/archaludon.wav b/sound/direct_sound_samples/cries/archaludon.wav
new file mode 100644
index 0000000000..7195a6aa00
Binary files /dev/null and b/sound/direct_sound_samples/cries/archaludon.wav differ
diff --git a/sound/direct_sound_samples/cries/archen.aif b/sound/direct_sound_samples/cries/archen.aif
deleted file mode 100644
index b1b2be3ead..0000000000
Binary files a/sound/direct_sound_samples/cries/archen.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/archen.wav b/sound/direct_sound_samples/cries/archen.wav
new file mode 100644
index 0000000000..05817f6633
Binary files /dev/null and b/sound/direct_sound_samples/cries/archen.wav differ
diff --git a/sound/direct_sound_samples/cries/archeops.aif b/sound/direct_sound_samples/cries/archeops.aif
deleted file mode 100644
index 6555f0ce3a..0000000000
Binary files a/sound/direct_sound_samples/cries/archeops.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/archeops.wav b/sound/direct_sound_samples/cries/archeops.wav
new file mode 100644
index 0000000000..e79d66625c
Binary files /dev/null and b/sound/direct_sound_samples/cries/archeops.wav differ
diff --git a/sound/direct_sound_samples/cries/arctibax.aif b/sound/direct_sound_samples/cries/arctibax.aif
deleted file mode 100644
index a18bc78081..0000000000
Binary files a/sound/direct_sound_samples/cries/arctibax.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/arctibax.wav b/sound/direct_sound_samples/cries/arctibax.wav
new file mode 100644
index 0000000000..75bce7bca5
Binary files /dev/null and b/sound/direct_sound_samples/cries/arctibax.wav differ
diff --git a/sound/direct_sound_samples/cries/arctovish.aif b/sound/direct_sound_samples/cries/arctovish.aif
deleted file mode 100644
index 281c88f8d3..0000000000
Binary files a/sound/direct_sound_samples/cries/arctovish.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/arctovish.wav b/sound/direct_sound_samples/cries/arctovish.wav
new file mode 100644
index 0000000000..6888758c3f
Binary files /dev/null and b/sound/direct_sound_samples/cries/arctovish.wav differ
diff --git a/sound/direct_sound_samples/cries/arctozolt.aif b/sound/direct_sound_samples/cries/arctozolt.aif
deleted file mode 100644
index 3d0bb58264..0000000000
Binary files a/sound/direct_sound_samples/cries/arctozolt.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/arctozolt.wav b/sound/direct_sound_samples/cries/arctozolt.wav
new file mode 100644
index 0000000000..fafc0a59fb
Binary files /dev/null and b/sound/direct_sound_samples/cries/arctozolt.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 343879d70a..0000000000
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 0000000000..f059bcfc93
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 23add2fec8..0000000000
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 0000000000..de11795664
Binary files /dev/null and b/sound/direct_sound_samples/cries/armaldo.wav differ
diff --git a/sound/direct_sound_samples/cries/armarouge.aif b/sound/direct_sound_samples/cries/armarouge.aif
deleted file mode 100644
index 578c73392b..0000000000
Binary files a/sound/direct_sound_samples/cries/armarouge.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/armarouge.wav b/sound/direct_sound_samples/cries/armarouge.wav
new file mode 100644
index 0000000000..bd891fe536
Binary files /dev/null and b/sound/direct_sound_samples/cries/armarouge.wav differ
diff --git a/sound/direct_sound_samples/cries/aromatisse.aif b/sound/direct_sound_samples/cries/aromatisse.aif
deleted file mode 100644
index 4880d14946..0000000000
Binary files a/sound/direct_sound_samples/cries/aromatisse.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/aromatisse.wav b/sound/direct_sound_samples/cries/aromatisse.wav
new file mode 100644
index 0000000000..bcfb43e6dc
Binary files /dev/null and b/sound/direct_sound_samples/cries/aromatisse.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 d246b4c22b..0000000000
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 0000000000..35c69f8dc4
Binary files /dev/null and b/sound/direct_sound_samples/cries/aron.wav differ
diff --git a/sound/direct_sound_samples/cries/arrokuda.aif b/sound/direct_sound_samples/cries/arrokuda.aif
deleted file mode 100644
index 863b6d2fb5..0000000000
Binary files a/sound/direct_sound_samples/cries/arrokuda.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/arrokuda.wav b/sound/direct_sound_samples/cries/arrokuda.wav
new file mode 100644
index 0000000000..c5b040c87a
Binary files /dev/null and b/sound/direct_sound_samples/cries/arrokuda.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 212114537f..0000000000
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 0000000000..348fbcd2f0
Binary files /dev/null and b/sound/direct_sound_samples/cries/articuno.wav differ
diff --git a/sound/direct_sound_samples/cries/audino.aif b/sound/direct_sound_samples/cries/audino.aif
deleted file mode 100644
index 873d4c947b..0000000000
Binary files a/sound/direct_sound_samples/cries/audino.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/audino.wav b/sound/direct_sound_samples/cries/audino.wav
new file mode 100644
index 0000000000..fc2fb1283d
Binary files /dev/null and b/sound/direct_sound_samples/cries/audino.wav differ
diff --git a/sound/direct_sound_samples/cries/audino_mega.aif b/sound/direct_sound_samples/cries/audino_mega.aif
deleted file mode 100644
index 04d815001e..0000000000
Binary files a/sound/direct_sound_samples/cries/audino_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/audino_mega.wav b/sound/direct_sound_samples/cries/audino_mega.wav
new file mode 100644
index 0000000000..5cf8619706
Binary files /dev/null and b/sound/direct_sound_samples/cries/audino_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/aurorus.aif b/sound/direct_sound_samples/cries/aurorus.aif
deleted file mode 100644
index 9483e1b637..0000000000
Binary files a/sound/direct_sound_samples/cries/aurorus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/aurorus.wav b/sound/direct_sound_samples/cries/aurorus.wav
new file mode 100644
index 0000000000..4504fd119a
Binary files /dev/null and b/sound/direct_sound_samples/cries/aurorus.wav differ
diff --git a/sound/direct_sound_samples/cries/avalugg.aif b/sound/direct_sound_samples/cries/avalugg.aif
deleted file mode 100644
index 95c9d7a174..0000000000
Binary files a/sound/direct_sound_samples/cries/avalugg.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/avalugg.wav b/sound/direct_sound_samples/cries/avalugg.wav
new file mode 100644
index 0000000000..cbb8acb91a
Binary files /dev/null and b/sound/direct_sound_samples/cries/avalugg.wav differ
diff --git a/sound/direct_sound_samples/cries/axew.aif b/sound/direct_sound_samples/cries/axew.aif
deleted file mode 100644
index f642085f67..0000000000
Binary files a/sound/direct_sound_samples/cries/axew.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/axew.wav b/sound/direct_sound_samples/cries/axew.wav
new file mode 100644
index 0000000000..8cdab431e9
Binary files /dev/null and b/sound/direct_sound_samples/cries/axew.wav differ
diff --git a/sound/direct_sound_samples/cries/azelf.aif b/sound/direct_sound_samples/cries/azelf.aif
deleted file mode 100644
index ad2e96c8f9..0000000000
Binary files a/sound/direct_sound_samples/cries/azelf.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/azelf.wav b/sound/direct_sound_samples/cries/azelf.wav
new file mode 100644
index 0000000000..b87f8e4d8f
Binary files /dev/null and b/sound/direct_sound_samples/cries/azelf.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 99a497e205..0000000000
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 0000000000..f9e9ed89a1
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 401385cafb..0000000000
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 0000000000..65fa56e65b
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 f7c5c3b59e..0000000000
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 0000000000..af36a96eb8
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 7900eb1d64..0000000000
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 0000000000..395954b565
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 587b307e27..0000000000
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 0000000000..f030fb66c2
Binary files /dev/null and b/sound/direct_sound_samples/cries/banette.wav differ
diff --git a/sound/direct_sound_samples/cries/banette_mega.aif b/sound/direct_sound_samples/cries/banette_mega.aif
deleted file mode 100644
index 974f74c31e..0000000000
Binary files a/sound/direct_sound_samples/cries/banette_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/banette_mega.wav b/sound/direct_sound_samples/cries/banette_mega.wav
new file mode 100644
index 0000000000..5de36a008c
Binary files /dev/null and b/sound/direct_sound_samples/cries/banette_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/barbaracle.aif b/sound/direct_sound_samples/cries/barbaracle.aif
deleted file mode 100644
index 3f724127bd..0000000000
Binary files a/sound/direct_sound_samples/cries/barbaracle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/barbaracle.wav b/sound/direct_sound_samples/cries/barbaracle.wav
new file mode 100644
index 0000000000..8c5f4c2c69
Binary files /dev/null and b/sound/direct_sound_samples/cries/barbaracle.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 926e7fc050..0000000000
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 0000000000..40539ce514
Binary files /dev/null and b/sound/direct_sound_samples/cries/barboach.wav differ
diff --git a/sound/direct_sound_samples/cries/barraskewda.aif b/sound/direct_sound_samples/cries/barraskewda.aif
deleted file mode 100644
index e1a75a7dc7..0000000000
Binary files a/sound/direct_sound_samples/cries/barraskewda.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/barraskewda.wav b/sound/direct_sound_samples/cries/barraskewda.wav
new file mode 100644
index 0000000000..61e0b5a883
Binary files /dev/null and b/sound/direct_sound_samples/cries/barraskewda.wav differ
diff --git a/sound/direct_sound_samples/cries/basculegion.aif b/sound/direct_sound_samples/cries/basculegion.aif
deleted file mode 100644
index 28a8349a51..0000000000
Binary files a/sound/direct_sound_samples/cries/basculegion.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/basculegion.wav b/sound/direct_sound_samples/cries/basculegion.wav
new file mode 100644
index 0000000000..61770488d1
Binary files /dev/null and b/sound/direct_sound_samples/cries/basculegion.wav differ
diff --git a/sound/direct_sound_samples/cries/basculin.aif b/sound/direct_sound_samples/cries/basculin.aif
deleted file mode 100644
index dfa6db25f1..0000000000
Binary files a/sound/direct_sound_samples/cries/basculin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/basculin.wav b/sound/direct_sound_samples/cries/basculin.wav
new file mode 100644
index 0000000000..177af170be
Binary files /dev/null and b/sound/direct_sound_samples/cries/basculin.wav differ
diff --git a/sound/direct_sound_samples/cries/bastiodon.aif b/sound/direct_sound_samples/cries/bastiodon.aif
deleted file mode 100644
index 5f5646f787..0000000000
Binary files a/sound/direct_sound_samples/cries/bastiodon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bastiodon.wav b/sound/direct_sound_samples/cries/bastiodon.wav
new file mode 100644
index 0000000000..7d693cb6cb
Binary files /dev/null and b/sound/direct_sound_samples/cries/bastiodon.wav differ
diff --git a/sound/direct_sound_samples/cries/baxcalibur.aif b/sound/direct_sound_samples/cries/baxcalibur.aif
deleted file mode 100644
index fd8f5eff6d..0000000000
Binary files a/sound/direct_sound_samples/cries/baxcalibur.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/baxcalibur.wav b/sound/direct_sound_samples/cries/baxcalibur.wav
new file mode 100644
index 0000000000..2dd6bf735f
Binary files /dev/null and b/sound/direct_sound_samples/cries/baxcalibur.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 1b38f322a9..0000000000
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 0000000000..754e6e6e6e
Binary files /dev/null and b/sound/direct_sound_samples/cries/bayleef.wav differ
diff --git a/sound/direct_sound_samples/cries/beartic.aif b/sound/direct_sound_samples/cries/beartic.aif
deleted file mode 100644
index 1c7635357a..0000000000
Binary files a/sound/direct_sound_samples/cries/beartic.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/beartic.wav b/sound/direct_sound_samples/cries/beartic.wav
new file mode 100644
index 0000000000..a7fa0481be
Binary files /dev/null and b/sound/direct_sound_samples/cries/beartic.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 5b31f73c31..0000000000
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 0000000000..f9c3f26a5b
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 888e1e637d..0000000000
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 0000000000..6ba426baea
Binary files /dev/null and b/sound/direct_sound_samples/cries/beedrill.wav differ
diff --git a/sound/direct_sound_samples/cries/beedrill_mega.aif b/sound/direct_sound_samples/cries/beedrill_mega.aif
deleted file mode 100644
index cea7ca52d5..0000000000
Binary files a/sound/direct_sound_samples/cries/beedrill_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/beedrill_mega.wav b/sound/direct_sound_samples/cries/beedrill_mega.wav
new file mode 100644
index 0000000000..ed5d23ee70
Binary files /dev/null and b/sound/direct_sound_samples/cries/beedrill_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/beheeyem.aif b/sound/direct_sound_samples/cries/beheeyem.aif
deleted file mode 100644
index fb7ce70677..0000000000
Binary files a/sound/direct_sound_samples/cries/beheeyem.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/beheeyem.wav b/sound/direct_sound_samples/cries/beheeyem.wav
new file mode 100644
index 0000000000..e69067281b
Binary files /dev/null and b/sound/direct_sound_samples/cries/beheeyem.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 626f94fc1c..0000000000
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 0000000000..5d6514af4c
Binary files /dev/null and b/sound/direct_sound_samples/cries/beldum.wav differ
diff --git a/sound/direct_sound_samples/cries/bellibolt.aif b/sound/direct_sound_samples/cries/bellibolt.aif
deleted file mode 100644
index b7fc6d0175..0000000000
Binary files a/sound/direct_sound_samples/cries/bellibolt.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bellibolt.wav b/sound/direct_sound_samples/cries/bellibolt.wav
new file mode 100644
index 0000000000..2a59187760
Binary files /dev/null and b/sound/direct_sound_samples/cries/bellibolt.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 ffe452fc5a..0000000000
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 0000000000..71680c16b2
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 40e12f8e8b..0000000000
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 0000000000..dc7da2e277
Binary files /dev/null and b/sound/direct_sound_samples/cries/bellsprout.wav differ
diff --git a/sound/direct_sound_samples/cries/bergmite.aif b/sound/direct_sound_samples/cries/bergmite.aif
deleted file mode 100644
index 9dbcb7dd08..0000000000
Binary files a/sound/direct_sound_samples/cries/bergmite.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bergmite.wav b/sound/direct_sound_samples/cries/bergmite.wav
new file mode 100644
index 0000000000..89b2c96ae5
Binary files /dev/null and b/sound/direct_sound_samples/cries/bergmite.wav differ
diff --git a/sound/direct_sound_samples/cries/bewear.aif b/sound/direct_sound_samples/cries/bewear.aif
deleted file mode 100644
index 00979e4542..0000000000
Binary files a/sound/direct_sound_samples/cries/bewear.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bewear.wav b/sound/direct_sound_samples/cries/bewear.wav
new file mode 100644
index 0000000000..e2f83f9e12
Binary files /dev/null and b/sound/direct_sound_samples/cries/bewear.wav differ
diff --git a/sound/direct_sound_samples/cries/bibarel.aif b/sound/direct_sound_samples/cries/bibarel.aif
deleted file mode 100644
index 64b3f5e0ec..0000000000
Binary files a/sound/direct_sound_samples/cries/bibarel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bibarel.wav b/sound/direct_sound_samples/cries/bibarel.wav
new file mode 100644
index 0000000000..d1db5310ff
Binary files /dev/null and b/sound/direct_sound_samples/cries/bibarel.wav differ
diff --git a/sound/direct_sound_samples/cries/bidoof.aif b/sound/direct_sound_samples/cries/bidoof.aif
deleted file mode 100644
index 4da8f32ade..0000000000
Binary files a/sound/direct_sound_samples/cries/bidoof.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bidoof.wav b/sound/direct_sound_samples/cries/bidoof.wav
new file mode 100644
index 0000000000..7d7b519fa6
Binary files /dev/null and b/sound/direct_sound_samples/cries/bidoof.wav differ
diff --git a/sound/direct_sound_samples/cries/binacle.aif b/sound/direct_sound_samples/cries/binacle.aif
deleted file mode 100644
index 168952c84b..0000000000
Binary files a/sound/direct_sound_samples/cries/binacle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/binacle.wav b/sound/direct_sound_samples/cries/binacle.wav
new file mode 100644
index 0000000000..c9a5449d90
Binary files /dev/null and b/sound/direct_sound_samples/cries/binacle.wav differ
diff --git a/sound/direct_sound_samples/cries/bisharp.aif b/sound/direct_sound_samples/cries/bisharp.aif
deleted file mode 100644
index dd1d4c4229..0000000000
Binary files a/sound/direct_sound_samples/cries/bisharp.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bisharp.wav b/sound/direct_sound_samples/cries/bisharp.wav
new file mode 100644
index 0000000000..55ee54e0f2
Binary files /dev/null and b/sound/direct_sound_samples/cries/bisharp.wav differ
diff --git a/sound/direct_sound_samples/cries/blacephalon.aif b/sound/direct_sound_samples/cries/blacephalon.aif
deleted file mode 100644
index f1308e1344..0000000000
Binary files a/sound/direct_sound_samples/cries/blacephalon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/blacephalon.wav b/sound/direct_sound_samples/cries/blacephalon.wav
new file mode 100644
index 0000000000..342221ee87
Binary files /dev/null and b/sound/direct_sound_samples/cries/blacephalon.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 c3ae9294f2..0000000000
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 0000000000..fecb7733b4
Binary files /dev/null and b/sound/direct_sound_samples/cries/blastoise.wav differ
diff --git a/sound/direct_sound_samples/cries/blastoise_mega.aif b/sound/direct_sound_samples/cries/blastoise_mega.aif
deleted file mode 100644
index a25f49c30c..0000000000
Binary files a/sound/direct_sound_samples/cries/blastoise_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/blastoise_mega.wav b/sound/direct_sound_samples/cries/blastoise_mega.wav
new file mode 100644
index 0000000000..1f04ee2aaa
Binary files /dev/null and b/sound/direct_sound_samples/cries/blastoise_mega.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 fa8a46ba9c..0000000000
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 0000000000..b7b663d8ec
Binary files /dev/null and b/sound/direct_sound_samples/cries/blaziken.wav differ
diff --git a/sound/direct_sound_samples/cries/blaziken_mega.aif b/sound/direct_sound_samples/cries/blaziken_mega.aif
deleted file mode 100644
index ef5f08153e..0000000000
Binary files a/sound/direct_sound_samples/cries/blaziken_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/blaziken_mega.wav b/sound/direct_sound_samples/cries/blaziken_mega.wav
new file mode 100644
index 0000000000..65e06208a1
Binary files /dev/null and b/sound/direct_sound_samples/cries/blaziken_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/blipbug.aif b/sound/direct_sound_samples/cries/blipbug.aif
deleted file mode 100644
index ac9a26d484..0000000000
Binary files a/sound/direct_sound_samples/cries/blipbug.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/blipbug.wav b/sound/direct_sound_samples/cries/blipbug.wav
new file mode 100644
index 0000000000..b398671b6f
Binary files /dev/null and b/sound/direct_sound_samples/cries/blipbug.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 6cb483ae72..0000000000
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 0000000000..a5012768c1
Binary files /dev/null and b/sound/direct_sound_samples/cries/blissey.wav differ
diff --git a/sound/direct_sound_samples/cries/blitzle.aif b/sound/direct_sound_samples/cries/blitzle.aif
deleted file mode 100644
index d730da670f..0000000000
Binary files a/sound/direct_sound_samples/cries/blitzle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/blitzle.wav b/sound/direct_sound_samples/cries/blitzle.wav
new file mode 100644
index 0000000000..e026b158d4
Binary files /dev/null and b/sound/direct_sound_samples/cries/blitzle.wav differ
diff --git a/sound/direct_sound_samples/cries/boldore.aif b/sound/direct_sound_samples/cries/boldore.aif
deleted file mode 100644
index 9dbee00115..0000000000
Binary files a/sound/direct_sound_samples/cries/boldore.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/boldore.wav b/sound/direct_sound_samples/cries/boldore.wav
new file mode 100644
index 0000000000..463e54d938
Binary files /dev/null and b/sound/direct_sound_samples/cries/boldore.wav differ
diff --git a/sound/direct_sound_samples/cries/boltund.aif b/sound/direct_sound_samples/cries/boltund.aif
deleted file mode 100644
index 819142f86c..0000000000
Binary files a/sound/direct_sound_samples/cries/boltund.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/boltund.wav b/sound/direct_sound_samples/cries/boltund.wav
new file mode 100644
index 0000000000..5545f33685
Binary files /dev/null and b/sound/direct_sound_samples/cries/boltund.wav differ
diff --git a/sound/direct_sound_samples/cries/bombirdier.aif b/sound/direct_sound_samples/cries/bombirdier.aif
deleted file mode 100644
index 27f334acbb..0000000000
Binary files a/sound/direct_sound_samples/cries/bombirdier.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bombirdier.wav b/sound/direct_sound_samples/cries/bombirdier.wav
new file mode 100644
index 0000000000..db0e74d7c1
Binary files /dev/null and b/sound/direct_sound_samples/cries/bombirdier.wav differ
diff --git a/sound/direct_sound_samples/cries/bonsly.aif b/sound/direct_sound_samples/cries/bonsly.aif
deleted file mode 100644
index 15bd56f232..0000000000
Binary files a/sound/direct_sound_samples/cries/bonsly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bonsly.wav b/sound/direct_sound_samples/cries/bonsly.wav
new file mode 100644
index 0000000000..7914868463
Binary files /dev/null and b/sound/direct_sound_samples/cries/bonsly.wav differ
diff --git a/sound/direct_sound_samples/cries/bouffalant.aif b/sound/direct_sound_samples/cries/bouffalant.aif
deleted file mode 100644
index e9502a94b6..0000000000
Binary files a/sound/direct_sound_samples/cries/bouffalant.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bouffalant.wav b/sound/direct_sound_samples/cries/bouffalant.wav
new file mode 100644
index 0000000000..a1af3a6b90
Binary files /dev/null and b/sound/direct_sound_samples/cries/bouffalant.wav differ
diff --git a/sound/direct_sound_samples/cries/bounsweet.aif b/sound/direct_sound_samples/cries/bounsweet.aif
deleted file mode 100644
index b1d21fb390..0000000000
Binary files a/sound/direct_sound_samples/cries/bounsweet.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bounsweet.wav b/sound/direct_sound_samples/cries/bounsweet.wav
new file mode 100644
index 0000000000..2a4120aa01
Binary files /dev/null and b/sound/direct_sound_samples/cries/bounsweet.wav differ
diff --git a/sound/direct_sound_samples/cries/braixen.aif b/sound/direct_sound_samples/cries/braixen.aif
deleted file mode 100644
index d5d9e800b0..0000000000
Binary files a/sound/direct_sound_samples/cries/braixen.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/braixen.wav b/sound/direct_sound_samples/cries/braixen.wav
new file mode 100644
index 0000000000..640edbfb2b
Binary files /dev/null and b/sound/direct_sound_samples/cries/braixen.wav differ
diff --git a/sound/direct_sound_samples/cries/brambleghast.aif b/sound/direct_sound_samples/cries/brambleghast.aif
deleted file mode 100644
index 404e7d1dc6..0000000000
Binary files a/sound/direct_sound_samples/cries/brambleghast.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/brambleghast.wav b/sound/direct_sound_samples/cries/brambleghast.wav
new file mode 100644
index 0000000000..30f2f133be
Binary files /dev/null and b/sound/direct_sound_samples/cries/brambleghast.wav differ
diff --git a/sound/direct_sound_samples/cries/bramblin.aif b/sound/direct_sound_samples/cries/bramblin.aif
deleted file mode 100644
index b55e43fe77..0000000000
Binary files a/sound/direct_sound_samples/cries/bramblin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bramblin.wav b/sound/direct_sound_samples/cries/bramblin.wav
new file mode 100644
index 0000000000..68596b96a1
Binary files /dev/null and b/sound/direct_sound_samples/cries/bramblin.wav differ
diff --git a/sound/direct_sound_samples/cries/braviary.aif b/sound/direct_sound_samples/cries/braviary.aif
deleted file mode 100644
index 0cf3fc403e..0000000000
Binary files a/sound/direct_sound_samples/cries/braviary.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/braviary.wav b/sound/direct_sound_samples/cries/braviary.wav
new file mode 100644
index 0000000000..a05d45f955
Binary files /dev/null and b/sound/direct_sound_samples/cries/braviary.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 aa6e22f1b9..0000000000
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 0000000000..49f57f53ec
Binary files /dev/null and b/sound/direct_sound_samples/cries/breloom.wav differ
diff --git a/sound/direct_sound_samples/cries/brionne.aif b/sound/direct_sound_samples/cries/brionne.aif
deleted file mode 100644
index ac026ada88..0000000000
Binary files a/sound/direct_sound_samples/cries/brionne.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/brionne.wav b/sound/direct_sound_samples/cries/brionne.wav
new file mode 100644
index 0000000000..f72a6df30a
Binary files /dev/null and b/sound/direct_sound_samples/cries/brionne.wav differ
diff --git a/sound/direct_sound_samples/cries/bronzong.aif b/sound/direct_sound_samples/cries/bronzong.aif
deleted file mode 100644
index 628ec30895..0000000000
Binary files a/sound/direct_sound_samples/cries/bronzong.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bronzong.wav b/sound/direct_sound_samples/cries/bronzong.wav
new file mode 100644
index 0000000000..019013e0da
Binary files /dev/null and b/sound/direct_sound_samples/cries/bronzong.wav differ
diff --git a/sound/direct_sound_samples/cries/bronzor.aif b/sound/direct_sound_samples/cries/bronzor.aif
deleted file mode 100644
index 857bef1056..0000000000
Binary files a/sound/direct_sound_samples/cries/bronzor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bronzor.wav b/sound/direct_sound_samples/cries/bronzor.wav
new file mode 100644
index 0000000000..133c581532
Binary files /dev/null and b/sound/direct_sound_samples/cries/bronzor.wav differ
diff --git a/sound/direct_sound_samples/cries/brute_bonnet.aif b/sound/direct_sound_samples/cries/brute_bonnet.aif
deleted file mode 100644
index 3a6369e8be..0000000000
Binary files a/sound/direct_sound_samples/cries/brute_bonnet.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/brute_bonnet.wav b/sound/direct_sound_samples/cries/brute_bonnet.wav
new file mode 100644
index 0000000000..f3fe7e9799
Binary files /dev/null and b/sound/direct_sound_samples/cries/brute_bonnet.wav differ
diff --git a/sound/direct_sound_samples/cries/bruxish.aif b/sound/direct_sound_samples/cries/bruxish.aif
deleted file mode 100644
index f725043bc7..0000000000
Binary files a/sound/direct_sound_samples/cries/bruxish.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bruxish.wav b/sound/direct_sound_samples/cries/bruxish.wav
new file mode 100644
index 0000000000..cd5bfbf912
Binary files /dev/null and b/sound/direct_sound_samples/cries/bruxish.wav differ
diff --git a/sound/direct_sound_samples/cries/budew.aif b/sound/direct_sound_samples/cries/budew.aif
deleted file mode 100644
index bebc52a8df..0000000000
Binary files a/sound/direct_sound_samples/cries/budew.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/budew.wav b/sound/direct_sound_samples/cries/budew.wav
new file mode 100644
index 0000000000..97960bf335
Binary files /dev/null and b/sound/direct_sound_samples/cries/budew.wav differ
diff --git a/sound/direct_sound_samples/cries/buizel.aif b/sound/direct_sound_samples/cries/buizel.aif
deleted file mode 100644
index b138be7a4f..0000000000
Binary files a/sound/direct_sound_samples/cries/buizel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/buizel.wav b/sound/direct_sound_samples/cries/buizel.wav
new file mode 100644
index 0000000000..21bb4d26aa
Binary files /dev/null and b/sound/direct_sound_samples/cries/buizel.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 cff5d718b3..0000000000
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 0000000000..77a2d1bd1c
Binary files /dev/null and b/sound/direct_sound_samples/cries/bulbasaur.wav differ
diff --git a/sound/direct_sound_samples/cries/buneary.aif b/sound/direct_sound_samples/cries/buneary.aif
deleted file mode 100644
index f02bf1b465..0000000000
Binary files a/sound/direct_sound_samples/cries/buneary.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/buneary.wav b/sound/direct_sound_samples/cries/buneary.wav
new file mode 100644
index 0000000000..00af6ec1d8
Binary files /dev/null and b/sound/direct_sound_samples/cries/buneary.wav differ
diff --git a/sound/direct_sound_samples/cries/bunnelby.aif b/sound/direct_sound_samples/cries/bunnelby.aif
deleted file mode 100644
index 7588776e93..0000000000
Binary files a/sound/direct_sound_samples/cries/bunnelby.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/bunnelby.wav b/sound/direct_sound_samples/cries/bunnelby.wav
new file mode 100644
index 0000000000..469b6d371b
Binary files /dev/null and b/sound/direct_sound_samples/cries/bunnelby.wav differ
diff --git a/sound/direct_sound_samples/cries/burmy.aif b/sound/direct_sound_samples/cries/burmy.aif
deleted file mode 100644
index 80478166f5..0000000000
Binary files a/sound/direct_sound_samples/cries/burmy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/burmy.wav b/sound/direct_sound_samples/cries/burmy.wav
new file mode 100644
index 0000000000..6f8db1d2a4
Binary files /dev/null and b/sound/direct_sound_samples/cries/burmy.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 e59865ae5a..0000000000
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 0000000000..796a1afa9a
Binary files /dev/null and b/sound/direct_sound_samples/cries/butterfree.wav differ
diff --git a/sound/direct_sound_samples/cries/buzzwole.aif b/sound/direct_sound_samples/cries/buzzwole.aif
deleted file mode 100644
index 242edabdce..0000000000
Binary files a/sound/direct_sound_samples/cries/buzzwole.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/buzzwole.wav b/sound/direct_sound_samples/cries/buzzwole.wav
new file mode 100644
index 0000000000..69f4f7c1a0
Binary files /dev/null and b/sound/direct_sound_samples/cries/buzzwole.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 4d1771b18d..0000000000
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 0000000000..b2786069b6
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 d81f86d9fc..0000000000
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 0000000000..34c4525227
Binary files /dev/null and b/sound/direct_sound_samples/cries/cacturne.wav differ
diff --git a/sound/direct_sound_samples/cries/calyrex.aif b/sound/direct_sound_samples/cries/calyrex.aif
deleted file mode 100644
index 59c41a4fdb..0000000000
Binary files a/sound/direct_sound_samples/cries/calyrex.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/calyrex.wav b/sound/direct_sound_samples/cries/calyrex.wav
new file mode 100644
index 0000000000..365d22f27e
Binary files /dev/null and b/sound/direct_sound_samples/cries/calyrex.wav differ
diff --git a/sound/direct_sound_samples/cries/calyrex_ice.aif b/sound/direct_sound_samples/cries/calyrex_ice.aif
deleted file mode 100644
index a6be291e1d..0000000000
Binary files a/sound/direct_sound_samples/cries/calyrex_ice.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/calyrex_ice.wav b/sound/direct_sound_samples/cries/calyrex_ice.wav
new file mode 100644
index 0000000000..d1bb9330fe
Binary files /dev/null and b/sound/direct_sound_samples/cries/calyrex_ice.wav differ
diff --git a/sound/direct_sound_samples/cries/calyrex_shadow.aif b/sound/direct_sound_samples/cries/calyrex_shadow.aif
deleted file mode 100644
index 2d3c43d978..0000000000
Binary files a/sound/direct_sound_samples/cries/calyrex_shadow.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/calyrex_shadow.wav b/sound/direct_sound_samples/cries/calyrex_shadow.wav
new file mode 100644
index 0000000000..8c5fabed08
Binary files /dev/null and b/sound/direct_sound_samples/cries/calyrex_shadow.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 82a7f237cf..0000000000
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 0000000000..95fdce3575
Binary files /dev/null and b/sound/direct_sound_samples/cries/camerupt.wav differ
diff --git a/sound/direct_sound_samples/cries/camerupt_mega.aif b/sound/direct_sound_samples/cries/camerupt_mega.aif
deleted file mode 100644
index 0c7966b8ea..0000000000
Binary files a/sound/direct_sound_samples/cries/camerupt_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/camerupt_mega.wav b/sound/direct_sound_samples/cries/camerupt_mega.wav
new file mode 100644
index 0000000000..b76cd2d974
Binary files /dev/null and b/sound/direct_sound_samples/cries/camerupt_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/capsakid.aif b/sound/direct_sound_samples/cries/capsakid.aif
deleted file mode 100644
index a93a531cdb..0000000000
Binary files a/sound/direct_sound_samples/cries/capsakid.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/capsakid.wav b/sound/direct_sound_samples/cries/capsakid.wav
new file mode 100644
index 0000000000..1a5837c9cd
Binary files /dev/null and b/sound/direct_sound_samples/cries/capsakid.wav differ
diff --git a/sound/direct_sound_samples/cries/carbink.aif b/sound/direct_sound_samples/cries/carbink.aif
deleted file mode 100644
index dfdc907bd7..0000000000
Binary files a/sound/direct_sound_samples/cries/carbink.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/carbink.wav b/sound/direct_sound_samples/cries/carbink.wav
new file mode 100644
index 0000000000..34ccc0db3b
Binary files /dev/null and b/sound/direct_sound_samples/cries/carbink.wav differ
diff --git a/sound/direct_sound_samples/cries/carkol.aif b/sound/direct_sound_samples/cries/carkol.aif
deleted file mode 100644
index a1f19de7f4..0000000000
Binary files a/sound/direct_sound_samples/cries/carkol.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/carkol.wav b/sound/direct_sound_samples/cries/carkol.wav
new file mode 100644
index 0000000000..526f8f473f
Binary files /dev/null and b/sound/direct_sound_samples/cries/carkol.wav differ
diff --git a/sound/direct_sound_samples/cries/carnivine.aif b/sound/direct_sound_samples/cries/carnivine.aif
deleted file mode 100644
index 491e846a1a..0000000000
Binary files a/sound/direct_sound_samples/cries/carnivine.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/carnivine.wav b/sound/direct_sound_samples/cries/carnivine.wav
new file mode 100644
index 0000000000..cdb7d8a358
Binary files /dev/null and b/sound/direct_sound_samples/cries/carnivine.wav differ
diff --git a/sound/direct_sound_samples/cries/carracosta.aif b/sound/direct_sound_samples/cries/carracosta.aif
deleted file mode 100644
index f75692c3a1..0000000000
Binary files a/sound/direct_sound_samples/cries/carracosta.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/carracosta.wav b/sound/direct_sound_samples/cries/carracosta.wav
new file mode 100644
index 0000000000..4367ed1372
Binary files /dev/null and b/sound/direct_sound_samples/cries/carracosta.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 2c0a6a5d8c..0000000000
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 0000000000..ae10c3b10c
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 a256131caf..0000000000
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 0000000000..fff0be6815
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 4fce6e5075..0000000000
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 0000000000..83748d45b8
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 4ce12c5fb7..0000000000
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 0000000000..ccdf1ba1ac
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 df1c4cd195..0000000000
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 0000000000..e217a99e81
Binary files /dev/null and b/sound/direct_sound_samples/cries/celebi.wav differ
diff --git a/sound/direct_sound_samples/cries/celesteela.aif b/sound/direct_sound_samples/cries/celesteela.aif
deleted file mode 100644
index acab333235..0000000000
Binary files a/sound/direct_sound_samples/cries/celesteela.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/celesteela.wav b/sound/direct_sound_samples/cries/celesteela.wav
new file mode 100644
index 0000000000..fd5cae47f9
Binary files /dev/null and b/sound/direct_sound_samples/cries/celesteela.wav differ
diff --git a/sound/direct_sound_samples/cries/centiskorch.aif b/sound/direct_sound_samples/cries/centiskorch.aif
deleted file mode 100644
index 01c6bc23a5..0000000000
Binary files a/sound/direct_sound_samples/cries/centiskorch.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/centiskorch.wav b/sound/direct_sound_samples/cries/centiskorch.wav
new file mode 100644
index 0000000000..cc669c123f
Binary files /dev/null and b/sound/direct_sound_samples/cries/centiskorch.wav differ
diff --git a/sound/direct_sound_samples/cries/ceruledge.aif b/sound/direct_sound_samples/cries/ceruledge.aif
deleted file mode 100644
index de4b1bb7c8..0000000000
Binary files a/sound/direct_sound_samples/cries/ceruledge.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ceruledge.wav b/sound/direct_sound_samples/cries/ceruledge.wav
new file mode 100644
index 0000000000..158bf548e0
Binary files /dev/null and b/sound/direct_sound_samples/cries/ceruledge.wav differ
diff --git a/sound/direct_sound_samples/cries/cetitan.aif b/sound/direct_sound_samples/cries/cetitan.aif
deleted file mode 100644
index 45302ff844..0000000000
Binary files a/sound/direct_sound_samples/cries/cetitan.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cetitan.wav b/sound/direct_sound_samples/cries/cetitan.wav
new file mode 100644
index 0000000000..9f6df2ec42
Binary files /dev/null and b/sound/direct_sound_samples/cries/cetitan.wav differ
diff --git a/sound/direct_sound_samples/cries/cetoddle.aif b/sound/direct_sound_samples/cries/cetoddle.aif
deleted file mode 100644
index f85f3d201f..0000000000
Binary files a/sound/direct_sound_samples/cries/cetoddle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cetoddle.wav b/sound/direct_sound_samples/cries/cetoddle.wav
new file mode 100644
index 0000000000..93f34e1cf7
Binary files /dev/null and b/sound/direct_sound_samples/cries/cetoddle.wav differ
diff --git a/sound/direct_sound_samples/cries/chandelure.aif b/sound/direct_sound_samples/cries/chandelure.aif
deleted file mode 100644
index 29cd52e1c1..0000000000
Binary files a/sound/direct_sound_samples/cries/chandelure.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chandelure.wav b/sound/direct_sound_samples/cries/chandelure.wav
new file mode 100644
index 0000000000..2539f2c239
Binary files /dev/null and b/sound/direct_sound_samples/cries/chandelure.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 b6a8a29020..0000000000
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 0000000000..62d8e6cd9f
Binary files /dev/null and b/sound/direct_sound_samples/cries/chansey.wav differ
diff --git a/sound/direct_sound_samples/cries/charcadet.aif b/sound/direct_sound_samples/cries/charcadet.aif
deleted file mode 100644
index 60f5512ca6..0000000000
Binary files a/sound/direct_sound_samples/cries/charcadet.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/charcadet.wav b/sound/direct_sound_samples/cries/charcadet.wav
new file mode 100644
index 0000000000..509e7b4968
Binary files /dev/null and b/sound/direct_sound_samples/cries/charcadet.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 cc5f2bdd33..0000000000
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 0000000000..fbbf3c555d
Binary files /dev/null and b/sound/direct_sound_samples/cries/charizard.wav differ
diff --git a/sound/direct_sound_samples/cries/charizard_mega_x.aif b/sound/direct_sound_samples/cries/charizard_mega_x.aif
deleted file mode 100644
index f9c0f76597..0000000000
Binary files a/sound/direct_sound_samples/cries/charizard_mega_x.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/charizard_mega_x.wav b/sound/direct_sound_samples/cries/charizard_mega_x.wav
new file mode 100644
index 0000000000..053f05caad
Binary files /dev/null and b/sound/direct_sound_samples/cries/charizard_mega_x.wav differ
diff --git a/sound/direct_sound_samples/cries/charizard_mega_y.aif b/sound/direct_sound_samples/cries/charizard_mega_y.aif
deleted file mode 100644
index 2cf5b3ea7f..0000000000
Binary files a/sound/direct_sound_samples/cries/charizard_mega_y.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/charizard_mega_y.wav b/sound/direct_sound_samples/cries/charizard_mega_y.wav
new file mode 100644
index 0000000000..1d354bb938
Binary files /dev/null and b/sound/direct_sound_samples/cries/charizard_mega_y.wav differ
diff --git a/sound/direct_sound_samples/cries/charjabug.aif b/sound/direct_sound_samples/cries/charjabug.aif
deleted file mode 100644
index ed5bd7d88b..0000000000
Binary files a/sound/direct_sound_samples/cries/charjabug.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/charjabug.wav b/sound/direct_sound_samples/cries/charjabug.wav
new file mode 100644
index 0000000000..686e72aa6f
Binary files /dev/null and b/sound/direct_sound_samples/cries/charjabug.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 dda65af549..0000000000
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 0000000000..3d82aca2fa
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 9a9a14e3bb..0000000000
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 0000000000..a491f0586e
Binary files /dev/null and b/sound/direct_sound_samples/cries/charmeleon.wav differ
diff --git a/sound/direct_sound_samples/cries/chatot.aif b/sound/direct_sound_samples/cries/chatot.aif
deleted file mode 100644
index 62a961a82f..0000000000
Binary files a/sound/direct_sound_samples/cries/chatot.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chatot.wav b/sound/direct_sound_samples/cries/chatot.wav
new file mode 100644
index 0000000000..5f76a91472
Binary files /dev/null and b/sound/direct_sound_samples/cries/chatot.wav differ
diff --git a/sound/direct_sound_samples/cries/cherrim.aif b/sound/direct_sound_samples/cries/cherrim.aif
deleted file mode 100644
index d70cf77b02..0000000000
Binary files a/sound/direct_sound_samples/cries/cherrim.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cherrim.wav b/sound/direct_sound_samples/cries/cherrim.wav
new file mode 100644
index 0000000000..ca0dc7a4c0
Binary files /dev/null and b/sound/direct_sound_samples/cries/cherrim.wav differ
diff --git a/sound/direct_sound_samples/cries/cherubi.aif b/sound/direct_sound_samples/cries/cherubi.aif
deleted file mode 100644
index 703c1d5f8b..0000000000
Binary files a/sound/direct_sound_samples/cries/cherubi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cherubi.wav b/sound/direct_sound_samples/cries/cherubi.wav
new file mode 100644
index 0000000000..2a87affb57
Binary files /dev/null and b/sound/direct_sound_samples/cries/cherubi.wav differ
diff --git a/sound/direct_sound_samples/cries/chesnaught.aif b/sound/direct_sound_samples/cries/chesnaught.aif
deleted file mode 100644
index 80cff83698..0000000000
Binary files a/sound/direct_sound_samples/cries/chesnaught.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chesnaught.wav b/sound/direct_sound_samples/cries/chesnaught.wav
new file mode 100644
index 0000000000..27044e80a4
Binary files /dev/null and b/sound/direct_sound_samples/cries/chesnaught.wav differ
diff --git a/sound/direct_sound_samples/cries/chespin.aif b/sound/direct_sound_samples/cries/chespin.aif
deleted file mode 100644
index 48136a98a0..0000000000
Binary files a/sound/direct_sound_samples/cries/chespin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chespin.wav b/sound/direct_sound_samples/cries/chespin.wav
new file mode 100644
index 0000000000..5e5f5a7c6a
Binary files /dev/null and b/sound/direct_sound_samples/cries/chespin.wav differ
diff --git a/sound/direct_sound_samples/cries/chewtle.aif b/sound/direct_sound_samples/cries/chewtle.aif
deleted file mode 100644
index d551d27156..0000000000
Binary files a/sound/direct_sound_samples/cries/chewtle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chewtle.wav b/sound/direct_sound_samples/cries/chewtle.wav
new file mode 100644
index 0000000000..a9f609dc4c
Binary files /dev/null and b/sound/direct_sound_samples/cries/chewtle.wav differ
diff --git a/sound/direct_sound_samples/cries/chi_yu.aif b/sound/direct_sound_samples/cries/chi_yu.aif
deleted file mode 100644
index 60131a9e46..0000000000
Binary files a/sound/direct_sound_samples/cries/chi_yu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chi_yu.wav b/sound/direct_sound_samples/cries/chi_yu.wav
new file mode 100644
index 0000000000..8db88a2de6
Binary files /dev/null and b/sound/direct_sound_samples/cries/chi_yu.wav differ
diff --git a/sound/direct_sound_samples/cries/chien_pao.aif b/sound/direct_sound_samples/cries/chien_pao.aif
deleted file mode 100644
index c598dac8d2..0000000000
Binary files a/sound/direct_sound_samples/cries/chien_pao.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chien_pao.wav b/sound/direct_sound_samples/cries/chien_pao.wav
new file mode 100644
index 0000000000..2575663d5d
Binary files /dev/null and b/sound/direct_sound_samples/cries/chien_pao.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 63d5c95033..0000000000
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 0000000000..65cb0c1765
Binary files /dev/null and b/sound/direct_sound_samples/cries/chikorita.wav differ
diff --git a/sound/direct_sound_samples/cries/chimchar.aif b/sound/direct_sound_samples/cries/chimchar.aif
deleted file mode 100644
index 06514a4d90..0000000000
Binary files a/sound/direct_sound_samples/cries/chimchar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chimchar.wav b/sound/direct_sound_samples/cries/chimchar.wav
new file mode 100644
index 0000000000..cd862e218a
Binary files /dev/null and b/sound/direct_sound_samples/cries/chimchar.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 7b2b45fac2..0000000000
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 0000000000..a063bf739e
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 846df5079c..0000000000
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 0000000000..8822996828
Binary files /dev/null and b/sound/direct_sound_samples/cries/chinchou.wav differ
diff --git a/sound/direct_sound_samples/cries/chingling.aif b/sound/direct_sound_samples/cries/chingling.aif
deleted file mode 100644
index dd3b00915b..0000000000
Binary files a/sound/direct_sound_samples/cries/chingling.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/chingling.wav b/sound/direct_sound_samples/cries/chingling.wav
new file mode 100644
index 0000000000..af4d305106
Binary files /dev/null and b/sound/direct_sound_samples/cries/chingling.wav differ
diff --git a/sound/direct_sound_samples/cries/cinccino.aif b/sound/direct_sound_samples/cries/cinccino.aif
deleted file mode 100644
index 6205aaf2b0..0000000000
Binary files a/sound/direct_sound_samples/cries/cinccino.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cinccino.wav b/sound/direct_sound_samples/cries/cinccino.wav
new file mode 100644
index 0000000000..beb20a3ce0
Binary files /dev/null and b/sound/direct_sound_samples/cries/cinccino.wav differ
diff --git a/sound/direct_sound_samples/cries/cinderace.aif b/sound/direct_sound_samples/cries/cinderace.aif
deleted file mode 100644
index 1e7bed5bfd..0000000000
Binary files a/sound/direct_sound_samples/cries/cinderace.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cinderace.wav b/sound/direct_sound_samples/cries/cinderace.wav
new file mode 100644
index 0000000000..01caaae4d6
Binary files /dev/null and b/sound/direct_sound_samples/cries/cinderace.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 186a1f9b40..0000000000
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 0000000000..6615de8779
Binary files /dev/null and b/sound/direct_sound_samples/cries/clamperl.wav differ
diff --git a/sound/direct_sound_samples/cries/clauncher.aif b/sound/direct_sound_samples/cries/clauncher.aif
deleted file mode 100644
index ab9cbf9ce1..0000000000
Binary files a/sound/direct_sound_samples/cries/clauncher.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/clauncher.wav b/sound/direct_sound_samples/cries/clauncher.wav
new file mode 100644
index 0000000000..19a07f395a
Binary files /dev/null and b/sound/direct_sound_samples/cries/clauncher.wav differ
diff --git a/sound/direct_sound_samples/cries/clawitzer.aif b/sound/direct_sound_samples/cries/clawitzer.aif
deleted file mode 100644
index bd14270c38..0000000000
Binary files a/sound/direct_sound_samples/cries/clawitzer.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/clawitzer.wav b/sound/direct_sound_samples/cries/clawitzer.wav
new file mode 100644
index 0000000000..7947944ace
Binary files /dev/null and b/sound/direct_sound_samples/cries/clawitzer.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 9da5f5bbb7..0000000000
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 0000000000..037a9a4063
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 e04bf536ad..0000000000
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 0000000000..09b0d19b86
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 b38fa6e9d7..0000000000
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 0000000000..b447b700cd
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 e3243d0998..0000000000
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 0000000000..53d18df415
Binary files /dev/null and b/sound/direct_sound_samples/cries/cleffa.wav differ
diff --git a/sound/direct_sound_samples/cries/clobbopus.aif b/sound/direct_sound_samples/cries/clobbopus.aif
deleted file mode 100644
index ebce642966..0000000000
Binary files a/sound/direct_sound_samples/cries/clobbopus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/clobbopus.wav b/sound/direct_sound_samples/cries/clobbopus.wav
new file mode 100644
index 0000000000..f26d8c1cdd
Binary files /dev/null and b/sound/direct_sound_samples/cries/clobbopus.wav differ
diff --git a/sound/direct_sound_samples/cries/clodsire.aif b/sound/direct_sound_samples/cries/clodsire.aif
deleted file mode 100644
index 17aea97e46..0000000000
Binary files a/sound/direct_sound_samples/cries/clodsire.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/clodsire.wav b/sound/direct_sound_samples/cries/clodsire.wav
new file mode 100644
index 0000000000..44cad4cb71
Binary files /dev/null and b/sound/direct_sound_samples/cries/clodsire.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 b69d0478bf..0000000000
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 0000000000..4fc766ae19
Binary files /dev/null and b/sound/direct_sound_samples/cries/cloyster.wav differ
diff --git a/sound/direct_sound_samples/cries/coalossal.aif b/sound/direct_sound_samples/cries/coalossal.aif
deleted file mode 100644
index 5d62b25fba..0000000000
Binary files a/sound/direct_sound_samples/cries/coalossal.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/coalossal.wav b/sound/direct_sound_samples/cries/coalossal.wav
new file mode 100644
index 0000000000..7b2a758d23
Binary files /dev/null and b/sound/direct_sound_samples/cries/coalossal.wav differ
diff --git a/sound/direct_sound_samples/cries/cobalion.aif b/sound/direct_sound_samples/cries/cobalion.aif
deleted file mode 100644
index 4a21505b5b..0000000000
Binary files a/sound/direct_sound_samples/cries/cobalion.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cobalion.wav b/sound/direct_sound_samples/cries/cobalion.wav
new file mode 100644
index 0000000000..2cbc6bbd55
Binary files /dev/null and b/sound/direct_sound_samples/cries/cobalion.wav differ
diff --git a/sound/direct_sound_samples/cries/cofagrigus.aif b/sound/direct_sound_samples/cries/cofagrigus.aif
deleted file mode 100644
index 6fbf1c16f8..0000000000
Binary files a/sound/direct_sound_samples/cries/cofagrigus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cofagrigus.wav b/sound/direct_sound_samples/cries/cofagrigus.wav
new file mode 100644
index 0000000000..2096837cd9
Binary files /dev/null and b/sound/direct_sound_samples/cries/cofagrigus.wav differ
diff --git a/sound/direct_sound_samples/cries/combee.aif b/sound/direct_sound_samples/cries/combee.aif
deleted file mode 100644
index 6aaedb642d..0000000000
Binary files a/sound/direct_sound_samples/cries/combee.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/combee.wav b/sound/direct_sound_samples/cries/combee.wav
new file mode 100644
index 0000000000..d2e370227e
Binary files /dev/null and b/sound/direct_sound_samples/cries/combee.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 58707c30b8..0000000000
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 0000000000..8da9de64a1
Binary files /dev/null and b/sound/direct_sound_samples/cries/combusken.wav differ
diff --git a/sound/direct_sound_samples/cries/comfey.aif b/sound/direct_sound_samples/cries/comfey.aif
deleted file mode 100644
index cb91d0cbd7..0000000000
Binary files a/sound/direct_sound_samples/cries/comfey.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/comfey.wav b/sound/direct_sound_samples/cries/comfey.wav
new file mode 100644
index 0000000000..b178f02a69
Binary files /dev/null and b/sound/direct_sound_samples/cries/comfey.wav differ
diff --git a/sound/direct_sound_samples/cries/conkeldurr.aif b/sound/direct_sound_samples/cries/conkeldurr.aif
deleted file mode 100644
index 09885ab2ef..0000000000
Binary files a/sound/direct_sound_samples/cries/conkeldurr.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/conkeldurr.wav b/sound/direct_sound_samples/cries/conkeldurr.wav
new file mode 100644
index 0000000000..fa56aac5e9
Binary files /dev/null and b/sound/direct_sound_samples/cries/conkeldurr.wav differ
diff --git a/sound/direct_sound_samples/cries/copperajah.aif b/sound/direct_sound_samples/cries/copperajah.aif
deleted file mode 100644
index 97484e695b..0000000000
Binary files a/sound/direct_sound_samples/cries/copperajah.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/copperajah.wav b/sound/direct_sound_samples/cries/copperajah.wav
new file mode 100644
index 0000000000..23df3fd99c
Binary files /dev/null and b/sound/direct_sound_samples/cries/copperajah.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 9bc708e2fb..0000000000
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 0000000000..990029d333
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 087308d8fd..0000000000
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 0000000000..890208bc73
Binary files /dev/null and b/sound/direct_sound_samples/cries/corsola.wav differ
diff --git a/sound/direct_sound_samples/cries/corviknight.aif b/sound/direct_sound_samples/cries/corviknight.aif
deleted file mode 100644
index 8a7e200da3..0000000000
Binary files a/sound/direct_sound_samples/cries/corviknight.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/corviknight.wav b/sound/direct_sound_samples/cries/corviknight.wav
new file mode 100644
index 0000000000..2f536e1280
Binary files /dev/null and b/sound/direct_sound_samples/cries/corviknight.wav differ
diff --git a/sound/direct_sound_samples/cries/corvisquire.aif b/sound/direct_sound_samples/cries/corvisquire.aif
deleted file mode 100644
index a18e64c9c0..0000000000
Binary files a/sound/direct_sound_samples/cries/corvisquire.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/corvisquire.wav b/sound/direct_sound_samples/cries/corvisquire.wav
new file mode 100644
index 0000000000..b0600991c0
Binary files /dev/null and b/sound/direct_sound_samples/cries/corvisquire.wav differ
diff --git a/sound/direct_sound_samples/cries/cosmoem.aif b/sound/direct_sound_samples/cries/cosmoem.aif
deleted file mode 100644
index f2c8c0e2b4..0000000000
Binary files a/sound/direct_sound_samples/cries/cosmoem.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cosmoem.wav b/sound/direct_sound_samples/cries/cosmoem.wav
new file mode 100644
index 0000000000..8f9523bced
Binary files /dev/null and b/sound/direct_sound_samples/cries/cosmoem.wav differ
diff --git a/sound/direct_sound_samples/cries/cosmog.aif b/sound/direct_sound_samples/cries/cosmog.aif
deleted file mode 100644
index deeb60b94d..0000000000
Binary files a/sound/direct_sound_samples/cries/cosmog.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cosmog.wav b/sound/direct_sound_samples/cries/cosmog.wav
new file mode 100644
index 0000000000..c52927d1b0
Binary files /dev/null and b/sound/direct_sound_samples/cries/cosmog.wav differ
diff --git a/sound/direct_sound_samples/cries/cottonee.aif b/sound/direct_sound_samples/cries/cottonee.aif
deleted file mode 100644
index 207ac9d12d..0000000000
Binary files a/sound/direct_sound_samples/cries/cottonee.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cottonee.wav b/sound/direct_sound_samples/cries/cottonee.wav
new file mode 100644
index 0000000000..a7c0e6ce5b
Binary files /dev/null and b/sound/direct_sound_samples/cries/cottonee.wav differ
diff --git a/sound/direct_sound_samples/cries/crabominable.aif b/sound/direct_sound_samples/cries/crabominable.aif
deleted file mode 100644
index 1d6b3d4caf..0000000000
Binary files a/sound/direct_sound_samples/cries/crabominable.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/crabominable.wav b/sound/direct_sound_samples/cries/crabominable.wav
new file mode 100644
index 0000000000..ca783994b8
Binary files /dev/null and b/sound/direct_sound_samples/cries/crabominable.wav differ
diff --git a/sound/direct_sound_samples/cries/crabrawler.aif b/sound/direct_sound_samples/cries/crabrawler.aif
deleted file mode 100644
index 8c42fb18e5..0000000000
Binary files a/sound/direct_sound_samples/cries/crabrawler.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/crabrawler.wav b/sound/direct_sound_samples/cries/crabrawler.wav
new file mode 100644
index 0000000000..b5afae8c1d
Binary files /dev/null and b/sound/direct_sound_samples/cries/crabrawler.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 3fa5e006f9..0000000000
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 0000000000..bb9d5bd425
Binary files /dev/null and b/sound/direct_sound_samples/cries/cradily.wav differ
diff --git a/sound/direct_sound_samples/cries/cramorant.aif b/sound/direct_sound_samples/cries/cramorant.aif
deleted file mode 100644
index 01151693ff..0000000000
Binary files a/sound/direct_sound_samples/cries/cramorant.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cramorant.wav b/sound/direct_sound_samples/cries/cramorant.wav
new file mode 100644
index 0000000000..a21c49b1c4
Binary files /dev/null and b/sound/direct_sound_samples/cries/cramorant.wav differ
diff --git a/sound/direct_sound_samples/cries/cranidos.aif b/sound/direct_sound_samples/cries/cranidos.aif
deleted file mode 100644
index dc67035a76..0000000000
Binary files a/sound/direct_sound_samples/cries/cranidos.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cranidos.wav b/sound/direct_sound_samples/cries/cranidos.wav
new file mode 100644
index 0000000000..5ceba87269
Binary files /dev/null and b/sound/direct_sound_samples/cries/cranidos.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 7f8ee48beb..0000000000
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 0000000000..e270a31791
Binary files /dev/null and b/sound/direct_sound_samples/cries/crawdaunt.wav differ
diff --git a/sound/direct_sound_samples/cries/cresselia.aif b/sound/direct_sound_samples/cries/cresselia.aif
deleted file mode 100644
index 5edd1b0194..0000000000
Binary files a/sound/direct_sound_samples/cries/cresselia.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cresselia.wav b/sound/direct_sound_samples/cries/cresselia.wav
new file mode 100644
index 0000000000..dd73997250
Binary files /dev/null and b/sound/direct_sound_samples/cries/cresselia.wav differ
diff --git a/sound/direct_sound_samples/cries/croagunk.aif b/sound/direct_sound_samples/cries/croagunk.aif
deleted file mode 100644
index c5d42a42bf..0000000000
Binary files a/sound/direct_sound_samples/cries/croagunk.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/croagunk.wav b/sound/direct_sound_samples/cries/croagunk.wav
new file mode 100644
index 0000000000..f3935f1b85
Binary files /dev/null and b/sound/direct_sound_samples/cries/croagunk.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 956be378c7..0000000000
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 0000000000..fdad8d4a63
Binary files /dev/null and b/sound/direct_sound_samples/cries/crobat.wav differ
diff --git a/sound/direct_sound_samples/cries/crocalor.aif b/sound/direct_sound_samples/cries/crocalor.aif
deleted file mode 100644
index 9a622026df..0000000000
Binary files a/sound/direct_sound_samples/cries/crocalor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/crocalor.wav b/sound/direct_sound_samples/cries/crocalor.wav
new file mode 100644
index 0000000000..17cba90fd9
Binary files /dev/null and b/sound/direct_sound_samples/cries/crocalor.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 b72db75f3f..0000000000
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 0000000000..deb2a70035
Binary files /dev/null and b/sound/direct_sound_samples/cries/croconaw.wav differ
diff --git a/sound/direct_sound_samples/cries/crustle.aif b/sound/direct_sound_samples/cries/crustle.aif
deleted file mode 100644
index 62014a79c8..0000000000
Binary files a/sound/direct_sound_samples/cries/crustle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/crustle.wav b/sound/direct_sound_samples/cries/crustle.wav
new file mode 100644
index 0000000000..6e1388bad8
Binary files /dev/null and b/sound/direct_sound_samples/cries/crustle.wav differ
diff --git a/sound/direct_sound_samples/cries/cry_unused_265.aif b/sound/direct_sound_samples/cries/cry_unused_265.aif
deleted file mode 100644
index 7f5965f06b..0000000000
Binary files a/sound/direct_sound_samples/cries/cry_unused_265.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cry_unused_268.aif b/sound/direct_sound_samples/cries/cry_unused_268.aif
deleted file mode 100644
index 5cae364c38..0000000000
Binary files a/sound/direct_sound_samples/cries/cry_unused_268.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cryogonal.aif b/sound/direct_sound_samples/cries/cryogonal.aif
deleted file mode 100644
index b2f551274e..0000000000
Binary files a/sound/direct_sound_samples/cries/cryogonal.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cryogonal.wav b/sound/direct_sound_samples/cries/cryogonal.wav
new file mode 100644
index 0000000000..22f6b994db
Binary files /dev/null and b/sound/direct_sound_samples/cries/cryogonal.wav differ
diff --git a/sound/direct_sound_samples/cries/cubchoo.aif b/sound/direct_sound_samples/cries/cubchoo.aif
deleted file mode 100644
index e10ca5a0cc..0000000000
Binary files a/sound/direct_sound_samples/cries/cubchoo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cubchoo.wav b/sound/direct_sound_samples/cries/cubchoo.wav
new file mode 100644
index 0000000000..5bbe309951
Binary files /dev/null and b/sound/direct_sound_samples/cries/cubchoo.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 1ebc283ef8..0000000000
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 0000000000..b198c25403
Binary files /dev/null and b/sound/direct_sound_samples/cries/cubone.wav differ
diff --git a/sound/direct_sound_samples/cries/cufant.aif b/sound/direct_sound_samples/cries/cufant.aif
deleted file mode 100644
index 9f8f55b245..0000000000
Binary files a/sound/direct_sound_samples/cries/cufant.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cufant.wav b/sound/direct_sound_samples/cries/cufant.wav
new file mode 100644
index 0000000000..a9cb12d5ed
Binary files /dev/null and b/sound/direct_sound_samples/cries/cufant.wav differ
diff --git a/sound/direct_sound_samples/cries/cursola.aif b/sound/direct_sound_samples/cries/cursola.aif
deleted file mode 100644
index 1bdba8731a..0000000000
Binary files a/sound/direct_sound_samples/cries/cursola.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cursola.wav b/sound/direct_sound_samples/cries/cursola.wav
new file mode 100644
index 0000000000..076aed18f5
Binary files /dev/null and b/sound/direct_sound_samples/cries/cursola.wav differ
diff --git a/sound/direct_sound_samples/cries/cutiefly.aif b/sound/direct_sound_samples/cries/cutiefly.aif
deleted file mode 100644
index 61535bbdd8..0000000000
Binary files a/sound/direct_sound_samples/cries/cutiefly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cutiefly.wav b/sound/direct_sound_samples/cries/cutiefly.wav
new file mode 100644
index 0000000000..612b06dc22
Binary files /dev/null and b/sound/direct_sound_samples/cries/cutiefly.wav differ
diff --git a/sound/direct_sound_samples/cries/cyclizar.aif b/sound/direct_sound_samples/cries/cyclizar.aif
deleted file mode 100644
index eb32c91d59..0000000000
Binary files a/sound/direct_sound_samples/cries/cyclizar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/cyclizar.wav b/sound/direct_sound_samples/cries/cyclizar.wav
new file mode 100644
index 0000000000..324dcbda08
Binary files /dev/null and b/sound/direct_sound_samples/cries/cyclizar.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 287c6496ad..0000000000
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 0000000000..87921c52eb
Binary files /dev/null and b/sound/direct_sound_samples/cries/cyndaquil.wav differ
diff --git a/sound/direct_sound_samples/cries/dachsbun.aif b/sound/direct_sound_samples/cries/dachsbun.aif
deleted file mode 100644
index 8e3ddbd781..0000000000
Binary files a/sound/direct_sound_samples/cries/dachsbun.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dachsbun.wav b/sound/direct_sound_samples/cries/dachsbun.wav
new file mode 100644
index 0000000000..870cb99aee
Binary files /dev/null and b/sound/direct_sound_samples/cries/dachsbun.wav differ
diff --git a/sound/direct_sound_samples/cries/darkrai.aif b/sound/direct_sound_samples/cries/darkrai.aif
deleted file mode 100644
index bfb37fca5b..0000000000
Binary files a/sound/direct_sound_samples/cries/darkrai.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/darkrai.wav b/sound/direct_sound_samples/cries/darkrai.wav
new file mode 100644
index 0000000000..3ff71721d5
Binary files /dev/null and b/sound/direct_sound_samples/cries/darkrai.wav differ
diff --git a/sound/direct_sound_samples/cries/darmanitan.aif b/sound/direct_sound_samples/cries/darmanitan.aif
deleted file mode 100644
index 902fdb69b4..0000000000
Binary files a/sound/direct_sound_samples/cries/darmanitan.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/darmanitan.wav b/sound/direct_sound_samples/cries/darmanitan.wav
new file mode 100644
index 0000000000..c39aafe52e
Binary files /dev/null and b/sound/direct_sound_samples/cries/darmanitan.wav differ
diff --git a/sound/direct_sound_samples/cries/dartrix.aif b/sound/direct_sound_samples/cries/dartrix.aif
deleted file mode 100644
index 894fefb331..0000000000
Binary files a/sound/direct_sound_samples/cries/dartrix.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dartrix.wav b/sound/direct_sound_samples/cries/dartrix.wav
new file mode 100644
index 0000000000..ac4ef1cfa7
Binary files /dev/null and b/sound/direct_sound_samples/cries/dartrix.wav differ
diff --git a/sound/direct_sound_samples/cries/darumaka.aif b/sound/direct_sound_samples/cries/darumaka.aif
deleted file mode 100644
index 849f0f1dab..0000000000
Binary files a/sound/direct_sound_samples/cries/darumaka.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/darumaka.wav b/sound/direct_sound_samples/cries/darumaka.wav
new file mode 100644
index 0000000000..f0feff8958
Binary files /dev/null and b/sound/direct_sound_samples/cries/darumaka.wav differ
diff --git a/sound/direct_sound_samples/cries/decidueye.aif b/sound/direct_sound_samples/cries/decidueye.aif
deleted file mode 100644
index dde3a574a9..0000000000
Binary files a/sound/direct_sound_samples/cries/decidueye.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/decidueye.wav b/sound/direct_sound_samples/cries/decidueye.wav
new file mode 100644
index 0000000000..df44f57bc0
Binary files /dev/null and b/sound/direct_sound_samples/cries/decidueye.wav differ
diff --git a/sound/direct_sound_samples/cries/dedenne.aif b/sound/direct_sound_samples/cries/dedenne.aif
deleted file mode 100644
index 843f5cf38f..0000000000
Binary files a/sound/direct_sound_samples/cries/dedenne.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dedenne.wav b/sound/direct_sound_samples/cries/dedenne.wav
new file mode 100644
index 0000000000..8b2472660b
Binary files /dev/null and b/sound/direct_sound_samples/cries/dedenne.wav differ
diff --git a/sound/direct_sound_samples/cries/deerling.aif b/sound/direct_sound_samples/cries/deerling.aif
deleted file mode 100644
index 9a4e8809b9..0000000000
Binary files a/sound/direct_sound_samples/cries/deerling.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/deerling.wav b/sound/direct_sound_samples/cries/deerling.wav
new file mode 100644
index 0000000000..655c5916c3
Binary files /dev/null and b/sound/direct_sound_samples/cries/deerling.wav differ
diff --git a/sound/direct_sound_samples/cries/deino.aif b/sound/direct_sound_samples/cries/deino.aif
deleted file mode 100644
index e5074d0821..0000000000
Binary files a/sound/direct_sound_samples/cries/deino.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/deino.wav b/sound/direct_sound_samples/cries/deino.wav
new file mode 100644
index 0000000000..f13aab187c
Binary files /dev/null and b/sound/direct_sound_samples/cries/deino.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 d4fe6c5c59..0000000000
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 0000000000..dce5e73b7a
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 f2e0d44642..0000000000
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 0000000000..7ccf645de6
Binary files /dev/null and b/sound/direct_sound_samples/cries/delibird.wav differ
diff --git a/sound/direct_sound_samples/cries/delphox.aif b/sound/direct_sound_samples/cries/delphox.aif
deleted file mode 100644
index 857af9f0ad..0000000000
Binary files a/sound/direct_sound_samples/cries/delphox.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/delphox.wav b/sound/direct_sound_samples/cries/delphox.wav
new file mode 100644
index 0000000000..b202343deb
Binary files /dev/null and b/sound/direct_sound_samples/cries/delphox.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 d9e3976e3c..0000000000
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 0000000000..7ed0f65cc1
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 daa3e5fd5c..0000000000
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 0000000000..24af04411a
Binary files /dev/null and b/sound/direct_sound_samples/cries/dewgong.wav differ
diff --git a/sound/direct_sound_samples/cries/dewott.aif b/sound/direct_sound_samples/cries/dewott.aif
deleted file mode 100644
index e654be2372..0000000000
Binary files a/sound/direct_sound_samples/cries/dewott.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dewott.wav b/sound/direct_sound_samples/cries/dewott.wav
new file mode 100644
index 0000000000..378ab5fbcb
Binary files /dev/null and b/sound/direct_sound_samples/cries/dewott.wav differ
diff --git a/sound/direct_sound_samples/cries/dewpider.aif b/sound/direct_sound_samples/cries/dewpider.aif
deleted file mode 100644
index 0d8ade106b..0000000000
Binary files a/sound/direct_sound_samples/cries/dewpider.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dewpider.wav b/sound/direct_sound_samples/cries/dewpider.wav
new file mode 100644
index 0000000000..97ad9d8262
Binary files /dev/null and b/sound/direct_sound_samples/cries/dewpider.wav differ
diff --git a/sound/direct_sound_samples/cries/dhelmise.aif b/sound/direct_sound_samples/cries/dhelmise.aif
deleted file mode 100644
index 892faf1909..0000000000
Binary files a/sound/direct_sound_samples/cries/dhelmise.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dhelmise.wav b/sound/direct_sound_samples/cries/dhelmise.wav
new file mode 100644
index 0000000000..0659563c76
Binary files /dev/null and b/sound/direct_sound_samples/cries/dhelmise.wav differ
diff --git a/sound/direct_sound_samples/cries/dialga.aif b/sound/direct_sound_samples/cries/dialga.aif
deleted file mode 100644
index ead8acb9a1..0000000000
Binary files a/sound/direct_sound_samples/cries/dialga.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dialga.wav b/sound/direct_sound_samples/cries/dialga.wav
new file mode 100644
index 0000000000..bb421999f1
Binary files /dev/null and b/sound/direct_sound_samples/cries/dialga.wav differ
diff --git a/sound/direct_sound_samples/cries/diancie.aif b/sound/direct_sound_samples/cries/diancie.aif
deleted file mode 100644
index a32ad4ff93..0000000000
Binary files a/sound/direct_sound_samples/cries/diancie.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/diancie.wav b/sound/direct_sound_samples/cries/diancie.wav
new file mode 100644
index 0000000000..ce1a602ebb
Binary files /dev/null and b/sound/direct_sound_samples/cries/diancie.wav differ
diff --git a/sound/direct_sound_samples/cries/diancie_mega.aif b/sound/direct_sound_samples/cries/diancie_mega.aif
deleted file mode 100644
index be62683153..0000000000
Binary files a/sound/direct_sound_samples/cries/diancie_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/diancie_mega.wav b/sound/direct_sound_samples/cries/diancie_mega.wav
new file mode 100644
index 0000000000..80bec59a51
Binary files /dev/null and b/sound/direct_sound_samples/cries/diancie_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/diggersby.aif b/sound/direct_sound_samples/cries/diggersby.aif
deleted file mode 100644
index 10dffad8ee..0000000000
Binary files a/sound/direct_sound_samples/cries/diggersby.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/diggersby.wav b/sound/direct_sound_samples/cries/diggersby.wav
new file mode 100644
index 0000000000..af1792443c
Binary files /dev/null and b/sound/direct_sound_samples/cries/diggersby.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 cd212878fd..0000000000
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 0000000000..8eecd3bedb
Binary files /dev/null and b/sound/direct_sound_samples/cries/diglett.wav differ
diff --git a/sound/direct_sound_samples/cries/dipplin.aif b/sound/direct_sound_samples/cries/dipplin.aif
deleted file mode 100644
index 5591528f9b..0000000000
Binary files a/sound/direct_sound_samples/cries/dipplin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dipplin.wav b/sound/direct_sound_samples/cries/dipplin.wav
new file mode 100644
index 0000000000..79f2d7a74c
Binary files /dev/null and b/sound/direct_sound_samples/cries/dipplin.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 8a1de24b25..0000000000
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 0000000000..bbd9d02804
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 507e4ef876..0000000000
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 0000000000..e43a8a9770
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 02c736d5a0..0000000000
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 0000000000..065e9fd62f
Binary files /dev/null and b/sound/direct_sound_samples/cries/doduo.wav differ
diff --git a/sound/direct_sound_samples/cries/dolliv.aif b/sound/direct_sound_samples/cries/dolliv.aif
deleted file mode 100644
index d0aae0c9ec..0000000000
Binary files a/sound/direct_sound_samples/cries/dolliv.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dolliv.wav b/sound/direct_sound_samples/cries/dolliv.wav
new file mode 100644
index 0000000000..df8eb73f81
Binary files /dev/null and b/sound/direct_sound_samples/cries/dolliv.wav differ
diff --git a/sound/direct_sound_samples/cries/dondozo.aif b/sound/direct_sound_samples/cries/dondozo.aif
deleted file mode 100644
index eddac5cc27..0000000000
Binary files a/sound/direct_sound_samples/cries/dondozo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dondozo.wav b/sound/direct_sound_samples/cries/dondozo.wav
new file mode 100644
index 0000000000..1462faa4a9
Binary files /dev/null and b/sound/direct_sound_samples/cries/dondozo.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 795cdaef45..0000000000
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 0000000000..ba6caf5bd8
Binary files /dev/null and b/sound/direct_sound_samples/cries/donphan.wav differ
diff --git a/sound/direct_sound_samples/cries/dottler.aif b/sound/direct_sound_samples/cries/dottler.aif
deleted file mode 100644
index 4ab520a4ae..0000000000
Binary files a/sound/direct_sound_samples/cries/dottler.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dottler.wav b/sound/direct_sound_samples/cries/dottler.wav
new file mode 100644
index 0000000000..7c21ff1251
Binary files /dev/null and b/sound/direct_sound_samples/cries/dottler.wav differ
diff --git a/sound/direct_sound_samples/cries/doublade.aif b/sound/direct_sound_samples/cries/doublade.aif
deleted file mode 100644
index d931b3de0a..0000000000
Binary files a/sound/direct_sound_samples/cries/doublade.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/doublade.wav b/sound/direct_sound_samples/cries/doublade.wav
new file mode 100644
index 0000000000..4b76e5ccce
Binary files /dev/null and b/sound/direct_sound_samples/cries/doublade.wav differ
diff --git a/sound/direct_sound_samples/cries/dracovish.aif b/sound/direct_sound_samples/cries/dracovish.aif
deleted file mode 100644
index e59b15f274..0000000000
Binary files a/sound/direct_sound_samples/cries/dracovish.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dracovish.wav b/sound/direct_sound_samples/cries/dracovish.wav
new file mode 100644
index 0000000000..1d8e2ee1f2
Binary files /dev/null and b/sound/direct_sound_samples/cries/dracovish.wav differ
diff --git a/sound/direct_sound_samples/cries/dracozolt.aif b/sound/direct_sound_samples/cries/dracozolt.aif
deleted file mode 100644
index 0c2b86f4b0..0000000000
Binary files a/sound/direct_sound_samples/cries/dracozolt.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dracozolt.wav b/sound/direct_sound_samples/cries/dracozolt.wav
new file mode 100644
index 0000000000..bce799d026
Binary files /dev/null and b/sound/direct_sound_samples/cries/dracozolt.wav differ
diff --git a/sound/direct_sound_samples/cries/dragalge.aif b/sound/direct_sound_samples/cries/dragalge.aif
deleted file mode 100644
index a9d11e9b65..0000000000
Binary files a/sound/direct_sound_samples/cries/dragalge.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dragalge.wav b/sound/direct_sound_samples/cries/dragalge.wav
new file mode 100644
index 0000000000..a4ce94444c
Binary files /dev/null and b/sound/direct_sound_samples/cries/dragalge.wav differ
diff --git a/sound/direct_sound_samples/cries/dragapult.aif b/sound/direct_sound_samples/cries/dragapult.aif
deleted file mode 100644
index 7e34c9bb1b..0000000000
Binary files a/sound/direct_sound_samples/cries/dragapult.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dragapult.wav b/sound/direct_sound_samples/cries/dragapult.wav
new file mode 100644
index 0000000000..b0086241f5
Binary files /dev/null and b/sound/direct_sound_samples/cries/dragapult.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 6cdc594f63..0000000000
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 0000000000..3fd2efee29
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 ab1a7af1c1..0000000000
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 0000000000..8517e0da0f
Binary files /dev/null and b/sound/direct_sound_samples/cries/dragonite.wav differ
diff --git a/sound/direct_sound_samples/cries/drakloak.aif b/sound/direct_sound_samples/cries/drakloak.aif
deleted file mode 100644
index 7b9beaad89..0000000000
Binary files a/sound/direct_sound_samples/cries/drakloak.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/drakloak.wav b/sound/direct_sound_samples/cries/drakloak.wav
new file mode 100644
index 0000000000..e8cc04483f
Binary files /dev/null and b/sound/direct_sound_samples/cries/drakloak.wav differ
diff --git a/sound/direct_sound_samples/cries/drampa.aif b/sound/direct_sound_samples/cries/drampa.aif
deleted file mode 100644
index 81e185711e..0000000000
Binary files a/sound/direct_sound_samples/cries/drampa.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/drampa.wav b/sound/direct_sound_samples/cries/drampa.wav
new file mode 100644
index 0000000000..fd7b9b4f50
Binary files /dev/null and b/sound/direct_sound_samples/cries/drampa.wav differ
diff --git a/sound/direct_sound_samples/cries/drapion.aif b/sound/direct_sound_samples/cries/drapion.aif
deleted file mode 100644
index 4ce0382fdc..0000000000
Binary files a/sound/direct_sound_samples/cries/drapion.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/drapion.wav b/sound/direct_sound_samples/cries/drapion.wav
new file mode 100644
index 0000000000..2aae89e669
Binary files /dev/null and b/sound/direct_sound_samples/cries/drapion.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 d79420d9c6..0000000000
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 0000000000..711c6b9a30
Binary files /dev/null and b/sound/direct_sound_samples/cries/dratini.wav differ
diff --git a/sound/direct_sound_samples/cries/drednaw.aif b/sound/direct_sound_samples/cries/drednaw.aif
deleted file mode 100644
index 8dd2c85409..0000000000
Binary files a/sound/direct_sound_samples/cries/drednaw.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/drednaw.wav b/sound/direct_sound_samples/cries/drednaw.wav
new file mode 100644
index 0000000000..ea83c848ef
Binary files /dev/null and b/sound/direct_sound_samples/cries/drednaw.wav differ
diff --git a/sound/direct_sound_samples/cries/dreepy.aif b/sound/direct_sound_samples/cries/dreepy.aif
deleted file mode 100644
index 12217a7f49..0000000000
Binary files a/sound/direct_sound_samples/cries/dreepy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dreepy.wav b/sound/direct_sound_samples/cries/dreepy.wav
new file mode 100644
index 0000000000..9e3dd46766
Binary files /dev/null and b/sound/direct_sound_samples/cries/dreepy.wav differ
diff --git a/sound/direct_sound_samples/cries/drifblim.aif b/sound/direct_sound_samples/cries/drifblim.aif
deleted file mode 100644
index 891c49f205..0000000000
Binary files a/sound/direct_sound_samples/cries/drifblim.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/drifblim.wav b/sound/direct_sound_samples/cries/drifblim.wav
new file mode 100644
index 0000000000..04d211e1ba
Binary files /dev/null and b/sound/direct_sound_samples/cries/drifblim.wav differ
diff --git a/sound/direct_sound_samples/cries/drifloon.aif b/sound/direct_sound_samples/cries/drifloon.aif
deleted file mode 100644
index ba4c94e979..0000000000
Binary files a/sound/direct_sound_samples/cries/drifloon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/drifloon.wav b/sound/direct_sound_samples/cries/drifloon.wav
new file mode 100644
index 0000000000..6cc70ceb21
Binary files /dev/null and b/sound/direct_sound_samples/cries/drifloon.wav differ
diff --git a/sound/direct_sound_samples/cries/drilbur.aif b/sound/direct_sound_samples/cries/drilbur.aif
deleted file mode 100644
index 105867ee08..0000000000
Binary files a/sound/direct_sound_samples/cries/drilbur.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/drilbur.wav b/sound/direct_sound_samples/cries/drilbur.wav
new file mode 100644
index 0000000000..c2c986331d
Binary files /dev/null and b/sound/direct_sound_samples/cries/drilbur.wav differ
diff --git a/sound/direct_sound_samples/cries/drizzile.aif b/sound/direct_sound_samples/cries/drizzile.aif
deleted file mode 100644
index fde8abfbfe..0000000000
Binary files a/sound/direct_sound_samples/cries/drizzile.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/drizzile.wav b/sound/direct_sound_samples/cries/drizzile.wav
new file mode 100644
index 0000000000..ebea7fbca0
Binary files /dev/null and b/sound/direct_sound_samples/cries/drizzile.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 d25203e123..0000000000
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 0000000000..4132109663
Binary files /dev/null and b/sound/direct_sound_samples/cries/drowzee.wav differ
diff --git a/sound/direct_sound_samples/cries/druddigon.aif b/sound/direct_sound_samples/cries/druddigon.aif
deleted file mode 100644
index 01bed53f92..0000000000
Binary files a/sound/direct_sound_samples/cries/druddigon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/druddigon.wav b/sound/direct_sound_samples/cries/druddigon.wav
new file mode 100644
index 0000000000..b1c7c7ce21
Binary files /dev/null and b/sound/direct_sound_samples/cries/druddigon.wav differ
diff --git a/sound/direct_sound_samples/cries/dubwool.aif b/sound/direct_sound_samples/cries/dubwool.aif
deleted file mode 100644
index 42f23089af..0000000000
Binary files a/sound/direct_sound_samples/cries/dubwool.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dubwool.wav b/sound/direct_sound_samples/cries/dubwool.wav
new file mode 100644
index 0000000000..a70cb4b18b
Binary files /dev/null and b/sound/direct_sound_samples/cries/dubwool.wav differ
diff --git a/sound/direct_sound_samples/cries/ducklett.aif b/sound/direct_sound_samples/cries/ducklett.aif
deleted file mode 100644
index a95520506b..0000000000
Binary files a/sound/direct_sound_samples/cries/ducklett.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ducklett.wav b/sound/direct_sound_samples/cries/ducklett.wav
new file mode 100644
index 0000000000..1748d7cb75
Binary files /dev/null and b/sound/direct_sound_samples/cries/ducklett.wav differ
diff --git a/sound/direct_sound_samples/cries/dudunsparce.aif b/sound/direct_sound_samples/cries/dudunsparce.aif
deleted file mode 100644
index faec8aae53..0000000000
Binary files a/sound/direct_sound_samples/cries/dudunsparce.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dudunsparce.wav b/sound/direct_sound_samples/cries/dudunsparce.wav
new file mode 100644
index 0000000000..dc0244f241
Binary files /dev/null and b/sound/direct_sound_samples/cries/dudunsparce.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 1a0a05ecd0..0000000000
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 0000000000..d159a2fae0
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 da70bedf08..0000000000
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 0000000000..5154546d10
Binary files /dev/null and b/sound/direct_sound_samples/cries/dunsparce.wav differ
diff --git a/sound/direct_sound_samples/cries/duosion.aif b/sound/direct_sound_samples/cries/duosion.aif
deleted file mode 100644
index 4022984f1a..0000000000
Binary files a/sound/direct_sound_samples/cries/duosion.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/duosion.wav b/sound/direct_sound_samples/cries/duosion.wav
new file mode 100644
index 0000000000..1850cd3937
Binary files /dev/null and b/sound/direct_sound_samples/cries/duosion.wav differ
diff --git a/sound/direct_sound_samples/cries/duraludon.aif b/sound/direct_sound_samples/cries/duraludon.aif
deleted file mode 100644
index 09be7c3ed9..0000000000
Binary files a/sound/direct_sound_samples/cries/duraludon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/duraludon.wav b/sound/direct_sound_samples/cries/duraludon.wav
new file mode 100644
index 0000000000..ae0345be14
Binary files /dev/null and b/sound/direct_sound_samples/cries/duraludon.wav differ
diff --git a/sound/direct_sound_samples/cries/durant.aif b/sound/direct_sound_samples/cries/durant.aif
deleted file mode 100644
index c0b19642c1..0000000000
Binary files a/sound/direct_sound_samples/cries/durant.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/durant.wav b/sound/direct_sound_samples/cries/durant.wav
new file mode 100644
index 0000000000..8a798caf7f
Binary files /dev/null and b/sound/direct_sound_samples/cries/durant.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 084c74ee87..0000000000
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 0000000000..81353887b9
Binary files /dev/null and b/sound/direct_sound_samples/cries/dusclops.wav differ
diff --git a/sound/direct_sound_samples/cries/dusknoir.aif b/sound/direct_sound_samples/cries/dusknoir.aif
deleted file mode 100644
index bb1d605671..0000000000
Binary files a/sound/direct_sound_samples/cries/dusknoir.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dusknoir.wav b/sound/direct_sound_samples/cries/dusknoir.wav
new file mode 100644
index 0000000000..333bd0448c
Binary files /dev/null and b/sound/direct_sound_samples/cries/dusknoir.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 523997cbf0..0000000000
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 0000000000..eba8fc3ff1
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 5ab919b520..0000000000
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 0000000000..42f23c1289
Binary files /dev/null and b/sound/direct_sound_samples/cries/dustox.wav differ
diff --git a/sound/direct_sound_samples/cries/dwebble.aif b/sound/direct_sound_samples/cries/dwebble.aif
deleted file mode 100644
index 1aff103323..0000000000
Binary files a/sound/direct_sound_samples/cries/dwebble.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/dwebble.wav b/sound/direct_sound_samples/cries/dwebble.wav
new file mode 100644
index 0000000000..81d2af0f7f
Binary files /dev/null and b/sound/direct_sound_samples/cries/dwebble.wav differ
diff --git a/sound/direct_sound_samples/cries/eelektrik.aif b/sound/direct_sound_samples/cries/eelektrik.aif
deleted file mode 100644
index d39453bc0d..0000000000
Binary files a/sound/direct_sound_samples/cries/eelektrik.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/eelektrik.wav b/sound/direct_sound_samples/cries/eelektrik.wav
new file mode 100644
index 0000000000..d0bf262cd3
Binary files /dev/null and b/sound/direct_sound_samples/cries/eelektrik.wav differ
diff --git a/sound/direct_sound_samples/cries/eelektross.aif b/sound/direct_sound_samples/cries/eelektross.aif
deleted file mode 100644
index b618fa5e97..0000000000
Binary files a/sound/direct_sound_samples/cries/eelektross.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/eelektross.wav b/sound/direct_sound_samples/cries/eelektross.wav
new file mode 100644
index 0000000000..4b65a7aced
Binary files /dev/null and b/sound/direct_sound_samples/cries/eelektross.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 0706209843..0000000000
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 0000000000..e21ce1f0e7
Binary files /dev/null and b/sound/direct_sound_samples/cries/eevee.wav differ
diff --git a/sound/direct_sound_samples/cries/eiscue_ice_face.aif b/sound/direct_sound_samples/cries/eiscue_ice_face.aif
deleted file mode 100644
index 5c6c7d52dd..0000000000
Binary files a/sound/direct_sound_samples/cries/eiscue_ice_face.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/eiscue_ice_face.wav b/sound/direct_sound_samples/cries/eiscue_ice_face.wav
new file mode 100644
index 0000000000..cf21e9ed35
Binary files /dev/null and b/sound/direct_sound_samples/cries/eiscue_ice_face.wav differ
diff --git a/sound/direct_sound_samples/cries/eiscue_noice_face.aif b/sound/direct_sound_samples/cries/eiscue_noice_face.aif
deleted file mode 100644
index e591e3e2ca..0000000000
Binary files a/sound/direct_sound_samples/cries/eiscue_noice_face.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/eiscue_noice_face.wav b/sound/direct_sound_samples/cries/eiscue_noice_face.wav
new file mode 100644
index 0000000000..b928e3211c
Binary files /dev/null and b/sound/direct_sound_samples/cries/eiscue_noice_face.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 80bc2fdfec..0000000000
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 0000000000..2ae3e4a180
Binary files /dev/null and b/sound/direct_sound_samples/cries/ekans.wav differ
diff --git a/sound/direct_sound_samples/cries/eldegoss.aif b/sound/direct_sound_samples/cries/eldegoss.aif
deleted file mode 100644
index 56f9419b36..0000000000
Binary files a/sound/direct_sound_samples/cries/eldegoss.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/eldegoss.wav b/sound/direct_sound_samples/cries/eldegoss.wav
new file mode 100644
index 0000000000..d5c9ccd7e6
Binary files /dev/null and b/sound/direct_sound_samples/cries/eldegoss.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 6071f1d4a9..0000000000
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 0000000000..b555d6631a
Binary files /dev/null and b/sound/direct_sound_samples/cries/electabuzz.wav differ
diff --git a/sound/direct_sound_samples/cries/electivire.aif b/sound/direct_sound_samples/cries/electivire.aif
deleted file mode 100644
index 9b9c17907d..0000000000
Binary files a/sound/direct_sound_samples/cries/electivire.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/electivire.wav b/sound/direct_sound_samples/cries/electivire.wav
new file mode 100644
index 0000000000..33f250d046
Binary files /dev/null and b/sound/direct_sound_samples/cries/electivire.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 e7dcc64248..0000000000
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 0000000000..8a210865bf
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 96e627bba5..0000000000
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 0000000000..8f28521464
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 99b3f959d5..0000000000
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 0000000000..82a9a2f675
Binary files /dev/null and b/sound/direct_sound_samples/cries/elekid.wav differ
diff --git a/sound/direct_sound_samples/cries/elgyem.aif b/sound/direct_sound_samples/cries/elgyem.aif
deleted file mode 100644
index 04e9ec7ab6..0000000000
Binary files a/sound/direct_sound_samples/cries/elgyem.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/elgyem.wav b/sound/direct_sound_samples/cries/elgyem.wav
new file mode 100644
index 0000000000..825cb7f86a
Binary files /dev/null and b/sound/direct_sound_samples/cries/elgyem.wav differ
diff --git a/sound/direct_sound_samples/cries/emboar.aif b/sound/direct_sound_samples/cries/emboar.aif
deleted file mode 100644
index 7bf61d285e..0000000000
Binary files a/sound/direct_sound_samples/cries/emboar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/emboar.wav b/sound/direct_sound_samples/cries/emboar.wav
new file mode 100644
index 0000000000..29d0d5dbe1
Binary files /dev/null and b/sound/direct_sound_samples/cries/emboar.wav differ
diff --git a/sound/direct_sound_samples/cries/emolga.aif b/sound/direct_sound_samples/cries/emolga.aif
deleted file mode 100644
index 20172f1446..0000000000
Binary files a/sound/direct_sound_samples/cries/emolga.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/emolga.wav b/sound/direct_sound_samples/cries/emolga.wav
new file mode 100644
index 0000000000..a15a472d96
Binary files /dev/null and b/sound/direct_sound_samples/cries/emolga.wav differ
diff --git a/sound/direct_sound_samples/cries/empoleon.aif b/sound/direct_sound_samples/cries/empoleon.aif
deleted file mode 100644
index 742bdf8124..0000000000
Binary files a/sound/direct_sound_samples/cries/empoleon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/empoleon.wav b/sound/direct_sound_samples/cries/empoleon.wav
new file mode 100644
index 0000000000..e7edb4111f
Binary files /dev/null and b/sound/direct_sound_samples/cries/empoleon.wav differ
diff --git a/sound/direct_sound_samples/cries/enamorus_incarnate.aif b/sound/direct_sound_samples/cries/enamorus_incarnate.aif
deleted file mode 100644
index 71068d9b7b..0000000000
Binary files a/sound/direct_sound_samples/cries/enamorus_incarnate.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/enamorus_incarnate.wav b/sound/direct_sound_samples/cries/enamorus_incarnate.wav
new file mode 100644
index 0000000000..22cb614f7b
Binary files /dev/null and b/sound/direct_sound_samples/cries/enamorus_incarnate.wav differ
diff --git a/sound/direct_sound_samples/cries/enamorus_therian.aif b/sound/direct_sound_samples/cries/enamorus_therian.aif
deleted file mode 100644
index 4286a98b69..0000000000
Binary files a/sound/direct_sound_samples/cries/enamorus_therian.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/enamorus_therian.wav b/sound/direct_sound_samples/cries/enamorus_therian.wav
new file mode 100644
index 0000000000..d7fa97072b
Binary files /dev/null and b/sound/direct_sound_samples/cries/enamorus_therian.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 1e5eff6876..0000000000
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 0000000000..cf7e9c0c2f
Binary files /dev/null and b/sound/direct_sound_samples/cries/entei.wav differ
diff --git a/sound/direct_sound_samples/cries/escavalier.aif b/sound/direct_sound_samples/cries/escavalier.aif
deleted file mode 100644
index 7ef48d2293..0000000000
Binary files a/sound/direct_sound_samples/cries/escavalier.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/escavalier.wav b/sound/direct_sound_samples/cries/escavalier.wav
new file mode 100644
index 0000000000..950107a7e1
Binary files /dev/null and b/sound/direct_sound_samples/cries/escavalier.wav differ
diff --git a/sound/direct_sound_samples/cries/espathra.aif b/sound/direct_sound_samples/cries/espathra.aif
deleted file mode 100644
index 5a196762b1..0000000000
Binary files a/sound/direct_sound_samples/cries/espathra.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/espathra.wav b/sound/direct_sound_samples/cries/espathra.wav
new file mode 100644
index 0000000000..8959b7c05a
Binary files /dev/null and b/sound/direct_sound_samples/cries/espathra.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 bf1f52c94d..0000000000
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 0000000000..20743268e1
Binary files /dev/null and b/sound/direct_sound_samples/cries/espeon.wav differ
diff --git a/sound/direct_sound_samples/cries/espurr.aif b/sound/direct_sound_samples/cries/espurr.aif
deleted file mode 100644
index 6d82769b36..0000000000
Binary files a/sound/direct_sound_samples/cries/espurr.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/espurr.wav b/sound/direct_sound_samples/cries/espurr.wav
new file mode 100644
index 0000000000..4cb90cdf66
Binary files /dev/null and b/sound/direct_sound_samples/cries/espurr.wav differ
diff --git a/sound/direct_sound_samples/cries/eternatus.aif b/sound/direct_sound_samples/cries/eternatus.aif
deleted file mode 100644
index 235bba61f9..0000000000
Binary files a/sound/direct_sound_samples/cries/eternatus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/eternatus.wav b/sound/direct_sound_samples/cries/eternatus.wav
new file mode 100644
index 0000000000..64f43baa78
Binary files /dev/null and b/sound/direct_sound_samples/cries/eternatus.wav differ
diff --git a/sound/direct_sound_samples/cries/eternatus_eternamax.aif b/sound/direct_sound_samples/cries/eternatus_eternamax.aif
deleted file mode 100644
index 7c6b292d4d..0000000000
Binary files a/sound/direct_sound_samples/cries/eternatus_eternamax.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/eternatus_eternamax.wav b/sound/direct_sound_samples/cries/eternatus_eternamax.wav
new file mode 100644
index 0000000000..3d7638de16
Binary files /dev/null and b/sound/direct_sound_samples/cries/eternatus_eternamax.wav differ
diff --git a/sound/direct_sound_samples/cries/excadrill.aif b/sound/direct_sound_samples/cries/excadrill.aif
deleted file mode 100644
index cd372dffdb..0000000000
Binary files a/sound/direct_sound_samples/cries/excadrill.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/excadrill.wav b/sound/direct_sound_samples/cries/excadrill.wav
new file mode 100644
index 0000000000..4ba4a2d1ff
Binary files /dev/null and b/sound/direct_sound_samples/cries/excadrill.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 bd634c7570..0000000000
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 0000000000..bfd825f800
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 094b27bc6f..0000000000
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 0000000000..f2a0d6bedc
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 98dafb1ee1..0000000000
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 0000000000..9b3cbf896b
Binary files /dev/null and b/sound/direct_sound_samples/cries/exploud.wav differ
diff --git a/sound/direct_sound_samples/cries/falinks.aif b/sound/direct_sound_samples/cries/falinks.aif
deleted file mode 100644
index 6fa1af8df4..0000000000
Binary files a/sound/direct_sound_samples/cries/falinks.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/falinks.wav b/sound/direct_sound_samples/cries/falinks.wav
new file mode 100644
index 0000000000..f3df8ba9cf
Binary files /dev/null and b/sound/direct_sound_samples/cries/falinks.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 5a710ed7de..0000000000
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 0000000000..d090445d41
Binary files /dev/null and b/sound/direct_sound_samples/cries/farfetchd.wav differ
diff --git a/sound/direct_sound_samples/cries/farigiraf.aif b/sound/direct_sound_samples/cries/farigiraf.aif
deleted file mode 100644
index d862b0d30e..0000000000
Binary files a/sound/direct_sound_samples/cries/farigiraf.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/farigiraf.wav b/sound/direct_sound_samples/cries/farigiraf.wav
new file mode 100644
index 0000000000..9b3c261949
Binary files /dev/null and b/sound/direct_sound_samples/cries/farigiraf.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 7922698482..0000000000
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 0000000000..6ef7eadee9
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 fc6e757134..0000000000
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 0000000000..a8f60a55f6
Binary files /dev/null and b/sound/direct_sound_samples/cries/feebas.wav differ
diff --git a/sound/direct_sound_samples/cries/fennekin.aif b/sound/direct_sound_samples/cries/fennekin.aif
deleted file mode 100644
index 3feb83cdf8..0000000000
Binary files a/sound/direct_sound_samples/cries/fennekin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/fennekin.wav b/sound/direct_sound_samples/cries/fennekin.wav
new file mode 100644
index 0000000000..3e187d6d1b
Binary files /dev/null and b/sound/direct_sound_samples/cries/fennekin.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 c71d66722b..0000000000
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 0000000000..d1da192f90
Binary files /dev/null and b/sound/direct_sound_samples/cries/feraligatr.wav differ
diff --git a/sound/direct_sound_samples/cries/ferroseed.aif b/sound/direct_sound_samples/cries/ferroseed.aif
deleted file mode 100644
index 1acd8342d0..0000000000
Binary files a/sound/direct_sound_samples/cries/ferroseed.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ferroseed.wav b/sound/direct_sound_samples/cries/ferroseed.wav
new file mode 100644
index 0000000000..0c74da6aea
Binary files /dev/null and b/sound/direct_sound_samples/cries/ferroseed.wav differ
diff --git a/sound/direct_sound_samples/cries/ferrothorn.aif b/sound/direct_sound_samples/cries/ferrothorn.aif
deleted file mode 100644
index 7e7f1ad3ad..0000000000
Binary files a/sound/direct_sound_samples/cries/ferrothorn.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ferrothorn.wav b/sound/direct_sound_samples/cries/ferrothorn.wav
new file mode 100644
index 0000000000..30d61a2f2b
Binary files /dev/null and b/sound/direct_sound_samples/cries/ferrothorn.wav differ
diff --git a/sound/direct_sound_samples/cries/fezandipiti.aif b/sound/direct_sound_samples/cries/fezandipiti.aif
deleted file mode 100644
index d24a32b9c7..0000000000
Binary files a/sound/direct_sound_samples/cries/fezandipiti.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/fezandipiti.wav b/sound/direct_sound_samples/cries/fezandipiti.wav
new file mode 100644
index 0000000000..cb99f08edd
Binary files /dev/null and b/sound/direct_sound_samples/cries/fezandipiti.wav differ
diff --git a/sound/direct_sound_samples/cries/fidough.aif b/sound/direct_sound_samples/cries/fidough.aif
deleted file mode 100644
index f2063bc79b..0000000000
Binary files a/sound/direct_sound_samples/cries/fidough.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/fidough.wav b/sound/direct_sound_samples/cries/fidough.wav
new file mode 100644
index 0000000000..d0af55bac8
Binary files /dev/null and b/sound/direct_sound_samples/cries/fidough.wav differ
diff --git a/sound/direct_sound_samples/cries/finizen.aif b/sound/direct_sound_samples/cries/finizen.aif
deleted file mode 100644
index 07af24f696..0000000000
Binary files a/sound/direct_sound_samples/cries/finizen.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/finizen.wav b/sound/direct_sound_samples/cries/finizen.wav
new file mode 100644
index 0000000000..f7d338dd7c
Binary files /dev/null and b/sound/direct_sound_samples/cries/finizen.wav differ
diff --git a/sound/direct_sound_samples/cries/finneon.aif b/sound/direct_sound_samples/cries/finneon.aif
deleted file mode 100644
index c2fe2f38ba..0000000000
Binary files a/sound/direct_sound_samples/cries/finneon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/finneon.wav b/sound/direct_sound_samples/cries/finneon.wav
new file mode 100644
index 0000000000..d5a706b1c8
Binary files /dev/null and b/sound/direct_sound_samples/cries/finneon.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 068e82e76c..0000000000
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 0000000000..a0cf3df062
Binary files /dev/null and b/sound/direct_sound_samples/cries/flaaffy.wav differ
diff --git a/sound/direct_sound_samples/cries/flabebe.aif b/sound/direct_sound_samples/cries/flabebe.aif
deleted file mode 100644
index a6dbe0321c..0000000000
Binary files a/sound/direct_sound_samples/cries/flabebe.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/flabebe.wav b/sound/direct_sound_samples/cries/flabebe.wav
new file mode 100644
index 0000000000..d93a0f4a4b
Binary files /dev/null and b/sound/direct_sound_samples/cries/flabebe.wav differ
diff --git a/sound/direct_sound_samples/cries/flamigo.aif b/sound/direct_sound_samples/cries/flamigo.aif
deleted file mode 100644
index 2b022da5b0..0000000000
Binary files a/sound/direct_sound_samples/cries/flamigo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/flamigo.wav b/sound/direct_sound_samples/cries/flamigo.wav
new file mode 100644
index 0000000000..1a47bf593a
Binary files /dev/null and b/sound/direct_sound_samples/cries/flamigo.wav differ
diff --git a/sound/direct_sound_samples/cries/flapple.aif b/sound/direct_sound_samples/cries/flapple.aif
deleted file mode 100644
index 844318022e..0000000000
Binary files a/sound/direct_sound_samples/cries/flapple.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/flapple.wav b/sound/direct_sound_samples/cries/flapple.wav
new file mode 100644
index 0000000000..4120296cc7
Binary files /dev/null and b/sound/direct_sound_samples/cries/flapple.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 b8d33df49e..0000000000
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 0000000000..6bd51168b3
Binary files /dev/null and b/sound/direct_sound_samples/cries/flareon.wav differ
diff --git a/sound/direct_sound_samples/cries/fletchinder.aif b/sound/direct_sound_samples/cries/fletchinder.aif
deleted file mode 100644
index 2267e3fdfc..0000000000
Binary files a/sound/direct_sound_samples/cries/fletchinder.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/fletchinder.wav b/sound/direct_sound_samples/cries/fletchinder.wav
new file mode 100644
index 0000000000..a5e0a7bac4
Binary files /dev/null and b/sound/direct_sound_samples/cries/fletchinder.wav differ
diff --git a/sound/direct_sound_samples/cries/fletchling.aif b/sound/direct_sound_samples/cries/fletchling.aif
deleted file mode 100644
index ce9085845f..0000000000
Binary files a/sound/direct_sound_samples/cries/fletchling.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/fletchling.wav b/sound/direct_sound_samples/cries/fletchling.wav
new file mode 100644
index 0000000000..7b8cb393ec
Binary files /dev/null and b/sound/direct_sound_samples/cries/fletchling.wav differ
diff --git a/sound/direct_sound_samples/cries/flittle.aif b/sound/direct_sound_samples/cries/flittle.aif
deleted file mode 100644
index d81016a64d..0000000000
Binary files a/sound/direct_sound_samples/cries/flittle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/flittle.wav b/sound/direct_sound_samples/cries/flittle.wav
new file mode 100644
index 0000000000..da2b154d2a
Binary files /dev/null and b/sound/direct_sound_samples/cries/flittle.wav differ
diff --git a/sound/direct_sound_samples/cries/floatzel.aif b/sound/direct_sound_samples/cries/floatzel.aif
deleted file mode 100644
index 36f34f5e90..0000000000
Binary files a/sound/direct_sound_samples/cries/floatzel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/floatzel.wav b/sound/direct_sound_samples/cries/floatzel.wav
new file mode 100644
index 0000000000..33e8eecf43
Binary files /dev/null and b/sound/direct_sound_samples/cries/floatzel.wav differ
diff --git a/sound/direct_sound_samples/cries/floette.aif b/sound/direct_sound_samples/cries/floette.aif
deleted file mode 100644
index 4244ce8eda..0000000000
Binary files a/sound/direct_sound_samples/cries/floette.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/floette.wav b/sound/direct_sound_samples/cries/floette.wav
new file mode 100644
index 0000000000..36000d14ac
Binary files /dev/null and b/sound/direct_sound_samples/cries/floette.wav differ
diff --git a/sound/direct_sound_samples/cries/floette_eternal.aif b/sound/direct_sound_samples/cries/floette_eternal.aif
deleted file mode 100644
index 386815f082..0000000000
Binary files a/sound/direct_sound_samples/cries/floette_eternal.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/floette_eternal.wav b/sound/direct_sound_samples/cries/floette_eternal.wav
new file mode 100644
index 0000000000..a4cc2b3a81
Binary files /dev/null and b/sound/direct_sound_samples/cries/floette_eternal.wav differ
diff --git a/sound/direct_sound_samples/cries/floragato.aif b/sound/direct_sound_samples/cries/floragato.aif
deleted file mode 100644
index 4fc8832423..0000000000
Binary files a/sound/direct_sound_samples/cries/floragato.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/floragato.wav b/sound/direct_sound_samples/cries/floragato.wav
new file mode 100644
index 0000000000..64fa6df859
Binary files /dev/null and b/sound/direct_sound_samples/cries/floragato.wav differ
diff --git a/sound/direct_sound_samples/cries/florges.aif b/sound/direct_sound_samples/cries/florges.aif
deleted file mode 100644
index e652e68fa9..0000000000
Binary files a/sound/direct_sound_samples/cries/florges.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/florges.wav b/sound/direct_sound_samples/cries/florges.wav
new file mode 100644
index 0000000000..180c6490bb
Binary files /dev/null and b/sound/direct_sound_samples/cries/florges.wav differ
diff --git a/sound/direct_sound_samples/cries/flutter_mane.aif b/sound/direct_sound_samples/cries/flutter_mane.aif
deleted file mode 100644
index ad4c636fe7..0000000000
Binary files a/sound/direct_sound_samples/cries/flutter_mane.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/flutter_mane.wav b/sound/direct_sound_samples/cries/flutter_mane.wav
new file mode 100644
index 0000000000..c52aeabc5c
Binary files /dev/null and b/sound/direct_sound_samples/cries/flutter_mane.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 c8b793f4f9..0000000000
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 0000000000..b6c5d90ba0
Binary files /dev/null and b/sound/direct_sound_samples/cries/flygon.wav differ
diff --git a/sound/direct_sound_samples/cries/fomantis.aif b/sound/direct_sound_samples/cries/fomantis.aif
deleted file mode 100644
index a82e4d4524..0000000000
Binary files a/sound/direct_sound_samples/cries/fomantis.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/fomantis.wav b/sound/direct_sound_samples/cries/fomantis.wav
new file mode 100644
index 0000000000..d3de05db55
Binary files /dev/null and b/sound/direct_sound_samples/cries/fomantis.wav differ
diff --git a/sound/direct_sound_samples/cries/foongus.aif b/sound/direct_sound_samples/cries/foongus.aif
deleted file mode 100644
index ca83e1b475..0000000000
Binary files a/sound/direct_sound_samples/cries/foongus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/foongus.wav b/sound/direct_sound_samples/cries/foongus.wav
new file mode 100644
index 0000000000..6c2c2381e0
Binary files /dev/null and b/sound/direct_sound_samples/cries/foongus.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 9b8af8baa4..0000000000
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 0000000000..3f704f65b5
Binary files /dev/null and b/sound/direct_sound_samples/cries/forretress.wav differ
diff --git a/sound/direct_sound_samples/cries/fraxure.aif b/sound/direct_sound_samples/cries/fraxure.aif
deleted file mode 100644
index 4586702b00..0000000000
Binary files a/sound/direct_sound_samples/cries/fraxure.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/fraxure.wav b/sound/direct_sound_samples/cries/fraxure.wav
new file mode 100644
index 0000000000..6759da7a1d
Binary files /dev/null and b/sound/direct_sound_samples/cries/fraxure.wav differ
diff --git a/sound/direct_sound_samples/cries/frigibax.aif b/sound/direct_sound_samples/cries/frigibax.aif
deleted file mode 100644
index e8318a0cf1..0000000000
Binary files a/sound/direct_sound_samples/cries/frigibax.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/frigibax.wav b/sound/direct_sound_samples/cries/frigibax.wav
new file mode 100644
index 0000000000..200f6f7da4
Binary files /dev/null and b/sound/direct_sound_samples/cries/frigibax.wav differ
diff --git a/sound/direct_sound_samples/cries/frillish.aif b/sound/direct_sound_samples/cries/frillish.aif
deleted file mode 100644
index 71511b8bcf..0000000000
Binary files a/sound/direct_sound_samples/cries/frillish.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/frillish.wav b/sound/direct_sound_samples/cries/frillish.wav
new file mode 100644
index 0000000000..45adf7c08c
Binary files /dev/null and b/sound/direct_sound_samples/cries/frillish.wav differ
diff --git a/sound/direct_sound_samples/cries/froakie.aif b/sound/direct_sound_samples/cries/froakie.aif
deleted file mode 100644
index d6955de8bc..0000000000
Binary files a/sound/direct_sound_samples/cries/froakie.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/froakie.wav b/sound/direct_sound_samples/cries/froakie.wav
new file mode 100644
index 0000000000..0099799d73
Binary files /dev/null and b/sound/direct_sound_samples/cries/froakie.wav differ
diff --git a/sound/direct_sound_samples/cries/frogadier.aif b/sound/direct_sound_samples/cries/frogadier.aif
deleted file mode 100644
index 918abc5d84..0000000000
Binary files a/sound/direct_sound_samples/cries/frogadier.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/frogadier.wav b/sound/direct_sound_samples/cries/frogadier.wav
new file mode 100644
index 0000000000..f7fcff3f05
Binary files /dev/null and b/sound/direct_sound_samples/cries/frogadier.wav differ
diff --git a/sound/direct_sound_samples/cries/froslass.aif b/sound/direct_sound_samples/cries/froslass.aif
deleted file mode 100644
index 75febf4311..0000000000
Binary files a/sound/direct_sound_samples/cries/froslass.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/froslass.wav b/sound/direct_sound_samples/cries/froslass.wav
new file mode 100644
index 0000000000..7c1baee478
Binary files /dev/null and b/sound/direct_sound_samples/cries/froslass.wav differ
diff --git a/sound/direct_sound_samples/cries/frosmoth.aif b/sound/direct_sound_samples/cries/frosmoth.aif
deleted file mode 100644
index 324034d15e..0000000000
Binary files a/sound/direct_sound_samples/cries/frosmoth.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/frosmoth.wav b/sound/direct_sound_samples/cries/frosmoth.wav
new file mode 100644
index 0000000000..b65a91e531
Binary files /dev/null and b/sound/direct_sound_samples/cries/frosmoth.wav differ
diff --git a/sound/direct_sound_samples/cries/fuecoco.aif b/sound/direct_sound_samples/cries/fuecoco.aif
deleted file mode 100644
index ee40234e0b..0000000000
Binary files a/sound/direct_sound_samples/cries/fuecoco.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/fuecoco.wav b/sound/direct_sound_samples/cries/fuecoco.wav
new file mode 100644
index 0000000000..7b3a68eaea
Binary files /dev/null and b/sound/direct_sound_samples/cries/fuecoco.wav differ
diff --git a/sound/direct_sound_samples/cries/furfrou.aif b/sound/direct_sound_samples/cries/furfrou.aif
deleted file mode 100644
index d989bde3d3..0000000000
Binary files a/sound/direct_sound_samples/cries/furfrou.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/furfrou.wav b/sound/direct_sound_samples/cries/furfrou.wav
new file mode 100644
index 0000000000..3800ae8c38
Binary files /dev/null and b/sound/direct_sound_samples/cries/furfrou.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 cdf9447d73..0000000000
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 0000000000..e3e4ec5842
Binary files /dev/null and b/sound/direct_sound_samples/cries/furret.wav differ
diff --git a/sound/direct_sound_samples/cries/gabite.aif b/sound/direct_sound_samples/cries/gabite.aif
deleted file mode 100644
index 5ca21cec7a..0000000000
Binary files a/sound/direct_sound_samples/cries/gabite.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gabite.wav b/sound/direct_sound_samples/cries/gabite.wav
new file mode 100644
index 0000000000..b8bd906101
Binary files /dev/null and b/sound/direct_sound_samples/cries/gabite.wav differ
diff --git a/sound/direct_sound_samples/cries/gallade.aif b/sound/direct_sound_samples/cries/gallade.aif
deleted file mode 100644
index 1eb55aeed9..0000000000
Binary files a/sound/direct_sound_samples/cries/gallade.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gallade.wav b/sound/direct_sound_samples/cries/gallade.wav
new file mode 100644
index 0000000000..bc0671f08f
Binary files /dev/null and b/sound/direct_sound_samples/cries/gallade.wav differ
diff --git a/sound/direct_sound_samples/cries/gallade_mega.aif b/sound/direct_sound_samples/cries/gallade_mega.aif
deleted file mode 100644
index 5b0d5eb5cc..0000000000
Binary files a/sound/direct_sound_samples/cries/gallade_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gallade_mega.wav b/sound/direct_sound_samples/cries/gallade_mega.wav
new file mode 100644
index 0000000000..c1725b2a80
Binary files /dev/null and b/sound/direct_sound_samples/cries/gallade_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/galvantula.aif b/sound/direct_sound_samples/cries/galvantula.aif
deleted file mode 100644
index 8d890a2463..0000000000
Binary files a/sound/direct_sound_samples/cries/galvantula.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/galvantula.wav b/sound/direct_sound_samples/cries/galvantula.wav
new file mode 100644
index 0000000000..d08ff5388c
Binary files /dev/null and b/sound/direct_sound_samples/cries/galvantula.wav differ
diff --git a/sound/direct_sound_samples/cries/garbodor.aif b/sound/direct_sound_samples/cries/garbodor.aif
deleted file mode 100644
index 09cad5cd7f..0000000000
Binary files a/sound/direct_sound_samples/cries/garbodor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/garbodor.wav b/sound/direct_sound_samples/cries/garbodor.wav
new file mode 100644
index 0000000000..d5c66fbf25
Binary files /dev/null and b/sound/direct_sound_samples/cries/garbodor.wav differ
diff --git a/sound/direct_sound_samples/cries/garchomp.aif b/sound/direct_sound_samples/cries/garchomp.aif
deleted file mode 100644
index f96c62f93b..0000000000
Binary files a/sound/direct_sound_samples/cries/garchomp.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/garchomp.wav b/sound/direct_sound_samples/cries/garchomp.wav
new file mode 100644
index 0000000000..828a1a49a2
Binary files /dev/null and b/sound/direct_sound_samples/cries/garchomp.wav differ
diff --git a/sound/direct_sound_samples/cries/garchomp_mega.aif b/sound/direct_sound_samples/cries/garchomp_mega.aif
deleted file mode 100644
index 65637139f2..0000000000
Binary files a/sound/direct_sound_samples/cries/garchomp_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/garchomp_mega.wav b/sound/direct_sound_samples/cries/garchomp_mega.wav
new file mode 100644
index 0000000000..0b1f9df662
Binary files /dev/null and b/sound/direct_sound_samples/cries/garchomp_mega.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 9285affb9d..0000000000
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 0000000000..bd3a99acc2
Binary files /dev/null and b/sound/direct_sound_samples/cries/gardevoir.wav differ
diff --git a/sound/direct_sound_samples/cries/gardevoir_mega.aif b/sound/direct_sound_samples/cries/gardevoir_mega.aif
deleted file mode 100644
index 71ba65d455..0000000000
Binary files a/sound/direct_sound_samples/cries/gardevoir_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gardevoir_mega.wav b/sound/direct_sound_samples/cries/gardevoir_mega.wav
new file mode 100644
index 0000000000..f94e401a96
Binary files /dev/null and b/sound/direct_sound_samples/cries/gardevoir_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/garganacl.aif b/sound/direct_sound_samples/cries/garganacl.aif
deleted file mode 100644
index 3c530cea53..0000000000
Binary files a/sound/direct_sound_samples/cries/garganacl.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/garganacl.wav b/sound/direct_sound_samples/cries/garganacl.wav
new file mode 100644
index 0000000000..5730bea348
Binary files /dev/null and b/sound/direct_sound_samples/cries/garganacl.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 5174cabffd..0000000000
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 0000000000..1bc2ff9667
Binary files /dev/null and b/sound/direct_sound_samples/cries/gastly.wav differ
diff --git a/sound/direct_sound_samples/cries/gastrodon.aif b/sound/direct_sound_samples/cries/gastrodon.aif
deleted file mode 100644
index d564820e83..0000000000
Binary files a/sound/direct_sound_samples/cries/gastrodon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gastrodon.wav b/sound/direct_sound_samples/cries/gastrodon.wav
new file mode 100644
index 0000000000..164666f314
Binary files /dev/null and b/sound/direct_sound_samples/cries/gastrodon.wav differ
diff --git a/sound/direct_sound_samples/cries/genesect.aif b/sound/direct_sound_samples/cries/genesect.aif
deleted file mode 100644
index 49e430ee9a..0000000000
Binary files a/sound/direct_sound_samples/cries/genesect.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/genesect.wav b/sound/direct_sound_samples/cries/genesect.wav
new file mode 100644
index 0000000000..443ea6f0df
Binary files /dev/null and b/sound/direct_sound_samples/cries/genesect.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 3c5e291ba3..0000000000
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 0000000000..9e8c24c28b
Binary files /dev/null and b/sound/direct_sound_samples/cries/gengar.wav differ
diff --git a/sound/direct_sound_samples/cries/gengar_mega.aif b/sound/direct_sound_samples/cries/gengar_mega.aif
deleted file mode 100644
index 7967d6dcfb..0000000000
Binary files a/sound/direct_sound_samples/cries/gengar_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gengar_mega.wav b/sound/direct_sound_samples/cries/gengar_mega.wav
new file mode 100644
index 0000000000..b0c8ab70c6
Binary files /dev/null and b/sound/direct_sound_samples/cries/gengar_mega.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 a09b2ca345..0000000000
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 0000000000..f355fc7e1a
Binary files /dev/null and b/sound/direct_sound_samples/cries/geodude.wav differ
diff --git a/sound/direct_sound_samples/cries/gholdengo.aif b/sound/direct_sound_samples/cries/gholdengo.aif
deleted file mode 100644
index 4cef67ba29..0000000000
Binary files a/sound/direct_sound_samples/cries/gholdengo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gholdengo.wav b/sound/direct_sound_samples/cries/gholdengo.wav
new file mode 100644
index 0000000000..37bb7ed39a
Binary files /dev/null and b/sound/direct_sound_samples/cries/gholdengo.wav differ
diff --git a/sound/direct_sound_samples/cries/gible.aif b/sound/direct_sound_samples/cries/gible.aif
deleted file mode 100644
index f3d4b4882f..0000000000
Binary files a/sound/direct_sound_samples/cries/gible.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gible.wav b/sound/direct_sound_samples/cries/gible.wav
new file mode 100644
index 0000000000..49bd85b916
Binary files /dev/null and b/sound/direct_sound_samples/cries/gible.wav differ
diff --git a/sound/direct_sound_samples/cries/gigalith.aif b/sound/direct_sound_samples/cries/gigalith.aif
deleted file mode 100644
index 00ad607cc6..0000000000
Binary files a/sound/direct_sound_samples/cries/gigalith.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gigalith.wav b/sound/direct_sound_samples/cries/gigalith.wav
new file mode 100644
index 0000000000..ae3b47aa7e
Binary files /dev/null and b/sound/direct_sound_samples/cries/gigalith.wav differ
diff --git a/sound/direct_sound_samples/cries/gimmighoul.aif b/sound/direct_sound_samples/cries/gimmighoul.aif
deleted file mode 100644
index fe8db162c9..0000000000
Binary files a/sound/direct_sound_samples/cries/gimmighoul.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gimmighoul.wav b/sound/direct_sound_samples/cries/gimmighoul.wav
new file mode 100644
index 0000000000..f915238a95
Binary files /dev/null and b/sound/direct_sound_samples/cries/gimmighoul.wav differ
diff --git a/sound/direct_sound_samples/cries/gimmighoul_roaming.aif b/sound/direct_sound_samples/cries/gimmighoul_roaming.aif
deleted file mode 100644
index 9f3c4483e9..0000000000
Binary files a/sound/direct_sound_samples/cries/gimmighoul_roaming.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/girafarig.aif b/sound/direct_sound_samples/cries/girafarig.aif
deleted file mode 100644
index af5af89268..0000000000
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 0000000000..d78162a29f
Binary files /dev/null and b/sound/direct_sound_samples/cries/girafarig.wav differ
diff --git a/sound/direct_sound_samples/cries/giratina.aif b/sound/direct_sound_samples/cries/giratina.aif
deleted file mode 100644
index 319e2c1323..0000000000
Binary files a/sound/direct_sound_samples/cries/giratina.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/giratina.wav b/sound/direct_sound_samples/cries/giratina.wav
new file mode 100644
index 0000000000..f2b4dff5c8
Binary files /dev/null and b/sound/direct_sound_samples/cries/giratina.wav differ
diff --git a/sound/direct_sound_samples/cries/glaceon.aif b/sound/direct_sound_samples/cries/glaceon.aif
deleted file mode 100644
index e38ebdef91..0000000000
Binary files a/sound/direct_sound_samples/cries/glaceon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/glaceon.wav b/sound/direct_sound_samples/cries/glaceon.wav
new file mode 100644
index 0000000000..b67779f873
Binary files /dev/null and b/sound/direct_sound_samples/cries/glaceon.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 38291bef49..0000000000
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 0000000000..bf35bd147b
Binary files /dev/null and b/sound/direct_sound_samples/cries/glalie.wav differ
diff --git a/sound/direct_sound_samples/cries/glalie_mega.aif b/sound/direct_sound_samples/cries/glalie_mega.aif
deleted file mode 100644
index cae5ba57f1..0000000000
Binary files a/sound/direct_sound_samples/cries/glalie_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/glalie_mega.wav b/sound/direct_sound_samples/cries/glalie_mega.wav
new file mode 100644
index 0000000000..366b61e630
Binary files /dev/null and b/sound/direct_sound_samples/cries/glalie_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/glameow.aif b/sound/direct_sound_samples/cries/glameow.aif
deleted file mode 100644
index a2d7ab1fa3..0000000000
Binary files a/sound/direct_sound_samples/cries/glameow.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/glameow.wav b/sound/direct_sound_samples/cries/glameow.wav
new file mode 100644
index 0000000000..8fe17099bb
Binary files /dev/null and b/sound/direct_sound_samples/cries/glameow.wav differ
diff --git a/sound/direct_sound_samples/cries/glastrier.aif b/sound/direct_sound_samples/cries/glastrier.aif
deleted file mode 100644
index 80c44e0b76..0000000000
Binary files a/sound/direct_sound_samples/cries/glastrier.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/glastrier.wav b/sound/direct_sound_samples/cries/glastrier.wav
new file mode 100644
index 0000000000..bd9885ce2b
Binary files /dev/null and b/sound/direct_sound_samples/cries/glastrier.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 e2103c2ff8..0000000000
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 0000000000..8fa3efa6b1
Binary files /dev/null and b/sound/direct_sound_samples/cries/gligar.wav differ
diff --git a/sound/direct_sound_samples/cries/glimmet.aif b/sound/direct_sound_samples/cries/glimmet.aif
deleted file mode 100644
index e89ac2ea59..0000000000
Binary files a/sound/direct_sound_samples/cries/glimmet.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/glimmet.wav b/sound/direct_sound_samples/cries/glimmet.wav
new file mode 100644
index 0000000000..37dbf6c8b1
Binary files /dev/null and b/sound/direct_sound_samples/cries/glimmet.wav differ
diff --git a/sound/direct_sound_samples/cries/glimmora.aif b/sound/direct_sound_samples/cries/glimmora.aif
deleted file mode 100644
index 64fb682289..0000000000
Binary files a/sound/direct_sound_samples/cries/glimmora.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/glimmora.wav b/sound/direct_sound_samples/cries/glimmora.wav
new file mode 100644
index 0000000000..9edf26f989
Binary files /dev/null and b/sound/direct_sound_samples/cries/glimmora.wav differ
diff --git a/sound/direct_sound_samples/cries/gliscor.aif b/sound/direct_sound_samples/cries/gliscor.aif
deleted file mode 100644
index 1df92dc9a9..0000000000
Binary files a/sound/direct_sound_samples/cries/gliscor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gliscor.wav b/sound/direct_sound_samples/cries/gliscor.wav
new file mode 100644
index 0000000000..1146423758
Binary files /dev/null and b/sound/direct_sound_samples/cries/gliscor.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 bcedd48d5e..0000000000
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 0000000000..abc408a0f7
Binary files /dev/null and b/sound/direct_sound_samples/cries/gloom.wav differ
diff --git a/sound/direct_sound_samples/cries/gogoat.aif b/sound/direct_sound_samples/cries/gogoat.aif
deleted file mode 100644
index 6717a2ff26..0000000000
Binary files a/sound/direct_sound_samples/cries/gogoat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gogoat.wav b/sound/direct_sound_samples/cries/gogoat.wav
new file mode 100644
index 0000000000..6ab6d386e4
Binary files /dev/null and b/sound/direct_sound_samples/cries/gogoat.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 2e91f76966..0000000000
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 0000000000..20d2ecf5c9
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 687f8d3920..0000000000
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 0000000000..342df710c9
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 bc6c5f5b16..0000000000
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 0000000000..a9bf91b2da
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 95fbef9c47..0000000000
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 0000000000..17ed6128e4
Binary files /dev/null and b/sound/direct_sound_samples/cries/golem.wav differ
diff --git a/sound/direct_sound_samples/cries/golett.aif b/sound/direct_sound_samples/cries/golett.aif
deleted file mode 100644
index 58c6f09cd8..0000000000
Binary files a/sound/direct_sound_samples/cries/golett.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/golett.wav b/sound/direct_sound_samples/cries/golett.wav
new file mode 100644
index 0000000000..46c3664e65
Binary files /dev/null and b/sound/direct_sound_samples/cries/golett.wav differ
diff --git a/sound/direct_sound_samples/cries/golisopod.aif b/sound/direct_sound_samples/cries/golisopod.aif
deleted file mode 100644
index 429f445ede..0000000000
Binary files a/sound/direct_sound_samples/cries/golisopod.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/golisopod.wav b/sound/direct_sound_samples/cries/golisopod.wav
new file mode 100644
index 0000000000..66912c8b08
Binary files /dev/null and b/sound/direct_sound_samples/cries/golisopod.wav differ
diff --git a/sound/direct_sound_samples/cries/golurk.aif b/sound/direct_sound_samples/cries/golurk.aif
deleted file mode 100644
index abc95bd808..0000000000
Binary files a/sound/direct_sound_samples/cries/golurk.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/golurk.wav b/sound/direct_sound_samples/cries/golurk.wav
new file mode 100644
index 0000000000..b6e41c1fe0
Binary files /dev/null and b/sound/direct_sound_samples/cries/golurk.wav differ
diff --git a/sound/direct_sound_samples/cries/goodra.aif b/sound/direct_sound_samples/cries/goodra.aif
deleted file mode 100644
index b2f407cc94..0000000000
Binary files a/sound/direct_sound_samples/cries/goodra.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/goodra.wav b/sound/direct_sound_samples/cries/goodra.wav
new file mode 100644
index 0000000000..ffb6bd7f44
Binary files /dev/null and b/sound/direct_sound_samples/cries/goodra.wav differ
diff --git a/sound/direct_sound_samples/cries/goomy.aif b/sound/direct_sound_samples/cries/goomy.aif
deleted file mode 100644
index bd2524ebe1..0000000000
Binary files a/sound/direct_sound_samples/cries/goomy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/goomy.wav b/sound/direct_sound_samples/cries/goomy.wav
new file mode 100644
index 0000000000..d7fdac2cec
Binary files /dev/null and b/sound/direct_sound_samples/cries/goomy.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 a93b1aa6fc..0000000000
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 0000000000..3d375f6dcf
Binary files /dev/null and b/sound/direct_sound_samples/cries/gorebyss.wav differ
diff --git a/sound/direct_sound_samples/cries/gossifleur.aif b/sound/direct_sound_samples/cries/gossifleur.aif
deleted file mode 100644
index dae1731c8f..0000000000
Binary files a/sound/direct_sound_samples/cries/gossifleur.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gossifleur.wav b/sound/direct_sound_samples/cries/gossifleur.wav
new file mode 100644
index 0000000000..a666b937c4
Binary files /dev/null and b/sound/direct_sound_samples/cries/gossifleur.wav differ
diff --git a/sound/direct_sound_samples/cries/gothita.aif b/sound/direct_sound_samples/cries/gothita.aif
deleted file mode 100644
index 00476d94bd..0000000000
Binary files a/sound/direct_sound_samples/cries/gothita.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gothita.wav b/sound/direct_sound_samples/cries/gothita.wav
new file mode 100644
index 0000000000..1d8ad153b4
Binary files /dev/null and b/sound/direct_sound_samples/cries/gothita.wav differ
diff --git a/sound/direct_sound_samples/cries/gothitelle.aif b/sound/direct_sound_samples/cries/gothitelle.aif
deleted file mode 100644
index d8f334784a..0000000000
Binary files a/sound/direct_sound_samples/cries/gothitelle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gothitelle.wav b/sound/direct_sound_samples/cries/gothitelle.wav
new file mode 100644
index 0000000000..3d7c2046d0
Binary files /dev/null and b/sound/direct_sound_samples/cries/gothitelle.wav differ
diff --git a/sound/direct_sound_samples/cries/gothorita.aif b/sound/direct_sound_samples/cries/gothorita.aif
deleted file mode 100644
index d5491f83b5..0000000000
Binary files a/sound/direct_sound_samples/cries/gothorita.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gothorita.wav b/sound/direct_sound_samples/cries/gothorita.wav
new file mode 100644
index 0000000000..47686081f5
Binary files /dev/null and b/sound/direct_sound_samples/cries/gothorita.wav differ
diff --git a/sound/direct_sound_samples/cries/gouging_fire.aif b/sound/direct_sound_samples/cries/gouging_fire.aif
deleted file mode 100644
index 996a7d8070..0000000000
Binary files a/sound/direct_sound_samples/cries/gouging_fire.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gouging_fire.wav b/sound/direct_sound_samples/cries/gouging_fire.wav
new file mode 100644
index 0000000000..6748b9c9d8
Binary files /dev/null and b/sound/direct_sound_samples/cries/gouging_fire.wav differ
diff --git a/sound/direct_sound_samples/cries/gourgeist.aif b/sound/direct_sound_samples/cries/gourgeist.aif
deleted file mode 100644
index b1790cdd3c..0000000000
Binary files a/sound/direct_sound_samples/cries/gourgeist.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gourgeist.wav b/sound/direct_sound_samples/cries/gourgeist.wav
new file mode 100644
index 0000000000..f3db74b554
Binary files /dev/null and b/sound/direct_sound_samples/cries/gourgeist.wav differ
diff --git a/sound/direct_sound_samples/cries/gourgeist_super.aif b/sound/direct_sound_samples/cries/gourgeist_super.aif
deleted file mode 100644
index cdf93aca58..0000000000
Binary files a/sound/direct_sound_samples/cries/gourgeist_super.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gourgeist_super.wav b/sound/direct_sound_samples/cries/gourgeist_super.wav
new file mode 100644
index 0000000000..e319d5ba84
Binary files /dev/null and b/sound/direct_sound_samples/cries/gourgeist_super.wav differ
diff --git a/sound/direct_sound_samples/cries/grafaiai.aif b/sound/direct_sound_samples/cries/grafaiai.aif
deleted file mode 100644
index d8e8511eec..0000000000
Binary files a/sound/direct_sound_samples/cries/grafaiai.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/grafaiai.wav b/sound/direct_sound_samples/cries/grafaiai.wav
new file mode 100644
index 0000000000..2d16b5e805
Binary files /dev/null and b/sound/direct_sound_samples/cries/grafaiai.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 87ed96a842..0000000000
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 0000000000..959793b724
Binary files /dev/null and b/sound/direct_sound_samples/cries/granbull.wav differ
diff --git a/sound/direct_sound_samples/cries/grapploct.aif b/sound/direct_sound_samples/cries/grapploct.aif
deleted file mode 100644
index 289d636ecb..0000000000
Binary files a/sound/direct_sound_samples/cries/grapploct.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/grapploct.wav b/sound/direct_sound_samples/cries/grapploct.wav
new file mode 100644
index 0000000000..fb3b48ccc6
Binary files /dev/null and b/sound/direct_sound_samples/cries/grapploct.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 fbf463c4fd..0000000000
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 0000000000..6b8591406f
Binary files /dev/null and b/sound/direct_sound_samples/cries/graveler.wav differ
diff --git a/sound/direct_sound_samples/cries/great_tusk.aif b/sound/direct_sound_samples/cries/great_tusk.aif
deleted file mode 100644
index 4ca76ff6c0..0000000000
Binary files a/sound/direct_sound_samples/cries/great_tusk.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/great_tusk.wav b/sound/direct_sound_samples/cries/great_tusk.wav
new file mode 100644
index 0000000000..0c7d0773ea
Binary files /dev/null and b/sound/direct_sound_samples/cries/great_tusk.wav differ
diff --git a/sound/direct_sound_samples/cries/greavard.aif b/sound/direct_sound_samples/cries/greavard.aif
deleted file mode 100644
index 434c1dceb0..0000000000
Binary files a/sound/direct_sound_samples/cries/greavard.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/greavard.wav b/sound/direct_sound_samples/cries/greavard.wav
new file mode 100644
index 0000000000..b93fd39327
Binary files /dev/null and b/sound/direct_sound_samples/cries/greavard.wav differ
diff --git a/sound/direct_sound_samples/cries/greedent.aif b/sound/direct_sound_samples/cries/greedent.aif
deleted file mode 100644
index 523cd57c3e..0000000000
Binary files a/sound/direct_sound_samples/cries/greedent.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/greedent.wav b/sound/direct_sound_samples/cries/greedent.wav
new file mode 100644
index 0000000000..351e21c9e3
Binary files /dev/null and b/sound/direct_sound_samples/cries/greedent.wav differ
diff --git a/sound/direct_sound_samples/cries/greninja.aif b/sound/direct_sound_samples/cries/greninja.aif
deleted file mode 100644
index 988d66b062..0000000000
Binary files a/sound/direct_sound_samples/cries/greninja.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/greninja.wav b/sound/direct_sound_samples/cries/greninja.wav
new file mode 100644
index 0000000000..3d097d8022
Binary files /dev/null and b/sound/direct_sound_samples/cries/greninja.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 050fb9620c..0000000000
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 0000000000..092dfeed61
Binary files /dev/null and b/sound/direct_sound_samples/cries/grimer.wav differ
diff --git a/sound/direct_sound_samples/cries/grimmsnarl.aif b/sound/direct_sound_samples/cries/grimmsnarl.aif
deleted file mode 100644
index 838312fde3..0000000000
Binary files a/sound/direct_sound_samples/cries/grimmsnarl.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/grimmsnarl.wav b/sound/direct_sound_samples/cries/grimmsnarl.wav
new file mode 100644
index 0000000000..7fd3bb5c03
Binary files /dev/null and b/sound/direct_sound_samples/cries/grimmsnarl.wav differ
diff --git a/sound/direct_sound_samples/cries/grookey.aif b/sound/direct_sound_samples/cries/grookey.aif
deleted file mode 100644
index 919063484f..0000000000
Binary files a/sound/direct_sound_samples/cries/grookey.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/grookey.wav b/sound/direct_sound_samples/cries/grookey.wav
new file mode 100644
index 0000000000..42ebd7ef1f
Binary files /dev/null and b/sound/direct_sound_samples/cries/grookey.wav differ
diff --git a/sound/direct_sound_samples/cries/grotle.aif b/sound/direct_sound_samples/cries/grotle.aif
deleted file mode 100644
index 2b08bca67e..0000000000
Binary files a/sound/direct_sound_samples/cries/grotle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/grotle.wav b/sound/direct_sound_samples/cries/grotle.wav
new file mode 100644
index 0000000000..65cdfe49c6
Binary files /dev/null and b/sound/direct_sound_samples/cries/grotle.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 9fe253745a..0000000000
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 0000000000..680d0ec047
Binary files /dev/null and b/sound/direct_sound_samples/cries/groudon.wav differ
diff --git a/sound/direct_sound_samples/cries/groudon_primal.aif b/sound/direct_sound_samples/cries/groudon_primal.aif
deleted file mode 100644
index a93d06a3fe..0000000000
Binary files a/sound/direct_sound_samples/cries/groudon_primal.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/groudon_primal.wav b/sound/direct_sound_samples/cries/groudon_primal.wav
new file mode 100644
index 0000000000..d3e5f41191
Binary files /dev/null and b/sound/direct_sound_samples/cries/groudon_primal.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 c21c58ad09..0000000000
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 0000000000..7e2f1acd0f
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 37b7233c29..0000000000
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 0000000000..3f72ea6f97
Binary files /dev/null and b/sound/direct_sound_samples/cries/growlithe.wav differ
diff --git a/sound/direct_sound_samples/cries/grubbin.aif b/sound/direct_sound_samples/cries/grubbin.aif
deleted file mode 100644
index 8e071f7815..0000000000
Binary files a/sound/direct_sound_samples/cries/grubbin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/grubbin.wav b/sound/direct_sound_samples/cries/grubbin.wav
new file mode 100644
index 0000000000..f76a663051
Binary files /dev/null and b/sound/direct_sound_samples/cries/grubbin.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 d5b766f43e..0000000000
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 0000000000..e9c8157e0f
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 4b0bc89b96..0000000000
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 0000000000..d1ab06b6b0
Binary files /dev/null and b/sound/direct_sound_samples/cries/gulpin.wav differ
diff --git a/sound/direct_sound_samples/cries/gumshoos.aif b/sound/direct_sound_samples/cries/gumshoos.aif
deleted file mode 100644
index 9f078f85db..0000000000
Binary files a/sound/direct_sound_samples/cries/gumshoos.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gumshoos.wav b/sound/direct_sound_samples/cries/gumshoos.wav
new file mode 100644
index 0000000000..9bbfb863b6
Binary files /dev/null and b/sound/direct_sound_samples/cries/gumshoos.wav differ
diff --git a/sound/direct_sound_samples/cries/gurdurr.aif b/sound/direct_sound_samples/cries/gurdurr.aif
deleted file mode 100644
index 055d366a91..0000000000
Binary files a/sound/direct_sound_samples/cries/gurdurr.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gurdurr.wav b/sound/direct_sound_samples/cries/gurdurr.wav
new file mode 100644
index 0000000000..ba73ebdcc1
Binary files /dev/null and b/sound/direct_sound_samples/cries/gurdurr.wav differ
diff --git a/sound/direct_sound_samples/cries/guzzlord.aif b/sound/direct_sound_samples/cries/guzzlord.aif
deleted file mode 100644
index 958e0b7ed3..0000000000
Binary files a/sound/direct_sound_samples/cries/guzzlord.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/guzzlord.wav b/sound/direct_sound_samples/cries/guzzlord.wav
new file mode 100644
index 0000000000..15404dea56
Binary files /dev/null and b/sound/direct_sound_samples/cries/guzzlord.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 f4b5dbf945..0000000000
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 0000000000..6a4124085e
Binary files /dev/null and b/sound/direct_sound_samples/cries/gyarados.wav differ
diff --git a/sound/direct_sound_samples/cries/gyarados_mega.aif b/sound/direct_sound_samples/cries/gyarados_mega.aif
deleted file mode 100644
index 33f9eadc3b..0000000000
Binary files a/sound/direct_sound_samples/cries/gyarados_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/gyarados_mega.wav b/sound/direct_sound_samples/cries/gyarados_mega.wav
new file mode 100644
index 0000000000..d14a015dd6
Binary files /dev/null and b/sound/direct_sound_samples/cries/gyarados_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/hakamo_o.aif b/sound/direct_sound_samples/cries/hakamo_o.aif
deleted file mode 100644
index 03d2ff241a..0000000000
Binary files a/sound/direct_sound_samples/cries/hakamo_o.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hakamo_o.wav b/sound/direct_sound_samples/cries/hakamo_o.wav
new file mode 100644
index 0000000000..c668cad629
Binary files /dev/null and b/sound/direct_sound_samples/cries/hakamo_o.wav differ
diff --git a/sound/direct_sound_samples/cries/happiny.aif b/sound/direct_sound_samples/cries/happiny.aif
deleted file mode 100644
index bee72680ac..0000000000
Binary files a/sound/direct_sound_samples/cries/happiny.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/happiny.wav b/sound/direct_sound_samples/cries/happiny.wav
new file mode 100644
index 0000000000..6d310d8d59
Binary files /dev/null and b/sound/direct_sound_samples/cries/happiny.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 0a61e0d8ae..0000000000
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 0000000000..5567aae3a1
Binary files /dev/null and b/sound/direct_sound_samples/cries/hariyama.wav differ
diff --git a/sound/direct_sound_samples/cries/hatenna.aif b/sound/direct_sound_samples/cries/hatenna.aif
deleted file mode 100644
index 3c431dd65f..0000000000
Binary files a/sound/direct_sound_samples/cries/hatenna.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hatenna.wav b/sound/direct_sound_samples/cries/hatenna.wav
new file mode 100644
index 0000000000..78e63ac2b4
Binary files /dev/null and b/sound/direct_sound_samples/cries/hatenna.wav differ
diff --git a/sound/direct_sound_samples/cries/hatterene.aif b/sound/direct_sound_samples/cries/hatterene.aif
deleted file mode 100644
index db21eb2e20..0000000000
Binary files a/sound/direct_sound_samples/cries/hatterene.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hatterene.wav b/sound/direct_sound_samples/cries/hatterene.wav
new file mode 100644
index 0000000000..27dfcf2db7
Binary files /dev/null and b/sound/direct_sound_samples/cries/hatterene.wav differ
diff --git a/sound/direct_sound_samples/cries/hattrem.aif b/sound/direct_sound_samples/cries/hattrem.aif
deleted file mode 100644
index 444c770283..0000000000
Binary files a/sound/direct_sound_samples/cries/hattrem.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hattrem.wav b/sound/direct_sound_samples/cries/hattrem.wav
new file mode 100644
index 0000000000..5da7c40af1
Binary files /dev/null and b/sound/direct_sound_samples/cries/hattrem.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 c9192cf9bc..0000000000
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 0000000000..e22b1cfc13
Binary files /dev/null and b/sound/direct_sound_samples/cries/haunter.wav differ
diff --git a/sound/direct_sound_samples/cries/hawlucha.aif b/sound/direct_sound_samples/cries/hawlucha.aif
deleted file mode 100644
index 0e4d9c78d1..0000000000
Binary files a/sound/direct_sound_samples/cries/hawlucha.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hawlucha.wav b/sound/direct_sound_samples/cries/hawlucha.wav
new file mode 100644
index 0000000000..629365ac41
Binary files /dev/null and b/sound/direct_sound_samples/cries/hawlucha.wav differ
diff --git a/sound/direct_sound_samples/cries/haxorus.aif b/sound/direct_sound_samples/cries/haxorus.aif
deleted file mode 100644
index 8414951d49..0000000000
Binary files a/sound/direct_sound_samples/cries/haxorus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/haxorus.wav b/sound/direct_sound_samples/cries/haxorus.wav
new file mode 100644
index 0000000000..7ebe8ba8d5
Binary files /dev/null and b/sound/direct_sound_samples/cries/haxorus.wav differ
diff --git a/sound/direct_sound_samples/cries/heatmor.aif b/sound/direct_sound_samples/cries/heatmor.aif
deleted file mode 100644
index 2a254ef0d9..0000000000
Binary files a/sound/direct_sound_samples/cries/heatmor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/heatmor.wav b/sound/direct_sound_samples/cries/heatmor.wav
new file mode 100644
index 0000000000..d340755c8a
Binary files /dev/null and b/sound/direct_sound_samples/cries/heatmor.wav differ
diff --git a/sound/direct_sound_samples/cries/heatran.aif b/sound/direct_sound_samples/cries/heatran.aif
deleted file mode 100644
index 56c373d8d8..0000000000
Binary files a/sound/direct_sound_samples/cries/heatran.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/heatran.wav b/sound/direct_sound_samples/cries/heatran.wav
new file mode 100644
index 0000000000..f3388a0756
Binary files /dev/null and b/sound/direct_sound_samples/cries/heatran.wav differ
diff --git a/sound/direct_sound_samples/cries/heliolisk.aif b/sound/direct_sound_samples/cries/heliolisk.aif
deleted file mode 100644
index d87e7bfd2a..0000000000
Binary files a/sound/direct_sound_samples/cries/heliolisk.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/heliolisk.wav b/sound/direct_sound_samples/cries/heliolisk.wav
new file mode 100644
index 0000000000..801d5968c3
Binary files /dev/null and b/sound/direct_sound_samples/cries/heliolisk.wav differ
diff --git a/sound/direct_sound_samples/cries/helioptile.aif b/sound/direct_sound_samples/cries/helioptile.aif
deleted file mode 100644
index aa1a9fb3a6..0000000000
Binary files a/sound/direct_sound_samples/cries/helioptile.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/helioptile.wav b/sound/direct_sound_samples/cries/helioptile.wav
new file mode 100644
index 0000000000..39c1fc5327
Binary files /dev/null and b/sound/direct_sound_samples/cries/helioptile.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 1fe12ed524..0000000000
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 0000000000..ed68648ba8
Binary files /dev/null and b/sound/direct_sound_samples/cries/heracross.wav differ
diff --git a/sound/direct_sound_samples/cries/heracross_mega.aif b/sound/direct_sound_samples/cries/heracross_mega.aif
deleted file mode 100644
index e1993473c2..0000000000
Binary files a/sound/direct_sound_samples/cries/heracross_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/heracross_mega.wav b/sound/direct_sound_samples/cries/heracross_mega.wav
new file mode 100644
index 0000000000..79d9a58797
Binary files /dev/null and b/sound/direct_sound_samples/cries/heracross_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/herdier.aif b/sound/direct_sound_samples/cries/herdier.aif
deleted file mode 100644
index bc798f60b5..0000000000
Binary files a/sound/direct_sound_samples/cries/herdier.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/herdier.wav b/sound/direct_sound_samples/cries/herdier.wav
new file mode 100644
index 0000000000..f272d2b01b
Binary files /dev/null and b/sound/direct_sound_samples/cries/herdier.wav differ
diff --git a/sound/direct_sound_samples/cries/hippopotas.aif b/sound/direct_sound_samples/cries/hippopotas.aif
deleted file mode 100644
index a8828805fe..0000000000
Binary files a/sound/direct_sound_samples/cries/hippopotas.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hippopotas.wav b/sound/direct_sound_samples/cries/hippopotas.wav
new file mode 100644
index 0000000000..c94da0f439
Binary files /dev/null and b/sound/direct_sound_samples/cries/hippopotas.wav differ
diff --git a/sound/direct_sound_samples/cries/hippowdon.aif b/sound/direct_sound_samples/cries/hippowdon.aif
deleted file mode 100644
index 94649f3f25..0000000000
Binary files a/sound/direct_sound_samples/cries/hippowdon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hippowdon.wav b/sound/direct_sound_samples/cries/hippowdon.wav
new file mode 100644
index 0000000000..ee24375a55
Binary files /dev/null and b/sound/direct_sound_samples/cries/hippowdon.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 279370fc9c..0000000000
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 0000000000..806d206d35
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 d388565df8..0000000000
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 0000000000..e40d852b99
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 237e0a6b0f..0000000000
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 0000000000..652222dc6c
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 886d66813a..0000000000
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 0000000000..acf8812532
Binary files /dev/null and b/sound/direct_sound_samples/cries/ho_oh.wav differ
diff --git a/sound/direct_sound_samples/cries/honchkrow.aif b/sound/direct_sound_samples/cries/honchkrow.aif
deleted file mode 100644
index ae3ceda671..0000000000
Binary files a/sound/direct_sound_samples/cries/honchkrow.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/honchkrow.wav b/sound/direct_sound_samples/cries/honchkrow.wav
new file mode 100644
index 0000000000..6ebbb5e429
Binary files /dev/null and b/sound/direct_sound_samples/cries/honchkrow.wav differ
diff --git a/sound/direct_sound_samples/cries/honedge.aif b/sound/direct_sound_samples/cries/honedge.aif
deleted file mode 100644
index e1204fddfe..0000000000
Binary files a/sound/direct_sound_samples/cries/honedge.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/honedge.wav b/sound/direct_sound_samples/cries/honedge.wav
new file mode 100644
index 0000000000..bf3136b3ad
Binary files /dev/null and b/sound/direct_sound_samples/cries/honedge.wav differ
diff --git a/sound/direct_sound_samples/cries/hoopa_confined.aif b/sound/direct_sound_samples/cries/hoopa_confined.aif
deleted file mode 100644
index 2d91b4982a..0000000000
Binary files a/sound/direct_sound_samples/cries/hoopa_confined.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hoopa_confined.wav b/sound/direct_sound_samples/cries/hoopa_confined.wav
new file mode 100644
index 0000000000..d5f50a8b42
Binary files /dev/null and b/sound/direct_sound_samples/cries/hoopa_confined.wav differ
diff --git a/sound/direct_sound_samples/cries/hoopa_unbound.aif b/sound/direct_sound_samples/cries/hoopa_unbound.aif
deleted file mode 100644
index 2b4d84015b..0000000000
Binary files a/sound/direct_sound_samples/cries/hoopa_unbound.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hoopa_unbound.wav b/sound/direct_sound_samples/cries/hoopa_unbound.wav
new file mode 100644
index 0000000000..319a519a88
Binary files /dev/null and b/sound/direct_sound_samples/cries/hoopa_unbound.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 52bccc8e91..0000000000
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 0000000000..e7ca2f5780
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 e715705f08..0000000000
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 0000000000..ab14fdaec7
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 12801a2076..0000000000
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 0000000000..ab67381edd
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 09c6e4957f..0000000000
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 0000000000..a34e4cda2b
Binary files /dev/null and b/sound/direct_sound_samples/cries/houndoom.wav differ
diff --git a/sound/direct_sound_samples/cries/houndoom_mega.aif b/sound/direct_sound_samples/cries/houndoom_mega.aif
deleted file mode 100644
index 102f822cc6..0000000000
Binary files a/sound/direct_sound_samples/cries/houndoom_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/houndoom_mega.wav b/sound/direct_sound_samples/cries/houndoom_mega.wav
new file mode 100644
index 0000000000..3b50f94920
Binary files /dev/null and b/sound/direct_sound_samples/cries/houndoom_mega.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 352d8fd897..0000000000
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 0000000000..51310524a8
Binary files /dev/null and b/sound/direct_sound_samples/cries/houndour.wav differ
diff --git a/sound/direct_sound_samples/cries/houndstone.aif b/sound/direct_sound_samples/cries/houndstone.aif
deleted file mode 100644
index 99e699b7ba..0000000000
Binary files a/sound/direct_sound_samples/cries/houndstone.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/houndstone.wav b/sound/direct_sound_samples/cries/houndstone.wav
new file mode 100644
index 0000000000..d70441d7bd
Binary files /dev/null and b/sound/direct_sound_samples/cries/houndstone.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 b520d2b7a8..0000000000
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 0000000000..b2e3f99853
Binary files /dev/null and b/sound/direct_sound_samples/cries/huntail.wav differ
diff --git a/sound/direct_sound_samples/cries/hydrapple.aif b/sound/direct_sound_samples/cries/hydrapple.aif
deleted file mode 100644
index 45f5fd9ca0..0000000000
Binary files a/sound/direct_sound_samples/cries/hydrapple.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hydrapple.wav b/sound/direct_sound_samples/cries/hydrapple.wav
new file mode 100644
index 0000000000..e3da4677a8
Binary files /dev/null and b/sound/direct_sound_samples/cries/hydrapple.wav differ
diff --git a/sound/direct_sound_samples/cries/hydreigon.aif b/sound/direct_sound_samples/cries/hydreigon.aif
deleted file mode 100644
index 8227c6d21f..0000000000
Binary files a/sound/direct_sound_samples/cries/hydreigon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/hydreigon.wav b/sound/direct_sound_samples/cries/hydreigon.wav
new file mode 100644
index 0000000000..ce816dcc58
Binary files /dev/null and b/sound/direct_sound_samples/cries/hydreigon.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 7c4bde1936..0000000000
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 0000000000..4369110c2c
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 0f2db1e52c..0000000000
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 0000000000..efec9bf4c4
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 26807295bd..0000000000
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 0000000000..6570492f79
Binary files /dev/null and b/sound/direct_sound_samples/cries/illumise.wav differ
diff --git a/sound/direct_sound_samples/cries/impidimp.aif b/sound/direct_sound_samples/cries/impidimp.aif
deleted file mode 100644
index 0abad6cb1e..0000000000
Binary files a/sound/direct_sound_samples/cries/impidimp.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/impidimp.wav b/sound/direct_sound_samples/cries/impidimp.wav
new file mode 100644
index 0000000000..1bc578a9b8
Binary files /dev/null and b/sound/direct_sound_samples/cries/impidimp.wav differ
diff --git a/sound/direct_sound_samples/cries/incineroar.aif b/sound/direct_sound_samples/cries/incineroar.aif
deleted file mode 100644
index b7f3e2201e..0000000000
Binary files a/sound/direct_sound_samples/cries/incineroar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/incineroar.wav b/sound/direct_sound_samples/cries/incineroar.wav
new file mode 100644
index 0000000000..f4b9bcd598
Binary files /dev/null and b/sound/direct_sound_samples/cries/incineroar.wav differ
diff --git a/sound/direct_sound_samples/cries/indeedee_female.aif b/sound/direct_sound_samples/cries/indeedee_female.aif
deleted file mode 100644
index b5e5fe4547..0000000000
Binary files a/sound/direct_sound_samples/cries/indeedee_female.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/indeedee_female.wav b/sound/direct_sound_samples/cries/indeedee_female.wav
new file mode 100644
index 0000000000..f7b563c1d1
Binary files /dev/null and b/sound/direct_sound_samples/cries/indeedee_female.wav differ
diff --git a/sound/direct_sound_samples/cries/indeedee_male.aif b/sound/direct_sound_samples/cries/indeedee_male.aif
deleted file mode 100644
index b5d950391e..0000000000
Binary files a/sound/direct_sound_samples/cries/indeedee_male.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/indeedee_male.wav b/sound/direct_sound_samples/cries/indeedee_male.wav
new file mode 100644
index 0000000000..554ec96593
Binary files /dev/null and b/sound/direct_sound_samples/cries/indeedee_male.wav differ
diff --git a/sound/direct_sound_samples/cries/infernape.aif b/sound/direct_sound_samples/cries/infernape.aif
deleted file mode 100644
index d4570a8f3a..0000000000
Binary files a/sound/direct_sound_samples/cries/infernape.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/infernape.wav b/sound/direct_sound_samples/cries/infernape.wav
new file mode 100644
index 0000000000..71e4af161d
Binary files /dev/null and b/sound/direct_sound_samples/cries/infernape.wav differ
diff --git a/sound/direct_sound_samples/cries/inkay.aif b/sound/direct_sound_samples/cries/inkay.aif
deleted file mode 100644
index 04753026e0..0000000000
Binary files a/sound/direct_sound_samples/cries/inkay.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/inkay.wav b/sound/direct_sound_samples/cries/inkay.wav
new file mode 100644
index 0000000000..dace2b5c24
Binary files /dev/null and b/sound/direct_sound_samples/cries/inkay.wav differ
diff --git a/sound/direct_sound_samples/cries/inteleon.aif b/sound/direct_sound_samples/cries/inteleon.aif
deleted file mode 100644
index 8153b02889..0000000000
Binary files a/sound/direct_sound_samples/cries/inteleon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/inteleon.wav b/sound/direct_sound_samples/cries/inteleon.wav
new file mode 100644
index 0000000000..8bef61a449
Binary files /dev/null and b/sound/direct_sound_samples/cries/inteleon.wav differ
diff --git a/sound/direct_sound_samples/cries/iron_boulder.aif b/sound/direct_sound_samples/cries/iron_boulder.aif
deleted file mode 100644
index 0ffdefdffb..0000000000
Binary files a/sound/direct_sound_samples/cries/iron_boulder.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/iron_boulder.wav b/sound/direct_sound_samples/cries/iron_boulder.wav
new file mode 100644
index 0000000000..df02d73d5c
Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_boulder.wav differ
diff --git a/sound/direct_sound_samples/cries/iron_bundle.aif b/sound/direct_sound_samples/cries/iron_bundle.aif
deleted file mode 100644
index 51c9e0b60c..0000000000
Binary files a/sound/direct_sound_samples/cries/iron_bundle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/iron_bundle.wav b/sound/direct_sound_samples/cries/iron_bundle.wav
new file mode 100644
index 0000000000..796ee101fe
Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_bundle.wav differ
diff --git a/sound/direct_sound_samples/cries/iron_crown.aif b/sound/direct_sound_samples/cries/iron_crown.aif
deleted file mode 100644
index 8c310455dc..0000000000
Binary files a/sound/direct_sound_samples/cries/iron_crown.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/iron_crown.wav b/sound/direct_sound_samples/cries/iron_crown.wav
new file mode 100644
index 0000000000..984f1c5a79
Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_crown.wav differ
diff --git a/sound/direct_sound_samples/cries/iron_hands.aif b/sound/direct_sound_samples/cries/iron_hands.aif
deleted file mode 100644
index 621e4fdc19..0000000000
Binary files a/sound/direct_sound_samples/cries/iron_hands.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/iron_hands.wav b/sound/direct_sound_samples/cries/iron_hands.wav
new file mode 100644
index 0000000000..c5b0332263
Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_hands.wav differ
diff --git a/sound/direct_sound_samples/cries/iron_jugulis.aif b/sound/direct_sound_samples/cries/iron_jugulis.aif
deleted file mode 100644
index 8409934f89..0000000000
Binary files a/sound/direct_sound_samples/cries/iron_jugulis.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/iron_jugulis.wav b/sound/direct_sound_samples/cries/iron_jugulis.wav
new file mode 100644
index 0000000000..a6e883a57b
Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_jugulis.wav differ
diff --git a/sound/direct_sound_samples/cries/iron_leaves.aif b/sound/direct_sound_samples/cries/iron_leaves.aif
deleted file mode 100644
index 45e0a420e2..0000000000
Binary files a/sound/direct_sound_samples/cries/iron_leaves.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/iron_leaves.wav b/sound/direct_sound_samples/cries/iron_leaves.wav
new file mode 100644
index 0000000000..b22f193e99
Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_leaves.wav differ
diff --git a/sound/direct_sound_samples/cries/iron_moth.aif b/sound/direct_sound_samples/cries/iron_moth.aif
deleted file mode 100644
index fb90d30481..0000000000
Binary files a/sound/direct_sound_samples/cries/iron_moth.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/iron_moth.wav b/sound/direct_sound_samples/cries/iron_moth.wav
new file mode 100644
index 0000000000..297be2d0b9
Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_moth.wav differ
diff --git a/sound/direct_sound_samples/cries/iron_thorns.aif b/sound/direct_sound_samples/cries/iron_thorns.aif
deleted file mode 100644
index ac88055c6d..0000000000
Binary files a/sound/direct_sound_samples/cries/iron_thorns.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/iron_thorns.wav b/sound/direct_sound_samples/cries/iron_thorns.wav
new file mode 100644
index 0000000000..b04462c057
Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_thorns.wav differ
diff --git a/sound/direct_sound_samples/cries/iron_treads.aif b/sound/direct_sound_samples/cries/iron_treads.aif
deleted file mode 100644
index e3b0471711..0000000000
Binary files a/sound/direct_sound_samples/cries/iron_treads.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/iron_treads.wav b/sound/direct_sound_samples/cries/iron_treads.wav
new file mode 100644
index 0000000000..51f3143b5b
Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_treads.wav differ
diff --git a/sound/direct_sound_samples/cries/iron_valiant.aif b/sound/direct_sound_samples/cries/iron_valiant.aif
deleted file mode 100644
index 04220e9f62..0000000000
Binary files a/sound/direct_sound_samples/cries/iron_valiant.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/iron_valiant.wav b/sound/direct_sound_samples/cries/iron_valiant.wav
new file mode 100644
index 0000000000..bf110f88a3
Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_valiant.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 40ee462805..0000000000
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 0000000000..07d10c0e8d
Binary files /dev/null and b/sound/direct_sound_samples/cries/ivysaur.wav differ
diff --git a/sound/direct_sound_samples/cries/jangmo_o.aif b/sound/direct_sound_samples/cries/jangmo_o.aif
deleted file mode 100644
index 29f8f86b51..0000000000
Binary files a/sound/direct_sound_samples/cries/jangmo_o.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/jangmo_o.wav b/sound/direct_sound_samples/cries/jangmo_o.wav
new file mode 100644
index 0000000000..96e08b0c96
Binary files /dev/null and b/sound/direct_sound_samples/cries/jangmo_o.wav differ
diff --git a/sound/direct_sound_samples/cries/jellicent.aif b/sound/direct_sound_samples/cries/jellicent.aif
deleted file mode 100644
index 33f6cf5aea..0000000000
Binary files a/sound/direct_sound_samples/cries/jellicent.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/jellicent.wav b/sound/direct_sound_samples/cries/jellicent.wav
new file mode 100644
index 0000000000..221c787864
Binary files /dev/null and b/sound/direct_sound_samples/cries/jellicent.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 09249f6dd6..0000000000
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 0000000000..d3e925fe94
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 0da759794c..0000000000
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 0000000000..43850cbaa0
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 acd96714ae..0000000000
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 0000000000..8c5f8bea4c
Binary files /dev/null and b/sound/direct_sound_samples/cries/jolteon.wav differ
diff --git a/sound/direct_sound_samples/cries/joltik.aif b/sound/direct_sound_samples/cries/joltik.aif
deleted file mode 100644
index a67354d74c..0000000000
Binary files a/sound/direct_sound_samples/cries/joltik.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/joltik.wav b/sound/direct_sound_samples/cries/joltik.wav
new file mode 100644
index 0000000000..4fa360d6b6
Binary files /dev/null and b/sound/direct_sound_samples/cries/joltik.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 2b93dad558..0000000000
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 0000000000..cce951b1f7
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 cbcd7ee99d..0000000000
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 0000000000..faacb1e957
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 2ed73716cb..0000000000
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 0000000000..448b178914
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 79a4b304a8..0000000000
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 0000000000..0c7b74fea3
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 3f03ee03f0..0000000000
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 0000000000..d7030b27a2
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 8331b0b0e5..0000000000
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 0000000000..f147428e38
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 26a8ac43a4..0000000000
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 0000000000..eaf7244627
Binary files /dev/null and b/sound/direct_sound_samples/cries/kangaskhan.wav differ
diff --git a/sound/direct_sound_samples/cries/kangaskhan_mega.aif b/sound/direct_sound_samples/cries/kangaskhan_mega.aif
deleted file mode 100644
index 417cb04f49..0000000000
Binary files a/sound/direct_sound_samples/cries/kangaskhan_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kangaskhan_mega.wav b/sound/direct_sound_samples/cries/kangaskhan_mega.wav
new file mode 100644
index 0000000000..5c96747381
Binary files /dev/null and b/sound/direct_sound_samples/cries/kangaskhan_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/karrablast.aif b/sound/direct_sound_samples/cries/karrablast.aif
deleted file mode 100644
index 7b5a2c3948..0000000000
Binary files a/sound/direct_sound_samples/cries/karrablast.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/karrablast.wav b/sound/direct_sound_samples/cries/karrablast.wav
new file mode 100644
index 0000000000..b77a4399de
Binary files /dev/null and b/sound/direct_sound_samples/cries/karrablast.wav differ
diff --git a/sound/direct_sound_samples/cries/kartana.aif b/sound/direct_sound_samples/cries/kartana.aif
deleted file mode 100644
index b43fa40d78..0000000000
Binary files a/sound/direct_sound_samples/cries/kartana.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kartana.wav b/sound/direct_sound_samples/cries/kartana.wav
new file mode 100644
index 0000000000..af53ba2608
Binary files /dev/null and b/sound/direct_sound_samples/cries/kartana.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 51dae29350..0000000000
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 0000000000..96ab74ff2b
Binary files /dev/null and b/sound/direct_sound_samples/cries/kecleon.wav differ
diff --git a/sound/direct_sound_samples/cries/keldeo.aif b/sound/direct_sound_samples/cries/keldeo.aif
deleted file mode 100644
index 6f23ad0885..0000000000
Binary files a/sound/direct_sound_samples/cries/keldeo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/keldeo.wav b/sound/direct_sound_samples/cries/keldeo.wav
new file mode 100644
index 0000000000..e1733f1660
Binary files /dev/null and b/sound/direct_sound_samples/cries/keldeo.wav differ
diff --git a/sound/direct_sound_samples/cries/kilowattrel.aif b/sound/direct_sound_samples/cries/kilowattrel.aif
deleted file mode 100644
index d54d4a43b5..0000000000
Binary files a/sound/direct_sound_samples/cries/kilowattrel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kilowattrel.wav b/sound/direct_sound_samples/cries/kilowattrel.wav
new file mode 100644
index 0000000000..b1b27b8ebe
Binary files /dev/null and b/sound/direct_sound_samples/cries/kilowattrel.wav differ
diff --git a/sound/direct_sound_samples/cries/kingambit.aif b/sound/direct_sound_samples/cries/kingambit.aif
deleted file mode 100644
index 38a3d1b6cc..0000000000
Binary files a/sound/direct_sound_samples/cries/kingambit.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kingambit.wav b/sound/direct_sound_samples/cries/kingambit.wav
new file mode 100644
index 0000000000..0770f23f5a
Binary files /dev/null and b/sound/direct_sound_samples/cries/kingambit.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 a9cc1d9fe4..0000000000
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 0000000000..2a47d1479d
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 b836829731..0000000000
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 0000000000..62418456d0
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 0beaebf16f..0000000000
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 0000000000..c7dd3078c8
Binary files /dev/null and b/sound/direct_sound_samples/cries/kirlia.wav differ
diff --git a/sound/direct_sound_samples/cries/klang.aif b/sound/direct_sound_samples/cries/klang.aif
deleted file mode 100644
index 13b28861f4..0000000000
Binary files a/sound/direct_sound_samples/cries/klang.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/klang.wav b/sound/direct_sound_samples/cries/klang.wav
new file mode 100644
index 0000000000..2524393b24
Binary files /dev/null and b/sound/direct_sound_samples/cries/klang.wav differ
diff --git a/sound/direct_sound_samples/cries/klawf.aif b/sound/direct_sound_samples/cries/klawf.aif
deleted file mode 100644
index 8359e13b17..0000000000
Binary files a/sound/direct_sound_samples/cries/klawf.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/klawf.wav b/sound/direct_sound_samples/cries/klawf.wav
new file mode 100644
index 0000000000..8d557afc68
Binary files /dev/null and b/sound/direct_sound_samples/cries/klawf.wav differ
diff --git a/sound/direct_sound_samples/cries/kleavor.aif b/sound/direct_sound_samples/cries/kleavor.aif
deleted file mode 100644
index c84a31cf2f..0000000000
Binary files a/sound/direct_sound_samples/cries/kleavor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kleavor.wav b/sound/direct_sound_samples/cries/kleavor.wav
new file mode 100644
index 0000000000..ac60149c3f
Binary files /dev/null and b/sound/direct_sound_samples/cries/kleavor.wav differ
diff --git a/sound/direct_sound_samples/cries/klink.aif b/sound/direct_sound_samples/cries/klink.aif
deleted file mode 100644
index 0bd6b65f74..0000000000
Binary files a/sound/direct_sound_samples/cries/klink.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/klink.wav b/sound/direct_sound_samples/cries/klink.wav
new file mode 100644
index 0000000000..0233d44ce2
Binary files /dev/null and b/sound/direct_sound_samples/cries/klink.wav differ
diff --git a/sound/direct_sound_samples/cries/klinklang.aif b/sound/direct_sound_samples/cries/klinklang.aif
deleted file mode 100644
index 35117bf30a..0000000000
Binary files a/sound/direct_sound_samples/cries/klinklang.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/klinklang.wav b/sound/direct_sound_samples/cries/klinklang.wav
new file mode 100644
index 0000000000..6cba25f48c
Binary files /dev/null and b/sound/direct_sound_samples/cries/klinklang.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 50d5bc978b..0000000000
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 0000000000..afa520c03e
Binary files /dev/null and b/sound/direct_sound_samples/cries/koffing.wav differ
diff --git a/sound/direct_sound_samples/cries/komala.aif b/sound/direct_sound_samples/cries/komala.aif
deleted file mode 100644
index e084c9a7c4..0000000000
Binary files a/sound/direct_sound_samples/cries/komala.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/komala.wav b/sound/direct_sound_samples/cries/komala.wav
new file mode 100644
index 0000000000..ce1077a9ac
Binary files /dev/null and b/sound/direct_sound_samples/cries/komala.wav differ
diff --git a/sound/direct_sound_samples/cries/kommo_o.aif b/sound/direct_sound_samples/cries/kommo_o.aif
deleted file mode 100644
index 057153e907..0000000000
Binary files a/sound/direct_sound_samples/cries/kommo_o.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kommo_o.wav b/sound/direct_sound_samples/cries/kommo_o.wav
new file mode 100644
index 0000000000..0782ecd776
Binary files /dev/null and b/sound/direct_sound_samples/cries/kommo_o.wav differ
diff --git a/sound/direct_sound_samples/cries/koraidon.aif b/sound/direct_sound_samples/cries/koraidon.aif
deleted file mode 100644
index 6ab93ad73e..0000000000
Binary files a/sound/direct_sound_samples/cries/koraidon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/koraidon.wav b/sound/direct_sound_samples/cries/koraidon.wav
new file mode 100644
index 0000000000..cf5de8aff3
Binary files /dev/null and b/sound/direct_sound_samples/cries/koraidon.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 33b8ea294b..0000000000
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 0000000000..0072ea777a
Binary files /dev/null and b/sound/direct_sound_samples/cries/krabby.wav differ
diff --git a/sound/direct_sound_samples/cries/kricketot.aif b/sound/direct_sound_samples/cries/kricketot.aif
deleted file mode 100644
index 7b301cc485..0000000000
Binary files a/sound/direct_sound_samples/cries/kricketot.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kricketot.wav b/sound/direct_sound_samples/cries/kricketot.wav
new file mode 100644
index 0000000000..126bbecee8
Binary files /dev/null and b/sound/direct_sound_samples/cries/kricketot.wav differ
diff --git a/sound/direct_sound_samples/cries/kricketune.aif b/sound/direct_sound_samples/cries/kricketune.aif
deleted file mode 100644
index b3ebcbf8ae..0000000000
Binary files a/sound/direct_sound_samples/cries/kricketune.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kricketune.wav b/sound/direct_sound_samples/cries/kricketune.wav
new file mode 100644
index 0000000000..832069528a
Binary files /dev/null and b/sound/direct_sound_samples/cries/kricketune.wav differ
diff --git a/sound/direct_sound_samples/cries/krokorok.aif b/sound/direct_sound_samples/cries/krokorok.aif
deleted file mode 100644
index 39765627ec..0000000000
Binary files a/sound/direct_sound_samples/cries/krokorok.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/krokorok.wav b/sound/direct_sound_samples/cries/krokorok.wav
new file mode 100644
index 0000000000..cf2f75dc8e
Binary files /dev/null and b/sound/direct_sound_samples/cries/krokorok.wav differ
diff --git a/sound/direct_sound_samples/cries/krookodile.aif b/sound/direct_sound_samples/cries/krookodile.aif
deleted file mode 100644
index 4b532b3bd1..0000000000
Binary files a/sound/direct_sound_samples/cries/krookodile.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/krookodile.wav b/sound/direct_sound_samples/cries/krookodile.wav
new file mode 100644
index 0000000000..0abdce9be7
Binary files /dev/null and b/sound/direct_sound_samples/cries/krookodile.wav differ
diff --git a/sound/direct_sound_samples/cries/kubfu.aif b/sound/direct_sound_samples/cries/kubfu.aif
deleted file mode 100644
index dd45534b88..0000000000
Binary files a/sound/direct_sound_samples/cries/kubfu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kubfu.wav b/sound/direct_sound_samples/cries/kubfu.wav
new file mode 100644
index 0000000000..899b03f7a9
Binary files /dev/null and b/sound/direct_sound_samples/cries/kubfu.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 c20d2cf324..0000000000
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 0000000000..00db984c66
Binary files /dev/null and b/sound/direct_sound_samples/cries/kyogre.wav differ
diff --git a/sound/direct_sound_samples/cries/kyogre_primal.aif b/sound/direct_sound_samples/cries/kyogre_primal.aif
deleted file mode 100644
index b7999915b3..0000000000
Binary files a/sound/direct_sound_samples/cries/kyogre_primal.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kyogre_primal.wav b/sound/direct_sound_samples/cries/kyogre_primal.wav
new file mode 100644
index 0000000000..1688dad88b
Binary files /dev/null and b/sound/direct_sound_samples/cries/kyogre_primal.wav differ
diff --git a/sound/direct_sound_samples/cries/kyurem.aif b/sound/direct_sound_samples/cries/kyurem.aif
deleted file mode 100644
index 0345a0c175..0000000000
Binary files a/sound/direct_sound_samples/cries/kyurem.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kyurem.wav b/sound/direct_sound_samples/cries/kyurem.wav
new file mode 100644
index 0000000000..d33514448e
Binary files /dev/null and b/sound/direct_sound_samples/cries/kyurem.wav differ
diff --git a/sound/direct_sound_samples/cries/kyurem_black.aif b/sound/direct_sound_samples/cries/kyurem_black.aif
deleted file mode 100644
index 9b5320bd63..0000000000
Binary files a/sound/direct_sound_samples/cries/kyurem_black.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kyurem_black.wav b/sound/direct_sound_samples/cries/kyurem_black.wav
new file mode 100644
index 0000000000..385bd7824f
Binary files /dev/null and b/sound/direct_sound_samples/cries/kyurem_black.wav differ
diff --git a/sound/direct_sound_samples/cries/kyurem_white.aif b/sound/direct_sound_samples/cries/kyurem_white.aif
deleted file mode 100644
index 1e6f0283ec..0000000000
Binary files a/sound/direct_sound_samples/cries/kyurem_white.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/kyurem_white.wav b/sound/direct_sound_samples/cries/kyurem_white.wav
new file mode 100644
index 0000000000..7a4b8dbd7c
Binary files /dev/null and b/sound/direct_sound_samples/cries/kyurem_white.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 44bc57df17..0000000000
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 0000000000..574ffac745
Binary files /dev/null and b/sound/direct_sound_samples/cries/lairon.wav differ
diff --git a/sound/direct_sound_samples/cries/lampent.aif b/sound/direct_sound_samples/cries/lampent.aif
deleted file mode 100644
index 9d5a8a3c01..0000000000
Binary files a/sound/direct_sound_samples/cries/lampent.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lampent.wav b/sound/direct_sound_samples/cries/lampent.wav
new file mode 100644
index 0000000000..e92380e5ad
Binary files /dev/null and b/sound/direct_sound_samples/cries/lampent.wav differ
diff --git a/sound/direct_sound_samples/cries/landorus_incarnate.aif b/sound/direct_sound_samples/cries/landorus_incarnate.aif
deleted file mode 100644
index 03111963d7..0000000000
Binary files a/sound/direct_sound_samples/cries/landorus_incarnate.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/landorus_incarnate.wav b/sound/direct_sound_samples/cries/landorus_incarnate.wav
new file mode 100644
index 0000000000..82c79ea48f
Binary files /dev/null and b/sound/direct_sound_samples/cries/landorus_incarnate.wav differ
diff --git a/sound/direct_sound_samples/cries/landorus_therian.aif b/sound/direct_sound_samples/cries/landorus_therian.aif
deleted file mode 100644
index 6a641cf6f4..0000000000
Binary files a/sound/direct_sound_samples/cries/landorus_therian.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/landorus_therian.wav b/sound/direct_sound_samples/cries/landorus_therian.wav
new file mode 100644
index 0000000000..246f4b2595
Binary files /dev/null and b/sound/direct_sound_samples/cries/landorus_therian.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 e88570f68d..0000000000
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 0000000000..6d8b21dd99
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 9bc9023730..0000000000
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 0000000000..d79819a971
Binary files /dev/null and b/sound/direct_sound_samples/cries/lapras.wav differ
diff --git a/sound/direct_sound_samples/cries/larvesta.aif b/sound/direct_sound_samples/cries/larvesta.aif
deleted file mode 100644
index a025df32bf..0000000000
Binary files a/sound/direct_sound_samples/cries/larvesta.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/larvesta.wav b/sound/direct_sound_samples/cries/larvesta.wav
new file mode 100644
index 0000000000..3c1fb5a46a
Binary files /dev/null and b/sound/direct_sound_samples/cries/larvesta.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 fd91d5bc7d..0000000000
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 0000000000..e0e22cd6f5
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 90f558abc8..0000000000
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 0000000000..87e6205ada
Binary files /dev/null and b/sound/direct_sound_samples/cries/latias.wav differ
diff --git a/sound/direct_sound_samples/cries/latias_mega.aif b/sound/direct_sound_samples/cries/latias_mega.aif
deleted file mode 100644
index 0dc1b89906..0000000000
Binary files a/sound/direct_sound_samples/cries/latias_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/latias_mega.wav b/sound/direct_sound_samples/cries/latias_mega.wav
new file mode 100644
index 0000000000..c1b5d48233
Binary files /dev/null and b/sound/direct_sound_samples/cries/latias_mega.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 f42446256c..0000000000
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 0000000000..1409dba11a
Binary files /dev/null and b/sound/direct_sound_samples/cries/latios.wav differ
diff --git a/sound/direct_sound_samples/cries/latios_mega.aif b/sound/direct_sound_samples/cries/latios_mega.aif
deleted file mode 100644
index 88a896035b..0000000000
Binary files a/sound/direct_sound_samples/cries/latios_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/latios_mega.wav b/sound/direct_sound_samples/cries/latios_mega.wav
new file mode 100644
index 0000000000..9a1b9754e7
Binary files /dev/null and b/sound/direct_sound_samples/cries/latios_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/leafeon.aif b/sound/direct_sound_samples/cries/leafeon.aif
deleted file mode 100644
index b3e7494b69..0000000000
Binary files a/sound/direct_sound_samples/cries/leafeon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/leafeon.wav b/sound/direct_sound_samples/cries/leafeon.wav
new file mode 100644
index 0000000000..3a248e47f8
Binary files /dev/null and b/sound/direct_sound_samples/cries/leafeon.wav differ
diff --git a/sound/direct_sound_samples/cries/leavanny.aif b/sound/direct_sound_samples/cries/leavanny.aif
deleted file mode 100644
index 503a08ffe8..0000000000
Binary files a/sound/direct_sound_samples/cries/leavanny.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/leavanny.wav b/sound/direct_sound_samples/cries/leavanny.wav
new file mode 100644
index 0000000000..e07d790e3b
Binary files /dev/null and b/sound/direct_sound_samples/cries/leavanny.wav differ
diff --git a/sound/direct_sound_samples/cries/lechonk.aif b/sound/direct_sound_samples/cries/lechonk.aif
deleted file mode 100644
index f1ab3af238..0000000000
Binary files a/sound/direct_sound_samples/cries/lechonk.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lechonk.wav b/sound/direct_sound_samples/cries/lechonk.wav
new file mode 100644
index 0000000000..7c1b4e71bd
Binary files /dev/null and b/sound/direct_sound_samples/cries/lechonk.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 cbc86ba6ac..0000000000
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 0000000000..554829075d
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 d90f684401..0000000000
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 0000000000..e539c3d60a
Binary files /dev/null and b/sound/direct_sound_samples/cries/ledyba.wav differ
diff --git a/sound/direct_sound_samples/cries/lickilicky.aif b/sound/direct_sound_samples/cries/lickilicky.aif
deleted file mode 100644
index 542bbcaf8b..0000000000
Binary files a/sound/direct_sound_samples/cries/lickilicky.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lickilicky.wav b/sound/direct_sound_samples/cries/lickilicky.wav
new file mode 100644
index 0000000000..e0e6ccf237
Binary files /dev/null and b/sound/direct_sound_samples/cries/lickilicky.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 c21d1b0365..0000000000
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 0000000000..33a0ab5ff3
Binary files /dev/null and b/sound/direct_sound_samples/cries/lickitung.wav differ
diff --git a/sound/direct_sound_samples/cries/liepard.aif b/sound/direct_sound_samples/cries/liepard.aif
deleted file mode 100644
index eec210c0e7..0000000000
Binary files a/sound/direct_sound_samples/cries/liepard.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/liepard.wav b/sound/direct_sound_samples/cries/liepard.wav
new file mode 100644
index 0000000000..f88311694c
Binary files /dev/null and b/sound/direct_sound_samples/cries/liepard.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 e1b750ba94..0000000000
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 0000000000..f890086d37
Binary files /dev/null and b/sound/direct_sound_samples/cries/lileep.wav differ
diff --git a/sound/direct_sound_samples/cries/lilligant.aif b/sound/direct_sound_samples/cries/lilligant.aif
deleted file mode 100644
index e00b1aafc4..0000000000
Binary files a/sound/direct_sound_samples/cries/lilligant.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lilligant.wav b/sound/direct_sound_samples/cries/lilligant.wav
new file mode 100644
index 0000000000..f49cd46afd
Binary files /dev/null and b/sound/direct_sound_samples/cries/lilligant.wav differ
diff --git a/sound/direct_sound_samples/cries/lillipup.aif b/sound/direct_sound_samples/cries/lillipup.aif
deleted file mode 100644
index 825f5054cf..0000000000
Binary files a/sound/direct_sound_samples/cries/lillipup.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lillipup.wav b/sound/direct_sound_samples/cries/lillipup.wav
new file mode 100644
index 0000000000..2ca638186c
Binary files /dev/null and b/sound/direct_sound_samples/cries/lillipup.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 1db1958d4c..0000000000
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 0000000000..b8c191bcd0
Binary files /dev/null and b/sound/direct_sound_samples/cries/linoone.wav differ
diff --git a/sound/direct_sound_samples/cries/litleo.aif b/sound/direct_sound_samples/cries/litleo.aif
deleted file mode 100644
index 417d3d4708..0000000000
Binary files a/sound/direct_sound_samples/cries/litleo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/litleo.wav b/sound/direct_sound_samples/cries/litleo.wav
new file mode 100644
index 0000000000..bbd5814c1f
Binary files /dev/null and b/sound/direct_sound_samples/cries/litleo.wav differ
diff --git a/sound/direct_sound_samples/cries/litten.aif b/sound/direct_sound_samples/cries/litten.aif
deleted file mode 100644
index c2c486dd98..0000000000
Binary files a/sound/direct_sound_samples/cries/litten.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/litten.wav b/sound/direct_sound_samples/cries/litten.wav
new file mode 100644
index 0000000000..faf794123f
Binary files /dev/null and b/sound/direct_sound_samples/cries/litten.wav differ
diff --git a/sound/direct_sound_samples/cries/litwick.aif b/sound/direct_sound_samples/cries/litwick.aif
deleted file mode 100644
index c13b749200..0000000000
Binary files a/sound/direct_sound_samples/cries/litwick.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/litwick.wav b/sound/direct_sound_samples/cries/litwick.wav
new file mode 100644
index 0000000000..da405865a3
Binary files /dev/null and b/sound/direct_sound_samples/cries/litwick.wav differ
diff --git a/sound/direct_sound_samples/cries/lokix.aif b/sound/direct_sound_samples/cries/lokix.aif
deleted file mode 100644
index 739ae1ad56..0000000000
Binary files a/sound/direct_sound_samples/cries/lokix.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lokix.wav b/sound/direct_sound_samples/cries/lokix.wav
new file mode 100644
index 0000000000..b3d94004d7
Binary files /dev/null and b/sound/direct_sound_samples/cries/lokix.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 3839f7a327..0000000000
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 0000000000..6d7888619e
Binary files /dev/null and b/sound/direct_sound_samples/cries/lombre.wav differ
diff --git a/sound/direct_sound_samples/cries/lopunny.aif b/sound/direct_sound_samples/cries/lopunny.aif
deleted file mode 100644
index f793790785..0000000000
Binary files a/sound/direct_sound_samples/cries/lopunny.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lopunny.wav b/sound/direct_sound_samples/cries/lopunny.wav
new file mode 100644
index 0000000000..8897e582a4
Binary files /dev/null and b/sound/direct_sound_samples/cries/lopunny.wav differ
diff --git a/sound/direct_sound_samples/cries/lopunny_mega.aif b/sound/direct_sound_samples/cries/lopunny_mega.aif
deleted file mode 100644
index 212df776de..0000000000
Binary files a/sound/direct_sound_samples/cries/lopunny_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lopunny_mega.wav b/sound/direct_sound_samples/cries/lopunny_mega.wav
new file mode 100644
index 0000000000..e02e8a69ef
Binary files /dev/null and b/sound/direct_sound_samples/cries/lopunny_mega.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 290ec54859..0000000000
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 0000000000..8e28b10f32
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 d9c7465573..0000000000
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 0000000000..ff8b2c8104
Binary files /dev/null and b/sound/direct_sound_samples/cries/loudred.wav differ
diff --git a/sound/direct_sound_samples/cries/lucario.aif b/sound/direct_sound_samples/cries/lucario.aif
deleted file mode 100644
index 80064d64fb..0000000000
Binary files a/sound/direct_sound_samples/cries/lucario.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lucario.wav b/sound/direct_sound_samples/cries/lucario.wav
new file mode 100644
index 0000000000..78cfeac18b
Binary files /dev/null and b/sound/direct_sound_samples/cries/lucario.wav differ
diff --git a/sound/direct_sound_samples/cries/lucario_mega.aif b/sound/direct_sound_samples/cries/lucario_mega.aif
deleted file mode 100644
index 1a100f4dab..0000000000
Binary files a/sound/direct_sound_samples/cries/lucario_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lucario_mega.wav b/sound/direct_sound_samples/cries/lucario_mega.wav
new file mode 100644
index 0000000000..7121965167
Binary files /dev/null and b/sound/direct_sound_samples/cries/lucario_mega.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 690cf75fe4..0000000000
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 0000000000..420ac54595
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 884b48591e..0000000000
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 0000000000..855920839e
Binary files /dev/null and b/sound/direct_sound_samples/cries/lugia.wav differ
diff --git a/sound/direct_sound_samples/cries/lumineon.aif b/sound/direct_sound_samples/cries/lumineon.aif
deleted file mode 100644
index 0577fb5575..0000000000
Binary files a/sound/direct_sound_samples/cries/lumineon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lumineon.wav b/sound/direct_sound_samples/cries/lumineon.wav
new file mode 100644
index 0000000000..fccb69a383
Binary files /dev/null and b/sound/direct_sound_samples/cries/lumineon.wav differ
diff --git a/sound/direct_sound_samples/cries/lunala.aif b/sound/direct_sound_samples/cries/lunala.aif
deleted file mode 100644
index d95185de79..0000000000
Binary files a/sound/direct_sound_samples/cries/lunala.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lunala.wav b/sound/direct_sound_samples/cries/lunala.wav
new file mode 100644
index 0000000000..e82139ef18
Binary files /dev/null and b/sound/direct_sound_samples/cries/lunala.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 e27d7f2f60..0000000000
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 0000000000..8edd9a17e1
Binary files /dev/null and b/sound/direct_sound_samples/cries/lunatone.wav differ
diff --git a/sound/direct_sound_samples/cries/lurantis.aif b/sound/direct_sound_samples/cries/lurantis.aif
deleted file mode 100644
index 36ab7d71e2..0000000000
Binary files a/sound/direct_sound_samples/cries/lurantis.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lurantis.wav b/sound/direct_sound_samples/cries/lurantis.wav
new file mode 100644
index 0000000000..d85d414356
Binary files /dev/null and b/sound/direct_sound_samples/cries/lurantis.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 396aceff5e..0000000000
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 0000000000..da1c84b80e
Binary files /dev/null and b/sound/direct_sound_samples/cries/luvdisc.wav differ
diff --git a/sound/direct_sound_samples/cries/luxio.aif b/sound/direct_sound_samples/cries/luxio.aif
deleted file mode 100644
index f56ffe1ea0..0000000000
Binary files a/sound/direct_sound_samples/cries/luxio.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/luxio.wav b/sound/direct_sound_samples/cries/luxio.wav
new file mode 100644
index 0000000000..9f3189f78e
Binary files /dev/null and b/sound/direct_sound_samples/cries/luxio.wav differ
diff --git a/sound/direct_sound_samples/cries/luxray.aif b/sound/direct_sound_samples/cries/luxray.aif
deleted file mode 100644
index 76bf5cb5d1..0000000000
Binary files a/sound/direct_sound_samples/cries/luxray.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/luxray.wav b/sound/direct_sound_samples/cries/luxray.wav
new file mode 100644
index 0000000000..7c393e1b4a
Binary files /dev/null and b/sound/direct_sound_samples/cries/luxray.wav differ
diff --git a/sound/direct_sound_samples/cries/lycanroc_dusk.aif b/sound/direct_sound_samples/cries/lycanroc_dusk.aif
deleted file mode 100644
index 61d985e64a..0000000000
Binary files a/sound/direct_sound_samples/cries/lycanroc_dusk.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lycanroc_dusk.wav b/sound/direct_sound_samples/cries/lycanroc_dusk.wav
new file mode 100644
index 0000000000..6f7e05e2c7
Binary files /dev/null and b/sound/direct_sound_samples/cries/lycanroc_dusk.wav differ
diff --git a/sound/direct_sound_samples/cries/lycanroc_midday.aif b/sound/direct_sound_samples/cries/lycanroc_midday.aif
deleted file mode 100644
index 380d192c22..0000000000
Binary files a/sound/direct_sound_samples/cries/lycanroc_midday.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lycanroc_midday.wav b/sound/direct_sound_samples/cries/lycanroc_midday.wav
new file mode 100644
index 0000000000..db29524ad4
Binary files /dev/null and b/sound/direct_sound_samples/cries/lycanroc_midday.wav differ
diff --git a/sound/direct_sound_samples/cries/lycanroc_midnight.aif b/sound/direct_sound_samples/cries/lycanroc_midnight.aif
deleted file mode 100644
index e81dac8c3e..0000000000
Binary files a/sound/direct_sound_samples/cries/lycanroc_midnight.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/lycanroc_midnight.wav b/sound/direct_sound_samples/cries/lycanroc_midnight.wav
new file mode 100644
index 0000000000..19bb4175fd
Binary files /dev/null and b/sound/direct_sound_samples/cries/lycanroc_midnight.wav differ
diff --git a/sound/direct_sound_samples/cries/mabosstiff.aif b/sound/direct_sound_samples/cries/mabosstiff.aif
deleted file mode 100644
index b66bbf731f..0000000000
Binary files a/sound/direct_sound_samples/cries/mabosstiff.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mabosstiff.wav b/sound/direct_sound_samples/cries/mabosstiff.wav
new file mode 100644
index 0000000000..245078423a
Binary files /dev/null and b/sound/direct_sound_samples/cries/mabosstiff.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 99bcfea898..0000000000
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 0000000000..b7e091dc72
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 241731b6fe..0000000000
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 0000000000..5e0fc98bf1
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 c878dfe99f..0000000000
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 0000000000..a34a0ccc80
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 69f77a3b35..0000000000
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 0000000000..8b083206c2
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 f1127dabc4..0000000000
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 0000000000..6d97b90c1b
Binary files /dev/null and b/sound/direct_sound_samples/cries/magcargo.wav differ
diff --git a/sound/direct_sound_samples/cries/magearna.aif b/sound/direct_sound_samples/cries/magearna.aif
deleted file mode 100644
index 2e01fe5aa3..0000000000
Binary files a/sound/direct_sound_samples/cries/magearna.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/magearna.wav b/sound/direct_sound_samples/cries/magearna.wav
new file mode 100644
index 0000000000..121867385d
Binary files /dev/null and b/sound/direct_sound_samples/cries/magearna.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 71bdbf3939..0000000000
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 0000000000..6c665d9e75
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 c2a6a171ae..0000000000
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 0000000000..902c15bf2e
Binary files /dev/null and b/sound/direct_sound_samples/cries/magmar.wav differ
diff --git a/sound/direct_sound_samples/cries/magmortar.aif b/sound/direct_sound_samples/cries/magmortar.aif
deleted file mode 100644
index ae7f0ea502..0000000000
Binary files a/sound/direct_sound_samples/cries/magmortar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/magmortar.wav b/sound/direct_sound_samples/cries/magmortar.wav
new file mode 100644
index 0000000000..6db0fc45de
Binary files /dev/null and b/sound/direct_sound_samples/cries/magmortar.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 d468102ac9..0000000000
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 0000000000..4fdc93f296
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 30327cdbc3..0000000000
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 0000000000..d69c276443
Binary files /dev/null and b/sound/direct_sound_samples/cries/magneton.wav differ
diff --git a/sound/direct_sound_samples/cries/magnezone.aif b/sound/direct_sound_samples/cries/magnezone.aif
deleted file mode 100644
index 750cbd3ac4..0000000000
Binary files a/sound/direct_sound_samples/cries/magnezone.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/magnezone.wav b/sound/direct_sound_samples/cries/magnezone.wav
new file mode 100644
index 0000000000..5e6adaeeaa
Binary files /dev/null and b/sound/direct_sound_samples/cries/magnezone.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 2dffab4bcc..0000000000
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 0000000000..79b055ef98
Binary files /dev/null and b/sound/direct_sound_samples/cries/makuhita.wav differ
diff --git a/sound/direct_sound_samples/cries/malamar.aif b/sound/direct_sound_samples/cries/malamar.aif
deleted file mode 100644
index 80428bfb16..0000000000
Binary files a/sound/direct_sound_samples/cries/malamar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/malamar.wav b/sound/direct_sound_samples/cries/malamar.wav
new file mode 100644
index 0000000000..37a33ffb84
Binary files /dev/null and b/sound/direct_sound_samples/cries/malamar.wav differ
diff --git a/sound/direct_sound_samples/cries/mamoswine.aif b/sound/direct_sound_samples/cries/mamoswine.aif
deleted file mode 100644
index 48625c1a6f..0000000000
Binary files a/sound/direct_sound_samples/cries/mamoswine.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mamoswine.wav b/sound/direct_sound_samples/cries/mamoswine.wav
new file mode 100644
index 0000000000..ce0488818b
Binary files /dev/null and b/sound/direct_sound_samples/cries/mamoswine.wav differ
diff --git a/sound/direct_sound_samples/cries/manaphy.aif b/sound/direct_sound_samples/cries/manaphy.aif
deleted file mode 100644
index 7df4dc8338..0000000000
Binary files a/sound/direct_sound_samples/cries/manaphy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/manaphy.wav b/sound/direct_sound_samples/cries/manaphy.wav
new file mode 100644
index 0000000000..ddd3ea6c38
Binary files /dev/null and b/sound/direct_sound_samples/cries/manaphy.wav differ
diff --git a/sound/direct_sound_samples/cries/mandibuzz.aif b/sound/direct_sound_samples/cries/mandibuzz.aif
deleted file mode 100644
index 1a3a3afec3..0000000000
Binary files a/sound/direct_sound_samples/cries/mandibuzz.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mandibuzz.wav b/sound/direct_sound_samples/cries/mandibuzz.wav
new file mode 100644
index 0000000000..2db3dfaf39
Binary files /dev/null and b/sound/direct_sound_samples/cries/mandibuzz.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 cb0783a0c9..0000000000
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 0000000000..939fc16093
Binary files /dev/null and b/sound/direct_sound_samples/cries/manectric.wav differ
diff --git a/sound/direct_sound_samples/cries/manectric_mega.aif b/sound/direct_sound_samples/cries/manectric_mega.aif
deleted file mode 100644
index 6e9717fe89..0000000000
Binary files a/sound/direct_sound_samples/cries/manectric_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/manectric_mega.wav b/sound/direct_sound_samples/cries/manectric_mega.wav
new file mode 100644
index 0000000000..cd4f1e11aa
Binary files /dev/null and b/sound/direct_sound_samples/cries/manectric_mega.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 b2634d3f7b..0000000000
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 0000000000..ab15ac9af6
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 f3f6af3213..0000000000
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 0000000000..919242e8fe
Binary files /dev/null and b/sound/direct_sound_samples/cries/mantine.wav differ
diff --git a/sound/direct_sound_samples/cries/mantyke.aif b/sound/direct_sound_samples/cries/mantyke.aif
deleted file mode 100644
index edf6a76ef1..0000000000
Binary files a/sound/direct_sound_samples/cries/mantyke.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mantyke.wav b/sound/direct_sound_samples/cries/mantyke.wav
new file mode 100644
index 0000000000..6c602275d1
Binary files /dev/null and b/sound/direct_sound_samples/cries/mantyke.wav differ
diff --git a/sound/direct_sound_samples/cries/maractus.aif b/sound/direct_sound_samples/cries/maractus.aif
deleted file mode 100644
index ad2488ec86..0000000000
Binary files a/sound/direct_sound_samples/cries/maractus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/maractus.wav b/sound/direct_sound_samples/cries/maractus.wav
new file mode 100644
index 0000000000..944aac4465
Binary files /dev/null and b/sound/direct_sound_samples/cries/maractus.wav differ
diff --git a/sound/direct_sound_samples/cries/mareanie.aif b/sound/direct_sound_samples/cries/mareanie.aif
deleted file mode 100644
index 75a73d5edb..0000000000
Binary files a/sound/direct_sound_samples/cries/mareanie.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mareanie.wav b/sound/direct_sound_samples/cries/mareanie.wav
new file mode 100644
index 0000000000..8889530143
Binary files /dev/null and b/sound/direct_sound_samples/cries/mareanie.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 2dfc9e88bc..0000000000
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 0000000000..386925f5d5
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 1c3b6bc41f..0000000000
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 0000000000..93201d1c51
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 c081ba9f9d..0000000000
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 0000000000..7bddb4b347
Binary files /dev/null and b/sound/direct_sound_samples/cries/marowak.wav differ
diff --git a/sound/direct_sound_samples/cries/marshadow.aif b/sound/direct_sound_samples/cries/marshadow.aif
deleted file mode 100644
index 3092b639f2..0000000000
Binary files a/sound/direct_sound_samples/cries/marshadow.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/marshadow.wav b/sound/direct_sound_samples/cries/marshadow.wav
new file mode 100644
index 0000000000..a9cfdf6a14
Binary files /dev/null and b/sound/direct_sound_samples/cries/marshadow.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 79728eb087..0000000000
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 0000000000..0caa959e29
Binary files /dev/null and b/sound/direct_sound_samples/cries/marshtomp.wav differ
diff --git a/sound/direct_sound_samples/cries/maschiff.aif b/sound/direct_sound_samples/cries/maschiff.aif
deleted file mode 100644
index ee93b59ade..0000000000
Binary files a/sound/direct_sound_samples/cries/maschiff.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/maschiff.wav b/sound/direct_sound_samples/cries/maschiff.wav
new file mode 100644
index 0000000000..7b4412d147
Binary files /dev/null and b/sound/direct_sound_samples/cries/maschiff.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 e3ef3b9d81..0000000000
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 0000000000..b0c5372ae3
Binary files /dev/null and b/sound/direct_sound_samples/cries/masquerain.wav differ
diff --git a/sound/direct_sound_samples/cries/maushold_four.aif b/sound/direct_sound_samples/cries/maushold_four.aif
deleted file mode 100644
index c7c0aee6ee..0000000000
Binary files a/sound/direct_sound_samples/cries/maushold_four.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/maushold_four.wav b/sound/direct_sound_samples/cries/maushold_four.wav
new file mode 100644
index 0000000000..b4cc4eb70f
Binary files /dev/null and b/sound/direct_sound_samples/cries/maushold_four.wav differ
diff --git a/sound/direct_sound_samples/cries/maushold_three.aif b/sound/direct_sound_samples/cries/maushold_three.aif
deleted file mode 100644
index 0e771535ea..0000000000
Binary files a/sound/direct_sound_samples/cries/maushold_three.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/maushold_three.wav b/sound/direct_sound_samples/cries/maushold_three.wav
new file mode 100644
index 0000000000..5e62f29003
Binary files /dev/null and b/sound/direct_sound_samples/cries/maushold_three.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 8374bf4797..0000000000
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 0000000000..9c54d40a48
Binary files /dev/null and b/sound/direct_sound_samples/cries/mawile.wav differ
diff --git a/sound/direct_sound_samples/cries/mawile_mega.aif b/sound/direct_sound_samples/cries/mawile_mega.aif
deleted file mode 100644
index a6e7ec8c83..0000000000
Binary files a/sound/direct_sound_samples/cries/mawile_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mawile_mega.wav b/sound/direct_sound_samples/cries/mawile_mega.wav
new file mode 100644
index 0000000000..fd19d9e096
Binary files /dev/null and b/sound/direct_sound_samples/cries/mawile_mega.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 02818ba0dd..0000000000
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 0000000000..be3668b173
Binary files /dev/null and b/sound/direct_sound_samples/cries/medicham.wav differ
diff --git a/sound/direct_sound_samples/cries/medicham_mega.aif b/sound/direct_sound_samples/cries/medicham_mega.aif
deleted file mode 100644
index 36db11b2f7..0000000000
Binary files a/sound/direct_sound_samples/cries/medicham_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/medicham_mega.wav b/sound/direct_sound_samples/cries/medicham_mega.wav
new file mode 100644
index 0000000000..c71155ae4b
Binary files /dev/null and b/sound/direct_sound_samples/cries/medicham_mega.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 e3dc9dd802..0000000000
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 0000000000..23db4f297f
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 abada35482..0000000000
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 0000000000..8f7920e937
Binary files /dev/null and b/sound/direct_sound_samples/cries/meganium.wav differ
diff --git a/sound/direct_sound_samples/cries/melmetal.aif b/sound/direct_sound_samples/cries/melmetal.aif
deleted file mode 100644
index 5590164d1e..0000000000
Binary files a/sound/direct_sound_samples/cries/melmetal.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/melmetal.wav b/sound/direct_sound_samples/cries/melmetal.wav
new file mode 100644
index 0000000000..0d16f9494c
Binary files /dev/null and b/sound/direct_sound_samples/cries/melmetal.wav differ
diff --git a/sound/direct_sound_samples/cries/meloetta.aif b/sound/direct_sound_samples/cries/meloetta.aif
deleted file mode 100644
index 298a5214be..0000000000
Binary files a/sound/direct_sound_samples/cries/meloetta.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/meloetta.wav b/sound/direct_sound_samples/cries/meloetta.wav
new file mode 100644
index 0000000000..ff7d225b4b
Binary files /dev/null and b/sound/direct_sound_samples/cries/meloetta.wav differ
diff --git a/sound/direct_sound_samples/cries/meltan.aif b/sound/direct_sound_samples/cries/meltan.aif
deleted file mode 100644
index 42b258f517..0000000000
Binary files a/sound/direct_sound_samples/cries/meltan.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/meltan.wav b/sound/direct_sound_samples/cries/meltan.wav
new file mode 100644
index 0000000000..8b55a26e23
Binary files /dev/null and b/sound/direct_sound_samples/cries/meltan.wav differ
diff --git a/sound/direct_sound_samples/cries/meowscarada.aif b/sound/direct_sound_samples/cries/meowscarada.aif
deleted file mode 100644
index 981a07a206..0000000000
Binary files a/sound/direct_sound_samples/cries/meowscarada.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/meowscarada.wav b/sound/direct_sound_samples/cries/meowscarada.wav
new file mode 100644
index 0000000000..d251942128
Binary files /dev/null and b/sound/direct_sound_samples/cries/meowscarada.wav differ
diff --git a/sound/direct_sound_samples/cries/meowstic.aif b/sound/direct_sound_samples/cries/meowstic.aif
deleted file mode 100644
index a8536832b2..0000000000
Binary files a/sound/direct_sound_samples/cries/meowstic.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/meowstic.wav b/sound/direct_sound_samples/cries/meowstic.wav
new file mode 100644
index 0000000000..aba57fdda0
Binary files /dev/null and b/sound/direct_sound_samples/cries/meowstic.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 d919e99e63..0000000000
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 0000000000..bebca1c27e
Binary files /dev/null and b/sound/direct_sound_samples/cries/meowth.wav differ
diff --git a/sound/direct_sound_samples/cries/mesprit.aif b/sound/direct_sound_samples/cries/mesprit.aif
deleted file mode 100644
index 0c76a7f0f4..0000000000
Binary files a/sound/direct_sound_samples/cries/mesprit.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mesprit.wav b/sound/direct_sound_samples/cries/mesprit.wav
new file mode 100644
index 0000000000..cd85af6499
Binary files /dev/null and b/sound/direct_sound_samples/cries/mesprit.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 bb3bc21c67..0000000000
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 0000000000..5112b3afa8
Binary files /dev/null and b/sound/direct_sound_samples/cries/metagross.wav differ
diff --git a/sound/direct_sound_samples/cries/metagross_mega.aif b/sound/direct_sound_samples/cries/metagross_mega.aif
deleted file mode 100644
index e1125b659f..0000000000
Binary files a/sound/direct_sound_samples/cries/metagross_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/metagross_mega.wav b/sound/direct_sound_samples/cries/metagross_mega.wav
new file mode 100644
index 0000000000..56fbcfb78b
Binary files /dev/null and b/sound/direct_sound_samples/cries/metagross_mega.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 225cdfbfe1..0000000000
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 0000000000..700759d207
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 e875755db0..0000000000
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 0000000000..6df3b6aefb
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 f0649ee6f8..0000000000
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 0000000000..e75fa95f35
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 2bafa47083..0000000000
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 0000000000..947984f672
Binary files /dev/null and b/sound/direct_sound_samples/cries/mewtwo.wav differ
diff --git a/sound/direct_sound_samples/cries/mewtwo_mega_x.aif b/sound/direct_sound_samples/cries/mewtwo_mega_x.aif
deleted file mode 100644
index c484f7b9eb..0000000000
Binary files a/sound/direct_sound_samples/cries/mewtwo_mega_x.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mewtwo_mega_x.wav b/sound/direct_sound_samples/cries/mewtwo_mega_x.wav
new file mode 100644
index 0000000000..84c83efb10
Binary files /dev/null and b/sound/direct_sound_samples/cries/mewtwo_mega_x.wav differ
diff --git a/sound/direct_sound_samples/cries/mewtwo_mega_y.aif b/sound/direct_sound_samples/cries/mewtwo_mega_y.aif
deleted file mode 100644
index 87a5d54ad9..0000000000
Binary files a/sound/direct_sound_samples/cries/mewtwo_mega_y.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mewtwo_mega_y.wav b/sound/direct_sound_samples/cries/mewtwo_mega_y.wav
new file mode 100644
index 0000000000..b885771fd3
Binary files /dev/null and b/sound/direct_sound_samples/cries/mewtwo_mega_y.wav differ
diff --git a/sound/direct_sound_samples/cries/mienfoo.aif b/sound/direct_sound_samples/cries/mienfoo.aif
deleted file mode 100644
index 5f9525d87e..0000000000
Binary files a/sound/direct_sound_samples/cries/mienfoo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mienfoo.wav b/sound/direct_sound_samples/cries/mienfoo.wav
new file mode 100644
index 0000000000..521448e71f
Binary files /dev/null and b/sound/direct_sound_samples/cries/mienfoo.wav differ
diff --git a/sound/direct_sound_samples/cries/mienshao.aif b/sound/direct_sound_samples/cries/mienshao.aif
deleted file mode 100644
index da04c18fc9..0000000000
Binary files a/sound/direct_sound_samples/cries/mienshao.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mienshao.wav b/sound/direct_sound_samples/cries/mienshao.wav
new file mode 100644
index 0000000000..439026ff57
Binary files /dev/null and b/sound/direct_sound_samples/cries/mienshao.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 099c8b9c7b..0000000000
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 0000000000..0149976e2b
Binary files /dev/null and b/sound/direct_sound_samples/cries/mightyena.wav differ
diff --git a/sound/direct_sound_samples/cries/milcery.aif b/sound/direct_sound_samples/cries/milcery.aif
deleted file mode 100644
index 003fbb4a62..0000000000
Binary files a/sound/direct_sound_samples/cries/milcery.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/milcery.wav b/sound/direct_sound_samples/cries/milcery.wav
new file mode 100644
index 0000000000..754329ea32
Binary files /dev/null and b/sound/direct_sound_samples/cries/milcery.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 796a87f358..0000000000
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 0000000000..20db44692f
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 cb8ad93ce9..0000000000
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 0000000000..5f51f525bb
Binary files /dev/null and b/sound/direct_sound_samples/cries/miltank.wav differ
diff --git a/sound/direct_sound_samples/cries/mime_jr.aif b/sound/direct_sound_samples/cries/mime_jr.aif
deleted file mode 100644
index 604c678fae..0000000000
Binary files a/sound/direct_sound_samples/cries/mime_jr.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mime_jr.wav b/sound/direct_sound_samples/cries/mime_jr.wav
new file mode 100644
index 0000000000..a02ccdb3b8
Binary files /dev/null and b/sound/direct_sound_samples/cries/mime_jr.wav differ
diff --git a/sound/direct_sound_samples/cries/mimikyu.aif b/sound/direct_sound_samples/cries/mimikyu.aif
deleted file mode 100644
index 15f3720dc7..0000000000
Binary files a/sound/direct_sound_samples/cries/mimikyu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mimikyu.wav b/sound/direct_sound_samples/cries/mimikyu.wav
new file mode 100644
index 0000000000..8f8eab2e64
Binary files /dev/null and b/sound/direct_sound_samples/cries/mimikyu.wav differ
diff --git a/sound/direct_sound_samples/cries/minccino.aif b/sound/direct_sound_samples/cries/minccino.aif
deleted file mode 100644
index d49eb07414..0000000000
Binary files a/sound/direct_sound_samples/cries/minccino.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/minccino.wav b/sound/direct_sound_samples/cries/minccino.wav
new file mode 100644
index 0000000000..b6c21d7d0e
Binary files /dev/null and b/sound/direct_sound_samples/cries/minccino.wav differ
diff --git a/sound/direct_sound_samples/cries/minior.aif b/sound/direct_sound_samples/cries/minior.aif
deleted file mode 100644
index d739824e04..0000000000
Binary files a/sound/direct_sound_samples/cries/minior.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/minior.wav b/sound/direct_sound_samples/cries/minior.wav
new file mode 100644
index 0000000000..a1c2689224
Binary files /dev/null and b/sound/direct_sound_samples/cries/minior.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 1b0d3405b9..0000000000
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 0000000000..9e9a62f7e8
Binary files /dev/null and b/sound/direct_sound_samples/cries/minun.wav differ
diff --git a/sound/direct_sound_samples/cries/miraidon.aif b/sound/direct_sound_samples/cries/miraidon.aif
deleted file mode 100644
index f07c1c360c..0000000000
Binary files a/sound/direct_sound_samples/cries/miraidon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/miraidon.wav b/sound/direct_sound_samples/cries/miraidon.wav
new file mode 100644
index 0000000000..e0b09ed9f4
Binary files /dev/null and b/sound/direct_sound_samples/cries/miraidon.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 774a832ea1..0000000000
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 0000000000..f632986da9
Binary files /dev/null and b/sound/direct_sound_samples/cries/misdreavus.wav differ
diff --git a/sound/direct_sound_samples/cries/mismagius.aif b/sound/direct_sound_samples/cries/mismagius.aif
deleted file mode 100644
index a9146205ba..0000000000
Binary files a/sound/direct_sound_samples/cries/mismagius.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mismagius.wav b/sound/direct_sound_samples/cries/mismagius.wav
new file mode 100644
index 0000000000..0a19c2bff4
Binary files /dev/null and b/sound/direct_sound_samples/cries/mismagius.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 39570a316c..0000000000
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 0000000000..7173a8cad4
Binary files /dev/null and b/sound/direct_sound_samples/cries/moltres.wav differ
diff --git a/sound/direct_sound_samples/cries/monferno.aif b/sound/direct_sound_samples/cries/monferno.aif
deleted file mode 100644
index 4f34c1de91..0000000000
Binary files a/sound/direct_sound_samples/cries/monferno.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/monferno.wav b/sound/direct_sound_samples/cries/monferno.wav
new file mode 100644
index 0000000000..030db53f08
Binary files /dev/null and b/sound/direct_sound_samples/cries/monferno.wav differ
diff --git a/sound/direct_sound_samples/cries/morelull.aif b/sound/direct_sound_samples/cries/morelull.aif
deleted file mode 100644
index 0b38baf6a4..0000000000
Binary files a/sound/direct_sound_samples/cries/morelull.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/morelull.wav b/sound/direct_sound_samples/cries/morelull.wav
new file mode 100644
index 0000000000..05c6d3e75a
Binary files /dev/null and b/sound/direct_sound_samples/cries/morelull.wav differ
diff --git a/sound/direct_sound_samples/cries/morgrem.aif b/sound/direct_sound_samples/cries/morgrem.aif
deleted file mode 100644
index b972242d37..0000000000
Binary files a/sound/direct_sound_samples/cries/morgrem.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/morgrem.wav b/sound/direct_sound_samples/cries/morgrem.wav
new file mode 100644
index 0000000000..d478cc0406
Binary files /dev/null and b/sound/direct_sound_samples/cries/morgrem.wav differ
diff --git a/sound/direct_sound_samples/cries/morpeko_full_belly.aif b/sound/direct_sound_samples/cries/morpeko_full_belly.aif
deleted file mode 100644
index 2feb33beb8..0000000000
Binary files a/sound/direct_sound_samples/cries/morpeko_full_belly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/morpeko_full_belly.wav b/sound/direct_sound_samples/cries/morpeko_full_belly.wav
new file mode 100644
index 0000000000..21943e1a4d
Binary files /dev/null and b/sound/direct_sound_samples/cries/morpeko_full_belly.wav differ
diff --git a/sound/direct_sound_samples/cries/morpeko_hangry.aif b/sound/direct_sound_samples/cries/morpeko_hangry.aif
deleted file mode 100644
index 84a89a2c01..0000000000
Binary files a/sound/direct_sound_samples/cries/morpeko_hangry.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/morpeko_hangry.wav b/sound/direct_sound_samples/cries/morpeko_hangry.wav
new file mode 100644
index 0000000000..80c5eed428
Binary files /dev/null and b/sound/direct_sound_samples/cries/morpeko_hangry.wav differ
diff --git a/sound/direct_sound_samples/cries/mothim.aif b/sound/direct_sound_samples/cries/mothim.aif
deleted file mode 100644
index d2a2c7b8c3..0000000000
Binary files a/sound/direct_sound_samples/cries/mothim.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mothim.wav b/sound/direct_sound_samples/cries/mothim.wav
new file mode 100644
index 0000000000..c1f085d528
Binary files /dev/null and b/sound/direct_sound_samples/cries/mothim.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 991eeb9d1c..0000000000
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 0000000000..23cf310532
Binary files /dev/null and b/sound/direct_sound_samples/cries/mr_mime.wav differ
diff --git a/sound/direct_sound_samples/cries/mr_rime.aif b/sound/direct_sound_samples/cries/mr_rime.aif
deleted file mode 100644
index 86bbd33304..0000000000
Binary files a/sound/direct_sound_samples/cries/mr_rime.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mr_rime.wav b/sound/direct_sound_samples/cries/mr_rime.wav
new file mode 100644
index 0000000000..653cb286c8
Binary files /dev/null and b/sound/direct_sound_samples/cries/mr_rime.wav differ
diff --git a/sound/direct_sound_samples/cries/mudbray.aif b/sound/direct_sound_samples/cries/mudbray.aif
deleted file mode 100644
index f7d0c8b287..0000000000
Binary files a/sound/direct_sound_samples/cries/mudbray.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mudbray.wav b/sound/direct_sound_samples/cries/mudbray.wav
new file mode 100644
index 0000000000..72f138c9b7
Binary files /dev/null and b/sound/direct_sound_samples/cries/mudbray.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 0162f94001..0000000000
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 0000000000..c965efe30c
Binary files /dev/null and b/sound/direct_sound_samples/cries/mudkip.wav differ
diff --git a/sound/direct_sound_samples/cries/mudsdale.aif b/sound/direct_sound_samples/cries/mudsdale.aif
deleted file mode 100644
index 2776ec02da..0000000000
Binary files a/sound/direct_sound_samples/cries/mudsdale.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/mudsdale.wav b/sound/direct_sound_samples/cries/mudsdale.wav
new file mode 100644
index 0000000000..01222f6e18
Binary files /dev/null and b/sound/direct_sound_samples/cries/mudsdale.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 2abfd59591..0000000000
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 0000000000..27cd6bdeb1
Binary files /dev/null and b/sound/direct_sound_samples/cries/muk.wav differ
diff --git a/sound/direct_sound_samples/cries/munchlax.aif b/sound/direct_sound_samples/cries/munchlax.aif
deleted file mode 100644
index ce347a32f4..0000000000
Binary files a/sound/direct_sound_samples/cries/munchlax.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/munchlax.wav b/sound/direct_sound_samples/cries/munchlax.wav
new file mode 100644
index 0000000000..ead5eb1974
Binary files /dev/null and b/sound/direct_sound_samples/cries/munchlax.wav differ
diff --git a/sound/direct_sound_samples/cries/munkidori.aif b/sound/direct_sound_samples/cries/munkidori.aif
deleted file mode 100644
index 7cb192732e..0000000000
Binary files a/sound/direct_sound_samples/cries/munkidori.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/munkidori.wav b/sound/direct_sound_samples/cries/munkidori.wav
new file mode 100644
index 0000000000..d37e97ac54
Binary files /dev/null and b/sound/direct_sound_samples/cries/munkidori.wav differ
diff --git a/sound/direct_sound_samples/cries/munna.aif b/sound/direct_sound_samples/cries/munna.aif
deleted file mode 100644
index 443bb80899..0000000000
Binary files a/sound/direct_sound_samples/cries/munna.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/munna.wav b/sound/direct_sound_samples/cries/munna.wav
new file mode 100644
index 0000000000..2de57dd376
Binary files /dev/null and b/sound/direct_sound_samples/cries/munna.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 1e7c6dd792..0000000000
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 0000000000..5da336fa90
Binary files /dev/null and b/sound/direct_sound_samples/cries/murkrow.wav differ
diff --git a/sound/direct_sound_samples/cries/musharna.aif b/sound/direct_sound_samples/cries/musharna.aif
deleted file mode 100644
index 69dd2800cf..0000000000
Binary files a/sound/direct_sound_samples/cries/musharna.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/musharna.wav b/sound/direct_sound_samples/cries/musharna.wav
new file mode 100644
index 0000000000..cac55c51ff
Binary files /dev/null and b/sound/direct_sound_samples/cries/musharna.wav differ
diff --git a/sound/direct_sound_samples/cries/nacli.aif b/sound/direct_sound_samples/cries/nacli.aif
deleted file mode 100644
index b29d579ee2..0000000000
Binary files a/sound/direct_sound_samples/cries/nacli.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nacli.wav b/sound/direct_sound_samples/cries/nacli.wav
new file mode 100644
index 0000000000..93ec1a80f6
Binary files /dev/null and b/sound/direct_sound_samples/cries/nacli.wav differ
diff --git a/sound/direct_sound_samples/cries/naclstack.aif b/sound/direct_sound_samples/cries/naclstack.aif
deleted file mode 100644
index 31eca0bd49..0000000000
Binary files a/sound/direct_sound_samples/cries/naclstack.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/naclstack.wav b/sound/direct_sound_samples/cries/naclstack.wav
new file mode 100644
index 0000000000..f223208317
Binary files /dev/null and b/sound/direct_sound_samples/cries/naclstack.wav differ
diff --git a/sound/direct_sound_samples/cries/naganadel.aif b/sound/direct_sound_samples/cries/naganadel.aif
deleted file mode 100644
index 4cd829612b..0000000000
Binary files a/sound/direct_sound_samples/cries/naganadel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/naganadel.wav b/sound/direct_sound_samples/cries/naganadel.wav
new file mode 100644
index 0000000000..989d068a6b
Binary files /dev/null and b/sound/direct_sound_samples/cries/naganadel.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 7609439888..0000000000
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 0000000000..4a2c853178
Binary files /dev/null and b/sound/direct_sound_samples/cries/natu.wav differ
diff --git a/sound/direct_sound_samples/cries/necrozma.aif b/sound/direct_sound_samples/cries/necrozma.aif
deleted file mode 100644
index db81bc135a..0000000000
Binary files a/sound/direct_sound_samples/cries/necrozma.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/necrozma.wav b/sound/direct_sound_samples/cries/necrozma.wav
new file mode 100644
index 0000000000..526ead7f45
Binary files /dev/null and b/sound/direct_sound_samples/cries/necrozma.wav differ
diff --git a/sound/direct_sound_samples/cries/necrozma_dawn_wings.aif b/sound/direct_sound_samples/cries/necrozma_dawn_wings.aif
deleted file mode 100644
index f33539121e..0000000000
Binary files a/sound/direct_sound_samples/cries/necrozma_dawn_wings.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/necrozma_dawn_wings.wav b/sound/direct_sound_samples/cries/necrozma_dawn_wings.wav
new file mode 100644
index 0000000000..0ffa398c79
Binary files /dev/null and b/sound/direct_sound_samples/cries/necrozma_dawn_wings.wav differ
diff --git a/sound/direct_sound_samples/cries/necrozma_dusk_mane.aif b/sound/direct_sound_samples/cries/necrozma_dusk_mane.aif
deleted file mode 100644
index fce3fb2f61..0000000000
Binary files a/sound/direct_sound_samples/cries/necrozma_dusk_mane.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/necrozma_dusk_mane.wav b/sound/direct_sound_samples/cries/necrozma_dusk_mane.wav
new file mode 100644
index 0000000000..b601790ba7
Binary files /dev/null and b/sound/direct_sound_samples/cries/necrozma_dusk_mane.wav differ
diff --git a/sound/direct_sound_samples/cries/necrozma_ultra.aif b/sound/direct_sound_samples/cries/necrozma_ultra.aif
deleted file mode 100644
index cfc9c5f27b..0000000000
Binary files a/sound/direct_sound_samples/cries/necrozma_ultra.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/necrozma_ultra.wav b/sound/direct_sound_samples/cries/necrozma_ultra.wav
new file mode 100644
index 0000000000..dfbceebaf4
Binary files /dev/null and b/sound/direct_sound_samples/cries/necrozma_ultra.wav differ
diff --git a/sound/direct_sound_samples/cries/nickit.aif b/sound/direct_sound_samples/cries/nickit.aif
deleted file mode 100644
index a4d660bb9d..0000000000
Binary files a/sound/direct_sound_samples/cries/nickit.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nickit.wav b/sound/direct_sound_samples/cries/nickit.wav
new file mode 100644
index 0000000000..820a0d5568
Binary files /dev/null and b/sound/direct_sound_samples/cries/nickit.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 5a645ca83a..0000000000
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 0000000000..556b20bdac
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 878570d3f6..0000000000
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 0000000000..7c23623a17
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 cf02133949..0000000000
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 0000000000..2997c2b579
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 2e691595bf..0000000000
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 0000000000..160ab71e7f
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 3f73fd947f..0000000000
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 0000000000..a46c416701
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 75e48cc721..0000000000
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 0000000000..38db59c2f1
Binary files /dev/null and b/sound/direct_sound_samples/cries/nidorino.wav differ
diff --git a/sound/direct_sound_samples/cries/nihilego.aif b/sound/direct_sound_samples/cries/nihilego.aif
deleted file mode 100644
index 17c56e8cbf..0000000000
Binary files a/sound/direct_sound_samples/cries/nihilego.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nihilego.wav b/sound/direct_sound_samples/cries/nihilego.wav
new file mode 100644
index 0000000000..8467b70a1f
Binary files /dev/null and b/sound/direct_sound_samples/cries/nihilego.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 d4695111cd..0000000000
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 0000000000..dd5feb818d
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 51a260f9e9..0000000000
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 0000000000..f84b874364
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 06693156a7..0000000000
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 0000000000..b61f4d37f5
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 2a96488f28..0000000000
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 0000000000..ab705b6f2c
Binary files /dev/null and b/sound/direct_sound_samples/cries/noctowl.wav differ
diff --git a/sound/direct_sound_samples/cries/noibat.aif b/sound/direct_sound_samples/cries/noibat.aif
deleted file mode 100644
index 6f3c18f40d..0000000000
Binary files a/sound/direct_sound_samples/cries/noibat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/noibat.wav b/sound/direct_sound_samples/cries/noibat.wav
new file mode 100644
index 0000000000..346fb772bd
Binary files /dev/null and b/sound/direct_sound_samples/cries/noibat.wav differ
diff --git a/sound/direct_sound_samples/cries/noivern.aif b/sound/direct_sound_samples/cries/noivern.aif
deleted file mode 100644
index 5806e69713..0000000000
Binary files a/sound/direct_sound_samples/cries/noivern.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/noivern.wav b/sound/direct_sound_samples/cries/noivern.wav
new file mode 100644
index 0000000000..eb44488e8a
Binary files /dev/null and b/sound/direct_sound_samples/cries/noivern.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 04c28caa6b..0000000000
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 0000000000..1e15fb10d3
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 9d6c2e0517..0000000000
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 0000000000..2d2d16f021
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 2d836705be..0000000000
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 0000000000..5efb6e8068
Binary files /dev/null and b/sound/direct_sound_samples/cries/nuzleaf.wav differ
diff --git a/sound/direct_sound_samples/cries/nymble.aif b/sound/direct_sound_samples/cries/nymble.aif
deleted file mode 100644
index bc41462fb6..0000000000
Binary files a/sound/direct_sound_samples/cries/nymble.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/nymble.wav b/sound/direct_sound_samples/cries/nymble.wav
new file mode 100644
index 0000000000..aad585fc6c
Binary files /dev/null and b/sound/direct_sound_samples/cries/nymble.wav differ
diff --git a/sound/direct_sound_samples/cries/obstagoon.aif b/sound/direct_sound_samples/cries/obstagoon.aif
deleted file mode 100644
index f1c4a45366..0000000000
Binary files a/sound/direct_sound_samples/cries/obstagoon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/obstagoon.wav b/sound/direct_sound_samples/cries/obstagoon.wav
new file mode 100644
index 0000000000..2b65e063ab
Binary files /dev/null and b/sound/direct_sound_samples/cries/obstagoon.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 1964004551..0000000000
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 0000000000..190d42c674
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 4f30f7ddb4..0000000000
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 0000000000..de6855d369
Binary files /dev/null and b/sound/direct_sound_samples/cries/oddish.wav differ
diff --git a/sound/direct_sound_samples/cries/ogerpon.aif b/sound/direct_sound_samples/cries/ogerpon.aif
deleted file mode 100644
index 17b9d94d62..0000000000
Binary files a/sound/direct_sound_samples/cries/ogerpon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ogerpon.wav b/sound/direct_sound_samples/cries/ogerpon.wav
new file mode 100644
index 0000000000..82a3a54b16
Binary files /dev/null and b/sound/direct_sound_samples/cries/ogerpon.wav differ
diff --git a/sound/direct_sound_samples/cries/oinkologne_f.aif b/sound/direct_sound_samples/cries/oinkologne_f.aif
deleted file mode 100644
index 885f2e3a7d..0000000000
Binary files a/sound/direct_sound_samples/cries/oinkologne_f.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/oinkologne_f.wav b/sound/direct_sound_samples/cries/oinkologne_f.wav
new file mode 100644
index 0000000000..f075ebb3cf
Binary files /dev/null and b/sound/direct_sound_samples/cries/oinkologne_f.wav differ
diff --git a/sound/direct_sound_samples/cries/oinkologne_m.aif b/sound/direct_sound_samples/cries/oinkologne_m.aif
deleted file mode 100644
index 611794de31..0000000000
Binary files a/sound/direct_sound_samples/cries/oinkologne_m.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/oinkologne_m.wav b/sound/direct_sound_samples/cries/oinkologne_m.wav
new file mode 100644
index 0000000000..ca0a7e450e
Binary files /dev/null and b/sound/direct_sound_samples/cries/oinkologne_m.wav differ
diff --git a/sound/direct_sound_samples/cries/okidogi.aif b/sound/direct_sound_samples/cries/okidogi.aif
deleted file mode 100644
index f22f3ba335..0000000000
Binary files a/sound/direct_sound_samples/cries/okidogi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/okidogi.wav b/sound/direct_sound_samples/cries/okidogi.wav
new file mode 100644
index 0000000000..1370c786d0
Binary files /dev/null and b/sound/direct_sound_samples/cries/okidogi.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 eeedac34db..0000000000
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 0000000000..3db237ac3f
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 9d4f738efd..0000000000
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 0000000000..69a4ea868f
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 6203ce5689..0000000000
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 0000000000..57da601410
Binary files /dev/null and b/sound/direct_sound_samples/cries/onix.wav differ
diff --git a/sound/direct_sound_samples/cries/oranguru.aif b/sound/direct_sound_samples/cries/oranguru.aif
deleted file mode 100644
index ec919ba93c..0000000000
Binary files a/sound/direct_sound_samples/cries/oranguru.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/oranguru.wav b/sound/direct_sound_samples/cries/oranguru.wav
new file mode 100644
index 0000000000..e8fa50d5d3
Binary files /dev/null and b/sound/direct_sound_samples/cries/oranguru.wav differ
diff --git a/sound/direct_sound_samples/cries/orbeetle.aif b/sound/direct_sound_samples/cries/orbeetle.aif
deleted file mode 100644
index 4b99afad15..0000000000
Binary files a/sound/direct_sound_samples/cries/orbeetle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/orbeetle.wav b/sound/direct_sound_samples/cries/orbeetle.wav
new file mode 100644
index 0000000000..384fe691d6
Binary files /dev/null and b/sound/direct_sound_samples/cries/orbeetle.wav differ
diff --git a/sound/direct_sound_samples/cries/oricorio_baile.aif b/sound/direct_sound_samples/cries/oricorio_baile.aif
deleted file mode 100644
index c5ec5af19b..0000000000
Binary files a/sound/direct_sound_samples/cries/oricorio_baile.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/oricorio_baile.wav b/sound/direct_sound_samples/cries/oricorio_baile.wav
new file mode 100644
index 0000000000..e1719cf8e9
Binary files /dev/null and b/sound/direct_sound_samples/cries/oricorio_baile.wav differ
diff --git a/sound/direct_sound_samples/cries/oricorio_pau.aif b/sound/direct_sound_samples/cries/oricorio_pau.aif
deleted file mode 100644
index 4faa6cc083..0000000000
Binary files a/sound/direct_sound_samples/cries/oricorio_pau.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/oricorio_pau.wav b/sound/direct_sound_samples/cries/oricorio_pau.wav
new file mode 100644
index 0000000000..71fa963187
Binary files /dev/null and b/sound/direct_sound_samples/cries/oricorio_pau.wav differ
diff --git a/sound/direct_sound_samples/cries/oricorio_sensu.aif b/sound/direct_sound_samples/cries/oricorio_sensu.aif
deleted file mode 100644
index bdc25a7749..0000000000
Binary files a/sound/direct_sound_samples/cries/oricorio_sensu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/oricorio_sensu.wav b/sound/direct_sound_samples/cries/oricorio_sensu.wav
new file mode 100644
index 0000000000..dc7687252a
Binary files /dev/null and b/sound/direct_sound_samples/cries/oricorio_sensu.wav differ
diff --git a/sound/direct_sound_samples/cries/orthworm.aif b/sound/direct_sound_samples/cries/orthworm.aif
deleted file mode 100644
index f88eec62f0..0000000000
Binary files a/sound/direct_sound_samples/cries/orthworm.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/orthworm.wav b/sound/direct_sound_samples/cries/orthworm.wav
new file mode 100644
index 0000000000..df86b5f9d8
Binary files /dev/null and b/sound/direct_sound_samples/cries/orthworm.wav differ
diff --git a/sound/direct_sound_samples/cries/oshawott.aif b/sound/direct_sound_samples/cries/oshawott.aif
deleted file mode 100644
index 81bf2917ed..0000000000
Binary files a/sound/direct_sound_samples/cries/oshawott.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/oshawott.wav b/sound/direct_sound_samples/cries/oshawott.wav
new file mode 100644
index 0000000000..8669120bb3
Binary files /dev/null and b/sound/direct_sound_samples/cries/oshawott.wav differ
diff --git a/sound/direct_sound_samples/cries/overqwil.aif b/sound/direct_sound_samples/cries/overqwil.aif
deleted file mode 100644
index 8b9a8a2dff..0000000000
Binary files a/sound/direct_sound_samples/cries/overqwil.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/overqwil.wav b/sound/direct_sound_samples/cries/overqwil.wav
new file mode 100644
index 0000000000..5b278516fc
Binary files /dev/null and b/sound/direct_sound_samples/cries/overqwil.wav differ
diff --git a/sound/direct_sound_samples/cries/pachirisu.aif b/sound/direct_sound_samples/cries/pachirisu.aif
deleted file mode 100644
index 6471363ee6..0000000000
Binary files a/sound/direct_sound_samples/cries/pachirisu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pachirisu.wav b/sound/direct_sound_samples/cries/pachirisu.wav
new file mode 100644
index 0000000000..311b40aa53
Binary files /dev/null and b/sound/direct_sound_samples/cries/pachirisu.wav differ
diff --git a/sound/direct_sound_samples/cries/palafin_hero.aif b/sound/direct_sound_samples/cries/palafin_hero.aif
deleted file mode 100644
index 5ef87ddeb8..0000000000
Binary files a/sound/direct_sound_samples/cries/palafin_hero.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/palafin_hero.wav b/sound/direct_sound_samples/cries/palafin_hero.wav
new file mode 100644
index 0000000000..8ec713357d
Binary files /dev/null and b/sound/direct_sound_samples/cries/palafin_hero.wav differ
diff --git a/sound/direct_sound_samples/cries/palafin_zero.aif b/sound/direct_sound_samples/cries/palafin_zero.aif
deleted file mode 100644
index 16051848be..0000000000
Binary files a/sound/direct_sound_samples/cries/palafin_zero.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/palafin_zero.wav b/sound/direct_sound_samples/cries/palafin_zero.wav
new file mode 100644
index 0000000000..f8526574c7
Binary files /dev/null and b/sound/direct_sound_samples/cries/palafin_zero.wav differ
diff --git a/sound/direct_sound_samples/cries/palkia.aif b/sound/direct_sound_samples/cries/palkia.aif
deleted file mode 100644
index dee52b9a59..0000000000
Binary files a/sound/direct_sound_samples/cries/palkia.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/palkia.wav b/sound/direct_sound_samples/cries/palkia.wav
new file mode 100644
index 0000000000..b3f057c1a0
Binary files /dev/null and b/sound/direct_sound_samples/cries/palkia.wav differ
diff --git a/sound/direct_sound_samples/cries/palossand.aif b/sound/direct_sound_samples/cries/palossand.aif
deleted file mode 100644
index a4a1da4fee..0000000000
Binary files a/sound/direct_sound_samples/cries/palossand.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/palossand.wav b/sound/direct_sound_samples/cries/palossand.wav
new file mode 100644
index 0000000000..2908e31766
Binary files /dev/null and b/sound/direct_sound_samples/cries/palossand.wav differ
diff --git a/sound/direct_sound_samples/cries/palpitoad.aif b/sound/direct_sound_samples/cries/palpitoad.aif
deleted file mode 100644
index 054d2dba0b..0000000000
Binary files a/sound/direct_sound_samples/cries/palpitoad.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/palpitoad.wav b/sound/direct_sound_samples/cries/palpitoad.wav
new file mode 100644
index 0000000000..04b404c1c7
Binary files /dev/null and b/sound/direct_sound_samples/cries/palpitoad.wav differ
diff --git a/sound/direct_sound_samples/cries/pancham.aif b/sound/direct_sound_samples/cries/pancham.aif
deleted file mode 100644
index 5a986eddf4..0000000000
Binary files a/sound/direct_sound_samples/cries/pancham.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pancham.wav b/sound/direct_sound_samples/cries/pancham.wav
new file mode 100644
index 0000000000..dbee7918fc
Binary files /dev/null and b/sound/direct_sound_samples/cries/pancham.wav differ
diff --git a/sound/direct_sound_samples/cries/pangoro.aif b/sound/direct_sound_samples/cries/pangoro.aif
deleted file mode 100644
index 47f7bcf2d0..0000000000
Binary files a/sound/direct_sound_samples/cries/pangoro.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pangoro.wav b/sound/direct_sound_samples/cries/pangoro.wav
new file mode 100644
index 0000000000..e277056884
Binary files /dev/null and b/sound/direct_sound_samples/cries/pangoro.wav differ
diff --git a/sound/direct_sound_samples/cries/panpour.aif b/sound/direct_sound_samples/cries/panpour.aif
deleted file mode 100644
index 18b65158eb..0000000000
Binary files a/sound/direct_sound_samples/cries/panpour.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/panpour.wav b/sound/direct_sound_samples/cries/panpour.wav
new file mode 100644
index 0000000000..8a2042cd63
Binary files /dev/null and b/sound/direct_sound_samples/cries/panpour.wav differ
diff --git a/sound/direct_sound_samples/cries/pansage.aif b/sound/direct_sound_samples/cries/pansage.aif
deleted file mode 100644
index a4d277230f..0000000000
Binary files a/sound/direct_sound_samples/cries/pansage.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pansage.wav b/sound/direct_sound_samples/cries/pansage.wav
new file mode 100644
index 0000000000..30004e0637
Binary files /dev/null and b/sound/direct_sound_samples/cries/pansage.wav differ
diff --git a/sound/direct_sound_samples/cries/pansear.aif b/sound/direct_sound_samples/cries/pansear.aif
deleted file mode 100644
index 4d76d6089c..0000000000
Binary files a/sound/direct_sound_samples/cries/pansear.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pansear.wav b/sound/direct_sound_samples/cries/pansear.wav
new file mode 100644
index 0000000000..fde72b7e45
Binary files /dev/null and b/sound/direct_sound_samples/cries/pansear.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 fbfbfaf07b..0000000000
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 0000000000..ba4a051c9f
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 1251cbabef..0000000000
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 0000000000..5ff6ac2907
Binary files /dev/null and b/sound/direct_sound_samples/cries/parasect.wav differ
diff --git a/sound/direct_sound_samples/cries/passimian.aif b/sound/direct_sound_samples/cries/passimian.aif
deleted file mode 100644
index ac824012e5..0000000000
Binary files a/sound/direct_sound_samples/cries/passimian.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/passimian.wav b/sound/direct_sound_samples/cries/passimian.wav
new file mode 100644
index 0000000000..f17f2ec250
Binary files /dev/null and b/sound/direct_sound_samples/cries/passimian.wav differ
diff --git a/sound/direct_sound_samples/cries/patrat.aif b/sound/direct_sound_samples/cries/patrat.aif
deleted file mode 100644
index f1e17939ab..0000000000
Binary files a/sound/direct_sound_samples/cries/patrat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/patrat.wav b/sound/direct_sound_samples/cries/patrat.wav
new file mode 100644
index 0000000000..51982fbc78
Binary files /dev/null and b/sound/direct_sound_samples/cries/patrat.wav differ
diff --git a/sound/direct_sound_samples/cries/pawmi.aif b/sound/direct_sound_samples/cries/pawmi.aif
deleted file mode 100644
index fa9a9197cb..0000000000
Binary files a/sound/direct_sound_samples/cries/pawmi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pawmi.wav b/sound/direct_sound_samples/cries/pawmi.wav
new file mode 100644
index 0000000000..ac07672b4a
Binary files /dev/null and b/sound/direct_sound_samples/cries/pawmi.wav differ
diff --git a/sound/direct_sound_samples/cries/pawmo.aif b/sound/direct_sound_samples/cries/pawmo.aif
deleted file mode 100644
index 7fbf646c2f..0000000000
Binary files a/sound/direct_sound_samples/cries/pawmo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pawmo.wav b/sound/direct_sound_samples/cries/pawmo.wav
new file mode 100644
index 0000000000..8ffc03d005
Binary files /dev/null and b/sound/direct_sound_samples/cries/pawmo.wav differ
diff --git a/sound/direct_sound_samples/cries/pawmot.aif b/sound/direct_sound_samples/cries/pawmot.aif
deleted file mode 100644
index 40ad2d5bf2..0000000000
Binary files a/sound/direct_sound_samples/cries/pawmot.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pawmot.wav b/sound/direct_sound_samples/cries/pawmot.wav
new file mode 100644
index 0000000000..81fe4267c8
Binary files /dev/null and b/sound/direct_sound_samples/cries/pawmot.wav differ
diff --git a/sound/direct_sound_samples/cries/pawniard.aif b/sound/direct_sound_samples/cries/pawniard.aif
deleted file mode 100644
index 6196892837..0000000000
Binary files a/sound/direct_sound_samples/cries/pawniard.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pawniard.wav b/sound/direct_sound_samples/cries/pawniard.wav
new file mode 100644
index 0000000000..25663a52c0
Binary files /dev/null and b/sound/direct_sound_samples/cries/pawniard.wav differ
diff --git a/sound/direct_sound_samples/cries/pecharunt.aif b/sound/direct_sound_samples/cries/pecharunt.aif
deleted file mode 100644
index 024e6bb587..0000000000
Binary files a/sound/direct_sound_samples/cries/pecharunt.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pecharunt.wav b/sound/direct_sound_samples/cries/pecharunt.wav
new file mode 100644
index 0000000000..9d9fadf408
Binary files /dev/null and b/sound/direct_sound_samples/cries/pecharunt.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 64a0080360..0000000000
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 0000000000..665dbcac9e
Binary files /dev/null and b/sound/direct_sound_samples/cries/pelipper.wav differ
diff --git a/sound/direct_sound_samples/cries/perrserker.aif b/sound/direct_sound_samples/cries/perrserker.aif
deleted file mode 100644
index b790ce5c51..0000000000
Binary files a/sound/direct_sound_samples/cries/perrserker.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/perrserker.wav b/sound/direct_sound_samples/cries/perrserker.wav
new file mode 100644
index 0000000000..80845b8c07
Binary files /dev/null and b/sound/direct_sound_samples/cries/perrserker.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 d87fe2cbe1..0000000000
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 0000000000..96acf8296c
Binary files /dev/null and b/sound/direct_sound_samples/cries/persian.wav differ
diff --git a/sound/direct_sound_samples/cries/petilil.aif b/sound/direct_sound_samples/cries/petilil.aif
deleted file mode 100644
index 6252c76247..0000000000
Binary files a/sound/direct_sound_samples/cries/petilil.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/petilil.wav b/sound/direct_sound_samples/cries/petilil.wav
new file mode 100644
index 0000000000..0bda09b259
Binary files /dev/null and b/sound/direct_sound_samples/cries/petilil.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 0c541c3bf1..0000000000
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 0000000000..4de13cafe1
Binary files /dev/null and b/sound/direct_sound_samples/cries/phanpy.wav differ
diff --git a/sound/direct_sound_samples/cries/phantump.aif b/sound/direct_sound_samples/cries/phantump.aif
deleted file mode 100644
index 1afccc074c..0000000000
Binary files a/sound/direct_sound_samples/cries/phantump.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/phantump.wav b/sound/direct_sound_samples/cries/phantump.wav
new file mode 100644
index 0000000000..3f0db048ad
Binary files /dev/null and b/sound/direct_sound_samples/cries/phantump.wav differ
diff --git a/sound/direct_sound_samples/cries/pheromosa.aif b/sound/direct_sound_samples/cries/pheromosa.aif
deleted file mode 100644
index bcf57050d3..0000000000
Binary files a/sound/direct_sound_samples/cries/pheromosa.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pheromosa.wav b/sound/direct_sound_samples/cries/pheromosa.wav
new file mode 100644
index 0000000000..a8f41396d3
Binary files /dev/null and b/sound/direct_sound_samples/cries/pheromosa.wav differ
diff --git a/sound/direct_sound_samples/cries/phione.aif b/sound/direct_sound_samples/cries/phione.aif
deleted file mode 100644
index ba31bd9a5d..0000000000
Binary files a/sound/direct_sound_samples/cries/phione.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/phione.wav b/sound/direct_sound_samples/cries/phione.wav
new file mode 100644
index 0000000000..bbc661c9eb
Binary files /dev/null and b/sound/direct_sound_samples/cries/phione.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 a0cff3f6f3..0000000000
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 0000000000..d325103719
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 67f49406a9..0000000000
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 0000000000..f93ed99656
Binary files /dev/null and b/sound/direct_sound_samples/cries/pidgeot.wav differ
diff --git a/sound/direct_sound_samples/cries/pidgeot_mega.aif b/sound/direct_sound_samples/cries/pidgeot_mega.aif
deleted file mode 100644
index a1639ba4e9..0000000000
Binary files a/sound/direct_sound_samples/cries/pidgeot_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pidgeot_mega.wav b/sound/direct_sound_samples/cries/pidgeot_mega.wav
new file mode 100644
index 0000000000..1cbd3d7a62
Binary files /dev/null and b/sound/direct_sound_samples/cries/pidgeot_mega.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 f31d3df8cf..0000000000
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 0000000000..8b40a41e99
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 3b4b6ece27..0000000000
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 0000000000..34a1d1bd6a
Binary files /dev/null and b/sound/direct_sound_samples/cries/pidgey.wav differ
diff --git a/sound/direct_sound_samples/cries/pidove.aif b/sound/direct_sound_samples/cries/pidove.aif
deleted file mode 100644
index b2bd5590bc..0000000000
Binary files a/sound/direct_sound_samples/cries/pidove.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pidove.wav b/sound/direct_sound_samples/cries/pidove.wav
new file mode 100644
index 0000000000..56527c92c5
Binary files /dev/null and b/sound/direct_sound_samples/cries/pidove.wav differ
diff --git a/sound/direct_sound_samples/cries/pignite.aif b/sound/direct_sound_samples/cries/pignite.aif
deleted file mode 100644
index 8e1f78ae2f..0000000000
Binary files a/sound/direct_sound_samples/cries/pignite.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pignite.wav b/sound/direct_sound_samples/cries/pignite.wav
new file mode 100644
index 0000000000..94095d9373
Binary files /dev/null and b/sound/direct_sound_samples/cries/pignite.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 4a7b270245..0000000000
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 0000000000..d5f68416f2
Binary files /dev/null and b/sound/direct_sound_samples/cries/pikachu.wav differ
diff --git a/sound/direct_sound_samples/cries/pikipek.aif b/sound/direct_sound_samples/cries/pikipek.aif
deleted file mode 100644
index 04efe56a4c..0000000000
Binary files a/sound/direct_sound_samples/cries/pikipek.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pikipek.wav b/sound/direct_sound_samples/cries/pikipek.wav
new file mode 100644
index 0000000000..67d05ca2d9
Binary files /dev/null and b/sound/direct_sound_samples/cries/pikipek.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 2511d3fd70..0000000000
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 0000000000..4f181b7ec6
Binary files /dev/null and b/sound/direct_sound_samples/cries/piloswine.wav differ
diff --git a/sound/direct_sound_samples/cries/pincurchin.aif b/sound/direct_sound_samples/cries/pincurchin.aif
deleted file mode 100644
index 76f68e2111..0000000000
Binary files a/sound/direct_sound_samples/cries/pincurchin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pincurchin.wav b/sound/direct_sound_samples/cries/pincurchin.wav
new file mode 100644
index 0000000000..070485416f
Binary files /dev/null and b/sound/direct_sound_samples/cries/pincurchin.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 acb6de8a0c..0000000000
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 0000000000..70d841b9e5
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 bfbb268d68..0000000000
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 0000000000..3d3dcc7929
Binary files /dev/null and b/sound/direct_sound_samples/cries/pinsir.wav differ
diff --git a/sound/direct_sound_samples/cries/pinsir_mega.aif b/sound/direct_sound_samples/cries/pinsir_mega.aif
deleted file mode 100644
index c2e57d2a39..0000000000
Binary files a/sound/direct_sound_samples/cries/pinsir_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pinsir_mega.wav b/sound/direct_sound_samples/cries/pinsir_mega.wav
new file mode 100644
index 0000000000..36815cbc71
Binary files /dev/null and b/sound/direct_sound_samples/cries/pinsir_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/piplup.aif b/sound/direct_sound_samples/cries/piplup.aif
deleted file mode 100644
index e8c161eb35..0000000000
Binary files a/sound/direct_sound_samples/cries/piplup.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/piplup.wav b/sound/direct_sound_samples/cries/piplup.wav
new file mode 100644
index 0000000000..aacf7d92a0
Binary files /dev/null and b/sound/direct_sound_samples/cries/piplup.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 e584201a8f..0000000000
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 0000000000..1b3cf87497
Binary files /dev/null and b/sound/direct_sound_samples/cries/plusle.wav differ
diff --git a/sound/direct_sound_samples/cries/poipole.aif b/sound/direct_sound_samples/cries/poipole.aif
deleted file mode 100644
index c2a141ac85..0000000000
Binary files a/sound/direct_sound_samples/cries/poipole.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/poipole.wav b/sound/direct_sound_samples/cries/poipole.wav
new file mode 100644
index 0000000000..9e0ad029c9
Binary files /dev/null and b/sound/direct_sound_samples/cries/poipole.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 2739c2a428..0000000000
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 0000000000..6472a08f55
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 d76e209495..0000000000
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 0000000000..d35c8f4d8f
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 4aee053d7f..0000000000
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 0000000000..0c59fbed64
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 bb9d78f3c3..0000000000
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 0000000000..c32bd44859
Binary files /dev/null and b/sound/direct_sound_samples/cries/poliwrath.wav differ
diff --git a/sound/direct_sound_samples/cries/poltchageist.aif b/sound/direct_sound_samples/cries/poltchageist.aif
deleted file mode 100644
index 855eb010ce..0000000000
Binary files a/sound/direct_sound_samples/cries/poltchageist.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/poltchageist.wav b/sound/direct_sound_samples/cries/poltchageist.wav
new file mode 100644
index 0000000000..33d929e811
Binary files /dev/null and b/sound/direct_sound_samples/cries/poltchageist.wav differ
diff --git a/sound/direct_sound_samples/cries/polteageist.aif b/sound/direct_sound_samples/cries/polteageist.aif
deleted file mode 100644
index f9051a25c4..0000000000
Binary files a/sound/direct_sound_samples/cries/polteageist.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/polteageist.wav b/sound/direct_sound_samples/cries/polteageist.wav
new file mode 100644
index 0000000000..94131a981b
Binary files /dev/null and b/sound/direct_sound_samples/cries/polteageist.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 ec66a33faf..0000000000
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 0000000000..911954226d
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 bfa6a00ae2..0000000000
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 0000000000..16cabc29c6
Binary files /dev/null and b/sound/direct_sound_samples/cries/poochyena.wav differ
diff --git a/sound/direct_sound_samples/cries/popplio.aif b/sound/direct_sound_samples/cries/popplio.aif
deleted file mode 100644
index cbb3a0ff30..0000000000
Binary files a/sound/direct_sound_samples/cries/popplio.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/popplio.wav b/sound/direct_sound_samples/cries/popplio.wav
new file mode 100644
index 0000000000..f3226c862a
Binary files /dev/null and b/sound/direct_sound_samples/cries/popplio.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 79160cdbbb..0000000000
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 0000000000..11dd528dda
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 94237057b1..0000000000
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 0000000000..5699d8e450
Binary files /dev/null and b/sound/direct_sound_samples/cries/porygon2.wav differ
diff --git a/sound/direct_sound_samples/cries/porygon_z.aif b/sound/direct_sound_samples/cries/porygon_z.aif
deleted file mode 100644
index 55448d13c0..0000000000
Binary files a/sound/direct_sound_samples/cries/porygon_z.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/porygon_z.wav b/sound/direct_sound_samples/cries/porygon_z.wav
new file mode 100644
index 0000000000..215d9b7e6d
Binary files /dev/null and b/sound/direct_sound_samples/cries/porygon_z.wav differ
diff --git a/sound/direct_sound_samples/cries/primarina.aif b/sound/direct_sound_samples/cries/primarina.aif
deleted file mode 100644
index 7952fda82e..0000000000
Binary files a/sound/direct_sound_samples/cries/primarina.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/primarina.wav b/sound/direct_sound_samples/cries/primarina.wav
new file mode 100644
index 0000000000..60e0cef0b6
Binary files /dev/null and b/sound/direct_sound_samples/cries/primarina.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 35898bf2e6..0000000000
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 0000000000..bcd98e6bb4
Binary files /dev/null and b/sound/direct_sound_samples/cries/primeape.wav differ
diff --git a/sound/direct_sound_samples/cries/prinplup.aif b/sound/direct_sound_samples/cries/prinplup.aif
deleted file mode 100644
index 62311c1cbf..0000000000
Binary files a/sound/direct_sound_samples/cries/prinplup.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/prinplup.wav b/sound/direct_sound_samples/cries/prinplup.wav
new file mode 100644
index 0000000000..8b914e4add
Binary files /dev/null and b/sound/direct_sound_samples/cries/prinplup.wav differ
diff --git a/sound/direct_sound_samples/cries/probopass.aif b/sound/direct_sound_samples/cries/probopass.aif
deleted file mode 100644
index ac831dbf20..0000000000
Binary files a/sound/direct_sound_samples/cries/probopass.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/probopass.wav b/sound/direct_sound_samples/cries/probopass.wav
new file mode 100644
index 0000000000..b749429c8a
Binary files /dev/null and b/sound/direct_sound_samples/cries/probopass.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 e99270f05f..0000000000
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 0000000000..bdc0d673e3
Binary files /dev/null and b/sound/direct_sound_samples/cries/psyduck.wav differ
diff --git a/sound/direct_sound_samples/cries/pumpkaboo.aif b/sound/direct_sound_samples/cries/pumpkaboo.aif
deleted file mode 100644
index 6960875e58..0000000000
Binary files a/sound/direct_sound_samples/cries/pumpkaboo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pumpkaboo.wav b/sound/direct_sound_samples/cries/pumpkaboo.wav
new file mode 100644
index 0000000000..ac870aaa23
Binary files /dev/null and b/sound/direct_sound_samples/cries/pumpkaboo.wav differ
diff --git a/sound/direct_sound_samples/cries/pumpkaboo_super.aif b/sound/direct_sound_samples/cries/pumpkaboo_super.aif
deleted file mode 100644
index f6c7500f68..0000000000
Binary files a/sound/direct_sound_samples/cries/pumpkaboo_super.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pumpkaboo_super.wav b/sound/direct_sound_samples/cries/pumpkaboo_super.wav
new file mode 100644
index 0000000000..62b4bc3743
Binary files /dev/null and b/sound/direct_sound_samples/cries/pumpkaboo_super.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 eb4674d521..0000000000
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 0000000000..5e797d420f
Binary files /dev/null and b/sound/direct_sound_samples/cries/pupitar.wav differ
diff --git a/sound/direct_sound_samples/cries/purrloin.aif b/sound/direct_sound_samples/cries/purrloin.aif
deleted file mode 100644
index ceb00874c5..0000000000
Binary files a/sound/direct_sound_samples/cries/purrloin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/purrloin.wav b/sound/direct_sound_samples/cries/purrloin.wav
new file mode 100644
index 0000000000..1abbc33d21
Binary files /dev/null and b/sound/direct_sound_samples/cries/purrloin.wav differ
diff --git a/sound/direct_sound_samples/cries/purugly.aif b/sound/direct_sound_samples/cries/purugly.aif
deleted file mode 100644
index 9f6460a630..0000000000
Binary files a/sound/direct_sound_samples/cries/purugly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/purugly.wav b/sound/direct_sound_samples/cries/purugly.wav
new file mode 100644
index 0000000000..662bdaafe8
Binary files /dev/null and b/sound/direct_sound_samples/cries/purugly.wav differ
diff --git a/sound/direct_sound_samples/cries/pyroar.aif b/sound/direct_sound_samples/cries/pyroar.aif
deleted file mode 100644
index 7bf77d50cb..0000000000
Binary files a/sound/direct_sound_samples/cries/pyroar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pyroar.wav b/sound/direct_sound_samples/cries/pyroar.wav
new file mode 100644
index 0000000000..9e145824f1
Binary files /dev/null and b/sound/direct_sound_samples/cries/pyroar.wav differ
diff --git a/sound/direct_sound_samples/cries/pyukumuku.aif b/sound/direct_sound_samples/cries/pyukumuku.aif
deleted file mode 100644
index ad1d740c31..0000000000
Binary files a/sound/direct_sound_samples/cries/pyukumuku.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/pyukumuku.wav b/sound/direct_sound_samples/cries/pyukumuku.wav
new file mode 100644
index 0000000000..eb2a7eaf4f
Binary files /dev/null and b/sound/direct_sound_samples/cries/pyukumuku.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 7373b6bb0c..0000000000
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 0000000000..e4a8c0aad3
Binary files /dev/null and b/sound/direct_sound_samples/cries/quagsire.wav differ
diff --git a/sound/direct_sound_samples/cries/quaquaval.aif b/sound/direct_sound_samples/cries/quaquaval.aif
deleted file mode 100644
index d04fac23ff..0000000000
Binary files a/sound/direct_sound_samples/cries/quaquaval.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/quaquaval.wav b/sound/direct_sound_samples/cries/quaquaval.wav
new file mode 100644
index 0000000000..65cce8b829
Binary files /dev/null and b/sound/direct_sound_samples/cries/quaquaval.wav differ
diff --git a/sound/direct_sound_samples/cries/quaxly.aif b/sound/direct_sound_samples/cries/quaxly.aif
deleted file mode 100644
index 81606b4a19..0000000000
Binary files a/sound/direct_sound_samples/cries/quaxly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/quaxly.wav b/sound/direct_sound_samples/cries/quaxly.wav
new file mode 100644
index 0000000000..b886a0b8ce
Binary files /dev/null and b/sound/direct_sound_samples/cries/quaxly.wav differ
diff --git a/sound/direct_sound_samples/cries/quaxwell.aif b/sound/direct_sound_samples/cries/quaxwell.aif
deleted file mode 100644
index 62669362ea..0000000000
Binary files a/sound/direct_sound_samples/cries/quaxwell.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/quaxwell.wav b/sound/direct_sound_samples/cries/quaxwell.wav
new file mode 100644
index 0000000000..f0ff99f2aa
Binary files /dev/null and b/sound/direct_sound_samples/cries/quaxwell.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 40d3db5594..0000000000
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 0000000000..ef0bd7381f
Binary files /dev/null and b/sound/direct_sound_samples/cries/quilava.wav differ
diff --git a/sound/direct_sound_samples/cries/quilladin.aif b/sound/direct_sound_samples/cries/quilladin.aif
deleted file mode 100644
index 9b6dfabdc6..0000000000
Binary files a/sound/direct_sound_samples/cries/quilladin.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/quilladin.wav b/sound/direct_sound_samples/cries/quilladin.wav
new file mode 100644
index 0000000000..1cce00c5ca
Binary files /dev/null and b/sound/direct_sound_samples/cries/quilladin.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 a5a56480f1..0000000000
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 0000000000..0b11276dec
Binary files /dev/null and b/sound/direct_sound_samples/cries/qwilfish.wav differ
diff --git a/sound/direct_sound_samples/cries/raboot.aif b/sound/direct_sound_samples/cries/raboot.aif
deleted file mode 100644
index b1a6d09892..0000000000
Binary files a/sound/direct_sound_samples/cries/raboot.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/raboot.wav b/sound/direct_sound_samples/cries/raboot.wav
new file mode 100644
index 0000000000..02fa5e3761
Binary files /dev/null and b/sound/direct_sound_samples/cries/raboot.wav differ
diff --git a/sound/direct_sound_samples/cries/rabsca.aif b/sound/direct_sound_samples/cries/rabsca.aif
deleted file mode 100644
index 5665f79865..0000000000
Binary files a/sound/direct_sound_samples/cries/rabsca.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rabsca.wav b/sound/direct_sound_samples/cries/rabsca.wav
new file mode 100644
index 0000000000..ca041c6cee
Binary files /dev/null and b/sound/direct_sound_samples/cries/rabsca.wav differ
diff --git a/sound/direct_sound_samples/cries/raging_bolt.aif b/sound/direct_sound_samples/cries/raging_bolt.aif
deleted file mode 100644
index 5b787e8116..0000000000
Binary files a/sound/direct_sound_samples/cries/raging_bolt.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/raging_bolt.wav b/sound/direct_sound_samples/cries/raging_bolt.wav
new file mode 100644
index 0000000000..f7e920d1b0
Binary files /dev/null and b/sound/direct_sound_samples/cries/raging_bolt.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 001dcba627..0000000000
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 0000000000..4e5dbaeb40
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 ac1e846691..0000000000
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 0000000000..fefeb1e3a5
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 660438548c..0000000000
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 0000000000..4327c13a12
Binary files /dev/null and b/sound/direct_sound_samples/cries/ralts.wav differ
diff --git a/sound/direct_sound_samples/cries/rampardos.aif b/sound/direct_sound_samples/cries/rampardos.aif
deleted file mode 100644
index edec1aac4f..0000000000
Binary files a/sound/direct_sound_samples/cries/rampardos.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rampardos.wav b/sound/direct_sound_samples/cries/rampardos.wav
new file mode 100644
index 0000000000..de2cfc5002
Binary files /dev/null and b/sound/direct_sound_samples/cries/rampardos.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 c070475d18..0000000000
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 0000000000..14ce75be75
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 fd726b655f..0000000000
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 0000000000..545ebfcf12
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 af6a4f2468..0000000000
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 0000000000..9e7a6b3cf6
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 ba7a73c7ee..0000000000
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 0000000000..c4e50535fc
Binary files /dev/null and b/sound/direct_sound_samples/cries/rayquaza.wav differ
diff --git a/sound/direct_sound_samples/cries/rayquaza_mega.aif b/sound/direct_sound_samples/cries/rayquaza_mega.aif
deleted file mode 100644
index 1b78a94e93..0000000000
Binary files a/sound/direct_sound_samples/cries/rayquaza_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rayquaza_mega.wav b/sound/direct_sound_samples/cries/rayquaza_mega.wav
new file mode 100644
index 0000000000..ee9804b9ad
Binary files /dev/null and b/sound/direct_sound_samples/cries/rayquaza_mega.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 812737a805..0000000000
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 0000000000..b65a79b4d4
Binary files /dev/null and b/sound/direct_sound_samples/cries/regice.wav differ
diff --git a/sound/direct_sound_samples/cries/regidrago.aif b/sound/direct_sound_samples/cries/regidrago.aif
deleted file mode 100644
index d67dbe0ce3..0000000000
Binary files a/sound/direct_sound_samples/cries/regidrago.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/regidrago.wav b/sound/direct_sound_samples/cries/regidrago.wav
new file mode 100644
index 0000000000..2231254c30
Binary files /dev/null and b/sound/direct_sound_samples/cries/regidrago.wav differ
diff --git a/sound/direct_sound_samples/cries/regieleki.aif b/sound/direct_sound_samples/cries/regieleki.aif
deleted file mode 100644
index 75061bccff..0000000000
Binary files a/sound/direct_sound_samples/cries/regieleki.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/regieleki.wav b/sound/direct_sound_samples/cries/regieleki.wav
new file mode 100644
index 0000000000..036545f82e
Binary files /dev/null and b/sound/direct_sound_samples/cries/regieleki.wav differ
diff --git a/sound/direct_sound_samples/cries/regigigas.aif b/sound/direct_sound_samples/cries/regigigas.aif
deleted file mode 100644
index 9de9e451d8..0000000000
Binary files a/sound/direct_sound_samples/cries/regigigas.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/regigigas.wav b/sound/direct_sound_samples/cries/regigigas.wav
new file mode 100644
index 0000000000..379ea83936
Binary files /dev/null and b/sound/direct_sound_samples/cries/regigigas.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 b9c2948095..0000000000
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 0000000000..0df3c1a720
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 5afe87279e..0000000000
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 0000000000..0e2b21beb2
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 a9c2b69e60..0000000000
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 0000000000..1a8c04473c
Binary files /dev/null and b/sound/direct_sound_samples/cries/relicanth.wav differ
diff --git a/sound/direct_sound_samples/cries/rellor.aif b/sound/direct_sound_samples/cries/rellor.aif
deleted file mode 100644
index 0a2f79805f..0000000000
Binary files a/sound/direct_sound_samples/cries/rellor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rellor.wav b/sound/direct_sound_samples/cries/rellor.wav
new file mode 100644
index 0000000000..813e82b3ac
Binary files /dev/null and b/sound/direct_sound_samples/cries/rellor.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 f879cf2835..0000000000
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 0000000000..0465e033f1
Binary files /dev/null and b/sound/direct_sound_samples/cries/remoraid.wav differ
diff --git a/sound/direct_sound_samples/cries/reshiram.aif b/sound/direct_sound_samples/cries/reshiram.aif
deleted file mode 100644
index 870d3cf515..0000000000
Binary files a/sound/direct_sound_samples/cries/reshiram.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/reshiram.wav b/sound/direct_sound_samples/cries/reshiram.wav
new file mode 100644
index 0000000000..7dc4f6d0fe
Binary files /dev/null and b/sound/direct_sound_samples/cries/reshiram.wav differ
diff --git a/sound/direct_sound_samples/cries/reuniclus.aif b/sound/direct_sound_samples/cries/reuniclus.aif
deleted file mode 100644
index ab22f0f97e..0000000000
Binary files a/sound/direct_sound_samples/cries/reuniclus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/reuniclus.wav b/sound/direct_sound_samples/cries/reuniclus.wav
new file mode 100644
index 0000000000..addb5c3a1c
Binary files /dev/null and b/sound/direct_sound_samples/cries/reuniclus.wav differ
diff --git a/sound/direct_sound_samples/cries/revavroom.aif b/sound/direct_sound_samples/cries/revavroom.aif
deleted file mode 100644
index e52bf1c6fe..0000000000
Binary files a/sound/direct_sound_samples/cries/revavroom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/revavroom.wav b/sound/direct_sound_samples/cries/revavroom.wav
new file mode 100644
index 0000000000..a9457ee018
Binary files /dev/null and b/sound/direct_sound_samples/cries/revavroom.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 c02623703d..0000000000
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 0000000000..e4f024f312
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 9a80e08f01..0000000000
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 0000000000..10c6841f43
Binary files /dev/null and b/sound/direct_sound_samples/cries/rhyhorn.wav differ
diff --git a/sound/direct_sound_samples/cries/rhyperior.aif b/sound/direct_sound_samples/cries/rhyperior.aif
deleted file mode 100644
index 210a7c8fd3..0000000000
Binary files a/sound/direct_sound_samples/cries/rhyperior.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rhyperior.wav b/sound/direct_sound_samples/cries/rhyperior.wav
new file mode 100644
index 0000000000..57a5002684
Binary files /dev/null and b/sound/direct_sound_samples/cries/rhyperior.wav differ
diff --git a/sound/direct_sound_samples/cries/ribombee.aif b/sound/direct_sound_samples/cries/ribombee.aif
deleted file mode 100644
index fb7dcd1f87..0000000000
Binary files a/sound/direct_sound_samples/cries/ribombee.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ribombee.wav b/sound/direct_sound_samples/cries/ribombee.wav
new file mode 100644
index 0000000000..36e292cc32
Binary files /dev/null and b/sound/direct_sound_samples/cries/ribombee.wav differ
diff --git a/sound/direct_sound_samples/cries/rillaboom.aif b/sound/direct_sound_samples/cries/rillaboom.aif
deleted file mode 100644
index f7e4624e88..0000000000
Binary files a/sound/direct_sound_samples/cries/rillaboom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rillaboom.wav b/sound/direct_sound_samples/cries/rillaboom.wav
new file mode 100644
index 0000000000..2757ed87cb
Binary files /dev/null and b/sound/direct_sound_samples/cries/rillaboom.wav differ
diff --git a/sound/direct_sound_samples/cries/riolu.aif b/sound/direct_sound_samples/cries/riolu.aif
deleted file mode 100644
index cd25b09faf..0000000000
Binary files a/sound/direct_sound_samples/cries/riolu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/riolu.wav b/sound/direct_sound_samples/cries/riolu.wav
new file mode 100644
index 0000000000..051e7e2acf
Binary files /dev/null and b/sound/direct_sound_samples/cries/riolu.wav differ
diff --git a/sound/direct_sound_samples/cries/roaring_moon.aif b/sound/direct_sound_samples/cries/roaring_moon.aif
deleted file mode 100644
index 3c258496dc..0000000000
Binary files a/sound/direct_sound_samples/cries/roaring_moon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/roaring_moon.wav b/sound/direct_sound_samples/cries/roaring_moon.wav
new file mode 100644
index 0000000000..72ed1c9139
Binary files /dev/null and b/sound/direct_sound_samples/cries/roaring_moon.wav differ
diff --git a/sound/direct_sound_samples/cries/rockruff.aif b/sound/direct_sound_samples/cries/rockruff.aif
deleted file mode 100644
index 90f6bed36b..0000000000
Binary files a/sound/direct_sound_samples/cries/rockruff.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rockruff.wav b/sound/direct_sound_samples/cries/rockruff.wav
new file mode 100644
index 0000000000..520eaf194f
Binary files /dev/null and b/sound/direct_sound_samples/cries/rockruff.wav differ
diff --git a/sound/direct_sound_samples/cries/roggenrola.aif b/sound/direct_sound_samples/cries/roggenrola.aif
deleted file mode 100644
index 8f2f7c8fa0..0000000000
Binary files a/sound/direct_sound_samples/cries/roggenrola.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/roggenrola.wav b/sound/direct_sound_samples/cries/roggenrola.wav
new file mode 100644
index 0000000000..34e9fe2f4a
Binary files /dev/null and b/sound/direct_sound_samples/cries/roggenrola.wav differ
diff --git a/sound/direct_sound_samples/cries/rolycoly.aif b/sound/direct_sound_samples/cries/rolycoly.aif
deleted file mode 100644
index cf6a7cefa6..0000000000
Binary files a/sound/direct_sound_samples/cries/rolycoly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rolycoly.wav b/sound/direct_sound_samples/cries/rolycoly.wav
new file mode 100644
index 0000000000..bae65dde29
Binary files /dev/null and b/sound/direct_sound_samples/cries/rolycoly.wav differ
diff --git a/sound/direct_sound_samples/cries/rookidee.aif b/sound/direct_sound_samples/cries/rookidee.aif
deleted file mode 100644
index 6fba48730a..0000000000
Binary files a/sound/direct_sound_samples/cries/rookidee.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rookidee.wav b/sound/direct_sound_samples/cries/rookidee.wav
new file mode 100644
index 0000000000..42217ed7eb
Binary files /dev/null and b/sound/direct_sound_samples/cries/rookidee.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 c6c53f3c1f..0000000000
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 0000000000..cd01f19f68
Binary files /dev/null and b/sound/direct_sound_samples/cries/roselia.wav differ
diff --git a/sound/direct_sound_samples/cries/roserade.aif b/sound/direct_sound_samples/cries/roserade.aif
deleted file mode 100644
index 7c9de96a0e..0000000000
Binary files a/sound/direct_sound_samples/cries/roserade.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/roserade.wav b/sound/direct_sound_samples/cries/roserade.wav
new file mode 100644
index 0000000000..25faa52091
Binary files /dev/null and b/sound/direct_sound_samples/cries/roserade.wav differ
diff --git a/sound/direct_sound_samples/cries/rotom.aif b/sound/direct_sound_samples/cries/rotom.aif
deleted file mode 100644
index 81080115c2..0000000000
Binary files a/sound/direct_sound_samples/cries/rotom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rotom.wav b/sound/direct_sound_samples/cries/rotom.wav
new file mode 100644
index 0000000000..621aeeae99
Binary files /dev/null and b/sound/direct_sound_samples/cries/rotom.wav differ
diff --git a/sound/direct_sound_samples/cries/rowlet.aif b/sound/direct_sound_samples/cries/rowlet.aif
deleted file mode 100644
index c201336015..0000000000
Binary files a/sound/direct_sound_samples/cries/rowlet.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rowlet.wav b/sound/direct_sound_samples/cries/rowlet.wav
new file mode 100644
index 0000000000..82b82415ce
Binary files /dev/null and b/sound/direct_sound_samples/cries/rowlet.wav differ
diff --git a/sound/direct_sound_samples/cries/rufflet.aif b/sound/direct_sound_samples/cries/rufflet.aif
deleted file mode 100644
index b7cc6cab12..0000000000
Binary files a/sound/direct_sound_samples/cries/rufflet.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/rufflet.wav b/sound/direct_sound_samples/cries/rufflet.wav
new file mode 100644
index 0000000000..5b11300983
Binary files /dev/null and b/sound/direct_sound_samples/cries/rufflet.wav differ
diff --git a/sound/direct_sound_samples/cries/runerigus.aif b/sound/direct_sound_samples/cries/runerigus.aif
deleted file mode 100644
index c04d5003c4..0000000000
Binary files a/sound/direct_sound_samples/cries/runerigus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/runerigus.wav b/sound/direct_sound_samples/cries/runerigus.wav
new file mode 100644
index 0000000000..405d3d4644
Binary files /dev/null and b/sound/direct_sound_samples/cries/runerigus.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 885a3b0b35..0000000000
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 0000000000..9f32fbdd60
Binary files /dev/null and b/sound/direct_sound_samples/cries/sableye.wav differ
diff --git a/sound/direct_sound_samples/cries/sableye_mega.aif b/sound/direct_sound_samples/cries/sableye_mega.aif
deleted file mode 100644
index 7f869cd7b8..0000000000
Binary files a/sound/direct_sound_samples/cries/sableye_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sableye_mega.wav b/sound/direct_sound_samples/cries/sableye_mega.wav
new file mode 100644
index 0000000000..6a5bb8f9bf
Binary files /dev/null and b/sound/direct_sound_samples/cries/sableye_mega.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 f733e098dd..0000000000
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 0000000000..1c426adfad
Binary files /dev/null and b/sound/direct_sound_samples/cries/salamence.wav differ
diff --git a/sound/direct_sound_samples/cries/salamence_mega.aif b/sound/direct_sound_samples/cries/salamence_mega.aif
deleted file mode 100644
index 90ce0b6ff8..0000000000
Binary files a/sound/direct_sound_samples/cries/salamence_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/salamence_mega.wav b/sound/direct_sound_samples/cries/salamence_mega.wav
new file mode 100644
index 0000000000..dc0b96bc5e
Binary files /dev/null and b/sound/direct_sound_samples/cries/salamence_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/salandit.aif b/sound/direct_sound_samples/cries/salandit.aif
deleted file mode 100644
index 90de8f0573..0000000000
Binary files a/sound/direct_sound_samples/cries/salandit.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/salandit.wav b/sound/direct_sound_samples/cries/salandit.wav
new file mode 100644
index 0000000000..631129c553
Binary files /dev/null and b/sound/direct_sound_samples/cries/salandit.wav differ
diff --git a/sound/direct_sound_samples/cries/salazzle.aif b/sound/direct_sound_samples/cries/salazzle.aif
deleted file mode 100644
index 7447bfc0bf..0000000000
Binary files a/sound/direct_sound_samples/cries/salazzle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/salazzle.wav b/sound/direct_sound_samples/cries/salazzle.wav
new file mode 100644
index 0000000000..0fbb0268f6
Binary files /dev/null and b/sound/direct_sound_samples/cries/salazzle.wav differ
diff --git a/sound/direct_sound_samples/cries/samurott.aif b/sound/direct_sound_samples/cries/samurott.aif
deleted file mode 100644
index fc8aa1c7c8..0000000000
Binary files a/sound/direct_sound_samples/cries/samurott.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/samurott.wav b/sound/direct_sound_samples/cries/samurott.wav
new file mode 100644
index 0000000000..e8c54366fa
Binary files /dev/null and b/sound/direct_sound_samples/cries/samurott.wav differ
diff --git a/sound/direct_sound_samples/cries/sandaconda.aif b/sound/direct_sound_samples/cries/sandaconda.aif
deleted file mode 100644
index 3fd1b08d96..0000000000
Binary files a/sound/direct_sound_samples/cries/sandaconda.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sandaconda.wav b/sound/direct_sound_samples/cries/sandaconda.wav
new file mode 100644
index 0000000000..24d92b705a
Binary files /dev/null and b/sound/direct_sound_samples/cries/sandaconda.wav differ
diff --git a/sound/direct_sound_samples/cries/sandile.aif b/sound/direct_sound_samples/cries/sandile.aif
deleted file mode 100644
index 316b66aec9..0000000000
Binary files a/sound/direct_sound_samples/cries/sandile.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sandile.wav b/sound/direct_sound_samples/cries/sandile.wav
new file mode 100644
index 0000000000..e57af83a74
Binary files /dev/null and b/sound/direct_sound_samples/cries/sandile.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 02dd3c1182..0000000000
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 0000000000..8c324ed3d6
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 59304e2dfe..0000000000
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 0000000000..95bcdb8698
Binary files /dev/null and b/sound/direct_sound_samples/cries/sandslash.wav differ
diff --git a/sound/direct_sound_samples/cries/sandy_shocks.aif b/sound/direct_sound_samples/cries/sandy_shocks.aif
deleted file mode 100644
index d26cfc8817..0000000000
Binary files a/sound/direct_sound_samples/cries/sandy_shocks.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sandy_shocks.wav b/sound/direct_sound_samples/cries/sandy_shocks.wav
new file mode 100644
index 0000000000..694ffe888f
Binary files /dev/null and b/sound/direct_sound_samples/cries/sandy_shocks.wav differ
diff --git a/sound/direct_sound_samples/cries/sandygast.aif b/sound/direct_sound_samples/cries/sandygast.aif
deleted file mode 100644
index b99472bbaf..0000000000
Binary files a/sound/direct_sound_samples/cries/sandygast.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sandygast.wav b/sound/direct_sound_samples/cries/sandygast.wav
new file mode 100644
index 0000000000..88997b8ed5
Binary files /dev/null and b/sound/direct_sound_samples/cries/sandygast.wav differ
diff --git a/sound/direct_sound_samples/cries/sawk.aif b/sound/direct_sound_samples/cries/sawk.aif
deleted file mode 100644
index c040994edc..0000000000
Binary files a/sound/direct_sound_samples/cries/sawk.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sawk.wav b/sound/direct_sound_samples/cries/sawk.wav
new file mode 100644
index 0000000000..b8ea999444
Binary files /dev/null and b/sound/direct_sound_samples/cries/sawk.wav differ
diff --git a/sound/direct_sound_samples/cries/sawsbuck.aif b/sound/direct_sound_samples/cries/sawsbuck.aif
deleted file mode 100644
index 9dcc4f927c..0000000000
Binary files a/sound/direct_sound_samples/cries/sawsbuck.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sawsbuck.wav b/sound/direct_sound_samples/cries/sawsbuck.wav
new file mode 100644
index 0000000000..562bc74a4f
Binary files /dev/null and b/sound/direct_sound_samples/cries/sawsbuck.wav differ
diff --git a/sound/direct_sound_samples/cries/scatterbug.aif b/sound/direct_sound_samples/cries/scatterbug.aif
deleted file mode 100644
index c553fb4771..0000000000
Binary files a/sound/direct_sound_samples/cries/scatterbug.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/scatterbug.wav b/sound/direct_sound_samples/cries/scatterbug.wav
new file mode 100644
index 0000000000..8afef83e92
Binary files /dev/null and b/sound/direct_sound_samples/cries/scatterbug.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 c460e445d5..0000000000
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 0000000000..32673bc773
Binary files /dev/null and b/sound/direct_sound_samples/cries/sceptile.wav differ
diff --git a/sound/direct_sound_samples/cries/sceptile_mega.aif b/sound/direct_sound_samples/cries/sceptile_mega.aif
deleted file mode 100644
index 50a16a1ee3..0000000000
Binary files a/sound/direct_sound_samples/cries/sceptile_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sceptile_mega.wav b/sound/direct_sound_samples/cries/sceptile_mega.wav
new file mode 100644
index 0000000000..228b21d4ed
Binary files /dev/null and b/sound/direct_sound_samples/cries/sceptile_mega.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 eb423f61dd..0000000000
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 0000000000..8196df16b2
Binary files /dev/null and b/sound/direct_sound_samples/cries/scizor.wav differ
diff --git a/sound/direct_sound_samples/cries/scizor_mega.aif b/sound/direct_sound_samples/cries/scizor_mega.aif
deleted file mode 100644
index c970f8083b..0000000000
Binary files a/sound/direct_sound_samples/cries/scizor_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/scizor_mega.wav b/sound/direct_sound_samples/cries/scizor_mega.wav
new file mode 100644
index 0000000000..010cb05e66
Binary files /dev/null and b/sound/direct_sound_samples/cries/scizor_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/scolipede.aif b/sound/direct_sound_samples/cries/scolipede.aif
deleted file mode 100644
index 0372641b70..0000000000
Binary files a/sound/direct_sound_samples/cries/scolipede.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/scolipede.wav b/sound/direct_sound_samples/cries/scolipede.wav
new file mode 100644
index 0000000000..1b493ce18d
Binary files /dev/null and b/sound/direct_sound_samples/cries/scolipede.wav differ
diff --git a/sound/direct_sound_samples/cries/scorbunny.aif b/sound/direct_sound_samples/cries/scorbunny.aif
deleted file mode 100644
index c0963bbc1c..0000000000
Binary files a/sound/direct_sound_samples/cries/scorbunny.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/scorbunny.wav b/sound/direct_sound_samples/cries/scorbunny.wav
new file mode 100644
index 0000000000..dd9e54c722
Binary files /dev/null and b/sound/direct_sound_samples/cries/scorbunny.wav differ
diff --git a/sound/direct_sound_samples/cries/scovillain.aif b/sound/direct_sound_samples/cries/scovillain.aif
deleted file mode 100644
index d84cb24087..0000000000
Binary files a/sound/direct_sound_samples/cries/scovillain.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/scovillain.wav b/sound/direct_sound_samples/cries/scovillain.wav
new file mode 100644
index 0000000000..a7d8f058e8
Binary files /dev/null and b/sound/direct_sound_samples/cries/scovillain.wav differ
diff --git a/sound/direct_sound_samples/cries/scrafty.aif b/sound/direct_sound_samples/cries/scrafty.aif
deleted file mode 100644
index bc351aa3de..0000000000
Binary files a/sound/direct_sound_samples/cries/scrafty.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/scrafty.wav b/sound/direct_sound_samples/cries/scrafty.wav
new file mode 100644
index 0000000000..e64613dfb8
Binary files /dev/null and b/sound/direct_sound_samples/cries/scrafty.wav differ
diff --git a/sound/direct_sound_samples/cries/scraggy.aif b/sound/direct_sound_samples/cries/scraggy.aif
deleted file mode 100644
index bd836ebc46..0000000000
Binary files a/sound/direct_sound_samples/cries/scraggy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/scraggy.wav b/sound/direct_sound_samples/cries/scraggy.wav
new file mode 100644
index 0000000000..e5c014a432
Binary files /dev/null and b/sound/direct_sound_samples/cries/scraggy.wav differ
diff --git a/sound/direct_sound_samples/cries/scream_tail.aif b/sound/direct_sound_samples/cries/scream_tail.aif
deleted file mode 100644
index a64bbdb051..0000000000
Binary files a/sound/direct_sound_samples/cries/scream_tail.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/scream_tail.wav b/sound/direct_sound_samples/cries/scream_tail.wav
new file mode 100644
index 0000000000..c7f133809d
Binary files /dev/null and b/sound/direct_sound_samples/cries/scream_tail.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 88bc85cdbb..0000000000
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 0000000000..5b6ba415a1
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 19852ad231..0000000000
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 0000000000..c68a68a196
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 f572ce5dd4..0000000000
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 0000000000..6f2533e946
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 9a0aedda62..0000000000
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 0000000000..ad01a5fed3
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 eac082184f..0000000000
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 0000000000..b4d74f65d6
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 1cc31998f2..0000000000
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 0000000000..6e252b375a
Binary files /dev/null and b/sound/direct_sound_samples/cries/seel.wav differ
diff --git a/sound/direct_sound_samples/cries/seismitoad.aif b/sound/direct_sound_samples/cries/seismitoad.aif
deleted file mode 100644
index 521f9b741b..0000000000
Binary files a/sound/direct_sound_samples/cries/seismitoad.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/seismitoad.wav b/sound/direct_sound_samples/cries/seismitoad.wav
new file mode 100644
index 0000000000..ad833ea8e0
Binary files /dev/null and b/sound/direct_sound_samples/cries/seismitoad.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 ffbce9c7c5..0000000000
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 0000000000..0c6746c456
Binary files /dev/null and b/sound/direct_sound_samples/cries/sentret.wav differ
diff --git a/sound/direct_sound_samples/cries/serperior.aif b/sound/direct_sound_samples/cries/serperior.aif
deleted file mode 100644
index 9a2eb0baad..0000000000
Binary files a/sound/direct_sound_samples/cries/serperior.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/serperior.wav b/sound/direct_sound_samples/cries/serperior.wav
new file mode 100644
index 0000000000..427443c56f
Binary files /dev/null and b/sound/direct_sound_samples/cries/serperior.wav differ
diff --git a/sound/direct_sound_samples/cries/servine.aif b/sound/direct_sound_samples/cries/servine.aif
deleted file mode 100644
index 7098f526d9..0000000000
Binary files a/sound/direct_sound_samples/cries/servine.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/servine.wav b/sound/direct_sound_samples/cries/servine.wav
new file mode 100644
index 0000000000..61da20ea83
Binary files /dev/null and b/sound/direct_sound_samples/cries/servine.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 5e3968db6d..0000000000
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 0000000000..b467378f4c
Binary files /dev/null and b/sound/direct_sound_samples/cries/seviper.wav differ
diff --git a/sound/direct_sound_samples/cries/sewaddle.aif b/sound/direct_sound_samples/cries/sewaddle.aif
deleted file mode 100644
index 9a3ac12721..0000000000
Binary files a/sound/direct_sound_samples/cries/sewaddle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sewaddle.wav b/sound/direct_sound_samples/cries/sewaddle.wav
new file mode 100644
index 0000000000..9751d50cf1
Binary files /dev/null and b/sound/direct_sound_samples/cries/sewaddle.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 b68c24bb81..0000000000
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 0000000000..26c52b43c3
Binary files /dev/null and b/sound/direct_sound_samples/cries/sharpedo.wav differ
diff --git a/sound/direct_sound_samples/cries/sharpedo_mega.aif b/sound/direct_sound_samples/cries/sharpedo_mega.aif
deleted file mode 100644
index 3fa5b49e92..0000000000
Binary files a/sound/direct_sound_samples/cries/sharpedo_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sharpedo_mega.wav b/sound/direct_sound_samples/cries/sharpedo_mega.wav
new file mode 100644
index 0000000000..232b0c5241
Binary files /dev/null and b/sound/direct_sound_samples/cries/sharpedo_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/shaymin_land.aif b/sound/direct_sound_samples/cries/shaymin_land.aif
deleted file mode 100644
index ab0c40f156..0000000000
Binary files a/sound/direct_sound_samples/cries/shaymin_land.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shaymin_land.wav b/sound/direct_sound_samples/cries/shaymin_land.wav
new file mode 100644
index 0000000000..9665e3b2ac
Binary files /dev/null and b/sound/direct_sound_samples/cries/shaymin_land.wav differ
diff --git a/sound/direct_sound_samples/cries/shaymin_sky.aif b/sound/direct_sound_samples/cries/shaymin_sky.aif
deleted file mode 100644
index ee3dfa8457..0000000000
Binary files a/sound/direct_sound_samples/cries/shaymin_sky.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shaymin_sky.wav b/sound/direct_sound_samples/cries/shaymin_sky.wav
new file mode 100644
index 0000000000..54f116f4b5
Binary files /dev/null and b/sound/direct_sound_samples/cries/shaymin_sky.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 d891bd382c..0000000000
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 0000000000..956ae0be9f
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 b202dc0376..0000000000
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 0000000000..7648d06f9a
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 3f2df4a82c..0000000000
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 0000000000..1fe4367d78
Binary files /dev/null and b/sound/direct_sound_samples/cries/shellder.wav differ
diff --git a/sound/direct_sound_samples/cries/shellos.aif b/sound/direct_sound_samples/cries/shellos.aif
deleted file mode 100644
index f590731202..0000000000
Binary files a/sound/direct_sound_samples/cries/shellos.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shellos.wav b/sound/direct_sound_samples/cries/shellos.wav
new file mode 100644
index 0000000000..99e9254347
Binary files /dev/null and b/sound/direct_sound_samples/cries/shellos.wav differ
diff --git a/sound/direct_sound_samples/cries/shelmet.aif b/sound/direct_sound_samples/cries/shelmet.aif
deleted file mode 100644
index 472b6658c0..0000000000
Binary files a/sound/direct_sound_samples/cries/shelmet.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shelmet.wav b/sound/direct_sound_samples/cries/shelmet.wav
new file mode 100644
index 0000000000..3cb2bcecc6
Binary files /dev/null and b/sound/direct_sound_samples/cries/shelmet.wav differ
diff --git a/sound/direct_sound_samples/cries/shieldon.aif b/sound/direct_sound_samples/cries/shieldon.aif
deleted file mode 100644
index 5ea98bf174..0000000000
Binary files a/sound/direct_sound_samples/cries/shieldon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shieldon.wav b/sound/direct_sound_samples/cries/shieldon.wav
new file mode 100644
index 0000000000..dc7c1c5a3b
Binary files /dev/null and b/sound/direct_sound_samples/cries/shieldon.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 dbc65b749e..0000000000
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 0000000000..533115f404
Binary files /dev/null and b/sound/direct_sound_samples/cries/shiftry.wav differ
diff --git a/sound/direct_sound_samples/cries/shiinotic.aif b/sound/direct_sound_samples/cries/shiinotic.aif
deleted file mode 100644
index 972aef0769..0000000000
Binary files a/sound/direct_sound_samples/cries/shiinotic.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shiinotic.wav b/sound/direct_sound_samples/cries/shiinotic.wav
new file mode 100644
index 0000000000..32ce942636
Binary files /dev/null and b/sound/direct_sound_samples/cries/shiinotic.wav differ
diff --git a/sound/direct_sound_samples/cries/shinx.aif b/sound/direct_sound_samples/cries/shinx.aif
deleted file mode 100644
index 08f7ad8a4c..0000000000
Binary files a/sound/direct_sound_samples/cries/shinx.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shinx.wav b/sound/direct_sound_samples/cries/shinx.wav
new file mode 100644
index 0000000000..2f62c5d966
Binary files /dev/null and b/sound/direct_sound_samples/cries/shinx.wav differ
diff --git a/sound/direct_sound_samples/cries/shroodle.aif b/sound/direct_sound_samples/cries/shroodle.aif
deleted file mode 100644
index b60ef3ade3..0000000000
Binary files a/sound/direct_sound_samples/cries/shroodle.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/shroodle.wav b/sound/direct_sound_samples/cries/shroodle.wav
new file mode 100644
index 0000000000..0166fa68ca
Binary files /dev/null and b/sound/direct_sound_samples/cries/shroodle.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 9c092ae072..0000000000
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 0000000000..07658c8801
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 a5523506b5..0000000000
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 0000000000..bb196dbfe9
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 8f48e8b5fd..0000000000
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 0000000000..6b043a2772
Binary files /dev/null and b/sound/direct_sound_samples/cries/shuppet.wav differ
diff --git a/sound/direct_sound_samples/cries/sigilyph.aif b/sound/direct_sound_samples/cries/sigilyph.aif
deleted file mode 100644
index cf84e7dcf9..0000000000
Binary files a/sound/direct_sound_samples/cries/sigilyph.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sigilyph.wav b/sound/direct_sound_samples/cries/sigilyph.wav
new file mode 100644
index 0000000000..5d43af49f5
Binary files /dev/null and b/sound/direct_sound_samples/cries/sigilyph.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 89cd186676..0000000000
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 0000000000..15827329e4
Binary files /dev/null and b/sound/direct_sound_samples/cries/silcoon.wav differ
diff --git a/sound/direct_sound_samples/cries/silicobra.aif b/sound/direct_sound_samples/cries/silicobra.aif
deleted file mode 100644
index 3b9f5e13fc..0000000000
Binary files a/sound/direct_sound_samples/cries/silicobra.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/silicobra.wav b/sound/direct_sound_samples/cries/silicobra.wav
new file mode 100644
index 0000000000..92392561ef
Binary files /dev/null and b/sound/direct_sound_samples/cries/silicobra.wav differ
diff --git a/sound/direct_sound_samples/cries/silvally.aif b/sound/direct_sound_samples/cries/silvally.aif
deleted file mode 100644
index 48856c7d16..0000000000
Binary files a/sound/direct_sound_samples/cries/silvally.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/silvally.wav b/sound/direct_sound_samples/cries/silvally.wav
new file mode 100644
index 0000000000..833dbb9286
Binary files /dev/null and b/sound/direct_sound_samples/cries/silvally.wav differ
diff --git a/sound/direct_sound_samples/cries/simipour.aif b/sound/direct_sound_samples/cries/simipour.aif
deleted file mode 100644
index 91e891b63f..0000000000
Binary files a/sound/direct_sound_samples/cries/simipour.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/simipour.wav b/sound/direct_sound_samples/cries/simipour.wav
new file mode 100644
index 0000000000..f5507327b0
Binary files /dev/null and b/sound/direct_sound_samples/cries/simipour.wav differ
diff --git a/sound/direct_sound_samples/cries/simisage.aif b/sound/direct_sound_samples/cries/simisage.aif
deleted file mode 100644
index 944f5ff831..0000000000
Binary files a/sound/direct_sound_samples/cries/simisage.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/simisage.wav b/sound/direct_sound_samples/cries/simisage.wav
new file mode 100644
index 0000000000..91bcf71d9d
Binary files /dev/null and b/sound/direct_sound_samples/cries/simisage.wav differ
diff --git a/sound/direct_sound_samples/cries/simisear.aif b/sound/direct_sound_samples/cries/simisear.aif
deleted file mode 100644
index e3e8eb860a..0000000000
Binary files a/sound/direct_sound_samples/cries/simisear.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/simisear.wav b/sound/direct_sound_samples/cries/simisear.wav
new file mode 100644
index 0000000000..737b37ba78
Binary files /dev/null and b/sound/direct_sound_samples/cries/simisear.wav differ
diff --git a/sound/direct_sound_samples/cries/sinistcha.aif b/sound/direct_sound_samples/cries/sinistcha.aif
deleted file mode 100644
index e9a619c3f0..0000000000
Binary files a/sound/direct_sound_samples/cries/sinistcha.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sinistcha.wav b/sound/direct_sound_samples/cries/sinistcha.wav
new file mode 100644
index 0000000000..f3cb98dd7b
Binary files /dev/null and b/sound/direct_sound_samples/cries/sinistcha.wav differ
diff --git a/sound/direct_sound_samples/cries/sinistea.aif b/sound/direct_sound_samples/cries/sinistea.aif
deleted file mode 100644
index 912a0800f9..0000000000
Binary files a/sound/direct_sound_samples/cries/sinistea.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sinistea.wav b/sound/direct_sound_samples/cries/sinistea.wav
new file mode 100644
index 0000000000..b91d77cae2
Binary files /dev/null and b/sound/direct_sound_samples/cries/sinistea.wav differ
diff --git a/sound/direct_sound_samples/cries/sirfetchd.aif b/sound/direct_sound_samples/cries/sirfetchd.aif
deleted file mode 100644
index a5ca065a75..0000000000
Binary files a/sound/direct_sound_samples/cries/sirfetchd.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sirfetchd.wav b/sound/direct_sound_samples/cries/sirfetchd.wav
new file mode 100644
index 0000000000..cfa590d2ca
Binary files /dev/null and b/sound/direct_sound_samples/cries/sirfetchd.wav differ
diff --git a/sound/direct_sound_samples/cries/sizzlipede.aif b/sound/direct_sound_samples/cries/sizzlipede.aif
deleted file mode 100644
index 99aade0666..0000000000
Binary files a/sound/direct_sound_samples/cries/sizzlipede.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sizzlipede.wav b/sound/direct_sound_samples/cries/sizzlipede.wav
new file mode 100644
index 0000000000..d2ee4859fc
Binary files /dev/null and b/sound/direct_sound_samples/cries/sizzlipede.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 5641486234..0000000000
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 0000000000..2924973023
Binary files /dev/null and b/sound/direct_sound_samples/cries/skarmory.wav differ
diff --git a/sound/direct_sound_samples/cries/skeledirge.aif b/sound/direct_sound_samples/cries/skeledirge.aif
deleted file mode 100644
index 720e102019..0000000000
Binary files a/sound/direct_sound_samples/cries/skeledirge.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/skeledirge.wav b/sound/direct_sound_samples/cries/skeledirge.wav
new file mode 100644
index 0000000000..284cd7f5fd
Binary files /dev/null and b/sound/direct_sound_samples/cries/skeledirge.wav differ
diff --git a/sound/direct_sound_samples/cries/skiddo.aif b/sound/direct_sound_samples/cries/skiddo.aif
deleted file mode 100644
index 5b2dc104f7..0000000000
Binary files a/sound/direct_sound_samples/cries/skiddo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/skiddo.wav b/sound/direct_sound_samples/cries/skiddo.wav
new file mode 100644
index 0000000000..ce3e1e35ef
Binary files /dev/null and b/sound/direct_sound_samples/cries/skiddo.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 4517e39c7a..0000000000
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 0000000000..30f9c26662
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 0f903b5377..0000000000
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 0000000000..02aaa4fcbd
Binary files /dev/null and b/sound/direct_sound_samples/cries/skitty.wav differ
diff --git a/sound/direct_sound_samples/cries/skorupi.aif b/sound/direct_sound_samples/cries/skorupi.aif
deleted file mode 100644
index a638cb4645..0000000000
Binary files a/sound/direct_sound_samples/cries/skorupi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/skorupi.wav b/sound/direct_sound_samples/cries/skorupi.wav
new file mode 100644
index 0000000000..ae1317e264
Binary files /dev/null and b/sound/direct_sound_samples/cries/skorupi.wav differ
diff --git a/sound/direct_sound_samples/cries/skrelp.aif b/sound/direct_sound_samples/cries/skrelp.aif
deleted file mode 100644
index 12bb27c043..0000000000
Binary files a/sound/direct_sound_samples/cries/skrelp.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/skrelp.wav b/sound/direct_sound_samples/cries/skrelp.wav
new file mode 100644
index 0000000000..4bbecd7a62
Binary files /dev/null and b/sound/direct_sound_samples/cries/skrelp.wav differ
diff --git a/sound/direct_sound_samples/cries/skuntank.aif b/sound/direct_sound_samples/cries/skuntank.aif
deleted file mode 100644
index 354f2af92c..0000000000
Binary files a/sound/direct_sound_samples/cries/skuntank.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/skuntank.wav b/sound/direct_sound_samples/cries/skuntank.wav
new file mode 100644
index 0000000000..315c8a41cf
Binary files /dev/null and b/sound/direct_sound_samples/cries/skuntank.wav differ
diff --git a/sound/direct_sound_samples/cries/skwovet.aif b/sound/direct_sound_samples/cries/skwovet.aif
deleted file mode 100644
index b5a27241d5..0000000000
Binary files a/sound/direct_sound_samples/cries/skwovet.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/skwovet.wav b/sound/direct_sound_samples/cries/skwovet.wav
new file mode 100644
index 0000000000..7765154b91
Binary files /dev/null and b/sound/direct_sound_samples/cries/skwovet.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 d023af7681..0000000000
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 0000000000..ef34d94d69
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 54248b2d85..0000000000
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 0000000000..d4588b3a21
Binary files /dev/null and b/sound/direct_sound_samples/cries/slakoth.wav differ
diff --git a/sound/direct_sound_samples/cries/sliggoo.aif b/sound/direct_sound_samples/cries/sliggoo.aif
deleted file mode 100644
index ed141e69c5..0000000000
Binary files a/sound/direct_sound_samples/cries/sliggoo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sliggoo.wav b/sound/direct_sound_samples/cries/sliggoo.wav
new file mode 100644
index 0000000000..c988d4244a
Binary files /dev/null and b/sound/direct_sound_samples/cries/sliggoo.wav differ
diff --git a/sound/direct_sound_samples/cries/slither_wing.aif b/sound/direct_sound_samples/cries/slither_wing.aif
deleted file mode 100644
index 699f74f2f9..0000000000
Binary files a/sound/direct_sound_samples/cries/slither_wing.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/slither_wing.wav b/sound/direct_sound_samples/cries/slither_wing.wav
new file mode 100644
index 0000000000..35baf10669
Binary files /dev/null and b/sound/direct_sound_samples/cries/slither_wing.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 c3778734e3..0000000000
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 0000000000..fe03ab4cdd
Binary files /dev/null and b/sound/direct_sound_samples/cries/slowbro.wav differ
diff --git a/sound/direct_sound_samples/cries/slowbro_mega.aif b/sound/direct_sound_samples/cries/slowbro_mega.aif
deleted file mode 100644
index 6ae2a0fb68..0000000000
Binary files a/sound/direct_sound_samples/cries/slowbro_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/slowbro_mega.wav b/sound/direct_sound_samples/cries/slowbro_mega.wav
new file mode 100644
index 0000000000..4dee27f96e
Binary files /dev/null and b/sound/direct_sound_samples/cries/slowbro_mega.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 e135c9e0db..0000000000
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 0000000000..f802796282
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 e92ed0c208..0000000000
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 0000000000..b3a45bef0a
Binary files /dev/null and b/sound/direct_sound_samples/cries/slowpoke.wav differ
diff --git a/sound/direct_sound_samples/cries/slowpoke_galar.aif b/sound/direct_sound_samples/cries/slowpoke_galar.aif
deleted file mode 100644
index 30251a2e8c..0000000000
Binary files a/sound/direct_sound_samples/cries/slowpoke_galar.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/slowpoke_galar.wav b/sound/direct_sound_samples/cries/slowpoke_galar.wav
new file mode 100644
index 0000000000..8e72b6d83e
Binary files /dev/null and b/sound/direct_sound_samples/cries/slowpoke_galar.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 3526b7f6e7..0000000000
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 0000000000..389bc88657
Binary files /dev/null and b/sound/direct_sound_samples/cries/slugma.wav differ
diff --git a/sound/direct_sound_samples/cries/slurpuff.aif b/sound/direct_sound_samples/cries/slurpuff.aif
deleted file mode 100644
index 93b59e8e35..0000000000
Binary files a/sound/direct_sound_samples/cries/slurpuff.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/slurpuff.wav b/sound/direct_sound_samples/cries/slurpuff.wav
new file mode 100644
index 0000000000..e7f4be9876
Binary files /dev/null and b/sound/direct_sound_samples/cries/slurpuff.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 76cc479ccc..0000000000
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 0000000000..e206f8f61b
Binary files /dev/null and b/sound/direct_sound_samples/cries/smeargle.wav differ
diff --git a/sound/direct_sound_samples/cries/smoliv.aif b/sound/direct_sound_samples/cries/smoliv.aif
deleted file mode 100644
index 44b688aff9..0000000000
Binary files a/sound/direct_sound_samples/cries/smoliv.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/smoliv.wav b/sound/direct_sound_samples/cries/smoliv.wav
new file mode 100644
index 0000000000..9662fc1e52
Binary files /dev/null and b/sound/direct_sound_samples/cries/smoliv.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 812586940c..0000000000
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 0000000000..a4abdde7ec
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 e4bf7129c4..0000000000
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 0000000000..da76aefb71
Binary files /dev/null and b/sound/direct_sound_samples/cries/sneasel.wav differ
diff --git a/sound/direct_sound_samples/cries/sneasler.aif b/sound/direct_sound_samples/cries/sneasler.aif
deleted file mode 100644
index b8537fef07..0000000000
Binary files a/sound/direct_sound_samples/cries/sneasler.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sneasler.wav b/sound/direct_sound_samples/cries/sneasler.wav
new file mode 100644
index 0000000000..4dbc8c5eea
Binary files /dev/null and b/sound/direct_sound_samples/cries/sneasler.wav differ
diff --git a/sound/direct_sound_samples/cries/snivy.aif b/sound/direct_sound_samples/cries/snivy.aif
deleted file mode 100644
index cd0335decb..0000000000
Binary files a/sound/direct_sound_samples/cries/snivy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/snivy.wav b/sound/direct_sound_samples/cries/snivy.wav
new file mode 100644
index 0000000000..1d9ba8c4a6
Binary files /dev/null and b/sound/direct_sound_samples/cries/snivy.wav differ
diff --git a/sound/direct_sound_samples/cries/snom.aif b/sound/direct_sound_samples/cries/snom.aif
deleted file mode 100644
index 9591fa1d7d..0000000000
Binary files a/sound/direct_sound_samples/cries/snom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/snom.wav b/sound/direct_sound_samples/cries/snom.wav
new file mode 100644
index 0000000000..384269745a
Binary files /dev/null and b/sound/direct_sound_samples/cries/snom.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 d65557c798..0000000000
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 0000000000..12e717be17
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 21bae9fc67..0000000000
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 0000000000..b4ecc4537f
Binary files /dev/null and b/sound/direct_sound_samples/cries/snorunt.wav differ
diff --git a/sound/direct_sound_samples/cries/snover.aif b/sound/direct_sound_samples/cries/snover.aif
deleted file mode 100644
index d02aceda4c..0000000000
Binary files a/sound/direct_sound_samples/cries/snover.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/snover.wav b/sound/direct_sound_samples/cries/snover.wav
new file mode 100644
index 0000000000..1ddb86c7bc
Binary files /dev/null and b/sound/direct_sound_samples/cries/snover.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 5e2ca9adb0..0000000000
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 0000000000..37cacda8f7
Binary files /dev/null and b/sound/direct_sound_samples/cries/snubbull.wav differ
diff --git a/sound/direct_sound_samples/cries/sobble.aif b/sound/direct_sound_samples/cries/sobble.aif
deleted file mode 100644
index bdb1d937fa..0000000000
Binary files a/sound/direct_sound_samples/cries/sobble.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sobble.wav b/sound/direct_sound_samples/cries/sobble.wav
new file mode 100644
index 0000000000..6a384d1de2
Binary files /dev/null and b/sound/direct_sound_samples/cries/sobble.wav differ
diff --git a/sound/direct_sound_samples/cries/solgaleo.aif b/sound/direct_sound_samples/cries/solgaleo.aif
deleted file mode 100644
index 8cb9ad0cb5..0000000000
Binary files a/sound/direct_sound_samples/cries/solgaleo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/solgaleo.wav b/sound/direct_sound_samples/cries/solgaleo.wav
new file mode 100644
index 0000000000..575978e635
Binary files /dev/null and b/sound/direct_sound_samples/cries/solgaleo.wav differ
diff --git a/sound/direct_sound_samples/cries/solosis.aif b/sound/direct_sound_samples/cries/solosis.aif
deleted file mode 100644
index 701424bbd6..0000000000
Binary files a/sound/direct_sound_samples/cries/solosis.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/solosis.wav b/sound/direct_sound_samples/cries/solosis.wav
new file mode 100644
index 0000000000..edb4b6ba7a
Binary files /dev/null and b/sound/direct_sound_samples/cries/solosis.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 ed58aeecae..0000000000
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 0000000000..12f766af71
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 9fb8d0cc8f..0000000000
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 0000000000..a648481368
Binary files /dev/null and b/sound/direct_sound_samples/cries/spearow.wav differ
diff --git a/sound/direct_sound_samples/cries/spectrier.aif b/sound/direct_sound_samples/cries/spectrier.aif
deleted file mode 100644
index a43dc77a6c..0000000000
Binary files a/sound/direct_sound_samples/cries/spectrier.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/spectrier.wav b/sound/direct_sound_samples/cries/spectrier.wav
new file mode 100644
index 0000000000..dbfbfef08d
Binary files /dev/null and b/sound/direct_sound_samples/cries/spectrier.wav differ
diff --git a/sound/direct_sound_samples/cries/spewpa.aif b/sound/direct_sound_samples/cries/spewpa.aif
deleted file mode 100644
index 34cd82b989..0000000000
Binary files a/sound/direct_sound_samples/cries/spewpa.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/spewpa.wav b/sound/direct_sound_samples/cries/spewpa.wav
new file mode 100644
index 0000000000..f260c20c64
Binary files /dev/null and b/sound/direct_sound_samples/cries/spewpa.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 44d21a9739..0000000000
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 0000000000..818caf8cd8
Binary files /dev/null and b/sound/direct_sound_samples/cries/spheal.wav differ
diff --git a/sound/direct_sound_samples/cries/spidops.aif b/sound/direct_sound_samples/cries/spidops.aif
deleted file mode 100644
index 626aa0c3f5..0000000000
Binary files a/sound/direct_sound_samples/cries/spidops.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/spidops.wav b/sound/direct_sound_samples/cries/spidops.wav
new file mode 100644
index 0000000000..cfde8c39b3
Binary files /dev/null and b/sound/direct_sound_samples/cries/spidops.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 f49c856aca..0000000000
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 0000000000..3c45731327
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 01914a5d09..0000000000
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 0000000000..4481e3a887
Binary files /dev/null and b/sound/direct_sound_samples/cries/spinda.wav differ
diff --git a/sound/direct_sound_samples/cries/spiritomb.aif b/sound/direct_sound_samples/cries/spiritomb.aif
deleted file mode 100644
index 7a504adfb0..0000000000
Binary files a/sound/direct_sound_samples/cries/spiritomb.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/spiritomb.wav b/sound/direct_sound_samples/cries/spiritomb.wav
new file mode 100644
index 0000000000..45b6574232
Binary files /dev/null and b/sound/direct_sound_samples/cries/spiritomb.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 102f53d8f1..0000000000
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 0000000000..36447fb84b
Binary files /dev/null and b/sound/direct_sound_samples/cries/spoink.wav differ
diff --git a/sound/direct_sound_samples/cries/sprigatito.aif b/sound/direct_sound_samples/cries/sprigatito.aif
deleted file mode 100644
index 13616f9686..0000000000
Binary files a/sound/direct_sound_samples/cries/sprigatito.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sprigatito.wav b/sound/direct_sound_samples/cries/sprigatito.wav
new file mode 100644
index 0000000000..822c2d70fc
Binary files /dev/null and b/sound/direct_sound_samples/cries/sprigatito.wav differ
diff --git a/sound/direct_sound_samples/cries/spritzee.aif b/sound/direct_sound_samples/cries/spritzee.aif
deleted file mode 100644
index 3bf2499d72..0000000000
Binary files a/sound/direct_sound_samples/cries/spritzee.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/spritzee.wav b/sound/direct_sound_samples/cries/spritzee.wav
new file mode 100644
index 0000000000..18dc72256f
Binary files /dev/null and b/sound/direct_sound_samples/cries/spritzee.wav differ
diff --git a/sound/direct_sound_samples/cries/squawkabilly.aif b/sound/direct_sound_samples/cries/squawkabilly.aif
deleted file mode 100644
index 0c88f36f74..0000000000
Binary files a/sound/direct_sound_samples/cries/squawkabilly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/squawkabilly.wav b/sound/direct_sound_samples/cries/squawkabilly.wav
new file mode 100644
index 0000000000..77d90d6f4d
Binary files /dev/null and b/sound/direct_sound_samples/cries/squawkabilly.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 8e6cf8644d..0000000000
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 0000000000..0cf32c6b6c
Binary files /dev/null and b/sound/direct_sound_samples/cries/squirtle.wav differ
diff --git a/sound/direct_sound_samples/cries/stakataka.aif b/sound/direct_sound_samples/cries/stakataka.aif
deleted file mode 100644
index cabe903b43..0000000000
Binary files a/sound/direct_sound_samples/cries/stakataka.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/stakataka.wav b/sound/direct_sound_samples/cries/stakataka.wav
new file mode 100644
index 0000000000..c5ca06ea58
Binary files /dev/null and b/sound/direct_sound_samples/cries/stakataka.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 231466ebea..0000000000
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 0000000000..f59953beb0
Binary files /dev/null and b/sound/direct_sound_samples/cries/stantler.wav differ
diff --git a/sound/direct_sound_samples/cries/staraptor.aif b/sound/direct_sound_samples/cries/staraptor.aif
deleted file mode 100644
index 05ccd1f024..0000000000
Binary files a/sound/direct_sound_samples/cries/staraptor.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/staraptor.wav b/sound/direct_sound_samples/cries/staraptor.wav
new file mode 100644
index 0000000000..acbbdc0ece
Binary files /dev/null and b/sound/direct_sound_samples/cries/staraptor.wav differ
diff --git a/sound/direct_sound_samples/cries/staravia.aif b/sound/direct_sound_samples/cries/staravia.aif
deleted file mode 100644
index 235d14eaf8..0000000000
Binary files a/sound/direct_sound_samples/cries/staravia.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/staravia.wav b/sound/direct_sound_samples/cries/staravia.wav
new file mode 100644
index 0000000000..97d6bfe631
Binary files /dev/null and b/sound/direct_sound_samples/cries/staravia.wav differ
diff --git a/sound/direct_sound_samples/cries/starly.aif b/sound/direct_sound_samples/cries/starly.aif
deleted file mode 100644
index 2b0dd3960a..0000000000
Binary files a/sound/direct_sound_samples/cries/starly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/starly.wav b/sound/direct_sound_samples/cries/starly.wav
new file mode 100644
index 0000000000..f897be9a81
Binary files /dev/null and b/sound/direct_sound_samples/cries/starly.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 a2daf86800..0000000000
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 0000000000..e3ace4fcf2
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 cd0cbc6b2b..0000000000
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 0000000000..c726206f43
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 060cd00be4..0000000000
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 0000000000..8683e3d242
Binary files /dev/null and b/sound/direct_sound_samples/cries/steelix.wav differ
diff --git a/sound/direct_sound_samples/cries/steelix_mega.aif b/sound/direct_sound_samples/cries/steelix_mega.aif
deleted file mode 100644
index dfb068e161..0000000000
Binary files a/sound/direct_sound_samples/cries/steelix_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/steelix_mega.wav b/sound/direct_sound_samples/cries/steelix_mega.wav
new file mode 100644
index 0000000000..1ce3f8a0e3
Binary files /dev/null and b/sound/direct_sound_samples/cries/steelix_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/steenee.aif b/sound/direct_sound_samples/cries/steenee.aif
deleted file mode 100644
index 54b9df83b7..0000000000
Binary files a/sound/direct_sound_samples/cries/steenee.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/steenee.wav b/sound/direct_sound_samples/cries/steenee.wav
new file mode 100644
index 0000000000..c6749208e9
Binary files /dev/null and b/sound/direct_sound_samples/cries/steenee.wav differ
diff --git a/sound/direct_sound_samples/cries/stonjourner.aif b/sound/direct_sound_samples/cries/stonjourner.aif
deleted file mode 100644
index c1a24f3779..0000000000
Binary files a/sound/direct_sound_samples/cries/stonjourner.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/stonjourner.wav b/sound/direct_sound_samples/cries/stonjourner.wav
new file mode 100644
index 0000000000..81064b70cf
Binary files /dev/null and b/sound/direct_sound_samples/cries/stonjourner.wav differ
diff --git a/sound/direct_sound_samples/cries/stoutland.aif b/sound/direct_sound_samples/cries/stoutland.aif
deleted file mode 100644
index 5479323d49..0000000000
Binary files a/sound/direct_sound_samples/cries/stoutland.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/stoutland.wav b/sound/direct_sound_samples/cries/stoutland.wav
new file mode 100644
index 0000000000..f95b522660
Binary files /dev/null and b/sound/direct_sound_samples/cries/stoutland.wav differ
diff --git a/sound/direct_sound_samples/cries/stufful.aif b/sound/direct_sound_samples/cries/stufful.aif
deleted file mode 100644
index abd70624f0..0000000000
Binary files a/sound/direct_sound_samples/cries/stufful.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/stufful.wav b/sound/direct_sound_samples/cries/stufful.wav
new file mode 100644
index 0000000000..f03666ef8f
Binary files /dev/null and b/sound/direct_sound_samples/cries/stufful.wav differ
diff --git a/sound/direct_sound_samples/cries/stunfisk.aif b/sound/direct_sound_samples/cries/stunfisk.aif
deleted file mode 100644
index 3d7f116cfd..0000000000
Binary files a/sound/direct_sound_samples/cries/stunfisk.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/stunfisk.wav b/sound/direct_sound_samples/cries/stunfisk.wav
new file mode 100644
index 0000000000..68165add79
Binary files /dev/null and b/sound/direct_sound_samples/cries/stunfisk.wav differ
diff --git a/sound/direct_sound_samples/cries/stunky.aif b/sound/direct_sound_samples/cries/stunky.aif
deleted file mode 100644
index bb9a34bc62..0000000000
Binary files a/sound/direct_sound_samples/cries/stunky.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/stunky.wav b/sound/direct_sound_samples/cries/stunky.wav
new file mode 100644
index 0000000000..50faa537e6
Binary files /dev/null and b/sound/direct_sound_samples/cries/stunky.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 64ef66ef0c..0000000000
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 0000000000..48661df94e
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 10840f92c1..0000000000
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 0000000000..f675d8fdc4
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 e64c7ab4e4..0000000000
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 0000000000..613422881c
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 ecead99e99..0000000000
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 0000000000..b183f9ee94
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 445daa6129..0000000000
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 0000000000..04b1be882d
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 0940910ce3..0000000000
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 0000000000..f24d349307
Binary files /dev/null and b/sound/direct_sound_samples/cries/swablu.wav differ
diff --git a/sound/direct_sound_samples/cries/swadloon.aif b/sound/direct_sound_samples/cries/swadloon.aif
deleted file mode 100644
index d2606953b2..0000000000
Binary files a/sound/direct_sound_samples/cries/swadloon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/swadloon.wav b/sound/direct_sound_samples/cries/swadloon.wav
new file mode 100644
index 0000000000..c2d2ff2eb4
Binary files /dev/null and b/sound/direct_sound_samples/cries/swadloon.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 87e57c9b70..0000000000
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 0000000000..cfed979342
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 132844c705..0000000000
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 0000000000..a06f15992f
Binary files /dev/null and b/sound/direct_sound_samples/cries/swampert.wav differ
diff --git a/sound/direct_sound_samples/cries/swampert_mega.aif b/sound/direct_sound_samples/cries/swampert_mega.aif
deleted file mode 100644
index c19ec99835..0000000000
Binary files a/sound/direct_sound_samples/cries/swampert_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/swampert_mega.wav b/sound/direct_sound_samples/cries/swampert_mega.wav
new file mode 100644
index 0000000000..6abd498819
Binary files /dev/null and b/sound/direct_sound_samples/cries/swampert_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/swanna.aif b/sound/direct_sound_samples/cries/swanna.aif
deleted file mode 100644
index 9b2ef724f6..0000000000
Binary files a/sound/direct_sound_samples/cries/swanna.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/swanna.wav b/sound/direct_sound_samples/cries/swanna.wav
new file mode 100644
index 0000000000..f2390b1fc4
Binary files /dev/null and b/sound/direct_sound_samples/cries/swanna.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 a5bf66627d..0000000000
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 0000000000..637ff46540
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 7b2a08bf6f..0000000000
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 0000000000..93eafa458d
Binary files /dev/null and b/sound/direct_sound_samples/cries/swinub.wav differ
diff --git a/sound/direct_sound_samples/cries/swirlix.aif b/sound/direct_sound_samples/cries/swirlix.aif
deleted file mode 100644
index 89fa6ecd16..0000000000
Binary files a/sound/direct_sound_samples/cries/swirlix.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/swirlix.wav b/sound/direct_sound_samples/cries/swirlix.wav
new file mode 100644
index 0000000000..e1340299c5
Binary files /dev/null and b/sound/direct_sound_samples/cries/swirlix.wav differ
diff --git a/sound/direct_sound_samples/cries/swoobat.aif b/sound/direct_sound_samples/cries/swoobat.aif
deleted file mode 100644
index 32f8d406c5..0000000000
Binary files a/sound/direct_sound_samples/cries/swoobat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/swoobat.wav b/sound/direct_sound_samples/cries/swoobat.wav
new file mode 100644
index 0000000000..be69ad2430
Binary files /dev/null and b/sound/direct_sound_samples/cries/swoobat.wav differ
diff --git a/sound/direct_sound_samples/cries/sylveon.aif b/sound/direct_sound_samples/cries/sylveon.aif
deleted file mode 100644
index 0ded5d19d1..0000000000
Binary files a/sound/direct_sound_samples/cries/sylveon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/sylveon.wav b/sound/direct_sound_samples/cries/sylveon.wav
new file mode 100644
index 0000000000..7652199061
Binary files /dev/null and b/sound/direct_sound_samples/cries/sylveon.wav differ
diff --git a/sound/direct_sound_samples/cries/tadbulb.aif b/sound/direct_sound_samples/cries/tadbulb.aif
deleted file mode 100644
index 4680059cde..0000000000
Binary files a/sound/direct_sound_samples/cries/tadbulb.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tadbulb.wav b/sound/direct_sound_samples/cries/tadbulb.wav
new file mode 100644
index 0000000000..42eec08df8
Binary files /dev/null and b/sound/direct_sound_samples/cries/tadbulb.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 c30cdb275b..0000000000
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 0000000000..9f1bb25f48
Binary files /dev/null and b/sound/direct_sound_samples/cries/taillow.wav differ
diff --git a/sound/direct_sound_samples/cries/talonflame.aif b/sound/direct_sound_samples/cries/talonflame.aif
deleted file mode 100644
index d16a4a2128..0000000000
Binary files a/sound/direct_sound_samples/cries/talonflame.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/talonflame.wav b/sound/direct_sound_samples/cries/talonflame.wav
new file mode 100644
index 0000000000..b418813d10
Binary files /dev/null and b/sound/direct_sound_samples/cries/talonflame.wav differ
diff --git a/sound/direct_sound_samples/cries/tandemaus.aif b/sound/direct_sound_samples/cries/tandemaus.aif
deleted file mode 100644
index c6aeb27e0c..0000000000
Binary files a/sound/direct_sound_samples/cries/tandemaus.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tandemaus.wav b/sound/direct_sound_samples/cries/tandemaus.wav
new file mode 100644
index 0000000000..88ddc17353
Binary files /dev/null and b/sound/direct_sound_samples/cries/tandemaus.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 e463f2b7e6..0000000000
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 0000000000..023a0362f9
Binary files /dev/null and b/sound/direct_sound_samples/cries/tangela.wav differ
diff --git a/sound/direct_sound_samples/cries/tangrowth.aif b/sound/direct_sound_samples/cries/tangrowth.aif
deleted file mode 100644
index 23e3d995b7..0000000000
Binary files a/sound/direct_sound_samples/cries/tangrowth.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tangrowth.wav b/sound/direct_sound_samples/cries/tangrowth.wav
new file mode 100644
index 0000000000..941a8d9d24
Binary files /dev/null and b/sound/direct_sound_samples/cries/tangrowth.wav differ
diff --git a/sound/direct_sound_samples/cries/tapu_bulu.aif b/sound/direct_sound_samples/cries/tapu_bulu.aif
deleted file mode 100644
index ab84791fa7..0000000000
Binary files a/sound/direct_sound_samples/cries/tapu_bulu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tapu_bulu.wav b/sound/direct_sound_samples/cries/tapu_bulu.wav
new file mode 100644
index 0000000000..45b7a0ff69
Binary files /dev/null and b/sound/direct_sound_samples/cries/tapu_bulu.wav differ
diff --git a/sound/direct_sound_samples/cries/tapu_fini.aif b/sound/direct_sound_samples/cries/tapu_fini.aif
deleted file mode 100644
index 301b0a70b8..0000000000
Binary files a/sound/direct_sound_samples/cries/tapu_fini.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tapu_fini.wav b/sound/direct_sound_samples/cries/tapu_fini.wav
new file mode 100644
index 0000000000..6a9a1fea48
Binary files /dev/null and b/sound/direct_sound_samples/cries/tapu_fini.wav differ
diff --git a/sound/direct_sound_samples/cries/tapu_koko.aif b/sound/direct_sound_samples/cries/tapu_koko.aif
deleted file mode 100644
index 2fae1a3b0b..0000000000
Binary files a/sound/direct_sound_samples/cries/tapu_koko.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tapu_koko.wav b/sound/direct_sound_samples/cries/tapu_koko.wav
new file mode 100644
index 0000000000..2f93829ee1
Binary files /dev/null and b/sound/direct_sound_samples/cries/tapu_koko.wav differ
diff --git a/sound/direct_sound_samples/cries/tapu_lele.aif b/sound/direct_sound_samples/cries/tapu_lele.aif
deleted file mode 100644
index c15bb31862..0000000000
Binary files a/sound/direct_sound_samples/cries/tapu_lele.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tapu_lele.wav b/sound/direct_sound_samples/cries/tapu_lele.wav
new file mode 100644
index 0000000000..6e93a9a4de
Binary files /dev/null and b/sound/direct_sound_samples/cries/tapu_lele.wav differ
diff --git a/sound/direct_sound_samples/cries/tarountula.aif b/sound/direct_sound_samples/cries/tarountula.aif
deleted file mode 100644
index d8d2438565..0000000000
Binary files a/sound/direct_sound_samples/cries/tarountula.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tarountula.wav b/sound/direct_sound_samples/cries/tarountula.wav
new file mode 100644
index 0000000000..13aa6c89f8
Binary files /dev/null and b/sound/direct_sound_samples/cries/tarountula.wav differ
diff --git a/sound/direct_sound_samples/cries/tatsugiri_curly.aif b/sound/direct_sound_samples/cries/tatsugiri_curly.aif
deleted file mode 100644
index 16c03553ab..0000000000
Binary files a/sound/direct_sound_samples/cries/tatsugiri_curly.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tatsugiri_curly.wav b/sound/direct_sound_samples/cries/tatsugiri_curly.wav
new file mode 100644
index 0000000000..c8eb9c8929
Binary files /dev/null and b/sound/direct_sound_samples/cries/tatsugiri_curly.wav differ
diff --git a/sound/direct_sound_samples/cries/tatsugiri_droopy.aif b/sound/direct_sound_samples/cries/tatsugiri_droopy.aif
deleted file mode 100644
index 20131039e5..0000000000
Binary files a/sound/direct_sound_samples/cries/tatsugiri_droopy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tatsugiri_droopy.wav b/sound/direct_sound_samples/cries/tatsugiri_droopy.wav
new file mode 100644
index 0000000000..999a846311
Binary files /dev/null and b/sound/direct_sound_samples/cries/tatsugiri_droopy.wav differ
diff --git a/sound/direct_sound_samples/cries/tatsugiri_stretchy.aif b/sound/direct_sound_samples/cries/tatsugiri_stretchy.aif
deleted file mode 100644
index 08e5680433..0000000000
Binary files a/sound/direct_sound_samples/cries/tatsugiri_stretchy.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tatsugiri_stretchy.wav b/sound/direct_sound_samples/cries/tatsugiri_stretchy.wav
new file mode 100644
index 0000000000..62653400ae
Binary files /dev/null and b/sound/direct_sound_samples/cries/tatsugiri_stretchy.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 1b4bdfa5c4..0000000000
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 0000000000..a982d052d9
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 19ba558c3b..0000000000
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 0000000000..adc9b80d9c
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 8918f25627..0000000000
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 0000000000..cd8f5afc7a
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 2497d178df..0000000000
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 0000000000..dfbc8c7f09
Binary files /dev/null and b/sound/direct_sound_samples/cries/tentacruel.wav differ
diff --git a/sound/direct_sound_samples/cries/tepig.aif b/sound/direct_sound_samples/cries/tepig.aif
deleted file mode 100644
index 45b7b4ecda..0000000000
Binary files a/sound/direct_sound_samples/cries/tepig.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tepig.wav b/sound/direct_sound_samples/cries/tepig.wav
new file mode 100644
index 0000000000..766107639e
Binary files /dev/null and b/sound/direct_sound_samples/cries/tepig.wav differ
diff --git a/sound/direct_sound_samples/cries/terapagos.aif b/sound/direct_sound_samples/cries/terapagos.aif
deleted file mode 100644
index a99810cca9..0000000000
Binary files a/sound/direct_sound_samples/cries/terapagos.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/terapagos.wav b/sound/direct_sound_samples/cries/terapagos.wav
new file mode 100644
index 0000000000..bbda64cb64
Binary files /dev/null and b/sound/direct_sound_samples/cries/terapagos.wav differ
diff --git a/sound/direct_sound_samples/cries/terrakion.aif b/sound/direct_sound_samples/cries/terrakion.aif
deleted file mode 100644
index e567be0f1e..0000000000
Binary files a/sound/direct_sound_samples/cries/terrakion.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/terrakion.wav b/sound/direct_sound_samples/cries/terrakion.wav
new file mode 100644
index 0000000000..ec3d1e52a6
Binary files /dev/null and b/sound/direct_sound_samples/cries/terrakion.wav differ
diff --git a/sound/direct_sound_samples/cries/thievul.aif b/sound/direct_sound_samples/cries/thievul.aif
deleted file mode 100644
index 8bf63fd888..0000000000
Binary files a/sound/direct_sound_samples/cries/thievul.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/thievul.wav b/sound/direct_sound_samples/cries/thievul.wav
new file mode 100644
index 0000000000..2a3fc4e49c
Binary files /dev/null and b/sound/direct_sound_samples/cries/thievul.wav differ
diff --git a/sound/direct_sound_samples/cries/throh.aif b/sound/direct_sound_samples/cries/throh.aif
deleted file mode 100644
index eeeba64e4b..0000000000
Binary files a/sound/direct_sound_samples/cries/throh.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/throh.wav b/sound/direct_sound_samples/cries/throh.wav
new file mode 100644
index 0000000000..9568bd7ca1
Binary files /dev/null and b/sound/direct_sound_samples/cries/throh.wav differ
diff --git a/sound/direct_sound_samples/cries/thundurus_incarnate.aif b/sound/direct_sound_samples/cries/thundurus_incarnate.aif
deleted file mode 100644
index 8b1c81b9f9..0000000000
Binary files a/sound/direct_sound_samples/cries/thundurus_incarnate.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/thundurus_incarnate.wav b/sound/direct_sound_samples/cries/thundurus_incarnate.wav
new file mode 100644
index 0000000000..bee2249eef
Binary files /dev/null and b/sound/direct_sound_samples/cries/thundurus_incarnate.wav differ
diff --git a/sound/direct_sound_samples/cries/thundurus_therian.aif b/sound/direct_sound_samples/cries/thundurus_therian.aif
deleted file mode 100644
index f5ac69f177..0000000000
Binary files a/sound/direct_sound_samples/cries/thundurus_therian.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/thundurus_therian.wav b/sound/direct_sound_samples/cries/thundurus_therian.wav
new file mode 100644
index 0000000000..e31bda03bc
Binary files /dev/null and b/sound/direct_sound_samples/cries/thundurus_therian.wav differ
diff --git a/sound/direct_sound_samples/cries/thwackey.aif b/sound/direct_sound_samples/cries/thwackey.aif
deleted file mode 100644
index 579df5c965..0000000000
Binary files a/sound/direct_sound_samples/cries/thwackey.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/thwackey.wav b/sound/direct_sound_samples/cries/thwackey.wav
new file mode 100644
index 0000000000..d91325a387
Binary files /dev/null and b/sound/direct_sound_samples/cries/thwackey.wav differ
diff --git a/sound/direct_sound_samples/cries/timburr.aif b/sound/direct_sound_samples/cries/timburr.aif
deleted file mode 100644
index 49edb74efb..0000000000
Binary files a/sound/direct_sound_samples/cries/timburr.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/timburr.wav b/sound/direct_sound_samples/cries/timburr.wav
new file mode 100644
index 0000000000..4a332408a1
Binary files /dev/null and b/sound/direct_sound_samples/cries/timburr.wav differ
diff --git a/sound/direct_sound_samples/cries/ting_lu.aif b/sound/direct_sound_samples/cries/ting_lu.aif
deleted file mode 100644
index a4a5ed2118..0000000000
Binary files a/sound/direct_sound_samples/cries/ting_lu.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ting_lu.wav b/sound/direct_sound_samples/cries/ting_lu.wav
new file mode 100644
index 0000000000..5f262d014e
Binary files /dev/null and b/sound/direct_sound_samples/cries/ting_lu.wav differ
diff --git a/sound/direct_sound_samples/cries/tinkatink.aif b/sound/direct_sound_samples/cries/tinkatink.aif
deleted file mode 100644
index a6229c1338..0000000000
Binary files a/sound/direct_sound_samples/cries/tinkatink.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tinkatink.wav b/sound/direct_sound_samples/cries/tinkatink.wav
new file mode 100644
index 0000000000..e20cf33933
Binary files /dev/null and b/sound/direct_sound_samples/cries/tinkatink.wav differ
diff --git a/sound/direct_sound_samples/cries/tinkaton.aif b/sound/direct_sound_samples/cries/tinkaton.aif
deleted file mode 100644
index fd88cb8459..0000000000
Binary files a/sound/direct_sound_samples/cries/tinkaton.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tinkaton.wav b/sound/direct_sound_samples/cries/tinkaton.wav
new file mode 100644
index 0000000000..eaac1993bd
Binary files /dev/null and b/sound/direct_sound_samples/cries/tinkaton.wav differ
diff --git a/sound/direct_sound_samples/cries/tinkatuff.aif b/sound/direct_sound_samples/cries/tinkatuff.aif
deleted file mode 100644
index aa096ef113..0000000000
Binary files a/sound/direct_sound_samples/cries/tinkatuff.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tinkatuff.wav b/sound/direct_sound_samples/cries/tinkatuff.wav
new file mode 100644
index 0000000000..e077d63a2d
Binary files /dev/null and b/sound/direct_sound_samples/cries/tinkatuff.wav differ
diff --git a/sound/direct_sound_samples/cries/tirtouga.aif b/sound/direct_sound_samples/cries/tirtouga.aif
deleted file mode 100644
index 2233557d22..0000000000
Binary files a/sound/direct_sound_samples/cries/tirtouga.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tirtouga.wav b/sound/direct_sound_samples/cries/tirtouga.wav
new file mode 100644
index 0000000000..c22f087842
Binary files /dev/null and b/sound/direct_sound_samples/cries/tirtouga.wav differ
diff --git a/sound/direct_sound_samples/cries/toedscool.aif b/sound/direct_sound_samples/cries/toedscool.aif
deleted file mode 100644
index a153ed4d87..0000000000
Binary files a/sound/direct_sound_samples/cries/toedscool.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/toedscool.wav b/sound/direct_sound_samples/cries/toedscool.wav
new file mode 100644
index 0000000000..21c119feec
Binary files /dev/null and b/sound/direct_sound_samples/cries/toedscool.wav differ
diff --git a/sound/direct_sound_samples/cries/toedscruel.aif b/sound/direct_sound_samples/cries/toedscruel.aif
deleted file mode 100644
index 1f2fade60c..0000000000
Binary files a/sound/direct_sound_samples/cries/toedscruel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/toedscruel.wav b/sound/direct_sound_samples/cries/toedscruel.wav
new file mode 100644
index 0000000000..7e1b4a6321
Binary files /dev/null and b/sound/direct_sound_samples/cries/toedscruel.wav differ
diff --git a/sound/direct_sound_samples/cries/togedemaru.aif b/sound/direct_sound_samples/cries/togedemaru.aif
deleted file mode 100644
index 366ce2be96..0000000000
Binary files a/sound/direct_sound_samples/cries/togedemaru.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/togedemaru.wav b/sound/direct_sound_samples/cries/togedemaru.wav
new file mode 100644
index 0000000000..7249f3eb6e
Binary files /dev/null and b/sound/direct_sound_samples/cries/togedemaru.wav differ
diff --git a/sound/direct_sound_samples/cries/togekiss.aif b/sound/direct_sound_samples/cries/togekiss.aif
deleted file mode 100644
index c66baeaf55..0000000000
Binary files a/sound/direct_sound_samples/cries/togekiss.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/togekiss.wav b/sound/direct_sound_samples/cries/togekiss.wav
new file mode 100644
index 0000000000..84ae1d7bc9
Binary files /dev/null and b/sound/direct_sound_samples/cries/togekiss.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 0785a662ab..0000000000
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 0000000000..e13355c554
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 f577120c6d..0000000000
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 0000000000..957a45dc94
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 3accc1b3c8..0000000000
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 0000000000..39a2522b32
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 b73d06ef5e..0000000000
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 0000000000..497e92af20
Binary files /dev/null and b/sound/direct_sound_samples/cries/torkoal.wav differ
diff --git a/sound/direct_sound_samples/cries/tornadus_incarnate.aif b/sound/direct_sound_samples/cries/tornadus_incarnate.aif
deleted file mode 100644
index b980ce2bb5..0000000000
Binary files a/sound/direct_sound_samples/cries/tornadus_incarnate.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tornadus_incarnate.wav b/sound/direct_sound_samples/cries/tornadus_incarnate.wav
new file mode 100644
index 0000000000..46c02fa112
Binary files /dev/null and b/sound/direct_sound_samples/cries/tornadus_incarnate.wav differ
diff --git a/sound/direct_sound_samples/cries/tornadus_therian.aif b/sound/direct_sound_samples/cries/tornadus_therian.aif
deleted file mode 100644
index a1d98062b6..0000000000
Binary files a/sound/direct_sound_samples/cries/tornadus_therian.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tornadus_therian.wav b/sound/direct_sound_samples/cries/tornadus_therian.wav
new file mode 100644
index 0000000000..3d6d421d2d
Binary files /dev/null and b/sound/direct_sound_samples/cries/tornadus_therian.wav differ
diff --git a/sound/direct_sound_samples/cries/torracat.aif b/sound/direct_sound_samples/cries/torracat.aif
deleted file mode 100644
index 44bb001375..0000000000
Binary files a/sound/direct_sound_samples/cries/torracat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/torracat.wav b/sound/direct_sound_samples/cries/torracat.wav
new file mode 100644
index 0000000000..fb8cf24c61
Binary files /dev/null and b/sound/direct_sound_samples/cries/torracat.wav differ
diff --git a/sound/direct_sound_samples/cries/torterra.aif b/sound/direct_sound_samples/cries/torterra.aif
deleted file mode 100644
index e659181e23..0000000000
Binary files a/sound/direct_sound_samples/cries/torterra.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/torterra.wav b/sound/direct_sound_samples/cries/torterra.wav
new file mode 100644
index 0000000000..3fdb2e6d12
Binary files /dev/null and b/sound/direct_sound_samples/cries/torterra.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 98fbb528be..0000000000
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 0000000000..93c0788473
Binary files /dev/null and b/sound/direct_sound_samples/cries/totodile.wav differ
diff --git a/sound/direct_sound_samples/cries/toucannon.aif b/sound/direct_sound_samples/cries/toucannon.aif
deleted file mode 100644
index 83a90bab9c..0000000000
Binary files a/sound/direct_sound_samples/cries/toucannon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/toucannon.wav b/sound/direct_sound_samples/cries/toucannon.wav
new file mode 100644
index 0000000000..f8b3938483
Binary files /dev/null and b/sound/direct_sound_samples/cries/toucannon.wav differ
diff --git a/sound/direct_sound_samples/cries/toxapex.aif b/sound/direct_sound_samples/cries/toxapex.aif
deleted file mode 100644
index 3369da2f70..0000000000
Binary files a/sound/direct_sound_samples/cries/toxapex.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/toxapex.wav b/sound/direct_sound_samples/cries/toxapex.wav
new file mode 100644
index 0000000000..a2e759b11d
Binary files /dev/null and b/sound/direct_sound_samples/cries/toxapex.wav differ
diff --git a/sound/direct_sound_samples/cries/toxel.aif b/sound/direct_sound_samples/cries/toxel.aif
deleted file mode 100644
index 0f917edddb..0000000000
Binary files a/sound/direct_sound_samples/cries/toxel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/toxel.wav b/sound/direct_sound_samples/cries/toxel.wav
new file mode 100644
index 0000000000..2f43210fab
Binary files /dev/null and b/sound/direct_sound_samples/cries/toxel.wav differ
diff --git a/sound/direct_sound_samples/cries/toxicroak.aif b/sound/direct_sound_samples/cries/toxicroak.aif
deleted file mode 100644
index ada83b0a2b..0000000000
Binary files a/sound/direct_sound_samples/cries/toxicroak.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/toxicroak.wav b/sound/direct_sound_samples/cries/toxicroak.wav
new file mode 100644
index 0000000000..5dd49163fe
Binary files /dev/null and b/sound/direct_sound_samples/cries/toxicroak.wav differ
diff --git a/sound/direct_sound_samples/cries/toxtricity_amped.aif b/sound/direct_sound_samples/cries/toxtricity_amped.aif
deleted file mode 100644
index 0775c8a049..0000000000
Binary files a/sound/direct_sound_samples/cries/toxtricity_amped.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/toxtricity_amped.wav b/sound/direct_sound_samples/cries/toxtricity_amped.wav
new file mode 100644
index 0000000000..236fc88417
Binary files /dev/null and b/sound/direct_sound_samples/cries/toxtricity_amped.wav differ
diff --git a/sound/direct_sound_samples/cries/toxtricity_low_key.aif b/sound/direct_sound_samples/cries/toxtricity_low_key.aif
deleted file mode 100644
index 57740d974d..0000000000
Binary files a/sound/direct_sound_samples/cries/toxtricity_low_key.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/toxtricity_low_key.wav b/sound/direct_sound_samples/cries/toxtricity_low_key.wav
new file mode 100644
index 0000000000..6c1bb8a111
Binary files /dev/null and b/sound/direct_sound_samples/cries/toxtricity_low_key.wav differ
diff --git a/sound/direct_sound_samples/cries/tranquill.aif b/sound/direct_sound_samples/cries/tranquill.aif
deleted file mode 100644
index 6a4e8a7661..0000000000
Binary files a/sound/direct_sound_samples/cries/tranquill.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tranquill.wav b/sound/direct_sound_samples/cries/tranquill.wav
new file mode 100644
index 0000000000..d8ade54fc1
Binary files /dev/null and b/sound/direct_sound_samples/cries/tranquill.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 cc27653fd4..0000000000
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 0000000000..5cad4ad23e
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 e9a47979e0..0000000000
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 0000000000..0c982f8408
Binary files /dev/null and b/sound/direct_sound_samples/cries/treecko.wav differ
diff --git a/sound/direct_sound_samples/cries/trevenant.aif b/sound/direct_sound_samples/cries/trevenant.aif
deleted file mode 100644
index 018a80e8c2..0000000000
Binary files a/sound/direct_sound_samples/cries/trevenant.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/trevenant.wav b/sound/direct_sound_samples/cries/trevenant.wav
new file mode 100644
index 0000000000..da2efb4594
Binary files /dev/null and b/sound/direct_sound_samples/cries/trevenant.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 81046fe1cf..0000000000
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 0000000000..55de362aa7
Binary files /dev/null and b/sound/direct_sound_samples/cries/tropius.wav differ
diff --git a/sound/direct_sound_samples/cries/trubbish.aif b/sound/direct_sound_samples/cries/trubbish.aif
deleted file mode 100644
index 09c1aac572..0000000000
Binary files a/sound/direct_sound_samples/cries/trubbish.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/trubbish.wav b/sound/direct_sound_samples/cries/trubbish.wav
new file mode 100644
index 0000000000..5ee879913b
Binary files /dev/null and b/sound/direct_sound_samples/cries/trubbish.wav differ
diff --git a/sound/direct_sound_samples/cries/trumbeak.aif b/sound/direct_sound_samples/cries/trumbeak.aif
deleted file mode 100644
index c6e477c401..0000000000
Binary files a/sound/direct_sound_samples/cries/trumbeak.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/trumbeak.wav b/sound/direct_sound_samples/cries/trumbeak.wav
new file mode 100644
index 0000000000..389e543a1f
Binary files /dev/null and b/sound/direct_sound_samples/cries/trumbeak.wav differ
diff --git a/sound/direct_sound_samples/cries/tsareena.aif b/sound/direct_sound_samples/cries/tsareena.aif
deleted file mode 100644
index bff64b0f3f..0000000000
Binary files a/sound/direct_sound_samples/cries/tsareena.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tsareena.wav b/sound/direct_sound_samples/cries/tsareena.wav
new file mode 100644
index 0000000000..f062986677
Binary files /dev/null and b/sound/direct_sound_samples/cries/tsareena.wav differ
diff --git a/sound/direct_sound_samples/cries/turtonator.aif b/sound/direct_sound_samples/cries/turtonator.aif
deleted file mode 100644
index b5d27b630f..0000000000
Binary files a/sound/direct_sound_samples/cries/turtonator.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/turtonator.wav b/sound/direct_sound_samples/cries/turtonator.wav
new file mode 100644
index 0000000000..0bc247246a
Binary files /dev/null and b/sound/direct_sound_samples/cries/turtonator.wav differ
diff --git a/sound/direct_sound_samples/cries/turtwig.aif b/sound/direct_sound_samples/cries/turtwig.aif
deleted file mode 100644
index a2e4ad60b3..0000000000
Binary files a/sound/direct_sound_samples/cries/turtwig.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/turtwig.wav b/sound/direct_sound_samples/cries/turtwig.wav
new file mode 100644
index 0000000000..afa0b43969
Binary files /dev/null and b/sound/direct_sound_samples/cries/turtwig.wav differ
diff --git a/sound/direct_sound_samples/cries/tympole.aif b/sound/direct_sound_samples/cries/tympole.aif
deleted file mode 100644
index d643216736..0000000000
Binary files a/sound/direct_sound_samples/cries/tympole.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tympole.wav b/sound/direct_sound_samples/cries/tympole.wav
new file mode 100644
index 0000000000..f8455239eb
Binary files /dev/null and b/sound/direct_sound_samples/cries/tympole.wav differ
diff --git a/sound/direct_sound_samples/cries/tynamo.aif b/sound/direct_sound_samples/cries/tynamo.aif
deleted file mode 100644
index ca9e2962fc..0000000000
Binary files a/sound/direct_sound_samples/cries/tynamo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tynamo.wav b/sound/direct_sound_samples/cries/tynamo.wav
new file mode 100644
index 0000000000..031a336a6c
Binary files /dev/null and b/sound/direct_sound_samples/cries/tynamo.wav differ
diff --git a/sound/direct_sound_samples/cries/type_null.aif b/sound/direct_sound_samples/cries/type_null.aif
deleted file mode 100644
index 6b6be2dcfb..0000000000
Binary files a/sound/direct_sound_samples/cries/type_null.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/type_null.wav b/sound/direct_sound_samples/cries/type_null.wav
new file mode 100644
index 0000000000..9850d88e4a
Binary files /dev/null and b/sound/direct_sound_samples/cries/type_null.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 cc993c8052..0000000000
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 0000000000..f1759989d7
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 3572da7667..0000000000
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 0000000000..5bec5f7279
Binary files /dev/null and b/sound/direct_sound_samples/cries/tyranitar.wav differ
diff --git a/sound/direct_sound_samples/cries/tyranitar_mega.aif b/sound/direct_sound_samples/cries/tyranitar_mega.aif
deleted file mode 100644
index 020118b388..0000000000
Binary files a/sound/direct_sound_samples/cries/tyranitar_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tyranitar_mega.wav b/sound/direct_sound_samples/cries/tyranitar_mega.wav
new file mode 100644
index 0000000000..dedb9d2560
Binary files /dev/null and b/sound/direct_sound_samples/cries/tyranitar_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/tyrantrum.aif b/sound/direct_sound_samples/cries/tyrantrum.aif
deleted file mode 100644
index 88e9506129..0000000000
Binary files a/sound/direct_sound_samples/cries/tyrantrum.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tyrantrum.wav b/sound/direct_sound_samples/cries/tyrantrum.wav
new file mode 100644
index 0000000000..766cbab204
Binary files /dev/null and b/sound/direct_sound_samples/cries/tyrantrum.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 7caea851b3..0000000000
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 0000000000..46d032063d
Binary files /dev/null and b/sound/direct_sound_samples/cries/tyrogue.wav differ
diff --git a/sound/direct_sound_samples/cries/tyrunt.aif b/sound/direct_sound_samples/cries/tyrunt.aif
deleted file mode 100644
index e693736005..0000000000
Binary files a/sound/direct_sound_samples/cries/tyrunt.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/tyrunt.wav b/sound/direct_sound_samples/cries/tyrunt.wav
new file mode 100644
index 0000000000..9cb0531dad
Binary files /dev/null and b/sound/direct_sound_samples/cries/tyrunt.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 93c739dd74..0000000000
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 0000000000..48f62064af
Binary files /dev/null and b/sound/direct_sound_samples/cries/umbreon.wav differ
diff --git a/sound/direct_sound_samples/cries/uncomp_klefki.aif b/sound/direct_sound_samples/cries/uncomp_klefki.aif
deleted file mode 100644
index c059b56628..0000000000
Binary files a/sound/direct_sound_samples/cries/uncomp_klefki.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/uncomp_klefki.wav b/sound/direct_sound_samples/cries/uncomp_klefki.wav
new file mode 100644
index 0000000000..9e606820eb
Binary files /dev/null and b/sound/direct_sound_samples/cries/uncomp_klefki.wav differ
diff --git a/sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.aif b/sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.aif
deleted file mode 100644
index aa5fce23b6..0000000000
Binary files a/sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.wav b/sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.wav
new file mode 100644
index 0000000000..912a9f3831
Binary files /dev/null and b/sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.wav differ
diff --git a/sound/direct_sound_samples/cries/unfezant.aif b/sound/direct_sound_samples/cries/unfezant.aif
deleted file mode 100644
index 1fde88bf0e..0000000000
Binary files a/sound/direct_sound_samples/cries/unfezant.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/unfezant.wav b/sound/direct_sound_samples/cries/unfezant.wav
new file mode 100644
index 0000000000..fa21282be0
Binary files /dev/null and b/sound/direct_sound_samples/cries/unfezant.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 0b3edf577f..0000000000
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 0000000000..1956ecef75
Binary files /dev/null and b/sound/direct_sound_samples/cries/unown.wav 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 0000000000..12c3d8640f
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.wav b/sound/direct_sound_samples/cries/unused_268.wav
new file mode 100644
index 0000000000..3501b24ef8
Binary files /dev/null and b/sound/direct_sound_samples/cries/unused_268.wav differ
diff --git a/sound/direct_sound_samples/cries/ursaluna.aif b/sound/direct_sound_samples/cries/ursaluna.aif
deleted file mode 100644
index 7ce14c630e..0000000000
Binary files a/sound/direct_sound_samples/cries/ursaluna.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/ursaluna.wav b/sound/direct_sound_samples/cries/ursaluna.wav
new file mode 100644
index 0000000000..b6e99a6015
Binary files /dev/null and b/sound/direct_sound_samples/cries/ursaluna.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 7837ba6597..0000000000
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 0000000000..b3d4a99cb7
Binary files /dev/null and b/sound/direct_sound_samples/cries/ursaring.wav differ
diff --git a/sound/direct_sound_samples/cries/urshifu_rapid_strike.aif b/sound/direct_sound_samples/cries/urshifu_rapid_strike.aif
deleted file mode 100644
index 8ac12bc909..0000000000
Binary files a/sound/direct_sound_samples/cries/urshifu_rapid_strike.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/urshifu_rapid_strike.wav b/sound/direct_sound_samples/cries/urshifu_rapid_strike.wav
new file mode 100644
index 0000000000..74a7f35206
Binary files /dev/null and b/sound/direct_sound_samples/cries/urshifu_rapid_strike.wav differ
diff --git a/sound/direct_sound_samples/cries/urshifu_single_strike.aif b/sound/direct_sound_samples/cries/urshifu_single_strike.aif
deleted file mode 100644
index 7dec47854a..0000000000
Binary files a/sound/direct_sound_samples/cries/urshifu_single_strike.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/urshifu_single_strike.wav b/sound/direct_sound_samples/cries/urshifu_single_strike.wav
new file mode 100644
index 0000000000..549e5cd2dc
Binary files /dev/null and b/sound/direct_sound_samples/cries/urshifu_single_strike.wav differ
diff --git a/sound/direct_sound_samples/cries/uxie.aif b/sound/direct_sound_samples/cries/uxie.aif
deleted file mode 100644
index da67cfc996..0000000000
Binary files a/sound/direct_sound_samples/cries/uxie.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/uxie.wav b/sound/direct_sound_samples/cries/uxie.wav
new file mode 100644
index 0000000000..336ff25f58
Binary files /dev/null and b/sound/direct_sound_samples/cries/uxie.wav differ
diff --git a/sound/direct_sound_samples/cries/vanillish.aif b/sound/direct_sound_samples/cries/vanillish.aif
deleted file mode 100644
index 625921a24b..0000000000
Binary files a/sound/direct_sound_samples/cries/vanillish.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vanillish.wav b/sound/direct_sound_samples/cries/vanillish.wav
new file mode 100644
index 0000000000..29f2e853c4
Binary files /dev/null and b/sound/direct_sound_samples/cries/vanillish.wav differ
diff --git a/sound/direct_sound_samples/cries/vanillite.aif b/sound/direct_sound_samples/cries/vanillite.aif
deleted file mode 100644
index 03d25f9615..0000000000
Binary files a/sound/direct_sound_samples/cries/vanillite.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vanillite.wav b/sound/direct_sound_samples/cries/vanillite.wav
new file mode 100644
index 0000000000..db303dd8e7
Binary files /dev/null and b/sound/direct_sound_samples/cries/vanillite.wav differ
diff --git a/sound/direct_sound_samples/cries/vanilluxe.aif b/sound/direct_sound_samples/cries/vanilluxe.aif
deleted file mode 100644
index e515359ee0..0000000000
Binary files a/sound/direct_sound_samples/cries/vanilluxe.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vanilluxe.wav b/sound/direct_sound_samples/cries/vanilluxe.wav
new file mode 100644
index 0000000000..d75e877475
Binary files /dev/null and b/sound/direct_sound_samples/cries/vanilluxe.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 3c9bf7ee8b..0000000000
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 0000000000..8ec3094851
Binary files /dev/null and b/sound/direct_sound_samples/cries/vaporeon.wav differ
diff --git a/sound/direct_sound_samples/cries/varoom.aif b/sound/direct_sound_samples/cries/varoom.aif
deleted file mode 100644
index 731bdce2d6..0000000000
Binary files a/sound/direct_sound_samples/cries/varoom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/varoom.wav b/sound/direct_sound_samples/cries/varoom.wav
new file mode 100644
index 0000000000..1774dd3dc4
Binary files /dev/null and b/sound/direct_sound_samples/cries/varoom.wav differ
diff --git a/sound/direct_sound_samples/cries/veluza.aif b/sound/direct_sound_samples/cries/veluza.aif
deleted file mode 100644
index d76ed74b66..0000000000
Binary files a/sound/direct_sound_samples/cries/veluza.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/veluza.wav b/sound/direct_sound_samples/cries/veluza.wav
new file mode 100644
index 0000000000..731b664ac3
Binary files /dev/null and b/sound/direct_sound_samples/cries/veluza.wav differ
diff --git a/sound/direct_sound_samples/cries/venipede.aif b/sound/direct_sound_samples/cries/venipede.aif
deleted file mode 100644
index d1c1e04e7b..0000000000
Binary files a/sound/direct_sound_samples/cries/venipede.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/venipede.wav b/sound/direct_sound_samples/cries/venipede.wav
new file mode 100644
index 0000000000..c1b88a3e25
Binary files /dev/null and b/sound/direct_sound_samples/cries/venipede.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 eb4ad02af7..0000000000
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 0000000000..ab5179df66
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 5bf36808c4..0000000000
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 0000000000..450c2bb222
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 91386c177d..0000000000
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 0000000000..fdd299ae27
Binary files /dev/null and b/sound/direct_sound_samples/cries/venusaur.wav differ
diff --git a/sound/direct_sound_samples/cries/venusaur_mega.aif b/sound/direct_sound_samples/cries/venusaur_mega.aif
deleted file mode 100644
index cec11aaae2..0000000000
Binary files a/sound/direct_sound_samples/cries/venusaur_mega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/venusaur_mega.wav b/sound/direct_sound_samples/cries/venusaur_mega.wav
new file mode 100644
index 0000000000..e8e01ee0c3
Binary files /dev/null and b/sound/direct_sound_samples/cries/venusaur_mega.wav differ
diff --git a/sound/direct_sound_samples/cries/vespiquen.aif b/sound/direct_sound_samples/cries/vespiquen.aif
deleted file mode 100644
index c86e9a403b..0000000000
Binary files a/sound/direct_sound_samples/cries/vespiquen.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vespiquen.wav b/sound/direct_sound_samples/cries/vespiquen.wav
new file mode 100644
index 0000000000..a1fdfe215c
Binary files /dev/null and b/sound/direct_sound_samples/cries/vespiquen.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 7e0a13c6df..0000000000
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 0000000000..5370104875
Binary files /dev/null and b/sound/direct_sound_samples/cries/vibrava.wav differ
diff --git a/sound/direct_sound_samples/cries/victini.aif b/sound/direct_sound_samples/cries/victini.aif
deleted file mode 100644
index cada6fbf07..0000000000
Binary files a/sound/direct_sound_samples/cries/victini.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/victini.wav b/sound/direct_sound_samples/cries/victini.wav
new file mode 100644
index 0000000000..381efef3f6
Binary files /dev/null and b/sound/direct_sound_samples/cries/victini.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 62bb048d4c..0000000000
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 0000000000..19f11202f9
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 8e3560ab1d..0000000000
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 0000000000..5d21bd23b0
Binary files /dev/null and b/sound/direct_sound_samples/cries/vigoroth.wav differ
diff --git a/sound/direct_sound_samples/cries/vikavolt.aif b/sound/direct_sound_samples/cries/vikavolt.aif
deleted file mode 100644
index badd95c3c5..0000000000
Binary files a/sound/direct_sound_samples/cries/vikavolt.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vikavolt.wav b/sound/direct_sound_samples/cries/vikavolt.wav
new file mode 100644
index 0000000000..ac1d363120
Binary files /dev/null and b/sound/direct_sound_samples/cries/vikavolt.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 e190e21511..0000000000
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 0000000000..7189097b18
Binary files /dev/null and b/sound/direct_sound_samples/cries/vileplume.wav differ
diff --git a/sound/direct_sound_samples/cries/virizion.aif b/sound/direct_sound_samples/cries/virizion.aif
deleted file mode 100644
index 7f1d8292b0..0000000000
Binary files a/sound/direct_sound_samples/cries/virizion.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/virizion.wav b/sound/direct_sound_samples/cries/virizion.wav
new file mode 100644
index 0000000000..4254006b8c
Binary files /dev/null and b/sound/direct_sound_samples/cries/virizion.wav differ
diff --git a/sound/direct_sound_samples/cries/vivillon.aif b/sound/direct_sound_samples/cries/vivillon.aif
deleted file mode 100644
index bf7474dd95..0000000000
Binary files a/sound/direct_sound_samples/cries/vivillon.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vivillon.wav b/sound/direct_sound_samples/cries/vivillon.wav
new file mode 100644
index 0000000000..e681a1011a
Binary files /dev/null and b/sound/direct_sound_samples/cries/vivillon.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 8d73e2c21d..0000000000
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 0000000000..ae6375b95f
Binary files /dev/null and b/sound/direct_sound_samples/cries/volbeat.wav differ
diff --git a/sound/direct_sound_samples/cries/volcanion.aif b/sound/direct_sound_samples/cries/volcanion.aif
deleted file mode 100644
index 72c78807a6..0000000000
Binary files a/sound/direct_sound_samples/cries/volcanion.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/volcanion.wav b/sound/direct_sound_samples/cries/volcanion.wav
new file mode 100644
index 0000000000..47b59afb3e
Binary files /dev/null and b/sound/direct_sound_samples/cries/volcanion.wav differ
diff --git a/sound/direct_sound_samples/cries/volcarona.aif b/sound/direct_sound_samples/cries/volcarona.aif
deleted file mode 100644
index f62e6e9e38..0000000000
Binary files a/sound/direct_sound_samples/cries/volcarona.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/volcarona.wav b/sound/direct_sound_samples/cries/volcarona.wav
new file mode 100644
index 0000000000..53b0fde6bc
Binary files /dev/null and b/sound/direct_sound_samples/cries/volcarona.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 832429cbf2..0000000000
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 0000000000..e303a3db73
Binary files /dev/null and b/sound/direct_sound_samples/cries/voltorb.wav differ
diff --git a/sound/direct_sound_samples/cries/vullaby.aif b/sound/direct_sound_samples/cries/vullaby.aif
deleted file mode 100644
index 49d0648e9f..0000000000
Binary files a/sound/direct_sound_samples/cries/vullaby.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/vullaby.wav b/sound/direct_sound_samples/cries/vullaby.wav
new file mode 100644
index 0000000000..7be4f722c6
Binary files /dev/null and b/sound/direct_sound_samples/cries/vullaby.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 32b149999e..0000000000
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 0000000000..71d58b0a72
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 8bada495e4..0000000000
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 0000000000..ef43c515fd
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 ea0f553cf8..0000000000
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 0000000000..a7e9d89f69
Binary files /dev/null and b/sound/direct_sound_samples/cries/wailord.wav differ
diff --git a/sound/direct_sound_samples/cries/walking_wake.aif b/sound/direct_sound_samples/cries/walking_wake.aif
deleted file mode 100644
index 88518dd200..0000000000
Binary files a/sound/direct_sound_samples/cries/walking_wake.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/walking_wake.wav b/sound/direct_sound_samples/cries/walking_wake.wav
new file mode 100644
index 0000000000..ea856c0cf7
Binary files /dev/null and b/sound/direct_sound_samples/cries/walking_wake.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 2843617fbf..0000000000
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 0000000000..cbc5fa8cb4
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 de2aa25480..0000000000
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 0000000000..950f87d74b
Binary files /dev/null and b/sound/direct_sound_samples/cries/wartortle.wav differ
diff --git a/sound/direct_sound_samples/cries/watchog.aif b/sound/direct_sound_samples/cries/watchog.aif
deleted file mode 100644
index df08e7a296..0000000000
Binary files a/sound/direct_sound_samples/cries/watchog.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/watchog.wav b/sound/direct_sound_samples/cries/watchog.wav
new file mode 100644
index 0000000000..f69adc8aef
Binary files /dev/null and b/sound/direct_sound_samples/cries/watchog.wav differ
diff --git a/sound/direct_sound_samples/cries/wattrel.aif b/sound/direct_sound_samples/cries/wattrel.aif
deleted file mode 100644
index 361ead8356..0000000000
Binary files a/sound/direct_sound_samples/cries/wattrel.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wattrel.wav b/sound/direct_sound_samples/cries/wattrel.wav
new file mode 100644
index 0000000000..b803ef4042
Binary files /dev/null and b/sound/direct_sound_samples/cries/wattrel.wav differ
diff --git a/sound/direct_sound_samples/cries/weavile.aif b/sound/direct_sound_samples/cries/weavile.aif
deleted file mode 100644
index 5bfb5019df..0000000000
Binary files a/sound/direct_sound_samples/cries/weavile.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/weavile.wav b/sound/direct_sound_samples/cries/weavile.wav
new file mode 100644
index 0000000000..36b8875373
Binary files /dev/null and b/sound/direct_sound_samples/cries/weavile.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 ac5b0eb765..0000000000
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 0000000000..6a209fede1
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 0b20df8089..0000000000
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 0000000000..48f7225cf5
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 b7b8d93da5..0000000000
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 0000000000..b5a7b189d0
Binary files /dev/null and b/sound/direct_sound_samples/cries/weezing.wav differ
diff --git a/sound/direct_sound_samples/cries/whimsicott.aif b/sound/direct_sound_samples/cries/whimsicott.aif
deleted file mode 100644
index 873d8a1b41..0000000000
Binary files a/sound/direct_sound_samples/cries/whimsicott.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/whimsicott.wav b/sound/direct_sound_samples/cries/whimsicott.wav
new file mode 100644
index 0000000000..712aab7154
Binary files /dev/null and b/sound/direct_sound_samples/cries/whimsicott.wav differ
diff --git a/sound/direct_sound_samples/cries/whirlipede.aif b/sound/direct_sound_samples/cries/whirlipede.aif
deleted file mode 100644
index c9b64404b8..0000000000
Binary files a/sound/direct_sound_samples/cries/whirlipede.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/whirlipede.wav b/sound/direct_sound_samples/cries/whirlipede.wav
new file mode 100644
index 0000000000..c468feb0f5
Binary files /dev/null and b/sound/direct_sound_samples/cries/whirlipede.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 71cd9fd00a..0000000000
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 0000000000..ebec93d188
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 c5a2369ba9..0000000000
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 0000000000..af3e3e0e31
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 07fcc8ebd3..0000000000
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 0000000000..a6b632a6ce
Binary files /dev/null and b/sound/direct_sound_samples/cries/wigglytuff.wav differ
diff --git a/sound/direct_sound_samples/cries/wiglett.aif b/sound/direct_sound_samples/cries/wiglett.aif
deleted file mode 100644
index d377681aef..0000000000
Binary files a/sound/direct_sound_samples/cries/wiglett.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wiglett.wav b/sound/direct_sound_samples/cries/wiglett.wav
new file mode 100644
index 0000000000..c555b6035e
Binary files /dev/null and b/sound/direct_sound_samples/cries/wiglett.wav differ
diff --git a/sound/direct_sound_samples/cries/wimpod.aif b/sound/direct_sound_samples/cries/wimpod.aif
deleted file mode 100644
index 5b75964096..0000000000
Binary files a/sound/direct_sound_samples/cries/wimpod.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wimpod.wav b/sound/direct_sound_samples/cries/wimpod.wav
new file mode 100644
index 0000000000..36b28c501d
Binary files /dev/null and b/sound/direct_sound_samples/cries/wimpod.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 49b04d9d96..0000000000
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 0000000000..4e158409ad
Binary files /dev/null and b/sound/direct_sound_samples/cries/wingull.wav differ
diff --git a/sound/direct_sound_samples/cries/wishiwashi_school.aif b/sound/direct_sound_samples/cries/wishiwashi_school.aif
deleted file mode 100644
index e63ce913a2..0000000000
Binary files a/sound/direct_sound_samples/cries/wishiwashi_school.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wishiwashi_school.wav b/sound/direct_sound_samples/cries/wishiwashi_school.wav
new file mode 100644
index 0000000000..ef49075f1c
Binary files /dev/null and b/sound/direct_sound_samples/cries/wishiwashi_school.wav differ
diff --git a/sound/direct_sound_samples/cries/wishiwashi_solo.aif b/sound/direct_sound_samples/cries/wishiwashi_solo.aif
deleted file mode 100644
index e6e26b75c6..0000000000
Binary files a/sound/direct_sound_samples/cries/wishiwashi_solo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wishiwashi_solo.wav b/sound/direct_sound_samples/cries/wishiwashi_solo.wav
new file mode 100644
index 0000000000..456a7c74f8
Binary files /dev/null and b/sound/direct_sound_samples/cries/wishiwashi_solo.wav differ
diff --git a/sound/direct_sound_samples/cries/wo_chien.aif b/sound/direct_sound_samples/cries/wo_chien.aif
deleted file mode 100644
index f50bd73e8d..0000000000
Binary files a/sound/direct_sound_samples/cries/wo_chien.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wo_chien.wav b/sound/direct_sound_samples/cries/wo_chien.wav
new file mode 100644
index 0000000000..562665fee3
Binary files /dev/null and b/sound/direct_sound_samples/cries/wo_chien.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 8e50da47bb..0000000000
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 0000000000..17e7464ad9
Binary files /dev/null and b/sound/direct_sound_samples/cries/wobbuffet.wav differ
diff --git a/sound/direct_sound_samples/cries/woobat.aif b/sound/direct_sound_samples/cries/woobat.aif
deleted file mode 100644
index db8ae140e2..0000000000
Binary files a/sound/direct_sound_samples/cries/woobat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/woobat.wav b/sound/direct_sound_samples/cries/woobat.wav
new file mode 100644
index 0000000000..e8d3523e83
Binary files /dev/null and b/sound/direct_sound_samples/cries/woobat.wav differ
diff --git a/sound/direct_sound_samples/cries/wooloo.aif b/sound/direct_sound_samples/cries/wooloo.aif
deleted file mode 100644
index db1360386c..0000000000
Binary files a/sound/direct_sound_samples/cries/wooloo.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wooloo.wav b/sound/direct_sound_samples/cries/wooloo.wav
new file mode 100644
index 0000000000..adc8ad4ade
Binary files /dev/null and b/sound/direct_sound_samples/cries/wooloo.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 d4b9ea1b4a..0000000000
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 0000000000..83c7e589df
Binary files /dev/null and b/sound/direct_sound_samples/cries/wooper.wav differ
diff --git a/sound/direct_sound_samples/cries/wormadam.aif b/sound/direct_sound_samples/cries/wormadam.aif
deleted file mode 100644
index 3645108206..0000000000
Binary files a/sound/direct_sound_samples/cries/wormadam.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wormadam.wav b/sound/direct_sound_samples/cries/wormadam.wav
new file mode 100644
index 0000000000..f03247f1dd
Binary files /dev/null and b/sound/direct_sound_samples/cries/wormadam.wav differ
diff --git a/sound/direct_sound_samples/cries/wugtrio.aif b/sound/direct_sound_samples/cries/wugtrio.aif
deleted file mode 100644
index 6c92cae873..0000000000
Binary files a/sound/direct_sound_samples/cries/wugtrio.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wugtrio.wav b/sound/direct_sound_samples/cries/wugtrio.wav
new file mode 100644
index 0000000000..d885b422f3
Binary files /dev/null and b/sound/direct_sound_samples/cries/wugtrio.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 1754d7e2b7..0000000000
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 0000000000..b58d5007cf
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 ddd289f9a4..0000000000
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 0000000000..6febe26aa4
Binary files /dev/null and b/sound/direct_sound_samples/cries/wynaut.wav differ
diff --git a/sound/direct_sound_samples/cries/wyrdeer.aif b/sound/direct_sound_samples/cries/wyrdeer.aif
deleted file mode 100644
index 597df62ab8..0000000000
Binary files a/sound/direct_sound_samples/cries/wyrdeer.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/wyrdeer.wav b/sound/direct_sound_samples/cries/wyrdeer.wav
new file mode 100644
index 0000000000..50bba2a433
Binary files /dev/null and b/sound/direct_sound_samples/cries/wyrdeer.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 da4afe62ca..0000000000
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 0000000000..7c84f65723
Binary files /dev/null and b/sound/direct_sound_samples/cries/xatu.wav differ
diff --git a/sound/direct_sound_samples/cries/xerneas.aif b/sound/direct_sound_samples/cries/xerneas.aif
deleted file mode 100644
index 4745e8e685..0000000000
Binary files a/sound/direct_sound_samples/cries/xerneas.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/xerneas.wav b/sound/direct_sound_samples/cries/xerneas.wav
new file mode 100644
index 0000000000..f08dd0ca93
Binary files /dev/null and b/sound/direct_sound_samples/cries/xerneas.wav differ
diff --git a/sound/direct_sound_samples/cries/xurkitree.aif b/sound/direct_sound_samples/cries/xurkitree.aif
deleted file mode 100644
index 3b0f5f3812..0000000000
Binary files a/sound/direct_sound_samples/cries/xurkitree.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/xurkitree.wav b/sound/direct_sound_samples/cries/xurkitree.wav
new file mode 100644
index 0000000000..2c521b1f2c
Binary files /dev/null and b/sound/direct_sound_samples/cries/xurkitree.wav differ
diff --git a/sound/direct_sound_samples/cries/yamask.aif b/sound/direct_sound_samples/cries/yamask.aif
deleted file mode 100644
index 51f07034b8..0000000000
Binary files a/sound/direct_sound_samples/cries/yamask.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/yamask.wav b/sound/direct_sound_samples/cries/yamask.wav
new file mode 100644
index 0000000000..e04533c5af
Binary files /dev/null and b/sound/direct_sound_samples/cries/yamask.wav differ
diff --git a/sound/direct_sound_samples/cries/yamper.aif b/sound/direct_sound_samples/cries/yamper.aif
deleted file mode 100644
index c57246e4ad..0000000000
Binary files a/sound/direct_sound_samples/cries/yamper.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/yamper.wav b/sound/direct_sound_samples/cries/yamper.wav
new file mode 100644
index 0000000000..ad8491f1f1
Binary files /dev/null and b/sound/direct_sound_samples/cries/yamper.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 3d8354bb59..0000000000
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 0000000000..166b373616
Binary files /dev/null and b/sound/direct_sound_samples/cries/yanma.wav differ
diff --git a/sound/direct_sound_samples/cries/yanmega.aif b/sound/direct_sound_samples/cries/yanmega.aif
deleted file mode 100644
index 6f3a3eb2dd..0000000000
Binary files a/sound/direct_sound_samples/cries/yanmega.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/yanmega.wav b/sound/direct_sound_samples/cries/yanmega.wav
new file mode 100644
index 0000000000..b464686713
Binary files /dev/null and b/sound/direct_sound_samples/cries/yanmega.wav differ
diff --git a/sound/direct_sound_samples/cries/yungoos.aif b/sound/direct_sound_samples/cries/yungoos.aif
deleted file mode 100644
index 13b633a98a..0000000000
Binary files a/sound/direct_sound_samples/cries/yungoos.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/yungoos.wav b/sound/direct_sound_samples/cries/yungoos.wav
new file mode 100644
index 0000000000..94a83e9223
Binary files /dev/null and b/sound/direct_sound_samples/cries/yungoos.wav differ
diff --git a/sound/direct_sound_samples/cries/yveltal.aif b/sound/direct_sound_samples/cries/yveltal.aif
deleted file mode 100644
index 3c2bbcb021..0000000000
Binary files a/sound/direct_sound_samples/cries/yveltal.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/yveltal.wav b/sound/direct_sound_samples/cries/yveltal.wav
new file mode 100644
index 0000000000..5bc4fec4fe
Binary files /dev/null and b/sound/direct_sound_samples/cries/yveltal.wav differ
diff --git a/sound/direct_sound_samples/cries/zacian_crowned_sword.aif b/sound/direct_sound_samples/cries/zacian_crowned_sword.aif
deleted file mode 100644
index 597c5ddd26..0000000000
Binary files a/sound/direct_sound_samples/cries/zacian_crowned_sword.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zacian_crowned_sword.wav b/sound/direct_sound_samples/cries/zacian_crowned_sword.wav
new file mode 100644
index 0000000000..ee135a12bc
Binary files /dev/null and b/sound/direct_sound_samples/cries/zacian_crowned_sword.wav differ
diff --git a/sound/direct_sound_samples/cries/zacian_hero_of_many_battles.aif b/sound/direct_sound_samples/cries/zacian_hero_of_many_battles.aif
deleted file mode 100644
index f67d857332..0000000000
Binary files a/sound/direct_sound_samples/cries/zacian_hero_of_many_battles.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zacian_hero_of_many_battles.wav b/sound/direct_sound_samples/cries/zacian_hero_of_many_battles.wav
new file mode 100644
index 0000000000..d3354b55a2
Binary files /dev/null and b/sound/direct_sound_samples/cries/zacian_hero_of_many_battles.wav differ
diff --git a/sound/direct_sound_samples/cries/zamazenta_crowned_shield.aif b/sound/direct_sound_samples/cries/zamazenta_crowned_shield.aif
deleted file mode 100644
index 05d170baba..0000000000
Binary files a/sound/direct_sound_samples/cries/zamazenta_crowned_shield.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zamazenta_crowned_shield.wav b/sound/direct_sound_samples/cries/zamazenta_crowned_shield.wav
new file mode 100644
index 0000000000..f4fad6e6b0
Binary files /dev/null and b/sound/direct_sound_samples/cries/zamazenta_crowned_shield.wav differ
diff --git a/sound/direct_sound_samples/cries/zamazenta_hero_of_many_battles.aif b/sound/direct_sound_samples/cries/zamazenta_hero_of_many_battles.aif
deleted file mode 100644
index 3674b2937f..0000000000
Binary files a/sound/direct_sound_samples/cries/zamazenta_hero_of_many_battles.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zamazenta_hero_of_many_battles.wav b/sound/direct_sound_samples/cries/zamazenta_hero_of_many_battles.wav
new file mode 100644
index 0000000000..50c1b217a0
Binary files /dev/null and b/sound/direct_sound_samples/cries/zamazenta_hero_of_many_battles.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 dc6182b784..0000000000
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 0000000000..b1e3e9ffc3
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 83bbd043e4..0000000000
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 0000000000..58415b9344
Binary files /dev/null and b/sound/direct_sound_samples/cries/zapdos.wav differ
diff --git a/sound/direct_sound_samples/cries/zarude.aif b/sound/direct_sound_samples/cries/zarude.aif
deleted file mode 100644
index d1a2a76aa4..0000000000
Binary files a/sound/direct_sound_samples/cries/zarude.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zarude.wav b/sound/direct_sound_samples/cries/zarude.wav
new file mode 100644
index 0000000000..252ff52573
Binary files /dev/null and b/sound/direct_sound_samples/cries/zarude.wav differ
diff --git a/sound/direct_sound_samples/cries/zebstrika.aif b/sound/direct_sound_samples/cries/zebstrika.aif
deleted file mode 100644
index 0609b145b2..0000000000
Binary files a/sound/direct_sound_samples/cries/zebstrika.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zebstrika.wav b/sound/direct_sound_samples/cries/zebstrika.wav
new file mode 100644
index 0000000000..f6f305f66c
Binary files /dev/null and b/sound/direct_sound_samples/cries/zebstrika.wav differ
diff --git a/sound/direct_sound_samples/cries/zekrom.aif b/sound/direct_sound_samples/cries/zekrom.aif
deleted file mode 100644
index dd74f80911..0000000000
Binary files a/sound/direct_sound_samples/cries/zekrom.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zekrom.wav b/sound/direct_sound_samples/cries/zekrom.wav
new file mode 100644
index 0000000000..61a2b1e6c3
Binary files /dev/null and b/sound/direct_sound_samples/cries/zekrom.wav differ
diff --git a/sound/direct_sound_samples/cries/zeraora.aif b/sound/direct_sound_samples/cries/zeraora.aif
deleted file mode 100644
index b1455a0100..0000000000
Binary files a/sound/direct_sound_samples/cries/zeraora.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zeraora.wav b/sound/direct_sound_samples/cries/zeraora.wav
new file mode 100644
index 0000000000..570cb398bb
Binary files /dev/null and b/sound/direct_sound_samples/cries/zeraora.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 8f7b32f818..0000000000
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 0000000000..ac0b68edcd
Binary files /dev/null and b/sound/direct_sound_samples/cries/zigzagoon.wav differ
diff --git a/sound/direct_sound_samples/cries/zoroark.aif b/sound/direct_sound_samples/cries/zoroark.aif
deleted file mode 100644
index 91e7ab0ce9..0000000000
Binary files a/sound/direct_sound_samples/cries/zoroark.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zoroark.wav b/sound/direct_sound_samples/cries/zoroark.wav
new file mode 100644
index 0000000000..34b6f1241d
Binary files /dev/null and b/sound/direct_sound_samples/cries/zoroark.wav differ
diff --git a/sound/direct_sound_samples/cries/zorua.aif b/sound/direct_sound_samples/cries/zorua.aif
deleted file mode 100644
index 674681f5bc..0000000000
Binary files a/sound/direct_sound_samples/cries/zorua.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zorua.wav b/sound/direct_sound_samples/cries/zorua.wav
new file mode 100644
index 0000000000..fe7c4ed8c6
Binary files /dev/null and b/sound/direct_sound_samples/cries/zorua.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 9ba4d36489..0000000000
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 0000000000..dc0756a06d
Binary files /dev/null and b/sound/direct_sound_samples/cries/zubat.wav differ
diff --git a/sound/direct_sound_samples/cries/zweilous.aif b/sound/direct_sound_samples/cries/zweilous.aif
deleted file mode 100644
index fc9a366ce9..0000000000
Binary files a/sound/direct_sound_samples/cries/zweilous.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zweilous.wav b/sound/direct_sound_samples/cries/zweilous.wav
new file mode 100644
index 0000000000..5474c4681c
Binary files /dev/null and b/sound/direct_sound_samples/cries/zweilous.wav differ
diff --git a/sound/direct_sound_samples/cries/zygarde_10.aif b/sound/direct_sound_samples/cries/zygarde_10.aif
deleted file mode 100644
index a8301cdc16..0000000000
Binary files a/sound/direct_sound_samples/cries/zygarde_10.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zygarde_10.wav b/sound/direct_sound_samples/cries/zygarde_10.wav
new file mode 100644
index 0000000000..da90abe5bb
Binary files /dev/null and b/sound/direct_sound_samples/cries/zygarde_10.wav differ
diff --git a/sound/direct_sound_samples/cries/zygarde_50.aif b/sound/direct_sound_samples/cries/zygarde_50.aif
deleted file mode 100644
index 92daba8bcb..0000000000
Binary files a/sound/direct_sound_samples/cries/zygarde_50.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zygarde_50.wav b/sound/direct_sound_samples/cries/zygarde_50.wav
new file mode 100644
index 0000000000..5bfe28b2ac
Binary files /dev/null and b/sound/direct_sound_samples/cries/zygarde_50.wav differ
diff --git a/sound/direct_sound_samples/cries/zygarde_complete.aif b/sound/direct_sound_samples/cries/zygarde_complete.aif
deleted file mode 100644
index 2eae63203b..0000000000
Binary files a/sound/direct_sound_samples/cries/zygarde_complete.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/cries/zygarde_complete.wav b/sound/direct_sound_samples/cries/zygarde_complete.wav
new file mode 100644
index 0000000000..5e295a0645
Binary files /dev/null and b/sound/direct_sound_samples/cries/zygarde_complete.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 db36a54bd0..0000000000
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 0000000000..a79a5c26f9
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 628421990e..0000000000
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 0000000000..49ba617f0c
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 4a4268210e..0000000000
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 0000000000..d1fb2c1a4f
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 5219bdf5d5..0000000000
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 0000000000..18731f5034
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 1696bd02e0..0000000000
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 0000000000..5c99fedf38
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 69267ca1c6..0000000000
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 0000000000..c12ae6de34
Binary files /dev/null and b/sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.wav differ
diff --git a/sound/direct_sound_samples/heart_of_asia_gamelan.aif b/sound/direct_sound_samples/heart_of_asia_gamelan.aif
deleted file mode 100644
index adaf6a0c53..0000000000
Binary files a/sound/direct_sound_samples/heart_of_asia_gamelan.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/heart_of_asia_gamelan.wav b/sound/direct_sound_samples/heart_of_asia_gamelan.wav
new file mode 100644
index 0000000000..a6258c97d4
Binary files /dev/null and b/sound/direct_sound_samples/heart_of_asia_gamelan.wav differ
diff --git a/sound/direct_sound_samples/phonemes/01.aif b/sound/direct_sound_samples/phonemes/01.aif
deleted file mode 100644
index 4b15a94b77..0000000000
Binary files a/sound/direct_sound_samples/phonemes/01.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/01.wav b/sound/direct_sound_samples/phonemes/01.wav
new file mode 100644
index 0000000000..d7f43544f5
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/01.wav differ
diff --git a/sound/direct_sound_samples/phonemes/02.aif b/sound/direct_sound_samples/phonemes/02.aif
deleted file mode 100644
index 74c1290730..0000000000
Binary files a/sound/direct_sound_samples/phonemes/02.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/02.wav b/sound/direct_sound_samples/phonemes/02.wav
new file mode 100644
index 0000000000..6b9e4134c8
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/02.wav differ
diff --git a/sound/direct_sound_samples/phonemes/03.aif b/sound/direct_sound_samples/phonemes/03.aif
deleted file mode 100644
index 359972c169..0000000000
Binary files a/sound/direct_sound_samples/phonemes/03.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/03.wav b/sound/direct_sound_samples/phonemes/03.wav
new file mode 100644
index 0000000000..a080496adb
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/03.wav differ
diff --git a/sound/direct_sound_samples/phonemes/04.aif b/sound/direct_sound_samples/phonemes/04.aif
deleted file mode 100644
index 3b136fa434..0000000000
Binary files a/sound/direct_sound_samples/phonemes/04.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/04.wav b/sound/direct_sound_samples/phonemes/04.wav
new file mode 100644
index 0000000000..0525f8f5d3
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/04.wav differ
diff --git a/sound/direct_sound_samples/phonemes/05.aif b/sound/direct_sound_samples/phonemes/05.aif
deleted file mode 100644
index fd72512cf1..0000000000
Binary files a/sound/direct_sound_samples/phonemes/05.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/05.wav b/sound/direct_sound_samples/phonemes/05.wav
new file mode 100644
index 0000000000..5df5562768
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/05.wav differ
diff --git a/sound/direct_sound_samples/phonemes/06.aif b/sound/direct_sound_samples/phonemes/06.aif
deleted file mode 100644
index 6f7794bec8..0000000000
Binary files a/sound/direct_sound_samples/phonemes/06.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/06.wav b/sound/direct_sound_samples/phonemes/06.wav
new file mode 100644
index 0000000000..3774664d97
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/06.wav differ
diff --git a/sound/direct_sound_samples/phonemes/07.aif b/sound/direct_sound_samples/phonemes/07.aif
deleted file mode 100644
index 89b845f21b..0000000000
Binary files a/sound/direct_sound_samples/phonemes/07.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/07.wav b/sound/direct_sound_samples/phonemes/07.wav
new file mode 100644
index 0000000000..fc44b7f771
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/07.wav differ
diff --git a/sound/direct_sound_samples/phonemes/08.aif b/sound/direct_sound_samples/phonemes/08.aif
deleted file mode 100644
index 1d99a3a932..0000000000
Binary files a/sound/direct_sound_samples/phonemes/08.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/08.wav b/sound/direct_sound_samples/phonemes/08.wav
new file mode 100644
index 0000000000..47c50d63b0
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/08.wav differ
diff --git a/sound/direct_sound_samples/phonemes/09.aif b/sound/direct_sound_samples/phonemes/09.aif
deleted file mode 100644
index 8833981298..0000000000
Binary files a/sound/direct_sound_samples/phonemes/09.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/09.wav b/sound/direct_sound_samples/phonemes/09.wav
new file mode 100644
index 0000000000..762ece0dd8
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/09.wav differ
diff --git a/sound/direct_sound_samples/phonemes/10.aif b/sound/direct_sound_samples/phonemes/10.aif
deleted file mode 100644
index 776815e636..0000000000
Binary files a/sound/direct_sound_samples/phonemes/10.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/10.wav b/sound/direct_sound_samples/phonemes/10.wav
new file mode 100644
index 0000000000..da9fa6727c
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/10.wav differ
diff --git a/sound/direct_sound_samples/phonemes/11.aif b/sound/direct_sound_samples/phonemes/11.aif
deleted file mode 100644
index 545bd12920..0000000000
Binary files a/sound/direct_sound_samples/phonemes/11.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/11.wav b/sound/direct_sound_samples/phonemes/11.wav
new file mode 100644
index 0000000000..5cd1904b42
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/11.wav differ
diff --git a/sound/direct_sound_samples/phonemes/12.aif b/sound/direct_sound_samples/phonemes/12.aif
deleted file mode 100644
index c0a3be10d0..0000000000
Binary files a/sound/direct_sound_samples/phonemes/12.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/12.wav b/sound/direct_sound_samples/phonemes/12.wav
new file mode 100644
index 0000000000..da638d82b0
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/12.wav differ
diff --git a/sound/direct_sound_samples/phonemes/13.aif b/sound/direct_sound_samples/phonemes/13.aif
deleted file mode 100644
index d26ecdd6de..0000000000
Binary files a/sound/direct_sound_samples/phonemes/13.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/13.wav b/sound/direct_sound_samples/phonemes/13.wav
new file mode 100644
index 0000000000..2eb58a5f3f
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/13.wav differ
diff --git a/sound/direct_sound_samples/phonemes/14.aif b/sound/direct_sound_samples/phonemes/14.aif
deleted file mode 100644
index 2b51201a48..0000000000
Binary files a/sound/direct_sound_samples/phonemes/14.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/14.wav b/sound/direct_sound_samples/phonemes/14.wav
new file mode 100644
index 0000000000..fef0bb0ded
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/14.wav differ
diff --git a/sound/direct_sound_samples/phonemes/15.aif b/sound/direct_sound_samples/phonemes/15.aif
deleted file mode 100644
index cf5ac4e038..0000000000
Binary files a/sound/direct_sound_samples/phonemes/15.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/15.wav b/sound/direct_sound_samples/phonemes/15.wav
new file mode 100644
index 0000000000..1dbe8cbfa3
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/15.wav differ
diff --git a/sound/direct_sound_samples/phonemes/16.aif b/sound/direct_sound_samples/phonemes/16.aif
deleted file mode 100644
index 606742e608..0000000000
Binary files a/sound/direct_sound_samples/phonemes/16.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/16.wav b/sound/direct_sound_samples/phonemes/16.wav
new file mode 100644
index 0000000000..83f1818582
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/16.wav differ
diff --git a/sound/direct_sound_samples/phonemes/17.aif b/sound/direct_sound_samples/phonemes/17.aif
deleted file mode 100644
index 71d4987d64..0000000000
Binary files a/sound/direct_sound_samples/phonemes/17.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/17.wav b/sound/direct_sound_samples/phonemes/17.wav
new file mode 100644
index 0000000000..ad55b8bda5
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/17.wav differ
diff --git a/sound/direct_sound_samples/phonemes/18.aif b/sound/direct_sound_samples/phonemes/18.aif
deleted file mode 100644
index 070c44a37c..0000000000
Binary files a/sound/direct_sound_samples/phonemes/18.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/18.wav b/sound/direct_sound_samples/phonemes/18.wav
new file mode 100644
index 0000000000..ecadb6f608
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/18.wav differ
diff --git a/sound/direct_sound_samples/phonemes/19.aif b/sound/direct_sound_samples/phonemes/19.aif
deleted file mode 100644
index b0ca84a38f..0000000000
Binary files a/sound/direct_sound_samples/phonemes/19.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/19.wav b/sound/direct_sound_samples/phonemes/19.wav
new file mode 100644
index 0000000000..ff905abe22
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/19.wav differ
diff --git a/sound/direct_sound_samples/phonemes/20.aif b/sound/direct_sound_samples/phonemes/20.aif
deleted file mode 100644
index f44101b23c..0000000000
Binary files a/sound/direct_sound_samples/phonemes/20.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/20.wav b/sound/direct_sound_samples/phonemes/20.wav
new file mode 100644
index 0000000000..595702e084
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/20.wav differ
diff --git a/sound/direct_sound_samples/phonemes/21.aif b/sound/direct_sound_samples/phonemes/21.aif
deleted file mode 100644
index a33809d423..0000000000
Binary files a/sound/direct_sound_samples/phonemes/21.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/21.wav b/sound/direct_sound_samples/phonemes/21.wav
new file mode 100644
index 0000000000..7d1709212c
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/21.wav differ
diff --git a/sound/direct_sound_samples/phonemes/22.aif b/sound/direct_sound_samples/phonemes/22.aif
deleted file mode 100644
index 6a005efccf..0000000000
Binary files a/sound/direct_sound_samples/phonemes/22.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/22.wav b/sound/direct_sound_samples/phonemes/22.wav
new file mode 100644
index 0000000000..274f6137aa
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/22.wav differ
diff --git a/sound/direct_sound_samples/phonemes/23.aif b/sound/direct_sound_samples/phonemes/23.aif
deleted file mode 100644
index 62f9493fdb..0000000000
Binary files a/sound/direct_sound_samples/phonemes/23.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/23.wav b/sound/direct_sound_samples/phonemes/23.wav
new file mode 100644
index 0000000000..72633f73c1
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/23.wav differ
diff --git a/sound/direct_sound_samples/phonemes/24.aif b/sound/direct_sound_samples/phonemes/24.aif
deleted file mode 100644
index 5767bd6d9a..0000000000
Binary files a/sound/direct_sound_samples/phonemes/24.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/24.wav b/sound/direct_sound_samples/phonemes/24.wav
new file mode 100644
index 0000000000..1d0e7b1a14
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/24.wav differ
diff --git a/sound/direct_sound_samples/phonemes/25.aif b/sound/direct_sound_samples/phonemes/25.aif
deleted file mode 100644
index 33e328a82e..0000000000
Binary files a/sound/direct_sound_samples/phonemes/25.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/25.wav b/sound/direct_sound_samples/phonemes/25.wav
new file mode 100644
index 0000000000..135bb246dd
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/25.wav differ
diff --git a/sound/direct_sound_samples/phonemes/26.aif b/sound/direct_sound_samples/phonemes/26.aif
deleted file mode 100644
index 548e740c8d..0000000000
Binary files a/sound/direct_sound_samples/phonemes/26.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/26.wav b/sound/direct_sound_samples/phonemes/26.wav
new file mode 100644
index 0000000000..e466df4d86
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/26.wav differ
diff --git a/sound/direct_sound_samples/phonemes/27.aif b/sound/direct_sound_samples/phonemes/27.aif
deleted file mode 100644
index cbbe09266a..0000000000
Binary files a/sound/direct_sound_samples/phonemes/27.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/27.wav b/sound/direct_sound_samples/phonemes/27.wav
new file mode 100644
index 0000000000..c4d4ce8008
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/27.wav differ
diff --git a/sound/direct_sound_samples/phonemes/28.aif b/sound/direct_sound_samples/phonemes/28.aif
deleted file mode 100644
index 8bdf7faaae..0000000000
Binary files a/sound/direct_sound_samples/phonemes/28.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/28.wav b/sound/direct_sound_samples/phonemes/28.wav
new file mode 100644
index 0000000000..fe9dde8e35
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/28.wav differ
diff --git a/sound/direct_sound_samples/phonemes/29.aif b/sound/direct_sound_samples/phonemes/29.aif
deleted file mode 100644
index f96f8853b2..0000000000
Binary files a/sound/direct_sound_samples/phonemes/29.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/29.wav b/sound/direct_sound_samples/phonemes/29.wav
new file mode 100644
index 0000000000..d05658c97e
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/29.wav differ
diff --git a/sound/direct_sound_samples/phonemes/30.aif b/sound/direct_sound_samples/phonemes/30.aif
deleted file mode 100644
index ab9abbf795..0000000000
Binary files a/sound/direct_sound_samples/phonemes/30.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/30.wav b/sound/direct_sound_samples/phonemes/30.wav
new file mode 100644
index 0000000000..aaf163ae97
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/30.wav differ
diff --git a/sound/direct_sound_samples/phonemes/31.aif b/sound/direct_sound_samples/phonemes/31.aif
deleted file mode 100644
index 9d21d0ab49..0000000000
Binary files a/sound/direct_sound_samples/phonemes/31.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/31.wav b/sound/direct_sound_samples/phonemes/31.wav
new file mode 100644
index 0000000000..64b2c7f6db
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/31.wav differ
diff --git a/sound/direct_sound_samples/phonemes/32.aif b/sound/direct_sound_samples/phonemes/32.aif
deleted file mode 100644
index c037ed4afc..0000000000
Binary files a/sound/direct_sound_samples/phonemes/32.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/32.wav b/sound/direct_sound_samples/phonemes/32.wav
new file mode 100644
index 0000000000..98862f1b64
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/32.wav differ
diff --git a/sound/direct_sound_samples/phonemes/33.aif b/sound/direct_sound_samples/phonemes/33.aif
deleted file mode 100644
index ac1f8b66f0..0000000000
Binary files a/sound/direct_sound_samples/phonemes/33.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/33.wav b/sound/direct_sound_samples/phonemes/33.wav
new file mode 100644
index 0000000000..f96a5e49fd
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/33.wav differ
diff --git a/sound/direct_sound_samples/phonemes/34.aif b/sound/direct_sound_samples/phonemes/34.aif
deleted file mode 100644
index 1fd9111c8b..0000000000
Binary files a/sound/direct_sound_samples/phonemes/34.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/34.wav b/sound/direct_sound_samples/phonemes/34.wav
new file mode 100644
index 0000000000..1439810d44
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/34.wav differ
diff --git a/sound/direct_sound_samples/phonemes/35.aif b/sound/direct_sound_samples/phonemes/35.aif
deleted file mode 100644
index 5d6ae2282f..0000000000
Binary files a/sound/direct_sound_samples/phonemes/35.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/35.wav b/sound/direct_sound_samples/phonemes/35.wav
new file mode 100644
index 0000000000..aa6599bcc8
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/35.wav differ
diff --git a/sound/direct_sound_samples/phonemes/36.aif b/sound/direct_sound_samples/phonemes/36.aif
deleted file mode 100644
index f267006907..0000000000
Binary files a/sound/direct_sound_samples/phonemes/36.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/36.wav b/sound/direct_sound_samples/phonemes/36.wav
new file mode 100644
index 0000000000..59f90f4614
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/36.wav differ
diff --git a/sound/direct_sound_samples/phonemes/37.aif b/sound/direct_sound_samples/phonemes/37.aif
deleted file mode 100644
index 3ba97a9fc3..0000000000
Binary files a/sound/direct_sound_samples/phonemes/37.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/37.wav b/sound/direct_sound_samples/phonemes/37.wav
new file mode 100644
index 0000000000..4df9cffee6
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/37.wav differ
diff --git a/sound/direct_sound_samples/phonemes/38.aif b/sound/direct_sound_samples/phonemes/38.aif
deleted file mode 100644
index 37f1be4b14..0000000000
Binary files a/sound/direct_sound_samples/phonemes/38.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/38.wav b/sound/direct_sound_samples/phonemes/38.wav
new file mode 100644
index 0000000000..759a23d514
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/38.wav differ
diff --git a/sound/direct_sound_samples/phonemes/39.aif b/sound/direct_sound_samples/phonemes/39.aif
deleted file mode 100644
index 4b3facb99a..0000000000
Binary files a/sound/direct_sound_samples/phonemes/39.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/39.wav b/sound/direct_sound_samples/phonemes/39.wav
new file mode 100644
index 0000000000..da335b2690
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/39.wav differ
diff --git a/sound/direct_sound_samples/phonemes/40.aif b/sound/direct_sound_samples/phonemes/40.aif
deleted file mode 100644
index 8a4d7653ba..0000000000
Binary files a/sound/direct_sound_samples/phonemes/40.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/40.wav b/sound/direct_sound_samples/phonemes/40.wav
new file mode 100644
index 0000000000..14944784a4
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/40.wav differ
diff --git a/sound/direct_sound_samples/phonemes/41.aif b/sound/direct_sound_samples/phonemes/41.aif
deleted file mode 100644
index db5bae2449..0000000000
Binary files a/sound/direct_sound_samples/phonemes/41.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/41.wav b/sound/direct_sound_samples/phonemes/41.wav
new file mode 100644
index 0000000000..57e38fb3c8
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/41.wav differ
diff --git a/sound/direct_sound_samples/phonemes/42.aif b/sound/direct_sound_samples/phonemes/42.aif
deleted file mode 100644
index 6612dd54db..0000000000
Binary files a/sound/direct_sound_samples/phonemes/42.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/42.wav b/sound/direct_sound_samples/phonemes/42.wav
new file mode 100644
index 0000000000..a990969146
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/42.wav differ
diff --git a/sound/direct_sound_samples/phonemes/43.aif b/sound/direct_sound_samples/phonemes/43.aif
deleted file mode 100644
index 441eecfcda..0000000000
Binary files a/sound/direct_sound_samples/phonemes/43.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/43.wav b/sound/direct_sound_samples/phonemes/43.wav
new file mode 100644
index 0000000000..ab4a046743
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/43.wav differ
diff --git a/sound/direct_sound_samples/phonemes/44.aif b/sound/direct_sound_samples/phonemes/44.aif
deleted file mode 100644
index 95670cf0a2..0000000000
Binary files a/sound/direct_sound_samples/phonemes/44.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/44.wav b/sound/direct_sound_samples/phonemes/44.wav
new file mode 100644
index 0000000000..efca4e3f97
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/44.wav differ
diff --git a/sound/direct_sound_samples/phonemes/45.aif b/sound/direct_sound_samples/phonemes/45.aif
deleted file mode 100644
index 0fadcba8e8..0000000000
Binary files a/sound/direct_sound_samples/phonemes/45.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/45.wav b/sound/direct_sound_samples/phonemes/45.wav
new file mode 100644
index 0000000000..0369d3c2a1
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/45.wav differ
diff --git a/sound/direct_sound_samples/phonemes/46.aif b/sound/direct_sound_samples/phonemes/46.aif
deleted file mode 100644
index 6017c55b4a..0000000000
Binary files a/sound/direct_sound_samples/phonemes/46.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/46.wav b/sound/direct_sound_samples/phonemes/46.wav
new file mode 100644
index 0000000000..0fa8eb1f88
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/46.wav differ
diff --git a/sound/direct_sound_samples/phonemes/47.aif b/sound/direct_sound_samples/phonemes/47.aif
deleted file mode 100644
index 2327b6d657..0000000000
Binary files a/sound/direct_sound_samples/phonemes/47.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/47.wav b/sound/direct_sound_samples/phonemes/47.wav
new file mode 100644
index 0000000000..a55f03a153
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/47.wav differ
diff --git a/sound/direct_sound_samples/phonemes/48.aif b/sound/direct_sound_samples/phonemes/48.aif
deleted file mode 100644
index 19ceca0d08..0000000000
Binary files a/sound/direct_sound_samples/phonemes/48.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/48.wav b/sound/direct_sound_samples/phonemes/48.wav
new file mode 100644
index 0000000000..f6c7dd4502
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/48.wav differ
diff --git a/sound/direct_sound_samples/phonemes/49.aif b/sound/direct_sound_samples/phonemes/49.aif
deleted file mode 100644
index 8438d301ab..0000000000
Binary files a/sound/direct_sound_samples/phonemes/49.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/49.wav b/sound/direct_sound_samples/phonemes/49.wav
new file mode 100644
index 0000000000..4168f2e137
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/49.wav differ
diff --git a/sound/direct_sound_samples/phonemes/50.aif b/sound/direct_sound_samples/phonemes/50.aif
deleted file mode 100644
index 74d4bcf4af..0000000000
Binary files a/sound/direct_sound_samples/phonemes/50.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/50.wav b/sound/direct_sound_samples/phonemes/50.wav
new file mode 100644
index 0000000000..88ce07d9d7
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/50.wav differ
diff --git a/sound/direct_sound_samples/phonemes/51.aif b/sound/direct_sound_samples/phonemes/51.aif
deleted file mode 100644
index dfef8a82be..0000000000
Binary files a/sound/direct_sound_samples/phonemes/51.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/51.wav b/sound/direct_sound_samples/phonemes/51.wav
new file mode 100644
index 0000000000..bd1a514180
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/51.wav differ
diff --git a/sound/direct_sound_samples/phonemes/shared.aif b/sound/direct_sound_samples/phonemes/shared.aif
deleted file mode 100644
index 98c3a19651..0000000000
Binary files a/sound/direct_sound_samples/phonemes/shared.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/phonemes/shared.wav b/sound/direct_sound_samples/phonemes/shared.wav
new file mode 100644
index 0000000000..63207e6e22
Binary files /dev/null and b/sound/direct_sound_samples/phonemes/shared.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 e56c5c1311..0000000000
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 0000000000..89d94e61cc
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 6d6c2e998b..0000000000
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 0000000000..f19a98d277
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 6d6c2e998b..0000000000
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 0000000000..f19a98d277
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 89872bf558..0000000000
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 0000000000..d6e61596d5
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_bubbles.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_church_organ3_high.aif b/sound/direct_sound_samples/sc88pro_church_organ3_high.aif
deleted file mode 100644
index 8663a62614..0000000000
Binary files a/sound/direct_sound_samples/sc88pro_church_organ3_high.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_church_organ3_high.wav b/sound/direct_sound_samples/sc88pro_church_organ3_high.wav
new file mode 100644
index 0000000000..0766a8503d
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_church_organ3_high.wav differ
diff --git a/sound/direct_sound_samples/sc88pro_church_organ3_low.aif b/sound/direct_sound_samples/sc88pro_church_organ3_low.aif
deleted file mode 100644
index a2618653f6..0000000000
Binary files a/sound/direct_sound_samples/sc88pro_church_organ3_low.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sc88pro_church_organ3_low.wav b/sound/direct_sound_samples/sc88pro_church_organ3_low.wav
new file mode 100644
index 0000000000..afc9c18907
Binary files /dev/null and b/sound/direct_sound_samples/sc88pro_church_organ3_low.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 f244a9982d..0000000000
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 0000000000..0e723b742b
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 703f3adbd0..0000000000
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 0000000000..409ce0f744
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 742c4385e9..0000000000
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 0000000000..105c186a2a
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 004fda6a18..0000000000
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 0000000000..380d796307
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 f3aa47d913..0000000000
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 0000000000..f639d5ccf2
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 199ead8112..0000000000
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 0000000000..4c9cbae149
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 083c45e3da..0000000000
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 0000000000..bdb176720c
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 0eaf313093..0000000000
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 0000000000..1eb6b1de1a
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 2e1bf9c641..0000000000
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 0000000000..c009d7265c
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 dea429a254..0000000000
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 0000000000..7538f508ad
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 8e1cb620a6..0000000000
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 0000000000..34a1e3f32a
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 576e3e19e1..0000000000
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 0000000000..c3f89f9c78
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 36b6407588..0000000000
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 0000000000..96b10bb05f
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 6372bbc324..0000000000
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 0000000000..bf6f2ba520
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 c2b3757b09..0000000000
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 0000000000..c7bcfca138
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 7de586c9bd..0000000000
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 0000000000..7199386c7b
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 5236141ba6..0000000000
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 0000000000..603006eb6f
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 a7c4e94f8f..0000000000
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 0000000000..0d76370756
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 1c0a027f7a..0000000000
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 0000000000..6bb6bc74a9
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 9c504e3d05..0000000000
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 0000000000..b05d88a812
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 544b187d5e..0000000000
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 0000000000..c00ee759f7
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 9175b63c5b..0000000000
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 0000000000..41d747259e
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 09e17f0ca7..0000000000
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 0000000000..020dae03a4
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 bfaa5c196c..0000000000
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 0000000000..26e9db076c
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 3e76cacddc..0000000000
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 0000000000..1699f831ca
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 2647c78ecb..0000000000
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 0000000000..5616d094a0
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 f39931a7e4..0000000000
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 0000000000..5aa61ab8ca
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 a8046cee8c..0000000000
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 0000000000..af01253368
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 39ec57d29b..0000000000
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 0000000000..016b2cc209
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 dfdfd702e0..0000000000
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 0000000000..bed5f113a1
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 7270872d64..0000000000
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 0000000000..8ab1862d02
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 b11787ffc8..0000000000
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 0000000000..2e07040cb4
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 e56df7f605..0000000000
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 0000000000..0c857d971d
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 8c68a83b31..0000000000
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 0000000000..93a62dc0ef
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 a03bafc974..0000000000
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 0000000000..12549376b5
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 d4077b4816..0000000000
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 0000000000..c3b78eea55
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 2ad86876be..0000000000
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 0000000000..fed8c72f43
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 9d00ecae6b..0000000000
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 0000000000..8c892236b9
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 ece919ea51..0000000000
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 0000000000..3856a4af1f
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 1bd43ca92e..0000000000
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 0000000000..a08296baa1
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 08f1acf388..0000000000
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 0000000000..6f390959fc
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 86ea0fa760..0000000000
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 0000000000..3c96f1cbca
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 fced037122..0000000000
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 0000000000..39e25a89ce
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 b0f0e82a1a..0000000000
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 0000000000..097d91f734
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 c4f7082ed7..0000000000
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 0000000000..d281d77572
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 41b6fec12f..0000000000
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 0000000000..2b9e96afc4
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 d37c79c056..0000000000
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 0000000000..7380be1e1b
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_shakuhachi.aif b/sound/direct_sound_samples/sd90_classical_shakuhachi.aif
deleted file mode 100644
index e04a34f642..0000000000
Binary files a/sound/direct_sound_samples/sd90_classical_shakuhachi.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/sd90_classical_shakuhachi.wav b/sound/direct_sound_samples/sd90_classical_shakuhachi.wav
new file mode 100644
index 0000000000..587cee2cb7
Binary files /dev/null and b/sound/direct_sound_samples/sd90_classical_shakuhachi.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 b4be7482f0..0000000000
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 0000000000..61a58445bf
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 43515f5427..0000000000
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 0000000000..9c35bf6541
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 c64ef6b037..0000000000
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 0000000000..d87fc68b2b
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 0d0b3e3ca2..0000000000
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 0000000000..92df2b3074
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 93b6793584..0000000000
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 0000000000..ad5d872844
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 8b7a7da405..0000000000
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 0000000000..8b4b563ac7
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 e98c64db4d..0000000000
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 0000000000..5a4d94b0a8
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 09fe6f12ea..0000000000
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 0000000000..6ad677b7d8
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 455ced13e9..0000000000
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 0000000000..7f42b9fcd9
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 4aec6882ff..0000000000
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 0000000000..c3e52d3e29
Binary files /dev/null and b/sound/direct_sound_samples/trinity_cymbal_crash.wav differ
diff --git a/sound/direct_sound_samples/unknown_01.aif b/sound/direct_sound_samples/unknown_01.aif
deleted file mode 100644
index ee6ff45b7f..0000000000
Binary files a/sound/direct_sound_samples/unknown_01.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_01.wav b/sound/direct_sound_samples/unknown_01.wav
new file mode 100644
index 0000000000..75d05e7f4d
Binary files /dev/null and b/sound/direct_sound_samples/unknown_01.wav differ
diff --git a/sound/direct_sound_samples/unknown_02.aif b/sound/direct_sound_samples/unknown_02.aif
deleted file mode 100644
index 2e09d08223..0000000000
Binary files a/sound/direct_sound_samples/unknown_02.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_02.wav b/sound/direct_sound_samples/unknown_02.wav
new file mode 100644
index 0000000000..1a25b1fe18
Binary files /dev/null and b/sound/direct_sound_samples/unknown_02.wav differ
diff --git a/sound/direct_sound_samples/unknown_03.aif b/sound/direct_sound_samples/unknown_03.aif
deleted file mode 100644
index 49f24936fa..0000000000
Binary files a/sound/direct_sound_samples/unknown_03.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_03.wav b/sound/direct_sound_samples/unknown_03.wav
new file mode 100644
index 0000000000..1a64c4b25d
Binary files /dev/null and b/sound/direct_sound_samples/unknown_03.wav differ
diff --git a/sound/direct_sound_samples/unknown_04.aif b/sound/direct_sound_samples/unknown_04.aif
deleted file mode 100644
index 5c55d91ed8..0000000000
Binary files a/sound/direct_sound_samples/unknown_04.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_04.wav b/sound/direct_sound_samples/unknown_04.wav
new file mode 100644
index 0000000000..a278be2758
Binary files /dev/null and b/sound/direct_sound_samples/unknown_04.wav differ
diff --git a/sound/direct_sound_samples/unknown_05.aif b/sound/direct_sound_samples/unknown_05.aif
deleted file mode 100644
index 515818a4da..0000000000
Binary files a/sound/direct_sound_samples/unknown_05.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_05.wav b/sound/direct_sound_samples/unknown_05.wav
new file mode 100644
index 0000000000..dd5eee1d2c
Binary files /dev/null and b/sound/direct_sound_samples/unknown_05.wav differ
diff --git a/sound/direct_sound_samples/unknown_06.aif b/sound/direct_sound_samples/unknown_06.aif
deleted file mode 100644
index 102830efa5..0000000000
Binary files a/sound/direct_sound_samples/unknown_06.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_06.wav b/sound/direct_sound_samples/unknown_06.wav
new file mode 100644
index 0000000000..396eb3e721
Binary files /dev/null and b/sound/direct_sound_samples/unknown_06.wav differ
diff --git a/sound/direct_sound_samples/unknown_07.aif b/sound/direct_sound_samples/unknown_07.aif
deleted file mode 100644
index 556be02382..0000000000
Binary files a/sound/direct_sound_samples/unknown_07.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_07.wav b/sound/direct_sound_samples/unknown_07.wav
new file mode 100644
index 0000000000..b1e0a0d08f
Binary files /dev/null and b/sound/direct_sound_samples/unknown_07.wav differ
diff --git a/sound/direct_sound_samples/unknown_08.aif b/sound/direct_sound_samples/unknown_08.aif
deleted file mode 100644
index dd80b1185a..0000000000
Binary files a/sound/direct_sound_samples/unknown_08.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_08.wav b/sound/direct_sound_samples/unknown_08.wav
new file mode 100644
index 0000000000..420ee23ce3
Binary files /dev/null and b/sound/direct_sound_samples/unknown_08.wav differ
diff --git a/sound/direct_sound_samples/unknown_09.aif b/sound/direct_sound_samples/unknown_09.aif
deleted file mode 100644
index ebd46eeaa2..0000000000
Binary files a/sound/direct_sound_samples/unknown_09.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_09.wav b/sound/direct_sound_samples/unknown_09.wav
new file mode 100644
index 0000000000..fd1ee4dd78
Binary files /dev/null and b/sound/direct_sound_samples/unknown_09.wav differ
diff --git a/sound/direct_sound_samples/unknown_10.aif b/sound/direct_sound_samples/unknown_10.aif
deleted file mode 100644
index 6a11945c55..0000000000
Binary files a/sound/direct_sound_samples/unknown_10.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_10.wav b/sound/direct_sound_samples/unknown_10.wav
new file mode 100644
index 0000000000..63cf6043cb
Binary files /dev/null and b/sound/direct_sound_samples/unknown_10.wav differ
diff --git a/sound/direct_sound_samples/unknown_11.aif b/sound/direct_sound_samples/unknown_11.aif
deleted file mode 100644
index a0fb49f89b..0000000000
Binary files a/sound/direct_sound_samples/unknown_11.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_11.wav b/sound/direct_sound_samples/unknown_11.wav
new file mode 100644
index 0000000000..f2e648045b
Binary files /dev/null and b/sound/direct_sound_samples/unknown_11.wav differ
diff --git a/sound/direct_sound_samples/unknown_12.aif b/sound/direct_sound_samples/unknown_12.aif
deleted file mode 100644
index 9521d0b6e8..0000000000
Binary files a/sound/direct_sound_samples/unknown_12.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_12.wav b/sound/direct_sound_samples/unknown_12.wav
new file mode 100644
index 0000000000..146db2c348
Binary files /dev/null and b/sound/direct_sound_samples/unknown_12.wav differ
diff --git a/sound/direct_sound_samples/unknown_13.aif b/sound/direct_sound_samples/unknown_13.aif
deleted file mode 100644
index 2519572e2c..0000000000
Binary files a/sound/direct_sound_samples/unknown_13.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_13.wav b/sound/direct_sound_samples/unknown_13.wav
new file mode 100644
index 0000000000..1618ea28b5
Binary files /dev/null and b/sound/direct_sound_samples/unknown_13.wav differ
diff --git a/sound/direct_sound_samples/unknown_14.aif b/sound/direct_sound_samples/unknown_14.aif
deleted file mode 100644
index d411e66128..0000000000
Binary files a/sound/direct_sound_samples/unknown_14.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_14.wav b/sound/direct_sound_samples/unknown_14.wav
new file mode 100644
index 0000000000..4c509795ad
Binary files /dev/null and b/sound/direct_sound_samples/unknown_14.wav differ
diff --git a/sound/direct_sound_samples/unknown_15.aif b/sound/direct_sound_samples/unknown_15.aif
deleted file mode 100644
index 3bc1aa839b..0000000000
Binary files a/sound/direct_sound_samples/unknown_15.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_15.wav b/sound/direct_sound_samples/unknown_15.wav
new file mode 100644
index 0000000000..080c4ad841
Binary files /dev/null and b/sound/direct_sound_samples/unknown_15.wav differ
diff --git a/sound/direct_sound_samples/unknown_16.aif b/sound/direct_sound_samples/unknown_16.aif
deleted file mode 100644
index 3bacf36765..0000000000
Binary files a/sound/direct_sound_samples/unknown_16.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_16.wav b/sound/direct_sound_samples/unknown_16.wav
new file mode 100644
index 0000000000..72cf7dcc95
Binary files /dev/null and b/sound/direct_sound_samples/unknown_16.wav differ
diff --git a/sound/direct_sound_samples/unknown_17.aif b/sound/direct_sound_samples/unknown_17.aif
deleted file mode 100644
index 5ddaa153da..0000000000
Binary files a/sound/direct_sound_samples/unknown_17.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_17.wav b/sound/direct_sound_samples/unknown_17.wav
new file mode 100644
index 0000000000..5a277f7d44
Binary files /dev/null and b/sound/direct_sound_samples/unknown_17.wav differ
diff --git a/sound/direct_sound_samples/unknown_18.aif b/sound/direct_sound_samples/unknown_18.aif
deleted file mode 100644
index e1715fd030..0000000000
Binary files a/sound/direct_sound_samples/unknown_18.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_18.wav b/sound/direct_sound_samples/unknown_18.wav
new file mode 100644
index 0000000000..9ee0027921
Binary files /dev/null and b/sound/direct_sound_samples/unknown_18.wav differ
diff --git a/sound/direct_sound_samples/unknown_bell.aif b/sound/direct_sound_samples/unknown_bell.aif
deleted file mode 100644
index 7de79e7478..0000000000
Binary files a/sound/direct_sound_samples/unknown_bell.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_bell.wav b/sound/direct_sound_samples/unknown_bell.wav
new file mode 100644
index 0000000000..4dc82a170b
Binary files /dev/null and b/sound/direct_sound_samples/unknown_bell.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 8747aef28d..0000000000
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 0000000000..86774ce3ce
Binary files /dev/null and b/sound/direct_sound_samples/unknown_close_hihat.wav differ
diff --git a/sound/direct_sound_samples/unknown_female_voice.aif b/sound/direct_sound_samples/unknown_female_voice.aif
deleted file mode 100644
index b310823a79..0000000000
Binary files a/sound/direct_sound_samples/unknown_female_voice.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_female_voice.wav b/sound/direct_sound_samples/unknown_female_voice.wav
new file mode 100644
index 0000000000..44e73b3395
Binary files /dev/null and b/sound/direct_sound_samples/unknown_female_voice.wav differ
diff --git a/sound/direct_sound_samples/unknown_koto_high.aif b/sound/direct_sound_samples/unknown_koto_high.aif
deleted file mode 100644
index 9c531de113..0000000000
Binary files a/sound/direct_sound_samples/unknown_koto_high.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_koto_high.wav b/sound/direct_sound_samples/unknown_koto_high.wav
new file mode 100644
index 0000000000..b9591a098f
Binary files /dev/null and b/sound/direct_sound_samples/unknown_koto_high.wav differ
diff --git a/sound/direct_sound_samples/unknown_koto_low.aif b/sound/direct_sound_samples/unknown_koto_low.aif
deleted file mode 100644
index 67c40f1966..0000000000
Binary files a/sound/direct_sound_samples/unknown_koto_low.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_koto_low.wav b/sound/direct_sound_samples/unknown_koto_low.wav
new file mode 100644
index 0000000000..a1736cafc7
Binary files /dev/null and b/sound/direct_sound_samples/unknown_koto_low.wav differ
diff --git a/sound/direct_sound_samples/unknown_open_hihat.aif b/sound/direct_sound_samples/unknown_open_hihat.aif
deleted file mode 100644
index 5ad9410d00..0000000000
Binary files a/sound/direct_sound_samples/unknown_open_hihat.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unknown_open_hihat.wav b/sound/direct_sound_samples/unknown_open_hihat.wav
new file mode 100644
index 0000000000..3a9ee824c1
Binary files /dev/null and b/sound/direct_sound_samples/unknown_open_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 e7184ec6f6..0000000000
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 0000000000..03295e4763
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 b3122457de..0000000000
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 0000000000..774194423d
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 7647a74a70..0000000000
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 0000000000..c75373087b
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 2e67f1d737..0000000000
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 0000000000..49d67a30f3
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 04f990b13c..0000000000
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 0000000000..b4c225827f
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 46d6e7d131..0000000000
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 0000000000..690cbc9183
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 2a0ea2a266..0000000000
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 0000000000..e7609ed53d
Binary files /dev/null and b/sound/direct_sound_samples/unused_sd90_oboe.wav differ
diff --git a/sound/direct_sound_samples/unused_unknown_male_voice.aif b/sound/direct_sound_samples/unused_unknown_male_voice.aif
deleted file mode 100644
index a2382d700f..0000000000
Binary files a/sound/direct_sound_samples/unused_unknown_male_voice.aif and /dev/null differ
diff --git a/sound/direct_sound_samples/unused_unknown_male_voice.wav b/sound/direct_sound_samples/unused_unknown_male_voice.wav
new file mode 100644
index 0000000000..7612c9b61d
Binary files /dev/null and b/sound/direct_sound_samples/unused_unknown_male_voice.wav differ
diff --git a/tools/aif2pcm/.gitignore b/tools/aif2pcm/.gitignore
deleted file mode 100644
index 31531797e7..0000000000
--- 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 dd48a87597..0000000000
--- 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 94449164bd..0000000000
--- 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 0824b92da8..0000000000
--- 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 0000000000..2715405656
--- /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 966b92bd69..d52bf8ee67 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 0000000000..a121730e95
--- /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 0000000000..86f2660231
--- /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 0000000000..c96135c149
--- /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 0000000000..df59ebe2d1
--- /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 0000000000..3ef56b4d91
--- /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 0000000000..be018abad6
--- /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 0000000000..4b242c5c00
--- /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 0000000000..b88da4eeb6
--- /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)
+};