Finish naming known sc88 noises and change naming scheme

62 files changed, 98 insertions, 98 deletions

diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
index 92527974c..ba50fa3f4 100644
--- a/sound/direct_sound_data.inc
+++ b/sound/direct_sound_data.inc
@@ -1,242 +1,242 @@
 	.align 2
 DirectSoundWaveData_8456330:: @ 8456330
-	.incbin "sound/direct_sound_samples/sc88/8456330.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_8456330.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Organ2:: @ 84569D4
-	.incbin "sound/direct_sound_samples/sc88/18_organ_2.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_18_organ_2.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_FretlessBass:: @ 84571CC
-	.incbin "sound/direct_sound_samples/sc88/36_fretless_bass.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_36_fretless_bass.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_FingerSlap:: @ 8457D98
-	.incbin "sound/direct_sound_samples/sc88/34_finger_slap.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_34_finger_slap.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_SynthBass1:: @ 8458CD0
-	.incbin "sound/direct_sound_samples/sc88/39_synth_bass_1.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_39_synth_bass_1.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitTimbale2:: @ 8459944
-	.incbin "sound/direct_sound_samples/sc88/drumkit_timbale_2.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitBassDrum:: @ 845AE14
-	.incbin "sound/direct_sound_samples/sc88/drumkit_bass_drum.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitSnare1:: @ 845B2B4
-	.incbin "sound/direct_sound_samples/sc88/drumkit_snare_1.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_1.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitHandClap:: @ 845B9A8
-	.incbin "sound/direct_sound_samples/sc88/drumkit_hand_clap.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitSnare2:: @ 845C238
-	.incbin "sound/direct_sound_samples/sc88/drumkit_snare_2.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_2.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitHiMidTom:: @ 845CAB0
-	.incbin "sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitClosedHiHat:: @ 845DAF0
-	.incbin "sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitOpenHiHat:: @ 845DF04
-	.incbin "sound/direct_sound_samples/sc88/drumkit_open_hi_hat.bin"
+	.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_SC88_DrumKitCabasa:: @ 845FCC8
-	.incbin "sound/direct_sound_samples/sc88/drumkit_cabasa.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_cabasa.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitCrashCymbal2:: @ 846057C
-	.incbin "sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitCrashCymbal1:: @ 8460E60
-	.incbin "sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitMuteHiConga:: @ 8461D8C
-	.incbin "sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitLowConga:: @ 84622A4
-	.incbin "sound/direct_sound_samples/sc88/drumkit_low_conga.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_low_conga.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_SteelStringGuitar:: @ 846286C
-	.incbin "sound/direct_sound_samples/sc88/26_steel_string_guitar.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Piano3:: @ 84637CC
-	.incbin "sound/direct_sound_samples/sc88/3_piano_3.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_3_piano_3.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Piano2:: @ 8464E2C
-	.incbin "sound/direct_sound_samples/sc88/2_piano_2.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_2_piano_2.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_UnisonSlap:: @ 8466388
-	.incbin "sound/direct_sound_samples/sc88/37_unison_slap.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_37_unison_slap.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Strings:: @ 8466F14
-	.incbin "sound/direct_sound_samples/sc88/49_strings.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_49_strings.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_StringsPlusFlute:: @ 846A4B8
-	.incbin "sound/direct_sound_samples/sc88/49_strings_plus_flute.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_StringsPlusHorn:: @ 846C7D4
-	.incbin "sound/direct_sound_samples/sc88/49_strings_plus_horn.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Trumpet:: @ 846FEA0
-	.incbin "sound/direct_sound_samples/sc88/57_trumpet.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_57_trumpet.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Trombone:: @ 84711F0
-	.incbin "sound/direct_sound_samples/sc88/58_trombone.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_58_trombone.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Tuba:: @ 8472700
-	.incbin "sound/direct_sound_samples/sc88/59_tuba.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_59_tuba.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_CupMutedTrumpet:: @ 8473B20
-	.incbin "sound/direct_sound_samples/sc88/60_cup_muted_trumpet.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_MutedTrumpet3:: @ 8474BBC
-	.incbin "sound/direct_sound_samples/sc88/60_muted_trumpet_3.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_FrenchHorns:: @ 8475C18
-	.incbin "sound/direct_sound_samples/sc88/61_french_horns.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_61_french_horns.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_WideFrenchHorns:: @ 847CBAC
-	.incbin "sound/direct_sound_samples/sc88/61_wide_french_horns.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_61_wide_french_horns.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_NylonStringGuitar:: @ 8481130
-	.incbin "sound/direct_sound_samples/sc88/25_nylon_string_guitar.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Flute:: @ 84830A0
-	.incbin "sound/direct_sound_samples/sc88/74_flute.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_74_flute.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_FingeredBass:: @ 8483804
-	.incbin "sound/direct_sound_samples/sc88/34_fingered_bass.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_34_fingered_bass.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitTimbale1:: @ 8485454
-	.incbin "sound/direct_sound_samples/sc88/drumkit_timbale_1.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_DrumKitSnare4:: @ 8486924
-	.incbin "sound/direct_sound_samples/sc88/drumkit_snare_4.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_4.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_SquareWave:: @ 8487330
-	.incbin "sound/direct_sound_samples/sc88/81_square_wave.bin"
+	.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_SC88_DrumKitSnare3:: @ 848A8A4
-	.incbin "sound/direct_sound_samples/sc88/drumkit_snare_3.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_3.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_PizzicatoStrings:: @ 848BD68
-	.incbin "sound/direct_sound_samples/sc88/46_pizzicato_strings.bin"
+	.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_SC88_Bubble:: @ 8492D10
-	.incbin "sound/direct_sound_samples/sc88/123_bubble.bin"
+	.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/sc88/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_SC88_DrumkitGuiro:: @ 849B320
-	.incbin "sound/direct_sound_samples/sc88/drumkit_guiro.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_drumkit_guiro.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_TubularBell:: @ 849BAEC
-	.incbin "sound/direct_sound_samples/sc88/15_tubular_bell.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_15_tubular_bell.bin"
 
 	.align 2
-DirectSoundWaveData_SC88_PinkNoise:: @ 849D45C
-	.incbin "sound/direct_sound_samples/sc88/123_pink_noise.bin"
+DirectSoundWaveData_Noise1:: @ 849D45C
+	.incbin "sound/direct_sound_samples/synth/noise1.bin"
 
 	.align 2
-DirectSoundWaveData_849F40C:: @ 849F40C
-	.incbin "sound/direct_sound_samples/sc88/849F40C.bin"
+DirectSoundWaveData_SC88_JPSuperSaw:: @ 849F40C
+	.incbin "sound/direct_sound_samples/synth/sc88_82_jp_super_saw.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Piano1:: @ 84A26EC
-	.incbin "sound/direct_sound_samples/sc88/1_piano_1.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_1_piano_1.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Marimba:: @ 84A311C
-	.incbin "sound/direct_sound_samples/sc88/13_marimba.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_13_marimba.bin"
 
 	.align 2
-DirectSoundWaveData_SC88_WhiteNoise:: @ 84A3B50
-	.incbin "sound/direct_sound_samples/sc88/123_white_noise.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_SC88_AccordianFr:: @ 84A5F58
-	.incbin "sound/direct_sound_samples/sc88/22_accordion_fr.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_22_accordion_fr.bin"
 
 	.align 2
 DirectSoundWaveData_84A7328:: @ 84A7328
@@ -2020,4 +2020,4 @@ DirectSoundWaveData_8654170:: @ 8654170
 
 	.align 2
 DirectSoundWaveData_SC88_AccordionFr_Copy:: @ 8654C20
-	.incbin "sound/direct_sound_samples/sc88/22_accordion_fr.bin"
+	.incbin "sound/direct_sound_samples/synth/sc88_22_accordion_fr.bin"
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/sc88/123_pink_noise.aif b/sound/direct_sound_samples/synth/noise1.aif
index ebd46eeaa..ebd46eeaa 100644
--- a/sound/direct_sound_samples/sc88/123_pink_noise.aif
+++ b/sound/direct_sound_samples/synth/noise1.aif
diff --git a/sound/direct_sound_samples/sc88/123_white_noise.aif b/sound/direct_sound_samples/synth/noise2.aif
index 6a11945c5..6a11945c5 100644
--- a/sound/direct_sound_samples/sc88/123_white_noise.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/sc88/123_bubble.aif b/sound/direct_sound_samples/synth/sc88_123_bubble.aif
index 89872bf55..89872bf55 100644
--- a/sound/direct_sound_samples/sc88/123_bubble.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/sc88/13_marimba.aif b/sound/direct_sound_samples/synth/sc88_13_marimba.aif
index 1bd43ca92..1bd43ca92 100644
--- a/sound/direct_sound_samples/sc88/13_marimba.aif
+++ b/sound/direct_sound_samples/synth/sc88_13_marimba.aif
diff --git a/sound/direct_sound_samples/sc88/15_tubular_bell.aif b/sound/direct_sound_samples/synth/sc88_15_tubular_bell.aif
index 9d00ecae6..9d00ecae6 100644
--- a/sound/direct_sound_samples/sc88/15_tubular_bell.aif
+++ b/sound/direct_sound_samples/synth/sc88_15_tubular_bell.aif
diff --git a/sound/direct_sound_samples/sc88/18_organ_2.aif b/sound/direct_sound_samples/synth/sc88_18_organ_2.aif
index 6372bbc32..6372bbc32 100644
--- a/sound/direct_sound_samples/sc88/18_organ_2.aif
+++ b/sound/direct_sound_samples/synth/sc88_18_organ_2.aif
diff --git a/sound/direct_sound_samples/sc88/1_piano_1.aif b/sound/direct_sound_samples/synth/sc88_1_piano_1.aif
index 083c45e3d..083c45e3d 100644
--- a/sound/direct_sound_samples/sc88/1_piano_1.aif
+++ b/sound/direct_sound_samples/synth/sc88_1_piano_1.aif
diff --git a/sound/direct_sound_samples/sc88/22_accordion_fr.aif b/sound/direct_sound_samples/synth/sc88_22_accordion_fr.aif
index 6d6c2e998..6d6c2e998 100644
--- a/sound/direct_sound_samples/sc88/22_accordion_fr.aif
+++ b/sound/direct_sound_samples/synth/sc88_22_accordion_fr.aif
diff --git a/sound/direct_sound_samples/sc88/25_nylon_string_guitar.aif b/sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.aif
index dea429a25..dea429a25 100644
--- a/sound/direct_sound_samples/sc88/25_nylon_string_guitar.aif
+++ b/sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.aif
diff --git a/sound/direct_sound_samples/sc88/26_steel_string_guitar.aif b/sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.aif
index c2b3757b0..c2b3757b0 100644
--- a/sound/direct_sound_samples/sc88/26_steel_string_guitar.aif
+++ b/sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.aif
diff --git a/sound/direct_sound_samples/sc88/2_piano_2.aif b/sound/direct_sound_samples/synth/sc88_2_piano_2.aif
index 5236141ba..5236141ba 100644
--- a/sound/direct_sound_samples/sc88/2_piano_2.aif
+++ b/sound/direct_sound_samples/synth/sc88_2_piano_2.aif
diff --git a/sound/direct_sound_samples/sc88/34_finger_slap.aif b/sound/direct_sound_samples/synth/sc88_34_finger_slap.aif
index 9175b63c5..9175b63c5 100644
--- a/sound/direct_sound_samples/sc88/34_finger_slap.aif
+++ b/sound/direct_sound_samples/synth/sc88_34_finger_slap.aif
diff --git a/sound/direct_sound_samples/sc88/34_fingered_bass.aif b/sound/direct_sound_samples/synth/sc88_34_fingered_bass.aif
index f244a9982..f244a9982 100644
--- a/sound/direct_sound_samples/sc88/34_fingered_bass.aif
+++ b/sound/direct_sound_samples/synth/sc88_34_fingered_bass.aif
diff --git a/sound/direct_sound_samples/sc88/36_fretless_bass.aif b/sound/direct_sound_samples/synth/sc88_36_fretless_bass.aif
index f3aa47d91..f3aa47d91 100644
--- a/sound/direct_sound_samples/sc88/36_fretless_bass.aif
+++ b/sound/direct_sound_samples/synth/sc88_36_fretless_bass.aif
diff --git a/sound/direct_sound_samples/sc88/37_unison_slap.aif b/sound/direct_sound_samples/synth/sc88_37_unison_slap.aif
index a7c4e94f8..a7c4e94f8 100644
--- a/sound/direct_sound_samples/sc88/37_unison_slap.aif
+++ b/sound/direct_sound_samples/synth/sc88_37_unison_slap.aif
diff --git a/sound/direct_sound_samples/sc88/39_synth_bass_1.aif b/sound/direct_sound_samples/synth/sc88_39_synth_bass_1.aif
index f39931a7e..f39931a7e 100644
--- a/sound/direct_sound_samples/sc88/39_synth_bass_1.aif
+++ b/sound/direct_sound_samples/synth/sc88_39_synth_bass_1.aif
diff --git a/sound/direct_sound_samples/sc88/3_piano_3.aif b/sound/direct_sound_samples/synth/sc88_3_piano_3.aif
index 7de586c9b..7de586c9b 100644
--- a/sound/direct_sound_samples/sc88/3_piano_3.aif
+++ b/sound/direct_sound_samples/synth/sc88_3_piano_3.aif
diff --git a/sound/direct_sound_samples/sc88/46_pizzicato_strings.aif b/sound/direct_sound_samples/synth/sc88_46_pizzicato_strings.aif
index 1c0a027f7..1c0a027f7 100644
--- a/sound/direct_sound_samples/sc88/46_pizzicato_strings.aif
+++ b/sound/direct_sound_samples/synth/sc88_46_pizzicato_strings.aif
diff --git a/sound/direct_sound_samples/sc88/49_strings.aif b/sound/direct_sound_samples/synth/sc88_49_strings.aif
index bfaa5c196..bfaa5c196 100644
--- a/sound/direct_sound_samples/sc88/49_strings.aif
+++ b/sound/direct_sound_samples/synth/sc88_49_strings.aif
diff --git a/sound/direct_sound_samples/sc88/49_strings_plus_flute.aif b/sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.aif
index 3e76cacdd..3e76cacdd 100644
--- a/sound/direct_sound_samples/sc88/49_strings_plus_flute.aif
+++ b/sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.aif
diff --git a/sound/direct_sound_samples/sc88/49_strings_plus_horn.aif b/sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.aif
index 2647c78ec..2647c78ec 100644
--- a/sound/direct_sound_samples/sc88/49_strings_plus_horn.aif
+++ b/sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.aif
diff --git a/sound/direct_sound_samples/sc88/57_trumpet.aif b/sound/direct_sound_samples/synth/sc88_57_trumpet.aif
index e56df7f60..e56df7f60 100644
--- a/sound/direct_sound_samples/sc88/57_trumpet.aif
+++ b/sound/direct_sound_samples/synth/sc88_57_trumpet.aif
diff --git a/sound/direct_sound_samples/sc88/58_trombone.aif b/sound/direct_sound_samples/synth/sc88_58_trombone.aif
index 8c68a83b3..8c68a83b3 100644
--- a/sound/direct_sound_samples/sc88/58_trombone.aif
+++ b/sound/direct_sound_samples/synth/sc88_58_trombone.aif
diff --git a/sound/direct_sound_samples/sc88/59_tuba.aif b/sound/direct_sound_samples/synth/sc88_59_tuba.aif
index a03bafc97..a03bafc97 100644
--- a/sound/direct_sound_samples/sc88/59_tuba.aif
+++ b/sound/direct_sound_samples/synth/sc88_59_tuba.aif
diff --git a/sound/direct_sound_samples/sc88/60_cup_muted_trumpet.aif b/sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.aif
index d4077b481..d4077b481 100644
--- a/sound/direct_sound_samples/sc88/60_cup_muted_trumpet.aif
+++ b/sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.aif
diff --git a/sound/direct_sound_samples/sc88/60_muted_trumpet_3.aif b/sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.aif
index 2ad86876b..2ad86876b 100644
--- a/sound/direct_sound_samples/sc88/60_muted_trumpet_3.aif
+++ b/sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.aif
diff --git a/sound/direct_sound_samples/sc88/61_french_horns.aif b/sound/direct_sound_samples/synth/sc88_61_french_horns.aif
index 742c4385e..742c4385e 100644
--- a/sound/direct_sound_samples/sc88/61_french_horns.aif
+++ b/sound/direct_sound_samples/synth/sc88_61_french_horns.aif
diff --git a/sound/direct_sound_samples/sc88/61_wide_french_horns.aif b/sound/direct_sound_samples/synth/sc88_61_wide_french_horns.aif
index 004fda6a1..004fda6a1 100644
--- a/sound/direct_sound_samples/sc88/61_wide_french_horns.aif
+++ b/sound/direct_sound_samples/synth/sc88_61_wide_french_horns.aif
diff --git a/sound/direct_sound_samples/sc88/74_flute.aif b/sound/direct_sound_samples/synth/sc88_74_flute.aif
index 703f3adbd..703f3adbd 100644
--- a/sound/direct_sound_samples/sc88/74_flute.aif
+++ b/sound/direct_sound_samples/synth/sc88_74_flute.aif
diff --git a/sound/direct_sound_samples/sc88/81_square_wave.aif b/sound/direct_sound_samples/synth/sc88_81_square_wave.aif
index 09e17f0ca..09e17f0ca 100644
--- a/sound/direct_sound_samples/sc88/81_square_wave.aif
+++ b/sound/direct_sound_samples/synth/sc88_81_square_wave.aif
diff --git a/sound/direct_sound_samples/sc88/849F40C.aif b/sound/direct_sound_samples/synth/sc88_82_jp_super_saw.aif
index 455ced13e..455ced13e 100644
--- a/sound/direct_sound_samples/sc88/849F40C.aif
+++ b/sound/direct_sound_samples/synth/sc88_82_jp_super_saw.aif
diff --git a/sound/direct_sound_samples/sc88/8497134.aif b/sound/direct_sound_samples/synth/sc88_82_waspy_synth.aif
index 09fe6f12e..09fe6f12e 100644
--- a/sound/direct_sound_samples/sc88/8497134.aif
+++ b/sound/direct_sound_samples/synth/sc88_82_waspy_synth.aif
diff --git a/sound/direct_sound_samples/sc88/8456330.aif b/sound/direct_sound_samples/synth/sc88_8456330.aif
index 199ead811..199ead811 100644
--- a/sound/direct_sound_samples/sc88/8456330.aif
+++ b/sound/direct_sound_samples/synth/sc88_8456330.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_bass_drum.aif b/sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.aif
index 9c504e3d0..9c504e3d0 100644
--- a/sound/direct_sound_samples/sc88/drumkit_bass_drum.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_cabasa.aif b/sound/direct_sound_samples/synth/sc88_drumkit_cabasa.aif
index 39ec57d29..39ec57d29 100644
--- a/sound/direct_sound_samples/sc88/drumkit_cabasa.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_cabasa.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.aif b/sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.aif
index 8747aef28..8747aef28 100644
--- a/sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.aif b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.aif
index 576e3e19e..576e3e19e 100644
--- a/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.aif b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.aif
index 4aec6882f..4aec6882f 100644
--- a/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_guiro.aif b/sound/direct_sound_samples/synth/sc88_drumkit_guiro.aif
index dd80b1185..dd80b1185 100644
--- a/sound/direct_sound_samples/sc88/drumkit_guiro.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_guiro.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_hand_clap.aif b/sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.aif
index b11787ffc..b11787ffc 100644
--- a/sound/direct_sound_samples/sc88/drumkit_hand_clap.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.aif b/sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.aif
index 04f990b13..04f990b13 100644
--- a/sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_low_conga.aif b/sound/direct_sound_samples/synth/sc88_drumkit_low_conga.aif
index 8e1cb620a..8e1cb620a 100644
--- a/sound/direct_sound_samples/sc88/drumkit_low_conga.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_low_conga.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.aif b/sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.aif
index 2e1bf9c64..2e1bf9c64 100644
--- a/sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_open_hi_hat.aif b/sound/direct_sound_samples/synth/sc88_drumkit_open_hi_hat.aif
index 5ad9410d0..5ad9410d0 100644
--- a/sound/direct_sound_samples/sc88/drumkit_open_hi_hat.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_open_hi_hat.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_1.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_1.aif
index 544b187d5..544b187d5 100644
--- a/sound/direct_sound_samples/sc88/drumkit_snare_1.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_snare_1.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_2.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_2.aif
index 36b640758..36b640758 100644
--- a/sound/direct_sound_samples/sc88/drumkit_snare_2.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_snare_2.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_3.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_3.aif
index ee6ff45b7..ee6ff45b7 100644
--- a/sound/direct_sound_samples/sc88/drumkit_snare_3.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_snare_3.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_4.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_4.aif
index b3122457d..b3122457d 100644
--- a/sound/direct_sound_samples/sc88/drumkit_snare_4.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_snare_4.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_timbale_1.aif b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.aif
index 7270872d6..7270872d6 100644
--- a/sound/direct_sound_samples/sc88/drumkit_timbale_1.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.aif
diff --git a/sound/direct_sound_samples/sc88/drumkit_timbale_2.aif b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.aif
index dfdfd702e..dfdfd702e 100644
--- a/sound/direct_sound_samples/sc88/drumkit_timbale_2.aif
+++ b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.aif
diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc
index 926e5ef7a..0d4c94121 100644
--- a/sound/voice_groups.inc
+++ b/sound/voice_groups.inc
@@ -108,7 +108,7 @@ voicegroup_842FEF8:: @ 842FEF8
 	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 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
@@ -500,7 +500,7 @@ 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
@@ -2234,7 +2234,7 @@ 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
@@ -10424,7 +10424,7 @@ 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_SC88_WhiteNoise, 255, 255, 255, 127  @ 844D7CC
+	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
 
@@ -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
@@ -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
@@ -12003,8 +12003,8 @@ 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_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_8456330, 255, 242, 0, 127  @ 8451FB4
 	voice_noise_alt 0, 0, 1, 0, 1  @ 8451FC0
@@ -12013,42 +12013,42 @@ voicegroup_8451F90:: @ 8451F90
 	voice_square_1_alt 0, 2, 0, 2, 0, 1  @ 8451FE4
 	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_848C4A4, 255, 0, 255, 127  @ 8452008
+	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_SC88_SquareWave, 255, 226, 0, 127  @ 8452038
-	voice_directsound 60, 0, DirectSoundWaveData_848E094, 255, 0, 255, 0  @ 8452044
+	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_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_SC88_DrumKitSnare2, 255, 0, 255, 127  @ 845208C
-	voice_directsound 60, 0, DirectSoundWaveData_8491ACC, 255, 0, 255, 127  @ 8452098
+	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_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_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_8499110, 255, 0, 255, 127  @ 8452140
-	voice_directsound 60, 0, DirectSoundWaveData_8497134, 255, 242, 0, 0  @ 845214C
+	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_SC88_PinkNoise, 255, 249, 0, 165  @ 845217C
+	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_SC88_TubularBell, 13, 0, 255, 127  @ 84521A0
-	voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 0, 255, 127  @ 84521AC
+	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_SC88_Marimba, 255, 235, 0, 204  @ 84521D0
@@ -12063,10 +12063,10 @@ voicegroup_8451F90:: @ 8451F90
 	voice_noise_alt 0, 1, 6, 0, 0  @ 845223C
 	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_SC88_WhiteNoise, 255, 255, 255, 127  @ 8452260
+	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_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
@@ -12076,7 +12076,7 @@ voicegroup_8451F90:: @ 8451F90
 	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