Merge pull request #1196 from Kurausukun/rename_instruments

rename instruments (again)

sound/direct_sound_data.inc

@@ -1,26 +1,26 @@
 	.align 2
-DirectSoundWaveData_sc88_glockenspiel::
+DirectSoundWaveData_sc88pro_glockenspiel::
-	.incbin "sound/direct_sound_samples/sc88_glockenspiel.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_glockenspiel.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_organ2::
+DirectSoundWaveData_sc88pro_organ2::
-	.incbin "sound/direct_sound_samples/sc88_organ2.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_organ2.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_fretless_bass::
+DirectSoundWaveData_sc88pro_fretless_bass::
-	.incbin "sound/direct_sound_samples/sc88_fretless_bass.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_fretless_bass.bin"
 
 	.align 2
-DirectSoundWaveData_jv1080_slap_bass::
+DirectSoundWaveData_sc88pro_slap_bass::
-	.incbin "sound/direct_sound_samples/jv1080_slap_bass.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_slap_bass.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_synth_bass::
+DirectSoundWaveData_sc88pro_synth_bass::
-	.incbin "sound/direct_sound_samples/sc88_synth_bass.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_synth_bass.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_timpani::
+DirectSoundWaveData_sc88pro_timpani::
-	.incbin "sound/direct_sound_samples/sc88_timpani.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_timpani.bin"
 
 	.align 2
 DirectSoundWaveData_classical_choir_voice_ahhs::
@@ -35,44 +35,44 @@ DirectSoundWaveData_unused_sd90_oboe::
 	.incbin "sound/direct_sound_samples/unused_sd90_oboe.bin"
 
 	.align 2
-DirectSoundWaveData_unused_electric_guitar::
+DirectSoundWaveData_unused_guitar_separates_power_chord::
-	.incbin "sound/direct_sound_samples/unused_electric_guitar.bin"
+	.incbin "sound/direct_sound_samples/unused_guitar_separates_power_chord.bin"
 
 	.align 2
-DirectSoundWaveData_unused_sc88_unison_slap::
+DirectSoundWaveData_unused_sc88pro_unison_slap::
-	.incbin "sound/direct_sound_samples/unused_sc88_unison_slap.bin"
+	.incbin "sound/direct_sound_samples/unused_sc88pro_unison_slap.bin"
 
 	.align 2
 DirectSoundWaveData_unknown_snare::
 	.incbin "sound/direct_sound_samples/unknown_snare.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_wood_block_low::
+DirectSoundWaveData_ethnic_flavours_ohtsuzumi::
-	.incbin "sound/direct_sound_samples/unknown_wood_block_low.bin"
+	.incbin "sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_wood_block_high::
+DirectSoundWaveData_ethnic_flavours_hyoushigi::
-	.incbin "sound/direct_sound_samples/unknown_wood_block_high.bin"
+	.incbin "sound/direct_sound_samples/ethnic_flavours_hyoushigi.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_standard_kick::
+DirectSoundWaveData_sc88pro_rnd_kick::
-	.incbin "sound/direct_sound_samples/sc88_standard_kick.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_rnd_kick.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_standard3_snare::
+DirectSoundWaveData_sc88pro_rnd_snare::
-	.incbin "sound/direct_sound_samples/sc88_standard3_snare.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_rnd_snare.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_standard_hand_clap::
+DirectSoundWaveData_sc88pro_tr909_hand_clap::
-	.incbin "sound/direct_sound_samples/sc88_standard_hand_clap.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_tr909_hand_clap.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_orchestra_snare::
+DirectSoundWaveData_sc88pro_orchestra_snare::
-	.incbin "sound/direct_sound_samples/sc88_orchestra_snare.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_orchestra_snare.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_tom::
+DirectSoundWaveData_unused_sc55_tom::
-	.incbin "sound/direct_sound_samples/unknown_tom.bin"
+	.incbin "sound/direct_sound_samples/unused_sc55_tom.bin"
 
 	.align 2
 DirectSoundWaveData_unknown_close_hihat::
@@ -87,24 +87,24 @@ DirectSoundWaveData_unknown_bell::
 	.incbin "sound/direct_sound_samples/unknown_bell.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_tambourine::
+DirectSoundWaveData_sc88pro_tambourine::
-	.incbin "sound/direct_sound_samples/unknown_tambourine.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_tambourine.bin"
 
 	.align 2
 DirectSoundWaveData_trinity_cymbal_crash::
 	.incbin "sound/direct_sound_samples/trinity_cymbal_crash.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_orchestra_cymbal_crash::
+DirectSoundWaveData_sc88pro_orchestra_cymbal_crash::
-	.incbin "sound/direct_sound_samples/sc88_orchestra_cymbal_crash.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_bongo::
+DirectSoundWaveData_sc88pro_mute_high_conga::
-	.incbin "sound/direct_sound_samples/sc88_bongo.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_mute_high_conga.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_bongo_low::
+DirectSoundWaveData_sc88pro_open_low_conga::
-	.incbin "sound/direct_sound_samples/sc88_bongo_low.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_open_low_conga.bin"
 
 	.align 2
 DirectSoundWaveData_drum_and_percussion_kick::
@@ -123,96 +123,96 @@ DirectSoundWaveData_dance_drums_ride_bell::
 	.incbin "sound/direct_sound_samples/dance_drums_ride_bell.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_cowbell::
+DirectSoundWaveData_sd90_cowbell::
-	.incbin "sound/direct_sound_samples/unknown_cowbell.bin"
+	.incbin "sound/direct_sound_samples/sd90_cowbell.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_djembe::
+DirectSoundWaveData_unused_heart_of_asia_indian_drum::
-	.incbin "sound/direct_sound_samples/unknown_djembe.bin"
+	.incbin "sound/direct_sound_samples/unused_heart_of_asia_indian_drum.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_anvil_high::
+DirectSoundWaveData_sd90_open_triangle::
-	.incbin "sound/direct_sound_samples/unknown_anvil_high.bin"
+	.incbin "sound/direct_sound_samples/sd90_open_triangle.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_standard_bells::
+DirectSoundWaveData_sc88pro_jingle_bell::
-	.incbin "sound/direct_sound_samples/sc88_standard_bells.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_jingle_bell.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_anvil_low::
+DirectSoundWaveData_ethnic_flavours_atarigane::
-	.incbin "sound/direct_sound_samples/unknown_anvil_low.bin"
+	.incbin "sound/direct_sound_samples/ethnic_flavours_atarigane.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_ethnic_drum::
+DirectSoundWaveData_unknown_taiko::
-	.incbin "sound/direct_sound_samples/unknown_ethnic_drum.bin"
+	.incbin "sound/direct_sound_samples/unknown_taiko.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_tsuzumi::
+DirectSoundWaveData_ethnic_flavours_kotsuzumi::
-	.incbin "sound/direct_sound_samples/unknown_tsuzumi.bin"
+	.incbin "sound/direct_sound_samples/ethnic_flavours_kotsuzumi.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_piano1_48::
+DirectSoundWaveData_sc88pro_piano1_48::
-	.incbin "sound/direct_sound_samples/sc88_piano1_48.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_piano1_48.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_piano1_60::
+DirectSoundWaveData_sc88pro_piano1_60::
-	.incbin "sound/direct_sound_samples/sc88_piano1_60.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_piano1_60.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_piano1_72::
+DirectSoundWaveData_sc88pro_piano1_72::
-	.incbin "sound/direct_sound_samples/sc88_piano1_72.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_piano1_72.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_piano1_84::
+DirectSoundWaveData_sc88pro_piano1_84::
-	.incbin "sound/direct_sound_samples/sc88_piano1_84.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_piano1_84.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_string_ensemble_60::
+DirectSoundWaveData_sc88pro_string_ensemble_60::
-	.incbin "sound/direct_sound_samples/sc88_string_ensemble_60.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_string_ensemble_60.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_string_ensemble_72::
+DirectSoundWaveData_sc88pro_string_ensemble_72::
-	.incbin "sound/direct_sound_samples/sc88_string_ensemble_72.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_string_ensemble_72.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_string_ensemble_84::
+DirectSoundWaveData_sc88pro_string_ensemble_84::
-	.incbin "sound/direct_sound_samples/sc88_string_ensemble_84.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_string_ensemble_84.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_trumpet_60::
+DirectSoundWaveData_sc88pro_trumpet_60::
-	.incbin "sound/direct_sound_samples/sc88_trumpet_60.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_trumpet_60.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_trumpet_72::
+DirectSoundWaveData_sc88pro_trumpet_72::
-	.incbin "sound/direct_sound_samples/sc88_trumpet_72.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_trumpet_72.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_trumpet_84::
+DirectSoundWaveData_sc88pro_trumpet_84::
-	.incbin "sound/direct_sound_samples/sc88_trumpet_84.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_trumpet_84.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_trombone_39::
+DirectSoundWaveData_sc88pro_tuba_39:: @N.B.: These tuba samples are actually sampled at 36 and 48, then pitched up
-	.incbin "sound/direct_sound_samples/unknown_trombone_39.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_tuba_39.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_trombone_51::
+DirectSoundWaveData_sc88pro_tuba_51::
-	.incbin "sound/direct_sound_samples/unknown_trombone_51.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_tuba_51.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_french_horn_60::
+DirectSoundWaveData_sc88pro_french_horn_60::
-	.incbin "sound/direct_sound_samples/sc88_french_horn_60.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_french_horn_60.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_french_horn_72::
+DirectSoundWaveData_sc88pro_french_horn_72::
-	.incbin "sound/direct_sound_samples/sc88_french_horn_72.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_french_horn_72.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_flute::
+DirectSoundWaveData_sc88pro_flute::
-	.incbin "sound/direct_sound_samples/sc88_flute.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_flute.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_pick_bass::
+DirectSoundWaveData_sc88pro_fingered_bass::
-	.incbin "sound/direct_sound_samples/sc88_pick_bass.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_fingered_bass.bin"
 
 	.align 2
 DirectSoundWaveData_unknown_koto_high::
@@ -243,12 +243,12 @@ DirectSoundWaveData_heart_of_asia_gamelan::
 	.incbin "sound/direct_sound_samples/heart_of_asia_gamelan.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_church_organ::
+DirectSoundWaveData_sc88pro_church_organ3_low::
-	.incbin "sound/direct_sound_samples/unknown_church_organ.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_church_organ3_low.bin"
 
 	.align 2
-DirectSoundWaveData_emu_ii_pipe_organ::
+DirectSoundWaveData_sc88pro_church_organ3_high::
-	.incbin "sound/direct_sound_samples/emu_ii_pipe_organ.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_church_organ3_high.bin"
 
 	.align 2
 DirectSoundWaveData_unknown_female_voice::
@@ -267,16 +267,16 @@ DirectSoundWaveData_sd90_classical_detuned_ep1_high::
 	.incbin "sound/direct_sound_samples/sd90_classical_detuned_ep1_high.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_timpani_with_snare::
+DirectSoundWaveData_sc88pro_timpani_with_snare::
-	.incbin "sound/direct_sound_samples/sc88_timpani_with_snare.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_timpani_with_snare.bin"
 
 	.align 2
 DirectSoundWaveData_unknown_synth_snare::
 	.incbin "sound/direct_sound_samples/unknown_synth_snare.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_square_wave::
+DirectSoundWaveData_sc88pro_square_wave::
-	.incbin "sound/direct_sound_samples/sc88_square_wave.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_square_wave.bin"
 
 	.align 2
 DirectSoundWaveData_bicycle_bell::
@@ -287,8 +287,8 @@ DirectSoundWaveData_8725A2C::
 	.incbin "sound/direct_sound_samples/8725A2C.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_pizzicato_strings::
+DirectSoundWaveData_sc88pro_pizzicato_strings::
-	.incbin "sound/direct_sound_samples/sc88_pizzicato_strings.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_pizzicato_strings.bin"
 
 	.align 2
 DirectSoundWaveData_872762C::
@@ -303,12 +303,12 @@ DirectSoundWaveData_872A5D0::
 	.incbin "sound/direct_sound_samples/872A5D0.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_wind::
+DirectSoundWaveData_sc88pro_wind::
-	.incbin "sound/direct_sound_samples/sc88_wind.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_wind.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_bubbles::
+DirectSoundWaveData_sc88pro_bubbles::
-	.incbin "sound/direct_sound_samples/sc88_bubbles.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_bubbles.bin"
 
 	.align 2
 DirectSoundWaveData_872EEA8::
@@ -319,8 +319,8 @@ DirectSoundWaveData_87301B0::
 	.incbin "sound/direct_sound_samples/87301B0.bin"
 
 	.align 2
-DirectSoundWaveData_unused_acid_bass::
+DirectSoundWaveData_trinity_30303_mega_bass::
-	.incbin "sound/direct_sound_samples/unused_acid_bass.bin"
+	.incbin "sound/direct_sound_samples/trinity_30303_mega_bass.bin"
 
 	.align 2
 DirectSoundWaveData_8734298::
@@ -331,24 +331,24 @@ DirectSoundWaveData_87364A8::
 	.incbin "sound/direct_sound_samples/87364A8.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_tubular_bell::
+DirectSoundWaveData_sc88pro_tubular_bell::
-	.incbin "sound/direct_sound_samples/sc88_tubular_bell.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_tubular_bell.bin"
 
 	.align 2
 DirectSoundWaveData_87385E4::
 	.incbin "sound/direct_sound_samples/87385E4.bin"
 
 	.align 2
-DirectSoundWaveData_unknown_polysynth::
+DirectSoundWaveData_trinity_big_boned::
-	.incbin "sound/direct_sound_samples/unknown_polysynth.bin"
+	.incbin "sound/direct_sound_samples/trinity_big_boned.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_harp::
+DirectSoundWaveData_sc88pro_harp::
-	.incbin "sound/direct_sound_samples/sc88_harp.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_harp.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_xylophone::
+DirectSoundWaveData_sc88pro_xylophone::
-	.incbin "sound/direct_sound_samples/sc88_xylophone.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_xylophone.bin"
 
 	.align 2
 DirectSoundWaveData_873ECD8::
@@ -359,8 +359,8 @@ DirectSoundWaveData_8740818::
 	.incbin "sound/direct_sound_samples/8740818.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_accordion::
+DirectSoundWaveData_sc88pro_accordion::
-	.incbin "sound/direct_sound_samples/sc88_accordion.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_accordion.bin"
 
 	.align 2
 DirectSoundWaveData_87424B0::
@@ -1947,8 +1947,8 @@ DirectSoundWaveData_88D6978::
 	.incbin "sound/direct_sound_samples/88D6978.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_nylon_str_guitar::
+DirectSoundWaveData_sc88pro_nylon_str_guitar::
-	.incbin "sound/direct_sound_samples/sc88_nylon_str_guitar.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_nylon_str_guitar.bin"
 
 	.align 2
 DirectSoundWaveData_sd90_special_scream_drive::
@@ -2159,8 +2159,8 @@ DirectSoundWaveData_88F6498::
 	.incbin "sound/direct_sound_samples/88F6498.bin"
 
 	.align 2
-DirectSoundWaveData_sc88_accordion_duplicate::
+DirectSoundWaveData_sc88pro_accordion_duplicate::
-	.incbin "sound/direct_sound_samples/sc88_accordion_duplicate.bin"
+	.incbin "sound/direct_sound_samples/sc88pro_accordion_duplicate.bin"
 
 	.align 2
 DirectSoundWaveData_steinway_b_piano::

sound/voicegroups/voicegroup000.inc

@@ -9,7 +9,7 @@ voicegroup000:: @ 8675D04
 	voice_square_2 60, 0, 2, 0, 0, 9, 2  @ 8675D4C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D58
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D64
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 235  @ 8675D70
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235  @ 8675D70
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D7C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D88
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D94
@@ -17,7 +17,7 @@ voicegroup000:: @ 8675D04
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DAC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DB8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DC4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127  @ 8675DD0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 8675DD0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DDC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DE8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DF4
@@ -32,13 +32,13 @@ voicegroup000:: @ 8675D04
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E60
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E6C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E78
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149  @ 8675E84
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 8675E84
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E90
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E9C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675EA8
-	voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 115  @ 8675EB4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115  @ 8675EB4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675EC0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115  @ 8675ECC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8675ECC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675ED8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675EE4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675EF0
@@ -47,7 +47,7 @@ voicegroup000:: @ 8675D04
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F14
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F20
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F2C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 204, 193, 239  @ 8675F38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239  @ 8675F38
 	voice_keysplit voicegroup006, KeySplitTable2  @ 8675F44
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F50
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F5C

sound/voicegroups/voicegroup002.inc

@@ -2,56 +2,56 @@
 voicegroup002:: @ 8676148
 	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127  @ 8676148
 	voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127  @ 8676154
-	voice_directsound 60, 0, DirectSoundWaveData_unused_electric_guitar, 255, 165, 206, 127  @ 8676160
+	voice_directsound 60, 0, DirectSoundWaveData_unused_guitar_separates_power_chord, 255, 165, 206, 127  @ 8676160
-	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 206, 127  @ 867616C
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 206, 127  @ 867616C
 	voice_directsound 60, 0, DirectSoundWaveData_unknown_snare, 255, 0, 255, 0  @ 8676178
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0  @ 8676184
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0  @ 8676184
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0  @ 8676190
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0  @ 8676190
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242  @ 867619C
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242  @ 867619C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86761A8
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242  @ 86761B4
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 86761B4
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127  @ 86761C0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 86761C0
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242  @ 86761CC
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 86761CC
-	voice_directsound 48, 44, DirectSoundWaveData_unknown_tom, 255, 210, 77, 204  @ 86761D8
+	voice_directsound 48, 44, DirectSoundWaveData_unused_sc55_tom, 255, 210, 77, 204  @ 86761D8
 	voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188  @ 86761E4
-	voice_directsound 51, 54, DirectSoundWaveData_unknown_tom, 255, 216, 77, 204  @ 86761F0
+	voice_directsound 51, 54, DirectSoundWaveData_unused_sc55_tom, 255, 216, 77, 204  @ 86761F0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86761FC
-	voice_directsound 54, 64, DirectSoundWaveData_unknown_tom, 255, 216, 77, 204  @ 8676208
+	voice_directsound 54, 64, DirectSoundWaveData_unused_sc55_tom, 255, 216, 77, 204  @ 8676208
 	voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_open_hihat, 255, 242, 141, 0  @ 8676214
-	voice_directsound 57, 69, DirectSoundWaveData_unknown_tom, 255, 210, 77, 204  @ 8676220
+	voice_directsound 57, 69, DirectSoundWaveData_unused_sc55_tom, 255, 210, 77, 204  @ 8676220
-	voice_directsound 60, 79, DirectSoundWaveData_unknown_tom, 255, 204, 77, 204  @ 867622C
+	voice_directsound 60, 79, DirectSoundWaveData_unused_sc55_tom, 255, 204, 77, 204  @ 867622C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676238
-	voice_directsound 62, 84, DirectSoundWaveData_unknown_tom, 255, 204, 77, 204  @ 8676244
+	voice_directsound 62, 84, DirectSoundWaveData_unused_sc55_tom, 255, 204, 77, 204  @ 8676244
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676250
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867625C
 	voice_directsound_no_resample 70, 49, DirectSoundWaveData_unknown_bell, 255, 165, 103, 231  @ 8676268
-	voice_directsound_no_resample 32, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204  @ 8676274
+	voice_directsound_no_resample 32, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 8676274
 	voice_directsound_no_resample 60, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 235, 0, 165  @ 8676280
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867628C
-	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216  @ 8676298
+	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216  @ 8676298
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86762A4
-	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216  @ 86762B0
+	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216  @ 86762B0
-	voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216  @ 86762BC
+	voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 86762BC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86762C8
-	voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0  @ 86762D4
+	voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 86762D4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86762E0
-	voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0  @ 86762EC
+	voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86762EC
 	voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0  @ 86762F8
 	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228  @ 8676304
 	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242  @ 8676310
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127  @ 867631C
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 867631C
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242  @ 8676328
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 8676328
 	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676334
-	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242  @ 8676340
+	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 8676340
 	voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 867634C
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242  @ 8676358
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 8676358
 	voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676364
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242  @ 8676370
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 8676370
 	voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 867637C
 	voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676388
-	voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676394
+	voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676394
 	voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235  @ 86763A0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86763AC
-	voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86763B8
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86763B8
 	voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231  @ 86763C4
 

sound/voicegroups/voicegroup003.inc

@@ -1,16 +1,16 @@
 	.align 2
 voicegroup003:: @ 86763D0
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204  @ 86763D0
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 86763D0
 	voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188  @ 86763DC
-	voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242  @ 86763E8
+	voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242  @ 86763E8
-	voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86763F4
+	voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86763F4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676400
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867640C
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867640C
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216  @ 8676418
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 8676418
-	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0  @ 8676424
+	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0  @ 8676424
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0  @ 8676430
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 8676430
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0  @ 867643C
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 867643C
-	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0  @ 8676448
+	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 8676448
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676454
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676460
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867646C
@@ -26,32 +26,32 @@ voicegroup003:: @ 86763D0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764E4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764F0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764FC
-	voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188  @ 8676508
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 8676508
-	voice_directsound_no_resample 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188  @ 8676514
+	voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 8676514
-	voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188  @ 8676520
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188  @ 8676520
-	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0  @ 867652C
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0  @ 867652C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676538
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676544
-	voice_directsound_no_resample 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0  @ 8676550
+	voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 8676550
-	voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0  @ 867655C
+	voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0  @ 867655C
-	voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0  @ 8676568
+	voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 8676568
-	voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0  @ 8676574
+	voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 8676574
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0  @ 8676580
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0  @ 8676580
 	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228  @ 867658C
 	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242  @ 8676598
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127  @ 86765A4
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 86765A4
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242  @ 86765B0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 86765B0
 	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86765BC
-	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242  @ 86765C8
+	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 86765C8
 	voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86765D4
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242  @ 86765E0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 86765E0
 	voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86765EC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86765F8
 	voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676604
 	voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676610
-	voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867661C
+	voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867661C
-	voice_directsound 64, 104, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 235  @ 8676628
+	voice_directsound 64, 104, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 235  @ 8676628
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676634
-	voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676640
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676640
 	voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231  @ 867664C
 

sound/voicegroups/voicegroup004.inc

@@ -1,16 +1,16 @@
 	.align 2
 voicegroup004:: @ 8676658
-	voice_directsound_no_resample 66, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204  @ 8676658
+	voice_directsound_no_resample 66, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 8676658
 	voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188  @ 8676664
-	voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242  @ 8676670
+	voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242  @ 8676670
-	voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867667C
+	voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867667C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676688
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676694
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676694
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216  @ 86766A0
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 86766A0
-	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0  @ 86766AC
+	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0  @ 86766AC
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0  @ 86766B8
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 86766B8
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0  @ 86766C4
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86766C4
-	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0  @ 86766D0
+	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86766D0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86766DC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86766E8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86766F4
@@ -21,50 +21,50 @@ voicegroup004:: @ 8676658
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676730
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867673C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676748
-	voice_directsound_no_resample 61, 84, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0  @ 8676754
+	voice_directsound_no_resample 61, 84, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0  @ 8676754
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0  @ 8676760
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0  @ 8676760
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867676C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676778
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676784
-	voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188  @ 8676790
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 8676790
-	voice_directsound_no_resample 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188  @ 867679C
+	voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 867679C
-	voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188  @ 86767A8
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188  @ 86767A8
-	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0  @ 86767B4
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0  @ 86767B4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86767C0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86767CC
-	voice_directsound_no_resample 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0  @ 86767D8
+	voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 86767D8
-	voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0  @ 86767E4
+	voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0  @ 86767E4
-	voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0  @ 86767F0
+	voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 86767F0
-	voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0  @ 86767FC
+	voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 86767FC
 	voice_directsound 62, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0  @ 8676808
 	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228  @ 8676814
 	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242  @ 8676820
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127  @ 867682C
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 867682C
-	voice_directsound 65, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242  @ 8676838
+	voice_directsound 65, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 8676838
 	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676844
-	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242  @ 8676850
+	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 8676850
 	voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 867685C
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242  @ 8676868
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 8676868
 	voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676874
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676880
 	voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 867688C
 	voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676898
-	voice_directsound 56, 89, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86768A4
+	voice_directsound 56, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86768A4
-	voice_directsound 64, 104, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 235  @ 86768B0
+	voice_directsound 64, 104, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 235  @ 86768B0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86768BC
-	voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86768C8
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86768C8
 	voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231  @ 86768D4
-	voice_directsound_no_resample 66, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204  @ 86768E0
+	voice_directsound_no_resample 66, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 86768E0
 	voice_directsound 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188  @ 86768EC
-	voice_directsound 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242  @ 86768F8
+	voice_directsound 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242  @ 86768F8
-	voice_directsound 60, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676904
+	voice_directsound 60, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676904
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676910
-	voice_directsound 58, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867691C
+	voice_directsound 58, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867691C
-	voice_directsound 62, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216  @ 8676928
+	voice_directsound 62, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 8676928
-	voice_directsound 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0  @ 8676934
+	voice_directsound 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0  @ 8676934
-	voice_directsound 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0  @ 8676940
+	voice_directsound 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 8676940
-	voice_directsound 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0  @ 867694C
+	voice_directsound 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 867694C
-	voice_directsound 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0  @ 8676958
+	voice_directsound 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 8676958
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676964
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676970
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867697C
@@ -75,19 +75,19 @@ voicegroup004:: @ 8676658
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86769B8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86769C4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86769D0
-	voice_directsound 61, 84, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0  @ 86769DC
+	voice_directsound 61, 84, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0  @ 86769DC
-	voice_directsound 64, 64, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0  @ 86769E8
+	voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0  @ 86769E8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86769F4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676A00
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676A0C
-	voice_directsound 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188  @ 8676A18
+	voice_directsound 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 8676A18
-	voice_directsound 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188  @ 8676A24
+	voice_directsound 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 8676A24
-	voice_directsound 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188  @ 8676A30
+	voice_directsound 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188  @ 8676A30
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0  @ 8676A3C
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0  @ 8676A3C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676A48
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676A54
-	voice_directsound 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0  @ 8676A60
+	voice_directsound 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 8676A60
-	voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0  @ 8676A6C
+	voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0  @ 8676A6C
-	voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0  @ 8676A78
+	voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 8676A78
-	voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0  @ 8676A84
+	voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 8676A84
 

sound/voicegroups/voicegroup005.inc

@@ -1,7 +1,7 @@
 	.align 2
 voicegroup005:: @ 8676A90
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_48, 255, 252, 0, 239  @ 8676A90
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_48, 255, 252, 0, 239  @ 8676A90
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_60, 255, 250, 0, 221  @ 8676A9C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_60, 255, 250, 0, 221  @ 8676A9C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_72, 255, 250, 0, 221  @ 8676AA8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_72, 255, 250, 0, 221  @ 8676AA8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_84, 255, 247, 0, 221  @ 8676AB4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_84, 255, 247, 0, 221  @ 8676AB4
 

sound/voicegroups/voicegroup006.inc

@@ -1,6 +1,6 @@
 	.align 2
 voicegroup006:: @ 8676AC0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_60, 255, 0, 255, 196  @ 8676AC0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_60, 255, 0, 255, 196  @ 8676AC0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_72, 255, 0, 255, 196  @ 8676ACC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 196  @ 8676ACC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_84, 255, 0, 255, 196  @ 8676AD8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_84, 255, 0, 255, 196  @ 8676AD8
 

sound/voicegroups/voicegroup007.inc

@@ -1,8 +1,8 @@
 	.align 2
 voicegroup007:: @ 8676AE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_60, 255, 0, 193, 127  @ 8676AE4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_60, 255, 0, 193, 127  @ 8676AE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_72, 255, 0, 193, 127  @ 8676AF0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_72, 255, 0, 193, 127  @ 8676AF0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_84, 255, 0, 193, 127  @ 8676AFC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_84, 255, 0, 193, 127  @ 8676AFC
 	voice_square_1_alt 60, 0, 38, 2, 1, 0, 0, 0  @ 8676B08
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B14
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B20

sound/voicegroups/voicegroup008.inc

@@ -1,5 +1,5 @@
 	.align 2
 voicegroup008:: @ 8677108
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_trombone_39, 255, 0, 255, 165  @ 8677108
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_39, 255, 0, 255, 165  @ 8677108
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_trombone_51, 255, 0, 255, 165  @ 8677114
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_51, 255, 0, 255, 165  @ 8677114
 

sound/voicegroups/voicegroup009.inc

@@ -1,5 +1,5 @@
 	.align 2
 voicegroup009:: @ 8677120
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_60, 255, 0, 224, 165  @ 8677120
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_60, 255, 0, 224, 165  @ 8677120
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_72, 255, 0, 218, 165  @ 867712C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 255, 0, 218, 165  @ 867712C
 

sound/voicegroups/voicegroup010.inc

@@ -14,7 +14,7 @@ voicegroup010:: @ 8677138
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771BC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771C8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242  @ 86771E0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242  @ 86771E0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771EC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771F8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677204
@@ -46,8 +46,8 @@ voicegroup010:: @ 8677138
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867733C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677348
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677354
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204  @ 8677360
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204  @ 8677360
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 867736C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867736C
 	voice_keysplit voicegroup006, KeySplitTable2  @ 8677378
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677384
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677390

sound/voicegroups/voicegroup011.inc

@@ -24,7 +24,7 @@ voicegroup011:: @ 8677528
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677624
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677630
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867763C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 149  @ 8677648
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 149  @ 8677648
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677654
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677660
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867766C
@@ -35,7 +35,7 @@ voicegroup011:: @ 8677528
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776A8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776B4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149  @ 86776CC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 86776CC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776D8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776E4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776F0
@@ -73,7 +73,7 @@ voicegroup011:: @ 8677528
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677870
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867787C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677888
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 8677894
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8677894
 	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 86778A0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86778AC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86778B8

sound/voicegroups/voicegroup012.inc

@@ -2,18 +2,18 @@
 voicegroup012:: @ 8677B28
 	voice_keysplit_all voicegroup001  @ 8677B28
 	voice_keysplit voicegroup005, KeySplitTable1  @ 8677B34
-	voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 255, 178, 180, 165  @ 8677B40
+	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 178, 180, 165  @ 8677B40
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B4C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B58
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B64
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B70
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B7C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 235  @ 8677B94
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235  @ 8677B94
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BA0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BAC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BB8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204  @ 8677BC4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8677BC4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BD0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BDC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BE8
@@ -38,7 +38,7 @@ voicegroup012:: @ 8677B28
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CCC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CD8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115  @ 8677CF0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8677CF0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CFC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D08
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D14
@@ -46,8 +46,8 @@ voicegroup012:: @ 8677B28
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D2C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D38
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D44
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204  @ 8677D50
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204  @ 8677D50
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 8677D5C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 8677D5C
 	voice_keysplit voicegroup006, KeySplitTable2  @ 8677D68
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D74
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D80
@@ -73,7 +73,7 @@ voicegroup012:: @ 8677B28
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E70
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E7C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 8677E94
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8677E94
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677EA0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677EAC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677EB8

sound/voicegroups/voicegroup013.inc

@@ -47,7 +47,7 @@ voicegroup013:: @ 8677FF0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678200
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867820C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678218
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 8678224
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 8678224
 	voice_keysplit voicegroup006, KeySplitTable2  @ 8678230
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867823C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678248

sound/voicegroups/voicegroup014.inc

@@ -24,7 +24,7 @@ voicegroup014:: @ 8678428
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678524
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678530
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867853C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 149  @ 8678548
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 149  @ 8678548
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678554
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678560
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867856C
@@ -46,8 +46,8 @@ voicegroup014:: @ 8678428
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867862C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678638
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678644
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235  @ 8678650
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 8678650
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 867865C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867865C
 	voice_keysplit voicegroup006, KeySplitTable2  @ 8678668
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678674
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678680
@@ -73,7 +73,7 @@ voicegroup014:: @ 8678428
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678770
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867877C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678788
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 8678794
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8678794
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86787A0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86787AC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86787B8

sound/voicegroups/voicegroup015.inc

@@ -35,7 +35,7 @@ voicegroup015:: @ 8678824
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789A4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789B0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789BC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149  @ 86789C8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 86789C8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789D4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789E0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789EC
@@ -56,7 +56,7 @@ voicegroup015:: @ 8678824
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AA0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AAC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AB8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165  @ 8678AC4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 8678AC4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AD0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678ADC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AE8
@@ -73,7 +73,7 @@ voicegroup015:: @ 8678824
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B6C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B78
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B84
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 8678B90
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8678B90
 	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 8678B9C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678BA8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678BB4

sound/voicegroups/voicegroup016.inc

@@ -36,11 +36,11 @@ voicegroup016:: @ 8678C74
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E00
 	voice_noise_alt 60, 0, 0, 0, 2, 0, 2  @ 8678E0C
 	voice_noise_alt 60, 0, 0, 0, 1, 0, 1  @ 8678E18
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242  @ 8678E24
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242  @ 8678E24
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E30
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242  @ 8678E3C
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 8678E3C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E48
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242  @ 8678E54
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 8678E54
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E60
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E6C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E78
@@ -54,7 +54,7 @@ voicegroup016:: @ 8678C74
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678ED8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678EE4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678EF0
-	voice_directsound_no_resample 32, 74, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204  @ 8678EFC
+	voice_directsound_no_resample 32, 74, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 8678EFC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F08
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F14
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F20
@@ -62,7 +62,7 @@ voicegroup016:: @ 8678C74
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F38
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F44
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F50
-	voice_directsound_no_resample 72, 66, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0  @ 8678F5C
+	voice_directsound_no_resample 72, 66, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 8678F5C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F68
-	voice_directsound_no_resample 72, 62, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0  @ 8678F74
+	voice_directsound_no_resample 72, 62, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 8678F74
 

sound/voicegroups/voicegroup017.inc

@@ -45,8 +45,8 @@ voicegroup017:: @ 8678F80
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679178
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679184
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679190
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165  @ 867919C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 867919C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204  @ 86791A8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204  @ 86791A8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86791B4
 	voice_keysplit voicegroup006, KeySplitTable2  @ 86791C0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86791CC
@@ -73,7 +73,7 @@ voicegroup017:: @ 8678F80
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86792C8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86792D4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86792E0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 86792EC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86792EC
 	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 86792F8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679304
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679310

sound/voicegroups/voicegroup018.inc

@@ -45,7 +45,7 @@ voicegroup018:: @ 86793C4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795BC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795C8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165  @ 86795E0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 86795E0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795EC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795F8
 	voice_keysplit voicegroup006, KeySplitTable2  @ 8679604
@@ -73,7 +73,7 @@ voicegroup018:: @ 86793C4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867970C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679718
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679724
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 8679730
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8679730
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867973C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679748
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679754

sound/voicegroups/voicegroup019.inc

@@ -45,7 +45,7 @@ voicegroup019:: @ 86799C4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BBC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BC8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BD4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165  @ 8679BE0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 8679BE0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BEC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BF8
 	voice_keysplit voicegroup006, KeySplitTable2  @ 8679C04
@@ -73,7 +73,7 @@ voicegroup019:: @ 86799C4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D0C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D18
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D24
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 8679D30
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8679D30
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D3C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D48
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D54

sound/voicegroups/voicegroup020.inc

@@ -45,7 +45,7 @@ voicegroup020:: @ 8679DC0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FB8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FC4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FD0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165  @ 8679FDC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 8679FDC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FE8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FF4
 	voice_keysplit voicegroup006, KeySplitTable2  @ 867A000

sound/voicegroups/voicegroup021.inc

@@ -47,7 +47,7 @@ voicegroup021:: @ 867A1D4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3E4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3F0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3FC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 867A408
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867A408
 	voice_keysplit voicegroup006, KeySplitTable2  @ 867A414
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A420
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A42C

sound/voicegroups/voicegroup022.inc

@@ -22,7 +22,7 @@ voicegroup022:: @ 867A438
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A51C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A528
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A534
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 867A540
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867A540
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A54C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A558
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A564
@@ -36,11 +36,11 @@ voicegroup022:: @ 867A438
 	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 867A5C4
 	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 1  @ 867A5D0
 	voice_square_1_alt 60, 0, 0, 0, 0, 0, 7, 0  @ 867A5DC
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242  @ 867A5E8
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242  @ 867A5E8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A5F4
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242  @ 867A600
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 867A600
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A60C
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242  @ 867A618
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 867A618
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A624
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A630
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A63C
@@ -54,7 +54,7 @@ voicegroup022:: @ 867A438
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A69C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6A8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6B4
-	voice_directsound_no_resample 32, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204  @ 867A6C0
+	voice_directsound_no_resample 32, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 867A6C0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6CC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6D8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6E4
@@ -62,7 +62,7 @@ voicegroup022:: @ 867A438
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6FC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A708
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A714
-	voice_directsound_no_resample 72, 67, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0  @ 867A720
+	voice_directsound_no_resample 72, 67, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 867A720
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A72C
-	voice_directsound_no_resample 72, 61, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0  @ 867A738
+	voice_directsound_no_resample 72, 61, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 867A738
 

sound/voicegroups/voicegroup023.inc

@@ -35,7 +35,7 @@ voicegroup023:: @ 867A744
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8C4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8D0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149  @ 867A8E8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 867A8E8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8F4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A900
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A90C
@@ -46,7 +46,7 @@ voicegroup023:: @ 867A744
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A948
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A954
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A960
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235  @ 867A96C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 867A96C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A978
 	voice_keysplit voicegroup006, KeySplitTable2  @ 867A984
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A990

sound/voicegroups/voicegroup024.inc

@@ -45,9 +45,9 @@ voicegroup024:: @ 867AB70
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD68
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD74
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD80
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165  @ 867AD8C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 867AD8C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD98
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 867ADA4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867ADA4
 	voice_keysplit voicegroup006, KeySplitTable2  @ 867ADB0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ADBC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ADC8
@@ -73,7 +73,7 @@ voicegroup024:: @ 867AB70
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AEB8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AEC4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AED0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 867AEDC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867AEDC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AEE8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AEF4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AF00

sound/voicegroups/voicegroup025.inc

@@ -47,7 +47,7 @@ voicegroup025:: @ 867AFB4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1C4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1D0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 867B1E8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867B1E8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1F4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B200
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B20C
@@ -73,7 +73,7 @@ voicegroup025:: @ 867AFB4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B2FC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B308
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B314
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 867B320
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867B320
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B32C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B338
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B344

sound/voicegroups/voicegroup026.inc

@@ -47,7 +47,7 @@ voicegroup026:: @ 867B3A4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5B4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5C0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5CC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 867B5D8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867B5D8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5E4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5F0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5FC

sound/voicegroups/voicegroup027.inc

@@ -13,7 +13,7 @@ voicegroup027:: @ 867B7A0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B818
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B824
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B830
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204  @ 867B83C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 867B83C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B848
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B854
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B860
@@ -38,7 +38,7 @@ voicegroup027:: @ 867B7A0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B944
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B950
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B95C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115  @ 867B968
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 867B968
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B974
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B980
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B98C

sound/voicegroups/voicegroup028.inc

@@ -17,7 +17,7 @@ voicegroup028:: @ 867BDA0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE48
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE54
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE60
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127  @ 867BE6C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 867BE6C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE78
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE84
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE90
@@ -36,7 +36,7 @@ voicegroup028:: @ 867BDA0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF2C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF38
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF44
-	voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99  @ 867BF50
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 867BF50
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF5C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF68
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF74

sound/voicegroups/voicegroup029.inc

@@ -14,7 +14,7 @@ voicegroup029:: @ 867C184
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C208
 	voice_square_2_alt 60, 0, 2, 0, 2, 0, 0  @ 867C214
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C220
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242  @ 867C22C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242  @ 867C22C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C238
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C244
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C250
@@ -45,9 +45,9 @@ voicegroup029:: @ 867C184
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C37C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C388
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C394
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165  @ 867C3A0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 867C3A0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C3AC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 867C3B8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867C3B8
 	voice_keysplit voicegroup006, KeySplitTable2  @ 867C3C4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C3D0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C3DC
@@ -73,7 +73,7 @@ voicegroup029:: @ 867C184
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4CC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4D8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4E4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 867C4F0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867C4F0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4FC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C508
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C514

sound/voicegroups/voicegroup030.inc

@@ -14,10 +14,10 @@ voicegroup030:: @ 867C5A4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C628
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C634
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C640
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242  @ 867C64C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242  @ 867C64C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C658
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C664
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 37, 165, 180, 127  @ 867C670
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 37, 165, 180, 127  @ 867C670
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C67C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C688
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C694
@@ -46,8 +46,8 @@ voicegroup030:: @ 867C5A4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7A8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7B4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235  @ 867C7CC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 867C7CC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 867C7D8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867C7D8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7E4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7F0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7FC

sound/voicegroups/voicegroup031.inc

@@ -35,12 +35,12 @@ voicegroup031:: @ 867C838
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9B8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9C4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9D0
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_polysynth, 255, 165, 154, 127  @ 867C9DC
+	voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 165, 154, 127  @ 867C9DC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9E8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9F4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA00
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA0C
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242  @ 867CA18
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 867CA18
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA24
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA30
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA3C
@@ -54,15 +54,15 @@ voicegroup031:: @ 867C838
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA9C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CAA8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CAB4
-	voice_directsound_no_resample 32, 49, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204  @ 867CAC0
+	voice_directsound_no_resample 32, 49, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 867CAC0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CACC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CAD8
-	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216  @ 867CAE4
+	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 867CAE4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CAF0
-	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216  @ 867CAFC
+	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216  @ 867CAFC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB08
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB14
-	voice_directsound_no_resample 72, 79, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0  @ 867CB20
+	voice_directsound_no_resample 72, 79, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 867CB20
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB2C
-	voice_directsound_no_resample 72, 74, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0  @ 867CB38
+	voice_directsound_no_resample 72, 74, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 867CB38
 

sound/voicegroups/voicegroup032.inc

@@ -35,7 +35,7 @@ voicegroup032:: @ 867CB44
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCC4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCD0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCDC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 250, 0, 149  @ 867CCE8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 250, 0, 149  @ 867CCE8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCF4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD00
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD0C
@@ -73,7 +73,7 @@ voicegroup032:: @ 867CB44
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE8C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE98
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CEA4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 867CEB0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867CEB0
 	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 867CEBC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CEC8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CED4

sound/voicegroups/voicegroup033.inc

@@ -35,7 +35,7 @@ voicegroup033:: @ 867D144
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2C4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2D0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149  @ 867D2E8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 867D2E8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2F4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D300
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D30C
@@ -46,7 +46,7 @@ voicegroup033:: @ 867D144
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D348
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D354
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D360
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235  @ 867D36C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 867D36C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D378
 	voice_keysplit voicegroup006, KeySplitTable2  @ 867D384
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D390
@@ -73,7 +73,7 @@ voicegroup033:: @ 867D144
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D48C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D498
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4A4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127  @ 867D4B0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867D4B0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4BC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4C8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4D4

sound/voicegroups/voicegroup034.inc

@@ -35,7 +35,7 @@ voicegroup034:: @ 867D528
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6A8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6B4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188  @ 867D6CC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 867D6CC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6D8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6E4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6F0
@@ -45,7 +45,7 @@ voicegroup034:: @ 867D528
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D720
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D72C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D738
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38  @ 867D744
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 867D744
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D750
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D75C
 	voice_keysplit voicegroup006, KeySplitTable2  @ 867D768
@@ -73,7 +73,7 @@ voicegroup034:: @ 867D528
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D870
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D87C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D888
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165  @ 867D894
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 867D894
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8A0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8AC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8B8

sound/voicegroups/voicegroup035.inc

@@ -47,7 +47,7 @@ voicegroup035:: @ 867D918
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB28
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB34
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB40
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 867DB4C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867DB4C
 	voice_keysplit voicegroup006, KeySplitTable2  @ 867DB58
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB64
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB70

sound/voicegroups/voicegroup036.inc

@@ -33,7 +33,7 @@ voicegroup036:: @ 867DD14
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE7C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE88
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE94
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149  @ 867DEA0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 867DEA0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DEAC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DEB8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DEC4
@@ -45,8 +45,8 @@ voicegroup036:: @ 867DD14
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF0C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF18
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF24
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165  @ 867DF30
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 867DF30
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235  @ 867DF3C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 867DF3C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF48
 	voice_keysplit voicegroup006, KeySplitTable2  @ 867DF54
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF60

sound/voicegroups/voicegroup037.inc

@@ -14,7 +14,7 @@ voicegroup037:: @ 867E314
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E398
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3A4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3B0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242  @ 867E3BC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242  @ 867E3BC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3C8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3D4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3E0
@@ -46,8 +46,8 @@ voicegroup037:: @ 867E314
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E518
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E524
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E530
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235  @ 867E53C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 867E53C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226  @ 867E548
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867E548
 	voice_keysplit voicegroup006, KeySplitTable2  @ 867E554
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E560
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E56C

sound/voicegroups/voicegroup038.inc

@@ -17,7 +17,7 @@ voicegroup038:: @ 867E740
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E7E8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E7F4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E800
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127  @ 867E80C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 867E80C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E818
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E824
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E830
@@ -38,7 +38,7 @@ voicegroup038:: @ 867E740
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8E4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8F0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8FC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115  @ 867E908
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 867E908
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E914
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E920
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E92C

sound/voicegroups/voicegroup039.inc

@@ -17,14 +17,14 @@ voicegroup039:: @ 867EB18
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBC0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBCC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBD8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165  @ 867EBE4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 867EBE4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBF0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBFC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC08
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC14
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC20
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC2C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76  @ 867EC38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 867EC38
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC44
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC50
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC5C
@@ -36,7 +36,7 @@ voicegroup039:: @ 867EB18
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECA4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECB0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECBC
-	voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99  @ 867ECC8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 867ECC8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECD4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECE0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECEC
@@ -73,7 +73,7 @@ voicegroup039:: @ 867EB18
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE60
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE6C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE78
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127  @ 867EE84
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 867EE84
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE90
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE9C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EEA8

sound/voicegroups/voicegroup040.inc

@@ -17,14 +17,14 @@ voicegroup040:: @ 867F118
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1C0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1CC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1D8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165  @ 867F1E4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 867F1E4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1F0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1FC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F208
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F214
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F220
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F22C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76  @ 867F238
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 867F238
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F244
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F250
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F25C
@@ -36,7 +36,7 @@ voicegroup040:: @ 867F118
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2A4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2B0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2BC
-	voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99  @ 867F2C8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 867F2C8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2D4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2E0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2EC
@@ -73,7 +73,7 @@ voicegroup040:: @ 867F118
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F460
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F46C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F478
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127  @ 867F484
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 867F484
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F490
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F49C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F4A8

sound/voicegroups/voicegroup041.inc

@@ -17,14 +17,14 @@ voicegroup041:: @ 867F718
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7C0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7CC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7D8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165  @ 867F7E4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 867F7E4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7F0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7FC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F808
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F814
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F820
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F82C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76  @ 867F838
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 867F838
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F844
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F850
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F85C
@@ -36,7 +36,7 @@ voicegroup041:: @ 867F718
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8A4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8B0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8BC
-	voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99  @ 867F8C8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 867F8C8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8D4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8E0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8EC
@@ -73,7 +73,7 @@ voicegroup041:: @ 867F718
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA60
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA6C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA78
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127  @ 867FA84
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 867FA84
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA90
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA9C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FAA8

sound/voicegroups/voicegroup042.inc

@@ -17,14 +17,14 @@ voicegroup042:: @ 867FD18
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDC0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDCC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDD8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165  @ 867FDE4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 867FDE4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDF0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDFC
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE08
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE14
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE20
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE2C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76  @ 867FE38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 867FE38
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE44
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE50
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE5C
@@ -36,7 +36,7 @@ voicegroup042:: @ 867FD18
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEA4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEB0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEBC
-	voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99  @ 867FEC8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 867FEC8
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FED4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEE0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEEC
@@ -73,7 +73,7 @@ voicegroup042:: @ 867FD18
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680060
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868006C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680078
-	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127  @ 8680084
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 8680084
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680090
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868009C
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86800A8