diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 9958dd0f5..617923c4e 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -1,2 +1,2 @@ -.include "sound/cry_tables/gCryTable0.inc" -.include "sound/cry_tables/gCryTable1.inc" +.include "sound/cry_tables/gCryTable.inc" +.include "sound/cry_tables/gCryReverseTable.inc" diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index 2f9698abc..926c7982f 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -1,70 +1,5 @@ @ .align 2 -@ voicegroup000:: -@ voice_keysplit_all voicegroup001 -@ voice_keysplit voicegroup003, KeySplitTable1 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_2 60, 0, 2, 0, 0, 9, 2 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239 -@ voice_keysplit voicegroup004, KeySplitTable2 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_keysplit voicegroup005, KeySplitTable3 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 -@ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 - -@ .align 2 -@ voicegroup001:: +@voicegroup001:: @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -96,7 +31,7 @@ @ voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ .align 2 -@ voicegroup002:: +@voicegroup002:: @ voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127 @ voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127 @ voice_directsound 60, 0, DirectSoundWaveData_unused_guitar_separates_power_chord, 255, 165, 206, 127 @@ -189,20 +124,20 @@ @ voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ .align 2 -@ voicegroup003:: +@voicegroup003:: @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_48, 255, 252, 0, 239 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_60, 255, 250, 0, 221 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_72, 255, 250, 0, 221 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_84, 255, 247, 0, 221 @ .align 2 -@ voicegroup004:: +@voicegroup004:: @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_60, 255, 0, 255, 196 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 196 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_84, 255, 0, 255, 196 @ .align 2 -@ voicegroup005:: +@voicegroup005:: @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_60, 255, 0, 193, 127 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_72, 255, 0, 193, 127 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_84, 255, 0, 193, 127 @@ -336,17 +271,17 @@ @ voice_square_1_alt 60, 0, 21, 2, 0, 0, 15, 2 @ .align 2 -@ voicegroup006:: +@voicegroup006:: @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_39, 255, 0, 255, 165 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_51, 255, 0, 255, 165 @ .align 2 -@ voicegroup007:: +@voicegroup007:: @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_60, 255, 0, 224, 165 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 255, 0, 218, 165 @ .align 2 -@ voicegroup008:: +@voicegroup008:: @ voice_keysplit_all voicegroup001 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 178, 180, 165 @@ -451,7 +386,7 @@ @ voice_square_1_alt 60, 0, 22, 2, 0, 2, 0, 0 @ .align 2 -@ voicegroup009:: +@voicegroup009:: @ voice_keysplit_all voicegroup001 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -539,7 +474,7 @@ @ voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0 @ .align 2 -@ voicegroup010:: +@voicegroup010:: @ voice_keysplit_all voicegroup001 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -633,7 +568,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2 @ .align 2 -@ voicegroup011:: +@voicegroup011:: @ voice_keysplit_all voicegroup001 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -727,12 +662,12 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2 @ .align 2 -@ voicegroup012:: +@voicegroup012:: @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_keysplit voicegroup003, KeySplitTable1 @ .align 2 -@ voicegroup127:: +@voicegroup127:: @ voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 249, 103, 165 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -863,7 +798,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 0, 1 @ .align 2 -@ voicegroup128:: +@voicegroup128:: @ voice_directsound_no_resample 60, 0, DirectSoundWaveData_bicycle_bell, 255, 249, 0, 165 @ voice_directsound_alt 60, 0, DirectSoundWaveData_bicycle_bell, 255, 0, 255, 165 @ voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 0, 255, 165 @@ -996,7 +931,7 @@ .include "sound/cry_tables.inc" @ .align 2 -@ voicegroup129:: +@voicegroup129:: @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @@ -1127,7 +1062,7 @@ @ voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ .align 2 -@ voicegroup130:: +@voicegroup130:: @ voice_keysplit_all voicegroup001 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -1258,7 +1193,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 7, 1 @ .align 2 -@ voicegroup131:: +@voicegroup131:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 128, 204, 51, 242 @@ -1389,7 +1324,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 0, 1 @ .align 2 -@ voicegroup132:: +@voicegroup132:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -1520,7 +1455,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 8, 1 @ .align 2 -@ voicegroup133:: +@voicegroup133:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -1651,7 +1586,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 8, 1 @ .align 2 -@ voicegroup134:: +@voicegroup134:: @ voice_keysplit_all voicegroup001 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -1744,7 +1679,7 @@ @ voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 1 @ .align 2 -@ voicegroup135:: +@voicegroup135:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -1830,7 +1765,7 @@ @ voice_square_1_alt 60, 0, 0, 0, 1, 2, 6, 0 @ .align 2 -@ voicegroup136:: +@voicegroup136:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -1961,7 +1896,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ .align 2 -@ voicegroup137:: +@voicegroup137:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -2092,7 +2027,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 0, 1 @ .align 2 -@ voicegroup138:: +@voicegroup138:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -2223,7 +2158,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup139:: +@voicegroup139:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -2354,14 +2289,14 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ .align 2 -@ voicegroup140:: +@voicegroup140:: @ voice_keysplit_all voicegroup001 @ voice_square_1 60, 0, 0, 2, 0, 2, 3, 1 @ voice_square_2_alt 60, 0, 2, 0, 2, 3, 1 @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0 @ .align 2 -@ voicegroup141:: +@voicegroup141:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -2492,7 +2427,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup142:: +@voicegroup142:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -2579,7 +2514,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_9, 0, 7, 15, 0 @ .align 2 -@ voicegroup143:: +@voicegroup143:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -2710,7 +2645,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ .align 2 -@ voicegroup144:: +@voicegroup144:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -2841,7 +2776,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup145:: +@voicegroup145:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -2972,7 +2907,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup146:: +@voicegroup146:: @ voice_keysplit_all voicegroup002 @ voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -3103,7 +3038,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 2 @ .align 2 -@ voicegroup147:: +@voicegroup147:: @ voice_keysplit_all voicegroup001 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -3190,7 +3125,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 2, 4, 2 @ .align 2 -@ voicegroup148:: +@voicegroup148:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -3321,7 +3256,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 5 @ .align 2 -@ voicegroup149:: +@voicegroup149:: @ voice_keysplit_all voicegroup190 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1_alt 60, 0, 0, 2, 0, 0, 12, 0 @@ -3417,7 +3352,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0 @ .align 2 -@ voicegroup150:: +@voicegroup150:: @ voice_keysplit_all voicegroup002 @ voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -3548,7 +3483,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ .align 2 -@ voicegroup151:: +@voicegroup151:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -3639,7 +3574,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0 @ .align 2 -@ voicegroup152:: +@voicegroup152:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -3770,7 +3705,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ .align 2 -@ voicegroup153:: +@voicegroup153:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -3901,7 +3836,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 2 @ .align 2 -@ voicegroup154:: +@voicegroup154:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -3997,7 +3932,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 0, 12, 0 @ .align 2 -@ voicegroup155:: +@voicegroup155:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -4128,7 +4063,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup156:: +@voicegroup156:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -4259,7 +4194,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup157:: +@voicegroup157:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -4390,7 +4325,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ .align 2 -@ voicegroup158:: +@voicegroup158:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -4521,7 +4456,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 8, 1 @ .align 2 -@ voicegroup159:: +@voicegroup159:: @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -4652,7 +4587,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ .align 2 -@ voicegroup160:: +@voicegroup160:: @ voice_keysplit_all voicegroup001 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -4743,7 +4678,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0 @ .align 2 -@ voicegroup161:: +@voicegroup161:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -4874,7 +4809,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ .align 2 -@ voicegroup162:: +@voicegroup162:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -4970,7 +4905,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0 @ .align 2 -@ voicegroup163:: +@voicegroup163:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -5101,7 +5036,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup164:: +@voicegroup164:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -5232,7 +5167,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup165:: +@voicegroup165:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -5363,7 +5298,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ .align 2 -@ voicegroup166:: +@voicegroup166:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -5494,7 +5429,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 8, 1 @ .align 2 -@ voicegroup167:: +@voicegroup167:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -5625,7 +5560,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup168:: +@voicegroup168:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -5756,7 +5691,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup169:: +@voicegroup169:: @ voice_keysplit_all voicegroup001 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -5887,7 +5822,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ .align 2 -@ voicegroup170:: +@voicegroup170:: @ voice_keysplit_all voicegroup001 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -5974,7 +5909,7 @@ @ voice_square_2_alt 60, 0, 2, 0, 1, 0, 0 @ .align 2 -@ voicegroup171:: +@voicegroup171:: @ voice_keysplit_all voicegroup001 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -6068,7 +6003,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1 @ .align 2 -@ voicegroup172:: +@voicegroup172:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -6199,7 +6134,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ .align 2 -@ voicegroup173:: +@voicegroup173:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -6330,7 +6265,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 3, 2 @ .align 2 -@ voicegroup174:: +@voicegroup174:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -6490,7 +6425,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0 @ .align 2 -@ voicegroup175:: +@voicegroup175:: @ voice_keysplit_all voicegroup177 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -6545,7 +6480,7 @@ @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ .align 2 -@ voicegroup176:: +@voicegroup176:: @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -6596,7 +6531,7 @@ @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ .align 2 -@ voicegroup177:: +@voicegroup177:: @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -6689,7 +6624,7 @@ @ voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ .align 2 -@ voicegroup178:: +@voicegroup178:: @ voice_keysplit_all voicegroup177 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -6780,7 +6715,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 0, 15, 1 @ .align 2 -@ voicegroup179:: +@voicegroup179:: @ voice_keysplit_all voicegroup177 @ voice_keysplit_all voicegroup176 @ voice_keysplit voicegroup003, KeySplitTable1 @@ -6871,7 +6806,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0 @ .align 2 -@ voicegroup180:: +@voicegroup180:: @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -7002,7 +6937,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ .align 2 -@ voicegroup181:: +@voicegroup181:: @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -7052,7 +6987,7 @@ @ voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ .align 2 -@ voicegroup182:: +@voicegroup182:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -7143,7 +7078,7 @@ @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0 @ .align 2 -@ voicegroup183:: +@voicegroup183:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -7274,7 +7209,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 3, 1 @ .align 2 -@ voicegroup184:: +@voicegroup184:: @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -7363,7 +7298,7 @@ @ voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ .align 2 -@ voicegroup185:: +@voicegroup185:: @ voice_keysplit_all voicegroup002 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -7494,7 +7429,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ .align 2 -@ voicegroup186:: +@voicegroup186:: @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -7625,7 +7560,7 @@ @ voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ .align 2 -@ voicegroup187:: +@voicegroup187:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -7756,7 +7691,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ .align 2 -@ voicegroup188:: +@voicegroup188:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -7887,7 +7822,7 @@ @ voice_noise_alt 60, 0, 0, 0, 1, 9, 1 @ .align 2 -@ voicegroup189:: +@voicegroup189:: @ voice_keysplit_all voicegroup002 @ voice_keysplit voicegroup003, KeySplitTable1 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @@ -7982,7 +7917,7 @@ @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ .align 2 -@ voicegroup190:: +@voicegroup190:: @ voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 2 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 diff --git a/sound/voicegroups/voicegroup000.inc b/sound/voicegroups/voicegroup000.inc index 4ea3eec8c..ec9d61337 100644 --- a/sound/voicegroups/voicegroup000.inc +++ b/sound/voicegroups/voicegroup000.inc @@ -1,65 +1,64 @@ .align 2 -voicegroup000:: @ 8675D04 - voice_keysplit_all voicegroup001 @ 8675D04 - voice_keysplit voicegroup005, KeySplitTable1 @ 8675D10 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D1C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D28 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D34 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D40 - voice_square_2 2, 0, 0, 9, 2 @ 8675D4C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D58 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D64 - voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 235 @ 8675D70 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D7C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D88 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675D94 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DA0 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DAC - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DB8 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DC4 - voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8675DD0 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DDC - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DE8 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675DF4 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E00 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E0C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E18 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E24 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E30 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E3C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E48 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E54 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E60 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E6C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E78 - voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149 @ 8675E84 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E90 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675E9C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EA8 - voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 115 @ 8675EB4 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EC0 - voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8675ECC - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675ED8 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EE4 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EF0 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675EFC - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F08 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F14 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F20 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F2C - voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 204, 193, 239 @ 8675F38 - voice_keysplit voicegroup006, KeySplitTable2 @ 8675F44 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F50 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F5C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F68 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F74 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F80 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F8C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675F98 - voice_keysplit voicegroup007, KeySplitTable3 @ 8675FA4 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FB0 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FBC - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FC8 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FD4 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FE0 - +voicegroup000:: + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2 60, 0, 2, 0, 0, 9, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 diff --git a/sound/voicegroups/voicegroup001.inc b/sound/voicegroups/voicegroup001.inc index b9e06536b..dc42f409c 100644 --- a/sound/voicegroups/voicegroup001.inc +++ b/sound/voicegroups/voicegroup001.inc @@ -1,32 +1,31 @@ .align 2 -voicegroup001:: @ 8675FEC - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FEC - voice_square_1 0, 2, 0, 0, 15, 0 @ 8675FF8 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676004 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676010 - voice_square_1 0, 2, 0, 0, 15, 0 @ 867601C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676028 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676034 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676040 - voice_square_1 0, 2, 0, 1, 6, 0 @ 867604C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676058 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676064 - voice_programmable_wave ProgrammableWaveData_86B4830, 0, 7, 15, 1 @ 8676070 - voice_square_1 0, 2, 0, 0, 15, 0 @ 867607C - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676088 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676094 - voice_square_1 0, 2, 0, 0, 15, 0 @ 86760A0 - voice_square_1 0, 2, 0, 0, 15, 0 @ 86760AC - voice_square_1 0, 2, 0, 0, 15, 0 @ 86760B8 - voice_square_2 2, 0, 1, 6, 0 @ 86760C4 - voice_programmable_wave ProgrammableWaveData_86B4850, 0, 7, 15, 1 @ 86760D0 - voice_square_1 0, 2, 0, 1, 6, 0 @ 86760DC - voice_square_2 3, 0, 1, 6, 0 @ 86760E8 - voice_square_1 0, 2, 0, 0, 15, 0 @ 86760F4 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676100 - voice_square_1 0, 2, 0, 0, 15, 0 @ 867610C - voice_square_1 0, 0, 0, 1, 6, 0 @ 8676118 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676124 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676130 - voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 867613C - +voicegroup001:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 1, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2 60, 0, 2, 0, 1, 6, 0 + voice_programmable_wave 60, 0, ProgrammableWaveData_3, 0, 7, 15, 1 + voice_square_1 60, 0, 0, 2, 0, 1, 6, 0 + voice_square_2 60, 0, 3, 0, 1, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 0, 0, 1, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 diff --git a/sound/voicegroups/voicegroup002.inc b/sound/voicegroups/voicegroup002.inc index 33fe54c57..3ae15a449 100644 --- a/sound/voicegroups/voicegroup002.inc +++ b/sound/voicegroups/voicegroup002.inc @@ -1,57 +1,92 @@ .align 2 -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_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_square_1 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, 79, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188 @ 86761E4 - voice_directsound 51, 54, DirectSoundWaveData_unknown_tom, 255, 216, 77, 204 @ 86761F0 - voice_square_1 0, 2, 0, 0, 15, 0 @ 86761FC - voice_directsound 54, 64, DirectSoundWaveData_unknown_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_square_1 0, 2, 0, 0, 15, 0 @ 8676238 - voice_directsound 62, 84, DirectSoundWaveData_unknown_tom, 255, 204, 77, 204 @ 8676244 - voice_square_1 0, 2, 0, 0, 15, 0 @ 8676250 - voice_square_1 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 60, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 235, 0, 165 @ 8676280 - voice_square_1 0, 2, 0, 0, 15, 0 @ 867628C - voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 8676298 - voice_square_1 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_square_1 0, 2, 0, 0, 15, 0 @ 86762C8 - voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 86762D4 - voice_square_1 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 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 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 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 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 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 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 86763A0 - voice_square_1 0, 2, 0, 0, 15, 0 @ 86763AC - voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86763B8 - voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86763C4 - +voicegroup002:: + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127 + voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127 + voice_directsound 60, 0, DirectSoundWaveData_unused_guitar_separates_power_chord, 255, 165, 206, 127 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 206, 127 + voice_directsound 60, 0, DirectSoundWaveData_unknown_snare, 255, 0, 255, 0 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 32, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 + voice_directsound_no_resample 60, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 235, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 + voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 + voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 + voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 + voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 + voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 + voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 + voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 + voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 + voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 + voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 + voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 + voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 + voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 \ No newline at end of file