diff options
241 files changed, 968 insertions, 968 deletions
diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 4a3a3b6d3..34410f1e1 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -1,26 +1,26 @@ .align 2 -DirectSoundWaveData_sc88_glockenspiel:: - .incbin "sound/direct_sound_samples/sc88_glockenspiel.bin" +DirectSoundWaveData_sc88pro_glockenspiel:: + .incbin "sound/direct_sound_samples/sc88pro_glockenspiel.bin" .align 2 -DirectSoundWaveData_sc88_organ2:: - .incbin "sound/direct_sound_samples/sc88_organ2.bin" +DirectSoundWaveData_sc88pro_organ2:: + .incbin "sound/direct_sound_samples/sc88pro_organ2.bin" .align 2 -DirectSoundWaveData_sc88_fretless_bass:: - .incbin "sound/direct_sound_samples/sc88_fretless_bass.bin" +DirectSoundWaveData_sc88pro_fretless_bass:: + .incbin "sound/direct_sound_samples/sc88pro_fretless_bass.bin" .align 2 -DirectSoundWaveData_jv1080_slap_bass:: - .incbin "sound/direct_sound_samples/jv1080_slap_bass.bin" +DirectSoundWaveData_sc88pro_slap_bass:: + .incbin "sound/direct_sound_samples/sc88pro_slap_bass.bin" .align 2 -DirectSoundWaveData_sc88_synth_bass:: - .incbin "sound/direct_sound_samples/sc88_synth_bass.bin" +DirectSoundWaveData_sc88pro_synth_bass:: + .incbin "sound/direct_sound_samples/sc88pro_synth_bass.bin" .align 2 -DirectSoundWaveData_sc88_timpani:: - .incbin "sound/direct_sound_samples/sc88_timpani.bin" +DirectSoundWaveData_sc88pro_timpani:: + .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:: - .incbin "sound/direct_sound_samples/unused_electric_guitar.bin" +DirectSoundWaveData_unused_guitar_separates_power_chord:: + .incbin "sound/direct_sound_samples/unused_guitar_separates_power_chord.bin" .align 2 -DirectSoundWaveData_unused_sc88_unison_slap:: - .incbin "sound/direct_sound_samples/unused_sc88_unison_slap.bin" +DirectSoundWaveData_unused_sc88pro_unison_slap:: + .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:: - .incbin "sound/direct_sound_samples/unknown_wood_block_low.bin" +DirectSoundWaveData_ethnic_flavours_ohtsuzumi:: + .incbin "sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.bin" .align 2 -DirectSoundWaveData_unknown_wood_block_high:: - .incbin "sound/direct_sound_samples/unknown_wood_block_high.bin" +DirectSoundWaveData_ethnic_flavours_hyoushigi:: + .incbin "sound/direct_sound_samples/ethnic_flavours_hyoushigi.bin" .align 2 -DirectSoundWaveData_sc88_standard_kick:: - .incbin "sound/direct_sound_samples/sc88_standard_kick.bin" +DirectSoundWaveData_sc88pro_rnd_kick:: + .incbin "sound/direct_sound_samples/sc88pro_rnd_kick.bin" .align 2 -DirectSoundWaveData_sc88_standard3_snare:: - .incbin "sound/direct_sound_samples/sc88_standard3_snare.bin" +DirectSoundWaveData_sc88pro_rnd_snare:: + .incbin "sound/direct_sound_samples/sc88pro_rnd_snare.bin" .align 2 -DirectSoundWaveData_sc88_standard_hand_clap:: - .incbin "sound/direct_sound_samples/sc88_standard_hand_clap.bin" +DirectSoundWaveData_sc88pro_tr909_hand_clap:: + .incbin "sound/direct_sound_samples/sc88pro_tr909_hand_clap.bin" .align 2 -DirectSoundWaveData_sc88_orchestra_snare:: - .incbin "sound/direct_sound_samples/sc88_orchestra_snare.bin" +DirectSoundWaveData_sc88pro_orchestra_snare:: + .incbin "sound/direct_sound_samples/sc88pro_orchestra_snare.bin" .align 2 -DirectSoundWaveData_unknown_tom:: - .incbin "sound/direct_sound_samples/unknown_tom.bin" +DirectSoundWaveData_unused_sc55_tom:: + .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:: - .incbin "sound/direct_sound_samples/unknown_tambourine.bin" +DirectSoundWaveData_sc88pro_tambourine:: + .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:: - .incbin "sound/direct_sound_samples/sc88_orchestra_cymbal_crash.bin" +DirectSoundWaveData_sc88pro_orchestra_cymbal_crash:: + .incbin "sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.bin" .align 2 -DirectSoundWaveData_sc88_bongo:: - .incbin "sound/direct_sound_samples/sc88_bongo.bin" +DirectSoundWaveData_sc88pro_mute_high_conga:: + .incbin "sound/direct_sound_samples/sc88pro_mute_high_conga.bin" .align 2 -DirectSoundWaveData_sc88_bongo_low:: - .incbin "sound/direct_sound_samples/sc88_bongo_low.bin" +DirectSoundWaveData_sc88pro_open_low_conga:: + .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:: - .incbin "sound/direct_sound_samples/unknown_cowbell.bin" +DirectSoundWaveData_sd90_cowbell:: + .incbin "sound/direct_sound_samples/sd90_cowbell.bin" .align 2 -DirectSoundWaveData_unknown_djembe:: - .incbin "sound/direct_sound_samples/unknown_djembe.bin" +DirectSoundWaveData_unused_heart_of_asia_indian_drum:: + .incbin "sound/direct_sound_samples/unused_heart_of_asia_indian_drum.bin" .align 2 -DirectSoundWaveData_unknown_anvil_high:: - .incbin "sound/direct_sound_samples/unknown_anvil_high.bin" +DirectSoundWaveData_sd90_open_triangle:: + .incbin "sound/direct_sound_samples/sd90_open_triangle.bin" .align 2 -DirectSoundWaveData_sc88_standard_bells:: - .incbin "sound/direct_sound_samples/sc88_standard_bells.bin" +DirectSoundWaveData_sc88pro_jingle_bell:: + .incbin "sound/direct_sound_samples/sc88pro_jingle_bell.bin" .align 2 -DirectSoundWaveData_unknown_anvil_low:: - .incbin "sound/direct_sound_samples/unknown_anvil_low.bin" +DirectSoundWaveData_ethnic_flavours_atarigane:: + .incbin "sound/direct_sound_samples/ethnic_flavours_atarigane.bin" .align 2 -DirectSoundWaveData_unknown_ethnic_drum:: - .incbin "sound/direct_sound_samples/unknown_ethnic_drum.bin" +DirectSoundWaveData_unknown_taiko:: + .incbin "sound/direct_sound_samples/unknown_taiko.bin" .align 2 -DirectSoundWaveData_unknown_tsuzumi:: - .incbin "sound/direct_sound_samples/unknown_tsuzumi.bin" +DirectSoundWaveData_ethnic_flavours_kotsuzumi:: + .incbin "sound/direct_sound_samples/ethnic_flavours_kotsuzumi.bin" .align 2 -DirectSoundWaveData_sc88_piano1_48:: - .incbin "sound/direct_sound_samples/sc88_piano1_48.bin" +DirectSoundWaveData_sc88pro_piano1_48:: + .incbin "sound/direct_sound_samples/sc88pro_piano1_48.bin" .align 2 -DirectSoundWaveData_sc88_piano1_60:: - .incbin "sound/direct_sound_samples/sc88_piano1_60.bin" +DirectSoundWaveData_sc88pro_piano1_60:: + .incbin "sound/direct_sound_samples/sc88pro_piano1_60.bin" .align 2 -DirectSoundWaveData_sc88_piano1_72:: - .incbin "sound/direct_sound_samples/sc88_piano1_72.bin" +DirectSoundWaveData_sc88pro_piano1_72:: + .incbin "sound/direct_sound_samples/sc88pro_piano1_72.bin" .align 2 -DirectSoundWaveData_sc88_piano1_84:: - .incbin "sound/direct_sound_samples/sc88_piano1_84.bin" +DirectSoundWaveData_sc88pro_piano1_84:: + .incbin "sound/direct_sound_samples/sc88pro_piano1_84.bin" .align 2 -DirectSoundWaveData_sc88_string_ensemble_60:: - .incbin "sound/direct_sound_samples/sc88_string_ensemble_60.bin" +DirectSoundWaveData_sc88pro_string_ensemble_60:: + .incbin "sound/direct_sound_samples/sc88pro_string_ensemble_60.bin" .align 2 -DirectSoundWaveData_sc88_string_ensemble_72:: - .incbin "sound/direct_sound_samples/sc88_string_ensemble_72.bin" +DirectSoundWaveData_sc88pro_string_ensemble_72:: + .incbin "sound/direct_sound_samples/sc88pro_string_ensemble_72.bin" .align 2 -DirectSoundWaveData_sc88_string_ensemble_84:: - .incbin "sound/direct_sound_samples/sc88_string_ensemble_84.bin" +DirectSoundWaveData_sc88pro_string_ensemble_84:: + .incbin "sound/direct_sound_samples/sc88pro_string_ensemble_84.bin" .align 2 -DirectSoundWaveData_sc88_trumpet_60:: - .incbin "sound/direct_sound_samples/sc88_trumpet_60.bin" +DirectSoundWaveData_sc88pro_trumpet_60:: + .incbin "sound/direct_sound_samples/sc88pro_trumpet_60.bin" .align 2 -DirectSoundWaveData_sc88_trumpet_72:: - .incbin "sound/direct_sound_samples/sc88_trumpet_72.bin" +DirectSoundWaveData_sc88pro_trumpet_72:: + .incbin "sound/direct_sound_samples/sc88pro_trumpet_72.bin" .align 2 -DirectSoundWaveData_sc88_trumpet_84:: - .incbin "sound/direct_sound_samples/sc88_trumpet_84.bin" +DirectSoundWaveData_sc88pro_trumpet_84:: + .incbin "sound/direct_sound_samples/sc88pro_trumpet_84.bin" .align 2 -DirectSoundWaveData_unknown_trombone_39:: - .incbin "sound/direct_sound_samples/unknown_trombone_39.bin" +DirectSoundWaveData_sc88pro_tuba_39:: @N.B.: These tuba samples are actually sampled at 36 and 48, then pitched up + .incbin "sound/direct_sound_samples/sc88pro_tuba_39.bin" .align 2 -DirectSoundWaveData_unknown_trombone_51:: - .incbin "sound/direct_sound_samples/unknown_trombone_51.bin" +DirectSoundWaveData_sc88pro_tuba_51:: + .incbin "sound/direct_sound_samples/sc88pro_tuba_51.bin" .align 2 -DirectSoundWaveData_sc88_french_horn_60:: - .incbin "sound/direct_sound_samples/sc88_french_horn_60.bin" +DirectSoundWaveData_sc88pro_french_horn_60:: + .incbin "sound/direct_sound_samples/sc88pro_french_horn_60.bin" .align 2 -DirectSoundWaveData_sc88_french_horn_72:: - .incbin "sound/direct_sound_samples/sc88_french_horn_72.bin" +DirectSoundWaveData_sc88pro_french_horn_72:: + .incbin "sound/direct_sound_samples/sc88pro_french_horn_72.bin" .align 2 -DirectSoundWaveData_sc88_flute:: - .incbin "sound/direct_sound_samples/sc88_flute.bin" +DirectSoundWaveData_sc88pro_flute:: + .incbin "sound/direct_sound_samples/sc88pro_flute.bin" .align 2 -DirectSoundWaveData_sc88_pick_bass:: - .incbin "sound/direct_sound_samples/sc88_pick_bass.bin" +DirectSoundWaveData_sc88pro_fingered_bass:: + .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:: - .incbin "sound/direct_sound_samples/unknown_church_organ.bin" +DirectSoundWaveData_sc88pro_church_organ3_low:: + .incbin "sound/direct_sound_samples/sc88pro_church_organ3_low.bin" .align 2 -DirectSoundWaveData_emu_ii_pipe_organ:: - .incbin "sound/direct_sound_samples/emu_ii_pipe_organ.bin" +DirectSoundWaveData_sc88pro_church_organ3_high:: + .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:: - .incbin "sound/direct_sound_samples/sc88_timpani_with_snare.bin" +DirectSoundWaveData_sc88pro_timpani_with_snare:: + .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:: - .incbin "sound/direct_sound_samples/sc88_square_wave.bin" +DirectSoundWaveData_sc88pro_square_wave:: + .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:: - .incbin "sound/direct_sound_samples/sc88_pizzicato_strings.bin" +DirectSoundWaveData_sc88pro_pizzicato_strings:: + .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:: - .incbin "sound/direct_sound_samples/sc88_wind.bin" +DirectSoundWaveData_sc88pro_wind:: + .incbin "sound/direct_sound_samples/sc88pro_wind.bin" .align 2 -DirectSoundWaveData_sc88_bubbles:: - .incbin "sound/direct_sound_samples/sc88_bubbles.bin" +DirectSoundWaveData_sc88pro_bubbles:: + .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:: - .incbin "sound/direct_sound_samples/unused_acid_bass.bin" +DirectSoundWaveData_trinity_30303_mega_bass:: + .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:: - .incbin "sound/direct_sound_samples/sc88_tubular_bell.bin" +DirectSoundWaveData_sc88pro_tubular_bell:: + .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:: - .incbin "sound/direct_sound_samples/unknown_polysynth.bin" +DirectSoundWaveData_trinity_big_boned:: + .incbin "sound/direct_sound_samples/trinity_big_boned.bin" .align 2 -DirectSoundWaveData_sc88_harp:: - .incbin "sound/direct_sound_samples/sc88_harp.bin" +DirectSoundWaveData_sc88pro_harp:: + .incbin "sound/direct_sound_samples/sc88pro_harp.bin" .align 2 -DirectSoundWaveData_sc88_xylophone:: - .incbin "sound/direct_sound_samples/sc88_xylophone.bin" +DirectSoundWaveData_sc88pro_xylophone:: + .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:: - .incbin "sound/direct_sound_samples/sc88_accordion.bin" +DirectSoundWaveData_sc88pro_accordion:: + .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:: - .incbin "sound/direct_sound_samples/sc88_nylon_str_guitar.bin" +DirectSoundWaveData_sc88pro_nylon_str_guitar:: + .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:: - .incbin "sound/direct_sound_samples/sc88_accordion_duplicate.bin" +DirectSoundWaveData_sc88pro_accordion_duplicate:: + .incbin "sound/direct_sound_samples/sc88pro_accordion_duplicate.bin" .align 2 DirectSoundWaveData_steinway_b_piano:: diff --git a/sound/direct_sound_samples/unknown_anvil_low.aif b/sound/direct_sound_samples/ethnic_flavours_atarigane.aif Binary files differindex 4a4268210..4a4268210 100644 --- a/sound/direct_sound_samples/unknown_anvil_low.aif +++ b/sound/direct_sound_samples/ethnic_flavours_atarigane.aif diff --git a/sound/direct_sound_samples/unknown_wood_block_high.aif b/sound/direct_sound_samples/ethnic_flavours_hyoushigi.aif Binary files differindex 5219bdf5d..5219bdf5d 100644 --- a/sound/direct_sound_samples/unknown_wood_block_high.aif +++ b/sound/direct_sound_samples/ethnic_flavours_hyoushigi.aif diff --git a/sound/direct_sound_samples/unknown_tsuzumi.aif b/sound/direct_sound_samples/ethnic_flavours_kotsuzumi.aif Binary files differindex 1696bd02e..1696bd02e 100644 --- a/sound/direct_sound_samples/unknown_tsuzumi.aif +++ b/sound/direct_sound_samples/ethnic_flavours_kotsuzumi.aif diff --git a/sound/direct_sound_samples/unknown_wood_block_low.aif b/sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.aif Binary files differindex 69267ca1c..69267ca1c 100644 --- a/sound/direct_sound_samples/unknown_wood_block_low.aif +++ b/sound/direct_sound_samples/ethnic_flavours_ohtsuzumi.aif diff --git a/sound/direct_sound_samples/sc88_accordion.aif b/sound/direct_sound_samples/sc88pro_accordion.aif Binary files differindex 6d6c2e998..6d6c2e998 100644 --- a/sound/direct_sound_samples/sc88_accordion.aif +++ b/sound/direct_sound_samples/sc88pro_accordion.aif diff --git a/sound/direct_sound_samples/sc88_accordion_duplicate.aif b/sound/direct_sound_samples/sc88pro_accordion_duplicate.aif Binary files differindex 6d6c2e998..6d6c2e998 100644 --- a/sound/direct_sound_samples/sc88_accordion_duplicate.aif +++ b/sound/direct_sound_samples/sc88pro_accordion_duplicate.aif diff --git a/sound/direct_sound_samples/sc88_bubbles.aif b/sound/direct_sound_samples/sc88pro_bubbles.aif Binary files differindex 89872bf55..89872bf55 100644 --- a/sound/direct_sound_samples/sc88_bubbles.aif +++ b/sound/direct_sound_samples/sc88pro_bubbles.aif diff --git a/sound/direct_sound_samples/emu_ii_pipe_organ.aif b/sound/direct_sound_samples/sc88pro_church_organ3_high.aif Binary files differindex 8663a6261..8663a6261 100644 --- a/sound/direct_sound_samples/emu_ii_pipe_organ.aif +++ b/sound/direct_sound_samples/sc88pro_church_organ3_high.aif diff --git a/sound/direct_sound_samples/unknown_church_organ.aif b/sound/direct_sound_samples/sc88pro_church_organ3_low.aif Binary files differindex a2618653f..a2618653f 100644 --- a/sound/direct_sound_samples/unknown_church_organ.aif +++ b/sound/direct_sound_samples/sc88pro_church_organ3_low.aif diff --git a/sound/direct_sound_samples/sc88_pick_bass.aif b/sound/direct_sound_samples/sc88pro_fingered_bass.aif Binary files differindex f244a9982..f244a9982 100644 --- a/sound/direct_sound_samples/sc88_pick_bass.aif +++ b/sound/direct_sound_samples/sc88pro_fingered_bass.aif diff --git a/sound/direct_sound_samples/sc88_flute.aif b/sound/direct_sound_samples/sc88pro_flute.aif Binary files differindex 703f3adbd..703f3adbd 100644 --- a/sound/direct_sound_samples/sc88_flute.aif +++ b/sound/direct_sound_samples/sc88pro_flute.aif diff --git a/sound/direct_sound_samples/sc88_french_horn_60.aif b/sound/direct_sound_samples/sc88pro_french_horn_60.aif Binary files differindex 742c4385e..742c4385e 100644 --- a/sound/direct_sound_samples/sc88_french_horn_60.aif +++ b/sound/direct_sound_samples/sc88pro_french_horn_60.aif diff --git a/sound/direct_sound_samples/sc88_french_horn_72.aif b/sound/direct_sound_samples/sc88pro_french_horn_72.aif Binary files differindex 004fda6a1..004fda6a1 100644 --- a/sound/direct_sound_samples/sc88_french_horn_72.aif +++ b/sound/direct_sound_samples/sc88pro_french_horn_72.aif diff --git a/sound/direct_sound_samples/sc88_fretless_bass.aif b/sound/direct_sound_samples/sc88pro_fretless_bass.aif Binary files differindex f3aa47d91..f3aa47d91 100644 --- a/sound/direct_sound_samples/sc88_fretless_bass.aif +++ b/sound/direct_sound_samples/sc88pro_fretless_bass.aif diff --git a/sound/direct_sound_samples/sc88_glockenspiel.aif b/sound/direct_sound_samples/sc88pro_glockenspiel.aif Binary files differindex 199ead811..199ead811 100644 --- a/sound/direct_sound_samples/sc88_glockenspiel.aif +++ b/sound/direct_sound_samples/sc88pro_glockenspiel.aif diff --git a/sound/direct_sound_samples/sc88_harp.aif b/sound/direct_sound_samples/sc88pro_harp.aif Binary files differindex 083c45e3d..083c45e3d 100644 --- a/sound/direct_sound_samples/sc88_harp.aif +++ b/sound/direct_sound_samples/sc88pro_harp.aif diff --git a/sound/direct_sound_samples/sc88_standard_bells.aif b/sound/direct_sound_samples/sc88pro_jingle_bell.aif Binary files differindex 0eaf31309..0eaf31309 100644 --- a/sound/direct_sound_samples/sc88_standard_bells.aif +++ b/sound/direct_sound_samples/sc88pro_jingle_bell.aif diff --git a/sound/direct_sound_samples/sc88_bongo.aif b/sound/direct_sound_samples/sc88pro_mute_high_conga.aif Binary files differindex 2e1bf9c64..2e1bf9c64 100644 --- a/sound/direct_sound_samples/sc88_bongo.aif +++ b/sound/direct_sound_samples/sc88pro_mute_high_conga.aif diff --git a/sound/direct_sound_samples/sc88_nylon_str_guitar.aif b/sound/direct_sound_samples/sc88pro_nylon_str_guitar.aif Binary files differindex dea429a25..dea429a25 100644 --- a/sound/direct_sound_samples/sc88_nylon_str_guitar.aif +++ b/sound/direct_sound_samples/sc88pro_nylon_str_guitar.aif diff --git a/sound/direct_sound_samples/sc88_bongo_low.aif b/sound/direct_sound_samples/sc88pro_open_low_conga.aif Binary files differindex 8e1cb620a..8e1cb620a 100644 --- a/sound/direct_sound_samples/sc88_bongo_low.aif +++ b/sound/direct_sound_samples/sc88pro_open_low_conga.aif diff --git a/sound/direct_sound_samples/sc88_orchestra_cymbal_crash.aif b/sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.aif Binary files differindex 576e3e19e..576e3e19e 100644 --- a/sound/direct_sound_samples/sc88_orchestra_cymbal_crash.aif +++ b/sound/direct_sound_samples/sc88pro_orchestra_cymbal_crash.aif diff --git a/sound/direct_sound_samples/sc88_orchestra_snare.aif b/sound/direct_sound_samples/sc88pro_orchestra_snare.aif Binary files differindex 36b640758..36b640758 100644 --- a/sound/direct_sound_samples/sc88_orchestra_snare.aif +++ b/sound/direct_sound_samples/sc88pro_orchestra_snare.aif diff --git a/sound/direct_sound_samples/sc88_organ2.aif b/sound/direct_sound_samples/sc88pro_organ2.aif Binary files differindex 6372bbc32..6372bbc32 100644 --- a/sound/direct_sound_samples/sc88_organ2.aif +++ b/sound/direct_sound_samples/sc88pro_organ2.aif diff --git a/sound/direct_sound_samples/sc88_piano1_48.aif b/sound/direct_sound_samples/sc88pro_piano1_48.aif Binary files differindex c2b3757b0..c2b3757b0 100644 --- a/sound/direct_sound_samples/sc88_piano1_48.aif +++ b/sound/direct_sound_samples/sc88pro_piano1_48.aif diff --git a/sound/direct_sound_samples/sc88_piano1_60.aif b/sound/direct_sound_samples/sc88pro_piano1_60.aif Binary files differindex 7de586c9b..7de586c9b 100644 --- a/sound/direct_sound_samples/sc88_piano1_60.aif +++ b/sound/direct_sound_samples/sc88pro_piano1_60.aif diff --git a/sound/direct_sound_samples/sc88_piano1_72.aif b/sound/direct_sound_samples/sc88pro_piano1_72.aif Binary files differindex 5236141ba..5236141ba 100644 --- a/sound/direct_sound_samples/sc88_piano1_72.aif +++ b/sound/direct_sound_samples/sc88pro_piano1_72.aif diff --git a/sound/direct_sound_samples/sc88_piano1_84.aif b/sound/direct_sound_samples/sc88pro_piano1_84.aif Binary files differindex a7c4e94f8..a7c4e94f8 100644 --- a/sound/direct_sound_samples/sc88_piano1_84.aif +++ b/sound/direct_sound_samples/sc88pro_piano1_84.aif diff --git a/sound/direct_sound_samples/sc88_pizzicato_strings.aif b/sound/direct_sound_samples/sc88pro_pizzicato_strings.aif Binary files differindex 1c0a027f7..1c0a027f7 100644 --- a/sound/direct_sound_samples/sc88_pizzicato_strings.aif +++ b/sound/direct_sound_samples/sc88pro_pizzicato_strings.aif diff --git a/sound/direct_sound_samples/sc88_standard_kick.aif b/sound/direct_sound_samples/sc88pro_rnd_kick.aif Binary files differindex 9c504e3d0..9c504e3d0 100644 --- a/sound/direct_sound_samples/sc88_standard_kick.aif +++ b/sound/direct_sound_samples/sc88pro_rnd_kick.aif diff --git a/sound/direct_sound_samples/sc88_standard3_snare.aif b/sound/direct_sound_samples/sc88pro_rnd_snare.aif Binary files differindex 544b187d5..544b187d5 100644 --- a/sound/direct_sound_samples/sc88_standard3_snare.aif +++ b/sound/direct_sound_samples/sc88pro_rnd_snare.aif diff --git a/sound/direct_sound_samples/jv1080_slap_bass.aif b/sound/direct_sound_samples/sc88pro_slap_bass.aif Binary files differindex 9175b63c5..9175b63c5 100644 --- a/sound/direct_sound_samples/jv1080_slap_bass.aif +++ b/sound/direct_sound_samples/sc88pro_slap_bass.aif diff --git a/sound/direct_sound_samples/sc88_square_wave.aif b/sound/direct_sound_samples/sc88pro_square_wave.aif Binary files differindex 09e17f0ca..09e17f0ca 100644 --- a/sound/direct_sound_samples/sc88_square_wave.aif +++ b/sound/direct_sound_samples/sc88pro_square_wave.aif diff --git a/sound/direct_sound_samples/sc88_string_ensemble_60.aif b/sound/direct_sound_samples/sc88pro_string_ensemble_60.aif Binary files differindex bfaa5c196..bfaa5c196 100644 --- a/sound/direct_sound_samples/sc88_string_ensemble_60.aif +++ b/sound/direct_sound_samples/sc88pro_string_ensemble_60.aif diff --git a/sound/direct_sound_samples/sc88_string_ensemble_72.aif b/sound/direct_sound_samples/sc88pro_string_ensemble_72.aif Binary files differindex 3e76cacdd..3e76cacdd 100644 --- a/sound/direct_sound_samples/sc88_string_ensemble_72.aif +++ b/sound/direct_sound_samples/sc88pro_string_ensemble_72.aif diff --git a/sound/direct_sound_samples/sc88_string_ensemble_84.aif b/sound/direct_sound_samples/sc88pro_string_ensemble_84.aif Binary files differindex 2647c78ec..2647c78ec 100644 --- a/sound/direct_sound_samples/sc88_string_ensemble_84.aif +++ b/sound/direct_sound_samples/sc88pro_string_ensemble_84.aif diff --git a/sound/direct_sound_samples/sc88_synth_bass.aif b/sound/direct_sound_samples/sc88pro_synth_bass.aif Binary files differindex f39931a7e..f39931a7e 100644 --- a/sound/direct_sound_samples/sc88_synth_bass.aif +++ b/sound/direct_sound_samples/sc88pro_synth_bass.aif diff --git a/sound/direct_sound_samples/unknown_tambourine.aif b/sound/direct_sound_samples/sc88pro_tambourine.aif Binary files differindex 39ec57d29..39ec57d29 100644 --- a/sound/direct_sound_samples/unknown_tambourine.aif +++ b/sound/direct_sound_samples/sc88pro_tambourine.aif diff --git a/sound/direct_sound_samples/sc88_timpani.aif b/sound/direct_sound_samples/sc88pro_timpani.aif Binary files differindex dfdfd702e..dfdfd702e 100644 --- a/sound/direct_sound_samples/sc88_timpani.aif +++ b/sound/direct_sound_samples/sc88pro_timpani.aif diff --git a/sound/direct_sound_samples/sc88_timpani_with_snare.aif b/sound/direct_sound_samples/sc88pro_timpani_with_snare.aif Binary files differindex 7270872d6..7270872d6 100644 --- a/sound/direct_sound_samples/sc88_timpani_with_snare.aif +++ b/sound/direct_sound_samples/sc88pro_timpani_with_snare.aif diff --git a/sound/direct_sound_samples/sc88_standard_hand_clap.aif b/sound/direct_sound_samples/sc88pro_tr909_hand_clap.aif Binary files differindex b11787ffc..b11787ffc 100644 --- a/sound/direct_sound_samples/sc88_standard_hand_clap.aif +++ b/sound/direct_sound_samples/sc88pro_tr909_hand_clap.aif diff --git a/sound/direct_sound_samples/sc88_trumpet_60.aif b/sound/direct_sound_samples/sc88pro_trumpet_60.aif Binary files differindex e56df7f60..e56df7f60 100644 --- a/sound/direct_sound_samples/sc88_trumpet_60.aif +++ b/sound/direct_sound_samples/sc88pro_trumpet_60.aif diff --git a/sound/direct_sound_samples/sc88_trumpet_72.aif b/sound/direct_sound_samples/sc88pro_trumpet_72.aif Binary files differindex 8c68a83b3..8c68a83b3 100644 --- a/sound/direct_sound_samples/sc88_trumpet_72.aif +++ b/sound/direct_sound_samples/sc88pro_trumpet_72.aif diff --git a/sound/direct_sound_samples/sc88_trumpet_84.aif b/sound/direct_sound_samples/sc88pro_trumpet_84.aif Binary files differindex a03bafc97..a03bafc97 100644 --- a/sound/direct_sound_samples/sc88_trumpet_84.aif +++ b/sound/direct_sound_samples/sc88pro_trumpet_84.aif diff --git a/sound/direct_sound_samples/unknown_trombone_39.aif b/sound/direct_sound_samples/sc88pro_tuba_39.aif Binary files differindex d4077b481..d4077b481 100644 --- a/sound/direct_sound_samples/unknown_trombone_39.aif +++ b/sound/direct_sound_samples/sc88pro_tuba_39.aif diff --git a/sound/direct_sound_samples/unknown_trombone_51.aif b/sound/direct_sound_samples/sc88pro_tuba_51.aif Binary files differindex 2ad86876b..2ad86876b 100644 --- a/sound/direct_sound_samples/unknown_trombone_51.aif +++ b/sound/direct_sound_samples/sc88pro_tuba_51.aif diff --git a/sound/direct_sound_samples/sc88_tubular_bell.aif b/sound/direct_sound_samples/sc88pro_tubular_bell.aif Binary files differindex 9d00ecae6..9d00ecae6 100644 --- a/sound/direct_sound_samples/sc88_tubular_bell.aif +++ b/sound/direct_sound_samples/sc88pro_tubular_bell.aif diff --git a/sound/direct_sound_samples/sc88_wind.aif b/sound/direct_sound_samples/sc88pro_wind.aif Binary files differindex ece919ea5..ece919ea5 100644 --- a/sound/direct_sound_samples/sc88_wind.aif +++ b/sound/direct_sound_samples/sc88pro_wind.aif diff --git a/sound/direct_sound_samples/sc88_xylophone.aif b/sound/direct_sound_samples/sc88pro_xylophone.aif Binary files differindex 1bd43ca92..1bd43ca92 100644 --- a/sound/direct_sound_samples/sc88_xylophone.aif +++ b/sound/direct_sound_samples/sc88pro_xylophone.aif diff --git a/sound/direct_sound_samples/unknown_cowbell.aif b/sound/direct_sound_samples/sd90_cowbell.aif Binary files differindex 43515f542..43515f542 100644 --- a/sound/direct_sound_samples/unknown_cowbell.aif +++ b/sound/direct_sound_samples/sd90_cowbell.aif diff --git a/sound/direct_sound_samples/unknown_anvil_high.aif b/sound/direct_sound_samples/sd90_open_triangle.aif Binary files differindex 0d0b3e3ca..0d0b3e3ca 100644 --- a/sound/direct_sound_samples/unknown_anvil_high.aif +++ b/sound/direct_sound_samples/sd90_open_triangle.aif diff --git a/sound/direct_sound_samples/unused_acid_bass.aif b/sound/direct_sound_samples/trinity_30303_mega_bass.aif Binary files differindex 09fe6f12e..09fe6f12e 100644 --- a/sound/direct_sound_samples/unused_acid_bass.aif +++ b/sound/direct_sound_samples/trinity_30303_mega_bass.aif diff --git a/sound/direct_sound_samples/unknown_polysynth.aif b/sound/direct_sound_samples/trinity_big_boned.aif Binary files differindex 455ced13e..455ced13e 100644 --- a/sound/direct_sound_samples/unknown_polysynth.aif +++ b/sound/direct_sound_samples/trinity_big_boned.aif diff --git a/sound/direct_sound_samples/unknown_ethnic_drum.aif b/sound/direct_sound_samples/unknown_taiko.aif Binary files differindex a8046cee8..a8046cee8 100644 --- a/sound/direct_sound_samples/unknown_ethnic_drum.aif +++ b/sound/direct_sound_samples/unknown_taiko.aif diff --git a/sound/direct_sound_samples/unused_electric_guitar.aif b/sound/direct_sound_samples/unused_guitar_separates_power_chord.aif Binary files differindex 7647a74a7..7647a74a7 100644 --- a/sound/direct_sound_samples/unused_electric_guitar.aif +++ b/sound/direct_sound_samples/unused_guitar_separates_power_chord.aif diff --git a/sound/direct_sound_samples/unknown_djembe.aif b/sound/direct_sound_samples/unused_heart_of_asia_indian_drum.aif Binary files differindex 2e67f1d73..2e67f1d73 100644 --- a/sound/direct_sound_samples/unknown_djembe.aif +++ b/sound/direct_sound_samples/unused_heart_of_asia_indian_drum.aif diff --git a/sound/direct_sound_samples/unknown_tom.aif b/sound/direct_sound_samples/unused_sc55_tom.aif Binary files differindex 04f990b13..04f990b13 100644 --- a/sound/direct_sound_samples/unknown_tom.aif +++ b/sound/direct_sound_samples/unused_sc55_tom.aif diff --git a/sound/direct_sound_samples/unused_sc88_unison_slap.aif b/sound/direct_sound_samples/unused_sc88pro_unison_slap.aif Binary files differindex 46d6e7d13..46d6e7d13 100644 --- a/sound/direct_sound_samples/unused_sc88_unison_slap.aif +++ b/sound/direct_sound_samples/unused_sc88pro_unison_slap.aif diff --git a/sound/voicegroups/voicegroup000.inc b/sound/voicegroups/voicegroup000.inc index c15bfea69..96dc02dfb 100644 --- a/sound/voicegroups/voicegroup000.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup002.inc b/sound/voicegroups/voicegroup002.inc index 9f98855d8..4a727f8e0 100644 --- a/sound/voicegroups/voicegroup002.inc +++ b/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_sc88_unison_slap, 255, 165, 206, 127 @ 867616C + voice_directsound 60, 0, DirectSoundWaveData_unused_guitar_separates_power_chord, 255, 165, 206, 127 @ 8676160 + 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_unknown_wood_block_high, 255, 0, 255, 0 @ 8676190 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242 @ 867619C + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0 @ 8676184 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0 @ 8676190 + 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_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86761C0 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86761CC - voice_directsound 48, 44, DirectSoundWaveData_unknown_tom, 255, 210, 77, 204 @ 86761D8 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 86761B4 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 86761C0 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 86761CC + 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 60, 79, DirectSoundWaveData_unknown_tom, 255, 204, 77, 204 @ 867622C + voice_directsound 57, 69, DirectSoundWaveData_unused_sc55_tom, 255, 210, 77, 204 @ 8676220 + 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, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86762BC + voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 @ 86762B0 + 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, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8676328 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 867631C + 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 diff --git a/sound/voicegroups/voicegroup003.inc b/sound/voicegroups/voicegroup003.inc index 9f0057860..2ba0592d5 100644 --- a/sound/voicegroups/voicegroup003.inc +++ b/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, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86763F4 + voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 86763E8 + 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_sc88_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, 34, DirectSoundWaveData_sc88_bongo, 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, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 8676448 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867640C + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 8676418 + 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_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 8676430 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 867643C + 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, 79, DirectSoundWaveData_unknown_anvil_high, 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, 24, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 867652C + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 8676508 + voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 8676514 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 8676520 + 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 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 867655C - voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676568 - voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676574 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 8676580 + voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 8676550 + voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 867655C + voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676568 + voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676574 + 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, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86765B0 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 86765A4 + 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 64, 104, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 235 @ 8676628 + voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867661C + 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 diff --git a/sound/voicegroups/voicegroup004.inc b/sound/voicegroups/voicegroup004.inc index c2071c241..c0c8e54d0 100644 --- a/sound/voicegroups/voicegroup004.inc +++ b/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, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867667C + voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 8676670 + 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_sc88_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, 34, DirectSoundWaveData_sc88_bongo, 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, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86766D0 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676694 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86766A0 + 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_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 86766B8 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 86766C4 + 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 64, 64, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0 @ 8676760 + voice_directsound_no_resample 61, 84, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0 @ 8676754 + 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, 79, DirectSoundWaveData_unknown_anvil_high, 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, 24, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 86767B4 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 8676790 + voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 867679C + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 86767A8 + 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 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 86767E4 - voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 86767F0 - voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 86767FC + voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86767D8 + voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 86767E4 + voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 86767F0 + 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 65, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 8676838 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 867682C + 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 64, 104, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 235 @ 86768B0 + voice_directsound 56, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86768A4 + 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 60, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676904 + voice_directsound 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 86768F8 + 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 62, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 8676928 - voice_directsound 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 8676934 - voice_directsound 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 8676940 - voice_directsound 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 867694C - voice_directsound 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 8676958 + voice_directsound 58, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867691C + voice_directsound 62, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 8676928 + voice_directsound 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 @ 8676934 + voice_directsound 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 8676940 + voice_directsound 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 867694C + 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 64, 64, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0 @ 86769E8 + voice_directsound 61, 84, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0 @ 86769DC + 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, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 8676A24 - voice_directsound 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 8676A30 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 8676A3C + voice_directsound 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 8676A18 + voice_directsound 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 8676A24 + voice_directsound 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 8676A30 + 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 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 8676A6C - voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676A78 - voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 8676A84 + voice_directsound 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 8676A60 + voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 8676A6C + voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676A78 + voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676A84 diff --git a/sound/voicegroups/voicegroup005.inc b/sound/voicegroups/voicegroup005.inc index 19cac18db..cd5c2d766 100644 --- a/sound/voicegroups/voicegroup005.inc +++ b/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_sc88_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_sc88_piano1_84, 255, 247, 0, 221 @ 8676AB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_48, 255, 252, 0, 239 @ 8676A90 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_60, 255, 250, 0, 221 @ 8676A9C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_72, 255, 250, 0, 221 @ 8676AA8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_84, 255, 247, 0, 221 @ 8676AB4 diff --git a/sound/voicegroups/voicegroup006.inc b/sound/voicegroups/voicegroup006.inc index 352bf3e43..fc030a26c 100644 --- a/sound/voicegroups/voicegroup006.inc +++ b/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_sc88_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_60, 255, 0, 255, 196 @ 8676AC0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 196 @ 8676ACC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_84, 255, 0, 255, 196 @ 8676AD8 diff --git a/sound/voicegroups/voicegroup007.inc b/sound/voicegroups/voicegroup007.inc index c741059be..1214ddd4e 100644 --- a/sound/voicegroups/voicegroup007.inc +++ b/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_sc88_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_60, 255, 0, 193, 127 @ 8676AE4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_72, 255, 0, 193, 127 @ 8676AF0 + 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 diff --git a/sound/voicegroups/voicegroup008.inc b/sound/voicegroups/voicegroup008.inc index d4b18d75c..c0d87ce5d 100644 --- a/sound/voicegroups/voicegroup008.inc +++ b/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_unknown_trombone_51, 255, 0, 255, 165 @ 8677114 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_39, 255, 0, 255, 165 @ 8677108 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_51, 255, 0, 255, 165 @ 8677114 diff --git a/sound/voicegroups/voicegroup009.inc b/sound/voicegroups/voicegroup009.inc index f4d525159..ebf550a03 100644 --- a/sound/voicegroups/voicegroup009.inc +++ b/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_sc88_french_horn_72, 255, 0, 218, 165 @ 867712C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_60, 255, 0, 224, 165 @ 8677120 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 255, 0, 218, 165 @ 867712C diff --git a/sound/voicegroups/voicegroup010.inc b/sound/voicegroups/voicegroup010.inc index fb1dd01b4..f4fe73e93 100644 --- a/sound/voicegroups/voicegroup010.inc +++ b/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_sc88_timpani, 255, 246, 0, 226 @ 867736C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204 @ 8677360 + 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 diff --git a/sound/voicegroups/voicegroup011.inc b/sound/voicegroups/voicegroup011.inc index 967614b7c..8102d59f4 100644 --- a/sound/voicegroups/voicegroup011.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup012.inc b/sound/voicegroups/voicegroup012.inc index 43aff40f3..670ae6553 100644 --- a/sound/voicegroups/voicegroup012.inc +++ b/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_sc88_timpani, 255, 246, 0, 226 @ 8677D5C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204 @ 8677D50 + 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 diff --git a/sound/voicegroups/voicegroup013.inc b/sound/voicegroups/voicegroup013.inc index 7ff874601..b8a05c59e 100644 --- a/sound/voicegroups/voicegroup013.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup014.inc b/sound/voicegroups/voicegroup014.inc index 70bb94d8b..6506a7e48 100644 --- a/sound/voicegroups/voicegroup014.inc +++ b/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_sc88_timpani, 255, 246, 0, 226 @ 867865C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 8678650 + 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 diff --git a/sound/voicegroups/voicegroup015.inc b/sound/voicegroups/voicegroup015.inc index 2e74ecc2d..a1dc7899c 100644 --- a/sound/voicegroups/voicegroup015.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup016.inc b/sound/voicegroups/voicegroup016.inc index 2b9294897..ca495e050 100644 --- a/sound/voicegroups/voicegroup016.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup017.inc b/sound/voicegroups/voicegroup017.inc index c9ef1bdbd..3064a4bd1 100644 --- a/sound/voicegroups/voicegroup017.inc +++ b/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_sc88_harp, 255, 242, 0, 204 @ 86791A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 867919C + 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 diff --git a/sound/voicegroups/voicegroup018.inc b/sound/voicegroups/voicegroup018.inc index 5a3140978..58f9d1b48 100644 --- a/sound/voicegroups/voicegroup018.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup019.inc b/sound/voicegroups/voicegroup019.inc index 30de95f36..31f17c73d 100644 --- a/sound/voicegroups/voicegroup019.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup020.inc b/sound/voicegroups/voicegroup020.inc index 658653420..a0e51c67d 100644 --- a/sound/voicegroups/voicegroup020.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup021.inc b/sound/voicegroups/voicegroup021.inc index c33f98191..8ae95ef43 100644 --- a/sound/voicegroups/voicegroup021.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup022.inc b/sound/voicegroups/voicegroup022.inc index 3e7200b60..c30a74351 100644 --- a/sound/voicegroups/voicegroup022.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup023.inc b/sound/voicegroups/voicegroup023.inc index bac472ea1..543ba1795 100644 --- a/sound/voicegroups/voicegroup023.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup024.inc b/sound/voicegroups/voicegroup024.inc index aee8c52ff..db85541cd 100644 --- a/sound/voicegroups/voicegroup024.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup025.inc b/sound/voicegroups/voicegroup025.inc index 5e83024cc..e9d68d30a 100644 --- a/sound/voicegroups/voicegroup025.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup026.inc b/sound/voicegroups/voicegroup026.inc index f0305b0c4..77f308ed9 100644 --- a/sound/voicegroups/voicegroup026.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup027.inc b/sound/voicegroups/voicegroup027.inc index 15273c83a..1747fbe67 100644 --- a/sound/voicegroups/voicegroup027.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup028.inc b/sound/voicegroups/voicegroup028.inc index e3da5f665..2b64c6b31 100644 --- a/sound/voicegroups/voicegroup028.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup029.inc b/sound/voicegroups/voicegroup029.inc index b00b706cc..e41307873 100644 --- a/sound/voicegroups/voicegroup029.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup030.inc b/sound/voicegroups/voicegroup030.inc index 932921a2b..ba7a81612 100644 --- a/sound/voicegroups/voicegroup030.inc +++ b/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_sc88_timpani, 255, 246, 0, 226 @ 867C7D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 867C7CC + 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 diff --git a/sound/voicegroups/voicegroup031.inc b/sound/voicegroups/voicegroup031.inc index ec8b3d33e..e0d8691db 100644 --- a/sound/voicegroups/voicegroup031.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup032.inc b/sound/voicegroups/voicegroup032.inc index 198ae6542..75e305f6e 100644 --- a/sound/voicegroups/voicegroup032.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup033.inc b/sound/voicegroups/voicegroup033.inc index 954ff03ea..21d1b108f 100644 --- a/sound/voicegroups/voicegroup033.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup034.inc b/sound/voicegroups/voicegroup034.inc index bcdb875d6..6ca2ded87 100644 --- a/sound/voicegroups/voicegroup034.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup035.inc b/sound/voicegroups/voicegroup035.inc index 4a4b3618c..ebcdf744f 100644 --- a/sound/voicegroups/voicegroup035.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup036.inc b/sound/voicegroups/voicegroup036.inc index 4b6406f2f..8799f251c 100644 --- a/sound/voicegroups/voicegroup036.inc +++ b/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_sc88_harp, 255, 246, 0, 235 @ 867DF3C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 867DF30 + 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 diff --git a/sound/voicegroups/voicegroup037.inc b/sound/voicegroups/voicegroup037.inc index 2b55d056c..9e52dc02e 100644 --- a/sound/voicegroups/voicegroup037.inc +++ b/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_sc88_timpani, 255, 246, 0, 226 @ 867E548 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 867E53C + 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 diff --git a/sound/voicegroups/voicegroup038.inc b/sound/voicegroups/voicegroup038.inc index e19d0766a..2b7f62f95 100644 --- a/sound/voicegroups/voicegroup038.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup039.inc b/sound/voicegroups/voicegroup039.inc index 589c966f0..580eb4fe7 100644 --- a/sound/voicegroups/voicegroup039.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup040.inc b/sound/voicegroups/voicegroup040.inc index e6bd5ab5b..78cc9167a 100644 --- a/sound/voicegroups/voicegroup040.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup041.inc b/sound/voicegroups/voicegroup041.inc index a6853b0c1..f5a1d6d16 100644 --- a/sound/voicegroups/voicegroup041.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup042.inc b/sound/voicegroups/voicegroup042.inc index 809be048c..764ce1c61 100644 --- a/sound/voicegroups/voicegroup042.inc +++ b/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 diff --git a/sound/voicegroups/voicegroup043.inc b/sound/voicegroups/voicegroup043.inc index 047529ffe..6e4c76dfc 100644 --- a/sound/voicegroups/voicegroup043.inc +++ b/sound/voicegroups/voicegroup043.inc @@ -32,7 +32,7 @@ voicegroup043:: @ 8680318 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680480 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868048C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149 @ 8680498 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149 @ 8680498 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86804A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86804B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86804BC @@ -73,7 +73,7 @@ voicegroup043:: @ 8680318 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680660 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868066C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680678 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8680684 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 8680684 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680690 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868069C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86806A8 diff --git a/sound/voicegroups/voicegroup044.inc b/sound/voicegroups/voicegroup044.inc index 78b2e28e3..5c848d94d 100644 --- a/sound/voicegroups/voicegroup044.inc +++ b/sound/voicegroups/voicegroup044.inc @@ -35,7 +35,7 @@ voicegroup044:: @ 86806E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680864 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680870 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868087C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 224 @ 8680888 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 224 @ 8680888 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680894 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86808A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86808AC @@ -45,7 +45,7 @@ voicegroup044:: @ 86806E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86808DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86808E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86808F4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8680900 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 8680900 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868090C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680918 voice_keysplit voicegroup006, KeySplitTable2 @ 8680924 @@ -73,7 +73,7 @@ voicegroup044:: @ 86806E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680A2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680A38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680A44 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8680A50 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 8680A50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680A5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680A68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680A74 diff --git a/sound/voicegroups/voicegroup045.inc b/sound/voicegroups/voicegroup045.inc index c929a4a5a..bb904e5ca 100644 --- a/sound/voicegroups/voicegroup045.inc +++ b/sound/voicegroups/voicegroup045.inc @@ -17,7 +17,7 @@ voicegroup045:: @ 8680AB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680B58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680B64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680B70 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8680B7C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8680B7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680B88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680B94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680BA0 @@ -38,7 +38,7 @@ voicegroup045:: @ 8680AB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680C54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680C60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680C6C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 216 @ 8680C78 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216 @ 8680C78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680C84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680C90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680C9C @@ -73,7 +73,7 @@ voicegroup045:: @ 8680AB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680DF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680E04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680E10 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8680E1C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 8680E1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680E28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680E34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8680E40 diff --git a/sound/voicegroups/voicegroup046.inc b/sound/voicegroups/voicegroup046.inc index eddc2b1ea..07889819a 100644 --- a/sound/voicegroups/voicegroup046.inc +++ b/sound/voicegroups/voicegroup046.inc @@ -5,7 +5,7 @@ voicegroup046:: @ 86810B0 voice_square_1_alt 60, 0, 0, 0, 1, 1, 9, 0 @ 86810C8 voice_square_2_alt 60, 0, 2, 0, 2, 6, 3 @ 86810D4 voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1 @ 86810E0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 216 @ 86810EC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216 @ 86810EC voice_square_2_alt 60, 0, 1, 0, 2, 6, 3 @ 86810F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681104 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681110 @@ -45,7 +45,7 @@ voicegroup046:: @ 86810B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86812A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86812B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86812C0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 165 @ 86812CC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 165 @ 86812CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86812D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86812E4 voice_keysplit voicegroup006, KeySplitTable2 @ 86812F0 @@ -73,7 +73,7 @@ voicegroup046:: @ 86810B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86813F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681404 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681410 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 868141C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 868141C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681428 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681434 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681440 diff --git a/sound/voicegroups/voicegroup047.inc b/sound/voicegroups/voicegroup047.inc index 9eebdc359..c045c1dd3 100644 --- a/sound/voicegroups/voicegroup047.inc +++ b/sound/voicegroups/voicegroup047.inc @@ -38,7 +38,7 @@ voicegroup047:: @ 86816B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681854 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681860 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868186C - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8681878 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8681878 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681884 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681890 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868189C @@ -46,8 +46,8 @@ voicegroup047:: @ 86816B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86818B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86818C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86818CC - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204 @ 86818D8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 204, 193, 239 @ 86818E4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204 @ 86818D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239 @ 86818E4 voice_keysplit voicegroup006, KeySplitTable2 @ 86818F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86818FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681908 diff --git a/sound/voicegroups/voicegroup048.inc b/sound/voicegroups/voicegroup048.inc index 32badd06b..151c725d1 100644 --- a/sound/voicegroups/voicegroup048.inc +++ b/sound/voicegroups/voicegroup048.inc @@ -9,7 +9,7 @@ voicegroup048:: @ 8681CB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681CF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681D04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681D10 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 204, 51, 242 @ 8681D1C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 204, 51, 242 @ 8681D1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681D28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681D34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681D40 @@ -46,8 +46,8 @@ voicegroup048:: @ 8681CB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681EB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681EC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681ECC - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 8681ED8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 239 @ 8681EE4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 8681ED8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 239 @ 8681EE4 voice_keysplit voicegroup006, KeySplitTable2 @ 8681EF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681EFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8681F08 diff --git a/sound/voicegroups/voicegroup049.inc b/sound/voicegroups/voicegroup049.inc index 6761d5f8c..a3700ecf3 100644 --- a/sound/voicegroups/voicegroup049.inc +++ b/sound/voicegroups/voicegroup049.inc @@ -9,7 +9,7 @@ voicegroup049:: @ 86820D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682118 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682124 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682130 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 868213C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 @ 868213C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682148 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682154 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682160 @@ -35,7 +35,7 @@ voicegroup049:: @ 86820D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682250 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868225C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682268 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8682274 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8682274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682280 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868228C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682298 @@ -45,9 +45,9 @@ voicegroup049:: @ 86820D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86822C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86822D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86822E0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 86822EC - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 86822F8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 226 @ 8682304 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 86822EC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 86822F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 226 @ 8682304 voice_keysplit voicegroup006, KeySplitTable2 @ 8682310 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868231C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682328 @@ -73,7 +73,7 @@ voicegroup049:: @ 86820D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682418 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682424 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682430 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 868243C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 868243C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682448 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682454 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682460 diff --git a/sound/voicegroups/voicegroup050.inc b/sound/voicegroups/voicegroup050.inc index f20c5d578..dbbe02cfc 100644 --- a/sound/voicegroups/voicegroup050.inc +++ b/sound/voicegroups/voicegroup050.inc @@ -17,7 +17,7 @@ voicegroup050:: @ 86826D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682778 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682784 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682790 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 868279C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 868279C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86827A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86827B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86827C0 @@ -35,7 +35,7 @@ voicegroup050:: @ 86826D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682850 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868285C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682868 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8682874 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8682874 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682880 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868288C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682898 @@ -46,7 +46,7 @@ voicegroup050:: @ 86826D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86828D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86828E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86828EC - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 86828F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 86828F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682904 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682910 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868291C diff --git a/sound/voicegroups/voicegroup051.inc b/sound/voicegroups/voicegroup051.inc index ef83bbf8d..ceafb4d4d 100644 --- a/sound/voicegroups/voicegroup051.inc +++ b/sound/voicegroups/voicegroup051.inc @@ -35,7 +35,7 @@ voicegroup051:: @ 8682CD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682E50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682E5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682E68 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8682E74 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8682E74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682E80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682E8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682E98 @@ -45,7 +45,7 @@ voicegroup051:: @ 8682CD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682EC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682ED4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682EE0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 99 @ 8682EEC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 99 @ 8682EEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682EF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8682F04 voice_keysplit voicegroup006, KeySplitTable2 @ 8682F10 @@ -73,5 +73,5 @@ voicegroup051:: @ 8682CD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683018 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683024 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683030 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 868303C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 868303C diff --git a/sound/voicegroups/voicegroup052.inc b/sound/voicegroups/voicegroup052.inc index af166424d..efddac28a 100644 --- a/sound/voicegroups/voicegroup052.inc +++ b/sound/voicegroups/voicegroup052.inc @@ -47,7 +47,7 @@ voicegroup052:: @ 8683048 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683258 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683264 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683270 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 226 @ 868327C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 226 @ 868327C voice_keysplit voicegroup006, KeySplitTable2 @ 8683288 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683294 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86832A0 diff --git a/sound/voicegroups/voicegroup053.inc b/sound/voicegroups/voicegroup053.inc index 147f1c6cf..559f7efa3 100644 --- a/sound/voicegroups/voicegroup053.inc +++ b/sound/voicegroups/voicegroup053.inc @@ -35,7 +35,7 @@ voicegroup053:: @ 8683648 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86837C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86837D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86837E0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86837EC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86837EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86837F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683804 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683810 @@ -45,7 +45,7 @@ voicegroup053:: @ 8683648 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683840 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868384C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683858 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8683864 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 8683864 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683870 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868387C voice_keysplit voicegroup006, KeySplitTable2 @ 8683888 @@ -73,7 +73,7 @@ voicegroup053:: @ 8683648 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683990 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868399C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86839A8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86839B4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86839B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86839C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86839CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86839D8 diff --git a/sound/voicegroups/voicegroup054.inc b/sound/voicegroups/voicegroup054.inc index ac7079d7e..1a300444e 100644 --- a/sound/voicegroups/voicegroup054.inc +++ b/sound/voicegroups/voicegroup054.inc @@ -45,8 +45,8 @@ voicegroup054:: @ 8683C48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683E40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683E4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683E58 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8683E64 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 8683E70 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 8683E64 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 8683E70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683E7C voice_keysplit voicegroup006, KeySplitTable2 @ 8683E88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683E94 @@ -73,7 +73,7 @@ voicegroup054:: @ 8683C48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683F90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683F9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683FA8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8683FB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 8683FB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683FC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683FCC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8683FD8 diff --git a/sound/voicegroups/voicegroup055.inc b/sound/voicegroups/voicegroup055.inc index ae79ac661..71556fc57 100644 --- a/sound/voicegroups/voicegroup055.inc +++ b/sound/voicegroups/voicegroup055.inc @@ -38,7 +38,7 @@ voicegroup055:: @ 8684248 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86843EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86843F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684404 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8684410 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8684410 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868441C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684428 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684434 @@ -46,8 +46,8 @@ voicegroup055:: @ 8684248 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868444C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684458 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684464 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204 @ 8684470 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 204, 193, 239 @ 868447C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204 @ 8684470 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239 @ 868447C voice_keysplit voicegroup006, KeySplitTable2 @ 8684488 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684494 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86844A0 diff --git a/sound/voicegroups/voicegroup056.inc b/sound/voicegroups/voicegroup056.inc index 62558e33b..56538a65b 100644 --- a/sound/voicegroups/voicegroup056.inc +++ b/sound/voicegroups/voicegroup056.inc @@ -38,7 +38,7 @@ voicegroup056:: @ 8684848 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86849EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86849F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684A04 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8684A10 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8684A10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684A1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684A28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684A34 @@ -73,7 +73,7 @@ voicegroup056:: @ 8684848 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684B90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684B9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684BA8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8684BB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 8684BB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684BC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684BCC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684BD8 diff --git a/sound/voicegroups/voicegroup057.inc b/sound/voicegroups/voicegroup057.inc index 9418b1c51..0a8b037b4 100644 --- a/sound/voicegroups/voicegroup057.inc +++ b/sound/voicegroups/voicegroup057.inc @@ -9,12 +9,12 @@ voicegroup057:: @ 8684E48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684E90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684E9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684EA8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 188, 51, 242 @ 8684EB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 188, 51, 242 @ 8684EB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684EC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684ECC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684ED8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684EE4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 128, 165, 90, 216 @ 8684EF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 128, 165, 90, 216 @ 8684EF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684EFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684F08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684F14 @@ -23,7 +23,7 @@ voicegroup057:: @ 8684E48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684F38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684F44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684F50 - voice_directsound 60, 0, DirectSoundWaveData_sc88_bubbles, 255, 0, 255, 127 @ 8684F5C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_bubbles, 255, 0, 255, 127 @ 8684F5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684F68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684F74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684F80 @@ -35,7 +35,7 @@ voicegroup057:: @ 8684E48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684FC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684FD4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684FE0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8684FEC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8684FEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8684FF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685004 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685010 @@ -45,9 +45,9 @@ voicegroup057:: @ 8684E48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685040 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868504C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685058 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8685064 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 8685070 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 226 @ 868507C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 8685064 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 8685070 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 226 @ 868507C voice_keysplit voicegroup006, KeySplitTable2 @ 8685088 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685094 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86850A0 @@ -73,7 +73,7 @@ voicegroup057:: @ 8684E48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685190 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868519C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86851A8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86851B4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86851B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86851C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86851CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86851D8 diff --git a/sound/voicegroups/voicegroup058.inc b/sound/voicegroups/voicegroup058.inc index fe9f22887..1e50a0b3a 100644 --- a/sound/voicegroups/voicegroup058.inc +++ b/sound/voicegroups/voicegroup058.inc @@ -17,7 +17,7 @@ voicegroup058:: @ 8685448 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86854F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86854FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685508 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8685514 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8685514 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685520 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868552C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685538 @@ -35,7 +35,7 @@ voicegroup058:: @ 8685448 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86855C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86855D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86855E0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86855EC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86855EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86855F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685604 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685610 diff --git a/sound/voicegroups/voicegroup059.inc b/sound/voicegroups/voicegroup059.inc index e4c447283..20b91da5d 100644 --- a/sound/voicegroups/voicegroup059.inc +++ b/sound/voicegroups/voicegroup059.inc @@ -9,12 +9,12 @@ voicegroup059:: @ 8685A48 voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0 @ 8685A90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685A9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685AA8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 8685AB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 @ 8685AB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685AC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685ACC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685AD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685AE4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8685AF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8685AF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685AFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685B08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685B14 @@ -46,8 +46,8 @@ voicegroup059:: @ 8685A48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685C4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685C58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685C64 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8685C70 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 239 @ 8685C7C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 8685C70 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239 @ 8685C7C voice_keysplit voicegroup006, KeySplitTable2 @ 8685C88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685C94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685CA0 @@ -73,7 +73,7 @@ voicegroup059:: @ 8685A48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685D90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685D9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685DA8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8685DB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 8685DB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685DC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685DCC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685DD8 diff --git a/sound/voicegroups/voicegroup060.inc b/sound/voicegroups/voicegroup060.inc index d9c237748..02569e1ca 100644 --- a/sound/voicegroups/voicegroup060.inc +++ b/sound/voicegroups/voicegroup060.inc @@ -13,7 +13,7 @@ voicegroup060:: @ 8685E74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685EEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685EF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685F04 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8685F10 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 8685F10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685F1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685F28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8685F34 @@ -45,9 +45,9 @@ voicegroup060:: @ 8685E74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868606C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686078 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686084 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 128, 226, 0, 38 @ 8686090 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868609C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86860A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 128, 226, 0, 38 @ 8686090 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 868609C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 86860A8 voice_keysplit voicegroup006, KeySplitTable2 @ 86860B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86860C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86860CC @@ -73,7 +73,7 @@ voicegroup060:: @ 8685E74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86861BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86861C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86861D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86861E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 86861E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86861EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86861F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686204 diff --git a/sound/voicegroups/voicegroup061.inc b/sound/voicegroups/voicegroup061.inc index bb4359572..d4b8a50b3 100644 --- a/sound/voicegroups/voicegroup061.inc +++ b/sound/voicegroups/voicegroup061.inc @@ -17,7 +17,7 @@ voicegroup061:: @ 8686474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868651C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686528 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686534 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8686540 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8686540 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868654C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686558 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686564 @@ -36,7 +36,7 @@ voicegroup061:: @ 8686474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686600 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868660C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686618 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 115 @ 8686624 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115 @ 8686624 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686630 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868663C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686648 @@ -73,7 +73,7 @@ voicegroup061:: @ 8686474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86867BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86867C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86867D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86867E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 86867E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86867EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86867F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686804 diff --git a/sound/voicegroups/voicegroup062.inc b/sound/voicegroups/voicegroup062.inc index e2869ec85..7415e7090 100644 --- a/sound/voicegroups/voicegroup062.inc +++ b/sound/voicegroups/voicegroup062.inc @@ -38,7 +38,7 @@ voicegroup062:: @ 8686A74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686C18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686C24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686C30 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8686C3C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8686C3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686C48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686C54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8686C60 diff --git a/sound/voicegroups/voicegroup063.inc b/sound/voicegroups/voicegroup063.inc index bfc7d08a5..98ac82176 100644 --- a/sound/voicegroups/voicegroup063.inc +++ b/sound/voicegroups/voicegroup063.inc @@ -17,7 +17,7 @@ voicegroup063:: @ 8687074 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868711C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687128 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687134 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 8687140 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165 @ 8687140 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868714C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687158 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687164 @@ -36,7 +36,7 @@ voicegroup063:: @ 8687074 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687200 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868720C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687218 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 8687224 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 8687224 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687230 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868723C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687248 diff --git a/sound/voicegroups/voicegroup064.inc b/sound/voicegroups/voicegroup064.inc index c9f747f19..f52f45699 100644 --- a/sound/voicegroups/voicegroup064.inc +++ b/sound/voicegroups/voicegroup064.inc @@ -24,7 +24,7 @@ voicegroup064:: @ 8687674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687770 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868777C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687788 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8687794 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 8687794 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86877A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86877AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86877B8 @@ -46,8 +46,8 @@ voicegroup064:: @ 8687674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687878 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687884 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687890 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868789C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86878A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 868789C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 86878A8 voice_keysplit voicegroup006, KeySplitTable2 @ 86878B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86878C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86878CC @@ -73,7 +73,7 @@ voicegroup064:: @ 8687674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86879BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86879C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86879D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86879E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 86879E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86879EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86879F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687A04 diff --git a/sound/voicegroups/voicegroup065.inc b/sound/voicegroups/voicegroup065.inc index 54f459005..d4a604867 100644 --- a/sound/voicegroups/voicegroup065.inc +++ b/sound/voicegroups/voicegroup065.inc @@ -17,7 +17,7 @@ voicegroup065:: @ 8687C74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687D1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687D28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687D34 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 8687D40 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165 @ 8687D40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687D4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687D58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687D64 @@ -36,7 +36,7 @@ voicegroup065:: @ 8687C74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687E00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687E0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687E18 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 8687E24 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 8687E24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687E30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687E3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8687E48 diff --git a/sound/voicegroups/voicegroup066.inc b/sound/voicegroups/voicegroup066.inc index 41d3eaac8..ba3f16703 100644 --- a/sound/voicegroups/voicegroup066.inc +++ b/sound/voicegroups/voicegroup066.inc @@ -24,7 +24,7 @@ voicegroup066:: @ 8688274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688370 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868837C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688388 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8688394 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 8688394 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86883A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86883AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86883B8 @@ -35,17 +35,17 @@ voicegroup066:: @ 8688274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86883F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688400 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868840C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8688418 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8688418 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688424 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688430 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868843C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 868843C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688448 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688454 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688460 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868846C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688478 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688484 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8688490 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 8688490 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868849C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86884A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86884B4 @@ -73,7 +73,7 @@ voicegroup066:: @ 8688274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86885BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86885C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86885D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86885E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 86885E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86885EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86885F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688604 diff --git a/sound/voicegroups/voicegroup067.inc b/sound/voicegroups/voicegroup067.inc index 525a7e453..b2ecd0927 100644 --- a/sound/voicegroups/voicegroup067.inc +++ b/sound/voicegroups/voicegroup067.inc @@ -17,14 +17,14 @@ voicegroup067:: @ 8688874 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868891C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688928 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688934 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8688940 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8688940 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868894C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688958 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688964 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688970 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868897C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688988 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8688994 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 8688994 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86889A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86889AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86889B8 @@ -38,7 +38,7 @@ voicegroup067:: @ 8688874 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688A18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688A24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688A30 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8688A3C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8688A3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688A48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688A54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688A60 @@ -73,7 +73,7 @@ voicegroup067:: @ 8688874 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688BBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688BC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688BD4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 8688BE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 8688BE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688BEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688BF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688C04 diff --git a/sound/voicegroups/voicegroup068.inc b/sound/voicegroups/voicegroup068.inc index f0aa96173..1d7f97cd5 100644 --- a/sound/voicegroups/voicegroup068.inc +++ b/sound/voicegroups/voicegroup068.inc @@ -14,17 +14,17 @@ voicegroup068:: @ 8688E74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688EF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688F04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688F10 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8688F1C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8688F1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688F28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688F34 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8688F40 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8688F40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688F4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688F58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688F64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688F70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688F7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688F88 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8688F94 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 8688F94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688FA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688FAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688FB8 @@ -35,10 +35,10 @@ voicegroup068:: @ 8688E74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8688FF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689000 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868900C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8689018 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8689018 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689024 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689030 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868903C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 868903C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689048 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689054 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689060 @@ -73,7 +73,7 @@ voicegroup068:: @ 8688E74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86891BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86891C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86891D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86891E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 86891E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86891EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86891F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689204 diff --git a/sound/voicegroups/voicegroup069.inc b/sound/voicegroups/voicegroup069.inc index e634acbb1..952ebff66 100644 --- a/sound/voicegroups/voicegroup069.inc +++ b/sound/voicegroups/voicegroup069.inc @@ -17,14 +17,14 @@ voicegroup069:: @ 8689474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868951C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689528 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689534 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8689540 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8689540 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868954C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689558 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689564 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689570 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868957C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689588 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8689594 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 8689594 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86895A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86895AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86895B8 @@ -35,17 +35,17 @@ voicegroup069:: @ 8689474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86895F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689600 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868960C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8689618 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8689618 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689624 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689630 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868963C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 868963C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689648 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689654 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689660 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868966C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689678 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689684 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8689690 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 8689690 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868969C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86896A8 voice_keysplit voicegroup006, KeySplitTable2 @ 86896B4 @@ -73,7 +73,7 @@ voicegroup069:: @ 8689474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86897BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86897C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86897D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86897E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 86897E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86897EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86897F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689804 diff --git a/sound/voicegroups/voicegroup070.inc b/sound/voicegroups/voicegroup070.inc index 252677177..6d80b556a 100644 --- a/sound/voicegroups/voicegroup070.inc +++ b/sound/voicegroups/voicegroup070.inc @@ -24,7 +24,7 @@ voicegroup070:: @ 8689A74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689B70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689B7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689B88 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8689B94 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 8689B94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689BA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689BAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689BB8 @@ -35,7 +35,7 @@ voicegroup070:: @ 8689A74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689BF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689C00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689C0C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8689C18 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8689C18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689C24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689C30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689C3C @@ -46,8 +46,8 @@ voicegroup070:: @ 8689A74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689C78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689C84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689C90 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8689C9C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 8689CA8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 8689C9C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 8689CA8 voice_keysplit voicegroup006, KeySplitTable2 @ 8689CB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689CC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8689CCC diff --git a/sound/voicegroups/voicegroup072.inc b/sound/voicegroups/voicegroup072.inc index cca4ad092..deb467dbf 100644 --- a/sound/voicegroups/voicegroup072.inc +++ b/sound/voicegroups/voicegroup072.inc @@ -13,18 +13,18 @@ voicegroup072:: @ 868A674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A6EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A6F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A704 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 868A710 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 868A710 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A71C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A728 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A734 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 868A740 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 868A740 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A74C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A758 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A764 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A770 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A77C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A788 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868A794 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 868A794 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A7A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A7AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A7B8 @@ -35,7 +35,7 @@ voicegroup072:: @ 868A674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A7F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A800 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A80C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868A818 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 868A818 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A824 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A830 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A83C @@ -46,7 +46,7 @@ voicegroup072:: @ 868A674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A878 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A884 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A890 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868A89C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 868A89C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A8A8 voice_keysplit voicegroup006, KeySplitTable2 @ 868A8B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868A8C0 diff --git a/sound/voicegroups/voicegroup073.inc b/sound/voicegroups/voicegroup073.inc index 702f5caff..2701b5c79 100644 --- a/sound/voicegroups/voicegroup073.inc +++ b/sound/voicegroups/voicegroup073.inc @@ -13,18 +13,18 @@ voicegroup073:: @ 868AC74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868ACEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868ACF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AD04 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 868AD10 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 868AD10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AD1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AD28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AD34 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 868AD40 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 868AD40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AD4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AD58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AD64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AD70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AD7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AD88 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868AD94 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 868AD94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868ADA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868ADAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868ADB8 @@ -35,10 +35,10 @@ voicegroup073:: @ 868AC74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868ADF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AE00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AE0C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868AE18 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 868AE18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AE24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AE30 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868AE3C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 868AE3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AE48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AE54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AE60 @@ -46,7 +46,7 @@ voicegroup073:: @ 868AC74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AE78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AE84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AE90 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868AE9C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 868AE9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AEA8 voice_keysplit voicegroup006, KeySplitTable2 @ 868AEB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AEC0 @@ -73,7 +73,7 @@ voicegroup073:: @ 868AC74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AFBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AFC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AFD4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868AFE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 868AFE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AFEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868AFF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B004 diff --git a/sound/voicegroups/voicegroup074.inc b/sound/voicegroups/voicegroup074.inc index a2bd0b199..6b9dcfb51 100644 --- a/sound/voicegroups/voicegroup074.inc +++ b/sound/voicegroups/voicegroup074.inc @@ -13,7 +13,7 @@ voicegroup074:: @ 868B274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B2EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B2F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B304 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 868B310 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 868B310 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B31C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B328 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B334 @@ -35,7 +35,7 @@ voicegroup074:: @ 868B274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B3F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B400 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B40C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868B418 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 868B418 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B424 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B430 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B43C @@ -47,7 +47,7 @@ voicegroup074:: @ 868B274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B484 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B490 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B49C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 216 @ 868B4A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 216 @ 868B4A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B4B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B4C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B4CC diff --git a/sound/voicegroups/voicegroup075.inc b/sound/voicegroups/voicegroup075.inc index dcb43b419..cd8ed9250 100644 --- a/sound/voicegroups/voicegroup075.inc +++ b/sound/voicegroups/voicegroup075.inc @@ -14,7 +14,7 @@ voicegroup075:: @ 868B874 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B8F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B904 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B910 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868B91C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 868B91C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B928 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B934 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B940 @@ -35,8 +35,8 @@ voicegroup075:: @ 868B874 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868B9F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BA00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BA0C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868BA18 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 868BA24 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 868BA18 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 868BA24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BA30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BA3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BA48 @@ -47,7 +47,7 @@ voicegroup075:: @ 868B874 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BA84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BA90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BA9C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868BAA8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 868BAA8 voice_keysplit voicegroup006, KeySplitTable2 @ 868BAB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BAC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BACC @@ -73,7 +73,7 @@ voicegroup075:: @ 868B874 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BBBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BBC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BBD4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868BBE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 868BBE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BBEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BBF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BC04 diff --git a/sound/voicegroups/voicegroup076.inc b/sound/voicegroups/voicegroup076.inc index 65e5b8e5d..3148389b2 100644 --- a/sound/voicegroups/voicegroup076.inc +++ b/sound/voicegroups/voicegroup076.inc @@ -17,7 +17,7 @@ voicegroup076:: @ 868BE74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BF1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BF28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BF34 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 868BF40 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165 @ 868BF40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BF4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BF58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BF64 @@ -35,8 +35,8 @@ voicegroup076:: @ 868BE74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868BFF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C000 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C00C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868C018 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 868C024 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 868C018 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 868C024 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C030 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C03C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C048 diff --git a/sound/voicegroups/voicegroup077.inc b/sound/voicegroups/voicegroup077.inc index 92293029c..bc174e895 100644 --- a/sound/voicegroups/voicegroup077.inc +++ b/sound/voicegroups/voicegroup077.inc @@ -13,18 +13,18 @@ voicegroup077:: @ 868C474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C4EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C4F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C504 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 868C510 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 868C510 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C51C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C528 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C534 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 868C540 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 868C540 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C54C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C558 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C564 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C570 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C57C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C588 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868C594 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 868C594 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C5A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C5AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C5B8 @@ -35,7 +35,7 @@ voicegroup077:: @ 868C474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C5F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C600 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C60C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 196 @ 868C618 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 196 @ 868C618 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C624 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C630 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C63C @@ -46,7 +46,7 @@ voicegroup077:: @ 868C474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C678 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C684 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C690 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868C69C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 868C69C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C6A8 voice_keysplit voicegroup006, KeySplitTable2 @ 868C6B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C6C0 @@ -73,7 +73,7 @@ voicegroup077:: @ 868C474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C7BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C7C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C7D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868C7E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 868C7E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C7EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C7F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868C804 diff --git a/sound/voicegroups/voicegroup078.inc b/sound/voicegroups/voicegroup078.inc index 2ca7a548c..29fc345c8 100644 --- a/sound/voicegroups/voicegroup078.inc +++ b/sound/voicegroups/voicegroup078.inc @@ -14,7 +14,7 @@ voicegroup078:: @ 868CA74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CAF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CB04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CB10 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868CB1C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 868CB1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CB28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CB34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CB40 @@ -24,7 +24,7 @@ voicegroup078:: @ 868CA74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CB70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CB7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CB88 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868CB94 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 868CB94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CBA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CBAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CBB8 @@ -35,7 +35,7 @@ voicegroup078:: @ 868CA74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CBF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CC00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CC0C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 196 @ 868CC18 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 196 @ 868CC18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CC24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CC30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CC3C @@ -45,9 +45,9 @@ voicegroup078:: @ 868CA74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CC6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CC78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CC84 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 868CC90 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 868CC90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CC9C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868CCA8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 868CCA8 voice_keysplit voicegroup006, KeySplitTable2 @ 868CCB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CCC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868CCCC diff --git a/sound/voicegroups/voicegroup079.inc b/sound/voicegroups/voicegroup079.inc index 39faa5f02..8aa13f41e 100644 --- a/sound/voicegroups/voicegroup079.inc +++ b/sound/voicegroups/voicegroup079.inc @@ -14,17 +14,17 @@ voicegroup079:: @ 868D074 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D0F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D104 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D110 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868D11C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 868D11C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D128 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D134 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 868D140 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 868D140 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D14C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D158 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D164 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D170 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D17C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D188 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868D194 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 868D194 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D1A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D1AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D1B8 @@ -45,8 +45,8 @@ voicegroup079:: @ 868D074 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D26C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D278 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D284 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 868D290 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868D29C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 868D290 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 868D29C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D2A8 voice_keysplit voicegroup006, KeySplitTable2 @ 868D2B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D2C0 @@ -73,7 +73,7 @@ voicegroup079:: @ 868D074 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D3BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D3C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D3D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868D3E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 868D3E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D3EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D3F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D404 diff --git a/sound/voicegroups/voicegroup080.inc b/sound/voicegroups/voicegroup080.inc index de3486388..1d0a21b32 100644 --- a/sound/voicegroups/voicegroup080.inc +++ b/sound/voicegroups/voicegroup080.inc @@ -24,7 +24,7 @@ voicegroup080:: @ 868D674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D770 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D77C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D788 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868D794 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 868D794 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D7A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D7AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D7B8 @@ -38,16 +38,16 @@ voicegroup080:: @ 868D674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D818 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D824 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D830 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868D83C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 868D83C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D848 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D854 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D860 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D86C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D878 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D884 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 868D890 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868D89C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868D8A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 868D890 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 868D89C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 868D8A8 voice_keysplit voicegroup006, KeySplitTable2 @ 868D8B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D8C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D8CC @@ -73,7 +73,7 @@ voicegroup080:: @ 868D674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D9BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D9C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D9D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868D9E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 868D9E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D9EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868D9F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DA04 diff --git a/sound/voicegroups/voicegroup082.inc b/sound/voicegroups/voicegroup082.inc index 9bd41676a..0e3886eb1 100644 --- a/sound/voicegroups/voicegroup082.inc +++ b/sound/voicegroups/voicegroup082.inc @@ -14,7 +14,7 @@ voicegroup082:: @ 868DC8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DD10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DD1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DD28 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868DD34 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 868DD34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DD40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DD4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DD58 @@ -24,7 +24,7 @@ voicegroup082:: @ 868DC8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DD88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DD94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DDA0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868DDAC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 868DDAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DDB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DDC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DDD0 @@ -47,7 +47,7 @@ voicegroup082:: @ 868DC8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DE9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DEA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DEB4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868DEC0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 868DEC0 voice_keysplit voicegroup006, KeySplitTable2 @ 868DECC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DED8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868DEE4 diff --git a/sound/voicegroups/voicegroup083.inc b/sound/voicegroups/voicegroup083.inc index 3bf9c4e94..4a7a6f942 100644 --- a/sound/voicegroups/voicegroup083.inc +++ b/sound/voicegroups/voicegroup083.inc @@ -9,7 +9,7 @@ voicegroup083:: @ 868E28C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E2D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E2E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E2EC - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 72, 249 @ 868E2F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 72, 249 @ 868E2F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E304 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E310 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E31C @@ -24,7 +24,7 @@ voicegroup083:: @ 868E28C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E388 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E394 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E3A0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 868E3AC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76 @ 868E3AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E3B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E3C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E3D0 @@ -35,7 +35,7 @@ voicegroup083:: @ 868E28C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E40C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E418 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E424 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868E430 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 868E430 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E43C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E448 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E454 @@ -45,8 +45,8 @@ voicegroup083:: @ 868E28C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E484 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E490 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E49C - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 868E4A8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 868E4B4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 868E4A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 868E4B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E4C0 voice_keysplit voicegroup006, KeySplitTable2 @ 868E4CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E4D8 @@ -73,7 +73,7 @@ voicegroup083:: @ 868E28C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E5D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E5E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E5EC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 868E5F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 868E5F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E604 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E610 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E61C diff --git a/sound/voicegroups/voicegroup084.inc b/sound/voicegroups/voicegroup084.inc index 52ccc9a7b..ea44d4722 100644 --- a/sound/voicegroups/voicegroup084.inc +++ b/sound/voicegroups/voicegroup084.inc @@ -14,7 +14,7 @@ voicegroup084:: @ 868E67C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E700 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E70C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E718 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868E724 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 868E724 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E730 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E73C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E748 @@ -24,7 +24,7 @@ voicegroup084:: @ 868E67C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E778 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E784 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E790 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868E79C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 868E79C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E7A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E7B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E7C0 @@ -46,8 +46,8 @@ voicegroup084:: @ 868E67C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E880 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E88C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E898 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868E8A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868E8B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 868E8A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 868E8B0 voice_keysplit voicegroup006, KeySplitTable2 @ 868E8BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E8C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E8D4 @@ -73,7 +73,7 @@ voicegroup084:: @ 868E67C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E9C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E9D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E9DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868E9E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 868E9E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868E9F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EA00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EA0C diff --git a/sound/voicegroups/voicegroup085.inc b/sound/voicegroups/voicegroup085.inc index ac05df6d1..fee99d5fc 100644 --- a/sound/voicegroups/voicegroup085.inc +++ b/sound/voicegroups/voicegroup085.inc @@ -24,7 +24,7 @@ voicegroup085:: @ 868EC7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868ED78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868ED84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868ED90 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868ED9C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 868ED9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EDA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EDB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EDC0 @@ -46,8 +46,8 @@ voicegroup085:: @ 868EC7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EE80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EE8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EE98 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868EEA4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868EEB0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 868EEA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 868EEB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EEBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EEC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EED4 @@ -73,7 +73,7 @@ voicegroup085:: @ 868EC7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EFC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EFD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EFDC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868EFE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 868EFE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868EFF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F000 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F00C diff --git a/sound/voicegroups/voicegroup086.inc b/sound/voicegroups/voicegroup086.inc index 76f33f279..88e475777 100644 --- a/sound/voicegroups/voicegroup086.inc +++ b/sound/voicegroups/voicegroup086.inc @@ -14,17 +14,17 @@ voicegroup086:: @ 868F27C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F300 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F30C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F318 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868F324 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 868F324 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F330 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F33C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 868F348 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165 @ 868F348 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F354 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F360 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F36C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F378 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F384 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F390 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 868F39C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 868F39C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F3A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F3B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F3C0 @@ -35,8 +35,8 @@ voicegroup086:: @ 868F27C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F3FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F408 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F414 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 868F420 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 868F42C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 868F420 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 868F42C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F438 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F444 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F450 @@ -46,7 +46,7 @@ voicegroup086:: @ 868F27C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F480 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F48C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F498 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 868F4A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 868F4A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F4B0 voice_keysplit voicegroup006, KeySplitTable2 @ 868F4BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F4C8 @@ -73,7 +73,7 @@ voicegroup086:: @ 868F27C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F5C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F5D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F5DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 868F5E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 868F5E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F5F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F600 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868F60C diff --git a/sound/voicegroups/voicegroup087.inc b/sound/voicegroups/voicegroup087.inc index b0c6139b1..f71016d5d 100644 --- a/sound/voicegroups/voicegroup087.inc +++ b/sound/voicegroups/voicegroup087.inc @@ -36,9 +36,9 @@ voicegroup087:: @ 868F87C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FA08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FA14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FA20 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 868FA2C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 868FA2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FA38 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 868FA44 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 868FA44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FA50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FA5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FA68 @@ -47,7 +47,7 @@ voicegroup087:: @ 868F87C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FA8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FA98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FAA4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 868FAB0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 868FAB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FABC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FAC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FAD4 diff --git a/sound/voicegroups/voicegroup088.inc b/sound/voicegroups/voicegroup088.inc index 240f2b439..6b0ecee98 100644 --- a/sound/voicegroups/voicegroup088.inc +++ b/sound/voicegroups/voicegroup088.inc @@ -14,7 +14,7 @@ voicegroup088:: @ 868FE7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FF00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FF0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FF18 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 868FF24 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 868FF24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FF30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FF3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 868FF48 @@ -46,8 +46,8 @@ voicegroup088:: @ 868FE7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8690080 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869008C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8690098 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 86900A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 239 @ 86900B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 86900A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239 @ 86900B0 voice_keysplit voicegroup006, KeySplitTable2 @ 86900BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86900C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86900D4 @@ -73,7 +73,7 @@ voicegroup088:: @ 868FE7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86901C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86901D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86901DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86901E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86901E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86901F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8690200 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869020C diff --git a/sound/voicegroups/voicegroup089.inc b/sound/voicegroups/voicegroup089.inc index 0da6aaec5..82e565444 100644 --- a/sound/voicegroups/voicegroup089.inc +++ b/sound/voicegroups/voicegroup089.inc @@ -14,7 +14,7 @@ voicegroup089:: @ 869047C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8690500 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869050C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8690518 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8690524 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8690524 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8690530 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869053C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8690548 @@ -73,7 +73,7 @@ voicegroup089:: @ 869047C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86907C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86907D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86907DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86907E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 86907E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86907F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8690800 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869080C diff --git a/sound/voicegroups/voicegroup091.inc b/sound/voicegroups/voicegroup091.inc index 2d738edb7..399735e84 100644 --- a/sound/voicegroups/voicegroup091.inc +++ b/sound/voicegroups/voicegroup091.inc @@ -9,22 +9,22 @@ voicegroup091:: @ 869107C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86910C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86910D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86910DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 72, 249 @ 86910E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 72, 249 @ 86910E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86910F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691100 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869110C - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8691118 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 8691118 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691124 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691130 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869113C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 165 @ 8691148 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165 @ 8691148 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691154 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691160 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869116C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691178 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691184 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691190 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 869119C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76 @ 869119C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86911A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86911B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86911C0 @@ -35,7 +35,7 @@ voicegroup091:: @ 869107C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86911FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691208 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691214 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8691220 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8691220 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869122C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691238 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691244 @@ -45,8 +45,8 @@ voicegroup091:: @ 869107C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691280 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869128C - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 226, 0, 38 @ 8691298 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 86912A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38 @ 8691298 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 86912A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86912B0 voice_keysplit voicegroup006, KeySplitTable2 @ 86912BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86912C8 @@ -73,7 +73,7 @@ voicegroup091:: @ 869107C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86913C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86913D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86913DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86913E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86913E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86913F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691400 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869140C diff --git a/sound/voicegroups/voicegroup092.inc b/sound/voicegroups/voicegroup092.inc index 353259de5..2bafc4853 100644 --- a/sound/voicegroups/voicegroup092.inc +++ b/sound/voicegroups/voicegroup092.inc @@ -13,7 +13,7 @@ voicegroup092:: @ 869167C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86916F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691700 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869170C - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8691718 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 8691718 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691724 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691730 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869173C @@ -24,7 +24,7 @@ voicegroup092:: @ 869167C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691778 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691784 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691790 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 869179C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76 @ 869179C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86917A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86917B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86917C0 @@ -38,7 +38,7 @@ voicegroup092:: @ 869167C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691820 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869182C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691838 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8691844 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8691844 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691850 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869185C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691868 @@ -46,7 +46,7 @@ voicegroup092:: @ 869167C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691880 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869188C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691898 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 86918A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 86918A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86918B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86918BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86918C8 diff --git a/sound/voicegroups/voicegroup093.inc b/sound/voicegroups/voicegroup093.inc index cf0350232..35fd8ccf5 100644 --- a/sound/voicegroups/voicegroup093.inc +++ b/sound/voicegroups/voicegroup093.inc @@ -13,7 +13,7 @@ voicegroup093:: @ 8691C7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691CF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691D00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691D0C - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8691D18 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 8691D18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691D24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691D30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691D3C @@ -24,7 +24,7 @@ voicegroup093:: @ 8691C7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691D78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691D84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691D90 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 8691D9C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76 @ 8691D9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691DA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691DB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691DC0 @@ -36,9 +36,9 @@ voicegroup093:: @ 8691C7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691E08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691E14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691E20 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 8691E2C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 8691E2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691E38 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8691E44 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8691E44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691E50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691E5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691E68 @@ -46,7 +46,7 @@ voicegroup093:: @ 8691C7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691E80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691E8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691E98 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 8691EA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 8691EA4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691EB0 voice_keysplit voicegroup006, KeySplitTable2 @ 8691EBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691EC8 @@ -73,7 +73,7 @@ voicegroup093:: @ 8691C7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691FC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691FD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691FDC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8691FE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 8691FE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8691FF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692000 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869200C diff --git a/sound/voicegroups/voicegroup094.inc b/sound/voicegroups/voicegroup094.inc index 95dba6417..92f5d1f3d 100644 --- a/sound/voicegroups/voicegroup094.inc +++ b/sound/voicegroups/voicegroup094.inc @@ -9,22 +9,22 @@ voicegroup094:: @ 869227C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86922C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86922D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86922DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 72, 249 @ 86922E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 72, 249 @ 86922E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86922F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692300 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869230C - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8692318 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8692324 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 8692318 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8692324 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692330 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869233C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8692348 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8692348 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692354 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692360 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869236C - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 8692378 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 8692378 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692384 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692390 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 869239C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76 @ 869239C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86923A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86923B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86923C0 @@ -47,7 +47,7 @@ voicegroup094:: @ 869227C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869248C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692498 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86924A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86924B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 86924B0 voice_keysplit voicegroup006, KeySplitTable2 @ 86924BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86924C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86924D4 @@ -73,7 +73,7 @@ voicegroup094:: @ 869227C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86925C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86925D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86925DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86925E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86925E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86925F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692600 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869260C diff --git a/sound/voicegroups/voicegroup095.inc b/sound/voicegroups/voicegroup095.inc index c55576bf4..feec67d53 100644 --- a/sound/voicegroups/voicegroup095.inc +++ b/sound/voicegroups/voicegroup095.inc @@ -17,14 +17,14 @@ voicegroup095:: @ 869287C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692924 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692930 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869293C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8692948 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8692948 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692954 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692960 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869296C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692978 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692984 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692990 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 869299C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 869299C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86929A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86929B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86929C0 @@ -38,7 +38,7 @@ voicegroup095:: @ 869287C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692A20 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692A2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692A38 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8692A44 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8692A44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692A50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692A5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692A68 @@ -73,7 +73,7 @@ voicegroup095:: @ 869287C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692BC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692BD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692BDC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 8692BE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 8692BE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692BF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692C00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692C0C diff --git a/sound/voicegroups/voicegroup096.inc b/sound/voicegroups/voicegroup096.inc index 90687ff3a..495b5b2f5 100644 --- a/sound/voicegroups/voicegroup096.inc +++ b/sound/voicegroups/voicegroup096.inc @@ -13,18 +13,18 @@ voicegroup096:: @ 8692E7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692EF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F0C - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8692F18 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 8692F18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F3C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8692F48 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8692F48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692F90 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8692F9C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 8692F9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692FA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692FB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8692FC0 @@ -36,9 +36,9 @@ voicegroup096:: @ 8692E7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693008 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693014 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693020 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 869302C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 869302C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693038 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8693044 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8693044 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693050 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869305C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693068 @@ -47,7 +47,7 @@ voicegroup096:: @ 8692E7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869308C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693098 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86930A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86930B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 86930B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86930BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86930C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86930D4 diff --git a/sound/voicegroups/voicegroup097.inc b/sound/voicegroups/voicegroup097.inc index 86dad29ce..dfb094bc7 100644 --- a/sound/voicegroups/voicegroup097.inc +++ b/sound/voicegroups/voicegroup097.inc @@ -14,7 +14,7 @@ voicegroup097:: @ 869347C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693500 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869350C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693518 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8693524 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8693524 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693530 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869353C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693548 @@ -47,7 +47,7 @@ voicegroup097:: @ 869347C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869368C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693698 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86936A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 249 @ 86936B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 249 @ 86936B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86936BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86936C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86936D4 diff --git a/sound/voicegroups/voicegroup098.inc b/sound/voicegroups/voicegroup098.inc index 3df7ff0c7..4814b93d0 100644 --- a/sound/voicegroups/voicegroup098.inc +++ b/sound/voicegroups/voicegroup098.inc @@ -73,7 +73,7 @@ voicegroup098:: @ 8693A7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693DC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693DD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693DDC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 8693DE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 8693DE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693DF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693E00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8693E0C @@ -126,6 +126,6 @@ voicegroup098:: @ 8693A7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694040 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869404C voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127 @ 8694058 - voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 8694064 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 8694064 voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ 8694070 diff --git a/sound/voicegroups/voicegroup099.inc b/sound/voicegroups/voicegroup099.inc index 7e29e4b47..87793e90e 100644 --- a/sound/voicegroups/voicegroup099.inc +++ b/sound/voicegroups/voicegroup099.inc @@ -13,7 +13,7 @@ voicegroup099:: @ 869407C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86940F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694100 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869410C - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8694118 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 8694118 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694124 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694130 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869413C @@ -36,9 +36,9 @@ voicegroup099:: @ 869407C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694208 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694214 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694220 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 869422C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 869422C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694238 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8694244 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8694244 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694250 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869425C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694268 diff --git a/sound/voicegroups/voicegroup100.inc b/sound/voicegroups/voicegroup100.inc index 96c3b075e..f39cc41ed 100644 --- a/sound/voicegroups/voicegroup100.inc +++ b/sound/voicegroups/voicegroup100.inc @@ -13,18 +13,18 @@ voicegroup100:: @ 869467C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86946F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694700 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869470C - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8694718 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 8694718 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694724 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694730 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869473C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8694748 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8694748 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694754 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694760 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869476C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694778 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694784 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694790 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 869479C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 869479C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86947A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86947B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86947C0 @@ -36,9 +36,9 @@ voicegroup100:: @ 869467C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694808 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694814 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694820 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 869482C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 869482C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694838 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8694844 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8694844 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694850 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869485C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694868 @@ -47,7 +47,7 @@ voicegroup100:: @ 869467C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869488C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694898 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86948A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86948B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 86948B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86948BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86948C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86948D4 @@ -73,7 +73,7 @@ voicegroup100:: @ 869467C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86949C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86949D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86949DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 86949E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 86949E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86949F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694A00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694A0C diff --git a/sound/voicegroups/voicegroup101.inc b/sound/voicegroups/voicegroup101.inc index e8e0ce584..1909e8ae3 100644 --- a/sound/voicegroups/voicegroup101.inc +++ b/sound/voicegroups/voicegroup101.inc @@ -14,7 +14,7 @@ voicegroup101:: @ 8694C7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694D00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694D0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694D18 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8694D24 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8694D24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694D30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694D3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694D48 @@ -46,8 +46,8 @@ voicegroup101:: @ 8694C7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694E80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694E8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694E98 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8694EA4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 239 @ 8694EB0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 8694EA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239 @ 8694EB0 voice_keysplit voicegroup006, KeySplitTable2 @ 8694EBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694EC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694ED4 @@ -73,7 +73,7 @@ voicegroup101:: @ 8694C7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694FC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694FD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8694FDC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8694FE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 8694FE8 voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0 @ 8694FF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695000 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869500C diff --git a/sound/voicegroups/voicegroup102.inc b/sound/voicegroups/voicegroup102.inc index 5ec7ba729..22aa8393a 100644 --- a/sound/voicegroups/voicegroup102.inc +++ b/sound/voicegroups/voicegroup102.inc @@ -24,7 +24,7 @@ voicegroup102:: @ 86951A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86952A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86952AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86952B8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 248 @ 86952C4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 248 @ 86952C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86952D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86952DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86952E8 @@ -46,7 +46,7 @@ voicegroup102:: @ 86951A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86953A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86953B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86953C0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 165 @ 86953CC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 165 @ 86953CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86953D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86953E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86953F0 diff --git a/sound/voicegroups/voicegroup103.inc b/sound/voicegroups/voicegroup103.inc index b5636babb..62780a9ab 100644 --- a/sound/voicegroups/voicegroup103.inc +++ b/sound/voicegroups/voicegroup103.inc @@ -14,7 +14,7 @@ voicegroup103:: @ 869557C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695600 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869560C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695618 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8695624 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8695624 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695630 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869563C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695648 @@ -24,7 +24,7 @@ voicegroup103:: @ 869557C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695678 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695684 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695690 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 869569C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 869569C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86956A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86956B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86956C0 @@ -46,8 +46,8 @@ voicegroup103:: @ 869557C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695780 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869578C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695798 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 86957A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 239 @ 86957B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 86957A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239 @ 86957B0 voice_keysplit voicegroup006, KeySplitTable2 @ 86957BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86957C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86957D4 diff --git a/sound/voicegroups/voicegroup104.inc b/sound/voicegroups/voicegroup104.inc index 2181efe15..b13ff6594 100644 --- a/sound/voicegroups/voicegroup104.inc +++ b/sound/voicegroups/voicegroup104.inc @@ -46,7 +46,7 @@ voicegroup104:: @ 8695B7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695D80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695D8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695D98 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8695DA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 8695DA4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695DB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695DBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8695DC8 diff --git a/sound/voicegroups/voicegroup105.inc b/sound/voicegroups/voicegroup105.inc index 75dc15769..5acba78cc 100644 --- a/sound/voicegroups/voicegroup105.inc +++ b/sound/voicegroups/voicegroup105.inc @@ -13,7 +13,7 @@ voicegroup105:: @ 869608C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696104 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696110 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869611C - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 216 @ 8696128 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 216 @ 8696128 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696134 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696140 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869614C diff --git a/sound/voicegroups/voicegroup106.inc b/sound/voicegroups/voicegroup106.inc index f56b9cfd6..267921b62 100644 --- a/sound/voicegroups/voicegroup106.inc +++ b/sound/voicegroups/voicegroup106.inc @@ -14,17 +14,17 @@ voicegroup106:: @ 8696470 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86964F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696500 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869650C - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8696518 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8696518 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696524 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696530 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 64, 38, 128, 226 @ 869653C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 38, 128, 226 @ 869653C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696548 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696554 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696560 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869656C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696578 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696584 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 8696590 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76 @ 8696590 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869659C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86965A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86965B4 @@ -38,7 +38,7 @@ voicegroup106:: @ 8696470 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696614 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696620 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869662C - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8696638 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8696638 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696644 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696650 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869665C @@ -46,8 +46,8 @@ voicegroup106:: @ 8696470 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696680 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869668C - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8696698 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 86966A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 8696698 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 86966A4 voice_keysplit voicegroup006, KeySplitTable2 @ 86966B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86966BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86966C8 @@ -73,7 +73,7 @@ voicegroup106:: @ 8696470 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86967B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86967C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86967D0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86967DC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86967DC voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0 @ 86967E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86967F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696800 diff --git a/sound/voicegroups/voicegroup107.inc b/sound/voicegroups/voicegroup107.inc index 5d8e91eef..527e23971 100644 --- a/sound/voicegroups/voicegroup107.inc +++ b/sound/voicegroups/voicegroup107.inc @@ -14,7 +14,7 @@ voicegroup107:: @ 8696A70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696AF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696B00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696B0C - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8696B18 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8696B18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696B24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696B30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696B3C @@ -24,7 +24,7 @@ voicegroup107:: @ 8696A70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696B6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696B78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696B84 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 8696B90 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76 @ 8696B90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696B9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696BA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696BB4 @@ -46,7 +46,7 @@ voicegroup107:: @ 8696A70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696C74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696C80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696C8C - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8696C98 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 8696C98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696CA4 voice_keysplit voicegroup006, KeySplitTable2 @ 8696CB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8696CBC diff --git a/sound/voicegroups/voicegroup108.inc b/sound/voicegroups/voicegroup108.inc index 331078f5c..d6bd6cf1f 100644 --- a/sound/voicegroups/voicegroup108.inc +++ b/sound/voicegroups/voicegroup108.inc @@ -24,7 +24,7 @@ voicegroup108:: @ 8697070 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869716C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697178 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697184 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 76 @ 8697190 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76 @ 8697190 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869719C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86971A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86971B4 @@ -35,7 +35,7 @@ voicegroup108:: @ 8697070 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86971F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86971FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697208 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8697214 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8697214 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697220 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869722C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697238 @@ -46,7 +46,7 @@ voicegroup108:: @ 8697070 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697280 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869728C - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8697298 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 8697298 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86972A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86972B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86972BC diff --git a/sound/voicegroups/voicegroup109.inc b/sound/voicegroups/voicegroup109.inc index 0ed2027c4..8dd614217 100644 --- a/sound/voicegroups/voicegroup109.inc +++ b/sound/voicegroups/voicegroup109.inc @@ -19,8 +19,8 @@ voicegroup109:: @ 8697670 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697730 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869773C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697748 - voice_directsound 60, 0, DirectSoundWaveData_unknown_church_organ, 255, 76, 154, 188 @ 8697754 - voice_directsound 60, 0, DirectSoundWaveData_emu_ii_pipe_organ, 255, 76, 154, 188 @ 8697760 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_church_organ3_low, 255, 76, 154, 188 @ 8697754 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_church_organ3_high, 255, 76, 154, 188 @ 8697760 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869776C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697778 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697784 @@ -35,7 +35,7 @@ voicegroup109:: @ 8697670 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86977F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86977FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697808 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8697814 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8697814 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697820 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869782C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697838 diff --git a/sound/voicegroups/voicegroup110.inc b/sound/voicegroups/voicegroup110.inc index 82128272d..f29928c5f 100644 --- a/sound/voicegroups/voicegroup110.inc +++ b/sound/voicegroups/voicegroup110.inc @@ -14,7 +14,7 @@ voicegroup110:: @ 8697A54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697AD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697AE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697AF0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8697AFC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8697AFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697B08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697B14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697B20 @@ -46,8 +46,8 @@ voicegroup110:: @ 8697A54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697C58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697C64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697C70 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8697C7C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 239 @ 8697C88 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 8697C7C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239 @ 8697C88 voice_keysplit voicegroup006, KeySplitTable2 @ 8697C94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697CA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8697CAC diff --git a/sound/voicegroups/voicegroup111.inc b/sound/voicegroups/voicegroup111.inc index dd3c7bff9..f4bf65fdc 100644 --- a/sound/voicegroups/voicegroup111.inc +++ b/sound/voicegroups/voicegroup111.inc @@ -17,7 +17,7 @@ voicegroup111:: @ 8698054 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86980FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698108 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698114 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8698120 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 8698120 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869812C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698138 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698144 diff --git a/sound/voicegroups/voicegroup112.inc b/sound/voicegroups/voicegroup112.inc index 060d89d92..1bafa809f 100644 --- a/sound/voicegroups/voicegroup112.inc +++ b/sound/voicegroups/voicegroup112.inc @@ -14,17 +14,17 @@ voicegroup112:: @ 8698654 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86986D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86986E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86986F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86986FC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86986FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698708 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698714 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 8698720 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 8698720 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869872C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698738 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698744 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698750 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869875C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698768 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 76 @ 8698774 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76 @ 8698774 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698780 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869878C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698798 @@ -35,10 +35,10 @@ voicegroup112:: @ 8698654 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86987D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86987E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86987EC - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86987F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86987F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698804 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698810 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 128, 252, 0, 115 @ 869881C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 128, 252, 0, 115 @ 869881C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698828 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698834 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698840 @@ -46,7 +46,7 @@ voicegroup112:: @ 8698654 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698858 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698864 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698870 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 869887C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 869887C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698888 voice_keysplit voicegroup006, KeySplitTable2 @ 8698894 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86988A0 diff --git a/sound/voicegroups/voicegroup113.inc b/sound/voicegroups/voicegroup113.inc index d516fa09a..d70870112 100644 --- a/sound/voicegroups/voicegroup113.inc +++ b/sound/voicegroups/voicegroup113.inc @@ -12,9 +12,9 @@ voicegroup113:: @ 8698C54 voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48E0, 0, 7, 15, 1 @ 8698CC0 voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48F0, 0, 7, 15, 1 @ 8698CCC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698CD8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8698CE4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 8698CE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698CF0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8698CFC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8698CFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698D08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698D14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698D20 @@ -35,10 +35,10 @@ voicegroup113:: @ 8698C54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698DD4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698DE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698DEC - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8698DF8 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 8698E04 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8698DF8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 8698E04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698E10 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8698E1C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8698E1C voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 1 @ 8698E28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698E34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698E40 @@ -47,7 +47,7 @@ voicegroup113:: @ 8698C54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698E64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698E70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698E7C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 180, 246 @ 8698E88 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246 @ 8698E88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698E94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698EA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698EAC @@ -73,7 +73,7 @@ voicegroup113:: @ 8698C54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698F9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698FA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698FB4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 127 @ 8698FC0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127 @ 8698FC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698FCC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698FD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8698FE4 diff --git a/sound/voicegroups/voicegroup114.inc b/sound/voicegroups/voicegroup114.inc index 084185b23..1c2eaa98e 100644 --- a/sound/voicegroups/voicegroup114.inc +++ b/sound/voicegroups/voicegroup114.inc @@ -14,7 +14,7 @@ voicegroup114:: @ 8699254 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86992D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86992E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86992F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242 @ 86992FC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242 @ 86992FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699308 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699314 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699320 @@ -33,7 +33,7 @@ voicegroup114:: @ 8699254 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86993BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86993C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86993D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86993E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 86993E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86993EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86993F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699404 @@ -47,7 +47,7 @@ voicegroup114:: @ 8699254 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699464 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699470 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869947C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 8699488 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 8699488 voice_keysplit voicegroup006, KeySplitTable2 @ 8699494 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86994A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86994AC @@ -73,7 +73,7 @@ voicegroup114:: @ 8699254 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869959C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86995A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86995B4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86995C0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86995C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86995CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86995D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86995E4 @@ -127,5 +127,5 @@ voicegroup114:: @ 8699254 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699824 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699830 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869983C - voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 8699848 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 @ 8699848 diff --git a/sound/voicegroups/voicegroup115.inc b/sound/voicegroups/voicegroup115.inc index 73422e403..caa336237 100644 --- a/sound/voicegroups/voicegroup115.inc +++ b/sound/voicegroups/voicegroup115.inc @@ -14,18 +14,18 @@ voicegroup115:: @ 8699854 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86998D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86998E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86998F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86998FC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86998FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699908 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699914 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8699920 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 8699920 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869992C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699938 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699944 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699950 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869995C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699968 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 204 @ 8699974 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 8699980 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 204 @ 8699974 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 8699980 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869998C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699998 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86999A4 @@ -33,21 +33,21 @@ voicegroup115:: @ 8699854 voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 165, 154, 165 @ 86999BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86999C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86999D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86999E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 86999E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86999EC - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 198 @ 86999F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 198 @ 86999F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699A04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699A10 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 146 @ 8699A1C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 146 @ 8699A1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699A28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699A34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699A40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699A4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699A58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699A64 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 8699A70 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 8699A7C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 8699A88 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 8699A70 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 8699A7C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 8699A88 voice_keysplit voicegroup006, KeySplitTable2 @ 8699A94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699AA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699AAC diff --git a/sound/voicegroups/voicegroup116.inc b/sound/voicegroups/voicegroup116.inc index 840122c9a..b9cbd5833 100644 --- a/sound/voicegroups/voicegroup116.inc +++ b/sound/voicegroups/voicegroup116.inc @@ -17,14 +17,14 @@ voicegroup116:: @ 8699E54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699EFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699F08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699F14 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 190, 115 @ 8699F20 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 190, 115 @ 8699F20 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699F2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699F38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699F44 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 8699F50 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 8699F50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699F5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699F68 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 216 @ 8699F74 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 216 @ 8699F74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699F80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699F8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699F98 @@ -33,12 +33,12 @@ voicegroup116:: @ 8699E54 voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 8699FBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699FC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699FD4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 8699FE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 8699FE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699FEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8699FF8 - voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 180, 216 @ 869A004 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216 @ 869A004 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A010 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 869A01C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 869A01C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A028 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A034 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A040 diff --git a/sound/voicegroups/voicegroup117.inc b/sound/voicegroups/voicegroup117.inc index 626c6f7f1..014153021 100644 --- a/sound/voicegroups/voicegroup117.inc +++ b/sound/voicegroups/voicegroup117.inc @@ -33,7 +33,7 @@ voicegroup117:: @ 869A454 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A5BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A5C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A5D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869A5E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 869A5E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A5EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A5F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A604 @@ -46,8 +46,8 @@ voicegroup117:: @ 869A454 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A658 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A664 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A670 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 869A67C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869A688 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 869A67C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869A688 voice_keysplit voicegroup006, KeySplitTable2 @ 869A694 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A6A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A6AC diff --git a/sound/voicegroups/voicegroup118.inc b/sound/voicegroups/voicegroup118.inc index ccd58e60a..1675cf1ee 100644 --- a/sound/voicegroups/voicegroup118.inc +++ b/sound/voicegroups/voicegroup118.inc @@ -14,14 +14,14 @@ voicegroup118:: @ 869A82C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A8B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A8BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A8C8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 250, 0, 242 @ 869A8D4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 250, 0, 242 @ 869A8D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A8E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A8EC - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 869A8F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 869A8F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A904 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A910 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A91C - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 869A928 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 869A928 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A934 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A940 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A94C @@ -33,12 +33,12 @@ voicegroup118:: @ 869A82C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A994 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A9A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A9AC - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869A9B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 869A9B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A9C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A9D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A9DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869A9E8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 869A9F4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 869A9F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AA00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AA0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AA18 @@ -46,8 +46,8 @@ voicegroup118:: @ 869A82C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AA30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AA3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AA48 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 869AA54 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869AA60 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 869AA54 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869AA60 voice_keysplit voicegroup006, KeySplitTable2 @ 869AA6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AA78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AA84 @@ -90,5 +90,5 @@ voicegroup118:: @ 869A82C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AC40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AC4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AC58 - voice_directsound 60, 0, DirectSoundWaveData_unknown_polysynth, 255, 0, 255, 127 @ 869AC64 + voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 0, 255, 127 @ 869AC64 diff --git a/sound/voicegroups/voicegroup119.inc b/sound/voicegroups/voicegroup119.inc index a4bc50cb5..0bba5d48b 100644 --- a/sound/voicegroups/voicegroup119.inc +++ b/sound/voicegroups/voicegroup119.inc @@ -17,7 +17,7 @@ voicegroup119:: @ 869AC70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AD18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AD24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AD30 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 869AD3C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 869AD3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AD48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AD54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AD60 @@ -33,7 +33,7 @@ voicegroup119:: @ 869AC70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869ADD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869ADE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869ADF0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869ADFC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 869ADFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AE08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AE14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AE20 @@ -46,8 +46,8 @@ voicegroup119:: @ 869AC70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AE74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AE80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AE8C - voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88_timpani_with_snare, 255, 246, 0, 226 @ 869AE98 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869AEA4 + voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88pro_timpani_with_snare, 255, 246, 0, 226 @ 869AE98 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869AEA4 voice_keysplit voicegroup006, KeySplitTable2 @ 869AEB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AEBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869AEC8 diff --git a/sound/voicegroups/voicegroup120.inc b/sound/voicegroups/voicegroup120.inc index 21b289f57..eb1bb463b 100644 --- a/sound/voicegroups/voicegroup120.inc +++ b/sound/voicegroups/voicegroup120.inc @@ -33,7 +33,7 @@ voicegroup120:: @ 869B0B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B21C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B228 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B234 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869B240 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 869B240 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B24C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B258 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B264 @@ -45,9 +45,9 @@ voicegroup120:: @ 869B0B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B2AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B2B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B2C4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 869B2D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 869B2D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B2DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869B2E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869B2E8 voice_keysplit voicegroup006, KeySplitTable2 @ 869B2F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B300 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B30C diff --git a/sound/voicegroups/voicegroup121.inc b/sound/voicegroups/voicegroup121.inc index 191684192..eca6ff4b6 100644 --- a/sound/voicegroups/voicegroup121.inc +++ b/sound/voicegroups/voicegroup121.inc @@ -33,7 +33,7 @@ voicegroup121:: @ 869B4F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B660 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B66C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B678 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869B684 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 869B684 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B690 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B69C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B6A8 @@ -45,9 +45,9 @@ voicegroup121:: @ 869B4F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B6F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B6FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B708 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 869B714 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 869B714 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B720 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869B72C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869B72C voice_keysplit voicegroup006, KeySplitTable2 @ 869B738 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B744 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B750 @@ -73,7 +73,7 @@ voicegroup121:: @ 869B4F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B840 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B84C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B858 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 869B864 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 869B864 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B870 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B87C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869B888 diff --git a/sound/voicegroups/voicegroup122.inc b/sound/voicegroups/voicegroup122.inc index 4afa2e10b..45c052cf1 100644 --- a/sound/voicegroups/voicegroup122.inc +++ b/sound/voicegroups/voicegroup122.inc @@ -36,7 +36,7 @@ voicegroup122:: @ 869B900 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BA8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BA98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BAA4 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 869BAB0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 869BAB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BABC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BAC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BAD4 @@ -45,9 +45,9 @@ voicegroup122:: @ 869B900 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BAF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BB04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BB10 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 869BB1C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 869BB1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BB28 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869BB34 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869BB34 voice_keysplit voicegroup006, KeySplitTable2 @ 869BB40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BB4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BB58 @@ -56,7 +56,7 @@ voicegroup122:: @ 869B900 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BB7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BB88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BB94 - voice_directsound 60, 0, DirectSoundWaveData_unknown_polysynth, 255, 165, 154, 127 @ 869BBA0 + voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 165, 154, 127 @ 869BBA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BBAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BBB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BBC4 diff --git a/sound/voicegroups/voicegroup123.inc b/sound/voicegroups/voicegroup123.inc index 28fcb226b..ab048cac0 100644 --- a/sound/voicegroups/voicegroup123.inc +++ b/sound/voicegroups/voicegroup123.inc @@ -14,7 +14,7 @@ voicegroup123:: @ 869BCF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BD74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BD80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BD8C - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 216, 90, 242 @ 869BD98 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242 @ 869BD98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BDA4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BDB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BDBC @@ -33,7 +33,7 @@ voicegroup123:: @ 869BCF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BE58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BE64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BE70 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869BE7C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 869BE7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BE88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BE94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BEA0 @@ -47,7 +47,7 @@ voicegroup123:: @ 869BCF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BF00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BF0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BF18 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869BF24 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869BF24 voice_keysplit voicegroup006, KeySplitTable2 @ 869BF30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BF3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869BF48 @@ -73,7 +73,7 @@ voicegroup123:: @ 869BCF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C038 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C044 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C050 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 869C05C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 869C05C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C068 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C074 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C080 @@ -127,5 +127,5 @@ voicegroup123:: @ 869BCF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C2C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C2CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C2D8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 869C2E4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 @ 869C2E4 diff --git a/sound/voicegroups/voicegroup124.inc b/sound/voicegroups/voicegroup124.inc index e34f12a22..630ab4a15 100644 --- a/sound/voicegroups/voicegroup124.inc +++ b/sound/voicegroups/voicegroup124.inc @@ -33,7 +33,7 @@ voicegroup124:: @ 869C2F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C458 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C464 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C470 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 869C47C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 869C47C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C488 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C494 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C4A0 @@ -46,8 +46,8 @@ voicegroup124:: @ 869C2F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C4F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C500 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C50C - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 869C518 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869C524 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 869C518 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869C524 voice_keysplit voicegroup006, KeySplitTable2 @ 869C530 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C53C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C548 diff --git a/sound/voicegroups/voicegroup125.inc b/sound/voicegroups/voicegroup125.inc index 96f2bf1f1..17a72153e 100644 --- a/sound/voicegroups/voicegroup125.inc +++ b/sound/voicegroups/voicegroup125.inc @@ -38,7 +38,7 @@ voicegroup125:: @ 869C704 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C8A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C8B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C8C0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 869C8CC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 869C8CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C8D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C8E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C8F0 @@ -47,7 +47,7 @@ voicegroup125:: @ 869C704 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C914 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C920 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C92C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869C938 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869C938 voice_keysplit voicegroup006, KeySplitTable2 @ 869C944 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C950 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869C95C diff --git a/sound/voicegroups/voicegroup126.inc b/sound/voicegroups/voicegroup126.inc index aea6cdb81..f169edb80 100644 --- a/sound/voicegroups/voicegroup126.inc +++ b/sound/voicegroups/voicegroup126.inc @@ -33,7 +33,7 @@ voicegroup126:: @ 869CAF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CC5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CC68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CC74 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 99 @ 869CC80 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99 @ 869CC80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CC8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CC98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CCA4 @@ -47,7 +47,7 @@ voicegroup126:: @ 869CAF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CD04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CD10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CD1C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869CD28 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869CD28 voice_keysplit voicegroup006, KeySplitTable2 @ 869CD34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CD40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869CD4C @@ -126,6 +126,6 @@ voicegroup126:: @ 869CAF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869D0B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869D0C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869D0D0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 216 @ 869D0DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 869D0E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 216 @ 869D0DC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 @ 869D0E8 diff --git a/sound/voicegroups/voicegroup127.inc b/sound/voicegroups/voicegroup127.inc index a0f650f1d..ee83df628 100644 --- a/sound/voicegroups/voicegroup127.inc +++ b/sound/voicegroups/voicegroup127.inc @@ -13,8 +13,8 @@ voicegroup127:: @ 869D0F4 voice_square_1_alt 60, 0, 0, 2, 2, 0, 15, 0 @ 869D16C voice_square_1_alt 60, 0, 0, 1, 2, 0, 15, 0 @ 869D178 voice_square_1_alt 60, 0, 23, 1, 0, 1, 9, 0 @ 869D184 - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 165 @ 869D190 - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 226, 0, 165 @ 869D19C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 165 @ 869D190 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 165 @ 869D19C voice_square_1_alt 60, 0, 0, 2, 0, 6, 0, 1 @ 869D1A8 voice_square_1_alt 60, 0, 36, 0, 0, 2, 0, 0 @ 869D1B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869D1C0 @@ -47,7 +47,7 @@ voicegroup127:: @ 869D0F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869D304 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869D310 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869D31C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 869D328 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 869D328 voice_keysplit voicegroup006, KeySplitTable2 @ 869D334 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869D340 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869D34C diff --git a/sound/voicegroups/voicegroup128.inc b/sound/voicegroups/voicegroup128.inc index 25d584300..ef4227e16 100644 --- a/sound/voicegroups/voicegroup128.inc +++ b/sound/voicegroups/voicegroup128.inc @@ -3,77 +3,77 @@ voicegroup128:: @ 869D6F4 voice_directsound_no_resample 60, 0, DirectSoundWaveData_bicycle_bell, 255, 249, 0, 165 @ 869D6F4 voice_directsound_alt 60, 0, DirectSoundWaveData_bicycle_bell, 255, 0, 255, 165 @ 869D700 voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 0, 255, 165 @ 869D70C - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 242, 0, 127 @ 869D718 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 242, 0, 127 @ 869D718 voice_noise_alt 60, 0, 0, 0, 1, 0, 1 @ 869D724 voice_noise_alt 60, 0, 1, 0, 1, 0, 1 @ 869D730 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 255, 165 @ 869D73C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 255, 165 @ 869D73C voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1 @ 869D748 voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165 @ 869D754 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 0, 255, 127 @ 869D760 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 0, 255, 127 @ 869D760 voice_directsound 60, 0, DirectSoundWaveData_872762C, 255, 0, 255, 127 @ 869D76C voice_noise_alt 60, 0, 1, 0, 2, 0, 0 @ 869D778 voice_square_1 60, 0, 103, 3, 2, 7, 0, 0 @ 869D784 voice_square_2 60, 0, 3, 2, 7, 0, 0 @ 869D790 - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 226, 0, 127 @ 869D79C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127 @ 869D79C voice_directsound 60, 0, DirectSoundWaveData_872921C, 255, 0, 255, 0 @ 869D7A8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 204, 0, 127 @ 869D7B4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127 @ 869D7B4 voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1 @ 869D7C0 voice_directsound 60, 0, DirectSoundWaveData_872A5D0, 255, 0, 255, 127 @ 869D7CC - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 869D7D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 @ 869D7D8 voice_square_1 60, 0, 103, 0, 0, 7, 0, 0 @ 869D7E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 127 @ 869D7F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_wind, 255, 0, 255, 127 @ 869D7FC - voice_directsound 60, 0, DirectSoundWaveData_sc88_bubbles, 255, 0, 255, 127 @ 869D808 - voice_directsound 60, 0, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 127 @ 869D814 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 127 @ 869D7F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_wind, 255, 0, 255, 127 @ 869D7FC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_bubbles, 255, 0, 255, 127 @ 869D808 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 127 @ 869D814 voice_noise_alt 60, 0, 0, 0, 7, 15, 1 @ 869D820 voice_directsound 60, 0, DirectSoundWaveData_872EEA8, 255, 0, 255, 127 @ 869D82C voice_noise_alt 60, 0, 1, 0, 7, 15, 1 @ 869D838 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 246, 0, 127 @ 869D844 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 246, 0, 127 @ 869D844 voice_directsound 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127 @ 869D850 voice_square_1_alt 60, 0, 19, 2, 0, 2, 0, 0 @ 869D85C - voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 255, 0, 255, 127 @ 869D868 + voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 0, 255, 127 @ 869D868 voice_square_1 60, 0, 103, 0, 0, 0, 15, 0 @ 869D874 voice_directsound_alt 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127 @ 869D880 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 255, 255, 127 @ 869D88C - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 0, 255, 127 @ 869D898 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 255, 255, 127 @ 869D88C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 0, 255, 127 @ 869D898 voice_directsound 60, 0, DirectSoundWaveData_8734298, 255, 0, 255, 127 @ 869D8A4 - voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 255, 242, 0, 0 @ 869D8B0 + voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 242, 0, 0 @ 869D8B0 voice_directsound 60, 0, DirectSoundWaveData_87364A8, 255, 0, 255, 0 @ 869D8BC - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 869D8C8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 869D8C8 voice_directsound 60, 0, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188 @ 869D8D4 voice_directsound 60, 0, DirectSoundWaveData_87385E4, 255, 249, 0, 165 @ 869D8E0 voice_square_1 60, 0, 0, 0, 4, 6, 0, 0 @ 869D8EC - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 13, 0, 255, 127 @ 869D8F8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 13, 0, 255, 127 @ 869D904 - voice_directsound 60, 0, DirectSoundWaveData_unknown_polysynth, 255, 0, 255, 127 @ 869D910 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 252, 0, 204 @ 869D91C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 13, 0, 255, 127 @ 869D8F8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 13, 0, 255, 127 @ 869D904 + voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 0, 255, 127 @ 869D910 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 252, 0, 204 @ 869D91C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869D928 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 869D934 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 869D934 voice_square_1 60, 0, 0, 0, 4, 0, 15, 0 @ 869D940 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 188, 0, 0 @ 869D94C - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 226, 0, 127 @ 869D958 - voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 26, 0, 255, 127 @ 869D964 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 188, 0, 0 @ 869D94C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 226, 0, 127 @ 869D958 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 26, 0, 255, 127 @ 869D964 voice_square_1_alt 60, 0, 0, 2, 0, 1, 0, 0 @ 869D970 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 252, 0, 127 @ 869D97C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 252, 0, 127 @ 869D97C voice_square_1_alt 60, 0, 0, 1, 0, 2, 0, 0 @ 869D988 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 127, 0, 127 @ 869D994 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 127, 0, 127 @ 869D994 voice_noise_alt 60, 0, 0, 1, 6, 0, 0 @ 869D9A0 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 255, 255, 127 @ 869D9AC - voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 869D9B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 255, 255, 127 @ 869D9AC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 869D9B8 voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127 @ 869D9C4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_72, 11, 242, 0, 127 @ 869D9D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 11, 242, 0, 127 @ 869D9D0 voice_square_1_alt 60, 0, 0, 2, 4, 6, 0, 0 @ 869D9DC voice_directsound 60, 0, DirectSoundWaveData_8740818, 255, 255, 255, 127 @ 869D9E8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 869D9F4 - voice_directsound 60, 0, DirectSoundWaveData_unknown_tom, 255, 0, 255, 165 @ 869DA00 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 869D9F4 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc55_tom, 255, 0, 255, 165 @ 869DA00 voice_noise_alt 60, 0, 0, 5, 7, 15, 1 @ 869DA0C - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 128, 242, 0, 165 @ 869DA18 - voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_72, 255, 0, 255, 165 @ 869DA24 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 128, 242, 0, 165 @ 869DA18 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 165 @ 869DA24 voice_square_1 60, 0, 0, 0, 1, 5, 0, 0 @ 869DA30 voice_noise_alt 60, 0, 0, 6, 6, 0, 1 @ 869DA3C voice_noise_alt 60, 0, 0, 3, 6, 0, 1 @ 869DA48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869DA54 - voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 15, 127, 231, 127 @ 869DA60 + voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 15, 127, 231, 127 @ 869DA60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869DA6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869DA78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 869DA84 diff --git a/sound/voicegroups/voicegroup129.inc b/sound/voicegroups/voicegroup129.inc index 1f85b7501..224329a48 100644 --- a/sound/voicegroups/voicegroup129.inc +++ b/sound/voicegroups/voicegroup129.inc @@ -1,19 +1,19 @@ .align 2 voicegroup129:: @ 86A0154 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0154 - voice_directsound 60, 0, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86A0160 - voice_directsound 60, 0, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86A016C - voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 226, 25, 0 @ 86A0178 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 86A0160 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 86A016C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 226, 25, 0 @ 86A0178 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0184 voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165 @ 86A0190 voice_directsound 60, 0, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86A019C - voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_high, 255, 204, 128, 249 @ 86A01A8 + voice_directsound 60, 0, DirectSoundWaveData_sd90_open_triangle, 255, 204, 128, 249 @ 86A01A8 voice_directsound 60, 0, DirectSoundWaveData_register_noise, 255, 0, 255, 76 @ 86A01B4 voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204 @ 86A01C0 - voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 206, 38 @ 86A01CC - voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 206, 0 @ 86A01D8 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 206, 38 @ 86A01CC + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 206, 0 @ 86A01D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A01E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 216 @ 86A01F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 216 @ 86A01F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A01FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0208 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0214 @@ -24,7 +24,7 @@ voicegroup129:: @ 86A0154 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0250 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A025C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0268 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 86A0274 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 86A0274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0280 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A028C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0298 @@ -38,7 +38,7 @@ voicegroup129:: @ 86A0154 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A02F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0304 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0310 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A031C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 86A031C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0328 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0334 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0340 @@ -46,9 +46,9 @@ voicegroup129:: @ 86A0154 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0358 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0364 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0370 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 252, 0, 204 @ 86A037C - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86A0388 - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 204, 0, 127 @ 86A0394 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 252, 0, 204 @ 86A037C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 86A0388 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127 @ 86A0394 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A03A0 voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0 @ 86A03AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A03B8 @@ -116,7 +116,7 @@ voicegroup129:: @ 86A0154 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A06A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A06AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A06B8 - voice_directsound 60, 0, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 86A06C4 + voice_directsound 60, 0, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 86A06C4 voice_directsound 60, 0, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86A06D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A06DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A06E8 diff --git a/sound/voicegroups/voicegroup130.inc b/sound/voicegroups/voicegroup130.inc index b10c314da..d322326e9 100644 --- a/sound/voicegroups/voicegroup130.inc +++ b/sound/voicegroups/voicegroup130.inc @@ -72,7 +72,7 @@ voicegroup130:: @ 86A0754 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0A90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0A9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0AA8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion_duplicate, 255, 249, 25, 248 @ 86A0AB4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion_duplicate, 255, 249, 25, 248 @ 86A0AB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0AC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0ACC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A0AD8 diff --git a/sound/voicegroups/voicegroup131.inc b/sound/voicegroups/voicegroup131.inc index 1f1b53812..ff98f6f82 100644 --- a/sound/voicegroups/voicegroup131.inc +++ b/sound/voicegroups/voicegroup131.inc @@ -24,7 +24,7 @@ voicegroup131:: @ 86A0FB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A10B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A10C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A10CC - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 86A10D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 @ 86A10D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A10E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A10F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A10FC diff --git a/sound/voicegroups/voicegroup132.inc b/sound/voicegroups/voicegroup132.inc index 00eb8b3f9..48247b457 100644 --- a/sound/voicegroups/voicegroup132.inc +++ b/sound/voicegroups/voicegroup132.inc @@ -14,17 +14,17 @@ voicegroup132:: @ 86A15B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A163C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1648 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1654 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 86A1660 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 @ 86A1660 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A166C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1678 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 118, 137 @ 86A1684 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 118, 137 @ 86A1684 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1690 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A169C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A16A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A16B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A16C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A16CC - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 51, 204, 92, 226 @ 86A16D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226 @ 86A16D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A16E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A16F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A16FC @@ -47,7 +47,7 @@ voicegroup132:: @ 86A15B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A17C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A17D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A17E0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 165, 154, 235 @ 86A17EC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 165, 154, 235 @ 86A17EC voice_keysplit voicegroup006, KeySplitTable2 @ 86A17F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1804 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1810 @@ -73,7 +73,7 @@ voicegroup132:: @ 86A15B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1900 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A190C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1918 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86A1924 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86A1924 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1930 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A193C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1948 diff --git a/sound/voicegroups/voicegroup133.inc b/sound/voicegroups/voicegroup133.inc index 8357e4bbd..766d7ef8f 100644 --- a/sound/voicegroups/voicegroup133.inc +++ b/sound/voicegroups/voicegroup133.inc @@ -10,21 +10,21 @@ voicegroup133:: @ 86A1BB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1C0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1C18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1C24 - voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86A1C30 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86A1C30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1C3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1C48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1C54 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A1C60 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86A1C60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1C6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1C78 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 108, 137 @ 86A1C84 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137 @ 86A1C84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1C90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1C9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1CA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1CB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1CC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1CCC - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 86A1CD8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 @ 86A1CD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1CE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1CF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1CFC @@ -38,8 +38,8 @@ voicegroup133:: @ 86A1BB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1D5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1D68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1D74 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A1D80 - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 86A1D8C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 86A1D80 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 @ 86A1D8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1D98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1DA4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1DB0 @@ -47,7 +47,7 @@ voicegroup133:: @ 86A1BB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1DC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1DD4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1DE0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 86A1DEC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 @ 86A1DEC voice_keysplit voicegroup006, KeySplitTable2 @ 86A1DF8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1E04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A1E10 diff --git a/sound/voicegroups/voicegroup134.inc b/sound/voicegroups/voicegroup134.inc index caae639d4..e689983d7 100644 --- a/sound/voicegroups/voicegroup134.inc +++ b/sound/voicegroups/voicegroup134.inc @@ -47,7 +47,7 @@ voicegroup134:: @ 86A21B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A23C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A23D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A23E0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 86A23EC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 86A23EC voice_keysplit voicegroup006, KeySplitTable2 @ 86A23F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A2404 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A2410 diff --git a/sound/voicegroups/voicegroup135.inc b/sound/voicegroups/voicegroup135.inc index 4d96ab628..09b7843c9 100644 --- a/sound/voicegroups/voicegroup135.inc +++ b/sound/voicegroups/voicegroup135.inc @@ -21,7 +21,7 @@ voicegroup135:: @ 86A25F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A26C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A26D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A26E0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 85, 137, 180, 204 @ 86A26EC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 85, 137, 180, 204 @ 86A26EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A26F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A2704 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A2710 diff --git a/sound/voicegroups/voicegroup136.inc b/sound/voicegroups/voicegroup136.inc index fd750cb95..086956a96 100644 --- a/sound/voicegroups/voicegroup136.inc +++ b/sound/voicegroups/voicegroup136.inc @@ -38,7 +38,7 @@ voicegroup136:: @ 86A29D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A2B78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A2B84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A2B90 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A2B9C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 86A2B9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A2BA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A2BB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A2BC0 diff --git a/sound/voicegroups/voicegroup137.inc b/sound/voicegroups/voicegroup137.inc index 15438b056..17c92d591 100644 --- a/sound/voicegroups/voicegroup137.inc +++ b/sound/voicegroups/voicegroup137.inc @@ -9,12 +9,12 @@ voicegroup137:: @ 86A2FD4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A301C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3028 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3034 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 204, 51, 242 @ 86A3040 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 204, 51, 242 @ 86A3040 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A304C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3058 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3064 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3070 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A307C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86A307C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3088 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3094 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A30A0 @@ -46,8 +46,8 @@ voicegroup137:: @ 86A2FD4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A31D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A31E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A31F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 86A31FC - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 86A3208 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 86A31FC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 @ 86A3208 voice_keysplit voicegroup006, KeySplitTable2 @ 86A3214 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3220 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A322C diff --git a/sound/voicegroups/voicegroup138.inc b/sound/voicegroups/voicegroup138.inc index bfad81f3c..21e849979 100644 --- a/sound/voicegroups/voicegroup138.inc +++ b/sound/voicegroups/voicegroup138.inc @@ -17,14 +17,14 @@ voicegroup138:: @ 86A35D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A367C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3688 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3694 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86A36A0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 86A36A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A36AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A36B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A36C4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86A36D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 86A36D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A36DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A36E8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86A36F4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 86A36F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3700 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A370C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3718 @@ -46,7 +46,7 @@ voicegroup138:: @ 86A35D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A37D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A37E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A37F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86A37FC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 86A37FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3808 voice_keysplit voicegroup006, KeySplitTable2 @ 86A3814 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3820 @@ -73,7 +73,7 @@ voicegroup138:: @ 86A35D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A391C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3928 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3934 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86A3940 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86A3940 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A394C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3958 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3964 diff --git a/sound/voicegroups/voicegroup139.inc b/sound/voicegroups/voicegroup139.inc index e41a95543..fc44fa188 100644 --- a/sound/voicegroups/voicegroup139.inc +++ b/sound/voicegroups/voicegroup139.inc @@ -9,22 +9,22 @@ voicegroup139:: @ 86A3BD4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3C1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3C28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3C34 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 86A3C40 - voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86A3C4C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 @ 86A3C40 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86A3C4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3C58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3C64 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86A3C70 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A3C7C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 86A3C70 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86A3C7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3C88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3C94 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 127, 103, 201 @ 86A3CA0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 127, 103, 201 @ 86A3CA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3CAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3CB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3CC4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 37, 127, 77, 165 @ 86A3CD0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 37, 127, 77, 165 @ 86A3CD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3CDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3CE8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 51, 204, 92, 226 @ 86A3CF4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226 @ 86A3CF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3D00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3D0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3D18 @@ -46,7 +46,7 @@ voicegroup139:: @ 86A3BD4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3DD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3DE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3DF0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 226 @ 86A3DFC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 226 @ 86A3DFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3E08 voice_keysplit voicegroup006, KeySplitTable2 @ 86A3E14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3E20 @@ -73,7 +73,7 @@ voicegroup139:: @ 86A3BD4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3F1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3F28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3F34 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86A3F40 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86A3F40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3F4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3F58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A3F64 diff --git a/sound/voicegroups/voicegroup141.inc b/sound/voicegroups/voicegroup141.inc index 517044845..4923049b3 100644 --- a/sound/voicegroups/voicegroup141.inc +++ b/sound/voicegroups/voicegroup141.inc @@ -13,18 +13,18 @@ voicegroup141:: @ 86A4204 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A427C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4288 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4294 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86A42A0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 86A42A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A42AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A42B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A42C4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86A42D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 86A42D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A42DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A42E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A42F4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86A4300 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 86A4300 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A430C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4318 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 249, 25, 127 @ 86A4324 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 127 @ 86A4324 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4330 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A433C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4348 @@ -73,7 +73,7 @@ voicegroup141:: @ 86A4204 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A454C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4558 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4564 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86A4570 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86A4570 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A457C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4588 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4594 diff --git a/sound/voicegroups/voicegroup142.inc b/sound/voicegroups/voicegroup142.inc index bedd5d843..f478d6dca 100644 --- a/sound/voicegroups/voicegroup142.inc +++ b/sound/voicegroups/voicegroup142.inc @@ -17,14 +17,14 @@ voicegroup142:: @ 86A4804 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A48AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A48B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A48C4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 64, 188, 128, 201 @ 86A48D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 188, 128, 201 @ 86A48D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A48DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A48E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A48F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4900 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A490C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4918 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 195, 103, 220 @ 86A4924 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 195, 103, 220 @ 86A4924 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4930 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A493C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4948 @@ -38,7 +38,7 @@ voicegroup142:: @ 86A4804 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A49A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A49B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A49C0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 128, 188, 77, 115 @ 86A49CC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 128, 188, 77, 115 @ 86A49CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A49D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A49E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A49F0 diff --git a/sound/voicegroups/voicegroup143.inc b/sound/voicegroups/voicegroup143.inc index 270ea1303..0f528bd88 100644 --- a/sound/voicegroups/voicegroup143.inc +++ b/sound/voicegroups/voicegroup143.inc @@ -17,14 +17,14 @@ voicegroup143:: @ 86A4BF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4C9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4CA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4CB4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 160, 123, 165 @ 86A4CC0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 160, 123, 165 @ 86A4CC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4CCC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4CD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4CE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4CF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4CFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4D08 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 0 @ 86A4D14 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 0 @ 86A4D14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4D20 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4D2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A4D38 diff --git a/sound/voicegroups/voicegroup144.inc b/sound/voicegroups/voicegroup144.inc index 6a1b0c227..4a3209f06 100644 --- a/sound/voicegroups/voicegroup144.inc +++ b/sound/voicegroups/voicegroup144.inc @@ -17,14 +17,14 @@ voicegroup144:: @ 86A51F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A529C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A52A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A52B4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 85, 188, 92, 165 @ 86A52C0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 85, 127, 180, 165 @ 86A52CC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 85, 188, 92, 165 @ 86A52C0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 85, 127, 180, 165 @ 86A52CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A52D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A52E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A52F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A52FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5308 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 51, 204, 92, 226 @ 86A5314 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226 @ 86A5314 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5320 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A532C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5338 @@ -35,10 +35,10 @@ voicegroup144:: @ 86A51F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5374 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5380 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A538C - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 216 @ 86A5398 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216 @ 86A5398 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A53A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A53B0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A53BC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 86A53BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A53C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A53D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A53E0 diff --git a/sound/voicegroups/voicegroup145.inc b/sound/voicegroups/voicegroup145.inc index 6f9a0411f..d4cd030fb 100644 --- a/sound/voicegroups/voicegroup145.inc +++ b/sound/voicegroups/voicegroup145.inc @@ -17,14 +17,14 @@ voicegroup145:: @ 86A57F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A589C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A58A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A58B4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86A58C0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 86A58C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A58CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A58D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A58E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86A58F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 86A58F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A58FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5908 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86A5914 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 86A5914 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5920 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A592C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5938 @@ -46,7 +46,7 @@ voicegroup145:: @ 86A57F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A59F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5A04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5A10 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86A5A1C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 86A5A1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5A28 voice_keysplit voicegroup006, KeySplitTable2 @ 86A5A34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5A40 @@ -73,7 +73,7 @@ voicegroup145:: @ 86A57F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5B3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5B48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5B54 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86A5B60 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86A5B60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5B6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5B78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5B84 diff --git a/sound/voicegroups/voicegroup146.inc b/sound/voicegroups/voicegroup146.inc index 6781b5707..ad15ef86a 100644 --- a/sound/voicegroups/voicegroup146.inc +++ b/sound/voicegroups/voicegroup146.inc @@ -13,7 +13,7 @@ voicegroup146:: @ 86A5DF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5E6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5E78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5E84 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86A5E90 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 86A5E90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5E9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5EA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5EB4 @@ -24,7 +24,7 @@ voicegroup146:: @ 86A5DF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5EF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5EFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5F08 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 249, 25, 226 @ 86A5F14 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 226 @ 86A5F14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5F20 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5F2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A5F38 diff --git a/sound/voicegroups/voicegroup147.inc b/sound/voicegroups/voicegroup147.inc index d728fc84b..159b5df80 100644 --- a/sound/voicegroups/voicegroup147.inc +++ b/sound/voicegroups/voicegroup147.inc @@ -24,7 +24,7 @@ voicegroup147:: @ 86A63F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A64F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A64FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6508 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 249, 25, 226 @ 86A6514 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 249, 25, 226 @ 86A6514 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6520 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A652C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6538 diff --git a/sound/voicegroups/voicegroup148.inc b/sound/voicegroups/voicegroup148.inc index 32b904ff7..da14a098b 100644 --- a/sound/voicegroups/voicegroup148.inc +++ b/sound/voicegroups/voicegroup148.inc @@ -13,8 +13,8 @@ voicegroup148:: @ 86A67E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A685C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6868 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6874 - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 226, 0, 127 @ 86A6880 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A688C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127 @ 86A6880 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86A688C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6898 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A68A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A68B0 @@ -39,7 +39,7 @@ voicegroup148:: @ 86A67E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6994 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A69A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A69AC - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 86A69B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 @ 86A69B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A69C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A69D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A69DC diff --git a/sound/voicegroups/voicegroup149.inc b/sound/voicegroups/voicegroup149.inc index 2587f1403..2d009d7fe 100644 --- a/sound/voicegroups/voicegroup149.inc +++ b/sound/voicegroups/voicegroup149.inc @@ -9,12 +9,12 @@ voicegroup149:: @ 86A6DE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6E2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6E38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6E44 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 86A6E50 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 @ 86A6E50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6E5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6E68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6E74 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86A6E80 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A6E8C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 86A6E80 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86A6E8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6E98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6EA4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6EB0 @@ -46,8 +46,8 @@ voicegroup149:: @ 86A6DE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6FE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A6FF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7000 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86A700C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 165, 154, 153 @ 86A7018 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 86A700C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 165, 154, 153 @ 86A7018 voice_keysplit voicegroup006, KeySplitTable2 @ 86A7024 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7030 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A703C @@ -73,7 +73,7 @@ voicegroup149:: @ 86A6DE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A712C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7138 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7144 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86A7150 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86A7150 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A715C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7168 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7174 diff --git a/sound/voicegroups/voicegroup151.inc b/sound/voicegroups/voicegroup151.inc index bb19d0c39..ac5d1a802 100644 --- a/sound/voicegroups/voicegroup151.inc +++ b/sound/voicegroups/voicegroup151.inc @@ -14,7 +14,7 @@ voicegroup151:: @ 86A7840 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A78C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A78D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A78DC - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A78E8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86A78E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A78F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7900 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A790C @@ -47,7 +47,7 @@ voicegroup151:: @ 86A7840 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7A50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7A5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7A68 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 127 @ 86A7A74 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 127 @ 86A7A74 voice_keysplit voicegroup006, KeySplitTable2 @ 86A7A80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7A8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7A98 diff --git a/sound/voicegroups/voicegroup152.inc b/sound/voicegroups/voicegroup152.inc index c29afafd2..16cd4bb97 100644 --- a/sound/voicegroups/voicegroup152.inc +++ b/sound/voicegroups/voicegroup152.inc @@ -14,17 +14,17 @@ voicegroup152:: @ 86A7C60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7CE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7CF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7CFC - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 86A7D08 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 @ 86A7D08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7D14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7D20 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 160, 175, 165 @ 86A7D2C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 160, 175, 165 @ 86A7D2C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7D38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7D44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7D50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7D5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7D68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7D74 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 86A7D80 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 86A7D80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7D8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7D98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7DA4 @@ -47,7 +47,7 @@ voicegroup152:: @ 86A7C60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7E70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7E7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7E88 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 127, 154, 235 @ 86A7E94 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235 @ 86A7E94 voice_keysplit voicegroup006, KeySplitTable2 @ 86A7EA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7EAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A7EB8 diff --git a/sound/voicegroups/voicegroup153.inc b/sound/voicegroups/voicegroup153.inc index d576629e7..1dae15586 100644 --- a/sound/voicegroups/voicegroup153.inc +++ b/sound/voicegroups/voicegroup153.inc @@ -14,7 +14,7 @@ voicegroup153:: @ 86A8260 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A82E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A82F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A82FC - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 86A8308 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 @ 86A8308 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8314 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8320 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A832C @@ -46,8 +46,8 @@ voicegroup153:: @ 86A8260 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8464 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8470 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A847C - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86A8488 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 127, 154, 235 @ 86A8494 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 86A8488 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235 @ 86A8494 voice_keysplit voicegroup006, KeySplitTable2 @ 86A84A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A84AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A84B8 @@ -73,7 +73,7 @@ voicegroup153:: @ 86A8260 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A85A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A85B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A85C0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86A85CC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86A85CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A85D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A85E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A85F0 diff --git a/sound/voicegroups/voicegroup154.inc b/sound/voicegroups/voicegroup154.inc index dee0ac500..77b8d3a1a 100644 --- a/sound/voicegroups/voicegroup154.inc +++ b/sound/voicegroups/voicegroup154.inc @@ -14,7 +14,7 @@ voicegroup154:: @ 86A8860 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A88E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A88F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A88FC - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 86A8908 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 @ 86A8908 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8914 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8920 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A892C @@ -47,7 +47,7 @@ voicegroup154:: @ 86A8860 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8A70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8A7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8A88 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 127, 154, 235 @ 86A8A94 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235 @ 86A8A94 voice_keysplit voicegroup006, KeySplitTable2 @ 86A8AA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8AAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8AB8 diff --git a/sound/voicegroups/voicegroup155.inc b/sound/voicegroups/voicegroup155.inc index c5dcf2b93..daefabb24 100644 --- a/sound/voicegroups/voicegroup155.inc +++ b/sound/voicegroups/voicegroup155.inc @@ -14,18 +14,18 @@ voicegroup155:: @ 86A8CBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8D40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8D4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8D58 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A8D64 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86A8D64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8D70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8D7C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 86A8D88 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 86A8D88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8D94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8DA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8DAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8DB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8DC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8DD0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86A8DDC - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 86A8DE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 86A8DDC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 86A8DE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8DF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8E00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8E0C @@ -47,7 +47,7 @@ voicegroup155:: @ 86A8CBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8ECC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8ED8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8EE4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 86A8EF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 86A8EF0 voice_keysplit voicegroup006, KeySplitTable2 @ 86A8EFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8F08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A8F14 diff --git a/sound/voicegroups/voicegroup156.inc b/sound/voicegroups/voicegroup156.inc index 9a7db75a5..52bebd5f7 100644 --- a/sound/voicegroups/voicegroup156.inc +++ b/sound/voicegroups/voicegroup156.inc @@ -17,14 +17,14 @@ voicegroup156:: @ 86A92BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9364 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9370 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A937C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 86A9388 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 86A9388 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9394 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A93A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A93AC - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86A93B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 86A93B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A93C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A93D0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 86A93DC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 86A93DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A93E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A93F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9400 @@ -36,7 +36,7 @@ voicegroup156:: @ 86A92BC voice_square_2_alt 60, 0, 3, 0, 4, 4, 4 @ 86A9448 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9454 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9460 - voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 180, 216 @ 86A946C + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216 @ 86A946C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9478 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9484 voice_square_2_alt 60, 0, 1, 0, 1, 7, 5 @ 86A9490 diff --git a/sound/voicegroups/voicegroup157.inc b/sound/voicegroups/voicegroup157.inc index 4437deb45..6469c4c4a 100644 --- a/sound/voicegroups/voicegroup157.inc +++ b/sound/voicegroups/voicegroup157.inc @@ -17,14 +17,14 @@ voicegroup157:: @ 86A98BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9964 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9970 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A997C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 190, 115 @ 86A9988 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 190, 115 @ 86A9988 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9994 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A99A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A99AC - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86A99B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 86A99B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A99C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A99D0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 86A99DC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 86A99DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A99E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A99F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9A00 @@ -33,12 +33,12 @@ voicegroup157:: @ 86A98BC voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 86A9A24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9A30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9A3C - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86A9A48 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 86A9A48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9A54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9A60 - voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 180, 216 @ 86A9A6C + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216 @ 86A9A6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9A78 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86A9A84 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 86A9A84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9A90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9A9C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9AA8 diff --git a/sound/voicegroups/voicegroup158.inc b/sound/voicegroups/voicegroup158.inc index d283dc9ff..efed45e18 100644 --- a/sound/voicegroups/voicegroup158.inc +++ b/sound/voicegroups/voicegroup158.inc @@ -10,21 +10,21 @@ voicegroup158:: @ 86A9EBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9F10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9F1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9F28 - voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86A9F34 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86A9F34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9F40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9F4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9F58 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86A9F64 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86A9F64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9F70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9F7C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 108, 137 @ 86A9F88 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137 @ 86A9F88 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9F94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9FA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9FAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9FB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9FC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9FD0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 86A9FDC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 @ 86A9FDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9FE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A9FF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA000 @@ -35,11 +35,11 @@ voicegroup158:: @ 86A9EBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA03C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA048 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA054 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86AA060 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86AA060 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA06C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA078 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86AA084 - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 86AA090 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 86AA084 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 @ 86AA090 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA09C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA0A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA0B4 @@ -47,7 +47,7 @@ voicegroup158:: @ 86A9EBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA0CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA0D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA0E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 86AA0F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 @ 86AA0F0 voice_keysplit voicegroup006, KeySplitTable2 @ 86AA0FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA108 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA114 diff --git a/sound/voicegroups/voicegroup159.inc b/sound/voicegroups/voicegroup159.inc index d135c3d0b..9b72cb505 100644 --- a/sound/voicegroups/voicegroup159.inc +++ b/sound/voicegroups/voicegroup159.inc @@ -24,7 +24,7 @@ voicegroup159:: @ 86AA4BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA5B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA5C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA5D0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 249, 25, 127 @ 86AA5DC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 127 @ 86AA5DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA5E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA5F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AA600 diff --git a/sound/voicegroups/voicegroup160.inc b/sound/voicegroups/voicegroup160.inc index 9a2e2d1ff..5bd5ec42d 100644 --- a/sound/voicegroups/voicegroup160.inc +++ b/sound/voicegroups/voicegroup160.inc @@ -14,7 +14,7 @@ voicegroup160:: @ 86AAABC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAB40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAB4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAB58 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86AAB64 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86AAB64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAB70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAB7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAB88 @@ -24,7 +24,7 @@ voicegroup160:: @ 86AAABC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AABB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AABC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AABD0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86AABDC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 86AABDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AABE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AABF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAC00 @@ -35,7 +35,7 @@ voicegroup160:: @ 86AAABC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAC3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAC48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAC54 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86AAC60 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86AAC60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAC6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAC78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAC84 diff --git a/sound/voicegroups/voicegroup161.inc b/sound/voicegroups/voicegroup161.inc index cb029a63c..72008eece 100644 --- a/sound/voicegroups/voicegroup161.inc +++ b/sound/voicegroups/voicegroup161.inc @@ -14,14 +14,14 @@ voicegroup161:: @ 86AAEDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAF60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAF6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAF78 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86AAF84 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86AAF84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAF90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAF9C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 86AAFA8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 86AAFA8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAFB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAFC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAFCC - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86AAFD8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 86AAFD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAFE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAFF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AAFFC @@ -73,7 +73,7 @@ voicegroup161:: @ 86AAEDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB224 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB230 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB23C - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86AB248 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86AB248 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB254 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB260 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB26C diff --git a/sound/voicegroups/voicegroup162.inc b/sound/voicegroups/voicegroup162.inc index dddf608c5..0694dc883 100644 --- a/sound/voicegroups/voicegroup162.inc +++ b/sound/voicegroups/voicegroup162.inc @@ -14,17 +14,17 @@ voicegroup162:: @ 86AB4DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB560 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB56C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB578 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86AB584 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86AB584 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB590 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB59C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 64, 195, 92, 235 @ 86AB5A8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 195, 92, 235 @ 86AB5A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB5B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB5C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB5CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB5D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB5E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB5F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86AB5FC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 86AB5FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB608 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB614 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB620 @@ -33,7 +33,7 @@ voicegroup162:: @ 86AB4DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB644 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB650 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB65C - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 64, 204, 113, 235 @ 86AB668 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 64, 204, 113, 235 @ 86AB668 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB674 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB680 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB68C diff --git a/sound/voicegroups/voicegroup163.inc b/sound/voicegroups/voicegroup163.inc index 9eb7cdab5..f221b761d 100644 --- a/sound/voicegroups/voicegroup163.inc +++ b/sound/voicegroups/voicegroup163.inc @@ -17,14 +17,14 @@ voicegroup163:: @ 86AB938 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB9E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB9EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AB9F8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86ABA04 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 86ABA04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABA10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABA1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABA28 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86ABA34 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 86ABA34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABA40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABA4C - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86ABA58 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 86ABA58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABA64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABA70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABA7C @@ -46,7 +46,7 @@ voicegroup163:: @ 86AB938 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABB3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABB48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABB54 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86ABB60 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 86ABB60 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABB6C voice_keysplit voicegroup006, KeySplitTable2 @ 86ABB78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABB84 @@ -73,7 +73,7 @@ voicegroup163:: @ 86AB938 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABC80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABC8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABC98 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86ABCA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86ABCA4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABCB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABCBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABCC8 diff --git a/sound/voicegroups/voicegroup164.inc b/sound/voicegroups/voicegroup164.inc index cdafb2994..67783f8f8 100644 --- a/sound/voicegroups/voicegroup164.inc +++ b/sound/voicegroups/voicegroup164.inc @@ -17,14 +17,14 @@ voicegroup164:: @ 86ABF38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABFE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABFEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ABFF8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86AC004 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 86AC004 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC010 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC01C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC028 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86AC034 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 86AC034 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC040 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC04C - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86AC058 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 86AC058 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC064 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC070 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC07C @@ -46,7 +46,7 @@ voicegroup164:: @ 86ABF38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC13C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC148 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC154 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86AC160 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 86AC160 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC16C voice_keysplit voicegroup006, KeySplitTable2 @ 86AC178 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC184 @@ -73,7 +73,7 @@ voicegroup164:: @ 86ABF38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC280 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC28C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC298 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86AC2A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86AC2A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC2B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC2BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC2C8 diff --git a/sound/voicegroups/voicegroup165.inc b/sound/voicegroups/voicegroup165.inc index 31f0addfb..95042d7a7 100644 --- a/sound/voicegroups/voicegroup165.inc +++ b/sound/voicegroups/voicegroup165.inc @@ -9,22 +9,22 @@ voicegroup165:: @ 86AC538 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC580 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC58C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC598 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 86AC5A4 - voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86AC5B0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 @ 86AC5A4 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86AC5B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC5BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC5C8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86AC5D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86AC5E0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 86AC5D4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86AC5E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC5EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC5F8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 37, 165, 103, 127 @ 86AC604 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 37, 165, 103, 127 @ 86AC604 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC610 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC61C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC628 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC634 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC640 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC64C - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 204, 92, 226 @ 86AC658 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 204, 92, 226 @ 86AC658 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC664 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC670 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC67C @@ -46,7 +46,7 @@ voicegroup165:: @ 86AC538 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC73C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC748 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC754 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 226 @ 86AC760 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 226 @ 86AC760 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC76C voice_keysplit voicegroup006, KeySplitTable2 @ 86AC778 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC784 @@ -73,7 +73,7 @@ voicegroup165:: @ 86AC538 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC880 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC88C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC898 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 86AC8A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 86AC8A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC8B0 voice_directsound 60, 0, DirectSoundWaveData_sd90_enhanced_delay_shaku, 255, 191, 97, 165 @ 86AC8BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AC8C8 diff --git a/sound/voicegroups/voicegroup166.inc b/sound/voicegroups/voicegroup166.inc index 13903fd29..a859f7f3a 100644 --- a/sound/voicegroups/voicegroup166.inc +++ b/sound/voicegroups/voicegroup166.inc @@ -10,21 +10,21 @@ voicegroup166:: @ 86ACB38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACB8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACB98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACBA4 - voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86ACBB0 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86ACBB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACBBC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACBC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACBD4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86ACBE0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86ACBE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACBEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACBF8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 108, 137 @ 86ACC04 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137 @ 86ACC04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACC10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACC1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACC28 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACC34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACC40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACC4C - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 86ACC58 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 @ 86ACC58 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACC64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACC70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACC7C @@ -35,11 +35,11 @@ voicegroup166:: @ 86ACB38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACCB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACCC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACCD0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86ACCDC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86ACCDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACCE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACCF4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86ACD00 - voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 86ACD0C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 86ACD00 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 @ 86ACD0C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACD18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACD24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACD30 @@ -47,7 +47,7 @@ voicegroup166:: @ 86ACB38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACD48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACD54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACD60 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 86ACD6C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 @ 86ACD6C voice_keysplit voicegroup006, KeySplitTable2 @ 86ACD78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACD84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ACD90 diff --git a/sound/voicegroups/voicegroup167.inc b/sound/voicegroups/voicegroup167.inc index 096b91057..2583623c3 100644 --- a/sound/voicegroups/voicegroup167.inc +++ b/sound/voicegroups/voicegroup167.inc @@ -17,14 +17,14 @@ voicegroup167:: @ 86AD138 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD1E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD1EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD1F8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86AD204 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 86AD204 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD210 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD21C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD228 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86AD234 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 86AD234 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD240 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD24C - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86AD258 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 86AD258 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD264 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD270 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD27C diff --git a/sound/voicegroups/voicegroup168.inc b/sound/voicegroups/voicegroup168.inc index 2678e7bd2..8d4d77c20 100644 --- a/sound/voicegroups/voicegroup168.inc +++ b/sound/voicegroups/voicegroup168.inc @@ -17,14 +17,14 @@ voicegroup168:: @ 86AD738 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD7E0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD7EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD7F8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86AD804 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 86AD804 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD810 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD81C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD828 - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86AD834 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 86AD834 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD840 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD84C - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86AD858 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 86AD858 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD864 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD870 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD87C @@ -45,8 +45,8 @@ voicegroup168:: @ 86AD738 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD930 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD93C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD948 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 86AD954 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86AD960 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 86AD954 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 86AD960 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD96C voice_keysplit voicegroup006, KeySplitTable2 @ 86AD978 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AD984 @@ -73,7 +73,7 @@ voicegroup168:: @ 86AD738 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADA80 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADA8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADA98 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86ADAA4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86ADAA4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADAB0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADABC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADAC8 diff --git a/sound/voicegroups/voicegroup169.inc b/sound/voicegroups/voicegroup169.inc index 0b456cb2c..37c24742e 100644 --- a/sound/voicegroups/voicegroup169.inc +++ b/sound/voicegroups/voicegroup169.inc @@ -17,7 +17,7 @@ voicegroup169:: @ 86ADD38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADDE0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADDEC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADDF8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 86ADE04 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 86ADE04 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADE10 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADE1C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADE28 @@ -35,7 +35,7 @@ voicegroup169:: @ 86ADD38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADEB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADEC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADED0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86ADEDC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86ADEDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADEE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADEF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86ADF00 diff --git a/sound/voicegroups/voicegroup170.inc b/sound/voicegroups/voicegroup170.inc index 43fca8981..b230f32d7 100644 --- a/sound/voicegroups/voicegroup170.inc +++ b/sound/voicegroups/voicegroup170.inc @@ -47,7 +47,7 @@ voicegroup170:: @ 86AE338 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE548 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE554 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE560 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 86AE56C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 86AE56C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE578 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE584 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE590 @@ -73,7 +73,7 @@ voicegroup170:: @ 86AE338 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE680 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE68C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE698 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86AE6A4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86AE6A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE6B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE6BC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE6C8 diff --git a/sound/voicegroups/voicegroup171.inc b/sound/voicegroups/voicegroup171.inc index ea0c0c95e..fe9cccdc7 100644 --- a/sound/voicegroups/voicegroup171.inc +++ b/sound/voicegroups/voicegroup171.inc @@ -45,9 +45,9 @@ voicegroup171:: @ 86AE728 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE920 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE92C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE938 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 86AE944 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 86AE944 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE950 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 86AE95C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 86AE95C voice_keysplit voicegroup006, KeySplitTable2 @ 86AE968 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE974 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AE980 @@ -73,7 +73,7 @@ voicegroup171:: @ 86AE728 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEA70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEA7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEA88 - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86AEA94 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86AEA94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEAA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEAAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEAB8 diff --git a/sound/voicegroups/voicegroup172.inc b/sound/voicegroups/voicegroup172.inc index 7683e3aa4..ee1db7715 100644 --- a/sound/voicegroups/voicegroup172.inc +++ b/sound/voicegroups/voicegroup172.inc @@ -17,14 +17,14 @@ voicegroup172:: @ 86AEB6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEC14 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEC20 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEC2C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86AEC38 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 86AEC38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEC44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEC50 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEC5C - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86AEC68 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 86AEC68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEC74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEC80 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86AEC8C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 86AEC8C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEC98 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AECA4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AECB0 @@ -46,7 +46,7 @@ voicegroup172:: @ 86AEB6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AED70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AED7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AED88 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86AED94 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 86AED94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEDA0 voice_keysplit voicegroup006, KeySplitTable2 @ 86AEDAC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEDB8 @@ -73,7 +73,7 @@ voicegroup172:: @ 86AEB6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEEB4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEEC0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEECC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86AEED8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86AEED8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEEE4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEEF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AEEFC diff --git a/sound/voicegroups/voicegroup173.inc b/sound/voicegroups/voicegroup173.inc index d49881fc8..e75926269 100644 --- a/sound/voicegroups/voicegroup173.inc +++ b/sound/voicegroups/voicegroup173.inc @@ -14,18 +14,18 @@ voicegroup173:: @ 86AF16C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF1F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF1FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF208 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86AF214 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86AF214 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF220 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF22C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 51, 0, 203, 127 @ 86AF238 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127 @ 86AF238 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF244 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF250 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF25C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF268 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF274 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF280 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86AF28C - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 216, 51, 224 @ 86AF298 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 86AF28C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224 @ 86AF298 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF2A4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF2B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF2BC @@ -35,7 +35,7 @@ voicegroup173:: @ 86AF16C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF2EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF2F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF304 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86AF310 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86AF310 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF31C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF328 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF334 @@ -73,7 +73,7 @@ voicegroup173:: @ 86AF16C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF4B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF4C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF4CC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86AF4D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86AF4D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF4E4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF4F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF4FC diff --git a/sound/voicegroups/voicegroup174.inc b/sound/voicegroups/voicegroup174.inc index 1272a4a98..face4c675 100644 --- a/sound/voicegroups/voicegroup174.inc +++ b/sound/voicegroups/voicegroup174.inc @@ -17,11 +17,11 @@ voicegroup174:: @ 86AF76C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF814 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF820 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF82C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 86AF838 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 86AF838 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF844 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF850 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF85C - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86AF868 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 86AF868 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF874 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF880 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF88C @@ -38,7 +38,7 @@ voicegroup174:: @ 86AF76C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF910 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF91C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF928 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 165 @ 86AF934 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 165 @ 86AF934 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF940 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF94C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AF958 @@ -152,7 +152,7 @@ voicegroup174:: @ 86AF76C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFE68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFE74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFE80 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 154, 127 @ 86AFE8C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 154, 127 @ 86AFE8C voice_keysplit_all voicegroup002 @ 86AFE98 voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1 @ 86AFEA4 voice_square_2_alt 60, 0, 2, 0, 2, 3, 1 @ 86AFEB0 diff --git a/sound/voicegroups/voicegroup175.inc b/sound/voicegroups/voicegroup175.inc index a99d14923..dac5ee5be 100644 --- a/sound/voicegroups/voicegroup175.inc +++ b/sound/voicegroups/voicegroup175.inc @@ -13,7 +13,7 @@ voicegroup175:: @ 86AFEC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFF40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFF4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFF58 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86AFF64 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 86AFF64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFF70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFF7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFF88 @@ -24,7 +24,7 @@ voicegroup175:: @ 86AFEC8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFFC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFFD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFFDC - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 165, 154, 127 @ 86AFFE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 165, 154, 127 @ 86AFFE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86AFFF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0000 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B000C diff --git a/sound/voicegroups/voicegroup177.inc b/sound/voicegroups/voicegroup177.inc index 439615d09..266e28278 100644 --- a/sound/voicegroups/voicegroup177.inc +++ b/sound/voicegroups/voicegroup177.inc @@ -35,36 +35,36 @@ voicegroup177:: @ 86B0378 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B04F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0504 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0510 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 86B051C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 @ 86B051C voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 86B0528 voice_directsound_no_resample 67, 71, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 86B0534 voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 86B0540 - voice_directsound_no_resample 65, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86B054C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86B0558 + voice_directsound_no_resample 65, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 86B054C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 86B0558 voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B0564 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0570 voice_directsound 68, 29, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B057C - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 86B0588 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 86B0588 voice_directsound 72, 64, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B0594 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B05A0 voice_directsound 76, 39, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B05AC voice_directsound 80, 89, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86B05B8 - voice_directsound_no_resample 33, 10, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B05C4 + voice_directsound_no_resample 33, 10, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B05C4 voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 86B05D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B05DC - voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B05E8 + voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B05E8 voice_directsound_no_resample 64, 64, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86B05F4 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86B0600 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 @ 86B0600 voice_directsound_no_resample 64, 64, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 86B060C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 86B0618 - voice_directsound_no_resample 64, 118, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B0624 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 86B0618 + voice_directsound_no_resample 64, 118, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B0624 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0630 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B063C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86B0648 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 86B0654 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86B0660 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86B066C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86B0678 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B063C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86B0648 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 @ 86B0654 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 86B0660 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 86B066C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 86B0678 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0684 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0690 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B069C @@ -80,14 +80,14 @@ voicegroup177:: @ 86B0378 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0714 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0720 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B072C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 86B0738 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 86B0744 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 86B0750 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 86B075C + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 86B0738 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 86B0744 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 86B0750 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 @ 86B075C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0768 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0774 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86B0780 - voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 86B078C - voice_directsound 50, 64, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 86B0798 - voice_directsound 64, 64, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 86B07A4 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86B0780 + voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 86B078C + voice_directsound 50, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 86B0798 + voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 86B07A4 diff --git a/sound/voicegroups/voicegroup178.inc b/sound/voicegroups/voicegroup178.inc index e13f2acaa..ea0ee13e9 100644 --- a/sound/voicegroups/voicegroup178.inc +++ b/sound/voicegroups/voicegroup178.inc @@ -13,7 +13,7 @@ voicegroup178:: @ 86B07B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0828 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0834 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0840 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 204, 103, 165 @ 86B084C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 204, 103, 165 @ 86B084C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0858 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0864 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0870 @@ -24,7 +24,7 @@ voicegroup178:: @ 86B07B0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B08AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B08B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B08C4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 154, 165 @ 86B08D0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 154, 165 @ 86B08D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B08DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B08E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B08F4 diff --git a/sound/voicegroups/voicegroup179.inc b/sound/voicegroups/voicegroup179.inc index ee890fd88..c98f76b03 100644 --- a/sound/voicegroups/voicegroup179.inc +++ b/sound/voicegroups/voicegroup179.inc @@ -13,7 +13,7 @@ voicegroup179:: @ 86B0BD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0C48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0C54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0C60 - voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 86B0C6C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 86B0C6C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0C78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0C84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0C90 @@ -24,7 +24,7 @@ voicegroup179:: @ 86B0BD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0CCC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0CD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0CE4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 165, 154, 127 @ 86B0CF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 165, 154, 127 @ 86B0CF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0CFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0D08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0D14 @@ -33,7 +33,7 @@ voicegroup179:: @ 86B0BD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0D38 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0D44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0D50 - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86B0D5C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 86B0D5C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0D68 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0D74 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0D80 diff --git a/sound/voicegroups/voicegroup180.inc b/sound/voicegroups/voicegroup180.inc index c7c270bf4..6915bd8dd 100644 --- a/sound/voicegroups/voicegroup180.inc +++ b/sound/voicegroups/voicegroup180.inc @@ -126,6 +126,6 @@ voicegroup180:: @ 86B0FF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B15B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B15C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B15CC - voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 86B15D8 + voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 86B15D8 voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ 86B15E4 diff --git a/sound/voicegroups/voicegroup181.inc b/sound/voicegroups/voicegroup181.inc index 69da7a62e..2b41b646c 100644 --- a/sound/voicegroups/voicegroup181.inc +++ b/sound/voicegroups/voicegroup181.inc @@ -46,5 +46,5 @@ voicegroup181:: @ 86B15F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B17F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1800 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B180C - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 86B1818 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 86B1818 diff --git a/sound/voicegroups/voicegroup182.inc b/sound/voicegroups/voicegroup182.inc index d57f5aae3..0eb9a5f7b 100644 --- a/sound/voicegroups/voicegroup182.inc +++ b/sound/voicegroups/voicegroup182.inc @@ -47,7 +47,7 @@ voicegroup182:: @ 86B1824 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1A34 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1A40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1A4C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 76 @ 86B1A58 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 76 @ 86B1A58 voice_keysplit voicegroup006, KeySplitTable2 @ 86B1A64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1A70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1A7C diff --git a/sound/voicegroups/voicegroup183.inc b/sound/voicegroups/voicegroup183.inc index ae3baa004..29b8b05d9 100644 --- a/sound/voicegroups/voicegroup183.inc +++ b/sound/voicegroups/voicegroup183.inc @@ -24,7 +24,7 @@ voicegroup183:: @ 86B1C44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1D40 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1D4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1D58 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86B1D64 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 86B1D64 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1D70 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1D7C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1D88 @@ -35,7 +35,7 @@ voicegroup183:: @ 86B1C44 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1DC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1DD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1DDC - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86B1DE8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86B1DE8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1DF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1E00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B1E0C diff --git a/sound/voicegroups/voicegroup184.inc b/sound/voicegroups/voicegroup184.inc index de4f3eef9..771c1e33a 100644 --- a/sound/voicegroups/voicegroup184.inc +++ b/sound/voicegroups/voicegroup184.inc @@ -14,7 +14,7 @@ voicegroup184:: @ 86B2244 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B22C8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B22D4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B22E0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86B22EC + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86B22EC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B22F8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2304 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2310 @@ -38,7 +38,7 @@ voicegroup184:: @ 86B2244 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B23E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B23F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2400 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86B240C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 86B240C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2418 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2424 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2430 diff --git a/sound/voicegroups/voicegroup185.inc b/sound/voicegroups/voicegroup185.inc index a328d25d3..3d4c08f7a 100644 --- a/sound/voicegroups/voicegroup185.inc +++ b/sound/voicegroups/voicegroup185.inc @@ -14,7 +14,7 @@ voicegroup185:: @ 86B264C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B26D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B26DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B26E8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86B26F4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86B26F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2700 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B270C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2718 @@ -33,21 +33,21 @@ voicegroup185:: @ 86B264C voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206 @ 86B27B4 voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 86B27C0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B27CC - voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 86B27D8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 86B27D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B27E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86B27F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86B27F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B27FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2808 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 86B2814 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 86B2814 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2820 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B282C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2838 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2844 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2850 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B285C - voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 86B2868 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 86B2868 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2874 - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 86B2880 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 86B2880 voice_keysplit voicegroup006, KeySplitTable2 @ 86B288C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B2898 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B28A4 diff --git a/sound/voicegroups/voicegroup187.inc b/sound/voicegroups/voicegroup187.inc index 16634a8b1..9afa51349 100644 --- a/sound/voicegroups/voicegroup187.inc +++ b/sound/voicegroups/voicegroup187.inc @@ -17,14 +17,14 @@ voicegroup187:: @ 86B324C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B32F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3300 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B330C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 86B3318 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 86B3318 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3324 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3330 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B333C - voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 86B3348 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 86B3348 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3354 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3360 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 86B336C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 86B336C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3378 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3384 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3390 @@ -46,7 +46,7 @@ voicegroup187:: @ 86B324C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3450 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B345C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3468 - voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 86B3474 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 86B3474 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3480 voice_keysplit voicegroup006, KeySplitTable2 @ 86B348C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3498 @@ -73,7 +73,7 @@ voicegroup187:: @ 86B324C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3594 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B35A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B35AC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86B35B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86B35B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B35C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B35D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B35DC diff --git a/sound/voicegroups/voicegroup188.inc b/sound/voicegroups/voicegroup188.inc index 5556218dd..a67df5a3a 100644 --- a/sound/voicegroups/voicegroup188.inc +++ b/sound/voicegroups/voicegroup188.inc @@ -14,18 +14,18 @@ voicegroup188:: @ 86B384C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B38D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B38DC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B38E8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86B38F4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86B38F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3900 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B390C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 51, 0, 203, 127 @ 86B3918 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127 @ 86B3918 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3924 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3930 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B393C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3948 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3954 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3960 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86B396C - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 216, 51, 224 @ 86B3978 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 86B396C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224 @ 86B3978 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3984 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3990 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B399C @@ -35,7 +35,7 @@ voicegroup188:: @ 86B384C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B39CC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B39D8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B39E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86B39F0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86B39F0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B39FC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3A08 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3A14 @@ -73,7 +73,7 @@ voicegroup188:: @ 86B384C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3B94 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3BA0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3BAC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86B3BB8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86B3BB8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3BC4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3BD0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3BDC diff --git a/sound/voicegroups/voicegroup189.inc b/sound/voicegroups/voicegroup189.inc index 15a8484d5..4593c06f0 100644 --- a/sound/voicegroups/voicegroup189.inc +++ b/sound/voicegroups/voicegroup189.inc @@ -14,18 +14,18 @@ voicegroup189:: @ 86B3E4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3ED0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3EDC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3EE8 - voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 86B3EF4 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 86B3EF4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F00 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F0C - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 51, 0, 203, 127 @ 86B3F18 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127 @ 86B3F18 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F24 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F30 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F3C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F48 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F54 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F60 - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86B3F6C - voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 216, 51, 224 @ 86B3F78 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 86B3F6C + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224 @ 86B3F78 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F84 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F90 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3F9C @@ -35,7 +35,7 @@ voicegroup189:: @ 86B3E4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3FCC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3FD8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3FE4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 86B3FF0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 86B3FF0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B3FFC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4008 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4014 @@ -73,7 +73,7 @@ voicegroup189:: @ 86B3E4C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4194 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B41A0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B41AC - voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 86B41B8 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 86B41B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B41C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B41D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B41DC diff --git a/sound/voicegroups/voicegroup190.inc b/sound/voicegroups/voicegroup190.inc index 0ec5acd29..02b185c93 100644 --- a/sound/voicegroups/voicegroup190.inc +++ b/sound/voicegroups/voicegroup190.inc @@ -38,33 +38,33 @@ voicegroup190:: @ 86B429C voice_noise_alt 60, 0, 0, 0, 1, 9, 1 @ 86B4440 voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 86B444C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4458 - voice_directsound_no_resample 64, 52, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 86B4464 + voice_directsound_no_resample 64, 52, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 86B4464 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4470 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B447C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4488 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4494 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B44A0 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 86B44AC + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 86B44AC voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B44B8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B44C4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B44D0 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B44DC - voice_directsound_no_resample 33, 104, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B44E8 + voice_directsound_no_resample 33, 104, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B44E8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B44F4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4500 - voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B450C + voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B450C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4518 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 86B4524 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 @ 86B4524 voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 86B4530 - voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 86B453C - voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B4548 + voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 86B453C + voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B4548 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4554 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B4560 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86B456C - voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 86B4578 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86B4584 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86B4590 - voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 86B459C + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86B4560 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 86B456C + voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 @ 86B4578 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 86B4584 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 86B4590 + voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 86B459C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B45A8 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B45B4 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B45C0 @@ -80,11 +80,11 @@ voicegroup190:: @ 86B429C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4638 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4644 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4650 - voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 86B465C - voice_directsound_no_resample 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 86B4668 - voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 86B4674 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 86B4680 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 86B465C + voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 86B4668 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 86B4674 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 @ 86B4680 voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B468C voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4698 - voice_directsound_no_resample 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 86B46A4 - voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 86B46B0 + voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86B46A4 + voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 86B46B0 |