Dump the cries and rewrite aif2pcm. (#156)

461 files changed, 2118 insertions, 2083 deletions

diff --git a/Makefile b/Makefile
index 11f59093c..dbdf82516 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ compare_sapphire_rev2: sapphire_rev2
 	@$(SHA1) sapphire_rev2.sha1
 
 clean: tidy
-	rm -f sound/programmable_wave_samples/*.bin sound/direct_sound_samples/*.bin sound/**/*.pcm
+	rm -f sound/programmable_wave_samples/*.bin sound/direct_sound_samples/*.bin
 	rm -f $(SONG_OBJS)
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} +
 
@@ -126,7 +126,6 @@ include generated.mk
 include misc.mk
 
 %.s: ;
-%.bin: ;
 %.png: ;
 %.pal: ;
 %.aif: ;
@@ -137,8 +136,8 @@ include misc.mk
 %.gbapal: %.pal ; $(GFX) $< $@
 %.lz: % ; $(GFX) $< $@
 %.rl: % ; $(GFX) $< $@
-%.pcm: %.aif  ; $(AIF) $< $@
-%.bin: %.aif  ; $(AIF) $< $@
+%.bin: %.aif ; $(AIF) $< $@
+sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress
 sound/songs/%.s: sound/songs/%.mid
 	cd $(@D) && ../../$(MID) $(<F)
 
diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
index 71e92f9ee..d4c39b2f8 100644
--- a/sound/direct_sound_data.inc
+++ b/sound/direct_sound_data.inc
@@ -1,2259 +1,2023 @@
 	.align 2
 DirectSoundWaveData_8456330:: @ 8456330
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8456330.bin"
-	.incbin "sound/direct_sound_samples/8456330.pcm"
 
 	.align 2
 DirectSoundWaveData_84569D4:: @ 84569D4
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84569D4.bin"
-	.incbin "sound/direct_sound_samples/84569D4.pcm"
 
 	.align 2
 DirectSoundWaveData_84571CC:: @ 84571CC
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84571CC.bin"
-	.incbin "sound/direct_sound_samples/84571CC.pcm"
 
 	.align 2
 DirectSoundWaveData_8457D98:: @ 8457D98
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8457D98.bin"
-	.incbin "sound/direct_sound_samples/8457D98.pcm"
 
 	.align 2
 DirectSoundWaveData_8458CD0:: @ 8458CD0
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8458CD0.bin"
-	.incbin "sound/direct_sound_samples/8458CD0.pcm"
 
 	.align 2
 DirectSoundWaveData_8459944:: @ 8459944
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8459944.bin"
-	.incbin "sound/direct_sound_samples/8459944.pcm"
 
 	.align 2
 DirectSoundWaveData_845AE14:: @ 845AE14
-	.4byte 0
 	.incbin "sound/direct_sound_samples/845AE14.bin"
-	.incbin "sound/direct_sound_samples/845AE14.pcm"
 
 	.align 2
 DirectSoundWaveData_845B2B4:: @ 845B2B4
-	.4byte 0
 	.incbin "sound/direct_sound_samples/845B2B4.bin"
-	.incbin "sound/direct_sound_samples/845B2B4.pcm"
 
 	.align 2
 DirectSoundWaveData_845B9A8:: @ 845B9A8
-	.4byte 0
 	.incbin "sound/direct_sound_samples/845B9A8.bin"
-	.incbin "sound/direct_sound_samples/845B9A8.pcm"
 
 	.align 2
 DirectSoundWaveData_845C238:: @ 845C238
-	.4byte 0
 	.incbin "sound/direct_sound_samples/845C238.bin"
-	.incbin "sound/direct_sound_samples/845C238.pcm"
 
 	.align 2
 DirectSoundWaveData_845CAB0:: @ 845CAB0
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/845CAB0.bin"
-	.incbin "sound/direct_sound_samples/845CAB0.pcm"
 
 	.align 2
 DirectSoundWaveData_845DAF0:: @ 845DAF0
-	.4byte 0
 	.incbin "sound/direct_sound_samples/845DAF0.bin"
-	.incbin "sound/direct_sound_samples/845DAF0.pcm"
 
 	.align 2
 DirectSoundWaveData_845DF04:: @ 845DF04
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/845DF04.bin"
-	.incbin "sound/direct_sound_samples/845DF04.pcm"
 
 	.align 2
 DirectSoundWaveData_845ED34:: @ 845ED34
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/845ED34.bin"
-	.incbin "sound/direct_sound_samples/845ED34.pcm"
 
 	.align 2
 DirectSoundWaveData_845FCC8:: @ 845FCC8
-	.4byte 0
 	.incbin "sound/direct_sound_samples/845FCC8.bin"
-	.incbin "sound/direct_sound_samples/845FCC8.pcm"
 
 	.align 2
 DirectSoundWaveData_846057C:: @ 846057C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/846057C.bin"
-	.incbin "sound/direct_sound_samples/846057C.pcm"
 
 	.align 2
 DirectSoundWaveData_8460E60:: @ 8460E60
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8460E60.bin"
-	.incbin "sound/direct_sound_samples/8460E60.pcm"
 
 	.align 2
 DirectSoundWaveData_8461D8C:: @ 8461D8C
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8461D8C.bin"
-	.incbin "sound/direct_sound_samples/8461D8C.pcm"
 
 	.align 2
 DirectSoundWaveData_84622A4:: @ 84622A4
-	.4byte 0
 	.incbin "sound/direct_sound_samples/84622A4.bin"
-	.incbin "sound/direct_sound_samples/84622A4.pcm"
 
 	.align 2
 DirectSoundWaveData_846286C:: @ 846286C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/846286C.bin"
-	.incbin "sound/direct_sound_samples/846286C.pcm"
 
 	.align 2
 DirectSoundWaveData_84637CC:: @ 84637CC
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84637CC.bin"
-	.incbin "sound/direct_sound_samples/84637CC.pcm"
 
 	.align 2
 DirectSoundWaveData_8464E2C:: @ 8464E2C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8464E2C.bin"
-	.incbin "sound/direct_sound_samples/8464E2C.pcm"
 
 	.align 2
 DirectSoundWaveData_8466388:: @ 8466388
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8466388.bin"
-	.incbin "sound/direct_sound_samples/8466388.pcm"
 
 	.align 2
 DirectSoundWaveData_8466F14:: @ 8466F14
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8466F14.bin"
-	.incbin "sound/direct_sound_samples/8466F14.pcm"
 
 	.align 2
 DirectSoundWaveData_846A4B8:: @ 846A4B8
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/846A4B8.bin"
-	.incbin "sound/direct_sound_samples/846A4B8.pcm"
 
 	.align 2
 DirectSoundWaveData_846C7D4:: @ 846C7D4
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/846C7D4.bin"
-	.incbin "sound/direct_sound_samples/846C7D4.pcm"
 
 	.align 2
 DirectSoundWaveData_846FEA0:: @ 846FEA0
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/846FEA0.bin"
-	.incbin "sound/direct_sound_samples/846FEA0.pcm"
 
 	.align 2
 DirectSoundWaveData_84711F0:: @ 84711F0
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84711F0.bin"
-	.incbin "sound/direct_sound_samples/84711F0.pcm"
 
 	.align 2
 DirectSoundWaveData_8472700:: @ 8472700
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8472700.bin"
-	.incbin "sound/direct_sound_samples/8472700.pcm"
 
 	.align 2
 DirectSoundWaveData_8473B20:: @ 8473B20
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8473B20.bin"
-	.incbin "sound/direct_sound_samples/8473B20.pcm"
 
 	.align 2
 DirectSoundWaveData_8474BBC:: @ 8474BBC
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8474BBC.bin"
-	.incbin "sound/direct_sound_samples/8474BBC.pcm"
 
 	.align 2
 DirectSoundWaveData_8475C18:: @ 8475C18
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8475C18.bin"
-	.incbin "sound/direct_sound_samples/8475C18.pcm"
 
 	.align 2
 DirectSoundWaveData_847CBAC:: @ 847CBAC
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/847CBAC.bin"
-	.incbin "sound/direct_sound_samples/847CBAC.pcm"
 
 	.align 2
 DirectSoundWaveData_8481130:: @ 8481130
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8481130.bin"
-	.incbin "sound/direct_sound_samples/8481130.pcm"
 
 	.align 2
 DirectSoundWaveData_84830A0:: @ 84830A0
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84830A0.bin"
-	.incbin "sound/direct_sound_samples/84830A0.pcm"
 
 	.align 2
 DirectSoundWaveData_8483804:: @ 8483804
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8483804.bin"
-	.incbin "sound/direct_sound_samples/8483804.pcm"
 
 	.align 2
 DirectSoundWaveData_8485454:: @ 8485454
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8485454.bin"
-	.incbin "sound/direct_sound_samples/8485454.pcm"
 
 	.align 2
 DirectSoundWaveData_8486924:: @ 8486924
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8486924.bin"
-	.incbin "sound/direct_sound_samples/8486924.pcm"
 
 	.align 2
 DirectSoundWaveData_8487330:: @ 8487330
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8487330.bin"
-	.incbin "sound/direct_sound_samples/8487330.pcm"
 
 	.align 2
 DirectSoundWaveData_8488F44:: @ 8488F44
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8488F44.bin"
-	.incbin "sound/direct_sound_samples/8488F44.pcm"
 
 	.align 2
 DirectSoundWaveData_848A8A4:: @ 848A8A4
-	.4byte 0
 	.incbin "sound/direct_sound_samples/848A8A4.bin"
-	.incbin "sound/direct_sound_samples/848A8A4.pcm"
 
 	.align 2
 DirectSoundWaveData_848BD68:: @ 848BD68
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/848BD68.bin"
-	.incbin "sound/direct_sound_samples/848BD68.pcm"
 
 	.align 2
 DirectSoundWaveData_848C4A4:: @ 848C4A4
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/848C4A4.bin"
-	.incbin "sound/direct_sound_samples/848C4A4.pcm"
 
 	.align 2
 DirectSoundWaveData_848E094:: @ 848E094
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/848E094.bin"
-	.incbin "sound/direct_sound_samples/848E094.pcm"
 
 	.align 2
 DirectSoundWaveData_848F448:: @ 848F448
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/848F448.bin"
-	.incbin "sound/direct_sound_samples/848F448.pcm"
 
 	.align 2
 DirectSoundWaveData_8491ACC:: @ 8491ACC
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8491ACC.bin"
-	.incbin "sound/direct_sound_samples/8491ACC.pcm"
 
 	.align 2
 DirectSoundWaveData_8492D10:: @ 8492D10
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8492D10.bin"
-	.incbin "sound/direct_sound_samples/8492D10.pcm"
 
 	.align 2
 DirectSoundWaveData_8493D20:: @ 8493D20
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8493D20.bin"
-	.incbin "sound/direct_sound_samples/8493D20.pcm"
 
 	.align 2
 DirectSoundWaveData_8495028:: @ 8495028
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8495028.bin"
-	.incbin "sound/direct_sound_samples/8495028.pcm"
 
 	.align 2
 DirectSoundWaveData_8497134:: @ 8497134
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8497134.bin"
-	.incbin "sound/direct_sound_samples/8497134.pcm"
 
 	.align 2
 DirectSoundWaveData_8499110:: @ 8499110
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8499110.bin"
-	.incbin "sound/direct_sound_samples/8499110.pcm"
 
 	.align 2
 DirectSoundWaveData_849B320:: @ 849B320
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/849B320.bin"
-	.incbin "sound/direct_sound_samples/849B320.pcm"
 
 	.align 2
 DirectSoundWaveData_849BAEC:: @ 849BAEC
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/849BAEC.bin"
-	.incbin "sound/direct_sound_samples/849BAEC.pcm"
 
 	.align 2
 DirectSoundWaveData_849D45C:: @ 849D45C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/849D45C.bin"
-	.incbin "sound/direct_sound_samples/849D45C.pcm"
 
 	.align 2
 DirectSoundWaveData_849F40C:: @ 849F40C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/849F40C.bin"
-	.incbin "sound/direct_sound_samples/849F40C.pcm"
 
 	.align 2
 DirectSoundWaveData_84A26EC:: @ 84A26EC
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A26EC.bin"
-	.incbin "sound/direct_sound_samples/84A26EC.pcm"
 
 	.align 2
 DirectSoundWaveData_84A311C:: @ 84A311C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A311C.bin"
-	.incbin "sound/direct_sound_samples/84A311C.pcm"
 
 	.align 2
 DirectSoundWaveData_84A3B50:: @ 84A3B50
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A3B50.bin"
-	.incbin "sound/direct_sound_samples/84A3B50.pcm"
 
 	.align 2
 DirectSoundWaveData_84A5690:: @ 84A5690
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A5690.bin"
-	.incbin "sound/direct_sound_samples/84A5690.pcm"
 
 	.align 2
 DirectSoundWaveData_84A5F58:: @ 84A5F58
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A5F58.bin"
-	.incbin "sound/direct_sound_samples/84A5F58.pcm"
 
 	.align 2
 DirectSoundWaveData_84A7328:: @ 84A7328
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A7328.bin"
-	.incbin "sound/direct_sound_samples/84A7328.pcm"
 
 	.align 2
 DirectSoundWaveData_84A7F38:: @ 84A7F38
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A7F38.bin"
-	.incbin "sound/direct_sound_samples/84A7F38.pcm"
 
 	.align 2
 DirectSoundWaveData_84A8AC8:: @ 84A8AC8
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A8AC8.bin"
-	.incbin "sound/direct_sound_samples/84A8AC8.pcm"
 
 	.align 2
 DirectSoundWaveData_84A9564:: @ 84A9564
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A9564.bin"
-	.incbin "sound/direct_sound_samples/84A9564.pcm"
 
 	.align 2
 DirectSoundWaveData_84A9EAC:: @ 84A9EAC
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A9EAC.bin"
-	.incbin "sound/direct_sound_samples/84A9EAC.pcm"
 
 	.align 2
 DirectSoundWaveData_84AA8F4:: @ 84AA8F4
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84AA8F4.bin"
-	.incbin "sound/direct_sound_samples/84AA8F4.pcm"
 
 	.align 2
-CryDirectSound_4AB57C:: @ 84AB57C
-	.incbin "baserom.gba", 0x4ab57c, 0x108c
+Cry_Bulbasaur:: @ 84AB57C
+	.incbin "sound/direct_sound_samples/cry_bulbasaur.bin"
 
 	.align 2
-CryDirectSound_4AC608:: @ 84AC608
-	.incbin "baserom.gba", 0x4ac608, 0x1090
+Cry_Ivysaur:: @ 84AC608
+	.incbin "sound/direct_sound_samples/cry_ivysaur.bin"
 
 	.align 2
-CryDirectSound_4AD698:: @ 84AD698
-	.incbin "baserom.gba", 0x4ad698, 0x1358
+Cry_Venusaur:: @ 84AD698
+	.incbin "sound/direct_sound_samples/cry_venusaur.bin"
 
 	.align 2
-CryDirectSound_4AE9F0:: @ 84AE9F0
-	.incbin "baserom.gba", 0x4ae9f0, 0xe70
+Cry_Charmander:: @ 84AE9F0
+	.incbin "sound/direct_sound_samples/cry_charmander.bin"
 
 	.align 2
-CryDirectSound_4AF860:: @ 84AF860
-	.incbin "baserom.gba", 0x4af860, 0xe80
+Cry_Charmeleon:: @ 84AF860
+	.incbin "sound/direct_sound_samples/cry_charmeleon.bin"
 
 	.align 2
-CryDirectSound_4B06E0:: @ 84B06E0
-	.incbin "baserom.gba", 0x4b06e0, 0x1348
+Cry_Charizard:: @ 84B06E0
+	.incbin "sound/direct_sound_samples/cry_charizard.bin"
 
 	.align 2
-CryDirectSound_4B1A28:: @ 84B1A28
-	.incbin "baserom.gba", 0x4b1a28, 0xe74
+Cry_Squirtle:: @ 84B1A28
+	.incbin "sound/direct_sound_samples/cry_squirtle.bin"
 
 	.align 2
-CryDirectSound_4B289C:: @ 84B289C
-	.incbin "baserom.gba", 0x4b289c, 0x1140
+Cry_Wartortle:: @ 84B289C
+	.incbin "sound/direct_sound_samples/cry_wartortle.bin"
 
 	.align 2
-CryDirectSound_4B39DC:: @ 84B39DC
-	.incbin "baserom.gba", 0x4b39dc, 0x1348
+Cry_Blastoise:: @ 84B39DC
+	.incbin "sound/direct_sound_samples/cry_blastoise.bin"
 
 	.align 2
-CryDirectSound_4B4D24:: @ 84B4D24
-	.incbin "baserom.gba", 0x4b4d24, 0x858
+Cry_Caterpie:: @ 84B4D24
+	.incbin "sound/direct_sound_samples/cry_caterpie.bin"
 
 	.align 2
-CryDirectSound_4B557C:: @ 84B557C
-	.incbin "baserom.gba", 0x4b557c, 0x1750
+Cry_Metapod:: @ 84B557C
+	.incbin "sound/direct_sound_samples/cry_metapod.bin"
 
 	.align 2
-CryDirectSound_4B6CCC:: @ 84B6CCC
-	.incbin "baserom.gba", 0x4b6ccc, 0xa08
+Cry_Butterfree:: @ 84B6CCC
+	.incbin "sound/direct_sound_samples/cry_butterfree.bin"
 
 	.align 2
-CryDirectSound_4B76D4:: @ 84B76D4
-	.incbin "baserom.gba", 0x4b76d4, 0x1044
+Cry_Weedle:: @ 84B76D4
+	.incbin "sound/direct_sound_samples/cry_weedle.bin"
 
 	.align 2
-CryDirectSound_4B8718:: @ 84B8718
-	.incbin "baserom.gba", 0x4b8718, 0x123c
+Cry_Kakuna:: @ 84B8718
+	.incbin "sound/direct_sound_samples/cry_kakuna.bin"
 
 	.align 2
-CryDirectSound_4B9954:: @ 84B9954
-	.incbin "baserom.gba", 0x4b9954, 0x135c
+Cry_Beedrill:: @ 84B9954
+	.incbin "sound/direct_sound_samples/cry_beedrill.bin"
 
 	.align 2
-CryDirectSound_4BACB0:: @ 84BACB0
-	.incbin "baserom.gba", 0x4bacb0, 0x3e8
+Cry_Pidgey:: @ 84BACB0
+	.incbin "sound/direct_sound_samples/cry_pidgey.bin"
 
 	.align 2
-CryDirectSound_4BB098:: @ 84BB098
-	.incbin "baserom.gba", 0x4bb098, 0xf08
+Cry_Pidgeotto:: @ 84BB098
+	.incbin "sound/direct_sound_samples/cry_pidgeotto.bin"
 
 	.align 2
-CryDirectSound_4BBFA0:: @ 84BBFA0
-	.incbin "baserom.gba", 0x4bbfa0, 0x1134
+Cry_Pidgeot:: @ 84BBFA0
+	.incbin "sound/direct_sound_samples/cry_pidgeot.bin"
 
 	.align 2
-CryDirectSound_4BD0D4:: @ 84BD0D4
-	.incbin "baserom.gba", 0x4bd0d4, 0x7e0
+Cry_Rattata:: @ 84BD0D4
+	.incbin "sound/direct_sound_samples/cry_rattata.bin"
 
 	.align 2
-CryDirectSound_4BD8B4:: @ 84BD8B4
-	.incbin "baserom.gba", 0x4bd8b4, 0x984
+Cry_Raticate:: @ 84BD8B4
+	.incbin "sound/direct_sound_samples/cry_raticate.bin"
 
 	.align 2
-CryDirectSound_4BE238:: @ 84BE238
-	.incbin "baserom.gba", 0x4be238, 0x11a4
+Cry_Spearow:: @ 84BE238
+	.incbin "sound/direct_sound_samples/cry_spearow.bin"
 
 	.align 2
-CryDirectSound_4BF3DC:: @ 84BF3DC
-	.incbin "baserom.gba", 0x4bf3dc, 0x113c
+Cry_Fearow:: @ 84BF3DC
+	.incbin "sound/direct_sound_samples/cry_fearow.bin"
 
 	.align 2
-CryDirectSound_4C0518:: @ 84C0518
-	.incbin "baserom.gba", 0x4c0518, 0x134c
+Cry_Ekans:: @ 84C0518
+	.incbin "sound/direct_sound_samples/cry_ekans.bin"
 
 	.align 2
-CryDirectSound_4C1864:: @ 84C1864
-	.incbin "baserom.gba", 0x4c1864, 0x1358
+Cry_Arbok:: @ 84C1864
+	.incbin "sound/direct_sound_samples/cry_arbok.bin"
 
 	.align 2
-CryDirectSound_4C2BBC:: @ 84C2BBC
-	.incbin "baserom.gba", 0x4c2bbc, 0x10a8
+Cry_Pikachu:: @ 84C2BBC
+	.incbin "sound/direct_sound_samples/cry_pikachu.bin"
 
 	.align 2
-CryDirectSound_4C3C64:: @ 84C3C64
-	.incbin "baserom.gba", 0x4c3c64, 0x17c0
+Cry_Raichu:: @ 84C3C64
+	.incbin "sound/direct_sound_samples/cry_raichu.bin"
 
 	.align 2
-CryDirectSound_4C5424:: @ 84C5424
-	.incbin "baserom.gba", 0x4c5424, 0x954
+Cry_Sandshrew:: @ 84C5424
+	.incbin "sound/direct_sound_samples/cry_sandshrew.bin"
 
 	.align 2
-CryDirectSound_4C5D78:: @ 84C5D78
-	.incbin "baserom.gba", 0x4c5d78, 0xd90
+Cry_Sandslash:: @ 84C5D78
+	.incbin "sound/direct_sound_samples/cry_sandslash.bin"
 
 	.align 2
-CryDirectSound_4C6B08:: @ 84C6B08
-	.incbin "baserom.gba", 0x4c6b08, 0x9b0
+Cry_NidoranF:: @ 84C6B08
+	.incbin "sound/direct_sound_samples/cry_nidoran_f.bin"
 
 	.align 2
-CryDirectSound_4C74B8:: @ 84C74B8
-	.incbin "baserom.gba", 0x4c74b8, 0xcc8
+Cry_Nidorina:: @ 84C74B8
+	.incbin "sound/direct_sound_samples/cry_nidorina.bin"
 
 	.align 2
-CryDirectSound_4C8180:: @ 84C8180
-	.incbin "baserom.gba", 0x4c8180, 0x10e0
+Cry_Nidoqueen:: @ 84C8180
+	.incbin "sound/direct_sound_samples/cry_nidoqueen.bin"
 
 	.align 2
-CryDirectSound_4C9260:: @ 84C9260
-	.incbin "baserom.gba", 0x4c9260, 0xa68
+Cry_NidoranM:: @ 84C9260
+	.incbin "sound/direct_sound_samples/cry_nidoran_m.bin"
 
 	.align 2
-CryDirectSound_4C9CC8:: @ 84C9CC8
-	.incbin "baserom.gba", 0x4c9cc8, 0xc14
+Cry_Nidorino:: @ 84C9CC8
+	.incbin "sound/direct_sound_samples/cry_nidorino.bin"
 
 	.align 2
-CryDirectSound_4CA8DC:: @ 84CA8DC
-	.incbin "baserom.gba", 0x4ca8dc, 0x186c
+Cry_Nidoking:: @ 84CA8DC
+	.incbin "sound/direct_sound_samples/cry_nidoking.bin"
 
 	.align 2
-CryDirectSound_4CC148:: @ 84CC148
-	.incbin "baserom.gba", 0x4cc148, 0x870
+Cry_Clefairy:: @ 84CC148
+	.incbin "sound/direct_sound_samples/cry_clefairy.bin"
 
 	.align 2
-CryDirectSound_4CC9B8:: @ 84CC9B8
-	.incbin "baserom.gba", 0x4cc9b8, 0xa90
+Cry_Clefable:: @ 84CC9B8
+	.incbin "sound/direct_sound_samples/cry_clefable.bin"
 
 	.align 2
-CryDirectSound_4CD448:: @ 84CD448
-	.incbin "baserom.gba", 0x4cd448, 0x17d0
+Cry_Vulpix:: @ 84CD448
+	.incbin "sound/direct_sound_samples/cry_vulpix.bin"
 
 	.align 2
-CryDirectSound_4CEC18:: @ 84CEC18
-	.incbin "baserom.gba", 0x4cec18, 0x186c
+Cry_Ninetales:: @ 84CEC18
+	.incbin "sound/direct_sound_samples/cry_ninetales.bin"
 
 	.align 2
-CryDirectSound_4D0484:: @ 84D0484
-	.incbin "baserom.gba", 0x4d0484, 0x564
+Cry_Jigglypuff:: @ 84D0484
+	.incbin "sound/direct_sound_samples/cry_jigglypuff.bin"
 
 	.align 2
-CryDirectSound_4D09E8:: @ 84D09E8
-	.incbin "baserom.gba", 0x4d09e8, 0x6c8
+Cry_Wigglytuff:: @ 84D09E8
+	.incbin "sound/direct_sound_samples/cry_wigglytuff.bin"
 
 	.align 2
-CryDirectSound_4D10B0:: @ 84D10B0
-	.incbin "baserom.gba", 0x4d10b0, 0x136c
+Cry_Zubat:: @ 84D10B0
+	.incbin "sound/direct_sound_samples/cry_zubat.bin"
 
 	.align 2
-CryDirectSound_4D241C:: @ 84D241C
-	.incbin "baserom.gba", 0x4d241c, 0x1364
+Cry_Golbat:: @ 84D241C
+	.incbin "sound/direct_sound_samples/cry_golbat.bin"
 
 	.align 2
-CryDirectSound_4D3780:: @ 84D3780
-	.incbin "baserom.gba", 0x4d3780, 0xe9c
+Cry_Oddish:: @ 84D3780
+	.incbin "sound/direct_sound_samples/cry_oddish.bin"
 
 	.align 2
-CryDirectSound_4D461C:: @ 84D461C
-	.incbin "baserom.gba", 0x4d461c, 0xc7c
+Cry_Gloom:: @ 84D461C
+	.incbin "sound/direct_sound_samples/cry_gloom.bin"
 
 	.align 2
-CryDirectSound_4D5298:: @ 84D5298
-	.incbin "baserom.gba", 0x4d5298, 0x199c
+Cry_Vileplume:: @ 84D5298
+	.incbin "sound/direct_sound_samples/cry_vileplume.bin"
 
 	.align 2
-CryDirectSound_4D6C34:: @ 84D6C34
-	.incbin "baserom.gba", 0x4d6c34, 0x1bf4
+Cry_Paras:: @ 84D6C34
+	.incbin "sound/direct_sound_samples/cry_paras.bin"
 
 	.align 2
-CryDirectSound_4D8828:: @ 84D8828
-	.incbin "baserom.gba", 0x4d8828, 0x1e68
+Cry_Parasect:: @ 84D8828
+	.incbin "sound/direct_sound_samples/cry_parasect.bin"
 
 	.align 2
-CryDirectSound_4DA690:: @ 84DA690
-	.incbin "baserom.gba", 0x4da690, 0xf80
+Cry_Venonat:: @ 84DA690
+	.incbin "sound/direct_sound_samples/cry_venonat.bin"
 
 	.align 2
-CryDirectSound_4DB610:: @ 84DB610
-	.incbin "baserom.gba", 0x4db610, 0x1004
+Cry_Venomoth:: @ 84DB610
+	.incbin "sound/direct_sound_samples/cry_venomoth.bin"
 
 	.align 2
-CryDirectSound_4DC614:: @ 84DC614
-	.incbin "baserom.gba", 0x4dc614, 0x1370
+Cry_Diglett:: @ 84DC614
+	.incbin "sound/direct_sound_samples/cry_diglett.bin"
 
 	.align 2
-CryDirectSound_4DD984:: @ 84DD984
-	.incbin "baserom.gba", 0x4dd984, 0x136c
+Cry_Dugtrio:: @ 84DD984
+	.incbin "sound/direct_sound_samples/cry_dugtrio.bin"
 
 	.align 2
-CryDirectSound_4DECF0:: @ 84DECF0
-	.incbin "baserom.gba", 0x4decf0, 0x990
+Cry_Meowth:: @ 84DECF0
+	.incbin "sound/direct_sound_samples/cry_meowth.bin"
 
 	.align 2
-CryDirectSound_4DF680:: @ 84DF680
-	.incbin "baserom.gba", 0x4df680, 0x12dc
+Cry_Persian:: @ 84DF680
+	.incbin "sound/direct_sound_samples/cry_persian.bin"
 
 	.align 2
-CryDirectSound_4E095C:: @ 84E095C
-	.incbin "baserom.gba", 0x4e095c, 0xd28
+Cry_Psyduck:: @ 84E095C
+	.incbin "sound/direct_sound_samples/cry_psyduck.bin"
 
 	.align 2
-CryDirectSound_4E1684:: @ 84E1684
-	.incbin "baserom.gba", 0x4e1684, 0xb48
+Cry_Golduck:: @ 84E1684
+	.incbin "sound/direct_sound_samples/cry_golduck.bin"
 
 	.align 2
-CryDirectSound_4E21CC:: @ 84E21CC
-	.incbin "baserom.gba", 0x4e21cc, 0x1060
+Cry_Mankey:: @ 84E21CC
+	.incbin "sound/direct_sound_samples/cry_mankey.bin"
 
 	.align 2
-CryDirectSound_4E322C:: @ 84E322C
-	.incbin "baserom.gba", 0x4e322c, 0x1030
+Cry_Primeape:: @ 84E322C
+	.incbin "sound/direct_sound_samples/cry_primeape.bin"
 
 	.align 2
-CryDirectSound_4E425C:: @ 84E425C
-	.incbin "baserom.gba", 0x4e425c, 0xd64
+Cry_Growlithe:: @ 84E425C
+	.incbin "sound/direct_sound_samples/cry_growlithe.bin"
 
 	.align 2
-CryDirectSound_4E4FC0:: @ 84E4FC0
-	.incbin "baserom.gba", 0x4e4fc0, 0x113c
+Cry_Arcanine:: @ 84E4FC0
+	.incbin "sound/direct_sound_samples/cry_arcanine.bin"
 
 	.align 2
-CryDirectSound_4E60FC:: @ 84E60FC
-	.incbin "baserom.gba", 0x4e60fc, 0xb1c
+Cry_Poliwag:: @ 84E60FC
+	.incbin "sound/direct_sound_samples/cry_poliwag.bin"
 
 	.align 2
-CryDirectSound_4E6C18:: @ 84E6C18
-	.incbin "baserom.gba", 0x4e6c18, 0x6a8
+Cry_Poliwhirl:: @ 84E6C18
+	.incbin "sound/direct_sound_samples/cry_poliwhirl.bin"
 
 	.align 2
-CryDirectSound_4E72C0:: @ 84E72C0
-	.incbin "baserom.gba", 0x4e72c0, 0xb24
+Cry_Poliwrath:: @ 84E72C0
+	.incbin "sound/direct_sound_samples/cry_poliwrath.bin"
 
 	.align 2
-CryDirectSound_4E7DE4:: @ 84E7DE4
-	.incbin "baserom.gba", 0x4e7de4, 0x1764
+Cry_Abra:: @ 84E7DE4
+	.incbin "sound/direct_sound_samples/cry_abra.bin"
 
 	.align 2
-CryDirectSound_4E9548:: @ 84E9548
-	.incbin "baserom.gba", 0x4e9548, 0x1ae8
+Cry_Kadabra:: @ 84E9548
+	.incbin "sound/direct_sound_samples/cry_kadabra.bin"
 
 	.align 2
-CryDirectSound_4EB030:: @ 84EB030
-	.incbin "baserom.gba", 0x4eb030, 0x1f9c
+Cry_Alakazam:: @ 84EB030
+	.incbin "sound/direct_sound_samples/cry_alakazam.bin"
 
 	.align 2
-CryDirectSound_4ECFCC:: @ 84ECFCC
-	.incbin "baserom.gba", 0x4ecfcc, 0xd64
+Cry_Machop:: @ 84ECFCC
+	.incbin "sound/direct_sound_samples/cry_machop.bin"
 
 	.align 2
-CryDirectSound_4EDD30:: @ 84EDD30
-	.incbin "baserom.gba", 0x4edd30, 0xd90
+Cry_Machoke:: @ 84EDD30
+	.incbin "sound/direct_sound_samples/cry_machoke.bin"
 
 	.align 2
-CryDirectSound_4EEAC0:: @ 84EEAC0
-	.incbin "baserom.gba", 0x4eeac0, 0x1088
+Cry_Machamp:: @ 84EEAC0
+	.incbin "sound/direct_sound_samples/cry_machamp.bin"
 
 	.align 2
-CryDirectSound_4EFB48:: @ 84EFB48
-	.incbin "baserom.gba", 0x4efb48, 0x78c
+Cry_Bellsprout:: @ 84EFB48
+	.incbin "sound/direct_sound_samples/cry_bellsprout.bin"
 
 	.align 2
-CryDirectSound_4F02D4:: @ 84F02D4
-	.incbin "baserom.gba", 0x4f02d4, 0xea0
+Cry_Weepinbell:: @ 84F02D4
+	.incbin "sound/direct_sound_samples/cry_weepinbell.bin"
 
 	.align 2
-CryDirectSound_4F1174:: @ 84F1174
-	.incbin "baserom.gba", 0x4f1174, 0x134c
+Cry_Victreebel:: @ 84F1174
+	.incbin "sound/direct_sound_samples/cry_victreebel.bin"
 
 	.align 2
-CryDirectSound_4F24C0:: @ 84F24C0
-	.incbin "baserom.gba", 0x4f24c0, 0xff0
+Cry_Tentacool:: @ 84F24C0
+	.incbin "sound/direct_sound_samples/cry_tentacool.bin"
 
 	.align 2
-CryDirectSound_4F34B0:: @ 84F34B0
-	.incbin "baserom.gba", 0x4f34b0, 0x16fc
+Cry_Tentacruel:: @ 84F34B0
+	.incbin "sound/direct_sound_samples/cry_tentacruel.bin"
 
 	.align 2
-CryDirectSound_4F4BAC:: @ 84F4BAC
-	.incbin "baserom.gba", 0x4f4bac, 0x17b4
+Cry_Geodude:: @ 84F4BAC
+	.incbin "sound/direct_sound_samples/cry_geodude.bin"
 
 	.align 2
-CryDirectSound_4F6360:: @ 84F6360
-	.incbin "baserom.gba", 0x4f6360, 0x1be8
+Cry_Graveler:: @ 84F6360
+	.incbin "sound/direct_sound_samples/cry_graveler.bin"
 
 	.align 2
-CryDirectSound_4F7F48:: @ 84F7F48
-	.incbin "baserom.gba", 0x4f7f48, 0xe2c
+Cry_Golem:: @ 84F7F48
+	.incbin "sound/direct_sound_samples/cry_golem.bin"
 
 	.align 2
-CryDirectSound_4F8D74:: @ 84F8D74
-	.incbin "baserom.gba", 0x4f8d74, 0xf10
+Cry_Ponyta:: @ 84F8D74
+	.incbin "sound/direct_sound_samples/cry_ponyta.bin"
 
 	.align 2
-CryDirectSound_4F9C84:: @ 84F9C84
-	.incbin "baserom.gba", 0x4f9c84, 0x12a0
+Cry_Rapidash:: @ 84F9C84
+	.incbin "sound/direct_sound_samples/cry_rapidash.bin"
 
 	.align 2
-CryDirectSound_4FAF24:: @ 84FAF24
-	.incbin "baserom.gba", 0x4faf24, 0x768
+Cry_Slowpoke:: @ 84FAF24
+	.incbin "sound/direct_sound_samples/cry_slowpoke.bin"
 
 	.align 2
-CryDirectSound_4FB68C:: @ 84FB68C
-	.incbin "baserom.gba", 0x4fb68c, 0xd70
+Cry_Slowbro:: @ 84FB68C
+	.incbin "sound/direct_sound_samples/cry_slowbro.bin"
 
 	.align 2
-CryDirectSound_4FC3FC:: @ 84FC3FC
-	.incbin "baserom.gba", 0x4fc3fc, 0x1344
+Cry_Magnemite:: @ 84FC3FC
+	.incbin "sound/direct_sound_samples/cry_magnemite.bin"
 
 	.align 2
-CryDirectSound_4FD740:: @ 84FD740
-	.incbin "baserom.gba", 0x4fd740, 0x17e8
+Cry_Magneton:: @ 84FD740
+	.incbin "sound/direct_sound_samples/cry_magneton.bin"
 
 	.align 2
-CryDirectSound_4FEF28:: @ 84FEF28
-	.incbin "baserom.gba", 0x4fef28, 0x77c
+Cry_Farfetchd:: @ 84FEF28
+	.incbin "sound/direct_sound_samples/cry_farfetchd.bin"
 
 	.align 2
-CryDirectSound_4FF6A4:: @ 84FF6A4
-	.incbin "baserom.gba", 0x4ff6a4, 0x1344
+Cry_Doduo:: @ 84FF6A4
+	.incbin "sound/direct_sound_samples/cry_doduo.bin"
 
 	.align 2
-CryDirectSound_5009E8:: @ 85009E8
-	.incbin "baserom.gba", 0x5009e8, 0x1378
+Cry_Dodrio:: @ 85009E8
+	.incbin "sound/direct_sound_samples/cry_dodrio.bin"
 
 	.align 2
-CryDirectSound_501D60:: @ 8501D60
-	.incbin "baserom.gba", 0x501d60, 0x11f0
+Cry_Seel:: @ 8501D60
+	.incbin "sound/direct_sound_samples/cry_seel.bin"
 
 	.align 2
-CryDirectSound_502F50:: @ 8502F50
-	.incbin "baserom.gba", 0x502f50, 0x1524
+Cry_Dewgong:: @ 8502F50
+	.incbin "sound/direct_sound_samples/cry_dewgong.bin"
 
 	.align 2
-CryDirectSound_504474:: @ 8504474
-	.incbin "baserom.gba", 0x504474, 0xa88
+Cry_Grimer:: @ 8504474
+	.incbin "sound/direct_sound_samples/cry_grimer.bin"
 
 	.align 2
-CryDirectSound_504EFC:: @ 8504EFC
-	.incbin "baserom.gba", 0x504efc, 0xec0
+Cry_Muk:: @ 8504EFC
+	.incbin "sound/direct_sound_samples/cry_muk.bin"
 
 	.align 2
-CryDirectSound_505DBC:: @ 8505DBC
-	.incbin "baserom.gba", 0x505dbc, 0xf74
+Cry_Shellder:: @ 8505DBC
+	.incbin "sound/direct_sound_samples/cry_shellder.bin"
 
 	.align 2
-CryDirectSound_506D30:: @ 8506D30
-	.incbin "baserom.gba", 0x506d30, 0x14c4
+Cry_Cloyster:: @ 8506D30
+	.incbin "sound/direct_sound_samples/cry_cloyster.bin"
 
 	.align 2
-CryDirectSound_5081F4:: @ 85081F4
-	.incbin "baserom.gba", 0x5081f4, 0x1750
+Cry_Gastly:: @ 85081F4
+	.incbin "sound/direct_sound_samples/cry_gastly.bin"
 
 	.align 2
-CryDirectSound_509944:: @ 8509944
-	.incbin "baserom.gba", 0x509944, 0x1780
+Cry_Haunter:: @ 8509944
+	.incbin "sound/direct_sound_samples/cry_haunter.bin"
 
 	.align 2
-CryDirectSound_50B0C4:: @ 850B0C4
-	.incbin "baserom.gba", 0x50b0c4, 0xec0
+Cry_Gengar:: @ 850B0C4
+	.incbin "sound/direct_sound_samples/cry_gengar.bin"
 
 	.align 2
-CryDirectSound_50BF84:: @ 850BF84
-	.incbin "baserom.gba", 0x50bf84, 0x18c4
+Cry_Onix:: @ 850BF84
+	.incbin "sound/direct_sound_samples/cry_onix.bin"
 
 	.align 2
-CryDirectSound_50D848:: @ 850D848
-	.incbin "baserom.gba", 0x50d848, 0x1d18
+Cry_Drowzee:: @ 850D848
+	.incbin "sound/direct_sound_samples/cry_drowzee.bin"
 
 	.align 2
-CryDirectSound_50F560:: @ 850F560
-	.incbin "baserom.gba", 0x50f560, 0x1d04
+Cry_Hypno:: @ 850F560
+	.incbin "sound/direct_sound_samples/cry_hypno.bin"
 
 	.align 2
-CryDirectSound_511264:: @ 8511264
-	.incbin "baserom.gba", 0x511264, 0x184c
+Cry_Krabby:: @ 8511264
+	.incbin "sound/direct_sound_samples/cry_krabby.bin"
 
 	.align 2
-CryDirectSound_512AB0:: @ 8512AB0
-	.incbin "baserom.gba", 0x512ab0, 0x1858
+Cry_Kingler:: @ 8512AB0
+	.incbin "sound/direct_sound_samples/cry_kingler.bin"
 
 	.align 2
-CryDirectSound_514308:: @ 8514308
-	.incbin "baserom.gba", 0x514308, 0x18c4
+Cry_Voltorb:: @ 8514308
+	.incbin "sound/direct_sound_samples/cry_voltorb.bin"
 
 	.align 2
-CryDirectSound_515BCC:: @ 8515BCC
-	.incbin "baserom.gba", 0x515bcc, 0x1938
+Cry_Electrode:: @ 8515BCC
+	.incbin "sound/direct_sound_samples/cry_electrode.bin"
 
 	.align 2
-CryDirectSound_517504:: @ 8517504
-	.incbin "baserom.gba", 0x517504, 0x12e0
+Cry_Exeggcute:: @ 8517504
+	.incbin "sound/direct_sound_samples/cry_exeggcute.bin"
 
 	.align 2
-CryDirectSound_5187E4:: @ 85187E4
-	.incbin "baserom.gba", 0x5187e4, 0x1fe4
+Cry_Exeggutor:: @ 85187E4
+	.incbin "sound/direct_sound_samples/cry_exeggutor.bin"
 
 	.align 2
-CryDirectSound_51A7C8:: @ 851A7C8
-	.incbin "baserom.gba", 0x51a7c8, 0xf20
+Cry_Cubone:: @ 851A7C8
+	.incbin "sound/direct_sound_samples/cry_cubone.bin"
 
 	.align 2
-CryDirectSound_51B6E8:: @ 851B6E8
-	.incbin "baserom.gba", 0x51b6e8, 0xe70
+Cry_Marowak:: @ 851B6E8
+	.incbin "sound/direct_sound_samples/cry_marowak.bin"
 
 	.align 2
-CryDirectSound_51C558:: @ 851C558
-	.incbin "baserom.gba", 0x51c558, 0x12ac
+Cry_Hitmonlee:: @ 851C558
+	.incbin "sound/direct_sound_samples/cry_hitmonlee.bin"
 
 	.align 2
-CryDirectSound_51D804:: @ 851D804
-	.incbin "baserom.gba", 0x51d804, 0x11d8
+Cry_Hitmonchan:: @ 851D804
+	.incbin "sound/direct_sound_samples/cry_hitmonchan.bin"
 
 	.align 2
-CryDirectSound_51E9DC:: @ 851E9DC
-	.incbin "baserom.gba", 0x51e9dc, 0xf28
+Cry_Lickitung:: @ 851E9DC
+	.incbin "sound/direct_sound_samples/cry_lickitung.bin"
 
 	.align 2
-CryDirectSound_51F904:: @ 851F904
-	.incbin "baserom.gba", 0x51f904, 0x145c
+Cry_Koffing:: @ 851F904
+	.incbin "sound/direct_sound_samples/cry_koffing.bin"
 
 	.align 2
-CryDirectSound_520D60:: @ 8520D60
-	.incbin "baserom.gba", 0x520d60, 0x15ac
+Cry_Weezing:: @ 8520D60
+	.incbin "sound/direct_sound_samples/cry_weezing.bin"
 
 	.align 2
-CryDirectSound_52230C:: @ 852230C
-	.incbin "baserom.gba", 0x52230c, 0x136c
+Cry_Rhyhorn:: @ 852230C
+	.incbin "sound/direct_sound_samples/cry_rhyhorn.bin"
 
 	.align 2
-CryDirectSound_523678:: @ 8523678
-	.incbin "baserom.gba", 0x523678, 0x146c
+Cry_Rhydon:: @ 8523678
+	.incbin "sound/direct_sound_samples/cry_rhydon.bin"
 
 	.align 2
-CryDirectSound_524AE4:: @ 8524AE4
-	.incbin "baserom.gba", 0x524ae4, 0xecc
+Cry_Chansey:: @ 8524AE4
+	.incbin "sound/direct_sound_samples/cry_chansey.bin"
 
 	.align 2
-CryDirectSound_5259B0:: @ 85259B0
-	.incbin "baserom.gba", 0x5259b0, 0xf1c
+Cry_Tangela:: @ 85259B0
+	.incbin "sound/direct_sound_samples/cry_tangela.bin"
 
 	.align 2
-CryDirectSound_5268CC:: @ 85268CC
-	.incbin "baserom.gba", 0x5268cc, 0x12b4
+Cry_Kangaskhan:: @ 85268CC
+	.incbin "sound/direct_sound_samples/cry_kangaskhan.bin"
 
 	.align 2
-CryDirectSound_527B80:: @ 8527B80
-	.incbin "baserom.gba", 0x527b80, 0x97c
+Cry_Horsea:: @ 8527B80
+	.incbin "sound/direct_sound_samples/cry_horsea.bin"
 
 	.align 2
-CryDirectSound_5284FC:: @ 85284FC
-	.incbin "baserom.gba", 0x5284fc, 0x86c
+Cry_Seadra:: @ 85284FC
+	.incbin "sound/direct_sound_samples/cry_seadra.bin"
 
 	.align 2
-CryDirectSound_528D68:: @ 8528D68
-	.incbin "baserom.gba", 0x528d68, 0x9d8
+Cry_Goldeen:: @ 8528D68
+	.incbin "sound/direct_sound_samples/cry_goldeen.bin"
 
 	.align 2
-CryDirectSound_529740:: @ 8529740
-	.incbin "baserom.gba", 0x529740, 0x1358
+Cry_Seaking:: @ 8529740
+	.incbin "sound/direct_sound_samples/cry_seaking.bin"
 
 	.align 2
-CryDirectSound_52AA98:: @ 852AA98
-	.incbin "baserom.gba", 0x52aa98, 0x13e8
+Cry_Staryu:: @ 852AA98
+	.incbin "sound/direct_sound_samples/cry_staryu.bin"
 
 	.align 2
-CryDirectSound_52BE80:: @ 852BE80
-	.incbin "baserom.gba", 0x52be80, 0x14dc
+Cry_Starmie:: @ 852BE80
+	.incbin "sound/direct_sound_samples/cry_starmie.bin"
 
 	.align 2
-CryDirectSound_52D35C:: @ 852D35C
-	.incbin "baserom.gba", 0x52d35c, 0x12f0
+Cry_MrMime:: @ 852D35C
+	.incbin "sound/direct_sound_samples/cry_mr_mime.bin"
 
 	.align 2
-CryDirectSound_52E64C:: @ 852E64C
-	.incbin "baserom.gba", 0x52e64c, 0xd5c
+Cry_Scyther:: @ 852E64C
+	.incbin "sound/direct_sound_samples/cry_scyther.bin"
 
 	.align 2
-CryDirectSound_52F3A8:: @ 852F3A8
-	.incbin "baserom.gba", 0x52f3a8, 0x2f74
+Cry_Jynx:: @ 852F3A8
+	.incbin "sound/direct_sound_samples/cry_jynx.bin"
 
 	.align 2
-CryDirectSound_53231C:: @ 853231C
-	.incbin "baserom.gba", 0x53231c, 0x1ee4
+Cry_Electabuzz:: @ 853231C
+	.incbin "sound/direct_sound_samples/cry_electabuzz.bin"
 
 	.align 2
-CryDirectSound_534200:: @ 8534200
-	.incbin "baserom.gba", 0x534200, 0xf7c
+Cry_Magmar:: @ 8534200
+	.incbin "sound/direct_sound_samples/cry_magmar.bin"
 
 	.align 2
-CryDirectSound_53517C:: @ 853517C
-	.incbin "baserom.gba", 0x53517c, 0xc5c
+Cry_Pinsir:: @ 853517C
+	.incbin "sound/direct_sound_samples/cry_pinsir.bin"
 
 	.align 2
-CryDirectSound_535DD8:: @ 8535DD8
-	.incbin "baserom.gba", 0x535dd8, 0x1254
+Cry_Tauros:: @ 8535DD8
+	.incbin "sound/direct_sound_samples/cry_tauros.bin"
 
 	.align 2
-CryDirectSound_53702C:: @ 853702C
-	.incbin "baserom.gba", 0x53702c, 0x1308
+Cry_Magikarp:: @ 853702C
+	.incbin "sound/direct_sound_samples/cry_magikarp.bin"
 
 	.align 2
-CryDirectSound_538334:: @ 8538334
-	.incbin "baserom.gba", 0x538334, 0x1434
+Cry_Gyarados:: @ 8538334
+	.incbin "sound/direct_sound_samples/cry_gyarados.bin"
 
 	.align 2
-CryDirectSound_539768:: @ 8539768
-	.incbin "baserom.gba", 0x539768, 0xed4
+Cry_Lapras:: @ 8539768
+	.incbin "sound/direct_sound_samples/cry_lapras.bin"
 
 	.align 2
-CryDirectSound_53A63C:: @ 853A63C
-	.incbin "baserom.gba", 0x53a63c, 0xb1c
+Cry_Ditto:: @ 853A63C
+	.incbin "sound/direct_sound_samples/cry_ditto.bin"
 
 	.align 2
-CryDirectSound_53B158:: @ 853B158
-	.incbin "baserom.gba", 0x53b158, 0xe38
+Cry_Eevee:: @ 853B158
+	.incbin "sound/direct_sound_samples/cry_eevee.bin"
 
 	.align 2
-CryDirectSound_53BF90:: @ 853BF90
-	.incbin "baserom.gba", 0x53bf90, 0x1618
+Cry_Vaporeon:: @ 853BF90
+	.incbin "sound/direct_sound_samples/cry_vaporeon.bin"
 
 	.align 2
-CryDirectSound_53D5A8:: @ 853D5A8
-	.incbin "baserom.gba", 0x53d5a8, 0xfd4
+Cry_Jolteon:: @ 853D5A8
+	.incbin "sound/direct_sound_samples/cry_jolteon.bin"
 
 	.align 2
-CryDirectSound_53E57C:: @ 853E57C
-	.incbin "baserom.gba", 0x53e57c, 0xf84
+Cry_Flareon:: @ 853E57C
+	.incbin "sound/direct_sound_samples/cry_flareon.bin"
 
 	.align 2
-CryDirectSound_53F500:: @ 853F500
-	.incbin "baserom.gba", 0x53f500, 0x140c
+Cry_Porygon:: @ 853F500
+	.incbin "sound/direct_sound_samples/cry_porygon.bin"
 
 	.align 2
-CryDirectSound_54090C:: @ 854090C
-	.incbin "baserom.gba", 0x54090c, 0xd58
+Cry_Omanyte:: @ 854090C
+	.incbin "sound/direct_sound_samples/cry_omanyte.bin"
 
 	.align 2
-CryDirectSound_541664:: @ 8541664
-	.incbin "baserom.gba", 0x541664, 0xd54
+Cry_Omastar:: @ 8541664
+	.incbin "sound/direct_sound_samples/cry_omastar.bin"
 
 	.align 2
-CryDirectSound_5423B8:: @ 85423B8
-	.incbin "baserom.gba", 0x5423b8, 0xc54
+Cry_Kabuto:: @ 85423B8
+	.incbin "sound/direct_sound_samples/cry_kabuto.bin"
 
 	.align 2
-CryDirectSound_54300C:: @ 854300C
-	.incbin "baserom.gba", 0x54300c, 0xdbc
+Cry_Kabutops:: @ 854300C
+	.incbin "sound/direct_sound_samples/cry_kabutops.bin"
 
 	.align 2
-CryDirectSound_543DC8:: @ 8543DC8
-	.incbin "baserom.gba", 0x543dc8, 0x185c
+Cry_Aerodactyl:: @ 8543DC8
+	.incbin "sound/direct_sound_samples/cry_aerodactyl.bin"
 
 	.align 2
-CryDirectSound_545624:: @ 8545624
-	.incbin "baserom.gba", 0x545624, 0x53c
+Cry_Snorlax:: @ 8545624
+	.incbin "sound/direct_sound_samples/cry_snorlax.bin"
 
 	.align 2
-CryDirectSound_545B60:: @ 8545B60
-	.incbin "baserom.gba", 0x545b60, 0x17a8
+Cry_Articuno:: @ 8545B60
+	.incbin "sound/direct_sound_samples/cry_articuno.bin"
 
 	.align 2
-CryDirectSound_547308:: @ 8547308
-	.incbin "baserom.gba", 0x547308, 0xf78
+Cry_Zapdos:: @ 8547308
+	.incbin "sound/direct_sound_samples/cry_zapdos.bin"
 
 	.align 2
-CryDirectSound_548280:: @ 8548280
-	.incbin "baserom.gba", 0x548280, 0x17ac
+Cry_Moltres:: @ 8548280
+	.incbin "sound/direct_sound_samples/cry_moltres.bin"
 
 	.align 2
-CryDirectSound_549A2C:: @ 8549A2C
-	.incbin "baserom.gba", 0x549a2c, 0xb9c
+Cry_Dratini:: @ 8549A2C
+	.incbin "sound/direct_sound_samples/cry_dratini.bin"
 
 	.align 2
-CryDirectSound_54A5C8:: @ 854A5C8
-	.incbin "baserom.gba", 0x54a5c8, 0x10a8
+Cry_Dragonair:: @ 854A5C8
+	.incbin "sound/direct_sound_samples/cry_dragonair.bin"
 
 	.align 2
-CryDirectSound_54B670:: @ 854B670
-	.incbin "baserom.gba", 0x54b670, 0x130c
+Cry_Dragonite:: @ 854B670
+	.incbin "sound/direct_sound_samples/cry_dragonite.bin"
 
 	.align 2
-CryDirectSound_54C97C:: @ 854C97C
-	.incbin "baserom.gba", 0x54c97c, 0x1e68
+Cry_Mewtwo:: @ 854C97C
+	.incbin "sound/direct_sound_samples/cry_mewtwo.bin"
 
 	.align 2
-CryDirectSound_54E7E4:: @ 854E7E4
-	.incbin "baserom.gba", 0x54e7e4, 0x1e68
+Cry_Mew:: @ 854E7E4
+	.incbin "sound/direct_sound_samples/cry_mew.bin"
 
 	.align 2
-CryDirectSound_55064C:: @ 855064C
-	.incbin "baserom.gba", 0x55064c, 0x540
+Cry_Chikorita:: @ 855064C
+	.incbin "sound/direct_sound_samples/cry_chikorita.bin"
 
 	.align 2
-CryDirectSound_550B8C:: @ 8550B8C
-	.incbin "baserom.gba", 0x550b8c, 0x8cc
+Cry_Bayleef:: @ 8550B8C
+	.incbin "sound/direct_sound_samples/cry_bayleef.bin"
 
 	.align 2
-CryDirectSound_551458:: @ 8551458
-	.incbin "baserom.gba", 0x551458, 0x1038
+Cry_Meganium:: @ 8551458
+	.incbin "sound/direct_sound_samples/cry_meganium.bin"
 
 	.align 2
-CryDirectSound_552490:: @ 8552490
-	.incbin "baserom.gba", 0x552490, 0x704
+Cry_Cyndaquil:: @ 8552490
+	.incbin "sound/direct_sound_samples/cry_cyndaquil.bin"
 
 	.align 2
-CryDirectSound_552B94:: @ 8552B94
-	.incbin "baserom.gba", 0x552b94, 0xbe8
+Cry_Quilava:: @ 8552B94
+	.incbin "sound/direct_sound_samples/cry_quilava.bin"
 
 	.align 2
-CryDirectSound_55377C:: @ 855377C
-	.incbin "baserom.gba", 0x55377c, 0x2610
+Cry_Typhlosion:: @ 855377C
+	.incbin "sound/direct_sound_samples/cry_typhlosion.bin"
 
 	.align 2
-CryDirectSound_555D8C:: @ 8555D8C
-	.incbin "baserom.gba", 0x555d8c, 0x1258
+Cry_Totodile:: @ 8555D8C
+	.incbin "sound/direct_sound_samples/cry_totodile.bin"
 
 	.align 2
-CryDirectSound_556FE4:: @ 8556FE4
-	.incbin "baserom.gba", 0x556fe4, 0x143c
+Cry_Croconaw:: @ 8556FE4
+	.incbin "sound/direct_sound_samples/cry_croconaw.bin"
 
 	.align 2
-CryDirectSound_558420:: @ 8558420
-	.incbin "baserom.gba", 0x558420, 0x1984
+Cry_Feraligatr:: @ 8558420
+	.incbin "sound/direct_sound_samples/cry_feraligatr.bin"
 
 	.align 2
-CryDirectSound_559DA4:: @ 8559DA4
-	.incbin "baserom.gba", 0x559da4, 0x428
+Cry_Sentret:: @ 8559DA4
+	.incbin "sound/direct_sound_samples/cry_sentret.bin"
 
 	.align 2
-CryDirectSound_55A1CC:: @ 855A1CC
-	.incbin "baserom.gba", 0x55a1cc, 0x648
+Cry_Furret:: @ 855A1CC
+	.incbin "sound/direct_sound_samples/cry_furret.bin"
 
 	.align 2
-CryDirectSound_55A814:: @ 855A814
-	.incbin "baserom.gba", 0x55a814, 0xae4
+Cry_Hoothoot:: @ 855A814
+	.incbin "sound/direct_sound_samples/cry_hoothoot.bin"
 
 	.align 2
-CryDirectSound_55B2F8:: @ 855B2F8
-	.incbin "baserom.gba", 0x55b2f8, 0x1530
+Cry_Noctowl:: @ 855B2F8
+	.incbin "sound/direct_sound_samples/cry_noctowl.bin"
 
 	.align 2
-CryDirectSound_55C828:: @ 855C828
-	.incbin "baserom.gba", 0x55c828, 0x6f8
+Cry_Ledyba:: @ 855C828
+	.incbin "sound/direct_sound_samples/cry_ledyba.bin"
 
 	.align 2
-CryDirectSound_55CF20:: @ 855CF20
-	.incbin "baserom.gba", 0x55cf20, 0x864
+Cry_Ledian:: @ 855CF20
+	.incbin "sound/direct_sound_samples/cry_ledian.bin"
 
 	.align 2
-CryDirectSound_55D784:: @ 855D784
-	.incbin "baserom.gba", 0x55d784, 0xd64
+Cry_Spinarak:: @ 855D784
+	.incbin "sound/direct_sound_samples/cry_spinarak.bin"
 
 	.align 2
-CryDirectSound_55E4E8:: @ 855E4E8
-	.incbin "baserom.gba", 0x55e4e8, 0xc54
+Cry_Ariados:: @ 855E4E8
+	.incbin "sound/direct_sound_samples/cry_ariados.bin"
 
 	.align 2
-CryDirectSound_55F13C:: @ 855F13C
-	.incbin "baserom.gba", 0x55f13c, 0x1730
+Cry_Crobat:: @ 855F13C
+	.incbin "sound/direct_sound_samples/cry_crobat.bin"
 
 	.align 2
-CryDirectSound_56086C:: @ 856086C
-	.incbin "baserom.gba", 0x56086c, 0xcb0
+Cry_Chinchou:: @ 856086C
+	.incbin "sound/direct_sound_samples/cry_chinchou.bin"
 
 	.align 2
-CryDirectSound_56151C:: @ 856151C
-	.incbin "baserom.gba", 0x56151c, 0xa8c
+Cry_Lanturn:: @ 856151C
+	.incbin "sound/direct_sound_samples/cry_lanturn.bin"
 
 	.align 2
-CryDirectSound_561FA8:: @ 8561FA8
-	.incbin "baserom.gba", 0x561fa8, 0x754
+Cry_Pichu:: @ 8561FA8
+	.incbin "sound/direct_sound_samples/cry_pichu.bin"
 
 	.align 2
-CryDirectSound_5626FC:: @ 85626FC
-	.incbin "baserom.gba", 0x5626fc, 0x5f0
+Cry_Cleffa:: @ 85626FC
+	.incbin "sound/direct_sound_samples/cry_cleffa.bin"
 
 	.align 2
-CryDirectSound_562CEC:: @ 8562CEC
-	.incbin "baserom.gba", 0x562cec, 0x6fc
+Cry_Igglybuff:: @ 8562CEC
+	.incbin "sound/direct_sound_samples/cry_igglybuff.bin"
 
 	.align 2
-CryDirectSound_5633E8:: @ 85633E8
-	.incbin "baserom.gba", 0x5633e8, 0xae8
+Cry_Togepi:: @ 85633E8
+	.incbin "sound/direct_sound_samples/cry_togepi.bin"
 
 	.align 2
-CryDirectSound_563ED0:: @ 8563ED0
-	.incbin "baserom.gba", 0x563ed0, 0x700
+Cry_Togetic:: @ 8563ED0
+	.incbin "sound/direct_sound_samples/cry_togetic.bin"
 
 	.align 2
-CryDirectSound_5645D0:: @ 85645D0
-	.incbin "baserom.gba", 0x5645d0, 0xa90
+Cry_Natu:: @ 85645D0
+	.incbin "sound/direct_sound_samples/cry_natu.bin"
 
 	.align 2
-CryDirectSound_565060:: @ 8565060
-	.incbin "baserom.gba", 0x565060, 0xecc
+Cry_Xatu:: @ 8565060
+	.incbin "sound/direct_sound_samples/cry_xatu.bin"
 
 	.align 2
-CryDirectSound_565F2C:: @ 8565F2C
-	.incbin "baserom.gba", 0x565f2c, 0x758
+Cry_Mareep:: @ 8565F2C
+	.incbin "sound/direct_sound_samples/cry_mareep.bin"
 
 	.align 2
-CryDirectSound_566684:: @ 8566684
-	.incbin "baserom.gba", 0x566684, 0xdb4
+Cry_Flaaffy:: @ 8566684
+	.incbin "sound/direct_sound_samples/cry_flaaffy.bin"
 
 	.align 2
-CryDirectSound_567438:: @ 8567438
-	.incbin "baserom.gba", 0x567438, 0x1080
+Cry_Ampharos:: @ 8567438
+	.incbin "sound/direct_sound_samples/cry_ampharos.bin"
 
 	.align 2
-CryDirectSound_5684B8:: @ 85684B8
-	.incbin "baserom.gba", 0x5684b8, 0xe18
+Cry_Bellossom:: @ 85684B8
+	.incbin "sound/direct_sound_samples/cry_bellossom.bin"
 
 	.align 2
-CryDirectSound_5692D0:: @ 85692D0
-	.incbin "baserom.gba", 0x5692d0, 0xd14
+Cry_Marill:: @ 85692D0
+	.incbin "sound/direct_sound_samples/cry_marill.bin"
 
 	.align 2
-CryDirectSound_569FE4:: @ 8569FE4
-	.incbin "baserom.gba", 0x569fe4, 0x10ec
+Cry_Azumarill:: @ 8569FE4
+	.incbin "sound/direct_sound_samples/cry_azumarill.bin"
 
 	.align 2
-CryDirectSound_56B0D0:: @ 856B0D0
-	.incbin "baserom.gba", 0x56b0d0, 0x1030
+Cry_Sudowoodo:: @ 856B0D0
+	.incbin "sound/direct_sound_samples/cry_sudowoodo.bin"
 
 	.align 2
-CryDirectSound_56C100:: @ 856C100
-	.incbin "baserom.gba", 0x56c100, 0x1244
+Cry_Politoed:: @ 856C100
+	.incbin "sound/direct_sound_samples/cry_politoed.bin"
 
 	.align 2
-CryDirectSound_56D344:: @ 856D344
-	.incbin "baserom.gba", 0x56d344, 0x86c
+Cry_Hoppip:: @ 856D344
+	.incbin "sound/direct_sound_samples/cry_hoppip.bin"
 
 	.align 2
-CryDirectSound_56DBB0:: @ 856DBB0
-	.incbin "baserom.gba", 0x56dbb0, 0xd08
+Cry_Skiploom:: @ 856DBB0
+	.incbin "sound/direct_sound_samples/cry_skiploom.bin"
 
 	.align 2
-CryDirectSound_56E8B8:: @ 856E8B8
-	.incbin "baserom.gba", 0x56e8b8, 0x103c
+Cry_Jumpluff:: @ 856E8B8
+	.incbin "sound/direct_sound_samples/cry_jumpluff.bin"
 
 	.align 2
-CryDirectSound_56F8F4:: @ 856F8F4
-	.incbin "baserom.gba", 0x56f8f4, 0xe20
+Cry_Aipom:: @ 856F8F4
+	.incbin "sound/direct_sound_samples/cry_aipom.bin"
 
 	.align 2
-CryDirectSound_570714:: @ 8570714
-	.incbin "baserom.gba", 0x570714, 0x814
+Cry_Sunkern:: @ 8570714
+	.incbin "sound/direct_sound_samples/cry_sunkern.bin"
 
 	.align 2
-CryDirectSound_570F28:: @ 8570F28
-	.incbin "baserom.gba", 0x570f28, 0xfe0
+Cry_Sunflora:: @ 8570F28
+	.incbin "sound/direct_sound_samples/cry_sunflora.bin"
 
 	.align 2
-CryDirectSound_571F08:: @ 8571F08
-	.incbin "baserom.gba", 0x571f08, 0x1108
+Cry_Yanma:: @ 8571F08
+	.incbin "sound/direct_sound_samples/cry_yanma.bin"
 
 	.align 2
-CryDirectSound_573010:: @ 8573010
-	.incbin "baserom.gba", 0x573010, 0x760
+Cry_Wooper:: @ 8573010
+	.incbin "sound/direct_sound_samples/cry_wooper.bin"
 
 	.align 2
-CryDirectSound_573770:: @ 8573770
-	.incbin "baserom.gba", 0x573770, 0xd60
+Cry_Quagsire:: @ 8573770
+	.incbin "sound/direct_sound_samples/cry_quagsire.bin"
 
 	.align 2
-CryDirectSound_5744D0:: @ 85744D0
-	.incbin "baserom.gba", 0x5744d0, 0x13b4
+Cry_Espeon:: @ 85744D0
+	.incbin "sound/direct_sound_samples/cry_espeon.bin"
 
 	.align 2
-CryDirectSound_575884:: @ 8575884
-	.incbin "baserom.gba", 0x575884, 0xf80
+Cry_Umbreon:: @ 8575884
+	.incbin "sound/direct_sound_samples/cry_umbreon.bin"
 
 	.align 2
-CryDirectSound_576804:: @ 8576804
-	.incbin "baserom.gba", 0x576804, 0x10c4
+Cry_Murkrow:: @ 8576804
+	.incbin "sound/direct_sound_samples/cry_murkrow.bin"
 
 	.align 2
-CryDirectSound_5778C8:: @ 85778C8
-	.incbin "baserom.gba", 0x5778c8, 0x17e4
+Cry_Slowking:: @ 85778C8
+	.incbin "sound/direct_sound_samples/cry_slowking.bin"
 
 	.align 2
-CryDirectSound_5790AC:: @ 85790AC
-	.incbin "baserom.gba", 0x5790ac, 0xba0
+Cry_Misdreavus:: @ 85790AC
+	.incbin "sound/direct_sound_samples/cry_misdreavus.bin"
 
 	.align 2
-CryDirectSound_579C4C:: @ 8579C4C
-	.incbin "baserom.gba", 0x579c4c, 0xd28
+Cry_Unown:: @ 8579C4C
+	.incbin "sound/direct_sound_samples/cry_unown.bin"
 
 	.align 2
-CryDirectSound_57A974:: @ 857A974
-	.incbin "baserom.gba", 0x57a974, 0x149c
+Cry_Wobbuffet:: @ 857A974
+	.incbin "sound/direct_sound_samples/cry_wobbuffet.bin"
 
 	.align 2
-CryDirectSound_57BE10:: @ 857BE10
-	.incbin "baserom.gba", 0x57be10, 0xeb4
+Cry_Girafarig:: @ 857BE10
+	.incbin "sound/direct_sound_samples/cry_girafarig.bin"
 
 	.align 2
-CryDirectSound_57CCC4:: @ 857CCC4
-	.incbin "baserom.gba", 0x57ccc4, 0xd60
+Cry_Pineco:: @ 857CCC4
+	.incbin "sound/direct_sound_samples/cry_pineco.bin"
 
 	.align 2
-CryDirectSound_57DA24:: @ 857DA24
-	.incbin "baserom.gba", 0x57da24, 0x1408
+Cry_Forretress:: @ 857DA24
+	.incbin "sound/direct_sound_samples/cry_forretress.bin"
 
 	.align 2
-CryDirectSound_57EE2C:: @ 857EE2C
-	.incbin "baserom.gba", 0x57ee2c, 0xfe0
+Cry_Dunsparce:: @ 857EE2C
+	.incbin "sound/direct_sound_samples/cry_dunsparce.bin"
 
 	.align 2
-CryDirectSound_57FE0C:: @ 857FE0C
-	.incbin "baserom.gba", 0x57fe0c, 0xc20
+Cry_Gligar:: @ 857FE0C
+	.incbin "sound/direct_sound_samples/cry_gligar.bin"
 
 	.align 2
-CryDirectSound_580A2C:: @ 8580A2C
-	.incbin "baserom.gba", 0x580a2c, 0x2628
+Cry_Steelix:: @ 8580A2C
+	.incbin "sound/direct_sound_samples/cry_steelix.bin"
 
 	.align 2
-CryDirectSound_583054:: @ 8583054
-	.incbin "baserom.gba", 0x583054, 0xe74
+Cry_Snubbull:: @ 8583054
+	.incbin "sound/direct_sound_samples/cry_snubbull.bin"
 
 	.align 2
-CryDirectSound_583EC8:: @ 8583EC8
-	.incbin "baserom.gba", 0x583ec8, 0x17a4
+Cry_Granbull:: @ 8583EC8
+	.incbin "sound/direct_sound_samples/cry_granbull.bin"
 
 	.align 2
-CryDirectSound_58566C:: @ 858566C
-	.incbin "baserom.gba", 0x58566c, 0xb9c
+Cry_Qwilfish:: @ 858566C
+	.incbin "sound/direct_sound_samples/cry_qwilfish.bin"
 
 	.align 2
-CryDirectSound_586208:: @ 8586208
-	.incbin "baserom.gba", 0x586208, 0x16fc
+Cry_Scizor:: @ 8586208
+	.incbin "sound/direct_sound_samples/cry_scizor.bin"
 
 	.align 2
-CryDirectSound_587904:: @ 8587904
-	.incbin "baserom.gba", 0x587904, 0xa34
+Cry_Shuckle:: @ 8587904
+	.incbin "sound/direct_sound_samples/cry_shuckle.bin"
 
 	.align 2
-CryDirectSound_588338:: @ 8588338
-	.incbin "baserom.gba", 0x588338, 0x1254
+Cry_Heracross:: @ 8588338
+	.incbin "sound/direct_sound_samples/cry_heracross.bin"
 
 	.align 2
-CryDirectSound_58958C:: @ 858958C
-	.incbin "baserom.gba", 0x58958c, 0x924
+Cry_Sneasel:: @ 858958C
+	.incbin "sound/direct_sound_samples/cry_sneasel.bin"
 
 	.align 2
-CryDirectSound_589EB0:: @ 8589EB0
-	.incbin "baserom.gba", 0x589eb0, 0x108c
+Cry_Teddiursa:: @ 8589EB0
+	.incbin "sound/direct_sound_samples/cry_teddiursa.bin"
 
 	.align 2
-CryDirectSound_58AF3C:: @ 858AF3C
-	.incbin "baserom.gba", 0x58af3c, 0x1dd8
+Cry_Ursaring:: @ 858AF3C
+	.incbin "sound/direct_sound_samples/cry_ursaring.bin"
 
 	.align 2
-CryDirectSound_58CD14:: @ 858CD14
-	.incbin "baserom.gba", 0x58cd14, 0x1118
+Cry_Slugma:: @ 858CD14
+	.incbin "sound/direct_sound_samples/cry_slugma.bin"
 
 	.align 2
-CryDirectSound_58DE2C:: @ 858DE2C
-	.incbin "baserom.gba", 0x58de2c, 0x1508
+Cry_Magcargo:: @ 858DE2C
+	.incbin "sound/direct_sound_samples/cry_magcargo.bin"
 
 	.align 2
-CryDirectSound_58F334:: @ 858F334
-	.incbin "baserom.gba", 0x58f334, 0xca8
+Cry_Swinub:: @ 858F334
+	.incbin "sound/direct_sound_samples/cry_swinub.bin"
 
 	.align 2
-CryDirectSound_58FFDC:: @ 858FFDC
-	.incbin "baserom.gba", 0x58ffdc, 0xcf4
+Cry_Piloswine:: @ 858FFDC
+	.incbin "sound/direct_sound_samples/cry_piloswine.bin"
 
 	.align 2
-CryDirectSound_590CD0:: @ 8590CD0
-	.incbin "baserom.gba", 0x590cd0, 0xce0
+Cry_Corsola:: @ 8590CD0
+	.incbin "sound/direct_sound_samples/cry_corsola.bin"
 
 	.align 2
-CryDirectSound_5919B0:: @ 85919B0
-	.incbin "baserom.gba", 0x5919b0, 0xa90
+Cry_Remoraid:: @ 85919B0
+	.incbin "sound/direct_sound_samples/cry_remoraid.bin"
 
 	.align 2
-CryDirectSound_592440:: @ 8592440
-	.incbin "baserom.gba", 0x592440, 0x1a44
+Cry_Octillery:: @ 8592440
+	.incbin "sound/direct_sound_samples/cry_octillery.bin"
 
 	.align 2
-CryDirectSound_593E84:: @ 8593E84
-	.incbin "baserom.gba", 0x593e84, 0x1034
+Cry_Delibird:: @ 8593E84
+	.incbin "sound/direct_sound_samples/cry_delibird.bin"
 
 	.align 2
-CryDirectSound_594EB8:: @ 8594EB8
-	.incbin "baserom.gba", 0x594eb8, 0xfc8
+Cry_Mantine:: @ 8594EB8
+	.incbin "sound/direct_sound_samples/cry_mantine.bin"
 
 	.align 2
-CryDirectSound_595E80:: @ 8595E80
-	.incbin "baserom.gba", 0x595e80, 0x1808
+Cry_Skarmory:: @ 8595E80
+	.incbin "sound/direct_sound_samples/cry_skarmory.bin"
 
 	.align 2
-CryDirectSound_597688:: @ 8597688
-	.incbin "baserom.gba", 0x597688, 0xca8
+Cry_Houndour:: @ 8597688
+	.incbin "sound/direct_sound_samples/cry_houndour.bin"
 
 	.align 2
-CryDirectSound_598330:: @ 8598330
-	.incbin "baserom.gba", 0x598330, 0x13b0
+Cry_Houndoom:: @ 8598330
+	.incbin "sound/direct_sound_samples/cry_houndoom.bin"
 
 	.align 2
-CryDirectSound_5996E0:: @ 85996E0
-	.incbin "baserom.gba", 0x5996e0, 0xdd8
+Cry_Kingdra:: @ 85996E0
+	.incbin "sound/direct_sound_samples/cry_kingdra.bin"
 
 	.align 2
-CryDirectSound_59A4B8:: @ 859A4B8
-	.incbin "baserom.gba", 0x59a4b8, 0xb50
+Cry_Phanpy:: @ 859A4B8
+	.incbin "sound/direct_sound_samples/cry_phanpy.bin"
 
 	.align 2
-CryDirectSound_59B008:: @ 859B008
-	.incbin "baserom.gba", 0x59b008, 0x1124
+Cry_Donphan:: @ 859B008
+	.incbin "sound/direct_sound_samples/cry_donphan.bin"
 
 	.align 2
-CryDirectSound_59C12C:: @ 859C12C
-	.incbin "baserom.gba", 0x59c12c, 0xfb8
+Cry_Porygon2:: @ 859C12C
+	.incbin "sound/direct_sound_samples/cry_porygon2.bin"
 
 	.align 2
-CryDirectSound_59D0E4:: @ 859D0E4
-	.incbin "baserom.gba", 0x59d0e4, 0x167c
+Cry_Stantler:: @ 859D0E4
+	.incbin "sound/direct_sound_samples/cry_stantler.bin"
 
 	.align 2
-CryDirectSound_59E760:: @ 859E760
-	.incbin "baserom.gba", 0x59e760, 0xa34
+Cry_Smeargle:: @ 859E760
+	.incbin "sound/direct_sound_samples/cry_smeargle.bin"
 
 	.align 2
-CryDirectSound_59F194:: @ 859F194
-	.incbin "baserom.gba", 0x59f194, 0x1028
+Cry_Tyrogue:: @ 859F194
+	.incbin "sound/direct_sound_samples/cry_tyrogue.bin"
 
 	.align 2
-CryDirectSound_5A01BC:: @ 85A01BC
-	.incbin "baserom.gba", 0x5a01bc, 0xde0
+Cry_Hitmontop:: @ 85A01BC
+	.incbin "sound/direct_sound_samples/cry_hitmontop.bin"
 
 	.align 2
-CryDirectSound_5A0F9C:: @ 85A0F9C
-	.incbin "baserom.gba", 0x5a0f9c, 0xbb4
+Cry_Smoochum:: @ 85A0F9C
+	.incbin "sound/direct_sound_samples/cry_smoochum.bin"
 
 	.align 2
-CryDirectSound_5A1B50:: @ 85A1B50
-	.incbin "baserom.gba", 0x5a1b50, 0xa8c
+Cry_Elekid:: @ 85A1B50
+	.incbin "sound/direct_sound_samples/cry_elekid.bin"
 
 	.align 2
-CryDirectSound_5A25DC:: @ 85A25DC
-	.incbin "baserom.gba", 0x5a25dc, 0xe70
+Cry_Magby:: @ 85A25DC
+	.incbin "sound/direct_sound_samples/cry_magby.bin"
 
 	.align 2
-CryDirectSound_5A344C:: @ 85A344C
-	.incbin "baserom.gba", 0x5a344c, 0xedc
+Cry_Miltank:: @ 85A344C
+	.incbin "sound/direct_sound_samples/cry_miltank.bin"
 
 	.align 2
-CryDirectSound_5A4328:: @ 85A4328
-	.incbin "baserom.gba", 0x5a4328, 0x1094
+Cry_Blissey:: @ 85A4328
+	.incbin "sound/direct_sound_samples/cry_blissey.bin"
 
 	.align 2
-CryDirectSound_5A53BC:: @ 85A53BC
-	.incbin "baserom.gba", 0x5a53bc, 0x1170
+Cry_Raikou:: @ 85A53BC
+	.incbin "sound/direct_sound_samples/cry_raikou.bin"
 
 	.align 2
-CryDirectSound_5A652C:: @ 85A652C
-	.incbin "baserom.gba", 0x5a652c, 0x1474
+Cry_Entei:: @ 85A652C
+	.incbin "sound/direct_sound_samples/cry_entei.bin"
 
 	.align 2
-CryDirectSound_5A79A0:: @ 85A79A0
-	.incbin "baserom.gba", 0x5a79a0, 0x1248
+Cry_Suicune:: @ 85A79A0
+	.incbin "sound/direct_sound_samples/cry_suicune.bin"
 
 	.align 2
-CryDirectSound_5A8BE8:: @ 85A8BE8
-	.incbin "baserom.gba", 0x5a8be8, 0xcb0
+Cry_Larvitar:: @ 85A8BE8
+	.incbin "sound/direct_sound_samples/cry_larvitar.bin"
 
 	.align 2
-CryDirectSound_5A9898:: @ 85A9898
-	.incbin "baserom.gba", 0x5a9898, 0x870
+Cry_Pupitar:: @ 85A9898
+	.incbin "sound/direct_sound_samples/cry_pupitar.bin"
 
 	.align 2
-CryDirectSound_5AA108:: @ 85AA108
-	.incbin "baserom.gba", 0x5aa108, 0x1760
+Cry_Tyranitar:: @ 85AA108
+	.incbin "sound/direct_sound_samples/cry_tyranitar.bin"
 
 	.align 2
-CryDirectSound_5AB868:: @ 85AB868
-	.incbin "baserom.gba", 0x5ab868, 0x25f8
+Cry_Lugia:: @ 85AB868
+	.incbin "sound/direct_sound_samples/cry_lugia.bin"
 
 	.align 2
-CryDirectSound_5ADE60:: @ 85ADE60
-	.incbin "baserom.gba", 0x5ade60, 0x1694
+Cry_HoOh:: @ 85ADE60
+	.incbin "sound/direct_sound_samples/cry_ho_oh.bin"
 
 	.align 2
-CryDirectSound_5AF4F4:: @ 85AF4F4
-	.incbin "baserom.gba", 0x5af4f4, 0xe78
+Cry_Celebi:: @ 85AF4F4
+	.incbin "sound/direct_sound_samples/cry_celebi.bin"
 
 	.align 2
-CryDirectSound_5B036C:: @ 85B036C
-	.incbin "baserom.gba", 0x5b036c, 0x860
+Cry_Kecleon:: @ 85B036C
+	.incbin "sound/direct_sound_samples/cry_kecleon.bin"
 
 	.align 2
-CryDirectSound_5B0BCC:: @ 85B0BCC
-	.incbin "baserom.gba", 0x5b0bcc, 0xac0
+Cry_Roselia:: @ 85B0BCC
+	.incbin "sound/direct_sound_samples/cry_roselia.bin"
 
 	.align 2
-CryDirectSound_5B168C:: @ 85B168C
-	.incbin "baserom.gba", 0x5b168c, 0x94c
+Cry_Torkoal:: @ 85B168C
+	.incbin "sound/direct_sound_samples/cry_torkoal.bin"
 
 	.align 2
-CryDirectSound_5B1FD8:: @ 85B1FD8
-	.incbin "baserom.gba", 0x5b1fd8, 0xc5c
+Cry_Electrike:: @ 85B1FD8
+	.incbin "sound/direct_sound_samples/cry_electrike.bin"
 
 	.align 2
-CryDirectSound_5B2C34:: @ 85B2C34
-	.incbin "baserom.gba", 0x5b2c34, 0x1508
+Cry_Manectric:: @ 85B2C34
+	.incbin "sound/direct_sound_samples/cry_manectric.bin"
 
 	.align 2
-CryDirectSound_5B413C:: @ 85B413C
-	.incbin "baserom.gba", 0x5b413c, 0xa98
+Cry_Duskull:: @ 85B413C
+	.incbin "sound/direct_sound_samples/cry_duskull.bin"
 
 	.align 2
-CryDirectSound_5B4BD4:: @ 85B4BD4
-	.incbin "baserom.gba", 0x5b4bd4, 0xc30
+Cry_Latias:: @ 85B4BD4
+	.incbin "sound/direct_sound_samples/cry_latias.bin"
 
 	.align 2
-CryDirectSound_5B5804:: @ 85B5804
-	.incbin "baserom.gba", 0x5b5804, 0xde0
+Cry_Wynaut:: @ 85B5804
+	.incbin "sound/direct_sound_samples/cry_wynaut.bin"
 
 	.align 2
-CryDirectSound_5B65E4:: @ 85B65E4
-	.incbin "baserom.gba", 0x5b65e4, 0xba0
+Cry_Seviper:: @ 85B65E4
+	.incbin "sound/direct_sound_samples/cry_seviper.bin"
 
 	.align 2
-CryDirectSound_5B7184:: @ 85B7184
-	.incbin "baserom.gba", 0x5b7184, 0x170c
+Cry_Sharpedo:: @ 85B7184
+	.incbin "sound/direct_sound_samples/cry_sharpedo.bin"
 
 	.align 2
-CryDirectSound_5B8890:: @ 85B8890
-	.incbin "baserom.gba", 0x5b8890, 0x990
+Cry_Zangoose:: @ 85B8890
+	.incbin "sound/direct_sound_samples/cry_zangoose.bin"
 
 	.align 2
-CryDirectSound_5B9220:: @ 85B9220
-	.incbin "baserom.gba", 0x5b9220, 0xa68
+Cry_Azurill:: @ 85B9220
+	.incbin "sound/direct_sound_samples/cry_azurill.bin"
 
 	.align 2
-CryDirectSound_5B9C88:: @ 85B9C88
-	.incbin "baserom.gba", 0x5b9c88, 0x598
+Cry_Swablu:: @ 85B9C88
+	.incbin "sound/direct_sound_samples/cry_swablu.bin"
 
 	.align 2
-CryDirectSound_5BA220:: @ 85BA220
-	.incbin "baserom.gba", 0x5ba220, 0xb1c
+Cry_Altaria:: @ 85BA220
+	.incbin "sound/direct_sound_samples/cry_altaria.bin"
 
 	.align 2
-CryDirectSound_5BAD3C:: @ 85BAD3C
-	.incbin "baserom.gba", 0x5bad3c, 0x954
+Cry_Unused265:: @ 85BAD3C
+	.incbin "sound/direct_sound_samples/cry_unused_265.bin"
 
 	.align 2
-CryDirectSound_5BB690:: @ 85BB690
-	.incbin "baserom.gba", 0x5bb690, 0x600
+Cry_Taillow:: @ 85BB690
+	.incbin "sound/direct_sound_samples/cry_taillow.bin"
 
 	.align 2
-CryDirectSound_5BBC90:: @ 85BBC90
-	.incbin "baserom.gba", 0x5bbc90, 0x904
+Cry_Swellow:: @ 85BBC90
+	.incbin "sound/direct_sound_samples/cry_swellow.bin"
 
 	.align 2
-CryDirectSound_5BC594:: @ 85BC594
-	.incbin "baserom.gba", 0x5bc594, 0x11b0
+Cry_Unused268:: @ 85BC594
+	.incbin "sound/direct_sound_samples/cry_unused_268.bin"
 
 	.align 2
-CryDirectSound_5BD744:: @ 85BD744
-	.incbin "baserom.gba", 0x5bd744, 0xc6c
+Cry_Spinda:: @ 85BD744
+	.incbin "sound/direct_sound_samples/cry_spinda.bin"
 
 	.align 2
-CryDirectSound_5BE3B0:: @ 85BE3B0
-	.incbin "baserom.gba", 0x5be3b0, 0x9a8
+Cry_Torchic:: @ 85BE3B0
+	.incbin "sound/direct_sound_samples/cry_torchic.bin"
 
 	.align 2
-CryDirectSound_5BED58:: @ 85BED58
-	.incbin "baserom.gba", 0x5bed58, 0x1cd4
+Cry_Combusken:: @ 85BED58
+	.incbin "sound/direct_sound_samples/cry_combusken.bin"
 
 	.align 2
-CryDirectSound_5C0A2C:: @ 85C0A2C
-	.incbin "baserom.gba", 0x5c0a2c, 0x1f80
+Cry_Blaziken:: @ 85C0A2C
+	.incbin "sound/direct_sound_samples/cry_blaziken.bin"
 
 	.align 2
-CryDirectSound_5C29AC:: @ 85C29AC
-	.incbin "baserom.gba", 0x5c29ac, 0xba8
+Cry_Treecko:: @ 85C29AC
+	.incbin "sound/direct_sound_samples/cry_treecko.bin"
 
 	.align 2
-CryDirectSound_5C3554:: @ 85C3554
-	.incbin "baserom.gba", 0x5c3554, 0x1474
+Cry_Grovyle:: @ 85C3554
+	.incbin "sound/direct_sound_samples/cry_grovyle.bin"
 
 	.align 2
-CryDirectSound_5C49C8:: @ 85C49C8
-	.incbin "baserom.gba", 0x5c49c8, 0x1a1c
+Cry_Sceptile:: @ 85C49C8
+	.incbin "sound/direct_sound_samples/cry_sceptile.bin"
 
 	.align 2
-CryDirectSound_5C63E4:: @ 85C63E4
-	.incbin "baserom.gba", 0x5c63e4, 0x784
+Cry_Mudkip:: @ 85C63E4
+	.incbin "sound/direct_sound_samples/cry_mudkip.bin"
 
 	.align 2
-CryDirectSound_5C6B68:: @ 85C6B68
-	.incbin "baserom.gba", 0x5c6b68, 0x1104
+Cry_Marshtomp:: @ 85C6B68
+	.incbin "sound/direct_sound_samples/cry_marshtomp.bin"
 
 	.align 2
-CryDirectSound_5C7C6C:: @ 85C7C6C
-	.incbin "baserom.gba", 0x5c7c6c, 0x1680
+Cry_Swampert:: @ 85C7C6C
+	.incbin "sound/direct_sound_samples/cry_swampert.bin"
 
 	.align 2
-CryDirectSound_5C92EC:: @ 85C92EC
-	.incbin "baserom.gba", 0x5c92ec, 0xbc8
+Cry_Pelipper:: @ 85C92EC
+	.incbin "sound/direct_sound_samples/cry_pelipper.bin"
 
 	.align 2
-CryDirectSound_5C9EB4:: @ 85C9EB4
-	.incbin "baserom.gba", 0x5c9eb4, 0xc40
+Cry_Wingull:: @ 85C9EB4
+	.incbin "sound/direct_sound_samples/cry_wingull.bin"
 
 	.align 2
-CryDirectSound_5CAAF4:: @ 85CAAF4
-	.incbin "baserom.gba", 0x5caaf4, 0xca8
+Cry_Banette:: @ 85CAAF4
+	.incbin "sound/direct_sound_samples/cry_banette.bin"
 
 	.align 2
-CryDirectSound_5CB79C:: @ 85CB79C
-	.incbin "baserom.gba", 0x5cb79c, 0x840
+Cry_Shuppet:: @ 85CB79C
+	.incbin "sound/direct_sound_samples/cry_shuppet.bin"
 
 	.align 2
-CryDirectSound_5CBFDC:: @ 85CBFDC
-	.incbin "baserom.gba", 0x5cbfdc, 0x468
+Cry_Lotad:: @ 85CBFDC
+	.incbin "sound/direct_sound_samples/cry_lotad.bin"
 
 	.align 2
-CryDirectSound_5CC444:: @ 85CC444
-	.incbin "baserom.gba", 0x5cc444, 0xe94
+Cry_Lombre:: @ 85CC444
+	.incbin "sound/direct_sound_samples/cry_lombre.bin"
 
 	.align 2
-CryDirectSound_5CD2D8:: @ 85CD2D8
-	.incbin "baserom.gba", 0x5cd2d8, 0x10d0
+Cry_Ludicolo:: @ 85CD2D8
+	.incbin "sound/direct_sound_samples/cry_ludicolo.bin"
 
 	.align 2
-CryDirectSound_5CE3A8:: @ 85CE3A8
-	.incbin "baserom.gba", 0x5ce3a8, 0x82c
+Cry_Seedot:: @ 85CE3A8
+	.incbin "sound/direct_sound_samples/cry_seedot.bin"
 
 	.align 2
-CryDirectSound_5CEBD4:: @ 85CEBD4
-	.incbin "baserom.gba", 0x5cebd4, 0xb68
+Cry_Nuzleaf:: @ 85CEBD4
+	.incbin "sound/direct_sound_samples/cry_nuzleaf.bin"
 
 	.align 2
-CryDirectSound_5CF73C:: @ 85CF73C
-	.incbin "baserom.gba", 0x5cf73c, 0x13c4
+Cry_Shiftry:: @ 85CF73C
+	.incbin "sound/direct_sound_samples/cry_shiftry.bin"
 
 	.align 2
-CryDirectSound_5D0B00:: @ 85D0B00
-	.incbin "baserom.gba", 0x5d0b00, 0xa14
+Cry_Carvanha:: @ 85D0B00
+	.incbin "sound/direct_sound_samples/cry_carvanha.bin"
 
 	.align 2
-CryDirectSound_5D1514:: @ 85D1514
-	.incbin "baserom.gba", 0x5d1514, 0x8cc
+Cry_Wurmple:: @ 85D1514
+	.incbin "sound/direct_sound_samples/cry_wurmple.bin"
 
 	.align 2
-CryDirectSound_5D1DE0:: @ 85D1DE0
-	.incbin "baserom.gba", 0x5d1de0, 0x102c
+Cry_Silcoon:: @ 85D1DE0
+	.incbin "sound/direct_sound_samples/cry_silcoon.bin"
 
 	.align 2
-CryDirectSound_5D2E0C:: @ 85D2E0C
-	.incbin "baserom.gba", 0x5d2e0c, 0x838
+Cry_Beautifly:: @ 85D2E0C
+	.incbin "sound/direct_sound_samples/cry_beautifly.bin"
 
 	.align 2
-CryDirectSound_5D3644:: @ 85D3644
-	.incbin "baserom.gba", 0x5d3644, 0x1044
+Cry_Cascoon:: @ 85D3644
+	.incbin "sound/direct_sound_samples/cry_cascoon.bin"
 
 	.align 2
-CryDirectSound_5D4688:: @ 85D4688
-	.incbin "baserom.gba", 0x5d4688, 0xcac
+Cry_Dustox:: @ 85D4688
+	.incbin "sound/direct_sound_samples/cry_dustox.bin"
 
 	.align 2
-CryDirectSound_5D5334:: @ 85D5334
-	.incbin "baserom.gba", 0x5d5334, 0xa1c
+Cry_Ralts:: @ 85D5334
+	.incbin "sound/direct_sound_samples/cry_ralts.bin"
 
 	.align 2
-CryDirectSound_5D5D50:: @ 85D5D50
-	.incbin "baserom.gba", 0x5d5d50, 0xc30
+Cry_Kirlia:: @ 85D5D50
+	.incbin "sound/direct_sound_samples/cry_kirlia.bin"
 
 	.align 2
-CryDirectSound_5D6980:: @ 85D6980
-	.incbin "baserom.gba", 0x5d6980, 0x1864
+Cry_Gardevoir:: @ 85D6980
+	.incbin "sound/direct_sound_samples/cry_gardevoir.bin"
 
 	.align 2
-CryDirectSound_5D81E4:: @ 85D81E4
-	.incbin "baserom.gba", 0x5d81e4, 0x884
+Cry_Slakoth:: @ 85D81E4
+	.incbin "sound/direct_sound_samples/cry_slakoth.bin"
 
 	.align 2
-CryDirectSound_5D8A68:: @ 85D8A68
-	.incbin "baserom.gba", 0x5d8a68, 0xe58
+Cry_Vigoroth:: @ 85D8A68
+	.incbin "sound/direct_sound_samples/cry_vigoroth.bin"
 
 	.align 2
-CryDirectSound_5D98C0:: @ 85D98C0
-	.incbin "baserom.gba", 0x5d98c0, 0x9ec
+Cry_Slaking:: @ 85D98C0
+	.incbin "sound/direct_sound_samples/cry_slaking.bin"
 
 	.align 2
-CryDirectSound_5DA2AC:: @ 85DA2AC
-	.incbin "baserom.gba", 0x5da2ac, 0x670
+Cry_Nincada:: @ 85DA2AC
+	.incbin "sound/direct_sound_samples/cry_nincada.bin"
 
 	.align 2
-CryDirectSound_5DA91C:: @ 85DA91C
-	.incbin "baserom.gba", 0x5da91c, 0xc28
+Cry_Ninjask:: @ 85DA91C
+	.incbin "sound/direct_sound_samples/cry_ninjask.bin"
 
 	.align 2
-CryDirectSound_5DB544:: @ 85DB544
-	.incbin "baserom.gba", 0x5db544, 0x7b8
+Cry_Shedinja:: @ 85DB544
+	.incbin "sound/direct_sound_samples/cry_shedinja.bin"
 
 	.align 2
-CryDirectSound_5DBCFC:: @ 85DBCFC
-	.incbin "baserom.gba", 0x5dbcfc, 0x75c
+Cry_Makuhita:: @ 85DBCFC
+	.incbin "sound/direct_sound_samples/cry_makuhita.bin"
 
 	.align 2
-CryDirectSound_5DC458:: @ 85DC458
-	.incbin "baserom.gba", 0x5dc458, 0x10b8
+Cry_Hariyama:: @ 85DC458
+	.incbin "sound/direct_sound_samples/cry_hariyama.bin"
 
 	.align 2
-CryDirectSound_5DD510:: @ 85DD510
-	.incbin "baserom.gba", 0x5dd510, 0xd64
+Cry_Nosepass:: @ 85DD510
+	.incbin "sound/direct_sound_samples/cry_nosepass.bin"
 
 	.align 2
-CryDirectSound_5DE274:: @ 85DE274
-	.incbin "baserom.gba", 0x5de274, 0x14e4
+Cry_Glalie:: @ 85DE274
+	.incbin "sound/direct_sound_samples/cry_glalie.bin"
 
 	.align 2
-CryDirectSound_5DF758:: @ 85DF758
-	.incbin "baserom.gba", 0x5df758, 0x8fc
+Cry_Plusle:: @ 85DF758
+	.incbin "sound/direct_sound_samples/cry_plusle.bin"
 
 	.align 2
-CryDirectSound_5E0054:: @ 85E0054
-	.incbin "baserom.gba", 0x5e0054, 0x1008
+Cry_Minun:: @ 85E0054
+	.incbin "sound/direct_sound_samples/cry_minun.bin"
 
 	.align 2
-CryDirectSound_5E105C:: @ 85E105C
-	.incbin "baserom.gba", 0x5e105c, 0xa80
+Cry_Surskit:: @ 85E105C
+	.incbin "sound/direct_sound_samples/cry_surskit.bin"
 
 	.align 2
-CryDirectSound_5E1ADC:: @ 85E1ADC
-	.incbin "baserom.gba", 0x5e1adc, 0x13b4
+Cry_Masquerain:: @ 85E1ADC
+	.incbin "sound/direct_sound_samples/cry_masquerain.bin"
 
 	.align 2
-CryDirectSound_5E2E90:: @ 85E2E90
-	.incbin "baserom.gba", 0x5e2e90, 0x714
+Cry_Skitty:: @ 85E2E90
+	.incbin "sound/direct_sound_samples/cry_skitty.bin"
 
 	.align 2
-CryDirectSound_5E35A4:: @ 85E35A4
-	.incbin "baserom.gba", 0x5e35a4, 0x1518
+Cry_Delcatty:: @ 85E35A4
+	.incbin "sound/direct_sound_samples/cry_delcatty.bin"
 
 	.align 2
-CryDirectSound_5E4ABC:: @ 85E4ABC
-	.incbin "baserom.gba", 0x5e4abc, 0x804
+Cry_Gulpin:: @ 85E4ABC
+	.incbin "sound/direct_sound_samples/cry_gulpin.bin"
 
 	.align 2
-CryDirectSound_5E52C0:: @ 85E52C0
-	.incbin "baserom.gba", 0x5e52c0, 0x1160
+Cry_Swalot:: @ 85E52C0
+	.incbin "sound/direct_sound_samples/cry_swalot.bin"
 
 	.align 2
-CryDirectSound_5E6420:: @ 85E6420
-	.incbin "baserom.gba", 0x5e6420, 0x94c
+Cry_Numel:: @ 85E6420
+	.incbin "sound/direct_sound_samples/cry_numel.bin"
 
 	.align 2
-CryDirectSound_5E6D6C:: @ 85E6D6C
-	.incbin "baserom.gba", 0x5e6d6c, 0x1720
+Cry_Camerupt:: @ 85E6D6C
+	.incbin "sound/direct_sound_samples/cry_camerupt.bin"
 
 	.align 2
-CryDirectSound_5E848C:: @ 85E848C
-	.incbin "baserom.gba", 0x5e848c, 0x93c
+Cry_Barboach:: @ 85E848C
+	.incbin "sound/direct_sound_samples/cry_barboach.bin"
 
 	.align 2
-CryDirectSound_5E8DC8:: @ 85E8DC8
-	.incbin "baserom.gba", 0x5e8dc8, 0x10fc
+Cry_Whiscash:: @ 85E8DC8
+	.incbin "sound/direct_sound_samples/cry_whiscash.bin"
 
 	.align 2
-CryDirectSound_5E9EC4:: @ 85E9EC4
-	.incbin "baserom.gba", 0x5e9ec4, 0xc04
+Cry_Corphish:: @ 85E9EC4
+	.incbin "sound/direct_sound_samples/cry_corphish.bin"
 
 	.align 2
-CryDirectSound_5EAAC8:: @ 85EAAC8
-	.incbin "baserom.gba", 0x5eaac8, 0x18b8
+Cry_Crawdaunt:: @ 85EAAC8
+	.incbin "sound/direct_sound_samples/cry_crawdaunt.bin"
 
 	.align 2
-CryDirectSound_5EC380:: @ 85EC380
-	.incbin "baserom.gba", 0x5ec380, 0x740
+Cry_Spoink:: @ 85EC380
+	.incbin "sound/direct_sound_samples/cry_spoink.bin"
 
 	.align 2
-CryDirectSound_5ECAC0:: @ 85ECAC0
-	.incbin "baserom.gba", 0x5ecac0, 0xca0
+Cry_Grumpig:: @ 85ECAC0
+	.incbin "sound/direct_sound_samples/cry_grumpig.bin"
 
 	.align 2
-CryDirectSound_5ED760:: @ 85ED760
-	.incbin "baserom.gba", 0x5ed760, 0xa24
+Cry_Trapinch:: @ 85ED760
+	.incbin "sound/direct_sound_samples/cry_trapinch.bin"
 
 	.align 2
-CryDirectSound_5EE184:: @ 85EE184
-	.incbin "baserom.gba", 0x5ee184, 0xe04
+Cry_Vibrava:: @ 85EE184
+	.incbin "sound/direct_sound_samples/cry_vibrava.bin"
 
 	.align 2
-CryDirectSound_5EEF88:: @ 85EEF88
-	.incbin "baserom.gba", 0x5eef88, 0x1a08
+Cry_Flygon:: @ 85EEF88
+	.incbin "sound/direct_sound_samples/cry_flygon.bin"
 
 	.align 2
-CryDirectSound_5F0990:: @ 85F0990
-	.incbin "baserom.gba", 0x5f0990, 0x8f0
+Cry_Cacnea:: @ 85F0990
+	.incbin "sound/direct_sound_samples/cry_cacnea.bin"
 
 	.align 2
-CryDirectSound_5F1280:: @ 85F1280
-	.incbin "baserom.gba", 0x5f1280, 0x16b0
+Cry_Cacturne:: @ 85F1280
+	.incbin "sound/direct_sound_samples/cry_cacturne.bin"
 
 	.align 2
-CryDirectSound_5F2930:: @ 85F2930
-	.incbin "baserom.gba", 0x5f2930, 0xc84
+Cry_Baltoy:: @ 85F2930
+	.incbin "sound/direct_sound_samples/cry_baltoy.bin"
 
 	.align 2
-CryDirectSound_5F35B4:: @ 85F35B4
-	.incbin "baserom.gba", 0x5f35b4, 0x1360
+Cry_Claydol:: @ 85F35B4
+	.incbin "sound/direct_sound_samples/cry_claydol.bin"
 
 	.align 2
-CryDirectSound_5F4914:: @ 85F4914
-	.incbin "baserom.gba", 0x5f4914, 0x17fc
+Cry_Lunatone:: @ 85F4914
+	.incbin "sound/direct_sound_samples/cry_lunatone.bin"
 
 	.align 2
-CryDirectSound_5F6110:: @ 85F6110
-	.incbin "baserom.gba", 0x5f6110, 0x102c
+Cry_Solrock:: @ 85F6110
+	.incbin "sound/direct_sound_samples/cry_solrock.bin"
 
 	.align 2
-CryDirectSound_5F713C:: @ 85F713C
-	.incbin "baserom.gba", 0x5f713c, 0x7d4
+Cry_Feebas:: @ 85F713C
+	.incbin "sound/direct_sound_samples/cry_feebas.bin"
 
 	.align 2
-CryDirectSound_5F7910:: @ 85F7910
-	.incbin "baserom.gba", 0x5f7910, 0x2744
+Cry_Milotic:: @ 85F7910
+	.incbin "sound/direct_sound_samples/cry_milotic.bin"
 
 	.align 2
-CryDirectSound_5FA054:: @ 85FA054
-	.incbin "baserom.gba", 0x5fa054, 0xa7c
+Cry_Absol:: @ 85FA054
+	.incbin "sound/direct_sound_samples/cry_absol.bin"
 
 	.align 2
-CryDirectSound_5FAAD0:: @ 85FAAD0
-	.incbin "baserom.gba", 0x5faad0, 0x820
+Cry_Meditite:: @ 85FAAD0
+	.incbin "sound/direct_sound_samples/cry_meditite.bin"
 
 	.align 2
-CryDirectSound_5FB2F0:: @ 85FB2F0
-	.incbin "baserom.gba", 0x5fb2f0, 0x1084
+Cry_Medicham:: @ 85FB2F0
+	.incbin "sound/direct_sound_samples/cry_medicham.bin"
 
 	.align 2
-CryDirectSound_5FC374:: @ 85FC374
-	.incbin "baserom.gba", 0x5fc374, 0x5b4
+Cry_Spheal:: @ 85FC374
+	.incbin "sound/direct_sound_samples/cry_spheal.bin"
 
 	.align 2
-CryDirectSound_5FC928:: @ 85FC928
-	.incbin "baserom.gba", 0x5fc928, 0xbd8
+Cry_Sealeo:: @ 85FC928
+	.incbin "sound/direct_sound_samples/cry_sealeo.bin"
 
 	.align 2
-CryDirectSound_5FD500:: @ 85FD500
-	.incbin "baserom.gba", 0x5fd500, 0x244c
+Cry_Walrein:: @ 85FD500
+	.incbin "sound/direct_sound_samples/cry_walrein.bin"
 
 	.align 2
-CryDirectSound_5FF94C:: @ 85FF94C
-	.incbin "baserom.gba", 0x5ff94c, 0x1250
+Cry_Clamperl:: @ 85FF94C
+	.incbin "sound/direct_sound_samples/cry_clamperl.bin"
 
 	.align 2
-CryDirectSound_600B9C:: @ 8600B9C
-	.incbin "baserom.gba", 0x600b9c, 0xfe8
+Cry_Huntail:: @ 8600B9C
+	.incbin "sound/direct_sound_samples/cry_huntail.bin"
 
 	.align 2
-CryDirectSound_601B84:: @ 8601B84
-	.incbin "baserom.gba", 0x601b84, 0x166c
+Cry_Gorebyss:: @ 8601B84
+	.incbin "sound/direct_sound_samples/cry_gorebyss.bin"
 
 	.align 2
-CryDirectSound_6031F0:: @ 86031F0
-	.incbin "baserom.gba", 0x6031f0, 0x9a8
+Cry_Lileep:: @ 86031F0
+	.incbin "sound/direct_sound_samples/cry_lileep.bin"
 
 	.align 2
-CryDirectSound_603B98:: @ 8603B98
-	.incbin "baserom.gba", 0x603b98, 0x1d30
+Cry_Cradily:: @ 8603B98
+	.incbin "sound/direct_sound_samples/cry_cradily.bin"
 
 	.align 2
-CryDirectSound_6058C8:: @ 86058C8
-	.incbin "baserom.gba", 0x6058c8, 0xbb8
+Cry_Anorith:: @ 86058C8
+	.incbin "sound/direct_sound_samples/cry_anorith.bin"
 
 	.align 2
-CryDirectSound_606480:: @ 8606480
-	.incbin "baserom.gba", 0x606480, 0x16d4
+Cry_Armaldo:: @ 8606480
+	.incbin "sound/direct_sound_samples/cry_armaldo.bin"
 
 	.align 2
-CryDirectSound_607B54:: @ 8607B54
-	.incbin "baserom.gba", 0x607b54, 0x9a0
+Cry_Beldum:: @ 8607B54
+	.incbin "sound/direct_sound_samples/cry_beldum.bin"
 
 	.align 2
-CryDirectSound_6084F4:: @ 86084F4
-	.incbin "baserom.gba", 0x6084f4, 0x12d4
+Cry_Metang:: @ 86084F4
+	.incbin "sound/direct_sound_samples/cry_metang.bin"
 
 	.align 2
-CryDirectSound_6097C8:: @ 86097C8
-	.incbin "baserom.gba", 0x6097c8, 0x2778
+Cry_Metagross:: @ 86097C8
+	.incbin "sound/direct_sound_samples/cry_metagross.bin"
 
 	.align 2
-CryDirectSound_60BF40:: @ 860BF40
-	.incbin "baserom.gba", 0x60bf40, 0x7d4
+Cry_Bagon:: @ 860BF40
+	.incbin "sound/direct_sound_samples/cry_bagon.bin"
 
 	.align 2
-CryDirectSound_60C714:: @ 860C714
-	.incbin "baserom.gba", 0x60c714, 0x1408
+Cry_Shelgon:: @ 860C714
+	.incbin "sound/direct_sound_samples/cry_shelgon.bin"
 
 	.align 2
-CryDirectSound_60DB1C:: @ 860DB1C
-	.incbin "baserom.gba", 0x60db1c, 0x1fdc
+Cry_Regirock:: @ 860DB1C
+	.incbin "sound/direct_sound_samples/cry_regirock.bin"
 
 	.align 2
-CryDirectSound_60FAF8:: @ 860FAF8
-	.incbin "baserom.gba", 0x60faf8, 0x2000
+Cry_Regice:: @ 860FAF8
+	.incbin "sound/direct_sound_samples/cry_regice.bin"
 
 	.align 2
-CryDirectSound_611AF8:: @ 8611AF8
-	.incbin "baserom.gba", 0x611af8, 0x1704
+Cry_Registeel:: @ 8611AF8
+	.incbin "sound/direct_sound_samples/cry_registeel.bin"
 
 	.align 2
-CryDirectSound_6131FC:: @ 86131FC
-	.incbin "baserom.gba", 0x6131fc, 0xc98
+Cry_Castform:: @ 86131FC
+	.incbin "sound/direct_sound_samples/cry_castform.bin"
 
 	.align 2
-CryDirectSound_613E94:: @ 8613E94
-	.incbin "baserom.gba", 0x613e94, 0xb88
+Cry_Volbeat:: @ 8613E94
+	.incbin "sound/direct_sound_samples/cry_volbeat.bin"
 
 	.align 2
-CryDirectSound_614A1C:: @ 8614A1C
-	.incbin "baserom.gba", 0x614a1c, 0x1118
+Cry_Illumise:: @ 8614A1C
+	.incbin "sound/direct_sound_samples/cry_illumise.bin"
 
 	.align 2
-CryDirectSound_615B34:: @ 8615B34
-	.incbin "baserom.gba", 0x615b34, 0x948
+Cry_Poochyena:: @ 8615B34
+	.incbin "sound/direct_sound_samples/cry_poochyena.bin"
 
 	.align 2
-CryDirectSound_61647C:: @ 861647C
-	.incbin "baserom.gba", 0x61647c, 0x138c
+Cry_Mightyena:: @ 861647C
+	.incbin "sound/direct_sound_samples/cry_mightyena.bin"
 
 	.align 2
-CryDirectSound_617808:: @ 8617808
-	.incbin "baserom.gba", 0x617808, 0xdb8
+Cry_Dusclops:: @ 8617808
+	.incbin "sound/direct_sound_samples/cry_dusclops.bin"
 
 	.align 2
-CryDirectSound_6185C0:: @ 86185C0
-	.incbin "baserom.gba", 0x6185c0, 0xba4
+Cry_Sableye:: @ 86185C0
+	.incbin "sound/direct_sound_samples/cry_sableye.bin"
 
 	.align 2
-CryDirectSound_619164:: @ 8619164
-	.incbin "baserom.gba", 0x619164, 0xb80
+Cry_Mawile:: @ 8619164
+	.incbin "sound/direct_sound_samples/cry_mawile.bin"
 
 	.align 2
-CryDirectSound_619CE4:: @ 8619CE4
-	.incbin "baserom.gba", 0x619ce4, 0x92c
+Cry_Aron:: @ 8619CE4
+	.incbin "sound/direct_sound_samples/cry_aron.bin"
 
 	.align 2
-CryDirectSound_61A610:: @ 861A610
-	.incbin "baserom.gba", 0x61a610, 0x14d8
+Cry_Lairon:: @ 861A610
+	.incbin "sound/direct_sound_samples/cry_lairon.bin"
 
 	.align 2
-CryDirectSound_61BAE8:: @ 861BAE8
-	.incbin "baserom.gba", 0x61bae8, 0x19a4
+Cry_Aggron:: @ 861BAE8
+	.incbin "sound/direct_sound_samples/cry_aggron.bin"
 
 	.align 2
-CryDirectSound_61D48C:: @ 861D48C
-	.incbin "baserom.gba", 0x61d48c, 0x1430
+Cry_Relicanth:: @ 861D48C
+	.incbin "sound/direct_sound_samples/cry_relicanth.bin"
 
 	.align 2
-CryDirectSound_61E8BC:: @ 861E8BC
-	.incbin "baserom.gba", 0x61e8bc, 0x4dc
+Cry_Luvdisc:: @ 861E8BC
+	.incbin "sound/direct_sound_samples/cry_luvdisc.bin"
 
 	.align 2
-CryDirectSound_61ED98:: @ 861ED98
-	.incbin "baserom.gba", 0x61ed98, 0x250c
+Cry_Groudon:: @ 861ED98
+	.incbin "sound/direct_sound_samples/cry_groudon.bin"
 
 	.align 2
-CryDirectSound_6212A4:: @ 86212A4
-	.incbin "baserom.gba", 0x6212a4, 0x23b8
+Cry_Kyogre:: @ 86212A4
+	.incbin "sound/direct_sound_samples/cry_kyogre.bin"
 
 	.align 2
-CryDirectSound_62365C:: @ 862365C
-	.incbin "baserom.gba", 0x62365c, 0x1d2c
+Cry_Rayquaza:: @ 862365C
+	.incbin "sound/direct_sound_samples/cry_rayquaza.bin"
 
 	.align 2
-CryDirectSound_625388:: @ 8625388
-	.incbin "baserom.gba", 0x625388, 0x191c
+Cry_Salamence:: @ 8625388
+	.incbin "sound/direct_sound_samples/cry_salamence.bin"
 
 	.align 2
-CryDirectSound_626CA4:: @ 8626CA4
-	.incbin "baserom.gba", 0x626ca4, 0xcc0
+Cry_Breloom:: @ 8626CA4
+	.incbin "sound/direct_sound_samples/cry_breloom.bin"
 
 	.align 2
-CryDirectSound_627964:: @ 8627964
-	.incbin "baserom.gba", 0x627964, 0x8d8
+Cry_Shroomish:: @ 8627964
+	.incbin "sound/direct_sound_samples/cry_shroomish.bin"
 
 	.align 2
-CryDirectSound_62823C:: @ 862823C
-	.incbin "baserom.gba", 0x62823c, 0x1e9c
+Cry_Linoone:: @ 862823C
+	.incbin "sound/direct_sound_samples/cry_linoone.bin"
 
 	.align 2
-CryDirectSound_62A0D8:: @ 862A0D8
-	.incbin "baserom.gba", 0x62a0d8, 0x20c4
+Cry_Tropius:: @ 862A0D8
+	.incbin "sound/direct_sound_samples/cry_tropius.bin"
 
 	.align 2
-CryDirectSound_62C19C:: @ 862C19C
-	.incbin "baserom.gba", 0x62c19c, 0x1c60
+Cry_Wailmer:: @ 862C19C
+	.incbin "sound/direct_sound_samples/cry_wailmer.bin"
 
 	.align 2
-CryDirectSound_62DDFC:: @ 862DDFC
-	.incbin "baserom.gba", 0x62ddfc, 0xb90
+Cry_Zigzagoon:: @ 862DDFC
+	.incbin "sound/direct_sound_samples/cry_zigzagoon.bin"
 
 	.align 2
-CryDirectSound_62E98C:: @ 862E98C
-	.incbin "baserom.gba", 0x62e98c, 0x1c48
+Cry_Exploud:: @ 862E98C
+	.incbin "sound/direct_sound_samples/cry_exploud.bin"
 
 	.align 2
-CryDirectSound_6305D4:: @ 86305D4
-	.incbin "baserom.gba", 0x6305d4, 0xd28
+Cry_Loudred:: @ 86305D4
+	.incbin "sound/direct_sound_samples/cry_loudred.bin"
 
 	.align 2
-CryDirectSound_6312FC:: @ 86312FC
-	.incbin "baserom.gba", 0x6312fc, 0x2a10
+Cry_Wailord:: @ 86312FC
+	.incbin "sound/direct_sound_samples/cry_wailord.bin"
 
 	.align 2
-CryDirectSound_633D0C:: @ 8633D0C
-	.incbin "baserom.gba", 0x633d0c, 0x824
+Cry_Whismur:: @ 8633D0C
+	.incbin "sound/direct_sound_samples/cry_whismur.bin"
 
 	.align 2
-CryDirectSound_634530:: @ 8634530
-	.incbin "baserom.gba", 0x634530, 0x1108
+Cry_Snorunt:: @ 8634530
+	.incbin "sound/direct_sound_samples/cry_snorunt.bin"
 
 	.align 2
-CryDirectSound_635638:: @ 8635638
-	.incbin "baserom.gba", 0x635638, 0x15f8
+Cry_Latios:: @ 8635638
+	.incbin "sound/direct_sound_samples/cry_latios.bin"
 
 	.align 2
-CryDirectSound_636C30:: @ 8636C30
-	.incbin "baserom.gba", 0x636c30, 0xd84
+Cry_Jirachi:: @ 8636C30
+	.incbin "sound/direct_sound_samples/cry_jirachi.bin"
 
 	.align 2
-CryDirectSound_6379B4:: @ 86379B4
-	.incbin "baserom.gba", 0x6379b4, 0x14d4
+Cry_Deoxys:: @ 86379B4
+	.incbin "sound/direct_sound_samples/cry_deoxys.bin"
 
 	.align 2
-CryDirectSound_638E88:: @ 8638E88
-	.incbin "baserom.gba", 0x638e88, 0xa10
+Cry_Chimecho:: @ 8638E88
+	.incbin "sound/direct_sound_samples/cry_chimecho.bin"
 
 	.align 2
 DirectSoundWaveData_8639898:: @ 8639898
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8639898.bin"
-	.incbin "sound/direct_sound_samples/8639898.pcm"
 
 	.align 2
 DirectSoundWaveData_8639EF8:: @ 8639EF8
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8639EF8.bin"
-	.incbin "sound/direct_sound_samples/8639EF8.pcm"
 
 	.align 2
 DirectSoundWaveData_863A3DC:: @ 863A3DC
-	.4byte 0
 	.incbin "sound/direct_sound_samples/863A3DC.bin"
-	.incbin "sound/direct_sound_samples/863A3DC.pcm"
 
 	.align 2
 DirectSoundWaveData_863AD2C:: @ 863AD2C
-	.4byte 0
 	.incbin "sound/direct_sound_samples/863AD2C.bin"
-	.incbin "sound/direct_sound_samples/863AD2C.pcm"
 
 	.align 2
 DirectSoundWaveData_863B79C:: @ 863B79C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/863B79C.bin"
-	.incbin "sound/direct_sound_samples/863B79C.pcm"
 
 	.align 2
 DirectSoundWaveData_863BABC:: @ 863BABC
-	.4byte 0
 	.incbin "sound/direct_sound_samples/863BABC.bin"
-	.incbin "sound/direct_sound_samples/863BABC.pcm"
 
 	.align 2
 DirectSoundWaveData_863C744:: @ 863C744
-	.4byte 0
 	.incbin "sound/direct_sound_samples/863C744.bin"
-	.incbin "sound/direct_sound_samples/863C744.pcm"
 
 	.align 2
 DirectSoundWaveData_863CD64:: @ 863CD64
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/863CD64.bin"
-	.incbin "sound/direct_sound_samples/863CD64.pcm"
 
 	.align 2
 DirectSoundWaveData_863D0EC:: @ 863D0EC
-	.4byte 0
 	.incbin "sound/direct_sound_samples/863D0EC.bin"
-	.incbin "sound/direct_sound_samples/863D0EC.pcm"
 
 	.align 2
 DirectSoundWaveData_863DED0:: @ 863DED0
-	.4byte 0
 	.incbin "sound/direct_sound_samples/863DED0.bin"
-	.incbin "sound/direct_sound_samples/863DED0.pcm"
 
 	.align 2
 DirectSoundWaveData_863E840:: @ 863E840
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/863E840.bin"
-	.incbin "sound/direct_sound_samples/863E840.pcm"
 
 	.align 2
 DirectSoundWaveData_863EBDC:: @ 863EBDC
-	.4byte 0
 	.incbin "sound/direct_sound_samples/863EBDC.bin"
-	.incbin "sound/direct_sound_samples/863EBDC.pcm"
 
 	.align 2
 DirectSoundWaveData_863F390:: @ 863F390
-	.4byte 0
 	.incbin "sound/direct_sound_samples/863F390.bin"
-	.incbin "sound/direct_sound_samples/863F390.pcm"
 
 	.align 2
 DirectSoundWaveData_86400EC:: @ 86400EC
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/86400EC.bin"
-	.incbin "sound/direct_sound_samples/86400EC.pcm"
 
 	.align 2
 DirectSoundWaveData_8640330:: @ 8640330
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8640330.bin"
-	.incbin "sound/direct_sound_samples/8640330.pcm"
 
 	.align 2
 DirectSoundWaveData_8641170:: @ 8641170
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8641170.bin"
-	.incbin "sound/direct_sound_samples/8641170.pcm"
 
 	.align 2
 DirectSoundWaveData_8641AC4:: @ 8641AC4
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8641AC4.bin"
-	.incbin "sound/direct_sound_samples/8641AC4.pcm"
 
 	.align 2
 DirectSoundWaveData_8641E18:: @ 8641E18
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8641E18.bin"
-	.incbin "sound/direct_sound_samples/8641E18.pcm"
 
 	.align 2
 DirectSoundWaveData_864244C:: @ 864244C
-	.4byte 0
 	.incbin "sound/direct_sound_samples/864244C.bin"
-	.incbin "sound/direct_sound_samples/864244C.pcm"
 
 	.align 2
 DirectSoundWaveData_86430B8:: @ 86430B8
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/86430B8.bin"
-	.incbin "sound/direct_sound_samples/86430B8.pcm"
 
 	.align 2
 DirectSoundWaveData_8643650:: @ 8643650
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8643650.bin"
-	.incbin "sound/direct_sound_samples/8643650.pcm"
 
 	.align 2
 DirectSoundWaveData_8644154:: @ 8644154
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8644154.bin"
-	.incbin "sound/direct_sound_samples/8644154.pcm"
 
 	.align 2
 DirectSoundWaveData_8644758:: @ 8644758
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8644758.bin"
-	.incbin "sound/direct_sound_samples/8644758.pcm"
 
 	.align 2
 DirectSoundWaveData_8644950:: @ 8644950
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8644950.bin"
-	.incbin "sound/direct_sound_samples/8644950.pcm"
 
 	.align 2
 DirectSoundWaveData_86452B4:: @ 86452B4
-	.4byte 0
 	.incbin "sound/direct_sound_samples/86452B4.bin"
-	.incbin "sound/direct_sound_samples/86452B4.pcm"
 
 	.align 2
 DirectSoundWaveData_8646240:: @ 8646240
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8646240.bin"
-	.incbin "sound/direct_sound_samples/8646240.pcm"
 
 	.align 2
 DirectSoundWaveData_8646878:: @ 8646878
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8646878.bin"
-	.incbin "sound/direct_sound_samples/8646878.pcm"
 
 	.align 2
 DirectSoundWaveData_864734C:: @ 864734C
-	.4byte 0
 	.incbin "sound/direct_sound_samples/864734C.bin"
-	.incbin "sound/direct_sound_samples/864734C.pcm"
 
 	.align 2
 DirectSoundWaveData_8648290:: @ 8648290
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8648290.bin"
-	.incbin "sound/direct_sound_samples/8648290.pcm"
 
 	.align 2
 DirectSoundWaveData_8648808:: @ 8648808
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8648808.bin"
-	.incbin "sound/direct_sound_samples/8648808.pcm"
 
 	.align 2
 DirectSoundWaveData_8649654:: @ 8649654
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8649654.bin"
-	.incbin "sound/direct_sound_samples/8649654.pcm"
 
 	.align 2
 DirectSoundWaveData_864A55C:: @ 864A55C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/864A55C.bin"
-	.incbin "sound/direct_sound_samples/864A55C.pcm"
 
 	.align 2
 DirectSoundWaveData_864B030:: @ 864B030
-	.4byte 0
 	.incbin "sound/direct_sound_samples/864B030.bin"
-	.incbin "sound/direct_sound_samples/864B030.pcm"
 
 	.align 2
 DirectSoundWaveData_864BBC4:: @ 864BBC4
-	.4byte 0
 	.incbin "sound/direct_sound_samples/864BBC4.bin"
-	.incbin "sound/direct_sound_samples/864BBC4.pcm"
 
 	.align 2
 DirectSoundWaveData_864C59C:: @ 864C59C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/864C59C.bin"
-	.incbin "sound/direct_sound_samples/864C59C.pcm"
 
 	.align 2
 DirectSoundWaveData_864CBDC:: @ 864CBDC
-	.4byte 0
 	.incbin "sound/direct_sound_samples/864CBDC.bin"
-	.incbin "sound/direct_sound_samples/864CBDC.pcm"
 
 	.align 2
 DirectSoundWaveData_864D6BC:: @ 864D6BC
-	.4byte 0
 	.incbin "sound/direct_sound_samples/864D6BC.bin"
-	.incbin "sound/direct_sound_samples/864D6BC.pcm"
 
 	.align 2
 DirectSoundWaveData_864DCF8:: @ 864DCF8
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/864DCF8.bin"
-	.incbin "sound/direct_sound_samples/864DCF8.pcm"
 
 	.align 2
 DirectSoundWaveData_864E410:: @ 864E410
-	.4byte 0
 	.incbin "sound/direct_sound_samples/864E410.bin"
-	.incbin "sound/direct_sound_samples/864E410.pcm"
 
 	.align 2
 DirectSoundWaveData_864ED4C:: @ 864ED4C
-	.4byte 0
 	.incbin "sound/direct_sound_samples/864ED4C.bin"
-	.incbin "sound/direct_sound_samples/864ED4C.pcm"
 
 	.align 2
 DirectSoundWaveData_864F508:: @ 864F508
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/864F508.bin"
-	.incbin "sound/direct_sound_samples/864F508.pcm"
 
 	.align 2
 DirectSoundWaveData_864FA6C:: @ 864FA6C
-	.4byte 0
 	.incbin "sound/direct_sound_samples/864FA6C.bin"
-	.incbin "sound/direct_sound_samples/864FA6C.pcm"
 
 	.align 2
 DirectSoundWaveData_86507E0:: @ 86507E0
-	.4byte 0
 	.incbin "sound/direct_sound_samples/86507E0.bin"
-	.incbin "sound/direct_sound_samples/86507E0.pcm"
 
 	.align 2
 DirectSoundWaveData_8650C5C:: @ 8650C5C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8650C5C.bin"
-	.incbin "sound/direct_sound_samples/8650C5C.pcm"
 
 	.align 2
 DirectSoundWaveData_8651148:: @ 8651148
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8651148.bin"
-	.incbin "sound/direct_sound_samples/8651148.pcm"
 
 	.align 2
 DirectSoundWaveData_8651910:: @ 8651910
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8651910.bin"
-	.incbin "sound/direct_sound_samples/8651910.pcm"
 
 	.align 2
 DirectSoundWaveData_865250C:: @ 865250C
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/865250C.bin"
-	.incbin "sound/direct_sound_samples/865250C.pcm"
 
 	.align 2
 DirectSoundWaveData_8652884:: @ 8652884
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8652884.bin"
-	.incbin "sound/direct_sound_samples/8652884.pcm"
 
 	.align 2
 DirectSoundWaveData_8653040:: @ 8653040
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8653040.bin"
-	.incbin "sound/direct_sound_samples/8653040.pcm"
 
 	.align 2
 DirectSoundWaveData_8653CA4:: @ 8653CA4
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8653CA4.bin"
-	.incbin "sound/direct_sound_samples/8653CA4.pcm"
 
 	.align 2
 DirectSoundWaveData_8654170:: @ 8654170
-	.4byte 0
 	.incbin "sound/direct_sound_samples/8654170.bin"
-	.incbin "sound/direct_sound_samples/8654170.pcm"
 
 	.align 2
 DirectSoundWaveData_8654C20:: @ 8654C20
-	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8654C20.bin"
-	.incbin "sound/direct_sound_samples/8654C20.pcm"
diff --git a/sound/direct_sound_samples/845AE14.aif b/sound/direct_sound_samples/845AE14.aif
index 976210050..a05801158 100644
--- a/sound/direct_sound_samples/845AE14.aif
+++ b/sound/direct_sound_samples/845AE14.aif
diff --git a/sound/direct_sound_samples/845B2B4.aif b/sound/direct_sound_samples/845B2B4.aif
index 277ff96fc..e65708ff7 100644
--- a/sound/direct_sound_samples/845B2B4.aif
+++ b/sound/direct_sound_samples/845B2B4.aif
diff --git a/sound/direct_sound_samples/845B9A8.aif b/sound/direct_sound_samples/845B9A8.aif
index 0c7116151..bbb5551a4 100644
--- a/sound/direct_sound_samples/845B9A8.aif
+++ b/sound/direct_sound_samples/845B9A8.aif
diff --git a/sound/direct_sound_samples/845C238.aif b/sound/direct_sound_samples/845C238.aif
index 6066e2b4e..e2ce5754e 100644
--- a/sound/direct_sound_samples/845C238.aif
+++ b/sound/direct_sound_samples/845C238.aif
diff --git a/sound/direct_sound_samples/845CAB0.aif b/sound/direct_sound_samples/845CAB0.aif
index b3b6e0b97..04f990b13 100644
--- a/sound/direct_sound_samples/845CAB0.aif
+++ b/sound/direct_sound_samples/845CAB0.aif
diff --git a/sound/direct_sound_samples/845DAF0.aif b/sound/direct_sound_samples/845DAF0.aif
index 3acfdabee..d70e61174 100644
--- a/sound/direct_sound_samples/845DAF0.aif
+++ b/sound/direct_sound_samples/845DAF0.aif
diff --git a/sound/direct_sound_samples/845ED34.aif b/sound/direct_sound_samples/845ED34.aif
index e5c1cd54a..7de79e747 100644
--- a/sound/direct_sound_samples/845ED34.aif
+++ b/sound/direct_sound_samples/845ED34.aif
diff --git a/sound/direct_sound_samples/845FCC8.aif b/sound/direct_sound_samples/845FCC8.aif
index 6cc8a968e..2a3c54de4 100644
--- a/sound/direct_sound_samples/845FCC8.aif
+++ b/sound/direct_sound_samples/845FCC8.aif
diff --git a/sound/direct_sound_samples/8460E60.aif b/sound/direct_sound_samples/8460E60.aif
index c6827ddee..576e3e19e 100644
--- a/sound/direct_sound_samples/8460E60.aif
+++ b/sound/direct_sound_samples/8460E60.aif
diff --git a/sound/direct_sound_samples/8461D8C.aif b/sound/direct_sound_samples/8461D8C.aif
index a83f3b0df..93cf811f2 100644
--- a/sound/direct_sound_samples/8461D8C.aif
+++ b/sound/direct_sound_samples/8461D8C.aif
diff --git a/sound/direct_sound_samples/84622A4.aif b/sound/direct_sound_samples/84622A4.aif
index dfc2746de..89e779850 100644
--- a/sound/direct_sound_samples/84622A4.aif
+++ b/sound/direct_sound_samples/84622A4.aif
diff --git a/sound/direct_sound_samples/8488F44.aif b/sound/direct_sound_samples/8488F44.aif
index 9a39e4653..a7495513b 100644
--- a/sound/direct_sound_samples/8488F44.aif
+++ b/sound/direct_sound_samples/8488F44.aif
diff --git a/sound/direct_sound_samples/848A8A4.aif b/sound/direct_sound_samples/848A8A4.aif
index 4902f212f..f88812bb2 100644
--- a/sound/direct_sound_samples/848A8A4.aif
+++ b/sound/direct_sound_samples/848A8A4.aif
diff --git a/sound/direct_sound_samples/8492D10.aif b/sound/direct_sound_samples/8492D10.aif
index 9b4669696..746c5a64e 100644
--- a/sound/direct_sound_samples/8492D10.aif
+++ b/sound/direct_sound_samples/8492D10.aif
diff --git a/sound/direct_sound_samples/8639898.aif b/sound/direct_sound_samples/8639898.aif
index f0d38e75a..55c97e88e 100644
--- a/sound/direct_sound_samples/8639898.aif
+++ b/sound/direct_sound_samples/8639898.aif
diff --git a/sound/direct_sound_samples/863A3DC.aif b/sound/direct_sound_samples/863A3DC.aif
index 9eb517c2c..3ff8a0518 100644
--- a/sound/direct_sound_samples/863A3DC.aif
+++ b/sound/direct_sound_samples/863A3DC.aif
diff --git a/sound/direct_sound_samples/863AD2C.aif b/sound/direct_sound_samples/863AD2C.aif
index 01cf6d960..a89ce2bb0 100644
--- a/sound/direct_sound_samples/863AD2C.aif
+++ b/sound/direct_sound_samples/863AD2C.aif
diff --git a/sound/direct_sound_samples/863BABC.aif b/sound/direct_sound_samples/863BABC.aif
index 30b226eed..8fa777eed 100644
--- a/sound/direct_sound_samples/863BABC.aif
+++ b/sound/direct_sound_samples/863BABC.aif
diff --git a/sound/direct_sound_samples/863C744.aif b/sound/direct_sound_samples/863C744.aif
index 9304e6d3d..a06d73b93 100644
--- a/sound/direct_sound_samples/863C744.aif
+++ b/sound/direct_sound_samples/863C744.aif
diff --git a/sound/direct_sound_samples/863D0EC.aif b/sound/direct_sound_samples/863D0EC.aif
index 6414161a2..ff39d8c7c 100644
--- a/sound/direct_sound_samples/863D0EC.aif
+++ b/sound/direct_sound_samples/863D0EC.aif
diff --git a/sound/direct_sound_samples/863DED0.aif b/sound/direct_sound_samples/863DED0.aif
index 334d79558..5512c7d5c 100644
--- a/sound/direct_sound_samples/863DED0.aif
+++ b/sound/direct_sound_samples/863DED0.aif
diff --git a/sound/direct_sound_samples/863EBDC.aif b/sound/direct_sound_samples/863EBDC.aif
index f417ef4f5..c6e219476 100644
--- a/sound/direct_sound_samples/863EBDC.aif
+++ b/sound/direct_sound_samples/863EBDC.aif
diff --git a/sound/direct_sound_samples/863F390.aif b/sound/direct_sound_samples/863F390.aif
index e242b6864..17475215a 100644
--- a/sound/direct_sound_samples/863F390.aif
+++ b/sound/direct_sound_samples/863F390.aif
diff --git a/sound/direct_sound_samples/8640330.aif b/sound/direct_sound_samples/8640330.aif
index 1d3ff6e89..d7ad57610 100644
--- a/sound/direct_sound_samples/8640330.aif
+++ b/sound/direct_sound_samples/8640330.aif
diff --git a/sound/direct_sound_samples/8641170.aif b/sound/direct_sound_samples/8641170.aif
index 0ca3c2f05..428fdc910 100644
--- a/sound/direct_sound_samples/8641170.aif
+++ b/sound/direct_sound_samples/8641170.aif
diff --git a/sound/direct_sound_samples/8641E18.aif b/sound/direct_sound_samples/8641E18.aif
index 17db9c813..650450282 100644
--- a/sound/direct_sound_samples/8641E18.aif
+++ b/sound/direct_sound_samples/8641E18.aif
diff --git a/sound/direct_sound_samples/864244C.aif b/sound/direct_sound_samples/864244C.aif
index a6c492d2a..d1f5ae69e 100644
--- a/sound/direct_sound_samples/864244C.aif
+++ b/sound/direct_sound_samples/864244C.aif
diff --git a/sound/direct_sound_samples/8643650.aif b/sound/direct_sound_samples/8643650.aif
index f6f7993d9..ab1b2c9ed 100644
--- a/sound/direct_sound_samples/8643650.aif
+++ b/sound/direct_sound_samples/8643650.aif
diff --git a/sound/direct_sound_samples/8644154.aif b/sound/direct_sound_samples/8644154.aif
index effcd7fc0..438ea6176 100644
--- a/sound/direct_sound_samples/8644154.aif
+++ b/sound/direct_sound_samples/8644154.aif
diff --git a/sound/direct_sound_samples/8644950.aif b/sound/direct_sound_samples/8644950.aif
index cacf6eca4..06de3bbe5 100644
--- a/sound/direct_sound_samples/8644950.aif
+++ b/sound/direct_sound_samples/8644950.aif
diff --git a/sound/direct_sound_samples/86452B4.aif b/sound/direct_sound_samples/86452B4.aif
index eccd9467f..f3cb868f4 100644
--- a/sound/direct_sound_samples/86452B4.aif
+++ b/sound/direct_sound_samples/86452B4.aif
diff --git a/sound/direct_sound_samples/8646878.aif b/sound/direct_sound_samples/8646878.aif
index fdd27e00b..00031ea40 100644
--- a/sound/direct_sound_samples/8646878.aif
+++ b/sound/direct_sound_samples/8646878.aif
diff --git a/sound/direct_sound_samples/864734C.aif b/sound/direct_sound_samples/864734C.aif
index 1119bd5a8..c86d4c58e 100644
--- a/sound/direct_sound_samples/864734C.aif
+++ b/sound/direct_sound_samples/864734C.aif
diff --git a/sound/direct_sound_samples/8648808.aif b/sound/direct_sound_samples/8648808.aif
index 6c5cb14b1..23db7e80e 100644
--- a/sound/direct_sound_samples/8648808.aif
+++ b/sound/direct_sound_samples/8648808.aif
diff --git a/sound/direct_sound_samples/8649654.aif b/sound/direct_sound_samples/8649654.aif
index 8cbe59d3e..bfc674d3f 100644
--- a/sound/direct_sound_samples/8649654.aif
+++ b/sound/direct_sound_samples/8649654.aif
diff --git a/sound/direct_sound_samples/864B030.aif b/sound/direct_sound_samples/864B030.aif
index 56eec193f..a551b6343 100644
--- a/sound/direct_sound_samples/864B030.aif
+++ b/sound/direct_sound_samples/864B030.aif
diff --git a/sound/direct_sound_samples/864BBC4.aif b/sound/direct_sound_samples/864BBC4.aif
index d14f83ba7..4f48d6221 100644
--- a/sound/direct_sound_samples/864BBC4.aif
+++ b/sound/direct_sound_samples/864BBC4.aif
diff --git a/sound/direct_sound_samples/864CBDC.aif b/sound/direct_sound_samples/864CBDC.aif
index e69605825..60a840be8 100644
--- a/sound/direct_sound_samples/864CBDC.aif
+++ b/sound/direct_sound_samples/864CBDC.aif
diff --git a/sound/direct_sound_samples/864D6BC.aif b/sound/direct_sound_samples/864D6BC.aif
index a584d9dc3..75aa83938 100644
--- a/sound/direct_sound_samples/864D6BC.aif
+++ b/sound/direct_sound_samples/864D6BC.aif
diff --git a/sound/direct_sound_samples/864E410.aif b/sound/direct_sound_samples/864E410.aif
index d27b41508..768888780 100644
--- a/sound/direct_sound_samples/864E410.aif
+++ b/sound/direct_sound_samples/864E410.aif
diff --git a/sound/direct_sound_samples/864ED4C.aif b/sound/direct_sound_samples/864ED4C.aif
index 28de72385..1a4c7d61f 100644
--- a/sound/direct_sound_samples/864ED4C.aif
+++ b/sound/direct_sound_samples/864ED4C.aif
diff --git a/sound/direct_sound_samples/864FA6C.aif b/sound/direct_sound_samples/864FA6C.aif
index 01a7ceed2..4dce97743 100644
--- a/sound/direct_sound_samples/864FA6C.aif
+++ b/sound/direct_sound_samples/864FA6C.aif
diff --git a/sound/direct_sound_samples/86507E0.aif b/sound/direct_sound_samples/86507E0.aif
index 5ad2c43ee..de2ebb15b 100644
--- a/sound/direct_sound_samples/86507E0.aif
+++ b/sound/direct_sound_samples/86507E0.aif
diff --git a/sound/direct_sound_samples/8651148.aif b/sound/direct_sound_samples/8651148.aif
index 5c48c39f5..cebdaaf7f 100644
--- a/sound/direct_sound_samples/8651148.aif
+++ b/sound/direct_sound_samples/8651148.aif
diff --git a/sound/direct_sound_samples/8651910.aif b/sound/direct_sound_samples/8651910.aif
index 800835073..aa4a892e0 100644
--- a/sound/direct_sound_samples/8651910.aif
+++ b/sound/direct_sound_samples/8651910.aif
diff --git a/sound/direct_sound_samples/8652884.aif b/sound/direct_sound_samples/8652884.aif
index eb49b5de7..fd1b032eb 100644
--- a/sound/direct_sound_samples/8652884.aif
+++ b/sound/direct_sound_samples/8652884.aif
diff --git a/sound/direct_sound_samples/8653040.aif b/sound/direct_sound_samples/8653040.aif
index ed129e539..2d3a51342 100644
--- a/sound/direct_sound_samples/8653040.aif
+++ b/sound/direct_sound_samples/8653040.aif
diff --git a/sound/direct_sound_samples/8654170.aif b/sound/direct_sound_samples/8654170.aif
index 0fc92a67c..aee32c0e3 100644
--- a/sound/direct_sound_samples/8654170.aif
+++ b/sound/direct_sound_samples/8654170.aif
diff --git a/sound/direct_sound_samples/cry_abra.aif b/sound/direct_sound_samples/cry_abra.aif
new file mode 100644
index 000000000..14abd608d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_abra.aif
diff --git a/sound/direct_sound_samples/cry_absol.aif b/sound/direct_sound_samples/cry_absol.aif
new file mode 100644
index 000000000..c55bca8b3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_absol.aif
diff --git a/sound/direct_sound_samples/cry_aerodactyl.aif b/sound/direct_sound_samples/cry_aerodactyl.aif
new file mode 100644
index 000000000..99b1db084
--- /dev/null
+++ b/sound/direct_sound_samples/cry_aerodactyl.aif
diff --git a/sound/direct_sound_samples/cry_aggron.aif b/sound/direct_sound_samples/cry_aggron.aif
new file mode 100644
index 000000000..10ca842e3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_aggron.aif
diff --git a/sound/direct_sound_samples/cry_aipom.aif b/sound/direct_sound_samples/cry_aipom.aif
new file mode 100644
index 000000000..105dfcf15
--- /dev/null
+++ b/sound/direct_sound_samples/cry_aipom.aif
diff --git a/sound/direct_sound_samples/cry_alakazam.aif b/sound/direct_sound_samples/cry_alakazam.aif
new file mode 100644
index 000000000..f3d0fb1b1
--- /dev/null
+++ b/sound/direct_sound_samples/cry_alakazam.aif
diff --git a/sound/direct_sound_samples/cry_altaria.aif b/sound/direct_sound_samples/cry_altaria.aif
new file mode 100644
index 000000000..70411e01d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_altaria.aif
diff --git a/sound/direct_sound_samples/cry_ampharos.aif b/sound/direct_sound_samples/cry_ampharos.aif
new file mode 100644
index 000000000..e368ebfb3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ampharos.aif
diff --git a/sound/direct_sound_samples/cry_anorith.aif b/sound/direct_sound_samples/cry_anorith.aif
new file mode 100644
index 000000000..200163032
--- /dev/null
+++ b/sound/direct_sound_samples/cry_anorith.aif
diff --git a/sound/direct_sound_samples/cry_arbok.aif b/sound/direct_sound_samples/cry_arbok.aif
new file mode 100644
index 000000000..af87f46d3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_arbok.aif
diff --git a/sound/direct_sound_samples/cry_arcanine.aif b/sound/direct_sound_samples/cry_arcanine.aif
new file mode 100644
index 000000000..662d912b0
--- /dev/null
+++ b/sound/direct_sound_samples/cry_arcanine.aif
diff --git a/sound/direct_sound_samples/cry_ariados.aif b/sound/direct_sound_samples/cry_ariados.aif
new file mode 100644
index 000000000..12d688cac
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ariados.aif
diff --git a/sound/direct_sound_samples/cry_armaldo.aif b/sound/direct_sound_samples/cry_armaldo.aif
new file mode 100644
index 000000000..9955225f3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_armaldo.aif
diff --git a/sound/direct_sound_samples/cry_aron.aif b/sound/direct_sound_samples/cry_aron.aif
new file mode 100644
index 000000000..1fada0c96
--- /dev/null
+++ b/sound/direct_sound_samples/cry_aron.aif
diff --git a/sound/direct_sound_samples/cry_articuno.aif b/sound/direct_sound_samples/cry_articuno.aif
new file mode 100644
index 000000000..80f13470e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_articuno.aif
diff --git a/sound/direct_sound_samples/cry_azumarill.aif b/sound/direct_sound_samples/cry_azumarill.aif
new file mode 100644
index 000000000..2e2c3d61d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_azumarill.aif
diff --git a/sound/direct_sound_samples/cry_azurill.aif b/sound/direct_sound_samples/cry_azurill.aif
new file mode 100644
index 000000000..b7fdf1b5d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_azurill.aif
diff --git a/sound/direct_sound_samples/cry_bagon.aif b/sound/direct_sound_samples/cry_bagon.aif
new file mode 100644
index 000000000..f40443859
--- /dev/null
+++ b/sound/direct_sound_samples/cry_bagon.aif
diff --git a/sound/direct_sound_samples/cry_baltoy.aif b/sound/direct_sound_samples/cry_baltoy.aif
new file mode 100644
index 000000000..94576437e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_baltoy.aif
diff --git a/sound/direct_sound_samples/cry_banette.aif b/sound/direct_sound_samples/cry_banette.aif
new file mode 100644
index 000000000..1006946d5
--- /dev/null
+++ b/sound/direct_sound_samples/cry_banette.aif
diff --git a/sound/direct_sound_samples/cry_barboach.aif b/sound/direct_sound_samples/cry_barboach.aif
new file mode 100644
index 000000000..efecf510e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_barboach.aif
diff --git a/sound/direct_sound_samples/cry_bayleef.aif b/sound/direct_sound_samples/cry_bayleef.aif
new file mode 100644
index 000000000..fde854f39
--- /dev/null
+++ b/sound/direct_sound_samples/cry_bayleef.aif
diff --git a/sound/direct_sound_samples/cry_beautifly.aif b/sound/direct_sound_samples/cry_beautifly.aif
new file mode 100644
index 000000000..eb756fbfd
--- /dev/null
+++ b/sound/direct_sound_samples/cry_beautifly.aif
diff --git a/sound/direct_sound_samples/cry_beedrill.aif b/sound/direct_sound_samples/cry_beedrill.aif
new file mode 100644
index 000000000..be80c31bd
--- /dev/null
+++ b/sound/direct_sound_samples/cry_beedrill.aif
diff --git a/sound/direct_sound_samples/cry_beldum.aif b/sound/direct_sound_samples/cry_beldum.aif
new file mode 100644
index 000000000..a9007aed7
--- /dev/null
+++ b/sound/direct_sound_samples/cry_beldum.aif
diff --git a/sound/direct_sound_samples/cry_bellossom.aif b/sound/direct_sound_samples/cry_bellossom.aif
new file mode 100644
index 000000000..eb1e5cf58
--- /dev/null
+++ b/sound/direct_sound_samples/cry_bellossom.aif
diff --git a/sound/direct_sound_samples/cry_bellsprout.aif b/sound/direct_sound_samples/cry_bellsprout.aif
new file mode 100644
index 000000000..1ab0d8972
--- /dev/null
+++ b/sound/direct_sound_samples/cry_bellsprout.aif
diff --git a/sound/direct_sound_samples/cry_blastoise.aif b/sound/direct_sound_samples/cry_blastoise.aif
new file mode 100644
index 000000000..d0aefe367
--- /dev/null
+++ b/sound/direct_sound_samples/cry_blastoise.aif
diff --git a/sound/direct_sound_samples/cry_blaziken.aif b/sound/direct_sound_samples/cry_blaziken.aif
new file mode 100644
index 000000000..48cf24c5b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_blaziken.aif
diff --git a/sound/direct_sound_samples/cry_blissey.aif b/sound/direct_sound_samples/cry_blissey.aif
new file mode 100644
index 000000000..6daf7a6df
--- /dev/null
+++ b/sound/direct_sound_samples/cry_blissey.aif
diff --git a/sound/direct_sound_samples/cry_breloom.aif b/sound/direct_sound_samples/cry_breloom.aif
new file mode 100644
index 000000000..1ff88d6ed
--- /dev/null
+++ b/sound/direct_sound_samples/cry_breloom.aif
diff --git a/sound/direct_sound_samples/cry_bulbasaur.aif b/sound/direct_sound_samples/cry_bulbasaur.aif
new file mode 100644
index 000000000..44bb79c3c
--- /dev/null
+++ b/sound/direct_sound_samples/cry_bulbasaur.aif
diff --git a/sound/direct_sound_samples/cry_butterfree.aif b/sound/direct_sound_samples/cry_butterfree.aif
new file mode 100644
index 000000000..72e86d6f4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_butterfree.aif
diff --git a/sound/direct_sound_samples/cry_cacnea.aif b/sound/direct_sound_samples/cry_cacnea.aif
new file mode 100644
index 000000000..bdc7d1de8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_cacnea.aif
diff --git a/sound/direct_sound_samples/cry_cacturne.aif b/sound/direct_sound_samples/cry_cacturne.aif
new file mode 100644
index 000000000..1ef3e07c8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_cacturne.aif
diff --git a/sound/direct_sound_samples/cry_camerupt.aif b/sound/direct_sound_samples/cry_camerupt.aif
new file mode 100644
index 000000000..f807cecf9
--- /dev/null
+++ b/sound/direct_sound_samples/cry_camerupt.aif
diff --git a/sound/direct_sound_samples/cry_carvanha.aif b/sound/direct_sound_samples/cry_carvanha.aif
new file mode 100644
index 000000000..7624e71bd
--- /dev/null
+++ b/sound/direct_sound_samples/cry_carvanha.aif
diff --git a/sound/direct_sound_samples/cry_cascoon.aif b/sound/direct_sound_samples/cry_cascoon.aif
new file mode 100644
index 000000000..539e6b1d1
--- /dev/null
+++ b/sound/direct_sound_samples/cry_cascoon.aif
diff --git a/sound/direct_sound_samples/cry_castform.aif b/sound/direct_sound_samples/cry_castform.aif
new file mode 100644
index 000000000..2d2ea0455
--- /dev/null
+++ b/sound/direct_sound_samples/cry_castform.aif
diff --git a/sound/direct_sound_samples/cry_caterpie.aif b/sound/direct_sound_samples/cry_caterpie.aif
new file mode 100644
index 000000000..fbb86ce20
--- /dev/null
+++ b/sound/direct_sound_samples/cry_caterpie.aif
diff --git a/sound/direct_sound_samples/cry_celebi.aif b/sound/direct_sound_samples/cry_celebi.aif
new file mode 100644
index 000000000..a86f2770f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_celebi.aif
diff --git a/sound/direct_sound_samples/cry_chansey.aif b/sound/direct_sound_samples/cry_chansey.aif
new file mode 100644
index 000000000..97a568853
--- /dev/null
+++ b/sound/direct_sound_samples/cry_chansey.aif
diff --git a/sound/direct_sound_samples/cry_charizard.aif b/sound/direct_sound_samples/cry_charizard.aif
new file mode 100644
index 000000000..6114ed5e6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_charizard.aif
diff --git a/sound/direct_sound_samples/cry_charmander.aif b/sound/direct_sound_samples/cry_charmander.aif
new file mode 100644
index 000000000..4fe0e8f96
--- /dev/null
+++ b/sound/direct_sound_samples/cry_charmander.aif
diff --git a/sound/direct_sound_samples/cry_charmeleon.aif b/sound/direct_sound_samples/cry_charmeleon.aif
new file mode 100644
index 000000000..1731dcb3f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_charmeleon.aif
diff --git a/sound/direct_sound_samples/cry_chikorita.aif b/sound/direct_sound_samples/cry_chikorita.aif
new file mode 100644
index 000000000..1adf2fe3c
--- /dev/null
+++ b/sound/direct_sound_samples/cry_chikorita.aif
diff --git a/sound/direct_sound_samples/cry_chimecho.aif b/sound/direct_sound_samples/cry_chimecho.aif
new file mode 100644
index 000000000..9d209c3a8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_chimecho.aif
diff --git a/sound/direct_sound_samples/cry_chinchou.aif b/sound/direct_sound_samples/cry_chinchou.aif
new file mode 100644
index 000000000..601ebb29f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_chinchou.aif
diff --git a/sound/direct_sound_samples/cry_clamperl.aif b/sound/direct_sound_samples/cry_clamperl.aif
new file mode 100644
index 000000000..9834c48db
--- /dev/null
+++ b/sound/direct_sound_samples/cry_clamperl.aif
diff --git a/sound/direct_sound_samples/cry_claydol.aif b/sound/direct_sound_samples/cry_claydol.aif
new file mode 100644
index 000000000..442e63060
--- /dev/null
+++ b/sound/direct_sound_samples/cry_claydol.aif
diff --git a/sound/direct_sound_samples/cry_clefable.aif b/sound/direct_sound_samples/cry_clefable.aif
new file mode 100644
index 000000000..a61ce7172
--- /dev/null
+++ b/sound/direct_sound_samples/cry_clefable.aif
diff --git a/sound/direct_sound_samples/cry_clefairy.aif b/sound/direct_sound_samples/cry_clefairy.aif
new file mode 100644
index 000000000..6f1c3c6ed
--- /dev/null
+++ b/sound/direct_sound_samples/cry_clefairy.aif
diff --git a/sound/direct_sound_samples/cry_cleffa.aif b/sound/direct_sound_samples/cry_cleffa.aif
new file mode 100644
index 000000000..92dae2300
--- /dev/null
+++ b/sound/direct_sound_samples/cry_cleffa.aif
diff --git a/sound/direct_sound_samples/cry_cloyster.aif b/sound/direct_sound_samples/cry_cloyster.aif
new file mode 100644
index 000000000..0581ac746
--- /dev/null
+++ b/sound/direct_sound_samples/cry_cloyster.aif
diff --git a/sound/direct_sound_samples/cry_combusken.aif b/sound/direct_sound_samples/cry_combusken.aif
new file mode 100644
index 000000000..9aafe5a44
--- /dev/null
+++ b/sound/direct_sound_samples/cry_combusken.aif
diff --git a/sound/direct_sound_samples/cry_corphish.aif b/sound/direct_sound_samples/cry_corphish.aif
new file mode 100644
index 000000000..2ba9a08a6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_corphish.aif
diff --git a/sound/direct_sound_samples/cry_corsola.aif b/sound/direct_sound_samples/cry_corsola.aif
new file mode 100644
index 000000000..0796fa64a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_corsola.aif
diff --git a/sound/direct_sound_samples/cry_cradily.aif b/sound/direct_sound_samples/cry_cradily.aif
new file mode 100644
index 000000000..0b3bcadf6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_cradily.aif
diff --git a/sound/direct_sound_samples/cry_crawdaunt.aif b/sound/direct_sound_samples/cry_crawdaunt.aif
new file mode 100644
index 000000000..b7ec28c23
--- /dev/null
+++ b/sound/direct_sound_samples/cry_crawdaunt.aif
diff --git a/sound/direct_sound_samples/cry_crobat.aif b/sound/direct_sound_samples/cry_crobat.aif
new file mode 100644
index 000000000..7e5e1d104
--- /dev/null
+++ b/sound/direct_sound_samples/cry_crobat.aif
diff --git a/sound/direct_sound_samples/cry_croconaw.aif b/sound/direct_sound_samples/cry_croconaw.aif
new file mode 100644
index 000000000..bcc1e4dc8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_croconaw.aif
diff --git a/sound/direct_sound_samples/cry_cubone.aif b/sound/direct_sound_samples/cry_cubone.aif
new file mode 100644
index 000000000..c305aaa0e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_cubone.aif
diff --git a/sound/direct_sound_samples/cry_cyndaquil.aif b/sound/direct_sound_samples/cry_cyndaquil.aif
new file mode 100644
index 000000000..fce3c49c7
--- /dev/null
+++ b/sound/direct_sound_samples/cry_cyndaquil.aif
diff --git a/sound/direct_sound_samples/cry_delcatty.aif b/sound/direct_sound_samples/cry_delcatty.aif
new file mode 100644
index 000000000..be6fef4f3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_delcatty.aif
diff --git a/sound/direct_sound_samples/cry_delibird.aif b/sound/direct_sound_samples/cry_delibird.aif
new file mode 100644
index 000000000..1634ac885
--- /dev/null
+++ b/sound/direct_sound_samples/cry_delibird.aif
diff --git a/sound/direct_sound_samples/cry_deoxys.aif b/sound/direct_sound_samples/cry_deoxys.aif
new file mode 100644
index 000000000..fd2245440
--- /dev/null
+++ b/sound/direct_sound_samples/cry_deoxys.aif
diff --git a/sound/direct_sound_samples/cry_dewgong.aif b/sound/direct_sound_samples/cry_dewgong.aif
new file mode 100644
index 000000000..6303104bd
--- /dev/null
+++ b/sound/direct_sound_samples/cry_dewgong.aif
diff --git a/sound/direct_sound_samples/cry_diglett.aif b/sound/direct_sound_samples/cry_diglett.aif
new file mode 100644
index 000000000..f9424ddda
--- /dev/null
+++ b/sound/direct_sound_samples/cry_diglett.aif
diff --git a/sound/direct_sound_samples/cry_ditto.aif b/sound/direct_sound_samples/cry_ditto.aif
new file mode 100644
index 000000000..f28aa3b5b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ditto.aif
diff --git a/sound/direct_sound_samples/cry_dodrio.aif b/sound/direct_sound_samples/cry_dodrio.aif
new file mode 100644
index 000000000..24830824f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_dodrio.aif
diff --git a/sound/direct_sound_samples/cry_doduo.aif b/sound/direct_sound_samples/cry_doduo.aif
new file mode 100644
index 000000000..c494aede0
--- /dev/null
+++ b/sound/direct_sound_samples/cry_doduo.aif
diff --git a/sound/direct_sound_samples/cry_donphan.aif b/sound/direct_sound_samples/cry_donphan.aif
new file mode 100644
index 000000000..dc4abfc91
--- /dev/null
+++ b/sound/direct_sound_samples/cry_donphan.aif
diff --git a/sound/direct_sound_samples/cry_dragonair.aif b/sound/direct_sound_samples/cry_dragonair.aif
new file mode 100644
index 000000000..0a3a6d8e2
--- /dev/null
+++ b/sound/direct_sound_samples/cry_dragonair.aif
diff --git a/sound/direct_sound_samples/cry_dragonite.aif b/sound/direct_sound_samples/cry_dragonite.aif
new file mode 100644
index 000000000..84fade856
--- /dev/null
+++ b/sound/direct_sound_samples/cry_dragonite.aif
diff --git a/sound/direct_sound_samples/cry_dratini.aif b/sound/direct_sound_samples/cry_dratini.aif
new file mode 100644
index 000000000..b8433c50f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_dratini.aif
diff --git a/sound/direct_sound_samples/cry_drowzee.aif b/sound/direct_sound_samples/cry_drowzee.aif
new file mode 100644
index 000000000..67af2a910
--- /dev/null
+++ b/sound/direct_sound_samples/cry_drowzee.aif
diff --git a/sound/direct_sound_samples/cry_dugtrio.aif b/sound/direct_sound_samples/cry_dugtrio.aif
new file mode 100644
index 000000000..24f4431f8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_dugtrio.aif
diff --git a/sound/direct_sound_samples/cry_dunsparce.aif b/sound/direct_sound_samples/cry_dunsparce.aif
new file mode 100644
index 000000000..03b2d2911
--- /dev/null
+++ b/sound/direct_sound_samples/cry_dunsparce.aif
diff --git a/sound/direct_sound_samples/cry_dusclops.aif b/sound/direct_sound_samples/cry_dusclops.aif
new file mode 100644
index 000000000..fab95ffe1
--- /dev/null
+++ b/sound/direct_sound_samples/cry_dusclops.aif
diff --git a/sound/direct_sound_samples/cry_duskull.aif b/sound/direct_sound_samples/cry_duskull.aif
new file mode 100644
index 000000000..825fe2c43
--- /dev/null
+++ b/sound/direct_sound_samples/cry_duskull.aif
diff --git a/sound/direct_sound_samples/cry_dustox.aif b/sound/direct_sound_samples/cry_dustox.aif
new file mode 100644
index 000000000..1e569b3aa
--- /dev/null
+++ b/sound/direct_sound_samples/cry_dustox.aif
diff --git a/sound/direct_sound_samples/cry_eevee.aif b/sound/direct_sound_samples/cry_eevee.aif
new file mode 100644
index 000000000..87635bbf4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_eevee.aif
diff --git a/sound/direct_sound_samples/cry_ekans.aif b/sound/direct_sound_samples/cry_ekans.aif
new file mode 100644
index 000000000..796180fc4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ekans.aif
diff --git a/sound/direct_sound_samples/cry_electabuzz.aif b/sound/direct_sound_samples/cry_electabuzz.aif
new file mode 100644
index 000000000..a39392430
--- /dev/null
+++ b/sound/direct_sound_samples/cry_electabuzz.aif
diff --git a/sound/direct_sound_samples/cry_electrike.aif b/sound/direct_sound_samples/cry_electrike.aif
new file mode 100644
index 000000000..f5a457a9b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_electrike.aif
diff --git a/sound/direct_sound_samples/cry_electrode.aif b/sound/direct_sound_samples/cry_electrode.aif
new file mode 100644
index 000000000..f1c0e4097
--- /dev/null
+++ b/sound/direct_sound_samples/cry_electrode.aif
diff --git a/sound/direct_sound_samples/cry_elekid.aif b/sound/direct_sound_samples/cry_elekid.aif
new file mode 100644
index 000000000..807e5749e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_elekid.aif
diff --git a/sound/direct_sound_samples/cry_entei.aif b/sound/direct_sound_samples/cry_entei.aif
new file mode 100644
index 000000000..f496b47a3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_entei.aif
diff --git a/sound/direct_sound_samples/cry_espeon.aif b/sound/direct_sound_samples/cry_espeon.aif
new file mode 100644
index 000000000..8fa0be30d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_espeon.aif
diff --git a/sound/direct_sound_samples/cry_exeggcute.aif b/sound/direct_sound_samples/cry_exeggcute.aif
new file mode 100644
index 000000000..9e86f84af
--- /dev/null
+++ b/sound/direct_sound_samples/cry_exeggcute.aif
diff --git a/sound/direct_sound_samples/cry_exeggutor.aif b/sound/direct_sound_samples/cry_exeggutor.aif
new file mode 100644
index 000000000..68e3812d5
--- /dev/null
+++ b/sound/direct_sound_samples/cry_exeggutor.aif
diff --git a/sound/direct_sound_samples/cry_exploud.aif b/sound/direct_sound_samples/cry_exploud.aif
new file mode 100644
index 000000000..8f7df1c37
--- /dev/null
+++ b/sound/direct_sound_samples/cry_exploud.aif
diff --git a/sound/direct_sound_samples/cry_farfetchd.aif b/sound/direct_sound_samples/cry_farfetchd.aif
new file mode 100644
index 000000000..9a504fb4b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_farfetchd.aif
diff --git a/sound/direct_sound_samples/cry_fearow.aif b/sound/direct_sound_samples/cry_fearow.aif
new file mode 100644
index 000000000..55e85bb1b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_fearow.aif
diff --git a/sound/direct_sound_samples/cry_feebas.aif b/sound/direct_sound_samples/cry_feebas.aif
new file mode 100644
index 000000000..853614ece
--- /dev/null
+++ b/sound/direct_sound_samples/cry_feebas.aif
diff --git a/sound/direct_sound_samples/cry_feraligatr.aif b/sound/direct_sound_samples/cry_feraligatr.aif
new file mode 100644
index 000000000..8fd817bfa
--- /dev/null
+++ b/sound/direct_sound_samples/cry_feraligatr.aif
diff --git a/sound/direct_sound_samples/cry_flaaffy.aif b/sound/direct_sound_samples/cry_flaaffy.aif
new file mode 100644
index 000000000..cba3944a1
--- /dev/null
+++ b/sound/direct_sound_samples/cry_flaaffy.aif
diff --git a/sound/direct_sound_samples/cry_flareon.aif b/sound/direct_sound_samples/cry_flareon.aif
new file mode 100644
index 000000000..9406e23a4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_flareon.aif
diff --git a/sound/direct_sound_samples/cry_flygon.aif b/sound/direct_sound_samples/cry_flygon.aif
new file mode 100644
index 000000000..cbe8bf323
--- /dev/null
+++ b/sound/direct_sound_samples/cry_flygon.aif
diff --git a/sound/direct_sound_samples/cry_forretress.aif b/sound/direct_sound_samples/cry_forretress.aif
new file mode 100644
index 000000000..f20173639
--- /dev/null
+++ b/sound/direct_sound_samples/cry_forretress.aif
diff --git a/sound/direct_sound_samples/cry_furret.aif b/sound/direct_sound_samples/cry_furret.aif
new file mode 100644
index 000000000..9ccaa8cca
--- /dev/null
+++ b/sound/direct_sound_samples/cry_furret.aif
diff --git a/sound/direct_sound_samples/cry_gardevoir.aif b/sound/direct_sound_samples/cry_gardevoir.aif
new file mode 100644
index 000000000..5e8b2fed9
--- /dev/null
+++ b/sound/direct_sound_samples/cry_gardevoir.aif
diff --git a/sound/direct_sound_samples/cry_gastly.aif b/sound/direct_sound_samples/cry_gastly.aif
new file mode 100644
index 000000000..a896cc02b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_gastly.aif
diff --git a/sound/direct_sound_samples/cry_gengar.aif b/sound/direct_sound_samples/cry_gengar.aif
new file mode 100644
index 000000000..f4b336714
--- /dev/null
+++ b/sound/direct_sound_samples/cry_gengar.aif
diff --git a/sound/direct_sound_samples/cry_geodude.aif b/sound/direct_sound_samples/cry_geodude.aif
new file mode 100644
index 000000000..0c2102151
--- /dev/null
+++ b/sound/direct_sound_samples/cry_geodude.aif
diff --git a/sound/direct_sound_samples/cry_girafarig.aif b/sound/direct_sound_samples/cry_girafarig.aif
new file mode 100644
index 000000000..0b66bc507
--- /dev/null
+++ b/sound/direct_sound_samples/cry_girafarig.aif
diff --git a/sound/direct_sound_samples/cry_glalie.aif b/sound/direct_sound_samples/cry_glalie.aif
new file mode 100644
index 000000000..dc56aed7d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_glalie.aif
diff --git a/sound/direct_sound_samples/cry_gligar.aif b/sound/direct_sound_samples/cry_gligar.aif
new file mode 100644
index 000000000..b1014e413
--- /dev/null
+++ b/sound/direct_sound_samples/cry_gligar.aif
diff --git a/sound/direct_sound_samples/cry_gloom.aif b/sound/direct_sound_samples/cry_gloom.aif
new file mode 100644
index 000000000..cb90b323f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_gloom.aif
diff --git a/sound/direct_sound_samples/cry_golbat.aif b/sound/direct_sound_samples/cry_golbat.aif
new file mode 100644
index 000000000..3a3b4aa9d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_golbat.aif
diff --git a/sound/direct_sound_samples/cry_goldeen.aif b/sound/direct_sound_samples/cry_goldeen.aif
new file mode 100644
index 000000000..f957d2245
--- /dev/null
+++ b/sound/direct_sound_samples/cry_goldeen.aif
diff --git a/sound/direct_sound_samples/cry_golduck.aif b/sound/direct_sound_samples/cry_golduck.aif
new file mode 100644
index 000000000..b38550273
--- /dev/null
+++ b/sound/direct_sound_samples/cry_golduck.aif
diff --git a/sound/direct_sound_samples/cry_golem.aif b/sound/direct_sound_samples/cry_golem.aif
new file mode 100644
index 000000000..ac3760deb
--- /dev/null
+++ b/sound/direct_sound_samples/cry_golem.aif
diff --git a/sound/direct_sound_samples/cry_gorebyss.aif b/sound/direct_sound_samples/cry_gorebyss.aif
new file mode 100644
index 000000000..221c1c6e8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_gorebyss.aif
diff --git a/sound/direct_sound_samples/cry_granbull.aif b/sound/direct_sound_samples/cry_granbull.aif
new file mode 100644
index 000000000..70d66c23b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_granbull.aif
diff --git a/sound/direct_sound_samples/cry_graveler.aif b/sound/direct_sound_samples/cry_graveler.aif
new file mode 100644
index 000000000..811a613a3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_graveler.aif
diff --git a/sound/direct_sound_samples/cry_grimer.aif b/sound/direct_sound_samples/cry_grimer.aif
new file mode 100644
index 000000000..077dff764
--- /dev/null
+++ b/sound/direct_sound_samples/cry_grimer.aif
diff --git a/sound/direct_sound_samples/cry_groudon.aif b/sound/direct_sound_samples/cry_groudon.aif
new file mode 100644
index 000000000..c72493c16
--- /dev/null
+++ b/sound/direct_sound_samples/cry_groudon.aif
diff --git a/sound/direct_sound_samples/cry_grovyle.aif b/sound/direct_sound_samples/cry_grovyle.aif
new file mode 100644
index 000000000..66b5ebaf6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_grovyle.aif
diff --git a/sound/direct_sound_samples/cry_growlithe.aif b/sound/direct_sound_samples/cry_growlithe.aif
new file mode 100644
index 000000000..f6968e2b6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_growlithe.aif
diff --git a/sound/direct_sound_samples/cry_grumpig.aif b/sound/direct_sound_samples/cry_grumpig.aif
new file mode 100644
index 000000000..c6c4fe5ca
--- /dev/null
+++ b/sound/direct_sound_samples/cry_grumpig.aif
diff --git a/sound/direct_sound_samples/cry_gulpin.aif b/sound/direct_sound_samples/cry_gulpin.aif
new file mode 100644
index 000000000..20becb560
--- /dev/null
+++ b/sound/direct_sound_samples/cry_gulpin.aif
diff --git a/sound/direct_sound_samples/cry_gyarados.aif b/sound/direct_sound_samples/cry_gyarados.aif
new file mode 100644
index 000000000..8daa129fb
--- /dev/null
+++ b/sound/direct_sound_samples/cry_gyarados.aif
diff --git a/sound/direct_sound_samples/cry_hariyama.aif b/sound/direct_sound_samples/cry_hariyama.aif
new file mode 100644
index 000000000..84f99be82
--- /dev/null
+++ b/sound/direct_sound_samples/cry_hariyama.aif
diff --git a/sound/direct_sound_samples/cry_haunter.aif b/sound/direct_sound_samples/cry_haunter.aif
new file mode 100644
index 000000000..34d043e2c
--- /dev/null
+++ b/sound/direct_sound_samples/cry_haunter.aif
diff --git a/sound/direct_sound_samples/cry_heracross.aif b/sound/direct_sound_samples/cry_heracross.aif
new file mode 100644
index 000000000..82190b672
--- /dev/null
+++ b/sound/direct_sound_samples/cry_heracross.aif
diff --git a/sound/direct_sound_samples/cry_hitmonchan.aif b/sound/direct_sound_samples/cry_hitmonchan.aif
new file mode 100644
index 000000000..c15e50612
--- /dev/null
+++ b/sound/direct_sound_samples/cry_hitmonchan.aif
diff --git a/sound/direct_sound_samples/cry_hitmonlee.aif b/sound/direct_sound_samples/cry_hitmonlee.aif
new file mode 100644
index 000000000..cc93a755e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_hitmonlee.aif
diff --git a/sound/direct_sound_samples/cry_hitmontop.aif b/sound/direct_sound_samples/cry_hitmontop.aif
new file mode 100644
index 000000000..61e05eed1
--- /dev/null
+++ b/sound/direct_sound_samples/cry_hitmontop.aif
diff --git a/sound/direct_sound_samples/cry_ho_oh.aif b/sound/direct_sound_samples/cry_ho_oh.aif
new file mode 100644
index 000000000..b7e5b4f36
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ho_oh.aif
diff --git a/sound/direct_sound_samples/cry_hoothoot.aif b/sound/direct_sound_samples/cry_hoothoot.aif
new file mode 100644
index 000000000..0b0d06c51
--- /dev/null
+++ b/sound/direct_sound_samples/cry_hoothoot.aif
diff --git a/sound/direct_sound_samples/cry_hoppip.aif b/sound/direct_sound_samples/cry_hoppip.aif
new file mode 100644
index 000000000..ed64184f6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_hoppip.aif
diff --git a/sound/direct_sound_samples/cry_horsea.aif b/sound/direct_sound_samples/cry_horsea.aif
new file mode 100644
index 000000000..d0ac96bf3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_horsea.aif
diff --git a/sound/direct_sound_samples/cry_houndoom.aif b/sound/direct_sound_samples/cry_houndoom.aif
new file mode 100644
index 000000000..749e1a205
--- /dev/null
+++ b/sound/direct_sound_samples/cry_houndoom.aif
diff --git a/sound/direct_sound_samples/cry_houndour.aif b/sound/direct_sound_samples/cry_houndour.aif
new file mode 100644
index 000000000..5c61d50e3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_houndour.aif
diff --git a/sound/direct_sound_samples/cry_huntail.aif b/sound/direct_sound_samples/cry_huntail.aif
new file mode 100644
index 000000000..580b03a40
--- /dev/null
+++ b/sound/direct_sound_samples/cry_huntail.aif
diff --git a/sound/direct_sound_samples/cry_hypno.aif b/sound/direct_sound_samples/cry_hypno.aif
new file mode 100644
index 000000000..4c149aae2
--- /dev/null
+++ b/sound/direct_sound_samples/cry_hypno.aif
diff --git a/sound/direct_sound_samples/cry_igglybuff.aif b/sound/direct_sound_samples/cry_igglybuff.aif
new file mode 100644
index 000000000..63df96541
--- /dev/null
+++ b/sound/direct_sound_samples/cry_igglybuff.aif
diff --git a/sound/direct_sound_samples/cry_illumise.aif b/sound/direct_sound_samples/cry_illumise.aif
new file mode 100644
index 000000000..c01d9299b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_illumise.aif
diff --git a/sound/direct_sound_samples/cry_ivysaur.aif b/sound/direct_sound_samples/cry_ivysaur.aif
new file mode 100644
index 000000000..9118600a7
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ivysaur.aif
diff --git a/sound/direct_sound_samples/cry_jigglypuff.aif b/sound/direct_sound_samples/cry_jigglypuff.aif
new file mode 100644
index 000000000..0798cdd0d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_jigglypuff.aif
diff --git a/sound/direct_sound_samples/cry_jirachi.aif b/sound/direct_sound_samples/cry_jirachi.aif
new file mode 100644
index 000000000..0c4cd1c6f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_jirachi.aif
diff --git a/sound/direct_sound_samples/cry_jolteon.aif b/sound/direct_sound_samples/cry_jolteon.aif
new file mode 100644
index 000000000..06b63eff6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_jolteon.aif
diff --git a/sound/direct_sound_samples/cry_jumpluff.aif b/sound/direct_sound_samples/cry_jumpluff.aif
new file mode 100644
index 000000000..be28bd5d6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_jumpluff.aif
diff --git a/sound/direct_sound_samples/cry_jynx.aif b/sound/direct_sound_samples/cry_jynx.aif
new file mode 100644
index 000000000..9da011071
--- /dev/null
+++ b/sound/direct_sound_samples/cry_jynx.aif
diff --git a/sound/direct_sound_samples/cry_kabuto.aif b/sound/direct_sound_samples/cry_kabuto.aif
new file mode 100644
index 000000000..890c865c9
--- /dev/null
+++ b/sound/direct_sound_samples/cry_kabuto.aif
diff --git a/sound/direct_sound_samples/cry_kabutops.aif b/sound/direct_sound_samples/cry_kabutops.aif
new file mode 100644
index 000000000..d83884618
--- /dev/null
+++ b/sound/direct_sound_samples/cry_kabutops.aif
diff --git a/sound/direct_sound_samples/cry_kadabra.aif b/sound/direct_sound_samples/cry_kadabra.aif
new file mode 100644
index 000000000..c598f87f5
--- /dev/null
+++ b/sound/direct_sound_samples/cry_kadabra.aif
diff --git a/sound/direct_sound_samples/cry_kakuna.aif b/sound/direct_sound_samples/cry_kakuna.aif
new file mode 100644
index 000000000..9ab90720a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_kakuna.aif
diff --git a/sound/direct_sound_samples/cry_kangaskhan.aif b/sound/direct_sound_samples/cry_kangaskhan.aif
new file mode 100644
index 000000000..8971d2452
--- /dev/null
+++ b/sound/direct_sound_samples/cry_kangaskhan.aif
diff --git a/sound/direct_sound_samples/cry_kecleon.aif b/sound/direct_sound_samples/cry_kecleon.aif
new file mode 100644
index 000000000..17f15a1a6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_kecleon.aif
diff --git a/sound/direct_sound_samples/cry_kingdra.aif b/sound/direct_sound_samples/cry_kingdra.aif
new file mode 100644
index 000000000..6ae074937
--- /dev/null
+++ b/sound/direct_sound_samples/cry_kingdra.aif
diff --git a/sound/direct_sound_samples/cry_kingler.aif b/sound/direct_sound_samples/cry_kingler.aif
new file mode 100644
index 000000000..078088ea4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_kingler.aif
diff --git a/sound/direct_sound_samples/cry_kirlia.aif b/sound/direct_sound_samples/cry_kirlia.aif
new file mode 100644
index 000000000..0d1187752
--- /dev/null
+++ b/sound/direct_sound_samples/cry_kirlia.aif
diff --git a/sound/direct_sound_samples/cry_koffing.aif b/sound/direct_sound_samples/cry_koffing.aif
new file mode 100644
index 000000000..eab517bb9
--- /dev/null
+++ b/sound/direct_sound_samples/cry_koffing.aif
diff --git a/sound/direct_sound_samples/cry_krabby.aif b/sound/direct_sound_samples/cry_krabby.aif
new file mode 100644
index 000000000..7762968e7
--- /dev/null
+++ b/sound/direct_sound_samples/cry_krabby.aif
diff --git a/sound/direct_sound_samples/cry_kyogre.aif b/sound/direct_sound_samples/cry_kyogre.aif
new file mode 100644
index 000000000..b8aaa0643
--- /dev/null
+++ b/sound/direct_sound_samples/cry_kyogre.aif
diff --git a/sound/direct_sound_samples/cry_lairon.aif b/sound/direct_sound_samples/cry_lairon.aif
new file mode 100644
index 000000000..c0b5a3d49
--- /dev/null
+++ b/sound/direct_sound_samples/cry_lairon.aif
diff --git a/sound/direct_sound_samples/cry_lanturn.aif b/sound/direct_sound_samples/cry_lanturn.aif
new file mode 100644
index 000000000..9440d995e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_lanturn.aif
diff --git a/sound/direct_sound_samples/cry_lapras.aif b/sound/direct_sound_samples/cry_lapras.aif
new file mode 100644
index 000000000..137a82f2d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_lapras.aif
diff --git a/sound/direct_sound_samples/cry_larvitar.aif b/sound/direct_sound_samples/cry_larvitar.aif
new file mode 100644
index 000000000..598b4b9f8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_larvitar.aif
diff --git a/sound/direct_sound_samples/cry_latias.aif b/sound/direct_sound_samples/cry_latias.aif
new file mode 100644
index 000000000..79efcdd19
--- /dev/null
+++ b/sound/direct_sound_samples/cry_latias.aif
diff --git a/sound/direct_sound_samples/cry_latios.aif b/sound/direct_sound_samples/cry_latios.aif
new file mode 100644
index 000000000..ca73c4dc2
--- /dev/null
+++ b/sound/direct_sound_samples/cry_latios.aif
diff --git a/sound/direct_sound_samples/cry_ledian.aif b/sound/direct_sound_samples/cry_ledian.aif
new file mode 100644
index 000000000..1ce9d7062
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ledian.aif
diff --git a/sound/direct_sound_samples/cry_ledyba.aif b/sound/direct_sound_samples/cry_ledyba.aif
new file mode 100644
index 000000000..41b31ef52
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ledyba.aif
diff --git a/sound/direct_sound_samples/cry_lickitung.aif b/sound/direct_sound_samples/cry_lickitung.aif
new file mode 100644
index 000000000..a4e26732f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_lickitung.aif
diff --git a/sound/direct_sound_samples/cry_lileep.aif b/sound/direct_sound_samples/cry_lileep.aif
new file mode 100644
index 000000000..94b2f40f4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_lileep.aif
diff --git a/sound/direct_sound_samples/cry_linoone.aif b/sound/direct_sound_samples/cry_linoone.aif
new file mode 100644
index 000000000..ae62cb562
--- /dev/null
+++ b/sound/direct_sound_samples/cry_linoone.aif
diff --git a/sound/direct_sound_samples/cry_lombre.aif b/sound/direct_sound_samples/cry_lombre.aif
new file mode 100644
index 000000000..381f1d3d7
--- /dev/null
+++ b/sound/direct_sound_samples/cry_lombre.aif
diff --git a/sound/direct_sound_samples/cry_lotad.aif b/sound/direct_sound_samples/cry_lotad.aif
new file mode 100644
index 000000000..086c7a6fb
--- /dev/null
+++ b/sound/direct_sound_samples/cry_lotad.aif
diff --git a/sound/direct_sound_samples/cry_loudred.aif b/sound/direct_sound_samples/cry_loudred.aif
new file mode 100644
index 000000000..386e7b8bb
--- /dev/null
+++ b/sound/direct_sound_samples/cry_loudred.aif
diff --git a/sound/direct_sound_samples/cry_ludicolo.aif b/sound/direct_sound_samples/cry_ludicolo.aif
new file mode 100644
index 000000000..b923e2b7f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ludicolo.aif
diff --git a/sound/direct_sound_samples/cry_lugia.aif b/sound/direct_sound_samples/cry_lugia.aif
new file mode 100644
index 000000000..ec43d314e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_lugia.aif
diff --git a/sound/direct_sound_samples/cry_lunatone.aif b/sound/direct_sound_samples/cry_lunatone.aif
new file mode 100644
index 000000000..b782983f9
--- /dev/null
+++ b/sound/direct_sound_samples/cry_lunatone.aif
diff --git a/sound/direct_sound_samples/cry_luvdisc.aif b/sound/direct_sound_samples/cry_luvdisc.aif
new file mode 100644
index 000000000..6b2d5bd69
--- /dev/null
+++ b/sound/direct_sound_samples/cry_luvdisc.aif
diff --git a/sound/direct_sound_samples/cry_machamp.aif b/sound/direct_sound_samples/cry_machamp.aif
new file mode 100644
index 000000000..5959947d1
--- /dev/null
+++ b/sound/direct_sound_samples/cry_machamp.aif
diff --git a/sound/direct_sound_samples/cry_machoke.aif b/sound/direct_sound_samples/cry_machoke.aif
new file mode 100644
index 000000000..a3fc366aa
--- /dev/null
+++ b/sound/direct_sound_samples/cry_machoke.aif
diff --git a/sound/direct_sound_samples/cry_machop.aif b/sound/direct_sound_samples/cry_machop.aif
new file mode 100644
index 000000000..c76db87a2
--- /dev/null
+++ b/sound/direct_sound_samples/cry_machop.aif
diff --git a/sound/direct_sound_samples/cry_magby.aif b/sound/direct_sound_samples/cry_magby.aif
new file mode 100644
index 000000000..bd4c7268f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_magby.aif
diff --git a/sound/direct_sound_samples/cry_magcargo.aif b/sound/direct_sound_samples/cry_magcargo.aif
new file mode 100644
index 000000000..0263b83d5
--- /dev/null
+++ b/sound/direct_sound_samples/cry_magcargo.aif
diff --git a/sound/direct_sound_samples/cry_magikarp.aif b/sound/direct_sound_samples/cry_magikarp.aif
new file mode 100644
index 000000000..fb310987c
--- /dev/null
+++ b/sound/direct_sound_samples/cry_magikarp.aif
diff --git a/sound/direct_sound_samples/cry_magmar.aif b/sound/direct_sound_samples/cry_magmar.aif
new file mode 100644
index 000000000..7c7199322
--- /dev/null
+++ b/sound/direct_sound_samples/cry_magmar.aif
diff --git a/sound/direct_sound_samples/cry_magnemite.aif b/sound/direct_sound_samples/cry_magnemite.aif
new file mode 100644
index 000000000..36f124c3e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_magnemite.aif
diff --git a/sound/direct_sound_samples/cry_magneton.aif b/sound/direct_sound_samples/cry_magneton.aif
new file mode 100644
index 000000000..14e3067ae
--- /dev/null
+++ b/sound/direct_sound_samples/cry_magneton.aif
diff --git a/sound/direct_sound_samples/cry_makuhita.aif b/sound/direct_sound_samples/cry_makuhita.aif
new file mode 100644
index 000000000..54551e898
--- /dev/null
+++ b/sound/direct_sound_samples/cry_makuhita.aif
diff --git a/sound/direct_sound_samples/cry_manectric.aif b/sound/direct_sound_samples/cry_manectric.aif
new file mode 100644
index 000000000..c5cdc94a1
--- /dev/null
+++ b/sound/direct_sound_samples/cry_manectric.aif
diff --git a/sound/direct_sound_samples/cry_mankey.aif b/sound/direct_sound_samples/cry_mankey.aif
new file mode 100644
index 000000000..16ca95339
--- /dev/null
+++ b/sound/direct_sound_samples/cry_mankey.aif
diff --git a/sound/direct_sound_samples/cry_mantine.aif b/sound/direct_sound_samples/cry_mantine.aif
new file mode 100644
index 000000000..695dc93c9
--- /dev/null
+++ b/sound/direct_sound_samples/cry_mantine.aif
diff --git a/sound/direct_sound_samples/cry_mareep.aif b/sound/direct_sound_samples/cry_mareep.aif
new file mode 100644
index 000000000..14ecca615
--- /dev/null
+++ b/sound/direct_sound_samples/cry_mareep.aif
diff --git a/sound/direct_sound_samples/cry_marill.aif b/sound/direct_sound_samples/cry_marill.aif
new file mode 100644
index 000000000..1fe753911
--- /dev/null
+++ b/sound/direct_sound_samples/cry_marill.aif
diff --git a/sound/direct_sound_samples/cry_marowak.aif b/sound/direct_sound_samples/cry_marowak.aif
new file mode 100644
index 000000000..4f389f474
--- /dev/null
+++ b/sound/direct_sound_samples/cry_marowak.aif
diff --git a/sound/direct_sound_samples/cry_marshtomp.aif b/sound/direct_sound_samples/cry_marshtomp.aif
new file mode 100644
index 000000000..6fc5c7ff3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_marshtomp.aif
diff --git a/sound/direct_sound_samples/cry_masquerain.aif b/sound/direct_sound_samples/cry_masquerain.aif
new file mode 100644
index 000000000..e2b1f732a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_masquerain.aif
diff --git a/sound/direct_sound_samples/cry_mawile.aif b/sound/direct_sound_samples/cry_mawile.aif
new file mode 100644
index 000000000..9bcb15930
--- /dev/null
+++ b/sound/direct_sound_samples/cry_mawile.aif
diff --git a/sound/direct_sound_samples/cry_medicham.aif b/sound/direct_sound_samples/cry_medicham.aif
new file mode 100644
index 000000000..d8335213d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_medicham.aif
diff --git a/sound/direct_sound_samples/cry_meditite.aif b/sound/direct_sound_samples/cry_meditite.aif
new file mode 100644
index 000000000..8b316dc93
--- /dev/null
+++ b/sound/direct_sound_samples/cry_meditite.aif
diff --git a/sound/direct_sound_samples/cry_meganium.aif b/sound/direct_sound_samples/cry_meganium.aif
new file mode 100644
index 000000000..fca24962b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_meganium.aif
diff --git a/sound/direct_sound_samples/cry_meowth.aif b/sound/direct_sound_samples/cry_meowth.aif
new file mode 100644
index 000000000..618b16431
--- /dev/null
+++ b/sound/direct_sound_samples/cry_meowth.aif
diff --git a/sound/direct_sound_samples/cry_metagross.aif b/sound/direct_sound_samples/cry_metagross.aif
new file mode 100644
index 000000000..a8942fb53
--- /dev/null
+++ b/sound/direct_sound_samples/cry_metagross.aif
diff --git a/sound/direct_sound_samples/cry_metang.aif b/sound/direct_sound_samples/cry_metang.aif
new file mode 100644
index 000000000..f7f5ab063
--- /dev/null
+++ b/sound/direct_sound_samples/cry_metang.aif
diff --git a/sound/direct_sound_samples/cry_metapod.aif b/sound/direct_sound_samples/cry_metapod.aif
new file mode 100644
index 000000000..809666df3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_metapod.aif
diff --git a/sound/direct_sound_samples/cry_mew.aif b/sound/direct_sound_samples/cry_mew.aif
new file mode 100644
index 000000000..bdedf1eaa
--- /dev/null
+++ b/sound/direct_sound_samples/cry_mew.aif
diff --git a/sound/direct_sound_samples/cry_mewtwo.aif b/sound/direct_sound_samples/cry_mewtwo.aif
new file mode 100644
index 000000000..32f15fc15
--- /dev/null
+++ b/sound/direct_sound_samples/cry_mewtwo.aif
diff --git a/sound/direct_sound_samples/cry_mightyena.aif b/sound/direct_sound_samples/cry_mightyena.aif
new file mode 100644
index 000000000..bac7bc079
--- /dev/null
+++ b/sound/direct_sound_samples/cry_mightyena.aif
diff --git a/sound/direct_sound_samples/cry_milotic.aif b/sound/direct_sound_samples/cry_milotic.aif
new file mode 100644
index 000000000..2b3a9556b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_milotic.aif
diff --git a/sound/direct_sound_samples/cry_miltank.aif b/sound/direct_sound_samples/cry_miltank.aif
new file mode 100644
index 000000000..69b7ae06a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_miltank.aif
diff --git a/sound/direct_sound_samples/cry_minun.aif b/sound/direct_sound_samples/cry_minun.aif
new file mode 100644
index 000000000..5d9cc5bd3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_minun.aif
diff --git a/sound/direct_sound_samples/cry_misdreavus.aif b/sound/direct_sound_samples/cry_misdreavus.aif
new file mode 100644
index 000000000..5d1a7ff95
--- /dev/null
+++ b/sound/direct_sound_samples/cry_misdreavus.aif
diff --git a/sound/direct_sound_samples/cry_moltres.aif b/sound/direct_sound_samples/cry_moltres.aif
new file mode 100644
index 000000000..c59714c5f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_moltres.aif
diff --git a/sound/direct_sound_samples/cry_mr_mime.aif b/sound/direct_sound_samples/cry_mr_mime.aif
new file mode 100644
index 000000000..285eaa3f2
--- /dev/null
+++ b/sound/direct_sound_samples/cry_mr_mime.aif
diff --git a/sound/direct_sound_samples/cry_mudkip.aif b/sound/direct_sound_samples/cry_mudkip.aif
new file mode 100644
index 000000000..d7b8b4c03
--- /dev/null
+++ b/sound/direct_sound_samples/cry_mudkip.aif
diff --git a/sound/direct_sound_samples/cry_muk.aif b/sound/direct_sound_samples/cry_muk.aif
new file mode 100644
index 000000000..1296a61df
--- /dev/null
+++ b/sound/direct_sound_samples/cry_muk.aif
diff --git a/sound/direct_sound_samples/cry_murkrow.aif b/sound/direct_sound_samples/cry_murkrow.aif
new file mode 100644
index 000000000..70ef1ec77
--- /dev/null
+++ b/sound/direct_sound_samples/cry_murkrow.aif
diff --git a/sound/direct_sound_samples/cry_natu.aif b/sound/direct_sound_samples/cry_natu.aif
new file mode 100644
index 000000000..e433cd2bb
--- /dev/null
+++ b/sound/direct_sound_samples/cry_natu.aif
diff --git a/sound/direct_sound_samples/cry_nidoking.aif b/sound/direct_sound_samples/cry_nidoking.aif
new file mode 100644
index 000000000..8318e395b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_nidoking.aif
diff --git a/sound/direct_sound_samples/cry_nidoqueen.aif b/sound/direct_sound_samples/cry_nidoqueen.aif
new file mode 100644
index 000000000..ad0e64eb9
--- /dev/null
+++ b/sound/direct_sound_samples/cry_nidoqueen.aif
diff --git a/sound/direct_sound_samples/cry_nidoran_f.aif b/sound/direct_sound_samples/cry_nidoran_f.aif
new file mode 100644
index 000000000..0598bbe84
--- /dev/null
+++ b/sound/direct_sound_samples/cry_nidoran_f.aif
diff --git a/sound/direct_sound_samples/cry_nidoran_m.aif b/sound/direct_sound_samples/cry_nidoran_m.aif
new file mode 100644
index 000000000..f446e45de
--- /dev/null
+++ b/sound/direct_sound_samples/cry_nidoran_m.aif
diff --git a/sound/direct_sound_samples/cry_nidorina.aif b/sound/direct_sound_samples/cry_nidorina.aif
new file mode 100644
index 000000000..cc07bcaf6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_nidorina.aif
diff --git a/sound/direct_sound_samples/cry_nidorino.aif b/sound/direct_sound_samples/cry_nidorino.aif
new file mode 100644
index 000000000..5210d39ab
--- /dev/null
+++ b/sound/direct_sound_samples/cry_nidorino.aif
diff --git a/sound/direct_sound_samples/cry_nincada.aif b/sound/direct_sound_samples/cry_nincada.aif
new file mode 100644
index 000000000..f40245db1
--- /dev/null
+++ b/sound/direct_sound_samples/cry_nincada.aif
diff --git a/sound/direct_sound_samples/cry_ninetales.aif b/sound/direct_sound_samples/cry_ninetales.aif
new file mode 100644
index 000000000..825f0d69d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ninetales.aif
diff --git a/sound/direct_sound_samples/cry_ninjask.aif b/sound/direct_sound_samples/cry_ninjask.aif
new file mode 100644
index 000000000..311ece422
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ninjask.aif
diff --git a/sound/direct_sound_samples/cry_noctowl.aif b/sound/direct_sound_samples/cry_noctowl.aif
new file mode 100644
index 000000000..4280bf5af
--- /dev/null
+++ b/sound/direct_sound_samples/cry_noctowl.aif
diff --git a/sound/direct_sound_samples/cry_none.aif b/sound/direct_sound_samples/cry_none.aif
new file mode 100644
index 000000000..44bb79c3c
--- /dev/null
+++ b/sound/direct_sound_samples/cry_none.aif
diff --git a/sound/direct_sound_samples/cry_nosepass.aif b/sound/direct_sound_samples/cry_nosepass.aif
new file mode 100644
index 000000000..08ea36ff5
--- /dev/null
+++ b/sound/direct_sound_samples/cry_nosepass.aif
diff --git a/sound/direct_sound_samples/cry_numel.aif b/sound/direct_sound_samples/cry_numel.aif
new file mode 100644
index 000000000..88d7ad865
--- /dev/null
+++ b/sound/direct_sound_samples/cry_numel.aif
diff --git a/sound/direct_sound_samples/cry_nuzleaf.aif b/sound/direct_sound_samples/cry_nuzleaf.aif
new file mode 100644
index 000000000..681b288be
--- /dev/null
+++ b/sound/direct_sound_samples/cry_nuzleaf.aif
diff --git a/sound/direct_sound_samples/cry_octillery.aif b/sound/direct_sound_samples/cry_octillery.aif
new file mode 100644
index 000000000..84209f6bd
--- /dev/null
+++ b/sound/direct_sound_samples/cry_octillery.aif
diff --git a/sound/direct_sound_samples/cry_oddish.aif b/sound/direct_sound_samples/cry_oddish.aif
new file mode 100644
index 000000000..283dffeaf
--- /dev/null
+++ b/sound/direct_sound_samples/cry_oddish.aif
diff --git a/sound/direct_sound_samples/cry_omanyte.aif b/sound/direct_sound_samples/cry_omanyte.aif
new file mode 100644
index 000000000..0b73edf5e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_omanyte.aif
diff --git a/sound/direct_sound_samples/cry_omastar.aif b/sound/direct_sound_samples/cry_omastar.aif
new file mode 100644
index 000000000..9d5581c50
--- /dev/null
+++ b/sound/direct_sound_samples/cry_omastar.aif
diff --git a/sound/direct_sound_samples/cry_onix.aif b/sound/direct_sound_samples/cry_onix.aif
new file mode 100644
index 000000000..46d566495
--- /dev/null
+++ b/sound/direct_sound_samples/cry_onix.aif
diff --git a/sound/direct_sound_samples/cry_paras.aif b/sound/direct_sound_samples/cry_paras.aif
new file mode 100644
index 000000000..89185381e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_paras.aif
diff --git a/sound/direct_sound_samples/cry_parasect.aif b/sound/direct_sound_samples/cry_parasect.aif
new file mode 100644
index 000000000..c32d09b26
--- /dev/null
+++ b/sound/direct_sound_samples/cry_parasect.aif
diff --git a/sound/direct_sound_samples/cry_pelipper.aif b/sound/direct_sound_samples/cry_pelipper.aif
new file mode 100644
index 000000000..68d2c125c
--- /dev/null
+++ b/sound/direct_sound_samples/cry_pelipper.aif
diff --git a/sound/direct_sound_samples/cry_persian.aif b/sound/direct_sound_samples/cry_persian.aif
new file mode 100644
index 000000000..5049c12c6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_persian.aif
diff --git a/sound/direct_sound_samples/cry_phanpy.aif b/sound/direct_sound_samples/cry_phanpy.aif
new file mode 100644
index 000000000..e0e648df4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_phanpy.aif
diff --git a/sound/direct_sound_samples/cry_pichu.aif b/sound/direct_sound_samples/cry_pichu.aif
new file mode 100644
index 000000000..8aa517cf2
--- /dev/null
+++ b/sound/direct_sound_samples/cry_pichu.aif
diff --git a/sound/direct_sound_samples/cry_pidgeot.aif b/sound/direct_sound_samples/cry_pidgeot.aif
new file mode 100644
index 000000000..46ea826cb
--- /dev/null
+++ b/sound/direct_sound_samples/cry_pidgeot.aif
diff --git a/sound/direct_sound_samples/cry_pidgeotto.aif b/sound/direct_sound_samples/cry_pidgeotto.aif
new file mode 100644
index 000000000..010b7ff02
--- /dev/null
+++ b/sound/direct_sound_samples/cry_pidgeotto.aif
diff --git a/sound/direct_sound_samples/cry_pidgey.aif b/sound/direct_sound_samples/cry_pidgey.aif
new file mode 100644
index 000000000..681a41232
--- /dev/null
+++ b/sound/direct_sound_samples/cry_pidgey.aif
diff --git a/sound/direct_sound_samples/cry_pikachu.aif b/sound/direct_sound_samples/cry_pikachu.aif
new file mode 100644
index 000000000..79b9b1913
--- /dev/null
+++ b/sound/direct_sound_samples/cry_pikachu.aif
diff --git a/sound/direct_sound_samples/cry_piloswine.aif b/sound/direct_sound_samples/cry_piloswine.aif
new file mode 100644
index 000000000..94637b2ed
--- /dev/null
+++ b/sound/direct_sound_samples/cry_piloswine.aif
diff --git a/sound/direct_sound_samples/cry_pineco.aif b/sound/direct_sound_samples/cry_pineco.aif
new file mode 100644
index 000000000..b96b968de
--- /dev/null
+++ b/sound/direct_sound_samples/cry_pineco.aif
diff --git a/sound/direct_sound_samples/cry_pinsir.aif b/sound/direct_sound_samples/cry_pinsir.aif
new file mode 100644
index 000000000..1079875d0
--- /dev/null
+++ b/sound/direct_sound_samples/cry_pinsir.aif
diff --git a/sound/direct_sound_samples/cry_plusle.aif b/sound/direct_sound_samples/cry_plusle.aif
new file mode 100644
index 000000000..02b1b7885
--- /dev/null
+++ b/sound/direct_sound_samples/cry_plusle.aif
diff --git a/sound/direct_sound_samples/cry_politoed.aif b/sound/direct_sound_samples/cry_politoed.aif
new file mode 100644
index 000000000..902d4dbba
--- /dev/null
+++ b/sound/direct_sound_samples/cry_politoed.aif
diff --git a/sound/direct_sound_samples/cry_poliwag.aif b/sound/direct_sound_samples/cry_poliwag.aif
new file mode 100644
index 000000000..0adfc3192
--- /dev/null
+++ b/sound/direct_sound_samples/cry_poliwag.aif
diff --git a/sound/direct_sound_samples/cry_poliwhirl.aif b/sound/direct_sound_samples/cry_poliwhirl.aif
new file mode 100644
index 000000000..2c04644e6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_poliwhirl.aif
diff --git a/sound/direct_sound_samples/cry_poliwrath.aif b/sound/direct_sound_samples/cry_poliwrath.aif
new file mode 100644
index 000000000..8d0d20aaa
--- /dev/null
+++ b/sound/direct_sound_samples/cry_poliwrath.aif
diff --git a/sound/direct_sound_samples/cry_ponyta.aif b/sound/direct_sound_samples/cry_ponyta.aif
new file mode 100644
index 000000000..c123f310e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ponyta.aif
diff --git a/sound/direct_sound_samples/cry_poochyena.aif b/sound/direct_sound_samples/cry_poochyena.aif
new file mode 100644
index 000000000..5e3615964
--- /dev/null
+++ b/sound/direct_sound_samples/cry_poochyena.aif
diff --git a/sound/direct_sound_samples/cry_porygon.aif b/sound/direct_sound_samples/cry_porygon.aif
new file mode 100644
index 000000000..8745067f8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_porygon.aif
diff --git a/sound/direct_sound_samples/cry_porygon2.aif b/sound/direct_sound_samples/cry_porygon2.aif
new file mode 100644
index 000000000..033f21b57
--- /dev/null
+++ b/sound/direct_sound_samples/cry_porygon2.aif
diff --git a/sound/direct_sound_samples/cry_primeape.aif b/sound/direct_sound_samples/cry_primeape.aif
new file mode 100644
index 000000000..81124aec8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_primeape.aif
diff --git a/sound/direct_sound_samples/cry_psyduck.aif b/sound/direct_sound_samples/cry_psyduck.aif
new file mode 100644
index 000000000..fc0ba0d41
--- /dev/null
+++ b/sound/direct_sound_samples/cry_psyduck.aif
diff --git a/sound/direct_sound_samples/cry_pupitar.aif b/sound/direct_sound_samples/cry_pupitar.aif
new file mode 100644
index 000000000..22bf1b2b4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_pupitar.aif
diff --git a/sound/direct_sound_samples/cry_quagsire.aif b/sound/direct_sound_samples/cry_quagsire.aif
new file mode 100644
index 000000000..c356380a4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_quagsire.aif
diff --git a/sound/direct_sound_samples/cry_quilava.aif b/sound/direct_sound_samples/cry_quilava.aif
new file mode 100644
index 000000000..1635fa530
--- /dev/null
+++ b/sound/direct_sound_samples/cry_quilava.aif
diff --git a/sound/direct_sound_samples/cry_qwilfish.aif b/sound/direct_sound_samples/cry_qwilfish.aif
new file mode 100644
index 000000000..8b2c7c488
--- /dev/null
+++ b/sound/direct_sound_samples/cry_qwilfish.aif
diff --git a/sound/direct_sound_samples/cry_raichu.aif b/sound/direct_sound_samples/cry_raichu.aif
new file mode 100644
index 000000000..7be5e84d8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_raichu.aif
diff --git a/sound/direct_sound_samples/cry_raikou.aif b/sound/direct_sound_samples/cry_raikou.aif
new file mode 100644
index 000000000..976fc064d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_raikou.aif
diff --git a/sound/direct_sound_samples/cry_ralts.aif b/sound/direct_sound_samples/cry_ralts.aif
new file mode 100644
index 000000000..925582042
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ralts.aif
diff --git a/sound/direct_sound_samples/cry_rapidash.aif b/sound/direct_sound_samples/cry_rapidash.aif
new file mode 100644
index 000000000..7151577a6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_rapidash.aif
diff --git a/sound/direct_sound_samples/cry_raticate.aif b/sound/direct_sound_samples/cry_raticate.aif
new file mode 100644
index 000000000..e7a7ad61c
--- /dev/null
+++ b/sound/direct_sound_samples/cry_raticate.aif
diff --git a/sound/direct_sound_samples/cry_rattata.aif b/sound/direct_sound_samples/cry_rattata.aif
new file mode 100644
index 000000000..690910030
--- /dev/null
+++ b/sound/direct_sound_samples/cry_rattata.aif
diff --git a/sound/direct_sound_samples/cry_rayquaza.aif b/sound/direct_sound_samples/cry_rayquaza.aif
new file mode 100644
index 000000000..0d8854686
--- /dev/null
+++ b/sound/direct_sound_samples/cry_rayquaza.aif
diff --git a/sound/direct_sound_samples/cry_regice.aif b/sound/direct_sound_samples/cry_regice.aif
new file mode 100644
index 000000000..1923ae250
--- /dev/null
+++ b/sound/direct_sound_samples/cry_regice.aif
diff --git a/sound/direct_sound_samples/cry_regirock.aif b/sound/direct_sound_samples/cry_regirock.aif
new file mode 100644
index 000000000..86548591f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_regirock.aif
diff --git a/sound/direct_sound_samples/cry_registeel.aif b/sound/direct_sound_samples/cry_registeel.aif
new file mode 100644
index 000000000..de5bf2967
--- /dev/null
+++ b/sound/direct_sound_samples/cry_registeel.aif
diff --git a/sound/direct_sound_samples/cry_relicanth.aif b/sound/direct_sound_samples/cry_relicanth.aif
new file mode 100644
index 000000000..e38cfe50d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_relicanth.aif
diff --git a/sound/direct_sound_samples/cry_remoraid.aif b/sound/direct_sound_samples/cry_remoraid.aif
new file mode 100644
index 000000000..8eb732967
--- /dev/null
+++ b/sound/direct_sound_samples/cry_remoraid.aif
diff --git a/sound/direct_sound_samples/cry_rhydon.aif b/sound/direct_sound_samples/cry_rhydon.aif
new file mode 100644
index 000000000..12a73b70e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_rhydon.aif
diff --git a/sound/direct_sound_samples/cry_rhyhorn.aif b/sound/direct_sound_samples/cry_rhyhorn.aif
new file mode 100644
index 000000000..d77bd714a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_rhyhorn.aif
diff --git a/sound/direct_sound_samples/cry_roselia.aif b/sound/direct_sound_samples/cry_roselia.aif
new file mode 100644
index 000000000..dad84a939
--- /dev/null
+++ b/sound/direct_sound_samples/cry_roselia.aif
diff --git a/sound/direct_sound_samples/cry_sableye.aif b/sound/direct_sound_samples/cry_sableye.aif
new file mode 100644
index 000000000..c56f77c3a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sableye.aif
diff --git a/sound/direct_sound_samples/cry_salamence.aif b/sound/direct_sound_samples/cry_salamence.aif
new file mode 100644
index 000000000..43f227d73
--- /dev/null
+++ b/sound/direct_sound_samples/cry_salamence.aif
diff --git a/sound/direct_sound_samples/cry_sandshrew.aif b/sound/direct_sound_samples/cry_sandshrew.aif
new file mode 100644
index 000000000..e4c2defa2
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sandshrew.aif
diff --git a/sound/direct_sound_samples/cry_sandslash.aif b/sound/direct_sound_samples/cry_sandslash.aif
new file mode 100644
index 000000000..332627497
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sandslash.aif
diff --git a/sound/direct_sound_samples/cry_sceptile.aif b/sound/direct_sound_samples/cry_sceptile.aif
new file mode 100644
index 000000000..b04110b07
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sceptile.aif
diff --git a/sound/direct_sound_samples/cry_scizor.aif b/sound/direct_sound_samples/cry_scizor.aif
new file mode 100644
index 000000000..4a53d74eb
--- /dev/null
+++ b/sound/direct_sound_samples/cry_scizor.aif
diff --git a/sound/direct_sound_samples/cry_scyther.aif b/sound/direct_sound_samples/cry_scyther.aif
new file mode 100644
index 000000000..3b0ae51b9
--- /dev/null
+++ b/sound/direct_sound_samples/cry_scyther.aif
diff --git a/sound/direct_sound_samples/cry_seadra.aif b/sound/direct_sound_samples/cry_seadra.aif
new file mode 100644
index 000000000..c3391de5e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_seadra.aif
diff --git a/sound/direct_sound_samples/cry_seaking.aif b/sound/direct_sound_samples/cry_seaking.aif
new file mode 100644
index 000000000..608252bac
--- /dev/null
+++ b/sound/direct_sound_samples/cry_seaking.aif
diff --git a/sound/direct_sound_samples/cry_sealeo.aif b/sound/direct_sound_samples/cry_sealeo.aif
new file mode 100644
index 000000000..d920d4bef
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sealeo.aif
diff --git a/sound/direct_sound_samples/cry_seedot.aif b/sound/direct_sound_samples/cry_seedot.aif
new file mode 100644
index 000000000..4c95be3cb
--- /dev/null
+++ b/sound/direct_sound_samples/cry_seedot.aif
diff --git a/sound/direct_sound_samples/cry_seel.aif b/sound/direct_sound_samples/cry_seel.aif
new file mode 100644
index 000000000..d1b5017df
--- /dev/null
+++ b/sound/direct_sound_samples/cry_seel.aif
diff --git a/sound/direct_sound_samples/cry_sentret.aif b/sound/direct_sound_samples/cry_sentret.aif
new file mode 100644
index 000000000..2b9efe891
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sentret.aif
diff --git a/sound/direct_sound_samples/cry_seviper.aif b/sound/direct_sound_samples/cry_seviper.aif
new file mode 100644
index 000000000..e72200a13
--- /dev/null
+++ b/sound/direct_sound_samples/cry_seviper.aif
diff --git a/sound/direct_sound_samples/cry_sharpedo.aif b/sound/direct_sound_samples/cry_sharpedo.aif
new file mode 100644
index 000000000..907dd8019
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sharpedo.aif
diff --git a/sound/direct_sound_samples/cry_shedinja.aif b/sound/direct_sound_samples/cry_shedinja.aif
new file mode 100644
index 000000000..cabda7f10
--- /dev/null
+++ b/sound/direct_sound_samples/cry_shedinja.aif
diff --git a/sound/direct_sound_samples/cry_shelgon.aif b/sound/direct_sound_samples/cry_shelgon.aif
new file mode 100644
index 000000000..62362d326
--- /dev/null
+++ b/sound/direct_sound_samples/cry_shelgon.aif
diff --git a/sound/direct_sound_samples/cry_shellder.aif b/sound/direct_sound_samples/cry_shellder.aif
new file mode 100644
index 000000000..74d374d69
--- /dev/null
+++ b/sound/direct_sound_samples/cry_shellder.aif
diff --git a/sound/direct_sound_samples/cry_shiftry.aif b/sound/direct_sound_samples/cry_shiftry.aif
new file mode 100644
index 000000000..b8ab5d300
--- /dev/null
+++ b/sound/direct_sound_samples/cry_shiftry.aif
diff --git a/sound/direct_sound_samples/cry_shroomish.aif b/sound/direct_sound_samples/cry_shroomish.aif
new file mode 100644
index 000000000..a4fe04c7a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_shroomish.aif
diff --git a/sound/direct_sound_samples/cry_shuckle.aif b/sound/direct_sound_samples/cry_shuckle.aif
new file mode 100644
index 000000000..73b526258
--- /dev/null
+++ b/sound/direct_sound_samples/cry_shuckle.aif
diff --git a/sound/direct_sound_samples/cry_shuppet.aif b/sound/direct_sound_samples/cry_shuppet.aif
new file mode 100644
index 000000000..c94ef6fdc
--- /dev/null
+++ b/sound/direct_sound_samples/cry_shuppet.aif
diff --git a/sound/direct_sound_samples/cry_silcoon.aif b/sound/direct_sound_samples/cry_silcoon.aif
new file mode 100644
index 000000000..c745cf14f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_silcoon.aif
diff --git a/sound/direct_sound_samples/cry_skarmory.aif b/sound/direct_sound_samples/cry_skarmory.aif
new file mode 100644
index 000000000..a2feb5c5c
--- /dev/null
+++ b/sound/direct_sound_samples/cry_skarmory.aif
diff --git a/sound/direct_sound_samples/cry_skiploom.aif b/sound/direct_sound_samples/cry_skiploom.aif
new file mode 100644
index 000000000..c6764957f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_skiploom.aif
diff --git a/sound/direct_sound_samples/cry_skitty.aif b/sound/direct_sound_samples/cry_skitty.aif
new file mode 100644
index 000000000..45413721f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_skitty.aif
diff --git a/sound/direct_sound_samples/cry_slaking.aif b/sound/direct_sound_samples/cry_slaking.aif
new file mode 100644
index 000000000..cd5616b20
--- /dev/null
+++ b/sound/direct_sound_samples/cry_slaking.aif
diff --git a/sound/direct_sound_samples/cry_slakoth.aif b/sound/direct_sound_samples/cry_slakoth.aif
new file mode 100644
index 000000000..35136c016
--- /dev/null
+++ b/sound/direct_sound_samples/cry_slakoth.aif
diff --git a/sound/direct_sound_samples/cry_slowbro.aif b/sound/direct_sound_samples/cry_slowbro.aif
new file mode 100644
index 000000000..0b9aab078
--- /dev/null
+++ b/sound/direct_sound_samples/cry_slowbro.aif
diff --git a/sound/direct_sound_samples/cry_slowking.aif b/sound/direct_sound_samples/cry_slowking.aif
new file mode 100644
index 000000000..6c2f72dbf
--- /dev/null
+++ b/sound/direct_sound_samples/cry_slowking.aif
diff --git a/sound/direct_sound_samples/cry_slowpoke.aif b/sound/direct_sound_samples/cry_slowpoke.aif
new file mode 100644
index 000000000..3d9cfa630
--- /dev/null
+++ b/sound/direct_sound_samples/cry_slowpoke.aif
diff --git a/sound/direct_sound_samples/cry_slugma.aif b/sound/direct_sound_samples/cry_slugma.aif
new file mode 100644
index 000000000..c26b3d858
--- /dev/null
+++ b/sound/direct_sound_samples/cry_slugma.aif
diff --git a/sound/direct_sound_samples/cry_smeargle.aif b/sound/direct_sound_samples/cry_smeargle.aif
new file mode 100644
index 000000000..11f554dac
--- /dev/null
+++ b/sound/direct_sound_samples/cry_smeargle.aif
diff --git a/sound/direct_sound_samples/cry_smoochum.aif b/sound/direct_sound_samples/cry_smoochum.aif
new file mode 100644
index 000000000..4b12c5920
--- /dev/null
+++ b/sound/direct_sound_samples/cry_smoochum.aif
diff --git a/sound/direct_sound_samples/cry_sneasel.aif b/sound/direct_sound_samples/cry_sneasel.aif
new file mode 100644
index 000000000..6e42ef1d8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sneasel.aif
diff --git a/sound/direct_sound_samples/cry_snorlax.aif b/sound/direct_sound_samples/cry_snorlax.aif
new file mode 100644
index 000000000..810fd7a7b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_snorlax.aif
diff --git a/sound/direct_sound_samples/cry_snorunt.aif b/sound/direct_sound_samples/cry_snorunt.aif
new file mode 100644
index 000000000..1ba9912e5
--- /dev/null
+++ b/sound/direct_sound_samples/cry_snorunt.aif
diff --git a/sound/direct_sound_samples/cry_snubbull.aif b/sound/direct_sound_samples/cry_snubbull.aif
new file mode 100644
index 000000000..2fa4ab108
--- /dev/null
+++ b/sound/direct_sound_samples/cry_snubbull.aif
diff --git a/sound/direct_sound_samples/cry_solrock.aif b/sound/direct_sound_samples/cry_solrock.aif
new file mode 100644
index 000000000..c718e6338
--- /dev/null
+++ b/sound/direct_sound_samples/cry_solrock.aif
diff --git a/sound/direct_sound_samples/cry_spearow.aif b/sound/direct_sound_samples/cry_spearow.aif
new file mode 100644
index 000000000..189baa6ab
--- /dev/null
+++ b/sound/direct_sound_samples/cry_spearow.aif
diff --git a/sound/direct_sound_samples/cry_spheal.aif b/sound/direct_sound_samples/cry_spheal.aif
new file mode 100644
index 000000000..7f6adb78c
--- /dev/null
+++ b/sound/direct_sound_samples/cry_spheal.aif
diff --git a/sound/direct_sound_samples/cry_spinarak.aif b/sound/direct_sound_samples/cry_spinarak.aif
new file mode 100644
index 000000000..9dc12f707
--- /dev/null
+++ b/sound/direct_sound_samples/cry_spinarak.aif
diff --git a/sound/direct_sound_samples/cry_spinda.aif b/sound/direct_sound_samples/cry_spinda.aif
new file mode 100644
index 000000000..ad04fdc7d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_spinda.aif
diff --git a/sound/direct_sound_samples/cry_spoink.aif b/sound/direct_sound_samples/cry_spoink.aif
new file mode 100644
index 000000000..1f76b90b6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_spoink.aif
diff --git a/sound/direct_sound_samples/cry_squirtle.aif b/sound/direct_sound_samples/cry_squirtle.aif
new file mode 100644
index 000000000..9f9e42704
--- /dev/null
+++ b/sound/direct_sound_samples/cry_squirtle.aif
diff --git a/sound/direct_sound_samples/cry_stantler.aif b/sound/direct_sound_samples/cry_stantler.aif
new file mode 100644
index 000000000..db3985cf8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_stantler.aif
diff --git a/sound/direct_sound_samples/cry_starmie.aif b/sound/direct_sound_samples/cry_starmie.aif
new file mode 100644
index 000000000..8ecaf1d1d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_starmie.aif
diff --git a/sound/direct_sound_samples/cry_staryu.aif b/sound/direct_sound_samples/cry_staryu.aif
new file mode 100644
index 000000000..b97e5e5dc
--- /dev/null
+++ b/sound/direct_sound_samples/cry_staryu.aif
diff --git a/sound/direct_sound_samples/cry_steelix.aif b/sound/direct_sound_samples/cry_steelix.aif
new file mode 100644
index 000000000..9e8297b13
--- /dev/null
+++ b/sound/direct_sound_samples/cry_steelix.aif
diff --git a/sound/direct_sound_samples/cry_sudowoodo.aif b/sound/direct_sound_samples/cry_sudowoodo.aif
new file mode 100644
index 000000000..6961d18a5
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sudowoodo.aif
diff --git a/sound/direct_sound_samples/cry_suicune.aif b/sound/direct_sound_samples/cry_suicune.aif
new file mode 100644
index 000000000..3b4dd9a51
--- /dev/null
+++ b/sound/direct_sound_samples/cry_suicune.aif
diff --git a/sound/direct_sound_samples/cry_sunflora.aif b/sound/direct_sound_samples/cry_sunflora.aif
new file mode 100644
index 000000000..56bddf1d4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sunflora.aif
diff --git a/sound/direct_sound_samples/cry_sunkern.aif b/sound/direct_sound_samples/cry_sunkern.aif
new file mode 100644
index 000000000..fb5973839
--- /dev/null
+++ b/sound/direct_sound_samples/cry_sunkern.aif
diff --git a/sound/direct_sound_samples/cry_surskit.aif b/sound/direct_sound_samples/cry_surskit.aif
new file mode 100644
index 000000000..fb3bb5273
--- /dev/null
+++ b/sound/direct_sound_samples/cry_surskit.aif
diff --git a/sound/direct_sound_samples/cry_swablu.aif b/sound/direct_sound_samples/cry_swablu.aif
new file mode 100644
index 000000000..a04538e0a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_swablu.aif
diff --git a/sound/direct_sound_samples/cry_swalot.aif b/sound/direct_sound_samples/cry_swalot.aif
new file mode 100644
index 000000000..5d7eee8df
--- /dev/null
+++ b/sound/direct_sound_samples/cry_swalot.aif
diff --git a/sound/direct_sound_samples/cry_swampert.aif b/sound/direct_sound_samples/cry_swampert.aif
new file mode 100644
index 000000000..2e3fa063a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_swampert.aif
diff --git a/sound/direct_sound_samples/cry_swellow.aif b/sound/direct_sound_samples/cry_swellow.aif
new file mode 100644
index 000000000..794485fc2
--- /dev/null
+++ b/sound/direct_sound_samples/cry_swellow.aif
diff --git a/sound/direct_sound_samples/cry_swinub.aif b/sound/direct_sound_samples/cry_swinub.aif
new file mode 100644
index 000000000..dfcea7084
--- /dev/null
+++ b/sound/direct_sound_samples/cry_swinub.aif
diff --git a/sound/direct_sound_samples/cry_taillow.aif b/sound/direct_sound_samples/cry_taillow.aif
new file mode 100644
index 000000000..1d61ec473
--- /dev/null
+++ b/sound/direct_sound_samples/cry_taillow.aif
diff --git a/sound/direct_sound_samples/cry_tangela.aif b/sound/direct_sound_samples/cry_tangela.aif
new file mode 100644
index 000000000..b0242c550
--- /dev/null
+++ b/sound/direct_sound_samples/cry_tangela.aif
diff --git a/sound/direct_sound_samples/cry_tauros.aif b/sound/direct_sound_samples/cry_tauros.aif
new file mode 100644
index 000000000..70e6f1420
--- /dev/null
+++ b/sound/direct_sound_samples/cry_tauros.aif
diff --git a/sound/direct_sound_samples/cry_teddiursa.aif b/sound/direct_sound_samples/cry_teddiursa.aif
new file mode 100644
index 000000000..8d86c6598
--- /dev/null
+++ b/sound/direct_sound_samples/cry_teddiursa.aif
diff --git a/sound/direct_sound_samples/cry_tentacool.aif b/sound/direct_sound_samples/cry_tentacool.aif
new file mode 100644
index 000000000..697a751a6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_tentacool.aif
diff --git a/sound/direct_sound_samples/cry_tentacruel.aif b/sound/direct_sound_samples/cry_tentacruel.aif
new file mode 100644
index 000000000..9126eab93
--- /dev/null
+++ b/sound/direct_sound_samples/cry_tentacruel.aif
diff --git a/sound/direct_sound_samples/cry_togepi.aif b/sound/direct_sound_samples/cry_togepi.aif
new file mode 100644
index 000000000..0285b78e7
--- /dev/null
+++ b/sound/direct_sound_samples/cry_togepi.aif
diff --git a/sound/direct_sound_samples/cry_togetic.aif b/sound/direct_sound_samples/cry_togetic.aif
new file mode 100644
index 000000000..19a5d9da1
--- /dev/null
+++ b/sound/direct_sound_samples/cry_togetic.aif
diff --git a/sound/direct_sound_samples/cry_torchic.aif b/sound/direct_sound_samples/cry_torchic.aif
new file mode 100644
index 000000000..479b44072
--- /dev/null
+++ b/sound/direct_sound_samples/cry_torchic.aif
diff --git a/sound/direct_sound_samples/cry_torkoal.aif b/sound/direct_sound_samples/cry_torkoal.aif
new file mode 100644
index 000000000..b719b4f72
--- /dev/null
+++ b/sound/direct_sound_samples/cry_torkoal.aif
diff --git a/sound/direct_sound_samples/cry_totodile.aif b/sound/direct_sound_samples/cry_totodile.aif
new file mode 100644
index 000000000..83dbc6cc4
--- /dev/null
+++ b/sound/direct_sound_samples/cry_totodile.aif
diff --git a/sound/direct_sound_samples/cry_trapinch.aif b/sound/direct_sound_samples/cry_trapinch.aif
new file mode 100644
index 000000000..c2227f4a0
--- /dev/null
+++ b/sound/direct_sound_samples/cry_trapinch.aif
diff --git a/sound/direct_sound_samples/cry_treecko.aif b/sound/direct_sound_samples/cry_treecko.aif
new file mode 100644
index 000000000..8a09c3220
--- /dev/null
+++ b/sound/direct_sound_samples/cry_treecko.aif
diff --git a/sound/direct_sound_samples/cry_tropius.aif b/sound/direct_sound_samples/cry_tropius.aif
new file mode 100644
index 000000000..2348dbb45
--- /dev/null
+++ b/sound/direct_sound_samples/cry_tropius.aif
diff --git a/sound/direct_sound_samples/cry_typhlosion.aif b/sound/direct_sound_samples/cry_typhlosion.aif
new file mode 100644
index 000000000..747617861
--- /dev/null
+++ b/sound/direct_sound_samples/cry_typhlosion.aif
diff --git a/sound/direct_sound_samples/cry_tyranitar.aif b/sound/direct_sound_samples/cry_tyranitar.aif
new file mode 100644
index 000000000..f6d0008ed
--- /dev/null
+++ b/sound/direct_sound_samples/cry_tyranitar.aif
diff --git a/sound/direct_sound_samples/cry_tyrogue.aif b/sound/direct_sound_samples/cry_tyrogue.aif
new file mode 100644
index 000000000..d5d1c3e24
--- /dev/null
+++ b/sound/direct_sound_samples/cry_tyrogue.aif
diff --git a/sound/direct_sound_samples/cry_umbreon.aif b/sound/direct_sound_samples/cry_umbreon.aif
new file mode 100644
index 000000000..25c9dde7b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_umbreon.aif
diff --git a/sound/direct_sound_samples/cry_unown.aif b/sound/direct_sound_samples/cry_unown.aif
new file mode 100644
index 000000000..4cf5dab02
--- /dev/null
+++ b/sound/direct_sound_samples/cry_unown.aif
diff --git a/sound/direct_sound_samples/cry_unused_265.aif b/sound/direct_sound_samples/cry_unused_265.aif
new file mode 100644
index 000000000..aec8a36ff
--- /dev/null
+++ b/sound/direct_sound_samples/cry_unused_265.aif
diff --git a/sound/direct_sound_samples/cry_unused_268.aif b/sound/direct_sound_samples/cry_unused_268.aif
new file mode 100644
index 000000000..99ca8dd93
--- /dev/null
+++ b/sound/direct_sound_samples/cry_unused_268.aif
diff --git a/sound/direct_sound_samples/cry_ursaring.aif b/sound/direct_sound_samples/cry_ursaring.aif
new file mode 100644
index 000000000..70d7b3c84
--- /dev/null
+++ b/sound/direct_sound_samples/cry_ursaring.aif
diff --git a/sound/direct_sound_samples/cry_vaporeon.aif b/sound/direct_sound_samples/cry_vaporeon.aif
new file mode 100644
index 000000000..8ef490dc7
--- /dev/null
+++ b/sound/direct_sound_samples/cry_vaporeon.aif
diff --git a/sound/direct_sound_samples/cry_venomoth.aif b/sound/direct_sound_samples/cry_venomoth.aif
new file mode 100644
index 000000000..8c623b7e2
--- /dev/null
+++ b/sound/direct_sound_samples/cry_venomoth.aif
diff --git a/sound/direct_sound_samples/cry_venonat.aif b/sound/direct_sound_samples/cry_venonat.aif
new file mode 100644
index 000000000..58bbdfbc2
--- /dev/null
+++ b/sound/direct_sound_samples/cry_venonat.aif
diff --git a/sound/direct_sound_samples/cry_venusaur.aif b/sound/direct_sound_samples/cry_venusaur.aif
new file mode 100644
index 000000000..ccd85fea9
--- /dev/null
+++ b/sound/direct_sound_samples/cry_venusaur.aif
diff --git a/sound/direct_sound_samples/cry_vibrava.aif b/sound/direct_sound_samples/cry_vibrava.aif
new file mode 100644
index 000000000..07cb73376
--- /dev/null
+++ b/sound/direct_sound_samples/cry_vibrava.aif
diff --git a/sound/direct_sound_samples/cry_victreebel.aif b/sound/direct_sound_samples/cry_victreebel.aif
new file mode 100644
index 000000000..fe156602b
--- /dev/null
+++ b/sound/direct_sound_samples/cry_victreebel.aif
diff --git a/sound/direct_sound_samples/cry_vigoroth.aif b/sound/direct_sound_samples/cry_vigoroth.aif
new file mode 100644
index 000000000..d4d09beca
--- /dev/null
+++ b/sound/direct_sound_samples/cry_vigoroth.aif
diff --git a/sound/direct_sound_samples/cry_vileplume.aif b/sound/direct_sound_samples/cry_vileplume.aif
new file mode 100644
index 000000000..353830909
--- /dev/null
+++ b/sound/direct_sound_samples/cry_vileplume.aif
diff --git a/sound/direct_sound_samples/cry_volbeat.aif b/sound/direct_sound_samples/cry_volbeat.aif
new file mode 100644
index 000000000..b92b761d9
--- /dev/null
+++ b/sound/direct_sound_samples/cry_volbeat.aif
diff --git a/sound/direct_sound_samples/cry_voltorb.aif b/sound/direct_sound_samples/cry_voltorb.aif
new file mode 100644
index 000000000..f376380a8
--- /dev/null
+++ b/sound/direct_sound_samples/cry_voltorb.aif
diff --git a/sound/direct_sound_samples/cry_vulpix.aif b/sound/direct_sound_samples/cry_vulpix.aif
new file mode 100644
index 000000000..314b81752
--- /dev/null
+++ b/sound/direct_sound_samples/cry_vulpix.aif
diff --git a/sound/direct_sound_samples/cry_wailmer.aif b/sound/direct_sound_samples/cry_wailmer.aif
new file mode 100644
index 000000000..e47000acf
--- /dev/null
+++ b/sound/direct_sound_samples/cry_wailmer.aif
diff --git a/sound/direct_sound_samples/cry_wailord.aif b/sound/direct_sound_samples/cry_wailord.aif
new file mode 100644
index 000000000..be4b0fd5f
--- /dev/null
+++ b/sound/direct_sound_samples/cry_wailord.aif
diff --git a/sound/direct_sound_samples/cry_walrein.aif b/sound/direct_sound_samples/cry_walrein.aif
new file mode 100644
index 000000000..2baf4f985
--- /dev/null
+++ b/sound/direct_sound_samples/cry_walrein.aif
diff --git a/sound/direct_sound_samples/cry_wartortle.aif b/sound/direct_sound_samples/cry_wartortle.aif
new file mode 100644
index 000000000..1c846f60a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_wartortle.aif
diff --git a/sound/direct_sound_samples/cry_weedle.aif b/sound/direct_sound_samples/cry_weedle.aif
new file mode 100644
index 000000000..4b91e1fc3
--- /dev/null
+++ b/sound/direct_sound_samples/cry_weedle.aif
diff --git a/sound/direct_sound_samples/cry_weepinbell.aif b/sound/direct_sound_samples/cry_weepinbell.aif
new file mode 100644
index 000000000..4353d5d25
--- /dev/null
+++ b/sound/direct_sound_samples/cry_weepinbell.aif
diff --git a/sound/direct_sound_samples/cry_weezing.aif b/sound/direct_sound_samples/cry_weezing.aif
new file mode 100644
index 000000000..376f1443d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_weezing.aif
diff --git a/sound/direct_sound_samples/cry_whiscash.aif b/sound/direct_sound_samples/cry_whiscash.aif
new file mode 100644
index 000000000..72435f691
--- /dev/null
+++ b/sound/direct_sound_samples/cry_whiscash.aif
diff --git a/sound/direct_sound_samples/cry_whismur.aif b/sound/direct_sound_samples/cry_whismur.aif
new file mode 100644
index 000000000..4ebb1f2f6
--- /dev/null
+++ b/sound/direct_sound_samples/cry_whismur.aif
diff --git a/sound/direct_sound_samples/cry_wigglytuff.aif b/sound/direct_sound_samples/cry_wigglytuff.aif
new file mode 100644
index 000000000..3ffa60e40
--- /dev/null
+++ b/sound/direct_sound_samples/cry_wigglytuff.aif
diff --git a/sound/direct_sound_samples/cry_wingull.aif b/sound/direct_sound_samples/cry_wingull.aif
new file mode 100644
index 000000000..55a0d8e82
--- /dev/null
+++ b/sound/direct_sound_samples/cry_wingull.aif
diff --git a/sound/direct_sound_samples/cry_wobbuffet.aif b/sound/direct_sound_samples/cry_wobbuffet.aif
new file mode 100644
index 000000000..66c971c4c
--- /dev/null
+++ b/sound/direct_sound_samples/cry_wobbuffet.aif
diff --git a/sound/direct_sound_samples/cry_wooper.aif b/sound/direct_sound_samples/cry_wooper.aif
new file mode 100644
index 000000000..bd6592a8a
--- /dev/null
+++ b/sound/direct_sound_samples/cry_wooper.aif
diff --git a/sound/direct_sound_samples/cry_wurmple.aif b/sound/direct_sound_samples/cry_wurmple.aif
new file mode 100644
index 000000000..3d800b7bb
--- /dev/null
+++ b/sound/direct_sound_samples/cry_wurmple.aif
diff --git a/sound/direct_sound_samples/cry_wynaut.aif b/sound/direct_sound_samples/cry_wynaut.aif
new file mode 100644
index 000000000..a93787e07
--- /dev/null
+++ b/sound/direct_sound_samples/cry_wynaut.aif
diff --git a/sound/direct_sound_samples/cry_xatu.aif b/sound/direct_sound_samples/cry_xatu.aif
new file mode 100644
index 000000000..9664d696d
--- /dev/null
+++ b/sound/direct_sound_samples/cry_xatu.aif
diff --git a/sound/direct_sound_samples/cry_yanma.aif b/sound/direct_sound_samples/cry_yanma.aif
new file mode 100644
index 000000000..1009e9b11
--- /dev/null
+++ b/sound/direct_sound_samples/cry_yanma.aif
diff --git a/sound/direct_sound_samples/cry_zangoose.aif b/sound/direct_sound_samples/cry_zangoose.aif
new file mode 100644
index 000000000..37babd376
--- /dev/null
+++ b/sound/direct_sound_samples/cry_zangoose.aif
diff --git a/sound/direct_sound_samples/cry_zapdos.aif b/sound/direct_sound_samples/cry_zapdos.aif
new file mode 100644
index 000000000..f0ea7d070
--- /dev/null
+++ b/sound/direct_sound_samples/cry_zapdos.aif
diff --git a/sound/direct_sound_samples/cry_zigzagoon.aif b/sound/direct_sound_samples/cry_zigzagoon.aif
new file mode 100644
index 000000000..9d34637fa
--- /dev/null
+++ b/sound/direct_sound_samples/cry_zigzagoon.aif
diff --git a/sound/direct_sound_samples/cry_zubat.aif b/sound/direct_sound_samples/cry_zubat.aif
new file mode 100644
index 000000000..afd6e392e
--- /dev/null
+++ b/sound/direct_sound_samples/cry_zubat.aif
diff --git a/sound/programmable_wave_samples/84553BC.aif b/sound/programmable_wave_samples/84553BC.aif
deleted file mode 100644
index 301c7cd81..000000000
--- a/sound/programmable_wave_samples/84553BC.aif
+++ /dev/null
diff --git a/sound/programmable_wave_samples/84553BC.pcm b/sound/programmable_wave_samples/84553BC.pcm
new file mode 100644
index 000000000..a0ca8fed9
--- /dev/null
+++ b/sound/programmable_wave_samples/84553BC.pcm
@@ -0,0 +1 @@
+
%ŠÞþÉc
%ŠÞþÉc
\ No newline at end of file
diff --git a/sound/programmable_wave_samples/84553CC.aif b/sound/programmable_wave_samples/84553CC.aif
deleted file mode 100644
index b2e48c383..000000000
--- a/sound/programmable_wave_samples/84553CC.aif
+++ /dev/null
diff --git a/sound/programmable_wave_samples/84553CC.pcm b/sound/programmable_wave_samples/84553CC.pcm
new file mode 100644
index 000000000..25be9c018
--- /dev/null
+++ b/sound/programmable_wave_samples/84553CC.pcm
@@ -0,0 +1 @@
+FŠÎý¹u1FŠÎý¹u1
\ No newline at end of file
diff --git a/sound/programmable_wave_samples/84553DC.aif b/sound/programmable_wave_samples/84553DC.aif
deleted file mode 100644
index 100baa99c..000000000
--- a/sound/programmable_wave_samples/84553DC.aif
+++ /dev/null
diff --git a/sound/programmable_wave_samples/84553DC.pcm b/sound/programmable_wave_samples/84553DC.pcm
new file mode 100644
index 000000000..5d9585aca
--- /dev/null
+++ b/sound/programmable_wave_samples/84553DC.pcm
@@ -0,0 +1 @@
+þܺ˜vT2þܺ˜vT2
\ No newline at end of file
diff --git a/sound/programmable_wave_samples/84553EC.aif b/sound/programmable_wave_samples/84553EC.aif
deleted file mode 100644
index 8d3266c0b..000000000
--- a/sound/programmable_wave_samples/84553EC.aif
+++ /dev/null
diff --git a/sound/programmable_wave_samples/84553EC.pcm b/sound/programmable_wave_samples/84553EC.pcm
new file mode 100644
index 000000000..25ff1b371
--- /dev/null
+++ b/sound/programmable_wave_samples/84553EC.pcm
@@ -0,0 +1 @@
+ý¹ˆˆwwe1ý¹ˆˆwwe1
\ No newline at end of file
diff --git a/sound/programmable_wave_samples/84553FC.aif b/sound/programmable_wave_samples/84553FC.aif
deleted file mode 100644
index 6d08430bb..000000000
--- a/sound/programmable_wave_samples/84553FC.aif
+++ /dev/null
diff --git a/sound/programmable_wave_samples/84553FC.pcm b/sound/programmable_wave_samples/84553FC.pcm
new file mode 100644
index 000000000..d0b69f04a
--- /dev/null
+++ b/sound/programmable_wave_samples/84553FC.pcm
@@ -0,0 +1 @@
+ŒÊ†ÿíC!ŒÊ†ÿíC!
\ No newline at end of file
diff --git a/sound/programmable_wave_samples/845540C.aif b/sound/programmable_wave_samples/845540C.aif
deleted file mode 100644
index 3db2b5d74..000000000
--- a/sound/programmable_wave_samples/845540C.aif
+++ /dev/null
diff --git a/sound/programmable_wave_samples/845540C.pcm b/sound/programmable_wave_samples/845540C.pcm
new file mode 100644
index 000000000..d0fa1932d
--- /dev/null
+++ b/sound/programmable_wave_samples/845540C.pcm
@@ -0,0 +1 @@
+ÿÿþ†CFŽÿÿþ†CFŽ
\ No newline at end of file
diff --git a/sound/programmable_wave_samples/845541C.aif b/sound/programmable_wave_samples/845541C.aif
deleted file mode 100644
index c748efda8..000000000
--- a/sound/programmable_wave_samples/845541C.aif
+++ /dev/null
diff --git a/sound/programmable_wave_samples/845541C.pcm b/sound/programmable_wave_samples/845541C.pcm
new file mode 100644
index 000000000..81afd79c5
--- /dev/null
+++ b/sound/programmable_wave_samples/845541C.pcm
diff --git a/sound/programmable_wave_samples/845542C.aif b/sound/programmable_wave_samples/845542C.aif
deleted file mode 100644
index a17403408..000000000
--- a/sound/programmable_wave_samples/845542C.aif
+++ /dev/null
diff --git a/sound/programmable_wave_samples/845542C.pcm b/sound/programmable_wave_samples/845542C.pcm
new file mode 100644
index 000000000..f5e51d5a9
--- /dev/null
+++ b/sound/programmable_wave_samples/845542C.pcm
@@ -0,0 +1 @@
+g‰«È˜–VTg‰«È˜–VT
\ No newline at end of file
diff --git a/sound/programmable_wave_samples/845543C.aif b/sound/programmable_wave_samples/845543C.aif
deleted file mode 100644
index 4c15c20e5..000000000
--- a/sound/programmable_wave_samples/845543C.aif
+++ /dev/null
diff --git a/sound/programmable_wave_samples/845543C.pcm b/sound/programmable_wave_samples/845543C.pcm
new file mode 100644
index 000000000..0d7192617
--- /dev/null
+++ b/sound/programmable_wave_samples/845543C.pcm
diff --git a/sound/programmable_wave_samples/845544C.aif b/sound/programmable_wave_samples/845544C.aif
deleted file mode 100644
index c7a12fc85..000000000
--- a/sound/programmable_wave_samples/845544C.aif
+++ /dev/null
diff --git a/sound/programmable_wave_samples/845544C.pcm b/sound/programmable_wave_samples/845544C.pcm
new file mode 100644
index 000000000..2aae22d26
--- /dev/null
+++ b/sound/programmable_wave_samples/845544C.pcm
@@ -0,0 +1 @@
+&8J\ZH6&8J\ZH6
\ No newline at end of file
diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc
index 3ce443a5c..d9e925956 100644
--- a/sound/voice_groups.inc
+++ b/sound/voice_groups.inc
@@ -12134,803 +12134,803 @@ voicegroup_8451F90:: @ 8451F90
 
 	.align 2
 voicegroup_8452590:: @ 8452590
-	cry CryDirectSound_4AB57C
-	cry CryDirectSound_4AC608
-	cry CryDirectSound_4AD698
-	cry CryDirectSound_4AE9F0
-	cry CryDirectSound_4AF860
-	cry CryDirectSound_4B06E0
-	cry CryDirectSound_4B1A28
-	cry CryDirectSound_4B289C
-	cry CryDirectSound_4B39DC
-	cry CryDirectSound_4B4D24
-	cry CryDirectSound_4B557C
-	cry CryDirectSound_4B6CCC
-	cry CryDirectSound_4B76D4
-	cry CryDirectSound_4B8718
-	cry CryDirectSound_4B9954
-	cry CryDirectSound_4BACB0
-	cry CryDirectSound_4BB098
-	cry CryDirectSound_4BBFA0
-	cry CryDirectSound_4BD0D4
-	cry CryDirectSound_4BD8B4
-	cry CryDirectSound_4BE238
-	cry CryDirectSound_4BF3DC
-	cry CryDirectSound_4C0518
-	cry CryDirectSound_4C1864
-	cry CryDirectSound_4C2BBC
-	cry CryDirectSound_4C3C64
-	cry CryDirectSound_4C5424
-	cry CryDirectSound_4C5D78
-	cry CryDirectSound_4C6B08
-	cry CryDirectSound_4C74B8
-	cry CryDirectSound_4C8180
-	cry CryDirectSound_4C9260
-	cry CryDirectSound_4C9CC8
-	cry CryDirectSound_4CA8DC
-	cry CryDirectSound_4CC148
-	cry CryDirectSound_4CC9B8
-	cry CryDirectSound_4CD448
-	cry CryDirectSound_4CEC18
-	cry CryDirectSound_4D0484
-	cry CryDirectSound_4D09E8
-	cry CryDirectSound_4D10B0
-	cry CryDirectSound_4D241C
-	cry CryDirectSound_4D3780
-	cry CryDirectSound_4D461C
-	cry CryDirectSound_4D5298
-	cry CryDirectSound_4D6C34
-	cry CryDirectSound_4D8828
-	cry CryDirectSound_4DA690
-	cry CryDirectSound_4DB610
-	cry CryDirectSound_4DC614
-	cry CryDirectSound_4DD984
-	cry CryDirectSound_4DECF0
-	cry CryDirectSound_4DF680
-	cry CryDirectSound_4E095C
-	cry CryDirectSound_4E1684
-	cry CryDirectSound_4E21CC
-	cry CryDirectSound_4E322C
-	cry CryDirectSound_4E425C
-	cry CryDirectSound_4E4FC0
-	cry CryDirectSound_4E60FC
-	cry CryDirectSound_4E6C18
-	cry CryDirectSound_4E72C0
-	cry CryDirectSound_4E7DE4
-	cry CryDirectSound_4E9548
-	cry CryDirectSound_4EB030
-	cry CryDirectSound_4ECFCC
-	cry CryDirectSound_4EDD30
-	cry CryDirectSound_4EEAC0
-	cry CryDirectSound_4EFB48
-	cry CryDirectSound_4F02D4
-	cry CryDirectSound_4F1174
-	cry CryDirectSound_4F24C0
-	cry CryDirectSound_4F34B0
-	cry CryDirectSound_4F4BAC
-	cry CryDirectSound_4F6360
-	cry CryDirectSound_4F7F48
-	cry CryDirectSound_4F8D74
-	cry CryDirectSound_4F9C84
-	cry CryDirectSound_4FAF24
-	cry CryDirectSound_4FB68C
-	cry CryDirectSound_4FC3FC
-	cry CryDirectSound_4FD740
-	cry CryDirectSound_4FEF28
-	cry CryDirectSound_4FF6A4
-	cry CryDirectSound_5009E8
-	cry CryDirectSound_501D60
-	cry CryDirectSound_502F50
-	cry CryDirectSound_504474
-	cry CryDirectSound_504EFC
-	cry CryDirectSound_505DBC
-	cry CryDirectSound_506D30
-	cry CryDirectSound_5081F4
-	cry CryDirectSound_509944
-	cry CryDirectSound_50B0C4
-	cry CryDirectSound_50BF84
-	cry CryDirectSound_50D848
-	cry CryDirectSound_50F560
-	cry CryDirectSound_511264
-	cry CryDirectSound_512AB0
-	cry CryDirectSound_514308
-	cry CryDirectSound_515BCC
-	cry CryDirectSound_517504
-	cry CryDirectSound_5187E4
-	cry CryDirectSound_51A7C8
-	cry CryDirectSound_51B6E8
-	cry CryDirectSound_51C558
-	cry CryDirectSound_51D804
-	cry CryDirectSound_51E9DC
-	cry CryDirectSound_51F904
-	cry CryDirectSound_520D60
-	cry CryDirectSound_52230C
-	cry CryDirectSound_523678
-	cry CryDirectSound_524AE4
-	cry CryDirectSound_5259B0
-	cry CryDirectSound_5268CC
-	cry CryDirectSound_527B80
-	cry CryDirectSound_5284FC
-	cry CryDirectSound_528D68
-	cry CryDirectSound_529740
-	cry CryDirectSound_52AA98
-	cry CryDirectSound_52BE80
-	cry CryDirectSound_52D35C
-	cry CryDirectSound_52E64C
-	cry CryDirectSound_52F3A8
-	cry CryDirectSound_53231C
-	cry CryDirectSound_534200
-	cry CryDirectSound_53517C
-	cry CryDirectSound_535DD8
+	cry Cry_Bulbasaur
+	cry Cry_Ivysaur
+	cry Cry_Venusaur
+	cry Cry_Charmander
+	cry Cry_Charmeleon
+	cry Cry_Charizard
+	cry Cry_Squirtle
+	cry Cry_Wartortle
+	cry Cry_Blastoise
+	cry Cry_Caterpie
+	cry Cry_Metapod
+	cry Cry_Butterfree
+	cry Cry_Weedle
+	cry Cry_Kakuna
+	cry Cry_Beedrill
+	cry Cry_Pidgey
+	cry Cry_Pidgeotto
+	cry Cry_Pidgeot
+	cry Cry_Rattata
+	cry Cry_Raticate
+	cry Cry_Spearow
+	cry Cry_Fearow
+	cry Cry_Ekans
+	cry Cry_Arbok
+	cry Cry_Pikachu
+	cry Cry_Raichu
+	cry Cry_Sandshrew
+	cry Cry_Sandslash
+	cry Cry_NidoranF
+	cry Cry_Nidorina
+	cry Cry_Nidoqueen
+	cry Cry_NidoranM
+	cry Cry_Nidorino
+	cry Cry_Nidoking
+	cry Cry_Clefairy
+	cry Cry_Clefable
+	cry Cry_Vulpix
+	cry Cry_Ninetales
+	cry Cry_Jigglypuff
+	cry Cry_Wigglytuff
+	cry Cry_Zubat
+	cry Cry_Golbat
+	cry Cry_Oddish
+	cry Cry_Gloom
+	cry Cry_Vileplume
+	cry Cry_Paras
+	cry Cry_Parasect
+	cry Cry_Venonat
+	cry Cry_Venomoth
+	cry Cry_Diglett
+	cry Cry_Dugtrio
+	cry Cry_Meowth
+	cry Cry_Persian
+	cry Cry_Psyduck
+	cry Cry_Golduck
+	cry Cry_Mankey
+	cry Cry_Primeape
+	cry Cry_Growlithe
+	cry Cry_Arcanine
+	cry Cry_Poliwag
+	cry Cry_Poliwhirl
+	cry Cry_Poliwrath
+	cry Cry_Abra
+	cry Cry_Kadabra
+	cry Cry_Alakazam
+	cry Cry_Machop
+	cry Cry_Machoke
+	cry Cry_Machamp
+	cry Cry_Bellsprout
+	cry Cry_Weepinbell
+	cry Cry_Victreebel
+	cry Cry_Tentacool
+	cry Cry_Tentacruel
+	cry Cry_Geodude
+	cry Cry_Graveler
+	cry Cry_Golem
+	cry Cry_Ponyta
+	cry Cry_Rapidash
+	cry Cry_Slowpoke
+	cry Cry_Slowbro
+	cry Cry_Magnemite
+	cry Cry_Magneton
+	cry Cry_Farfetchd
+	cry Cry_Doduo
+	cry Cry_Dodrio
+	cry Cry_Seel
+	cry Cry_Dewgong
+	cry Cry_Grimer
+	cry Cry_Muk
+	cry Cry_Shellder
+	cry Cry_Cloyster
+	cry Cry_Gastly
+	cry Cry_Haunter
+	cry Cry_Gengar
+	cry Cry_Onix
+	cry Cry_Drowzee
+	cry Cry_Hypno
+	cry Cry_Krabby
+	cry Cry_Kingler
+	cry Cry_Voltorb
+	cry Cry_Electrode
+	cry Cry_Exeggcute
+	cry Cry_Exeggutor
+	cry Cry_Cubone
+	cry Cry_Marowak
+	cry Cry_Hitmonlee
+	cry Cry_Hitmonchan
+	cry Cry_Lickitung
+	cry Cry_Koffing
+	cry Cry_Weezing
+	cry Cry_Rhyhorn
+	cry Cry_Rhydon
+	cry Cry_Chansey
+	cry Cry_Tangela
+	cry Cry_Kangaskhan
+	cry Cry_Horsea
+	cry Cry_Seadra
+	cry Cry_Goldeen
+	cry Cry_Seaking
+	cry Cry_Staryu
+	cry Cry_Starmie
+	cry Cry_MrMime
+	cry Cry_Scyther
+	cry Cry_Jynx
+	cry Cry_Electabuzz
+	cry Cry_Magmar
+	cry Cry_Pinsir
+	cry Cry_Tauros
 
 	.align 2
 voicegroup_8452B90:: @ 8452B90
-	cry CryDirectSound_53702C
-	cry CryDirectSound_538334
-	cry CryDirectSound_539768
-	cry CryDirectSound_53A63C
-	cry CryDirectSound_53B158
-	cry CryDirectSound_53BF90
-	cry CryDirectSound_53D5A8
-	cry CryDirectSound_53E57C
-	cry CryDirectSound_53F500
-	cry CryDirectSound_54090C
-	cry CryDirectSound_541664
-	cry CryDirectSound_5423B8
-	cry CryDirectSound_54300C
-	cry CryDirectSound_543DC8
-	cry CryDirectSound_545624
-	cry CryDirectSound_545B60
-	cry CryDirectSound_547308
-	cry CryDirectSound_548280
-	cry CryDirectSound_549A2C
-	cry CryDirectSound_54A5C8
-	cry CryDirectSound_54B670
-	cry CryDirectSound_54C97C
-	cry CryDirectSound_54E7E4
-	cry CryDirectSound_55064C
-	cry CryDirectSound_550B8C
-	cry CryDirectSound_551458
-	cry CryDirectSound_552490
-	cry CryDirectSound_552B94
-	cry CryDirectSound_55377C
-	cry CryDirectSound_555D8C
-	cry CryDirectSound_556FE4
-	cry CryDirectSound_558420
-	cry CryDirectSound_559DA4
-	cry CryDirectSound_55A1CC
-	cry CryDirectSound_55A814
-	cry CryDirectSound_55B2F8
-	cry CryDirectSound_55C828
-	cry CryDirectSound_55CF20
-	cry CryDirectSound_55D784
-	cry CryDirectSound_55E4E8
-	cry CryDirectSound_55F13C
-	cry CryDirectSound_56086C
-	cry CryDirectSound_56151C
-	cry CryDirectSound_561FA8
-	cry CryDirectSound_5626FC
-	cry CryDirectSound_562CEC
-	cry CryDirectSound_5633E8
-	cry CryDirectSound_563ED0
-	cry CryDirectSound_5645D0
-	cry CryDirectSound_565060
-	cry CryDirectSound_565F2C
-	cry CryDirectSound_566684
-	cry CryDirectSound_567438
-	cry CryDirectSound_5684B8
-	cry CryDirectSound_5692D0
-	cry CryDirectSound_569FE4
-	cry CryDirectSound_56B0D0
-	cry CryDirectSound_56C100
-	cry CryDirectSound_56D344
-	cry CryDirectSound_56DBB0
-	cry CryDirectSound_56E8B8
-	cry CryDirectSound_56F8F4
-	cry CryDirectSound_570714
-	cry CryDirectSound_570F28
-	cry CryDirectSound_571F08
-	cry CryDirectSound_573010
-	cry CryDirectSound_573770
-	cry CryDirectSound_5744D0
-	cry CryDirectSound_575884
-	cry CryDirectSound_576804
-	cry CryDirectSound_5778C8
-	cry CryDirectSound_5790AC
-	cry CryDirectSound_579C4C
-	cry CryDirectSound_57A974
-	cry CryDirectSound_57BE10
-	cry CryDirectSound_57CCC4
-	cry CryDirectSound_57DA24
-	cry CryDirectSound_57EE2C
-	cry CryDirectSound_57FE0C
-	cry CryDirectSound_580A2C
-	cry CryDirectSound_583054
-	cry CryDirectSound_583EC8
-	cry CryDirectSound_58566C
-	cry CryDirectSound_586208
-	cry CryDirectSound_587904
-	cry CryDirectSound_588338
-	cry CryDirectSound_58958C
-	cry CryDirectSound_589EB0
-	cry CryDirectSound_58AF3C
-	cry CryDirectSound_58CD14
-	cry CryDirectSound_58DE2C
-	cry CryDirectSound_58F334
-	cry CryDirectSound_58FFDC
-	cry CryDirectSound_590CD0
-	cry CryDirectSound_5919B0
-	cry CryDirectSound_592440
-	cry CryDirectSound_593E84
-	cry CryDirectSound_594EB8
-	cry CryDirectSound_595E80
-	cry CryDirectSound_597688
-	cry CryDirectSound_598330
-	cry CryDirectSound_5996E0
-	cry CryDirectSound_59A4B8
-	cry CryDirectSound_59B008
-	cry CryDirectSound_59C12C
-	cry CryDirectSound_59D0E4
-	cry CryDirectSound_59E760
-	cry CryDirectSound_59F194
-	cry CryDirectSound_5A01BC
-	cry CryDirectSound_5A0F9C
-	cry CryDirectSound_5A1B50
-	cry CryDirectSound_5A25DC
-	cry CryDirectSound_5A344C
-	cry CryDirectSound_5A4328
-	cry CryDirectSound_5A53BC
-	cry CryDirectSound_5A652C
-	cry CryDirectSound_5A79A0
-	cry CryDirectSound_5A8BE8
-	cry CryDirectSound_5A9898
-	cry CryDirectSound_5AA108
-	cry CryDirectSound_5AB868
-	cry CryDirectSound_5ADE60
-	cry CryDirectSound_5AF4F4
-	cry CryDirectSound_5B036C
-	cry CryDirectSound_5B0BCC
-	cry CryDirectSound_5B168C
-	cry CryDirectSound_5B1FD8
-	cry CryDirectSound_5B2C34
+	cry Cry_Magikarp
+	cry Cry_Gyarados
+	cry Cry_Lapras
+	cry Cry_Ditto
+	cry Cry_Eevee
+	cry Cry_Vaporeon
+	cry Cry_Jolteon
+	cry Cry_Flareon
+	cry Cry_Porygon
+	cry Cry_Omanyte
+	cry Cry_Omastar
+	cry Cry_Kabuto
+	cry Cry_Kabutops
+	cry Cry_Aerodactyl
+	cry Cry_Snorlax
+	cry Cry_Articuno
+	cry Cry_Zapdos
+	cry Cry_Moltres
+	cry Cry_Dratini
+	cry Cry_Dragonair
+	cry Cry_Dragonite
+	cry Cry_Mewtwo
+	cry Cry_Mew
+	cry Cry_Chikorita
+	cry Cry_Bayleef
+	cry Cry_Meganium
+	cry Cry_Cyndaquil
+	cry Cry_Quilava
+	cry Cry_Typhlosion
+	cry Cry_Totodile
+	cry Cry_Croconaw
+	cry Cry_Feraligatr
+	cry Cry_Sentret
+	cry Cry_Furret
+	cry Cry_Hoothoot
+	cry Cry_Noctowl
+	cry Cry_Ledyba
+	cry Cry_Ledian
+	cry Cry_Spinarak
+	cry Cry_Ariados
+	cry Cry_Crobat
+	cry Cry_Chinchou
+	cry Cry_Lanturn
+	cry Cry_Pichu
+	cry Cry_Cleffa
+	cry Cry_Igglybuff
+	cry Cry_Togepi
+	cry Cry_Togetic
+	cry Cry_Natu
+	cry Cry_Xatu
+	cry Cry_Mareep
+	cry Cry_Flaaffy
+	cry Cry_Ampharos
+	cry Cry_Bellossom
+	cry Cry_Marill
+	cry Cry_Azumarill
+	cry Cry_Sudowoodo
+	cry Cry_Politoed
+	cry Cry_Hoppip
+	cry Cry_Skiploom
+	cry Cry_Jumpluff
+	cry Cry_Aipom
+	cry Cry_Sunkern
+	cry Cry_Sunflora
+	cry Cry_Yanma
+	cry Cry_Wooper
+	cry Cry_Quagsire
+	cry Cry_Espeon
+	cry Cry_Umbreon
+	cry Cry_Murkrow
+	cry Cry_Slowking
+	cry Cry_Misdreavus
+	cry Cry_Unown
+	cry Cry_Wobbuffet
+	cry Cry_Girafarig
+	cry Cry_Pineco
+	cry Cry_Forretress
+	cry Cry_Dunsparce
+	cry Cry_Gligar
+	cry Cry_Steelix
+	cry Cry_Snubbull
+	cry Cry_Granbull
+	cry Cry_Qwilfish
+	cry Cry_Scizor
+	cry Cry_Shuckle
+	cry Cry_Heracross
+	cry Cry_Sneasel
+	cry Cry_Teddiursa
+	cry Cry_Ursaring
+	cry Cry_Slugma
+	cry Cry_Magcargo
+	cry Cry_Swinub
+	cry Cry_Piloswine
+	cry Cry_Corsola
+	cry Cry_Remoraid
+	cry Cry_Octillery
+	cry Cry_Delibird
+	cry Cry_Mantine
+	cry Cry_Skarmory
+	cry Cry_Houndour
+	cry Cry_Houndoom
+	cry Cry_Kingdra
+	cry Cry_Phanpy
+	cry Cry_Donphan
+	cry Cry_Porygon2
+	cry Cry_Stantler
+	cry Cry_Smeargle
+	cry Cry_Tyrogue
+	cry Cry_Hitmontop
+	cry Cry_Smoochum
+	cry Cry_Elekid
+	cry Cry_Magby
+	cry Cry_Miltank
+	cry Cry_Blissey
+	cry Cry_Raikou
+	cry Cry_Entei
+	cry Cry_Suicune
+	cry Cry_Larvitar
+	cry Cry_Pupitar
+	cry Cry_Tyranitar
+	cry Cry_Lugia
+	cry Cry_HoOh
+	cry Cry_Celebi
+	cry Cry_Kecleon
+	cry Cry_Roselia
+	cry Cry_Torkoal
+	cry Cry_Electrike
+	cry Cry_Manectric
 
 	.align 2
 voicegroup_8453190:: @ 8453190
-	cry CryDirectSound_5B413C
-	cry CryDirectSound_5B4BD4
-	cry CryDirectSound_5B5804
-	cry CryDirectSound_5B65E4
-	cry CryDirectSound_5B7184
-	cry CryDirectSound_5B8890
-	cry CryDirectSound_5B9220
-	cry CryDirectSound_5B9C88
-	cry CryDirectSound_5BA220
-	cry CryDirectSound_5BAD3C
-	cry CryDirectSound_5BB690
-	cry CryDirectSound_5BBC90
-	cry CryDirectSound_5BC594
-	cry CryDirectSound_5BD744
-	cry CryDirectSound_5BE3B0
-	cry CryDirectSound_5BED58
-	cry CryDirectSound_5C0A2C
-	cry CryDirectSound_5C29AC
-	cry CryDirectSound_5C3554
-	cry CryDirectSound_5C49C8
-	cry CryDirectSound_5C63E4
-	cry CryDirectSound_5C6B68
-	cry CryDirectSound_5C7C6C
-	cry CryDirectSound_5C92EC
-	cry CryDirectSound_5C9EB4
-	cry CryDirectSound_5CAAF4
-	cry CryDirectSound_5CB79C
-	cry CryDirectSound_5CBFDC
-	cry CryDirectSound_5CC444
-	cry CryDirectSound_5CD2D8
-	cry CryDirectSound_5CE3A8
-	cry CryDirectSound_5CEBD4
-	cry CryDirectSound_5CF73C
-	cry CryDirectSound_5D0B00
-	cry CryDirectSound_5D1514
-	cry CryDirectSound_5D1DE0
-	cry CryDirectSound_5D2E0C
-	cry CryDirectSound_5D3644
-	cry CryDirectSound_5D4688
-	cry CryDirectSound_5D5334
-	cry CryDirectSound_5D5D50
-	cry CryDirectSound_5D6980
-	cry CryDirectSound_5D81E4
-	cry CryDirectSound_5D8A68
-	cry CryDirectSound_5D98C0
-	cry CryDirectSound_5DA2AC
-	cry CryDirectSound_5DA91C
-	cry CryDirectSound_5DB544
-	cry CryDirectSound_5DBCFC
-	cry CryDirectSound_5DC458
-	cry CryDirectSound_5DD510
-	cry CryDirectSound_5DE274
-	cry CryDirectSound_5DF758
-	cry CryDirectSound_5E0054
-	cry CryDirectSound_5E105C
-	cry CryDirectSound_5E1ADC
-	cry CryDirectSound_5E2E90
-	cry CryDirectSound_5E35A4
-	cry CryDirectSound_5E4ABC
-	cry CryDirectSound_5E52C0
-	cry CryDirectSound_5E6420
-	cry CryDirectSound_5E6D6C
-	cry CryDirectSound_5E848C
-	cry CryDirectSound_5E8DC8
-	cry CryDirectSound_5E9EC4
-	cry CryDirectSound_5EAAC8
-	cry CryDirectSound_5EC380
-	cry CryDirectSound_5ECAC0
-	cry CryDirectSound_5ED760
-	cry CryDirectSound_5EE184
-	cry CryDirectSound_5EEF88
-	cry CryDirectSound_5F0990
-	cry CryDirectSound_5F1280
-	cry CryDirectSound_5F2930
-	cry CryDirectSound_5F35B4
-	cry CryDirectSound_5F4914
-	cry CryDirectSound_5F6110
-	cry CryDirectSound_5F713C
-	cry CryDirectSound_5F7910
-	cry CryDirectSound_5FA054
-	cry CryDirectSound_5FAAD0
-	cry CryDirectSound_5FB2F0
-	cry CryDirectSound_5FC374
-	cry CryDirectSound_5FC928
-	cry CryDirectSound_5FD500
-	cry CryDirectSound_5FF94C
-	cry CryDirectSound_600B9C
-	cry CryDirectSound_601B84
-	cry CryDirectSound_6031F0
-	cry CryDirectSound_603B98
-	cry CryDirectSound_6058C8
-	cry CryDirectSound_606480
-	cry CryDirectSound_607B54
-	cry CryDirectSound_6084F4
-	cry CryDirectSound_6097C8
-	cry CryDirectSound_60BF40
-	cry CryDirectSound_60C714
-	cry CryDirectSound_60DB1C
-	cry CryDirectSound_60FAF8
-	cry CryDirectSound_611AF8
-	cry CryDirectSound_6131FC
-	cry CryDirectSound_613E94
-	cry CryDirectSound_614A1C
-	cry CryDirectSound_615B34
-	cry CryDirectSound_61647C
-	cry CryDirectSound_617808
-	cry CryDirectSound_6185C0
-	cry CryDirectSound_619164
-	cry CryDirectSound_619CE4
-	cry CryDirectSound_61A610
-	cry CryDirectSound_61BAE8
-	cry CryDirectSound_61D48C
-	cry CryDirectSound_61E8BC
-	cry CryDirectSound_61ED98
-	cry CryDirectSound_6212A4
-	cry CryDirectSound_62365C
-	cry CryDirectSound_625388
-	cry CryDirectSound_626CA4
-	cry CryDirectSound_627964
-	cry CryDirectSound_62823C
-	cry CryDirectSound_62A0D8
-	cry CryDirectSound_62C19C
-	cry CryDirectSound_62DDFC
-	cry CryDirectSound_62E98C
-	cry CryDirectSound_6305D4
-	cry CryDirectSound_6312FC
-	cry CryDirectSound_633D0C
-	cry CryDirectSound_634530
+	cry Cry_Duskull
+	cry Cry_Latias
+	cry Cry_Wynaut
+	cry Cry_Seviper
+	cry Cry_Sharpedo
+	cry Cry_Zangoose
+	cry Cry_Azurill
+	cry Cry_Swablu
+	cry Cry_Altaria
+	cry Cry_Unused265
+	cry Cry_Taillow
+	cry Cry_Swellow
+	cry Cry_Unused268
+	cry Cry_Spinda
+	cry Cry_Torchic
+	cry Cry_Combusken
+	cry Cry_Blaziken
+	cry Cry_Treecko
+	cry Cry_Grovyle
+	cry Cry_Sceptile
+	cry Cry_Mudkip
+	cry Cry_Marshtomp
+	cry Cry_Swampert
+	cry Cry_Pelipper
+	cry Cry_Wingull
+	cry Cry_Banette
+	cry Cry_Shuppet
+	cry Cry_Lotad
+	cry Cry_Lombre
+	cry Cry_Ludicolo
+	cry Cry_Seedot
+	cry Cry_Nuzleaf
+	cry Cry_Shiftry
+	cry Cry_Carvanha
+	cry Cry_Wurmple
+	cry Cry_Silcoon
+	cry Cry_Beautifly
+	cry Cry_Cascoon
+	cry Cry_Dustox
+	cry Cry_Ralts
+	cry Cry_Kirlia
+	cry Cry_Gardevoir
+	cry Cry_Slakoth
+	cry Cry_Vigoroth
+	cry Cry_Slaking
+	cry Cry_Nincada
+	cry Cry_Ninjask
+	cry Cry_Shedinja
+	cry Cry_Makuhita
+	cry Cry_Hariyama
+	cry Cry_Nosepass
+	cry Cry_Glalie
+	cry Cry_Plusle
+	cry Cry_Minun
+	cry Cry_Surskit
+	cry Cry_Masquerain
+	cry Cry_Skitty
+	cry Cry_Delcatty
+	cry Cry_Gulpin
+	cry Cry_Swalot
+	cry Cry_Numel
+	cry Cry_Camerupt
+	cry Cry_Barboach
+	cry Cry_Whiscash
+	cry Cry_Corphish
+	cry Cry_Crawdaunt
+	cry Cry_Spoink
+	cry Cry_Grumpig
+	cry Cry_Trapinch
+	cry Cry_Vibrava
+	cry Cry_Flygon
+	cry Cry_Cacnea
+	cry Cry_Cacturne
+	cry Cry_Baltoy
+	cry Cry_Claydol
+	cry Cry_Lunatone
+	cry Cry_Solrock
+	cry Cry_Feebas
+	cry Cry_Milotic
+	cry Cry_Absol
+	cry Cry_Meditite
+	cry Cry_Medicham
+	cry Cry_Spheal
+	cry Cry_Sealeo
+	cry Cry_Walrein
+	cry Cry_Clamperl
+	cry Cry_Huntail
+	cry Cry_Gorebyss
+	cry Cry_Lileep
+	cry Cry_Cradily
+	cry Cry_Anorith
+	cry Cry_Armaldo
+	cry Cry_Beldum
+	cry Cry_Metang
+	cry Cry_Metagross
+	cry Cry_Bagon
+	cry Cry_Shelgon
+	cry Cry_Regirock
+	cry Cry_Regice
+	cry Cry_Registeel
+	cry Cry_Castform
+	cry Cry_Volbeat
+	cry Cry_Illumise
+	cry Cry_Poochyena
+	cry Cry_Mightyena
+	cry Cry_Dusclops
+	cry Cry_Sableye
+	cry Cry_Mawile
+	cry Cry_Aron
+	cry Cry_Lairon
+	cry Cry_Aggron
+	cry Cry_Relicanth
+	cry Cry_Luvdisc
+	cry Cry_Groudon
+	cry Cry_Kyogre
+	cry Cry_Rayquaza
+	cry Cry_Salamence
+	cry Cry_Breloom
+	cry Cry_Shroomish
+	cry Cry_Linoone
+	cry Cry_Tropius
+	cry Cry_Wailmer
+	cry Cry_Zigzagoon
+	cry Cry_Exploud
+	cry Cry_Loudred
+	cry Cry_Wailord
+	cry Cry_Whismur
+	cry Cry_Snorunt
 
 	.align 2
 voicegroup_8453790:: @ 8453790
-	cry CryDirectSound_635638
-	cry CryDirectSound_636C30
-	cry CryDirectSound_6379B4
-	cry CryDirectSound_638E88
+	cry Cry_Latios
+	cry Cry_Jirachi
+	cry Cry_Deoxys
+	cry Cry_Chimecho
 
 	.align 2
 voicegroup_84537C0:: @ 84537C0
-	cry2 CryDirectSound_4AB57C
-	cry2 CryDirectSound_4AC608
-	cry2 CryDirectSound_4AD698
-	cry2 CryDirectSound_4AE9F0
-	cry2 CryDirectSound_4AF860
-	cry2 CryDirectSound_4B06E0
-	cry2 CryDirectSound_4B1A28
-	cry2 CryDirectSound_4B289C
-	cry2 CryDirectSound_4B39DC
-	cry2 CryDirectSound_4B4D24
-	cry2 CryDirectSound_4B557C
-	cry2 CryDirectSound_4B6CCC
-	cry2 CryDirectSound_4B76D4
-	cry2 CryDirectSound_4B8718
-	cry2 CryDirectSound_4B9954
-	cry2 CryDirectSound_4BACB0
-	cry2 CryDirectSound_4BB098
-	cry2 CryDirectSound_4BBFA0
-	cry2 CryDirectSound_4BD0D4
-	cry2 CryDirectSound_4BD8B4
-	cry2 CryDirectSound_4BE238
-	cry2 CryDirectSound_4BF3DC
-	cry2 CryDirectSound_4C0518
-	cry2 CryDirectSound_4C1864
-	cry2 CryDirectSound_4C2BBC
-	cry2 CryDirectSound_4C3C64
-	cry2 CryDirectSound_4C5424
-	cry2 CryDirectSound_4C5D78
-	cry2 CryDirectSound_4C6B08
-	cry2 CryDirectSound_4C74B8
-	cry2 CryDirectSound_4C8180
-	cry2 CryDirectSound_4C9260
-	cry2 CryDirectSound_4C9CC8
-	cry2 CryDirectSound_4CA8DC
-	cry2 CryDirectSound_4CC148
-	cry2 CryDirectSound_4CC9B8
-	cry2 CryDirectSound_4CD448
-	cry2 CryDirectSound_4CEC18
-	cry2 CryDirectSound_4D0484
-	cry2 CryDirectSound_4D09E8
-	cry2 CryDirectSound_4D10B0
-	cry2 CryDirectSound_4D241C
-	cry2 CryDirectSound_4D3780
-	cry2 CryDirectSound_4D461C
-	cry2 CryDirectSound_4D5298
-	cry2 CryDirectSound_4D6C34
-	cry2 CryDirectSound_4D8828
-	cry2 CryDirectSound_4DA690
-	cry2 CryDirectSound_4DB610
-	cry2 CryDirectSound_4DC614
-	cry2 CryDirectSound_4DD984
-	cry2 CryDirectSound_4DECF0
-	cry2 CryDirectSound_4DF680
-	cry2 CryDirectSound_4E095C
-	cry2 CryDirectSound_4E1684
-	cry2 CryDirectSound_4E21CC
-	cry2 CryDirectSound_4E322C
-	cry2 CryDirectSound_4E425C
-	cry2 CryDirectSound_4E4FC0
-	cry2 CryDirectSound_4E60FC
-	cry2 CryDirectSound_4E6C18
-	cry2 CryDirectSound_4E72C0
-	cry2 CryDirectSound_4E7DE4
-	cry2 CryDirectSound_4E9548
-	cry2 CryDirectSound_4EB030
-	cry2 CryDirectSound_4ECFCC
-	cry2 CryDirectSound_4EDD30
-	cry2 CryDirectSound_4EEAC0
-	cry2 CryDirectSound_4EFB48
-	cry2 CryDirectSound_4F02D4
-	cry2 CryDirectSound_4F1174
-	cry2 CryDirectSound_4F24C0
-	cry2 CryDirectSound_4F34B0
-	cry2 CryDirectSound_4F4BAC
-	cry2 CryDirectSound_4F6360
-	cry2 CryDirectSound_4F7F48
-	cry2 CryDirectSound_4F8D74
-	cry2 CryDirectSound_4F9C84
-	cry2 CryDirectSound_4FAF24
-	cry2 CryDirectSound_4FB68C
-	cry2 CryDirectSound_4FC3FC
-	cry2 CryDirectSound_4FD740
-	cry2 CryDirectSound_4FEF28
-	cry2 CryDirectSound_4FF6A4
-	cry2 CryDirectSound_5009E8
-	cry2 CryDirectSound_501D60
-	cry2 CryDirectSound_502F50
-	cry2 CryDirectSound_504474
-	cry2 CryDirectSound_504EFC
-	cry2 CryDirectSound_505DBC
-	cry2 CryDirectSound_506D30
-	cry2 CryDirectSound_5081F4
-	cry2 CryDirectSound_509944
-	cry2 CryDirectSound_50B0C4
-	cry2 CryDirectSound_50BF84
-	cry2 CryDirectSound_50D848
-	cry2 CryDirectSound_50F560
-	cry2 CryDirectSound_511264
-	cry2 CryDirectSound_512AB0
-	cry2 CryDirectSound_514308
-	cry2 CryDirectSound_515BCC
-	cry2 CryDirectSound_517504
-	cry2 CryDirectSound_5187E4
-	cry2 CryDirectSound_51A7C8
-	cry2 CryDirectSound_51B6E8
-	cry2 CryDirectSound_51C558
-	cry2 CryDirectSound_51D804
-	cry2 CryDirectSound_51E9DC
-	cry2 CryDirectSound_51F904
-	cry2 CryDirectSound_520D60
-	cry2 CryDirectSound_52230C
-	cry2 CryDirectSound_523678
-	cry2 CryDirectSound_524AE4
-	cry2 CryDirectSound_5259B0
-	cry2 CryDirectSound_5268CC
-	cry2 CryDirectSound_527B80
-	cry2 CryDirectSound_5284FC
-	cry2 CryDirectSound_528D68
-	cry2 CryDirectSound_529740
-	cry2 CryDirectSound_52AA98
-	cry2 CryDirectSound_52BE80
-	cry2 CryDirectSound_52D35C
-	cry2 CryDirectSound_52E64C
-	cry2 CryDirectSound_52F3A8
-	cry2 CryDirectSound_53231C
-	cry2 CryDirectSound_534200
-	cry2 CryDirectSound_53517C
-	cry2 CryDirectSound_535DD8
+	cry2 Cry_Bulbasaur
+	cry2 Cry_Ivysaur
+	cry2 Cry_Venusaur
+	cry2 Cry_Charmander
+	cry2 Cry_Charmeleon
+	cry2 Cry_Charizard
+	cry2 Cry_Squirtle
+	cry2 Cry_Wartortle
+	cry2 Cry_Blastoise
+	cry2 Cry_Caterpie
+	cry2 Cry_Metapod
+	cry2 Cry_Butterfree
+	cry2 Cry_Weedle
+	cry2 Cry_Kakuna
+	cry2 Cry_Beedrill
+	cry2 Cry_Pidgey
+	cry2 Cry_Pidgeotto
+	cry2 Cry_Pidgeot
+	cry2 Cry_Rattata
+	cry2 Cry_Raticate
+	cry2 Cry_Spearow
+	cry2 Cry_Fearow
+	cry2 Cry_Ekans
+	cry2 Cry_Arbok
+	cry2 Cry_Pikachu
+	cry2 Cry_Raichu
+	cry2 Cry_Sandshrew
+	cry2 Cry_Sandslash
+	cry2 Cry_NidoranF
+	cry2 Cry_Nidorina
+	cry2 Cry_Nidoqueen
+	cry2 Cry_NidoranM
+	cry2 Cry_Nidorino
+	cry2 Cry_Nidoking
+	cry2 Cry_Clefairy
+	cry2 Cry_Clefable
+	cry2 Cry_Vulpix
+	cry2 Cry_Ninetales
+	cry2 Cry_Jigglypuff
+	cry2 Cry_Wigglytuff
+	cry2 Cry_Zubat
+	cry2 Cry_Golbat
+	cry2 Cry_Oddish
+	cry2 Cry_Gloom
+	cry2 Cry_Vileplume
+	cry2 Cry_Paras
+	cry2 Cry_Parasect
+	cry2 Cry_Venonat
+	cry2 Cry_Venomoth
+	cry2 Cry_Diglett
+	cry2 Cry_Dugtrio
+	cry2 Cry_Meowth
+	cry2 Cry_Persian
+	cry2 Cry_Psyduck
+	cry2 Cry_Golduck
+	cry2 Cry_Mankey
+	cry2 Cry_Primeape
+	cry2 Cry_Growlithe
+	cry2 Cry_Arcanine
+	cry2 Cry_Poliwag
+	cry2 Cry_Poliwhirl
+	cry2 Cry_Poliwrath
+	cry2 Cry_Abra
+	cry2 Cry_Kadabra
+	cry2 Cry_Alakazam
+	cry2 Cry_Machop
+	cry2 Cry_Machoke
+	cry2 Cry_Machamp
+	cry2 Cry_Bellsprout
+	cry2 Cry_Weepinbell
+	cry2 Cry_Victreebel
+	cry2 Cry_Tentacool
+	cry2 Cry_Tentacruel
+	cry2 Cry_Geodude
+	cry2 Cry_Graveler
+	cry2 Cry_Golem
+	cry2 Cry_Ponyta
+	cry2 Cry_Rapidash
+	cry2 Cry_Slowpoke
+	cry2 Cry_Slowbro
+	cry2 Cry_Magnemite
+	cry2 Cry_Magneton
+	cry2 Cry_Farfetchd
+	cry2 Cry_Doduo
+	cry2 Cry_Dodrio
+	cry2 Cry_Seel
+	cry2 Cry_Dewgong
+	cry2 Cry_Grimer
+	cry2 Cry_Muk
+	cry2 Cry_Shellder
+	cry2 Cry_Cloyster
+	cry2 Cry_Gastly
+	cry2 Cry_Haunter
+	cry2 Cry_Gengar
+	cry2 Cry_Onix
+	cry2 Cry_Drowzee
+	cry2 Cry_Hypno
+	cry2 Cry_Krabby
+	cry2 Cry_Kingler
+	cry2 Cry_Voltorb
+	cry2 Cry_Electrode
+	cry2 Cry_Exeggcute
+	cry2 Cry_Exeggutor
+	cry2 Cry_Cubone
+	cry2 Cry_Marowak
+	cry2 Cry_Hitmonlee
+	cry2 Cry_Hitmonchan
+	cry2 Cry_Lickitung
+	cry2 Cry_Koffing
+	cry2 Cry_Weezing
+	cry2 Cry_Rhyhorn
+	cry2 Cry_Rhydon
+	cry2 Cry_Chansey
+	cry2 Cry_Tangela
+	cry2 Cry_Kangaskhan
+	cry2 Cry_Horsea
+	cry2 Cry_Seadra
+	cry2 Cry_Goldeen
+	cry2 Cry_Seaking
+	cry2 Cry_Staryu
+	cry2 Cry_Starmie
+	cry2 Cry_MrMime
+	cry2 Cry_Scyther
+	cry2 Cry_Jynx
+	cry2 Cry_Electabuzz
+	cry2 Cry_Magmar
+	cry2 Cry_Pinsir
+	cry2 Cry_Tauros
 
 	.align 2
 voicegroup_8453DC0:: @ 8453DC0
-	cry2 CryDirectSound_53702C
-	cry2 CryDirectSound_538334
-	cry2 CryDirectSound_539768
-	cry2 CryDirectSound_53A63C
-	cry2 CryDirectSound_53B158
-	cry2 CryDirectSound_53BF90
-	cry2 CryDirectSound_53D5A8
-	cry2 CryDirectSound_53E57C
-	cry2 CryDirectSound_53F500
-	cry2 CryDirectSound_54090C
-	cry2 CryDirectSound_541664
-	cry2 CryDirectSound_5423B8
-	cry2 CryDirectSound_54300C
-	cry2 CryDirectSound_543DC8
-	cry2 CryDirectSound_545624
-	cry2 CryDirectSound_545B60
-	cry2 CryDirectSound_547308
-	cry2 CryDirectSound_548280
-	cry2 CryDirectSound_549A2C
-	cry2 CryDirectSound_54A5C8
-	cry2 CryDirectSound_54B670
-	cry2 CryDirectSound_54C97C
-	cry2 CryDirectSound_54E7E4
-	cry2 CryDirectSound_55064C
-	cry2 CryDirectSound_550B8C
-	cry2 CryDirectSound_551458
-	cry2 CryDirectSound_552490
-	cry2 CryDirectSound_552B94
-	cry2 CryDirectSound_55377C
-	cry2 CryDirectSound_555D8C
-	cry2 CryDirectSound_556FE4
-	cry2 CryDirectSound_558420
-	cry2 CryDirectSound_559DA4
-	cry2 CryDirectSound_55A1CC
-	cry2 CryDirectSound_55A814
-	cry2 CryDirectSound_55B2F8
-	cry2 CryDirectSound_55C828
-	cry2 CryDirectSound_55CF20
-	cry2 CryDirectSound_55D784
-	cry2 CryDirectSound_55E4E8
-	cry2 CryDirectSound_55F13C
-	cry2 CryDirectSound_56086C
-	cry2 CryDirectSound_56151C
-	cry2 CryDirectSound_561FA8
-	cry2 CryDirectSound_5626FC
-	cry2 CryDirectSound_562CEC
-	cry2 CryDirectSound_5633E8
-	cry2 CryDirectSound_563ED0
-	cry2 CryDirectSound_5645D0
-	cry2 CryDirectSound_565060
-	cry2 CryDirectSound_565F2C
-	cry2 CryDirectSound_566684
-	cry2 CryDirectSound_567438
-	cry2 CryDirectSound_5684B8
-	cry2 CryDirectSound_5692D0
-	cry2 CryDirectSound_569FE4
-	cry2 CryDirectSound_56B0D0
-	cry2 CryDirectSound_56C100
-	cry2 CryDirectSound_56D344
-	cry2 CryDirectSound_56DBB0
-	cry2 CryDirectSound_56E8B8
-	cry2 CryDirectSound_56F8F4
-	cry2 CryDirectSound_570714
-	cry2 CryDirectSound_570F28
-	cry2 CryDirectSound_571F08
-	cry2 CryDirectSound_573010
-	cry2 CryDirectSound_573770
-	cry2 CryDirectSound_5744D0
-	cry2 CryDirectSound_575884
-	cry2 CryDirectSound_576804
-	cry2 CryDirectSound_5778C8
-	cry2 CryDirectSound_5790AC
-	cry2 CryDirectSound_579C4C
-	cry2 CryDirectSound_57A974
-	cry2 CryDirectSound_57BE10
-	cry2 CryDirectSound_57CCC4
-	cry2 CryDirectSound_57DA24
-	cry2 CryDirectSound_57EE2C
-	cry2 CryDirectSound_57FE0C
-	cry2 CryDirectSound_580A2C
-	cry2 CryDirectSound_583054
-	cry2 CryDirectSound_583EC8
-	cry2 CryDirectSound_58566C
-	cry2 CryDirectSound_586208
-	cry2 CryDirectSound_587904
-	cry2 CryDirectSound_588338
-	cry2 CryDirectSound_58958C
-	cry2 CryDirectSound_589EB0
-	cry2 CryDirectSound_58AF3C
-	cry2 CryDirectSound_58CD14
-	cry2 CryDirectSound_58DE2C
-	cry2 CryDirectSound_58F334
-	cry2 CryDirectSound_58FFDC
-	cry2 CryDirectSound_590CD0
-	cry2 CryDirectSound_5919B0
-	cry2 CryDirectSound_592440
-	cry2 CryDirectSound_593E84
-	cry2 CryDirectSound_594EB8
-	cry2 CryDirectSound_595E80
-	cry2 CryDirectSound_597688
-	cry2 CryDirectSound_598330
-	cry2 CryDirectSound_5996E0
-	cry2 CryDirectSound_59A4B8
-	cry2 CryDirectSound_59B008
-	cry2 CryDirectSound_59C12C
-	cry2 CryDirectSound_59D0E4
-	cry2 CryDirectSound_59E760
-	cry2 CryDirectSound_59F194
-	cry2 CryDirectSound_5A01BC
-	cry2 CryDirectSound_5A0F9C
-	cry2 CryDirectSound_5A1B50
-	cry2 CryDirectSound_5A25DC
-	cry2 CryDirectSound_5A344C
-	cry2 CryDirectSound_5A4328
-	cry2 CryDirectSound_5A53BC
-	cry2 CryDirectSound_5A652C
-	cry2 CryDirectSound_5A79A0
-	cry2 CryDirectSound_5A8BE8
-	cry2 CryDirectSound_5A9898
-	cry2 CryDirectSound_5AA108
-	cry2 CryDirectSound_5AB868
-	cry2 CryDirectSound_5ADE60
-	cry2 CryDirectSound_5AF4F4
-	cry2 CryDirectSound_5B036C
-	cry2 CryDirectSound_5B0BCC
-	cry2 CryDirectSound_5B168C
-	cry2 CryDirectSound_5B1FD8
-	cry2 CryDirectSound_5B2C34
+	cry2 Cry_Magikarp
+	cry2 Cry_Gyarados
+	cry2 Cry_Lapras
+	cry2 Cry_Ditto
+	cry2 Cry_Eevee
+	cry2 Cry_Vaporeon
+	cry2 Cry_Jolteon
+	cry2 Cry_Flareon
+	cry2 Cry_Porygon
+	cry2 Cry_Omanyte
+	cry2 Cry_Omastar
+	cry2 Cry_Kabuto
+	cry2 Cry_Kabutops
+	cry2 Cry_Aerodactyl
+	cry2 Cry_Snorlax
+	cry2 Cry_Articuno
+	cry2 Cry_Zapdos
+	cry2 Cry_Moltres
+	cry2 Cry_Dratini
+	cry2 Cry_Dragonair
+	cry2 Cry_Dragonite
+	cry2 Cry_Mewtwo
+	cry2 Cry_Mew
+	cry2 Cry_Chikorita
+	cry2 Cry_Bayleef
+	cry2 Cry_Meganium
+	cry2 Cry_Cyndaquil
+	cry2 Cry_Quilava
+	cry2 Cry_Typhlosion
+	cry2 Cry_Totodile
+	cry2 Cry_Croconaw
+	cry2 Cry_Feraligatr
+	cry2 Cry_Sentret
+	cry2 Cry_Furret
+	cry2 Cry_Hoothoot
+	cry2 Cry_Noctowl
+	cry2 Cry_Ledyba
+	cry2 Cry_Ledian
+	cry2 Cry_Spinarak
+	cry2 Cry_Ariados
+	cry2 Cry_Crobat
+	cry2 Cry_Chinchou
+	cry2 Cry_Lanturn
+	cry2 Cry_Pichu
+	cry2 Cry_Cleffa
+	cry2 Cry_Igglybuff
+	cry2 Cry_Togepi
+	cry2 Cry_Togetic
+	cry2 Cry_Natu
+	cry2 Cry_Xatu
+	cry2 Cry_Mareep
+	cry2 Cry_Flaaffy
+	cry2 Cry_Ampharos
+	cry2 Cry_Bellossom
+	cry2 Cry_Marill
+	cry2 Cry_Azumarill
+	cry2 Cry_Sudowoodo
+	cry2 Cry_Politoed
+	cry2 Cry_Hoppip
+	cry2 Cry_Skiploom
+	cry2 Cry_Jumpluff
+	cry2 Cry_Aipom
+	cry2 Cry_Sunkern
+	cry2 Cry_Sunflora
+	cry2 Cry_Yanma
+	cry2 Cry_Wooper
+	cry2 Cry_Quagsire
+	cry2 Cry_Espeon
+	cry2 Cry_Umbreon
+	cry2 Cry_Murkrow
+	cry2 Cry_Slowking
+	cry2 Cry_Misdreavus
+	cry2 Cry_Unown
+	cry2 Cry_Wobbuffet
+	cry2 Cry_Girafarig
+	cry2 Cry_Pineco
+	cry2 Cry_Forretress
+	cry2 Cry_Dunsparce
+	cry2 Cry_Gligar
+	cry2 Cry_Steelix
+	cry2 Cry_Snubbull
+	cry2 Cry_Granbull
+	cry2 Cry_Qwilfish
+	cry2 Cry_Scizor
+	cry2 Cry_Shuckle
+	cry2 Cry_Heracross
+	cry2 Cry_Sneasel
+	cry2 Cry_Teddiursa
+	cry2 Cry_Ursaring
+	cry2 Cry_Slugma
+	cry2 Cry_Magcargo
+	cry2 Cry_Swinub
+	cry2 Cry_Piloswine
+	cry2 Cry_Corsola
+	cry2 Cry_Remoraid
+	cry2 Cry_Octillery
+	cry2 Cry_Delibird
+	cry2 Cry_Mantine
+	cry2 Cry_Skarmory
+	cry2 Cry_Houndour
+	cry2 Cry_Houndoom
+	cry2 Cry_Kingdra
+	cry2 Cry_Phanpy
+	cry2 Cry_Donphan
+	cry2 Cry_Porygon2
+	cry2 Cry_Stantler
+	cry2 Cry_Smeargle
+	cry2 Cry_Tyrogue
+	cry2 Cry_Hitmontop
+	cry2 Cry_Smoochum
+	cry2 Cry_Elekid
+	cry2 Cry_Magby
+	cry2 Cry_Miltank
+	cry2 Cry_Blissey
+	cry2 Cry_Raikou
+	cry2 Cry_Entei
+	cry2 Cry_Suicune
+	cry2 Cry_Larvitar
+	cry2 Cry_Pupitar
+	cry2 Cry_Tyranitar
+	cry2 Cry_Lugia
+	cry2 Cry_HoOh
+	cry2 Cry_Celebi
+	cry2 Cry_Kecleon
+	cry2 Cry_Roselia
+	cry2 Cry_Torkoal
+	cry2 Cry_Electrike
+	cry2 Cry_Manectric
 
 	.align 2
 voicegroup_84543C0:: @ 84543C0
-	cry2 CryDirectSound_5B413C
-	cry2 CryDirectSound_5B4BD4
-	cry2 CryDirectSound_5B5804
-	cry2 CryDirectSound_5B65E4
-	cry2 CryDirectSound_5B7184
-	cry2 CryDirectSound_5B8890
-	cry2 CryDirectSound_5B9220
-	cry2 CryDirectSound_5B9C88
-	cry2 CryDirectSound_5BA220
-	cry2 CryDirectSound_5BAD3C
-	cry2 CryDirectSound_5BB690
-	cry2 CryDirectSound_5BBC90
-	cry2 CryDirectSound_5BC594
-	cry2 CryDirectSound_5BD744
-	cry2 CryDirectSound_5BE3B0
-	cry2 CryDirectSound_5BED58
-	cry2 CryDirectSound_5C0A2C
-	cry2 CryDirectSound_5C29AC
-	cry2 CryDirectSound_5C3554
-	cry2 CryDirectSound_5C49C8
-	cry2 CryDirectSound_5C63E4
-	cry2 CryDirectSound_5C6B68
-	cry2 CryDirectSound_5C7C6C
-	cry2 CryDirectSound_5C92EC
-	cry2 CryDirectSound_5C9EB4
-	cry2 CryDirectSound_5CAAF4
-	cry2 CryDirectSound_5CB79C
-	cry2 CryDirectSound_5CBFDC
-	cry2 CryDirectSound_5CC444
-	cry2 CryDirectSound_5CD2D8
-	cry2 CryDirectSound_5CE3A8
-	cry2 CryDirectSound_5CEBD4
-	cry2 CryDirectSound_5CF73C
-	cry2 CryDirectSound_5D0B00
-	cry2 CryDirectSound_5D1514
-	cry2 CryDirectSound_5D1DE0
-	cry2 CryDirectSound_5D2E0C
-	cry2 CryDirectSound_5D3644
-	cry2 CryDirectSound_5D4688
-	cry2 CryDirectSound_5D5334
-	cry2 CryDirectSound_5D5D50
-	cry2 CryDirectSound_5D6980
-	cry2 CryDirectSound_5D81E4
-	cry2 CryDirectSound_5D8A68
-	cry2 CryDirectSound_5D98C0
-	cry2 CryDirectSound_5DA2AC
-	cry2 CryDirectSound_5DA91C
-	cry2 CryDirectSound_5DB544
-	cry2 CryDirectSound_5DBCFC
-	cry2 CryDirectSound_5DC458
-	cry2 CryDirectSound_5DD510
-	cry2 CryDirectSound_5DE274
-	cry2 CryDirectSound_5DF758
-	cry2 CryDirectSound_5E0054
-	cry2 CryDirectSound_5E105C
-	cry2 CryDirectSound_5E1ADC
-	cry2 CryDirectSound_5E2E90
-	cry2 CryDirectSound_5E35A4
-	cry2 CryDirectSound_5E4ABC
-	cry2 CryDirectSound_5E52C0
-	cry2 CryDirectSound_5E6420
-	cry2 CryDirectSound_5E6D6C
-	cry2 CryDirectSound_5E848C
-	cry2 CryDirectSound_5E8DC8
-	cry2 CryDirectSound_5E9EC4
-	cry2 CryDirectSound_5EAAC8
-	cry2 CryDirectSound_5EC380
-	cry2 CryDirectSound_5ECAC0
-	cry2 CryDirectSound_5ED760
-	cry2 CryDirectSound_5EE184
-	cry2 CryDirectSound_5EEF88
-	cry2 CryDirectSound_5F0990
-	cry2 CryDirectSound_5F1280
-	cry2 CryDirectSound_5F2930
-	cry2 CryDirectSound_5F35B4
-	cry2 CryDirectSound_5F4914
-	cry2 CryDirectSound_5F6110
-	cry2 CryDirectSound_5F713C
-	cry2 CryDirectSound_5F7910
-	cry2 CryDirectSound_5FA054
-	cry2 CryDirectSound_5FAAD0
-	cry2 CryDirectSound_5FB2F0
-	cry2 CryDirectSound_5FC374
-	cry2 CryDirectSound_5FC928
-	cry2 CryDirectSound_5FD500
-	cry2 CryDirectSound_5FF94C
-	cry2 CryDirectSound_600B9C
-	cry2 CryDirectSound_601B84
-	cry2 CryDirectSound_6031F0
-	cry2 CryDirectSound_603B98
-	cry2 CryDirectSound_6058C8
-	cry2 CryDirectSound_606480
-	cry2 CryDirectSound_607B54
-	cry2 CryDirectSound_6084F4
-	cry2 CryDirectSound_6097C8
-	cry2 CryDirectSound_60BF40
-	cry2 CryDirectSound_60C714
-	cry2 CryDirectSound_60DB1C
-	cry2 CryDirectSound_60FAF8
-	cry2 CryDirectSound_611AF8
-	cry2 CryDirectSound_6131FC
-	cry2 CryDirectSound_613E94
-	cry2 CryDirectSound_614A1C
-	cry2 CryDirectSound_615B34
-	cry2 CryDirectSound_61647C
-	cry2 CryDirectSound_617808
-	cry2 CryDirectSound_6185C0
-	cry2 CryDirectSound_619164
-	cry2 CryDirectSound_619CE4
-	cry2 CryDirectSound_61A610
-	cry2 CryDirectSound_61BAE8
-	cry2 CryDirectSound_61D48C
-	cry2 CryDirectSound_61E8BC
-	cry2 CryDirectSound_61ED98
-	cry2 CryDirectSound_6212A4
-	cry2 CryDirectSound_62365C
-	cry2 CryDirectSound_625388
-	cry2 CryDirectSound_626CA4
-	cry2 CryDirectSound_627964
-	cry2 CryDirectSound_62823C
-	cry2 CryDirectSound_62A0D8
-	cry2 CryDirectSound_62C19C
-	cry2 CryDirectSound_62DDFC
-	cry2 CryDirectSound_62E98C
-	cry2 CryDirectSound_6305D4
-	cry2 CryDirectSound_6312FC
-	cry2 CryDirectSound_633D0C
-	cry2 CryDirectSound_634530
+	cry2 Cry_Duskull
+	cry2 Cry_Latias
+	cry2 Cry_Wynaut
+	cry2 Cry_Seviper
+	cry2 Cry_Sharpedo
+	cry2 Cry_Zangoose
+	cry2 Cry_Azurill
+	cry2 Cry_Swablu
+	cry2 Cry_Altaria
+	cry2 Cry_Unused265
+	cry2 Cry_Taillow
+	cry2 Cry_Swellow
+	cry2 Cry_Unused268
+	cry2 Cry_Spinda
+	cry2 Cry_Torchic
+	cry2 Cry_Combusken
+	cry2 Cry_Blaziken
+	cry2 Cry_Treecko
+	cry2 Cry_Grovyle
+	cry2 Cry_Sceptile
+	cry2 Cry_Mudkip
+	cry2 Cry_Marshtomp
+	cry2 Cry_Swampert
+	cry2 Cry_Pelipper
+	cry2 Cry_Wingull
+	cry2 Cry_Banette
+	cry2 Cry_Shuppet
+	cry2 Cry_Lotad
+	cry2 Cry_Lombre
+	cry2 Cry_Ludicolo
+	cry2 Cry_Seedot
+	cry2 Cry_Nuzleaf
+	cry2 Cry_Shiftry
+	cry2 Cry_Carvanha
+	cry2 Cry_Wurmple
+	cry2 Cry_Silcoon
+	cry2 Cry_Beautifly
+	cry2 Cry_Cascoon
+	cry2 Cry_Dustox
+	cry2 Cry_Ralts
+	cry2 Cry_Kirlia
+	cry2 Cry_Gardevoir
+	cry2 Cry_Slakoth
+	cry2 Cry_Vigoroth
+	cry2 Cry_Slaking
+	cry2 Cry_Nincada
+	cry2 Cry_Ninjask
+	cry2 Cry_Shedinja
+	cry2 Cry_Makuhita
+	cry2 Cry_Hariyama
+	cry2 Cry_Nosepass
+	cry2 Cry_Glalie
+	cry2 Cry_Plusle
+	cry2 Cry_Minun
+	cry2 Cry_Surskit
+	cry2 Cry_Masquerain
+	cry2 Cry_Skitty
+	cry2 Cry_Delcatty
+	cry2 Cry_Gulpin
+	cry2 Cry_Swalot
+	cry2 Cry_Numel
+	cry2 Cry_Camerupt
+	cry2 Cry_Barboach
+	cry2 Cry_Whiscash
+	cry2 Cry_Corphish
+	cry2 Cry_Crawdaunt
+	cry2 Cry_Spoink
+	cry2 Cry_Grumpig
+	cry2 Cry_Trapinch
+	cry2 Cry_Vibrava
+	cry2 Cry_Flygon
+	cry2 Cry_Cacnea
+	cry2 Cry_Cacturne
+	cry2 Cry_Baltoy
+	cry2 Cry_Claydol
+	cry2 Cry_Lunatone
+	cry2 Cry_Solrock
+	cry2 Cry_Feebas
+	cry2 Cry_Milotic
+	cry2 Cry_Absol
+	cry2 Cry_Meditite
+	cry2 Cry_Medicham
+	cry2 Cry_Spheal
+	cry2 Cry_Sealeo
+	cry2 Cry_Walrein
+	cry2 Cry_Clamperl
+	cry2 Cry_Huntail
+	cry2 Cry_Gorebyss
+	cry2 Cry_Lileep
+	cry2 Cry_Cradily
+	cry2 Cry_Anorith
+	cry2 Cry_Armaldo
+	cry2 Cry_Beldum
+	cry2 Cry_Metang
+	cry2 Cry_Metagross
+	cry2 Cry_Bagon
+	cry2 Cry_Shelgon
+	cry2 Cry_Regirock
+	cry2 Cry_Regice
+	cry2 Cry_Registeel
+	cry2 Cry_Castform
+	cry2 Cry_Volbeat
+	cry2 Cry_Illumise
+	cry2 Cry_Poochyena
+	cry2 Cry_Mightyena
+	cry2 Cry_Dusclops
+	cry2 Cry_Sableye
+	cry2 Cry_Mawile
+	cry2 Cry_Aron
+	cry2 Cry_Lairon
+	cry2 Cry_Aggron
+	cry2 Cry_Relicanth
+	cry2 Cry_Luvdisc
+	cry2 Cry_Groudon
+	cry2 Cry_Kyogre
+	cry2 Cry_Rayquaza
+	cry2 Cry_Salamence
+	cry2 Cry_Breloom
+	cry2 Cry_Shroomish
+	cry2 Cry_Linoone
+	cry2 Cry_Tropius
+	cry2 Cry_Wailmer
+	cry2 Cry_Zigzagoon
+	cry2 Cry_Exploud
+	cry2 Cry_Loudred
+	cry2 Cry_Wailord
+	cry2 Cry_Whismur
+	cry2 Cry_Snorunt
 
 	.align 2
 voicegroup_84549C0:: @ 84549C0
-	cry2 CryDirectSound_635638
-	cry2 CryDirectSound_636C30
-	cry2 CryDirectSound_6379B4
-	cry2 CryDirectSound_638E88
+	cry2 Cry_Latios
+	cry2 Cry_Jirachi
+	cry2 Cry_Deoxys
+	cry2 Cry_Chimecho
 
 	.align 2
 voicegroup_84549F0:: @ 84549F0
diff --git a/tools/aif2pcm/main.c b/tools/aif2pcm/main.c
index dd2d368a5..41b413d4b 100644
--- a/tools/aif2pcm/main.c
+++ b/tools/aif2pcm/main.c
@@ -52,43 +52,94 @@ typedef struct {
 	unsigned long num_samples;
 	uint8_t *samples;
 	uint8_t midi_note;
+	bool has_loop;
 	unsigned long loop_offset;
 	double sample_rate;
 } AifData;
 
+struct Bytes {
+	unsigned long length;
+	uint8_t *data;
+};
 
-char * get_file_extension(char *filename)
+struct Bytes *read_bytearray(const char *filename)
 {
-	char *dot = strrchr(filename, '.');
-	if (!dot || dot == filename)
+	struct Bytes *bytes = malloc(sizeof(struct Bytes));
+	FILE *f = fopen(filename, "rb");
+	if (!f)
 	{
-		FATAL_ERROR("Input file has no file extension.\n");
+		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);
+}
 
-	return dot + 1;
+void free_bytearray(struct Bytes *bytes)
+{
+	free(bytes->data);
+	free(bytes);
 }
 
-void change_file_extension(char *filename, const char *new_extension)
+char *get_file_extension(char *filename)
 {
-	char *dot = strrchr(filename, '.');
-	if (!dot || dot == filename)
+	char *index = strrchr(filename, '.');
+	if (!index || index == filename)
 	{
-		FATAL_ERROR("Input file has no file extension.\n");
+		return NULL;
 	}
+	return index + 1;
+}
 
-	memcpy(dot + 1, new_extension, 3);
+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;
 }
 
-AifData *read_aif(uint8_t * aif_file_data, unsigned long aif_file_data_size)
+AifData *read_aif(struct Bytes *aif)
 {
 	AifData *aif_data = (AifData *)malloc(sizeof(AifData));
+	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_file_data + pos, 4);
+	memcpy(chunk_name, &aif->data[pos], 4);
 	pos += 4;
 	if (strcmp(chunk_name, "FORM") != 0)
 	{
@@ -96,19 +147,19 @@ AifData *read_aif(uint8_t * aif_file_data, unsigned long aif_file_data_size)
 	}
 
 	// Read size of whole file.
-	unsigned long whole_chunk_size = aif_file_data[pos++] << 24;
-	whole_chunk_size |= (aif_file_data[pos++] << 16);
-	whole_chunk_size |= (aif_file_data[pos++] <<  8);
-	whole_chunk_size |= (uint8_t)aif_file_data[pos++];
+	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_file_data_size - 8;
+	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_file_data + pos, 4);
+	memcpy(chunk_type, &aif->data[pos], 4);
 	pos += 4;
 	if (strcmp(chunk_type, "AIFF") != 0)
 	{
@@ -118,44 +169,44 @@ AifData *read_aif(uint8_t * aif_file_data, unsigned long aif_file_data_size)
 	unsigned long num_sample_frames = 0;
 
 	// Read all the Chunks to populate the AifData struct.
-	while ((pos + 8) < aif_file_data_size)
+	while ((pos + 8) < aif->length)
 	{
 		// Read Chunk id
-		memcpy(chunk_name, aif_file_data + pos, 4);
+		memcpy(chunk_name, &aif->data[pos], 4);
 		pos += 4;
 
-		unsigned long chunk_size = (aif_file_data[pos++] << 24);
-		chunk_size |= (aif_file_data[pos++] << 16);
-		chunk_size |= (aif_file_data[pos++] <<  8);
-		chunk_size |=  aif_file_data[pos++];
+		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_file_data_size)
+		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_file_data[pos++] << 8);
-			num_channels |= (uint8_t)aif_file_data[pos++];
+			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_file_data[pos++] << 24);
-			num_sample_frames |= (aif_file_data[pos++] << 16);
-			num_sample_frames |= (aif_file_data[pos++] <<  8);
-			num_sample_frames |=  (uint8_t)aif_file_data[pos++];
+			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++];
 
-			short sample_size = (aif_file_data[pos++] << 8);
-			sample_size |= (uint8_t)aif_file_data[pos++];
+			short sample_size = (aif->data[pos++] << 8);
+			sample_size |= (uint8_t)aif->data[pos++];
 			if (sample_size != 8)
 			{
 				FATAL_ERROR("sampleSize (%d) in the COMM Chunk must be 8!\n", sample_size);
 			}
 
-			double sample_rate = ieee754_read_extended((uint8_t*)(aif_file_data + pos));
+			double sample_rate = ieee754_read_extended((uint8_t*)(aif->data + pos));
 			pos += 10;
 
 			aif_data->sample_rate = sample_rate;
@@ -167,32 +218,31 @@ AifData *read_aif(uint8_t * aif_file_data, unsigned long aif_file_data_size)
 		}
 		else if (strcmp(chunk_name, "MARK") == 0)
 		{
-			unsigned short num_markers = (aif_file_data[pos++] << 8);
-			num_markers |= (uint8_t)aif_file_data[pos++];
-
-			unsigned long loop_start = 0;
+			unsigned short num_markers = (aif->data[pos++] << 8);
+			num_markers |= (uint8_t)aif->data[pos++];
 
 			// Read each marker and look for the "START" marker.
 			for (int i = 0; i < num_markers; i++)
 			{
-				unsigned short marker_id = (aif_file_data[pos++] << 8);
-				marker_id |= (uint8_t)aif_file_data[pos++];
+				unsigned short marker_id = (aif->data[pos++] << 8);
+				marker_id |= (uint8_t)aif->data[pos++];
 
-				unsigned long marker_position = (aif_file_data[pos++] << 24);
-				marker_position |= (aif_file_data[pos++] << 16);
-				marker_position |= (aif_file_data[pos++] << 8);
-				marker_position |=  (uint8_t)aif_file_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 id is a pascal-style string.
-				uint8_t marker_name_size = aif_file_data[pos++];
+				uint8_t marker_name_size = aif->data[pos++];
 				char *marker_name = (char *)malloc((marker_name_size + 1) * sizeof(char));
-				memcpy(marker_name, aif_file_data + pos, marker_name_size);
+				memcpy(marker_name, &aif->data[pos], marker_name_size);
 				marker_name[marker_name_size] = '\0';
 				pos += marker_name_size;
 
 				if (strcmp(marker_name, "START") == 0)
 				{
-					loop_start = marker_position;
+					aif_data->loop_offset = marker_position;
+					aif_data->has_loop = true;
 				}
 				else if (strcmp(marker_name, "END") == 0)
 				{
@@ -201,12 +251,10 @@ AifData *read_aif(uint8_t * aif_file_data, unsigned long aif_file_data_size)
 
 				free(marker_name);
 			}
-
-			aif_data->loop_offset = loop_start;
 		}
 		else if (strcmp(chunk_name, "INST") == 0)
 		{
-			uint8_t midi_note = (uint8_t)aif_file_data[pos++];
+			uint8_t midi_note = (uint8_t)aif->data[pos++];
 
 			aif_data->midi_note = midi_note;
 
@@ -218,15 +266,16 @@ AifData *read_aif(uint8_t * aif_file_data, unsigned long aif_file_data_size)
 			// SKip offset and blockSize
 			pos += 8;
 
-			uint8_t *sample_data = (uint8_t *)malloc(num_sample_frames * sizeof(uint8_t));
-			memcpy(sample_data, aif_file_data + pos, num_sample_frames);
+			unsigned long num_samples = chunk_size - 8;
+			uint8_t *sample_data = (uint8_t *)malloc(num_samples * sizeof(uint8_t));
+			memcpy(sample_data, &aif->data[pos], num_samples);
 
 			aif_data->samples = sample_data;
-			pos += num_sample_frames;
+			pos += chunk_size - 8;
 		}
 		else
 		{
-			// Skip over stuff we unsupported chunks.
+			// Skip over unsupported chunks.
 			pos += chunk_size;
 		}
 	}
@@ -234,368 +283,583 @@ AifData *read_aif(uint8_t * aif_file_data, unsigned long aif_file_data_size)
 	return aif_data;
 }
 
-// Reads an .aif file and produces a .pcm file containing an array of 8-bit samples.
-void aif2pcm(const char *aif_filename)
-{
-	// Get .pcm filename.
-	char *pcm_filename = malloc(strlen(aif_filename) + 1);
+// This is a table of deltas between sample values in compressed PCM data.
+const int8_t gDeltaEncodingTable[] = {
+	0, 1, 4, 9, 16, 25, 36, 49,
+	-64, -49, -36, -25, -16, -9, -4, -1,
+};
 
-	if (!pcm_filename)
+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)
 	{
-		FATAL_ERROR("Failed to allocate space for pcm filename.\n");
+		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;
+		}
 	}
 
-	strcpy(pcm_filename, aif_filename);
-	change_file_extension(pcm_filename, "pcm");
+	pcm->length = j;
+	return pcm;
+}
 
-	// Get .metadata filename.
-	char *metadata_filename = malloc(strlen(aif_filename) + 1);
+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;
 
-	if (!metadata_filename)
+	int extra = pcm->length % 64;
+	if (extra)
+	{
+		delta->length += 1;
+		extra -= 1;
+	}
+	if (extra)
 	{
-		FATAL_ERROR("Failed to allocate space for metadata filename.\n");
+		delta->length += 1;
+		extra -= 1;
+	}
+	if (extra)
+	{
+		delta->length += (extra + 1) / 2;
 	}
 
-	strcpy(metadata_filename, aif_filename);
-	change_file_extension(metadata_filename, "bin");
+	delta->data = malloc(delta->length + 33);
 
-	// Open the given .aif file so we can read its contents.
-	FILE *aif_file;
-	aif_file = fopen(aif_filename, "rb");
-	if (!aif_file)
+	uint8_t hi, lo;
+	unsigned int i = 0;
+	unsigned int j = 0;
+	int k;
+	int l;
+	int8_t base;
+	int8_t diff;
+	while (i < pcm->length)
 	{
-		FATAL_ERROR("Failed to open '%s' for reading!\n", aif_filename);
+		base = (int8_t)pcm->data[i++];
+		delta->data[j++] = (uint8_t)base;
+		if (i >= pcm->length)
+		{
+			break;
+		}
+		hi = 0;
+		diff = pcm->data[i++] - base;
+		if (diff > 49)
+		{
+			diff = -diff;
+		}
+		if (diff < 0)
+		{
+			for (l = 8; l < 16; l++)
+			{
+				lo = l & 0xf;
+				if (diff <= gDeltaEncodingTable[l]) break;
+			}
+		}
+		else
+		{
+			for (l = 0; l < 8; l++)
+			{
+				lo = l & 0xf;
+				if (diff <= gDeltaEncodingTable[l]) break;
+			}
+		}
+		base += diff;
+		delta->data[j++] = (hi << 4) | lo;
+		if (i >= pcm->length)
+		{
+			break;
+		}
+		for (k = 0; k < 31; k++)
+		{
+			diff = pcm->data[i++] - base;
+			if (diff > 49) diff = -diff;
+			if (diff < 0)
+			{
+				for (l = 8; l < 16; l++)
+				{
+					hi = l & 0xf;
+					if (diff <= gDeltaEncodingTable[l]) break;
+				}
+			}
+			else
+			{
+				for (l = 0; l < 8; l++)
+				{
+					hi = l & 0xf;
+					if (diff <= gDeltaEncodingTable[l]) break;
+				}
+			}
+			base += diff;
+			delta->data[j] = (hi << 4);
+			if (i >= pcm->length)
+			{
+				break;
+			}
+			diff = pcm->data[i++] - base;
+			if (diff > 49) diff = -diff;
+			if (diff < 0)
+			{
+				for (l = 8; l < 16; l++)
+				{
+					lo = l & 0xf;
+					if (diff <= gDeltaEncodingTable[l]) break;
+				}
+			}
+			else
+			{
+				for (l = 0; l < 8; l++)
+				{
+					lo = l & 0xf;
+					if (diff <= gDeltaEncodingTable[l]) break;
+				}
+			}
+			base += diff;
+			delta->data[j++] = (hi << 4) | lo;
+			if (i >= pcm->length)
+			{
+				break;
+			}
+		}
+		if (i >= pcm->length)
+		{
+			break;
+		}
 	}
 
-	// Get file length.
-	fseek(aif_file, 0, SEEK_END);
-	unsigned long aif_file_length = ftell(aif_file);
-	fseek(aif_file, 0, SEEK_SET);
+	delta->length = j;
+
+	return delta;
+}
 
-	// Create buffer for samples.
-	uint8_t *aif_file_data = (uint8_t *)malloc(aif_file_length * sizeof(uint8_t));
-	if (!aif_file_data)
+#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 = read_aif(aif);
+
+	int header_size = 0x10;
+	struct Bytes *pcm;
+	struct Bytes output = {0};
+
+	if (compress)
 	{
-		FATAL_ERROR("Failed to allocate buffer for aif file data!\n");
+		struct Bytes *input = malloc(sizeof(struct Bytes));
+		input->data = aif_data->samples;
+		input->length = aif_data->num_samples;
+		pcm = delta_compress(input);
+		free(input);
 	}
-
-	// Populate buffer from file.
-	unsigned long read = fread(aif_file_data, aif_file_length, 1, aif_file);
-	fclose(aif_file);
-	if (read <= 0)
+	else
 	{
-		FATAL_ERROR("Failed to read data from '%s'!\n", aif_filename);
+		pcm = malloc(sizeof(struct Bytes));
+		pcm->data = aif_data->samples;
+		pcm->length = aif_data->num_samples;
 	}
+	output.length = header_size + pcm->length;
+	output.data = malloc(output.length);
 
-	AifData *aif_data = read_aif(aif_file_data, aif_file_length);
-
-	// Write the output .pcm file
-	FILE *pcm_file;
-	pcm_file = fopen(pcm_filename, "wb");
-	fwrite(aif_data->samples, aif_data->num_samples, 1, pcm_file);
-	fclose(pcm_file);
-
-	// Write the output .bin file containing .aif metadata.
-	FILE *metadata_file;
-	metadata_file = fopen(metadata_filename, "wb");
 	uint32_t pitch_adjust = (uint32_t)(aif_data->sample_rate * 1024);
-	fwrite(&pitch_adjust, sizeof(uint32_t), 1, metadata_file);
-	fwrite(&(aif_data->loop_offset), sizeof(uint32_t), 1, metadata_file);
+	uint32_t loop_offset = (uint32_t)(aif_data->loop_offset);
 	uint32_t adjusted_num_samples = (uint32_t)(aif_data->num_samples - 1);
-	fwrite(&adjusted_num_samples, sizeof(uint32_t), 1, metadata_file);
-	fclose(metadata_file);
-
+	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->samples);
 	free(aif_data);
-	free(aif_file_data);
-	free(metadata_filename);
-	free(pcm_filename);
 }
 
 // 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, char base_note, long pitch_adjust, long loop_start)
+void pcm2aif(const char *pcm_filename, const char *aif_filename, uint32_t base_note)
 {
-	// Get .aif filename.
-	char *aif_filename = malloc(strlen(pcm_filename) + 1);
+	struct Bytes *pcm = read_bytearray(pcm_filename);
 
-	if (!aif_filename)
-	{
-		FATAL_ERROR("Failed to allocate space for aif filename.\n");
-	}
+	AifData *aif_data = malloc(sizeof(AifData));
 
-	strcpy(aif_filename, pcm_filename);
-	change_file_extension(aif_filename, "aif");
+	uint32_t flags;
+	LOAD_U32_LE(flags, pcm->data + 0);
+	aif_data->has_loop = flags & 0x40000000;
+	bool compressed = flags & 1;
 
-	// Open the given .pcm file so we can read its 8-bit samples.
-	FILE *pcm_file;
-	pcm_file = fopen(pcm_filename, "rb");
-	if (!pcm_file)
-	{
-		FATAL_ERROR("Failed to open '%s' for reading!\n", pcm_filename);
-	}
+	uint32_t pitch_adjust;
+	LOAD_U32_LE(pitch_adjust, pcm->data + 4);
+	aif_data->sample_rate = pitch_adjust / 1024.0;
 
-	// Get file length.
-	fseek(pcm_file, 0, SEEK_END);
-	unsigned long num_samples = ftell(pcm_file);
-	fseek(pcm_file, 0, SEEK_SET);
+	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;
 
-	unsigned long num_samples_extended = num_samples * 1;
-
-	// Create buffer for samples.
-	signed char *pcm_samples = (signed char *)malloc(num_samples_extended * sizeof(signed char));
-	if (!pcm_samples)
+	if (compressed)
 	{
-		FATAL_ERROR("Failed to allocate buffer for pcm samples!\n");
+		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);
 	}
-
-	// Populate buffer from file.
-	unsigned long read = fread(pcm_samples, num_samples, 1, pcm_file);
-	fclose(pcm_file);
-	if (read <= 0)
+	else
 	{
-		FATAL_ERROR("Failed to read data from '%s'!\n", pcm_filename);
+		pcm->length -= 0x10;
+		pcm->data += 0x10;
 	}
 
-	// Allocate buffer for output .aif file.
-	unsigned long aif_file_size = 54 + 60 + num_samples_extended;
-	char *aif_buffer = (char *)malloc(aif_file_size * sizeof(char));
-	if (!aif_buffer)
-	{
-		FATAL_ERROR("Failed to allocate buffer for aif file!\n");
-	}
+	aif_data->samples = malloc(pcm->length);
+	memcpy(aif_data->samples, pcm->data, pcm->length);
+
+	struct Bytes *aif = malloc(sizeof(struct Bytes));
+	aif->length = 54 + 60 + aif_data->num_samples;
+	aif->data = malloc(aif->length);
 
 	long pos = 0;
 
 	// First, write the FORM header chunk.
 	// FORM Chunk ckID
-	aif_buffer[pos++] = 'F';
-	aif_buffer[pos++] = 'O';
-	aif_buffer[pos++] = 'R';
-	aif_buffer[pos++] = 'M';
+	aif->data[pos++] = 'F';
+	aif->data[pos++] = 'O';
+	aif->data[pos++] = 'R';
+	aif->data[pos++] = 'M';
 
 	// FORM Chunk ckSize
-	unsigned long data_size = aif_file_size - 8;
-	aif_buffer[pos++] = ((data_size >> 24) & 0xFF);
-	aif_buffer[pos++] = ((data_size >> 16) & 0xFF);
-	aif_buffer[pos++] = ((data_size >>  8) & 0xFF);
-	aif_buffer[pos++] = (data_size & 0xFF);
+	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_buffer[pos++]  = 'A';
-	aif_buffer[pos++]  = 'I';
-	aif_buffer[pos++] = 'F';
-	aif_buffer[pos++] = 'F';
+	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_buffer[pos++] = 'C';
-	aif_buffer[pos++] = 'O';
-	aif_buffer[pos++] = 'M';
-	aif_buffer[pos++] = 'M';
+	aif->data[pos++] = 'C';
+	aif->data[pos++] = 'O';
+	aif->data[pos++] = 'M';
+	aif->data[pos++] = 'M';
 
 	// Common Chunk ckSize
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 18;
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 18;
 
 	// Common Chunk numChannels
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 1;  // 1 channel
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 1;  // 1 channel
 
 	// Common Chunk numSampleFrames
-	aif_buffer[pos++] = ((num_samples_extended >> 24) & 0xFF);
-	aif_buffer[pos++] = ((num_samples_extended >> 16) & 0xFF);
-	aif_buffer[pos++] = ((num_samples_extended >> 8)  & 0xFF);
-	aif_buffer[pos++] = (num_samples_extended & 0xFF);
+	aif->data[pos++] = ((pcm->length >> 24) & 0xFF);
+	aif->data[pos++] = ((pcm->length >> 16) & 0xFF);
+	aif->data[pos++] = ((pcm->length >> 8)  & 0xFF);
+	aif->data[pos++] = (pcm->length & 0xFF);
 
 	// Common Chunk sampleSize
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 8;  // 8 bits per sample
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 8;  // 8 bits per sample
 
 	// Common Chunk sampleRate
-	double sample_rate = pitch_adjust / 1024.0;
+	//double sample_rate = pitch_adjust / 1024.0;
 	uint8_t sample_rate_buffer[10];
-	ieee754_write_extended(sample_rate, sample_rate_buffer);
+	ieee754_write_extended(aif_data->sample_rate, sample_rate_buffer);
 	for (int i = 0; i < 10; i++)
 	{
-		aif_buffer[pos++] = sample_rate_buffer[i];
+		aif->data[pos++] = sample_rate_buffer[i];
 	}
 
 	// Marker Chunk ckID
-	aif_buffer[pos++] = 'M';
-	aif_buffer[pos++] = 'A';
-	aif_buffer[pos++] = 'R';
-	aif_buffer[pos++] = 'K';
+	aif->data[pos++] = 'M';
+	aif->data[pos++] = 'A';
+	aif->data[pos++] = 'R';
+	aif->data[pos++] = 'K';
 
 	// Marker Chunk ckSize
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 24;
+	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_buffer[pos++] = 0;
-	aif_buffer[pos++] = 2;
-
-	// Marker loop start
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 1;  // id = 1
-
-	aif_buffer[pos++] = ((loop_start >> 24) & 0xFF);
-	aif_buffer[pos++] = ((loop_start >> 16) & 0xFF);
-	aif_buffer[pos++] = ((loop_start >> 8)  & 0xFF);
-	aif_buffer[pos++] = (loop_start & 0xFF);  // position
+	aif->data[pos++] = 0;
+	aif->data[pos++] = (aif_data->has_loop ? 2 : 1);
 
-	aif_buffer[pos++] = 5;  // pascal-style string length
-	aif_buffer[pos++] = 'S';
-	aif_buffer[pos++] = 'T';
-	aif_buffer[pos++] = 'A';
-	aif_buffer[pos++] = 'R';
-	aif_buffer[pos++] = 'T';  // markerName
+	if (aif_data->has_loop)
+	{
+		// 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_buffer[pos++] = 0;
-	aif_buffer[pos++] = 2;  // id = 2
+	aif->data[pos++] = 0;
+	aif->data[pos++] = (aif_data->has_loop ? 2 : 1);  // id = 2
 
-	long loop_end = num_samples;
-	aif_buffer[pos++] = ((loop_end >> 24) & 0xFF);
-	aif_buffer[pos++] = ((loop_end >> 16) & 0xFF);
-	aif_buffer[pos++] = ((loop_end >> 8)  & 0xFF);
-	aif_buffer[pos++] = (loop_end & 0xFF);  // position
-
-	aif_buffer[pos++] = 3;  // pascal-style string length
-	aif_buffer[pos++] = 'E';
-	aif_buffer[pos++] = 'N';
-	aif_buffer[pos++] = 'D';
+	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_buffer[pos++] = 'I';
-	aif_buffer[pos++] = 'N';
-	aif_buffer[pos++] = 'S';
-	aif_buffer[pos++] = 'T';
+	aif->data[pos++] = 'I';
+	aif->data[pos++] = 'N';
+	aif->data[pos++] = 'S';
+	aif->data[pos++] = 'T';
 
 	// Instrument Chunk ckSize
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 20;
-
-	aif_buffer[pos++] = base_note;  // baseNote
-	aif_buffer[pos++] = 0;          // detune
-	aif_buffer[pos++] = 0;          // lowNote
-	aif_buffer[pos++] = 127;        // highNote
-	aif_buffer[pos++] = 1;          // lowVelocity
-	aif_buffer[pos++] = 127;        // highVelocity
-	aif_buffer[pos++] = 0;          // gain (hi)
-	aif_buffer[pos++] = 0;          // gain (lo)
+	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_buffer[pos++] = 0;
-	aif_buffer[pos++] = 1; // playMode = ForwardLooping
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 1; // playMode = ForwardLooping
 
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 1;  // beginLoop marker id
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 1;  // beginLoop marker id
 
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 2;  // endLoop marker id
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 2;  // endLoop marker id
 
 		// Instrument Chunk releaseLoop
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 1; // playMode = ForwardLooping
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 1; // playMode = ForwardLooping
 
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 1;  // beginLoop marker id
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 1;  // beginLoop marker id
 
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 2;  // endLoop marker id
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 2;  // endLoop marker id
 
 	// Finally, write the Sound Data Chunk
 	// Sound Data Chunk ckID
-	aif_buffer[pos++] = 'S';
-	aif_buffer[pos++] = 'S';
-	aif_buffer[pos++] = 'N';
-	aif_buffer[pos++] = 'D';
+	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 = num_samples_extended + 8;
-	aif_buffer[pos++] = ((sound_data_size >> 24) & 0xFF);
-	aif_buffer[pos++] = ((sound_data_size >> 16) & 0xFF);
-	aif_buffer[pos++] = ((sound_data_size >> 8)  & 0xFF);
-	aif_buffer[pos++] = (sound_data_size & 0xFF);
+	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_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 0;
 
 	// Sound Data Chunk blockSize
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
-	aif_buffer[pos++] = 0;
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 0;
+	aif->data[pos++] = 0;
 
 	// Sound Data Chunk soundData
-	for (int i = 0; i < loop_start; i++)
+	for (unsigned int i = 0; i < aif_data->loop_offset; i++)
 	{
-		aif_buffer[pos++] = pcm_samples[i];
+		aif->data[pos++] = aif_data->samples[i];
 	}
 
 	int j = 0;
-	for (unsigned int i = loop_start; i < num_samples_extended; i++)
+	for (unsigned int i = aif_data->loop_offset; i < pcm->length; i++)
 	{
-		int pcm_index = loop_start + (j++ % (num_samples - loop_start - 1));
-		aif_buffer[pos++] = pcm_samples[pcm_index];
+		int pcm_index = aif_data->loop_offset + (j++ % (pcm->length - aif_data->loop_offset));
+		aif->data[pos++] = aif_data->samples[pcm_index];
 	}
 
-	// Write the .aif file contents.
-	FILE *aif_file;
-	aif_file = fopen(aif_filename, "wb");
-	if (!aif_file)
-	{
-		FATAL_ERROR("Failed to open '%s' for writing!\n", aif_filename);
-	}
+	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);
 
-	fwrite(aif_buffer, 1, aif_file_size, aif_file);
-	fclose(aif_file);
+	write_bytearray(aif_filename, aif);
+
+	free(aif->data);
+	free(aif);
+}
 
-	free(aif_buffer);
-	free(pcm_samples);
-	free(aif_filename);
+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)
 	{
-		FATAL_ERROR("Usage: aif2pcm <aif_file>\n");
+		usage();
+		exit(1);
 	}
 
-	char *input_filename = argv[1];
-	char *extension = get_file_extension(input_filename);
+	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)
 	{
-		aif2pcm(input_filename);
+		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, "pcm") == 0)
+	else if (strcmp(extension, "bin") == 0)
 	{
-		if (argc < 5)
+		if (argc >= 3)
 		{
-			FATAL_ERROR("Usage: aif2pcm <pcm_file> <midi_note> <pitch_adjust> <loop_start>\n");
+			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);
 		}
-
-		char base_note = atoi(argv[2]);
-		long pitch_adjust = atol(argv[3]);
-		long loop_start = atol(argv[4]);
-		pcm2aif(input_filename, base_note, pitch_adjust, loop_start);
 	}
 	else
 	{
-		FATAL_ERROR("Input file must be .aif or .pcm: '%s'\n", input_filename);
+		FATAL_ERROR("Input file must be .aif or .bin: '%s'\n", input_file);
 	}
 
 	return 0;