diff --git a/crysaudio/music/TCG/boosterpack.asm b/crysaudio/music/TCG/boosterpack.asm index b9b491b37..2979b2c44 100644 --- a/crysaudio/music/TCG/boosterpack.asm +++ b/crysaudio/music/TCG/boosterpack.asm @@ -6,99 +6,87 @@ Music_BoosterPack: Music_BoosterPack_Ch1: stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 -; cutoff 8 octave 4 duty_cycle 1 speed 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D#, 5 volume_envelope 3, 7 note D#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 5 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A#, 5 volume_envelope 3, 7 note A#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 5 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 5 volume_envelope 3, 7 note A_, 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 5 volume_envelope 3, 7 note C_, 2 dec_octave - volume_envelope 10, 0 + note_type 2, 10, 8 note B_, 16 -; tie - note B_, 16 -; tie + note_type 1, 10, 8 note B_, 6 volume_envelope 3, 7 note B_, 9 sound_ret - Music_BoosterPack_Ch2: stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 -; cutoff 8 octave 3 duty_cycle 1 speed 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note A#, 5 volume_envelope 2, 7 note A#, 1 inc_octave - volume_envelope 9, 0 + volume_envelope 9, 8 note D#, 5 volume_envelope 2, 7 note D#, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 5 volume_envelope 2, 7 note G_, 2 - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 5 volume_envelope 2, 7 note C_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F_, 5 volume_envelope 2, 7 note F_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note A_, 5 volume_envelope 2, 7 note A_, 2 - volume_envelope 9, 0 - note G_, 16 -; tie + note_type 2, 9, 8 note G_, 16 -; tie + note_type 1, 9, 8 note G_, 6 volume_envelope 2, 7 note G_, 9 sound_ret - Music_BoosterPack_Ch3: stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 -; cutoff 8 -; echo 0 octave 2 speed 1 note D#, 6 @@ -111,9 +99,8 @@ Music_BoosterPack_Ch3: note C_, 6 note F_, 7 dec_octave + note_type 2, 1, 11 note G_, 16 -; tie - note G_, 16 -; tie + note_type 1, 1, 11 note G_, 6 sound_ret diff --git a/crysaudio/music/TCG/challengehall.asm b/crysaudio/music/TCG/challengehall.asm index 5429450fe..482a0b6d7 100644 --- a/crysaudio/music/TCG/challengehall.asm +++ b/crysaudio/music/TCG/challengehall.asm @@ -7,75 +7,72 @@ Music_ChallengeHall: Music_ChallengeHall_Ch1: stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 15, 3, 3 -; cutoff 7 octave 3 duty_cycle 2 - volume_envelope 8, 0 -; cutoff 8 + volume_envelope 8, 8 speed 1 note A_, 7 note G#, 4 volume_envelope 1, 7 note G#, 4 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 4 volume_envelope 1, 7 note A_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 4 volume_envelope 1, 7 note B_, 4 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note C#, 7 note C_, 4 volume_envelope 1, 7 note C_, 4 - volume_envelope 8, 0 + volume_envelope 8, 8 note C#, 4 volume_envelope 1, 7 note C#, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 4 volume_envelope 1, 7 note D_, 4 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 7 note D#, 4 volume_envelope 1, 7 note D#, 4 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 4 volume_envelope 1, 7 note E_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note F#, 4 volume_envelope 1, 7 note F#, 4 - volume_envelope 8, 0 + volume_envelope 8, 8 note G#, 4 volume_envelope 1, 7 note G#, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 8 note B_, 7 inc_octave note C#, 4 note D_, 4 -.MainLoop - volume_envelope 7, 0 +.MainLoop: + volume_envelope 7, 8 speed 1 octave 5 -.Loop1 +.Loop1: note E_, 4 note F#, 3 note E_, 4 note F#, 4 sound_loop 8, .Loop1 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 dec_octave dec_octave dec_octave @@ -83,141 +80,136 @@ Music_ChallengeHall_Ch1: volume_envelope 2, 7 note B_, 8 dec_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 7 note B_, 8 note B_, 7 volume_envelope 2, 7 note B_, 8 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 7 volume_envelope 2, 7 note B_, 8 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 7 volume_envelope 2, 7 note B_, 8 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 15 inc_octave note D_, 15 note E_, 15 inc_octave duty_cycle 0 - volume_envelope 10, 0 + volume_envelope 10, 8 sound_call Branch_f9848 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 8 speed 10 - note C#, 6 -; tie - note C#, 6 + note C#, 12 volume_envelope 3, 7 speed 1 note C#, 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note C#, 7 volume_envelope 2, 7 note C#, 8 rest 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note C#, 7 volume_envelope 2, 7 note C#, 8 rest 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 7 volume_envelope 2, 7 note D_, 8 rest 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 7 volume_envelope 2, 7 note D_, 8 duty_cycle 0 - volume_envelope 10, 0 + volume_envelope 10, 8 sound_call Branch_f9848 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 8 dec_octave speed 10 - note A_, 6 -; tie - note A_, 6 + note A_, 12 volume_envelope 3, 7 speed 1 note A_, 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 inc_octave note C#, 7 volume_envelope 2, 7 note C#, 8 rest 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note C#, 7 volume_envelope 2, 7 note C#, 8 rest 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note C#, 15 note D_, 15 note E_, 15 volume_envelope 2, 7 note E_, 15 duty_cycle 0 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 7 note F_, 7 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 7 note F_, 8 note F#, 7 note G#, 7 volume_envelope 3, 7 note G#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 10 note A_, 3 -; tie speed 1 note A_, 15 dec_octave duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 duty_cycle 0 - volume_envelope 10, 0 + volume_envelope 10, 8 rest 15 inc_octave note E_, 7 note D#, 7 volume_envelope 3, 7 note D#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 7 note D#, 8 note E_, 7 note G#, 7 volume_envelope 3, 7 note G#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 9 note A_, 5 speed 1 dec_octave duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 duty_cycle 0 - volume_envelope 10, 0 + volume_envelope 10, 8 rest 15 inc_octave note D_, 7 @@ -225,127 +217,126 @@ Music_ChallengeHall_Ch1: note D_, 7 volume_envelope 3, 7 note D_, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 7 volume_envelope 3, 7 note A_, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 15 -; tie note G#, 7 volume_envelope 3, 7 note G#, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 15 volume_envelope 3, 7 note F#, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 8 speed 10 note E_, 6 speed 1 volume_envelope 3, 7 note E_, 15 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 15 note D_, 15 note E_, 15 volume_envelope 3, 7 note E_, 15 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 7 note F_, 7 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 7 note F_, 8 note F#, 6 volume_envelope 3, 7 note F#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 6 volume_envelope 3, 7 note G#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 10 note A_, 3 speed 1 note G#, 15 dec_octave duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 7 inc_octave duty_cycle 0 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 6 volume_envelope 3, 7 note F#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 15 volume_envelope 3, 7 note E_, 15 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 dec_octave note B_, 7 inc_octave duty_cycle 0 - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 6 volume_envelope 3, 7 note G#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 10 note A_, 3 speed 1 volume_envelope 3, 7 note A_, 15 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 6 volume_envelope 3, 7 note B_, 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 6 volume_envelope 3, 7 note C#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 10 note D_, 3 speed 1 volume_envelope 3, 7 note D_, 15 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 6 volume_envelope 3, 7 note F#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 6 volume_envelope 3, 7 note B_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 15 volume_envelope 3, 7 note A_, 15 - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 11 volume_envelope 3, 7 note G#, 4 rest 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 7 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 10 note A_, 6 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 inc_octave note C#, 7 @@ -366,170 +357,160 @@ Branch_f9848: note C#, 15 volume_envelope 3, 7 note C#, 15 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 15 volume_envelope 3, 7 note E_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 8 note D_, 15 volume_envelope 3, 7 note D_, 15 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 15 volume_envelope 3, 7 note F#, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 8 note E_, 7 volume_envelope 3, 7 note E_, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 15 note G#, 7 volume_envelope 3, 7 note G#, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 7 volume_envelope 3, 7 note F#, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 15 note D_, 7 volume_envelope 3, 7 note D_, 8 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 15 volume_envelope 3, 7 note B_, 7 inc_octave sound_ret - Music_ChallengeHall_Ch2: stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 15, 3, 3 -; cutoff 7 octave 3 speed 10 -.Loop1 +.Loop1: rest 6 sound_loop 2, .Loop1 -.MainLoop +.MainLoop: duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 speed 10 - note E_, 6 -; tie - note E_, 6 + note E_, 12 speed 1 note E_, 7 volume_envelope 2, 7 note E_, 8 dec_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 7 note E_, 8 note E_, 7 volume_envelope 2, 7 note E_, 8 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 7 volume_envelope 2, 7 note E_, 8 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 7 volume_envelope 2, 7 note E_, 8 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 15 note F#, 15 note G#, 15 sound_call Branch_f9a28 note B_, 8 speed 10 - note A_, 6 -; tie - note A_, 6 + note A_, 12 speed 1 rest 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 rest 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 rest 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 7 volume_envelope 2, 7 note B_, 8 rest 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 7 volume_envelope 2, 7 note B_, 8 sound_call Branch_f9a28 note G#, 8 speed 10 - note E_, 6 -; tie - note E_, 6 + note E_, 12 speed 1 rest 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 rest 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 rest 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 15 note B_, 15 inc_octave note C#, 15 volume_envelope 2, 7 note C#, 15 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 7 volume_envelope 2, 7 note D_, 8 rest 15 dec_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 rest 15 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 7 duty_cycle 2 - volume_envelope 6, 0 + volume_envelope 6, 8 inc_octave note D_, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 inc_octave - volume_envelope 6, 0 + volume_envelope 6, 8 note D_, 7 volume_envelope 2, 7 note D_, 8 - volume_envelope 6, 0 -.Loop2 + volume_envelope 6, 8 +.Loop2: note E_, 4 note F#, 3 note E_, 4 @@ -541,22 +522,22 @@ Music_ChallengeHall_Ch2: dec_octave dec_octave duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note C#, 7 inc_octave duty_cycle 2 - volume_envelope 6, 0 + volume_envelope 6, 8 note E_, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 inc_octave - volume_envelope 6, 0 + volume_envelope 6, 8 note C#, 7 volume_envelope 2, 7 note C#, 8 - volume_envelope 5, 0 -.Loop3 + volume_envelope 5, 8 +.Loop3: note D_, 4 note E_, 3 note D_, 4 @@ -568,17 +549,16 @@ Music_ChallengeHall_Ch2: note D_, 7 volume_envelope 2, 7 note D_, 8 - volume_envelope 5, 0 + volume_envelope 5, 8 note C#, 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 octave 2 note B_, 7 inc_octave inc_octave -; vibrato_type 1 duty_cycle 2 - volume_envelope 5, 0 + volume_envelope 5, 8 note B_, 8 inc_octave speed 10 @@ -586,51 +566,50 @@ Music_ChallengeHall_Ch2: volume_envelope 2, 7 speed 1 note C#, 15 -; vibrato_type 8 duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 octave 2 note E_, 15 note F#, 15 note A#, 15 rest 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 inc_octave note D_, 7 volume_envelope 2, 7 note D_, 8 rest 15 dec_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 7 volume_envelope 2, 7 note B_, 8 rest 15 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 7 inc_octave duty_cycle 2 - volume_envelope 6, 0 + volume_envelope 6, 8 note D_, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 inc_octave - volume_envelope 6, 0 + volume_envelope 6, 8 note D_, 7 volume_envelope 2, 7 note D_, 8 - volume_envelope 6, 0 -.Loop4 + volume_envelope 6, 8 +.Loop4: note E_, 4 note F#, 3 note E_, 4 note F#, 4 sound_loop 2, .Loop4 duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 dec_octave dec_octave note F_, 15 @@ -642,10 +621,10 @@ Music_ChallengeHall_Ch2: speed 1 rest 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note C#, 7 duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 6 rest 2 speed 10 @@ -654,49 +633,47 @@ Music_ChallengeHall_Ch2: rest 15 dec_octave duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 7 inc_octave duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 note D_, 6 rest 2 note E_, 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 7 volume_envelope 2, 7 note E_, 8 duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 note D_, 11 rest 4 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 dec_octave note B_, 7 inc_octave duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 note D_, 6 rest 2 note C#, 15 duty_cycle 1 - volume_envelope 8, 0 -; cutoff 7 + volume_envelope 8, 8 note C#, 5 note C#, 5 note C#, 5 -; cutoff 8 note C#, 7 volume_envelope 2, 7 note C#, 8 - volume_envelope 8, 0 + volume_envelope 8, 8 note C#, 7 volume_envelope 2, 7 note C#, 8 duty_cycle 0 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 7 volume_envelope 3, 7 note A_, 8 @@ -707,103 +684,93 @@ Music_ChallengeHall_Ch2: Branch_f9a28: duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 note A_, 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 7 volume_envelope 2, 7 note A_, 8 duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 inc_octave note C#, 15 dec_octave duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 7 duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 note A_, 8 note B_, 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 7 volume_envelope 2, 7 note B_, 8 duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 inc_octave note D_, 15 dec_octave duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 7 duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 note B_, 8 inc_octave note C#, 7 volume_envelope 3, 7 note C#, 8 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note C#, 7 volume_envelope 2, 7 note C#, 8 duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 7 rest 8 note E_, 7 rest 8 - volume_envelope 7, 0 note D_, 15 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 7 volume_envelope 2, 7 note D_, 8 dec_octave duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 note G#, 15 inc_octave duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 7 dec_octave duty_cycle 0 - volume_envelope 7, 0 + volume_envelope 7, 8 sound_ret - Music_ChallengeHall_Ch3: stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 -; echo 0 -; cutoff 8 -; cutoff 8 speed 10 -.Loop1 +.Loop1: rest 6 sound_loop 2, .Loop1 -.MainLoop +.MainLoop: octave 2 -; cutoff 8 - note E_, 6 -; tie - note E_, 6 + note E_, 12 speed 1 inc_octave note E_, 7 rest 8 dec_octave -; cutoff 7 note E_, 7 note E_, 8 -; cutoff 8 note E_, 7 rest 8 note E_, 7 @@ -815,7 +782,7 @@ Music_ChallengeHall_Ch3: note G#, 15 sound_call Branch_f9b7d sound_call Branch_f9b92 -.Loop2 +.Loop2: sound_call Branch_f9b7d sound_loop 3, .Loop2 sound_call Branch_f9b92 @@ -837,7 +804,7 @@ Music_ChallengeHall_Ch3: inc_octave note C#, 15 dec_octave -.Loop3 +.Loop3: note D_, 15 inc_octave note A_, 7 @@ -972,18 +939,16 @@ Music_ChallengeHall_Ch3: dec_octave note A_, 7 rest 8 -; cutoff 7 note A_, 5 note A_, 5 note A_, 5 -; cutoff 8 note A_, 7 rest 8 note A_, 7 rest 8 note A_, 7 - rest 8 - rest 15 + rest 16 + rest 7 speed 10 rest 3 sound_loop 0, .MainLoop @@ -1036,21 +1001,20 @@ Branch_f9b92: dec_octave sound_ret - Music_ChallengeHall_Ch4: toggle_noise 6 drum_speed 1 drum_speed 10 -.Loop1 +.Loop1: rest 6 sound_loop 2, .Loop1 -.MainLoop +.MainLoop: drum_speed 1 drum_note 2, 4 drum_note 3, 3 drum_note 3, 4 drum_note 3, 4 -.Loop2 +.Loop2: drum_note 3, 4 drum_note 3, 3 drum_note 3, 4 @@ -1068,7 +1032,7 @@ Music_ChallengeHall_Ch4: drum_note 3, 4 drum_note 2, 15 drum_note 2, 15 -.Loop3 +.Loop3: drum_note 1, 15 drum_note 2, 15 drum_note 1, 15 diff --git a/crysaudio/music/TCG/club2.asm b/crysaudio/music/TCG/club2.asm index 089c6b4d3..6915d2717 100644 --- a/crysaudio/music/TCG/club2.asm +++ b/crysaudio/music/TCG/club2.asm @@ -208,14 +208,13 @@ Music_Club2_Ch3: note E_, 4 note C_, 4 note F#, 2 - rest 2 rest 16 + rest 2 note G_, 4 note A_, 4 note B_, 4 note F#, 2 - rest 2 - rest 14 + rest 16 channel_volume 2 sound_call Branch_fa1cf octave 5 @@ -226,30 +225,36 @@ Music_Club2_Ch3: note G_, 8 sound_call Branch_fa1f3 octave 4 - note G_, 16 - note G_, 12 + note_type 12, 1, 10 + note G_, 14 + note_type 6, 1, 10 rest 16 rest 8 note E_, 8 sound_call Branch_fa1f3 octave 4 - note G_, 16 + note_type 12, 1, 10 + note G_, 14 note G_, 12 - note G_, 16 - note G_, 8 + note_type 6, 1, 10 rest 4 note A_, 2 note G_, 2 - note F#, 16 - note F#, 12 + note_type 12, 1, 10 + note F#, 14 + note_type 6, 1, 10 rest 4 note F#, 1 - note G_, 15 - note G_, 12 + note G_, 1 + note_type 12, 1, 10 + note G_, 13 + note_type 6, 1, 10 rest 4 note G#, 1 + note A_, 1 + note_type 12, 1, 10 note A_, 15 - note A_, 16 + note_type 6, 1, 10 rest 16 rest 16 sound_loop 0, .MainLoop @@ -257,13 +262,16 @@ Music_Club2_Ch3: Branch_fa1cf: octave 6 note C#, 1 - note D_, 15 - note D_, 12 + note D_, 1 + note_type 12, 2, 10 + note D_, 13 + note_type 6, 2, 10 note C_, 2 dec_octave note B_, 2 - note G_, 16 - note G_, 8 + note_type 12, 2, 10 + note G_, 12 + note_type 6, 2, 10 rest 4 note E_, 4 note B_, 4 @@ -271,8 +279,9 @@ Branch_fa1cf: note C_, 4 dec_octave note B_, 4 - note A_, 16 - note A_, 8 + note_type 12, 2, 10 + note A_, 12 + note_type 6, 2, 10 note A_, 16 rest 4 sound_ret @@ -287,8 +296,9 @@ Branch_fa1f3: note B_, 4 inc_octave note C_, 4 - note D_, 16 - note D_, 8 + note_type 12, 1, 10 + note D_, 12 + note_type 6, 1, 10 rest 4 note C_, 2 dec_octave diff --git a/crysaudio/music/TCG/credits.asm b/crysaudio/music/TCG/credits.asm index 7b839002d..e960ae390 100644 --- a/crysaudio/music/TCG/credits.asm +++ b/crysaudio/music/TCG/credits.asm @@ -8,16 +8,13 @@ Music_TCGCredits: Music_TCGCredits_Ch1: speed 13 stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 -; cutoff 8 octave 2 duty_cycle 1 volume_envelope 4, -7 note F_, 1 - volume_envelope 6, 0 + volume_envelope 6, 8 note F_, 2 -; tie speed 1 note F_, 6 volume_envelope 3, 7 @@ -25,9 +22,8 @@ Music_TCGCredits_Ch1: speed 13 volume_envelope 6, -7 note G_, 1 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 2 -; tie speed 1 note G_, 6 volume_envelope 4, 7 @@ -35,20 +31,19 @@ Music_TCGCredits_Ch1: speed 13 volume_envelope 6, -7 note A_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 2 -; tie speed 1 note A_, 6 volume_envelope 4, 7 note A_, 7 speed 13 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 3 volume_envelope 4, 7 note B_, 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 1 volume_envelope 3, 7 note C_, 1 @@ -59,108 +54,103 @@ Music_TCGCredits_Ch1: note F_, 1 sound_call Branch_fb36b octave 4 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note D#, 3 note E_, 10 -; tie speed 13 note E_, 4 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 1 speed 1 note G_, 5 volume_envelope 3, 7 note G_, 8 speed 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 5 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 1 speed 1 note G_, 5 volume_envelope 3, 7 note G_, 8 speed 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 5 volume_envelope 3, 7 note C_, 1 dec_octave speed 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 6 volume_envelope 3, 7 note A_, 13 rest 7 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 3 note D_, 10 -; tie speed 13 note D_, 2 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 1 volume_envelope 3, 7 note C_, 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 1 volume_envelope 3, 7 note G#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 3 note G_, 10 -; tie speed 13 note G_, 3 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 1 speed 1 note A_, 5 volume_envelope 3, 7 note A_, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 5 volume_envelope 3, 7 note B_, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 3 inc_octave note C_, 10 -; tie speed 13 note C_, 2 -; tie speed 1 note C_, 6 volume_envelope 3, 7 note C_, 13 rest 7 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 3 inc_octave note C_, 10 note D_, 5 volume_envelope 3, 7 note D_, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 5 volume_envelope 3, 7 note E_, 8 speed 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 3 note E_, 1 speed 1 @@ -169,81 +159,74 @@ Music_TCGCredits_Ch1: note C_, 13 rest 7 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 6 volume_envelope 3, 7 note A_, 13 rest 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 3 inc_octave note C_, 10 -; tie speed 13 note C_, 2 -; tie speed 1 note C_, 6 volume_envelope 3, 7 note C_, 13 rest 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 3 note D_, 10 -; tie speed 13 note D_, 2 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 - note C_, 8 -; tie - note C_, 8 -; tie + volume_envelope 10, 8 + note C_, 16 + vibrato 0, 3, 3 note C_, 8 volume_envelope 3, 7 + vibrato 20, 3, 3 note C_, 1 sound_call Branch_fb36b octave 4 speed 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 3 note D#, 10 -; tie speed 13 note D#, 4 volume_envelope 3, 7 note D#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 1 speed 1 note C_, 6 volume_envelope 3, 7 note C_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 3 note F_, 10 -; tie speed 13 note F_, 3 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D#, 1 note F_, 1 volume_envelope 3, 7 note F_, 1 speed 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 3 note G_, 10 -; tie speed 13 note G_, 4 dec_octave dec_octave speed 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note E_, 6 note A_, 7 inc_octave @@ -256,9 +239,7 @@ Music_TCGCredits_Ch1: note F_, 6 note D_, 7 speed 13 - note E_, 8 -; tie - note E_, 1 + note E_, 9 volume_envelope 3, 7 note E_, 2 sound_ret @@ -266,13 +247,13 @@ Music_TCGCredits_Ch1: Branch_fb36b: speed 13 octave 2 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 1 rest 1 note G_, 1 volume_envelope 3, 7 note G_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 1 note B_, 1 inc_octave @@ -280,11 +261,10 @@ Branch_fb36b: volume_envelope 3, 7 note C_, 1 rest 1 -; sound_call Branch_fb5bc octave 2 speed 13 rest 2 - volume_envelope 8, 0 + volume_envelope 8, 8 note G_, 1 inc_octave note C_, 1 @@ -294,11 +274,11 @@ Branch_fb36b: volume_envelope 3, 7 note A_, 1 rest 2 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 1 volume_envelope 3, 7 note B_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 1 rest 1 inc_octave @@ -307,27 +287,25 @@ Branch_fb36b: note C_, 1 rest 3 dec_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note G_, 1 inc_octave note C_, 1 rest 1 -; sound_ret octave 2 note A_, 2 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 1 inc_octave -; sound_call Branch_fb5e4 octave 3 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 3 note G_, 10 @@ -335,65 +313,58 @@ Branch_fb36b: volume_envelope 3, 7 note F_, 7 speed 13 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 4 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note C#, 3 note D_, 10 -; tie speed 13 note D_, 4 volume_envelope 3, 7 note D_, 1 -; sound_ret octave 4 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 1 volume_envelope 3, 7 note C_, 1 dec_octave - volume_envelope 10, 0 - note G_, 4 -; tie - note G_, 8 + volume_envelope 10, 8 + note G_, 12 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 1 note F_, 1 speed 1 note G_, 6 volume_envelope 3, 7 note G_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 3 note G_, 10 -; tie speed 13 note G_, 4 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 1 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note E_, 3 note F_, 10 -; tie speed 13 note F_, 2 note E_, 1 -; tie speed 1 note E_, 6 note F_, 4 @@ -402,19 +373,15 @@ Branch_fb36b: note C_, 13 volume_envelope 3, 7 note C_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 3 note D_, 10 -; tie speed 13 - note D_, 4 -; tie - note D_, 8 + note D_, 12 volume_envelope 3, 7 note D_, 2 -; sound_call Branch_fb5e4 octave 3 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 3 note G_, 10 @@ -422,151 +389,139 @@ Branch_fb36b: volume_envelope 3, 7 note F_, 7 speed 13 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 4 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note C#, 3 note D_, 10 -; tie speed 13 note D_, 4 volume_envelope 3, 7 note D_, 1 -; sound_ret octave 4 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 dec_octave - volume_envelope 10, 0 - note G_, 4 -; tie - note G_, 8 + volume_envelope 10, 8 + note G_, 12 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 1 note F_, 1 speed 1 note G_, 6 volume_envelope 3, 7 note G_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 3 note G#, 10 -; tie note G#, 13 volume_envelope 3, 7 note G#, 13 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 13 volume_envelope 3, 7 note C_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 3 note D_, 10 note C_, 13 volume_envelope 3, 7 note C_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 3 note G_, 10 -; tie speed 13 note G_, 2 note F_, 1 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 1 note D_, 1 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note D#, 3 note E_, 10 -; tie speed 13 note E_, 8 -; sound_call Branch_fb60c octave 4 speed 13 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note D#, 3 note E_, 10 speed 13 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 1 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G#, 3 note A_, 10 -; tie speed 13 note A_, 8 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G#, 3 note A_, 10 volume_envelope 3, 7 note A_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 13 volume_envelope 3, 7 note G_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 13 volume_envelope 3, 7 note F_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 3 note G_, 10 -; tie -; sound_ret speed 13 - octave 4 note G_, 8 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 3 note G_, 10 volume_envelope 3, 7 note G_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 13 volume_envelope 3, 7 note F_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 13 volume_envelope 3, 7 note E_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 6 note F_, 7 note E_, 13 @@ -575,43 +530,41 @@ Branch_fb36b: volume_envelope 3, 7 note A_, 7 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 6 volume_envelope 3, 7 note C_, 7 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 6 volume_envelope 3, 7 note F_, 13 rest 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 13 inc_octave note C_, 6 volume_envelope 3, 7 note C_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note D#, 3 note E_, 10 -; tie note E_, 13 note F_, 6 volume_envelope 3, 7 note F_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 6 volume_envelope 3, 7 note E_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 6 volume_envelope 3, 7 note C_, 13 rest 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 3 note D_, 10 -; tie note D_, 13 note C#, 6 note C_, 7 @@ -621,162 +574,154 @@ Branch_fb36b: note C_, 6 volume_envelope 3, 7 note C_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 6 volume_envelope 3, 7 note G_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 13 note E_, 5 -; sound_call Branch_fb60c octave 4 speed 13 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note D#, 3 note E_, 10 speed 13 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 1 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G#, 3 note A_, 10 -; tie speed 13 note A_, 8 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G#, 3 note A_, 10 volume_envelope 3, 7 note A_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 13 volume_envelope 3, 7 note G_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 13 volume_envelope 3, 7 note F_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 3 note G_, 10 -; tie -; sound_ret speed 13 - octave 4 note G_, 3 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 1 speed 1 note A_, 6 volume_envelope 3, 7 note A_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 6 volume_envelope 3, 7 note B_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 3 inc_octave note C_, 10 volume_envelope 3, 7 note C_, 13 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 3 note G_, 10 volume_envelope 3, 7 note G_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 13 volume_envelope 3, 7 note F_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 13 volume_envelope 3, 7 note E_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 3 note F_, 10 -; tie note F_, 13 note E_, 13 note C_, 6 volume_envelope 3, 7 note C_, 7 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 6 volume_envelope 3, 7 note A_, 7 rest 13 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 13 dec_octave note A_, 6 volume_envelope 3, 7 note A_, 7 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 3 note F_, 10 -; tie note F_, 13 note E_, 13 note C_, 6 volume_envelope 3, 7 note C_, 7 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 6 volume_envelope 3, 7 note G#, 7 rest 13 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 6 volume_envelope 3, 7 note C_, 7 rest 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 3 note G_, 10 -; tie speed 13 note G_, 8 volume_envelope 3, 7 note G_, 1 dec_octave dec_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note G_, 1 volume_envelope 2, 7 note G_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 1 volume_envelope 2, 7 note A_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 1 speed 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 3 note A_, 3 note B_, 3 @@ -786,23 +731,20 @@ Branch_fb36b: note E_, 3 note F_, 3 note G_, 4 -; sound_call Branch_fb651 octave 3 - volume_envelope 10, 0 note D#, 3 note E_, 10 note F_, 6 volume_envelope 3, 7 note F_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 5 volume_envelope 3, 7 note G_, 8 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 3 note D_, 10 -; tie note D_, 13 note C_, 6 volume_envelope 3, 7 @@ -810,99 +752,90 @@ Branch_fb36b: rest 7 dec_octave speed 13 - volume_envelope 10, 0 - note G_, 6 -; tie - note G_, 6 -; tie + volume_envelope 10, 8 + note G_, 12 + vibrato 0, 3, 3 note G_, 8 volume_envelope 3, 7 + vibrato 20, 3, 3 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note D#, 3 note E_, 10 note F_, 5 volume_envelope 3, 7 note F_, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 5 volume_envelope 3, 7 note G_, 8 -; sound_ret octave 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 3 note A_, 10 -; tie note A_, 13 volume_envelope 3, 7 note A_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 13 volume_envelope 3, 7 note C_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 3 note D_, 10 note C_, 13 volume_envelope 3, 7 note C_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 3 note G_, 10 -; tie note G_, 13 volume_envelope 3, 7 note G_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note D#, 3 note E_, 10 volume_envelope 3, 7 note E_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 13 note C_, 13 volume_envelope 3, 7 note C_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 3 note D_, 10 -; tie speed 13 - note D_, 4 -; tie - note D_, 8 + note D_, 12 volume_envelope 3, 7 note D_, 1 dec_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note G_, 1 speed 1 note A_, 6 volume_envelope 2, 7 note A_, 7 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 6 volume_envelope 2, 7 note B_, 7 -; sound_call Branch_fb651 octave 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note D#, 3 note E_, 10 note F_, 6 volume_envelope 3, 7 note F_, 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 5 volume_envelope 3, 7 note G_, 8 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 3 note D_, 10 -; tie note D_, 13 note C_, 6 volume_envelope 3, 7 @@ -910,55 +843,51 @@ Branch_fb36b: rest 7 dec_octave speed 13 - volume_envelope 10, 0 - note G_, 6 -; tie - note G_, 6 -; tie + volume_envelope 10, 8 + note G_, 12 + vibrato 0, 3, 3 note G_, 8 volume_envelope 3, 7 + vibrato 20, 3, 3 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note D#, 3 note E_, 10 note F_, 5 volume_envelope 3, 7 note F_, 8 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 5 volume_envelope 3, 7 note G_, 8 -; sound_ret octave 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 3 note G#, 10 -; tie note G#, 13 volume_envelope 3, 7 note G#, 13 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 13 volume_envelope 3, 7 note C_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 3 note D_, 10 note C_, 13 volume_envelope 3, 7 note C_, 13 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 3 note G_, 10 -; tie speed 13 note G_, 2 note F_, 1 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 1 note D_, 1 volume_envelope 3, 7 @@ -969,7 +898,7 @@ Branch_fb5bc: octave 2 speed 13 rest 2 - volume_envelope 8, 0 + volume_envelope 8, 8 note G_, 1 inc_octave note C_, 1 @@ -979,11 +908,11 @@ Branch_fb5bc: volume_envelope 3, 7 note A_, 1 rest 2 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 1 volume_envelope 3, 7 note B_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 1 rest 1 inc_octave @@ -992,151 +921,23 @@ Branch_fb5bc: note C_, 1 rest 3 dec_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note G_, 1 inc_octave note C_, 1 rest 1 sound_ret -Branch_fb5e4: - octave 3 - volume_envelope 10, 0 - speed 1 - note F#, 3 - note G_, 10 - note F_, 6 - volume_envelope 3, 7 - note F_, 7 - speed 13 - volume_envelope 8, 0 - note E_, 4 - volume_envelope 3, 7 - note E_, 1 - volume_envelope 10, 0 - note G_, 1 - volume_envelope 3, 7 - note G_, 1 - inc_octave - volume_envelope 10, 0 - speed 1 - note C#, 3 - note D_, 10 -; tie - speed 13 - note D_, 4 - volume_envelope 3, 7 - note D_, 1 - sound_ret - -Branch_fb60c: - octave 4 - speed 13 - volume_envelope 3, 7 - note E_, 1 - volume_envelope 10, 0 - speed 1 - note D#, 3 - note E_, 10 - speed 13 - volume_envelope 3, 7 - note E_, 1 - volume_envelope 10, 0 - note F_, 1 - volume_envelope 3, 7 - note F_, 1 - volume_envelope 10, 0 - note G_, 1 - volume_envelope 3, 7 - note G_, 1 - volume_envelope 10, 0 - speed 1 - note G#, 3 - note A_, 10 -; tie - speed 13 - note A_, 8 - volume_envelope 3, 7 - note A_, 1 - volume_envelope 10, 0 - speed 1 - note G#, 3 - note A_, 10 - volume_envelope 3, 7 - note A_, 13 - volume_envelope 10, 0 - note G_, 13 - volume_envelope 3, 7 - note G_, 13 - volume_envelope 10, 0 - note F_, 13 - volume_envelope 3, 7 - note F_, 13 - volume_envelope 10, 0 - note F#, 3 - note G_, 10 -; tie - sound_ret - -Branch_fb651: - octave 3 - volume_envelope 10, 0 - note D#, 3 - note E_, 10 - note F_, 6 - volume_envelope 3, 7 - note F_, 7 - volume_envelope 10, 0 - note G_, 5 - volume_envelope 3, 7 - note G_, 8 - inc_octave - volume_envelope 10, 0 - note C#, 3 - note D_, 10 -; tie - note D_, 13 - note C_, 6 - volume_envelope 3, 7 - note C_, 13 - rest 7 - dec_octave - speed 13 - volume_envelope 10, 0 - note G_, 6 -; tie - note G_, 6 -; tie - note G_, 8 - volume_envelope 3, 7 - note G_, 1 - volume_envelope 10, 0 - speed 1 - note D#, 3 - note E_, 10 - note F_, 5 - volume_envelope 3, 7 - note F_, 8 - volume_envelope 10, 0 - note G_, 5 - volume_envelope 3, 7 - note G_, 8 - sound_ret - - Music_TCGCredits_Ch2: stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 -; cutoff 8 duty_cycle 1 octave 2 speed 13 volume_envelope 3, -7 note A_, 1 - volume_envelope 7, 0 + volume_envelope 7, 8 note A_, 2 -; tie speed 1 note A_, 6 volume_envelope 2, 7 @@ -1144,9 +945,8 @@ Music_TCGCredits_Ch2: speed 13 volume_envelope 7, -7 note B_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 2 -; tie speed 1 note B_, 6 volume_envelope 3, 7 @@ -1155,116 +955,142 @@ Music_TCGCredits_Ch2: speed 13 volume_envelope 5, -7 note C_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 2 -; tie speed 1 note C_, 6 volume_envelope 3, 7 note C_, 7 speed 13 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 3 volume_envelope 3, 7 note D_, 1 sound_call Branch_fb79e octave 4 speed 13 - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 3 dec_octave volume_envelope 9, 2 note C_, 1 rest 2 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 1 -; cutoff 4 + note_type 5, 8, 8 note E_, 1 -; cutoff 8 + rest 1 + note_type 1, 8, 8 + rest 3 + note_type 13, 8, 8 note C_, 3 dec_octave volume_envelope 9, 2 note D_, 1 rest 2 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 1 -; cutoff 4 + note_type 5, 8, 8 note E_, 1 + rest 1 + note_type 1, 8, 8 + rest 3 + note_type 13, 8, 8 dec_octave -; cutoff 8 note A_, 3 volume_envelope 9, 2 note C_, 1 rest 2 -; cutoff 4 - volume_envelope 8, 0 + note_type 6, 8, 8 note F_, 1 -; cutoff 8 - volume_envelope 9, 2 + rest 1 + note_type 1, 8, 8 + rest 1 + note_type 13, 9, 2 note C_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note G#, 3 volume_envelope 9, 2 note C_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note G#, 1 rest 1 note F_, 1 volume_envelope 9, 2 note C_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 3 volume_envelope 9, 2 note D_, 1 rest 1 dec_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 1 inc_octave -; cutoff 4 + note_type 5, 8, 8 note C_, 1 - volume_envelope 9, 2 -; cutoff 8 + rest 1 + note_type 1, 8, 8 + rest 3 + note_type 5, 9, 2 note D_, 1 - volume_envelope 8, 0 + rest 1 + note_type 1, 9, 2 + rest 3 + note_type 13, 8, 8 note E_, 3 - volume_envelope 9, 2 + note_type 6, 9, 2 note C_, 1 rest 1 - volume_envelope 8, 0 + note_type 1, 9, 2 + rest 1 + note_type 13, 9, 2 + rest 1 + volume_envelope 8, 8 note E_, 1 -; cutoff 4 + note_type 5, 8, 8 note F_, 1 -; cutoff 8 - volume_envelope 9, 2 + rest 1 + note_type 1, 8, 8 + rest 3 + note_type 5, 9, 2 note C_, 1 - volume_envelope 8, 0 + rest 1 + note_type 1, 9, 2 + rest 3 + note_type 13, 8, 8 note A_, 3 volume_envelope 9, 2 note C_, 1 -; cutoff 4 + note_type 6, 9, 2 note A_, 1 rest 1 + note_type 1, 9, 2 + rest 1 + note_type 13, 9, 2 + rest 1 + note_type 6, 9, 2 note F_, 1 -; cutoff 8 - volume_envelope 9, 2 + rest 1 + note_type 1, 9, 2 + rest 1 + note_type 13, 9, 2 note C_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 3 volume_envelope 9, 2 note C_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note G#, 3 rest 1 sound_call Branch_fb79e octave 4 speed 13 - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 1 -; tie note C_, 2 dec_octave dec_octave @@ -1272,37 +1098,34 @@ Music_TCGCredits_Ch2: note G#, 1 rest 2 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note A#, 1 dec_octave volume_envelope 9, 2 note G#, 1 inc_octave inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 1 -; tie note C_, 2 dec_octave volume_envelope 9, 2 note C_, 1 rest 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 1 note C_, 1 dec_octave volume_envelope 9, 2 note C_, 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 1 -; tie note E_, 4 dec_octave dec_octave speed 1 - volume_envelope 8, 0 note C_, 6 note F_, 7 note A_, 6 @@ -1315,9 +1138,7 @@ Music_TCGCredits_Ch2: note B_, 7 inc_octave speed 13 - note C_, 8 -; tie - note C_, 1 + note C_, 9 volume_envelope 2, 7 note C_, 2 sound_ret @@ -1325,36 +1146,34 @@ Music_TCGCredits_Ch2: Branch_fb79e: speed 13 octave 3 - volume_envelope 9, 0 + volume_envelope 9, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 -; sound_call Branch_fba68 - octave 3 volume_envelope 9, 2 note C_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 1 note E_, 1 volume_envelope 9, 2 note C_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F_, 1 volume_envelope 3, 7 note F_, 1 rest 1 volume_envelope 9, 2 note C_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F_, 1 volume_envelope 9, 2 note C_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 @@ -1362,61 +1181,59 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 1 note E_, 1 volume_envelope 9, 2 note C_, 1 -; sound_ret octave 2 - volume_envelope 9, 0 + volume_envelope 9, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 inc_octave - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 1 volume_envelope 9, 2 note C_, 1 dec_octave - volume_envelope 9, 0 + volume_envelope 9, 8 note B_, 1 volume_envelope 3, 7 note B_, 1 inc_octave - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 1 note D_, 1 note E_, 1 volume_envelope 3, 7 note E_, 1 rest 1 -; sound_call Branch_fba68 octave 3 volume_envelope 9, 2 note C_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 1 note E_, 1 volume_envelope 9, 2 note C_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F_, 1 volume_envelope 3, 7 note F_, 1 rest 1 volume_envelope 9, 2 note C_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F_, 1 volume_envelope 9, 2 note C_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 @@ -1424,37 +1241,34 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 1 note E_, 1 volume_envelope 9, 2 note C_, 1 -; sound_ret - volume_envelope 9, 0 - octave 3 + volume_envelope 9, 8 speed 1 note E_, 3 note F_, 10 -; tie speed 13 note F_, 1 note E_, 1 volume_envelope 3, 7 note E_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 1 volume_envelope 3, 7 note C_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 3 volume_envelope 9, 2 duty_cycle 1 -.Loop1 +.Loop1: rest 2 note C_, 1 rest 1 sound_loop 2, .Loop1 -.Loop2 +.Loop2: rest 2 note D_, 1 rest 1 @@ -1462,10 +1276,9 @@ Branch_fb79e: rest 2 note C_, 1 rest 2 -; sound_call Branch_fba9d octave 4 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note F#, 3 note G_, 10 @@ -1475,11 +1288,11 @@ Branch_fb79e: note C_, 13 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 5 volume_envelope 2, 7 note E_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 3 note F_, 10 note E_, 5 @@ -1491,23 +1304,22 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 1 -; sound_ret rest 2 duty_cycle 1 volume_envelope 9, 2 octave 3 note C_, 1 rest 1 -.Loop3 +.Loop3: rest 2 note C_, 1 rest 1 sound_loop 4, .Loop3 rest 2 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note E_, 3 note F_, 10 @@ -1515,11 +1327,11 @@ Branch_fb79e: volume_envelope 2, 7 note A_, 8 inc_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note C_, 5 volume_envelope 2, 7 note C_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 5 volume_envelope 2, 7 note E_, 8 @@ -1529,10 +1341,9 @@ Branch_fb79e: note C_, 13 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 3 note F_, 10 -; tie note F_, 13 note E_, 5 note F_, 4 @@ -1542,16 +1353,16 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 13 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note A_, 5 volume_envelope 2, 7 note A_, 8 inc_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note C_, 5 volume_envelope 2, 7 note C_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note C#, 3 note D_, 10 dec_octave @@ -1560,11 +1371,10 @@ Branch_fb79e: note C_, 13 rest 13 dec_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 3 inc_octave note C_, 10 -; tie speed 13 note C_, 3 rest 1 @@ -1572,26 +1382,23 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A#, 3 note B_, 10 -; tie speed 13 note B_, 4 rest 1 inc_octave note C_, 1 dec_octave - duty_cycle 1 volume_envelope 9, 2 note D_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 5 rest 1 -; sound_call Branch_fba9d octave 4 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note F#, 3 note G_, 10 @@ -1601,11 +1408,11 @@ Branch_fb79e: note C_, 13 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 5 volume_envelope 2, 7 note E_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 3 note F_, 10 note E_, 5 @@ -1617,9 +1424,8 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 1 -; sound_ret duty_cycle 1 octave 3 note C_, 1 @@ -1627,10 +1433,9 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 3 note F_, 10 -; tie speed 13 note F_, 1 rest 1 @@ -1641,11 +1446,10 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 speed 1 note D_, 3 note D#, 10 -; tie speed 13 note D#, 2 dec_octave @@ -1654,7 +1458,7 @@ Branch_fb79e: note G#, 1 rest 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note G#, 1 note A#, 1 dec_octave @@ -1662,29 +1466,25 @@ Branch_fb79e: note G#, 1 inc_octave inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 3 dec_octave volume_envelope 9, 2 note C_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 1 note F#, 3 note G_, 10 inc_octave speed 13 -; cutoff 4 note C_, 1 dec_octave note B_, 1 -; cutoff 8 note A#, 1 rest 1 -; sound_call Branch_fbacb octave 3 -; cutoff 8 -.Loop4 +.Loop4: note A#, 1 rest 1 sound_loop 3, .Loop4 @@ -1694,17 +1494,15 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 1 inc_octave -; cutoff 4 note C_, 1 dec_octave -; cutoff 8 volume_envelope 9, 2 note C_, 1 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A#, 3 note B_, 16 rest 7 @@ -1715,7 +1513,7 @@ Branch_fb79e: volume_envelope 9, 2 note B_, 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 1 rest 1 note A_, 1 @@ -1723,23 +1521,20 @@ Branch_fb79e: volume_envelope 9, 2 note B_, 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 3 volume_envelope 9, 2 note D_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 1 inc_octave -; cutoff 4 note D_, 1 -; sound_ret octave 3 volume_envelope 9, 2 -; cutoff 8 note D_, 1 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 3 inc_octave note C_, 10 @@ -1750,7 +1545,7 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 1 rest 1 note C_, 1 @@ -1758,52 +1553,69 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 1 note C_, 1 dec_octave -; cutoff 4 + note_type 6, 8, 8 note F_, 1 -; cutoff 8 - volume_envelope 9, 2 + rest 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 9, 2 note C_, 1 - volume_envelope 8, 0 -; cutoff 4 + rest 1 + note_type 1, 9, 2 + rest 1 + note_type 6, 8, 8 note D_, 1 rest 1 -; cutoff 8 + note_type 1, 8, 8 + rest 1 + note_type 13, 8, 8 + rest 1 note F_, 1 - volume_envelope 9, 2 + note_type 6, 9, 2 note C_, 1 + rest 1 + note_type 1, 9, 2 + rest 1 + note_type 13, 8, 8 inc_octave - volume_envelope 8, 0 note C_, 2 -; cutoff 4 + note_type 6, 8, 8 note D_, 1 + rest 1 + note_type 1, 8, 8 + rest 1 + note_type 13, 9, 2 dec_octave -; cutoff 8 - volume_envelope 9, 2 note C_, 1 - volume_envelope 8, 0 -; cutoff 4 + note_type 6, 8, 8 note A_, 1 rest 1 -; cutoff 8 + note_type 1, 8, 8 + rest 1 + note_type 13, 8, 8 + rest 1 note B_, 1 volume_envelope 9, 2 note C_, 1 - volume_envelope 8, 0 -; cutoff 4 + volume_envelope 8, 8 note A_, 1 -; cutoff 8 note G_, 1 -; cutoff 4 + note_type 6, 8, 8 note A_, 1 -; cutoff 8 - volume_envelope 9, 2 + rest 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 9, 2 note C_, 1 + rest 1 + note_type 1, 9, 2 + rest 1 + note_type 13, 8, 8 inc_octave - volume_envelope 8, 0 note C_, 2 dec_octave speed 1 @@ -1812,14 +1624,11 @@ Branch_fb79e: note C_, 10 dec_octave speed 13 -; cutoff 4 note B_, 1 -; cutoff 6 - note A#, 2 -; sound_call Branch_fbacb + note A#, 1 + rest 1 octave 3 -; cutoff 8 -.Loop5 +.Loop5: note A#, 1 rest 1 sound_loop 3, .Loop5 @@ -1829,17 +1638,15 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A_, 1 inc_octave -; cutoff 4 note C_, 1 dec_octave -; cutoff 8 volume_envelope 9, 2 note C_, 1 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A#, 3 note B_, 16 rest 7 @@ -1850,7 +1657,7 @@ Branch_fb79e: volume_envelope 9, 2 note B_, 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 1 rest 1 note A_, 1 @@ -1858,20 +1665,26 @@ Branch_fb79e: volume_envelope 9, 2 note B_, 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 3 volume_envelope 9, 2 note D_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 1 inc_octave -; cutoff 4 + note_type 6, 8, 8 note D_, 1 -; sound_ret + rest 1 + note_type 1, 8, 8 + rest 1 octave 4 + note_type 6, 8, 8 note G_, 1 -; cutoff 8 + rest 1 + note_type 1, 8, 8 + rest 1 + note_type 13, 8, 8 note E_, 1 speed 13 rest 1 @@ -1880,7 +1693,7 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 inc_octave - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 1 rest 1 note C_, 1 @@ -1888,112 +1701,127 @@ Branch_fb79e: volume_envelope 9, 2 note C_, 1 inc_octave - volume_envelope 8, 0 -; cutoff 7 + volume_envelope 8, 8 note C_, 2 -; cutoff 8 note C_, 1 dec_octave - volume_envelope 9, 2 + note_type 6, 9, 2 note C_, 1 - volume_envelope 8, 0 -; cutoff 4 + rest 1 + note_type 1, 9, 2 + rest 1 + note_type 6, 8, 8 note F_, 1 rest 1 -; cutoff 8 + note_type 1, 8, 8 + rest 1 + note_type 13, 8, 8 + rest 1 note A_, 1 - volume_envelope 9, 2 + note_type 6, 9, 2 note C_, 1 + rest 1 + note_type 1, 9, 2 + rest 1 + note_type 13, 8, 8 inc_octave - volume_envelope 8, 0 -; cutoff 7 note C_, 2 -; cutoff 8 note C_, 1 dec_octave - volume_envelope 9, 2 + note_type 6, 9, 2 note C_, 1 - volume_envelope 8, 0 -; cutoff 4 + rest 1 + note_type 1, 9, 2 + rest 1 + note_type 6, 8, 8 note F_, 1 rest 1 + note_type 1, 8, 8 + rest 1 + note_type 13, 8, 8 + rest 1 + note_type 6, 8, 8 note G#, 1 -; cutoff 8 - volume_envelope 9, 2 + rest 1 + note_type 1, 8, 8 + rest 1 + note_type 13, 9, 2 note C_, 1 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 3 inc_octave note C_, 10 -; tie speed 13 note C_, 3 rest 1 dec_octave note A_, 1 inc_octave -; cutoff 4 note C_, 1 dec_octave -; cutoff 8 volume_envelope 9, 2 note C_, 1 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note A#, 3 note B_, 10 rest 13 dec_octave - volume_envelope 9, 0 + volume_envelope 9, 8 note A#, 3 note B_, 10 volume_envelope 2, 7 note B_, 13 inc_octave - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 13 volume_envelope 2, 7 note C_, 13 - volume_envelope 9, 0 + volume_envelope 9, 8 speed 13 note D_, 2 volume_envelope 2, 7 note D_, 1 -; sound_call Branch_fbb10 octave 3 speed 13 - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 1 -; cutoff 3 + note_type 6, 8, 8 note D_, 1 - volume_envelope 9, 2 -; cutoff 8 + rest 1 + note_type 1, 8, 8 + rest 1 + note_type 5, 9, 2 note C_, 1 - volume_envelope 8, 0 + rest 1 + note_type 1, 9, 2 + rest 3 + note_type 13, 8, 8 note B_, 2 -; cutoff 3 + note_type 6, 8, 8 note A_, 1 - volume_envelope 9, 3 -; cutoff 8 + rest 1 + note_type 1, 8, 8 + rest 1 + note_type 13, 9, 3 note C_, 1 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D#, 3 note E_, 10 -; tie speed 13 note E_, 2 volume_envelope 9, 2 note D_, 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note G_, 5 volume_envelope 2, 7 note G_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note F_, 5 note G_, 4 note F_, 4 @@ -2006,22 +1834,22 @@ Branch_fb79e: note D_, 13 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note C_, 5 volume_envelope 2, 7 note C_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note D_, 13 note E_, 5 volume_envelope 2, 7 note E_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note C_, 5 volume_envelope 2, 7 note C_, 8 dec_octave speed 13 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 4 inc_octave inc_octave @@ -2030,35 +1858,40 @@ Branch_fb79e: volume_envelope 2, 7 note C_, 8 dec_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note B_, 13 inc_octave note C_, 5 volume_envelope 2, 7 note C_, 8 dec_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note B_, 5 volume_envelope 2, 7 note B_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 5 volume_envelope 2, 7 note G_, 8 dec_octave dec_octave duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 3 inc_octave note C_, 10 - speed 13 -; cutoff 3 + note_type 5, 8, 8 note D_, 1 + rest 1 + note_type 1, 8, 8 + rest 3 + note_type 5, 8, 8 note E_, 1 -; cutoff 8 + rest 1 + note_type 1, 8, 8 + rest 3 + note_type 13, 8, 8 note F_, 2 -; sound_ret rest 1 octave 2 note A_, 1 @@ -2068,42 +1901,39 @@ Branch_fb79e: inc_octave volume_envelope 9, 2 note C_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 2 rest 1 note C_, 1 rest 1 dec_octave -; cutoff 7 note G_, 1 -; cutoff 8 note G_, 1 inc_octave volume_envelope 9, 2 note C_, 1 dec_octave speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 3 note F_, 10 -; tie speed 13 note F_, 1 rest 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note F_, 13 note A_, 6 volume_envelope 2, 7 note A_, 7 inc_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note C_, 6 volume_envelope 2, 7 note C_, 7 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 6 volume_envelope 2, 7 note E_, 7 @@ -2113,10 +1943,9 @@ Branch_fb79e: note C_, 13 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note D#, 3 note E_, 10 -; tie speed 13 note E_, 1 note F_, 1 @@ -2124,7 +1953,7 @@ Branch_fb79e: note E_, 5 volume_envelope 2, 7 note E_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note D_, 5 volume_envelope 2, 7 note D_, 8 @@ -2132,7 +1961,7 @@ Branch_fb79e: rest 1 dec_octave dec_octave - volume_envelope 9, 0 + volume_envelope 9, 8 duty_cycle 1 note B_, 1 inc_octave @@ -2140,44 +1969,49 @@ Branch_fb79e: note C_, 6 volume_envelope 2, 7 note C_, 7 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 6 volume_envelope 2, 7 note D_, 7 -; sound_call Branch_fbb10 octave 3 speed 13 - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 1 -; cutoff 3 + note_type 6, 8, 8 note D_, 1 - volume_envelope 9, 2 -; cutoff 8 + rest 1 + note_type 1, 8, 8 + rest 1 + note_type 5, 9, 2 note C_, 1 - volume_envelope 8, 0 + rest 1 + note_type 1, 9, 2 + rest 3 + note_type 13, 8, 8 note B_, 2 -; cutoff 3 + note_type 6, 8, 8 note A_, 1 - volume_envelope 9, 3 -; cutoff 8 + rest 1 + note_type 1, 8, 8 + rest 1 + note_type 13, 9, 3 note C_, 1 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D#, 3 note E_, 10 -; tie speed 13 note E_, 2 volume_envelope 9, 2 note D_, 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note G_, 5 volume_envelope 2, 7 note G_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note F_, 5 note G_, 4 note F_, 4 @@ -2190,22 +2024,22 @@ Branch_fb79e: note D_, 13 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note C_, 5 volume_envelope 2, 7 note C_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note D_, 13 note E_, 5 volume_envelope 2, 7 note E_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note C_, 5 volume_envelope 2, 7 note C_, 8 dec_octave speed 13 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 4 inc_octave inc_octave @@ -2214,35 +2048,40 @@ Branch_fb79e: volume_envelope 2, 7 note C_, 8 dec_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note B_, 13 inc_octave note C_, 5 volume_envelope 2, 7 note C_, 8 dec_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note B_, 5 volume_envelope 2, 7 note B_, 8 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 5 volume_envelope 2, 7 note G_, 8 dec_octave dec_octave duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 3 inc_octave note C_, 10 - speed 13 -; cutoff 3 + note_type 5, 8, 8 note D_, 1 + rest 1 + note_type 1, 8, 8 + rest 3 + note_type 5, 8, 8 note E_, 1 -; cutoff 8 + rest 1 + note_type 1, 8, 8 + rest 3 + note_type 13, 8, 8 note F_, 2 -; sound_ret octave 3 rest 1 note F_, 1 @@ -2253,10 +2092,9 @@ Branch_fb79e: note C_, 1 inc_octave speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 3 note D#, 10 -; tie speed 13 note D#, 2 dec_octave @@ -2266,7 +2104,7 @@ Branch_fb79e: rest 1 speed 1 rest 6 - volume_envelope 9, 0 + volume_envelope 9, 8 note G#, 7 inc_octave note C_, 6 @@ -2275,243 +2113,13 @@ Branch_fb79e: note A#, 7 sound_ret -Branch_fba68: - octave 3 - volume_envelope 9, 2 - note C_, 1 - rest 1 - volume_envelope 9, 0 - note C_, 1 - note E_, 1 - volume_envelope 9, 2 - note C_, 1 - volume_envelope 9, 0 - note F_, 1 - volume_envelope 3, 7 - note F_, 1 - rest 1 - volume_envelope 9, 2 - note C_, 1 - volume_envelope 9, 0 - note G_, 1 - volume_envelope 3, 7 - note G_, 1 - volume_envelope 9, 0 - note F_, 1 - volume_envelope 9, 2 - note C_, 1 - volume_envelope 9, 0 - note E_, 1 - volume_envelope 3, 7 - note E_, 1 - rest 1 - volume_envelope 9, 2 - note C_, 1 - rest 1 - volume_envelope 9, 0 - note C_, 1 - note E_, 1 - volume_envelope 9, 2 - note C_, 1 - sound_ret - -Branch_fba9d: - octave 4 - duty_cycle 2 - volume_envelope 7, 0 - speed 1 - note F#, 3 - note G_, 10 - dec_octave - duty_cycle 1 - volume_envelope 9, 2 - note C_, 13 - inc_octave - duty_cycle 2 - volume_envelope 7, 0 - note E_, 5 - volume_envelope 2, 7 - note E_, 8 - volume_envelope 7, 0 - note E_, 3 - note F_, 10 - note E_, 5 - volume_envelope 2, 7 - note E_, 8 - dec_octave - speed 13 - duty_cycle 1 - volume_envelope 9, 2 - note C_, 1 - duty_cycle 2 - volume_envelope 7, 0 - note G_, 1 - sound_ret - -Branch_fbacb: - octave 3 -; cutoff 8 -.Loop4 - note A#, 1 - rest 1 - sound_loop 3, .Loop4 - inc_octave - note C_, 3 - dec_octave - volume_envelope 9, 2 - note C_, 1 - rest 1 - volume_envelope 8, 0 - note A_, 1 - inc_octave -; cutoff 4 - note C_, 1 - dec_octave -; cutoff 8 - volume_envelope 9, 2 - note C_, 1 - speed 1 - volume_envelope 8, 0 - note A#, 3 - note B_, 16 - rest 7 - note A#, 3 - note B_, 10 - dec_octave - speed 13 - volume_envelope 9, 2 - note B_, 1 - inc_octave - volume_envelope 8, 0 - note B_, 1 - rest 1 - note A_, 1 - dec_octave - volume_envelope 9, 2 - note B_, 1 - inc_octave - volume_envelope 8, 0 - note B_, 3 - volume_envelope 9, 2 - note D_, 1 - rest 1 - volume_envelope 8, 0 - note B_, 1 - inc_octave -; cutoff 4 - note D_, 1 - sound_ret - -Branch_fbb10: - octave 3 - speed 13 - volume_envelope 8, 0 - note C_, 1 -; cutoff 3 - note D_, 1 - volume_envelope 9, 2 -; cutoff 8 - note C_, 1 - volume_envelope 8, 0 - note B_, 2 -; cutoff 3 - note A_, 1 - volume_envelope 9, 3 -; cutoff 8 - note C_, 1 - speed 1 - volume_envelope 8, 0 - note D#, 3 - note E_, 10 -; tie - speed 13 - note E_, 2 - volume_envelope 9, 2 - note D_, 1 - inc_octave - duty_cycle 2 - volume_envelope 7, 0 - speed 1 - note G_, 5 - volume_envelope 2, 7 - note G_, 8 - volume_envelope 7, 0 - note F_, 5 - note G_, 4 - note F_, 4 - note E_, 5 - volume_envelope 2, 7 - note E_, 8 - dec_octave - duty_cycle 1 - volume_envelope 9, 2 - note D_, 13 - inc_octave - duty_cycle 2 - volume_envelope 7, 0 - note C_, 5 - volume_envelope 2, 7 - note C_, 8 - volume_envelope 7, 0 - note D_, 13 - note E_, 5 - volume_envelope 2, 7 - note E_, 8 - volume_envelope 7, 0 - note C_, 5 - volume_envelope 2, 7 - note C_, 8 - dec_octave - speed 13 - volume_envelope 7, 0 - note E_, 4 - inc_octave - inc_octave - speed 1 - note C_, 5 - volume_envelope 2, 7 - note C_, 8 - dec_octave - volume_envelope 7, 0 - note B_, 13 - inc_octave - note C_, 5 - volume_envelope 2, 7 - note C_, 8 - dec_octave - volume_envelope 7, 0 - note B_, 5 - volume_envelope 2, 7 - note B_, 8 - volume_envelope 7, 0 - note G_, 5 - volume_envelope 2, 7 - note G_, 8 - dec_octave - dec_octave - duty_cycle 1 - volume_envelope 8, 0 - note B_, 3 - inc_octave - note C_, 10 - speed 13 -; cutoff 3 - note D_, 1 - note E_, 1 -; cutoff 8 - note F_, 2 - sound_ret - - -Music_TCGCredits_Ch3: +Music_TCGCredits_Ch3: speed 1 stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 -; echo 96 -; cutoff 8 octave 2 -.Loop1 +.Loop1: note G_, 6 rest 7 sound_loop 12, .Loop1 @@ -2527,42 +2135,36 @@ Music_TCGCredits_Ch3: sound_call Branch_fbc46 sound_call Branch_fbd47 octave 2 -.Loop2 +.Loop2: note B_, 6 rest 7 note B_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note B_, 6 rest 7 sound_loop 2, .Loop2 -.Loop3 +.Loop3: note A_, 6 rest 7 note A_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop3 -.Loop4 +.Loop4: note G#, 6 rest 7 note G#, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note G#, 6 rest 7 sound_loop 2, .Loop4 @@ -2575,32 +2177,28 @@ Music_TCGCredits_Ch3: sound_call Branch_fbc46 speed 1 octave 2 -.Loop5 +.Loop5: note G#, 6 rest 7 note G#, 6 rest 7 inc_octave inc_octave -; cutoff 4 note D#, 13 dec_octave dec_octave -; cutoff 8 note G#, 6 rest 7 sound_loop 2, .Loop5 inc_octave -.Loop6 +.Loop6: note C#, 6 rest 7 note C#, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note C#, 6 rest 7 sound_loop 2, .Loop6 @@ -2609,10 +2207,8 @@ Music_TCGCredits_Ch3: note C_, 6 rest 7 inc_octave -; cutoff 4 note C_, 13 dec_octave -; cutoff 8 note C_, 6 rest 7 note C_, 6 @@ -2625,378 +2221,281 @@ Music_TCGCredits_Ch3: note G_, 6 rest 7 speed 13 - note C_, 8 -; tie - note C_, 1 + note C_, 9 rest 2 sound_ret Branch_fbc46: speed 1 octave 3 -; sound_call Branch_fbd47 - octave 3 -.Loop7 +.Loop7: note C_, 6 rest 7 note C_, 6 rest 7 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop7 -; sound_ret -; sound_call Branch_fbe23 octave 3 -.Loop8 +.Loop8: note C_, 6 rest 7 sound_loop 2, .Loop8 -; cutoff 4 note A_, 13 -; cutoff 8 note C_, 6 rest 7 -.Loop9 +.Loop9: note C_, 6 rest 7 sound_loop 2, .Loop9 -; cutoff 4 note F_, 13 -; cutoff 8 note C_, 6 rest 7 -; sound_ret -; sound_call Branch_fbd47 octave 3 -.Loop10 +.Loop10: note C_, 6 rest 7 note C_, 6 rest 7 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop10 -; sound_ret -.Loop11 +.Loop11: note C_, 6 rest 7 sound_loop 2, .Loop11 -; cutoff 4 note A_, 13 -; cutoff 8 note C_, 6 rest 7 -.Loop12 +.Loop12: note C_, 6 rest 7 sound_loop 2, .Loop12 inc_octave -; cutoff 4 note C_, 13 dec_octave -; cutoff 8 note C_, 6 rest 7 -; sound_call Branch_fbd47 octave 3 -.Loop13 +.Loop13: note C_, 6 rest 7 note C_, 6 rest 7 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop13 -; sound_ret -; sound_call Branch_fbe23 octave 3 -.Loop14 +.Loop14: note C_, 6 rest 7 sound_loop 2, .Loop14 -; cutoff 4 note A_, 13 -; cutoff 8 note C_, 6 rest 7 -.Loop15 +.Loop15: note C_, 6 rest 7 sound_loop 2, .Loop15 -; cutoff 4 note F_, 13 -; cutoff 8 note C_, 6 rest 7 -; sound_ret octave 3 -.Loop16 +.Loop16: note C_, 6 rest 7 sound_loop 2, .Loop16 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 -.Loop17 +.Loop17: note C_, 6 rest 7 sound_loop 2, .Loop17 -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note G_, 13 -; tie speed 13 note G_, 7 rest 1 speed 1 -; sound_call Branch_fbd47 octave 3 -.Loop18 +.Loop18: note C_, 6 rest 7 note C_, 6 rest 7 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop18 -; sound_ret -; sound_call Branch_fbd58 octave 2 -.Loop19 +.Loop19: note B_, 6 rest 7 note B_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note B_, 6 rest 7 sound_loop 2, .Loop19 -; sound_ret -; sound_call Branch_fbd6b octave 2 -.Loop20 +.Loop20: note A_, 6 rest 7 note A_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop20 -; sound_ret -; sound_call Branch_fbd7e octave 2 -.Loop21 +.Loop21: note G_, 6 rest 7 note G_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop21 -; sound_ret -; sound_call Branch_fbd91 octave 2 -.Loop22 +.Loop22: note F_, 6 rest 7 note F_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note F_, 6 rest 7 sound_loop 2, .Loop22 -; sound_ret -; sound_call Branch_fbda4 octave 2 -.Loop23 +.Loop23: note E_, 6 rest 7 note E_, 6 rest 7 inc_octave -; cutoff 4 note E_, 13 dec_octave -; cutoff 8 note E_, 6 rest 7 sound_loop 2, .Loop23 -; sound_ret -; sound_call Branch_fbdb7 octave 2 -.Loop24 +.Loop24: note D_, 6 rest 7 note D_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note D_, 6 rest 7 sound_loop 2, .Loop24 -; sound_ret -; sound_call Branch_fbdca octave 2 -.Loop25 +.Loop25: note G_, 6 rest 7 note G_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop25 -; sound_ret -; sound_call Branch_fbd47 octave 3 -.Loop26 +.Loop26: note C_, 6 rest 7 note C_, 6 rest 7 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop26 -; sound_ret -; sound_call Branch_fbd58 octave 2 -.Loop27 +.Loop27: note B_, 6 rest 7 note B_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note B_, 6 rest 7 sound_loop 2, .Loop27 -; sound_ret -; sound_call Branch_fbd6b octave 2 -.Loop28 +.Loop28: note A_, 6 rest 7 note A_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop28 -; sound_ret -; sound_call Branch_fbd7e octave 2 -.Loop29 +.Loop29: note G_, 6 rest 7 note G_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop29 -; sound_ret -; sound_call Branch_fbddd octave 2 -.Loop30 +.Loop30: note F_, 6 rest 7 note F_, 6 rest 7 inc_octave -; cutoff 4 note G#, 13 dec_octave -; cutoff 8 note F_, 6 rest 7 sound_loop 2, .Loop30 -; sound_ret -; sound_call Branch_fbdf0 octave 2 -.Loop31 +.Loop31: note A#, 6 rest 7 note A#, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note A#, 6 rest 7 sound_loop 2, .Loop31 -; sound_ret -; sound_call Branch_fbd47 octave 3 -.Loop32 +.Loop32: note C_, 6 rest 7 note C_, 6 rest 7 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop32 -; sound_ret -; sound_call Branch_fbe03 octave 3 note C_, 6 rest 7 @@ -3009,118 +2508,88 @@ Branch_fbc46: rest 13 note C_, 6 rest 7 -; sound_ret -; sound_call Branch_fbd91 octave 2 -.Loop33 +.Loop33: note F_, 6 rest 7 note F_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note F_, 6 rest 7 sound_loop 2, .Loop33 -; sound_ret -; sound_call Branch_fbdca octave 2 -.Loop34 +.Loop34: note G_, 6 rest 7 note G_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop34 -; sound_ret -; sound_call Branch_fbe10 octave 2 -.Loop35 +.Loop35: note E_, 6 rest 7 note E_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note E_, 6 rest 7 sound_loop 2, .Loop35 -; sound_ret -; sound_call Branch_fbd6b octave 2 -.Loop36 +.Loop36: note A_, 6 rest 7 note A_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop36 -; sound_ret -; sound_call Branch_fbdb7 octave 2 -.Loop37 +.Loop37: note D_, 6 rest 7 note D_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note D_, 6 rest 7 sound_loop 2, .Loop37 -; sound_ret -; sound_call Branch_fbdca octave 2 -.Loop38 +.Loop38: note G_, 6 rest 7 note G_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop38 -; sound_ret -; sound_call Branch_fbd47 octave 3 -.Loop39 +.Loop39: note C_, 6 rest 7 note C_, 6 rest 7 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop39 -; sound_ret -; sound_call Branch_fbe03 octave 3 note C_, 6 rest 7 @@ -3133,119 +2602,90 @@ Branch_fbc46: rest 13 note C_, 6 rest 7 -; sound_ret -; sound_call Branch_fbd91 octave 2 -.Loop40 +.Loop40: note F_, 6 rest 7 note F_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note F_, 6 rest 7 sound_loop 2, .Loop40 -; sound_ret -; sound_call Branch_fbdca octave 2 -.Loop41 +.Loop41: note G_, 6 rest 7 note G_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop41 -; sound_ret -; sound_call Branch_fbe10 octave 2 -.Loop42 +.Loop42: note E_, 6 rest 7 note E_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note E_, 6 rest 7 sound_loop 2, .Loop42 -; sound_ret -; sound_call Branch_fbd6b octave 2 -.Loop43 +.Loop43: note A_, 6 rest 7 note A_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop43 -; sound_ret -; sound_call Branch_fbdb7 octave 2 -.Loop44 +.Loop44: note D_, 6 rest 7 note D_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note D_, 6 rest 7 sound_loop 2, .Loop44 -; sound_ret -; sound_call Branch_fbdf0 octave 2 -.Loop45 +.Loop45: note A#, 6 rest 7 note A#, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note A#, 6 rest 7 sound_loop 2, .Loop45 -; sound_ret -; sound_call Branch_fbdca octave 2 -.Loop46 +.Loop46: note G_, 6 rest 7 note G_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop46 -; sound_ret octave 2 note G_, 6 rest 7 @@ -3262,225 +2702,171 @@ Branch_fbc46: note B_, 2 note G_, 1 speed 1 -; sound_call Branch_fbd47 octave 3 -.Loop47 +.Loop47: note C_, 6 rest 7 note C_, 6 rest 7 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop47 -; sound_ret -; sound_call Branch_fbd58 octave 2 -.Loop48 +.Loop48: note B_, 6 rest 7 note B_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note B_, 6 rest 7 sound_loop 2, .Loop48 -; sound_ret -; sound_call Branch_fbd6b octave 2 -.Loop49 +.Loop49: note A_, 6 rest 7 note A_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop49 -; sound_ret -; sound_call Branch_fbd7e octave 2 -.Loop50 +.Loop50: note G_, 6 rest 7 note G_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop50 -; sound_ret -; sound_call Branch_fbd91 octave 2 -.Loop51 +.Loop51: note F_, 6 rest 7 note F_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note F_, 6 rest 7 sound_loop 2, .Loop51 -; sound_ret -; sound_call Branch_fbda4 octave 2 -.Loop52 +.Loop52: note E_, 6 rest 7 note E_, 6 rest 7 inc_octave -; cutoff 4 note E_, 13 dec_octave -; cutoff 8 note E_, 6 rest 7 sound_loop 2, .Loop52 -; sound_ret -; sound_call Branch_fbdb7 octave 2 -.Loop53 +.Loop53: note D_, 6 rest 7 note D_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note D_, 6 rest 7 sound_loop 2, .Loop53 -; sound_ret -; sound_call Branch_fbe3d octave 2 -.Loop54 +.Loop54: note G_, 6 rest 7 sound_loop 2, .Loop54 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 note G_, 6 rest 7 note G_, 13 note A_, 13 -; sound_ret octave 2 note B_, 6 rest 7 -; sound_call Branch_fbd47 octave 3 -.Loop55 +.Loop55: note C_, 6 rest 7 note C_, 6 rest 7 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop55 -; sound_ret -; sound_call Branch_fbd58 octave 2 -.Loop56 +.Loop56: note B_, 6 rest 7 note B_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note B_, 6 rest 7 sound_loop 2, .Loop56 -; sound_ret -; sound_call Branch_fbd6b octave 2 -.Loop57 +.Loop57: note A_, 6 rest 7 note A_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop57 -; sound_ret -; sound_call Branch_fbd7e octave 2 -.Loop58 +.Loop58: note G_, 6 rest 7 note G_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop58 -; sound_ret -; sound_call Branch_fbddd octave 2 -.Loop59 +.Loop59: note F_, 6 rest 7 note F_, 6 rest 7 inc_octave -; cutoff 4 note G#, 13 dec_octave -; cutoff 8 note F_, 6 rest 7 sound_loop 2, .Loop59 -; sound_ret octave 2 -.Loop60 +.Loop60: note A#, 6 rest 7 sound_loop 2, .Loop60 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note A#, 6 rest 7 note A#, 6 @@ -3499,237 +2885,71 @@ Branch_fbc46: Branch_fbd47: octave 3 -.Loop12 +.Loop12: note C_, 6 rest 7 note C_, 6 rest 7 -; cutoff 4 note G_, 13 -; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop12 sound_ret -Branch_fbd58: - octave 2 -.Loop13 - note B_, 6 - rest 7 - note B_, 6 - rest 7 - inc_octave -; cutoff 4 - note G_, 13 - dec_octave -; cutoff 8 - note B_, 6 - rest 7 - sound_loop 2, .Loop13 - sound_ret - Branch_fbd6b: octave 2 -.Loop14 +.Loop14: note A_, 6 rest 7 note A_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop14 sound_ret -Branch_fbd7e: - octave 2 -.Loop15 - note G_, 6 - rest 7 - note G_, 6 - rest 7 - inc_octave -; cutoff 4 - note G_, 13 - dec_octave -; cutoff 8 - note G_, 6 - rest 7 - sound_loop 2, .Loop15 - sound_ret - -Branch_fbd91: - octave 2 -.Loop16 - note F_, 6 - rest 7 - note F_, 6 - rest 7 - inc_octave -; cutoff 4 - note F_, 13 - dec_octave -; cutoff 8 - note F_, 6 - rest 7 - sound_loop 2, .Loop16 - sound_ret - -Branch_fbda4: - octave 2 -.Loop17 - note E_, 6 - rest 7 - note E_, 6 - rest 7 - inc_octave -; cutoff 4 - note E_, 13 - dec_octave -; cutoff 8 - note E_, 6 - rest 7 - sound_loop 2, .Loop17 - sound_ret - Branch_fbdb7: octave 2 -.Loop18 +.Loop18: note D_, 6 rest 7 note D_, 6 rest 7 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note D_, 6 rest 7 sound_loop 2, .Loop18 sound_ret -Branch_fbdca: - octave 2 -.Loop19 - note G_, 6 - rest 7 - note G_, 6 - rest 7 - inc_octave -; cutoff 4 - note F_, 13 - dec_octave -; cutoff 8 - note G_, 6 - rest 7 - sound_loop 2, .Loop19 - sound_ret - -Branch_fbddd: - octave 2 -.Loop20 - note F_, 6 - rest 7 - note F_, 6 - rest 7 - inc_octave -; cutoff 4 - note G#, 13 - dec_octave -; cutoff 8 - note F_, 6 - rest 7 - sound_loop 2, .Loop20 - sound_ret - -Branch_fbdf0: - octave 2 -.Loop21 - note A#, 6 - rest 7 - note A#, 6 - rest 7 - inc_octave -; cutoff 4 - note F_, 13 - dec_octave -; cutoff 8 - note A#, 6 - rest 7 - sound_loop 2, .Loop21 - sound_ret - -Branch_fbe03: - octave 3 - note C_, 6 - rest 7 - dec_octave - note C_, 13 - rest 13 - note D_, 13 - rest 13 - note E_, 13 - rest 13 - note C_, 6 - rest 7 - sound_ret - Branch_fbe10: octave 2 -.Loop22 +.Loop22: note E_, 6 rest 7 note E_, 6 rest 7 inc_octave -; cutoff 4 note G_, 13 dec_octave -; cutoff 8 note E_, 6 rest 7 sound_loop 2, .Loop22 sound_ret -Branch_fbe23: - octave 3 -.Loop23 - note C_, 6 - rest 7 - sound_loop 2, .Loop23 -; cutoff 4 - note A_, 13 -; cutoff 8 - note C_, 6 - rest 7 -.Loop24 - note C_, 6 - rest 7 - sound_loop 2, .Loop24 -; cutoff 4 - note F_, 13 -; cutoff 8 - note C_, 6 - rest 7 - sound_ret - Branch_fbe3d: octave 2 -.Loop25 +.Loop25: note G_, 6 rest 7 sound_loop 2, .Loop25 inc_octave -; cutoff 4 note F_, 13 dec_octave -; cutoff 8 note G_, 6 rest 7 note G_, 6 @@ -3738,23 +2958,22 @@ Branch_fbe3d: note A_, 13 sound_ret - Music_TCGCredits_Ch4: toggle_noise 6 drum_speed 1 octave 1 -.Loop1 +.Loop1: drum_note 3, 13 sound_loop 8, .Loop1 -.Loop2 +.Loop2: drum_note 2, 13 sound_loop 4, .Loop2 -.Loop3 +.Loop3: drum_note 2, 6 drum_note 2, 7 sound_loop 4, .Loop3 sound_call Branch_fbe86 -.Loop4 +.Loop4: sound_call Branch_fbed1 sound_loop 7, .Loop4 drum_note 1, 13 @@ -3763,12 +2982,12 @@ Music_TCGCredits_Ch4: drum_note 4, 6 drum_note 3, 4 drum_note 3, 3 -.Loop5 +.Loop5: drum_note 2, 6 drum_note 2, 7 sound_loop 4, .Loop5 sound_call Branch_fbe86 -.Loop6 +.Loop6: sound_call Branch_fbed1 sound_loop 2, .Loop6 sound_call Branch_fbeea @@ -3778,8 +2997,7 @@ Music_TCGCredits_Ch4: sound_ret Branch_fbe86: -.Loop7 -; sound_call Branch_fbed1 +.Loop7: drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 @@ -3789,7 +3007,6 @@ Branch_fbe86: drum_note 4, 13 drum_note 2, 13 drum_note 5, 13 -; sound_ret sound_loop 6, .Loop7 drum_note 1, 13 drum_note 4, 13 @@ -3803,8 +3020,7 @@ Branch_fbe86: drum_note 6, 7 drum_note 2, 2 drum_speed 1 -.Loop8 -; sound_call Branch_fbed1 +.Loop8: drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 @@ -3814,15 +3030,13 @@ Branch_fbe86: drum_note 4, 13 drum_note 2, 13 drum_note 5, 13 -; sound_ret sound_loop 15, .Loop8 -; sound_call Branch_fbedb drum_note 1, 13 drum_note 4, 6 drum_note 3, 7 drum_note 2, 6 drum_note 2, 7 -.Loop9 +.Loop9: drum_note 2, 6 drum_note 3, 4 drum_note 3, 3 @@ -3830,9 +3044,7 @@ Branch_fbe86: drum_note 2, 7 sound_loop 2, .Loop9 drum_note 2, 13 -; sound_ret -.Loop10 -; sound_call Branch_fbed1 +.Loop10: drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 @@ -3842,15 +3054,13 @@ Branch_fbe86: drum_note 4, 13 drum_note 2, 13 drum_note 5, 13 -; sound_ret sound_loop 7, .Loop10 -; sound_call Branch_fbedb drum_note 1, 13 drum_note 4, 6 drum_note 3, 7 drum_note 2, 6 drum_note 2, 7 -.Loop11 +.Loop11: drum_note 2, 6 drum_note 3, 4 drum_note 3, 3 @@ -3858,9 +3068,7 @@ Branch_fbe86: drum_note 2, 7 sound_loop 2, .Loop11 drum_note 2, 13 -; sound_ret -.Loop12 -; sound_call Branch_fbed1 +.Loop12: drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 @@ -3870,23 +3078,19 @@ Branch_fbe86: drum_note 4, 13 drum_note 2, 13 drum_note 5, 13 -; sound_ret sound_loop 7, .Loop12 -; sound_call Branch_fbeea drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 drum_note 4, 6 drum_note 3, 4 drum_note 3, 3 -.Loop13 +.Loop13: drum_note 2, 6 drum_note 2, 7 sound_loop 3, .Loop13 drum_note 2, 13 -; sound_ret -.Loop14 -; sound_call Branch_fbed1 +.Loop14: drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 @@ -3896,7 +3100,6 @@ Branch_fbe86: drum_note 4, 13 drum_note 2, 13 drum_note 5, 13 -; sound_ret sound_loop 7, .Loop14 drum_note 1, 13 drum_note 4, 13 @@ -3910,8 +3113,7 @@ Branch_fbe86: drum_note 2, 6 drum_note 2, 7 drum_note 2, 13 -.Loop15 -; sound_call Branch_fbed1 +.Loop15: drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 @@ -3921,21 +3123,18 @@ Branch_fbe86: drum_note 4, 13 drum_note 2, 13 drum_note 5, 13 -; sound_ret sound_loop 5, .Loop15 -; sound_call Branch_fbeea drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 drum_note 4, 6 drum_note 3, 4 drum_note 3, 3 -.Loop16 +.Loop16: drum_note 2, 6 drum_note 2, 7 sound_loop 3, .Loop16 drum_note 2, 13 -; sound_ret sound_ret Branch_fbed1: @@ -3950,22 +3149,6 @@ Branch_fbed1: drum_note 5, 13 sound_ret -Branch_fbedb: - drum_note 1, 13 - drum_note 4, 6 - drum_note 3, 7 - drum_note 2, 6 - drum_note 2, 7 -.Loop13 - drum_note 2, 6 - drum_note 3, 4 - drum_note 3, 3 - drum_note 2, 6 - drum_note 2, 7 - sound_loop 2, .Loop13 - drum_note 2, 13 - sound_ret - Branch_fbeea: drum_note 1, 13 drum_note 4, 13 @@ -3973,7 +3156,7 @@ Branch_fbeea: drum_note 4, 6 drum_note 3, 4 drum_note 3, 3 -.Loop14 +.Loop14: drum_note 2, 6 drum_note 2, 7 sound_loop 3, .Loop14 diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm index d1e51f120..e7c96980c 100644 --- a/crysaudio/music/TCG/dueltheme1.asm +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -32,7 +32,6 @@ Music_DuelTheme1_Ch1: note A_, 1 rest 2 inc_octave - volume_envelope 10, 8 note D_, 10 volume_envelope 3, 7 note D_, 12 @@ -192,8 +191,7 @@ Music_DuelTheme1_Ch1: note G#, 4 note A_, 3 speed 7 - note A_, 5 - note A_, 10 + note A_, 15 note A_, 6 volume_envelope 3, 7 note A_, 2 @@ -248,11 +246,9 @@ Music_DuelTheme1_Ch1: sound_call Branch_f5580 volume_envelope 10, 8 note A_, 2 - note A_, 8 - note A_, 8 + note A_, 16 note A_, 6 duty_cycle 1 - volume_envelope 10, 8 speed 1 dec_octave note B_, 4 @@ -296,10 +292,8 @@ Music_DuelTheme1_Ch1: volume_envelope 3, 7 note D_, 2 volume_envelope 10, 8 - note D_, 8 - note D_, 8 - note D_, 8 - note D_, 8 + note D_, 16 + note D_, 16 volume_envelope 3, 7 note D_, 2 volume_envelope 10, 8 @@ -307,8 +301,7 @@ Music_DuelTheme1_Ch1: volume_envelope 3, 7 note D_, 2 volume_envelope 10, 8 - note D_, 6 - note D_, 8 + note D_, 14 rest 4 sound_loop 0, .MainLoop @@ -747,7 +740,6 @@ Music_DuelTheme1_Ch2: note F#, 1 note A_, 1 rest 1 - volume_envelope 7, 8 sound_call Branch_f594d volume_envelope 7, 8 octave 3 @@ -1003,8 +995,7 @@ Music_DuelTheme1_Ch2: dec_octave speed 7 sound_call Branch_f598c - note D_, 8 - note D_, 8 + note D_, 16 note C#, 6 dec_octave duty_cycle 1 @@ -1035,10 +1026,8 @@ Music_DuelTheme1_Ch2: dec_octave note A_, 2 rest 2 - note G_, 8 - note G_, 8 - note F#, 8 - note F#, 8 + note G_, 16 + note F#, 16 rest 2 note G_, 12 rest 2 diff --git a/crysaudio/music/TCG/dueltheme2.asm b/crysaudio/music/TCG/dueltheme2.asm index 8a10752ea..80d54c53c 100644 --- a/crysaudio/music/TCG/dueltheme2.asm +++ b/crysaudio/music/TCG/dueltheme2.asm @@ -8,24 +8,22 @@ Music_DuelTheme2: Music_DuelTheme2_Ch1: speed 9 stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 20, 3, 3 -; cutoff 8 octave 1 duty_cycle 1 volume_envelope 9, 4 -.Loop1 +.Loop1: note D_, 2 note D_, 1 sound_loop 8, .Loop1 -.MainLoop +.MainLoop: octave 1 -.Loop2 +.Loop2: note D_, 2 note D_, 1 sound_loop 23, .Loop2 duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 inc_octave inc_octave speed 1 @@ -41,46 +39,40 @@ Music_DuelTheme2_Ch1: speed 9 sound_call Branch_f5f3d note C_, 6 -; tie speed 1 note C_, 12 volume_envelope 3, 7 note C_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 dec_octave note B_, 12 volume_envelope 3, 7 note B_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 12 volume_envelope 3, 7 note G_, 6 speed 9 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 -; cutoff 6 + volume_envelope 10, 8 note D_, 1 -; cutoff 8 note D_, 9 -; tie note D_, 9 volume_envelope 4, 7 note D_, 3 duty_cycle 2 -; cutoff 8 volume_envelope 2, -7 note E_, 4 - volume_envelope 6, 0 + volume_envelope 6, 8 note E_, 7 volume_envelope 2, 7 note E_, 1 volume_envelope 5, -7 note G_, 4 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 1 note G_, 12 volume_envelope 2, 7 @@ -88,10 +80,9 @@ Music_DuelTheme2_Ch1: inc_octave speed 9 volume_envelope 7, -7 -; cutoff 8 note C_, 3 duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 dec_octave speed 1 note C_, 3 @@ -105,9 +96,7 @@ Music_DuelTheme2_Ch1: note C_, 3 speed 9 sound_call Branch_f5f3d -; cutoff 8 note C_, 4 -; tie speed 1 note C_, 4 note E_, 5 @@ -116,47 +105,41 @@ Music_DuelTheme2_Ch1: note G_, 12 volume_envelope 3, 7 note G_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 12 volume_envelope 3, 7 note E_, 6 speed 9 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 note C_, 1 volume_envelope 3, 7 note C_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 dec_octave - volume_envelope 10, 0 -; cutoff 6 + volume_envelope 10, 8 note A_, 1 inc_octave -; cutoff 8 note D_, 9 -; tie note D_, 10 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 -; cutoff 8 note D_, 4 note D#, 5 speed 9 note E_, 11 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 5 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 inc_octave -; cutoff 8 note C_, 3 dec_octave speed 1 @@ -177,7 +160,7 @@ Music_DuelTheme2_Ch1: volume_envelope 9, 4 octave 1 note D_, 1 -.Loop3 +.Loop3: note D_, 2 note D_, 1 sound_loop 3, .Loop3 @@ -197,30 +180,28 @@ Music_DuelTheme2_Ch1: note D_, 1 note B_, 1 duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 sound_call Branch_f5f62 octave 4 volume_envelope 4, 7 note F#, 12 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 9 volume_envelope 4, 7 note C#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 1 note D_, 1 note E_, 3 note D_, 3 note C#, 3 dec_octave -; cutoff 6 note B_, 3 -; cutoff 8 note B_, 4 volume_envelope 4, 7 note B_, 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note C#, 4 dec_octave @@ -231,65 +212,52 @@ Music_DuelTheme2_Ch1: note A_, 1 duty_cycle 1 volume_envelope 9, 3 -; cutoff 8 note D_, 2 note D_, 2 rest 2 note C#, 2 - duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 sound_call Branch_f5f62 octave 4 volume_envelope 4, 7 note F#, 6 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 2 inc_octave note C#, 2 note D_, 1 volume_envelope 4, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 9 volume_envelope 4, 7 note D_, 1 - volume_envelope 10, 0 -; cutoff 7 + volume_envelope 10, 8 note C#, 1 note D_, 1 -; cutoff 8 note E_, 3 note D_, 3 note C#, 3 dec_octave -; cutoff 6 note A_, 3 inc_octave -; cutoff 8 note F_, 10 -; cutoff 7 note E_, 1 note F_, 1 -; cutoff 8 note G_, 3 note F_, 3 note E_, 3 speed 1 note C_, 2 -; tie note C_, 16 volume_envelope 4, 7 note C_, 9 speed 9 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 note A_, 10 -; cutoff 7 note G_, 1 note F_, 1 -; cutoff 8 note G_, 6 inc_octave note C_, 3 @@ -312,13 +280,12 @@ Music_DuelTheme2_Ch1: volume_envelope 9, 4 octave 1 note D_, 1 -.Loop4 +.Loop4: note D_, 2 note D_, 1 sound_loop 3, .Loop4 duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 octave 5 note D_, 1 note C_, 1 @@ -335,41 +302,33 @@ Music_DuelTheme2_Ch1: note G_, 1 note F_, 1 note C_, 1 - note D_, 12 -; tie - note D_, 12 - duty_cycle 1 - volume_envelope 9, 4 + note_type 13, 10, 8 + note D_, 16 + note_type 8, 10, 8 + note D_, 1 + note_type 9, 9, 4 sound_loop 0, .MainLoop Branch_f5f3d: -; cutoff 8 - note D_, 12 -; tie - note D_, 4 -; tie + note D_, 16 speed 1 note D_, 7 volume_envelope 4, 7 note D_, 2 -; tie speed 9 note D_, 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 4 -; tie speed 1 note A_, 7 volume_envelope 4, 7 note A_, 2 -; tie speed 9 note A_, 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 12 -; tie sound_ret Branch_f5f62: @@ -393,7 +352,7 @@ Branch_f5f62: volume_envelope 4, 7 note F#, 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 2 note C#, 2 dec_octave @@ -404,18 +363,16 @@ Branch_f5f62: note B_, 1 volume_envelope 4, 7 note B_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 inc_octave -; cutoff 6 note F#, 1 -; cutoff 8 note F#, 9 sound_ret Branch_f5f90: octave 5 speed 9 -.Loop5 +.Loop5: note D_, 1 volume_envelope 3, 7 note D_, 1 @@ -434,43 +391,37 @@ Branch_f5f90: note D_, 2 note D_, 1 note D_, 2 - duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 octave 5 note C_, 4 sound_loop 3, .Loop5 sound_ret - Music_DuelTheme2_Ch2: speed 9 stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 15, 3, 3 -; cutoff 8 octave 2 duty_cycle 1 volume_envelope 7, 4 -; frequency_offset 5 -.Loop1 +.Loop1: note D_, 2 note D_, 1 sound_loop 8, .Loop1 -.MainLoop -.Loop2 +.MainLoop: +.Loop2: note D_, 2 note D_, 1 sound_loop 24, .Loop2 duty_cycle 2 volume_envelope 6, -3 -; frequency_offset 0 -.Loop3 +.Loop3: inc_octave note D_, 1 dec_octave note A_, 1 sound_loop 12, .Loop3 -.Loop4 +.Loop4: inc_octave note C_, 1 dec_octave @@ -483,34 +434,31 @@ Music_DuelTheme2_Ch2: note C_, 1 note G_, 1 duty_cycle 1 - volume_envelope 7, 0 + volume_envelope 7, 8 dec_octave note D_, 1 rest 1 dec_octave -; cutoff 6 note A_, 1 -; cutoff 8 note A_, 9 duty_cycle 2 volume_envelope 6, -3 -.Loop5 +.Loop5: note A_, 1 note D_, 1 note A_, 1 sound_loop 4, .Loop5 duty_cycle 2 inc_octave -; cutoff 8 volume_envelope 2, -7 note C_, 4 - volume_envelope 6, 0 + volume_envelope 6, 8 note C_, 7 rest 1 volume_envelope 5, -7 note E_, 4 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 12 rest 6 speed 9 @@ -518,7 +466,7 @@ Music_DuelTheme2_Ch2: note G_, 3 dec_octave duty_cycle 1 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note G_, 3 note A_, 4 @@ -532,24 +480,24 @@ Music_DuelTheme2_Ch2: speed 9 duty_cycle 2 volume_envelope 6, -3 -.Loop6 +.Loop6: note A_, 1 note D_, 1 sound_loop 9, .Loop6 -.Loop7 +.Loop7: note D_, 1 dec_octave note A_, 1 inc_octave sound_loop 3, .Loop7 -.Loop8 +.Loop8: note G_, 1 note C_, 1 sound_loop 8, .Loop8 speed 1 note G_, 4 duty_cycle 1 - volume_envelope 7, 0 + volume_envelope 7, 8 inc_octave note C_, 5 note D_, 4 @@ -565,19 +513,17 @@ Music_DuelTheme2_Ch2: rest 1 note A_, 1 rest 1 -; cutoff 6 note D_, 1 -; cutoff 8 note A_, 9 duty_cycle 2 volume_envelope 6, -3 -.Loop9 +.Loop9: note A_, 1 note D_, 1 sound_loop 5, .Loop9 note A_, 1 duty_cycle 1 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note A#, 4 note B_, 5 @@ -604,17 +550,15 @@ Music_DuelTheme2_Ch2: rest 1 duty_cycle 1 volume_envelope 7, 4 -; frequency_offset 5 dec_octave dec_octave note D_, 1 -.Loop10 +.Loop10: note D_, 2 note D_, 1 sound_loop 3, .Loop10 duty_cycle 2 volume_envelope 6, -3 -; frequency_offset 0 inc_octave note E_, 1 rest 1 @@ -631,11 +575,9 @@ Music_DuelTheme2_Ch2: note E_, 1 inc_octave note C#, 1 - duty_cycle 2 - volume_envelope 6, -3 sound_call Branch_f6173 octave 4 -.Loop11 +.Loop11: note D_, 1 dec_octave note G_, 1 @@ -647,7 +589,7 @@ Music_DuelTheme2_Ch2: inc_octave inc_octave sound_loop 4, .Loop11 -.Loop12 +.Loop12: note C#, 1 dec_octave note F#, 1 @@ -663,13 +605,11 @@ Music_DuelTheme2_Ch2: volume_envelope 9, 3 octave 2 rest 1 -; cutoff 8 note B_, 2 note B_, 2 rest 2 note A_, 2 inc_octave -; cutoff 8 note C#, 1 note D_, 1 note E_, 1 @@ -677,7 +617,7 @@ Music_DuelTheme2_Ch2: volume_envelope 6, -3 sound_call Branch_f6173 octave 3 -.Loop13 +.Loop13: note B_, 1 note D_, 1 note G_, 1 @@ -689,7 +629,7 @@ Music_DuelTheme2_Ch2: note G_, 1 inc_octave sound_loop 2, .Loop13 -.Loop14 +.Loop14: inc_octave note C#, 1 dec_octave @@ -701,7 +641,7 @@ Music_DuelTheme2_Ch2: note A_, 1 inc_octave sound_loop 2, .Loop14 -.Loop15 +.Loop15: inc_octave note D_, 1 dec_octave @@ -713,7 +653,7 @@ Music_DuelTheme2_Ch2: note A_, 1 inc_octave sound_loop 2, .Loop15 -.Loop16 +.Loop16: inc_octave note E_, 1 dec_octave @@ -762,7 +702,7 @@ Music_DuelTheme2_Ch2: inc_octave note C_, 1 duty_cycle 1 - volume_envelope 7, 0 + volume_envelope 7, 8 dec_octave speed 1 note G_, 3 @@ -779,31 +719,27 @@ Music_DuelTheme2_Ch2: rest 1 duty_cycle 1 volume_envelope 7, 4 -; frequency_offset 5 dec_octave dec_octave note D_, 1 -.Loop17 +.Loop17: note D_, 2 note D_, 1 sound_loop 3, .Loop17 rest 12 duty_cycle 1 - volume_envelope 7, 0 -; frequency_offset 0 inc_octave - note A_, 12 -; tie - note A_, 12 + note_type 13, 7, 8 + note A_, 16 + note_type 8, 7, 8 + note A_, 1 + note_type 9, 7, 4 dec_octave - duty_cycle 1 - volume_envelope 7, 4 -; frequency_offset 5 sound_loop 0, .MainLoop Branch_f6173: octave 4 -.Loop18 +.Loop18: note C#, 1 dec_octave note F#, 1 @@ -815,7 +751,7 @@ Branch_f6173: inc_octave inc_octave sound_loop 4, .Loop18 -.Loop19 +.Loop19: note D_, 1 dec_octave note G_, 1 @@ -832,11 +768,10 @@ Branch_f6173: Branch_f618f: octave 4 speed 9 -.Loop20 +.Loop20: note A_, 1 rest 1 volume_envelope 7, 4 -; frequency_offset 5 dec_octave dec_octave note D_, 1 @@ -851,46 +786,39 @@ Branch_f618f: note D_, 2 note D_, 1 note D_, 2 - volume_envelope 7, 0 -; frequency_offset 0 + volume_envelope 7, 8 inc_octave inc_octave note G_, 4 sound_loop 3, .Loop20 sound_ret - Music_DuelTheme2_Ch3: speed 9 stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 -; echo 64 -; cutoff 7 octave 2 -.Loop1 +.Loop1: sound_call Branch_f62e5 sound_loop 4, .Loop1 -.MainLoop -.Loop2 +.MainLoop: +.Loop2: sound_call Branch_f62e5 sound_loop 44, .Loop2 -.Loop3 +.Loop3: sound_call Branch_f62e5 sound_call Branch_f62e5 sound_call Branch_f62e5 octave 2 -; cutoff 4 note D_, 2 -; cutoff 7 note C_, 3 note E_, 1 sound_loop 3, .Loop3 -.Loop4 +.Loop4: sound_call Branch_f62e5 sound_loop 2, .Loop4 octave 2 -; cutoff 8 note E_, 1 inc_octave note E_, 1 @@ -911,14 +839,12 @@ Music_DuelTheme2_Ch3: note A_, 1 dec_octave note A_, 1 -.Loop5 +.Loop5: sound_call Branch_f62e5 sound_loop 4, .Loop5 octave 2 -.Loop6 -; cutoff 4 +.Loop6: note E_, 2 -; cutoff 7 note E_, 1 inc_octave note E_, 1 @@ -928,10 +854,8 @@ Music_DuelTheme2_Ch3: note E_, 1 dec_octave sound_loop 4, .Loop6 -.Loop7 -; cutoff 4 +.Loop7: note A_, 2 -; cutoff 7 note A_, 1 inc_octave note A_, 1 @@ -941,11 +865,10 @@ Music_DuelTheme2_Ch3: note A_, 1 dec_octave sound_loop 4, .Loop7 -.Loop8 +.Loop8: sound_call Branch_f62e5 sound_loop 2, .Loop8 octave 2 -; cutoff 8 note E_, 1 inc_octave note E_, 1 @@ -969,14 +892,12 @@ Music_DuelTheme2_Ch3: note A_, 1 inc_octave note A_, 1 -.Loop9 +.Loop9: sound_call Branch_f62e5 sound_loop 4, .Loop9 octave 2 -.Loop10 -; cutoff 4 +.Loop10: note E_, 2 -; cutoff 7 note E_, 1 inc_octave note E_, 1 @@ -986,10 +907,8 @@ Music_DuelTheme2_Ch3: note E_, 1 dec_octave sound_loop 4, .Loop10 -.Loop11 -; cutoff 4 +.Loop11: note G_, 2 -; cutoff 7 note G_, 1 inc_octave note G_, 1 @@ -999,10 +918,8 @@ Music_DuelTheme2_Ch3: note G_, 1 dec_octave sound_loop 2, .Loop11 -.Loop12 -; cutoff 4 +.Loop12: note A_, 2 -; cutoff 7 note A_, 1 inc_octave note A_, 1 @@ -1012,10 +929,8 @@ Music_DuelTheme2_Ch3: note A_, 1 dec_octave sound_loop 2, .Loop12 -.Loop13 -; cutoff 4 +.Loop13: note A#, 2 -; cutoff 7 note A#, 1 inc_octave note A#, 1 @@ -1026,10 +941,8 @@ Music_DuelTheme2_Ch3: dec_octave sound_loop 2, .Loop13 inc_octave -.Loop14 -; cutoff 4 +.Loop14: note C_, 2 -; cutoff 7 note C_, 1 inc_octave note C_, 1 @@ -1040,10 +953,8 @@ Music_DuelTheme2_Ch3: dec_octave sound_loop 2, .Loop14 dec_octave -.Loop15 -; cutoff 4 +.Loop15: note A#, 2 -; cutoff 7 note A#, 1 inc_octave note A#, 1 @@ -1054,10 +965,8 @@ Music_DuelTheme2_Ch3: dec_octave sound_loop 2, .Loop15 inc_octave -.Loop16 -; cutoff 4 +.Loop16: note C_, 2 -; cutoff 7 note C_, 1 inc_octave note C_, 1 @@ -1067,22 +976,19 @@ Music_DuelTheme2_Ch3: note C_, 1 dec_octave sound_loop 2, .Loop16 -.Loop17 +.Loop17: sound_call Branch_f62e5 sound_call Branch_f62e5 sound_call Branch_f62e5 octave 2 -; cutoff 4 note D_, 2 -; cutoff 7 note C_, 3 note E_, 1 sound_loop 3, .Loop17 -.Loop18 +.Loop18: sound_call Branch_f62e5 sound_loop 2, .Loop18 octave 3 -; cutoff 8 note D_, 1 note C_, 1 dec_octave @@ -1098,16 +1004,14 @@ Music_DuelTheme2_Ch3: note G_, 1 note F_, 1 note C_, 1 -.Loop19 +.Loop19: sound_call Branch_f62e5 sound_loop 4, .Loop19 sound_loop 0, .MainLoop Branch_f62e5: octave 2 -; cutoff 4 note D_, 2 -; cutoff 7 note D_, 1 inc_octave note D_, 1 @@ -1117,20 +1021,19 @@ Branch_f62e5: note D_, 1 sound_ret - Music_DuelTheme2_Ch4: toggle_noise 6 drum_speed 9 -.Loop1 +.Loop1: rest 12 sound_loop 2, .Loop1 -.MainLoop +.MainLoop: rest 12 rest 6 -.Loop2 +.Loop2: drum_note 2, 1 sound_loop 6, .Loop2 -.Loop3 +.Loop3: sound_call Branch_f637c sound_loop 3, .Loop3 drum_note 1, 1 @@ -1139,14 +1042,14 @@ Music_DuelTheme2_Ch4: drum_note 2, 1 drum_note 4, 1 drum_note 5, 1 -.Loop4 +.Loop4: drum_note 2, 1 sound_loop 6, .Loop4 -.Loop5 +.Loop5: sound_call Branch_f637c sound_loop 15, .Loop5 sound_call Branch_f6396 -.Loop6 +.Loop6: sound_call Branch_f637c drum_note 2, 1 drum_note 2, 1 @@ -1171,10 +1074,10 @@ Music_DuelTheme2_Ch4: drum_note 3, 5 drum_speed 9 drum_note 2, 3 -.Loop7 +.Loop7: drum_note 2, 1 sound_loop 12, .Loop7 -.Loop8 +.Loop8: sound_call Branch_f637c sound_call Branch_f6389 sound_loop 3, .Loop8 @@ -1194,13 +1097,13 @@ Music_DuelTheme2_Ch4: drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 -.Loop9 +.Loop9: sound_call Branch_f637c sound_call Branch_f6389 sound_loop 4, .Loop9 sound_call Branch_f637c sound_call Branch_f6396 -.Loop10 +.Loop10: sound_call Branch_f637c drum_note 2, 1 drum_note 2, 1 @@ -1213,7 +1116,7 @@ Music_DuelTheme2_Ch4: drum_note 2, 1 sound_loop 3, .Loop10 sound_call Branch_f637c -.Loop11 +.Loop11: drum_note 2, 1 sound_loop 12, .Loop11 drum_note 6, 12 @@ -1257,7 +1160,7 @@ Branch_f6396: drum_note 2, 1 drum_note 4, 1 drum_note 4, 1 -.Loop12 +.Loop12: drum_note 2, 1 sound_loop 6, .Loop12 sound_ret diff --git a/crysaudio/music/TCG/dueltheme3.asm b/crysaudio/music/TCG/dueltheme3.asm index 17f23730e..4de648484 100644 --- a/crysaudio/music/TCG/dueltheme3.asm +++ b/crysaudio/music/TCG/dueltheme3.asm @@ -8,36 +8,31 @@ Music_DuelTheme3: Music_DuelTheme3_Ch1: speed 11 stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 20, 3, 3 -; cutoff 8 -.MainLoop +.MainLoop: octave 2 duty_cycle 0 -.Loop1 +.Loop1: volume_envelope 9, 2 note F#, 2 rest 1 - volume_envelope 9, 2 note F#, 2 rest 1 - volume_envelope 9, 2 note F#, 2 rest 1 - volume_envelope 9, 2 note F#, 2 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note E_, 2 volume_envelope 9, 5 note F_, 2 sound_loop 4, .Loop1 -.Loop2 +.Loop2: sound_call Branch_f67b2 sound_loop 4, .Loop2 duty_cycle 1 - volume_envelope 10, 0 -.Loop3 + volume_envelope 10, 8 +.Loop3: octave 3 note C#, 1 note F#, 1 @@ -79,8 +74,8 @@ Music_DuelTheme3_Ch1: sound_call Branch_f65cf speed 11 duty_cycle 1 - volume_envelope 10, 0 -.Loop4 + volume_envelope 10, 8 +.Loop4: octave 3 note C#, 1 note F#, 1 @@ -96,73 +91,71 @@ Music_DuelTheme3_Ch1: note B_, 5 volume_envelope 3, 7 note B_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 sound_call Branch_f65a7 sound_loop 2, .Loop4 vibrato 10, 3, 3 duty_cycle 0 -.Loop5 +.Loop5: octave 2 rest 4 - volume_envelope 9, 0 + volume_envelope 9, 8 note F#, 2 volume_envelope 2, 7 note F#, 2 rest 2 - volume_envelope 9, 0 + volume_envelope 9, 8 note E_, 2 volume_envelope 2, 7 note E_, 4 - volume_envelope 9, 0 + volume_envelope 9, 8 note D#, 2 volume_envelope 2, 7 note D#, 4 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 2 note C#, 2 sound_loop 2, .Loop5 vibrato 20, 3, 3 duty_cycle 2 -; cutoff 6 -.Loop6 +.Loop6: sound_call Branch_f661d sound_loop 4, .Loop6 octave 4 - volume_envelope 7, 0 + volume_envelope 7, 8 note C#, 5 volume_envelope 2, 7 note C#, 6 - volume_envelope 7, 0 + volume_envelope 7, 8 note F#, 5 volume_envelope 2, 7 note F#, 6 -.Loop7 +.Loop7: sound_call Branch_f661d sound_loop 3, .Loop7 octave 4 - volume_envelope 7, 0 + volume_envelope 7, 8 note C#, 5 volume_envelope 2, 7 note C#, 6 - volume_envelope 7, 0 + volume_envelope 7, 8 note F#, 5 volume_envelope 2, 7 note F#, 6 inc_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note C#, 5 volume_envelope 2, 7 note C#, 6 dec_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note F#, 5 volume_envelope 2, 7 note F#, 6 dec_octave speed 11 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 2 note C#, 2 dec_octave @@ -187,66 +180,66 @@ Music_DuelTheme3_Ch1: note G#, 4 duty_cycle 0 octave 2 -.Loop8 - volume_envelope 9, 0 +.Loop8: + volume_envelope 9, 8 note F#, 1 volume_envelope 3, 7 note F#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F#, 1 volume_envelope 3, 7 note F#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F#, 1 volume_envelope 3, 7 note F#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F#, 1 volume_envelope 3, 7 note F#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F#, 1 volume_envelope 3, 7 note F#, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F#, 1 volume_envelope 3, 7 note F#, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 sound_loop 2, .Loop8 duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 octave 3 note C#, 1 note F#, 1 @@ -263,13 +256,13 @@ Music_DuelTheme3_Ch1: volume_envelope 3, 7 note G#, 6 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 speed 11 note C#, 9 volume_envelope 3, 7 note C#, 2 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 1 inc_octave note C#, 1 @@ -281,52 +274,51 @@ Music_DuelTheme3_Ch1: volume_envelope 3, 7 note B_, 6 speed 11 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 9 volume_envelope 3, 7 note F#, 4 - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 1 note A_, 1 speed 1 note G#, 5 volume_envelope 3, 7 note G#, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 11 note B_, 8 volume_envelope 3, 7 note B_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 2 note B_, 1 -; tie speed 1 note B_, 5 volume_envelope 3, 7 note B_, 6 speed 11 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 1 note D_, 1 speed 1 note C#, 5 volume_envelope 3, 7 note C#, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 11 note E_, 10 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 1 speed 1 note C#, 8 volume_envelope 3, 7 note C#, 3 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 speed 11 note B_, 1 inc_octave @@ -337,76 +329,76 @@ Music_DuelTheme3_Ch1: volume_envelope 3, 7 note B_, 6 speed 11 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 10 volume_envelope 3, 7 note E_, 3 volume_envelope 1, -7 note A_, 3 - volume_envelope 6, 0 + volume_envelope 6, 8 note A_, 5 inc_octave volume_envelope 3, -7 note E_, 3 volume_envelope 7, -7 note E_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 2 duty_cycle 1 -.Loop9 - volume_envelope 9, 0 +.Loop9: + volume_envelope 9, 8 note G#, 1 volume_envelope 3, 7 note G#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G#, 1 volume_envelope 3, 7 note G#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G#, 1 volume_envelope 3, 7 note G#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G#, 1 volume_envelope 3, 7 note G#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G#, 1 volume_envelope 3, 7 note G#, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note G#, 1 volume_envelope 3, 7 note G#, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 @@ -416,14 +408,12 @@ Music_DuelTheme3_Ch1: Branch_f65a7: speed 11 octave 4 - volume_envelope 10, 0 - note C#, 5 -; tie - note C#, 4 + volume_envelope 10, 8 + note C#, 9 volume_envelope 3, 7 note C#, 2 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 1 inc_octave note C#, 1 @@ -435,19 +425,17 @@ Branch_f65a7: volume_envelope 3, 7 note B_, 6 speed 11 - volume_envelope 10, 0 + volume_envelope 10, 8 inc_octave - note C#, 5 -; tie - note C#, 4 + note C#, 9 volume_envelope 3, 7 note C#, 4 - volume_envelope 10, 0 + volume_envelope 10, 8 sound_ret Branch_f65cf: octave 3 -.Loop10 +.Loop10: speed 11 rest 2 speed 1 @@ -457,7 +445,7 @@ Branch_f65cf: note E_, 6 sound_loop 3, .Loop10 duty_cycle 2 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 5 note G_, 6 note B_, 5 @@ -481,7 +469,7 @@ Branch_f65cf: note E_, 5 volume_envelope 2, 7 note E_, 6 -.Loop11 +.Loop11: speed 11 rest 2 speed 1 @@ -492,7 +480,7 @@ Branch_f65cf: sound_loop 3, .Loop11 dec_octave duty_cycle 2 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 5 inc_octave note E_, 6 @@ -508,48 +496,105 @@ Branch_f65cf: Branch_f661d: octave 4 speed 1 - volume_envelope 7, 0 + volume_envelope 7, 8 note C#, 5 volume_envelope 2, 7 note C#, 6 - volume_envelope 7, 0 + volume_envelope 7, 8 note F#, 5 volume_envelope 2, 7 note F#, 6 inc_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note C#, 5 volume_envelope 2, 7 note C#, 6 dec_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note F#, 5 volume_envelope 2, 7 note F#, 6 inc_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note C#, 5 volume_envelope 2, 7 note C#, 6 dec_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note F#, 5 volume_envelope 2, 7 note F#, 6 sound_ret +Branch_f67b2: + octave 2 + volume_envelope 10, 3 + speed 11 + rest 1 + speed 1 + note F#, 5 + volume_envelope 2, 7 + note F#, 6 + volume_envelope 10, 3 + note A_, 5 + volume_envelope 2, 7 + note A_, 6 + volume_envelope 10, 3 + note F#, 5 + volume_envelope 2, 7 + note F#, 6 + volume_envelope 10, 3 + speed 11 + rest 1 + speed 1 + note F#, 5 + volume_envelope 3, 7 + note F#, 6 + inc_octave + volume_envelope 10, 3 + speed 11 + note C_, 1 + dec_octave + speed 1 + note B_, 5 + volume_envelope 2, 7 + note B_, 6 + speed 11 + rest 1 + speed 1 + volume_envelope 10, 3 + note A_, 5 + volume_envelope 2, 7 + note A_, 6 + speed 11 + rest 1 + speed 1 + volume_envelope 10, 3 + note B_, 5 + volume_envelope 2, 7 + note B_, 6 + volume_envelope 10, 3 + note A_, 4 + note B_, 4 + note A_, 3 + note F#, 5 + volume_envelope 2, 7 + note F#, 6 + speed 11 + volume_envelope 9, 8 + note E_, 1 + volume_envelope 10, 3 + note F_, 1 + sound_ret Music_DuelTheme3_Ch2: speed 11 stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 20, 3, 3 -; cutoff 8 -.MainLoop +.MainLoop: octave 2 duty_cycle 0 -; frequency_offset 3 -.Loop1 +.Loop1: volume_envelope 8, 2 note F#, 2 rest 1 @@ -562,14 +607,13 @@ Music_DuelTheme3_Ch2: volume_envelope 8, 2 note F#, 2 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 2 volume_envelope 8, 5 note F_, 2 sound_loop 4, .Loop1 -; frequency_offset 0 octave 3 -.Loop2 +.Loop2: rest 6 volume_envelope 10, 3 note E_, 1 @@ -577,9 +621,9 @@ Music_DuelTheme3_Ch2: note E_, 1 rest 8 sound_loop 4, .Loop2 -.Loop3 - sound_call Branch_f67b2 - sound_call Branch_f67b2 +.Loop3: + sound_call Branch_f67b2_2 + sound_call Branch_f67b2_2 sound_call Branch_f680a sound_call Branch_f680a sound_loop 2, .Loop3 @@ -613,80 +657,64 @@ Music_DuelTheme3_Ch2: note A_, 6 sound_call Branch_f6866 duty_cycle 0 - volume_envelope 9, 0 -.Loop4 - sound_call Branch_f67b2 - sound_call Branch_f67b2 + volume_envelope 9, 8 +.Loop4: + sound_call Branch_f67b2_2 + sound_call Branch_f67b2_2 sound_call Branch_f680a sound_call Branch_f680a sound_loop 2, .Loop4 vibrato 10, 3, 3 -.Loop5 +.Loop5: volume_envelope 10, 3 -; cutoff 6 note F#, 1 note F#, 1 -; cutoff 8 speed 1 note F#, 5 volume_envelope 2, 7 note F#, 6 volume_envelope 10, 3 -; cutoff 6 speed 11 note F#, 1 inc_octave - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note C#, 2 dec_octave volume_envelope 10, 3 -; cutoff 6 note F#, 1 note F#, 1 speed 1 -; cutoff 8 note F#, 5 volume_envelope 2, 7 note F#, 6 volume_envelope 10, 3 -; cutoff 6 speed 11 note F#, 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note B_, 2 volume_envelope 10, 3 -; cutoff 6 note F#, 1 note F#, 1 -; cutoff 8 speed 1 note F#, 5 volume_envelope 2, 7 note F#, 6 volume_envelope 10, 3 -; cutoff 6 speed 11 note F#, 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note B_, 2 volume_envelope 10, 3 -; cutoff 6 note F#, 1 note F#, 1 speed 1 -; cutoff 8 note F#, 5 volume_envelope 2, 7 note F#, 6 volume_envelope 10, 3 -; cutoff 6 speed 11 note F#, 1 -; cutoff 8 - volume_envelope 9, 0 + volume_envelope 9, 8 note A_, 2 note G#, 2 sound_loop 4, .Loop5 @@ -711,127 +739,127 @@ Music_DuelTheme3_Ch2: speed 11 note E_, 4 octave 3 -.Loop6 - volume_envelope 9, 0 +.Loop6: + volume_envelope 9, 8 note C#, 1 volume_envelope 3, 7 note C#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C#, 1 volume_envelope 3, 7 note C#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C#, 1 volume_envelope 3, 7 note C#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C#, 1 volume_envelope 3, 7 note C#, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C#, 1 volume_envelope 3, 7 note C#, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note C#, 1 volume_envelope 3, 7 note C#, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 rest 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 sound_loop 6, .Loop6 duty_cycle 1 inc_octave -.Loop7 - volume_envelope 8, 0 +.Loop7: + volume_envelope 8, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 sound_loop 4, .Loop7 sound_loop 0, .MainLoop -Branch_f67b2: +Branch_f67b2_2: octave 2 volume_envelope 10, 3 speed 11 @@ -886,7 +914,7 @@ Branch_f67b2: volume_envelope 2, 7 note F#, 6 speed 11 - volume_envelope 9, 0 + volume_envelope 9, 8 note E_, 1 volume_envelope 10, 3 note F_, 1 @@ -951,7 +979,7 @@ Branch_f680a: volume_envelope 2, 7 note G_, 6 speed 11 - volume_envelope 9, 0 + volume_envelope 9, 8 note B_, 1 volume_envelope 10, 3 note G_, 1 @@ -959,7 +987,7 @@ Branch_f680a: Branch_f6866: octave 2 -.Loop8 +.Loop8: speed 11 rest 1 speed 1 @@ -973,7 +1001,7 @@ Branch_f6866: note A_, 6 sound_loop 3, .Loop8 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note B_, 5 inc_octave note D_, 6 @@ -998,7 +1026,7 @@ Branch_f6866: note A_, 5 volume_envelope 2, 7 note A_, 6 -.Loop9 +.Loop9: speed 11 rest 1 speed 1 @@ -1012,7 +1040,7 @@ Branch_f6866: note A_, 6 sound_loop 3, .Loop9 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 5 note B_, 6 inc_octave @@ -1027,43 +1055,34 @@ Branch_f6866: inc_octave sound_ret - Music_DuelTheme3_Ch3: speed 11 stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 -; echo 96 -; vibrato_type 8 vibrato 0, 3, 3 -; cutoff 8 -.MainLoop +.MainLoop: octave 2 -.Loop1 -; cutoff 4 +.Loop1: note F#, 2 rest 1 -; cutoff 4 note F#, 2 rest 1 -; cutoff 4 note F#, 2 rest 1 -; cutoff 4 note F#, 2 rest 1 -; cutoff 8 note E_, 2 note F_, 2 sound_loop 4, .Loop1 -.Loop2 +.Loop2: sound_call Branch_f6973 sound_loop 4, .Loop2 -.Loop3 +.Loop3: sound_call Branch_f6992 sound_loop 2, .Loop3 octave 2 -.Loop4 +.Loop4: note F#, 1 rest 2 note F#, 1 @@ -1085,16 +1104,15 @@ Music_DuelTheme3_Ch3: note E_, 2 note F_, 2 sound_loop 2, .Loop4 -.Loop5 +.Loop5: sound_call Branch_f6992 sound_loop 2, .Loop5 vibrato 10, 3, 3 octave 2 -.Loop6 +.Loop6: sound_call Branch_f69f0 speed 11 octave 4 -; cutoff 8 note D_, 2 note C#, 2 dec_octave @@ -1102,7 +1120,6 @@ Music_DuelTheme3_Ch3: sound_loop 3, .Loop6 sound_call Branch_f69f0 octave 2 -; cutoff 8 note F#, 2 note E_, 2 vibrato 0, 3, 3 @@ -1126,7 +1143,7 @@ Music_DuelTheme3_Ch3: speed 11 note E_, 4 dec_octave -.Loop7 +.Loop7: note F#, 1 rest 2 note F#, 1 @@ -1148,8 +1165,7 @@ Music_DuelTheme3_Ch3: note E_, 2 note F_, 2 sound_loop 6, .Loop7 -; cutoff 7 -.Loop8 +.Loop8: inc_octave note F#, 1 dec_octave @@ -1207,7 +1223,6 @@ Music_DuelTheme3_Ch3: dec_octave note E_, 1 sound_loop 4, .Loop8 -; cutoff 8 sound_loop 0, .MainLoop Branch_f6973: @@ -1216,11 +1231,9 @@ Branch_f6973: rest 1 inc_octave inc_octave -; cutoff 4 note E_, 1 dec_octave dec_octave -; cutoff 8 note F#, 1 rest 2 note F#, 1 @@ -1230,28 +1243,23 @@ Branch_f6973: rest 1 inc_octave inc_octave -; cutoff 4 note E_, 1 dec_octave dec_octave -; cutoff 8 note E_, 2 note F_, 2 sound_ret Branch_f6992: octave 2 -; sound_call Branch_f6973 octave 2 note F#, 1 rest 1 inc_octave inc_octave -; cutoff 4 note E_, 1 dec_octave dec_octave -; cutoff 8 note F#, 1 rest 2 note F#, 1 @@ -1261,23 +1269,18 @@ Branch_f6992: rest 1 inc_octave inc_octave -; cutoff 4 note E_, 1 dec_octave dec_octave -; cutoff 8 note E_, 2 note F_, 2 -; sound_ret note F#, 1 rest 1 inc_octave inc_octave -; cutoff 4 note E_, 1 dec_octave dec_octave -; cutoff 8 note F#, 1 rest 2 note F#, 1 @@ -1287,11 +1290,9 @@ Branch_f6992: rest 1 inc_octave inc_octave -; cutoff 4 note E_, 1 dec_octave dec_octave -; cutoff 8 note F#, 1 rest 1 note F#, 2 @@ -1299,11 +1300,9 @@ Branch_f6992: rest 1 inc_octave inc_octave -; cutoff 4 note F#, 1 dec_octave dec_octave -; cutoff 8 note G_, 1 rest 2 note G_, 1 @@ -1313,22 +1312,18 @@ Branch_f6992: rest 1 inc_octave inc_octave -; cutoff 4 note F#, 1 dec_octave dec_octave -; cutoff 8 note F_, 2 note F#, 2 note G_, 1 rest 1 inc_octave inc_octave -; cutoff 4 note F#, 1 dec_octave dec_octave -; cutoff 8 note G_, 1 rest 2 note G_, 1 @@ -1338,11 +1333,9 @@ Branch_f6992: rest 1 inc_octave inc_octave -; cutoff 4 note F#, 1 dec_octave dec_octave -; cutoff 8 note G_, 1 rest 1 note F_, 2 @@ -1350,76 +1343,60 @@ Branch_f6992: Branch_f69f0: octave 2 -; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave -; cutoff 4 note C#, 1 dec_octave dec_octave -; cutoff 6 note F#, 1 inc_octave inc_octave -; cutoff 8 note F#, 2 dec_octave dec_octave -; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave -; cutoff 4 note C#, 1 dec_octave dec_octave -; cutoff 6 note F#, 1 inc_octave inc_octave -; cutoff 8 note E_, 2 dec_octave dec_octave -; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave -; cutoff 4 note C#, 1 dec_octave dec_octave -; cutoff 6 note F#, 1 inc_octave inc_octave -; cutoff 8 note D#, 2 dec_octave dec_octave -; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave -; cutoff 4 note C#, 1 dec_octave dec_octave -; cutoff 6 note F#, 1 sound_ret - Music_DuelTheme3_Ch4: toggle_noise 6 drum_speed 11 -.MainLoop -.Loop1 +.MainLoop: +.Loop1: drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 @@ -1437,7 +1414,7 @@ Music_DuelTheme3_Ch4: drum_note 5, 1 drum_note 4, 1 sound_loop 2, .Loop1 -.Loop2 +.Loop2: drum_note 2, 1 drum_note 1, 1 drum_note 1, 1 @@ -1446,7 +1423,7 @@ Music_DuelTheme3_Ch4: drum_note 1, 1 drum_note 2, 1 drum_note 1, 1 -.Loop3 +.Loop3: drum_note 2, 1 drum_note 1, 1 drum_note 1, 1 @@ -1458,7 +1435,7 @@ Music_DuelTheme3_Ch4: drum_speed 11 drum_note 2, 1 drum_note 2, 1 -.Loop4 +.Loop4: sound_call Branch_f6b40 sound_loop 3, .Loop4 drum_note 1, 2 @@ -1477,7 +1454,7 @@ Music_DuelTheme3_Ch4: drum_speed 11 drum_note 2, 1 drum_note 2, 1 -.Loop5 +.Loop5: sound_call Branch_f6b40 sound_loop 7, .Loop5 drum_note 1, 2 @@ -1509,7 +1486,7 @@ Music_DuelTheme3_Ch4: drum_note 3, 6 drum_speed 11 drum_note 2, 2 -.Loop6 +.Loop6: sound_call Branch_f6b40 sound_loop 7, .Loop6 drum_note 1, 2 @@ -1563,7 +1540,7 @@ Music_DuelTheme3_Ch4: drum_note 2, 6 drum_speed 11 drum_note 2, 1 -.Loop7 +.Loop7: sound_call Branch_f6b65 drum_speed 1 drum_note 1, 6 @@ -1571,7 +1548,7 @@ Music_DuelTheme3_Ch4: sound_call Branch_f6b65 drum_speed 1 drum_note 2, 6 -.Loop8 +.Loop8: sound_call Branch_f6b65 drum_speed 1 drum_note 1, 6 @@ -1710,7 +1687,7 @@ Branch_f6b7e: Branch_f6b9a: drum_speed 11 -.Loop9 +.Loop9: drum_note 1, 1 drum_speed 1 drum_note 4, 5 @@ -1743,7 +1720,7 @@ Branch_f6b9a: drum_note 2, 1 drum_note 1, 1 sound_loop 3, .Loop9 -.Loop10 +.Loop10: drum_note 1, 1 drum_speed 1 drum_note 4, 5 diff --git a/crysaudio/music/TCG/hallofhonor.asm b/crysaudio/music/TCG/hallofhonor.asm index d3fd1a0d6..d719c5462 100644 --- a/crysaudio/music/TCG/hallofhonor.asm +++ b/crysaudio/music/TCG/hallofhonor.asm @@ -214,23 +214,24 @@ Music_HallOfHonor_Ch3: speed 1 note B_, 3 inc_octave - note C_, 4 - speed 7 - note C_, 15 - note C_, 8 + note C_, 11 + note_type 14, 1, 12 + note C_, 11 + note_type 7, 1, 12 dec_octave note B_, 2 note A_, 2 note G_, 6 - note C_, 10 - note C_, 12 + note_type 14, 1, 12 + note C_, 11 + note_type 7, 1, 12 speed 1 note B_, 3 inc_octave - note C_, 4 - speed 7 - note C_, 15 - note C_, 6 + note C_, 11 + note_type 14, 1, 12 + note C_, 10 + note_type 7, 1, 12 dec_octave note B_, 2 inc_octave @@ -239,20 +240,20 @@ Music_HallOfHonor_Ch3: dec_octave speed 1 note F#, 3 - note G_, 4 - speed 7 - note G_, 15 - note G_, 6 + note G_, 11 + note_type 14, 1, 12 + note G_, 10 + note_type 7, 1, 12 note G_, 2 note A_, 2 note B_, 2 speed 1 note B_, 3 inc_octave - note C_, 4 - speed 7 - note C_, 15 - note C_, 8 + note C_, 11 + note_type 14, 1, 12 + note C_, 11 + note_type 7, 1, 12 dec_octave note B_, 2 note A_, 2 @@ -262,8 +263,7 @@ Music_HallOfHonor_Ch3: inc_octave note C_, 4 speed 7 - note C_, 9 - note C_, 6 + note C_, 15 dec_octave note G_, 2 inc_octave @@ -276,8 +276,9 @@ Music_HallOfHonor_Ch3: note F_, 1 note E_, 2 note C_, 2 + note_type 14, 1, 12 note C_, 10 - note C_, 10 + note_type 7, 1, 12 note E_, 2 speed 1 note E_, 3 @@ -286,35 +287,39 @@ Music_HallOfHonor_Ch3: note F_, 1 note E_, 2 note C_, 2 - note C_, 10 - note C_, 12 + note_type 14, 1, 12 + note C_, 11 + note_type 7, 1, 12 speed 1 note F#, 3 - note G_, 4 - speed 7 - note G_, 15 - note G_, 8 + note G_, 11 + note_type 14, 1, 12 + note G_, 11 + note_type 7, 1, 12 note F_, 2 note E_, 2 note F_, 2 note E_, 2 note C_, 2 dec_octave + note_type 14, 1, 12 note G_, 10 - note G_, 10 + note_type 7, 1, 12 note E_, 2 note F_, 2 inc_octave note C_, 2 - note C_, 12 - note C_, 10 + note_type 14, 1, 12 + note C_, 11 + note_type 7, 1, 12 dec_octave note E_, 2 note F_, 2 inc_octave note C_, 2 + note_type 14, 1, 12 note C_, 12 - note C_, 12 + note_type 7, 1, 12 rest 3 channel_volume 3 sound_loop 0, .MainLoop diff --git a/crysaudio/music/TCG/matchloss.asm b/crysaudio/music/TCG/matchloss.asm index eab3b5bb5..1cc2f0756 100644 --- a/crysaudio/music/TCG/matchloss.asm +++ b/crysaudio/music/TCG/matchloss.asm @@ -6,78 +6,69 @@ Music_MatchLoss: Music_MatchLoss_Ch1: stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 -; cutoff 8 octave 4 duty_cycle 2 - volume_envelope 11, 0 + volume_envelope 11, 8 speed 1 note E_, 3 note F_, 2 -; tie speed 5 note F_, 3 note C_, 1 volume_envelope 3, 7 note C_, 3 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A#, 1 volume_envelope 3, 7 note A#, 3 inc_octave speed 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 3 note D#, 2 -; tie note D#, 16 dec_octave note A#, 6 volume_envelope 3, 7 note A#, 16 - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 6 volume_envelope 3, 7 note G#, 16 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 note C#, 8 -; tie note C#, 12 dec_octave speed 6 note G#, 1 volume_envelope 3, 7 note G#, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 1 speed 7 volume_envelope 3, 7 note F#, 3 speed 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 5 inc_octave note C_, 4 -; tie speed 9 note C_, 11 volume_envelope 3, 7 note C_, 2 sound_ret - Music_MatchLoss_Ch2: stereo_panning TRUE, TRUE -; vibrato_type 5 vibrato 20, 3, 3 -; cutoff 8 octave 3 duty_cycle 2 - volume_envelope 9, 0 + volume_envelope 9, 8 speed 9 rest 9 speed 11 @@ -86,50 +77,39 @@ Music_MatchLoss_Ch2: rest 8 speed 9 rest 6 - note G_, 6 -; tie - note G_, 6 + note G_, 12 volume_envelope 3, 7 note G_, 2 sound_ret - Music_MatchLoss_Ch3: stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 -; cutoff 8 -; echo 64 octave 2 speed 5 note A#, 4 inc_octave -; cutoff 4 note F_, 4 note A#, 4 dec_octave -; cutoff 8 speed 7 note G#, 3 inc_octave -; cutoff 4 speed 2 note D#, 11 note G#, 11 dec_octave -; cutoff 8 - speed 1 - note F#, 11 -; tie - note F#, 12 + note_type 11, 1, 11 + note F#, 2 + note_type 1, 1, 11 + rest 1 inc_octave -; cutoff 4 speed 12 note C#, 2 speed 2 note F#, 13 dec_octave speed 9 -; cutoff 8 note F_, 12 sound_ret diff --git a/crysaudio/music/TCG/overworld.asm b/crysaudio/music/TCG/overworld.asm index 149f4e7db..1e5528b49 100644 --- a/crysaudio/music/TCG/overworld.asm +++ b/crysaudio/music/TCG/overworld.asm @@ -15,6 +15,7 @@ Music_Overworld_Ch1: rest 3 sound_call Branch_f72ba rest 3 + volume_envelope 10, 2 .MainLoop: sound_call Branch_f72ba duty_cycle 1 @@ -168,14 +169,12 @@ Music_Overworld_Ch1: note G_, 5 volume_envelope 3, 7 note G_, 1 - volume_envelope 9, 8 - note F_, 8 - note F_, 8 - note F_, 8 + note_type 14, 9, 8 + note F_, 16 + vibrato 0, 3, 3 note F_, 8 - note F_, 8 - note F_, 8 - volume_envelope 3, 7 + note_type 7, 3, 7 + vibrato 25, 3, 3 note F_, 3 duty_cycle 0 volume_envelope 10, 2 diff --git a/crysaudio/music/TCG/pokemondome.asm b/crysaudio/music/TCG/pokemondome.asm index a7653d8fc..f15cbfcc1 100644 --- a/crysaudio/music/TCG/pokemondome.asm +++ b/crysaudio/music/TCG/pokemondome.asm @@ -8,12 +8,10 @@ Music_PokemonDome: Music_PokemonDome_Ch1: speed 7 stereo_panning TRUE, TRUE -; vibrato_type 9 vibrato 20, 3, 3 -; cutoff 8 octave 2 duty_cycle 0 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G_, 5 note A_, 5 @@ -44,127 +42,126 @@ Music_PokemonDome_Ch1: note F_, 5 note G_, 4 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 dec_octave speed 1 note C_, 11 volume_envelope 3, 7 note C_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 11 volume_envelope 3, 7 note C_, 10 rest 7 - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 4 volume_envelope 3, 7 note C_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 4 volume_envelope 3, 7 note C_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 11 volume_envelope 3, 7 note C_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 11 volume_envelope 3, 7 note C_, 10 speed 7 rest 3 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 1 note D_, 11 volume_envelope 3, 7 note D_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 11 volume_envelope 3, 7 note D_, 10 rest 7 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 4 volume_envelope 3, 7 note D_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 4 volume_envelope 3, 7 note D_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 11 volume_envelope 3, 7 note D_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 11 volume_envelope 3, 7 note D_, 3 -.MainLoop +.MainLoop: speed 7 duty_cycle 1 volume_envelope 10, 4 octave 2 note G_, 4 inc_octave - duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 1 note E_, 11 volume_envelope 3, 7 note E_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 1 note E_, 11 volume_envelope 3, 7 note E_, 10 rest 7 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 4 volume_envelope 3, 7 note E_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 4 volume_envelope 3, 7 note E_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 11 volume_envelope 3, 7 note E_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 11 volume_envelope 3, 7 note E_, 10 speed 7 rest 3 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 1 note D_, 11 volume_envelope 3, 7 note D_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 11 volume_envelope 3, 7 note D_, 10 rest 7 speed 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 4 volume_envelope 3, 7 note D_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 4 volume_envelope 3, 7 note D_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 11 volume_envelope 3, 7 note D_, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 11 volume_envelope 3, 7 note D_, 3 duty_cycle 0 - volume_envelope 10, 0 + volume_envelope 10, 8 dec_octave speed 1 note B_, 4 @@ -185,33 +182,33 @@ Music_PokemonDome_Ch1: note G_, 1 rest 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 1 note D_, 10 volume_envelope 3, 7 note D_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 3 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 10 volume_envelope 3, 7 note F_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 volume_envelope 3, 7 note C_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 10 note E_, 1 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 3 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 12 dec_octave note G_, 1 @@ -219,7 +216,7 @@ Music_PokemonDome_Ch1: note G_, 1 rest 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 1 note D_, 8 dec_octave @@ -228,103 +225,95 @@ Music_PokemonDome_Ch1: note D_, 3 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 14 volume_envelope 3, 7 note C_, 2 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 10 volume_envelope 3, 7 note B_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 4 note A_, 12 note B_, 1 volume_envelope 3, 7 note B_, 2 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 1 note D_, 8 note E_, 4 note F_, 4 - note G_, 8 -; tie - note G_, 8 -; tie - note G_, 8 - volume_envelope 3, 7 + note_type 14, 10, 8 + note G_, 12 + note_type 7, 3, 7 note G_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 2 note E_, 2 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note E_, 5 volume_envelope 3, 7 note E_, 2 speed 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 rest 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 inc_octave note C_, 8 note G_, 1 volume_envelope 3, 7 note G_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 1 note E_, 1 volume_envelope 3, 7 note E_, 1 rest 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 inc_octave note C_, 8 note G_, 1 volume_envelope 3, 7 note G_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 1 note E_, 1 volume_envelope 3, 7 note E_, 1 rest 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note G#, 1 inc_octave - note C_, 12 -; tie - note C_, 8 + note_type 14, 10, 8 + note C_, 10 + note_type 7, 10, 8 note D_, 8 - note C_, 8 -; tie - note C_, 8 -; tie - note C_, 12 + note_type 14, 10, 8 + note C_, 14 + note_type 7, 10, 8 sound_loop 0, .MainLoop - Music_PokemonDome_Ch2: speed 7 stereo_panning TRUE, TRUE -; vibrato_type 9 vibrato 20, 3, 3 -; cutoff 8 octave 1 duty_cycle 0 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 1 note B_, 5 inc_octave @@ -354,32 +343,32 @@ Music_PokemonDome_Ch2: note G_, 5 note A_, 5 note B_, 4 -.MainLoop +.MainLoop: duty_cycle 1 - volume_envelope 7, 0 + volume_envelope 7, 8 octave 3 speed 1 note E_, 11 volume_envelope 3, 7 note E_, 3 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 11 volume_envelope 3, 7 note E_, 10 rest 7 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 4 volume_envelope 3, 7 note E_, 3 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 4 volume_envelope 3, 7 note E_, 3 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 11 volume_envelope 3, 7 note E_, 3 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 11 volume_envelope 3, 7 note E_, 10 @@ -388,29 +377,29 @@ Music_PokemonDome_Ch2: sound_call Branch_f9554 speed 7 rest 4 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note G_, 11 volume_envelope 3, 7 note G_, 3 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 11 volume_envelope 3, 7 note G_, 10 rest 7 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 4 volume_envelope 3, 7 note G_, 3 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 4 volume_envelope 3, 7 note G_, 3 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 11 volume_envelope 3, 7 note G_, 3 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 11 volume_envelope 3, 7 note G_, 10 @@ -418,7 +407,7 @@ Music_PokemonDome_Ch2: rest 3 sound_call Branch_f9554 duty_cycle 0 - volume_envelope 8, 0 + volume_envelope 8, 8 dec_octave speed 1 note G_, 4 @@ -438,7 +427,7 @@ Music_PokemonDome_Ch2: volume_envelope 2, 7 note E_, 1 rest 1 - volume_envelope 7, 0 + volume_envelope 7, 8 note G_, 1 note G_, 10 note A_, 2 @@ -462,9 +451,7 @@ Music_PokemonDome_Ch2: note E_, 4 note F#, 8 note F#, 4 -; cutoff 6 note F#, 3 -; cutoff 8 speed 1 note F#, 5 rest 2 @@ -494,7 +481,7 @@ Music_PokemonDome_Ch2: duty_cycle 1 volume_envelope 7, -7 speed 1 -.Loop1 +.Loop1: note F_, 5 note C_, 5 dec_octave @@ -506,7 +493,7 @@ Music_PokemonDome_Ch2: note F_, 4 inc_octave sound_loop 4, .Loop1 -.Loop2 +.Loop2: note G#, 5 note F_, 5 note C_, 4 @@ -516,7 +503,7 @@ Music_PokemonDome_Ch2: note G#, 4 inc_octave sound_loop 4, .Loop2 -.Loop3 +.Loop3: inc_octave note D_, 5 dec_octave @@ -526,7 +513,7 @@ Music_PokemonDome_Ch2: note G_, 5 note D_, 4 sound_loop 4, .Loop3 -.Loop4 +.Loop4: inc_octave note C#, 5 dec_octave @@ -546,14 +533,14 @@ Music_PokemonDome_Ch2: inc_octave note C#, 4 duty_cycle 0 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 7 -.Loop5 +.Loop5: note C_, 1 volume_envelope 2, 7 note C_, 1 rest 1 - volume_envelope 7, 0 + volume_envelope 7, 8 dec_octave note F_, 1 note A_, 8 @@ -562,7 +549,7 @@ Music_PokemonDome_Ch2: volume_envelope 2, 7 note E_, 1 rest 1 - volume_envelope 7, 0 + volume_envelope 7, 8 note D_, 1 sound_loop 2, .Loop5 note C_, 1 @@ -570,7 +557,7 @@ Music_PokemonDome_Ch2: note C_, 1 rest 1 dec_octave - volume_envelope 7, 0 + volume_envelope 7, 8 note F_, 1 note G#, 12 note C_, 1 @@ -599,50 +586,45 @@ Music_PokemonDome_Ch2: Branch_f9554: speed 1 - volume_envelope 7, 0 + volume_envelope 7, 8 note F_, 11 volume_envelope 3, 7 note F_, 3 - volume_envelope 7, 0 + volume_envelope 7, 8 note F_, 11 volume_envelope 3, 7 note F_, 10 rest 7 - volume_envelope 7, 0 + volume_envelope 7, 8 note F_, 4 volume_envelope 3, 7 note F_, 3 - volume_envelope 7, 0 + volume_envelope 7, 8 note F_, 4 volume_envelope 3, 7 note F_, 3 -.Loop6 - volume_envelope 7, 0 +.Loop6: + volume_envelope 7, 8 note F_, 11 volume_envelope 3, 7 note F_, 3 sound_loop 2, .Loop6 sound_ret - Music_PokemonDome_Ch3: speed 7 stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 -; echo 64 -; cutoff 6 octave 2 -; cutoff 4 speed 1 -.Loop1 +.Loop1: note G_, 5 note G_, 5 note G_, 4 sound_loop 8, .Loop1 -; cutoff 6 speed 7 -.MainLoop +.MainLoop: inc_octave note C_, 2 note C_, 2 @@ -651,10 +633,8 @@ Music_PokemonDome_Ch3: note C_, 1 sound_call Branch_f9613 octave 2 -; cutoff 4 note C_, 2 inc_octave -; cutoff 6 note C_, 2 rest 2 note C_, 1 @@ -698,56 +678,56 @@ Music_PokemonDome_Ch3: note G#, 2 rest 2 note F_, 2 -.Loop2 +.Loop2: note G_, 2 note G_, 2 rest 2 note G_, 1 note G_, 1 sound_loop 2, .Loop2 -.Loop3 +.Loop3: note F#, 2 note F#, 2 rest 2 note F#, 1 note F#, 1 sound_loop 2, .Loop3 -.Loop4 +.Loop4: note G_, 2 note G_, 2 rest 2 note G_, 1 note G_, 1 sound_loop 4, .Loop4 -.Loop5 +.Loop5: note F_, 2 note F_, 2 rest 2 note F_, 1 note F_, 1 sound_loop 4, .Loop5 -.Loop6 +.Loop6: note E_, 2 note E_, 2 rest 2 note E_, 1 note E_, 1 sound_loop 2, .Loop6 -.Loop7 +.Loop7: note A_, 2 note A_, 2 rest 2 note A_, 1 note A_, 1 sound_loop 2, .Loop7 -.Loop8 +.Loop8: note D_, 2 note D_, 2 rest 2 note D_, 1 note D_, 1 sound_loop 4, .Loop8 -.Loop9 +.Loop9: note G_, 2 note G_, 2 rest 2 @@ -772,13 +752,10 @@ Branch_f9613: note C_, 2 note C_, 2 dec_octave -; cutoff 4 note G_, 2 -; cutoff 6 note G_, 2 sound_ret - Music_PokemonDome_Ch4: toggle_noise 6 drum_speed 7 @@ -787,12 +764,12 @@ Music_PokemonDome_Ch4: drum_speed 1 drum_note 2, 4 drum_note 3, 3 -.Loop1 +.Loop1: drum_note 3, 4 drum_note 3, 3 sound_loop 7, .Loop1 -.MainLoop -.Loop2 +.MainLoop: +.Loop2: drum_speed 7 drum_note 2, 2 drum_note 2, 2 diff --git a/crysaudio/music/TCG/ronald.asm b/crysaudio/music/TCG/ronald.asm index a2263db78..93183c186 100644 --- a/crysaudio/music/TCG/ronald.asm +++ b/crysaudio/music/TCG/ronald.asm @@ -7,19 +7,15 @@ Music_Ronald: Music_Ronald_Ch1: stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 12, 3, 3 -; cutoff 8 duty_cycle 0 -.MainLoop +.MainLoop: octave 3 speed 13 -.Loop1 +.Loop1: volume_envelope 9, 2 -; cutoff 3 note D_, 1 note D_, 1 -; cutoff 4 note F_, 1 rest 2 note D_, 1 @@ -30,17 +26,14 @@ Music_Ronald_Ch1: rest 1 note F_, 1 rest 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 2 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 3 note G_, 1 inc_octave note D_, 1 -; cutoff 4 note F_, 1 rest 2 note F_, 1 @@ -51,32 +44,29 @@ Music_Ronald_Ch1: rest 1 note A_, 1 rest 1 -; cutoff 8 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 2 rest 1 sound_loop 2, .Loop1 -.Loop2 +.Loop2: vibrato 20, 3, 3 sound_call Branch_fa9aa speed 1 octave 4 note C#, 3 note D_, 10 -; tie speed 13 note D_, 2 vibrato 12, 3, 3 sound_call Branch_fa9ec sound_loop 2, .Loop2 -.Loop3 +.Loop3: vibrato 20, 3, 3 sound_call Branch_fa9cb speed 1 octave 4 note C#, 3 note D_, 10 -; tie speed 13 note D_, 2 vibrato 12, 3, 3 @@ -90,10 +80,9 @@ Music_Ronald_Ch1: note D_, 3 rest 7 duty_cycle 2 - volume_envelope 9, 0 + volume_envelope 9, 8 rest 6 dec_octave -; cutoff 4 note G_, 7 inc_octave note F_, 6 @@ -108,12 +97,10 @@ Music_Ronald_Ch1: dec_octave note G_, 7 inc_octave -; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave -; cutoff 4 note A#, 6 inc_octave note C_, 7 @@ -122,22 +109,18 @@ Music_Ronald_Ch1: note G_, 7 note F_, 6 note F#, 7 -; cutoff 8 note G_, 6 -; cutoff 4 note C#, 7 note C_, 6 dec_octave note A#, 7 inc_octave -; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave note A#, 6 inc_octave -; cutoff 4 note C_, 7 dec_octave note A#, 6 @@ -145,7 +128,6 @@ Music_Ronald_Ch1: note F_, 6 note F#, 7 note G_, 6 -; cutoff 8 note A#, 7 inc_octave note C_, 6 @@ -158,10 +140,9 @@ Music_Ronald_Ch1: note D_, 3 rest 7 duty_cycle 2 - volume_envelope 9, 0 + volume_envelope 9, 8 rest 6 dec_octave -; cutoff 4 note G_, 7 inc_octave note F_, 6 @@ -176,12 +157,10 @@ Music_Ronald_Ch1: dec_octave note G_, 7 inc_octave -; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave -; cutoff 4 note A#, 6 inc_octave note C_, 7 @@ -191,20 +170,16 @@ Music_Ronald_Ch1: note F_, 6 note F#, 7 note G_, 6 -; cutoff 8 note A#, 7 inc_octave -; cutoff 4 note C_, 6 dec_octave note A#, 7 inc_octave -; cutoff 8 note C#, 4 note C_, 4 dec_octave note A#, 5 -; cutoff 4 note G_, 6 note F_, 7 note G_, 6 @@ -213,15 +188,12 @@ Music_Ronald_Ch1: dec_octave note A#, 7 inc_octave -; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave -; cutoff 4 note A#, 6 note G_, 7 -; cutoff 8 sound_call Branch_fa9cb speed 1 octave 4 @@ -229,21 +201,16 @@ Music_Ronald_Ch1: note D_, 3 rest 7 duty_cycle 2 - volume_envelope 9, 0 + volume_envelope 9, 8 rest 13 -; cutoff 4 note F_, 6 rest 7 -; cutoff 8 note E_, 4 note F_, 4 note E_, 5 -; cutoff 4 note D_, 6 rest 7 -; cutoff 8 note E_, 6 -; cutoff 4 note C_, 7 dec_octave note G_, 6 @@ -252,41 +219,30 @@ Music_Ronald_Ch1: note C#, 6 note D_, 7 dec_octave -; cutoff 8 note A#, 6 -; cutoff 4 note G_, 7 rest 6 note F_, 7 -; cutoff 8 note F#, 6 -; cutoff 4 note G_, 7 -; cutoff 8 note A#, 6 -; cutoff 4 note G_, 7 note A#, 6 inc_octave note C_, 7 -; cutoff 8 note C#, 6 -; cutoff 4 note D_, 7 note F_, 6 note D_, 7 -; cutoff 8 note F_, 6 dec_octave -; cutoff 4 note G_, 7 dec_octave note G_, 6 inc_octave note D_, 7 duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 sound_call Branch_fa9cb speed 1 octave 4 @@ -314,12 +270,12 @@ Music_Ronald_Ch1: rest 7 rest 13 speed 13 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 2 rest 1 vibrato 20, 3, 3 speed 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 3 note G_, 10 note A#, 3 @@ -413,7 +369,6 @@ Music_Ronald_Ch1: rest 7 note C#, 3 note D_, 10 -; tie speed 13 note D_, 5 rest 1 @@ -427,7 +382,7 @@ Music_Ronald_Ch1: Branch_fa9aa: octave 4 duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 rest 2 speed 1 note G#, 3 @@ -457,7 +412,7 @@ Branch_fa9aa: Branch_fa9cb: octave 4 duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note D#, 3 note E_, 10 @@ -508,21 +463,18 @@ Branch_fa9ec: rest 7 rest 13 speed 13 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 2 rest 1 sound_ret - Music_Ronald_Ch2: stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 12, 3, 3 -; cutoff 8 duty_cycle 0 -.MainLoop +.MainLoop: octave 2 -.Loop1 +.Loop1: speed 1 volume_envelope 9, 2 note G_, 3 @@ -537,8 +489,7 @@ Music_Ronald_Ch2: note G_, 3 rest 4 note A#, 3 - rest 3 - rest 13 + rest 16 note G_, 3 note D_, 4 note A#, 6 @@ -548,18 +499,18 @@ Music_Ronald_Ch2: note G_, 3 rest 4 note G_, 6 - rest 7 - rest 13 + rest 16 + rest 4 note A#, 6 rest 13 note G_, 3 note A#, 4 inc_octave note D_, 6 - rest 7 - rest 13 + rest 16 + rest 4 speed 13 - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 2 rest 1 dec_octave @@ -577,8 +528,7 @@ Music_Ronald_Ch2: note G_, 3 rest 4 note A#, 3 - rest 3 - rest 13 + rest 16 note G_, 3 note A#, 4 inc_octave @@ -590,8 +540,8 @@ Music_Ronald_Ch2: note G_, 3 rest 4 note G_, 6 - rest 7 - rest 13 + rest 16 + rest 4 inc_octave note D_, 6 rest 13 @@ -600,41 +550,42 @@ Music_Ronald_Ch2: inc_octave note D_, 4 note F_, 6 - rest 7 - rest 13 + rest 16 + rest 4 speed 13 - volume_envelope 9, 0 + volume_envelope 9, 8 note E_, 2 rest 1 dec_octave sound_loop 2, .Loop1 -.Loop2 +.Loop2: sound_call Branch_fab76 -; cutoff 8 - volume_envelope 8, 0 + volume_envelope 8, 8 note C_, 2 rest 1 sound_call Branch_fab76 -; cutoff 8 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 2 rest 1 sound_loop 4, .Loop2 -.Loop3 +.Loop3: vibrato 20, 3, 3 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 13 duty_cycle 1 octave 4 rest 2 -; cutoff 4 + note_type 6, 8, 8 note F_, 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 8, 8 + rest 1 + note_type 13, 8, 8 rest 1 -; cutoff 8 note D_, 1 dec_octave dec_octave -; cutoff 4 duty_cycle 0 volume_envelope 9, 2 note A#, 1 @@ -642,20 +593,45 @@ Music_Ronald_Ch2: inc_octave inc_octave duty_cycle 1 - volume_envelope 8, 0 + note_type 6, 8, 8 note C_, 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 8, 8 + rest 1 + note_type 13, 8, 8 rest 1 -; cutoff 8 note D_, 1 -; cutoff 3 + note_type 3, 8, 8 note E_, 1 -; cutoff 4 + note_type 1, 8, 8 + rest 1 + note_type 3, 8, 8 + rest 3 + note_type 6, 8, 8 note C_, 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 8, 8 + rest 1 + note_type 13, 8, 8 rest 1 dec_octave + note_type 6, 8, 8 note A_, 1 + note_type 1, 8, 8 rest 1 + note_type 6, 8, 8 + rest 1 + note_type 13, 8, 8 + rest 1 + note_type 6, 8, 8 note A#, 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 8, 8 + rest 1 + note_type 13, 8, 8 rest 2 vibrato 12, 3, 3 duty_cycle 0 @@ -672,8 +648,7 @@ Music_Ronald_Ch2: rest 1 note A_, 1 rest 1 -; cutoff 8 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 2 rest 1 sound_loop 2, .Loop3 @@ -684,7 +659,6 @@ Music_Ronald_Ch2: vibrato 12, 3, 3 duty_cycle 0 volume_envelope 9, 2 -; cutoff 4 note F_, 1 rest 2 note F_, 1 @@ -697,8 +671,7 @@ Music_Ronald_Ch2: rest 1 note A_, 1 rest 1 -; cutoff 8 - volume_envelope 9, 0 + volume_envelope 9, 8 note G_, 2 rest 1 vibrato 20, 3, 3 @@ -706,7 +679,6 @@ Music_Ronald_Ch2: octave 3 rest 1 speed 1 -; cutoff 8 note E_, 3 note F_, 10 note E_, 3 @@ -717,7 +689,6 @@ Music_Ronald_Ch2: vibrato 12, 3, 3 duty_cycle 0 volume_envelope 9, 2 -; cutoff 4 note G_, 1 rest 1 inc_octave @@ -725,26 +696,21 @@ Music_Ronald_Ch2: rest 1 note D_, 1 rest 1 -; cutoff 8 - volume_envelope 9, 0 + volume_envelope 9, 8 note E_, 2 rest 1 sound_call Branch_fabb1 rest 1 -; cutoff 4 octave 2 note A#, 1 rest 1 note A#, 1 rest 1 inc_octave -; cutoff 8 - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 2 - rest 1 + rest 3 volume_envelope 9, 2 - rest 2 -; cutoff 4 note F_, 1 rest 2 note F_, 1 @@ -755,35 +721,29 @@ Music_Ronald_Ch2: rest 1 note A_, 1 rest 1 -; cutoff 8 - volume_envelope 9, 0 + volume_envelope 9, 8 note F_, 2 rest 1 sound_call Branch_fabb1 rest 1 octave 2 -; cutoff 4 note G_, 1 rest 1 note G_, 1 rest 1 inc_octave -; cutoff 8 - volume_envelope 9, 0 + volume_envelope 9, 8 note C_, 2 - rest 1 - rest 2 + rest 3 dec_octave volume_envelope 9, 2 -; cutoff 4 note G_, 1 rest 2 note G_, 1 rest 1 vibrato 20, 3, 3 -; cutoff 8 duty_cycle 1 - volume_envelope 7, 0 + volume_envelope 7, 8 note F#, 8 rest 1 duty_cycle 0 @@ -795,50 +755,117 @@ Branch_fab76: volume_envelope 9, 2 speed 13 rest 2 -; cutoff 4 + note_type 6, 9, 2 note A#, 1 + rest 1 + note_type 1, 9, 2 + rest 1 + note_type 13, 9, 2 rest 2 + note_type 6, 9, 2 note A#, 1 rest 1 + note_type 1, 9, 2 + rest 1 + note_type 13, 9, 2 + rest 1 + note_type 6, 9, 2 note G_, 1 rest 1 + note_type 1, 9, 2 + rest 1 + note_type 13, 9, 2 + rest 1 + note_type 6, 9, 2 note A#, 1 rest 1 + note_type 1, 9, 2 + rest 1 + note_type 13, 9, 2 + rest 1 inc_octave + note_type 6, 9, 2 note D_, 1 rest 1 + note_type 1, 9, 2 + rest 1 + note_type 13, 9, 2 + rest 1 sound_ret Branch_fab8a: octave 4 duty_cycle 1 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 13 note C_, 1 -; cutoff 3 + note_type 3, 8, 8 note D_, 1 + note_type 1, 8, 8 + rest 1 + note_type 3, 8, 8 + rest 3 note E_, 1 -; cutoff 4 + note_type 1, 8, 8 + rest 1 + note_type 3, 8, 8 + rest 3 + note_type 6, 8, 8 note C_, 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 8, 8 + rest 1 + note_type 13, 8, 8 rest 1 dec_octave + note_type 6, 8, 8 note A_, 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 8, 8 + rest 1 + note_type 13, 8, 8 rest 1 + note_type 6, 8, 8 note A#, 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 8, 8 + rest 1 + note_type 13, 8, 8 rest 1 inc_octave -; cutoff 8 note C_, 1 -; cutoff 3 + note_type 3, 8, 8 note D_, 1 + note_type 1, 8, 8 + rest 1 + note_type 3, 8, 8 + rest 3 note E_, 1 -; cutoff 8 + note_type 1, 8, 8 + rest 1 + note_type 3, 8, 8 + rest 3 + note_type 13, 8, 8 note C_, 1 dec_octave -; cutoff 4 + note_type 6, 8, 8 note A_, 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 8, 8 + rest 1 + note_type 13, 8, 8 rest 1 + note_type 6, 8, 8 note A#, 1 + note_type 1, 8, 8 + rest 1 + note_type 6, 8, 8 + rest 1 + note_type 13, 8, 8 sound_ret Branch_fabb1: @@ -846,7 +873,6 @@ Branch_fabb1: volume_envelope 9, 2 speed 13 rest 2 -; cutoff 4 note A#, 1 rest 2 note A#, 1 @@ -855,17 +881,14 @@ Branch_fabb1: note C_, 1 sound_ret - Music_Ronald_Ch3: speed 1 stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 -; echo 0 -; cutoff 8 -.MainLoop +.MainLoop: octave 2 -.Loop1 +.Loop1: note G_, 13 note G_, 2 rest 4 @@ -908,7 +931,7 @@ Music_Ronald_Ch3: rest 7 dec_octave sound_loop 4, .Loop1 -.Loop2 +.Loop2: sound_call Branch_fac94 octave 3 note A#, 6 @@ -1130,13 +1153,12 @@ Branch_facc5: rest 7 sound_ret - Music_Ronald_Ch4: toggle_noise 6 drum_speed 1 octave 1 -.MainLoop -.Loop1 +.MainLoop: +.Loop1: sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1157,11 +1179,11 @@ Music_Ronald_Ch4: drum_note 5, 6 drum_note 3, 3 drum_note 3, 4 -.Loop2 +.Loop2: drum_note 2, 6 drum_note 2, 7 sound_loop 2, .Loop2 -.Loop3 +.Loop3: sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1253,7 +1275,7 @@ Music_Ronald_Ch4: drum_note 2, 6 drum_note 2, 7 sound_loop 2, .Loop3 -.Loop4 +.Loop4: sound_call Branch_fad46 drum_note 4, 13 sound_loop 6, .Loop4 @@ -1266,7 +1288,7 @@ Music_Ronald_Ch4: drum_note 3, 4 drum_note 2, 6 drum_note 2, 7 -.Loop5 +.Loop5: drum_note 3, 6 drum_note 2, 7 sound_loop 2, .Loop5 @@ -1275,13 +1297,11 @@ Music_Ronald_Ch4: sound_loop 0, .MainLoop Branch_fad46: -; sound_call Branch_fad4f drum_note 1, 13 drum_note 5, 6 drum_note 1, 7 drum_note 2, 13 drum_note 1, 6 -; sound_ret drum_note 3, 7 drum_note 1, 13 drum_note 5, 6 diff --git a/crysaudio/music/TCG/titlescreen.asm b/crysaudio/music/TCG/titlescreen.asm index 51c66894e..ea258beba 100644 --- a/crysaudio/music/TCG/titlescreen.asm +++ b/crysaudio/music/TCG/titlescreen.asm @@ -9,267 +9,223 @@ Music_TCGTitleScreen_Ch1: speed 7 duty_cycle 0 stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 octave 3 note G_, 1 volume_envelope 3, 7 note G_, 1 rest 1 - volume_envelope 10, 0 -; cutoff 6 + volume_envelope 10, 8 note F_, 1 -; cutoff 8 note E_, 3 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 3 volume_envelope 3, 7 note G_, 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 5 volume_envelope 3, 7 note D_, 1 - volume_envelope 13, 0 -; cutoff 6 + volume_envelope 13, 8 note C_, 2 dec_octave -; cutoff 8 note G_, 10 volume_envelope 3, 7 note G_, 2 - volume_envelope 13, 0 + volume_envelope 13, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 rest 1 - volume_envelope 10, 0 -; cutoff 6 + volume_envelope 10, 8 note G_, 1 -; cutoff 8 note G_, 5 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 -; cutoff 6 + volume_envelope 10, 8 note F_, 2 -; cutoff 8 note F_, 2 speed 1 note E_, 5 -; tie note F_, 4 -; tie note E_, 5 speed 7 note D_, 1 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 1 volume_envelope 3, 7 note C_, 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 note D_, 11 volume_envelope 3, 7 note D_, 1 - volume_envelope 13, 0 + volume_envelope 13, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 rest 1 - volume_envelope 10, 0 -; cutoff 6 + volume_envelope 10, 8 note F_, 1 -; cutoff 8 note E_, 3 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 3 volume_envelope 3, 7 note G_, 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 5 volume_envelope 3, 7 note D_, 1 - volume_envelope 13, 0 -; cutoff 6 + volume_envelope 13, 8 note E_, 2 dec_octave -; cutoff 8 note G_, 8 volume_envelope 3, 7 note G_, 2 - volume_envelope 13, 0 + volume_envelope 13, 8 note E_, 2 note F_, 2 note G_, 2 note G#, 3 volume_envelope 3, 7 note G#, 1 - volume_envelope 13, 0 + volume_envelope 13, 8 inc_octave note C_, 3 volume_envelope 3, 7 note C_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 5 volume_envelope 3, 7 note D_, 1 - volume_envelope 13, 0 -; cutoff 6 + volume_envelope 13, 8 note C_, 2 -; cutoff 8 note G_, 9 volume_envelope 3, 7 note G_, 1 - volume_envelope 13, 0 + volume_envelope 13, 8 note F_, 2 note C_, 2 note D_, 2 -.Loop1 +.Loop1: note E_, 10 volume_envelope 3, 7 note E_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 rest 1 - volume_envelope 10, 0 -; cutoff 6 + volume_envelope 10, 8 note E_, 1 -; cutoff 8 sound_loop 2, .Loop1 note E_, 12 volume_envelope 3, 7 note E_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 1 note C_, 1 note D_, 1 volume_envelope 3, 7 note D_, 1 rest 1 - volume_envelope 10, 0 -; cutoff 6 + volume_envelope 10, 8 note G_, 1 -; cutoff 8 note G_, 8 volume_envelope 3, 7 note G_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 -; cutoff 7 note G_, 5 note G_, 4 note G_, 5 -; cutoff 8 speed 7 note G_, 9 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 2 note C_, 2 note D_, 2 note E_, 10 volume_envelope 3, 7 note E_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 1 volume_envelope 3, 7 note C_, 1 rest 1 -; cutoff 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 1 -; cutoff 8 note E_, 6 volume_envelope 3, 7 note E_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 3 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 volume_envelope 3, 7 note C_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 6 volume_envelope 3, 7 note C_, 2 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 5 volume_envelope 3, 7 note B_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 inc_octave -; cutoff 6 note C_, 1 -; cutoff 8 - note C_, 8 -; tie - note C_, 8 -; tie - note C_, 8 - volume_envelope 3, 7 + note_type 14, 10, 8 + note C_, 12 + note_type 7, 3, 7 note C_, 8 sound_ret - Music_TCGTitleScreen_Ch2: speed 7 duty_cycle 0 stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 - volume_envelope 8, 0 -; cutoff 8 + volume_envelope 8, 8 octave 2 note B_, 1 volume_envelope 2, 7 note B_, 1 rest 1 inc_octave - volume_envelope 8, 0 -; cutoff 6 + volume_envelope 8, 8 note D_, 1 -; cutoff 8 note C_, 3 volume_envelope 2, 7 note C_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 3 rest 1 note G_, 5 rest 1 -; cutoff 6 note G_, 2 -; cutoff 8 note E_, 10 rest 2 note C_, 1 rest 2 -; cutoff 6 note E_, 1 -; cutoff 8 note F_, 5 rest 1 -; cutoff 6 note C_, 2 -; cutoff 7 note C_, 2 -; cutoff 8 note C_, 2 dec_octave note G_, 1 @@ -280,29 +236,23 @@ Music_TCGTitleScreen_Ch2: note A_, 1 rest 2 inc_octave -; cutoff 6 note C_, 1 dec_octave -; cutoff 8 note B_, 3 rest 1 note B_, 1 rest 2 inc_octave -; cutoff 6 note D_, 1 -; cutoff 8 note C_, 3 volume_envelope 2, 7 note C_, 1 - volume_envelope 8, 0 + volume_envelope 8, 8 note E_, 3 rest 1 note G_, 5 rest 1 -; cutoff 6 note G_, 2 -; cutoff 8 note E_, 8 rest 2 note C_, 2 @@ -314,9 +264,7 @@ Music_TCGTitleScreen_Ch2: rest 1 note G#, 5 rest 1 -; cutoff 6 note F_, 2 -; cutoff 8 note G#, 9 rest 1 note G#, 2 @@ -330,11 +278,9 @@ Music_TCGTitleScreen_Ch2: volume_envelope 2, 7 note A_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 inc_octave -; cutoff 6 note C_, 1 -; cutoff 8 dec_octave note B_, 10 rest 2 @@ -342,49 +288,39 @@ Music_TCGTitleScreen_Ch2: volume_envelope 2, 7 note G_, 1 rest 1 - volume_envelope 8, 0 -; cutoff 6 + volume_envelope 8, 8 note B_, 1 -; cutoff 8 note A_, 12 volume_envelope 2, 7 note A_, 2 - volume_envelope 8, 0 + volume_envelope 8, 8 note B_, 1 note A_, 1 note B_, 1 volume_envelope 2, 7 note B_, 1 rest 1 - volume_envelope 8, 0 + volume_envelope 8, 8 inc_octave -; cutoff 6 note D_, 1 -; cutoff 8 note D_, 8 rest 2 speed 1 -; cutoff 7 note D_, 5 note D_, 4 note D_, 5 speed 7 -; cutoff 8 note C_, 9 rest 1 note C_, 2 dec_octave -; cutoff 7 note G#, 2 -; cutoff 8 note G#, 2 note G_, 10 rest 2 note G_, 1 rest 2 -; cutoff 6 note G_, 1 -; cutoff 8 note A_, 6 rest 2 note F#, 3 @@ -395,13 +331,10 @@ Music_TCGTitleScreen_Ch2: rest 2 note F_, 5 rest 2 -; cutoff 6 note F_, 1 -; cutoff 8 note F_, 7 rest 1 speed 1 -; cutoff 8 note F_, 14 rest 5 note D_, 13 @@ -414,14 +347,11 @@ Music_TCGTitleScreen_Ch2: note E_, 8 sound_ret - Music_TCGTitleScreen_Ch3: speed 7 fade_wave 14 channel_volume 1 -; echo 0 stereo_panning TRUE, TRUE -; cutoff 6 octave 3 rest 4 sound_call Branch_f52f0 @@ -435,50 +365,50 @@ Music_TCGTitleScreen_Ch3: note G_, 4 inc_octave sound_call Branch_f52f0 -.Loop1 +.Loop1: note F_, 4 sound_loop 4, .Loop1 -.Loop2 +.Loop2: note A#, 4 sound_loop 4, .Loop2 -.Loop3 +.Loop3: note A_, 2 note A_, 2 rest 2 note A_, 1 note A_, 1 sound_loop 2, .Loop3 -.Loop4 +.Loop4: note G_, 2 note G_, 2 rest 2 note G_, 1 note G_, 1 sound_loop 2, .Loop4 -.Loop5 +.Loop5: note F_, 2 note F_, 2 rest 2 note F_, 1 note F_, 1 sound_loop 2, .Loop5 -.Loop6 +.Loop6: note E_, 2 note E_, 2 rest 2 note E_, 1 note E_, 1 sound_loop 2, .Loop6 -.Loop7 +.Loop7: note G#, 4 sound_loop 4, .Loop7 -.Loop8 +.Loop8: note G_, 4 sound_loop 4, .Loop8 -.Loop9 +.Loop9: note F#, 4 sound_loop 4, .Loop9 -.Loop10 +.Loop10: note G_, 4 sound_loop 4, .Loop10 inc_octave @@ -486,17 +416,13 @@ Music_TCGTitleScreen_Ch3: note C_, 4 speed 1 note C_, 9 -; tie note C_, 10 dec_octave note G_, 9 -; tie note G_, 9 note G_, 9 -; tie note G_, 10 speed 7 -; cutoff 8 note C_, 8 sound_ret @@ -512,19 +438,18 @@ Branch_f52f0: note G_, 4 sound_ret - Music_TCGTitleScreen_Ch4: toggle_noise 6 drum_speed 7 octave 1 rest 4 -.Loop1 +.Loop1: sound_call Branch_f5312 sound_loop 16, .Loop1 -.Loop2 +.Loop2: sound_call Branch_f531e sound_loop 8, .Loop2 -.Loop3 +.Loop3: sound_call Branch_f5312 sound_loop 10, .Loop3 drum_note 2, 8