diff --git a/crysaudio/music/TCG/club2.asm b/crysaudio/music/TCG/club2.asm index 0e574ad4..089c6b4d 100644 --- a/crysaudio/music/TCG/club2.asm +++ b/crysaudio/music/TCG/club2.asm @@ -8,26 +8,23 @@ Music_Club2_Ch1: speed 6 duty_cycle 2 stereo_panning TRUE, TRUE -; cutoff 8 -.MainLoop +.MainLoop: octave 4 -.Loop1 +.Loop1: volume_envelope 7, 5 note G_, 4 note E_, 4 note C_, 4 volume_envelope 7, 7 - note F#, 4 -; tie note F#, 16 + rest 4 volume_envelope 7, 5 note G_, 4 note A_, 4 note B_, 4 volume_envelope 7, 7 - note F#, 4 -; tie note F#, 16 + rest 4 sound_loop 8, .Loop1 volume_envelope 7, 5 note G_, 4 @@ -36,17 +33,15 @@ Music_Club2_Ch1: note B_, 4 inc_octave volume_envelope 7, 7 - note B_, 4 -; tie note B_, 16 + rest 4 volume_envelope 7, 5 note G_, 4 note D_, 4 note C_, 4 volume_envelope 7, 7 - note B_, 4 -; tie note B_, 16 + rest 4 dec_octave volume_envelope 7, 5 note F#, 4 @@ -83,29 +78,24 @@ Music_Club2_Ch1: note F#, 4 note A_, 4 note A_, 3 -; tie speed 1 note A_, 3 inc_octave volume_envelope 7, 7 rest 4 note D_, 5 -; tie speed 6 - note D_, 15 -; tie note D_, 16 + rest 15 sound_loop 0, .MainLoop - Music_Club2_Ch2: speed 6 duty_cycle 2 stereo_panning TRUE, TRUE -; cutoff 8 -.MainLoop +.MainLoop: octave 2 -.Loop1 +.Loop1: volume_envelope 7, 5 note C_, 4 note G_, 4 @@ -113,9 +103,8 @@ Music_Club2_Ch2: note G_, 4 inc_octave volume_envelope 7, 7 - note D_, 4 -; tie note D_, 16 + rest 4 dec_octave dec_octave volume_envelope 7, 5 @@ -125,9 +114,8 @@ Music_Club2_Ch2: inc_octave note C_, 4 volume_envelope 7, 7 - note D_, 4 -; tie note D_, 16 + rest 4 dec_octave dec_octave sound_loop 8, .Loop1 @@ -140,9 +128,8 @@ Music_Club2_Ch2: note G_, 4 inc_octave volume_envelope 7, 7 - note G_, 4 -; tie note G_, 16 + rest 4 dec_octave dec_octave dec_octave @@ -154,9 +141,8 @@ Music_Club2_Ch2: note A_, 4 inc_octave volume_envelope 7, 7 - note C_, 4 -; tie note C_, 16 + rest 4 dec_octave dec_octave volume_envelope 7, 5 @@ -195,7 +181,6 @@ Music_Club2_Ch2: inc_octave note D_, 4 note E_, 3 -; tie speed 1 note E_, 3 dec_octave @@ -204,26 +189,19 @@ Music_Club2_Ch2: inc_octave volume_envelope 7, 7 note F#, 7 -; tie speed 6 - note F#, 14 -; tie - note F#, 16 + note F#, 15 + rest 15 sound_loop 0, .MainLoop - Music_Club2_Ch3: speed 6 channel_volume 1 stereo_panning TRUE, TRUE fade_wave 10 -; vibrato_type 4 vibrato 35, 3, 3 -; cutoff 6 -; echo 64 -.MainLoop +.MainLoop: channel_volume 3 -; cutoff 8 rest 2 octave 5 note G_, 4 @@ -239,89 +217,62 @@ Music_Club2_Ch3: rest 2 rest 14 channel_volume 2 -; echo 96 sound_call Branch_fa1cf octave 5 -; cutoff 8 note G_, 8 sound_call Branch_fa1cf -; echo 64 channel_volume 1 octave 4 -; cutoff 8 note G_, 8 sound_call Branch_fa1f3 octave 4 note G_, 16 -; tie note G_, 12 rest 16 rest 8 -; cutoff 8 note E_, 8 sound_call Branch_fa1f3 octave 4 note G_, 16 -; tie note G_, 12 -; tie note G_, 16 -; tie note G_, 8 rest 4 -; cutoff 8 note A_, 2 note G_, 2 -; cutoff 6 note F#, 16 -; tie note F#, 12 rest 4 note F#, 1 -; tie note G_, 15 -; tie note G_, 12 rest 4 note G#, 1 -; tie note A_, 15 -; tie note A_, 16 rest 16 rest 16 -; echo 96 sound_loop 0, .MainLoop Branch_fa1cf: -; cutoff 6 octave 6 note C#, 1 -; tie note D_, 15 -; tie note D_, 12 -; cutoff 8 note C_, 2 dec_octave note B_, 2 -; cutoff 6 note G_, 16 -; tie note G_, 8 rest 4 -; cutoff 8 note E_, 4 note B_, 4 inc_octave note C_, 4 dec_octave note B_, 4 -; cutoff 6 note A_, 16 -; tie note A_, 8 -; tie note A_, 16 rest 4 sound_ret @@ -329,21 +280,16 @@ Branch_fa1cf: Branch_fa1f3: octave 5 note C#, 1 -; tie note D_, 15 -; tie note D_, 4 note E_, 4 dec_octave note B_, 4 inc_octave note C_, 4 -; cutoff 6 note D_, 16 -; tie note D_, 8 rest 4 -; cutoff 8 note C_, 2 dec_octave note B_, 2 @@ -351,5 +297,4 @@ Branch_fa1f3: note C_, 2 dec_octave note B_, 2 -; cutoff 6 sound_ret diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm index 3903a442..d1e51f12 100644 --- a/crysaudio/music/TCG/dueltheme1.asm +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -8,129 +8,119 @@ Music_DuelTheme1: Music_DuelTheme1_Ch1: speed 7 stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 20, 3, 3 -; cutoff 8 duty_cycle 2 -.MainLoop +.MainLoop: octave 2 -.Loop1 +.Loop1: rest 16 sound_loop 7, .Loop1 rest 9 -.Loop2 +.Loop2: rest 3 sound_call Branch_f54f9 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F_, 4 note F#, 3 -; tie speed 7 note F#, 1 volume_envelope 3, 7 note F#, 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 rest 2 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 10 volume_envelope 3, 7 note D_, 12 sound_call Branch_f54f9 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 2 volume_envelope 3, 7 note F#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 13 volume_envelope 3, 7 note A_, 10 - 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 F#, 1 note G_, 1 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 15 volume_envelope 3, 7 note B_, 4 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 3 note A_, 3 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 2 volume_envelope 3, 7 note G_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 15 volume_envelope 3, 7 note A_, 4 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 3 note G_, 4 note F#, 2 volume_envelope 3, 7 note F#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 15 volume_envelope 3, 7 note G_, 4 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 3 note F#, 4 note E_, 3 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note D#, 4 note E_, 3 -; tie speed 7 note E_, 1 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 13 volume_envelope 3, 7 note D_, 9 @@ -138,11 +128,10 @@ Music_DuelTheme1_Ch1: sound_loop 2, .Loop2 inc_octave duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note C#, 4 note D_, 3 -; tie speed 7 note D_, 1 rest 1 @@ -154,28 +143,27 @@ Music_DuelTheme1_Ch1: speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 5 volume_envelope 3, 7 note F#, 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 inc_octave speed 1 note D_, 4 volume_envelope 3, 7 note D_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 4 volume_envelope 3, 7 note F#, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 4 volume_envelope 3, 7 note A_, 3 @@ -183,9 +171,8 @@ Music_DuelTheme1_Ch1: rest 3 dec_octave duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 -.Loop3 + volume_envelope 10, 8 +.Loop3: note A_, 1 rest 2 sound_loop 3, .Loop3 @@ -193,7 +180,6 @@ Music_DuelTheme1_Ch1: speed 1 note C#, 4 note D_, 3 -; tie speed 7 note D_, 1 rest 1 @@ -205,43 +191,37 @@ Music_DuelTheme1_Ch1: speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 5 -; tie note A_, 10 -; tie note A_, 6 volume_envelope 3, 7 note A_, 2 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note C#, 4 note D_, 3 -; tie speed 7 note D_, 2 note C#, 1 volume_envelope 3, 7 note C#, 2 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 1 volume_envelope 3, 7 note B_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 1 volume_envelope 3, 7 note B_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 13 -; tie note A_, 6 volume_envelope 3, 7 note A_, 2 @@ -266,16 +246,13 @@ Music_DuelTheme1_Ch1: note A_, 4 dec_octave sound_call Branch_f5580 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 2 -; tie note A_, 8 -; tie note A_, 8 -; tie note A_, 6 duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 dec_octave note B_, 4 @@ -290,98 +267,90 @@ Music_DuelTheme1_Ch1: note G_, 2 duty_cycle 2 sound_call Branch_f5580 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 5 note G_, 2 note F#, 2 volume_envelope 3, 7 note F#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 2 volume_envelope 3, 7 note E_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 5 note F#, 2 note E_, 2 volume_envelope 3, 7 note E_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 2 volume_envelope 3, 7 note D_, 2 - volume_envelope 10, 0 - note D_, 8 -; tie + volume_envelope 10, 8 + note D_, 8 note D_, 8 note D_, 8 -; tie note D_, 8 volume_envelope 3, 7 note D_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 12 volume_envelope 3, 7 note D_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 6 -; tie note D_, 8 rest 4 sound_loop 0, .MainLoop Branch_f54f9: octave 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 note B_, 1 inc_octave note D_, 1 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F_, 4 note F#, 3 -; tie speed 7 note F#, 10 volume_envelope 3, 7 note F#, 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 speed 1 note D#, 4 note E_, 3 -; tie speed 7 note E_, 5 volume_envelope 3, 7 note E_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 2 note F#, 1 volume_envelope 3, 7 note F#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 @@ -396,118 +365,113 @@ Branch_f5538: note G_, 1 rest 2 duty_cycle 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 1 inc_octave speed 1 note C_, 4 volume_envelope 3, 7 note C_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 4 volume_envelope 3, 7 note E_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 4 volume_envelope 3, 7 note G_, 3 speed 7 rest 3 duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 dec_octave -.Loop4 +.Loop4: note G_, 1 rest 2 sound_loop 3, .Loop4 inc_octave duty_cycle 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 2 note A_, 1 volume_envelope 3, 7 note A_, 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 sound_ret Branch_f5580: speed 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 4 note F#, 3 -; tie speed 7 note F#, 9 volume_envelope 3, 7 note F#, 2 - 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 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 2 volume_envelope 3, 7 note B_, 2 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F_, 4 note F#, 3 -; tie speed 7 note F#, 7 note E_, 1 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 2 volume_envelope 3, 7 note C#, 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 9 note F#, 1 volume_envelope 3, 7 note F#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 8 volume_envelope 3, 7 note B_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 4 note G_, 4 note F#, 10 note G_, 1 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 10 note E_, 2 note F#, 2 @@ -515,25 +479,21 @@ Branch_f5580: note F#, 2 sound_ret - Music_DuelTheme1_Ch2: speed 7 stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 20, 3, 3 -; cutoff 8 -.MainLoop +.MainLoop: duty_cycle 1 - volume_envelope 9, 0 + volume_envelope 9, 8 octave 2 -.Loop1 +.Loop1: note D_, 1 rest 2 note D_, 1 rest 2 note D_, 1 - rest 2 - rest 1 + rest 3 dec_octave note A_, 1 rest 1 @@ -542,15 +502,15 @@ Music_DuelTheme1_Ch2: rest 2 inc_octave sound_loop 4, .Loop1 -.Loop2 +.Loop2: octave 2 note D_, 1 rest 2 note D_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note A_, 2 + note A_, 1 + rest 1 sound_call Branch_f59f9 sound_loop 4, .Loop2 octave 2 @@ -560,8 +520,8 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 sound_call Branch_f59f9 octave 2 note D_, 1 @@ -570,12 +530,11 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note C_, 2 + note C_, 1 + rest 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -584,16 +543,14 @@ Music_DuelTheme1_Ch2: inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note G_, 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note B_, 1 rest 2 inc_octave -.Loop3 +.Loop3: octave 2 note D_, 1 rest 2 @@ -601,8 +558,8 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 sound_call Branch_f59f9 sound_loop 3, .Loop3 octave 2 @@ -612,12 +569,11 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note C_, 2 + note C_, 1 + rest 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -626,12 +582,10 @@ Music_DuelTheme1_Ch2: inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note G_, 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note B_, 1 rest 2 inc_octave @@ -641,8 +595,8 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 sound_call Branch_f59f9 octave 2 note D_, 1 @@ -651,47 +605,41 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note A_, 2 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note F#, 1 rest 1 -.Loop4 +.Loop4: note G_, 1 rest 2 note G_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note G_, 2 + note G_, 1 + rest 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note G_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note G_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 1 rest 2 sound_loop 2, .Loop4 @@ -700,9 +648,9 @@ Music_DuelTheme1_Ch2: note F#, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 inc_octave - note C#, 2 + note C#, 1 + rest 1 sound_call Branch_f5a17 octave 2 note F#, 1 @@ -711,30 +659,27 @@ Music_DuelTheme1_Ch2: inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note E_, 2 + note E_, 1 + rest 1 sound_call Branch_f5a17 note E_, 1 rest 2 note E_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note G_, 2 + note G_, 1 + rest 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note B_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note G_, 1 rest 2 note A_, 1 @@ -742,22 +687,19 @@ Music_DuelTheme1_Ch2: note A_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note G_, 2 + note G_, 1 + rest 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note A_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note A_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note A_, 1 rest 2 note D_, 1 @@ -765,11 +707,10 @@ Music_DuelTheme1_Ch2: note D_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note A_, 2 + note A_, 1 + rest 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -778,12 +719,10 @@ Music_DuelTheme1_Ch2: inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note A_, 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note B_, 1 rest 2 inc_octave @@ -792,11 +731,10 @@ Music_DuelTheme1_Ch2: note D_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note A_, 2 + note A_, 1 + rest 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -804,46 +742,41 @@ Music_DuelTheme1_Ch2: rest 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 -; frequency_offset 0 + volume_envelope 7, 8 note E_, 1 note F#, 1 note A_, 1 rest 1 - volume_envelope 7, 0 + volume_envelope 7, 8 sound_call Branch_f594d - volume_envelope 7, 0 + volume_envelope 7, 8 octave 3 speed 1 note C#, 4 note D_, 3 -; tie speed 7 note D_, 1 rest 1 dec_octave note F#, 1 volume_envelope 10, 2 -; cutoff 6 - note F#, 2 - volume_envelope 7, 0 -; cutoff 8 + note F#, 1 + rest 1 + volume_envelope 7, 8 note A_, 10 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 inc_octave - note D_, 2 + note D_, 1 + rest 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -851,38 +784,36 @@ Music_DuelTheme1_Ch2: rest 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 1 note F#, 1 note A_, 1 rest 1 sound_call Branch_f594d - volume_envelope 7, 0 + volume_envelope 7, 8 octave 3 note D_, 2 rest 1 note F#, 13 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note D_, 1 rest 1 note D_, 1 @@ -892,23 +823,20 @@ Music_DuelTheme1_Ch2: speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 15 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note G_, 1 rest 2 note G_, 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 2 rest 1 @@ -916,36 +844,31 @@ Music_DuelTheme1_Ch2: rest 1 dec_octave volume_envelope 10, 2 -; cutoff 6 note G_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note E_, 4 note F#, 3 -; tie speed 7 note F#, 15 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note F#, 1 rest 2 note F#, 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note E_, 4 note F#, 3 -; tie speed 7 note F#, 2 rest 1 @@ -953,35 +876,30 @@ Music_DuelTheme1_Ch2: rest 1 dec_octave volume_envelope 10, 2 -; cutoff 6 note A_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note D#, 4 note E_, 3 -; tie speed 7 note E_, 15 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note A_, 1 rest 2 note A_, 1 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 2 rest 1 @@ -992,36 +910,31 @@ Music_DuelTheme1_Ch2: speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 1 rest 1 note F#, 13 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 2 note D_, 1 inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 dec_octave -; frequency_offset 0 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 2 sound_call Branch_f59b4 octave 3 speed 1 - volume_envelope 7, 0 + volume_envelope 7, 8 note F_, 4 note F#, 3 -; tie speed 7 note F#, 1 rest 1 @@ -1041,23 +954,20 @@ Music_DuelTheme1_Ch2: rest 3 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 -.Loop5 + volume_envelope 9, 8 +.Loop5: note D_, 1 rest 2 sound_loop 3, .Loop5 sound_call Branch_f59b4 - volume_envelope 8, 0 + volume_envelope 8, 8 octave 3 note D_, 16 -; tie note D_, 6 rest 2 speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 2 note A_, 1 @@ -1094,12 +1004,11 @@ Music_DuelTheme1_Ch2: speed 7 sound_call Branch_f598c note D_, 8 -; tie note D_, 8 note C#, 6 dec_octave duty_cycle 1 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note G_, 4 note G#, 3 @@ -1127,10 +1036,8 @@ Music_DuelTheme1_Ch2: note A_, 2 rest 2 note G_, 8 -; tie note G_, 8 note F#, 8 -; tie note F#, 8 rest 2 note G_, 12 @@ -1144,51 +1051,46 @@ Branch_f594d: speed 1 note C#, 4 note D_, 3 -; tie speed 7 note D_, 9 dec_octave duty_cycle 1 - volume_envelope 9, 0 + volume_envelope 9, 8 dec_octave note A_, 1 rest 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note A_, 3 rest 1 inc_octave note C_, 6 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note D#, 4 note E_, 3 -; tie speed 7 note E_, 2 note D_, 1 dec_octave volume_envelope 10, 2 -; cutoff 6 note G_, 2 inc_octave - volume_envelope 7, 0 -; cutoff 8 + volume_envelope 7, 8 note C_, 1 rest 1 sound_ret Branch_f598c: - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 10 rest 2 note E_, 1 @@ -1225,16 +1127,14 @@ Branch_f598c: note D_, 2 rest 2 note D_, 2 -; tie sound_ret Branch_f59b4: octave 2 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 1 rest 1 @@ -1249,7 +1149,7 @@ Branch_f59b4: note C_, 1 rest 2 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 1 speed 1 note G_, 4 @@ -1261,21 +1161,19 @@ Branch_f59b4: rest 3 speed 7 rest 3 -; cutoff 8 dec_octave duty_cycle 1 - volume_envelope 8, 0 -.Loop6 + volume_envelope 8, 8 +.Loop6: note C_, 1 rest 2 sound_loop 3, .Loop6 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 2 note F#, 1 @@ -1287,8 +1185,7 @@ Branch_f59b4: Branch_f59f9: octave 2 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -1297,12 +1194,10 @@ Branch_f59f9: inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note A_, 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note B_, 1 rest 2 sound_ret @@ -1310,54 +1205,46 @@ Branch_f59f9: Branch_f5a17: octave 2 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note F#, 1 rest 3 note C#, 1 rest 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note A_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 1 rest 2 sound_ret - Music_DuelTheme1_Ch3: speed 7 stereo_panning TRUE, TRUE channel_volume 1 fade_wave 14 -; echo 96 -; cutoff 8 octave 2 -.MainLoop -.Loop1 +.MainLoop: +.Loop1: note D_, 1 rest 2 note D_, 1 rest 2 note D_, 1 - rest 2 - rest 1 + rest 3 sound_call Branch_f5c47 sound_loop 4, .Loop1 -.Loop2 +.Loop2: note D_, 1 rest 2 note D_, 1 inc_octave inc_octave -; cutoff 3 - note D_, 2 + note D_, 1 + rest 1 dec_octave dec_octave -; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1367,10 +1254,9 @@ Music_DuelTheme1_Ch3: rest 2 note D_, 1 inc_octave -; cutoff 3 - note F#, 2 + note F#, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1379,11 +1265,10 @@ Music_DuelTheme1_Ch3: note D_, 1 inc_octave inc_octave -; cutoff 3 - note D_, 2 + note D_, 1 + rest 1 dec_octave dec_octave -; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1392,10 +1277,9 @@ Music_DuelTheme1_Ch3: rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1403,10 +1287,9 @@ Music_DuelTheme1_Ch3: rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 2 note D_, 2 @@ -1425,7 +1308,7 @@ Music_DuelTheme1_Ch3: note C_, 1 rest 1 dec_octave -.Loop3 +.Loop3: note D_, 1 rest 2 sound_loop 3, .Loop3 @@ -1443,7 +1326,7 @@ Music_DuelTheme1_Ch3: rest 3 dec_octave dec_octave -.Loop4 +.Loop4: note D_, 1 rest 2 sound_loop 3, .Loop4 @@ -1462,36 +1345,29 @@ Music_DuelTheme1_Ch3: rest 1 sound_call Branch_f5c60 octave 2 -; cutoff 8 note E_, 1 rest 1 note E_, 2 -; cutoff 6 note B_, 2 sound_call Branch_f5c60 octave 2 -; cutoff 8 note F#, 2 note G_, 2 -; cutoff 6 note G#, 2 sound_call Branch_f5c6f octave 2 -; cutoff 8 note A_, 1 rest 1 note A_, 2 -; cutoff 6 note E_, 2 sound_call Branch_f5c6f octave 2 -; cutoff 8 note B_, 2 inc_octave note C_, 2 note C#, 2 dec_octave -.Loop5 +.Loop5: sound_call Branch_f5c4d note E_, 1 rest 1 @@ -1503,9 +1379,7 @@ Music_DuelTheme1_Ch3: rest 1 note E_, 1 rest 1 -; cutoff 7 note E_, 1 -; cutoff 8 note E_, 1 rest 1 note E_, 2 @@ -1519,9 +1393,7 @@ Music_DuelTheme1_Ch3: rest 1 note F#, 1 rest 1 -; cutoff 7 note F#, 1 -; cutoff 8 note F#, 1 rest 1 note F#, 2 @@ -1535,9 +1407,7 @@ Music_DuelTheme1_Ch3: rest 1 note G_, 1 rest 1 -; cutoff 7 note G_, 1 -; cutoff 8 note F#, 1 rest 1 note E_, 2 @@ -1552,9 +1422,7 @@ Music_DuelTheme1_Ch3: rest 1 note B_, 1 rest 1 -; cutoff 7 note B_, 1 -; cutoff 8 note F#, 1 rest 1 note F_, 2 @@ -1583,7 +1451,7 @@ Music_DuelTheme1_Ch3: note E_, 2 note C#, 2 sound_loop 2, .Loop5 -.Loop6 +.Loop6: sound_call Branch_f5c4d sound_loop 2, .Loop6 note D_, 1 @@ -1596,9 +1464,7 @@ Music_DuelTheme1_Ch3: rest 1 note D_, 1 rest 1 -; cutoff 7 note D_, 1 -; cutoff 8 note D_, 1 rest 1 note A_, 14 @@ -1610,97 +1476,81 @@ Branch_f5b8d: rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 -; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 -; sound_ret note D_, 1 rest 2 note D_, 1 inc_octave -; cutoff 3 - note G_, 2 + note G_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 -; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 -; sound_ret -.Loop7 +.Loop7: note D_, 1 rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 -; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 -; sound_ret sound_loop 3, .Loop7 note D_, 1 rest 2 note D_, 1 inc_octave -; cutoff 3 - note G_, 2 + note G_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 -; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 -; sound_ret note D_, 1 rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 -; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 -; sound_ret note D_, 1 rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 note D_, 1 @@ -1708,15 +1558,14 @@ Branch_f5b8d: note E_, 2 note F#, 1 rest 1 -.Loop8 +.Loop8: note G_, 1 rest 2 note G_, 1 inc_octave -; cutoff 3 - note B_, 2 + note B_, 1 + rest 1 dec_octave -; cutoff 8 note G_, 1 rest 3 note D_, 1 @@ -1729,10 +1578,9 @@ Branch_f5b8d: rest 2 note F#, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note F#, 1 rest 3 note C#, 1 @@ -1745,11 +1593,10 @@ Branch_f5b8d: note F#, 1 inc_octave inc_octave -; cutoff 3 - note C#, 2 + note C#, 1 + rest 1 dec_octave dec_octave -; cutoff 8 note F#, 1 rest 3 note C#, 1 @@ -1761,10 +1608,9 @@ Branch_f5b8d: rest 2 note E_, 1 inc_octave -; cutoff 3 - note B_, 2 + note B_, 1 + rest 1 dec_octave -; cutoff 8 note E_, 1 rest 3 note E_, 1 @@ -1776,10 +1622,9 @@ Branch_f5b8d: rest 2 note A_, 1 inc_octave -; cutoff 3 - note B_, 2 + note B_, 1 + rest 1 dec_octave -; cutoff 8 note A_, 1 rest 3 note E_, 1 @@ -1808,9 +1653,7 @@ Branch_f5c4d: rest 1 note D_, 1 rest 1 -; cutoff 7 note D_, 1 -; cutoff 8 note D_, 1 rest 1 note D_, 2 @@ -1818,7 +1661,6 @@ Branch_f5c4d: Branch_f5c60: octave 2 -; cutoff 8 note E_, 1 rest 1 note E_, 1 @@ -1827,13 +1669,11 @@ Branch_f5c60: rest 1 note E_, 1 rest 1 -; cutoff 6 note E_, 1 sound_ret Branch_f5c6f: octave 2 -; cutoff 8 note A_, 1 rest 1 note A_, 1 @@ -1842,13 +1682,12 @@ Branch_f5c6f: rest 1 note A_, 1 rest 1 -; cutoff 6 note A_, 1 sound_ret Branch_f5c7e: octave 2 -.Loop9 +.Loop9: note C_, 1 rest 2 sound_loop 3, .Loop9 @@ -1866,19 +1705,18 @@ Branch_f5c7e: rest 3 dec_octave dec_octave -.Loop10 +.Loop10: note C_, 1 rest 2 sound_loop 3, .Loop10 sound_ret - Music_DuelTheme1_Ch4: toggle_noise 6 drum_speed 7 octave 1 -.MainLoop -.Loop1 +.MainLoop: +.Loop1: drum_note 1, 2 drum_note 4, 1 drum_note 5, 1 @@ -1909,15 +1747,15 @@ Music_DuelTheme1_Ch4: drum_note 2, 1 drum_note 2, 1 drum_note 2, 2 -.Loop2 +.Loop2: sound_call Branch_f5d39 sound_loop 3, .Loop2 sound_call Branch_f5d46 -.Loop3 +.Loop3: sound_call Branch_f5d39 sound_loop 15, .Loop3 sound_call Branch_f5d46 -.Loop4 +.Loop4: sound_call Branch_f5d39 sound_loop 15, .Loop4 drum_note 1, 2 @@ -1932,10 +1770,10 @@ Music_DuelTheme1_Ch4: drum_note 3, 4 drum_note 3, 3 drum_speed 7 -.Loop5 +.Loop5: drum_note 2, 1 sound_loop 4, .Loop5 -.Loop6 +.Loop6: drum_note 1, 1 drum_note 4, 1 drum_note 5, 1 @@ -1962,22 +1800,22 @@ Music_DuelTheme1_Ch4: drum_note 3, 4 drum_note 3, 3 drum_speed 7 -.Loop7 +.Loop7: drum_note 2, 1 sound_loop 4, .Loop7 -.Loop8 +.Loop8: sound_call Branch_f5d39 sound_loop 3, .Loop8 sound_call Branch_f5d58 -.Loop9 +.Loop9: sound_call Branch_f5d39 sound_loop 7, .Loop9 sound_call Branch_f5d46 -.Loop10 +.Loop10: sound_call Branch_f5d39 sound_loop 7, .Loop10 sound_call Branch_f5d58 -.Loop11 +.Loop11: sound_call Branch_f5d39 sound_loop 2, .Loop11 drum_note 1, 2 @@ -2036,7 +1874,7 @@ Branch_f5d58: drum_note 3, 4 drum_note 3, 3 drum_speed 7 -.Loop12 +.Loop12: drum_note 2, 1 sound_loop 8, .Loop12 sound_ret diff --git a/crysaudio/music/TCG/hallofhonor.asm b/crysaudio/music/TCG/hallofhonor.asm index 00a69b1a..d3fd1a0d 100644 --- a/crysaudio/music/TCG/hallofhonor.asm +++ b/crysaudio/music/TCG/hallofhonor.asm @@ -7,13 +7,12 @@ Music_HallOfHonor: Music_HallOfHonor_Ch1: speed 7 stereo_panning TRUE, TRUE -; cutoff 8 duty_cycle 2 -.Loop1 +.Loop1: sound_call Branch_fb016 sound_loop 4, .Loop1 -.MainLoop -.Loop2 +.MainLoop: +.Loop2: sound_call Branch_fb016 sound_loop 8, .Loop2 octave 4 @@ -22,7 +21,7 @@ Music_HallOfHonor_Ch1: volume_envelope 2, 7 note C_, 1 sound_call Branch_fb044 -.Loop3 +.Loop3: volume_envelope 5, 5 note C_, 1 volume_envelope 2, 7 @@ -97,20 +96,17 @@ Branch_fb044: note F_, 1 sound_ret - Music_HallOfHonor_Ch2: speed 7 stereo_panning TRUE, TRUE -; cutoff 8 duty_cycle 2 -; frequency_offset -1 rest 2 speed 1 rest 4 speed 7 volume_envelope 1, 7 -.Loop1 - sound_call Branch_fb1ec +.Loop1: + sound_call Branch_fb1ec_Ch2 sound_loop 3, .Loop1 octave 4 note C_, 1 @@ -129,72 +125,75 @@ Music_HallOfHonor_Ch2: speed 1 rest 3 speed 7 -; frequency_offset 0 -.MainLoop +.MainLoop: octave 1 duty_cycle 1 -.Loop2 +.Loop2: sound_call Branch_fb0bb octave 1 volume_envelope 6, -5 - note E_, 5 - volume_envelope 13, 0 - note E_, 11 -; tie - note E_, 12 + note E_, 14 + volume_envelope 13, 8 + note E_, 14 sound_loop 3, .Loop2 sound_call Branch_fb0bb octave 1 volume_envelope 6, -5 - note G_, 5 - volume_envelope 13, 0 - note G_, 11 -; tie - note G_, 12 + note G_, 14 + volume_envelope 13, 8 + note G_, 14 sound_loop 0, .MainLoop Branch_fb0bb: octave 1 volume_envelope 6, -5 - note F_, 5 - volume_envelope 13, 0 - note F_, 11 -; tie - note F_, 12 + note F_, 14 + volume_envelope 13, 8 + note F_, 14 volume_envelope 6, -5 - note E_, 5 - volume_envelope 13, 0 - note E_, 11 -; tie - note E_, 12 + note E_, 14 + volume_envelope 13, 8 + note E_, 14 volume_envelope 6, -5 - note D_, 5 - volume_envelope 13, 0 - note D_, 11 -; tie - note D_, 12 + note D_, 14 + volume_envelope 13, 8 + note D_, 14 sound_ret +Branch_fb1ec_Ch2: + octave 5 + note C_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + inc_octave + note C_, 1 + rest 1 + dec_octave + note F_, 1 + rest 1 + note G_, 1 + rest 1 + sound_ret Music_HallOfHonor_Ch3: speed 7 channel_volume 2 stereo_panning TRUE, TRUE fade_wave 12 -; vibrato_type 4 vibrato 35, 2, 4 -; cutoff 6 -; echo 64 rest 3 channel_volume 3 -; cutoff 8 -; frequency_offset -1 -.Loop1 +.Loop1: rest 14 sound_loop 4, .Loop1 -.MainLoop +.MainLoop: octave 6 -.Loop2 +.Loop2: sound_call Branch_fb1ec sound_loop 7, .Loop2 note C_, 1 @@ -211,175 +210,113 @@ Music_HallOfHonor_Ch3: dec_octave note F_, 1 channel_volume 1 -; frequency_offset 0 octave 5 speed 1 -; cutoff 6 note B_, 3 inc_octave note C_, 4 -; tie speed 7 note C_, 15 -; tie note C_, 8 dec_octave -; cutoff 8 note B_, 2 -; cutoff 4 note A_, 2 -; cutoff 6 note G_, 6 note C_, 10 -; tie note C_, 12 speed 1 -; cutoff 8 note B_, 3 inc_octave -; cutoff 6 note C_, 4 -; tie speed 7 note C_, 15 -; tie note C_, 6 dec_octave -; cutoff 8 note B_, 2 inc_octave note C_, 2 -; cutoff 4 note D_, 2 dec_octave speed 1 -; cutoff 8 note F#, 3 -; cutoff 6 note G_, 4 -; tie speed 7 note G_, 15 -; tie note G_, 6 -; cutoff 8 note G_, 2 note A_, 2 -; cutoff 4 note B_, 2 speed 1 -; cutoff 8 note B_, 3 inc_octave note C_, 4 -; tie speed 7 note C_, 15 -; tie note C_, 8 dec_octave note B_, 2 -; cutoff 4 note A_, 2 -; cutoff 6 note G_, 6 -; cutoff 8 speed 1 note B_, 3 inc_octave -; cutoff 6 note C_, 4 -; tie speed 7 note C_, 9 -; tie note C_, 6 dec_octave -; cutoff 8 note G_, 2 inc_octave note C_, 2 -; cutoff 4 note E_, 2 speed 1 -; cutoff 8 note E_, 3 note F_, 4 -; tie speed 7 note F_, 1 note E_, 2 -; cutoff 4 note C_, 2 -; cutoff 7 note C_, 10 -; tie note C_, 10 -; cutoff 4 note E_, 2 speed 1 -; cutoff 8 note E_, 3 note F_, 4 -; tie speed 7 note F_, 1 note E_, 2 -; cutoff 4 note C_, 2 -; cutoff 6 note C_, 10 -; tie note C_, 12 speed 1 -; cutoff 8 note F#, 3 -; cutoff 7 note G_, 4 -; tie speed 7 note G_, 15 -; tie note G_, 8 -; cutoff 8 note F_, 2 -; cutoff 4 note E_, 2 -; cutoff 8 note F_, 2 -; cutoff 4 note E_, 2 note C_, 2 dec_octave -; cutoff 7 note G_, 10 -; tie note G_, 10 -; cutoff 8 note E_, 2 note F_, 2 inc_octave -; cutoff 4 note C_, 2 -; cutoff 7 note C_, 12 -; tie note C_, 10 dec_octave -; cutoff 8 note E_, 2 note F_, 2 inc_octave -; cutoff 4 note C_, 2 -; cutoff 6 note C_, 12 -; tie note C_, 12 rest 3 channel_volume 3 -; frequency_offset -1 -; cutoff 8 sound_loop 0, .MainLoop Branch_fb1ec: diff --git a/crysaudio/music/TCG/medal.asm b/crysaudio/music/TCG/medal.asm index a78e973d..f4840946 100644 --- a/crysaudio/music/TCG/medal.asm +++ b/crysaudio/music/TCG/medal.asm @@ -6,12 +6,10 @@ Music_Medal: Music_Medal_Ch1: stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 -; cutoff 8 octave 2 duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note E_, 5 note A_, 5 @@ -33,49 +31,40 @@ Music_Medal_Ch1: note E_, 5 speed 15 note A_, 2 -; tie speed 1 note A_, 10 volume_envelope 3, 7 note A_, 5 - volume_envelope 10, 0 -; cutoff 7 + volume_envelope 10, 8 note A_, 5 note A_, 5 note A_, 5 -; cutoff 8 note A_, 15 volume_envelope 3, 7 note A_, 5 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 16 volume_envelope 3, 7 note A_, 5 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 16 volume_envelope 3, 7 note A_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 9 - note A_, 5 -; tie - note A_, 8 -; tie + note A_, 13 speed 1 note A_, 2 volume_envelope 3, 7 note A_, 16 sound_ret - Music_Medal_Ch2: stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 -; cutoff 8 octave 1 duty_cycle 0 - volume_envelope 9, 0 + volume_envelope 9, 8 speed 1 note A_, 5 inc_octave @@ -96,61 +85,49 @@ Music_Medal_Ch2: inc_octave speed 15 note C_, 2 -; tie speed 1 note C_, 10 volume_envelope 2, 7 note C_, 5 - volume_envelope 10, 0 -; cutoff 7 + volume_envelope 10, 8 note C_, 5 note C_, 5 note C_, 5 -; cutoff 8 note D_, 15 volume_envelope 3, 7 note D_, 5 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 16 volume_envelope 2, 7 note D_, 5 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 16 volume_envelope 3, 7 note D_, 6 - volume_envelope 9, 0 + volume_envelope 9, 8 speed 9 - note C#, 5 -; tie - note C#, 8 -; tie + note C#, 13 speed 1 note C#, 2 volume_envelope 2, 7 note C#, 16 sound_ret - Music_Medal_Ch3: stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 -; cutoff 8 -; echo 0 octave 2 speed 1 speed 15 rest 4 note F_, 2 -; tie speed 1 note F_, 10 rest 5 -; cutoff 7 note F_, 5 note F_, 5 note F_, 5 -; cutoff 8 note A#, 15 rest 5 note A#, 16 @@ -159,7 +136,6 @@ Music_Medal_Ch3: rest 6 speed 9 note A_, 13 -; tie speed 1 note A_, 2 sound_ret diff --git a/crysaudio/music/TCG/overworld.asm b/crysaudio/music/TCG/overworld.asm index ee0ecc4b..149f4e7d 100644 --- a/crysaudio/music/TCG/overworld.asm +++ b/crysaudio/music/TCG/overworld.asm @@ -9,35 +9,32 @@ Music_Overworld_Ch1: speed 7 duty_cycle 0 stereo_panning TRUE, TRUE -; vibrato_type 9 vibrato 25, 3, 3 volume_envelope 10, 2 -; cutoff 7 octave 3 rest 3 sound_call Branch_f72ba rest 3 -.MainLoop +.MainLoop: sound_call Branch_f72ba duty_cycle 1 -; cutoff 8 octave 3 - 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_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 3 speed 1 note E_, 11 volume_envelope 3, 7 note E_, 10 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 7 note G_, 3 speed 1 @@ -45,43 +42,41 @@ Music_Overworld_Ch1: volume_envelope 3, 7 note F_, 10 speed 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 12 volume_envelope 3, 7 note C_, 2 duty_cycle 0 volume_envelope 9, 2 -; cutoff 7 octave 3 note E_, 4 note E_, 3 note E_, 3 duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 sound_call Branch_f72fb note C_, 6 volume_envelope 3, 7 note C_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 note D_, 3 note E_, 3 note G_, 6 volume_envelope 3, 7 note G_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 4 volume_envelope 3, 7 note F_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 dec_octave note A_, 6 note A#, 9 volume_envelope 3, 7 note A#, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note A#, 3 inc_octave note D_, 3 @@ -89,115 +84,101 @@ Music_Overworld_Ch1: note A_, 3 volume_envelope 3, 7 note A_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 3 volume_envelope 3, 7 note G_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 3 note D_, 3 volume_envelope 3, 7 note D_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 2 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 note C_, 9 volume_envelope 3, 7 note C_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 dec_octave note A_, 3 inc_octave speed 1 note C_, 11 - volume_envelope 4, 0 + volume_envelope 4, 8 note C_, 10 speed 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 3 speed 1 note F_, 11 - volume_envelope 4, 0 + volume_envelope 4, 8 note F_, 10 speed 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 12 volume_envelope 3, 7 note C_, 6 duty_cycle 2 -; cutoff 8 volume_envelope 5, -7 octave 4 note G_, 1 -; tie note E_, 1 -; tie note C_, 1 -; tie dec_octave note G_, 1 -; tie note E_, 1 -; tie note C_, 1 duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 sound_call Branch_f72fb note C_, 6 volume_envelope 3, 7 note C_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 note D_, 3 note E_, 3 note F_, 9 volume_envelope 3, 7 note F_, 12 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 2 note G_, 1 note A_, 1 volume_envelope 3, 7 note A_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 12 volume_envelope 3, 7 note A_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 3 note A_, 3 note A#, 9 volume_envelope 3, 7 note A#, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 5 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 5 volume_envelope 3, 7 note G_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F_, 8 -; tie note F_, 8 -; tie note F_, 8 -; tie note F_, 8 -; tie note F_, 8 -; tie note F_, 8 volume_envelope 3, 7 note F_, 3 duty_cycle 0 volume_envelope 10, 2 -; cutoff 7 sound_loop 0, .MainLoop Branch_f72ba: @@ -206,23 +187,20 @@ Branch_f72ba: note F_, 2 note A_, 1 inc_octave - volume_envelope 10, 0 -; cutoff 4 + volume_envelope 10, 8 note C_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 - note A#, 3 + note A#, 2 + rest 1 note A#, 1 inc_octave - volume_envelope 10, 0 -; cutoff 4 + volume_envelope 10, 8 note D_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note G_, 3 note A#, 3 rest 3 @@ -230,22 +208,19 @@ Branch_f72ba: note A_, 2 inc_octave note C_, 1 - volume_envelope 10, 0 -; cutoff 4 + volume_envelope 10, 8 note C_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 - note A#, 3 + note A#, 2 + rest 1 note A#, 1 inc_octave - volume_envelope 10, 0 -; cutoff 4 + volume_envelope 10, 8 note D_, 1 rest 2 volume_envelope 9, 2 -; cutoff 7 note C_, 3 dec_octave note A#, 3 @@ -253,15 +228,15 @@ Branch_f72ba: Branch_f72fb: octave 4 - 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 F_, 5 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 3 speed 1 note G_, 11 @@ -269,7 +244,7 @@ Branch_f72fb: note G_, 10 speed 7 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 dec_octave speed 1 @@ -277,59 +252,51 @@ Branch_f72fb: volume_envelope 3, 7 note A#, 10 speed 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 12 volume_envelope 3, 7 note C#, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note D#, 3 speed 1 note C#, 11 volume_envelope 3, 7 note C#, 10 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 7 sound_ret - Music_Overworld_Ch2: speed 7 duty_cycle 0 stereo_panning TRUE, TRUE -; vibrato_type 9 vibrato 30, 3, 3 -; cutoff 7 octave 3 sound_call Branch_f7535 -.MainLoop +.MainLoop: sound_call Branch_f7535 volume_envelope 9, 2 -; cutoff 7 rest 3 note C_, 5 note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C_, 4 note C_, 3 note C_, 3 rest 3 note C_, 5 note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note G_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note D_, 4 note D_, 3 note C_, 3 @@ -338,14 +305,12 @@ Music_Overworld_Ch2: note A#, 5 inc_octave note D_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C_, 4 note C_, 3 dec_octave @@ -354,14 +319,12 @@ Music_Overworld_Ch2: note A#, 5 inc_octave note C#, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C#, 4 dec_octave note F_, 3 @@ -371,40 +334,29 @@ Music_Overworld_Ch2: note C_, 3 note E_, 2 note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note G_, 1 -; cutoff 7 - volume_envelope 6, 0 -; cutoff 8 + volume_envelope 6, 8 octave 3 note E_, 3 note F_, 3 note G_, 3 -; cutoff 7 note A#, 6 volume_envelope 9, 2 -; cutoff 7 - octave 3 note D_, 3 - volume_envelope 6, 0 -; cutoff 8 - octave 3 + volume_envelope 6, 8 note A_, 3 volume_envelope 9, 2 -; cutoff 7 octave 2 note A_, 2 inc_octave inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 dec_octave rest 2 volume_envelope 9, 2 -; cutoff 7 note D_, 4 note D_, 3 dec_octave @@ -415,8 +367,7 @@ Music_Overworld_Ch2: note D_, 2 dec_octave note A#, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave inc_octave note F_, 1 @@ -424,7 +375,6 @@ Music_Overworld_Ch2: dec_octave dec_octave volume_envelope 9, 2 -; cutoff 7 note A#, 4 note A#, 3 note A#, 3 @@ -434,14 +384,12 @@ Music_Overworld_Ch2: note D_, 2 dec_octave note A#, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note A_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note A#, 6 inc_octave note D_, 1 @@ -451,13 +399,11 @@ Music_Overworld_Ch2: inc_octave note C_, 5 note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 volume_envelope 9, 2 -; cutoff 7 dec_octave note C_, 4 note C_, 3 @@ -465,48 +411,37 @@ Music_Overworld_Ch2: rest 3 note C_, 5 note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note G_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note D_, 4 duty_cycle 2 volume_envelope 5, -7 -; cutoff 8 octave 4 note C_, 1 -; tie dec_octave note G_, 1 -; tie note E_, 1 -; tie note C_, 1 -; tie dec_octave note G_, 1 -; tie note E_, 1 duty_cycle 0 volume_envelope 9, 2 -; cutoff 7 octave 2 rest 3 note A#, 5 inc_octave note D_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C_, 4 note C_, 3 dec_octave @@ -515,14 +450,12 @@ Music_Overworld_Ch2: note A#, 5 inc_octave note C#, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C#, 4 note C#, 3 note C#, 3 @@ -532,14 +465,12 @@ Music_Overworld_Ch2: note A_, 2 inc_octave note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note G_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C_, 4 note E_, 3 note C_, 3 @@ -549,296 +480,240 @@ Music_Overworld_Ch2: note B_, 2 inc_octave inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note D_, 4 - volume_envelope 6, 0 -; cutoff 8 + volume_envelope 6, 8 octave 4 note D_, 2 note E_, 1 note F_, 1 volume_envelope 2, 7 note F_, 2 - volume_envelope 6, 0 + volume_envelope 6, 8 note F_, 11 volume_envelope 9, 2 -; cutoff 7 - octave 4 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 rest 2 dec_octave dec_octave volume_envelope 9, 2 -; cutoff 7 note A#, 1 - volume_envelope 6, 0 -; cutoff 8 + volume_envelope 6, 8 octave 3 note A#, 3 inc_octave note F_, 3 note G_, 9 volume_envelope 9, 2 -; cutoff 7 octave 3 note D_, 2 dec_octave note A#, 3 inc_octave inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 -; cutoff 8 - volume_envelope 6, 0 + volume_envelope 6, 8 octave 4 note C_, 5 volume_envelope 2, 7 note C_, 1 dec_octave - volume_envelope 9, 0 + volume_envelope 9, 8 note A#, 5 volume_envelope 2, 7 note A#, 1 volume_envelope 9, 2 -; cutoff 7 octave 3 rest 3 note F_, 3 note C_, 2 note F_, 1 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 note G_, 3 note G_, 3 speed 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 inc_octave note F_, 4 note C_, 3 speed 7 dec_octave volume_envelope 9, 2 -; cutoff 7 note E_, 3 note G_, 2 inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 volume_envelope 9, 2 -; cutoff 7 dec_octave rest 3 note A_, 3 note F_, 2 note A_, 1 inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 note G_, 3 note G_, 3 speed 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 inc_octave note F_, 4 note C_, 3 dec_octave speed 7 volume_envelope 9, 2 -; cutoff 7 note A_, 3 note G_, 2 inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 sound_loop 0, .MainLoop Branch_f7535: octave 3 volume_envelope 9, 2 -; cutoff 7 rest 3 note C_, 3 note C_, 2 note F_, 1 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 - note G_, 3 + note G_, 2 + rest 1 note G_, 1 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 1 dec_octave -; cutoff 8 speed 1 inc_octave note F_, 4 note C_, 3 speed 7 volume_envelope 9, 2 -; cutoff 7 dec_octave note E_, 3 note G_, 2 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 dec_octave rest 3 volume_envelope 9, 2 -; cutoff 8 note F_, 3 note F_, 2 note A_, 1 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 - note G_, 3 + note G_, 2 + rest 1 note G_, 1 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 1 dec_octave -; cutoff 8 speed 1 inc_octave note F_, 4 note C_, 3 speed 7 volume_envelope 9, 2 -; cutoff 7 dec_octave note A_, 3 note G_, 2 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 dec_octave sound_ret - Music_Overworld_Ch3: speed 7 stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 -; echo 64 -; cutoff 7 octave 2 sound_call Branch_f77f8 note F_, 2 inc_octave note C_, 1 -.MainLoop +.MainLoop: sound_call Branch_f77f8 note F_, 3 sound_call Branch_f7826 octave 2 -; cutoff 8 note F_, 1 note A#, 2 rest 1 octave 4 -; cutoff 3 note C#, 2 dec_octave -; cutoff 8 note F_, 1 note A#, 1 rest 1 inc_octave -; cutoff 3 note F_, 2 rest 1 inc_octave note C#, 1 octave 2 -; cutoff 8 note A#, 1 rest 1 octave 4 -; cutoff 7 note G_, 1 octave 2 -; cutoff 8 note A#, 1 rest 1 note F_, 1 inc_octave -; cutoff 3 note A#, 2 dec_octave -; cutoff 8 note A#, 1 octave 4 -; cutoff 3 note C#, 2 octave 2 -; cutoff 8 note F_, 1 note A_, 2 rest 1 octave 4 -; cutoff 3 note E_, 2 octave 2 -; cutoff 8 note A_, 1 octave 4 -; cutoff 3 note G_, 2 -; cutoff 7 note E_, 1 -; cutoff 8 dec_octave note E_, 1 rest 1 inc_octave inc_octave -; cutoff 3 note E_, 1 octave 2 -; cutoff 8 note A_, 1 rest 1 inc_octave @@ -859,240 +734,176 @@ Music_Overworld_Ch3: note D_, 2 rest 1 octave 4 -; cutoff 3 note F_, 2 octave 2 -; cutoff 8 note A_, 1 inc_octave note D_, 2 dec_octave note A_, 1 octave 4 -; cutoff 3 note D_, 2 inc_octave note C_, 1 octave 2 -; cutoff 8 note D_, 2 octave 4 -; cutoff 3 note F_, 2 rest 1 octave 2 -; cutoff 8 note A_, 1 octave 4 -; cutoff 3 note F_, 2 octave 2 -; cutoff 8 note D_, 1 octave 4 -; cutoff 3 note D_, 2 -; cutoff 8 octave 2 note A_, 1 note G_, 2 rest 1 octave 4 -; cutoff 3 note D_, 2 octave 2 -; cutoff 8 note G_, 1 octave 4 -; cutoff 3 note F_, 2 -; cutoff 7 note D_, 1 dec_octave -; cutoff 8 note D_, 1 rest 1 -; cutoff 3 inc_octave note A#, 1 octave 2 -; cutoff 8 note G_, 1 rest 1 octave 4 -; cutoff 3 note D_, 2 rest 1 dec_octave -; cutoff 8 note D_, 1 inc_octave -; cutoff 3 note F_, 2 octave 2 -; cutoff 8 note G_, 1 octave 4 -; cutoff 3 note D_, 2 -; cutoff 8 dec_octave note D_, 1 note C_, 2 rest 1 inc_octave -; cutoff 3 note D_, 2 octave 2 -; cutoff 8 note G_, 1 octave 4 -; cutoff 3 note F_, 2 -; cutoff 7 note D_, 1 octave 2 -; cutoff 8 note C_, 1 rest 1 octave 4 -; cutoff 3 note F_, 1 dec_octave -; cutoff 8 note C_, 1 rest 1 inc_octave -; cutoff 3 note D_, 2 rest 1 octave 2 -; cutoff 8 note E_, 1 inc_octave note C_, 1 rest 1 inc_octave -; cutoff 7 note F_, 1 -; cutoff 3 note E_, 2 -; cutoff 8 octave 2 note E_, 1 sound_call Branch_f7826 -; cutoff 8 octave 3 note C_, 1 note C#, 2 rest 1 inc_octave -; cutoff 3 note C#, 2 octave 2 -; cutoff 8 note G#, 1 inc_octave note C#, 1 rest 1 inc_octave -; cutoff 3 note F_, 2 rest 1 inc_octave note C#, 1 octave 3 -; cutoff 8 note C#, 1 rest 1 inc_octave note G_, 1 dec_octave -; cutoff 8 note C#, 1 rest 1 dec_octave note G#, 1 octave 4 -; cutoff 3 note G_, 2 dec_octave -; cutoff 8 note C#, 1 inc_octave -; cutoff 3 note F_, 2 octave 2 -; cutoff 8 note G#, 1 inc_octave note C_, 2 rest 1 inc_octave -; cutoff 3 note E_, 2 dec_octave -; cutoff 8 note G_, 1 inc_octave -; cutoff 3 note C_, 2 -; cutoff 7 note E_, 1 dec_octave -; cutoff 8 note E_, 1 rest 1 octave 5 -; cutoff 3 note E_, 1 octave 3 -; cutoff 8 note C_, 1 rest 1 inc_octave -; cutoff 3 note E_, 2 rest 1 octave 2 -; cutoff 8 note G_, 1 octave 4 -; cutoff 3 note G_, 2 dec_octave -; cutoff 8 note C_, 1 inc_octave -; cutoff 3 note E_, 2 octave 2 -; cutoff 8 note G_, 1 note B_, 2 rest 1 octave 4 -; cutoff 3 note F_, 2 dec_octave -; cutoff 8 note F_, 1 note B_, 2 note F_, 1 inc_octave -; cutoff 3 note D_, 2 inc_octave note D_, 1 octave 2 -; cutoff 8 note B_, 2 octave 4 -; cutoff 3 note F_, 2 rest 1 dec_octave -; cutoff 8 note F_, 1 note B_, 2 note F_, 1 @@ -1102,27 +913,21 @@ Music_Overworld_Ch3: note A#, 2 rest 1 octave 4 -; cutoff 3 note D_, 2 dec_octave -; cutoff 8 note F_, 1 note A#, 2 note F_, 1 inc_octave -; cutoff 3 note F_, 2 inc_octave note D_, 1 octave 2 -; cutoff 8 note A#, 1 rest 1 octave 4 -; cutoff 7 note D_, 1 octave 2 -; cutoff 8 note A#, 1 rest 2 note A#, 2 @@ -1133,33 +938,24 @@ Music_Overworld_Ch3: note C_, 2 rest 1 inc_octave -; cutoff 3 note D_, 2 octave 2 -; cutoff 8 note G_, 1 octave 4 -; cutoff 3 note F_, 2 -; cutoff 7 note D_, 1 octave 2 -; cutoff 8 note C_, 1 rest 1 octave 5 -; cutoff 3 note D_, 1 octave 3 -; cutoff 8 note C_, 1 rest 1 inc_octave -; cutoff 3 note D_, 2 rest 1 octave 2 -; cutoff 8 note E_, 1 inc_octave note C_, 1 @@ -1171,13 +967,10 @@ Music_Overworld_Ch3: note E_, 1 note F_, 3 octave 4 -; cutoff 3 note A_, 2 dec_octave -; cutoff 8 note C_, 1 inc_octave -; cutoff 5 note F_, 2 note A_, 1 inc_octave @@ -1193,24 +986,18 @@ Music_Overworld_Ch3: rest 2 note G_, 2 dec_octave -; cutoff 8 note C_, 1 inc_octave -; cutoff 5 note A#, 2 inc_octave note C_, 1 octave 2 -; cutoff 8 note F_, 3 octave 5 -; cutoff 3 note C_, 2 octave 3 -; cutoff 8 note C_, 1 inc_octave -; cutoff 5 note A_, 2 inc_octave note C_, 1 @@ -1225,13 +1012,10 @@ Music_Overworld_Ch3: rest 2 note C_, 2 octave 3 -; cutoff 8 note C_, 1 inc_octave -; cutoff 5 note A#, 2 dec_octave -; cutoff 8 note C_, 1 sound_loop 0, .MainLoop @@ -1239,10 +1023,8 @@ Branch_f77f8: octave 2 note F_, 3 octave 4 -; cutoff 3 note A_, 2 dec_octave -; cutoff 8 note C_, 1 note F_, 2 note C_, 1 @@ -1261,10 +1043,8 @@ Branch_f77f8: dec_octave note F_, 3 octave 5 -; cutoff 3 note C_, 2 octave 3 -; cutoff 8 note C_, 1 note F_, 2 note C_, 1 @@ -1284,69 +1064,53 @@ Branch_f7826: note F_, 2 rest 1 octave 4 -; cutoff 3 note F_, 2 dec_octave -; cutoff 8 note C_, 1 note F_, 1 rest 1 inc_octave -; cutoff 3 note F_, 2 rest 1 inc_octave note C_, 1 octave 2 -; cutoff 8 note F_, 1 rest 1 octave 4 -; cutoff 7 note G_, 1 octave 2 -; cutoff 8 note F_, 1 rest 1 note C_, 1 octave 4 -; cutoff 3 note G_, 2 octave 2 -; cutoff 8 note F_, 1 octave 4 -; cutoff 7 note F_, 2 octave 2 -; cutoff 8 note G_, 1 note A_, 2 rest 1 octave 4 -; cutoff 3 note E_, 2 dec_octave -; cutoff 8 note E_, 1 note A_, 1 rest 1 inc_octave -; cutoff 3 note E_, 2 rest 1 inc_octave note C_, 1 octave 2 -; cutoff 8 note A_, 1 rest 1 octave 4 -; cutoff 7 note E_, 1 octave 2 -; cutoff 8 -.Loop1 +.Loop1: note A_, 1 rest 1 note E_, 1 @@ -1356,50 +1120,40 @@ Branch_f7826: note A#, 2 rest 1 octave 4 -; cutoff 3 note D_, 2 dec_octave -; cutoff 8 note F_, 1 note A#, 1 rest 1 inc_octave -; cutoff 3 note F_, 2 rest 1 inc_octave note D_, 1 octave 2 -; cutoff 8 note A#, 1 rest 1 octave 4 -; cutoff 7 note D_, 1 octave 2 -; cutoff 8 note A#, 1 rest 1 note F_, 1 octave 4 -; cutoff 3 note D_, 2 octave 2 -; cutoff 8 note A#, 1 octave 4 -; cutoff 3 note D_, 2 sound_ret - Music_Overworld_Ch4: toggle_noise 6 drum_speed 7 octave 1 sound_call Branch_f78ee sound_call Branch_f78fb -.MainLoop +.MainLoop: sound_call Branch_f78ee drum_note 1, 3 drum_note 4, 2 @@ -1414,13 +1168,13 @@ Music_Overworld_Ch4: drum_note 4, 1 drum_note 4, 1 drum_note 2, 3 -.Loop1 +.Loop1: sound_call Branch_f78ee sound_call Branch_f78fb sound_loop 3, .Loop1 sound_call Branch_f78ee sound_call Branch_f790a -.Loop2 +.Loop2: sound_call Branch_f78ee sound_call Branch_f78fb sound_loop 3, .Loop2