Merge branch 'master' into contest_link_80C2020

519 files changed, 1334 insertions, 1384 deletions

diff --git a/Makefile b/Makefile
index eda7fb2c2..91abef07a 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ ifeq ($(COMPARE),1)
 endif
 
 clean: tidy
-	$(RM) sound/direct_sound_samples/*.bin
+	find sound/direct_sound_samples \( -iname '*.bin' \) -exec rm {} +
 	$(RM) $(ALL_OBJECTS)
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} +
 
@@ -160,7 +160,7 @@ include override.mk
 
 #### Sound Rules ####
 
-sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif
+sound/direct_sound_samples/cries/cry_%.bin: sound/direct_sound_samples/cries/cry_%.aif
 	$(AIF2PCM) $< $@ --compress
 
 sound/%.bin: sound/%.aif
diff --git a/include/fldeff_poison.h b/include/fldeff_poison.h
index fe3308ba9..abcacbd03 100644
--- a/include/fldeff_poison.h
+++ b/include/fldeff_poison.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_FLDEFF_POISON_H
 #define GUARD_FLDEFF_POISON_H
 
-void DoFieldPoisonEffect(void);
-bool32 FieldPoisonEffectIsRunning(void);
+void FldeffPoison_Start(void);
+bool32 FldeffPoison_IsActive(void);
 
 #endif // GUARD_FLDEFF_POISON_H
diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
index d4c39b2f8..455763ccf 100644
--- a/sound/direct_sound_data.inc
+++ b/sound/direct_sound_data.inc
@@ -1,2023 +1,2023 @@
 	.align 2
-DirectSoundWaveData_8456330:: @ 8456330
-	.incbin "sound/direct_sound_samples/8456330.bin"
+DirectSoundWaveData_Tone1:: @ 8456330
+	.incbin "sound/direct_sound_samples/synth/tone1.bin"
 
 	.align 2
-DirectSoundWaveData_84569D4:: @ 84569D4
-	.incbin "sound/direct_sound_samples/84569D4.bin"
+DirectSoundWaveData_SC88_Organ2:: @ 84569D4
+	.incbin "sound/direct_sound_samples/synth/sc88_18_organ_2.bin"
 
 	.align 2
-DirectSoundWaveData_84571CC:: @ 84571CC
-	.incbin "sound/direct_sound_samples/84571CC.bin"
+DirectSoundWaveData_SC88_FretlessBass:: @ 84571CC
+	.incbin "sound/direct_sound_samples/synth/sc88_36_fretless_bass.bin"
 
 	.align 2
-DirectSoundWaveData_8457D98:: @ 8457D98
-	.incbin "sound/direct_sound_samples/8457D98.bin"
+DirectSoundWaveData_SC88_FingerSlap:: @ 8457D98
+	.incbin "sound/direct_sound_samples/synth/sc88_34_finger_slap.bin"
 
 	.align 2
-DirectSoundWaveData_8458CD0:: @ 8458CD0
-	.incbin "sound/direct_sound_samples/8458CD0.bin"
+DirectSoundWaveData_SC88_SynthBass1:: @ 8458CD0
+	.incbin "sound/direct_sound_samples/synth/sc88_39_synth_bass_1.bin"
 
 	.align 2
-DirectSoundWaveData_8459944:: @ 8459944
-	.incbin "sound/direct_sound_samples/8459944.bin"
+DirectSoundWaveData_SC88_DrumKitTimbale2:: @ 8459944
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.bin"
 
 	.align 2
-DirectSoundWaveData_845AE14:: @ 845AE14
-	.incbin "sound/direct_sound_samples/845AE14.bin"
+DirectSoundWaveData_SC88_DrumKitBassDrum:: @ 845AE14
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.bin"
 
 	.align 2
-DirectSoundWaveData_845B2B4:: @ 845B2B4
-	.incbin "sound/direct_sound_samples/845B2B4.bin"
+DirectSoundWaveData_SC88_DrumKitSnare1:: @ 845B2B4
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_1.bin"
 
 	.align 2
-DirectSoundWaveData_845B9A8:: @ 845B9A8
-	.incbin "sound/direct_sound_samples/845B9A8.bin"
+DirectSoundWaveData_SC88_DrumKitHandClap:: @ 845B9A8
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.bin"
 
 	.align 2
-DirectSoundWaveData_845C238:: @ 845C238
-	.incbin "sound/direct_sound_samples/845C238.bin"
+DirectSoundWaveData_SC88_DrumKitSnare2:: @ 845C238
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_2.bin"
 
 	.align 2
-DirectSoundWaveData_845CAB0:: @ 845CAB0
-	.incbin "sound/direct_sound_samples/845CAB0.bin"
+DirectSoundWaveData_SC88_DrumKitHiMidTom:: @ 845CAB0
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.bin"
 
 	.align 2
-DirectSoundWaveData_845DAF0:: @ 845DAF0
-	.incbin "sound/direct_sound_samples/845DAF0.bin"
+DirectSoundWaveData_SC88_DrumKitClosedHiHat:: @ 845DAF0
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.bin"
 
 	.align 2
-DirectSoundWaveData_845DF04:: @ 845DF04
-	.incbin "sound/direct_sound_samples/845DF04.bin"
+DirectSoundWaveData_SC88_DrumKitOpenHiHat:: @ 845DF04
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_open_hi_hat.bin"
 
 	.align 2
-DirectSoundWaveData_845ED34:: @ 845ED34
-	.incbin "sound/direct_sound_samples/845ED34.bin"
+DirectSoundWaveData_HiHatRattle:: @ 845ED34
+	.incbin "sound/direct_sound_samples/synth/hi_hat_rattle.bin"
 
 	.align 2
-DirectSoundWaveData_845FCC8:: @ 845FCC8
-	.incbin "sound/direct_sound_samples/845FCC8.bin"
+DirectSoundWaveData_SC88_DrumKitCabasa:: @ 845FCC8
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_cabasa.bin"
 
 	.align 2
-DirectSoundWaveData_846057C:: @ 846057C
-	.incbin "sound/direct_sound_samples/846057C.bin"
+DirectSoundWaveData_SC88_DrumKitCrashCymbal2:: @ 846057C
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.bin"
 
 	.align 2
-DirectSoundWaveData_8460E60:: @ 8460E60
-	.incbin "sound/direct_sound_samples/8460E60.bin"
+DirectSoundWaveData_SC88_DrumKitCrashCymbal1:: @ 8460E60
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.bin"
 
 	.align 2
-DirectSoundWaveData_8461D8C:: @ 8461D8C
-	.incbin "sound/direct_sound_samples/8461D8C.bin"
+DirectSoundWaveData_SC88_DrumKitMuteHiConga:: @ 8461D8C
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.bin"
 
 	.align 2
-DirectSoundWaveData_84622A4:: @ 84622A4
-	.incbin "sound/direct_sound_samples/84622A4.bin"
+DirectSoundWaveData_SC88_DrumKitLowConga:: @ 84622A4
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_low_conga.bin"
 
 	.align 2
-DirectSoundWaveData_846286C:: @ 846286C
-	.incbin "sound/direct_sound_samples/846286C.bin"
+DirectSoundWaveData_SC88_SteelStringGuitar:: @ 846286C
+	.incbin "sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.bin"
 
 	.align 2
-DirectSoundWaveData_84637CC:: @ 84637CC
-	.incbin "sound/direct_sound_samples/84637CC.bin"
+DirectSoundWaveData_SC88_Piano3:: @ 84637CC
+	.incbin "sound/direct_sound_samples/synth/sc88_3_piano_3.bin"
 
 	.align 2
-DirectSoundWaveData_8464E2C:: @ 8464E2C
-	.incbin "sound/direct_sound_samples/8464E2C.bin"
+DirectSoundWaveData_SC88_Piano2:: @ 8464E2C
+	.incbin "sound/direct_sound_samples/synth/sc88_2_piano_2.bin"
 
 	.align 2
-DirectSoundWaveData_8466388:: @ 8466388
-	.incbin "sound/direct_sound_samples/8466388.bin"
+DirectSoundWaveData_SC88_UnisonSlap:: @ 8466388
+	.incbin "sound/direct_sound_samples/synth/sc88_37_unison_slap.bin"
 
 	.align 2
-DirectSoundWaveData_8466F14:: @ 8466F14
-	.incbin "sound/direct_sound_samples/8466F14.bin"
+DirectSoundWaveData_SC88_Strings:: @ 8466F14
+	.incbin "sound/direct_sound_samples/synth/sc88_49_strings.bin"
 
 	.align 2
-DirectSoundWaveData_846A4B8:: @ 846A4B8
-	.incbin "sound/direct_sound_samples/846A4B8.bin"
+DirectSoundWaveData_SC88_StringsPlusFlute:: @ 846A4B8
+	.incbin "sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.bin"
 
 	.align 2
-DirectSoundWaveData_846C7D4:: @ 846C7D4
-	.incbin "sound/direct_sound_samples/846C7D4.bin"
+DirectSoundWaveData_SC88_StringsPlusHorn:: @ 846C7D4
+	.incbin "sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.bin"
 
 	.align 2
-DirectSoundWaveData_846FEA0:: @ 846FEA0
-	.incbin "sound/direct_sound_samples/846FEA0.bin"
+DirectSoundWaveData_SC88_Trumpet:: @ 846FEA0
+	.incbin "sound/direct_sound_samples/synth/sc88_57_trumpet.bin"
 
 	.align 2
-DirectSoundWaveData_84711F0:: @ 84711F0
-	.incbin "sound/direct_sound_samples/84711F0.bin"
+DirectSoundWaveData_SC88_Trombone:: @ 84711F0
+	.incbin "sound/direct_sound_samples/synth/sc88_58_trombone.bin"
 
 	.align 2
-DirectSoundWaveData_8472700:: @ 8472700
-	.incbin "sound/direct_sound_samples/8472700.bin"
+DirectSoundWaveData_SC88_Tuba:: @ 8472700
+	.incbin "sound/direct_sound_samples/synth/sc88_59_tuba.bin"
 
 	.align 2
-DirectSoundWaveData_8473B20:: @ 8473B20
-	.incbin "sound/direct_sound_samples/8473B20.bin"
+DirectSoundWaveData_SC88_CupMutedTrumpet:: @ 8473B20
+	.incbin "sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.bin"
 
 	.align 2
-DirectSoundWaveData_8474BBC:: @ 8474BBC
-	.incbin "sound/direct_sound_samples/8474BBC.bin"
+DirectSoundWaveData_SC88_MutedTrumpet3:: @ 8474BBC
+	.incbin "sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.bin"
 
 	.align 2
-DirectSoundWaveData_8475C18:: @ 8475C18
-	.incbin "sound/direct_sound_samples/8475C18.bin"
+DirectSoundWaveData_SC88_FrenchHorns:: @ 8475C18
+	.incbin "sound/direct_sound_samples/synth/sc88_61_french_horns.bin"
 
 	.align 2
-DirectSoundWaveData_847CBAC:: @ 847CBAC
-	.incbin "sound/direct_sound_samples/847CBAC.bin"
+DirectSoundWaveData_SC88_WideFrenchHorns:: @ 847CBAC
+	.incbin "sound/direct_sound_samples/synth/sc88_61_wide_french_horns.bin"
 
 	.align 2
-DirectSoundWaveData_8481130:: @ 8481130
-	.incbin "sound/direct_sound_samples/8481130.bin"
+DirectSoundWaveData_SC88_NylonStringGuitar:: @ 8481130
+	.incbin "sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.bin"
 
 	.align 2
-DirectSoundWaveData_84830A0:: @ 84830A0
-	.incbin "sound/direct_sound_samples/84830A0.bin"
+DirectSoundWaveData_SC88_Flute:: @ 84830A0
+	.incbin "sound/direct_sound_samples/synth/sc88_74_flute.bin"
 
 	.align 2
-DirectSoundWaveData_8483804:: @ 8483804
-	.incbin "sound/direct_sound_samples/8483804.bin"
+DirectSoundWaveData_SC88_FingeredBass:: @ 8483804
+	.incbin "sound/direct_sound_samples/synth/sc88_34_fingered_bass.bin"
 
 	.align 2
-DirectSoundWaveData_8485454:: @ 8485454
-	.incbin "sound/direct_sound_samples/8485454.bin"
+DirectSoundWaveData_SC88_DrumKitTimbale1:: @ 8485454
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.bin"
 
 	.align 2
-DirectSoundWaveData_8486924:: @ 8486924
-	.incbin "sound/direct_sound_samples/8486924.bin"
+DirectSoundWaveData_SC88_DrumKitSnare4:: @ 8486924
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_4.bin"
 
 	.align 2
-DirectSoundWaveData_8487330:: @ 8487330
-	.incbin "sound/direct_sound_samples/8487330.bin"
+DirectSoundWaveData_SC88_SquareWave:: @ 8487330
+	.incbin "sound/direct_sound_samples/synth/sc88_81_square_wave.bin"
 
 	.align 2
-DirectSoundWaveData_8488F44:: @ 8488F44
-	.incbin "sound/direct_sound_samples/8488F44.bin"
+DirectSoundWaveData_Ring:: @ 8488F44
+	.incbin "sound/direct_sound_samples/synth/ring.bin"
 
 	.align 2
-DirectSoundWaveData_848A8A4:: @ 848A8A4
-	.incbin "sound/direct_sound_samples/848A8A4.bin"
+DirectSoundWaveData_SC88_DrumKitSnare3:: @ 848A8A4
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_3.bin"
 
 	.align 2
-DirectSoundWaveData_848BD68:: @ 848BD68
-	.incbin "sound/direct_sound_samples/848BD68.bin"
+DirectSoundWaveData_SC88_PizzicatoStrings:: @ 848BD68
+	.incbin "sound/direct_sound_samples/synth/sc88_46_pizzicato_strings.bin"
 
 	.align 2
-DirectSoundWaveData_848C4A4:: @ 848C4A4
-	.incbin "sound/direct_sound_samples/848C4A4.bin"
+DirectSoundWaveData_MachineSound2:: @ 848C4A4
+	.incbin "sound/direct_sound_samples/synth/machine_sound2.bin"
 
 	.align 2
-DirectSoundWaveData_848E094:: @ 848E094
-	.incbin "sound/direct_sound_samples/848E094.bin"
+DirectSoundWaveData_MachineSound1:: @ 848E094
+	.incbin "sound/direct_sound_samples/synth/machine_sound1.bin"
 
 	.align 2
-DirectSoundWaveData_848F448:: @ 848F448
-	.incbin "sound/direct_sound_samples/848F448.bin"
+DirectSoundWaveData_SC88_Applause2:: @ 848F448
+	.incbin "sound/direct_sound_samples/synth/sc88_127_applause_2.bin"
 
 	.align 2
-DirectSoundWaveData_8491ACC:: @ 8491ACC
-	.incbin "sound/direct_sound_samples/8491ACC.bin"
+DirectSoundWaveData_Noise3:: @ 8491ACC
+	.incbin "sound/direct_sound_samples/synth/noise3.bin"
 
 	.align 2
-DirectSoundWaveData_8492D10:: @ 8492D10
-	.incbin "sound/direct_sound_samples/8492D10.bin"
+DirectSoundWaveData_SC88_Bubble:: @ 8492D10
+	.incbin "sound/direct_sound_samples/synth/sc88_123_bubble.bin"
 
 	.align 2
-DirectSoundWaveData_8493D20:: @ 8493D20
-	.incbin "sound/direct_sound_samples/8493D20.bin"
+DirectSoundWaveData_SC88_CarCrash:: @ 8493D20
+	.incbin "sound/direct_sound_samples/synth/sc88_126_car_crash.bin"
 
 	.align 2
-DirectSoundWaveData_8495028:: @ 8495028
-	.incbin "sound/direct_sound_samples/8495028.bin"
+DirectSoundWaveData_SC88_PinkNoise:: @ 8495028
+	.incbin "sound/direct_sound_samples/synth/sc88_123_pink_noise.bin"
 
 	.align 2
-DirectSoundWaveData_8497134:: @ 8497134
-	.incbin "sound/direct_sound_samples/8497134.bin"
+DirectSoundWaveData_SC88_WaspySynth:: @ 8497134
+	.incbin "sound/direct_sound_samples/synth/sc88_82_waspy_synth.bin"
 
 	.align 2
-DirectSoundWaveData_8499110:: @ 8499110
-	.incbin "sound/direct_sound_samples/8499110.bin"
+DirectSoundWaveData_SC88_WhiteNoise:: @ 8499110
+	.incbin "sound/direct_sound_samples/synth/sc88_123_white_noise.bin"
 
 	.align 2
-DirectSoundWaveData_849B320:: @ 849B320
-	.incbin "sound/direct_sound_samples/849B320.bin"
+DirectSoundWaveData_SC88_DrumkitGuiro:: @ 849B320
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_guiro.bin"
 
 	.align 2
-DirectSoundWaveData_849BAEC:: @ 849BAEC
-	.incbin "sound/direct_sound_samples/849BAEC.bin"
+DirectSoundWaveData_SC88_TubularBell:: @ 849BAEC
+	.incbin "sound/direct_sound_samples/synth/sc88_15_tubular_bell.bin"
 
 	.align 2
-DirectSoundWaveData_849D45C:: @ 849D45C
-	.incbin "sound/direct_sound_samples/849D45C.bin"
+DirectSoundWaveData_Noise1:: @ 849D45C
+	.incbin "sound/direct_sound_samples/synth/noise1.bin"
 
 	.align 2
-DirectSoundWaveData_849F40C:: @ 849F40C
-	.incbin "sound/direct_sound_samples/849F40C.bin"
+DirectSoundWaveData_SC88_JPSuperSaw:: @ 849F40C
+	.incbin "sound/direct_sound_samples/synth/sc88_82_jp_super_saw.bin"
 
 	.align 2
-DirectSoundWaveData_84A26EC:: @ 84A26EC
-	.incbin "sound/direct_sound_samples/84A26EC.bin"
+DirectSoundWaveData_SC88_Piano1:: @ 84A26EC
+	.incbin "sound/direct_sound_samples/synth/sc88_1_piano_1.bin"
 
 	.align 2
-DirectSoundWaveData_84A311C:: @ 84A311C
-	.incbin "sound/direct_sound_samples/84A311C.bin"
+DirectSoundWaveData_SC88_Marimba:: @ 84A311C
+	.incbin "sound/direct_sound_samples/synth/sc88_13_marimba.bin"
 
 	.align 2
-DirectSoundWaveData_84A3B50:: @ 84A3B50
-	.incbin "sound/direct_sound_samples/84A3B50.bin"
+DirectSoundWaveData_Noise2:: @ 84A3B50
+	.incbin "sound/direct_sound_samples/synth/noise2.bin"
 
 	.align 2
-DirectSoundWaveData_84A5690:: @ 84A5690
-	.incbin "sound/direct_sound_samples/84A5690.bin"
+DirectSoundWaveData_SC88_HorseGallop:: @ 84A5690
+	.incbin "sound/direct_sound_samples/synth/sc88_124_horse_gallop.bin"
 
 	.align 2
-DirectSoundWaveData_84A5F58:: @ 84A5F58
-	.incbin "sound/direct_sound_samples/84A5F58.bin"
+DirectSoundWaveData_SC88_AccordianFr:: @ 84A5F58
+	.incbin "sound/direct_sound_samples/synth/sc88_22_accordion_fr.bin"
 
 	.align 2
-DirectSoundWaveData_84A7328:: @ 84A7328
-	.incbin "sound/direct_sound_samples/84A7328.bin"
+DirectSoundWaveData_Phoneme_Vowel1:: @ 84A7328
+	.incbin "sound/direct_sound_samples/phonemes/vowel_1.bin"
 
 	.align 2
-DirectSoundWaveData_84A7F38:: @ 84A7F38
-	.incbin "sound/direct_sound_samples/84A7F38.bin"
+DirectSoundWaveData_Phoneme_Vowel2:: @ 84A7F38
+	.incbin "sound/direct_sound_samples/phonemes/vowel_2.bin"
 
 	.align 2
-DirectSoundWaveData_84A8AC8:: @ 84A8AC8
-	.incbin "sound/direct_sound_samples/84A8AC8.bin"
+DirectSoundWaveData_Phoneme_Vowel3:: @ 84A8AC8
+	.incbin "sound/direct_sound_samples/phonemes/vowel_3.bin"
 
 	.align 2
-DirectSoundWaveData_84A9564:: @ 84A9564
-	.incbin "sound/direct_sound_samples/84A9564.bin"
+DirectSoundWaveData_Phoneme_Vowel4:: @ 84A9564
+	.incbin "sound/direct_sound_samples/phonemes/vowel_4.bin"
 
 	.align 2
-DirectSoundWaveData_84A9EAC:: @ 84A9EAC
-	.incbin "sound/direct_sound_samples/84A9EAC.bin"
+DirectSoundWaveData_Phoneme_Vowel5:: @ 84A9EAC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_5.bin"
 
 	.align 2
-DirectSoundWaveData_84AA8F4:: @ 84AA8F4
-	.incbin "sound/direct_sound_samples/84AA8F4.bin"
+DirectSoundWaveData_Phoneme_Vowel6:: @ 84AA8F4
+	.incbin "sound/direct_sound_samples/phonemes/vowel_6.bin"
 
 	.align 2
 Cry_Bulbasaur:: @ 84AB57C
-	.incbin "sound/direct_sound_samples/cry_bulbasaur.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_bulbasaur.bin"
 
 	.align 2
 Cry_Ivysaur:: @ 84AC608
-	.incbin "sound/direct_sound_samples/cry_ivysaur.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ivysaur.bin"
 
 	.align 2
 Cry_Venusaur:: @ 84AD698
-	.incbin "sound/direct_sound_samples/cry_venusaur.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_venusaur.bin"
 
 	.align 2
 Cry_Charmander:: @ 84AE9F0
-	.incbin "sound/direct_sound_samples/cry_charmander.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_charmander.bin"
 
 	.align 2
 Cry_Charmeleon:: @ 84AF860
-	.incbin "sound/direct_sound_samples/cry_charmeleon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_charmeleon.bin"
 
 	.align 2
 Cry_Charizard:: @ 84B06E0
-	.incbin "sound/direct_sound_samples/cry_charizard.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_charizard.bin"
 
 	.align 2
 Cry_Squirtle:: @ 84B1A28
-	.incbin "sound/direct_sound_samples/cry_squirtle.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_squirtle.bin"
 
 	.align 2
 Cry_Wartortle:: @ 84B289C
-	.incbin "sound/direct_sound_samples/cry_wartortle.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_wartortle.bin"
 
 	.align 2
 Cry_Blastoise:: @ 84B39DC
-	.incbin "sound/direct_sound_samples/cry_blastoise.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_blastoise.bin"
 
 	.align 2
 Cry_Caterpie:: @ 84B4D24
-	.incbin "sound/direct_sound_samples/cry_caterpie.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_caterpie.bin"
 
 	.align 2
 Cry_Metapod:: @ 84B557C
-	.incbin "sound/direct_sound_samples/cry_metapod.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_metapod.bin"
 
 	.align 2
 Cry_Butterfree:: @ 84B6CCC
-	.incbin "sound/direct_sound_samples/cry_butterfree.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_butterfree.bin"
 
 	.align 2
 Cry_Weedle:: @ 84B76D4
-	.incbin "sound/direct_sound_samples/cry_weedle.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_weedle.bin"
 
 	.align 2
 Cry_Kakuna:: @ 84B8718
-	.incbin "sound/direct_sound_samples/cry_kakuna.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_kakuna.bin"
 
 	.align 2
 Cry_Beedrill:: @ 84B9954
-	.incbin "sound/direct_sound_samples/cry_beedrill.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_beedrill.bin"
 
 	.align 2
 Cry_Pidgey:: @ 84BACB0
-	.incbin "sound/direct_sound_samples/cry_pidgey.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_pidgey.bin"
 
 	.align 2
 Cry_Pidgeotto:: @ 84BB098
-	.incbin "sound/direct_sound_samples/cry_pidgeotto.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_pidgeotto.bin"
 
 	.align 2
 Cry_Pidgeot:: @ 84BBFA0
-	.incbin "sound/direct_sound_samples/cry_pidgeot.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_pidgeot.bin"
 
 	.align 2
 Cry_Rattata:: @ 84BD0D4
-	.incbin "sound/direct_sound_samples/cry_rattata.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_rattata.bin"
 
 	.align 2
 Cry_Raticate:: @ 84BD8B4
-	.incbin "sound/direct_sound_samples/cry_raticate.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_raticate.bin"
 
 	.align 2
 Cry_Spearow:: @ 84BE238
-	.incbin "sound/direct_sound_samples/cry_spearow.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_spearow.bin"
 
 	.align 2
 Cry_Fearow:: @ 84BF3DC
-	.incbin "sound/direct_sound_samples/cry_fearow.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_fearow.bin"
 
 	.align 2
 Cry_Ekans:: @ 84C0518
-	.incbin "sound/direct_sound_samples/cry_ekans.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ekans.bin"
 
 	.align 2
 Cry_Arbok:: @ 84C1864
-	.incbin "sound/direct_sound_samples/cry_arbok.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_arbok.bin"
 
 	.align 2
 Cry_Pikachu:: @ 84C2BBC
-	.incbin "sound/direct_sound_samples/cry_pikachu.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_pikachu.bin"
 
 	.align 2
 Cry_Raichu:: @ 84C3C64
-	.incbin "sound/direct_sound_samples/cry_raichu.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_raichu.bin"
 
 	.align 2
 Cry_Sandshrew:: @ 84C5424
-	.incbin "sound/direct_sound_samples/cry_sandshrew.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sandshrew.bin"
 
 	.align 2
 Cry_Sandslash:: @ 84C5D78
-	.incbin "sound/direct_sound_samples/cry_sandslash.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sandslash.bin"
 
 	.align 2
 Cry_NidoranF:: @ 84C6B08
-	.incbin "sound/direct_sound_samples/cry_nidoran_f.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_nidoran_f.bin"
 
 	.align 2
 Cry_Nidorina:: @ 84C74B8
-	.incbin "sound/direct_sound_samples/cry_nidorina.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_nidorina.bin"
 
 	.align 2
 Cry_Nidoqueen:: @ 84C8180
-	.incbin "sound/direct_sound_samples/cry_nidoqueen.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_nidoqueen.bin"
 
 	.align 2
 Cry_NidoranM:: @ 84C9260
-	.incbin "sound/direct_sound_samples/cry_nidoran_m.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_nidoran_m.bin"
 
 	.align 2
 Cry_Nidorino:: @ 84C9CC8
-	.incbin "sound/direct_sound_samples/cry_nidorino.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_nidorino.bin"
 
 	.align 2
 Cry_Nidoking:: @ 84CA8DC
-	.incbin "sound/direct_sound_samples/cry_nidoking.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_nidoking.bin"
 
 	.align 2
 Cry_Clefairy:: @ 84CC148
-	.incbin "sound/direct_sound_samples/cry_clefairy.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_clefairy.bin"
 
 	.align 2
 Cry_Clefable:: @ 84CC9B8
-	.incbin "sound/direct_sound_samples/cry_clefable.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_clefable.bin"
 
 	.align 2
 Cry_Vulpix:: @ 84CD448
-	.incbin "sound/direct_sound_samples/cry_vulpix.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_vulpix.bin"
 
 	.align 2
 Cry_Ninetales:: @ 84CEC18
-	.incbin "sound/direct_sound_samples/cry_ninetales.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ninetales.bin"
 
 	.align 2
 Cry_Jigglypuff:: @ 84D0484
-	.incbin "sound/direct_sound_samples/cry_jigglypuff.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_jigglypuff.bin"
 
 	.align 2
 Cry_Wigglytuff:: @ 84D09E8
-	.incbin "sound/direct_sound_samples/cry_wigglytuff.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_wigglytuff.bin"
 
 	.align 2
 Cry_Zubat:: @ 84D10B0
-	.incbin "sound/direct_sound_samples/cry_zubat.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_zubat.bin"
 
 	.align 2
 Cry_Golbat:: @ 84D241C
-	.incbin "sound/direct_sound_samples/cry_golbat.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_golbat.bin"
 
 	.align 2
 Cry_Oddish:: @ 84D3780
-	.incbin "sound/direct_sound_samples/cry_oddish.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_oddish.bin"
 
 	.align 2
 Cry_Gloom:: @ 84D461C
-	.incbin "sound/direct_sound_samples/cry_gloom.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_gloom.bin"
 
 	.align 2
 Cry_Vileplume:: @ 84D5298
-	.incbin "sound/direct_sound_samples/cry_vileplume.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_vileplume.bin"
 
 	.align 2
 Cry_Paras:: @ 84D6C34
-	.incbin "sound/direct_sound_samples/cry_paras.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_paras.bin"
 
 	.align 2
 Cry_Parasect:: @ 84D8828
-	.incbin "sound/direct_sound_samples/cry_parasect.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_parasect.bin"
 
 	.align 2
 Cry_Venonat:: @ 84DA690
-	.incbin "sound/direct_sound_samples/cry_venonat.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_venonat.bin"
 
 	.align 2
 Cry_Venomoth:: @ 84DB610
-	.incbin "sound/direct_sound_samples/cry_venomoth.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_venomoth.bin"
 
 	.align 2
 Cry_Diglett:: @ 84DC614
-	.incbin "sound/direct_sound_samples/cry_diglett.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_diglett.bin"
 
 	.align 2
 Cry_Dugtrio:: @ 84DD984
-	.incbin "sound/direct_sound_samples/cry_dugtrio.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_dugtrio.bin"
 
 	.align 2
 Cry_Meowth:: @ 84DECF0
-	.incbin "sound/direct_sound_samples/cry_meowth.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_meowth.bin"
 
 	.align 2
 Cry_Persian:: @ 84DF680
-	.incbin "sound/direct_sound_samples/cry_persian.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_persian.bin"
 
 	.align 2
 Cry_Psyduck:: @ 84E095C
-	.incbin "sound/direct_sound_samples/cry_psyduck.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_psyduck.bin"
 
 	.align 2
 Cry_Golduck:: @ 84E1684
-	.incbin "sound/direct_sound_samples/cry_golduck.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_golduck.bin"
 
 	.align 2
 Cry_Mankey:: @ 84E21CC
-	.incbin "sound/direct_sound_samples/cry_mankey.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_mankey.bin"
 
 	.align 2
 Cry_Primeape:: @ 84E322C
-	.incbin "sound/direct_sound_samples/cry_primeape.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_primeape.bin"
 
 	.align 2
 Cry_Growlithe:: @ 84E425C
-	.incbin "sound/direct_sound_samples/cry_growlithe.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_growlithe.bin"
 
 	.align 2
 Cry_Arcanine:: @ 84E4FC0
-	.incbin "sound/direct_sound_samples/cry_arcanine.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_arcanine.bin"
 
 	.align 2
 Cry_Poliwag:: @ 84E60FC
-	.incbin "sound/direct_sound_samples/cry_poliwag.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_poliwag.bin"
 
 	.align 2
 Cry_Poliwhirl:: @ 84E6C18
-	.incbin "sound/direct_sound_samples/cry_poliwhirl.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_poliwhirl.bin"
 
 	.align 2
 Cry_Poliwrath:: @ 84E72C0
-	.incbin "sound/direct_sound_samples/cry_poliwrath.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_poliwrath.bin"
 
 	.align 2
 Cry_Abra:: @ 84E7DE4
-	.incbin "sound/direct_sound_samples/cry_abra.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_abra.bin"
 
 	.align 2
 Cry_Kadabra:: @ 84E9548
-	.incbin "sound/direct_sound_samples/cry_kadabra.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_kadabra.bin"
 
 	.align 2
 Cry_Alakazam:: @ 84EB030
-	.incbin "sound/direct_sound_samples/cry_alakazam.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_alakazam.bin"
 
 	.align 2
 Cry_Machop:: @ 84ECFCC
-	.incbin "sound/direct_sound_samples/cry_machop.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_machop.bin"
 
 	.align 2
 Cry_Machoke:: @ 84EDD30
-	.incbin "sound/direct_sound_samples/cry_machoke.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_machoke.bin"
 
 	.align 2
 Cry_Machamp:: @ 84EEAC0
-	.incbin "sound/direct_sound_samples/cry_machamp.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_machamp.bin"
 
 	.align 2
 Cry_Bellsprout:: @ 84EFB48
-	.incbin "sound/direct_sound_samples/cry_bellsprout.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_bellsprout.bin"
 
 	.align 2
 Cry_Weepinbell:: @ 84F02D4
-	.incbin "sound/direct_sound_samples/cry_weepinbell.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_weepinbell.bin"
 
 	.align 2
 Cry_Victreebel:: @ 84F1174
-	.incbin "sound/direct_sound_samples/cry_victreebel.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_victreebel.bin"
 
 	.align 2
 Cry_Tentacool:: @ 84F24C0
-	.incbin "sound/direct_sound_samples/cry_tentacool.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_tentacool.bin"
 
 	.align 2
 Cry_Tentacruel:: @ 84F34B0
-	.incbin "sound/direct_sound_samples/cry_tentacruel.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_tentacruel.bin"
 
 	.align 2
 Cry_Geodude:: @ 84F4BAC
-	.incbin "sound/direct_sound_samples/cry_geodude.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_geodude.bin"
 
 	.align 2
 Cry_Graveler:: @ 84F6360
-	.incbin "sound/direct_sound_samples/cry_graveler.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_graveler.bin"
 
 	.align 2
 Cry_Golem:: @ 84F7F48
-	.incbin "sound/direct_sound_samples/cry_golem.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_golem.bin"
 
 	.align 2
 Cry_Ponyta:: @ 84F8D74
-	.incbin "sound/direct_sound_samples/cry_ponyta.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ponyta.bin"
 
 	.align 2
 Cry_Rapidash:: @ 84F9C84
-	.incbin "sound/direct_sound_samples/cry_rapidash.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_rapidash.bin"
 
 	.align 2
 Cry_Slowpoke:: @ 84FAF24
-	.incbin "sound/direct_sound_samples/cry_slowpoke.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_slowpoke.bin"
 
 	.align 2
 Cry_Slowbro:: @ 84FB68C
-	.incbin "sound/direct_sound_samples/cry_slowbro.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_slowbro.bin"
 
 	.align 2
 Cry_Magnemite:: @ 84FC3FC
-	.incbin "sound/direct_sound_samples/cry_magnemite.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_magnemite.bin"
 
 	.align 2
 Cry_Magneton:: @ 84FD740
-	.incbin "sound/direct_sound_samples/cry_magneton.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_magneton.bin"
 
 	.align 2
 Cry_Farfetchd:: @ 84FEF28
-	.incbin "sound/direct_sound_samples/cry_farfetchd.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_farfetchd.bin"
 
 	.align 2
 Cry_Doduo:: @ 84FF6A4
-	.incbin "sound/direct_sound_samples/cry_doduo.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_doduo.bin"
 
 	.align 2
 Cry_Dodrio:: @ 85009E8
-	.incbin "sound/direct_sound_samples/cry_dodrio.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_dodrio.bin"
 
 	.align 2
 Cry_Seel:: @ 8501D60
-	.incbin "sound/direct_sound_samples/cry_seel.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_seel.bin"
 
 	.align 2
 Cry_Dewgong:: @ 8502F50
-	.incbin "sound/direct_sound_samples/cry_dewgong.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_dewgong.bin"
 
 	.align 2
 Cry_Grimer:: @ 8504474
-	.incbin "sound/direct_sound_samples/cry_grimer.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_grimer.bin"
 
 	.align 2
 Cry_Muk:: @ 8504EFC
-	.incbin "sound/direct_sound_samples/cry_muk.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_muk.bin"
 
 	.align 2
 Cry_Shellder:: @ 8505DBC
-	.incbin "sound/direct_sound_samples/cry_shellder.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_shellder.bin"
 
 	.align 2
 Cry_Cloyster:: @ 8506D30
-	.incbin "sound/direct_sound_samples/cry_cloyster.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_cloyster.bin"
 
 	.align 2
 Cry_Gastly:: @ 85081F4
-	.incbin "sound/direct_sound_samples/cry_gastly.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_gastly.bin"
 
 	.align 2
 Cry_Haunter:: @ 8509944
-	.incbin "sound/direct_sound_samples/cry_haunter.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_haunter.bin"
 
 	.align 2
 Cry_Gengar:: @ 850B0C4
-	.incbin "sound/direct_sound_samples/cry_gengar.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_gengar.bin"
 
 	.align 2
 Cry_Onix:: @ 850BF84
-	.incbin "sound/direct_sound_samples/cry_onix.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_onix.bin"
 
 	.align 2
 Cry_Drowzee:: @ 850D848
-	.incbin "sound/direct_sound_samples/cry_drowzee.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_drowzee.bin"
 
 	.align 2
 Cry_Hypno:: @ 850F560
-	.incbin "sound/direct_sound_samples/cry_hypno.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_hypno.bin"
 
 	.align 2
 Cry_Krabby:: @ 8511264
-	.incbin "sound/direct_sound_samples/cry_krabby.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_krabby.bin"
 
 	.align 2
 Cry_Kingler:: @ 8512AB0
-	.incbin "sound/direct_sound_samples/cry_kingler.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_kingler.bin"
 
 	.align 2
 Cry_Voltorb:: @ 8514308
-	.incbin "sound/direct_sound_samples/cry_voltorb.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_voltorb.bin"
 
 	.align 2
 Cry_Electrode:: @ 8515BCC
-	.incbin "sound/direct_sound_samples/cry_electrode.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_electrode.bin"
 
 	.align 2
 Cry_Exeggcute:: @ 8517504
-	.incbin "sound/direct_sound_samples/cry_exeggcute.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_exeggcute.bin"
 
 	.align 2
 Cry_Exeggutor:: @ 85187E4
-	.incbin "sound/direct_sound_samples/cry_exeggutor.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_exeggutor.bin"
 
 	.align 2
 Cry_Cubone:: @ 851A7C8
-	.incbin "sound/direct_sound_samples/cry_cubone.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_cubone.bin"
 
 	.align 2
 Cry_Marowak:: @ 851B6E8
-	.incbin "sound/direct_sound_samples/cry_marowak.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_marowak.bin"
 
 	.align 2
 Cry_Hitmonlee:: @ 851C558
-	.incbin "sound/direct_sound_samples/cry_hitmonlee.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_hitmonlee.bin"
 
 	.align 2
 Cry_Hitmonchan:: @ 851D804
-	.incbin "sound/direct_sound_samples/cry_hitmonchan.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_hitmonchan.bin"
 
 	.align 2
 Cry_Lickitung:: @ 851E9DC
-	.incbin "sound/direct_sound_samples/cry_lickitung.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_lickitung.bin"
 
 	.align 2
 Cry_Koffing:: @ 851F904
-	.incbin "sound/direct_sound_samples/cry_koffing.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_koffing.bin"
 
 	.align 2
 Cry_Weezing:: @ 8520D60
-	.incbin "sound/direct_sound_samples/cry_weezing.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_weezing.bin"
 
 	.align 2
 Cry_Rhyhorn:: @ 852230C
-	.incbin "sound/direct_sound_samples/cry_rhyhorn.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_rhyhorn.bin"
 
 	.align 2
 Cry_Rhydon:: @ 8523678
-	.incbin "sound/direct_sound_samples/cry_rhydon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_rhydon.bin"
 
 	.align 2
 Cry_Chansey:: @ 8524AE4
-	.incbin "sound/direct_sound_samples/cry_chansey.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_chansey.bin"
 
 	.align 2
 Cry_Tangela:: @ 85259B0
-	.incbin "sound/direct_sound_samples/cry_tangela.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_tangela.bin"
 
 	.align 2
 Cry_Kangaskhan:: @ 85268CC
-	.incbin "sound/direct_sound_samples/cry_kangaskhan.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_kangaskhan.bin"
 
 	.align 2
 Cry_Horsea:: @ 8527B80
-	.incbin "sound/direct_sound_samples/cry_horsea.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_horsea.bin"
 
 	.align 2
 Cry_Seadra:: @ 85284FC
-	.incbin "sound/direct_sound_samples/cry_seadra.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_seadra.bin"
 
 	.align 2
 Cry_Goldeen:: @ 8528D68
-	.incbin "sound/direct_sound_samples/cry_goldeen.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_goldeen.bin"
 
 	.align 2
 Cry_Seaking:: @ 8529740
-	.incbin "sound/direct_sound_samples/cry_seaking.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_seaking.bin"
 
 	.align 2
 Cry_Staryu:: @ 852AA98
-	.incbin "sound/direct_sound_samples/cry_staryu.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_staryu.bin"
 
 	.align 2
 Cry_Starmie:: @ 852BE80
-	.incbin "sound/direct_sound_samples/cry_starmie.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_starmie.bin"
 
 	.align 2
 Cry_MrMime:: @ 852D35C
-	.incbin "sound/direct_sound_samples/cry_mr_mime.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_mr_mime.bin"
 
 	.align 2
 Cry_Scyther:: @ 852E64C
-	.incbin "sound/direct_sound_samples/cry_scyther.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_scyther.bin"
 
 	.align 2
 Cry_Jynx:: @ 852F3A8
-	.incbin "sound/direct_sound_samples/cry_jynx.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_jynx.bin"
 
 	.align 2
 Cry_Electabuzz:: @ 853231C
-	.incbin "sound/direct_sound_samples/cry_electabuzz.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_electabuzz.bin"
 
 	.align 2
 Cry_Magmar:: @ 8534200
-	.incbin "sound/direct_sound_samples/cry_magmar.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_magmar.bin"
 
 	.align 2
 Cry_Pinsir:: @ 853517C
-	.incbin "sound/direct_sound_samples/cry_pinsir.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_pinsir.bin"
 
 	.align 2
 Cry_Tauros:: @ 8535DD8
-	.incbin "sound/direct_sound_samples/cry_tauros.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_tauros.bin"
 
 	.align 2
 Cry_Magikarp:: @ 853702C
-	.incbin "sound/direct_sound_samples/cry_magikarp.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_magikarp.bin"
 
 	.align 2
 Cry_Gyarados:: @ 8538334
-	.incbin "sound/direct_sound_samples/cry_gyarados.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_gyarados.bin"
 
 	.align 2
 Cry_Lapras:: @ 8539768
-	.incbin "sound/direct_sound_samples/cry_lapras.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_lapras.bin"
 
 	.align 2
 Cry_Ditto:: @ 853A63C
-	.incbin "sound/direct_sound_samples/cry_ditto.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ditto.bin"
 
 	.align 2
 Cry_Eevee:: @ 853B158
-	.incbin "sound/direct_sound_samples/cry_eevee.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_eevee.bin"
 
 	.align 2
 Cry_Vaporeon:: @ 853BF90
-	.incbin "sound/direct_sound_samples/cry_vaporeon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_vaporeon.bin"
 
 	.align 2
 Cry_Jolteon:: @ 853D5A8
-	.incbin "sound/direct_sound_samples/cry_jolteon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_jolteon.bin"
 
 	.align 2
 Cry_Flareon:: @ 853E57C
-	.incbin "sound/direct_sound_samples/cry_flareon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_flareon.bin"
 
 	.align 2
 Cry_Porygon:: @ 853F500
-	.incbin "sound/direct_sound_samples/cry_porygon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_porygon.bin"
 
 	.align 2
 Cry_Omanyte:: @ 854090C
-	.incbin "sound/direct_sound_samples/cry_omanyte.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_omanyte.bin"
 
 	.align 2
 Cry_Omastar:: @ 8541664
-	.incbin "sound/direct_sound_samples/cry_omastar.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_omastar.bin"
 
 	.align 2
 Cry_Kabuto:: @ 85423B8
-	.incbin "sound/direct_sound_samples/cry_kabuto.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_kabuto.bin"
 
 	.align 2
 Cry_Kabutops:: @ 854300C
-	.incbin "sound/direct_sound_samples/cry_kabutops.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_kabutops.bin"
 
 	.align 2
 Cry_Aerodactyl:: @ 8543DC8
-	.incbin "sound/direct_sound_samples/cry_aerodactyl.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_aerodactyl.bin"
 
 	.align 2
 Cry_Snorlax:: @ 8545624
-	.incbin "sound/direct_sound_samples/cry_snorlax.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_snorlax.bin"
 
 	.align 2
 Cry_Articuno:: @ 8545B60
-	.incbin "sound/direct_sound_samples/cry_articuno.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_articuno.bin"
 
 	.align 2
 Cry_Zapdos:: @ 8547308
-	.incbin "sound/direct_sound_samples/cry_zapdos.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_zapdos.bin"
 
 	.align 2
 Cry_Moltres:: @ 8548280
-	.incbin "sound/direct_sound_samples/cry_moltres.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_moltres.bin"
 
 	.align 2
 Cry_Dratini:: @ 8549A2C
-	.incbin "sound/direct_sound_samples/cry_dratini.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_dratini.bin"
 
 	.align 2
 Cry_Dragonair:: @ 854A5C8
-	.incbin "sound/direct_sound_samples/cry_dragonair.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_dragonair.bin"
 
 	.align 2
 Cry_Dragonite:: @ 854B670
-	.incbin "sound/direct_sound_samples/cry_dragonite.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_dragonite.bin"
 
 	.align 2
 Cry_Mewtwo:: @ 854C97C
-	.incbin "sound/direct_sound_samples/cry_mewtwo.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_mewtwo.bin"
 
 	.align 2
 Cry_Mew:: @ 854E7E4
-	.incbin "sound/direct_sound_samples/cry_mew.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_mew.bin"
 
 	.align 2
 Cry_Chikorita:: @ 855064C
-	.incbin "sound/direct_sound_samples/cry_chikorita.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_chikorita.bin"
 
 	.align 2
 Cry_Bayleef:: @ 8550B8C
-	.incbin "sound/direct_sound_samples/cry_bayleef.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_bayleef.bin"
 
 	.align 2
 Cry_Meganium:: @ 8551458
-	.incbin "sound/direct_sound_samples/cry_meganium.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_meganium.bin"
 
 	.align 2
 Cry_Cyndaquil:: @ 8552490
-	.incbin "sound/direct_sound_samples/cry_cyndaquil.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_cyndaquil.bin"
 
 	.align 2
 Cry_Quilava:: @ 8552B94
-	.incbin "sound/direct_sound_samples/cry_quilava.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_quilava.bin"
 
 	.align 2
 Cry_Typhlosion:: @ 855377C
-	.incbin "sound/direct_sound_samples/cry_typhlosion.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_typhlosion.bin"
 
 	.align 2
 Cry_Totodile:: @ 8555D8C
-	.incbin "sound/direct_sound_samples/cry_totodile.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_totodile.bin"
 
 	.align 2
 Cry_Croconaw:: @ 8556FE4
-	.incbin "sound/direct_sound_samples/cry_croconaw.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_croconaw.bin"
 
 	.align 2
 Cry_Feraligatr:: @ 8558420
-	.incbin "sound/direct_sound_samples/cry_feraligatr.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_feraligatr.bin"
 
 	.align 2
 Cry_Sentret:: @ 8559DA4
-	.incbin "sound/direct_sound_samples/cry_sentret.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sentret.bin"
 
 	.align 2
 Cry_Furret:: @ 855A1CC
-	.incbin "sound/direct_sound_samples/cry_furret.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_furret.bin"
 
 	.align 2
 Cry_Hoothoot:: @ 855A814
-	.incbin "sound/direct_sound_samples/cry_hoothoot.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_hoothoot.bin"
 
 	.align 2
 Cry_Noctowl:: @ 855B2F8
-	.incbin "sound/direct_sound_samples/cry_noctowl.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_noctowl.bin"
 
 	.align 2
 Cry_Ledyba:: @ 855C828
-	.incbin "sound/direct_sound_samples/cry_ledyba.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ledyba.bin"
 
 	.align 2
 Cry_Ledian:: @ 855CF20
-	.incbin "sound/direct_sound_samples/cry_ledian.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ledian.bin"
 
 	.align 2
 Cry_Spinarak:: @ 855D784
-	.incbin "sound/direct_sound_samples/cry_spinarak.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_spinarak.bin"
 
 	.align 2
 Cry_Ariados:: @ 855E4E8
-	.incbin "sound/direct_sound_samples/cry_ariados.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ariados.bin"
 
 	.align 2
 Cry_Crobat:: @ 855F13C
-	.incbin "sound/direct_sound_samples/cry_crobat.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_crobat.bin"
 
 	.align 2
 Cry_Chinchou:: @ 856086C
-	.incbin "sound/direct_sound_samples/cry_chinchou.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_chinchou.bin"
 
 	.align 2
 Cry_Lanturn:: @ 856151C
-	.incbin "sound/direct_sound_samples/cry_lanturn.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_lanturn.bin"
 
 	.align 2
 Cry_Pichu:: @ 8561FA8
-	.incbin "sound/direct_sound_samples/cry_pichu.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_pichu.bin"
 
 	.align 2
 Cry_Cleffa:: @ 85626FC
-	.incbin "sound/direct_sound_samples/cry_cleffa.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_cleffa.bin"
 
 	.align 2
 Cry_Igglybuff:: @ 8562CEC
-	.incbin "sound/direct_sound_samples/cry_igglybuff.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_igglybuff.bin"
 
 	.align 2
 Cry_Togepi:: @ 85633E8
-	.incbin "sound/direct_sound_samples/cry_togepi.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_togepi.bin"
 
 	.align 2
 Cry_Togetic:: @ 8563ED0
-	.incbin "sound/direct_sound_samples/cry_togetic.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_togetic.bin"
 
 	.align 2
 Cry_Natu:: @ 85645D0
-	.incbin "sound/direct_sound_samples/cry_natu.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_natu.bin"
 
 	.align 2
 Cry_Xatu:: @ 8565060
-	.incbin "sound/direct_sound_samples/cry_xatu.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_xatu.bin"
 
 	.align 2
 Cry_Mareep:: @ 8565F2C
-	.incbin "sound/direct_sound_samples/cry_mareep.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_mareep.bin"
 
 	.align 2
 Cry_Flaaffy:: @ 8566684
-	.incbin "sound/direct_sound_samples/cry_flaaffy.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_flaaffy.bin"
 
 	.align 2
 Cry_Ampharos:: @ 8567438
-	.incbin "sound/direct_sound_samples/cry_ampharos.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ampharos.bin"
 
 	.align 2
 Cry_Bellossom:: @ 85684B8
-	.incbin "sound/direct_sound_samples/cry_bellossom.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_bellossom.bin"
 
 	.align 2
 Cry_Marill:: @ 85692D0
-	.incbin "sound/direct_sound_samples/cry_marill.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_marill.bin"
 
 	.align 2
 Cry_Azumarill:: @ 8569FE4
-	.incbin "sound/direct_sound_samples/cry_azumarill.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_azumarill.bin"
 
 	.align 2
 Cry_Sudowoodo:: @ 856B0D0
-	.incbin "sound/direct_sound_samples/cry_sudowoodo.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sudowoodo.bin"
 
 	.align 2
 Cry_Politoed:: @ 856C100
-	.incbin "sound/direct_sound_samples/cry_politoed.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_politoed.bin"
 
 	.align 2
 Cry_Hoppip:: @ 856D344
-	.incbin "sound/direct_sound_samples/cry_hoppip.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_hoppip.bin"
 
 	.align 2
 Cry_Skiploom:: @ 856DBB0
-	.incbin "sound/direct_sound_samples/cry_skiploom.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_skiploom.bin"
 
 	.align 2
 Cry_Jumpluff:: @ 856E8B8
-	.incbin "sound/direct_sound_samples/cry_jumpluff.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_jumpluff.bin"
 
 	.align 2
 Cry_Aipom:: @ 856F8F4
-	.incbin "sound/direct_sound_samples/cry_aipom.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_aipom.bin"
 
 	.align 2
 Cry_Sunkern:: @ 8570714
-	.incbin "sound/direct_sound_samples/cry_sunkern.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sunkern.bin"
 
 	.align 2
 Cry_Sunflora:: @ 8570F28
-	.incbin "sound/direct_sound_samples/cry_sunflora.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sunflora.bin"
 
 	.align 2
 Cry_Yanma:: @ 8571F08
-	.incbin "sound/direct_sound_samples/cry_yanma.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_yanma.bin"
 
 	.align 2
 Cry_Wooper:: @ 8573010
-	.incbin "sound/direct_sound_samples/cry_wooper.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_wooper.bin"
 
 	.align 2
 Cry_Quagsire:: @ 8573770
-	.incbin "sound/direct_sound_samples/cry_quagsire.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_quagsire.bin"
 
 	.align 2
 Cry_Espeon:: @ 85744D0
-	.incbin "sound/direct_sound_samples/cry_espeon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_espeon.bin"
 
 	.align 2
 Cry_Umbreon:: @ 8575884
-	.incbin "sound/direct_sound_samples/cry_umbreon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_umbreon.bin"
 
 	.align 2
 Cry_Murkrow:: @ 8576804
-	.incbin "sound/direct_sound_samples/cry_murkrow.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_murkrow.bin"
 
 	.align 2
 Cry_Slowking:: @ 85778C8
-	.incbin "sound/direct_sound_samples/cry_slowking.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_slowking.bin"
 
 	.align 2
 Cry_Misdreavus:: @ 85790AC
-	.incbin "sound/direct_sound_samples/cry_misdreavus.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_misdreavus.bin"
 
 	.align 2
 Cry_Unown:: @ 8579C4C
-	.incbin "sound/direct_sound_samples/cry_unown.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_unown.bin"
 
 	.align 2
 Cry_Wobbuffet:: @ 857A974
-	.incbin "sound/direct_sound_samples/cry_wobbuffet.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_wobbuffet.bin"
 
 	.align 2
 Cry_Girafarig:: @ 857BE10
-	.incbin "sound/direct_sound_samples/cry_girafarig.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_girafarig.bin"
 
 	.align 2
 Cry_Pineco:: @ 857CCC4
-	.incbin "sound/direct_sound_samples/cry_pineco.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_pineco.bin"
 
 	.align 2
 Cry_Forretress:: @ 857DA24
-	.incbin "sound/direct_sound_samples/cry_forretress.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_forretress.bin"
 
 	.align 2
 Cry_Dunsparce:: @ 857EE2C
-	.incbin "sound/direct_sound_samples/cry_dunsparce.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_dunsparce.bin"
 
 	.align 2
 Cry_Gligar:: @ 857FE0C
-	.incbin "sound/direct_sound_samples/cry_gligar.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_gligar.bin"
 
 	.align 2
 Cry_Steelix:: @ 8580A2C
-	.incbin "sound/direct_sound_samples/cry_steelix.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_steelix.bin"
 
 	.align 2
 Cry_Snubbull:: @ 8583054
-	.incbin "sound/direct_sound_samples/cry_snubbull.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_snubbull.bin"
 
 	.align 2
 Cry_Granbull:: @ 8583EC8
-	.incbin "sound/direct_sound_samples/cry_granbull.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_granbull.bin"
 
 	.align 2
 Cry_Qwilfish:: @ 858566C
-	.incbin "sound/direct_sound_samples/cry_qwilfish.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_qwilfish.bin"
 
 	.align 2
 Cry_Scizor:: @ 8586208
-	.incbin "sound/direct_sound_samples/cry_scizor.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_scizor.bin"
 
 	.align 2
 Cry_Shuckle:: @ 8587904
-	.incbin "sound/direct_sound_samples/cry_shuckle.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_shuckle.bin"
 
 	.align 2
 Cry_Heracross:: @ 8588338
-	.incbin "sound/direct_sound_samples/cry_heracross.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_heracross.bin"
 
 	.align 2
 Cry_Sneasel:: @ 858958C
-	.incbin "sound/direct_sound_samples/cry_sneasel.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sneasel.bin"
 
 	.align 2
 Cry_Teddiursa:: @ 8589EB0
-	.incbin "sound/direct_sound_samples/cry_teddiursa.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_teddiursa.bin"
 
 	.align 2
 Cry_Ursaring:: @ 858AF3C
-	.incbin "sound/direct_sound_samples/cry_ursaring.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ursaring.bin"
 
 	.align 2
 Cry_Slugma:: @ 858CD14
-	.incbin "sound/direct_sound_samples/cry_slugma.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_slugma.bin"
 
 	.align 2
 Cry_Magcargo:: @ 858DE2C
-	.incbin "sound/direct_sound_samples/cry_magcargo.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_magcargo.bin"
 
 	.align 2
 Cry_Swinub:: @ 858F334
-	.incbin "sound/direct_sound_samples/cry_swinub.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_swinub.bin"
 
 	.align 2
 Cry_Piloswine:: @ 858FFDC
-	.incbin "sound/direct_sound_samples/cry_piloswine.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_piloswine.bin"
 
 	.align 2
 Cry_Corsola:: @ 8590CD0
-	.incbin "sound/direct_sound_samples/cry_corsola.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_corsola.bin"
 
 	.align 2
 Cry_Remoraid:: @ 85919B0
-	.incbin "sound/direct_sound_samples/cry_remoraid.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_remoraid.bin"
 
 	.align 2
 Cry_Octillery:: @ 8592440
-	.incbin "sound/direct_sound_samples/cry_octillery.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_octillery.bin"
 
 	.align 2
 Cry_Delibird:: @ 8593E84
-	.incbin "sound/direct_sound_samples/cry_delibird.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_delibird.bin"
 
 	.align 2
 Cry_Mantine:: @ 8594EB8
-	.incbin "sound/direct_sound_samples/cry_mantine.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_mantine.bin"
 
 	.align 2
 Cry_Skarmory:: @ 8595E80
-	.incbin "sound/direct_sound_samples/cry_skarmory.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_skarmory.bin"
 
 	.align 2
 Cry_Houndour:: @ 8597688
-	.incbin "sound/direct_sound_samples/cry_houndour.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_houndour.bin"
 
 	.align 2
 Cry_Houndoom:: @ 8598330
-	.incbin "sound/direct_sound_samples/cry_houndoom.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_houndoom.bin"
 
 	.align 2
 Cry_Kingdra:: @ 85996E0
-	.incbin "sound/direct_sound_samples/cry_kingdra.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_kingdra.bin"
 
 	.align 2
 Cry_Phanpy:: @ 859A4B8
-	.incbin "sound/direct_sound_samples/cry_phanpy.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_phanpy.bin"
 
 	.align 2
 Cry_Donphan:: @ 859B008
-	.incbin "sound/direct_sound_samples/cry_donphan.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_donphan.bin"
 
 	.align 2
 Cry_Porygon2:: @ 859C12C
-	.incbin "sound/direct_sound_samples/cry_porygon2.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_porygon2.bin"
 
 	.align 2
 Cry_Stantler:: @ 859D0E4
-	.incbin "sound/direct_sound_samples/cry_stantler.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_stantler.bin"
 
 	.align 2
 Cry_Smeargle:: @ 859E760
-	.incbin "sound/direct_sound_samples/cry_smeargle.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_smeargle.bin"
 
 	.align 2
 Cry_Tyrogue:: @ 859F194
-	.incbin "sound/direct_sound_samples/cry_tyrogue.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_tyrogue.bin"
 
 	.align 2
 Cry_Hitmontop:: @ 85A01BC
-	.incbin "sound/direct_sound_samples/cry_hitmontop.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_hitmontop.bin"
 
 	.align 2
 Cry_Smoochum:: @ 85A0F9C
-	.incbin "sound/direct_sound_samples/cry_smoochum.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_smoochum.bin"
 
 	.align 2
 Cry_Elekid:: @ 85A1B50
-	.incbin "sound/direct_sound_samples/cry_elekid.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_elekid.bin"
 
 	.align 2
 Cry_Magby:: @ 85A25DC
-	.incbin "sound/direct_sound_samples/cry_magby.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_magby.bin"
 
 	.align 2
 Cry_Miltank:: @ 85A344C
-	.incbin "sound/direct_sound_samples/cry_miltank.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_miltank.bin"
 
 	.align 2
 Cry_Blissey:: @ 85A4328
-	.incbin "sound/direct_sound_samples/cry_blissey.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_blissey.bin"
 
 	.align 2
 Cry_Raikou:: @ 85A53BC
-	.incbin "sound/direct_sound_samples/cry_raikou.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_raikou.bin"
 
 	.align 2
 Cry_Entei:: @ 85A652C
-	.incbin "sound/direct_sound_samples/cry_entei.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_entei.bin"
 
 	.align 2
 Cry_Suicune:: @ 85A79A0
-	.incbin "sound/direct_sound_samples/cry_suicune.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_suicune.bin"
 
 	.align 2
 Cry_Larvitar:: @ 85A8BE8
-	.incbin "sound/direct_sound_samples/cry_larvitar.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_larvitar.bin"
 
 	.align 2
 Cry_Pupitar:: @ 85A9898
-	.incbin "sound/direct_sound_samples/cry_pupitar.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_pupitar.bin"
 
 	.align 2
 Cry_Tyranitar:: @ 85AA108
-	.incbin "sound/direct_sound_samples/cry_tyranitar.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_tyranitar.bin"
 
 	.align 2
 Cry_Lugia:: @ 85AB868
-	.incbin "sound/direct_sound_samples/cry_lugia.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_lugia.bin"
 
 	.align 2
 Cry_HoOh:: @ 85ADE60
-	.incbin "sound/direct_sound_samples/cry_ho_oh.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ho_oh.bin"
 
 	.align 2
 Cry_Celebi:: @ 85AF4F4
-	.incbin "sound/direct_sound_samples/cry_celebi.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_celebi.bin"
 
 	.align 2
 Cry_Kecleon:: @ 85B036C
-	.incbin "sound/direct_sound_samples/cry_kecleon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_kecleon.bin"
 
 	.align 2
 Cry_Roselia:: @ 85B0BCC
-	.incbin "sound/direct_sound_samples/cry_roselia.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_roselia.bin"
 
 	.align 2
 Cry_Torkoal:: @ 85B168C
-	.incbin "sound/direct_sound_samples/cry_torkoal.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_torkoal.bin"
 
 	.align 2
 Cry_Electrike:: @ 85B1FD8
-	.incbin "sound/direct_sound_samples/cry_electrike.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_electrike.bin"
 
 	.align 2
 Cry_Manectric:: @ 85B2C34
-	.incbin "sound/direct_sound_samples/cry_manectric.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_manectric.bin"
 
 	.align 2
 Cry_Duskull:: @ 85B413C
-	.incbin "sound/direct_sound_samples/cry_duskull.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_duskull.bin"
 
 	.align 2
 Cry_Latias:: @ 85B4BD4
-	.incbin "sound/direct_sound_samples/cry_latias.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_latias.bin"
 
 	.align 2
 Cry_Wynaut:: @ 85B5804
-	.incbin "sound/direct_sound_samples/cry_wynaut.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_wynaut.bin"
 
 	.align 2
 Cry_Seviper:: @ 85B65E4
-	.incbin "sound/direct_sound_samples/cry_seviper.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_seviper.bin"
 
 	.align 2
 Cry_Sharpedo:: @ 85B7184
-	.incbin "sound/direct_sound_samples/cry_sharpedo.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sharpedo.bin"
 
 	.align 2
 Cry_Zangoose:: @ 85B8890
-	.incbin "sound/direct_sound_samples/cry_zangoose.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_zangoose.bin"
 
 	.align 2
 Cry_Azurill:: @ 85B9220
-	.incbin "sound/direct_sound_samples/cry_azurill.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_azurill.bin"
 
 	.align 2
 Cry_Swablu:: @ 85B9C88
-	.incbin "sound/direct_sound_samples/cry_swablu.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_swablu.bin"
 
 	.align 2
 Cry_Altaria:: @ 85BA220
-	.incbin "sound/direct_sound_samples/cry_altaria.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_altaria.bin"
 
 	.align 2
 Cry_Unused265:: @ 85BAD3C
-	.incbin "sound/direct_sound_samples/cry_unused_265.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_unused_265.bin"
 
 	.align 2
 Cry_Taillow:: @ 85BB690
-	.incbin "sound/direct_sound_samples/cry_taillow.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_taillow.bin"
 
 	.align 2
 Cry_Swellow:: @ 85BBC90
-	.incbin "sound/direct_sound_samples/cry_swellow.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_swellow.bin"
 
 	.align 2
 Cry_Unused268:: @ 85BC594
-	.incbin "sound/direct_sound_samples/cry_unused_268.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_unused_268.bin"
 
 	.align 2
 Cry_Spinda:: @ 85BD744
-	.incbin "sound/direct_sound_samples/cry_spinda.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_spinda.bin"
 
 	.align 2
 Cry_Torchic:: @ 85BE3B0
-	.incbin "sound/direct_sound_samples/cry_torchic.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_torchic.bin"
 
 	.align 2
 Cry_Combusken:: @ 85BED58
-	.incbin "sound/direct_sound_samples/cry_combusken.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_combusken.bin"
 
 	.align 2
 Cry_Blaziken:: @ 85C0A2C
-	.incbin "sound/direct_sound_samples/cry_blaziken.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_blaziken.bin"
 
 	.align 2
 Cry_Treecko:: @ 85C29AC
-	.incbin "sound/direct_sound_samples/cry_treecko.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_treecko.bin"
 
 	.align 2
 Cry_Grovyle:: @ 85C3554
-	.incbin "sound/direct_sound_samples/cry_grovyle.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_grovyle.bin"
 
 	.align 2
 Cry_Sceptile:: @ 85C49C8
-	.incbin "sound/direct_sound_samples/cry_sceptile.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sceptile.bin"
 
 	.align 2
 Cry_Mudkip:: @ 85C63E4
-	.incbin "sound/direct_sound_samples/cry_mudkip.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_mudkip.bin"
 
 	.align 2
 Cry_Marshtomp:: @ 85C6B68
-	.incbin "sound/direct_sound_samples/cry_marshtomp.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_marshtomp.bin"
 
 	.align 2
 Cry_Swampert:: @ 85C7C6C
-	.incbin "sound/direct_sound_samples/cry_swampert.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_swampert.bin"
 
 	.align 2
 Cry_Pelipper:: @ 85C92EC
-	.incbin "sound/direct_sound_samples/cry_pelipper.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_pelipper.bin"
 
 	.align 2
 Cry_Wingull:: @ 85C9EB4
-	.incbin "sound/direct_sound_samples/cry_wingull.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_wingull.bin"
 
 	.align 2
 Cry_Banette:: @ 85CAAF4
-	.incbin "sound/direct_sound_samples/cry_banette.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_banette.bin"
 
 	.align 2
 Cry_Shuppet:: @ 85CB79C
-	.incbin "sound/direct_sound_samples/cry_shuppet.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_shuppet.bin"
 
 	.align 2
 Cry_Lotad:: @ 85CBFDC
-	.incbin "sound/direct_sound_samples/cry_lotad.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_lotad.bin"
 
 	.align 2
 Cry_Lombre:: @ 85CC444
-	.incbin "sound/direct_sound_samples/cry_lombre.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_lombre.bin"
 
 	.align 2
 Cry_Ludicolo:: @ 85CD2D8
-	.incbin "sound/direct_sound_samples/cry_ludicolo.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ludicolo.bin"
 
 	.align 2
 Cry_Seedot:: @ 85CE3A8
-	.incbin "sound/direct_sound_samples/cry_seedot.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_seedot.bin"
 
 	.align 2
 Cry_Nuzleaf:: @ 85CEBD4
-	.incbin "sound/direct_sound_samples/cry_nuzleaf.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_nuzleaf.bin"
 
 	.align 2
 Cry_Shiftry:: @ 85CF73C
-	.incbin "sound/direct_sound_samples/cry_shiftry.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_shiftry.bin"
 
 	.align 2
 Cry_Carvanha:: @ 85D0B00
-	.incbin "sound/direct_sound_samples/cry_carvanha.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_carvanha.bin"
 
 	.align 2
 Cry_Wurmple:: @ 85D1514
-	.incbin "sound/direct_sound_samples/cry_wurmple.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_wurmple.bin"
 
 	.align 2
 Cry_Silcoon:: @ 85D1DE0
-	.incbin "sound/direct_sound_samples/cry_silcoon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_silcoon.bin"
 
 	.align 2
 Cry_Beautifly:: @ 85D2E0C
-	.incbin "sound/direct_sound_samples/cry_beautifly.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_beautifly.bin"
 
 	.align 2
 Cry_Cascoon:: @ 85D3644
-	.incbin "sound/direct_sound_samples/cry_cascoon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_cascoon.bin"
 
 	.align 2
 Cry_Dustox:: @ 85D4688
-	.incbin "sound/direct_sound_samples/cry_dustox.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_dustox.bin"
 
 	.align 2
 Cry_Ralts:: @ 85D5334
-	.incbin "sound/direct_sound_samples/cry_ralts.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ralts.bin"
 
 	.align 2
 Cry_Kirlia:: @ 85D5D50
-	.incbin "sound/direct_sound_samples/cry_kirlia.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_kirlia.bin"
 
 	.align 2
 Cry_Gardevoir:: @ 85D6980
-	.incbin "sound/direct_sound_samples/cry_gardevoir.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_gardevoir.bin"
 
 	.align 2
 Cry_Slakoth:: @ 85D81E4
-	.incbin "sound/direct_sound_samples/cry_slakoth.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_slakoth.bin"
 
 	.align 2
 Cry_Vigoroth:: @ 85D8A68
-	.incbin "sound/direct_sound_samples/cry_vigoroth.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_vigoroth.bin"
 
 	.align 2
 Cry_Slaking:: @ 85D98C0
-	.incbin "sound/direct_sound_samples/cry_slaking.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_slaking.bin"
 
 	.align 2
 Cry_Nincada:: @ 85DA2AC
-	.incbin "sound/direct_sound_samples/cry_nincada.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_nincada.bin"
 
 	.align 2
 Cry_Ninjask:: @ 85DA91C
-	.incbin "sound/direct_sound_samples/cry_ninjask.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_ninjask.bin"
 
 	.align 2
 Cry_Shedinja:: @ 85DB544
-	.incbin "sound/direct_sound_samples/cry_shedinja.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_shedinja.bin"
 
 	.align 2
 Cry_Makuhita:: @ 85DBCFC
-	.incbin "sound/direct_sound_samples/cry_makuhita.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_makuhita.bin"
 
 	.align 2
 Cry_Hariyama:: @ 85DC458
-	.incbin "sound/direct_sound_samples/cry_hariyama.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_hariyama.bin"
 
 	.align 2
 Cry_Nosepass:: @ 85DD510
-	.incbin "sound/direct_sound_samples/cry_nosepass.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_nosepass.bin"
 
 	.align 2
 Cry_Glalie:: @ 85DE274
-	.incbin "sound/direct_sound_samples/cry_glalie.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_glalie.bin"
 
 	.align 2
 Cry_Plusle:: @ 85DF758
-	.incbin "sound/direct_sound_samples/cry_plusle.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_plusle.bin"
 
 	.align 2
 Cry_Minun:: @ 85E0054
-	.incbin "sound/direct_sound_samples/cry_minun.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_minun.bin"
 
 	.align 2
 Cry_Surskit:: @ 85E105C
-	.incbin "sound/direct_sound_samples/cry_surskit.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_surskit.bin"
 
 	.align 2
 Cry_Masquerain:: @ 85E1ADC
-	.incbin "sound/direct_sound_samples/cry_masquerain.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_masquerain.bin"
 
 	.align 2
 Cry_Skitty:: @ 85E2E90
-	.incbin "sound/direct_sound_samples/cry_skitty.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_skitty.bin"
 
 	.align 2
 Cry_Delcatty:: @ 85E35A4
-	.incbin "sound/direct_sound_samples/cry_delcatty.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_delcatty.bin"
 
 	.align 2
 Cry_Gulpin:: @ 85E4ABC
-	.incbin "sound/direct_sound_samples/cry_gulpin.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_gulpin.bin"
 
 	.align 2
 Cry_Swalot:: @ 85E52C0
-	.incbin "sound/direct_sound_samples/cry_swalot.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_swalot.bin"
 
 	.align 2
 Cry_Numel:: @ 85E6420
-	.incbin "sound/direct_sound_samples/cry_numel.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_numel.bin"
 
 	.align 2
 Cry_Camerupt:: @ 85E6D6C
-	.incbin "sound/direct_sound_samples/cry_camerupt.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_camerupt.bin"
 
 	.align 2
 Cry_Barboach:: @ 85E848C
-	.incbin "sound/direct_sound_samples/cry_barboach.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_barboach.bin"
 
 	.align 2
 Cry_Whiscash:: @ 85E8DC8
-	.incbin "sound/direct_sound_samples/cry_whiscash.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_whiscash.bin"
 
 	.align 2
 Cry_Corphish:: @ 85E9EC4
-	.incbin "sound/direct_sound_samples/cry_corphish.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_corphish.bin"
 
 	.align 2
 Cry_Crawdaunt:: @ 85EAAC8
-	.incbin "sound/direct_sound_samples/cry_crawdaunt.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_crawdaunt.bin"
 
 	.align 2
 Cry_Spoink:: @ 85EC380
-	.incbin "sound/direct_sound_samples/cry_spoink.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_spoink.bin"
 
 	.align 2
 Cry_Grumpig:: @ 85ECAC0
-	.incbin "sound/direct_sound_samples/cry_grumpig.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_grumpig.bin"
 
 	.align 2
 Cry_Trapinch:: @ 85ED760
-	.incbin "sound/direct_sound_samples/cry_trapinch.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_trapinch.bin"
 
 	.align 2
 Cry_Vibrava:: @ 85EE184
-	.incbin "sound/direct_sound_samples/cry_vibrava.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_vibrava.bin"
 
 	.align 2
 Cry_Flygon:: @ 85EEF88
-	.incbin "sound/direct_sound_samples/cry_flygon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_flygon.bin"
 
 	.align 2
 Cry_Cacnea:: @ 85F0990
-	.incbin "sound/direct_sound_samples/cry_cacnea.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_cacnea.bin"
 
 	.align 2
 Cry_Cacturne:: @ 85F1280
-	.incbin "sound/direct_sound_samples/cry_cacturne.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_cacturne.bin"
 
 	.align 2
 Cry_Baltoy:: @ 85F2930
-	.incbin "sound/direct_sound_samples/cry_baltoy.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_baltoy.bin"
 
 	.align 2
 Cry_Claydol:: @ 85F35B4
-	.incbin "sound/direct_sound_samples/cry_claydol.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_claydol.bin"
 
 	.align 2
 Cry_Lunatone:: @ 85F4914
-	.incbin "sound/direct_sound_samples/cry_lunatone.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_lunatone.bin"
 
 	.align 2
 Cry_Solrock:: @ 85F6110
-	.incbin "sound/direct_sound_samples/cry_solrock.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_solrock.bin"
 
 	.align 2
 Cry_Feebas:: @ 85F713C
-	.incbin "sound/direct_sound_samples/cry_feebas.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_feebas.bin"
 
 	.align 2
 Cry_Milotic:: @ 85F7910
-	.incbin "sound/direct_sound_samples/cry_milotic.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_milotic.bin"
 
 	.align 2
 Cry_Absol:: @ 85FA054
-	.incbin "sound/direct_sound_samples/cry_absol.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_absol.bin"
 
 	.align 2
 Cry_Meditite:: @ 85FAAD0
-	.incbin "sound/direct_sound_samples/cry_meditite.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_meditite.bin"
 
 	.align 2
 Cry_Medicham:: @ 85FB2F0
-	.incbin "sound/direct_sound_samples/cry_medicham.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_medicham.bin"
 
 	.align 2
 Cry_Spheal:: @ 85FC374
-	.incbin "sound/direct_sound_samples/cry_spheal.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_spheal.bin"
 
 	.align 2
 Cry_Sealeo:: @ 85FC928
-	.incbin "sound/direct_sound_samples/cry_sealeo.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sealeo.bin"
 
 	.align 2
 Cry_Walrein:: @ 85FD500
-	.incbin "sound/direct_sound_samples/cry_walrein.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_walrein.bin"
 
 	.align 2
 Cry_Clamperl:: @ 85FF94C
-	.incbin "sound/direct_sound_samples/cry_clamperl.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_clamperl.bin"
 
 	.align 2
 Cry_Huntail:: @ 8600B9C
-	.incbin "sound/direct_sound_samples/cry_huntail.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_huntail.bin"
 
 	.align 2
 Cry_Gorebyss:: @ 8601B84
-	.incbin "sound/direct_sound_samples/cry_gorebyss.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_gorebyss.bin"
 
 	.align 2
 Cry_Lileep:: @ 86031F0
-	.incbin "sound/direct_sound_samples/cry_lileep.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_lileep.bin"
 
 	.align 2
 Cry_Cradily:: @ 8603B98
-	.incbin "sound/direct_sound_samples/cry_cradily.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_cradily.bin"
 
 	.align 2
 Cry_Anorith:: @ 86058C8
-	.incbin "sound/direct_sound_samples/cry_anorith.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_anorith.bin"
 
 	.align 2
 Cry_Armaldo:: @ 8606480
-	.incbin "sound/direct_sound_samples/cry_armaldo.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_armaldo.bin"
 
 	.align 2
 Cry_Beldum:: @ 8607B54
-	.incbin "sound/direct_sound_samples/cry_beldum.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_beldum.bin"
 
 	.align 2
 Cry_Metang:: @ 86084F4
-	.incbin "sound/direct_sound_samples/cry_metang.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_metang.bin"
 
 	.align 2
 Cry_Metagross:: @ 86097C8
-	.incbin "sound/direct_sound_samples/cry_metagross.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_metagross.bin"
 
 	.align 2
 Cry_Bagon:: @ 860BF40
-	.incbin "sound/direct_sound_samples/cry_bagon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_bagon.bin"
 
 	.align 2
 Cry_Shelgon:: @ 860C714
-	.incbin "sound/direct_sound_samples/cry_shelgon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_shelgon.bin"
 
 	.align 2
 Cry_Regirock:: @ 860DB1C
-	.incbin "sound/direct_sound_samples/cry_regirock.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_regirock.bin"
 
 	.align 2
 Cry_Regice:: @ 860FAF8
-	.incbin "sound/direct_sound_samples/cry_regice.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_regice.bin"
 
 	.align 2
 Cry_Registeel:: @ 8611AF8
-	.incbin "sound/direct_sound_samples/cry_registeel.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_registeel.bin"
 
 	.align 2
 Cry_Castform:: @ 86131FC
-	.incbin "sound/direct_sound_samples/cry_castform.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_castform.bin"
 
 	.align 2
 Cry_Volbeat:: @ 8613E94
-	.incbin "sound/direct_sound_samples/cry_volbeat.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_volbeat.bin"
 
 	.align 2
 Cry_Illumise:: @ 8614A1C
-	.incbin "sound/direct_sound_samples/cry_illumise.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_illumise.bin"
 
 	.align 2
 Cry_Poochyena:: @ 8615B34
-	.incbin "sound/direct_sound_samples/cry_poochyena.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_poochyena.bin"
 
 	.align 2
 Cry_Mightyena:: @ 861647C
-	.incbin "sound/direct_sound_samples/cry_mightyena.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_mightyena.bin"
 
 	.align 2
 Cry_Dusclops:: @ 8617808
-	.incbin "sound/direct_sound_samples/cry_dusclops.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_dusclops.bin"
 
 	.align 2
 Cry_Sableye:: @ 86185C0
-	.incbin "sound/direct_sound_samples/cry_sableye.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_sableye.bin"
 
 	.align 2
 Cry_Mawile:: @ 8619164
-	.incbin "sound/direct_sound_samples/cry_mawile.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_mawile.bin"
 
 	.align 2
 Cry_Aron:: @ 8619CE4
-	.incbin "sound/direct_sound_samples/cry_aron.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_aron.bin"
 
 	.align 2
 Cry_Lairon:: @ 861A610
-	.incbin "sound/direct_sound_samples/cry_lairon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_lairon.bin"
 
 	.align 2
 Cry_Aggron:: @ 861BAE8
-	.incbin "sound/direct_sound_samples/cry_aggron.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_aggron.bin"
 
 	.align 2
 Cry_Relicanth:: @ 861D48C
-	.incbin "sound/direct_sound_samples/cry_relicanth.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_relicanth.bin"
 
 	.align 2
 Cry_Luvdisc:: @ 861E8BC
-	.incbin "sound/direct_sound_samples/cry_luvdisc.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_luvdisc.bin"
 
 	.align 2
 Cry_Groudon:: @ 861ED98
-	.incbin "sound/direct_sound_samples/cry_groudon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_groudon.bin"
 
 	.align 2
 Cry_Kyogre:: @ 86212A4
-	.incbin "sound/direct_sound_samples/cry_kyogre.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_kyogre.bin"
 
 	.align 2
 Cry_Rayquaza:: @ 862365C
-	.incbin "sound/direct_sound_samples/cry_rayquaza.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_rayquaza.bin"
 
 	.align 2
 Cry_Salamence:: @ 8625388
-	.incbin "sound/direct_sound_samples/cry_salamence.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_salamence.bin"
 
 	.align 2
 Cry_Breloom:: @ 8626CA4
-	.incbin "sound/direct_sound_samples/cry_breloom.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_breloom.bin"
 
 	.align 2
 Cry_Shroomish:: @ 8627964
-	.incbin "sound/direct_sound_samples/cry_shroomish.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_shroomish.bin"
 
 	.align 2
 Cry_Linoone:: @ 862823C
-	.incbin "sound/direct_sound_samples/cry_linoone.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_linoone.bin"
 
 	.align 2
 Cry_Tropius:: @ 862A0D8
-	.incbin "sound/direct_sound_samples/cry_tropius.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_tropius.bin"
 
 	.align 2
 Cry_Wailmer:: @ 862C19C
-	.incbin "sound/direct_sound_samples/cry_wailmer.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_wailmer.bin"
 
 	.align 2
 Cry_Zigzagoon:: @ 862DDFC
-	.incbin "sound/direct_sound_samples/cry_zigzagoon.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_zigzagoon.bin"
 
 	.align 2
 Cry_Exploud:: @ 862E98C
-	.incbin "sound/direct_sound_samples/cry_exploud.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_exploud.bin"
 
 	.align 2
 Cry_Loudred:: @ 86305D4
-	.incbin "sound/direct_sound_samples/cry_loudred.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_loudred.bin"
 
 	.align 2
 Cry_Wailord:: @ 86312FC
-	.incbin "sound/direct_sound_samples/cry_wailord.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_wailord.bin"
 
 	.align 2
 Cry_Whismur:: @ 8633D0C
-	.incbin "sound/direct_sound_samples/cry_whismur.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_whismur.bin"
 
 	.align 2
 Cry_Snorunt:: @ 8634530
-	.incbin "sound/direct_sound_samples/cry_snorunt.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_snorunt.bin"
 
 	.align 2
 Cry_Latios:: @ 8635638
-	.incbin "sound/direct_sound_samples/cry_latios.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_latios.bin"
 
 	.align 2
 Cry_Jirachi:: @ 8636C30
-	.incbin "sound/direct_sound_samples/cry_jirachi.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_jirachi.bin"
 
 	.align 2
 Cry_Deoxys:: @ 86379B4
-	.incbin "sound/direct_sound_samples/cry_deoxys.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_deoxys.bin"
 
 	.align 2
 Cry_Chimecho:: @ 8638E88
-	.incbin "sound/direct_sound_samples/cry_chimecho.bin"
+	.incbin "sound/direct_sound_samples/cries/cry_chimecho.bin"
 
 	.align 2
-DirectSoundWaveData_8639898:: @ 8639898
-	.incbin "sound/direct_sound_samples/8639898.bin"
+DirectSoundWaveData_Phoneme_Vowel7:: @ 8639898
+	.incbin "sound/direct_sound_samples/phonemes/vowel_7.bin"
 
 	.align 2
-DirectSoundWaveData_8639EF8:: @ 8639EF8
-	.incbin "sound/direct_sound_samples/8639EF8.bin"
+DirectSoundWaveData_Phoneme_Vowel8:: @ 8639EF8
+	.incbin "sound/direct_sound_samples/phonemes/vowel_8.bin"
 
 	.align 2
-DirectSoundWaveData_863A3DC:: @ 863A3DC
-	.incbin "sound/direct_sound_samples/863A3DC.bin"
+DirectSoundWaveData_Phoneme_Vowel9:: @ 863A3DC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_9.bin"
 
 	.align 2
-DirectSoundWaveData_863AD2C:: @ 863AD2C
-	.incbin "sound/direct_sound_samples/863AD2C.bin"
+DirectSoundWaveData_Phoneme_Vowel10:: @ 863AD2C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_10.bin"
 
 	.align 2
-DirectSoundWaveData_863B79C:: @ 863B79C
-	.incbin "sound/direct_sound_samples/863B79C.bin"
+DirectSoundWaveData_Phoneme_Vowel11:: @ 863B79C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_11.bin"
 
 	.align 2
-DirectSoundWaveData_863BABC:: @ 863BABC
-	.incbin "sound/direct_sound_samples/863BABC.bin"
+DirectSoundWaveData_Phoneme_Vowel12:: @ 863BABC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_12.bin"
 
 	.align 2
-DirectSoundWaveData_863C744:: @ 863C744
-	.incbin "sound/direct_sound_samples/863C744.bin"
+DirectSoundWaveData_Phoneme_Vowel13:: @ 863C744
+	.incbin "sound/direct_sound_samples/phonemes/vowel_13.bin"
 
 	.align 2
-DirectSoundWaveData_863CD64:: @ 863CD64
-	.incbin "sound/direct_sound_samples/863CD64.bin"
+DirectSoundWaveData_Phoneme_Vowel14:: @ 863CD64
+	.incbin "sound/direct_sound_samples/phonemes/vowel_14.bin"
 
 	.align 2
-DirectSoundWaveData_863D0EC:: @ 863D0EC
-	.incbin "sound/direct_sound_samples/863D0EC.bin"
+DirectSoundWaveData_Phoneme_Vowel15:: @ 863D0EC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_15.bin"
 
 	.align 2
-DirectSoundWaveData_863DED0:: @ 863DED0
-	.incbin "sound/direct_sound_samples/863DED0.bin"
+DirectSoundWaveData_Phoneme_Vowel16:: @ 863DED0
+	.incbin "sound/direct_sound_samples/phonemes/vowel_16.bin"
 
 	.align 2
-DirectSoundWaveData_863E840:: @ 863E840
-	.incbin "sound/direct_sound_samples/863E840.bin"
+DirectSoundWaveData_Phoneme_Vowel17:: @ 863E840
+	.incbin "sound/direct_sound_samples/phonemes/vowel_17.bin"
 
 	.align 2
-DirectSoundWaveData_863EBDC:: @ 863EBDC
-	.incbin "sound/direct_sound_samples/863EBDC.bin"
+DirectSoundWaveData_Phoneme_Vowel18:: @ 863EBDC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_18.bin"
 
 	.align 2
-DirectSoundWaveData_863F390:: @ 863F390
-	.incbin "sound/direct_sound_samples/863F390.bin"
+DirectSoundWaveData_Phoneme_Vowel19:: @ 863F390
+	.incbin "sound/direct_sound_samples/phonemes/vowel_19.bin"
 
 	.align 2
-DirectSoundWaveData_86400EC:: @ 86400EC
-	.incbin "sound/direct_sound_samples/86400EC.bin"
+DirectSoundWaveData_Phoneme_Vowel20:: @ 86400EC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_20.bin"
 
 	.align 2
-DirectSoundWaveData_8640330:: @ 8640330
-	.incbin "sound/direct_sound_samples/8640330.bin"
+DirectSoundWaveData_Phoneme_Vowel21:: @ 8640330
+	.incbin "sound/direct_sound_samples/phonemes/vowel_21.bin"
 
 	.align 2
-DirectSoundWaveData_8641170:: @ 8641170
-	.incbin "sound/direct_sound_samples/8641170.bin"
+DirectSoundWaveData_Phoneme_Vowel22:: @ 8641170
+	.incbin "sound/direct_sound_samples/phonemes/vowel_22.bin"
 
 	.align 2
-DirectSoundWaveData_8641AC4:: @ 8641AC4
-	.incbin "sound/direct_sound_samples/8641AC4.bin"
+DirectSoundWaveData_Phoneme_Vowel23:: @ 8641AC4
+	.incbin "sound/direct_sound_samples/phonemes/vowel_23.bin"
 
 	.align 2
-DirectSoundWaveData_8641E18:: @ 8641E18
-	.incbin "sound/direct_sound_samples/8641E18.bin"
+DirectSoundWaveData_Phoneme_Vowel24:: @ 8641E18
+	.incbin "sound/direct_sound_samples/phonemes/vowel_24.bin"
 
 	.align 2
-DirectSoundWaveData_864244C:: @ 864244C
-	.incbin "sound/direct_sound_samples/864244C.bin"
+DirectSoundWaveData_Phoneme_Vowel25:: @ 864244C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_25.bin"
 
 	.align 2
-DirectSoundWaveData_86430B8:: @ 86430B8
-	.incbin "sound/direct_sound_samples/86430B8.bin"
+DirectSoundWaveData_Phoneme_Vowel26:: @ 86430B8
+	.incbin "sound/direct_sound_samples/phonemes/vowel_26.bin"
 
 	.align 2
-DirectSoundWaveData_8643650:: @ 8643650
-	.incbin "sound/direct_sound_samples/8643650.bin"
+DirectSoundWaveData_Phoneme_Vowel27:: @ 8643650
+	.incbin "sound/direct_sound_samples/phonemes/vowel_27.bin"
 
 	.align 2
-DirectSoundWaveData_8644154:: @ 8644154
-	.incbin "sound/direct_sound_samples/8644154.bin"
+DirectSoundWaveData_Phoneme_Vowel28:: @ 8644154
+	.incbin "sound/direct_sound_samples/phonemes/vowel_28.bin"
 
 	.align 2
-DirectSoundWaveData_8644758:: @ 8644758
-	.incbin "sound/direct_sound_samples/8644758.bin"
+DirectSoundWaveData_Phoneme_Vowel29:: @ 8644758
+	.incbin "sound/direct_sound_samples/phonemes/vowel_29.bin"
 
 	.align 2
-DirectSoundWaveData_8644950:: @ 8644950
-	.incbin "sound/direct_sound_samples/8644950.bin"
+DirectSoundWaveData_Phoneme_Vowel30:: @ 8644950
+	.incbin "sound/direct_sound_samples/phonemes/vowel_30.bin"
 
 	.align 2
-DirectSoundWaveData_86452B4:: @ 86452B4
-	.incbin "sound/direct_sound_samples/86452B4.bin"
+DirectSoundWaveData_Phoneme_Vowel31:: @ 86452B4
+	.incbin "sound/direct_sound_samples/phonemes/vowel_31.bin"
 
 	.align 2
-DirectSoundWaveData_8646240:: @ 8646240
-	.incbin "sound/direct_sound_samples/8646240.bin"
+DirectSoundWaveData_Phoneme_Vowel32:: @ 8646240
+	.incbin "sound/direct_sound_samples/phonemes/vowel_32.bin"
 
 	.align 2
-DirectSoundWaveData_8646878:: @ 8646878
-	.incbin "sound/direct_sound_samples/8646878.bin"
+DirectSoundWaveData_Phoneme_Vowel33:: @ 8646878
+	.incbin "sound/direct_sound_samples/phonemes/vowel_33.bin"
 
 	.align 2
-DirectSoundWaveData_864734C:: @ 864734C
-	.incbin "sound/direct_sound_samples/864734C.bin"
+DirectSoundWaveData_Phoneme_Vowel34:: @ 864734C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_34.bin"
 
 	.align 2
-DirectSoundWaveData_8648290:: @ 8648290
-	.incbin "sound/direct_sound_samples/8648290.bin"
+DirectSoundWaveData_Phoneme_Vowel35:: @ 8648290
+	.incbin "sound/direct_sound_samples/phonemes/vowel_35.bin"
 
 	.align 2
-DirectSoundWaveData_8648808:: @ 8648808
-	.incbin "sound/direct_sound_samples/8648808.bin"
+DirectSoundWaveData_Phoneme_Vowel36:: @ 8648808
+	.incbin "sound/direct_sound_samples/phonemes/vowel_36.bin"
 
 	.align 2
-DirectSoundWaveData_8649654:: @ 8649654
-	.incbin "sound/direct_sound_samples/8649654.bin"
+DirectSoundWaveData_Phoneme_Vowel37:: @ 8649654
+	.incbin "sound/direct_sound_samples/phonemes/vowel_37.bin"
 
 	.align 2
-DirectSoundWaveData_864A55C:: @ 864A55C
-	.incbin "sound/direct_sound_samples/864A55C.bin"
+DirectSoundWaveData_Phoneme_Vowel38:: @ 864A55C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_38.bin"
 
 	.align 2
-DirectSoundWaveData_864B030:: @ 864B030
-	.incbin "sound/direct_sound_samples/864B030.bin"
+DirectSoundWaveData_Phoneme_Vowel39:: @ 864B030
+	.incbin "sound/direct_sound_samples/phonemes/vowel_39.bin"
 
 	.align 2
-DirectSoundWaveData_864BBC4:: @ 864BBC4
-	.incbin "sound/direct_sound_samples/864BBC4.bin"
+DirectSoundWaveData_Phoneme_Vowel40:: @ 864BBC4
+	.incbin "sound/direct_sound_samples/phonemes/vowel_40.bin"
 
 	.align 2
-DirectSoundWaveData_864C59C:: @ 864C59C
-	.incbin "sound/direct_sound_samples/864C59C.bin"
+DirectSoundWaveData_Phoneme_Vowel41:: @ 864C59C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_41.bin"
 
 	.align 2
-DirectSoundWaveData_864CBDC:: @ 864CBDC
-	.incbin "sound/direct_sound_samples/864CBDC.bin"
+DirectSoundWaveData_Phoneme_Vowel42:: @ 864CBDC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_42.bin"
 
 	.align 2
-DirectSoundWaveData_864D6BC:: @ 864D6BC
-	.incbin "sound/direct_sound_samples/864D6BC.bin"
+DirectSoundWaveData_Phoneme_Vowel43:: @ 864D6BC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_43.bin"
 
 	.align 2
-DirectSoundWaveData_864DCF8:: @ 864DCF8
-	.incbin "sound/direct_sound_samples/864DCF8.bin"
+DirectSoundWaveData_Phoneme_Vowel44:: @ 864DCF8
+	.incbin "sound/direct_sound_samples/phonemes/vowel_44.bin"
 
 	.align 2
-DirectSoundWaveData_864E410:: @ 864E410
-	.incbin "sound/direct_sound_samples/864E410.bin"
+DirectSoundWaveData_Phoneme_Vowel45:: @ 864E410
+	.incbin "sound/direct_sound_samples/phonemes/vowel_45.bin"
 
 	.align 2
-DirectSoundWaveData_864ED4C:: @ 864ED4C
-	.incbin "sound/direct_sound_samples/864ED4C.bin"
+DirectSoundWaveData_Phoneme_Vowel46:: @ 864ED4C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_46.bin"
 
 	.align 2
-DirectSoundWaveData_864F508:: @ 864F508
-	.incbin "sound/direct_sound_samples/864F508.bin"
+DirectSoundWaveData_Phoneme_Vowel47:: @ 864F508
+	.incbin "sound/direct_sound_samples/phonemes/vowel_47.bin"
 
 	.align 2
-DirectSoundWaveData_864FA6C:: @ 864FA6C
-	.incbin "sound/direct_sound_samples/864FA6C.bin"
+DirectSoundWaveData_Phoneme_Vowel48:: @ 864FA6C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_48.bin"
 
 	.align 2
-DirectSoundWaveData_86507E0:: @ 86507E0
-	.incbin "sound/direct_sound_samples/86507E0.bin"
+DirectSoundWaveData_Phoneme_Vowel49:: @ 86507E0
+	.incbin "sound/direct_sound_samples/phonemes/vowel_49.bin"
 
 	.align 2
-DirectSoundWaveData_8650C5C:: @ 8650C5C
-	.incbin "sound/direct_sound_samples/8650C5C.bin"
+DirectSoundWaveData_Phoneme_Vowel50:: @ 8650C5C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_50.bin"
 
 	.align 2
-DirectSoundWaveData_8651148:: @ 8651148
-	.incbin "sound/direct_sound_samples/8651148.bin"
+DirectSoundWaveData_Phoneme_Vowel51:: @ 8651148
+	.incbin "sound/direct_sound_samples/phonemes/vowel_51.bin"
 
 	.align 2
-DirectSoundWaveData_8651910:: @ 8651910
-	.incbin "sound/direct_sound_samples/8651910.bin"
+DirectSoundWaveData_Phoneme_Vowel52:: @ 8651910
+	.incbin "sound/direct_sound_samples/phonemes/vowel_52.bin"
 
 	.align 2
-DirectSoundWaveData_865250C:: @ 865250C
-	.incbin "sound/direct_sound_samples/865250C.bin"
+DirectSoundWaveData_Phoneme_Vowel53:: @ 865250C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_53.bin"
 
 	.align 2
-DirectSoundWaveData_8652884:: @ 8652884
-	.incbin "sound/direct_sound_samples/8652884.bin"
+DirectSoundWaveData_Phoneme_Vowel54:: @ 8652884
+	.incbin "sound/direct_sound_samples/phonemes/vowel_54.bin"
 
 	.align 2
-DirectSoundWaveData_8653040:: @ 8653040
-	.incbin "sound/direct_sound_samples/8653040.bin"
+DirectSoundWaveData_Phoneme_Vowel55:: @ 8653040
+	.incbin "sound/direct_sound_samples/phonemes/vowel_55.bin"
 
 	.align 2
-DirectSoundWaveData_8653CA4:: @ 8653CA4
-	.incbin "sound/direct_sound_samples/8653CA4.bin"
+DirectSoundWaveData_Phoneme_Vowel56:: @ 8653CA4
+	.incbin "sound/direct_sound_samples/phonemes/vowel_56.bin"
 
 	.align 2
-DirectSoundWaveData_8654170:: @ 8654170
-	.incbin "sound/direct_sound_samples/8654170.bin"
+DirectSoundWaveData_Phoneme_Vowel57:: @ 8654170
+	.incbin "sound/direct_sound_samples/phonemes/vowel_57.bin"
 
 	.align 2
-DirectSoundWaveData_8654C20:: @ 8654C20
-	.incbin "sound/direct_sound_samples/8654C20.bin"
+DirectSoundWaveData_SC88_AccordionFr_Copy:: @ 8654C20
+	.incbin "sound/direct_sound_samples/synth/sc88_22_accordion_fr.bin"
diff --git a/sound/direct_sound_samples/8654C20.aif b/sound/direct_sound_samples/8654C20.aif
deleted file mode 100644
index 6d6c2e998..000000000
--- a/sound/direct_sound_samples/8654C20.aif
+++ /dev/null
diff --git a/sound/direct_sound_samples/cry_abra.aif b/sound/direct_sound_samples/cries/cry_abra.aif
index 7df4446db..7df4446db 100644
--- a/sound/direct_sound_samples/cry_abra.aif
+++ b/sound/direct_sound_samples/cries/cry_abra.aif
diff --git a/sound/direct_sound_samples/cry_absol.aif b/sound/direct_sound_samples/cries/cry_absol.aif
index 884ab22b3..884ab22b3 100644
--- a/sound/direct_sound_samples/cry_absol.aif
+++ b/sound/direct_sound_samples/cries/cry_absol.aif
diff --git a/sound/direct_sound_samples/cry_aerodactyl.aif b/sound/direct_sound_samples/cries/cry_aerodactyl.aif
index c0e40f6d1..c0e40f6d1 100644
--- a/sound/direct_sound_samples/cry_aerodactyl.aif
+++ b/sound/direct_sound_samples/cries/cry_aerodactyl.aif
diff --git a/sound/direct_sound_samples/cry_aggron.aif b/sound/direct_sound_samples/cries/cry_aggron.aif
index b89ea1222..b89ea1222 100644
--- a/sound/direct_sound_samples/cry_aggron.aif
+++ b/sound/direct_sound_samples/cries/cry_aggron.aif
diff --git a/sound/direct_sound_samples/cry_aipom.aif b/sound/direct_sound_samples/cries/cry_aipom.aif
index 5ca276de2..5ca276de2 100644
--- a/sound/direct_sound_samples/cry_aipom.aif
+++ b/sound/direct_sound_samples/cries/cry_aipom.aif
diff --git a/sound/direct_sound_samples/cry_alakazam.aif b/sound/direct_sound_samples/cries/cry_alakazam.aif
index 920e2ff94..920e2ff94 100644
--- a/sound/direct_sound_samples/cry_alakazam.aif
+++ b/sound/direct_sound_samples/cries/cry_alakazam.aif
diff --git a/sound/direct_sound_samples/cry_altaria.aif b/sound/direct_sound_samples/cries/cry_altaria.aif
index 3e8e35e8e..3e8e35e8e 100644
--- a/sound/direct_sound_samples/cry_altaria.aif
+++ b/sound/direct_sound_samples/cries/cry_altaria.aif
diff --git a/sound/direct_sound_samples/cry_ampharos.aif b/sound/direct_sound_samples/cries/cry_ampharos.aif
index 4f6e255a0..4f6e255a0 100644
--- a/sound/direct_sound_samples/cry_ampharos.aif
+++ b/sound/direct_sound_samples/cries/cry_ampharos.aif
diff --git a/sound/direct_sound_samples/cry_anorith.aif b/sound/direct_sound_samples/cries/cry_anorith.aif
index 96e87e919..96e87e919 100644
--- a/sound/direct_sound_samples/cry_anorith.aif
+++ b/sound/direct_sound_samples/cries/cry_anorith.aif
diff --git a/sound/direct_sound_samples/cry_arbok.aif b/sound/direct_sound_samples/cries/cry_arbok.aif
index 6ccace9f9..6ccace9f9 100644
--- a/sound/direct_sound_samples/cry_arbok.aif
+++ b/sound/direct_sound_samples/cries/cry_arbok.aif
diff --git a/sound/direct_sound_samples/cry_arcanine.aif b/sound/direct_sound_samples/cries/cry_arcanine.aif
index 61d802153..61d802153 100644
--- a/sound/direct_sound_samples/cry_arcanine.aif
+++ b/sound/direct_sound_samples/cries/cry_arcanine.aif
diff --git a/sound/direct_sound_samples/cry_ariados.aif b/sound/direct_sound_samples/cries/cry_ariados.aif
index 1748624fb..1748624fb 100644
--- a/sound/direct_sound_samples/cry_ariados.aif
+++ b/sound/direct_sound_samples/cries/cry_ariados.aif
diff --git a/sound/direct_sound_samples/cry_armaldo.aif b/sound/direct_sound_samples/cries/cry_armaldo.aif
index 756bf0842..756bf0842 100644
--- a/sound/direct_sound_samples/cry_armaldo.aif
+++ b/sound/direct_sound_samples/cries/cry_armaldo.aif
diff --git a/sound/direct_sound_samples/cry_aron.aif b/sound/direct_sound_samples/cries/cry_aron.aif
index cce70b73b..cce70b73b 100644
--- a/sound/direct_sound_samples/cry_aron.aif
+++ b/sound/direct_sound_samples/cries/cry_aron.aif
diff --git a/sound/direct_sound_samples/cry_articuno.aif b/sound/direct_sound_samples/cries/cry_articuno.aif
index 4f237dd0f..4f237dd0f 100644
--- a/sound/direct_sound_samples/cry_articuno.aif
+++ b/sound/direct_sound_samples/cries/cry_articuno.aif
diff --git a/sound/direct_sound_samples/cry_azumarill.aif b/sound/direct_sound_samples/cries/cry_azumarill.aif
index 18411f93c..18411f93c 100644
--- a/sound/direct_sound_samples/cry_azumarill.aif
+++ b/sound/direct_sound_samples/cries/cry_azumarill.aif
diff --git a/sound/direct_sound_samples/cry_azurill.aif b/sound/direct_sound_samples/cries/cry_azurill.aif
index 7f651c3d3..7f651c3d3 100644
--- a/sound/direct_sound_samples/cry_azurill.aif
+++ b/sound/direct_sound_samples/cries/cry_azurill.aif
diff --git a/sound/direct_sound_samples/cry_bagon.aif b/sound/direct_sound_samples/cries/cry_bagon.aif
index 3843fb9f4..3843fb9f4 100644
--- a/sound/direct_sound_samples/cry_bagon.aif
+++ b/sound/direct_sound_samples/cries/cry_bagon.aif
diff --git a/sound/direct_sound_samples/cry_baltoy.aif b/sound/direct_sound_samples/cries/cry_baltoy.aif
index 25e1a708a..25e1a708a 100644
--- a/sound/direct_sound_samples/cry_baltoy.aif
+++ b/sound/direct_sound_samples/cries/cry_baltoy.aif
diff --git a/sound/direct_sound_samples/cry_banette.aif b/sound/direct_sound_samples/cries/cry_banette.aif
index 23713f1b5..23713f1b5 100644
--- a/sound/direct_sound_samples/cry_banette.aif
+++ b/sound/direct_sound_samples/cries/cry_banette.aif
diff --git a/sound/direct_sound_samples/cry_barboach.aif b/sound/direct_sound_samples/cries/cry_barboach.aif
index 4b9228259..4b9228259 100644
--- a/sound/direct_sound_samples/cry_barboach.aif
+++ b/sound/direct_sound_samples/cries/cry_barboach.aif
diff --git a/sound/direct_sound_samples/cry_bayleef.aif b/sound/direct_sound_samples/cries/cry_bayleef.aif
index 8cef22df3..8cef22df3 100644
--- a/sound/direct_sound_samples/cry_bayleef.aif
+++ b/sound/direct_sound_samples/cries/cry_bayleef.aif
diff --git a/sound/direct_sound_samples/cry_beautifly.aif b/sound/direct_sound_samples/cries/cry_beautifly.aif
index 0924b6c55..0924b6c55 100644
--- a/sound/direct_sound_samples/cry_beautifly.aif
+++ b/sound/direct_sound_samples/cries/cry_beautifly.aif
diff --git a/sound/direct_sound_samples/cry_beedrill.aif b/sound/direct_sound_samples/cries/cry_beedrill.aif
index 00d0bc96c..00d0bc96c 100644
--- a/sound/direct_sound_samples/cry_beedrill.aif
+++ b/sound/direct_sound_samples/cries/cry_beedrill.aif
diff --git a/sound/direct_sound_samples/cry_beldum.aif b/sound/direct_sound_samples/cries/cry_beldum.aif
index 76435a6a8..76435a6a8 100644
--- a/sound/direct_sound_samples/cry_beldum.aif
+++ b/sound/direct_sound_samples/cries/cry_beldum.aif
diff --git a/sound/direct_sound_samples/cry_bellossom.aif b/sound/direct_sound_samples/cries/cry_bellossom.aif
index 86580df65..86580df65 100644
--- a/sound/direct_sound_samples/cry_bellossom.aif
+++ b/sound/direct_sound_samples/cries/cry_bellossom.aif
diff --git a/sound/direct_sound_samples/cry_bellsprout.aif b/sound/direct_sound_samples/cries/cry_bellsprout.aif
index cfdd7aed2..cfdd7aed2 100644
--- a/sound/direct_sound_samples/cry_bellsprout.aif
+++ b/sound/direct_sound_samples/cries/cry_bellsprout.aif
diff --git a/sound/direct_sound_samples/cry_blastoise.aif b/sound/direct_sound_samples/cries/cry_blastoise.aif
index 76dac2bcc..76dac2bcc 100644
--- a/sound/direct_sound_samples/cry_blastoise.aif
+++ b/sound/direct_sound_samples/cries/cry_blastoise.aif
diff --git a/sound/direct_sound_samples/cry_blaziken.aif b/sound/direct_sound_samples/cries/cry_blaziken.aif
index 83e5ccf23..83e5ccf23 100644
--- a/sound/direct_sound_samples/cry_blaziken.aif
+++ b/sound/direct_sound_samples/cries/cry_blaziken.aif
diff --git a/sound/direct_sound_samples/cry_blissey.aif b/sound/direct_sound_samples/cries/cry_blissey.aif
index 897eb3d69..897eb3d69 100644
--- a/sound/direct_sound_samples/cry_blissey.aif
+++ b/sound/direct_sound_samples/cries/cry_blissey.aif
diff --git a/sound/direct_sound_samples/cry_breloom.aif b/sound/direct_sound_samples/cries/cry_breloom.aif
index ea3f1bb66..ea3f1bb66 100644
--- a/sound/direct_sound_samples/cry_breloom.aif
+++ b/sound/direct_sound_samples/cries/cry_breloom.aif
diff --git a/sound/direct_sound_samples/cry_bulbasaur.aif b/sound/direct_sound_samples/cries/cry_bulbasaur.aif
index 040fb1df7..040fb1df7 100644
--- a/sound/direct_sound_samples/cry_bulbasaur.aif
+++ b/sound/direct_sound_samples/cries/cry_bulbasaur.aif
diff --git a/sound/direct_sound_samples/cry_butterfree.aif b/sound/direct_sound_samples/cries/cry_butterfree.aif
index f27616395..f27616395 100644
--- a/sound/direct_sound_samples/cry_butterfree.aif
+++ b/sound/direct_sound_samples/cries/cry_butterfree.aif
diff --git a/sound/direct_sound_samples/cry_cacnea.aif b/sound/direct_sound_samples/cries/cry_cacnea.aif
index 4fd5acd36..4fd5acd36 100644
--- a/sound/direct_sound_samples/cry_cacnea.aif
+++ b/sound/direct_sound_samples/cries/cry_cacnea.aif
diff --git a/sound/direct_sound_samples/cry_cacturne.aif b/sound/direct_sound_samples/cries/cry_cacturne.aif
index d9fb8fda8..d9fb8fda8 100644
--- a/sound/direct_sound_samples/cry_cacturne.aif
+++ b/sound/direct_sound_samples/cries/cry_cacturne.aif
diff --git a/sound/direct_sound_samples/cry_camerupt.aif b/sound/direct_sound_samples/cries/cry_camerupt.aif
index 325df1220..325df1220 100644
--- a/sound/direct_sound_samples/cry_camerupt.aif
+++ b/sound/direct_sound_samples/cries/cry_camerupt.aif
diff --git a/sound/direct_sound_samples/cry_carvanha.aif b/sound/direct_sound_samples/cries/cry_carvanha.aif
index c7cdedf91..c7cdedf91 100644
--- a/sound/direct_sound_samples/cry_carvanha.aif
+++ b/sound/direct_sound_samples/cries/cry_carvanha.aif
diff --git a/sound/direct_sound_samples/cry_cascoon.aif b/sound/direct_sound_samples/cries/cry_cascoon.aif
index 17eef0ee9..17eef0ee9 100644
--- a/sound/direct_sound_samples/cry_cascoon.aif
+++ b/sound/direct_sound_samples/cries/cry_cascoon.aif
diff --git a/sound/direct_sound_samples/cry_castform.aif b/sound/direct_sound_samples/cries/cry_castform.aif
index c10745640..c10745640 100644
--- a/sound/direct_sound_samples/cry_castform.aif
+++ b/sound/direct_sound_samples/cries/cry_castform.aif
diff --git a/sound/direct_sound_samples/cry_caterpie.aif b/sound/direct_sound_samples/cries/cry_caterpie.aif
index b0b246b4f..b0b246b4f 100644
--- a/sound/direct_sound_samples/cry_caterpie.aif
+++ b/sound/direct_sound_samples/cries/cry_caterpie.aif
diff --git a/sound/direct_sound_samples/cry_celebi.aif b/sound/direct_sound_samples/cries/cry_celebi.aif
index 9f9f3ea39..9f9f3ea39 100644
--- a/sound/direct_sound_samples/cry_celebi.aif
+++ b/sound/direct_sound_samples/cries/cry_celebi.aif
diff --git a/sound/direct_sound_samples/cry_chansey.aif b/sound/direct_sound_samples/cries/cry_chansey.aif
index d764c86ce..d764c86ce 100644
--- a/sound/direct_sound_samples/cry_chansey.aif
+++ b/sound/direct_sound_samples/cries/cry_chansey.aif
diff --git a/sound/direct_sound_samples/cry_charizard.aif b/sound/direct_sound_samples/cries/cry_charizard.aif
index 48321b792..48321b792 100644
--- a/sound/direct_sound_samples/cry_charizard.aif
+++ b/sound/direct_sound_samples/cries/cry_charizard.aif
diff --git a/sound/direct_sound_samples/cry_charmander.aif b/sound/direct_sound_samples/cries/cry_charmander.aif
index d72c0f9e0..d72c0f9e0 100644
--- a/sound/direct_sound_samples/cry_charmander.aif
+++ b/sound/direct_sound_samples/cries/cry_charmander.aif
diff --git a/sound/direct_sound_samples/cry_charmeleon.aif b/sound/direct_sound_samples/cries/cry_charmeleon.aif
index 8e84af0d8..8e84af0d8 100644
--- a/sound/direct_sound_samples/cry_charmeleon.aif
+++ b/sound/direct_sound_samples/cries/cry_charmeleon.aif
diff --git a/sound/direct_sound_samples/cry_chikorita.aif b/sound/direct_sound_samples/cries/cry_chikorita.aif
index 67ceafdc3..67ceafdc3 100644
--- a/sound/direct_sound_samples/cry_chikorita.aif
+++ b/sound/direct_sound_samples/cries/cry_chikorita.aif
diff --git a/sound/direct_sound_samples/cry_chimecho.aif b/sound/direct_sound_samples/cries/cry_chimecho.aif
index 87ee2faee..87ee2faee 100644
--- a/sound/direct_sound_samples/cry_chimecho.aif
+++ b/sound/direct_sound_samples/cries/cry_chimecho.aif
diff --git a/sound/direct_sound_samples/cry_chinchou.aif b/sound/direct_sound_samples/cries/cry_chinchou.aif
index 356475678..356475678 100644
--- a/sound/direct_sound_samples/cry_chinchou.aif
+++ b/sound/direct_sound_samples/cries/cry_chinchou.aif
diff --git a/sound/direct_sound_samples/cry_clamperl.aif b/sound/direct_sound_samples/cries/cry_clamperl.aif
index 7250bd703..7250bd703 100644
--- a/sound/direct_sound_samples/cry_clamperl.aif
+++ b/sound/direct_sound_samples/cries/cry_clamperl.aif
diff --git a/sound/direct_sound_samples/cry_claydol.aif b/sound/direct_sound_samples/cries/cry_claydol.aif
index b89772021..b89772021 100644
--- a/sound/direct_sound_samples/cry_claydol.aif
+++ b/sound/direct_sound_samples/cries/cry_claydol.aif
diff --git a/sound/direct_sound_samples/cry_clefable.aif b/sound/direct_sound_samples/cries/cry_clefable.aif
index 9c2d8c664..9c2d8c664 100644
--- a/sound/direct_sound_samples/cry_clefable.aif
+++ b/sound/direct_sound_samples/cries/cry_clefable.aif
diff --git a/sound/direct_sound_samples/cry_clefairy.aif b/sound/direct_sound_samples/cries/cry_clefairy.aif
index c370c4a9b..c370c4a9b 100644
--- a/sound/direct_sound_samples/cry_clefairy.aif
+++ b/sound/direct_sound_samples/cries/cry_clefairy.aif
diff --git a/sound/direct_sound_samples/cry_cleffa.aif b/sound/direct_sound_samples/cries/cry_cleffa.aif
index b27cdeca9..b27cdeca9 100644
--- a/sound/direct_sound_samples/cry_cleffa.aif
+++ b/sound/direct_sound_samples/cries/cry_cleffa.aif
diff --git a/sound/direct_sound_samples/cry_cloyster.aif b/sound/direct_sound_samples/cries/cry_cloyster.aif
index b406deab0..b406deab0 100644
--- a/sound/direct_sound_samples/cry_cloyster.aif
+++ b/sound/direct_sound_samples/cries/cry_cloyster.aif
diff --git a/sound/direct_sound_samples/cry_combusken.aif b/sound/direct_sound_samples/cries/cry_combusken.aif
index 7d4b0d4cc..7d4b0d4cc 100644
--- a/sound/direct_sound_samples/cry_combusken.aif
+++ b/sound/direct_sound_samples/cries/cry_combusken.aif
diff --git a/sound/direct_sound_samples/cry_corphish.aif b/sound/direct_sound_samples/cries/cry_corphish.aif
index f0f5ca01e..f0f5ca01e 100644
--- a/sound/direct_sound_samples/cry_corphish.aif
+++ b/sound/direct_sound_samples/cries/cry_corphish.aif
diff --git a/sound/direct_sound_samples/cry_corsola.aif b/sound/direct_sound_samples/cries/cry_corsola.aif
index 68e743bfd..68e743bfd 100644
--- a/sound/direct_sound_samples/cry_corsola.aif
+++ b/sound/direct_sound_samples/cries/cry_corsola.aif
diff --git a/sound/direct_sound_samples/cry_cradily.aif b/sound/direct_sound_samples/cries/cry_cradily.aif
index 197dc8d92..197dc8d92 100644
--- a/sound/direct_sound_samples/cry_cradily.aif
+++ b/sound/direct_sound_samples/cries/cry_cradily.aif
diff --git a/sound/direct_sound_samples/cry_crawdaunt.aif b/sound/direct_sound_samples/cries/cry_crawdaunt.aif
index a203ce2fb..a203ce2fb 100644
--- a/sound/direct_sound_samples/cry_crawdaunt.aif
+++ b/sound/direct_sound_samples/cries/cry_crawdaunt.aif
diff --git a/sound/direct_sound_samples/cry_crobat.aif b/sound/direct_sound_samples/cries/cry_crobat.aif
index 75d039bd8..75d039bd8 100644
--- a/sound/direct_sound_samples/cry_crobat.aif
+++ b/sound/direct_sound_samples/cries/cry_crobat.aif
diff --git a/sound/direct_sound_samples/cry_croconaw.aif b/sound/direct_sound_samples/cries/cry_croconaw.aif
index afb7f3fdc..afb7f3fdc 100644
--- a/sound/direct_sound_samples/cry_croconaw.aif
+++ b/sound/direct_sound_samples/cries/cry_croconaw.aif
diff --git a/sound/direct_sound_samples/cry_cubone.aif b/sound/direct_sound_samples/cries/cry_cubone.aif
index 170745da1..170745da1 100644
--- a/sound/direct_sound_samples/cry_cubone.aif
+++ b/sound/direct_sound_samples/cries/cry_cubone.aif
diff --git a/sound/direct_sound_samples/cry_cyndaquil.aif b/sound/direct_sound_samples/cries/cry_cyndaquil.aif
index 4aa580199..4aa580199 100644
--- a/sound/direct_sound_samples/cry_cyndaquil.aif
+++ b/sound/direct_sound_samples/cries/cry_cyndaquil.aif
diff --git a/sound/direct_sound_samples/cry_delcatty.aif b/sound/direct_sound_samples/cries/cry_delcatty.aif
index dd665b110..dd665b110 100644
--- a/sound/direct_sound_samples/cry_delcatty.aif
+++ b/sound/direct_sound_samples/cries/cry_delcatty.aif
diff --git a/sound/direct_sound_samples/cry_delibird.aif b/sound/direct_sound_samples/cries/cry_delibird.aif
index dbedc42d4..dbedc42d4 100644
--- a/sound/direct_sound_samples/cry_delibird.aif
+++ b/sound/direct_sound_samples/cries/cry_delibird.aif
diff --git a/sound/direct_sound_samples/cry_deoxys.aif b/sound/direct_sound_samples/cries/cry_deoxys.aif
index b9623b337..b9623b337 100644
--- a/sound/direct_sound_samples/cry_deoxys.aif
+++ b/sound/direct_sound_samples/cries/cry_deoxys.aif
diff --git a/sound/direct_sound_samples/cry_dewgong.aif b/sound/direct_sound_samples/cries/cry_dewgong.aif
index 72d69b773..72d69b773 100644
--- a/sound/direct_sound_samples/cry_dewgong.aif
+++ b/sound/direct_sound_samples/cries/cry_dewgong.aif
diff --git a/sound/direct_sound_samples/cry_diglett.aif b/sound/direct_sound_samples/cries/cry_diglett.aif
index b116af7f2..b116af7f2 100644
--- a/sound/direct_sound_samples/cry_diglett.aif
+++ b/sound/direct_sound_samples/cries/cry_diglett.aif
diff --git a/sound/direct_sound_samples/cry_ditto.aif b/sound/direct_sound_samples/cries/cry_ditto.aif
index 2c797f4c4..2c797f4c4 100644
--- a/sound/direct_sound_samples/cry_ditto.aif
+++ b/sound/direct_sound_samples/cries/cry_ditto.aif
diff --git a/sound/direct_sound_samples/cry_dodrio.aif b/sound/direct_sound_samples/cries/cry_dodrio.aif
index 111d8bf3e..111d8bf3e 100644
--- a/sound/direct_sound_samples/cry_dodrio.aif
+++ b/sound/direct_sound_samples/cries/cry_dodrio.aif
diff --git a/sound/direct_sound_samples/cry_doduo.aif b/sound/direct_sound_samples/cries/cry_doduo.aif
index 5700b91d9..5700b91d9 100644
--- a/sound/direct_sound_samples/cry_doduo.aif
+++ b/sound/direct_sound_samples/cries/cry_doduo.aif
diff --git a/sound/direct_sound_samples/cry_donphan.aif b/sound/direct_sound_samples/cries/cry_donphan.aif
index a41c124b1..a41c124b1 100644
--- a/sound/direct_sound_samples/cry_donphan.aif
+++ b/sound/direct_sound_samples/cries/cry_donphan.aif
diff --git a/sound/direct_sound_samples/cry_dragonair.aif b/sound/direct_sound_samples/cries/cry_dragonair.aif
index 38c3955ef..38c3955ef 100644
--- a/sound/direct_sound_samples/cry_dragonair.aif
+++ b/sound/direct_sound_samples/cries/cry_dragonair.aif
diff --git a/sound/direct_sound_samples/cry_dragonite.aif b/sound/direct_sound_samples/cries/cry_dragonite.aif
index d1e7b11cf..d1e7b11cf 100644
--- a/sound/direct_sound_samples/cry_dragonite.aif
+++ b/sound/direct_sound_samples/cries/cry_dragonite.aif
diff --git a/sound/direct_sound_samples/cry_dratini.aif b/sound/direct_sound_samples/cries/cry_dratini.aif
index 298497480..298497480 100644
--- a/sound/direct_sound_samples/cry_dratini.aif
+++ b/sound/direct_sound_samples/cries/cry_dratini.aif
diff --git a/sound/direct_sound_samples/cry_drowzee.aif b/sound/direct_sound_samples/cries/cry_drowzee.aif
index 0d53eb2ff..0d53eb2ff 100644
--- a/sound/direct_sound_samples/cry_drowzee.aif
+++ b/sound/direct_sound_samples/cries/cry_drowzee.aif
diff --git a/sound/direct_sound_samples/cry_dugtrio.aif b/sound/direct_sound_samples/cries/cry_dugtrio.aif
index dff573dfe..dff573dfe 100644
--- a/sound/direct_sound_samples/cry_dugtrio.aif
+++ b/sound/direct_sound_samples/cries/cry_dugtrio.aif
diff --git a/sound/direct_sound_samples/cry_dunsparce.aif b/sound/direct_sound_samples/cries/cry_dunsparce.aif
index 454617c05..454617c05 100644
--- a/sound/direct_sound_samples/cry_dunsparce.aif
+++ b/sound/direct_sound_samples/cries/cry_dunsparce.aif
diff --git a/sound/direct_sound_samples/cry_dusclops.aif b/sound/direct_sound_samples/cries/cry_dusclops.aif
index de9657e4f..de9657e4f 100644
--- a/sound/direct_sound_samples/cry_dusclops.aif
+++ b/sound/direct_sound_samples/cries/cry_dusclops.aif
diff --git a/sound/direct_sound_samples/cry_duskull.aif b/sound/direct_sound_samples/cries/cry_duskull.aif
index d84ea274e..d84ea274e 100644
--- a/sound/direct_sound_samples/cry_duskull.aif
+++ b/sound/direct_sound_samples/cries/cry_duskull.aif
diff --git a/sound/direct_sound_samples/cry_dustox.aif b/sound/direct_sound_samples/cries/cry_dustox.aif
index 56d8eb336..56d8eb336 100644
--- a/sound/direct_sound_samples/cry_dustox.aif
+++ b/sound/direct_sound_samples/cries/cry_dustox.aif
diff --git a/sound/direct_sound_samples/cry_eevee.aif b/sound/direct_sound_samples/cries/cry_eevee.aif
index 8711a1470..8711a1470 100644
--- a/sound/direct_sound_samples/cry_eevee.aif
+++ b/sound/direct_sound_samples/cries/cry_eevee.aif
diff --git a/sound/direct_sound_samples/cry_ekans.aif b/sound/direct_sound_samples/cries/cry_ekans.aif
index 9eb396735..9eb396735 100644
--- a/sound/direct_sound_samples/cry_ekans.aif
+++ b/sound/direct_sound_samples/cries/cry_ekans.aif
diff --git a/sound/direct_sound_samples/cry_electabuzz.aif b/sound/direct_sound_samples/cries/cry_electabuzz.aif
index 5abdb49b7..5abdb49b7 100644
--- a/sound/direct_sound_samples/cry_electabuzz.aif
+++ b/sound/direct_sound_samples/cries/cry_electabuzz.aif
diff --git a/sound/direct_sound_samples/cry_electrike.aif b/sound/direct_sound_samples/cries/cry_electrike.aif
index 56c9666df..56c9666df 100644
--- a/sound/direct_sound_samples/cry_electrike.aif
+++ b/sound/direct_sound_samples/cries/cry_electrike.aif
diff --git a/sound/direct_sound_samples/cry_electrode.aif b/sound/direct_sound_samples/cries/cry_electrode.aif
index cbd7f0971..cbd7f0971 100644
--- a/sound/direct_sound_samples/cry_electrode.aif
+++ b/sound/direct_sound_samples/cries/cry_electrode.aif
diff --git a/sound/direct_sound_samples/cry_elekid.aif b/sound/direct_sound_samples/cries/cry_elekid.aif
index 839bdee17..839bdee17 100644
--- a/sound/direct_sound_samples/cry_elekid.aif
+++ b/sound/direct_sound_samples/cries/cry_elekid.aif
diff --git a/sound/direct_sound_samples/cry_entei.aif b/sound/direct_sound_samples/cries/cry_entei.aif
index 56a740207..56a740207 100644
--- a/sound/direct_sound_samples/cry_entei.aif
+++ b/sound/direct_sound_samples/cries/cry_entei.aif
diff --git a/sound/direct_sound_samples/cry_espeon.aif b/sound/direct_sound_samples/cries/cry_espeon.aif
index 53dc62f4d..53dc62f4d 100644
--- a/sound/direct_sound_samples/cry_espeon.aif
+++ b/sound/direct_sound_samples/cries/cry_espeon.aif
diff --git a/sound/direct_sound_samples/cry_exeggcute.aif b/sound/direct_sound_samples/cries/cry_exeggcute.aif
index 147912c2f..147912c2f 100644
--- a/sound/direct_sound_samples/cry_exeggcute.aif
+++ b/sound/direct_sound_samples/cries/cry_exeggcute.aif
diff --git a/sound/direct_sound_samples/cry_exeggutor.aif b/sound/direct_sound_samples/cries/cry_exeggutor.aif
index c0b9177bf..c0b9177bf 100644
--- a/sound/direct_sound_samples/cry_exeggutor.aif
+++ b/sound/direct_sound_samples/cries/cry_exeggutor.aif
diff --git a/sound/direct_sound_samples/cry_exploud.aif b/sound/direct_sound_samples/cries/cry_exploud.aif
index 5b80870cc..5b80870cc 100644
--- a/sound/direct_sound_samples/cry_exploud.aif
+++ b/sound/direct_sound_samples/cries/cry_exploud.aif
diff --git a/sound/direct_sound_samples/cry_farfetchd.aif b/sound/direct_sound_samples/cries/cry_farfetchd.aif
index f1db556dc..f1db556dc 100644
--- a/sound/direct_sound_samples/cry_farfetchd.aif
+++ b/sound/direct_sound_samples/cries/cry_farfetchd.aif
diff --git a/sound/direct_sound_samples/cry_fearow.aif b/sound/direct_sound_samples/cries/cry_fearow.aif
index 74a76f6d4..74a76f6d4 100644
--- a/sound/direct_sound_samples/cry_fearow.aif
+++ b/sound/direct_sound_samples/cries/cry_fearow.aif
diff --git a/sound/direct_sound_samples/cry_feebas.aif b/sound/direct_sound_samples/cries/cry_feebas.aif
index c386522f1..c386522f1 100644
--- a/sound/direct_sound_samples/cry_feebas.aif
+++ b/sound/direct_sound_samples/cries/cry_feebas.aif
diff --git a/sound/direct_sound_samples/cry_feraligatr.aif b/sound/direct_sound_samples/cries/cry_feraligatr.aif
index 9fcd93cff..9fcd93cff 100644
--- a/sound/direct_sound_samples/cry_feraligatr.aif
+++ b/sound/direct_sound_samples/cries/cry_feraligatr.aif
diff --git a/sound/direct_sound_samples/cry_flaaffy.aif b/sound/direct_sound_samples/cries/cry_flaaffy.aif
index 93dfacfaf..93dfacfaf 100644
--- a/sound/direct_sound_samples/cry_flaaffy.aif
+++ b/sound/direct_sound_samples/cries/cry_flaaffy.aif
diff --git a/sound/direct_sound_samples/cry_flareon.aif b/sound/direct_sound_samples/cries/cry_flareon.aif
index 58d28e60a..58d28e60a 100644
--- a/sound/direct_sound_samples/cry_flareon.aif
+++ b/sound/direct_sound_samples/cries/cry_flareon.aif
diff --git a/sound/direct_sound_samples/cry_flygon.aif b/sound/direct_sound_samples/cries/cry_flygon.aif
index c8c377016..c8c377016 100644
--- a/sound/direct_sound_samples/cry_flygon.aif
+++ b/sound/direct_sound_samples/cries/cry_flygon.aif
diff --git a/sound/direct_sound_samples/cry_forretress.aif b/sound/direct_sound_samples/cries/cry_forretress.aif
index 288dacbea..288dacbea 100644
--- a/sound/direct_sound_samples/cry_forretress.aif
+++ b/sound/direct_sound_samples/cries/cry_forretress.aif
diff --git a/sound/direct_sound_samples/cry_furret.aif b/sound/direct_sound_samples/cries/cry_furret.aif
index 6b4e9ce11..6b4e9ce11 100644
--- a/sound/direct_sound_samples/cry_furret.aif
+++ b/sound/direct_sound_samples/cries/cry_furret.aif
diff --git a/sound/direct_sound_samples/cry_gardevoir.aif b/sound/direct_sound_samples/cries/cry_gardevoir.aif
index a14780990..a14780990 100644
--- a/sound/direct_sound_samples/cry_gardevoir.aif
+++ b/sound/direct_sound_samples/cries/cry_gardevoir.aif
diff --git a/sound/direct_sound_samples/cry_gastly.aif b/sound/direct_sound_samples/cries/cry_gastly.aif
index 93cef851d..93cef851d 100644
--- a/sound/direct_sound_samples/cry_gastly.aif
+++ b/sound/direct_sound_samples/cries/cry_gastly.aif
diff --git a/sound/direct_sound_samples/cry_gengar.aif b/sound/direct_sound_samples/cries/cry_gengar.aif
index 379b5d37e..379b5d37e 100644
--- a/sound/direct_sound_samples/cry_gengar.aif
+++ b/sound/direct_sound_samples/cries/cry_gengar.aif
diff --git a/sound/direct_sound_samples/cry_geodude.aif b/sound/direct_sound_samples/cries/cry_geodude.aif
index 143b9031c..143b9031c 100644
--- a/sound/direct_sound_samples/cry_geodude.aif
+++ b/sound/direct_sound_samples/cries/cry_geodude.aif
diff --git a/sound/direct_sound_samples/cry_girafarig.aif b/sound/direct_sound_samples/cries/cry_girafarig.aif
index 1dd5f93e2..1dd5f93e2 100644
--- a/sound/direct_sound_samples/cry_girafarig.aif
+++ b/sound/direct_sound_samples/cries/cry_girafarig.aif
diff --git a/sound/direct_sound_samples/cry_glalie.aif b/sound/direct_sound_samples/cries/cry_glalie.aif
index e4e896547..e4e896547 100644
--- a/sound/direct_sound_samples/cry_glalie.aif
+++ b/sound/direct_sound_samples/cries/cry_glalie.aif
diff --git a/sound/direct_sound_samples/cry_gligar.aif b/sound/direct_sound_samples/cries/cry_gligar.aif
index 4050f08b0..4050f08b0 100644
--- a/sound/direct_sound_samples/cry_gligar.aif
+++ b/sound/direct_sound_samples/cries/cry_gligar.aif
diff --git a/sound/direct_sound_samples/cry_gloom.aif b/sound/direct_sound_samples/cries/cry_gloom.aif
index e930328ac..e930328ac 100644
--- a/sound/direct_sound_samples/cry_gloom.aif
+++ b/sound/direct_sound_samples/cries/cry_gloom.aif
diff --git a/sound/direct_sound_samples/cry_golbat.aif b/sound/direct_sound_samples/cries/cry_golbat.aif
index 11413df3a..11413df3a 100644
--- a/sound/direct_sound_samples/cry_golbat.aif
+++ b/sound/direct_sound_samples/cries/cry_golbat.aif
diff --git a/sound/direct_sound_samples/cry_goldeen.aif b/sound/direct_sound_samples/cries/cry_goldeen.aif
index 81fd1ecdf..81fd1ecdf 100644
--- a/sound/direct_sound_samples/cry_goldeen.aif
+++ b/sound/direct_sound_samples/cries/cry_goldeen.aif
diff --git a/sound/direct_sound_samples/cry_golduck.aif b/sound/direct_sound_samples/cries/cry_golduck.aif
index b6b71a7a4..b6b71a7a4 100644
--- a/sound/direct_sound_samples/cry_golduck.aif
+++ b/sound/direct_sound_samples/cries/cry_golduck.aif
diff --git a/sound/direct_sound_samples/cry_golem.aif b/sound/direct_sound_samples/cries/cry_golem.aif
index 0d2c4515e..0d2c4515e 100644
--- a/sound/direct_sound_samples/cry_golem.aif
+++ b/sound/direct_sound_samples/cries/cry_golem.aif
diff --git a/sound/direct_sound_samples/cry_gorebyss.aif b/sound/direct_sound_samples/cries/cry_gorebyss.aif
index b7605062c..b7605062c 100644
--- a/sound/direct_sound_samples/cry_gorebyss.aif
+++ b/sound/direct_sound_samples/cries/cry_gorebyss.aif
diff --git a/sound/direct_sound_samples/cry_granbull.aif b/sound/direct_sound_samples/cries/cry_granbull.aif
index 146b3bd0c..146b3bd0c 100644
--- a/sound/direct_sound_samples/cry_granbull.aif
+++ b/sound/direct_sound_samples/cries/cry_granbull.aif
diff --git a/sound/direct_sound_samples/cry_graveler.aif b/sound/direct_sound_samples/cries/cry_graveler.aif
index 773994228..773994228 100644
--- a/sound/direct_sound_samples/cry_graveler.aif
+++ b/sound/direct_sound_samples/cries/cry_graveler.aif
diff --git a/sound/direct_sound_samples/cry_grimer.aif b/sound/direct_sound_samples/cries/cry_grimer.aif
index 95eed1061..95eed1061 100644
--- a/sound/direct_sound_samples/cry_grimer.aif
+++ b/sound/direct_sound_samples/cries/cry_grimer.aif
diff --git a/sound/direct_sound_samples/cry_groudon.aif b/sound/direct_sound_samples/cries/cry_groudon.aif
index 62452b4d9..62452b4d9 100644
--- a/sound/direct_sound_samples/cry_groudon.aif
+++ b/sound/direct_sound_samples/cries/cry_groudon.aif
diff --git a/sound/direct_sound_samples/cry_grovyle.aif b/sound/direct_sound_samples/cries/cry_grovyle.aif
index 983bcfff3..983bcfff3 100644
--- a/sound/direct_sound_samples/cry_grovyle.aif
+++ b/sound/direct_sound_samples/cries/cry_grovyle.aif
diff --git a/sound/direct_sound_samples/cry_growlithe.aif b/sound/direct_sound_samples/cries/cry_growlithe.aif
index 134e29834..134e29834 100644
--- a/sound/direct_sound_samples/cry_growlithe.aif
+++ b/sound/direct_sound_samples/cries/cry_growlithe.aif
diff --git a/sound/direct_sound_samples/cry_grumpig.aif b/sound/direct_sound_samples/cries/cry_grumpig.aif
index 97c372076..97c372076 100644
--- a/sound/direct_sound_samples/cry_grumpig.aif
+++ b/sound/direct_sound_samples/cries/cry_grumpig.aif
diff --git a/sound/direct_sound_samples/cry_gulpin.aif b/sound/direct_sound_samples/cries/cry_gulpin.aif
index f3043b422..f3043b422 100644
--- a/sound/direct_sound_samples/cry_gulpin.aif
+++ b/sound/direct_sound_samples/cries/cry_gulpin.aif
diff --git a/sound/direct_sound_samples/cry_gyarados.aif b/sound/direct_sound_samples/cries/cry_gyarados.aif
index 238b6d721..238b6d721 100644
--- a/sound/direct_sound_samples/cry_gyarados.aif
+++ b/sound/direct_sound_samples/cries/cry_gyarados.aif
diff --git a/sound/direct_sound_samples/cry_hariyama.aif b/sound/direct_sound_samples/cries/cry_hariyama.aif
index 1ac1f3f7e..1ac1f3f7e 100644
--- a/sound/direct_sound_samples/cry_hariyama.aif
+++ b/sound/direct_sound_samples/cries/cry_hariyama.aif
diff --git a/sound/direct_sound_samples/cry_haunter.aif b/sound/direct_sound_samples/cries/cry_haunter.aif
index 60ec72171..60ec72171 100644
--- a/sound/direct_sound_samples/cry_haunter.aif
+++ b/sound/direct_sound_samples/cries/cry_haunter.aif
diff --git a/sound/direct_sound_samples/cry_heracross.aif b/sound/direct_sound_samples/cries/cry_heracross.aif
index a0734748f..a0734748f 100644
--- a/sound/direct_sound_samples/cry_heracross.aif
+++ b/sound/direct_sound_samples/cries/cry_heracross.aif
diff --git a/sound/direct_sound_samples/cry_hitmonchan.aif b/sound/direct_sound_samples/cries/cry_hitmonchan.aif
index 40479452c..40479452c 100644
--- a/sound/direct_sound_samples/cry_hitmonchan.aif
+++ b/sound/direct_sound_samples/cries/cry_hitmonchan.aif
diff --git a/sound/direct_sound_samples/cry_hitmonlee.aif b/sound/direct_sound_samples/cries/cry_hitmonlee.aif
index 3a4bcddca..3a4bcddca 100644
--- a/sound/direct_sound_samples/cry_hitmonlee.aif
+++ b/sound/direct_sound_samples/cries/cry_hitmonlee.aif
diff --git a/sound/direct_sound_samples/cry_hitmontop.aif b/sound/direct_sound_samples/cries/cry_hitmontop.aif
index 3fbee8041..3fbee8041 100644
--- a/sound/direct_sound_samples/cry_hitmontop.aif
+++ b/sound/direct_sound_samples/cries/cry_hitmontop.aif
diff --git a/sound/direct_sound_samples/cry_ho_oh.aif b/sound/direct_sound_samples/cries/cry_ho_oh.aif
index 52f8dd307..52f8dd307 100644
--- a/sound/direct_sound_samples/cry_ho_oh.aif
+++ b/sound/direct_sound_samples/cries/cry_ho_oh.aif
diff --git a/sound/direct_sound_samples/cry_hoothoot.aif b/sound/direct_sound_samples/cries/cry_hoothoot.aif
index 59e685dcc..59e685dcc 100644
--- a/sound/direct_sound_samples/cry_hoothoot.aif
+++ b/sound/direct_sound_samples/cries/cry_hoothoot.aif
diff --git a/sound/direct_sound_samples/cry_hoppip.aif b/sound/direct_sound_samples/cries/cry_hoppip.aif
index ea47877d0..ea47877d0 100644
--- a/sound/direct_sound_samples/cry_hoppip.aif
+++ b/sound/direct_sound_samples/cries/cry_hoppip.aif
diff --git a/sound/direct_sound_samples/cry_horsea.aif b/sound/direct_sound_samples/cries/cry_horsea.aif
index e41eff4b1..e41eff4b1 100644
--- a/sound/direct_sound_samples/cry_horsea.aif
+++ b/sound/direct_sound_samples/cries/cry_horsea.aif
diff --git a/sound/direct_sound_samples/cry_houndoom.aif b/sound/direct_sound_samples/cries/cry_houndoom.aif
index 6fec16d39..6fec16d39 100644
--- a/sound/direct_sound_samples/cry_houndoom.aif
+++ b/sound/direct_sound_samples/cries/cry_houndoom.aif
diff --git a/sound/direct_sound_samples/cry_houndour.aif b/sound/direct_sound_samples/cries/cry_houndour.aif
index 7431bbf29..7431bbf29 100644
--- a/sound/direct_sound_samples/cry_houndour.aif
+++ b/sound/direct_sound_samples/cries/cry_houndour.aif
diff --git a/sound/direct_sound_samples/cry_huntail.aif b/sound/direct_sound_samples/cries/cry_huntail.aif
index f1d3b29d9..f1d3b29d9 100644
--- a/sound/direct_sound_samples/cry_huntail.aif
+++ b/sound/direct_sound_samples/cries/cry_huntail.aif
diff --git a/sound/direct_sound_samples/cry_hypno.aif b/sound/direct_sound_samples/cries/cry_hypno.aif
index 32672a3c3..32672a3c3 100644
--- a/sound/direct_sound_samples/cry_hypno.aif
+++ b/sound/direct_sound_samples/cries/cry_hypno.aif
diff --git a/sound/direct_sound_samples/cry_igglybuff.aif b/sound/direct_sound_samples/cries/cry_igglybuff.aif
index 8de8394d5..8de8394d5 100644
--- a/sound/direct_sound_samples/cry_igglybuff.aif
+++ b/sound/direct_sound_samples/cries/cry_igglybuff.aif
diff --git a/sound/direct_sound_samples/cry_illumise.aif b/sound/direct_sound_samples/cries/cry_illumise.aif
index 75e03efc8..75e03efc8 100644
--- a/sound/direct_sound_samples/cry_illumise.aif
+++ b/sound/direct_sound_samples/cries/cry_illumise.aif
diff --git a/sound/direct_sound_samples/cry_ivysaur.aif b/sound/direct_sound_samples/cries/cry_ivysaur.aif
index ea474ff88..ea474ff88 100644
--- a/sound/direct_sound_samples/cry_ivysaur.aif
+++ b/sound/direct_sound_samples/cries/cry_ivysaur.aif
diff --git a/sound/direct_sound_samples/cry_jigglypuff.aif b/sound/direct_sound_samples/cries/cry_jigglypuff.aif
index 780424b4f..780424b4f 100644
--- a/sound/direct_sound_samples/cry_jigglypuff.aif
+++ b/sound/direct_sound_samples/cries/cry_jigglypuff.aif
diff --git a/sound/direct_sound_samples/cry_jirachi.aif b/sound/direct_sound_samples/cries/cry_jirachi.aif
index ea8a5c8ad..ea8a5c8ad 100644
--- a/sound/direct_sound_samples/cry_jirachi.aif
+++ b/sound/direct_sound_samples/cries/cry_jirachi.aif
diff --git a/sound/direct_sound_samples/cry_jolteon.aif b/sound/direct_sound_samples/cries/cry_jolteon.aif
index 013369158..013369158 100644
--- a/sound/direct_sound_samples/cry_jolteon.aif
+++ b/sound/direct_sound_samples/cries/cry_jolteon.aif
diff --git a/sound/direct_sound_samples/cry_jumpluff.aif b/sound/direct_sound_samples/cries/cry_jumpluff.aif
index 13b0fd315..13b0fd315 100644
--- a/sound/direct_sound_samples/cry_jumpluff.aif
+++ b/sound/direct_sound_samples/cries/cry_jumpluff.aif
diff --git a/sound/direct_sound_samples/cry_jynx.aif b/sound/direct_sound_samples/cries/cry_jynx.aif
index 7394a48a2..7394a48a2 100644
--- a/sound/direct_sound_samples/cry_jynx.aif
+++ b/sound/direct_sound_samples/cries/cry_jynx.aif
diff --git a/sound/direct_sound_samples/cry_kabuto.aif b/sound/direct_sound_samples/cries/cry_kabuto.aif
index 6ae9801b5..6ae9801b5 100644
--- a/sound/direct_sound_samples/cry_kabuto.aif
+++ b/sound/direct_sound_samples/cries/cry_kabuto.aif
diff --git a/sound/direct_sound_samples/cry_kabutops.aif b/sound/direct_sound_samples/cries/cry_kabutops.aif
index f23778e57..f23778e57 100644
--- a/sound/direct_sound_samples/cry_kabutops.aif
+++ b/sound/direct_sound_samples/cries/cry_kabutops.aif
diff --git a/sound/direct_sound_samples/cry_kadabra.aif b/sound/direct_sound_samples/cries/cry_kadabra.aif
index bfcc18031..bfcc18031 100644
--- a/sound/direct_sound_samples/cry_kadabra.aif
+++ b/sound/direct_sound_samples/cries/cry_kadabra.aif
diff --git a/sound/direct_sound_samples/cry_kakuna.aif b/sound/direct_sound_samples/cries/cry_kakuna.aif
index 7c4e9d7a8..7c4e9d7a8 100644
--- a/sound/direct_sound_samples/cry_kakuna.aif
+++ b/sound/direct_sound_samples/cries/cry_kakuna.aif
diff --git a/sound/direct_sound_samples/cry_kangaskhan.aif b/sound/direct_sound_samples/cries/cry_kangaskhan.aif
index 643e81eb7..643e81eb7 100644
--- a/sound/direct_sound_samples/cry_kangaskhan.aif
+++ b/sound/direct_sound_samples/cries/cry_kangaskhan.aif
diff --git a/sound/direct_sound_samples/cry_kecleon.aif b/sound/direct_sound_samples/cries/cry_kecleon.aif
index f27ae1832..f27ae1832 100644
--- a/sound/direct_sound_samples/cry_kecleon.aif
+++ b/sound/direct_sound_samples/cries/cry_kecleon.aif
diff --git a/sound/direct_sound_samples/cry_kingdra.aif b/sound/direct_sound_samples/cries/cry_kingdra.aif
index ade230c82..ade230c82 100644
--- a/sound/direct_sound_samples/cry_kingdra.aif
+++ b/sound/direct_sound_samples/cries/cry_kingdra.aif
diff --git a/sound/direct_sound_samples/cry_kingler.aif b/sound/direct_sound_samples/cries/cry_kingler.aif
index a1d845f45..a1d845f45 100644
--- a/sound/direct_sound_samples/cry_kingler.aif
+++ b/sound/direct_sound_samples/cries/cry_kingler.aif
diff --git a/sound/direct_sound_samples/cry_kirlia.aif b/sound/direct_sound_samples/cries/cry_kirlia.aif
index 692e03e5f..692e03e5f 100644
--- a/sound/direct_sound_samples/cry_kirlia.aif
+++ b/sound/direct_sound_samples/cries/cry_kirlia.aif
diff --git a/sound/direct_sound_samples/cry_koffing.aif b/sound/direct_sound_samples/cries/cry_koffing.aif
index 7ca9de088..7ca9de088 100644
--- a/sound/direct_sound_samples/cry_koffing.aif
+++ b/sound/direct_sound_samples/cries/cry_koffing.aif
diff --git a/sound/direct_sound_samples/cry_krabby.aif b/sound/direct_sound_samples/cries/cry_krabby.aif
index 6b7692f21..6b7692f21 100644
--- a/sound/direct_sound_samples/cry_krabby.aif
+++ b/sound/direct_sound_samples/cries/cry_krabby.aif
diff --git a/sound/direct_sound_samples/cry_kyogre.aif b/sound/direct_sound_samples/cries/cry_kyogre.aif
index 290948319..290948319 100644
--- a/sound/direct_sound_samples/cry_kyogre.aif
+++ b/sound/direct_sound_samples/cries/cry_kyogre.aif
diff --git a/sound/direct_sound_samples/cry_lairon.aif b/sound/direct_sound_samples/cries/cry_lairon.aif
index b487165bf..b487165bf 100644
--- a/sound/direct_sound_samples/cry_lairon.aif
+++ b/sound/direct_sound_samples/cries/cry_lairon.aif
diff --git a/sound/direct_sound_samples/cry_lanturn.aif b/sound/direct_sound_samples/cries/cry_lanturn.aif
index dfeac1fbd..dfeac1fbd 100644
--- a/sound/direct_sound_samples/cry_lanturn.aif
+++ b/sound/direct_sound_samples/cries/cry_lanturn.aif
diff --git a/sound/direct_sound_samples/cry_lapras.aif b/sound/direct_sound_samples/cries/cry_lapras.aif
index 61de32408..61de32408 100644
--- a/sound/direct_sound_samples/cry_lapras.aif
+++ b/sound/direct_sound_samples/cries/cry_lapras.aif
diff --git a/sound/direct_sound_samples/cry_larvitar.aif b/sound/direct_sound_samples/cries/cry_larvitar.aif
index 1ab0e1d5f..1ab0e1d5f 100644
--- a/sound/direct_sound_samples/cry_larvitar.aif
+++ b/sound/direct_sound_samples/cries/cry_larvitar.aif
diff --git a/sound/direct_sound_samples/cry_latias.aif b/sound/direct_sound_samples/cries/cry_latias.aif
index 46f7235f3..46f7235f3 100644
--- a/sound/direct_sound_samples/cry_latias.aif
+++ b/sound/direct_sound_samples/cries/cry_latias.aif
diff --git a/sound/direct_sound_samples/cry_latios.aif b/sound/direct_sound_samples/cries/cry_latios.aif
index b8ace2a30..b8ace2a30 100644
--- a/sound/direct_sound_samples/cry_latios.aif
+++ b/sound/direct_sound_samples/cries/cry_latios.aif
diff --git a/sound/direct_sound_samples/cry_ledian.aif b/sound/direct_sound_samples/cries/cry_ledian.aif
index baefb5fa3..baefb5fa3 100644
--- a/sound/direct_sound_samples/cry_ledian.aif
+++ b/sound/direct_sound_samples/cries/cry_ledian.aif
diff --git a/sound/direct_sound_samples/cry_ledyba.aif b/sound/direct_sound_samples/cries/cry_ledyba.aif
index 4f26859a7..4f26859a7 100644
--- a/sound/direct_sound_samples/cry_ledyba.aif
+++ b/sound/direct_sound_samples/cries/cry_ledyba.aif
diff --git a/sound/direct_sound_samples/cry_lickitung.aif b/sound/direct_sound_samples/cries/cry_lickitung.aif
index ef889a275..ef889a275 100644
--- a/sound/direct_sound_samples/cry_lickitung.aif
+++ b/sound/direct_sound_samples/cries/cry_lickitung.aif
diff --git a/sound/direct_sound_samples/cry_lileep.aif b/sound/direct_sound_samples/cries/cry_lileep.aif
index ed8258eb7..ed8258eb7 100644
--- a/sound/direct_sound_samples/cry_lileep.aif
+++ b/sound/direct_sound_samples/cries/cry_lileep.aif
diff --git a/sound/direct_sound_samples/cry_linoone.aif b/sound/direct_sound_samples/cries/cry_linoone.aif
index 4e5e7d3b5..4e5e7d3b5 100644
--- a/sound/direct_sound_samples/cry_linoone.aif
+++ b/sound/direct_sound_samples/cries/cry_linoone.aif
diff --git a/sound/direct_sound_samples/cry_lombre.aif b/sound/direct_sound_samples/cries/cry_lombre.aif
index abafe4321..abafe4321 100644
--- a/sound/direct_sound_samples/cry_lombre.aif
+++ b/sound/direct_sound_samples/cries/cry_lombre.aif
diff --git a/sound/direct_sound_samples/cry_lotad.aif b/sound/direct_sound_samples/cries/cry_lotad.aif
index 2596f4390..2596f4390 100644
--- a/sound/direct_sound_samples/cry_lotad.aif
+++ b/sound/direct_sound_samples/cries/cry_lotad.aif
diff --git a/sound/direct_sound_samples/cry_loudred.aif b/sound/direct_sound_samples/cries/cry_loudred.aif
index fed7ebec8..fed7ebec8 100644
--- a/sound/direct_sound_samples/cry_loudred.aif
+++ b/sound/direct_sound_samples/cries/cry_loudred.aif
diff --git a/sound/direct_sound_samples/cry_ludicolo.aif b/sound/direct_sound_samples/cries/cry_ludicolo.aif
index 7cf670f38..7cf670f38 100644
--- a/sound/direct_sound_samples/cry_ludicolo.aif
+++ b/sound/direct_sound_samples/cries/cry_ludicolo.aif
diff --git a/sound/direct_sound_samples/cry_lugia.aif b/sound/direct_sound_samples/cries/cry_lugia.aif
index 45890a2fc..45890a2fc 100644
--- a/sound/direct_sound_samples/cry_lugia.aif
+++ b/sound/direct_sound_samples/cries/cry_lugia.aif
diff --git a/sound/direct_sound_samples/cry_lunatone.aif b/sound/direct_sound_samples/cries/cry_lunatone.aif
index 42cbc5e3c..42cbc5e3c 100644
--- a/sound/direct_sound_samples/cry_lunatone.aif
+++ b/sound/direct_sound_samples/cries/cry_lunatone.aif
diff --git a/sound/direct_sound_samples/cry_luvdisc.aif b/sound/direct_sound_samples/cries/cry_luvdisc.aif
index 3cc0cc744..3cc0cc744 100644
--- a/sound/direct_sound_samples/cry_luvdisc.aif
+++ b/sound/direct_sound_samples/cries/cry_luvdisc.aif
diff --git a/sound/direct_sound_samples/cry_machamp.aif b/sound/direct_sound_samples/cries/cry_machamp.aif
index ddeaf22c8..ddeaf22c8 100644
--- a/sound/direct_sound_samples/cry_machamp.aif
+++ b/sound/direct_sound_samples/cries/cry_machamp.aif
diff --git a/sound/direct_sound_samples/cry_machoke.aif b/sound/direct_sound_samples/cries/cry_machoke.aif
index 97065ee09..97065ee09 100644
--- a/sound/direct_sound_samples/cry_machoke.aif
+++ b/sound/direct_sound_samples/cries/cry_machoke.aif
diff --git a/sound/direct_sound_samples/cry_machop.aif b/sound/direct_sound_samples/cries/cry_machop.aif
index d92419e84..d92419e84 100644
--- a/sound/direct_sound_samples/cry_machop.aif
+++ b/sound/direct_sound_samples/cries/cry_machop.aif
diff --git a/sound/direct_sound_samples/cry_magby.aif b/sound/direct_sound_samples/cries/cry_magby.aif
index 12f3dc889..12f3dc889 100644
--- a/sound/direct_sound_samples/cry_magby.aif
+++ b/sound/direct_sound_samples/cries/cry_magby.aif
diff --git a/sound/direct_sound_samples/cry_magcargo.aif b/sound/direct_sound_samples/cries/cry_magcargo.aif
index bef0351c0..bef0351c0 100644
--- a/sound/direct_sound_samples/cry_magcargo.aif
+++ b/sound/direct_sound_samples/cries/cry_magcargo.aif
diff --git a/sound/direct_sound_samples/cry_magikarp.aif b/sound/direct_sound_samples/cries/cry_magikarp.aif
index f4f9219c5..f4f9219c5 100644
--- a/sound/direct_sound_samples/cry_magikarp.aif
+++ b/sound/direct_sound_samples/cries/cry_magikarp.aif
diff --git a/sound/direct_sound_samples/cry_magmar.aif b/sound/direct_sound_samples/cries/cry_magmar.aif
index b79c8b9a1..b79c8b9a1 100644
--- a/sound/direct_sound_samples/cry_magmar.aif
+++ b/sound/direct_sound_samples/cries/cry_magmar.aif
diff --git a/sound/direct_sound_samples/cry_magnemite.aif b/sound/direct_sound_samples/cries/cry_magnemite.aif
index ebb9103d9..ebb9103d9 100644
--- a/sound/direct_sound_samples/cry_magnemite.aif
+++ b/sound/direct_sound_samples/cries/cry_magnemite.aif
diff --git a/sound/direct_sound_samples/cry_magneton.aif b/sound/direct_sound_samples/cries/cry_magneton.aif
index 53083ac62..53083ac62 100644
--- a/sound/direct_sound_samples/cry_magneton.aif
+++ b/sound/direct_sound_samples/cries/cry_magneton.aif
diff --git a/sound/direct_sound_samples/cry_makuhita.aif b/sound/direct_sound_samples/cries/cry_makuhita.aif
index 38d7f4b44..38d7f4b44 100644
--- a/sound/direct_sound_samples/cry_makuhita.aif
+++ b/sound/direct_sound_samples/cries/cry_makuhita.aif
diff --git a/sound/direct_sound_samples/cry_manectric.aif b/sound/direct_sound_samples/cries/cry_manectric.aif
index 18a8f4666..18a8f4666 100644
--- a/sound/direct_sound_samples/cry_manectric.aif
+++ b/sound/direct_sound_samples/cries/cry_manectric.aif
diff --git a/sound/direct_sound_samples/cry_mankey.aif b/sound/direct_sound_samples/cries/cry_mankey.aif
index dda929d4c..dda929d4c 100644
--- a/sound/direct_sound_samples/cry_mankey.aif
+++ b/sound/direct_sound_samples/cries/cry_mankey.aif
diff --git a/sound/direct_sound_samples/cry_mantine.aif b/sound/direct_sound_samples/cries/cry_mantine.aif
index d1840aafa..d1840aafa 100644
--- a/sound/direct_sound_samples/cry_mantine.aif
+++ b/sound/direct_sound_samples/cries/cry_mantine.aif
diff --git a/sound/direct_sound_samples/cry_mareep.aif b/sound/direct_sound_samples/cries/cry_mareep.aif
index 2615b9def..2615b9def 100644
--- a/sound/direct_sound_samples/cry_mareep.aif
+++ b/sound/direct_sound_samples/cries/cry_mareep.aif
diff --git a/sound/direct_sound_samples/cry_marill.aif b/sound/direct_sound_samples/cries/cry_marill.aif
index 48d936e7d..48d936e7d 100644
--- a/sound/direct_sound_samples/cry_marill.aif
+++ b/sound/direct_sound_samples/cries/cry_marill.aif
diff --git a/sound/direct_sound_samples/cry_marowak.aif b/sound/direct_sound_samples/cries/cry_marowak.aif
index 279381bb5..279381bb5 100644
--- a/sound/direct_sound_samples/cry_marowak.aif
+++ b/sound/direct_sound_samples/cries/cry_marowak.aif
diff --git a/sound/direct_sound_samples/cry_marshtomp.aif b/sound/direct_sound_samples/cries/cry_marshtomp.aif
index c0106ff6c..c0106ff6c 100644
--- a/sound/direct_sound_samples/cry_marshtomp.aif
+++ b/sound/direct_sound_samples/cries/cry_marshtomp.aif
diff --git a/sound/direct_sound_samples/cry_masquerain.aif b/sound/direct_sound_samples/cries/cry_masquerain.aif
index 107bed2f7..107bed2f7 100644
--- a/sound/direct_sound_samples/cry_masquerain.aif
+++ b/sound/direct_sound_samples/cries/cry_masquerain.aif
diff --git a/sound/direct_sound_samples/cry_mawile.aif b/sound/direct_sound_samples/cries/cry_mawile.aif
index 81b252b57..81b252b57 100644
--- a/sound/direct_sound_samples/cry_mawile.aif
+++ b/sound/direct_sound_samples/cries/cry_mawile.aif
diff --git a/sound/direct_sound_samples/cry_medicham.aif b/sound/direct_sound_samples/cries/cry_medicham.aif
index dc85dd3b5..dc85dd3b5 100644
--- a/sound/direct_sound_samples/cry_medicham.aif
+++ b/sound/direct_sound_samples/cries/cry_medicham.aif
diff --git a/sound/direct_sound_samples/cry_meditite.aif b/sound/direct_sound_samples/cries/cry_meditite.aif
index 8ac680f79..8ac680f79 100644
--- a/sound/direct_sound_samples/cry_meditite.aif
+++ b/sound/direct_sound_samples/cries/cry_meditite.aif
diff --git a/sound/direct_sound_samples/cry_meganium.aif b/sound/direct_sound_samples/cries/cry_meganium.aif
index ea1e1aa51..ea1e1aa51 100644
--- a/sound/direct_sound_samples/cry_meganium.aif
+++ b/sound/direct_sound_samples/cries/cry_meganium.aif
diff --git a/sound/direct_sound_samples/cry_meowth.aif b/sound/direct_sound_samples/cries/cry_meowth.aif
index aaf3825d5..aaf3825d5 100644
--- a/sound/direct_sound_samples/cry_meowth.aif
+++ b/sound/direct_sound_samples/cries/cry_meowth.aif
diff --git a/sound/direct_sound_samples/cry_metagross.aif b/sound/direct_sound_samples/cries/cry_metagross.aif
index b96e6647c..b96e6647c 100644
--- a/sound/direct_sound_samples/cry_metagross.aif
+++ b/sound/direct_sound_samples/cries/cry_metagross.aif
diff --git a/sound/direct_sound_samples/cry_metang.aif b/sound/direct_sound_samples/cries/cry_metang.aif
index da544ce4d..da544ce4d 100644
--- a/sound/direct_sound_samples/cry_metang.aif
+++ b/sound/direct_sound_samples/cries/cry_metang.aif
diff --git a/sound/direct_sound_samples/cry_metapod.aif b/sound/direct_sound_samples/cries/cry_metapod.aif
index ddba3ed44..ddba3ed44 100644
--- a/sound/direct_sound_samples/cry_metapod.aif
+++ b/sound/direct_sound_samples/cries/cry_metapod.aif
diff --git a/sound/direct_sound_samples/cry_mew.aif b/sound/direct_sound_samples/cries/cry_mew.aif
index 2651b96ca..2651b96ca 100644
--- a/sound/direct_sound_samples/cry_mew.aif
+++ b/sound/direct_sound_samples/cries/cry_mew.aif
diff --git a/sound/direct_sound_samples/cry_mewtwo.aif b/sound/direct_sound_samples/cries/cry_mewtwo.aif
index 8e1e6c7f1..8e1e6c7f1 100644
--- a/sound/direct_sound_samples/cry_mewtwo.aif
+++ b/sound/direct_sound_samples/cries/cry_mewtwo.aif
diff --git a/sound/direct_sound_samples/cry_mightyena.aif b/sound/direct_sound_samples/cries/cry_mightyena.aif
index 53a645edc..53a645edc 100644
--- a/sound/direct_sound_samples/cry_mightyena.aif
+++ b/sound/direct_sound_samples/cries/cry_mightyena.aif
diff --git a/sound/direct_sound_samples/cry_milotic.aif b/sound/direct_sound_samples/cries/cry_milotic.aif
index 93a14161b..93a14161b 100644
--- a/sound/direct_sound_samples/cry_milotic.aif
+++ b/sound/direct_sound_samples/cries/cry_milotic.aif
diff --git a/sound/direct_sound_samples/cry_miltank.aif b/sound/direct_sound_samples/cries/cry_miltank.aif
index ad8a41a45..ad8a41a45 100644
--- a/sound/direct_sound_samples/cry_miltank.aif
+++ b/sound/direct_sound_samples/cries/cry_miltank.aif
diff --git a/sound/direct_sound_samples/cry_minun.aif b/sound/direct_sound_samples/cries/cry_minun.aif
index a55aa5631..a55aa5631 100644
--- a/sound/direct_sound_samples/cry_minun.aif
+++ b/sound/direct_sound_samples/cries/cry_minun.aif
diff --git a/sound/direct_sound_samples/cry_misdreavus.aif b/sound/direct_sound_samples/cries/cry_misdreavus.aif
index 39a09f4d0..39a09f4d0 100644
--- a/sound/direct_sound_samples/cry_misdreavus.aif
+++ b/sound/direct_sound_samples/cries/cry_misdreavus.aif
diff --git a/sound/direct_sound_samples/cry_moltres.aif b/sound/direct_sound_samples/cries/cry_moltres.aif
index 2e038a3d7..2e038a3d7 100644
--- a/sound/direct_sound_samples/cry_moltres.aif
+++ b/sound/direct_sound_samples/cries/cry_moltres.aif
diff --git a/sound/direct_sound_samples/cry_mr_mime.aif b/sound/direct_sound_samples/cries/cry_mr_mime.aif
index ff870dbc4..ff870dbc4 100644
--- a/sound/direct_sound_samples/cry_mr_mime.aif
+++ b/sound/direct_sound_samples/cries/cry_mr_mime.aif
diff --git a/sound/direct_sound_samples/cry_mudkip.aif b/sound/direct_sound_samples/cries/cry_mudkip.aif
index e8fa5c212..e8fa5c212 100644
--- a/sound/direct_sound_samples/cry_mudkip.aif
+++ b/sound/direct_sound_samples/cries/cry_mudkip.aif
diff --git a/sound/direct_sound_samples/cry_muk.aif b/sound/direct_sound_samples/cries/cry_muk.aif
index f61ff4075..f61ff4075 100644
--- a/sound/direct_sound_samples/cry_muk.aif
+++ b/sound/direct_sound_samples/cries/cry_muk.aif
diff --git a/sound/direct_sound_samples/cry_murkrow.aif b/sound/direct_sound_samples/cries/cry_murkrow.aif
index 4beddff1e..4beddff1e 100644
--- a/sound/direct_sound_samples/cry_murkrow.aif
+++ b/sound/direct_sound_samples/cries/cry_murkrow.aif
diff --git a/sound/direct_sound_samples/cry_natu.aif b/sound/direct_sound_samples/cries/cry_natu.aif
index e6e38d5cc..e6e38d5cc 100644
--- a/sound/direct_sound_samples/cry_natu.aif
+++ b/sound/direct_sound_samples/cries/cry_natu.aif
diff --git a/sound/direct_sound_samples/cry_nidoking.aif b/sound/direct_sound_samples/cries/cry_nidoking.aif
index a0c86f9ab..a0c86f9ab 100644
--- a/sound/direct_sound_samples/cry_nidoking.aif
+++ b/sound/direct_sound_samples/cries/cry_nidoking.aif
diff --git a/sound/direct_sound_samples/cry_nidoqueen.aif b/sound/direct_sound_samples/cries/cry_nidoqueen.aif
index 6c8f5254b..6c8f5254b 100644
--- a/sound/direct_sound_samples/cry_nidoqueen.aif
+++ b/sound/direct_sound_samples/cries/cry_nidoqueen.aif
diff --git a/sound/direct_sound_samples/cry_nidoran_f.aif b/sound/direct_sound_samples/cries/cry_nidoran_f.aif
index b7c8a5317..b7c8a5317 100644
--- a/sound/direct_sound_samples/cry_nidoran_f.aif
+++ b/sound/direct_sound_samples/cries/cry_nidoran_f.aif
diff --git a/sound/direct_sound_samples/cry_nidoran_m.aif b/sound/direct_sound_samples/cries/cry_nidoran_m.aif
index 08fc81c8b..08fc81c8b 100644
--- a/sound/direct_sound_samples/cry_nidoran_m.aif
+++ b/sound/direct_sound_samples/cries/cry_nidoran_m.aif
diff --git a/sound/direct_sound_samples/cry_nidorina.aif b/sound/direct_sound_samples/cries/cry_nidorina.aif
index 91e293a50..91e293a50 100644
--- a/sound/direct_sound_samples/cry_nidorina.aif
+++ b/sound/direct_sound_samples/cries/cry_nidorina.aif
diff --git a/sound/direct_sound_samples/cry_nidorino.aif b/sound/direct_sound_samples/cries/cry_nidorino.aif
index 959351363..959351363 100644
--- a/sound/direct_sound_samples/cry_nidorino.aif
+++ b/sound/direct_sound_samples/cries/cry_nidorino.aif
diff --git a/sound/direct_sound_samples/cry_nincada.aif b/sound/direct_sound_samples/cries/cry_nincada.aif
index 5f96bda50..5f96bda50 100644
--- a/sound/direct_sound_samples/cry_nincada.aif
+++ b/sound/direct_sound_samples/cries/cry_nincada.aif
diff --git a/sound/direct_sound_samples/cry_ninetales.aif b/sound/direct_sound_samples/cries/cry_ninetales.aif
index 70c8cf528..70c8cf528 100644
--- a/sound/direct_sound_samples/cry_ninetales.aif
+++ b/sound/direct_sound_samples/cries/cry_ninetales.aif
diff --git a/sound/direct_sound_samples/cry_ninjask.aif b/sound/direct_sound_samples/cries/cry_ninjask.aif
index a6f07e8d3..a6f07e8d3 100644
--- a/sound/direct_sound_samples/cry_ninjask.aif
+++ b/sound/direct_sound_samples/cries/cry_ninjask.aif
diff --git a/sound/direct_sound_samples/cry_noctowl.aif b/sound/direct_sound_samples/cries/cry_noctowl.aif
index fe2e63d45..fe2e63d45 100644
--- a/sound/direct_sound_samples/cry_noctowl.aif
+++ b/sound/direct_sound_samples/cries/cry_noctowl.aif
diff --git a/sound/direct_sound_samples/cry_none.aif b/sound/direct_sound_samples/cries/cry_none.aif
index 44bb79c3c..44bb79c3c 100644
--- a/sound/direct_sound_samples/cry_none.aif
+++ b/sound/direct_sound_samples/cries/cry_none.aif
diff --git a/sound/direct_sound_samples/cry_nosepass.aif b/sound/direct_sound_samples/cries/cry_nosepass.aif
index be65ba082..be65ba082 100644
--- a/sound/direct_sound_samples/cry_nosepass.aif
+++ b/sound/direct_sound_samples/cries/cry_nosepass.aif
diff --git a/sound/direct_sound_samples/cry_numel.aif b/sound/direct_sound_samples/cries/cry_numel.aif
index 55cce5f2c..55cce5f2c 100644
--- a/sound/direct_sound_samples/cry_numel.aif
+++ b/sound/direct_sound_samples/cries/cry_numel.aif
diff --git a/sound/direct_sound_samples/cry_nuzleaf.aif b/sound/direct_sound_samples/cries/cry_nuzleaf.aif
index d668f3fd3..d668f3fd3 100644
--- a/sound/direct_sound_samples/cry_nuzleaf.aif
+++ b/sound/direct_sound_samples/cries/cry_nuzleaf.aif
diff --git a/sound/direct_sound_samples/cry_octillery.aif b/sound/direct_sound_samples/cries/cry_octillery.aif
index 75ee28ceb..75ee28ceb 100644
--- a/sound/direct_sound_samples/cry_octillery.aif
+++ b/sound/direct_sound_samples/cries/cry_octillery.aif
diff --git a/sound/direct_sound_samples/cry_oddish.aif b/sound/direct_sound_samples/cries/cry_oddish.aif
index 6909a8dad..6909a8dad 100644
--- a/sound/direct_sound_samples/cry_oddish.aif
+++ b/sound/direct_sound_samples/cries/cry_oddish.aif
diff --git a/sound/direct_sound_samples/cry_omanyte.aif b/sound/direct_sound_samples/cries/cry_omanyte.aif
index 15ec2d1ef..15ec2d1ef 100644
--- a/sound/direct_sound_samples/cry_omanyte.aif
+++ b/sound/direct_sound_samples/cries/cry_omanyte.aif
diff --git a/sound/direct_sound_samples/cry_omastar.aif b/sound/direct_sound_samples/cries/cry_omastar.aif
index e67d5d7fc..e67d5d7fc 100644
--- a/sound/direct_sound_samples/cry_omastar.aif
+++ b/sound/direct_sound_samples/cries/cry_omastar.aif
diff --git a/sound/direct_sound_samples/cry_onix.aif b/sound/direct_sound_samples/cries/cry_onix.aif
index aa8a16505..aa8a16505 100644
--- a/sound/direct_sound_samples/cry_onix.aif
+++ b/sound/direct_sound_samples/cries/cry_onix.aif
diff --git a/sound/direct_sound_samples/cry_paras.aif b/sound/direct_sound_samples/cries/cry_paras.aif
index f9d69c21c..f9d69c21c 100644
--- a/sound/direct_sound_samples/cry_paras.aif
+++ b/sound/direct_sound_samples/cries/cry_paras.aif
diff --git a/sound/direct_sound_samples/cry_parasect.aif b/sound/direct_sound_samples/cries/cry_parasect.aif
index d6d9433e9..d6d9433e9 100644
--- a/sound/direct_sound_samples/cry_parasect.aif
+++ b/sound/direct_sound_samples/cries/cry_parasect.aif
diff --git a/sound/direct_sound_samples/cry_pelipper.aif b/sound/direct_sound_samples/cries/cry_pelipper.aif
index 26718f848..26718f848 100644
--- a/sound/direct_sound_samples/cry_pelipper.aif
+++ b/sound/direct_sound_samples/cries/cry_pelipper.aif
diff --git a/sound/direct_sound_samples/cry_persian.aif b/sound/direct_sound_samples/cries/cry_persian.aif
index 40b3a2c56..40b3a2c56 100644
--- a/sound/direct_sound_samples/cry_persian.aif
+++ b/sound/direct_sound_samples/cries/cry_persian.aif
diff --git a/sound/direct_sound_samples/cry_phanpy.aif b/sound/direct_sound_samples/cries/cry_phanpy.aif
index 2fcab3c82..2fcab3c82 100644
--- a/sound/direct_sound_samples/cry_phanpy.aif
+++ b/sound/direct_sound_samples/cries/cry_phanpy.aif
diff --git a/sound/direct_sound_samples/cry_pichu.aif b/sound/direct_sound_samples/cries/cry_pichu.aif
index de47bbab8..de47bbab8 100644
--- a/sound/direct_sound_samples/cry_pichu.aif
+++ b/sound/direct_sound_samples/cries/cry_pichu.aif
diff --git a/sound/direct_sound_samples/cry_pidgeot.aif b/sound/direct_sound_samples/cries/cry_pidgeot.aif
index af400cdc6..af400cdc6 100644
--- a/sound/direct_sound_samples/cry_pidgeot.aif
+++ b/sound/direct_sound_samples/cries/cry_pidgeot.aif
diff --git a/sound/direct_sound_samples/cry_pidgeotto.aif b/sound/direct_sound_samples/cries/cry_pidgeotto.aif
index 7c71c8f3e..7c71c8f3e 100644
--- a/sound/direct_sound_samples/cry_pidgeotto.aif
+++ b/sound/direct_sound_samples/cries/cry_pidgeotto.aif
diff --git a/sound/direct_sound_samples/cry_pidgey.aif b/sound/direct_sound_samples/cries/cry_pidgey.aif
index b9c3a5d2a..b9c3a5d2a 100644
--- a/sound/direct_sound_samples/cry_pidgey.aif
+++ b/sound/direct_sound_samples/cries/cry_pidgey.aif
diff --git a/sound/direct_sound_samples/cry_pikachu.aif b/sound/direct_sound_samples/cries/cry_pikachu.aif
index 690bf5e1d..690bf5e1d 100644
--- a/sound/direct_sound_samples/cry_pikachu.aif
+++ b/sound/direct_sound_samples/cries/cry_pikachu.aif
diff --git a/sound/direct_sound_samples/cry_piloswine.aif b/sound/direct_sound_samples/cries/cry_piloswine.aif
index b1f34d3b5..b1f34d3b5 100644
--- a/sound/direct_sound_samples/cry_piloswine.aif
+++ b/sound/direct_sound_samples/cries/cry_piloswine.aif
diff --git a/sound/direct_sound_samples/cry_pineco.aif b/sound/direct_sound_samples/cries/cry_pineco.aif
index 80292bda0..80292bda0 100644
--- a/sound/direct_sound_samples/cry_pineco.aif
+++ b/sound/direct_sound_samples/cries/cry_pineco.aif
diff --git a/sound/direct_sound_samples/cry_pinsir.aif b/sound/direct_sound_samples/cries/cry_pinsir.aif
index cf27a11de..cf27a11de 100644
--- a/sound/direct_sound_samples/cry_pinsir.aif
+++ b/sound/direct_sound_samples/cries/cry_pinsir.aif
diff --git a/sound/direct_sound_samples/cry_plusle.aif b/sound/direct_sound_samples/cries/cry_plusle.aif
index d68984263..d68984263 100644
--- a/sound/direct_sound_samples/cry_plusle.aif
+++ b/sound/direct_sound_samples/cries/cry_plusle.aif
diff --git a/sound/direct_sound_samples/cry_politoed.aif b/sound/direct_sound_samples/cries/cry_politoed.aif
index 38b1883b4..38b1883b4 100644
--- a/sound/direct_sound_samples/cry_politoed.aif
+++ b/sound/direct_sound_samples/cries/cry_politoed.aif
diff --git a/sound/direct_sound_samples/cry_poliwag.aif b/sound/direct_sound_samples/cries/cry_poliwag.aif
index 8467f0540..8467f0540 100644
--- a/sound/direct_sound_samples/cry_poliwag.aif
+++ b/sound/direct_sound_samples/cries/cry_poliwag.aif
diff --git a/sound/direct_sound_samples/cry_poliwhirl.aif b/sound/direct_sound_samples/cries/cry_poliwhirl.aif
index f0851c693..f0851c693 100644
--- a/sound/direct_sound_samples/cry_poliwhirl.aif
+++ b/sound/direct_sound_samples/cries/cry_poliwhirl.aif
diff --git a/sound/direct_sound_samples/cry_poliwrath.aif b/sound/direct_sound_samples/cries/cry_poliwrath.aif
index 8d19f1d86..8d19f1d86 100644
--- a/sound/direct_sound_samples/cry_poliwrath.aif
+++ b/sound/direct_sound_samples/cries/cry_poliwrath.aif
diff --git a/sound/direct_sound_samples/cry_ponyta.aif b/sound/direct_sound_samples/cries/cry_ponyta.aif
index 46feb123d..46feb123d 100644
--- a/sound/direct_sound_samples/cry_ponyta.aif
+++ b/sound/direct_sound_samples/cries/cry_ponyta.aif
diff --git a/sound/direct_sound_samples/cry_poochyena.aif b/sound/direct_sound_samples/cries/cry_poochyena.aif
index 3b464ce13..3b464ce13 100644
--- a/sound/direct_sound_samples/cry_poochyena.aif
+++ b/sound/direct_sound_samples/cries/cry_poochyena.aif
diff --git a/sound/direct_sound_samples/cry_porygon.aif b/sound/direct_sound_samples/cries/cry_porygon.aif
index ced70b379..ced70b379 100644
--- a/sound/direct_sound_samples/cry_porygon.aif
+++ b/sound/direct_sound_samples/cries/cry_porygon.aif
diff --git a/sound/direct_sound_samples/cry_porygon2.aif b/sound/direct_sound_samples/cries/cry_porygon2.aif
index c08a3caaf..c08a3caaf 100644
--- a/sound/direct_sound_samples/cry_porygon2.aif
+++ b/sound/direct_sound_samples/cries/cry_porygon2.aif
diff --git a/sound/direct_sound_samples/cry_primeape.aif b/sound/direct_sound_samples/cries/cry_primeape.aif
index a868b3120..a868b3120 100644
--- a/sound/direct_sound_samples/cry_primeape.aif
+++ b/sound/direct_sound_samples/cries/cry_primeape.aif
diff --git a/sound/direct_sound_samples/cry_psyduck.aif b/sound/direct_sound_samples/cries/cry_psyduck.aif
index d2d0612f2..d2d0612f2 100644
--- a/sound/direct_sound_samples/cry_psyduck.aif
+++ b/sound/direct_sound_samples/cries/cry_psyduck.aif
diff --git a/sound/direct_sound_samples/cry_pupitar.aif b/sound/direct_sound_samples/cries/cry_pupitar.aif
index 7386636ce..7386636ce 100644
--- a/sound/direct_sound_samples/cry_pupitar.aif
+++ b/sound/direct_sound_samples/cries/cry_pupitar.aif
diff --git a/sound/direct_sound_samples/cry_quagsire.aif b/sound/direct_sound_samples/cries/cry_quagsire.aif
index 1953d0e42..1953d0e42 100644
--- a/sound/direct_sound_samples/cry_quagsire.aif
+++ b/sound/direct_sound_samples/cries/cry_quagsire.aif
diff --git a/sound/direct_sound_samples/cry_quilava.aif b/sound/direct_sound_samples/cries/cry_quilava.aif
index efe873229..efe873229 100644
--- a/sound/direct_sound_samples/cry_quilava.aif
+++ b/sound/direct_sound_samples/cries/cry_quilava.aif
diff --git a/sound/direct_sound_samples/cry_qwilfish.aif b/sound/direct_sound_samples/cries/cry_qwilfish.aif
index 268c5c89d..268c5c89d 100644
--- a/sound/direct_sound_samples/cry_qwilfish.aif
+++ b/sound/direct_sound_samples/cries/cry_qwilfish.aif
diff --git a/sound/direct_sound_samples/cry_raichu.aif b/sound/direct_sound_samples/cries/cry_raichu.aif
index e59ffbad4..e59ffbad4 100644
--- a/sound/direct_sound_samples/cry_raichu.aif
+++ b/sound/direct_sound_samples/cries/cry_raichu.aif
diff --git a/sound/direct_sound_samples/cry_raikou.aif b/sound/direct_sound_samples/cries/cry_raikou.aif
index a57a2365c..a57a2365c 100644
--- a/sound/direct_sound_samples/cry_raikou.aif
+++ b/sound/direct_sound_samples/cries/cry_raikou.aif
diff --git a/sound/direct_sound_samples/cry_ralts.aif b/sound/direct_sound_samples/cries/cry_ralts.aif
index 0baef5760..0baef5760 100644
--- a/sound/direct_sound_samples/cry_ralts.aif
+++ b/sound/direct_sound_samples/cries/cry_ralts.aif
diff --git a/sound/direct_sound_samples/cry_rapidash.aif b/sound/direct_sound_samples/cries/cry_rapidash.aif
index 920f510e4..920f510e4 100644
--- a/sound/direct_sound_samples/cry_rapidash.aif
+++ b/sound/direct_sound_samples/cries/cry_rapidash.aif
diff --git a/sound/direct_sound_samples/cry_raticate.aif b/sound/direct_sound_samples/cries/cry_raticate.aif
index 01601cab5..01601cab5 100644
--- a/sound/direct_sound_samples/cry_raticate.aif
+++ b/sound/direct_sound_samples/cries/cry_raticate.aif
diff --git a/sound/direct_sound_samples/cry_rattata.aif b/sound/direct_sound_samples/cries/cry_rattata.aif
index cb0e1f422..cb0e1f422 100644
--- a/sound/direct_sound_samples/cry_rattata.aif
+++ b/sound/direct_sound_samples/cries/cry_rattata.aif
diff --git a/sound/direct_sound_samples/cry_rayquaza.aif b/sound/direct_sound_samples/cries/cry_rayquaza.aif
index 6115e11d8..6115e11d8 100644
--- a/sound/direct_sound_samples/cry_rayquaza.aif
+++ b/sound/direct_sound_samples/cries/cry_rayquaza.aif
diff --git a/sound/direct_sound_samples/cry_regice.aif b/sound/direct_sound_samples/cries/cry_regice.aif
index 6fa23dd73..6fa23dd73 100644
--- a/sound/direct_sound_samples/cry_regice.aif
+++ b/sound/direct_sound_samples/cries/cry_regice.aif
diff --git a/sound/direct_sound_samples/cry_regirock.aif b/sound/direct_sound_samples/cries/cry_regirock.aif
index ab2a47eb8..ab2a47eb8 100644
--- a/sound/direct_sound_samples/cry_regirock.aif
+++ b/sound/direct_sound_samples/cries/cry_regirock.aif
diff --git a/sound/direct_sound_samples/cry_registeel.aif b/sound/direct_sound_samples/cries/cry_registeel.aif
index f5374e5f0..f5374e5f0 100644
--- a/sound/direct_sound_samples/cry_registeel.aif
+++ b/sound/direct_sound_samples/cries/cry_registeel.aif
diff --git a/sound/direct_sound_samples/cry_relicanth.aif b/sound/direct_sound_samples/cries/cry_relicanth.aif
index 60af9cf4e..60af9cf4e 100644
--- a/sound/direct_sound_samples/cry_relicanth.aif
+++ b/sound/direct_sound_samples/cries/cry_relicanth.aif
diff --git a/sound/direct_sound_samples/cry_remoraid.aif b/sound/direct_sound_samples/cries/cry_remoraid.aif
index 16d3f1d65..16d3f1d65 100644
--- a/sound/direct_sound_samples/cry_remoraid.aif
+++ b/sound/direct_sound_samples/cries/cry_remoraid.aif
diff --git a/sound/direct_sound_samples/cry_rhydon.aif b/sound/direct_sound_samples/cries/cry_rhydon.aif
index cfa709ee9..cfa709ee9 100644
--- a/sound/direct_sound_samples/cry_rhydon.aif
+++ b/sound/direct_sound_samples/cries/cry_rhydon.aif
diff --git a/sound/direct_sound_samples/cry_rhyhorn.aif b/sound/direct_sound_samples/cries/cry_rhyhorn.aif
index 47f344ba2..47f344ba2 100644
--- a/sound/direct_sound_samples/cry_rhyhorn.aif
+++ b/sound/direct_sound_samples/cries/cry_rhyhorn.aif
diff --git a/sound/direct_sound_samples/cry_roselia.aif b/sound/direct_sound_samples/cries/cry_roselia.aif
index 50b60b77b..50b60b77b 100644
--- a/sound/direct_sound_samples/cry_roselia.aif
+++ b/sound/direct_sound_samples/cries/cry_roselia.aif
diff --git a/sound/direct_sound_samples/cry_sableye.aif b/sound/direct_sound_samples/cries/cry_sableye.aif
index 1b3a9be30..1b3a9be30 100644
--- a/sound/direct_sound_samples/cry_sableye.aif
+++ b/sound/direct_sound_samples/cries/cry_sableye.aif
diff --git a/sound/direct_sound_samples/cry_salamence.aif b/sound/direct_sound_samples/cries/cry_salamence.aif
index d2957809c..d2957809c 100644
--- a/sound/direct_sound_samples/cry_salamence.aif
+++ b/sound/direct_sound_samples/cries/cry_salamence.aif
diff --git a/sound/direct_sound_samples/cry_sandshrew.aif b/sound/direct_sound_samples/cries/cry_sandshrew.aif
index 6879be11d..6879be11d 100644
--- a/sound/direct_sound_samples/cry_sandshrew.aif
+++ b/sound/direct_sound_samples/cries/cry_sandshrew.aif
diff --git a/sound/direct_sound_samples/cry_sandslash.aif b/sound/direct_sound_samples/cries/cry_sandslash.aif
index ee4a458ed..ee4a458ed 100644
--- a/sound/direct_sound_samples/cry_sandslash.aif
+++ b/sound/direct_sound_samples/cries/cry_sandslash.aif
diff --git a/sound/direct_sound_samples/cry_sceptile.aif b/sound/direct_sound_samples/cries/cry_sceptile.aif
index 7252cb85f..7252cb85f 100644
--- a/sound/direct_sound_samples/cry_sceptile.aif
+++ b/sound/direct_sound_samples/cries/cry_sceptile.aif
diff --git a/sound/direct_sound_samples/cry_scizor.aif b/sound/direct_sound_samples/cries/cry_scizor.aif
index f1f7832ce..f1f7832ce 100644
--- a/sound/direct_sound_samples/cry_scizor.aif
+++ b/sound/direct_sound_samples/cries/cry_scizor.aif
diff --git a/sound/direct_sound_samples/cry_scyther.aif b/sound/direct_sound_samples/cries/cry_scyther.aif
index 2b8cbc104..2b8cbc104 100644
--- a/sound/direct_sound_samples/cry_scyther.aif
+++ b/sound/direct_sound_samples/cries/cry_scyther.aif
diff --git a/sound/direct_sound_samples/cry_seadra.aif b/sound/direct_sound_samples/cries/cry_seadra.aif
index 2f60cce4a..2f60cce4a 100644
--- a/sound/direct_sound_samples/cry_seadra.aif
+++ b/sound/direct_sound_samples/cries/cry_seadra.aif
diff --git a/sound/direct_sound_samples/cry_seaking.aif b/sound/direct_sound_samples/cries/cry_seaking.aif
index e4fc7e70d..e4fc7e70d 100644
--- a/sound/direct_sound_samples/cry_seaking.aif
+++ b/sound/direct_sound_samples/cries/cry_seaking.aif
diff --git a/sound/direct_sound_samples/cry_sealeo.aif b/sound/direct_sound_samples/cries/cry_sealeo.aif
index d9ea50026..d9ea50026 100644
--- a/sound/direct_sound_samples/cry_sealeo.aif
+++ b/sound/direct_sound_samples/cries/cry_sealeo.aif
diff --git a/sound/direct_sound_samples/cry_seedot.aif b/sound/direct_sound_samples/cries/cry_seedot.aif
index c37b769f8..c37b769f8 100644
--- a/sound/direct_sound_samples/cry_seedot.aif
+++ b/sound/direct_sound_samples/cries/cry_seedot.aif
diff --git a/sound/direct_sound_samples/cry_seel.aif b/sound/direct_sound_samples/cries/cry_seel.aif
index 84c4a0a94..84c4a0a94 100644
--- a/sound/direct_sound_samples/cry_seel.aif
+++ b/sound/direct_sound_samples/cries/cry_seel.aif
diff --git a/sound/direct_sound_samples/cry_sentret.aif b/sound/direct_sound_samples/cries/cry_sentret.aif
index 4aed7cd70..4aed7cd70 100644
--- a/sound/direct_sound_samples/cry_sentret.aif
+++ b/sound/direct_sound_samples/cries/cry_sentret.aif
diff --git a/sound/direct_sound_samples/cry_seviper.aif b/sound/direct_sound_samples/cries/cry_seviper.aif
index 6a15dd6e2..6a15dd6e2 100644
--- a/sound/direct_sound_samples/cry_seviper.aif
+++ b/sound/direct_sound_samples/cries/cry_seviper.aif
diff --git a/sound/direct_sound_samples/cry_sharpedo.aif b/sound/direct_sound_samples/cries/cry_sharpedo.aif
index 1b02b56ce..1b02b56ce 100644
--- a/sound/direct_sound_samples/cry_sharpedo.aif
+++ b/sound/direct_sound_samples/cries/cry_sharpedo.aif
diff --git a/sound/direct_sound_samples/cry_shedinja.aif b/sound/direct_sound_samples/cries/cry_shedinja.aif
index 6d1d565f3..6d1d565f3 100644
--- a/sound/direct_sound_samples/cry_shedinja.aif
+++ b/sound/direct_sound_samples/cries/cry_shedinja.aif
diff --git a/sound/direct_sound_samples/cry_shelgon.aif b/sound/direct_sound_samples/cries/cry_shelgon.aif
index 24f234ffe..24f234ffe 100644
--- a/sound/direct_sound_samples/cry_shelgon.aif
+++ b/sound/direct_sound_samples/cries/cry_shelgon.aif
diff --git a/sound/direct_sound_samples/cry_shellder.aif b/sound/direct_sound_samples/cries/cry_shellder.aif
index b2ea85228..b2ea85228 100644
--- a/sound/direct_sound_samples/cry_shellder.aif
+++ b/sound/direct_sound_samples/cries/cry_shellder.aif
diff --git a/sound/direct_sound_samples/cry_shiftry.aif b/sound/direct_sound_samples/cries/cry_shiftry.aif
index c91ece114..c91ece114 100644
--- a/sound/direct_sound_samples/cry_shiftry.aif
+++ b/sound/direct_sound_samples/cries/cry_shiftry.aif
diff --git a/sound/direct_sound_samples/cry_shroomish.aif b/sound/direct_sound_samples/cries/cry_shroomish.aif
index 9e944ca20..9e944ca20 100644
--- a/sound/direct_sound_samples/cry_shroomish.aif
+++ b/sound/direct_sound_samples/cries/cry_shroomish.aif
diff --git a/sound/direct_sound_samples/cry_shuckle.aif b/sound/direct_sound_samples/cries/cry_shuckle.aif
index d835d2de6..d835d2de6 100644
--- a/sound/direct_sound_samples/cry_shuckle.aif
+++ b/sound/direct_sound_samples/cries/cry_shuckle.aif
diff --git a/sound/direct_sound_samples/cry_shuppet.aif b/sound/direct_sound_samples/cries/cry_shuppet.aif
index 1cd9a2f14..1cd9a2f14 100644
--- a/sound/direct_sound_samples/cry_shuppet.aif
+++ b/sound/direct_sound_samples/cries/cry_shuppet.aif
diff --git a/sound/direct_sound_samples/cry_silcoon.aif b/sound/direct_sound_samples/cries/cry_silcoon.aif
index ff48950ad..ff48950ad 100644
--- a/sound/direct_sound_samples/cry_silcoon.aif
+++ b/sound/direct_sound_samples/cries/cry_silcoon.aif
diff --git a/sound/direct_sound_samples/cry_skarmory.aif b/sound/direct_sound_samples/cries/cry_skarmory.aif
index 88d3985a3..88d3985a3 100644
--- a/sound/direct_sound_samples/cry_skarmory.aif
+++ b/sound/direct_sound_samples/cries/cry_skarmory.aif
diff --git a/sound/direct_sound_samples/cry_skiploom.aif b/sound/direct_sound_samples/cries/cry_skiploom.aif
index 201744d12..201744d12 100644
--- a/sound/direct_sound_samples/cry_skiploom.aif
+++ b/sound/direct_sound_samples/cries/cry_skiploom.aif
diff --git a/sound/direct_sound_samples/cry_skitty.aif b/sound/direct_sound_samples/cries/cry_skitty.aif
index 7dc4578f4..7dc4578f4 100644
--- a/sound/direct_sound_samples/cry_skitty.aif
+++ b/sound/direct_sound_samples/cries/cry_skitty.aif
diff --git a/sound/direct_sound_samples/cry_slaking.aif b/sound/direct_sound_samples/cries/cry_slaking.aif
index b6a4160f3..b6a4160f3 100644
--- a/sound/direct_sound_samples/cry_slaking.aif
+++ b/sound/direct_sound_samples/cries/cry_slaking.aif
diff --git a/sound/direct_sound_samples/cry_slakoth.aif b/sound/direct_sound_samples/cries/cry_slakoth.aif
index 0e4bbc3c3..0e4bbc3c3 100644
--- a/sound/direct_sound_samples/cry_slakoth.aif
+++ b/sound/direct_sound_samples/cries/cry_slakoth.aif
diff --git a/sound/direct_sound_samples/cry_slowbro.aif b/sound/direct_sound_samples/cries/cry_slowbro.aif
index f74b753d2..f74b753d2 100644
--- a/sound/direct_sound_samples/cry_slowbro.aif
+++ b/sound/direct_sound_samples/cries/cry_slowbro.aif
diff --git a/sound/direct_sound_samples/cry_slowking.aif b/sound/direct_sound_samples/cries/cry_slowking.aif
index 245a42023..245a42023 100644
--- a/sound/direct_sound_samples/cry_slowking.aif
+++ b/sound/direct_sound_samples/cries/cry_slowking.aif
diff --git a/sound/direct_sound_samples/cry_slowpoke.aif b/sound/direct_sound_samples/cries/cry_slowpoke.aif
index 82b05a9a7..82b05a9a7 100644
--- a/sound/direct_sound_samples/cry_slowpoke.aif
+++ b/sound/direct_sound_samples/cries/cry_slowpoke.aif
diff --git a/sound/direct_sound_samples/cry_slugma.aif b/sound/direct_sound_samples/cries/cry_slugma.aif
index fed42817c..fed42817c 100644
--- a/sound/direct_sound_samples/cry_slugma.aif
+++ b/sound/direct_sound_samples/cries/cry_slugma.aif
diff --git a/sound/direct_sound_samples/cry_smeargle.aif b/sound/direct_sound_samples/cries/cry_smeargle.aif
index 00dbedead..00dbedead 100644
--- a/sound/direct_sound_samples/cry_smeargle.aif
+++ b/sound/direct_sound_samples/cries/cry_smeargle.aif
diff --git a/sound/direct_sound_samples/cry_smoochum.aif b/sound/direct_sound_samples/cries/cry_smoochum.aif
index 4005b4ad4..4005b4ad4 100644
--- a/sound/direct_sound_samples/cry_smoochum.aif
+++ b/sound/direct_sound_samples/cries/cry_smoochum.aif
diff --git a/sound/direct_sound_samples/cry_sneasel.aif b/sound/direct_sound_samples/cries/cry_sneasel.aif
index 54242a23f..54242a23f 100644
--- a/sound/direct_sound_samples/cry_sneasel.aif
+++ b/sound/direct_sound_samples/cries/cry_sneasel.aif
diff --git a/sound/direct_sound_samples/cry_snorlax.aif b/sound/direct_sound_samples/cries/cry_snorlax.aif
index f95128e3a..f95128e3a 100644
--- a/sound/direct_sound_samples/cry_snorlax.aif
+++ b/sound/direct_sound_samples/cries/cry_snorlax.aif
diff --git a/sound/direct_sound_samples/cry_snorunt.aif b/sound/direct_sound_samples/cries/cry_snorunt.aif
index 53b05b229..53b05b229 100644
--- a/sound/direct_sound_samples/cry_snorunt.aif
+++ b/sound/direct_sound_samples/cries/cry_snorunt.aif
diff --git a/sound/direct_sound_samples/cry_snubbull.aif b/sound/direct_sound_samples/cries/cry_snubbull.aif
index bbba023fd..bbba023fd 100644
--- a/sound/direct_sound_samples/cry_snubbull.aif
+++ b/sound/direct_sound_samples/cries/cry_snubbull.aif
diff --git a/sound/direct_sound_samples/cry_solrock.aif b/sound/direct_sound_samples/cries/cry_solrock.aif
index 64c71f289..64c71f289 100644
--- a/sound/direct_sound_samples/cry_solrock.aif
+++ b/sound/direct_sound_samples/cries/cry_solrock.aif
diff --git a/sound/direct_sound_samples/cry_spearow.aif b/sound/direct_sound_samples/cries/cry_spearow.aif
index 7ce86ae29..7ce86ae29 100644
--- a/sound/direct_sound_samples/cry_spearow.aif
+++ b/sound/direct_sound_samples/cries/cry_spearow.aif
diff --git a/sound/direct_sound_samples/cry_spheal.aif b/sound/direct_sound_samples/cries/cry_spheal.aif
index fb6470210..fb6470210 100644
--- a/sound/direct_sound_samples/cry_spheal.aif
+++ b/sound/direct_sound_samples/cries/cry_spheal.aif
diff --git a/sound/direct_sound_samples/cry_spinarak.aif b/sound/direct_sound_samples/cries/cry_spinarak.aif
index 3c4c1eff1..3c4c1eff1 100644
--- a/sound/direct_sound_samples/cry_spinarak.aif
+++ b/sound/direct_sound_samples/cries/cry_spinarak.aif
diff --git a/sound/direct_sound_samples/cry_spinda.aif b/sound/direct_sound_samples/cries/cry_spinda.aif
index 0217573c7..0217573c7 100644
--- a/sound/direct_sound_samples/cry_spinda.aif
+++ b/sound/direct_sound_samples/cries/cry_spinda.aif
diff --git a/sound/direct_sound_samples/cry_spoink.aif b/sound/direct_sound_samples/cries/cry_spoink.aif
index 6cc9bf546..6cc9bf546 100644
--- a/sound/direct_sound_samples/cry_spoink.aif
+++ b/sound/direct_sound_samples/cries/cry_spoink.aif
diff --git a/sound/direct_sound_samples/cry_squirtle.aif b/sound/direct_sound_samples/cries/cry_squirtle.aif
index 43a98a53d..43a98a53d 100644
--- a/sound/direct_sound_samples/cry_squirtle.aif
+++ b/sound/direct_sound_samples/cries/cry_squirtle.aif
diff --git a/sound/direct_sound_samples/cry_stantler.aif b/sound/direct_sound_samples/cries/cry_stantler.aif
index 36ba54658..36ba54658 100644
--- a/sound/direct_sound_samples/cry_stantler.aif
+++ b/sound/direct_sound_samples/cries/cry_stantler.aif
diff --git a/sound/direct_sound_samples/cry_starmie.aif b/sound/direct_sound_samples/cries/cry_starmie.aif
index 7452a78f9..7452a78f9 100644
--- a/sound/direct_sound_samples/cry_starmie.aif
+++ b/sound/direct_sound_samples/cries/cry_starmie.aif
diff --git a/sound/direct_sound_samples/cry_staryu.aif b/sound/direct_sound_samples/cries/cry_staryu.aif
index 6ab5584bf..6ab5584bf 100644
--- a/sound/direct_sound_samples/cry_staryu.aif
+++ b/sound/direct_sound_samples/cries/cry_staryu.aif
diff --git a/sound/direct_sound_samples/cry_steelix.aif b/sound/direct_sound_samples/cries/cry_steelix.aif
index aa05e2d4c..aa05e2d4c 100644
--- a/sound/direct_sound_samples/cry_steelix.aif
+++ b/sound/direct_sound_samples/cries/cry_steelix.aif
diff --git a/sound/direct_sound_samples/cry_sudowoodo.aif b/sound/direct_sound_samples/cries/cry_sudowoodo.aif
index 1af7e18eb..1af7e18eb 100644
--- a/sound/direct_sound_samples/cry_sudowoodo.aif
+++ b/sound/direct_sound_samples/cries/cry_sudowoodo.aif
diff --git a/sound/direct_sound_samples/cry_suicune.aif b/sound/direct_sound_samples/cries/cry_suicune.aif
index 697732d68..697732d68 100644
--- a/sound/direct_sound_samples/cry_suicune.aif
+++ b/sound/direct_sound_samples/cries/cry_suicune.aif
diff --git a/sound/direct_sound_samples/cry_sunflora.aif b/sound/direct_sound_samples/cries/cry_sunflora.aif
index 126931adc..126931adc 100644
--- a/sound/direct_sound_samples/cry_sunflora.aif
+++ b/sound/direct_sound_samples/cries/cry_sunflora.aif
diff --git a/sound/direct_sound_samples/cry_sunkern.aif b/sound/direct_sound_samples/cries/cry_sunkern.aif
index bede3bf95..bede3bf95 100644
--- a/sound/direct_sound_samples/cry_sunkern.aif
+++ b/sound/direct_sound_samples/cries/cry_sunkern.aif
diff --git a/sound/direct_sound_samples/cry_surskit.aif b/sound/direct_sound_samples/cries/cry_surskit.aif
index 438b5b67a..438b5b67a 100644
--- a/sound/direct_sound_samples/cry_surskit.aif
+++ b/sound/direct_sound_samples/cries/cry_surskit.aif
diff --git a/sound/direct_sound_samples/cry_swablu.aif b/sound/direct_sound_samples/cries/cry_swablu.aif
index 066095f55..066095f55 100644
--- a/sound/direct_sound_samples/cry_swablu.aif
+++ b/sound/direct_sound_samples/cries/cry_swablu.aif
diff --git a/sound/direct_sound_samples/cry_swalot.aif b/sound/direct_sound_samples/cries/cry_swalot.aif
index 518a9bf5a..518a9bf5a 100644
--- a/sound/direct_sound_samples/cry_swalot.aif
+++ b/sound/direct_sound_samples/cries/cry_swalot.aif
diff --git a/sound/direct_sound_samples/cry_swampert.aif b/sound/direct_sound_samples/cries/cry_swampert.aif
index 56bd26405..56bd26405 100644
--- a/sound/direct_sound_samples/cry_swampert.aif
+++ b/sound/direct_sound_samples/cries/cry_swampert.aif
diff --git a/sound/direct_sound_samples/cry_swellow.aif b/sound/direct_sound_samples/cries/cry_swellow.aif
index 2b94eb432..2b94eb432 100644
--- a/sound/direct_sound_samples/cry_swellow.aif
+++ b/sound/direct_sound_samples/cries/cry_swellow.aif
diff --git a/sound/direct_sound_samples/cry_swinub.aif b/sound/direct_sound_samples/cries/cry_swinub.aif
index dc68d62d8..dc68d62d8 100644
--- a/sound/direct_sound_samples/cry_swinub.aif
+++ b/sound/direct_sound_samples/cries/cry_swinub.aif
diff --git a/sound/direct_sound_samples/cry_taillow.aif b/sound/direct_sound_samples/cries/cry_taillow.aif
index 8322a3224..8322a3224 100644
--- a/sound/direct_sound_samples/cry_taillow.aif
+++ b/sound/direct_sound_samples/cries/cry_taillow.aif
diff --git a/sound/direct_sound_samples/cry_tangela.aif b/sound/direct_sound_samples/cries/cry_tangela.aif
index c900b426d..c900b426d 100644
--- a/sound/direct_sound_samples/cry_tangela.aif
+++ b/sound/direct_sound_samples/cries/cry_tangela.aif
diff --git a/sound/direct_sound_samples/cry_tauros.aif b/sound/direct_sound_samples/cries/cry_tauros.aif
index 84fa9b317..84fa9b317 100644
--- a/sound/direct_sound_samples/cry_tauros.aif
+++ b/sound/direct_sound_samples/cries/cry_tauros.aif
diff --git a/sound/direct_sound_samples/cry_teddiursa.aif b/sound/direct_sound_samples/cries/cry_teddiursa.aif
index ba5cb5bc3..ba5cb5bc3 100644
--- a/sound/direct_sound_samples/cry_teddiursa.aif
+++ b/sound/direct_sound_samples/cries/cry_teddiursa.aif
diff --git a/sound/direct_sound_samples/cry_tentacool.aif b/sound/direct_sound_samples/cries/cry_tentacool.aif
index 332bec4b2..332bec4b2 100644
--- a/sound/direct_sound_samples/cry_tentacool.aif
+++ b/sound/direct_sound_samples/cries/cry_tentacool.aif
diff --git a/sound/direct_sound_samples/cry_tentacruel.aif b/sound/direct_sound_samples/cries/cry_tentacruel.aif
index e8ec1b14c..e8ec1b14c 100644
--- a/sound/direct_sound_samples/cry_tentacruel.aif
+++ b/sound/direct_sound_samples/cries/cry_tentacruel.aif
diff --git a/sound/direct_sound_samples/cry_togepi.aif b/sound/direct_sound_samples/cries/cry_togepi.aif
index 87ef6ef2d..87ef6ef2d 100644
--- a/sound/direct_sound_samples/cry_togepi.aif
+++ b/sound/direct_sound_samples/cries/cry_togepi.aif
diff --git a/sound/direct_sound_samples/cry_togetic.aif b/sound/direct_sound_samples/cries/cry_togetic.aif
index 8aa18ac41..8aa18ac41 100644
--- a/sound/direct_sound_samples/cry_togetic.aif
+++ b/sound/direct_sound_samples/cries/cry_togetic.aif
diff --git a/sound/direct_sound_samples/cry_torchic.aif b/sound/direct_sound_samples/cries/cry_torchic.aif
index 185a79499..185a79499 100644
--- a/sound/direct_sound_samples/cry_torchic.aif
+++ b/sound/direct_sound_samples/cries/cry_torchic.aif
diff --git a/sound/direct_sound_samples/cry_torkoal.aif b/sound/direct_sound_samples/cries/cry_torkoal.aif
index 9e56d3810..9e56d3810 100644
--- a/sound/direct_sound_samples/cry_torkoal.aif
+++ b/sound/direct_sound_samples/cries/cry_torkoal.aif
diff --git a/sound/direct_sound_samples/cry_totodile.aif b/sound/direct_sound_samples/cries/cry_totodile.aif
index dbf2179a7..dbf2179a7 100644
--- a/sound/direct_sound_samples/cry_totodile.aif
+++ b/sound/direct_sound_samples/cries/cry_totodile.aif
diff --git a/sound/direct_sound_samples/cry_trapinch.aif b/sound/direct_sound_samples/cries/cry_trapinch.aif
index 01664b72e..01664b72e 100644
--- a/sound/direct_sound_samples/cry_trapinch.aif
+++ b/sound/direct_sound_samples/cries/cry_trapinch.aif
diff --git a/sound/direct_sound_samples/cry_treecko.aif b/sound/direct_sound_samples/cries/cry_treecko.aif
index a7416e8da..a7416e8da 100644
--- a/sound/direct_sound_samples/cry_treecko.aif
+++ b/sound/direct_sound_samples/cries/cry_treecko.aif
diff --git a/sound/direct_sound_samples/cry_tropius.aif b/sound/direct_sound_samples/cries/cry_tropius.aif
index bbb52787b..bbb52787b 100644
--- a/sound/direct_sound_samples/cry_tropius.aif
+++ b/sound/direct_sound_samples/cries/cry_tropius.aif
diff --git a/sound/direct_sound_samples/cry_typhlosion.aif b/sound/direct_sound_samples/cries/cry_typhlosion.aif
index f0238d066..f0238d066 100644
--- a/sound/direct_sound_samples/cry_typhlosion.aif
+++ b/sound/direct_sound_samples/cries/cry_typhlosion.aif
diff --git a/sound/direct_sound_samples/cry_tyranitar.aif b/sound/direct_sound_samples/cries/cry_tyranitar.aif
index 557f61769..557f61769 100644
--- a/sound/direct_sound_samples/cry_tyranitar.aif
+++ b/sound/direct_sound_samples/cries/cry_tyranitar.aif
diff --git a/sound/direct_sound_samples/cry_tyrogue.aif b/sound/direct_sound_samples/cries/cry_tyrogue.aif
index e5065f58b..e5065f58b 100644
--- a/sound/direct_sound_samples/cry_tyrogue.aif
+++ b/sound/direct_sound_samples/cries/cry_tyrogue.aif
diff --git a/sound/direct_sound_samples/cry_umbreon.aif b/sound/direct_sound_samples/cries/cry_umbreon.aif
index 38129b1a7..38129b1a7 100644
--- a/sound/direct_sound_samples/cry_umbreon.aif
+++ b/sound/direct_sound_samples/cries/cry_umbreon.aif
diff --git a/sound/direct_sound_samples/cry_unown.aif b/sound/direct_sound_samples/cries/cry_unown.aif
index 8339ccb6b..8339ccb6b 100644
--- a/sound/direct_sound_samples/cry_unown.aif
+++ b/sound/direct_sound_samples/cries/cry_unown.aif
diff --git a/sound/direct_sound_samples/cry_unused_265.aif b/sound/direct_sound_samples/cries/cry_unused_265.aif
index 7f5965f06..7f5965f06 100644
--- a/sound/direct_sound_samples/cry_unused_265.aif
+++ b/sound/direct_sound_samples/cries/cry_unused_265.aif
diff --git a/sound/direct_sound_samples/cry_unused_268.aif b/sound/direct_sound_samples/cries/cry_unused_268.aif
index 5cae364c3..5cae364c3 100644
--- a/sound/direct_sound_samples/cry_unused_268.aif
+++ b/sound/direct_sound_samples/cries/cry_unused_268.aif
diff --git a/sound/direct_sound_samples/cry_ursaring.aif b/sound/direct_sound_samples/cries/cry_ursaring.aif
index fcc748bd1..fcc748bd1 100644
--- a/sound/direct_sound_samples/cry_ursaring.aif
+++ b/sound/direct_sound_samples/cries/cry_ursaring.aif
diff --git a/sound/direct_sound_samples/cry_vaporeon.aif b/sound/direct_sound_samples/cries/cry_vaporeon.aif
index 4967cfdeb..4967cfdeb 100644
--- a/sound/direct_sound_samples/cry_vaporeon.aif
+++ b/sound/direct_sound_samples/cries/cry_vaporeon.aif
diff --git a/sound/direct_sound_samples/cry_venomoth.aif b/sound/direct_sound_samples/cries/cry_venomoth.aif
index bc291ec33..bc291ec33 100644
--- a/sound/direct_sound_samples/cry_venomoth.aif
+++ b/sound/direct_sound_samples/cries/cry_venomoth.aif
diff --git a/sound/direct_sound_samples/cry_venonat.aif b/sound/direct_sound_samples/cries/cry_venonat.aif
index e89d87fa8..e89d87fa8 100644
--- a/sound/direct_sound_samples/cry_venonat.aif
+++ b/sound/direct_sound_samples/cries/cry_venonat.aif
diff --git a/sound/direct_sound_samples/cry_venusaur.aif b/sound/direct_sound_samples/cries/cry_venusaur.aif
index 8a1f69e6e..8a1f69e6e 100644
--- a/sound/direct_sound_samples/cry_venusaur.aif
+++ b/sound/direct_sound_samples/cries/cry_venusaur.aif
diff --git a/sound/direct_sound_samples/cry_vibrava.aif b/sound/direct_sound_samples/cries/cry_vibrava.aif
index 3e3180219..3e3180219 100644
--- a/sound/direct_sound_samples/cry_vibrava.aif
+++ b/sound/direct_sound_samples/cries/cry_vibrava.aif
diff --git a/sound/direct_sound_samples/cry_victreebel.aif b/sound/direct_sound_samples/cries/cry_victreebel.aif
index d6e6a4fe9..d6e6a4fe9 100644
--- a/sound/direct_sound_samples/cry_victreebel.aif
+++ b/sound/direct_sound_samples/cries/cry_victreebel.aif
diff --git a/sound/direct_sound_samples/cry_vigoroth.aif b/sound/direct_sound_samples/cries/cry_vigoroth.aif
index fc414f33d..fc414f33d 100644
--- a/sound/direct_sound_samples/cry_vigoroth.aif
+++ b/sound/direct_sound_samples/cries/cry_vigoroth.aif
diff --git a/sound/direct_sound_samples/cry_vileplume.aif b/sound/direct_sound_samples/cries/cry_vileplume.aif
index 723eec697..723eec697 100644
--- a/sound/direct_sound_samples/cry_vileplume.aif
+++ b/sound/direct_sound_samples/cries/cry_vileplume.aif
diff --git a/sound/direct_sound_samples/cry_volbeat.aif b/sound/direct_sound_samples/cries/cry_volbeat.aif
index 6f765081e..6f765081e 100644
--- a/sound/direct_sound_samples/cry_volbeat.aif
+++ b/sound/direct_sound_samples/cries/cry_volbeat.aif
diff --git a/sound/direct_sound_samples/cry_voltorb.aif b/sound/direct_sound_samples/cries/cry_voltorb.aif
index 96e3bff31..96e3bff31 100644
--- a/sound/direct_sound_samples/cry_voltorb.aif
+++ b/sound/direct_sound_samples/cries/cry_voltorb.aif
diff --git a/sound/direct_sound_samples/cry_vulpix.aif b/sound/direct_sound_samples/cries/cry_vulpix.aif
index 20da23fb4..20da23fb4 100644
--- a/sound/direct_sound_samples/cry_vulpix.aif
+++ b/sound/direct_sound_samples/cries/cry_vulpix.aif
diff --git a/sound/direct_sound_samples/cry_wailmer.aif b/sound/direct_sound_samples/cries/cry_wailmer.aif
index e8de91333..e8de91333 100644
--- a/sound/direct_sound_samples/cry_wailmer.aif
+++ b/sound/direct_sound_samples/cries/cry_wailmer.aif
diff --git a/sound/direct_sound_samples/cry_wailord.aif b/sound/direct_sound_samples/cries/cry_wailord.aif
index 2c0468010..2c0468010 100644
--- a/sound/direct_sound_samples/cry_wailord.aif
+++ b/sound/direct_sound_samples/cries/cry_wailord.aif
diff --git a/sound/direct_sound_samples/cry_walrein.aif b/sound/direct_sound_samples/cries/cry_walrein.aif
index 24c00a596..24c00a596 100644
--- a/sound/direct_sound_samples/cry_walrein.aif
+++ b/sound/direct_sound_samples/cries/cry_walrein.aif
diff --git a/sound/direct_sound_samples/cry_wartortle.aif b/sound/direct_sound_samples/cries/cry_wartortle.aif
index 5dab7fd93..5dab7fd93 100644
--- a/sound/direct_sound_samples/cry_wartortle.aif
+++ b/sound/direct_sound_samples/cries/cry_wartortle.aif
diff --git a/sound/direct_sound_samples/cry_weedle.aif b/sound/direct_sound_samples/cries/cry_weedle.aif
index 773c2c8ae..773c2c8ae 100644
--- a/sound/direct_sound_samples/cry_weedle.aif
+++ b/sound/direct_sound_samples/cries/cry_weedle.aif
diff --git a/sound/direct_sound_samples/cry_weepinbell.aif b/sound/direct_sound_samples/cries/cry_weepinbell.aif
index cdd61380a..cdd61380a 100644
--- a/sound/direct_sound_samples/cry_weepinbell.aif
+++ b/sound/direct_sound_samples/cries/cry_weepinbell.aif
diff --git a/sound/direct_sound_samples/cry_weezing.aif b/sound/direct_sound_samples/cries/cry_weezing.aif
index 2e4a7fe13..2e4a7fe13 100644
--- a/sound/direct_sound_samples/cry_weezing.aif
+++ b/sound/direct_sound_samples/cries/cry_weezing.aif
diff --git a/sound/direct_sound_samples/cry_whiscash.aif b/sound/direct_sound_samples/cries/cry_whiscash.aif
index 219737f32..219737f32 100644
--- a/sound/direct_sound_samples/cry_whiscash.aif
+++ b/sound/direct_sound_samples/cries/cry_whiscash.aif
diff --git a/sound/direct_sound_samples/cry_whismur.aif b/sound/direct_sound_samples/cries/cry_whismur.aif
index 4da92ca6a..4da92ca6a 100644
--- a/sound/direct_sound_samples/cry_whismur.aif
+++ b/sound/direct_sound_samples/cries/cry_whismur.aif
diff --git a/sound/direct_sound_samples/cry_wigglytuff.aif b/sound/direct_sound_samples/cries/cry_wigglytuff.aif
index 90aa90a23..90aa90a23 100644
--- a/sound/direct_sound_samples/cry_wigglytuff.aif
+++ b/sound/direct_sound_samples/cries/cry_wigglytuff.aif
diff --git a/sound/direct_sound_samples/cry_wingull.aif b/sound/direct_sound_samples/cries/cry_wingull.aif
index 182ef18e6..182ef18e6 100644
--- a/sound/direct_sound_samples/cry_wingull.aif
+++ b/sound/direct_sound_samples/cries/cry_wingull.aif
diff --git a/sound/direct_sound_samples/cry_wobbuffet.aif b/sound/direct_sound_samples/cries/cry_wobbuffet.aif
index 70ee1f704..70ee1f704 100644
--- a/sound/direct_sound_samples/cry_wobbuffet.aif
+++ b/sound/direct_sound_samples/cries/cry_wobbuffet.aif
diff --git a/sound/direct_sound_samples/cry_wooper.aif b/sound/direct_sound_samples/cries/cry_wooper.aif
index 51a6b627e..51a6b627e 100644
--- a/sound/direct_sound_samples/cry_wooper.aif
+++ b/sound/direct_sound_samples/cries/cry_wooper.aif
diff --git a/sound/direct_sound_samples/cry_wurmple.aif b/sound/direct_sound_samples/cries/cry_wurmple.aif
index 6442a4063..6442a4063 100644
--- a/sound/direct_sound_samples/cry_wurmple.aif
+++ b/sound/direct_sound_samples/cries/cry_wurmple.aif
diff --git a/sound/direct_sound_samples/cry_wynaut.aif b/sound/direct_sound_samples/cries/cry_wynaut.aif
index 798732c74..798732c74 100644
--- a/sound/direct_sound_samples/cry_wynaut.aif
+++ b/sound/direct_sound_samples/cries/cry_wynaut.aif
diff --git a/sound/direct_sound_samples/cry_xatu.aif b/sound/direct_sound_samples/cries/cry_xatu.aif
index ac758fdbf..ac758fdbf 100644
--- a/sound/direct_sound_samples/cry_xatu.aif
+++ b/sound/direct_sound_samples/cries/cry_xatu.aif
diff --git a/sound/direct_sound_samples/cry_yanma.aif b/sound/direct_sound_samples/cries/cry_yanma.aif
index df76534c5..df76534c5 100644
--- a/sound/direct_sound_samples/cry_yanma.aif
+++ b/sound/direct_sound_samples/cries/cry_yanma.aif
diff --git a/sound/direct_sound_samples/cry_zangoose.aif b/sound/direct_sound_samples/cries/cry_zangoose.aif
index ce1622043..ce1622043 100644
--- a/sound/direct_sound_samples/cry_zangoose.aif
+++ b/sound/direct_sound_samples/cries/cry_zangoose.aif
diff --git a/sound/direct_sound_samples/cry_zapdos.aif b/sound/direct_sound_samples/cries/cry_zapdos.aif
index a8d914d14..a8d914d14 100644
--- a/sound/direct_sound_samples/cry_zapdos.aif
+++ b/sound/direct_sound_samples/cries/cry_zapdos.aif
diff --git a/sound/direct_sound_samples/cry_zigzagoon.aif b/sound/direct_sound_samples/cries/cry_zigzagoon.aif
index 52b9bb4f4..52b9bb4f4 100644
--- a/sound/direct_sound_samples/cry_zigzagoon.aif
+++ b/sound/direct_sound_samples/cries/cry_zigzagoon.aif
diff --git a/sound/direct_sound_samples/cry_zubat.aif b/sound/direct_sound_samples/cries/cry_zubat.aif
index 45036d072..45036d072 100644
--- a/sound/direct_sound_samples/cry_zubat.aif
+++ b/sound/direct_sound_samples/cries/cry_zubat.aif
diff --git a/sound/direct_sound_samples/84A7328.aif b/sound/direct_sound_samples/phonemes/vowel_1.aif
index 9521d0b6e..9521d0b6e 100644
--- a/sound/direct_sound_samples/84A7328.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_1.aif
diff --git a/sound/direct_sound_samples/863AD2C.aif b/sound/direct_sound_samples/phonemes/vowel_10.aif
index 3b136fa43..3b136fa43 100644
--- a/sound/direct_sound_samples/863AD2C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_10.aif
diff --git a/sound/direct_sound_samples/863B79C.aif b/sound/direct_sound_samples/phonemes/vowel_11.aif
index fd72512cf..fd72512cf 100644
--- a/sound/direct_sound_samples/863B79C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_11.aif
diff --git a/sound/direct_sound_samples/863BABC.aif b/sound/direct_sound_samples/phonemes/vowel_12.aif
index 6f7794bec..6f7794bec 100644
--- a/sound/direct_sound_samples/863BABC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_12.aif
diff --git a/sound/direct_sound_samples/863C744.aif b/sound/direct_sound_samples/phonemes/vowel_13.aif
index 89b845f21..89b845f21 100644
--- a/sound/direct_sound_samples/863C744.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_13.aif
diff --git a/sound/direct_sound_samples/863CD64.aif b/sound/direct_sound_samples/phonemes/vowel_14.aif
index 1d99a3a93..1d99a3a93 100644
--- a/sound/direct_sound_samples/863CD64.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_14.aif
diff --git a/sound/direct_sound_samples/863D0EC.aif b/sound/direct_sound_samples/phonemes/vowel_15.aif
index 883398129..883398129 100644
--- a/sound/direct_sound_samples/863D0EC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_15.aif
diff --git a/sound/direct_sound_samples/863DED0.aif b/sound/direct_sound_samples/phonemes/vowel_16.aif
index 776815e63..776815e63 100644
--- a/sound/direct_sound_samples/863DED0.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_16.aif
diff --git a/sound/direct_sound_samples/863E840.aif b/sound/direct_sound_samples/phonemes/vowel_17.aif
index 545bd1292..545bd1292 100644
--- a/sound/direct_sound_samples/863E840.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_17.aif
diff --git a/sound/direct_sound_samples/863EBDC.aif b/sound/direct_sound_samples/phonemes/vowel_18.aif
index c0a3be10d..c0a3be10d 100644
--- a/sound/direct_sound_samples/863EBDC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_18.aif
diff --git a/sound/direct_sound_samples/863F390.aif b/sound/direct_sound_samples/phonemes/vowel_19.aif
index d26ecdd6d..d26ecdd6d 100644
--- a/sound/direct_sound_samples/863F390.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_19.aif
diff --git a/sound/direct_sound_samples/84A7F38.aif b/sound/direct_sound_samples/phonemes/vowel_2.aif
index 2519572e2..2519572e2 100644
--- a/sound/direct_sound_samples/84A7F38.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_2.aif
diff --git a/sound/direct_sound_samples/86400EC.aif b/sound/direct_sound_samples/phonemes/vowel_20.aif
index 2b51201a4..2b51201a4 100644
--- a/sound/direct_sound_samples/86400EC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_20.aif
diff --git a/sound/direct_sound_samples/8640330.aif b/sound/direct_sound_samples/phonemes/vowel_21.aif
index cf5ac4e03..cf5ac4e03 100644
--- a/sound/direct_sound_samples/8640330.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_21.aif
diff --git a/sound/direct_sound_samples/8641170.aif b/sound/direct_sound_samples/phonemes/vowel_22.aif
index 606742e60..606742e60 100644
--- a/sound/direct_sound_samples/8641170.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_22.aif
diff --git a/sound/direct_sound_samples/8641AC4.aif b/sound/direct_sound_samples/phonemes/vowel_23.aif
index 71d4987d6..71d4987d6 100644
--- a/sound/direct_sound_samples/8641AC4.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_23.aif
diff --git a/sound/direct_sound_samples/8641E18.aif b/sound/direct_sound_samples/phonemes/vowel_24.aif
index 070c44a37..070c44a37 100644
--- a/sound/direct_sound_samples/8641E18.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_24.aif
diff --git a/sound/direct_sound_samples/864244C.aif b/sound/direct_sound_samples/phonemes/vowel_25.aif
index b0ca84a38..b0ca84a38 100644
--- a/sound/direct_sound_samples/864244C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_25.aif
diff --git a/sound/direct_sound_samples/86430B8.aif b/sound/direct_sound_samples/phonemes/vowel_26.aif
index f44101b23..f44101b23 100644
--- a/sound/direct_sound_samples/86430B8.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_26.aif
diff --git a/sound/direct_sound_samples/8643650.aif b/sound/direct_sound_samples/phonemes/vowel_27.aif
index a33809d42..a33809d42 100644
--- a/sound/direct_sound_samples/8643650.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_27.aif
diff --git a/sound/direct_sound_samples/8644154.aif b/sound/direct_sound_samples/phonemes/vowel_28.aif
index 6a005efcc..6a005efcc 100644
--- a/sound/direct_sound_samples/8644154.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_28.aif
diff --git a/sound/direct_sound_samples/8644758.aif b/sound/direct_sound_samples/phonemes/vowel_29.aif
index 62f9493fd..62f9493fd 100644
--- a/sound/direct_sound_samples/8644758.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_29.aif
diff --git a/sound/direct_sound_samples/84A8AC8.aif b/sound/direct_sound_samples/phonemes/vowel_3.aif
index d411e6612..d411e6612 100644
--- a/sound/direct_sound_samples/84A8AC8.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_3.aif
diff --git a/sound/direct_sound_samples/8644950.aif b/sound/direct_sound_samples/phonemes/vowel_30.aif
index 5767bd6d9..5767bd6d9 100644
--- a/sound/direct_sound_samples/8644950.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_30.aif
diff --git a/sound/direct_sound_samples/86452B4.aif b/sound/direct_sound_samples/phonemes/vowel_31.aif
index 33e328a82..33e328a82 100644
--- a/sound/direct_sound_samples/86452B4.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_31.aif
diff --git a/sound/direct_sound_samples/8646240.aif b/sound/direct_sound_samples/phonemes/vowel_32.aif
index 548e740c8..548e740c8 100644
--- a/sound/direct_sound_samples/8646240.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_32.aif
diff --git a/sound/direct_sound_samples/8646878.aif b/sound/direct_sound_samples/phonemes/vowel_33.aif
index cbbe09266..cbbe09266 100644
--- a/sound/direct_sound_samples/8646878.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_33.aif
diff --git a/sound/direct_sound_samples/864734C.aif b/sound/direct_sound_samples/phonemes/vowel_34.aif
index 8bdf7faaa..8bdf7faaa 100644
--- a/sound/direct_sound_samples/864734C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_34.aif
diff --git a/sound/direct_sound_samples/8648290.aif b/sound/direct_sound_samples/phonemes/vowel_35.aif
index f96f8853b..f96f8853b 100644
--- a/sound/direct_sound_samples/8648290.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_35.aif
diff --git a/sound/direct_sound_samples/8648808.aif b/sound/direct_sound_samples/phonemes/vowel_36.aif
index ab9abbf79..ab9abbf79 100644
--- a/sound/direct_sound_samples/8648808.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_36.aif
diff --git a/sound/direct_sound_samples/8649654.aif b/sound/direct_sound_samples/phonemes/vowel_37.aif
index 9d21d0ab4..9d21d0ab4 100644
--- a/sound/direct_sound_samples/8649654.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_37.aif
diff --git a/sound/direct_sound_samples/864A55C.aif b/sound/direct_sound_samples/phonemes/vowel_38.aif
index c037ed4af..c037ed4af 100644
--- a/sound/direct_sound_samples/864A55C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_38.aif
diff --git a/sound/direct_sound_samples/864B030.aif b/sound/direct_sound_samples/phonemes/vowel_39.aif
index ac1f8b66f..ac1f8b66f 100644
--- a/sound/direct_sound_samples/864B030.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_39.aif
diff --git a/sound/direct_sound_samples/84A9564.aif b/sound/direct_sound_samples/phonemes/vowel_4.aif
index 3bc1aa839..3bc1aa839 100644
--- a/sound/direct_sound_samples/84A9564.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_4.aif
diff --git a/sound/direct_sound_samples/864BBC4.aif b/sound/direct_sound_samples/phonemes/vowel_40.aif
index 1fd9111c8..1fd9111c8 100644
--- a/sound/direct_sound_samples/864BBC4.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_40.aif
diff --git a/sound/direct_sound_samples/864C59C.aif b/sound/direct_sound_samples/phonemes/vowel_41.aif
index 5d6ae2282..5d6ae2282 100644
--- a/sound/direct_sound_samples/864C59C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_41.aif
diff --git a/sound/direct_sound_samples/864CBDC.aif b/sound/direct_sound_samples/phonemes/vowel_42.aif
index f26700690..f26700690 100644
--- a/sound/direct_sound_samples/864CBDC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_42.aif
diff --git a/sound/direct_sound_samples/864D6BC.aif b/sound/direct_sound_samples/phonemes/vowel_43.aif
index 3ba97a9fc..3ba97a9fc 100644
--- a/sound/direct_sound_samples/864D6BC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_43.aif
diff --git a/sound/direct_sound_samples/864DCF8.aif b/sound/direct_sound_samples/phonemes/vowel_44.aif
index 37f1be4b1..37f1be4b1 100644
--- a/sound/direct_sound_samples/864DCF8.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_44.aif
diff --git a/sound/direct_sound_samples/864E410.aif b/sound/direct_sound_samples/phonemes/vowel_45.aif
index 4b3facb99..4b3facb99 100644
--- a/sound/direct_sound_samples/864E410.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_45.aif
diff --git a/sound/direct_sound_samples/864ED4C.aif b/sound/direct_sound_samples/phonemes/vowel_46.aif
index 8a4d7653b..8a4d7653b 100644
--- a/sound/direct_sound_samples/864ED4C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_46.aif
diff --git a/sound/direct_sound_samples/864F508.aif b/sound/direct_sound_samples/phonemes/vowel_47.aif
index db5bae244..db5bae244 100644
--- a/sound/direct_sound_samples/864F508.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_47.aif
diff --git a/sound/direct_sound_samples/864FA6C.aif b/sound/direct_sound_samples/phonemes/vowel_48.aif
index 6612dd54d..6612dd54d 100644
--- a/sound/direct_sound_samples/864FA6C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_48.aif
diff --git a/sound/direct_sound_samples/86507E0.aif b/sound/direct_sound_samples/phonemes/vowel_49.aif
index 441eecfcd..441eecfcd 100644
--- a/sound/direct_sound_samples/86507E0.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_49.aif
diff --git a/sound/direct_sound_samples/84A9EAC.aif b/sound/direct_sound_samples/phonemes/vowel_5.aif
index 3bacf3676..3bacf3676 100644
--- a/sound/direct_sound_samples/84A9EAC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_5.aif
diff --git a/sound/direct_sound_samples/8650C5C.aif b/sound/direct_sound_samples/phonemes/vowel_50.aif
index 95670cf0a..95670cf0a 100644
--- a/sound/direct_sound_samples/8650C5C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_50.aif
diff --git a/sound/direct_sound_samples/8651148.aif b/sound/direct_sound_samples/phonemes/vowel_51.aif
index 0fadcba8e..0fadcba8e 100644
--- a/sound/direct_sound_samples/8651148.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_51.aif
diff --git a/sound/direct_sound_samples/8651910.aif b/sound/direct_sound_samples/phonemes/vowel_52.aif
index 6017c55b4..6017c55b4 100644
--- a/sound/direct_sound_samples/8651910.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_52.aif
diff --git a/sound/direct_sound_samples/865250C.aif b/sound/direct_sound_samples/phonemes/vowel_53.aif
index 2327b6d65..2327b6d65 100644
--- a/sound/direct_sound_samples/865250C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_53.aif
diff --git a/sound/direct_sound_samples/8652884.aif b/sound/direct_sound_samples/phonemes/vowel_54.aif
index 19ceca0d0..19ceca0d0 100644
--- a/sound/direct_sound_samples/8652884.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_54.aif
diff --git a/sound/direct_sound_samples/8653040.aif b/sound/direct_sound_samples/phonemes/vowel_55.aif
index 8438d301a..8438d301a 100644
--- a/sound/direct_sound_samples/8653040.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_55.aif
diff --git a/sound/direct_sound_samples/8653CA4.aif b/sound/direct_sound_samples/phonemes/vowel_56.aif
index 74d4bcf4a..74d4bcf4a 100644
--- a/sound/direct_sound_samples/8653CA4.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_56.aif
diff --git a/sound/direct_sound_samples/8654170.aif b/sound/direct_sound_samples/phonemes/vowel_57.aif
index dfef8a82b..dfef8a82b 100644
--- a/sound/direct_sound_samples/8654170.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_57.aif
diff --git a/sound/direct_sound_samples/84AA8F4.aif b/sound/direct_sound_samples/phonemes/vowel_6.aif
index 5ddaa153d..5ddaa153d 100644
--- a/sound/direct_sound_samples/84AA8F4.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_6.aif
diff --git a/sound/direct_sound_samples/8639898.aif b/sound/direct_sound_samples/phonemes/vowel_7.aif
index 4b15a94b7..4b15a94b7 100644
--- a/sound/direct_sound_samples/8639898.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_7.aif
diff --git a/sound/direct_sound_samples/8639EF8.aif b/sound/direct_sound_samples/phonemes/vowel_8.aif
index 74c129073..74c129073 100644
--- a/sound/direct_sound_samples/8639EF8.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_8.aif
diff --git a/sound/direct_sound_samples/863A3DC.aif b/sound/direct_sound_samples/phonemes/vowel_9.aif
index 359972c16..359972c16 100644
--- a/sound/direct_sound_samples/863A3DC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_9.aif
diff --git a/sound/direct_sound_samples/845ED34.aif b/sound/direct_sound_samples/synth/hi_hat_rattle.aif
index 7de79e747..7de79e747 100644
--- a/sound/direct_sound_samples/845ED34.aif
+++ b/sound/direct_sound_samples/synth/hi_hat_rattle.aif
diff --git a/sound/direct_sound_samples/848E094.aif b/sound/direct_sound_samples/synth/machine_sound1.aif
index 49f24936f..49f24936f 100644
--- a/sound/direct_sound_samples/848E094.aif
+++ b/sound/direct_sound_samples/synth/machine_sound1.aif
diff --git a/sound/direct_sound_samples/848C4A4.aif b/sound/direct_sound_samples/synth/machine_sound2.aif
index 2e09d0822..2e09d0822 100644
--- a/sound/direct_sound_samples/848C4A4.aif
+++ b/sound/direct_sound_samples/synth/machine_sound2.aif
diff --git a/sound/direct_sound_samples/849D45C.aif b/sound/direct_sound_samples/synth/noise1.aif
index ebd46eeaa..ebd46eeaa 100644
--- a/sound/direct_sound_samples/849D45C.aif
+++ b/sound/direct_sound_samples/synth/noise1.aif
diff --git a/sound/direct_sound_samples/84A3B50.aif b/sound/direct_sound_samples/synth/noise2.aif
index 6a11945c5..6a11945c5 100644
--- a/sound/direct_sound_samples/84A3B50.aif
+++ b/sound/direct_sound_samples/synth/noise2.aif
diff --git a/sound/direct_sound_samples/8491ACC.aif b/sound/direct_sound_samples/synth/noise3.aif
index ece919ea5..ece919ea5 100644
--- a/sound/direct_sound_samples/8491ACC.aif
+++ b/sound/direct_sound_samples/synth/noise3.aif
diff --git a/sound/direct_sound_samples/8488F44.aif b/sound/direct_sound_samples/synth/ring.aif
index 578a81c2f..578a81c2f 100644
--- a/sound/direct_sound_samples/8488F44.aif
+++ b/sound/direct_sound_samples/synth/ring.aif
diff --git a/sound/direct_sound_samples/8492D10.aif b/sound/direct_sound_samples/synth/sc88_123_bubble.aif
index 89872bf55..89872bf55 100644
--- a/sound/direct_sound_samples/8492D10.aif
+++ b/sound/direct_sound_samples/synth/sc88_123_bubble.aif
diff --git a/sound/direct_sound_samples/8495028.aif b/sound/direct_sound_samples/synth/sc88_123_pink_noise.aif
index 102830efa..102830efa 100644
--- a/sound/direct_sound_samples/8495028.aif
+++ b/sound/direct_sound_samples/synth/sc88_123_pink_noise.aif
diff --git a/sound/direct_sound_samples/8499110.aif b/sound/direct_sound_samples/synth/sc88_123_white_noise.aif
index 556be0238..556be0238 100644
--- a/sound/direct_sound_samples/8499110.aif
+++ b/sound/direct_sound_samples/synth/sc88_123_white_noise.aif
diff --git a/sound/direct_sound_samples/84A5690.aif b/sound/direct_sound_samples/synth/sc88_124_horse_gallop.aif
index a0fb49f89..a0fb49f89 100644
--- a/sound/direct_sound_samples/84A5690.aif
+++ b/sound/direct_sound_samples/synth/sc88_124_horse_gallop.aif
diff --git a/sound/direct_sound_samples/8493D20.aif b/sound/direct_sound_samples/synth/sc88_126_car_crash.aif
index 515818a4d..515818a4d 100644
--- a/sound/direct_sound_samples/8493D20.aif
+++ b/sound/direct_sound_samples/synth/sc88_126_car_crash.aif
diff --git a/sound/direct_sound_samples/848F448.aif b/sound/direct_sound_samples/synth/sc88_127_applause_2.aif
index 5c55d91ed..5c55d91ed 100644
--- a/sound/direct_sound_samples/848F448.aif
+++ b/sound/direct_sound_samples/synth/sc88_127_applause_2.aif
diff --git a/sound/direct_sound_samples/84A311C.aif b/sound/direct_sound_samples/synth/sc88_13_marimba.aif
index 1bd43ca92..1bd43ca92 100644
--- a/sound/direct_sound_samples/84A311C.aif
+++ b/sound/direct_sound_samples/synth/sc88_13_marimba.aif
diff --git a/sound/direct_sound_samples/849BAEC.aif b/sound/direct_sound_samples/synth/sc88_15_tubular_bell.aif
index 9d00ecae6..9d00ecae6 100644
--- a/sound/direct_sound_samples/849BAEC.aif
+++ b/sound/direct_sound_samples/synth/sc88_15_tubular_bell.aif
diff --git a/sound/direct_sound_samples/84569D4.aif b/sound/direct_sound_samples/synth/sc88_18_organ_2.aif
index 6372bbc32..6372bbc32 100644
--- a/sound/direct_sound_samples/84569D4.aif
+++ b/sound/direct_sound_samples/synth/sc88_18_organ_2.aif
diff --git a/sound/direct_sound_samples/84A26EC.aif b/sound/direct_sound_samples/synth/sc88_1_piano_1.aif
index 083c45e3d..083c45e3d 100644
--- a/sound/direct_sound_samples/84A26EC.aif
+++ b/sound/direct_sound_samples/synth/sc88_1_piano_1.aif
diff --git a/sound/direct_sound_samples/84A5F58.aif b/sound/direct_sound_samples/synth/sc88_22_accordion_fr.aif
index 6d6c2e998..6d6c2e998 100644
--- a/sound/direct_sound_samples/84A5F58.aif
+++ b/sound/direct_sound_samples/synth/sc88_22_accordion_fr.aif
diff --git a/sound/direct_sound_samples/8481130.aif b/sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.aif
index dea429a25..dea429a25 100644
--- a/sound/direct_sound_samples/8481130.aif
+++ b/sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.aif
diff --git a/sound/direct_sound_samples/846286C.aif b/sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.aif
index c2b3757b0..c2b3757b0 100644
--- a/sound/direct_sound_samples/846286C.aif
+++ b/sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.aif
diff --git a/sound/direct_sound_samples/8464E2C.aif b/sound/direct_sound_samples/synth/sc88_2_piano_2.aif
index 5236141ba..5236141ba 100644
--- a/sound/direct_sound_samples/8464E2C.aif
+++ b/sound/direct_sound_samples/synth/sc88_2_piano_2.aif
diff --git a/sound/direct_sound_samples/8457D98.aif b/sound/direct_sound_samples/synth/sc88_34_finger_slap.aif
index 9175b63c5..9175b63c5 100644
--- a/sound/direct_sound_samples/8457D98.aif
+++ b/sound/direct_sound_samples/synth/sc88_34_finger_slap.aif
diff --git a/sound/direct_sound_samples/8483804.aif b/sound/direct_sound_samples/synth/sc88_34_fingered_bass.aif
index f244a9982..f244a9982 100644
--- a/sound/direct_sound_samples/8483804.aif
+++ b/sound/direct_sound_samples/synth/sc88_34_fingered_bass.aif
diff --git a/sound/direct_sound_samples/84571CC.aif b/sound/direct_sound_samples/synth/sc88_36_fretless_bass.aif
index f3aa47d91..f3aa47d91 100644
--- a/sound/direct_sound_samples/84571CC.aif
+++ b/sound/direct_sound_samples/synth/sc88_36_fretless_bass.aif
diff --git a/sound/direct_sound_samples/8466388.aif b/sound/direct_sound_samples/synth/sc88_37_unison_slap.aif
index a7c4e94f8..a7c4e94f8 100644
--- a/sound/direct_sound_samples/8466388.aif
+++ b/sound/direct_sound_samples/synth/sc88_37_unison_slap.aif
diff --git a/sound/direct_sound_samples/8458CD0.aif b/sound/direct_sound_samples/synth/sc88_39_synth_bass_1.aif
index f39931a7e..f39931a7e 100644
--- a/sound/direct_sound_samples/8458CD0.aif
+++ b/sound/direct_sound_samples/synth/sc88_39_synth_bass_1.aif
diff --git a/sound/direct_sound_samples/84637CC.aif b/sound/direct_sound_samples/synth/sc88_3_piano_3.aif
index 7de586c9b..7de586c9b 100644
--- a/sound/direct_sound_samples/84637CC.aif
+++ b/sound/direct_sound_samples/synth/sc88_3_piano_3.aif
diff --git a/sound/direct_sound_samples/848BD68.aif b/sound/direct_sound_samples/synth/sc88_46_pizzicato_strings.aif
index 1c0a027f7..1c0a027f7 100644
--- a/sound/direct_sound_samples/848BD68.aif
+++ b/sound/direct_sound_samples/synth/sc88_46_pizzicato_strings.aif
diff --git a/sound/direct_sound_samples/8466F14.aif b/sound/direct_sound_samples/synth/sc88_49_strings.aif
index bfaa5c196..bfaa5c196 100644
--- a/sound/direct_sound_samples/8466F14.aif
+++ b/sound/direct_sound_samples/synth/sc88_49_strings.aif
diff --git a/sound/direct_sound_samples/846A4B8.aif b/sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.aif
index 3e76cacdd..3e76cacdd 100644
--- a/sound/direct_sound_samples/846A4B8.aif
+++ b/sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.aif
diff --git a/sound/direct_sound_samples/846C7D4.aif b/sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.aif
index 2647c78ec..2647c78ec 100644
--- a/sound/direct_sound_samples/846C7D4.aif
+++ b/sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.aif
diff --git a/sound/direct_sound_samples/846FEA0.aif b/sound/direct_sound_samples/synth/sc88_57_trumpet.aif
index e56df7f60..e56df7f60 100644
--- a/sound/direct_sound_samples/846FEA0.aif
+++ b/sound/direct_sound_samples/synth/sc88_57_trumpet.aif
diff --git a/sound/direct_sound_samples/84711F0.aif b/sound/direct_sound_samples/synth/sc88_58_trombone.aif
index 8c68a83b3..8c68a83b3 100644
--- a/sound/direct_sound_samples/84711F0.aif
+++ b/sound/direct_sound_samples/synth/sc88_58_trombone.aif
diff --git a/sound/direct_sound_samples/8472700.aif b/sound/direct_sound_samples/synth/sc88_59_tuba.aif
index a03bafc97..a03bafc97 100644
--- a/sound/direct_sound_samples/8472700.aif
+++ b/sound/direct_sound_samples/synth/sc88_59_tuba.aif
diff --git a/sound/direct_sound_samples/8473B20.aif b/sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.aif
index d4077b481..d4077b481 100644
--- a/sound/direct_sound_samples/8473B20.aif
+++ b/sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.aif
diff --git a/sound/direct_sound_samples/8474BBC.aif b/sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.aif
index 2ad86876b..2ad86876b 100644
--- a/sound/direct_sound_samples/8474BBC.aif
+++ b/sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.aif
diff --git a/sound/direct_sound_samples/8475C18.aif b/sound/direct_sound_samples/synth/sc88_61_french_horns.aif
index 742c4385e..742c4385e 100644
--- a/sound/direct_sound_samples/8475C18.aif
+++ b/sound/direct_sound_samples/synth/sc88_61_french_horns.aif
diff --git a/sound/direct_sound_samples/847CBAC.aif b/sound/direct_sound_samples/synth/sc88_61_wide_french_horns.aif
index 004fda6a1..004fda6a1 100644
--- a/sound/direct_sound_samples/847CBAC.aif
+++ b/sound/direct_sound_samples/synth/sc88_61_wide_french_horns.aif
diff --git a/sound/direct_sound_samples/84830A0.aif b/sound/direct_sound_samples/synth/sc88_74_flute.aif
index 703f3adbd..703f3adbd 100644
--- a/sound/direct_sound_samples/84830A0.aif
+++ b/sound/direct_sound_samples/synth/sc88_74_flute.aif
diff --git a/sound/direct_sound_samples/8487330.aif b/sound/direct_sound_samples/synth/sc88_81_square_wave.aif
index 09e17f0ca..09e17f0ca 100644
--- a/sound/direct_sound_samples/8487330.aif
+++ b/sound/direct_sound_samples/synth/sc88_81_square_wave.aif
diff --git a/sound/direct_sound_samples/849F40C.aif b/sound/direct_sound_samples/synth/sc88_82_jp_super_saw.aif
index 455ced13e..455ced13e 100644
--- a/sound/direct_sound_samples/849F40C.aif
+++ b/sound/direct_sound_samples/synth/sc88_82_jp_super_saw.aif
diff --git a/sound/direct_sound_samples/8497134.aif b/sound/direct_sound_samples/synth/sc88_82_waspy_synth.aif
index 09fe6f12e..09fe6f12e 100644
--- a/sound/direct_sound_samples/8497134.aif
+++ b/sound/direct_sound_samples/synth/sc88_82_waspy_synth.aif
diff --git a/sound/direct_sound_samples/845AE14.aif b/sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.aif
index 9c504e3d0..9c504e3d0 100644
--- a/sound/direct_sound_samples/845AE14.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.aif
diff --git a/sound/direct_sound_samples/845FCC8.aif b/sound/direct_sound_samples/synth/sc88_drumkit_cabasa.aif
index 39ec57d29..39ec57d29 100644
--- a/sound/direct_sound_samples/845FCC8.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_cabasa.aif
diff --git a/sound/direct_sound_samples/845DAF0.aif b/sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.aif
index 8747aef28..8747aef28 100644
--- a/sound/direct_sound_samples/845DAF0.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.aif
diff --git a/sound/direct_sound_samples/8460E60.aif b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.aif
index 576e3e19e..576e3e19e 100644
--- a/sound/direct_sound_samples/8460E60.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.aif
diff --git a/sound/direct_sound_samples/846057C.aif b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.aif
index 4aec6882f..4aec6882f 100644
--- a/sound/direct_sound_samples/846057C.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.aif
diff --git a/sound/direct_sound_samples/849B320.aif b/sound/direct_sound_samples/synth/sc88_drumkit_guiro.aif
index dd80b1185..dd80b1185 100644
--- a/sound/direct_sound_samples/849B320.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_guiro.aif
diff --git a/sound/direct_sound_samples/845B9A8.aif b/sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.aif
index b11787ffc..b11787ffc 100644
--- a/sound/direct_sound_samples/845B9A8.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.aif
diff --git a/sound/direct_sound_samples/845CAB0.aif b/sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.aif
index 04f990b13..04f990b13 100644
--- a/sound/direct_sound_samples/845CAB0.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.aif
diff --git a/sound/direct_sound_samples/84622A4.aif b/sound/direct_sound_samples/synth/sc88_drumkit_low_conga.aif
index 8e1cb620a..8e1cb620a 100644
--- a/sound/direct_sound_samples/84622A4.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_low_conga.aif
diff --git a/sound/direct_sound_samples/8461D8C.aif b/sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.aif
index 2e1bf9c64..2e1bf9c64 100644
--- a/sound/direct_sound_samples/8461D8C.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.aif
diff --git a/sound/direct_sound_samples/845DF04.aif b/sound/direct_sound_samples/synth/sc88_drumkit_open_hi_hat.aif
index 5ad9410d0..5ad9410d0 100644
--- a/sound/direct_sound_samples/845DF04.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_open_hi_hat.aif
diff --git a/sound/direct_sound_samples/845B2B4.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_1.aif
index 544b187d5..544b187d5 100644
--- a/sound/direct_sound_samples/845B2B4.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_snare_1.aif
diff --git a/sound/direct_sound_samples/845C238.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_2.aif
index 36b640758..36b640758 100644
--- a/sound/direct_sound_samples/845C238.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_snare_2.aif
diff --git a/sound/direct_sound_samples/848A8A4.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_3.aif
index ee6ff45b7..ee6ff45b7 100644
--- a/sound/direct_sound_samples/848A8A4.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_snare_3.aif
diff --git a/sound/direct_sound_samples/8486924.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_4.aif
index b3122457d..b3122457d 100644
--- a/sound/direct_sound_samples/8486924.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_snare_4.aif
diff --git a/sound/direct_sound_samples/8485454.aif b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.aif
index 7270872d6..7270872d6 100644
--- a/sound/direct_sound_samples/8485454.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.aif
diff --git a/sound/direct_sound_samples/8459944.aif b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.aif
index dfdfd702e..dfdfd702e 100644
--- a/sound/direct_sound_samples/8459944.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.aif
diff --git a/sound/direct_sound_samples/8456330.aif b/sound/direct_sound_samples/synth/tone1.aif
index 199ead811..199ead811 100644
--- a/sound/direct_sound_samples/8456330.aif
+++ b/sound/direct_sound_samples/synth/tone1.aif
diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc
index d9e925956..1d7c46c83 100644
--- a/sound/voice_groups.inc
+++ b/sound/voice_groups.inc
@@ -9,7 +9,7 @@ voicegroup_pokemon_cry:: @ 842FC8
 	voice_square_2 2, 0, 0, 9, 2  @ 842FCD0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FCDC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FCE8
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 235  @ 842FCF4
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 235  @ 842FCF4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD0C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD18
@@ -17,7 +17,7 @@ voicegroup_pokemon_cry:: @ 842FC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD48
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 127  @ 842FD54
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 127  @ 842FD54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD78
@@ -32,13 +32,13 @@ voicegroup_pokemon_cry:: @ 842FC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FDE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FDF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FDFC
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149  @ 842FE08
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149  @ 842FE08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FE14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FE20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FE2C
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 115  @ 842FE38
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 115  @ 842FE38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FE44
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 842FE50
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 842FE50
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FE5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FE68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FE74
@@ -47,7 +47,7 @@ voicegroup_pokemon_cry:: @ 842FC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FE98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FEA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FEB0
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 204, 193, 239  @ 842FEBC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 204, 193, 239  @ 842FEBC
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 842FEC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FED4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FEE0
@@ -91,54 +91,54 @@ voicegroup_842FEF8:: @ 842FEF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430084
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430090
 	voice_square_1 0, 0, 0, 1, 6, 0  @ 843009C
-	voice_directsound_no_resample 60, 0x40, DirectSoundWaveData_845AE14, 255, 0, 255, 242  @ 84300A8
+	voice_directsound_no_resample 60, 0x40, DirectSoundWaveData_SC88_DrumKitBassDrum, 255, 0, 255, 242  @ 84300A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84300B4
-	voice_directsound_no_resample 60, 192, DirectSoundWaveData_845B2B4, 255, 0, 255, 242  @ 84300C0
-	voice_directsound_no_resample 60, 192, DirectSoundWaveData_845B9A8, 255, 255, 255, 127  @ 84300CC
-	voice_directsound_no_resample 60, 192, DirectSoundWaveData_845C238, 255, 0, 255, 242  @ 84300D8
-	voice_directsound 48, 172, DirectSoundWaveData_845CAB0, 255, 210, 77, 204  @ 84300E4
-	voice_directsound_no_resample 60, 207, DirectSoundWaveData_845DAF0, 255, 127, 0, 188  @ 84300F0
-	voice_directsound 51, 0x31, DirectSoundWaveData_845CAB0, 255, 216, 77, 204  @ 84300FC
+	voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare1, 255, 0, 255, 242  @ 84300C0
+	voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitHandClap, 255, 255, 255, 127  @ 84300CC
+	voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 242  @ 84300D8
+	voice_directsound 48, 172, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 210, 77, 204  @ 84300E4
+	voice_directsound_no_resample 60, 207, DirectSoundWaveData_SC88_DrumKitClosedHiHat, 255, 127, 0, 188  @ 84300F0
+	voice_directsound 51, 0x31, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 216, 77, 204  @ 84300FC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430108
-	voice_directsound 54, 187, DirectSoundWaveData_845CAB0, 255, 216, 77, 204  @ 8430114
-	voice_directsound_no_resample 60, 207, DirectSoundWaveData_845DF04, 255, 242, 141, 0  @ 8430120
-	voice_directsound 57, 197, DirectSoundWaveData_845CAB0, 255, 210, 77, 204  @ 843012C
-	voice_directsound 60, 207, DirectSoundWaveData_845CAB0, 255, 204, 77, 204  @ 8430138
+	voice_directsound 54, 187, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 216, 77, 204  @ 8430114
+	voice_directsound_no_resample 60, 207, DirectSoundWaveData_SC88_DrumKitOpenHiHat, 255, 242, 141, 0  @ 8430120
+	voice_directsound 57, 197, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 210, 77, 204  @ 843012C
+	voice_directsound 60, 207, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 204, 77, 204  @ 8430138
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430144
-	voice_directsound 62, 212, DirectSoundWaveData_845CAB0, 255, 204, 77, 204  @ 8430150
+	voice_directsound 62, 212, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 204, 77, 204  @ 8430150
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843015C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430168
-	voice_directsound_no_resample 70, 177, DirectSoundWaveData_845ED34, 255, 165, 103, 231  @ 8430174
-	voice_directsound_no_resample 32, 162, DirectSoundWaveData_845FCC8, 255, 127, 77, 204  @ 8430180
-	voice_directsound_no_resample 60, 142, DirectSoundWaveData_846057C, 255, 235, 0, 165  @ 843018C
+	voice_directsound_no_resample 70, 177, DirectSoundWaveData_HiHatRattle, 255, 165, 103, 231  @ 8430174
+	voice_directsound_no_resample 32, 162, DirectSoundWaveData_SC88_DrumKitCabasa, 255, 127, 77, 204  @ 8430180
+	voice_directsound_no_resample 60, 142, DirectSoundWaveData_SC88_DrumKitCrashCymbal2, 255, 235, 0, 165  @ 843018C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430198
-	voice_directsound_no_resample 30, 182, DirectSoundWaveData_8460E60, 255, 246, 0, 216  @ 84301A4
+	voice_directsound_no_resample 30, 182, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216  @ 84301A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84301B0
-	voice_directsound_no_resample 30, 182, DirectSoundWaveData_8460E60, 255, 246, 0, 216  @ 84301BC
-	voice_directsound_no_resample 30, 182, DirectSoundWaveData_8460E60, 8, 0, 255, 216  @ 84301C8
+	voice_directsound_no_resample 30, 182, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216  @ 84301BC
+	voice_directsound_no_resample 30, 182, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 8, 0, 255, 216  @ 84301C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84301D4
-	voice_directsound_no_resample 72, 232, DirectSoundWaveData_8461D8C, 255, 0, 255, 0  @ 84301E0
+	voice_directsound_no_resample 72, 232, DirectSoundWaveData_SC88_DrumKitMuteHiConga, 255, 0, 255, 0  @ 84301E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84301EC
-	voice_directsound_no_resample 72, 222, DirectSoundWaveData_84622A4, 255, 0, 255, 0  @ 84301F8
+	voice_directsound_no_resample 72, 222, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0  @ 84301F8
 
 	.align 2
 voicegroup_8430204:: @ 8430204
-	voice_directsound 60, 0, DirectSoundWaveData_846286C, 255, 252, 0, 239  @ 8430204
-	voice_directsound 60, 0, DirectSoundWaveData_84637CC, 255, 250, 0, 221  @ 8430210
-	voice_directsound 60, 0, DirectSoundWaveData_8464E2C, 255, 250, 0, 221  @ 843021C
-	voice_directsound 60, 0, DirectSoundWaveData_8466388, 255, 247, 0, 221  @ 8430228
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SteelStringGuitar, 255, 252, 0, 239  @ 8430204
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano3, 255, 250, 0, 221  @ 8430210
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano2, 255, 250, 0, 221  @ 843021C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_UnisonSlap, 255, 247, 0, 221  @ 8430228
 
 	.align 2
 voicegroup_8430234:: @ 8430234
-	voice_directsound 60, 0, DirectSoundWaveData_8466F14, 255, 0, 255, 196  @ 8430234
-	voice_directsound 60, 0, DirectSoundWaveData_846A4B8, 255, 0, 255, 196  @ 8430240
-	voice_directsound 60, 0, DirectSoundWaveData_846C7D4, 255, 0, 255, 196  @ 843024C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Strings, 255, 0, 255, 196  @ 8430234
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_StringsPlusFlute, 255, 0, 255, 196  @ 8430240
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_StringsPlusHorn, 255, 0, 255, 196  @ 843024C
 
 	.align 2
 voicegroup_8430258:: @ 8430258
-	voice_directsound 60, 0, DirectSoundWaveData_846FEA0, 255, 0, 193, 127  @ 8430258
-	voice_directsound 60, 0, DirectSoundWaveData_84711F0, 255, 0, 193, 127  @ 8430264
-	voice_directsound 60, 0, DirectSoundWaveData_8472700, 255, 0, 193, 127  @ 8430270
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Trumpet, 255, 0, 193, 127  @ 8430258
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Trombone, 255, 0, 193, 127  @ 8430264
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Tuba, 255, 0, 193, 127  @ 8430270
 	voice_square_1_alt 38, 2, 1, 0, 0, 0  @ 843027C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430288
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430294
@@ -270,13 +270,13 @@ voicegroup_8430258:: @ 8430258
 
 	.align 2
 voicegroup_843087C:: @ 843087
-	voice_directsound 60, 0, DirectSoundWaveData_8473B20, 255, 0, 255, 165  @ 843087C
-	voice_directsound 60, 0, DirectSoundWaveData_8474BBC, 255, 0, 255, 165  @ 8430888
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_CupMutedTrumpet, 255, 0, 255, 165  @ 843087C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_MutedTrumpet3, 255, 0, 255, 165  @ 8430888
 
 	.align 2
 voicegroup_8430894:: @ 8430894
-	voice_directsound 60, 0, DirectSoundWaveData_8475C18, 255, 0, 224, 165  @ 8430894
-	voice_directsound 60, 0, DirectSoundWaveData_847CBAC, 255, 0, 218, 165  @ 84308A0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FrenchHorns, 255, 0, 224, 165  @ 8430894
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_WideFrenchHorns, 255, 0, 218, 165  @ 84308A0
 
 	.align 2
 voicegroup_84308AC:: @ 84308AC
@@ -294,7 +294,7 @@ voicegroup_84308AC:: @ 84308AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430930
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843093C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430948
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 216, 90, 242  @ 8430954
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 216, 90, 242  @ 8430954
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430960
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843096C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430978
@@ -326,8 +326,8 @@ voicegroup_84308AC:: @ 84308AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430AB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430ABC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430AC8
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 204  @ 8430AD4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8430AE0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204  @ 8430AD4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8430AE0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8430AEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430AF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430B04
@@ -391,7 +391,7 @@ voicegroup_8430C9C:: @ 8430C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430D98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430DA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430DB0
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 149  @ 8430DBC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 149  @ 8430DBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430DC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430DD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430DE0
@@ -402,7 +402,7 @@ voicegroup_8430C9C:: @ 8430C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430E1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430E28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430E34
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149  @ 8430E40
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149  @ 8430E40
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430E4C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430E58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430E64
@@ -440,7 +440,7 @@ voicegroup_8430C9C:: @ 8430C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430FE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430FF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430FFC
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8431008
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8431008
 	voice_programmable_wave_alt ProgrammableWaveData_84553BC, 0, 7, 15, 1  @ 8431014
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431020
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843102C
@@ -500,18 +500,18 @@ voicegroup_8430C9C:: @ 8430C9C
 voicegroup_843129C:: @ 843129C
 	voice_keysplit_all voicegroup_842FEF8  @ 843129C
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 84312A8
-	voice_directsound 60, 0, DirectSoundWaveData_8497134, 255, 178, 180, 165  @ 84312B4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 255, 178, 180, 165  @ 84312B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84312C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84312CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84312D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84312E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84312F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84312FC
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 235  @ 8431308
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 235  @ 8431308
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431314
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431320
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843132C
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 8431338
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 8431338
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431344
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431350
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843135C
@@ -536,7 +536,7 @@ voicegroup_843129C:: @ 843129C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431440
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843144C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431458
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 8431464
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 8431464
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431470
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843147C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431488
@@ -544,8 +544,8 @@ voicegroup_843129C:: @ 843129C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84314A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84314AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84314B8
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 204  @ 84314C4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 84314D0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204  @ 84314C4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 84314D0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 84314DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84314E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84314F4
@@ -571,7 +571,7 @@ voicegroup_843129C:: @ 843129C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84315E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84315F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84315FC
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8431608
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8431608
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431614
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431620
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843162C
@@ -650,7 +650,7 @@ voicegroup_8431764:: @ 8431764
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431974
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431980
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843198C
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8431998
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8431998
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 84319A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84319B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84319BC
@@ -720,7 +720,7 @@ voicegroup_8431B9C:: @ 8431B9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431C98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431CA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431CB0
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 149  @ 8431CBC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 149  @ 8431CBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431CC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431CD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431CE0
@@ -742,8 +742,8 @@ voicegroup_8431B9C:: @ 8431B9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431DA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431DAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431DB8
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235  @ 8431DC4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8431DD0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235  @ 8431DC4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8431DD0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8431DDC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431DF4
@@ -769,7 +769,7 @@ voicegroup_8431B9C:: @ 8431B9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431EE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431EF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431EFC
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8431F08
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8431F08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431F14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431F20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431F2C
@@ -819,7 +819,7 @@ voicegroup_8431F98:: @ 8431F98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432118
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432124
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432130
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149  @ 843213C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149  @ 843213C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432148
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432154
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432160
@@ -840,7 +840,7 @@ voicegroup_8431F98:: @ 8431F98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432214
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432220
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843222C
-	voice_directsound 60, 0, DirectSoundWaveData_84A5F58, 255, 0, 255, 165  @ 8432238
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordianFr, 255, 0, 255, 165  @ 8432238
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432244
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432250
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843225C
@@ -857,7 +857,7 @@ voicegroup_8431F98:: @ 8431F98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84322E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84322EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84322F8
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8432304
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8432304
 	voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 1  @ 8432310
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843231C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432328
@@ -915,11 +915,11 @@ voicegroup_84323E8:: @ 84323E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432574
 	voice_noise_alt 0, 0, 2, 0, 2  @ 8432580
 	voice_noise_alt 0, 0, 1, 0, 1  @ 843258C
-	voice_directsound_no_resample 60, 192, DirectSoundWaveData_845AE14, 255, 0, 255, 242  @ 8432598
+	voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitBassDrum, 255, 0, 255, 242  @ 8432598
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84325A4
-	voice_directsound_no_resample 60, 192, DirectSoundWaveData_845B2B4, 255, 0, 255, 242  @ 84325B0
+	voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare1, 255, 0, 255, 242  @ 84325B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84325BC
-	voice_directsound_no_resample 60, 192, DirectSoundWaveData_845C238, 255, 0, 255, 242  @ 84325C8
+	voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 242  @ 84325C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84325D4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84325E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84325EC
@@ -933,7 +933,7 @@ voicegroup_84323E8:: @ 84323E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843264C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432658
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432664
-	voice_directsound_no_resample 32, 202, DirectSoundWaveData_845FCC8, 255, 127, 77, 204  @ 8432670
+	voice_directsound_no_resample 32, 202, DirectSoundWaveData_SC88_DrumKitCabasa, 255, 127, 77, 204  @ 8432670
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843267C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432688
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432694
@@ -941,9 +941,9 @@ voicegroup_84323E8:: @ 84323E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84326AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84326B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84326C4
-	voice_directsound_no_resample 72, 194, DirectSoundWaveData_8461D8C, 255, 0, 255, 0  @ 84326D0
+	voice_directsound_no_resample 72, 194, DirectSoundWaveData_SC88_DrumKitMuteHiConga, 255, 0, 255, 0  @ 84326D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84326DC
-	voice_directsound_no_resample 72, 190, DirectSoundWaveData_84622A4, 255, 0, 255, 0  @ 84326E8
+	voice_directsound_no_resample 72, 190, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0  @ 84326E8
 
 	.align 2
 voicegroup_84326F4:: @ 84326F4
@@ -992,8 +992,8 @@ voicegroup_84326F4:: @ 84326F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84328EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84328F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432904
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165  @ 8432910
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 204  @ 843291C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165  @ 8432910
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204  @ 843291C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432928
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8432934
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432940
@@ -1020,7 +1020,7 @@ voicegroup_84326F4:: @ 84326F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432A3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432A48
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432A54
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8432A60
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8432A60
 	voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 0  @ 8432A6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432A78
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432A84
@@ -1086,7 +1086,7 @@ voicegroup_8432B38:: @ 8432B38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432D30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432D3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432D48
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165  @ 8432D54
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165  @ 8432D54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432D60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432D6C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8432D78
@@ -1114,7 +1114,7 @@ voicegroup_8432B38:: @ 8432B38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432E80
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432E8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432E98
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8432EA4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8432EA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432EB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432EBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8432EC8
@@ -1217,7 +1217,7 @@ voicegroup_8433138:: @ 8433138
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433330
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843333C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433348
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165  @ 8433354
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165  @ 8433354
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433360
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843336C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8433378
@@ -1245,7 +1245,7 @@ voicegroup_8433138:: @ 8433138
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433480
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843348C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433498
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 84334A4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 84334A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84334B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84334BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84334C8
@@ -1305,7 +1305,7 @@ voicegroup_8433534:: @ 8433534
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843372C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433738
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433744
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165  @ 8433750
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165  @ 8433750
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843375C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433768
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8433774
@@ -1397,7 +1397,7 @@ voicegroup_8433948:: @ 8433948
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433B58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433B64
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433B70
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8433B7C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8433B7C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8433B88
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433B94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433BA0
@@ -1426,7 +1426,7 @@ voicegroup_8433BAC:: @ 8433BAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433C90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433CA8
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8433CB4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8433CB4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433CC0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433CCC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433CD8
@@ -1440,11 +1440,11 @@ voicegroup_8433BAC:: @ 8433BAC
 	voice_programmable_wave_alt ProgrammableWaveData_84553FC, 0, 7, 15, 0  @ 8433D38
 	voice_programmable_wave_alt ProgrammableWaveData_84553FC, 0, 7, 15, 1  @ 8433D44
 	voice_square_1_alt 0, 0, 0, 0, 7, 0  @ 8433D50
-	voice_directsound_no_resample 60, 192, DirectSoundWaveData_845AE14, 255, 0, 255, 242  @ 8433D5C
+	voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitBassDrum, 255, 0, 255, 242  @ 8433D5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433D68
-	voice_directsound_no_resample 60, 192, DirectSoundWaveData_845B2B4, 255, 0, 255, 242  @ 8433D74
+	voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare1, 255, 0, 255, 242  @ 8433D74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433D80
-	voice_directsound_no_resample 60, 192, DirectSoundWaveData_845C238, 255, 0, 255, 242  @ 8433D8C
+	voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 242  @ 8433D8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433D98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433DA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433DB0
@@ -1458,7 +1458,7 @@ voicegroup_8433BAC:: @ 8433BAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433E10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433E1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433E28
-	voice_directsound_no_resample 32, 162, DirectSoundWaveData_845FCC8, 255, 127, 77, 204  @ 8433E34
+	voice_directsound_no_resample 32, 162, DirectSoundWaveData_SC88_DrumKitCabasa, 255, 127, 77, 204  @ 8433E34
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433E40
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433E4C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433E58
@@ -1466,9 +1466,9 @@ voicegroup_8433BAC:: @ 8433BAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433E70
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433E7C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433E88
-	voice_directsound_no_resample 72, 195, DirectSoundWaveData_8461D8C, 255, 0, 255, 0  @ 8433E94
+	voice_directsound_no_resample 72, 195, DirectSoundWaveData_SC88_DrumKitMuteHiConga, 255, 0, 255, 0  @ 8433E94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433EA0
-	voice_directsound_no_resample 72, 189, DirectSoundWaveData_84622A4, 255, 0, 255, 0  @ 8433EAC
+	voice_directsound_no_resample 72, 189, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0  @ 8433EAC
 
 	.align 2
 voicegroup_8433EB8:: @ 8433EB8
@@ -1507,7 +1507,7 @@ voicegroup_8433EB8:: @ 8433EB8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434038
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434044
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434050
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149  @ 843405C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149  @ 843405C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434068
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434074
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434080
@@ -1518,7 +1518,7 @@ voicegroup_8433EB8:: @ 8433EB8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84340BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84340C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84340D4
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235  @ 84340E0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235  @ 84340E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84340EC
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 84340F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434104
@@ -1609,9 +1609,9 @@ voicegroup_84342E4:: @ 84342E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84344DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84344E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84344F4
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165  @ 8434500
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165  @ 8434500
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843450C
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8434518
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8434518
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8434524
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434530
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843453C
@@ -1637,7 +1637,7 @@ voicegroup_84342E4:: @ 84342E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843462C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434638
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434644
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8434650
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8434650
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843465C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434668
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434674
@@ -1705,7 +1705,7 @@ voicegroup_8434728:: @ 8434728
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434938
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434944
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434950
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 843495C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 843495C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434968
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434974
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434980
@@ -1731,7 +1731,7 @@ voicegroup_8434728:: @ 8434728
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434A70
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434A7C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434A88
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8434A94
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8434A94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434AA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434AAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434AB8
@@ -1792,7 +1792,7 @@ voicegroup_8434B18:: @ 8434B18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434D28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434D34
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434D40
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8434D4C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8434D4C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434D58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434D64
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434D70
@@ -1846,7 +1846,7 @@ voicegroup_8434F14:: @ 8434F14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434F8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434F98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434FA4
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 8434FB0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 8434FB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434FBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434FC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434FD4
@@ -1871,7 +1871,7 @@ voicegroup_8434F14:: @ 8434F14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84350B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84350C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84350D0
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 84350DC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 84350DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84350E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84350F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435100
@@ -1981,7 +1981,7 @@ voicegroup_8435514:: @ 8435514
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84355BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84355C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84355D4
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 127  @ 84355E0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 127  @ 84355E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84355EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84355F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435604
@@ -2000,7 +2000,7 @@ voicegroup_8435514:: @ 8435514
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84356A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84356AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84356B8
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 84356C4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 84356C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84356D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84356DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84356E8
@@ -2064,7 +2064,7 @@ voicegroup_84358F8:: @ 84358F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843597C
 	voice_square_2_alt 2, 0, 2, 0, 0  @ 8435988
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435994
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 216, 90, 242  @ 84359A0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 216, 90, 242  @ 84359A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84359AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84359B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84359C4
@@ -2095,9 +2095,9 @@ voicegroup_84358F8:: @ 84358F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435AF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435AFC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435B08
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165  @ 8435B14
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165  @ 8435B14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435B20
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8435B2C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8435B2C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8435B38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435B44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435B50
@@ -2123,7 +2123,7 @@ voicegroup_84358F8:: @ 84358F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435C40
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435C4C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435C58
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8435C64
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8435C64
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435C70
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435C7C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435C88
@@ -2155,10 +2155,10 @@ voicegroup_8435D18:: @ 8435D18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435D9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435DA8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435DB4
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 216, 90, 242  @ 8435DC0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 216, 90, 242  @ 8435DC0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435DCC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435DD8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 37, 165, 180, 127  @ 8435DE4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 37, 165, 180, 127  @ 8435DE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435DF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435DFC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435E08
@@ -2187,8 +2187,8 @@ voicegroup_8435D18:: @ 8435D18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435F1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435F28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435F34
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235  @ 8435F40
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8435F4C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235  @ 8435F40
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8435F4C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435F58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435F64
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435F70
@@ -2234,12 +2234,12 @@ voicegroup_8435FAC:: @ 8435FAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843612C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436138
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436144
-	voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 165, 154, 127  @ 8436150
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 165, 154, 127  @ 8436150
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843615C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436168
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436174
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436180
-	voice_directsound_no_resample 60, 192, DirectSoundWaveData_845C238, 255, 0, 255, 242  @ 843618C
+	voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 242  @ 843618C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436198
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84361A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84361B0
@@ -2253,17 +2253,17 @@ voicegroup_8435FAC:: @ 8435FAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436210
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843621C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436228
-	voice_directsound_no_resample 32, 177, DirectSoundWaveData_845FCC8, 255, 127, 77, 204  @ 8436234
+	voice_directsound_no_resample 32, 177, DirectSoundWaveData_SC88_DrumKitCabasa, 255, 127, 77, 204  @ 8436234
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436240
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843624C
-	voice_directsound_no_resample 30, 182, DirectSoundWaveData_8460E60, 8, 0, 255, 216  @ 8436258
+	voice_directsound_no_resample 30, 182, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 8, 0, 255, 216  @ 8436258
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436264
-	voice_directsound_no_resample 30, 182, DirectSoundWaveData_8460E60, 255, 246, 0, 216  @ 8436270
+	voice_directsound_no_resample 30, 182, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216  @ 8436270
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843627C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436288
-	voice_directsound_no_resample 72, 207, DirectSoundWaveData_8461D8C, 255, 0, 255, 0  @ 8436294
+	voice_directsound_no_resample 72, 207, DirectSoundWaveData_SC88_DrumKitMuteHiConga, 255, 0, 255, 0  @ 8436294
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84362A0
-	voice_directsound_no_resample 72, 202, DirectSoundWaveData_84622A4, 255, 0, 255, 0  @ 84362AC
+	voice_directsound_no_resample 72, 202, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0  @ 84362AC
 
 	.align 2
 voicegroup_84362B8:: @ 84362B8
@@ -2302,7 +2302,7 @@ voicegroup_84362B8:: @ 84362B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436438
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436444
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436450
-	voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 250, 0, 149  @ 843645C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 250, 0, 149  @ 843645C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436468
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436474
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436480
@@ -2340,7 +2340,7 @@ voicegroup_84362B8:: @ 84362B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436600
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843660C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436618
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8436624
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8436624
 	voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 1  @ 8436630
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843663C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436648
@@ -2433,7 +2433,7 @@ voicegroup_84368B8:: @ 84368B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436A38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436A44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436A50
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149  @ 8436A5C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149  @ 8436A5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436A68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436A74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436A80
@@ -2444,7 +2444,7 @@ voicegroup_84368B8:: @ 84368B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436ABC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436AC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436AD4
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235  @ 8436AE0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235  @ 8436AE0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436AEC
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8436AF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436B04
@@ -2471,7 +2471,7 @@ voicegroup_84368B8:: @ 84368B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436C00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436C0C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436C18
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127  @ 8436C24
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127  @ 8436C24
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436C30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436C3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436C48
@@ -2519,7 +2519,7 @@ voicegroup_8436C9C:: @ 8436C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436E1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436E28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436E34
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 8436E40
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 8436E40
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436E4C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436E58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436E64
@@ -2529,7 +2529,7 @@ voicegroup_8436C9C:: @ 8436C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436E94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436EA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436EAC
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 8436EB8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 8436EB8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436EC4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436ED0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8436EDC
@@ -2557,7 +2557,7 @@ voicegroup_8436C9C:: @ 8436C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436FE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436FF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436FFC
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 8437008
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 8437008
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437014
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437020
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843702C
@@ -2618,7 +2618,7 @@ voicegroup_843708C:: @ 843708C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843729C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84372A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84372B4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 84372C0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 84372C0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 84372CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84372D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84372E4
@@ -2692,7 +2692,7 @@ voicegroup_8437488:: @ 8437488
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84375F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84375FC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437608
-	voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149  @ 8437614
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149  @ 8437614
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437620
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843762C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437638
@@ -2704,8 +2704,8 @@ voicegroup_8437488:: @ 8437488
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437680
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843768C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437698
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165  @ 84376A4
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235  @ 84376B0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165  @ 84376A4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235  @ 84376B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84376BC
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 84376C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84376D4
@@ -2804,7 +2804,7 @@ voicegroup_8437A88:: @ 8437A88
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437B0C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437B18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437B24
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 216, 90, 242  @ 8437B30
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 216, 90, 242  @ 8437B30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437B3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437B48
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437B54
@@ -2836,8 +2836,8 @@ voicegroup_8437A88:: @ 8437A88
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437C8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437C98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437CA4
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235  @ 8437CB0
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8437CBC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235  @ 8437CB0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8437CBC
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8437CC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437CD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437CE0
@@ -2899,7 +2899,7 @@ voicegroup_8437EB4:: @ 8437EB4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437F5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437F68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437F74
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 127  @ 8437F80
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 127  @ 8437F80
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437F8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437F98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437FA4
@@ -2920,7 +2920,7 @@ voicegroup_8437EB4:: @ 8437EB4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438058
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438064
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438070
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 843807C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 843807C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438088
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438094
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84380A0
@@ -2984,14 +2984,14 @@ voicegroup_843828C:: @ 843828C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438334
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438340
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843834C
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165  @ 8438358
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165  @ 8438358
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438364
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438370
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843837C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438388
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438394
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84383A0
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 84383AC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 84383AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84383B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84383C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84383D0
@@ -3003,7 +3003,7 @@ voicegroup_843828C:: @ 843828C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438418
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438424
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438430
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 843843C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 843843C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438448
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438454
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438460
@@ -3040,7 +3040,7 @@ voicegroup_843828C:: @ 843828C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84385D4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84385E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84385EC
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 84385F8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 84385F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438604
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438610
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843861C
@@ -3115,14 +3115,14 @@ voicegroup_843888C:: @ 843888C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438934
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438940
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843894C
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165  @ 8438958
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165  @ 8438958
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438964
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438970
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843897C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438988
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438994
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84389A0
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 84389AC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 84389AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84389B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84389C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84389D0
@@ -3134,7 +3134,7 @@ voicegroup_843888C:: @ 843888C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438A18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438A24
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438A30
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 8438A3C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 8438A3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438A48
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438A54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438A60
@@ -3171,7 +3171,7 @@ voicegroup_843888C:: @ 843888C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438BD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438BE0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438BEC
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8438BF8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8438BF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438C04
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438C10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438C1C
@@ -3246,14 +3246,14 @@ voicegroup_8438E8C:: @ 8438E8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438F34
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438F40
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438F4C
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165  @ 8438F58
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165  @ 8438F58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438F64
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438F70
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438F7C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438F88
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438F94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438FA0
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8438FAC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8438FAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438FB8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438FC4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438FD0
@@ -3265,7 +3265,7 @@ voicegroup_8438E8C:: @ 8438E8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439018
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439024
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439030
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 843903C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 843903C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439048
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439054
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439060
@@ -3302,7 +3302,7 @@ voicegroup_8438E8C:: @ 8438E8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84391D4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84391E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84391EC
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 84391F8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 84391F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439204
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439210
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843921C
@@ -3377,14 +3377,14 @@ voicegroup_843948C:: @ 843948C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439534
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439540
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843954C
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165  @ 8439558
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165  @ 8439558
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439564
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439570
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843957C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439588
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439594
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84395A0
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 84395AC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 84395AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84395B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84395C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84395D0
@@ -3396,7 +3396,7 @@ voicegroup_843948C:: @ 843948C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439618
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439624
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439630
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 843963C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 843963C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439648
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439654
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439660
@@ -3433,7 +3433,7 @@ voicegroup_843948C:: @ 843948C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84397D4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84397E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84397EC
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 84397F8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 84397F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439804
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439810
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843981C
@@ -3523,7 +3523,7 @@ voicegroup_8439A8C:: @ 8439A8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439BE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439BF4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439C00
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149  @ 8439C0C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149  @ 8439C0C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439C18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439C24
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439C30
@@ -3564,7 +3564,7 @@ voicegroup_8439A8C:: @ 8439A8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439DD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439DE0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439DEC
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 8439DF8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 8439DF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439E04
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439E10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439E1C
@@ -3610,7 +3610,7 @@ voicegroup_8439E58:: @ 8439E58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439FD8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439FE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439FF0
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 224  @ 8439FFC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 224  @ 8439FFC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A008
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A014
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A020
@@ -3620,7 +3620,7 @@ voicegroup_8439E58:: @ 8439E58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A050
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A05C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A068
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 843A074
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 843A074
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A080
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A08C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843A098
@@ -3648,7 +3648,7 @@ voicegroup_8439E58:: @ 8439E58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A1A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A1AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A1B8
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843A1C4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 843A1C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A1D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A1DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A1E8
@@ -3676,7 +3676,7 @@ voicegroup_843A224:: @ 843A224
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A2CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A2D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A2E4
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 843A2F0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 843A2F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A2FC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A308
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A314
@@ -3697,7 +3697,7 @@ voicegroup_843A224:: @ 843A224
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A3C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A3D4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A3E0
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 216  @ 843A3EC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 216  @ 843A3EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A3F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A404
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A410
@@ -3732,7 +3732,7 @@ voicegroup_843A224:: @ 843A224
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A56C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A578
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A584
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843A590
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 843A590
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A59C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A5A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A5B4
@@ -3795,7 +3795,7 @@ voicegroup_843A824:: @ 843A824
 	voice_square_1_alt 0, 0, 1, 1, 9, 0  @ 843A83C
 	voice_square_2_alt 2, 0, 2, 6, 3  @ 843A848
 	voice_programmable_wave_alt ProgrammableWaveData_84553DC, 0, 7, 15, 1  @ 843A854
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 216  @ 843A860
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 216  @ 843A860
 	voice_square_2_alt 1, 0, 2, 6, 3  @ 843A86C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A878
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A884
@@ -3835,7 +3835,7 @@ voicegroup_843A824:: @ 843A824
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AA1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AA28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AA34
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 165  @ 843AA40
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 165  @ 843AA40
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AA4C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AA58
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843AA64
@@ -3863,7 +3863,7 @@ voicegroup_843A824:: @ 843A824
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AB6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AB78
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AB84
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843AB90
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 843AB90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AB9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843ABA8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843ABB4
@@ -3959,7 +3959,7 @@ voicegroup_843AE24:: @ 843AE24
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AFC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AFD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AFE0
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 843AFEC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 843AFEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AFF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B004
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B010
@@ -3967,8 +3967,8 @@ voicegroup_843AE24:: @ 843AE24
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B028
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B034
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B040
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 204  @ 843B04C
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 204, 193, 239  @ 843B058
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204  @ 843B04C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 204, 193, 239  @ 843B058
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843B064
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B070
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B07C
@@ -4061,7 +4061,7 @@ voicegroup_843B424:: @ 843B424
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B46C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B478
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B484
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 204, 51, 242  @ 843B490
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 204, 51, 242  @ 843B490
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B49C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B4A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B4B4
@@ -4098,8 +4098,8 @@ voicegroup_843B424:: @ 843B424
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B628
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B634
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B640
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242  @ 843B64C
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 239  @ 843B658
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242  @ 843B64C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 239  @ 843B658
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843B664
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B670
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B67C
@@ -4152,7 +4152,7 @@ voicegroup_843B844:: @ 843B844
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B88C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B898
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B8A4
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 242  @ 843B8B0
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 242  @ 843B8B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B8BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B8C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B8D4
@@ -4178,7 +4178,7 @@ voicegroup_843B844:: @ 843B844
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B9C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B9D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B9DC
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 843B9E8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 843B9E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B9F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BA00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BA0C
@@ -4188,9 +4188,9 @@ voicegroup_843B844:: @ 843B844
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BA3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BA48
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BA54
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 843BA60
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242  @ 843BA6C
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 226  @ 843BA78
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 843BA60
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242  @ 843BA6C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 226  @ 843BA78
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843BA84
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BA90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BA9C
@@ -4216,7 +4216,7 @@ voicegroup_843B844:: @ 843B844
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BB8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BB98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BBA4
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843BBB0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 843BBB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BBBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BBC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BBD4
@@ -4291,7 +4291,7 @@ voicegroup_843BE44:: @ 843BE44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BEEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BEF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BF04
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 843BF10
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 843BF10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BF1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BF28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BF34
@@ -4309,7 +4309,7 @@ voicegroup_843BE44:: @ 843BE44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BFC4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BFD0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BFDC
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 843BFE8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 843BFE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BFF4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C000
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C00C
@@ -4320,7 +4320,7 @@ voicegroup_843BE44:: @ 843BE44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C048
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C054
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C060
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242  @ 843C06C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242  @ 843C06C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C078
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C084
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C090
@@ -4440,7 +4440,7 @@ voicegroup_843C444:: @ 843C444
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C5C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C5D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C5DC
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 843C5E8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 843C5E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C5F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C600
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C60C
@@ -4450,7 +4450,7 @@ voicegroup_843C444:: @ 843C444
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C63C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C648
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C654
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 99  @ 843C660
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 99  @ 843C660
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C66C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C678
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843C684
@@ -4478,7 +4478,7 @@ voicegroup_843C444:: @ 843C444
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C78C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C798
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C7A4
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843C7B0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 843C7B0
 
 	.align 2
 voicegroup_843C7BC:: @ 843C7BC
@@ -4529,7 +4529,7 @@ voicegroup_843C7BC:: @ 843C7BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C9CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C9D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C9E4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 226  @ 843C9F0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 226  @ 843C9F0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843C9FC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CA08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CA14
@@ -4648,7 +4648,7 @@ voicegroup_843CDBC:: @ 843CDBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CF3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CF48
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CF54
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 843CF60
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 843CF60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CF6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CF78
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CF84
@@ -4658,7 +4658,7 @@ voicegroup_843CDBC:: @ 843CDBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CFB4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CFC0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CFCC
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 843CFD8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 843CFD8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CFE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843CFF0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843CFFC
@@ -4686,7 +4686,7 @@ voicegroup_843CDBC:: @ 843CDBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D104
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D110
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D11C
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843D128
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 843D128
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D134
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D140
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D14C
@@ -4789,8 +4789,8 @@ voicegroup_843D3BC:: @ 843D3BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D5B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D5C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D5CC
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 843D5D8
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242  @ 843D5E4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 843D5D8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242  @ 843D5E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D5F0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843D5FC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D608
@@ -4817,7 +4817,7 @@ voicegroup_843D3BC:: @ 843D3BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D704
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D710
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D71C
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843D728
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 843D728
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D734
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D740
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D74C
@@ -4913,7 +4913,7 @@ voicegroup_843D9BC:: @ 843D9BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DB60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DB6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DB78
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 843DB84
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 843DB84
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DB90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DB9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DBA8
@@ -4921,8 +4921,8 @@ voicegroup_843D9BC:: @ 843D9BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DBC0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DBCC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DBD8
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 204  @ 843DBE4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 204, 193, 239  @ 843DBF0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204  @ 843DBE4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 204, 193, 239  @ 843DBF0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843DBFC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DC08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DC14
@@ -5044,7 +5044,7 @@ voicegroup_843DFBC:: @ 843DFBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E160
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E16C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E178
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 843E184
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 843E184
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E190
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E19C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E1A8
@@ -5079,7 +5079,7 @@ voicegroup_843DFBC:: @ 843DFBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E304
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E310
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E31C
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843E328
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 843E328
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E334
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E340
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E34C
@@ -5146,12 +5146,12 @@ voicegroup_843E5BC:: @ 843E5BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E604
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E610
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E61C
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 188, 51, 242  @ 843E628
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 188, 51, 242  @ 843E628
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E634
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E640
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E64C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E658
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 128, 165, 90, 216  @ 843E664
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 128, 165, 90, 216  @ 843E664
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E670
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E67C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E688
@@ -5160,7 +5160,7 @@ voicegroup_843E5BC:: @ 843E5BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E6AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E6B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E6C4
-	voice_directsound 60, 0, DirectSoundWaveData_8492D10, 255, 0, 255, 127  @ 843E6D0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Bubble, 255, 0, 255, 127  @ 843E6D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E6DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E6E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E6F4
@@ -5172,7 +5172,7 @@ voicegroup_843E5BC:: @ 843E5BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E73C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E748
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E754
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 843E760
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 843E760
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E76C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E778
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E784
@@ -5182,9 +5182,9 @@ voicegroup_843E5BC:: @ 843E5BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E7B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E7C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E7CC
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 843E7D8
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242  @ 843E7E4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 226  @ 843E7F0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 843E7D8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242  @ 843E7E4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 226  @ 843E7F0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843E7FC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E808
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E814
@@ -5210,7 +5210,7 @@ voicegroup_843E5BC:: @ 843E5BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E904
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E910
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E91C
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843E928
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 843E928
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E934
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E940
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E94C
@@ -5285,7 +5285,7 @@ voicegroup_843EBBC:: @ 843EBBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843EC64
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843EC70
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843EC7C
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 843EC88
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 843EC88
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843EC94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843ECA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843ECAC
@@ -5303,7 +5303,7 @@ voicegroup_843EBBC:: @ 843EBBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843ED3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843ED48
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843ED54
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 843ED60
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 843ED60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843ED6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843ED78
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843ED84
@@ -5408,12 +5408,12 @@ voicegroup_843F1BC:: @ 843F1BC
 	voice_programmable_wave_alt ProgrammableWaveData_84553FC, 0, 7, 15, 0  @ 843F204
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F210
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F21C
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 242  @ 843F228
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 242  @ 843F228
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F234
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F240
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F24C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F258
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 843F264
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 843F264
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F270
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F27C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F288
@@ -5445,8 +5445,8 @@ voicegroup_843F1BC:: @ 843F1BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F3C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F3CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F3D8
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 843F3E4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 239  @ 843F3F0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 843F3E4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 239  @ 843F3F0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843F3FC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F408
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F414
@@ -5472,7 +5472,7 @@ voicegroup_843F1BC:: @ 843F1BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F504
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F510
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F51C
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843F528
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 843F528
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F534
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F540
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F54C
@@ -5504,7 +5504,7 @@ voicegroup_843F5E8:: @ 843F5E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F660
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F66C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F678
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 843F684
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 843F684
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F690
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F69C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F6A8
@@ -5536,9 +5536,9 @@ voicegroup_843F5E8:: @ 843F5E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F7E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F7EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F7F8
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 128, 226, 0, 38  @ 843F804
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 843F810
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 843F81C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 128, 226, 0, 38  @ 843F804
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 843F810
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 843F81C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 843F828
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F834
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F840
@@ -5564,7 +5564,7 @@ voicegroup_843F5E8:: @ 843F5E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F930
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F93C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F948
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 843F954
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 843F954
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F960
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F96C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F978
@@ -5639,7 +5639,7 @@ voicegroup_843FBE8:: @ 843FBE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FC90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FC9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FCA8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 843FCB4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 843FCB4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FCC0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FCCC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FCD8
@@ -5658,7 +5658,7 @@ voicegroup_843FBE8:: @ 843FBE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FD74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FD80
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FD8C
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 115  @ 843FD98
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 115  @ 843FD98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FDA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FDB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FDBC
@@ -5695,7 +5695,7 @@ voicegroup_843FBE8:: @ 843FBE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FF30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FF3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FF48
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 843FF54
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 843FF54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FF60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FF6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FF78
@@ -5791,7 +5791,7 @@ voicegroup_84401E8:: @ 84401E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844038C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440398
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84403A4
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 84403B0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 84403B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84403BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84403C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84403D4
@@ -5901,7 +5901,7 @@ voicegroup_84407E8:: @ 84407E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440890
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844089C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84408A8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165  @ 84408B4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165  @ 84408B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84408C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84408CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84408D8
@@ -5920,7 +5920,7 @@ voicegroup_84407E8:: @ 84407E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440974
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440980
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844098C
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 8440998
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 8440998
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84409A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84409B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84409BC
@@ -6039,7 +6039,7 @@ voicegroup_8440DE8:: @ 8440DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440EE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440EF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440EFC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8440F08
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8440F08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440F14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440F20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440F2C
@@ -6061,8 +6061,8 @@ voicegroup_8440DE8:: @ 8440DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440FEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440FF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441004
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8441010
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 844101C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8441010
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 844101C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8441028
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441034
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441040
@@ -6088,7 +6088,7 @@ voicegroup_8440DE8:: @ 8440DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441130
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844113C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441148
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8441154
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8441154
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441160
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844116C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441178
@@ -6163,7 +6163,7 @@ voicegroup_84413E8:: @ 84413E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441490
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844149C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84414A8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165  @ 84414B4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165  @ 84414B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84414C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84414CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84414D8
@@ -6182,7 +6182,7 @@ voicegroup_84413E8:: @ 84413E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441574
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441580
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844158C
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 8441598
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 8441598
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84415A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84415B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84415BC
@@ -6301,7 +6301,7 @@ voicegroup_84419E8:: @ 84419E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441AE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441AF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441AFC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8441B08
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8441B08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441B14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441B20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441B2C
@@ -6312,17 +6312,17 @@ voicegroup_84419E8:: @ 84419E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441B68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441B74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441B80
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 8441B8C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 8441B8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441B98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441BA4
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 8441BB0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 8441BB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441BBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441BC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441BD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441BE0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441BEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441BF8
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 8441C04
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 8441C04
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441C10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441C1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441C28
@@ -6350,7 +6350,7 @@ voicegroup_84419E8:: @ 84419E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441D30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441D3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441D48
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8441D54
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8441D54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441D60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441D6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8441D78
@@ -6425,14 +6425,14 @@ voicegroup_8441FE8:: @ 8441FE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442090
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844209C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84420A8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 84420B4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 84420B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84420C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84420CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84420D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84420E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84420F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84420FC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8442108
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8442108
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442114
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442120
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844212C
@@ -6446,7 +6446,7 @@ voicegroup_8441FE8:: @ 8441FE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844218C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442198
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84421A4
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 84421B0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 84421B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84421BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84421C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84421D4
@@ -6481,7 +6481,7 @@ voicegroup_8441FE8:: @ 8441FE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442330
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844233C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442348
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8442354
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8442354
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442360
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844236C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442378
@@ -6553,17 +6553,17 @@ voicegroup_84425E8:: @ 84425E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844266C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442678
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442684
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 8442690
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 8442690
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844269C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84426A8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 84426B4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 84426B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84426C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84426CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84426D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84426E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84426F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84426FC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8442708
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8442708
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442714
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442720
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844272C
@@ -6574,10 +6574,10 @@ voicegroup_84425E8:: @ 84425E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442768
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442774
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442780
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 844278C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 844278C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442798
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84427A4
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 84427B0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 84427B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84427BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84427C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84427D4
@@ -6612,7 +6612,7 @@ voicegroup_84425E8:: @ 84425E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442930
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844293C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442948
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8442954
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8442954
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442960
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844296C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442978
@@ -6687,14 +6687,14 @@ voicegroup_8442BE8:: @ 8442BE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442C90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442CA8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 8442CB4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 8442CB4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442CC0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442CCC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442CD8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442CE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442CF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442CFC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8442D08
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8442D08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442D14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442D20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442D2C
@@ -6705,17 +6705,17 @@ voicegroup_8442BE8:: @ 8442BE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442D68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442D74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442D80
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 8442D8C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 8442D8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442D98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442DA4
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 8442DB0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 8442DB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442DBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442DC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442DD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442DE0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442DEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442DF8
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 8442E04
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 8442E04
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442E10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442E1C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8442E28
@@ -6743,7 +6743,7 @@ voicegroup_8442BE8:: @ 8442BE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442F30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442F3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442F48
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8442F54
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8442F54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442F60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442F6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442F78
@@ -6825,7 +6825,7 @@ voicegroup_84431E8:: @ 84431E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84432E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84432F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84432FC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8443308
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8443308
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443314
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443320
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844332C
@@ -6836,7 +6836,7 @@ voicegroup_84431E8:: @ 84431E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443368
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443374
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443380
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 844338C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 844338C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443398
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84433A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84433B0
@@ -6847,8 +6847,8 @@ voicegroup_84431E8:: @ 84431E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84433EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84433F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443404
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8443410
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 844341C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8443410
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 844341C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8443428
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443434
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443440
@@ -7076,18 +7076,18 @@ voicegroup_8443DE8:: @ 8443DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443E60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443E6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443E78
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 8443E84
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 8443E84
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443E90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443E9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443EA8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 8443EB4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 8443EB4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443EC0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443ECC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443ED8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443EE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443EF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443EFC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8443F08
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8443F08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443F14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443F20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443F2C
@@ -7098,7 +7098,7 @@ voicegroup_8443DE8:: @ 8443DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443F68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443F74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443F80
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 8443F8C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 8443F8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443F98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443FA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443FB0
@@ -7109,7 +7109,7 @@ voicegroup_8443DE8:: @ 8443DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443FEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443FF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444004
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8444010
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8444010
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844401C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8444028
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444034
@@ -7207,18 +7207,18 @@ voicegroup_84443E8:: @ 84443E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444460
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844446C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444478
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 8444484
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 8444484
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444490
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844449C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84444A8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 84444B4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 84444B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84444C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84444CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84444D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84444E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84444F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84444FC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8444508
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8444508
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444514
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444520
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844452C
@@ -7229,10 +7229,10 @@ voicegroup_84443E8:: @ 84443E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444568
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444574
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444580
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 844458C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 844458C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444598
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84445A4
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 84445B0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 84445B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84445BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84445C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84445D4
@@ -7240,7 +7240,7 @@ voicegroup_84443E8:: @ 84443E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84445EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84445F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444604
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8444610
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8444610
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844461C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8444628
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444634
@@ -7267,7 +7267,7 @@ voicegroup_84443E8:: @ 84443E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444730
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844473C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444748
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8444754
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8444754
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444760
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844476C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444778
@@ -7338,7 +7338,7 @@ voicegroup_84449E8:: @ 84449E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444A60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444A6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444A78
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 8444A84
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 8444A84
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444A90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444A9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444AA8
@@ -7360,7 +7360,7 @@ voicegroup_84449E8:: @ 84449E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444B68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444B74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444B80
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 8444B8C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 8444B8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444B98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444BA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444BB0
@@ -7372,7 +7372,7 @@ voicegroup_84449E8:: @ 84449E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444BF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444C04
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444C10
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 216  @ 8444C1C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 216  @ 8444C1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444C28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444C34
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8444C40
@@ -7470,7 +7470,7 @@ voicegroup_8444FE8:: @ 8444FE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844506C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445078
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445084
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 8445090
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 8445090
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844509C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84450A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84450B4
@@ -7491,8 +7491,8 @@ voicegroup_8444FE8:: @ 8444FE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445168
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445174
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445180
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 844518C
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 8445198
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 844518C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 8445198
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84451A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84451B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84451BC
@@ -7503,7 +7503,7 @@ voicegroup_8444FE8:: @ 8444FE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84451F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445204
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445210
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 844521C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 844521C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8445228
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445234
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445240
@@ -7529,7 +7529,7 @@ voicegroup_8444FE8:: @ 8444FE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445330
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844533C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445348
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8445354
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8445354
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445360
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844536C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445378
@@ -7604,7 +7604,7 @@ voicegroup_84455E8:: @ 84455E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445690
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844569C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84456A8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165  @ 84456B4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165  @ 84456B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84456C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84456CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84456D8
@@ -7622,8 +7622,8 @@ voicegroup_84455E8:: @ 84455E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445768
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445774
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445780
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 844578C
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 8445798
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 844578C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 8445798
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84457A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84457B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84457BC
@@ -7731,18 +7731,18 @@ voicegroup_8445BE8:: @ 8445BE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445C60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445C6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445C78
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 8445C84
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 8445C84
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445C90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445CA8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 8445CB4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 8445CB4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445CC0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445CCC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445CD8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445CE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445CF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445CFC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8445D08
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8445D08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445D14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445D20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445D2C
@@ -7753,7 +7753,7 @@ voicegroup_8445BE8:: @ 8445BE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445D68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445D74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445D80
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 196  @ 8445D8C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 196  @ 8445D8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445D98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445DA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445DB0
@@ -7764,7 +7764,7 @@ voicegroup_8445BE8:: @ 8445BE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445DEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445DF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445E04
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8445E10
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8445E10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445E1C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8445E28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445E34
@@ -7791,7 +7791,7 @@ voicegroup_8445BE8:: @ 8445BE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445F30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445F3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445F48
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8445F54
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8445F54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445F60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445F6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445F78
@@ -7863,7 +7863,7 @@ voicegroup_84461E8:: @ 84461E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844626C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446278
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446284
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 8446290
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 8446290
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844629C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84462A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84462B4
@@ -7873,7 +7873,7 @@ voicegroup_84461E8:: @ 84461E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84462E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84462F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84462FC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8446308
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8446308
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446314
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446320
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844632C
@@ -7884,7 +7884,7 @@ voicegroup_84461E8:: @ 84461E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446368
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446374
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446380
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 196  @ 844638C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 196  @ 844638C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446398
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84463A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84463B0
@@ -7894,9 +7894,9 @@ voicegroup_84461E8:: @ 84461E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84463E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84463EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84463F8
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 8446404
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 8446404
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446410
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 844641C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 844641C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8446428
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446434
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446440
@@ -7994,17 +7994,17 @@ voicegroup_84467E8:: @ 84467E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844686C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446878
 	voice_square_1 0, 2, 0, 0,  15, 0 @ 8446884
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 8446890
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 8446890
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844689C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84468A8
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 84468B4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 84468B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84468C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84468CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84468D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84468E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84468F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84468FC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8446908
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8446908
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446914
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446920
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844692C
@@ -8025,8 +8025,8 @@ voicegroup_84467E8:: @ 84467E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84469E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84469EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84469F8
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 8446A04
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8446A10
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 8446A04
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8446A10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446A1C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8446A28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446A34
@@ -8053,7 +8053,7 @@ voicegroup_84467E8:: @ 84467E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446B30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446B3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446B48
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8446B54
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8446B54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446B60
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446B6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446B78
@@ -8135,7 +8135,7 @@ voicegroup_8446DE8:: @ 8446DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446EE4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446EF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446EFC
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8446F08
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8446F08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446F14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446F20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446F2C
@@ -8149,16 +8149,16 @@ voicegroup_8446DE8:: @ 8446DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446F8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446F98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446FA4
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 8446FB0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 8446FB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446FBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446FC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446FD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446FE0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446FEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446FF8
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 8447004
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8447010
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 844701C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 8447004
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8447010
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 844701C
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8447028
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447034
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447040
@@ -8184,7 +8184,7 @@ voicegroup_8446DE8:: @ 8446DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447130
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844713C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447148
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8447154
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8447154
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447160
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844716C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447178
@@ -8261,7 +8261,7 @@ voicegroup_8447400:: @ 8447400
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447484
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447490
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844749C
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 84474A8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 84474A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84474B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84474C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84474CC
@@ -8271,7 +8271,7 @@ voicegroup_8447400:: @ 8447400
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84474FC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447508
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447514
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8447520
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8447520
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844752C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447538
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447544
@@ -8294,7 +8294,7 @@ voicegroup_8447400:: @ 8447400
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447610
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844761C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447628
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 8447634
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 8447634
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8447640
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844764C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447658
@@ -8387,7 +8387,7 @@ voicegroup_8447A00:: @ 8447A00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A48
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A60
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 72, 249  @ 8447A6C
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 72, 249  @ 8447A6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A78
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A84
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A90
@@ -8402,7 +8402,7 @@ voicegroup_8447A00:: @ 8447A00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447AFC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447B08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447B14
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 128, 249, 25, 76  @ 8447B20
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 128, 249, 25, 76  @ 8447B20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447B2C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447B38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447B44
@@ -8413,7 +8413,7 @@ voicegroup_8447A00:: @ 8447A00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447B80
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447B8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447B98
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 8447BA4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 8447BA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447BB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447BBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447BC8
@@ -8423,8 +8423,8 @@ voicegroup_8447A00:: @ 8447A00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447BF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447C04
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447C10
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 8447C1C
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242  @ 8447C28
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 8447C1C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242  @ 8447C28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447C34
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8447C40
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447C4C
@@ -8451,7 +8451,7 @@ voicegroup_8447A00:: @ 8447A00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447D48
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447D54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447D60
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 8447D6C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 8447D6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447D78
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447D84
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447D90
@@ -8479,7 +8479,7 @@ voicegroup_8447DF0:: @ 8447DF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447E74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447E80
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447E8C
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 8447E98
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 8447E98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447EA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447EB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447EBC
@@ -8489,7 +8489,7 @@ voicegroup_8447DF0:: @ 8447DF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447EEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447EF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447F04
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8447F10
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8447F10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447F1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447F28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447F34
@@ -8511,8 +8511,8 @@ voicegroup_8447DF0:: @ 8447DF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447FF4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448000
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844800C
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8448018
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 8448024
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8448018
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 8448024
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8448030
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844803C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448048
@@ -8538,7 +8538,7 @@ voicegroup_8447DF0:: @ 8447DF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448138
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448144
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448150
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 844815C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 844815C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448168
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448174
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448180
@@ -8620,7 +8620,7 @@ voicegroup_84483F0:: @ 84483F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84484EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84484F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448504
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8448510
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8448510
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844851C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448528
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448534
@@ -8642,8 +8642,8 @@ voicegroup_84483F0:: @ 84483F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84485F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448600
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844860C
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8448618
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 8448624
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8448618
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 8448624
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448630
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844863C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448648
@@ -8669,7 +8669,7 @@ voicegroup_84483F0:: @ 84483F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448738
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448744
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448750
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 844875C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 844875C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448768
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448774
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448780
@@ -8741,17 +8741,17 @@ voicegroup_84489F0:: @ 84489F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448A74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448A80
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448A8C
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 8448A98
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 8448A98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448AA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448AB0
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165  @ 8448ABC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165  @ 8448ABC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448AC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448AD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448AE0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448AEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448AF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448B04
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 8448B10
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 8448B10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448B1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448B28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448B34
@@ -8762,8 +8762,8 @@ voicegroup_84489F0:: @ 84489F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448B70
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448B7C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448B88
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 8448B94
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 8448BA0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 8448B94
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 8448BA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448BAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448BB8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448BC4
@@ -8773,7 +8773,7 @@ voicegroup_84489F0:: @ 84489F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448BF4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448C00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448C0C
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8448C18
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8448C18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448C24
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8448C30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448C3C
@@ -8800,7 +8800,7 @@ voicegroup_84489F0:: @ 84489F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448D38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448D44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448D50
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8448D5C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8448D5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448D68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448D74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448D80
@@ -8894,9 +8894,9 @@ voicegroup_8448FF0:: @ 8448FF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844917C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449188
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449194
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 84491A0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 84491A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84491AC
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 84491B8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 84491B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84491C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84491D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84491DC
@@ -8905,7 +8905,7 @@ voicegroup_8448FF0:: @ 8448FF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449200
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844920C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449218
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 8449224
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 8449224
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449230
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844923C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449248
@@ -9003,7 +9003,7 @@ voicegroup_84495F0:: @ 84495F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449674
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449680
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844968C
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 8449698
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 8449698
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84496A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84496B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84496BC
@@ -9035,8 +9035,8 @@ voicegroup_84495F0:: @ 84495F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84497F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449800
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844980C
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 8449818
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 239  @ 8449824
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 8449818
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 239  @ 8449824
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8449830
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844983C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449848
@@ -9062,7 +9062,7 @@ voicegroup_84495F0:: @ 84495F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449938
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449944
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449950
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 844995C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 844995C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449968
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449974
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449980
@@ -9134,7 +9134,7 @@ voicegroup_8449BF0:: @ 8449BF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449C74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449C80
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449C8C
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 8449C98
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 8449C98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449CA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449CB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449CBC
@@ -9193,7 +9193,7 @@ voicegroup_8449BF0:: @ 8449BF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449F38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449F44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449F50
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 8449F5C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 8449F5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449F68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449F74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449F80
@@ -9391,22 +9391,22 @@ voicegroup_844A7F0:: @ 844A7F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A838
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A844
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A850
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 72, 249  @ 844A85C
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 72, 249  @ 844A85C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A868
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A874
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A880
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 844A88C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 844A88C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A898
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A8A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A8B0
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165  @ 844A8BC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165  @ 844A8BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A8C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A8D4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A8E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A8EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A8F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A904
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 128, 249, 25, 76  @ 844A910
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 128, 249, 25, 76  @ 844A910
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A91C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A928
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A934
@@ -9417,7 +9417,7 @@ voicegroup_844A7F0:: @ 844A7F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A970
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A97C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A988
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188  @ 844A994
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188  @ 844A994
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A9A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A9AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A9B8
@@ -9427,8 +9427,8 @@ voicegroup_844A7F0:: @ 844A7F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A9E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A9F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AA00
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38  @ 844AA0C
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242  @ 844AA18
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38  @ 844AA0C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242  @ 844AA18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AA24
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 844AA30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AA3C
@@ -9455,7 +9455,7 @@ voicegroup_844A7F0:: @ 844A7F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AB38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AB44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AB50
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 844AB5C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 844AB5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AB68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AB74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AB80
@@ -9526,7 +9526,7 @@ voicegroup_844ADF0:: @ 844ADF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AE68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AE74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AE80
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 844AE8C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 844AE8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AE98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AEA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AEB0
@@ -9537,7 +9537,7 @@ voicegroup_844ADF0:: @ 844ADF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AEEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AEF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AF04
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 128, 249, 25, 76  @ 844AF10
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 128, 249, 25, 76  @ 844AF10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AF1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AF28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AF34
@@ -9551,7 +9551,7 @@ voicegroup_844ADF0:: @ 844ADF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AF94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AFA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AFAC
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 844AFB8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 844AFB8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AFC4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AFD0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AFDC
@@ -9559,7 +9559,7 @@ voicegroup_844ADF0:: @ 844ADF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844AFF4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B000
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B00C
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242  @ 844B018
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242  @ 844B018
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B024
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B030
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B03C
@@ -9657,7 +9657,7 @@ voicegroup_844B3F0:: @ 844B3F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B468
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B474
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B480
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 844B48C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 844B48C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B498
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B4A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B4B0
@@ -9668,7 +9668,7 @@ voicegroup_844B3F0:: @ 844B3F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B4EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B4F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B504
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 128, 249, 25, 76  @ 844B510
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 128, 249, 25, 76  @ 844B510
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B51C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B528
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B534
@@ -9680,9 +9680,9 @@ voicegroup_844B3F0:: @ 844B3F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B57C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B588
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B594
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 844B5A0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 844B5A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B5AC
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 844B5B8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 844B5B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B5C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B5D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B5DC
@@ -9690,7 +9690,7 @@ voicegroup_844B3F0:: @ 844B3F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B5F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B600
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B60C
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242  @ 844B618
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242  @ 844B618
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B624
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 844B630
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B63C
@@ -9717,7 +9717,7 @@ voicegroup_844B3F0:: @ 844B3F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B738
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B744
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B750
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 844B75C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 844B75C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B768
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B774
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B780
@@ -9784,22 +9784,22 @@ voicegroup_844B9F0:: @ 844B9F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA50
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 72, 249  @ 844BA5C
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 72, 249  @ 844BA5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA80
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 844BA8C
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 844BA98
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 844BA8C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 844BA98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BAA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BAB0
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 844BABC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 844BABC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BAC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BAD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BAE0
-	voice_directsound 60, 0, DirectSoundWaveData_84A5F58, 255, 0, 255, 165  @ 844BAEC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordianFr, 255, 0, 255, 165  @ 844BAEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BAF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BB04
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 128, 249, 25, 76  @ 844BB10
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 128, 249, 25, 76  @ 844BB10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BB1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BB28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BB34
@@ -9822,7 +9822,7 @@ voicegroup_844B9F0:: @ 844B9F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BC00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BC0C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BC18
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 844BC24
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 844BC24
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 844BC30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BC3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BC48
@@ -9848,7 +9848,7 @@ voicegroup_844B9F0:: @ 844B9F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BD38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BD44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BD50
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 844BD5C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 844BD5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BD68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BD74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BD80
@@ -9923,14 +9923,14 @@ voicegroup_844BFF0:: @ 844BFF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C098
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C0A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C0B0
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 844C0BC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 844C0BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C0C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C0D4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C0E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C0EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C0F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C104
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 844C110
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 844C110
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C11C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C128
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C134
@@ -9944,7 +9944,7 @@ voicegroup_844BFF0:: @ 844BFF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C194
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C1A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C1AC
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 844C1B8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 844C1B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C1C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C1D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C1DC
@@ -9979,7 +9979,7 @@ voicegroup_844BFF0:: @ 844BFF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C338
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C344
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C350
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 844C35C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 844C35C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C368
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C374
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C380
@@ -10050,18 +10050,18 @@ voicegroup_844C5F0:: @ 844C5F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C668
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C674
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C680
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 844C68C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 844C68C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C698
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C6A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C6B0
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 844C6BC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 844C6BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C6C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C6D4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C6E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C6EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C6F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C704
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 844C710
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 844C710
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C71C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C728
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C734
@@ -10073,9 +10073,9 @@ voicegroup_844C5F0:: @ 844C5F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C77C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C788
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C794
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 844C7A0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 844C7A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C7AC
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 844C7B8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 844C7B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C7C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C7D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C7DC
@@ -10084,7 +10084,7 @@ voicegroup_844C5F0:: @ 844C5F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C800
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C80C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C818
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 844C824
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 844C824
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C830
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C83C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C848
@@ -10182,7 +10182,7 @@ voicegroup_844CBF0:: @ 844CBF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CC74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CC80
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CC8C
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 844CC98
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 844CC98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CCA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CCB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CCBC
@@ -10215,7 +10215,7 @@ voicegroup_844CBF0:: @ 844CBF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CE00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CE0C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CE18
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 249  @ 844CE24
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 249  @ 844CE24
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CE30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CE3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844CE48
@@ -10372,7 +10372,7 @@ voicegroup_844D1F0:: @ 844D1F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D538
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D544
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D550
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 844D55C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 844D55C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D568
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D574
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D580
@@ -10424,8 +10424,8 @@ voicegroup_844D1F0:: @ 844D1F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D7A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D7B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D7C0
-	voice_directsound 60, 0, DirectSoundWaveData_84A3B50, 255, 255, 255, 127  @ 844D7CC
-	voice_directsound 60, 0, DirectSoundWaveData_845B9A8, 255, 255, 255, 127  @ 844D7D8
+	voice_directsound 60, 0, DirectSoundWaveData_Noise2, 255, 255, 255, 127  @ 844D7CC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitHandClap, 255, 255, 255, 127  @ 844D7D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844D7E4
 
 	.align 2
@@ -10443,7 +10443,7 @@ voicegroup_844D7F0:: @ 844D7F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D868
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D874
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D880
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 844D88C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 844D88C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D898
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D8A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D8B0
@@ -10466,9 +10466,9 @@ voicegroup_844D7F0:: @ 844D7F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D97C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D988
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D994
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 844D9A0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 844D9A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D9AC
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 844D9B8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 844D9B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D9C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D9D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D9DC
@@ -10574,18 +10574,18 @@ voicegroup_844DDF0:: @ 844DDF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DE68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DE74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DE80
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 844DE8C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 844DE8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DE98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DEA4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DEB0
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210  @ 844DEBC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210  @ 844DEBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DEC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DED4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DEE0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DEEC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DEF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DF04
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76  @ 844DF10
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76  @ 844DF10
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DF1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DF28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DF34
@@ -10597,9 +10597,9 @@ voicegroup_844DDF0:: @ 844DDF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DF7C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DF88
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DF94
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 844DFA0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 844DFA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DFAC
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 844DFB8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 844DFB8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DFC4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DFD0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DFDC
@@ -10608,7 +10608,7 @@ voicegroup_844DDF0:: @ 844DDF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E000
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E00C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E018
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246  @ 844E024
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246  @ 844E024
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E030
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E03C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E048
@@ -10634,7 +10634,7 @@ voicegroup_844DDF0:: @ 844DDF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E138
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E144
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E150
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127  @ 844E15C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127  @ 844E15C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E168
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E174
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E180
@@ -10706,7 +10706,7 @@ voicegroup_844E3F0:: @ 844E3F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E474
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E480
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E48C
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 844E498
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 844E498
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E4A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E4B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E4BC
@@ -10738,8 +10738,8 @@ voicegroup_844E3F0:: @ 844E3F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E5F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E600
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E60C
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242  @ 844E618
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 239  @ 844E624
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242  @ 844E618
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 239  @ 844E624
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 844E630
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E63C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E648
@@ -10765,7 +10765,7 @@ voicegroup_844E3F0:: @ 844E3F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E738
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E744
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E750
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 844E75C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 844E75C
 	voice_programmable_wave_alt ProgrammableWaveData_845540C, 0, 7, 15, 0  @ 844E768
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E774
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E780
@@ -10829,7 +10829,7 @@ voicegroup_844E918:: @ 844E918
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EA14
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EA20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EA2C
-	voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 248  @ 844EA38
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 248  @ 844EA38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EA44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EA50
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EA5C
@@ -10851,7 +10851,7 @@ voicegroup_844E918:: @ 844E918
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EB1C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EB28
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EB34
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 165  @ 844EB40
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 165  @ 844EB40
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EB4C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EB58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EB64
@@ -10923,7 +10923,7 @@ voicegroup_844ECF0:: @ 844ECF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EE58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EE64
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EE70
-	voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149  @ 844EE7C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149  @ 844EE7C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EE88
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EE94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EEA0
@@ -10936,8 +10936,8 @@ voicegroup_844ECF0:: @ 844ECF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EEF4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EF00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EF0C
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235  @ 844EF18
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 844EF24
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235  @ 844EF18
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 844EF24
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 844EF30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EF3C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844EF48
@@ -10989,14 +10989,14 @@ voicegroup_844F0C8:: @ 844F0C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F14C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F158
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F164
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 250, 0, 242  @ 844F170
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 250, 0, 242  @ 844F170
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F17C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F188
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 127  @ 844F194
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 127  @ 844F194
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F1A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F1AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F1B8
-	voice_directsound 60, 0, DirectSoundWaveData_84A5F58, 255, 0, 255, 165  @ 844F1C4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordianFr, 255, 0, 255, 165  @ 844F1C4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F1D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F1DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F1E8
@@ -11008,12 +11008,12 @@ voicegroup_844F0C8:: @ 844F0C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F230
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F23C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F248
-	voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149  @ 844F254
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149  @ 844F254
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F260
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F26C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F278
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F284
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 844F290
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 844F290
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F29C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F2A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F2B4
@@ -11021,8 +11021,8 @@ voicegroup_844F0C8:: @ 844F0C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F2CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F2D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F2E4
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235  @ 844F2F0
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 844F2FC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235  @ 844F2F0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 844F2FC
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 844F308
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F314
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F320
@@ -11065,7 +11065,7 @@ voicegroup_844F0C8:: @ 844F0C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F4DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F4E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F4F4
-	voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 0, 255, 127  @ 844F500
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 0, 255, 127  @ 844F500
 
 	.align 2
 voicegroup_844F50C:: @ 844F50C
@@ -11086,7 +11086,7 @@ voicegroup_844F50C:: @ 844F50C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F5B4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F5C0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F5CC
-	voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 127  @ 844F5D8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 127  @ 844F5D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F5E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F5F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F5FC
@@ -11102,7 +11102,7 @@ voicegroup_844F50C:: @ 844F50C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F674
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F680
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F68C
-	voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149  @ 844F698
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149  @ 844F698
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F6A4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F6B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F6BC
@@ -11115,8 +11115,8 @@ voicegroup_844F50C:: @ 844F50C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F710
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F71C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F728
-	voice_directsound_no_resample 60, 0, DirectSoundWaveData_8485454, 255, 246, 0, 226  @ 844F734
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 844F740
+	voice_directsound_no_resample 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale1, 255, 246, 0, 226  @ 844F734
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 844F740
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 844F74C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F758
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F764
@@ -11196,7 +11196,7 @@ voicegroup_844F950:: @ 844F950
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FAB8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FAC4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FAD0
-	voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149  @ 844FADC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149  @ 844FADC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FAE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FAF4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FB00
@@ -11208,9 +11208,9 @@ voicegroup_844F950:: @ 844F950
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FB48
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FB54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FB60
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165  @ 844FB6C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165  @ 844FB6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FB78
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 844FB84
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 844FB84
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 844FB90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FB9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FBA8
@@ -11290,7 +11290,7 @@ voicegroup_844FD94:: @ 844FD94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FEFC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FF08
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FF14
-	voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149  @ 844FF20
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149  @ 844FF20
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FF2C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FF38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FF44
@@ -11302,9 +11302,9 @@ voicegroup_844FD94:: @ 844FD94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FF8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FF98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FFA4
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165  @ 844FFB0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165  @ 844FFB0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FFBC
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 844FFC8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 844FFC8
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 844FFD4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FFE0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FFEC
@@ -11330,7 +11330,7 @@ voicegroup_844FD94:: @ 844FD94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84500DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84500E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84500F4
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 8450100
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 8450100
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845010C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450118
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450124
@@ -11382,7 +11382,7 @@ voicegroup_845019C:: @ 845019C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450328
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450334
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450340
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 845034C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 845034C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450358
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450364
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450370
@@ -11391,9 +11391,9 @@ voicegroup_845019C:: @ 845019C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450394
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84503A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84503AC
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165  @ 84503B8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165  @ 84503B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84503C4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 84503D0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 84503D0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 84503DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84503E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84503F4
@@ -11402,7 +11402,7 @@ voicegroup_845019C:: @ 845019C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450418
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450424
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450430
-	voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 165, 154, 127  @ 845043C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 165, 154, 127  @ 845043C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450448
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450454
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450460
@@ -11447,7 +11447,7 @@ voicegroup_845058C:: @ 845058C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450610
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845061C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450628
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 216, 90, 242  @ 8450634
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 216, 90, 242  @ 8450634
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450640
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845064C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450658
@@ -11466,7 +11466,7 @@ voicegroup_845058C:: @ 845058C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84506F4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450700
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845070C
-	voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149  @ 8450718
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149  @ 8450718
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450724
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450730
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845073C
@@ -11480,7 +11480,7 @@ voicegroup_845058C:: @ 845058C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845079C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84507A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84507B4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 84507C0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 84507C0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 84507CC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84507D8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84507E4
@@ -11506,7 +11506,7 @@ voicegroup_845058C:: @ 845058C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84508D4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84508E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84508EC
-	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 84508F8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165  @ 84508F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450904
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450910
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845091C
@@ -11560,7 +11560,7 @@ voicegroup_845058C:: @ 845058C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450B5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450B68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450B74
-	voice_directsound 60, 0, DirectSoundWaveData_8460E60, 255, 246, 0, 216  @ 8450B80
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216  @ 8450B80
 
 	.align 2
 voicegroup_8450B8C:: @ 8450B8C
@@ -11597,7 +11597,7 @@ voicegroup_8450B8C:: @ 8450B8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450CF4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450D00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450D0C
-	voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149  @ 8450D18
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149  @ 8450D18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450D24
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450D30
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450D3C
@@ -11610,8 +11610,8 @@ voicegroup_8450B8C:: @ 8450B8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450D90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450D9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450DA8
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235  @ 8450DB4
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8450DC0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235  @ 8450DB4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8450DC0
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8450DCC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450DD8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450DE4
@@ -11692,7 +11692,7 @@ voicegroup_8450FA0:: @ 8450FA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451144
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451150
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845115C
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115  @ 8451168
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115  @ 8451168
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451174
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451180
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845118C
@@ -11701,7 +11701,7 @@ voicegroup_8450FA0:: @ 8450FA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84511B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84511BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84511C8
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 84511D4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 84511D4
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 84511E0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84511EC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84511F8
@@ -11774,7 +11774,7 @@ voicegroup_8451390:: @ 8451390
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84514F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451504
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451510
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99  @ 845151C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99  @ 845151C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451528
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451534
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451540
@@ -11788,7 +11788,7 @@ voicegroup_8451390:: @ 8451390
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84515A0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84515AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84515B8
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 84515C4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 84515C4
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 84515D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84515DC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84515E8
@@ -11867,12 +11867,12 @@ voicegroup_8451390:: @ 8451390
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451954
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451960
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845196C
-	voice_directsound 60, 0, DirectSoundWaveData_8460E60, 255, 235, 0, 216  @ 8451978
-	voice_directsound 60, 0, DirectSoundWaveData_8460E60, 255, 246, 0, 216  @ 8451984
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 235, 0, 216  @ 8451978
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216  @ 8451984
 
 	.align 2
 voicegroup_8451990:: @ 8451990
-	voice_directsound 60, 0, DirectSoundWaveData_8486924, 255, 249, 103, 165  @ 8451990
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare4, 255, 249, 103, 165  @ 8451990
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845199C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84519A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84519B4
@@ -11885,8 +11885,8 @@ voicegroup_8451990:: @ 8451990
 	voice_square_1_alt 0, 2, 2, 0, 15, 0  @ 8451A08
 	voice_square_1_alt 0, 1, 2, 0, 15, 0  @ 8451A14
 	voice_square_1_alt 23, 1, 0, 1, 9, 0  @ 8451A20
-	voice_directsound 60, 0, DirectSoundWaveData_8487330, 255, 0, 255, 165  @ 8451A2C
-	voice_directsound 60, 0, DirectSoundWaveData_8487330, 255, 226, 0, 165  @ 8451A38
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 0, 255, 165  @ 8451A2C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 226, 0, 165  @ 8451A38
 	voice_square_1_alt 0, 2, 0, 6, 0, 1  @ 8451A44
 	voice_square_1_alt 36, 0, 0, 2, 0, 0  @ 8451A50
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451A5C
@@ -11919,7 +11919,7 @@ voicegroup_8451990:: @ 8451990
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451BA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451BAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451BB8
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226  @ 8451BC4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226  @ 8451BC4
 	voice_keysplit voicegroup_8430234, KeySplitTable_845526C  @ 8451BD0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451BDC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8451BE8
@@ -12003,80 +12003,80 @@ voicegroup_8451990:: @ 8451990
 
 	.align 2
 voicegroup_8451F90:: @ 8451F90
-	voice_directsound_no_resample 60, 0, DirectSoundWaveData_8488F44, 255, 249, 0, 165  @ 8451F90
-	voice_directsound_alt 60, 0, DirectSoundWaveData_8488F44, 255, 0, 255, 165  @ 8451F9C
-	voice_directsound 60, 0, DirectSoundWaveData_8486924, 255, 0, 255, 165  @ 8451FA8
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 242, 0, 127  @ 8451FB4
+	voice_directsound_no_resample 60, 0, DirectSoundWaveData_Ring, 255, 249, 0, 165  @ 8451F90
+	voice_directsound_alt 60, 0, DirectSoundWaveData_Ring, 255, 0, 255, 165  @ 8451F9C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare4, 255, 0, 255, 165  @ 8451FA8
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 242, 0, 127  @ 8451FB4
 	voice_noise_alt 0, 0, 1, 0, 1  @ 8451FC0
 	voice_noise_alt 1, 0, 1, 0, 1  @ 8451FCC
-	voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 255, 165  @ 8451FD8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 255, 165  @ 8451FD8
 	voice_square_1_alt 0, 2, 0, 2, 0, 1  @ 8451FE4
-	voice_directsound 60, 0, DirectSoundWaveData_848A8A4, 255, 0, 255, 165  @ 8451FF0
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 0, 255, 127  @ 8451FFC
-	voice_directsound 60, 0, DirectSoundWaveData_848C4A4, 255, 0, 255, 127  @ 8452008
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare3, 255, 0, 255, 165  @ 8451FF0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 0, 255, 127  @ 8451FFC
+	voice_directsound 60, 0, DirectSoundWaveData_MachineSound2, 255, 0, 255, 127  @ 8452008
 	voice_noise_alt 1, 0, 2, 0, 0  @ 8452014
 	voice_square_1 0x67, 3, 2, 7, 0, 0  @ 8452020
 	voice_square_2 3, 2, 7, 0, 0  @ 845202C
-	voice_directsound 60, 0, DirectSoundWaveData_8487330, 255, 226, 0, 127  @ 8452038
-	voice_directsound 60, 0, DirectSoundWaveData_848E094, 255, 0, 255, 0  @ 8452044
-	voice_directsound 60, 0, DirectSoundWaveData_8487330, 255, 204, 0, 127  @ 8452050
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 226, 0, 127  @ 8452038
+	voice_directsound 60, 0, DirectSoundWaveData_MachineSound1, 255, 0, 255, 0  @ 8452044
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 204, 0, 127  @ 8452050
 	voice_square_1_alt 0, 2, 0, 2, 0, 1  @ 845205C
-	voice_directsound 60, 0, DirectSoundWaveData_848F448, 255, 0, 255, 127  @ 8452068
-	voice_directsound 60, 0, DirectSoundWaveData_8487330, 255, 0, 255, 127  @ 8452074
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Applause2, 255, 0, 255, 127  @ 8452068
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 0, 255, 127  @ 8452074
 	voice_square_1 103, 0, 0, 7, 0, 0  @ 8452080
-	voice_directsound 60, 0, DirectSoundWaveData_845C238, 255, 0, 255, 127  @ 845208C
-	voice_directsound 60, 0, DirectSoundWaveData_8491ACC, 255, 0, 255, 127  @ 8452098
-	voice_directsound 60, 0, DirectSoundWaveData_8492D10, 255, 0, 255, 127  @ 84520A4
-	voice_directsound 60, 0, DirectSoundWaveData_845B2B4, 255, 0, 255, 127  @ 84520B0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 127  @ 845208C
+	voice_directsound 60, 0, DirectSoundWaveData_Noise3, 255, 0, 255, 127  @ 8452098
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Bubble, 255, 0, 255, 127  @ 84520A4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare1, 255, 0, 255, 127  @ 84520B0
 	voice_noise_alt 0, 0, 7, 15, 1  @ 84520BC
-	voice_directsound 60, 0, DirectSoundWaveData_8493D20, 255, 0, 255, 127  @ 84520C8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_CarCrash, 255, 0, 255, 127  @ 84520C8
 	voice_noise_alt 1, 0, 7, 15, 1  @ 84520D4
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 246, 0, 127  @ 84520E0
-	voice_directsound 60, 0, DirectSoundWaveData_8495028, 255, 0, 255, 127  @ 84520EC
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 246, 0, 127  @ 84520E0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PinkNoise, 255, 0, 255, 127  @ 84520EC
 	voice_square_1_alt 19, 2, 0, 2, 0, 0  @ 84520F8
-	voice_directsound 60, 0, DirectSoundWaveData_8497134, 255, 0, 255, 127  @ 8452104
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 255, 0, 255, 127  @ 8452104
 	voice_square_1 103, 0, 0, 0, 15, 0  @ 8452110
-	voice_directsound_alt 60, 0, DirectSoundWaveData_8495028, 255, 0, 255, 127  @ 845211C
-	voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 255, 255, 127  @ 8452128
-	voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 0, 255, 127  @ 8452134
-	voice_directsound 60, 0, DirectSoundWaveData_8499110, 255, 0, 255, 127  @ 8452140
-	voice_directsound 60, 0, DirectSoundWaveData_8497134, 255, 242, 0, 0  @ 845214C
-	voice_directsound 60, 0, DirectSoundWaveData_849B320, 255, 0, 255, 0  @ 8452158
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216  @ 8452164
-	voice_directsound 60, 0, DirectSoundWaveData_845DAF0, 255, 127, 0, 188  @ 8452170
-	voice_directsound 60, 0, DirectSoundWaveData_849D45C, 255, 249, 0, 165  @ 845217C
+	voice_directsound_alt 60, 0, DirectSoundWaveData_SC88_PinkNoise, 255, 0, 255, 127  @ 845211C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 255, 255, 127  @ 8452128
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 0, 255, 127  @ 8452134
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_WhiteNoise, 255, 0, 255, 127  @ 8452140
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 255, 242, 0, 0  @ 845214C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumkitGuiro, 255, 0, 255, 0  @ 8452158
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216  @ 8452164
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitClosedHiHat, 255, 127, 0, 188  @ 8452170
+	voice_directsound 60, 0, DirectSoundWaveData_Noise1, 255, 249, 0, 165  @ 845217C
 	voice_square_1 0, 0, 4, 6, 0, 0  @ 8452188
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 13, 0, 255, 127  @ 8452194
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 13, 0, 255, 127  @ 84521A0
-	voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 0, 255, 127  @ 84521AC
-	voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 252, 0, 204  @ 84521B8
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 13, 0, 255, 127  @ 8452194
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 13, 0, 255, 127  @ 84521A0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 0, 255, 127  @ 84521AC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 252, 0, 204  @ 84521B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84521C4
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204  @ 84521D0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204  @ 84521D0
 	voice_square_1 0, 0, 4, 0, 15, 0  @ 84521DC
-	voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 188, 0, 0  @ 84521E8
-	voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 226, 0, 127  @ 84521F4
-	voice_directsound 60, 0, DirectSoundWaveData_8460E60, 26, 0, 255, 127  @ 8452200
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 188, 0, 0  @ 84521E8
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 226, 0, 127  @ 84521F4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 26, 0, 255, 127  @ 8452200
 	voice_square_1_alt 0, 2, 0, 1, 0, 0  @ 845220C
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 252, 0, 127  @ 8452218
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 252, 0, 127  @ 8452218
 	voice_square_1_alt 0, 1, 0, 2, 0, 0  @ 8452224
-	voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 127, 0, 127  @ 8452230
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 127, 0, 127  @ 8452230
 	voice_noise_alt 0, 1, 6, 0, 0  @ 845223C
-	voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 255, 255, 127  @ 8452248
-	voice_directsound 60, 0, DirectSoundWaveData_845B9A8, 255, 255, 255, 127  @ 8452254
-	voice_directsound 60, 0, DirectSoundWaveData_84A3B50, 255, 255, 255, 127  @ 8452260
-	voice_directsound 60, 0, DirectSoundWaveData_847CBAC, 11, 242, 0, 127  @ 845226C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 255, 255, 127  @ 8452248
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitHandClap, 255, 255, 255, 127  @ 8452254
+	voice_directsound 60, 0, DirectSoundWaveData_Noise2, 255, 255, 255, 127  @ 8452260
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_WideFrenchHorns, 11, 242, 0, 127  @ 845226C
 	voice_square_1_alt 0, 2, 4, 6, 0, 0  @ 8452278
-	voice_directsound 60, 0, DirectSoundWaveData_84A5690, 255, 255, 255, 127  @ 8452284
-	voice_directsound 60, 0, DirectSoundWaveData_84A5F58, 255, 0, 255, 165  @ 8452290
-	voice_directsound 60, 0, DirectSoundWaveData_845CAB0, 255, 0, 255, 165  @ 845229C
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_HorseGallop, 255, 255, 255, 127  @ 8452284
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordianFr, 255, 0, 255, 165  @ 8452290
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 0, 255, 165  @ 845229C
 	voice_noise_alt 0, 5, 7, 15, 1  @ 84522A8
-	voice_directsound 60, 0, DirectSoundWaveData_8487330, 128, 242, 0, 165  @ 84522B4
-	voice_directsound 60, 0, DirectSoundWaveData_846A4B8, 255, 0, 255, 165  @ 84522C0
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 128, 242, 0, 165  @ 84522B4
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_StringsPlusFlute, 255, 0, 255, 165  @ 84522C0
 	voice_square_1 0, 0, 1, 5, 0, 0  @ 84522CC
 	voice_noise_alt 0, 6, 6, 0, 1  @ 84522D8
 	voice_noise_alt 0, 3, 6, 0, 1  @ 84522E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84522F0
-	voice_directsound 60, 0, DirectSoundWaveData_8497134, 15, 127, 231, 127  @ 84522FC
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 15, 127, 231, 127  @ 84522FC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8452308
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8452314
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8452320
@@ -12125,12 +12125,12 @@ voicegroup_8451F90:: @ 8451F90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8452524
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8452530
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845253C
-	voice_directsound 60, 0, DirectSoundWaveData_84A7328, 255, 0, 255, 165  @ 8452548
-	voice_directsound 60, 0, DirectSoundWaveData_84A7F38, 255, 0, 255, 165  @ 8452554
-	voice_directsound 60, 0, DirectSoundWaveData_84A8AC8, 255, 0, 255, 165  @ 8452560
-	voice_directsound 60, 0, DirectSoundWaveData_84A9564, 255, 0, 255, 165  @ 845256C
-	voice_directsound 60, 0, DirectSoundWaveData_84A9EAC, 255, 0, 255, 165  @ 8452578
-	voice_directsound 60, 0, DirectSoundWaveData_84AA8F4, 255, 0, 255, 165  @ 8452584
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel1, 255, 0, 255, 165  @ 8452548
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel2, 255, 0, 255, 165  @ 8452554
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel3, 255, 0, 255, 165  @ 8452560
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel4, 255, 0, 255, 165  @ 845256C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel5, 255, 0, 255, 165  @ 8452578
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel6, 255, 0, 255, 165  @ 8452584
 
 	.align 2
 voicegroup_8452590:: @ 8452590
@@ -12934,57 +12934,57 @@ voicegroup_84549C0:: @ 84549C0
 
 	.align 2
 voicegroup_84549F0:: @ 84549F0
-	voice_directsound 60, 0, DirectSoundWaveData_8639898, 255, 0, 255, 0  @ 84549F0
-	voice_directsound 60, 0, DirectSoundWaveData_8639EF8, 255, 0, 255, 0  @ 84549FC
-	voice_directsound 60, 0, DirectSoundWaveData_863A3DC, 255, 0, 255, 0  @ 8454A08
-	voice_directsound 60, 0, DirectSoundWaveData_863AD2C, 255, 0, 255, 0  @ 8454A14
-	voice_directsound 60, 0, DirectSoundWaveData_863B79C, 255, 0, 255, 0  @ 8454A20
-	voice_directsound 60, 0, DirectSoundWaveData_863BABC, 255, 0, 255, 0  @ 8454A2C
-	voice_directsound 60, 0, DirectSoundWaveData_863C744, 255, 0, 255, 0  @ 8454A38
-	voice_directsound 60, 0, DirectSoundWaveData_863CD64, 255, 0, 255, 0  @ 8454A44
-	voice_directsound 60, 0, DirectSoundWaveData_863D0EC, 255, 0, 255, 0  @ 8454A50
-	voice_directsound 60, 0, DirectSoundWaveData_863DED0, 255, 0, 255, 0  @ 8454A5C
-	voice_directsound 60, 0, DirectSoundWaveData_863E840, 255, 0, 255, 0  @ 8454A68
-	voice_directsound 60, 0, DirectSoundWaveData_863EBDC, 255, 0, 255, 0  @ 8454A74
-	voice_directsound 60, 0, DirectSoundWaveData_863F390, 255, 0, 255, 0  @ 8454A80
-	voice_directsound 60, 0, DirectSoundWaveData_86400EC, 255, 0, 255, 0  @ 8454A8C
-	voice_directsound 60, 0, DirectSoundWaveData_8640330, 255, 0, 255, 0  @ 8454A98
-	voice_directsound 60, 0, DirectSoundWaveData_8641170, 255, 0, 255, 0  @ 8454AA4
-	voice_directsound 60, 0, DirectSoundWaveData_8641AC4, 255, 0, 255, 0  @ 8454AB0
-	voice_directsound 60, 0, DirectSoundWaveData_8641E18, 255, 0, 255, 0  @ 8454ABC
-	voice_directsound 60, 0, DirectSoundWaveData_864244C, 255, 0, 255, 0  @ 8454AC8
-	voice_directsound 60, 0, DirectSoundWaveData_86430B8, 255, 0, 255, 0  @ 8454AD4
-	voice_directsound 60, 0, DirectSoundWaveData_8643650, 255, 0, 255, 0  @ 8454AE0
-	voice_directsound 60, 0, DirectSoundWaveData_8644154, 255, 0, 255, 0  @ 8454AEC
-	voice_directsound 60, 0, DirectSoundWaveData_8644758, 255, 0, 255, 0  @ 8454AF8
-	voice_directsound 60, 0, DirectSoundWaveData_8644950, 255, 0, 255, 0  @ 8454B04
-	voice_directsound 60, 0, DirectSoundWaveData_86452B4, 255, 0, 255, 0  @ 8454B10
-	voice_directsound 60, 0, DirectSoundWaveData_8646240, 255, 0, 255, 0  @ 8454B1C
-	voice_directsound 60, 0, DirectSoundWaveData_8646878, 255, 0, 255, 0  @ 8454B28
-	voice_directsound 60, 0, DirectSoundWaveData_864734C, 255, 0, 255, 0  @ 8454B34
-	voice_directsound 60, 0, DirectSoundWaveData_8648290, 255, 0, 255, 0  @ 8454B40
-	voice_directsound 60, 0, DirectSoundWaveData_8648808, 255, 0, 255, 0  @ 8454B4C
-	voice_directsound 60, 0, DirectSoundWaveData_8649654, 255, 0, 255, 0  @ 8454B58
-	voice_directsound 60, 0, DirectSoundWaveData_864A55C, 255, 0, 255, 0  @ 8454B64
-	voice_directsound 60, 0, DirectSoundWaveData_864B030, 255, 0, 255, 0  @ 8454B70
-	voice_directsound 60, 0, DirectSoundWaveData_864BBC4, 255, 0, 255, 0  @ 8454B7C
-	voice_directsound 60, 0, DirectSoundWaveData_864C59C, 255, 0, 255, 0  @ 8454B88
-	voice_directsound 60, 0, DirectSoundWaveData_864CBDC, 255, 0, 255, 0  @ 8454B94
-	voice_directsound 60, 0, DirectSoundWaveData_864D6BC, 255, 0, 255, 0  @ 8454BA0
-	voice_directsound 60, 0, DirectSoundWaveData_864DCF8, 255, 0, 255, 0  @ 8454BAC
-	voice_directsound 60, 0, DirectSoundWaveData_864E410, 255, 0, 255, 0  @ 8454BB8
-	voice_directsound 60, 0, DirectSoundWaveData_864ED4C, 255, 0, 255, 0  @ 8454BC4
-	voice_directsound 60, 0, DirectSoundWaveData_864F508, 255, 0, 255, 0  @ 8454BD0
-	voice_directsound 60, 0, DirectSoundWaveData_864FA6C, 255, 0, 255, 0  @ 8454BDC
-	voice_directsound 60, 0, DirectSoundWaveData_86507E0, 255, 0, 255, 0  @ 8454BE8
-	voice_directsound 60, 0, DirectSoundWaveData_8650C5C, 255, 0, 255, 0  @ 8454BF4
-	voice_directsound 60, 0, DirectSoundWaveData_8651148, 255, 0, 255, 0  @ 8454C00
-	voice_directsound 60, 0, DirectSoundWaveData_8651910, 255, 0, 255, 0  @ 8454C0C
-	voice_directsound 60, 0, DirectSoundWaveData_865250C, 255, 0, 255, 0  @ 8454C18
-	voice_directsound 60, 0, DirectSoundWaveData_8652884, 255, 0, 255, 0  @ 8454C24
-	voice_directsound 60, 0, DirectSoundWaveData_8653040, 255, 0, 255, 0  @ 8454C30
-	voice_directsound 60, 0, DirectSoundWaveData_8653CA4, 255, 0, 255, 0  @ 8454C3C
-	voice_directsound 60, 0, DirectSoundWaveData_8654170, 255, 0, 255, 0  @ 8454C48
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel7, 255, 0, 255, 0  @ 84549F0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel8, 255, 0, 255, 0  @ 84549FC
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel9, 255, 0, 255, 0  @ 8454A08
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel10, 255, 0, 255, 0  @ 8454A14
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel11, 255, 0, 255, 0  @ 8454A20
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel12, 255, 0, 255, 0  @ 8454A2C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel13, 255, 0, 255, 0  @ 8454A38
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel14, 255, 0, 255, 0  @ 8454A44
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel15, 255, 0, 255, 0  @ 8454A50
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel16, 255, 0, 255, 0  @ 8454A5C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel17, 255, 0, 255, 0  @ 8454A68
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel18, 255, 0, 255, 0  @ 8454A74
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel19, 255, 0, 255, 0  @ 8454A80
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel20, 255, 0, 255, 0  @ 8454A8C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel21, 255, 0, 255, 0  @ 8454A98
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel22, 255, 0, 255, 0  @ 8454AA4
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel23, 255, 0, 255, 0  @ 8454AB0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel24, 255, 0, 255, 0  @ 8454ABC
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel25, 255, 0, 255, 0  @ 8454AC8
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel26, 255, 0, 255, 0  @ 8454AD4
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel27, 255, 0, 255, 0  @ 8454AE0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel28, 255, 0, 255, 0  @ 8454AEC
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel29, 255, 0, 255, 0  @ 8454AF8
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel30, 255, 0, 255, 0  @ 8454B04
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel31, 255, 0, 255, 0  @ 8454B10
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel32, 255, 0, 255, 0  @ 8454B1C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel33, 255, 0, 255, 0  @ 8454B28
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel34, 255, 0, 255, 0  @ 8454B34
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel35, 255, 0, 255, 0  @ 8454B40
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel36, 255, 0, 255, 0  @ 8454B4C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel37, 255, 0, 255, 0  @ 8454B58
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel38, 255, 0, 255, 0  @ 8454B64
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel39, 255, 0, 255, 0  @ 8454B70
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel40, 255, 0, 255, 0  @ 8454B7C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel41, 255, 0, 255, 0  @ 8454B88
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel42, 255, 0, 255, 0  @ 8454B94
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel43, 255, 0, 255, 0  @ 8454BA0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel44, 255, 0, 255, 0  @ 8454BAC
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel45, 255, 0, 255, 0  @ 8454BB8
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel46, 255, 0, 255, 0  @ 8454BC4
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel47, 255, 0, 255, 0  @ 8454BD0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel48, 255, 0, 255, 0  @ 8454BDC
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel49, 255, 0, 255, 0  @ 8454BE8
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel50, 255, 0, 255, 0  @ 8454BF4
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel51, 255, 0, 255, 0  @ 8454C00
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel52, 255, 0, 255, 0  @ 8454C0C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel53, 255, 0, 255, 0  @ 8454C18
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel54, 255, 0, 255, 0  @ 8454C24
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel55, 255, 0, 255, 0  @ 8454C30
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel56, 255, 0, 255, 0  @ 8454C3C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel57, 255, 0, 255, 0  @ 8454C48
 
 	.align 2
 voicegroup_8454C54:: @ 8454C54
@@ -13009,7 +13009,7 @@ voicegroup_8454C54:: @ 8454C54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8454D2C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8454D38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8454D44
-	voice_directsound 60, 0, DirectSoundWaveData_8654C20, 255, 249, 25, 248  @ 8454D50
+	voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordionFr_Copy, 255, 249, 25, 248  @ 8454D50
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8454D5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8454D68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8454D74
diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c
index ab093eab1..254160109 100644
--- a/src/battle/anim/guard.c
+++ b/src/battle/anim/guard.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "battle.h"
 #include "battle_anim.h"
 #include "rom_8077ABC.h"
 
@@ -12,7 +13,7 @@ extern u16 gBattleTypeFlags;
 
 void sub_80D3014(struct Sprite *sprite)
 {
-    if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+    if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
     {
         sub_807A3FC(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
         sprite->pos1.y += 40;
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 892be1029..15555f833 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -475,7 +475,7 @@ static void Task_BattleStart(u8 taskId)
     switch (tState)
     {
     case 0:
-        if (!FieldPoisonEffectIsRunning()) // is poison not active?
+        if (!FldeffPoison_IsActive()) // is poison not active?
         {
             BattleTransition_StartOnField(tTransition);
             tState++; // go to case 1.
diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c
index d4e921a0e..a2d32ffb6 100644
--- a/src/engine/option_menu.c
+++ b/src/engine/option_menu.c
@@ -10,19 +10,9 @@
 
 extern void SetPokemonCryStereo(u32 val);
 
-//Task data
-enum {
-    TD_MENUSELECTION,
-    TD_TEXTSPEED,
-    TD_BATTLESCENE,
-    TD_BATTLESTYLE,
-    TD_SOUND,
-    TD_BUTTONMODE,
-    TD_FRAMETYPE,
-};
-
-//Menu items
-enum {
+// Menu items
+enum
+{
     MENUITEM_TEXTSPEED,
     MENUITEM_BATTLESCENE,
     MENUITEM_BATTLESTYLE,
@@ -32,6 +22,15 @@ enum {
     MENUITEM_CANCEL,
 };
 
+// Task data
+#define tMenuSelection  data[0]
+#define tOptTextSpeed   data[1]
+#define tOptBattleScene data[2]
+#define tOptBattleStyle data[3]
+#define tOptSound       data[4]
+#define tOptButtonMode  data[5]
+#define tOptFrameType   data[6]
+
 const u16 gUnknown_0839F5FC[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal");
 // note: this is only used in the Japanese release
 const u8 gUnknown_0839F63C[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp");
@@ -75,7 +74,6 @@ void CB2_InitOptionMenu(void)
     {
     default:
     case 0:
-    {
         SetVBlankCallback(NULL);
         REG_DISPCNT = 0;
         REG_BG2CNT = 0;
@@ -92,7 +90,6 @@ void CB2_InitOptionMenu(void)
         DmaClear16(3, PLTT, PLTT_SIZE);
         gMain.state++;
         break;
-    }
     case 1:
         ResetPaletteFade();
         ScanlineEffect_Stop();
@@ -150,37 +147,38 @@ void CB2_InitOptionMenu(void)
     {
         u8 taskId = CreateTask(Task_OptionMenuFadeIn, 0);
 
-        gTasks[taskId].data[TD_MENUSELECTION] = 0;
-        gTasks[taskId].data[TD_TEXTSPEED] = gSaveBlock2.optionsTextSpeed;
-        gTasks[taskId].data[TD_BATTLESCENE] = gSaveBlock2.optionsBattleSceneOff;
-        gTasks[taskId].data[TD_BATTLESTYLE] = gSaveBlock2.optionsBattleStyle;
-        gTasks[taskId].data[TD_SOUND] = gSaveBlock2.optionsSound;
-        gTasks[taskId].data[TD_BUTTONMODE] = gSaveBlock2.optionsButtonMode;
-        gTasks[taskId].data[TD_FRAMETYPE] = gSaveBlock2.optionsWindowFrameType;
-
-        Menu_DrawStdWindowFrame(2, 0, 27, 3);
-        Menu_DrawStdWindowFrame(2, 4, 27, 19);
-
-        Menu_PrintText(gSystemText_OptionMenu, 4, 1);
-        Menu_PrintText(gSystemText_TextSpeed, 4, 5);
-        Menu_PrintText(gSystemText_BattleScene, 4, 7);
-        Menu_PrintText(gSystemText_BattleStyle, 4, 9);
-        Menu_PrintText(gSystemText_Sound, 4, 11);
-        Menu_PrintText(gSystemText_ButtonMode, 4, 13);
-        Menu_PrintText(gSystemText_Frame, 4, 15);
-        Menu_PrintText(gSystemText_Cancel, 4, 17);
-
-        TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
-        BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
-        BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]);
-        Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]);
-        ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]);
-        FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]);
+        gTasks[taskId].tMenuSelection = 0;
+        gTasks[taskId].tOptTextSpeed   = gSaveBlock2.optionsTextSpeed;
+        gTasks[taskId].tOptBattleScene = gSaveBlock2.optionsBattleSceneOff;
+        gTasks[taskId].tOptBattleStyle = gSaveBlock2.optionsBattleStyle;
+        gTasks[taskId].tOptSound       = gSaveBlock2.optionsSound;
+        gTasks[taskId].tOptButtonMode  = gSaveBlock2.optionsButtonMode;
+        gTasks[taskId].tOptFrameType   = gSaveBlock2.optionsWindowFrameType;
+
+        Menu_DrawStdWindowFrame(2, 0, 27, 3);   // title box
+        Menu_DrawStdWindowFrame(2, 4, 27, 19);  // options list box
+
+        Menu_PrintText(gSystemText_OptionMenu,  4,  1);
+
+        Menu_PrintText(gSystemText_TextSpeed,   4,  5);
+        Menu_PrintText(gSystemText_BattleScene, 4,  7);
+        Menu_PrintText(gSystemText_BattleStyle, 4,  9);
+        Menu_PrintText(gSystemText_Sound,       4, 11);
+        Menu_PrintText(gSystemText_ButtonMode,  4, 13);
+        Menu_PrintText(gSystemText_Frame,       4, 15);
+        Menu_PrintText(gSystemText_Cancel,      4, 17);
+
+        TextSpeed_DrawChoices(gTasks[taskId].tOptTextSpeed);
+        BattleScene_DrawChoices(gTasks[taskId].tOptBattleScene);
+        BattleStyle_DrawChoices(gTasks[taskId].tOptBattleStyle);
+        Sound_DrawChoices(gTasks[taskId].tOptSound);
+        ButtonMode_DrawChoices(gTasks[taskId].tOptButtonMode);
+        FrameType_DrawChoices(gTasks[taskId].tOptFrameType);
 
         REG_WIN0H = WIN_RANGE(17, 223);
         REG_WIN0V = WIN_RANGE(1, 31);
 
-        HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
+        HighlightOptionMenuItem(gTasks[taskId].tMenuSelection);
         gMain.state++;
         break;
     }
@@ -193,16 +191,14 @@ void CB2_InitOptionMenu(void)
 static void Task_OptionMenuFadeIn(u8 taskId)
 {
     if (!gPaletteFade.active)
-    {
         gTasks[taskId].func = Task_OptionMenuProcessInput;
-    }
 }
 
 static void Task_OptionMenuProcessInput(u8 taskId)
 {
     if (gMain.newKeys & A_BUTTON)
     {
-        if (gTasks[taskId].data[TD_MENUSELECTION] == MENUITEM_CANCEL)
+        if (gTasks[taskId].tMenuSelection == MENUITEM_CANCEL)
             gTasks[taskId].func = Task_OptionMenuSave;
     }
     else if (gMain.newKeys & B_BUTTON)
@@ -211,47 +207,47 @@ static void Task_OptionMenuProcessInput(u8 taskId)
     }
     else if (gMain.newKeys & DPAD_UP)
     {
-        if (gTasks[taskId].data[TD_MENUSELECTION] > 0)
-            gTasks[taskId].data[TD_MENUSELECTION]--;
+        if (gTasks[taskId].tMenuSelection > 0)
+            gTasks[taskId].tMenuSelection--;
         else
-            gTasks[taskId].data[TD_MENUSELECTION] = 6;
-        HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
+            gTasks[taskId].tMenuSelection = 6;
+        HighlightOptionMenuItem(gTasks[taskId].tMenuSelection);
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
-        if (gTasks[taskId].data[TD_MENUSELECTION] <= 5)
-            gTasks[taskId].data[TD_MENUSELECTION]++;
+        if (gTasks[taskId].tMenuSelection < 6)
+            gTasks[taskId].tMenuSelection++;
         else
-            gTasks[taskId].data[TD_MENUSELECTION] = 0;
-        HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
+            gTasks[taskId].tMenuSelection = 0;
+        HighlightOptionMenuItem(gTasks[taskId].tMenuSelection);
     }
     else
     {
-        switch (gTasks[taskId].data[TD_MENUSELECTION])
+        switch (gTasks[taskId].tMenuSelection)
         {
         case MENUITEM_TEXTSPEED:
-            gTasks[taskId].data[TD_TEXTSPEED] = TextSpeed_ProcessInput(gTasks[taskId].data[TD_TEXTSPEED]);
-            TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
+            gTasks[taskId].tOptTextSpeed = TextSpeed_ProcessInput(gTasks[taskId].tOptTextSpeed);
+            TextSpeed_DrawChoices(gTasks[taskId].tOptTextSpeed);
             break;
         case MENUITEM_BATTLESCENE:
-            gTasks[taskId].data[TD_BATTLESCENE] = BattleScene_ProcessInput(gTasks[taskId].data[TD_BATTLESCENE]);
-            BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
+            gTasks[taskId].tOptBattleScene = BattleScene_ProcessInput(gTasks[taskId].tOptBattleScene);
+            BattleScene_DrawChoices(gTasks[taskId].tOptBattleScene);
             break;
         case MENUITEM_BATTLESTYLE:
-            gTasks[taskId].data[TD_BATTLESTYLE] = BattleStyle_ProcessInput(gTasks[taskId].data[TD_BATTLESTYLE]);
-            BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]);
+            gTasks[taskId].tOptBattleStyle = BattleStyle_ProcessInput(gTasks[taskId].tOptBattleStyle);
+            BattleStyle_DrawChoices(gTasks[taskId].tOptBattleStyle);
             break;
         case MENUITEM_SOUND:
-            gTasks[taskId].data[TD_SOUND] = Sound_ProcessInput(gTasks[taskId].data[TD_SOUND]);
-            Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]);
+            gTasks[taskId].tOptSound = Sound_ProcessInput(gTasks[taskId].tOptSound);
+            Sound_DrawChoices(gTasks[taskId].tOptSound);
             break;
         case MENUITEM_BUTTONMODE:
-            gTasks[taskId].data[TD_BUTTONMODE] = ButtonMode_ProcessInput(gTasks[taskId].data[TD_BUTTONMODE]);
-            ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]);
+            gTasks[taskId].tOptButtonMode = ButtonMode_ProcessInput(gTasks[taskId].tOptButtonMode);
+            ButtonMode_DrawChoices(gTasks[taskId].tOptButtonMode);
             break;
         case MENUITEM_FRAMETYPE:
-            gTasks[taskId].data[TD_FRAMETYPE] = FrameType_ProcessInput(gTasks[taskId].data[TD_FRAMETYPE]);
-            FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]);
+            gTasks[taskId].tOptFrameType = FrameType_ProcessInput(gTasks[taskId].tOptFrameType);
+            FrameType_DrawChoices(gTasks[taskId].tOptFrameType);
             break;
         }
     }
@@ -259,12 +255,12 @@ static void Task_OptionMenuProcessInput(u8 taskId)
 
 static void Task_OptionMenuSave(u8 taskId)
 {
-    gSaveBlock2.optionsTextSpeed = gTasks[taskId].data[TD_TEXTSPEED];
-    gSaveBlock2.optionsBattleSceneOff = gTasks[taskId].data[TD_BATTLESCENE];
-    gSaveBlock2.optionsBattleStyle = gTasks[taskId].data[TD_BATTLESTYLE];
-    gSaveBlock2.optionsSound = gTasks[taskId].data[TD_SOUND];
-    gSaveBlock2.optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE];
-    gSaveBlock2.optionsWindowFrameType = gTasks[taskId].data[TD_FRAMETYPE];
+    gSaveBlock2.optionsTextSpeed       = gTasks[taskId].tOptTextSpeed;
+    gSaveBlock2.optionsBattleSceneOff  = gTasks[taskId].tOptBattleScene;
+    gSaveBlock2.optionsBattleStyle     = gTasks[taskId].tOptBattleStyle;
+    gSaveBlock2.optionsSound           = gTasks[taskId].tOptSound;
+    gSaveBlock2.optionsButtonMode      = gTasks[taskId].tOptButtonMode;
+    gSaveBlock2.optionsWindowFrameType = gTasks[taskId].tOptFrameType;
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
     gTasks[taskId].func = Task_OptionMenuFadeOut;
@@ -290,10 +286,10 @@ static void HighlightOptionMenuItem(u8 index)
 
 static void DrawOptionMenuChoice(const u8 *text, u8 x, u8 y, u8 style)
 {
-    u8 dst[16];
+    u8 dst[15];
     u16 i;
 
-    for (i = 0; *text != EOS && i <= 14; i++)
+    for (i = 0; *text != EOS && i < 15; i++)
         dst[i] = *(text++);
 
     dst[2] = style;
@@ -305,14 +301,14 @@ static u8 TextSpeed_ProcessInput(u8 selection)
 {
     if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (selection <= 1)
+        if (selection < 2)
             selection++;
         else
             selection = 0;
     }
     if (gMain.newKeys & DPAD_LEFT)
     {
-        if (selection != 0)
+        if (selection > 0)
             selection--;
         else
             selection = 2;
@@ -341,7 +337,7 @@ static void TextSpeed_DrawChoices(u8 selection)
     styles[selection] = 0x8;
 
     DrawOptionMenuChoice(gSystemText_Slow, TEXTSPEED_SLOW_LEFT, 40, styles[0]);
-    DrawOptionMenuChoice(gSystemText_Mid, TEXTSPEED_MIX_LEFT, 40, styles[1]);
+    DrawOptionMenuChoice(gSystemText_Mid,  TEXTSPEED_MIX_LEFT,  40, styles[1]);
     DrawOptionMenuChoice(gSystemText_Fast, TEXTSPEED_FAST_LEFT, 40, styles[2]);
 }
 
@@ -360,7 +356,7 @@ static void BattleScene_DrawChoices(u8 selection)
     styles[1] = 0xF;
     styles[selection] = 0x8;
 
-    DrawOptionMenuChoice(gSystemText_On, 120, 56, styles[0]);
+    DrawOptionMenuChoice(gSystemText_On,  120, 56, styles[0]);
     DrawOptionMenuChoice(gSystemText_Off, 190, 56, styles[1]);
 }
 
@@ -388,7 +384,7 @@ static void BattleStyle_DrawChoices(u8 selection)
     styles[selection] = 0x8;
 
     DrawOptionMenuChoice(gSystemText_Shift, BATTLESTYLE_SHIFT, 72, styles[0]);
-    DrawOptionMenuChoice(gSystemText_Set, BATTLESTYLE_SET, 72, styles[1]);
+    DrawOptionMenuChoice(gSystemText_Set,   BATTLESTYLE_SET,   72, styles[1]);
 }
 
 static u8 Sound_ProcessInput(u8 selection)
@@ -409,7 +405,7 @@ static void Sound_DrawChoices(u8 selection)
     styles[1] = 0xF;
     styles[selection] = 0x8;
 
-    DrawOptionMenuChoice(gSystemText_Mono, 120, 88, styles[0]);
+    DrawOptionMenuChoice(gSystemText_Mono,   120, 88, styles[0]);
     DrawOptionMenuChoice(gSystemText_Stereo, 172, 88, styles[1]);
 }
 
@@ -425,7 +421,7 @@ static u8 FrameType_ProcessInput(u8 selection)
     }
     if (gMain.newKeys & DPAD_LEFT)
     {
-        if (selection != 0)
+        if (selection > 0)
             selection--;
         else
             selection = 19;
@@ -439,11 +435,11 @@ static u8 FrameType_ProcessInput(u8 selection)
 #if ENGLISH
 static void FrameType_DrawChoices(u8 selection)
 {
-    u8 text[8];
+    u8 text[6];
     u8 n = selection + 1;
     u16 i;
 
-    for (i = 0; gSystemText_Terminator[i] != EOS && i <= 5; i++)
+    for (i = 0; gSystemText_Terminator[i] != EOS && i < 6; i++)
         text[i] = gSystemText_Terminator[i];
 
     //Convert number to decimal string
@@ -534,14 +530,14 @@ static u8 ButtonMode_ProcessInput(u8 selection)
 {
     if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (selection <= 1)
+        if (selection < 2)
             selection++;
         else
             selection = 0;
     }
     if (gMain.newKeys & DPAD_LEFT)
     {
-        if (selection != 0)
+        if (selection > 0)
             selection--;
         else
             selection = 2;
@@ -559,6 +555,6 @@ static void ButtonMode_DrawChoices(u8 selection)
     styles[selection] = 0x8;
 
     DrawOptionMenuChoice(gSystemText_Normal, 120, 104, styles[0]);
-    DrawOptionMenuChoice(gSystemText_LR, 166, 104, styles[1]);
-    DrawOptionMenuChoice(gSystemText_LA, 188, 104, styles[2]);
+    DrawOptionMenuChoice(gSystemText_LR,     166, 104, styles[1]);
+    DrawOptionMenuChoice(gSystemText_LA,     188, 104, styles[2]);
 }
diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c
index bf96c724f..83924b384 100644
--- a/src/field/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
@@ -532,7 +532,7 @@ static void happiness_algorithm_step(void)
     {
         struct Pokemon *pkmn = gPlayerParty;
 
-        for (i = 5; i >= 0; i--)
+        for (i = 0; i < 6; i++)
         {
             AdjustFriendship(pkmn, 5);
             pkmn++;
diff --git a/src/field/field_poison.c b/src/field/field_poison.c
index 49678f269..8365351f9 100644
--- a/src/field/field_poison.c
+++ b/src/field/field_poison.c
@@ -43,7 +43,7 @@ void MonFaintFromPoisonOnField(u8 partyMember)
     u32 val = 0;
 
     AdjustFriendship(pkmn, 7);
-    SetMonData(pkmn, MON_DATA_STATUS, (u8*)&val);
+    SetMonData(pkmn, MON_DATA_STATUS, &val);
     GetMonData(pkmn, MON_DATA_NICKNAME, gStringVar1);
     StringGetEnd10(gStringVar1);
 }
@@ -60,38 +60,36 @@ bool32 CheckMonFaintedFromPoison(u8 partyMember)
         return FALSE;
 }
 
-//Task data
-enum
-{
-    TD_STATE,
-    TD_PARTY_MEMBER,
-};
+#define tState       data[0]
+#define tPartyMember data[1]
 
 void Task_WhiteOut(u8 taskId)
 {
-    s16 *taskData = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
 
-    switch (taskData[TD_STATE])
+    switch (tState)
     {
-    case 0: //Check if Pokemon have fainted due to poison
-        while (taskData[TD_PARTY_MEMBER] < 6)
+    case 0:
+        // Check if any Pokemon have fainted due to poison
+        while (tPartyMember < 6)
         {
-            if (CheckMonFaintedFromPoison(taskData[TD_PARTY_MEMBER]))
+            if (CheckMonFaintedFromPoison(tPartyMember))
             {
-                MonFaintFromPoisonOnField(taskData[TD_PARTY_MEMBER]);
+                // Show message about fainted mon
+                MonFaintFromPoisonOnField(tPartyMember);
                 ShowFieldMessage(fieldPoisonText_PokemonFainted);
-                taskData[TD_STATE]++;
+                tState++;
                 return;
             }
-            taskData[TD_PARTY_MEMBER]++;
+            tPartyMember++;
         }
-        taskData[TD_STATE] = 2;
+        tState = 2;
         break;
-    case 1: //Wait for message box to disappear
+    case 1:  // Wait for message box to disappear
         if (IsFieldMessageBoxHidden())
-            taskData[TD_STATE]--; //Check next party member
+            tState--;  // Go to previous step and check next party member
         break;
-    case 2: //Done checking Pokemon
+    case 2:  // done checking all mons
         if (AllMonsFainted())
             gSpecialVar_Result = 1;
         else
@@ -102,6 +100,9 @@ void Task_WhiteOut(u8 taskId)
     }
 }
 
+#undef tState
+#undef tPartyMember
+
 void ExecuteWhiteOut(void)
 {
     CreateTask(Task_WhiteOut, 0x50);
@@ -115,26 +116,28 @@ s32 DoPoisonFieldEffect(void)
     u32 numFainting = 0;
     int i;
 
+    // count the number of mons that are poisoned and fainting from poison,
+    // and decrement HP of all poisoned mons
     for (i = 0; i < 6; i++)
     {
         u32 hp;
 
-        // UB: Too few arguments for function 'GetMonData'
         if (GetMonData(pkmn, MON_DATA_SANITY_BIT2) != 0
          && pokemon_ailments_get_primary(GetMonData(pkmn, MON_DATA_STATUS)) == 1)
         {
+            // decrement HP of poisoned mon
             hp = GetMonData(pkmn, MON_DATA_HP);
             if (hp != 0)
                 hp--;
             if (hp == 0)
-                numFainting++; //Pokemon will now faint due to poison
+                numFainting++;
             SetMonData(pkmn, MON_DATA_HP, &hp);
             numPoisoned++;
         }
         pkmn++;
     }
     if (numFainting != 0 || numPoisoned != 0)
-        DoFieldPoisonEffect();
+        FldeffPoison_Start();
     if (numFainting != 0)
         return 2;
     if (numPoisoned != 0)
diff --git a/src/field/fldeff_poison.c b/src/field/fldeff_poison.c
index b0052d59d..52afc2516 100644
--- a/src/field/fldeff_poison.c
+++ b/src/field/fldeff_poison.c
@@ -32,13 +32,13 @@ static void Task_FieldPoisonEffect(u8 taskId)
     REG_MOSAIC = (data[1] << 4) | data[1];
 }
 
-void DoFieldPoisonEffect(void)
+void FldeffPoison_Start(void)
 {
     PlaySE(SE_DOKU);
     CreateTask(Task_FieldPoisonEffect, 80);
 }
 
-bool32 FieldPoisonEffectIsRunning(void)
+bool32 FldeffPoison_IsActive(void)
 {
     return FuncIsActiveTask(Task_FieldPoisonEffect);
 }
diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c
deleted file mode 100644
index 3473b58c8..000000000
--- a/src/pokemon/pokemon_data.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "global.h"
-#include "pokemon.h"
-#include "constants/species.h"
-#include "trainer.h"
-#include "constants/abilities.h"
-#include "constants/moves.h"
-#include "constants/hold_effects.h"
-#include "constants/items.h"
-#include "sprite.h"
-#include "data2.h"
-
-
diff --git a/src/roulette_util.c b/src/roulette_util.c
index 3d5b03a5c..f3eae5518 100644
--- a/src/roulette_util.c
+++ b/src/roulette_util.c
@@ -13,12 +13,12 @@ void sub_8124918(struct UnkStruct0 *r0)
 {
     r0->var00 = 0;
     r0->var02 = 0;
-    memset((&r0->var04), 0, 0xC0);
+    memset(&r0->var04, 0, sizeof(r0->var04));
 }
 
 u8 sub_812492C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2)
 {
-    if (!(r1 < 0x10) || (r0->var04[r1].var00_7))
+    if (!(r1 < 16) || (r0->var04[r1].var00_7))
         return 0xFF;
 
     r0->var04[r1].var04.var00 = r2->var00;
@@ -29,123 +29,82 @@ u8 sub_812492C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2)
     r0->var04[r1].var04.var07_0 = r2->var07_0;
     r0->var04[r1].var04.var07_5 = r2->var07_5;
     r0->var04[r1].var04.var07_7 = r2->var07_7;
-
-
-    r0->var04[r1].var00_0 = 0x0;
-    r0->var04[r1].var00_7 = 0x1;
-
-    r0->var04[r1].var02 = 0x0;
-    r0->var04[r1].var01 = 0x0;
+    r0->var04[r1].var00_0 = 0;
+    r0->var04[r1].var00_7 = 1;
+    r0->var04[r1].var02 = 0;
+    r0->var04[r1].var01 = 0;
     if (r0->var04[r1].var04.var07_7 < 0)
         r0->var04[r1].var03 = 0xFF;
     else
-        r0->var04[r1].var03 = 0x1;
+        r0->var04[r1].var03 = 1;
     return r1;
 }
 
-#ifdef NONMATCHING
 u8 unref_sub_81249B0(struct UnkStruct0 *r0, u8 r1)
 {
-    if (r1 < 0x10)
-    {
-        if (r0->var04[r1].var00_7)
-        {
-            r0->var04[r1] = (struct UnkStruct3){0};
-            return r1;
-        }
-    }
-    return 0xFF;
-}
-#else
-__attribute__((naked))
-u8 unref_sub_81249B0(struct UnkStruct0 *r0 , u8 r1)
-{
-        asm(".syntax unified\n\
-        push {r4,lr}\n\
-        adds r2, r0, 0\n\
-        lsls r1, 24\n\
-        lsrs r1, 24\n\
-        adds r4, r1, 0\n\
-        cmp r4, 0xF\n\
-        bhi _081249DC\n\
-        lsls r0, r4, 1\n\
-        adds r0, r4\n\
-        lsls r0, 2\n\
-        adds r1, r2, r0\n\
-        ldrb r0, [r1, 0x4]\n\
-        lsrs r0, 7\n\
-        cmp r0, 0\n\
-        beq _081249DC\n\
-        adds r0, r1, 0x4\n\
-        movs r1, 0\n\
-        movs r2, 0xC\n\
-        bl memset\n\
-        adds r0, r4, 0\n\
-        b _081249DE\n\
-        _081249DC:\n\
-        movs r0, 0xFF\n\
-        _081249DE:\n\
-        pop {r4}\n\
-        pop {r1}\n\
-        bx r1\n\
-            .syntax divided\n");
+    if (r1 >= 16)
+        return 0xFF;
+    if (!r0->var04[r1].var00_7)
+        return 0xFF;
+    memset(&r0->var04[r1], 0, sizeof(r0->var04[r1]));
+    return r1;
 }
-#endif
 
 u8 sub_81249E4(struct UnkStruct3 *r0)
 {
     u8 i;
     u8 returnval;
+
     for (i = 0; i < r0->var04.var04; i++)
     {
-        u32 offset = r0->var04.var02 + i;
-        struct PlttData *faded =   (struct PlttData *)&gPlttBufferFaded[offset];
-        struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[offset];
-        switch(r0->var00_0)
+        struct PlttData *faded =   (struct PlttData *)&gPlttBufferFaded[r0->var04.var02 + i];
+        struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[r0->var04.var02 + i];
+
+        switch (r0->var00_0)
         {
-        case 0x1:
-            if ((u32)(faded->r + r0->var03) < 0x20)
+        case 1:
+            if (faded->r + r0->var03 >= 0 && faded->r + r0->var03 < 32)
                 faded->r += r0->var03;
-            if ((u32)(faded->g + r0->var03) < 0x20)
+            if (faded->g + r0->var03 >= 0 && faded->g + r0->var03 < 32)
                 faded->g += r0->var03;
-            if ((u32)(faded->b + r0->var03) < 0x20)
+            if (faded->b + r0->var03 >= 0 && faded->b + r0->var03 < 32)
                 faded->b += r0->var03;
-        break;
-        case 0x2:
+            break;
+        case 2:
             if (r0->var03 < 0)
             {
-                if (!(faded->r + r0->var03 < unfaded->r))
+                if (faded->r + r0->var03 >= unfaded->r)
                     faded->r += r0->var03;
-                if (!(faded->g + r0->var03 < unfaded->g))
+                if (faded->g + r0->var03 >= unfaded->g)
                     faded->g += r0->var03;
-                if (!(faded->b + r0->var03 < unfaded->b))
+                if (faded->b + r0->var03 >= unfaded->b)
                     faded->b += r0->var03;
             }
             else
             {
-                if (!(faded->r + r0->var03 > unfaded->r))
+                if (faded->r + r0->var03 <= unfaded->r)
                     faded->r += r0->var03;
-                if (!(faded->g + r0->var03 > unfaded->g))
+                if (faded->g + r0->var03 <= unfaded->g)
                     faded->g += r0->var03;
-                if (!(faded->b + r0->var03 > unfaded->b))
+                if (faded->b + r0->var03 <= unfaded->b)
                     faded->b += r0->var03;
             }
-        break;
+            break;
         }
     }
-    if (((u32)r0->var02++) != r0->var04.var07_0)
+    if ((u32)r0->var02++ != r0->var04.var07_0)
     {
-        returnval = 0x0;
+        returnval = 0;
     }
     else
     {
-        r0->var02 = 0x0;
-        r0->var03 = r0->var03 * -1;
-        if (r0->var00_0 == 0x1)
+        r0->var02 = 0;
+        r0->var03 *= -1;
+        if (r0->var00_0 == 1)
             r0->var00_0++;
         else
             r0->var00_0--;
-        returnval = 0x1;
+        returnval = 1;
     }
     return returnval;
 }
@@ -153,34 +112,36 @@ u8 sub_81249E4(struct UnkStruct3 *r0)
 u8 sub_8124BEC(struct UnkStruct3 *r0)
 {
     u8 rg2 = 0;
+
     switch (r0->var00_0)
     {
-        case 0x1:
+    case 1:
         for (rg2 = 0; rg2 < r0->var04.var04; rg2++)
             gPlttBufferFaded[r0->var04.var02 + rg2] = r0->var04.var00;
         r0->var00_0++;
         break;
-        case 0x2:
+    case 2:
         for (rg2 = 0; rg2 < r0->var04.var04; rg2++)
             gPlttBufferFaded[r0->var04.var02 + rg2] = gPlttBufferUnfaded[r0->var04.var02 + rg2];
         r0->var00_0--;
         break;
     }
-    return 0x1;
+    return 1;
 }
 
 void task_tutorial_controls_fadein(struct UnkStruct0 *r0)
 {
     u8 i = 0;
+
     if (r0->var00)
     {
-        for (i = 0; i < 0x10; i++)
+        for (i = 0; i < 16; i++)
         {
-            if ((r0->var02 >> i) & 0x1)
+            if ((r0->var02 >> i) & 1)
             {
-                if (((u8)--r0->var04[i].var01) == 0xFF) // if underflow ?
+                if (--r0->var04[i].var01 == 0xFF) // if underflow ?
                 {
-                    if (r0->var04[i].var04.var00 & (0x80 << 8)) // PlttData->unused_15 ?
+                    if (r0->var04[i].var04.var00 & 0x8000) // PlttData->unused_15 ?
                         sub_81249E4(&r0->var04[i]);
                     else
                         sub_8124BEC(&r0->var04[i]);
@@ -194,15 +155,16 @@ void task_tutorial_controls_fadein(struct UnkStruct0 *r0)
 void sub_8124CE8(struct UnkStruct0 *r0, u16 r1)
 {
     u8 i = 0;
+
     r0->var00++;
-    for (i = 0; i < 0x10; i++)
+    for (i = 0; i < 16; i++)
     {
-        if ((r1 >> i) & 0x1)
+        if ((r1 >> i) & 1)
         {
             if (r0->var04[i].var00_7)
             {
-                r0->var02 |= 0x1 << i;
-                r0->var04[i].var00_0 = 0x1;
+                r0->var02 |= 1 << i;
+                r0->var04[i].var00_0 = 1;
             }
         }
     }
@@ -211,21 +173,22 @@ void sub_8124CE8(struct UnkStruct0 *r0, u16 r1)
 void sub_8124D3C(struct UnkStruct0 *r0, u16 r1)
 {
     u8 i;
-    for (i = 0; i < 0x10; i++)
+
+    for (i = 0; i < 16; i++)
     {
-        if ((r0->var02 >> i) & 0x1)
+        if ((r0->var02 >> i) & 1)
         {
             if (r0->var04[i].var00_7)
             {
-                if ((r1 >> i) & 0x1)
+                if ((r1 >> i) & 1)
                 {
                     u32 offset = r0->var04[i].var04.var02;
                     u16 *faded = &gPlttBufferFaded[offset];
                     u16 *unfaded = &gPlttBufferUnfaded[offset];
                     memcpy(faded, unfaded, r0->var04[i].var04.var04 * 2);
-                    r0->var04[i].var00_0 = 0x0;
-                    r0->var04[i].var02 = 0x0;
-                    r0->var04[i].var01 = 0x0;
+                    r0->var04[i].var00_0 = 0;
+                    r0->var04[i].var02 = 0;
+                    r0->var04[i].var01 = 0;
                     if (r0->var04[i].var04.var07_7 < 0)
                         r0->var04[i].var03 = 0xFF;
                     else
@@ -236,8 +199,8 @@ void sub_8124D3C(struct UnkStruct0 *r0, u16 r1)
     }
     if (r1 == 0xFFFF)
     {
-        r0->var00 = 0x0;
-        r0->var02 = 0x0;
+        r0->var00 = 0;
+        r0->var02 = 0;
     }
     else
     {
@@ -246,11 +209,10 @@ void sub_8124D3C(struct UnkStruct0 *r0, u16 r1)
 }
 void sub_8124DDC(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height)
 {
-
     u16 *_dest;
     u8 i;
     u8 j;
-    i = 0x0;
+    i = 0;
     dest = &dest[top * 32 + left];
     for (; i < height; i++)
     {
@@ -267,7 +229,7 @@ void sub_8124E2C(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height)
     u16 *_src = src;
     u8 i;
     u8 j;
-    i = 0x0;
+    i = 0;
     dest = &dest[top * 32 + left];
     for (; i < height; i++)
     {