diff --git a/crysaudio/music/TCG/boosterpack.asm b/crysaudio/music/TCG/boosterpack.asm index b73378c9..b9b491b3 100644 --- a/crysaudio/music/TCG/boosterpack.asm +++ b/crysaudio/music/TCG/boosterpack.asm @@ -4,101 +4,101 @@ Music_BoosterPack: channel 2, Music_BoosterPack_Ch2 channel 3, Music_BoosterPack_Ch3 -Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_BoosterPack_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 4 duty_cycle 1 speed 1 - channel_volume 10 + volume_envelope 10, 0 note D#, 5 - channel_volume 3 + volume_envelope 3, 7 note D#, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note A#, 5 - channel_volume 3 + volume_envelope 3, 7 note A#, 2 - channel_volume 10 + volume_envelope 10, 0 note F_, 5 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 5 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 5 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 6 - channel_volume 3 + volume_envelope 3, 7 note B_, 9 sound_ret -Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_BoosterPack_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 3 duty_cycle 1 speed 1 - channel_volume 9 + volume_envelope 9, 0 note A#, 5 - channel_volume 2 + volume_envelope 2, 7 note A#, 1 inc_octave - channel_volume 9 + volume_envelope 9, 0 note D#, 5 - channel_volume 2 + volume_envelope 2, 7 note D#, 1 - channel_volume 9 + volume_envelope 9, 0 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 2 - channel_volume 9 + volume_envelope 9, 0 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 - channel_volume 9 + volume_envelope 9, 0 note F_, 5 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 - channel_volume 9 + volume_envelope 9, 0 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 2 - channel_volume 9 + volume_envelope 9, 0 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 6 - channel_volume 2 + volume_envelope 2, 7 note G_, 9 sound_ret -Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) - ;stereo_panning 1, 1 +Music_BoosterPack_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;cutoff 8 - ;echo 0 +; cutoff 8 +; echo 0 octave 2 speed 1 note D#, 6 @@ -112,9 +112,8 @@ Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) note F_, 7 dec_octave note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 6 sound_ret -; 0xf7df8 diff --git a/crysaudio/music/TCG/cardpop.asm b/crysaudio/music/TCG/cardpop.asm index 77612bfe..2d8f3963 100644 --- a/crysaudio/music/TCG/cardpop.asm +++ b/crysaudio/music/TCG/cardpop.asm @@ -5,12 +5,12 @@ Music_CardPop: channel 3, Music_CardPop_Ch3 channel 4, Music_CardPop_Ch4 -Music_CardPop_Ch1: ; f703a (3d:703a) +Music_CardPop_Ch1: speed 4 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 - channel_volume 9 + volume_envelope 9, 0 .MainLoop .Loop1 rest 16 @@ -18,50 +18,50 @@ Music_CardPop_Ch1: ; f703a (3d:703a) rest 14 .Loop2 octave 5 - fade_wave 8 +; cutoff 8 note F#, 1 note G_, 1 - fade_wave 6 +; cutoff 6 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note A_, 1 inc_octave - channel_volume 3 + volume_envelope 3, 7 note D_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 inc_octave note D_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 note F#, 1 @@ -69,70 +69,70 @@ Music_CardPop_Ch1: ; f703a (3d:703a) rest 16 rest 14 octave 5 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 note F_, 1 - fade_wave 6 +; cutoff 6 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 9 + volume_envelope 9, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note G_, 1 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 9 + volume_envelope 9, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 inc_octave note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 rest 1 note E_, 1 rest 12 rest 16 - channel_volume 9 + volume_envelope 9, 0 rest 14 sound_loop 2, .Loop2 rest 2 sound_loop 0, .MainLoop -Music_CardPop_Ch2: ; f70df (3d:70df) +Music_CardPop_Ch2: speed 4 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 - channel_volume 6 - fade_wave 3 + volume_envelope 6, 0 +; cutoff 3 .Loop1 octave 2 note A_, 2 @@ -212,13 +212,13 @@ Music_CardPop_Ch2: ; f70df (3d:70df) sound_loop 0, Music_CardPop_Ch2 -Music_CardPop_Ch3: ; f713a (3d:713a) +Music_CardPop_Ch3: speed 4 fade_wave 11 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 - ;echo 0 - ;cutoff 8 +; echo 0 +; cutoff 8 sound_call Branch_f715b note C_, 2 note C#, 2 @@ -272,9 +272,8 @@ Branch_f716c: sound_ret -Music_CardPop_Ch4: ; f717d (3d:717d) +Music_CardPop_Ch4: toggle_noise 6 -.MainLoop drum_speed 4 octave 1 .Loop1 @@ -292,7 +291,7 @@ Music_CardPop_Ch4: ; f717d (3d:717d) .Loop2 drum_note 2, 2 sound_loop 4, .Loop2 - sound_loop 0, .MainLoop + sound_loop 0, Music_CardPop_Ch4 Branch_f7196: drum_note 1, 2 @@ -305,4 +304,3 @@ Branch_f7196: drum_note 1, 2 drum_note 2, 2 sound_ret -; 0xf71a0 diff --git a/crysaudio/music/TCG/challengehall.asm b/crysaudio/music/TCG/challengehall.asm index 615f85a0..5429450f 100644 --- a/crysaudio/music/TCG/challengehall.asm +++ b/crysaudio/music/TCG/challengehall.asm @@ -5,67 +5,67 @@ Music_ChallengeHall: channel 3, Music_ChallengeHall_Ch3 channel 4, Music_ChallengeHall_Ch4 -Music_ChallengeHall_Ch1: ; f9646 (3e:5646) - ;stereo_panning 1, 1 - ;vibrato_type 8 +Music_ChallengeHall_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 15, 3, 3 - fade_wave 7 +; cutoff 7 octave 3 duty_cycle 2 - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 speed 1 note A_, 7 note G#, 4 - channel_volume 1 + volume_envelope 1, 7 note G#, 4 - channel_volume 8 + volume_envelope 8, 0 note A_, 4 - channel_volume 1 + volume_envelope 1, 7 note A_, 3 - channel_volume 8 + volume_envelope 8, 0 note B_, 4 - channel_volume 1 + volume_envelope 1, 7 note B_, 4 inc_octave - channel_volume 8 + volume_envelope 8, 0 note C#, 7 note C_, 4 - channel_volume 1 + volume_envelope 1, 7 note C_, 4 - channel_volume 8 + volume_envelope 8, 0 note C#, 4 - channel_volume 1 + volume_envelope 1, 7 note C#, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 4 - channel_volume 1 + volume_envelope 1, 7 note D_, 4 - channel_volume 8 + volume_envelope 8, 0 note E_, 7 note D#, 4 - channel_volume 1 + volume_envelope 1, 7 note D#, 4 - channel_volume 8 + volume_envelope 8, 0 note E_, 4 - channel_volume 1 + volume_envelope 1, 7 note E_, 3 - channel_volume 8 + volume_envelope 8, 0 note F#, 4 - channel_volume 1 + volume_envelope 1, 7 note F#, 4 - channel_volume 8 + volume_envelope 8, 0 note G#, 4 - channel_volume 1 + volume_envelope 1, 7 note G#, 3 - channel_volume 8 + volume_envelope 8, 0 note A_, 8 note B_, 7 inc_octave note C#, 4 note D_, 4 .MainLoop - channel_volume 7 + volume_envelope 7, 0 speed 1 octave 5 .Loop1 @@ -75,277 +75,277 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) note F#, 4 sound_loop 8, .Loop1 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 dec_octave dec_octave dec_octave note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 dec_octave - channel_volume 8 + volume_envelope 8, 0 note B_, 7 note B_, 8 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 - channel_volume 8 + volume_envelope 8, 0 note B_, 15 inc_octave note D_, 15 note E_, 15 inc_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 sound_call Branch_f9848 - channel_volume 10 + volume_envelope 10, 0 note D_, 8 speed 10 note C#, 6 - ;tie +; tie note C#, 6 - channel_volume 3 + volume_envelope 3, 7 speed 1 note C#, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 sound_call Branch_f9848 - channel_volume 10 + volume_envelope 10, 0 note C#, 8 dec_octave speed 10 note A_, 6 - ;tie +; tie note A_, 6 - channel_volume 3 + volume_envelope 3, 7 speed 1 note A_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 inc_octave note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note C#, 15 note D_, 15 note E_, 15 - channel_volume 2 + volume_envelope 2, 7 note E_, 15 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 note F#, 7 note F_, 7 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 7 note F_, 8 note F#, 7 note G#, 7 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 10 + volume_envelope 10, 0 speed 10 note A_, 3 - ;tie +; tie speed 1 note A_, 15 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 rest 15 inc_octave note E_, 7 note D#, 7 - channel_volume 3 + volume_envelope 3, 7 note D#, 1 - channel_volume 10 + volume_envelope 10, 0 note E_, 7 note D#, 8 note E_, 7 note G#, 7 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 10 + volume_envelope 10, 0 speed 9 note A_, 5 speed 1 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 rest 15 inc_octave note D_, 7 note C#, 8 note D_, 7 - channel_volume 3 + volume_envelope 3, 7 note D_, 8 - channel_volume 10 + volume_envelope 10, 0 note A_, 7 - channel_volume 3 + volume_envelope 3, 7 note A_, 8 - channel_volume 10 + volume_envelope 10, 0 note G#, 15 - ;tie +; tie note G#, 7 - channel_volume 3 + volume_envelope 3, 7 note G#, 8 - channel_volume 10 + volume_envelope 10, 0 note F#, 15 - channel_volume 3 + volume_envelope 3, 7 note F#, 7 - channel_volume 10 + volume_envelope 10, 0 note G#, 8 speed 10 note E_, 6 speed 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 15 - channel_volume 10 + volume_envelope 10, 0 note C#, 15 note D_, 15 note E_, 15 - channel_volume 3 + volume_envelope 3, 7 note E_, 15 - channel_volume 10 + volume_envelope 10, 0 note F#, 7 note F_, 7 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 7 note F_, 8 note F#, 6 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 note G#, 6 - channel_volume 3 + volume_envelope 3, 7 note G#, 2 - channel_volume 10 + volume_envelope 10, 0 speed 10 note A_, 3 speed 1 note G#, 15 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 inc_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 note F#, 6 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 - channel_volume 10 + volume_envelope 10, 0 note E_, 15 - channel_volume 3 + volume_envelope 3, 7 note E_, 15 - channel_volume 10 + volume_envelope 10, 0 note B_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 dec_octave note B_, 7 inc_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 note G#, 6 - channel_volume 3 + volume_envelope 3, 7 note G#, 2 - channel_volume 10 + volume_envelope 10, 0 speed 10 note A_, 3 speed 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 15 - channel_volume 10 + volume_envelope 10, 0 note B_, 6 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C#, 6 - channel_volume 3 + volume_envelope 3, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 speed 10 note D_, 3 speed 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 15 dec_octave - channel_volume 10 + volume_envelope 10, 0 note F#, 6 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 note B_, 6 - channel_volume 3 + volume_envelope 3, 7 note B_, 2 - channel_volume 10 + volume_envelope 10, 0 note A_, 15 - channel_volume 3 + volume_envelope 3, 7 note A_, 15 - channel_volume 10 + volume_envelope 10, 0 note G#, 11 - channel_volume 3 + volume_envelope 3, 7 note G#, 4 rest 7 - channel_volume 10 + volume_envelope 10, 0 note A_, 7 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 10 note A_, 6 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 inc_octave note C#, 7 @@ -364,54 +364,54 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) Branch_f9848: note C#, 15 - channel_volume 3 + volume_envelope 3, 7 note C#, 15 - channel_volume 10 + volume_envelope 10, 0 note E_, 15 - channel_volume 3 + volume_envelope 3, 7 note E_, 7 - channel_volume 10 + volume_envelope 10, 0 note C#, 8 note D_, 15 - channel_volume 3 + volume_envelope 3, 7 note D_, 15 - channel_volume 10 + volume_envelope 10, 0 note F#, 15 - channel_volume 3 + volume_envelope 3, 7 note F#, 7 - channel_volume 10 + volume_envelope 10, 0 note D_, 8 note E_, 7 - channel_volume 3 + volume_envelope 3, 7 note E_, 8 - channel_volume 10 + volume_envelope 10, 0 note A_, 15 note G#, 7 - channel_volume 3 + volume_envelope 3, 7 note G#, 8 - channel_volume 10 + volume_envelope 10, 0 note F#, 7 - channel_volume 3 + volume_envelope 3, 7 note F#, 8 - channel_volume 10 + volume_envelope 10, 0 note E_, 15 note D_, 7 - channel_volume 3 + volume_envelope 3, 7 note D_, 8 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 15 - channel_volume 3 + volume_envelope 3, 7 note B_, 7 inc_octave sound_ret -Music_ChallengeHall_Ch2: ; f9883 (3e:5883) - ;stereo_panning 1, 1 - ;vibrato_type 8 +Music_ChallengeHall_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 15, 3, 3 - fade_wave 7 +; cutoff 7 octave 3 speed 10 .Loop1 @@ -419,32 +419,32 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) sound_loop 2, .Loop1 .MainLoop duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 speed 10 note E_, 6 - ;tie +; tie note E_, 6 speed 1 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 dec_octave - channel_volume 8 + volume_envelope 8, 0 note E_, 7 note E_, 8 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 - channel_volume 8 + volume_envelope 8, 0 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 - channel_volume 8 + volume_envelope 8, 0 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 - channel_volume 8 + volume_envelope 8, 0 note E_, 15 note F#, 15 note G#, 15 @@ -452,110 +452,110 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note B_, 8 speed 10 note A_, 6 - ;tie +; tie note A_, 6 speed 1 rest 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 sound_call Branch_f9a28 note G#, 8 speed 10 note E_, 6 - ;tie +; tie note E_, 6 speed 1 rest 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note A_, 15 note B_, 15 inc_octave note C#, 15 - channel_volume 2 + volume_envelope 2, 7 note C#, 15 - channel_volume 8 + volume_envelope 8, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 rest 15 dec_octave - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 15 inc_octave - channel_volume 8 + volume_envelope 8, 0 note D_, 7 duty_cycle 2 - channel_volume 6 + volume_envelope 6, 0 inc_octave note D_, 8 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 inc_octave - channel_volume 6 + volume_envelope 6, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 - channel_volume 6 + volume_envelope 6, 0 .Loop2 note E_, 4 note F#, 3 note E_, 4 note F#, 4 sound_loop 4, .Loop2 - channel_volume 2 + volume_envelope 2, 7 note F#, 5 rest 10 dec_octave dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 inc_octave duty_cycle 2 - channel_volume 6 + volume_envelope 6, 0 note E_, 8 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 inc_octave - channel_volume 6 + volume_envelope 6, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 - channel_volume 5 + volume_envelope 5, 0 .Loop3 note D_, 4 note E_, 3 @@ -566,63 +566,63 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note B_, 15 inc_octave note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 - channel_volume 5 + volume_envelope 5, 0 note C#, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 octave 2 note B_, 7 inc_octave inc_octave - ;vibrato_type 1 +; vibrato_type 1 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 note B_, 8 inc_octave speed 10 note C#, 6 - channel_volume 2 + volume_envelope 2, 7 speed 1 note C#, 15 - ;vibrato_type 8 +; vibrato_type 8 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 octave 2 note E_, 15 note F#, 15 note A#, 15 rest 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 inc_octave note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 rest 15 dec_octave - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 rest 15 inc_octave - channel_volume 8 + volume_envelope 8, 0 note D_, 7 inc_octave duty_cycle 2 - channel_volume 6 + volume_envelope 6, 0 note D_, 8 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 inc_octave - channel_volume 6 + volume_envelope 6, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 - channel_volume 6 + volume_envelope 6, 0 .Loop4 note E_, 4 note F#, 3 @@ -630,7 +630,7 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note F#, 4 sound_loop 2, .Loop4 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 dec_octave dec_octave note F_, 15 @@ -642,10 +642,10 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) speed 1 rest 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note E_, 6 rest 2 speed 10 @@ -654,51 +654,51 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) rest 15 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 inc_octave duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note D_, 6 rest 2 note E_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note D_, 11 rest 4 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 dec_octave note B_, 7 inc_octave duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note D_, 6 rest 2 note C#, 15 duty_cycle 1 - channel_volume 8 - fade_wave 7 + volume_envelope 8, 0 +; cutoff 7 note C#, 5 note C#, 5 note C#, 5 - fade_wave 8 +; cutoff 8 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 note A_, 7 - channel_volume 3 + volume_envelope 3, 7 note A_, 8 rest 15 speed 10 @@ -707,103 +707,103 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) Branch_f9a28: duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note A_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 inc_octave note C#, 15 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note A_, 8 note B_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 inc_octave note D_, 15 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note B_, 8 inc_octave note C#, 7 - channel_volume 3 + volume_envelope 3, 7 note C#, 8 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note E_, 7 rest 8 note E_, 7 rest 8 - channel_volume 7 + volume_envelope 7, 0 note D_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 dec_octave duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note G#, 15 inc_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 7 dec_octave duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 sound_ret -Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) - ;stereo_panning 1, 1 +Music_ChallengeHall_Ch3: + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 0 - ;cutoff 8 - ;cutoff 8 +; echo 0 +; cutoff 8 +; cutoff 8 speed 10 .Loop1 rest 6 sound_loop 2, .Loop1 .MainLoop octave 2 - ;cutoff 8 +; cutoff 8 note E_, 6 - ;tie +; tie note E_, 6 speed 1 inc_octave note E_, 7 rest 8 dec_octave - ;cutoff 7 +; cutoff 7 note E_, 7 note E_, 8 - ;cutoff 8 +; cutoff 8 note E_, 7 rest 8 note E_, 7 @@ -972,11 +972,11 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) dec_octave note A_, 7 rest 8 - ;cutoff 7 +; cutoff 7 note A_, 5 note A_, 5 note A_, 5 - ;cutoff 8 +; cutoff 8 note A_, 7 rest 8 note A_, 7 @@ -1037,7 +1037,7 @@ Branch_f9b92: sound_ret -Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9) +Music_ChallengeHall_Ch4: toggle_noise 6 drum_speed 1 drum_speed 10 @@ -1092,4 +1092,3 @@ Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9) drum_note 2, 3 rest 3 sound_loop 0, .MainLoop -; 0xf9be5 diff --git a/crysaudio/music/TCG/club1.asm b/crysaudio/music/TCG/club1.asm index ec58ab53..fe1d174d 100644 --- a/crysaudio/music/TCG/club1.asm +++ b/crysaudio/music/TCG/club1.asm @@ -5,16 +5,16 @@ Music_Club1: channel 3, Music_Club1_Ch3 channel 4, Music_Club1_Ch4 -Music_Club1_Ch1: ; f9be5 (3e:5be5) +Music_Club1_Ch1: speed 5 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 3 duty_cycle 0 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 2 +; cutoff 8 note C#, 2 dec_octave note A_, 2 @@ -22,21 +22,21 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 2 note A_, 2 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 inc_octave speed 1 note C#, 8 - channel_volume 2 + volume_envelope 2, 7 note C#, 2 - channel_volume 6 + volume_envelope 5, -2 note A_, 4 - channel_volume 7 + volume_envelope 7, 0 note A_, 4 - channel_volume 2 + volume_envelope 2, 7 note A_, 2 dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 speed 5 note C#, 2 dec_octave @@ -45,40 +45,40 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 2 note A#, 2 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 inc_octave speed 1 note C#, 8 - channel_volume 2 + volume_envelope 2, 7 note C#, 2 speed 5 - channel_volume 8 + volume_envelope 8, 0 dec_octave note B_, 1 inc_octave note C_, 1 - ;vibrato_type 1 +; vibrato_type 1 vibrato 10, 3, 3 note C#, 4 dec_octave - ;vibrato_type 8 +; vibrato_type 8 vibrato 20, 3, 3 note A_, 2 inc_octave note C#, 4 dec_octave note B_, 2 - channel_volume 2 + volume_envelope 2, 7 note B_, 2 rest 2 duty_cycle 0 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 4 +; cutoff 8 note E_, 6 rest 2 .MainLoop duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 octave 3 rest 6 note A_, 4 @@ -88,44 +88,44 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) inc_octave note C_, 4 note C#, 8 - channel_volume 4 + volume_envelope 4, 7 note C#, 4 - channel_volume 10 + volume_envelope 10, 0 note C#, 2 note D_, 4 note E_, 2 - channel_volume 4 + volume_envelope 4, 7 note E_, 2 rest 2 - channel_volume 10 + volume_envelope 10, 0 note D#, 1 note E_, 7 note D_, 6 dec_octave note A_, 4 note F#, 2 - channel_volume 4 + volume_envelope 4, 7 note F#, 2 rest 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note C#, 3 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 2 note C_, 4 dec_octave note B_, 6 - channel_volume 9 + volume_envelope 9, 3 note D_, 4 rest 2 dec_octave note A_, 2 - ;vibrato_type 1 +; vibrato_type 1 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 inc_octave inc_octave inc_octave @@ -133,9 +133,9 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 5 dec_octave dec_octave - ;vibrato_type 8 +; vibrato_type 8 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 note A_, 4 note E_, 2 note A_, 4 @@ -145,88 +145,88 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 6 dec_octave dec_octave - channel_volume 9 + volume_envelope 9, 3 note A#, 1 rest 5 inc_octave inc_octave - channel_volume 10 + volume_envelope 10, 0 note C#, 2 note D_, 4 note E_, 2 - channel_volume 4 + volume_envelope 4, 7 note E_, 2 rest 2 - channel_volume 10 + volume_envelope 10, 0 note D#, 1 note E_, 7 note D_, 6 dec_octave note A_, 4 note F#, 2 - channel_volume 4 + volume_envelope 4, 7 note F#, 2 rest 2 - channel_volume 10 + volume_envelope 10, 0 inc_octave note C_, 1 note C#, 3 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 2 note C_, 4 dec_octave note B_, 8 - channel_volume 4 + volume_envelope 4, 7 note B_, 4 - channel_volume 10 + volume_envelope 10, 0 note E_, 2 note F_, 1 note F#, 5 note A_, 6 note B_, 4 note A_, 2 - channel_volume 4 + volume_envelope 4, 7 note A_, 2 rest 2 - channel_volume 10 + volume_envelope 10, 0 note E_, 1 note F_, 7 note A_, 6 note B_, 4 note A_, 2 - channel_volume 4 + volume_envelope 4, 7 note A_, 2 rest 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note C#, 5 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 4 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 4 note C_, 2 note C#, 4 dec_octave note F#, 2 - channel_volume 4 + volume_envelope 4, 7 note F#, 2 rest 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note D#, 1 note E_, 5 note D_, 6 note C#, 4 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note C#, 7 dec_octave @@ -234,10 +234,10 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note F#, 2 note A_, 4 note F#, 2 - channel_volume 4 + volume_envelope 4, 7 note F#, 2 rest 2 - channel_volume 10 + volume_envelope 10, 0 inc_octave note C_, 1 note C#, 5 @@ -248,20 +248,20 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note F#, 2 note A_, 4 note F#, 2 - channel_volume 4 + volume_envelope 4, 7 note F#, 2 rest 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note C#, 5 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 4 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 4 dec_octave note A_, 2 @@ -270,49 +270,49 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) dec_octave note B_, 14 duty_cycle 2 - channel_volume 6 + volume_envelope 6, 0 note G#, 2 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 inc_octave - channel_volume 6 + volume_envelope 6, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 6 + volume_envelope 6, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 6 + volume_envelope 6, 0 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 inc_octave - channel_volume 6 + volume_envelope 6, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 sound_loop 0, .MainLoop -Music_Club1_Ch2: ; f9d5f (3e:5d5f) +Music_Club1_Ch2: speed 5 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 7 +; cutoff 7 octave 2 duty_cycle 0 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 2 +; cutoff 8 note A_, 2 note E_, 2 note A_, 2 inc_octave note C#, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 speed 1 note A_, 8 rest 2 @@ -321,7 +321,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) rest 2 speed 5 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 dec_octave dec_octave note A#, 2 @@ -330,14 +330,14 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) inc_octave note C#, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 speed 1 note A#, 8 rest 2 dec_octave speed 5 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 note G_, 1 note G#, 1 note A_, 2 @@ -347,14 +347,14 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note F#, 2 note G#, 3 rest 3 - channel_volume 9 + volume_envelope 9, 4 note B_, 6 rest 2 .MainLoop octave 2 rest 4 inc_octave - channel_volume 9 + volume_envelope 9, 3 note C#, 5 rest 7 note C#, 4 @@ -364,7 +364,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) dec_octave note A#, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 octave 5 note C#, 1 note D_, 3 @@ -373,21 +373,21 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note A#, 4 dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 note E_, 4 rest 2 - ;vibrato_type 1 +; vibrato_type 1 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 octave 5 note C_, 1 note C#, 5 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 octave 3 note D_, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 inc_octave note A_, 4 note F#, 2 @@ -405,28 +405,28 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note A_, 2 rest 2 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 rest 2 dec_octave note C#, 2 - channel_volume 6 + volume_envelope 6, 0 note C#, 4 - channel_volume 3 + volume_envelope 3, 7 note C#, 4 rest 2 - channel_volume 9 + volume_envelope 9, 3 note C#, 2 - ;vibrato_type 8 - channel_volume 6 +; vibrato_type 8 + volume_envelope 6, 0 note D#, 4 note E_, 6 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 inc_octave inc_octave - ;vibrato_type 1 +; vibrato_type 1 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 note C#, 1 note D_, 3 note C#, 2 @@ -440,10 +440,10 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) dec_octave dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 note D_, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 inc_octave note A_, 4 note F#, 2 @@ -458,7 +458,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note D_, 6 dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 note D_, 4 rest 2 dec_octave @@ -466,7 +466,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) rest 4 note A_, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 inc_octave inc_octave note F_, 1 @@ -475,7 +475,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note C#, 4 dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 note D_, 4 rest 2 dec_octave @@ -485,14 +485,14 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) inc_octave inc_octave duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 note E_, 1 note F_, 3 note D_, 2 note C#, 4 dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 note D_, 4 rest 2 dec_octave @@ -501,7 +501,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note B_, 2 inc_octave duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 note E_, 4 note G#, 2 note B_, 4 @@ -509,15 +509,15 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note E_, 2 rest 4 dec_octave - ;vibrato_type 8 +; vibrato_type 8 duty_cycle 0 - channel_volume 6 + volume_envelope 6, 0 note A#, 2 - channel_volume 3 + volume_envelope 3, 7 note A#, 2 rest 2 inc_octave - channel_volume 6 + volume_envelope 6, 0 note C_, 1 note C#, 5 dec_octave @@ -526,49 +526,49 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) rest 2 note G#, 1 note A_, 5 - channel_volume 9 + volume_envelope 9, 3 note D_, 2 - channel_volume 6 + volume_envelope 6, 0 note F#, 4 note D_, 2 note F#, 4 dec_octave - channel_volume 9 + volume_envelope 9, 3 note A_, 4 rest 2 - channel_volume 6 + volume_envelope 6, 0 inc_octave note G#, 1 note A_, 5 - channel_volume 9 + volume_envelope 9, 3 note D_, 2 - channel_volume 6 + volume_envelope 6, 0 note F#, 4 note D_, 2 note F#, 4 dec_octave - channel_volume 9 + volume_envelope 9, 3 note A_, 4 rest 2 inc_octave - channel_volume 6 + volume_envelope 6, 0 note G#, 1 note A_, 5 - channel_volume 9 + volume_envelope 9, 3 note D_, 2 - channel_volume 6 + volume_envelope 6, 0 note A_, 4 rest 2 note A_, 4 dec_octave - channel_volume 9 + volume_envelope 9, 3 note A_, 2 inc_octave - channel_volume 6 + volume_envelope 6, 0 note A_, 4 note G#, 12 dec_octave - channel_volume 9 + volume_envelope 9, 3 note A_, 4 rest 2 note B_, 4 @@ -578,13 +578,13 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) sound_loop 0, .MainLoop -Music_Club1_Ch3: ; f9ec4 (3e:5ec4) +Music_Club1_Ch3: speed 5 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 96 - ;cutoff 7 +; echo 96 +; cutoff 7 octave 2 note A_, 2 rest 2 @@ -597,16 +597,16 @@ Music_Club1_Ch3: ; f9ec4 (3e:5ec4) note A#, 2 rest 4 note B_, 2 - ;cutoff 4 +; cutoff 4 note B_, 2 - ;cutoff 7 +; cutoff 7 note F#, 2 note F_, 2 inc_octave - ;cutoff 4 +; cutoff 4 note D_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note E_, 2 rest 4 inc_octave @@ -617,267 +617,267 @@ Music_Club1_Ch3: ; f9ec4 (3e:5ec4) octave 2 note A_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note C#, 6 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 - ;cutoff 7 +; cutoff 7 note C#, 6 dec_octave note A#, 4 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note C#, 2 dec_octave dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 sound_call Branch_fa01a octave 2 - ;cutoff 7 +; cutoff 7 note A_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note C#, 6 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F_, 4 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note C#, 2 dec_octave dec_octave - ;cutoff 7 +; cutoff 7 note F#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 - ;cutoff 7 +; cutoff 7 note C#, 6 dec_octave note A#, 4 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 2 dec_octave dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 sound_call Branch_fa01a octave 2 - ;cutoff 7 +; cutoff 7 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D_, 4 rest 2 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D_, 4 rest 2 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note C#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note E_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note C#, 6 note E_, 4 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 2 dec_octave dec_octave - ;cutoff 7 +; cutoff 7 note F_, 6 note F#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A#, 2 - ;cutoff 7 +; cutoff 7 note C#, 6 dec_octave note A#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 note B_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 note A_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note A#, 4 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note D_, 2 dec_octave dec_octave - ;cutoff 7 +; cutoff 7 note B_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 6 +; cutoff 6 note E_, 6 - ;cutoff 7 +; cutoff 7 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 - ;cutoff 7 +; cutoff 7 note E_, 4 - ;cutoff 4 +; cutoff 4 note G#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note G#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note G#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note B_, 2 - ;cutoff 7 +; cutoff 7 sound_loop 0, .MainLoop Branch_fa01a: octave 2 note B_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note C#, 6 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D#, 6 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note B_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note B_, 6 note G#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note B_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note E_, 2 sound_ret -Music_Club1_Ch4: ; fa044 (3e:6044) +Music_Club1_Ch4: toggle_noise 6 drum_speed 5 octave 1 @@ -925,4 +925,3 @@ Branch_fa06f: drum_note 4, 2 sound_loop 15, .Loop2 sound_ret -; 0xfa077 diff --git a/crysaudio/music/TCG/club2.asm b/crysaudio/music/TCG/club2.asm index 6a404acd..0e574ad4 100644 --- a/crysaudio/music/TCG/club2.asm +++ b/crysaudio/music/TCG/club2.asm @@ -4,59 +4,51 @@ Music_Club2: channel 2, Music_Club2_Ch2 channel 3, Music_Club2_Ch3 -Music_Club2_Ch1: ; fa077 (3e:6077) +Music_Club2_Ch1: speed 6 duty_cycle 2 - ;stereo_panning 1, 1 - fade_wave 6 + stereo_panning TRUE, TRUE +; cutoff 8 .MainLoop octave 4 .Loop1 - channel_volume 7 + volume_envelope 7, 5 note G_, 4 note E_, 4 note C_, 4 - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note F#, 4 - ;tie - fade_wave 6 +; tie note F#, 16 - channel_volume 7 + volume_envelope 7, 5 note G_, 4 note A_, 4 note B_, 4 - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note F#, 4 - ;tie - fade_wave 6 +; tie note F#, 16 sound_loop 8, .Loop1 - channel_volume 7 + volume_envelope 7, 5 note G_, 4 note D_, 4 dec_octave note B_, 4 inc_octave - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note B_, 4 - ;tie - fade_wave 6 +; tie note B_, 16 - channel_volume 7 + volume_envelope 7, 5 note G_, 4 note D_, 4 note C_, 4 - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note B_, 4 - ;tie - fade_wave 6 +; tie note B_, 16 dec_octave - channel_volume 7 + volume_envelope 7, 5 note F#, 4 dec_octave note D_, 4 @@ -91,93 +83,83 @@ Music_Club2_Ch1: ; fa077 (3e:6077) note F#, 4 note A_, 4 note A_, 3 - ;tie +; tie speed 1 note A_, 3 inc_octave - channel_volume 7 + volume_envelope 7, 7 rest 4 note D_, 5 - ;tie +; tie speed 6 - fade_wave 0 note D_, 15 - ;tie - fade_wave 6 +; tie note D_, 16 sound_loop 0, .MainLoop -Music_Club2_Ch2: ; fa0e3 (3e:60e3) +Music_Club2_Ch2: speed 6 duty_cycle 2 - ;stereo_panning 1, 1 - fade_wave 6 + stereo_panning TRUE, TRUE +; cutoff 8 .MainLoop octave 2 .Loop1 - channel_volume 7 + volume_envelope 7, 5 note C_, 4 note G_, 4 inc_octave note G_, 4 inc_octave - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note D_, 4 - ;tie - fade_wave 6 +; tie note D_, 16 dec_octave dec_octave - channel_volume 7 + volume_envelope 7, 5 note C_, 4 note G_, 4 inc_octave inc_octave note C_, 4 - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note D_, 4 - ;tie - fade_wave 6 +; tie note D_, 16 dec_octave dec_octave sound_loop 8, .Loop1 dec_octave - channel_volume 7 + volume_envelope 7, 5 note B_, 4 inc_octave note G_, 4 inc_octave note G_, 4 inc_octave - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note G_, 4 - ;tie - fade_wave 6 +; tie note G_, 16 dec_octave dec_octave dec_octave - channel_volume 7 + volume_envelope 7, 5 note A_, 4 inc_octave note A_, 4 inc_octave note A_, 4 inc_octave - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note C_, 4 - ;tie - fade_wave 6 +; tie note C_, 16 dec_octave dec_octave - channel_volume 7 + volume_envelope 7, 5 note D_, 4 octave 2 note F#, 4 @@ -213,37 +195,35 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) inc_octave note D_, 4 note E_, 3 - ;tie +; tie speed 1 note E_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 4 note A_, 8 inc_octave - channel_volume 7 + volume_envelope 7, 7 note F#, 7 - ;tie +; tie speed 6 - fade_wave 0 note F#, 14 - ;tie - fade_wave 6 +; tie note F#, 16 sound_loop 0, .MainLoop -Music_Club2_Ch3: ; fa164 (3e:6164) +Music_Club2_Ch3: speed 6 channel_volume 1 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE fade_wave 10 - ;vibrato_type 4 +; vibrato_type 4 vibrato 35, 3, 3 - ;cutoff 6 - ;echo 64 +; cutoff 6 +; echo 64 .MainLoop channel_volume 3 - ;cutoff 8 +; cutoff 8 rest 2 octave 5 note G_, 4 @@ -259,89 +239,89 @@ Music_Club2_Ch3: ; fa164 (3e:6164) rest 2 rest 14 channel_volume 2 - ;echo 96 +; echo 96 sound_call Branch_fa1cf octave 5 - ;cutoff 8 +; cutoff 8 note G_, 8 sound_call Branch_fa1cf - ;echo 64 +; echo 64 channel_volume 1 octave 4 - ;cutoff 8 +; cutoff 8 note G_, 8 sound_call Branch_fa1f3 octave 4 note G_, 16 - ;tie +; tie note G_, 12 rest 16 rest 8 - ;cutoff 8 +; cutoff 8 note E_, 8 sound_call Branch_fa1f3 octave 4 note G_, 16 - ;tie +; tie note G_, 12 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 8 rest 4 - ;cutoff 8 +; cutoff 8 note A_, 2 note G_, 2 - ;cutoff 6 +; cutoff 6 note F#, 16 - ;tie +; tie note F#, 12 rest 4 note F#, 1 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 12 rest 4 note G#, 1 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 16 rest 16 rest 16 - ;echo 96 +; echo 96 sound_loop 0, .MainLoop Branch_fa1cf: - ;cutoff 6 +; cutoff 6 octave 6 note C#, 1 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 12 - ;cutoff 8 +; cutoff 8 note C_, 2 dec_octave note B_, 2 - ;cutoff 6 +; cutoff 6 note G_, 16 - ;tie +; tie note G_, 8 rest 4 - ;cutoff 8 +; cutoff 8 note E_, 4 note B_, 4 inc_octave note C_, 4 dec_octave note B_, 4 - ;cutoff 6 +; cutoff 6 note A_, 16 - ;tie +; tie note A_, 8 - ;tie +; tie note A_, 16 rest 4 sound_ret @@ -349,21 +329,21 @@ Branch_fa1cf: Branch_fa1f3: octave 5 note C#, 1 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 4 note E_, 4 dec_octave note B_, 4 inc_octave note C_, 4 - ;cutoff 6 +; cutoff 6 note D_, 16 - ;tie +; tie note D_, 8 rest 4 - ;cutoff 8 +; cutoff 8 note C_, 2 dec_octave note B_, 2 @@ -371,6 +351,5 @@ Branch_fa1f3: note C_, 2 dec_octave note B_, 2 - ;cutoff 6 +; cutoff 6 sound_ret -; 0xfa210 diff --git a/crysaudio/music/TCG/club3.asm b/crysaudio/music/TCG/club3.asm index 2ff0b16c..3b2cf004 100644 --- a/crysaudio/music/TCG/club3.asm +++ b/crysaudio/music/TCG/club3.asm @@ -5,60 +5,60 @@ Music_Club3: channel 3, Music_Club3_Ch3 channel 4, Music_Club3_Ch4 -Music_Club3_Ch1: ; fa210 (3e:6210) +Music_Club3_Ch1: speed 9 - ;stereo_panning 1, 1 - ;vibrato_type 5 + stereo_panning TRUE, TRUE +; vibrato_type 5 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 .MainLoop duty_cycle 0 .Loop1 octave 2 - channel_volume 9 + volume_envelope 9, 0 rest 4 note G_, 2 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 inc_octave - channel_volume 9 + volume_envelope 9, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 dec_octave - channel_volume 9 + volume_envelope 9, 0 note A#, 6 - ;tie +; tie note A#, 12 - channel_volume 3 + volume_envelope 3, 7 note A#, 4 rest 4 - channel_volume 9 + volume_envelope 9, 0 note G_, 2 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 inc_octave - channel_volume 9 + volume_envelope 9, 0 speed 1 note C_, 5 - ;tie +; tie note C#, 4 - ;tie +; tie speed 9 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note A#, 6 - ;tie +; tie note A#, 12 - channel_volume 3 + volume_envelope 3, 7 note A#, 4 sound_loop 2, .Loop1 duty_cycle 1 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 sound_call Branch_fa330 sound_call Branch_fa403 note A#, 1 @@ -86,19 +86,19 @@ Music_Club3_Ch1: ; fa210 (3e:6210) octave 2 note G_, 1 inc_octave - fade_wave 8 +; cutoff 8 speed 1 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 4 speed 9 - channel_volume 8 + volume_envelope 8, 0 note C#, 1 note C_, 1 dec_octave note A#, 1 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 sound_call Branch_fa330 sound_call Branch_fa403 inc_octave @@ -129,9 +129,9 @@ Music_Club3_Ch1: ; fa210 (3e:6210) note G_, 1 octave 4 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 - fade_wave 8 +; cutoff 8 note G_, 5 note C#, 4 note C_, 5 @@ -143,7 +143,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave note A#, 4 duty_cycle 1 - fade_wave 7 +; cutoff 7 speed 9 sound_call Branch_fa370 sound_call Branch_fa403 @@ -172,13 +172,13 @@ Music_Club3_Ch1: ; fa210 (3e:6210) octave 2 note G_, 1 inc_octave - fade_wave 8 +; cutoff 8 speed 1 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 4 speed 9 - channel_volume 8 + volume_envelope 8, 0 note C#, 1 note C_, 1 dec_octave @@ -214,8 +214,8 @@ Music_Club3_Ch1: ; fa210 (3e:6210) inc_octave duty_cycle 2 speed 1 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 note G_, 5 note C#, 4 note C_, 5 @@ -227,7 +227,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave note A#, 4 speed 9 - fade_wave 8 +; cutoff 8 sound_loop 0, .MainLoop Branch_fa330: @@ -252,11 +252,11 @@ Branch_fa330: note A#, 1 dec_octave speed 1 - fade_wave 8 +; cutoff 8 note F_, 5 note F#, 4 speed 9 - fade_wave 7 +; cutoff 7 note G_, 1 inc_octave note E_, 1 @@ -294,8 +294,8 @@ Branch_fa330: Branch_fa370: octave 2 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 inc_octave note D_, 1 @@ -316,54 +316,54 @@ Branch_fa370: note A#, 1 dec_octave speed 1 - fade_wave 8 +; cutoff 8 note F_, 5 note F#, 4 octave 4 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note G_, 3 - channel_volume 1 + volume_envelope 1, 7 note G_, 2 inc_octave - channel_volume 7 + volume_envelope 7, 0 note D_, 2 - channel_volume 1 + volume_envelope 1, 7 dec_octave note G_, 2 inc_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 3 - channel_volume 1 + volume_envelope 1, 7 note D_, 2 - channel_volume 7 + volume_envelope 7, 0 note D_, 2 - channel_volume 1 + volume_envelope 1, 7 note G_, 2 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 3 - channel_volume 1 + volume_envelope 1, 7 inc_octave note D_, 2 - channel_volume 7 + volume_envelope 7, 0 note D_, 2 - channel_volume 1 + volume_envelope 1, 7 dec_octave note G_, 2 inc_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 3 - channel_volume 1 + volume_envelope 1, 7 note D_, 2 - channel_volume 7 + volume_envelope 7, 0 note D_, 2 - channel_volume 1 + volume_envelope 1, 7 note G_, 2 speed 9 duty_cycle 1 - fade_wave 7 - channel_volume 9 +; cutoff 7 + volume_envelope 9, 3 octave 2 note G_, 1 inc_octave @@ -389,8 +389,8 @@ Branch_fa370: octave 5 duty_cycle 2 speed 1 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 octave 5 note G_, 5 note C#, 4 @@ -404,8 +404,8 @@ Branch_fa370: note A#, 4 speed 9 duty_cycle 1 - fade_wave 7 - channel_volume 9 +; cutoff 7 + volume_envelope 9, 3 sound_ret Branch_fa403: @@ -430,59 +430,59 @@ Branch_fa403: note A#, 1 dec_octave speed 1 - fade_wave 8 +; cutoff 8 note F_, 5 note F#, 4 speed 9 - fade_wave 7 +; cutoff 7 note G_, 1 sound_ret -Music_Club3_Ch2: ; fa423 (3e:6423) +Music_Club3_Ch2: speed 9 - ;stereo_panning 1, 1 - ;vibrato_type 5 + stereo_panning TRUE, TRUE +; vibrato_type 5 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 .MainLoop duty_cycle 0 .Loop1 octave 2 - channel_volume 7 + volume_envelope 7, 0 rest 4 note D_, 2 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 7 + volume_envelope 7, 0 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 - channel_volume 7 + volume_envelope 7, 0 note E_, 6 - ;tie +; tie note E_, 12 - channel_volume 3 + volume_envelope 3, 7 note E_, 4 rest 4 - channel_volume 7 + volume_envelope 7, 0 note D_, 2 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 7 + volume_envelope 7, 0 speed 1 note F_, 5 - ;tie +; tie note F#, 4 speed 9 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 7 + volume_envelope 7, 0 note E_, 6 - ;tie +; tie note E_, 12 - channel_volume 3 + volume_envelope 3, 7 note E_, 4 sound_loop 2, .Loop1 duty_cycle 1 @@ -491,107 +491,107 @@ Music_Club3_Ch2: ; fa423 (3e:6423) speed 9 rest 1 inc_octave - channel_volume 8 + volume_envelope 8, 0 speed 1 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note F_, 5 note F#, 4 inc_octave speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 3 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 dec_octave - channel_volume 9 + volume_envelope 9, 3 note D_, 1 inc_octave inc_octave - channel_volume 8 + volume_envelope 8, 0 speed 1 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 - channel_volume 9 + volume_envelope 9, 3 speed 9 rest 1 dec_octave speed 1 - fade_wave 8 +; cutoff 8 note G_, 5 note D_, 4 dec_octave note A#, 5 - channel_volume 3 + volume_envelope 3, 7 note A#, 4 inc_octave inc_octave - channel_volume 9 + volume_envelope 9, 3 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 8 + volume_envelope 8, 0 rest 1 dec_octave speed 1 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note F_, 5 note F#, 4 inc_octave speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note A#, 1 - channel_volume 3 + volume_envelope 3, 7 note A#, 2 inc_octave - channel_volume 9 + volume_envelope 9, 3 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 dec_octave - channel_volume 9 + volume_envelope 9, 3 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 dec_octave speed 1 - channel_volume 8 + volume_envelope 8, 0 note A#, 5 - channel_volume 3 + volume_envelope 3, 7 note C_, 4 speed 9 rest 1 dec_octave - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 note A#, 1 note B_, 1 inc_octave @@ -601,99 +601,99 @@ Music_Club3_Ch2: ; fa423 (3e:6423) rest 1 inc_octave speed 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note F_, 5 note F#, 4 inc_octave speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 3 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 - channel_volume 9 + volume_envelope 9, 3 note D_, 1 inc_octave - channel_volume 8 + volume_envelope 8, 0 speed 1 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 4 speed 9 rest 1 dec_octave dec_octave speed 1 - channel_volume 8 + volume_envelope 8, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 4 inc_octave - channel_volume 8 + volume_envelope 8, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 rest 1 rest 1 speed 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note F_, 5 note F#, 4 inc_octave inc_octave speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 2 - channel_volume 9 + volume_envelope 9, 3 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 3 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 8 + volume_envelope 8, 0 speed 1 note F_, 5 - channel_volume 3 + volume_envelope 3, 7 note F_, 4 - channel_volume 8 + volume_envelope 8, 0 speed 9 rest 1 dec_octave - fade_wave 8 +; cutoff 8 note D_, 1 note D#, 1 note E_, 1 @@ -703,115 +703,115 @@ Music_Club3_Ch2: ; fa423 (3e:6423) Branch_fa5a6: octave 3 rest 1 - channel_volume 8 + volume_envelope 8, 0 speed 1 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 note F_, 5 note F#, 4 inc_octave speed 9 - fade_wave 7 - channel_volume 9 +; cutoff 7 + volume_envelope 9, 3 note G_, 1 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 3 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 - channel_volume 9 + volume_envelope 9, 3 note E_, 1 inc_octave - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 speed 1 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 - channel_volume 8 + volume_envelope 8, 0 speed 9 rest 1 dec_octave speed 1 - fade_wave 8 +; cutoff 8 note G_, 5 note D_, 4 dec_octave note A#, 5 - channel_volume 3 + volume_envelope 3, 7 note A#, 4 - channel_volume 8 + volume_envelope 8, 0 inc_octave inc_octave note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 rest 1 dec_octave speed 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 note F_, 5 note F#, 4 speed 9 inc_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note A#, 1 - channel_volume 3 + volume_envelope 3, 7 note A#, 2 inc_octave - channel_volume 9 + volume_envelope 9, 3 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 dec_octave - channel_volume 9 + volume_envelope 9, 3 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 3 note A#, 1 - channel_volume 3 + volume_envelope 3, 7 note A#, 1 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note A#, 1 - channel_volume 3 + volume_envelope 3, 7 note A#, 2 sound_ret -Music_Club3_Ch3: ; fa63e (3e:663e) +Music_Club3_Ch3: speed 9 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 0 - ;cutoff 8 +; echo 0 +; cutoff 8 .Loop1 octave 2 note G_, 1 @@ -836,11 +836,11 @@ Music_Club3_Ch3: ; fa63e (3e:663e) octave 2 note G_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 inc_octave note F_, 1 @@ -853,25 +853,25 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note G_, 1 rest 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 note F_, 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 inc_octave note F_, 1 @@ -884,21 +884,21 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note G_, 1 rest 1 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note E_, 1 octave 2 note F_, 1 note F#, 1 note D#, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note D#, 1 inc_octave note D_, 1 @@ -911,25 +911,25 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note D#, 1 rest 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 note C#, 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note D#, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note D#, 1 inc_octave note D_, 1 @@ -942,22 +942,22 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note D#, 1 rest 1 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 1 rest 1 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 note D#, 1 note E_, 1 dec_octave note C_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 note A#, 1 inc_octave @@ -970,25 +970,25 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note C_, 1 rest 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 note A#, 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 note A#, 1 inc_octave @@ -1001,21 +1001,21 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note C_, 1 rest 1 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note E_, 1 octave 2 note A#, 1 note B_, 1 note D_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note D_, 1 inc_octave note C_, 1 @@ -1028,23 +1028,23 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note D_, 1 rest 1 octave 5 - ;cutoff 4 +; cutoff 4 note C_, 1 rest 1 octave 3 - ;cutoff 6 +; cutoff 6 note A#, 1 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 note C#, 1 note D_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note D_, 1 inc_octave note C_, 1 @@ -1056,11 +1056,11 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note F_, 1 rest 1 inc_octave - ;cutoff 4 +; cutoff 4 note A#, 1 rest 1 dec_octave - ;cutoff 8 +; cutoff 8 note A#, 1 note B_, 1 inc_octave @@ -1069,7 +1069,7 @@ Music_Club3_Ch3: ; fa63e (3e:663e) sound_loop 0, Music_Club3_Ch3 -Music_Club3_Ch4: ; fa772 (3e:6772) +Music_Club3_Ch4: toggle_noise 6 drum_speed 9 octave 1 @@ -1107,4 +1107,3 @@ Branch_fa796: drum_note 5, 1 drum_note 1, 1 sound_ret -; 0xfa7a0 diff --git a/crysaudio/music/TCG/credits.asm b/crysaudio/music/TCG/credits.asm index 82c1a641..7b839002 100644 --- a/crysaudio/music/TCG/credits.asm +++ b/crysaudio/music/TCG/credits.asm @@ -5,1111 +5,245 @@ Music_TCGCredits: channel 3, Music_TCGCredits_Ch3 channel 4, Music_TCGCredits_Ch4 -Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) +Music_TCGCredits_Ch1: speed 13 - ;stereo_panning 1, 1 - ;vibrato_type 1 + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 2 duty_cycle 1 - channel_volume 5 + volume_envelope 4, -7 note F_, 1 - channel_volume 6 + volume_envelope 6, 0 note F_, 2 - ;tie +; tie speed 1 note F_, 6 - channel_volume 3 + volume_envelope 3, 7 note F_, 7 speed 13 - channel_volume 7 + volume_envelope 6, -7 note G_, 1 - channel_volume 7 + volume_envelope 7, 0 note G_, 2 - ;tie +; tie speed 1 note G_, 6 - channel_volume 4 + volume_envelope 4, 7 note G_, 7 speed 13 - channel_volume 7 + volume_envelope 6, -7 note A_, 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 2 - ;tie +; tie speed 1 note A_, 6 - channel_volume 4 + volume_envelope 4, 7 note A_, 7 speed 13 - channel_volume 8 + volume_envelope 8, 0 note B_, 3 - channel_volume 4 + volume_envelope 4, 7 note B_, 1 inc_octave - channel_volume 8 + volume_envelope 8, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 sound_call Branch_fb5bc octave 2 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - ; - ;sound_call Branch_fb36b - speed 13 - octave 2 - channel_volume 8 - note A_, 1 - rest 1 - note G_, 1 - channel_volume 3 - note G_, 1 - channel_volume 8 - note A_, 1 - note B_, 1 - inc_octave - note C_, 1 - channel_volume 3 - note C_, 1 - rest 1 - sound_call Branch_fb5bc - octave 2 - note A_, 2 - note A_, 1 - channel_volume 3 - note A_, 1 - channel_volume 8 - note A_, 1 - channel_volume 3 - note A_, 1 - channel_volume 8 - note B_, 1 - inc_octave - sound_call Branch_fb5e4 + sound_call Branch_fb36b octave 4 - channel_volume 10 - note C_, 1 - channel_volume 3 - note C_, 1 - dec_octave - channel_volume 10 - note G_, 4 - ;tie - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - note E_, 1 - note F_, 1 - speed 1 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 4 - channel_volume 3 - note G_, 1 - channel_volume 10 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - 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 - note E_, 3 - note D_, 13 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - speed 13 - note D_, 4 - ;tie - note D_, 8 - channel_volume 3 - note D_, 2 - sound_call Branch_fb5e4 - octave 4 - channel_volume 10 - note E_, 1 - channel_volume 3 - note E_, 1 - dec_octave - channel_volume 10 - note G_, 4 - ;tie - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - note E_, 1 - note F_, 1 - speed 1 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - note G_, 3 - note G#, 10 - ;tie - note G#, 13 - channel_volume 3 - note G#, 13 - inc_octave - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 2 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - note C_, 1 - note D_, 1 - channel_volume 3 - note D_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 3 note E_, 10 - ;tie - speed 13 - note E_, 8 - sound_call Branch_fb60c - speed 13 - octave 4 - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - speed 1 - note F#, 3 - note G_, 10 - channel_volume 3 - note G_, 13 - channel_volume 10 - note F_, 13 - channel_volume 3 - note F_, 13 - channel_volume 10 - note E_, 13 - channel_volume 3 - note E_, 13 - channel_volume 10 - note E_, 6 - note F_, 7 - note E_, 13 - dec_octave - note A_, 6 - channel_volume 3 - note A_, 7 - inc_octave - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note F_, 6 - channel_volume 3 - note F_, 13 - rest 7 - channel_volume 10 - note A_, 13 - inc_octave - note C_, 6 - channel_volume 3 - note C_, 7 - channel_volume 10 - note D#, 3 - note E_, 10 - ;tie - note E_, 13 - note F_, 6 - channel_volume 3 - note F_, 7 - channel_volume 10 - note E_, 6 - channel_volume 3 - note E_, 7 - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 13 - rest 7 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - note D_, 13 - note C#, 6 - note C_, 7 - dec_octave - note B_, 13 - inc_octave - note C_, 6 - channel_volume 3 - note C_, 7 - channel_volume 10 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - speed 13 - note E_, 5 - sound_call Branch_fb60c - speed 13 - octave 4 - note G_, 3 - channel_volume 3 - note G_, 1 - channel_volume 10 - note G_, 1 - speed 1 - note A_, 6 - channel_volume 3 - note A_, 7 - channel_volume 10 - note B_, 6 - channel_volume 3 - note B_, 7 - channel_volume 10 - note B_, 3 - inc_octave - note C_, 10 - channel_volume 3 - note C_, 13 - dec_octave - channel_volume 10 - note F#, 3 - note G_, 10 - channel_volume 3 - note G_, 13 - channel_volume 10 - note F_, 13 - channel_volume 3 - note F_, 13 - channel_volume 10 - note E_, 13 - channel_volume 3 - note E_, 13 - channel_volume 10 - note E_, 3 - note F_, 10 - ;tie - note F_, 13 - note E_, 13 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note A_, 6 - channel_volume 3 - note A_, 7 - rest 13 - inc_octave - channel_volume 10 - note C_, 13 - dec_octave - note A_, 6 - channel_volume 3 - note A_, 7 - inc_octave - channel_volume 10 - note E_, 3 - note F_, 10 - ;tie - note F_, 13 - note E_, 13 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note G#, 6 - channel_volume 3 - note G#, 7 - rest 13 - inc_octave - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 7 - rest 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 8 - channel_volume 3 - note G_, 1 - dec_octave - dec_octave - channel_volume 8 - note G_, 1 - channel_volume 2 - note G_, 1 - channel_volume 8 - note A_, 1 - channel_volume 2 - note A_, 1 - channel_volume 8 - note B_, 1 - speed 1 - channel_volume 10 - note G_, 3 - note A_, 3 - note B_, 3 - inc_octave - note C_, 4 - note D_, 3 - note E_, 3 - note F_, 3 - note G_, 4 - sound_call Branch_fb651 - octave 3 - channel_volume 10 - note G#, 3 - note A_, 10 - ;tie - note A_, 13 - channel_volume 3 - note A_, 13 - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - note G_, 13 - channel_volume 3 - note G_, 13 - channel_volume 10 - note D#, 3 - note E_, 10 - channel_volume 3 - note E_, 13 - channel_volume 10 - note D_, 13 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - speed 13 - note D_, 4 - ;tie - note D_, 8 - channel_volume 3 - note D_, 1 - dec_octave - channel_volume 8 - note G_, 1 - speed 1 - note A_, 6 - channel_volume 2 - note A_, 7 - channel_volume 8 - note B_, 6 - channel_volume 2 - note B_, 7 - sound_call Branch_fb651 - octave 3 - channel_volume 10 - note G_, 3 - note G#, 10 - ;tie - note G#, 13 - channel_volume 3 - note G#, 13 - inc_octave - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 2 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - note C_, 1 - note D_, 1 - channel_volume 3 - note D_, 1 - ; - octave 4 - channel_volume 10 - speed 1 - note D#, 3 - note E_, 10 - ;tie +; tie speed 13 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 1 speed 1 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 8 speed 13 - channel_volume 10 + volume_envelope 10, 0 note E_, 5 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 1 speed 1 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 8 speed 13 - channel_volume 10 + volume_envelope 10, 0 note C_, 5 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave speed 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 6 - channel_volume 3 + volume_envelope 3, 7 note A_, 13 rest 7 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 2 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 3 note G_, 10 - ;tie +; tie speed 13 note G_, 3 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 speed 1 note A_, 5 - channel_volume 3 + volume_envelope 3, 7 note A_, 8 - channel_volume 10 + volume_envelope 10, 0 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 8 - channel_volume 10 + volume_envelope 10, 0 note B_, 3 inc_octave note C_, 10 - ;tie +; tie speed 13 note C_, 2 - ;tie +; tie speed 1 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 13 rest 7 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 3 inc_octave note C_, 10 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 8 - channel_volume 10 + volume_envelope 10, 0 note E_, 5 - channel_volume 3 + volume_envelope 3, 7 note E_, 8 speed 13 - channel_volume 10 + volume_envelope 10, 0 note F_, 3 note E_, 1 speed 1 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 13 rest 7 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 6 - channel_volume 3 + volume_envelope 3, 7 note A_, 13 rest 7 - channel_volume 10 + volume_envelope 10, 0 note B_, 3 inc_octave note C_, 10 - ;tie +; tie speed 13 note C_, 2 - ;tie +; tie speed 1 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 13 rest 7 - channel_volume 10 + volume_envelope 10, 0 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 2 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 8 - ;tie +; tie note C_, 8 - ;tie +; tie note C_, 8 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - ; - ;sound_call Branch_fb36b - speed 13 - octave 2 - channel_volume 8 - note A_, 1 - rest 1 - note G_, 1 - channel_volume 3 - note G_, 1 - channel_volume 8 - note A_, 1 - note B_, 1 - inc_octave - note C_, 1 - channel_volume 3 - note C_, 1 - rest 1 - sound_call Branch_fb5bc - octave 2 - note A_, 2 - note A_, 1 - channel_volume 3 - note A_, 1 - channel_volume 8 - note A_, 1 - channel_volume 3 - note A_, 1 - channel_volume 8 - note B_, 1 - inc_octave - sound_call Branch_fb5e4 - octave 4 - channel_volume 10 - note C_, 1 - channel_volume 3 - note C_, 1 - dec_octave - channel_volume 10 - note G_, 4 - ;tie - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - note E_, 1 - note F_, 1 - speed 1 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 4 - channel_volume 3 - note G_, 1 - channel_volume 10 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - 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 - note E_, 3 - note D_, 13 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - speed 13 - note D_, 4 - ;tie - note D_, 8 - channel_volume 3 - note D_, 2 - sound_call Branch_fb5e4 - octave 4 - channel_volume 10 - note E_, 1 - channel_volume 3 - note E_, 1 - dec_octave - channel_volume 10 - note G_, 4 - ;tie - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - note E_, 1 - note F_, 1 - speed 1 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - note G_, 3 - note G#, 10 - ;tie - note G#, 13 - channel_volume 3 - note G#, 13 - inc_octave - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 2 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - note C_, 1 - note D_, 1 - channel_volume 3 - note D_, 1 - channel_volume 10 - speed 1 - note D#, 3 - note E_, 10 - ;tie - speed 13 - note E_, 8 - sound_call Branch_fb60c - speed 13 - octave 4 - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - speed 1 - note F#, 3 - note G_, 10 - channel_volume 3 - note G_, 13 - channel_volume 10 - note F_, 13 - channel_volume 3 - note F_, 13 - channel_volume 10 - note E_, 13 - channel_volume 3 - note E_, 13 - channel_volume 10 - note E_, 6 - note F_, 7 - note E_, 13 - dec_octave - note A_, 6 - channel_volume 3 - note A_, 7 - inc_octave - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note F_, 6 - channel_volume 3 - note F_, 13 - rest 7 - channel_volume 10 - note A_, 13 - inc_octave - note C_, 6 - channel_volume 3 - note C_, 7 - channel_volume 10 - note D#, 3 - note E_, 10 - ;tie - note E_, 13 - note F_, 6 - channel_volume 3 - note F_, 7 - channel_volume 10 - note E_, 6 - channel_volume 3 - note E_, 7 - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 13 - rest 7 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - note D_, 13 - note C#, 6 - note C_, 7 - dec_octave - note B_, 13 - inc_octave - note C_, 6 - channel_volume 3 - note C_, 7 - channel_volume 10 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - speed 13 - note E_, 5 - sound_call Branch_fb60c - speed 13 - octave 4 - note G_, 3 - channel_volume 3 - note G_, 1 - channel_volume 10 - note G_, 1 - speed 1 - note A_, 6 - channel_volume 3 - note A_, 7 - channel_volume 10 - note B_, 6 - channel_volume 3 - note B_, 7 - channel_volume 10 - note B_, 3 - inc_octave - note C_, 10 - channel_volume 3 - note C_, 13 - dec_octave - channel_volume 10 - note F#, 3 - note G_, 10 - channel_volume 3 - note G_, 13 - channel_volume 10 - note F_, 13 - channel_volume 3 - note F_, 13 - channel_volume 10 - note E_, 13 - channel_volume 3 - note E_, 13 - channel_volume 10 - note E_, 3 - note F_, 10 - ;tie - note F_, 13 - note E_, 13 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note A_, 6 - channel_volume 3 - note A_, 7 - rest 13 - inc_octave - channel_volume 10 - note C_, 13 - dec_octave - note A_, 6 - channel_volume 3 - note A_, 7 - inc_octave - channel_volume 10 - note E_, 3 - note F_, 10 - ;tie - note F_, 13 - note E_, 13 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note G#, 6 - channel_volume 3 - note G#, 7 - rest 13 - inc_octave - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 7 - rest 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 8 - channel_volume 3 - note G_, 1 - dec_octave - dec_octave - channel_volume 8 - note G_, 1 - channel_volume 2 - note G_, 1 - channel_volume 8 - note A_, 1 - channel_volume 2 - note A_, 1 - channel_volume 8 - note B_, 1 - speed 1 - channel_volume 10 - note G_, 3 - note A_, 3 - note B_, 3 - inc_octave - note C_, 4 - note D_, 3 - note E_, 3 - note F_, 3 - note G_, 4 - sound_call Branch_fb651 - octave 3 - channel_volume 10 - note G#, 3 - note A_, 10 - ;tie - note A_, 13 - channel_volume 3 - note A_, 13 - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - note G_, 13 - channel_volume 3 - note G_, 13 - channel_volume 10 - note D#, 3 - note E_, 10 - channel_volume 3 - note E_, 13 - channel_volume 10 - note D_, 13 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - speed 13 - note D_, 4 - ;tie - note D_, 8 - channel_volume 3 - note D_, 1 - dec_octave - channel_volume 8 - note G_, 1 - speed 1 - note A_, 6 - channel_volume 2 - note A_, 7 - channel_volume 8 - note B_, 6 - channel_volume 2 - note B_, 7 - sound_call Branch_fb651 - octave 3 - channel_volume 10 - note G_, 3 - note G#, 10 - ;tie - note G#, 13 - channel_volume 3 - note G#, 13 - inc_octave - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 2 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - note C_, 1 - note D_, 1 - channel_volume 3 - note D_, 1 - ; + sound_call Branch_fb36b octave 4 speed 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 note D#, 10 - ;tie +; tie speed 13 note D#, 4 - channel_volume 3 + volume_envelope 3, 7 note D#, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 1 speed 1 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 7 - channel_volume 10 + volume_envelope 10, 0 note E_, 3 note F_, 10 - ;tie +; tie speed 13 note F_, 3 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note D#, 1 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 speed 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 3 note G_, 10 - ;tie +; tie speed 13 note G_, 4 dec_octave dec_octave speed 1 - channel_volume 9 + volume_envelope 9, 0 note E_, 6 note A_, 7 inc_octave @@ -1123,40 +257,742 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note D_, 7 speed 13 note E_, 8 - ;tie +; tie note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 sound_ret -Branch_fb5bc: +Branch_fb36b: + speed 13 + octave 2 + volume_envelope 8, 0 + note A_, 1 + rest 1 + note G_, 1 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 8, 0 + note A_, 1 + note B_, 1 + inc_octave + note C_, 1 + volume_envelope 3, 7 + note C_, 1 + rest 1 +; sound_call Branch_fb5bc octave 2 speed 13 rest 2 - channel_volume 8 + volume_envelope 8, 0 note G_, 1 inc_octave note C_, 1 rest 1 dec_octave note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 2 - channel_volume 8 + volume_envelope 8, 0 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 1 rest 1 inc_octave note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 rest 3 dec_octave - channel_volume 8 + volume_envelope 8, 0 + 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 + note A_, 1 + volume_envelope 3, 7 + note A_, 1 + volume_envelope 8, 0 + note B_, 1 + inc_octave +; sound_call 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 + octave 4 + volume_envelope 10, 0 + 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 3, 7 + note G_, 1 + volume_envelope 10, 0 + note E_, 1 + note F_, 1 + speed 1 + note G_, 6 + volume_envelope 3, 7 + note G_, 7 + volume_envelope 10, 0 + note F#, 3 + note G_, 10 +; tie + speed 13 + note G_, 4 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + note F_, 1 + volume_envelope 3, 7 + note F_, 1 + volume_envelope 10, 0 + 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 + note E_, 3 + note D_, 13 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 +; tie + speed 13 + note D_, 4 +; tie + note D_, 8 + volume_envelope 3, 7 + note D_, 2 +; sound_call 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 + octave 4 + volume_envelope 10, 0 + 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 3, 7 + note G_, 1 + volume_envelope 10, 0 + note E_, 1 + note F_, 1 + speed 1 + note G_, 6 + volume_envelope 3, 7 + note G_, 7 + volume_envelope 10, 0 + note G_, 3 + note G#, 10 +; tie + note G#, 13 + volume_envelope 3, 7 + note G#, 13 + inc_octave + volume_envelope 10, 0 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + 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 + note C_, 1 + note D_, 1 + volume_envelope 3, 7 + note D_, 1 + volume_envelope 10, 0 + 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 + 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 + speed 13 + octave 4 + note G_, 8 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + speed 1 + note F#, 3 + note G_, 10 + 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 E_, 13 + volume_envelope 3, 7 + note E_, 13 + volume_envelope 10, 0 + note E_, 6 + note F_, 7 + note E_, 13 + dec_octave + note A_, 6 + volume_envelope 3, 7 + note A_, 7 + inc_octave + volume_envelope 10, 0 + note C_, 6 + volume_envelope 3, 7 + note C_, 7 + dec_octave + volume_envelope 10, 0 + note F_, 6 + volume_envelope 3, 7 + note F_, 13 + rest 7 + volume_envelope 10, 0 + note A_, 13 + inc_octave + note C_, 6 + volume_envelope 3, 7 + note C_, 7 + volume_envelope 10, 0 + note D#, 3 + note E_, 10 +; tie + note E_, 13 + note F_, 6 + volume_envelope 3, 7 + note F_, 7 + volume_envelope 10, 0 + note E_, 6 + volume_envelope 3, 7 + note E_, 7 + volume_envelope 10, 0 + note C_, 6 + volume_envelope 3, 7 + note C_, 13 + rest 7 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 +; tie + note D_, 13 + note C#, 6 + note C_, 7 + dec_octave + note B_, 13 + inc_octave + note C_, 6 + volume_envelope 3, 7 + note C_, 7 + volume_envelope 10, 0 + note G_, 6 + volume_envelope 3, 7 + note G_, 7 + volume_envelope 10, 0 + speed 13 + note E_, 5 +; sound_call 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 + speed 13 + octave 4 + note G_, 3 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + note G_, 1 + speed 1 + note A_, 6 + volume_envelope 3, 7 + note A_, 7 + volume_envelope 10, 0 + note B_, 6 + volume_envelope 3, 7 + note B_, 7 + volume_envelope 10, 0 + note B_, 3 + inc_octave + note C_, 10 + volume_envelope 3, 7 + note C_, 13 + dec_octave + volume_envelope 10, 0 + note F#, 3 + note G_, 10 + 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 E_, 13 + volume_envelope 3, 7 + note E_, 13 + volume_envelope 10, 0 + 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 + note A_, 6 + volume_envelope 3, 7 + note A_, 7 + rest 13 + inc_octave + volume_envelope 10, 0 + note C_, 13 + dec_octave + note A_, 6 + volume_envelope 3, 7 + note A_, 7 + inc_octave + volume_envelope 10, 0 + 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 + note G#, 6 + volume_envelope 3, 7 + note G#, 7 + rest 13 + inc_octave + volume_envelope 10, 0 + note C_, 6 + volume_envelope 3, 7 + note C_, 7 + rest 13 + volume_envelope 10, 0 + 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 + note G_, 1 + volume_envelope 2, 7 + note G_, 1 + volume_envelope 8, 0 + note A_, 1 + volume_envelope 2, 7 + note A_, 1 + volume_envelope 8, 0 + note B_, 1 + speed 1 + volume_envelope 10, 0 + note G_, 3 + note A_, 3 + note B_, 3 + inc_octave + note C_, 4 + note D_, 3 + 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 + 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 + octave 3 + volume_envelope 10, 0 + note G#, 3 + note A_, 10 +; tie + note A_, 13 + volume_envelope 3, 7 + note A_, 13 + volume_envelope 10, 0 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note F#, 3 + note G_, 10 +; tie + note G_, 13 + volume_envelope 3, 7 + note G_, 13 + volume_envelope 10, 0 + note D#, 3 + note E_, 10 + volume_envelope 3, 7 + note E_, 13 + volume_envelope 10, 0 + note D_, 13 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 +; tie + speed 13 + note D_, 4 +; tie + note D_, 8 + volume_envelope 3, 7 + note D_, 1 + dec_octave + volume_envelope 8, 0 + note G_, 1 + speed 1 + note A_, 6 + volume_envelope 2, 7 + note A_, 7 + volume_envelope 8, 0 + note B_, 6 + volume_envelope 2, 7 + note B_, 7 +; 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 + 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 + octave 3 + volume_envelope 10, 0 + note G_, 3 + note G#, 10 +; tie + note G#, 13 + volume_envelope 3, 7 + note G#, 13 + inc_octave + volume_envelope 10, 0 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + 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 + note C_, 1 + note D_, 1 + volume_envelope 3, 7 + note D_, 1 + sound_ret + +Branch_fb5bc: + octave 2 + speed 13 + rest 2 + volume_envelope 8, 0 + note G_, 1 + inc_octave + note C_, 1 + rest 1 + dec_octave + note A_, 1 + volume_envelope 3, 7 + note A_, 1 + rest 2 + volume_envelope 8, 0 + note B_, 1 + volume_envelope 3, 7 + note B_, 1 + volume_envelope 8, 0 + note A_, 1 + rest 1 + inc_octave + note C_, 1 + volume_envelope 3, 7 + note C_, 1 + rest 3 + dec_octave + volume_envelope 8, 0 note G_, 1 inc_octave note C_, 1 @@ -1165,223 +1001,453 @@ Branch_fb5bc: Branch_fb5e4: octave 3 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 3 note G_, 10 note F_, 6 - channel_volume 3 + volume_envelope 3, 7 note F_, 7 speed 13 - channel_volume 8 + volume_envelope 8, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 speed 1 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 sound_ret Branch_fb60c: octave 4 speed 13 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 3 note E_, 10 speed 13 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G#, 3 note A_, 10 - ;tie +; tie speed 13 note A_, 8 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G#, 3 note A_, 10 - channel_volume 3 + volume_envelope 3, 7 note A_, 13 - channel_volume 10 + volume_envelope 10, 0 note G_, 13 - channel_volume 3 + volume_envelope 3, 7 note G_, 13 - channel_volume 10 + volume_envelope 10, 0 note F_, 13 - channel_volume 3 + volume_envelope 3, 7 note F_, 13 - channel_volume 10 + volume_envelope 10, 0 note F#, 3 note G_, 10 - ;tie +; tie sound_ret Branch_fb651: octave 3 - channel_volume 10 + volume_envelope 10, 0 note D#, 3 note E_, 10 note F_, 6 - channel_volume 3 + volume_envelope 3, 7 note F_, 7 - channel_volume 10 + volume_envelope 10, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 8 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C#, 3 note D_, 10 - ;tie +; tie note D_, 13 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 13 rest 7 dec_octave speed 13 - channel_volume 10 + volume_envelope 10, 0 note G_, 6 - ;tie +; tie note G_, 6 - ;tie +; tie note G_, 8 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 3 note E_, 10 note F_, 5 - channel_volume 3 + volume_envelope 3, 7 note F_, 8 - channel_volume 10 + volume_envelope 10, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 8 sound_ret -Music_TCGCredits_Ch2: ; fb68a (3e:768a) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_TCGCredits_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 1 octave 2 speed 13 - channel_volume 4 + volume_envelope 3, -7 note A_, 1 - channel_volume 7 + volume_envelope 7, 0 note A_, 2 - ;tie +; tie speed 1 note A_, 6 - channel_volume 2 + volume_envelope 2, 7 note A_, 7 speed 13 - channel_volume 8 + volume_envelope 7, -7 note B_, 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 2 - ;tie +; tie speed 1 note B_, 6 - channel_volume 3 + volume_envelope 3, 7 note B_, 7 inc_octave speed 13 - channel_volume 6 + volume_envelope 5, -7 note C_, 1 - channel_volume 9 + volume_envelope 9, 0 note C_, 2 - ;tie +; tie speed 1 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 7 speed 13 - channel_volume 9 + volume_envelope 9, 0 note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - ; - ;sound_call Branch_fb79e + sound_call Branch_fb79e + octave 4 speed 13 - octave 3 - channel_volume 9 - note E_, 1 - channel_volume 3 - note E_, 1 - sound_call Branch_fba68 - octave 2 - channel_volume 9 - note A_, 1 - channel_volume 3 - note A_, 1 - inc_octave - channel_volume 9 + volume_envelope 8, 0 + note C_, 3 + dec_octave + volume_envelope 9, 2 + note C_, 1 + rest 2 + inc_octave + volume_envelope 8, 0 + note D_, 1 +; cutoff 4 + note E_, 1 +; cutoff 8 + note C_, 3 + dec_octave + volume_envelope 9, 2 + note D_, 1 + rest 2 + inc_octave + volume_envelope 8, 0 + note D_, 1 +; cutoff 4 + note E_, 1 + dec_octave +; cutoff 8 + note A_, 3 + volume_envelope 9, 2 + note C_, 1 + rest 2 +; cutoff 4 + volume_envelope 8, 0 + note F_, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note G#, 3 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note G#, 1 + rest 1 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note E_, 3 + volume_envelope 9, 2 + note D_, 1 + rest 1 + dec_octave + volume_envelope 8, 0 + note B_, 1 + inc_octave +; cutoff 4 + note C_, 1 + volume_envelope 9, 2 +; cutoff 8 + note D_, 1 + volume_envelope 8, 0 + note E_, 3 + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 8, 0 + note E_, 1 +; cutoff 4 + note F_, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note A_, 3 + volume_envelope 9, 2 + note C_, 1 +; cutoff 4 + note A_, 1 + rest 1 + note F_, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note A_, 3 + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 8, 0 + note G#, 3 + rest 1 + sound_call Branch_fb79e + octave 4 + speed 13 + volume_envelope 8, 0 + note C_, 1 +; tie + note C_, 2 + dec_octave + dec_octave + volume_envelope 9, 2 + note G#, 1 + rest 2 + inc_octave + volume_envelope 8, 0 + note A#, 1 + dec_octave + volume_envelope 9, 2 + note G#, 1 + inc_octave + inc_octave + volume_envelope 8, 0 + note C_, 1 +; tie + note C_, 2 + dec_octave + volume_envelope 9, 2 + note C_, 1 + rest 1 + inc_octave + volume_envelope 8, 0 note C_, 1 - channel_volume 9 note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + 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 + note F_, 7 + note E_, 6 + note G_, 7 + inc_octave + note D_, 6 + dec_octave + note B_, 7 + inc_octave + speed 13 + note C_, 8 +; tie + note C_, 1 + volume_envelope 2, 7 + note C_, 2 + sound_ret + +Branch_fb79e: + speed 13 + octave 3 + volume_envelope 9, 0 + 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 + 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 + octave 2 + volume_envelope 9, 0 + note A_, 1 + volume_envelope 3, 7 + note A_, 1 + inc_octave + volume_envelope 9, 0 + note C_, 1 + volume_envelope 9, 2 + note C_, 1 + dec_octave + volume_envelope 9, 0 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 inc_octave - channel_volume 9 + volume_envelope 9, 0 note C_, 1 note D_, 1 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - sound_call Branch_fba68 - channel_volume 9 +; sound_call 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 + volume_envelope 9, 0 octave 3 speed 1 note E_, 3 note F_, 10 - ;tie +; tie speed 13 note F_, 1 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 9 + volume_envelope 9, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 9 + volume_envelope 9, 0 note D_, 3 - channel_volume 9 + volume_envelope 9, 2 duty_cycle 1 .Loop1 rest 2 @@ -1396,10 +1462,41 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) rest 2 note C_, 1 rest 2 - sound_call Branch_fba9d +; sound_call 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 rest 2 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 octave 3 note C_, 1 rest 1 @@ -1410,75 +1507,75 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) sound_loop 4, .Loop3 rest 2 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note E_, 3 note F_, 10 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 - channel_volume 7 + volume_envelope 7, 0 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 dec_octave - channel_volume 9 + volume_envelope 9, 2 duty_cycle 1 note C_, 13 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note E_, 3 note F_, 10 - ;tie +; tie note F_, 13 note E_, 5 note F_, 4 note E_, 4 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note C_, 13 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 - channel_volume 7 + volume_envelope 7, 0 note C#, 3 note D_, 10 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note C_, 13 rest 13 dec_octave - channel_volume 8 + volume_envelope 8, 0 note B_, 3 inc_octave note C_, 10 - ;tie +; tie speed 13 note C_, 3 rest 1 note E_, 1 - channel_volume 9 + volume_envelope 9, 2 note C_, 1 speed 1 - channel_volume 8 + volume_envelope 8, 0 note A#, 3 note B_, 10 - ;tie +; tie speed 13 note B_, 4 rest 1 @@ -1486,1110 +1583,107 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note C_, 1 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note D_, 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 5 rest 1 - sound_call Branch_fba9d - duty_cycle 1 - octave 3 - note C_, 1 - note D_, 1 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note G#, 1 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - speed 1 - note D_, 3 - note D#, 10 - ;tie - speed 13 - note D#, 2 - dec_octave - dec_octave - channel_volume 9 - note G#, 1 - rest 1 - inc_octave - channel_volume 8 - note G#, 1 - note A#, 1 - dec_octave - channel_volume 9 - note G#, 1 - inc_octave - inc_octave - channel_volume 8 - note C_, 3 - dec_octave - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 8 - speed 1 - note F#, 3 - note G_, 10 - inc_octave - speed 13 - fade_wave 4 - note C_, 1 - dec_octave - note B_, 1 - fade_wave 8 - note A#, 1 - rest 1 - sound_call Branch_fbacb - octave 3 - channel_volume 9 - fade_wave 8 - note D_, 1 - speed 1 - channel_volume 8 - note B_, 3 - inc_octave - note C_, 10 - speed 13 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - note C_, 1 - dec_octave - fade_wave 4 - note F_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note D_, 1 - rest 1 - fade_wave 8 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 2 - fade_wave 4 - note D_, 1 - dec_octave - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note A_, 1 - rest 1 - fade_wave 8 - note B_, 1 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note A_, 1 - fade_wave 8 - note G_, 1 - fade_wave 4 - note A_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 2 - dec_octave - speed 1 - note B_, 3 - inc_octave - note C_, 10 - dec_octave - speed 13 - fade_wave 4 - note B_, 1 - fade_wave 6 - note A#, 2 - sound_call Branch_fbacb - octave 4 - note G_, 1 - fade_wave 8 - note E_, 1 - speed 13 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - fade_wave 7 - note C_, 2 - fade_wave 8 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note F_, 1 - rest 1 - fade_wave 8 - note A_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - fade_wave 7 - note C_, 2 - fade_wave 8 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note F_, 1 - rest 1 - note G#, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note B_, 3 - inc_octave - note C_, 10 - ;tie - speed 13 - note C_, 3 - rest 1 - dec_octave - note A_, 1 - inc_octave - fade_wave 4 - note C_, 1 - dec_octave - fade_wave 8 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note A#, 3 - note B_, 10 - rest 13 - dec_octave - channel_volume 9 - note A#, 3 - note B_, 10 - channel_volume 2 - note B_, 13 - inc_octave - channel_volume 9 - note C_, 13 - channel_volume 2 - note C_, 13 - channel_volume 9 - speed 13 - note D_, 2 - channel_volume 2 - note D_, 1 - sound_call Branch_fbb10 - rest 1 - octave 2 - note A_, 1 - rest 1 - note B_, 1 - note A_, 1 - inc_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - note E_, 2 - rest 1 - note C_, 1 - rest 1 - dec_octave - fade_wave 7 - note G_, 1 - fade_wave 8 - note G_, 1 - inc_octave - channel_volume 9 - note C_, 1 - dec_octave - speed 1 - channel_volume 8 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 1 - rest 1 - inc_octave - duty_cycle 2 - channel_volume 7 - speed 1 - note F_, 13 - note A_, 6 - channel_volume 2 - note A_, 7 - inc_octave - channel_volume 7 - note C_, 6 - channel_volume 2 - note C_, 7 - channel_volume 7 - note E_, 6 - channel_volume 2 - note E_, 7 - dec_octave - duty_cycle 1 - channel_volume 9 - note C_, 13 - inc_octave - duty_cycle 2 - channel_volume 7 - note D#, 3 - note E_, 10 - ;tie - speed 13 - note E_, 1 - note F_, 1 - speed 1 - note E_, 5 - channel_volume 2 - note E_, 8 - channel_volume 7 - note D_, 5 - channel_volume 2 - note D_, 8 - speed 13 - rest 1 - dec_octave - dec_octave - channel_volume 9 - duty_cycle 1 - note B_, 1 - inc_octave - speed 1 - note C_, 6 - channel_volume 2 - note C_, 7 - channel_volume 9 - note D_, 6 - channel_volume 2 - note D_, 7 - sound_call Branch_fbb10 - octave 3 - rest 1 - note F_, 1 - rest 1 - note G#, 1 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - speed 1 - channel_volume 8 - note D_, 3 - note D#, 10 - ;tie - speed 13 - note D#, 2 - dec_octave - dec_octave - channel_volume 9 - note G#, 1 - rest 1 - speed 1 - rest 6 - channel_volume 9 - note G#, 7 - inc_octave - note C_, 6 - note D#, 7 - note G_, 6 - note A#, 7 - ; - octave 4 - speed 13 - channel_volume 8 - note C_, 3 - dec_octave - channel_volume 9 - note C_, 1 - rest 2 - inc_octave - channel_volume 8 - note D_, 1 - fade_wave 4 - note E_, 1 - fade_wave 8 - note C_, 3 - dec_octave - channel_volume 9 - note D_, 1 - rest 2 - inc_octave - channel_volume 8 - note D_, 1 - fade_wave 4 - note E_, 1 - dec_octave - fade_wave 8 - note A_, 3 - channel_volume 9 - note C_, 1 - rest 2 - fade_wave 4 - channel_volume 8 - note F_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - note G#, 3 - channel_volume 9 - note C_, 1 - channel_volume 8 - note G#, 1 - rest 1 - note F_, 1 - channel_volume 9 - note C_, 1 - channel_volume 8 - note E_, 3 - channel_volume 9 - note D_, 1 - rest 1 - dec_octave - channel_volume 8 - note B_, 1 - inc_octave - fade_wave 4 - note C_, 1 - channel_volume 9 - fade_wave 8 - note D_, 1 - channel_volume 8 - note E_, 3 - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 8 - note E_, 1 - fade_wave 4 - note F_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - note A_, 3 - channel_volume 9 - note C_, 1 - fade_wave 4 - note A_, 1 - rest 1 - note F_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - note A_, 3 - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 8 - note G#, 3 - rest 1 - ; - ;sound_call Branch_fb79e - speed 13 - octave 3 - channel_volume 9 - note E_, 1 - channel_volume 3 - note E_, 1 - sound_call Branch_fba68 - octave 2 - channel_volume 9 - note A_, 1 - channel_volume 3 - note A_, 1 - inc_octave - channel_volume 9 - note C_, 1 - channel_volume 9 - note C_, 1 - dec_octave - channel_volume 9 - note B_, 1 - channel_volume 3 - note B_, 1 - inc_octave - channel_volume 9 - note C_, 1 - note D_, 1 - note E_, 1 - channel_volume 3 - note E_, 1 - rest 1 - sound_call Branch_fba68 - channel_volume 9 - octave 3 - speed 1 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 1 - note E_, 1 - channel_volume 3 - note E_, 1 - channel_volume 9 - note C_, 1 - channel_volume 3 - note C_, 1 - channel_volume 9 - note D_, 3 - channel_volume 9 - duty_cycle 1 -.Loop4 - rest 2 - note C_, 1 - rest 1 - sound_loop 2, .Loop4 -.Loop5 - rest 2 - note D_, 1 - rest 1 - sound_loop 2, .Loop5 - rest 2 - note C_, 1 - rest 2 - sound_call Branch_fba9d - rest 2 - duty_cycle 1 - channel_volume 9 - octave 3 - note C_, 1 - rest 1 -.Loop6 - rest 2 - note C_, 1 - rest 1 - sound_loop 4, .Loop6 - rest 2 - duty_cycle 2 - channel_volume 7 - speed 1 - note E_, 3 - note F_, 10 - note A_, 5 - channel_volume 2 - note A_, 8 - inc_octave - channel_volume 7 - note C_, 5 - channel_volume 2 - note C_, 8 - channel_volume 7 - note E_, 5 - channel_volume 2 - note E_, 8 - dec_octave - channel_volume 9 - duty_cycle 1 - note C_, 13 - inc_octave - duty_cycle 2 - channel_volume 7 - note E_, 3 - note F_, 10 - ;tie - note F_, 13 - note E_, 5 - note F_, 4 - note E_, 4 - dec_octave - duty_cycle 1 - channel_volume 9 - note C_, 13 - duty_cycle 2 - channel_volume 7 - note A_, 5 - channel_volume 2 - note A_, 8 - inc_octave - channel_volume 7 - note C_, 5 - channel_volume 2 - note C_, 8 - channel_volume 7 - note C#, 3 - note D_, 10 - dec_octave - duty_cycle 1 - channel_volume 9 - note C_, 13 - rest 13 - dec_octave - channel_volume 8 - note B_, 3 - inc_octave - note C_, 10 - ;tie - speed 13 - note C_, 3 - rest 1 - note E_, 1 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 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 - channel_volume 9 - note D_, 1 - channel_volume 8 - note E_, 5 - rest 1 - sound_call Branch_fba9d - duty_cycle 1 - octave 3 - note C_, 1 - note D_, 1 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note G#, 1 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - speed 1 - note D_, 3 - note D#, 10 - ;tie - speed 13 - note D#, 2 - dec_octave - dec_octave - channel_volume 9 - note G#, 1 - rest 1 - inc_octave - channel_volume 8 - note G#, 1 - note A#, 1 - dec_octave - channel_volume 9 - note G#, 1 - inc_octave - inc_octave - channel_volume 8 - note C_, 3 - dec_octave - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 8 - speed 1 - note F#, 3 - note G_, 10 - inc_octave - speed 13 - fade_wave 4 - note C_, 1 - dec_octave - note B_, 1 - fade_wave 8 - note A#, 1 - rest 1 - sound_call Branch_fbacb - octave 3 - channel_volume 9 - fade_wave 8 - note D_, 1 - speed 1 - channel_volume 8 - note B_, 3 - inc_octave - note C_, 10 - speed 13 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - note C_, 1 - dec_octave - fade_wave 4 - note F_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note D_, 1 - rest 1 - fade_wave 8 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 2 - fade_wave 4 - note D_, 1 - dec_octave - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note A_, 1 - rest 1 - fade_wave 8 - note B_, 1 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note A_, 1 - fade_wave 8 - note G_, 1 - fade_wave 4 - note A_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 2 - dec_octave - speed 1 - note B_, 3 - inc_octave - note C_, 10 - dec_octave - speed 13 - fade_wave 4 - note B_, 1 - fade_wave 6 - note A#, 2 - sound_call Branch_fbacb - octave 4 - note G_, 1 - fade_wave 8 - note E_, 1 - speed 13 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - fade_wave 7 - note C_, 2 - fade_wave 8 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note F_, 1 - rest 1 - fade_wave 8 - note A_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - fade_wave 7 - note C_, 2 - fade_wave 8 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note F_, 1 - rest 1 - note G#, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note B_, 3 - inc_octave - note C_, 10 - ;tie - speed 13 - note C_, 3 - rest 1 - dec_octave - note A_, 1 - inc_octave - fade_wave 4 - note C_, 1 - dec_octave - fade_wave 8 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note A#, 3 - note B_, 10 - rest 13 - dec_octave - channel_volume 9 - note A#, 3 - note B_, 10 - channel_volume 2 - note B_, 13 - inc_octave - channel_volume 9 - note C_, 13 - channel_volume 2 - note C_, 13 - channel_volume 9 - speed 13 - note D_, 2 - channel_volume 2 - note D_, 1 - sound_call Branch_fbb10 - rest 1 - octave 2 - note A_, 1 - rest 1 - note B_, 1 - note A_, 1 - inc_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - note E_, 2 - rest 1 - note C_, 1 - rest 1 - dec_octave - fade_wave 7 - note G_, 1 - fade_wave 8 - note G_, 1 - inc_octave - channel_volume 9 - note C_, 1 - dec_octave - speed 1 - channel_volume 8 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 1 - rest 1 - inc_octave - duty_cycle 2 - channel_volume 7 - speed 1 - note F_, 13 - note A_, 6 - channel_volume 2 - note A_, 7 - inc_octave - channel_volume 7 - note C_, 6 - channel_volume 2 - note C_, 7 - channel_volume 7 - note E_, 6 - channel_volume 2 - note E_, 7 - dec_octave - duty_cycle 1 - channel_volume 9 - note C_, 13 - inc_octave - duty_cycle 2 - channel_volume 7 - note D#, 3 - note E_, 10 - ;tie - speed 13 - note E_, 1 - note F_, 1 - speed 1 - note E_, 5 - channel_volume 2 - note E_, 8 - channel_volume 7 - note D_, 5 - channel_volume 2 - note D_, 8 - speed 13 - rest 1 - dec_octave - dec_octave - channel_volume 9 - duty_cycle 1 - note B_, 1 - inc_octave - speed 1 - note C_, 6 - channel_volume 2 - note C_, 7 - channel_volume 9 - note D_, 6 - channel_volume 2 - note D_, 7 - sound_call Branch_fbb10 - octave 3 - rest 1 - note F_, 1 - rest 1 - note G#, 1 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - speed 1 - channel_volume 8 - note D_, 3 - note D#, 10 - ;tie - speed 13 - note D#, 2 - dec_octave - dec_octave - channel_volume 9 - note G#, 1 - rest 1 - speed 1 - rest 6 - channel_volume 9 - note G#, 7 - inc_octave - note C_, 6 - note D#, 7 - note G_, 6 - note A#, 7 - ; - octave 4 - speed 13 - channel_volume 8 - note C_, 1 - ;tie - note C_, 2 - dec_octave - dec_octave - channel_volume 9 - note G#, 1 - rest 2 - inc_octave - channel_volume 8 - note A#, 1 - dec_octave - channel_volume 9 - note G#, 1 - inc_octave - inc_octave - channel_volume 8 - note C_, 1 - ;tie - note C_, 2 - dec_octave - channel_volume 9 - note C_, 1 - rest 1 - inc_octave - channel_volume 8 - note C_, 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note E_, 1 - ;tie - note E_, 4 - dec_octave - dec_octave - speed 1 - channel_volume 8 - note C_, 6 - note F_, 7 - note A_, 6 - note F_, 7 - note E_, 6 - note G_, 7 - inc_octave - note D_, 6 - dec_octave - note B_, 7 - inc_octave - speed 13 - note C_, 8 - ;tie - note C_, 1 - channel_volume 2 - note C_, 2 - sound_ret - -Branch_fba68: - octave 3 - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 9 - note C_, 1 - note E_, 1 - channel_volume 9 - note C_, 1 - channel_volume 9 - note F_, 1 - channel_volume 3 - note F_, 1 - rest 1 - channel_volume 9 - note C_, 1 - channel_volume 9 - note G_, 1 - channel_volume 3 - note G_, 1 - channel_volume 9 - note F_, 1 - channel_volume 9 - note C_, 1 - channel_volume 9 - note E_, 1 - channel_volume 3 - note E_, 1 - rest 1 - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 9 - note C_, 1 - note E_, 1 - channel_volume 9 - note C_, 1 - sound_ret - -Branch_fba9d: +; sound_call Branch_fba9d octave 4 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note F#, 3 note G_, 10 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note C_, 13 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 - channel_volume 7 + volume_envelope 7, 0 note E_, 3 note F_, 10 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 dec_octave speed 13 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note C_, 1 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note G_, 1 - sound_ret - -Branch_fbacb: +; sound_ret + duty_cycle 1 octave 3 - fade_wave 8 + note C_, 1 + note D_, 1 + volume_envelope 9, 2 + note C_, 1 + speed 1 + volume_envelope 8, 0 + note E_, 3 + note F_, 10 +; tie + speed 13 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G#, 1 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + speed 1 + note D_, 3 + note D#, 10 +; tie + speed 13 + note D#, 2 + dec_octave + dec_octave + volume_envelope 9, 2 + note G#, 1 + rest 1 + inc_octave + volume_envelope 8, 0 + note G#, 1 + note A#, 1 + dec_octave + volume_envelope 9, 3 + note G#, 1 + inc_octave + inc_octave + volume_envelope 8, 0 + note C_, 3 + dec_octave + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 8, 0 + 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 note A#, 1 rest 1 @@ -2597,20 +1691,20 @@ Branch_fbacb: inc_octave note C_, 3 dec_octave - channel_volume 9 + volume_envelope 9, 2 note C_, 1 rest 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 1 inc_octave - fade_wave 4 +; cutoff 4 note C_, 1 dec_octave - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 2 note C_, 1 speed 1 - channel_volume 8 + volume_envelope 8, 0 note A#, 3 note B_, 16 rest 7 @@ -2618,137 +1712,804 @@ Branch_fbacb: note B_, 10 dec_octave speed 13 - channel_volume 9 + volume_envelope 9, 2 note B_, 1 inc_octave - channel_volume 8 + volume_envelope 8, 0 note B_, 1 rest 1 note A_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 2 note B_, 1 inc_octave - channel_volume 8 + volume_envelope 8, 0 note B_, 3 - channel_volume 9 + volume_envelope 9, 2 note D_, 1 rest 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 1 inc_octave - fade_wave 4 +; cutoff 4 + note D_, 1 +; sound_ret + octave 3 + volume_envelope 9, 2 +; cutoff 8 + note D_, 1 + speed 1 + volume_envelope 8, 0 + note B_, 3 + inc_octave + note C_, 10 + speed 13 + rest 1 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note C_, 1 + rest 1 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note C_, 1 + note C_, 1 + dec_octave +; cutoff 4 + note F_, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 +; cutoff 4 + note D_, 1 + rest 1 +; cutoff 8 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note C_, 2 +; cutoff 4 + note D_, 1 + dec_octave +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 +; cutoff 4 + note A_, 1 + rest 1 +; cutoff 8 + note B_, 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 +; cutoff 4 + note A_, 1 +; cutoff 8 + note G_, 1 +; cutoff 4 + note A_, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note C_, 2 + dec_octave + speed 1 + note B_, 3 + inc_octave + note C_, 10 + dec_octave + speed 13 +; cutoff 4 + note B_, 1 +; cutoff 6 + note A#, 2 +; sound_call Branch_fbacb + octave 3 +; cutoff 8 +.Loop5 + note A#, 1 + rest 1 + sound_loop 3, .Loop5 + 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 + octave 4 + note G_, 1 +; cutoff 8 + note E_, 1 + speed 13 + rest 1 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note C_, 1 + rest 1 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 +; cutoff 7 + note C_, 2 +; cutoff 8 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 +; cutoff 4 + note F_, 1 + rest 1 +; cutoff 8 + note A_, 1 + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 +; cutoff 7 + note C_, 2 +; cutoff 8 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 +; cutoff 4 + note F_, 1 + rest 1 + note G#, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + speed 1 + volume_envelope 8, 0 + 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 + note A#, 3 + note B_, 10 + rest 13 + dec_octave + volume_envelope 9, 0 + note A#, 3 + note B_, 10 + volume_envelope 2, 7 + note B_, 13 + inc_octave + volume_envelope 9, 0 + note C_, 13 + volume_envelope 2, 7 + note C_, 13 + volume_envelope 9, 0 + speed 13 + note D_, 2 + volume_envelope 2, 7 + note D_, 1 +; sound_call 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 + rest 1 + octave 2 + note A_, 1 + rest 1 + note B_, 1 + note A_, 1 + inc_octave + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + 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 + note E_, 3 + note F_, 10 +; tie + speed 13 + note F_, 1 + rest 1 + inc_octave + duty_cycle 2 + volume_envelope 7, 0 + speed 1 + note F_, 13 + note A_, 6 + volume_envelope 2, 7 + note A_, 7 + inc_octave + volume_envelope 7, 0 + note C_, 6 + volume_envelope 2, 7 + note C_, 7 + volume_envelope 7, 0 + note E_, 6 + volume_envelope 2, 7 + note E_, 7 + dec_octave + duty_cycle 1 + volume_envelope 9, 2 + note C_, 13 + inc_octave + duty_cycle 2 + volume_envelope 7, 0 + note D#, 3 + note E_, 10 +; tie + speed 13 + note E_, 1 + note F_, 1 + speed 1 + note E_, 5 + volume_envelope 2, 7 + note E_, 8 + volume_envelope 7, 0 + note D_, 5 + volume_envelope 2, 7 + note D_, 8 + speed 13 + rest 1 + dec_octave + dec_octave + volume_envelope 9, 0 + duty_cycle 1 + note B_, 1 + inc_octave + speed 1 + note C_, 6 + volume_envelope 2, 7 + note C_, 7 + volume_envelope 9, 0 + note D_, 6 + volume_envelope 2, 7 + note D_, 7 +; sound_call 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 + octave 3 + rest 1 + note F_, 1 + rest 1 + note G#, 1 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + inc_octave + speed 1 + volume_envelope 8, 0 + note D_, 3 + note D#, 10 +; tie + speed 13 + note D#, 2 + dec_octave + dec_octave + volume_envelope 9, 2 + note G#, 1 + rest 1 + speed 1 + rest 6 + volume_envelope 9, 0 + note G#, 7 + inc_octave + note C_, 6 + note D#, 7 + note G_, 6 + 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 - channel_volume 8 + volume_envelope 8, 0 note C_, 1 - fade_wave 3 +; cutoff 3 note D_, 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 2 +; cutoff 8 note C_, 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 2 - fade_wave 3 +; cutoff 3 note A_, 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 3 +; cutoff 8 note C_, 1 speed 1 - channel_volume 8 + volume_envelope 8, 0 note D#, 3 note E_, 10 - ;tie +; tie speed 13 note E_, 2 - channel_volume 9 + volume_envelope 9, 2 note D_, 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 8 - channel_volume 7 + volume_envelope 7, 0 note F_, 5 note G_, 4 note F_, 4 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note D_, 13 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 - channel_volume 7 + volume_envelope 7, 0 note D_, 13 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 - channel_volume 7 + volume_envelope 7, 0 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 dec_octave speed 13 - channel_volume 7 + volume_envelope 7, 0 note E_, 4 inc_octave inc_octave speed 1 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 dec_octave - channel_volume 7 + volume_envelope 7, 0 note B_, 13 inc_octave note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 dec_octave - channel_volume 7 + volume_envelope 7, 0 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 - channel_volume 7 + volume_envelope 7, 0 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 8 dec_octave dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 3 inc_octave note C_, 10 speed 13 - fade_wave 3 +; cutoff 3 note D_, 1 note E_, 1 - fade_wave 8 +; cutoff 8 note F_, 2 sound_ret -Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) +Music_TCGCredits_Ch3: speed 1 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 96 - ;cutoff 8 +; echo 96 +; cutoff 8 octave 2 .Loop1 note G_, 6 @@ -2763,194 +2524,45 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note E_, 7 note F_, 6 note G_, 7 - ; - ;sound_call Branch_fbc46 - speed 1 - octave 3 - sound_call Branch_fbd47 - sound_call Branch_fbe23 - sound_call Branch_fbd47 -.Loop7 - note C_, 6 - rest 7 - sound_loop 2, .Loop7 - ;cutoff 4 - note A_, 13 - ;cutoff 8 - note C_, 6 - rest 7 -.Loop8 - note C_, 6 - rest 7 - sound_loop 2, .Loop8 - inc_octave - ;cutoff 4 - note C_, 13 - dec_octave - ;cutoff 8 - note C_, 6 - rest 7 - sound_call Branch_fbd47 - sound_call Branch_fbe23 - octave 3 -.Loop9 - note C_, 6 - rest 7 - sound_loop 2, .Loop9 - ;cutoff 4 - note G_, 13 - ;cutoff 8 - note C_, 6 - rest 7 -.Loop10 - note C_, 6 - rest 7 - sound_loop 2, .Loop10 - ;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 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbd91 - sound_call Branch_fbda4 - sound_call Branch_fbdb7 - sound_call Branch_fbdca - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbddd - sound_call Branch_fbdf0 - sound_call Branch_fbd47 - sound_call Branch_fbe03 - sound_call Branch_fbd91 - sound_call Branch_fbdca - sound_call Branch_fbe10 - sound_call Branch_fbd6b - sound_call Branch_fbdb7 - sound_call Branch_fbdca - sound_call Branch_fbd47 - sound_call Branch_fbe03 - sound_call Branch_fbd91 - sound_call Branch_fbdca - sound_call Branch_fbe10 - sound_call Branch_fbd6b - sound_call Branch_fbdb7 - sound_call Branch_fbdf0 - sound_call Branch_fbdca - octave 2 - note G_, 6 - rest 7 - note G_, 13 - inc_octave - note G_, 6 - rest 7 - dec_octave - note A_, 6 - rest 7 - note A_, 6 - rest 7 - speed 13 - note B_, 2 - note G_, 1 - speed 1 - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbd91 - sound_call Branch_fbda4 - sound_call Branch_fbdb7 - sound_call Branch_fbe3d - octave 2 - note B_, 6 - rest 7 - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbddd - octave 2 -.Loop11 - note A#, 6 - rest 7 - sound_loop 2, .Loop11 - inc_octave - ;cutoff 4 - note F_, 13 - dec_octave - ;cutoff 8 - note A#, 6 - rest 7 - note A#, 6 - inc_octave - note F_, 7 - note G#, 6 - inc_octave - note C_, 7 - note D#, 6 - note G_, 7 - dec_octave - dec_octave - note A#, 6 - rest 7 - ; + sound_call Branch_fbc46 sound_call Branch_fbd47 octave 2 .Loop2 - ;rept 2 note B_, 6 rest 7 - ;--- note B_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note B_, 6 rest 7 sound_loop 2, .Loop2 .Loop3 - ;rept 2 note A_, 6 rest 7 - ;--- note A_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop3 .Loop4 - ;rept 2 note G#, 6 rest 7 - ;--- note G#, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note G#, 6 rest 7 sound_loop 2, .Loop4 @@ -2960,147 +2572,7 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) sound_call Branch_fbe3d octave 2 note B_, 13 - ; - ;sound_call Branch_fbc46 - speed 1 - octave 3 - sound_call Branch_fbd47 - sound_call Branch_fbe23 - sound_call Branch_fbd47 -.Loop12 - note C_, 6 - rest 7 - sound_loop 2, .Loop12 - ;cutoff 4 - note A_, 13 - ;cutoff 8 - note C_, 6 - rest 7 -.Loop13 - note C_, 6 - rest 7 - sound_loop 2, .Loop13 - inc_octave - ;cutoff 4 - note C_, 13 - dec_octave - ;cutoff 8 - note C_, 6 - rest 7 - sound_call Branch_fbd47 - sound_call Branch_fbe23 - octave 3 -.Loop14 - note C_, 6 - rest 7 - sound_loop 2, .Loop14 - ;cutoff 4 - note G_, 13 - ;cutoff 8 - note C_, 6 - rest 7 -.Loop15 - note C_, 6 - rest 7 - sound_loop 2, .Loop15 - ;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 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbd91 - sound_call Branch_fbda4 - sound_call Branch_fbdb7 - sound_call Branch_fbdca - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbddd - sound_call Branch_fbdf0 - sound_call Branch_fbd47 - sound_call Branch_fbe03 - sound_call Branch_fbd91 - sound_call Branch_fbdca - sound_call Branch_fbe10 - sound_call Branch_fbd6b - sound_call Branch_fbdb7 - sound_call Branch_fbdca - sound_call Branch_fbd47 - sound_call Branch_fbe03 - sound_call Branch_fbd91 - sound_call Branch_fbdca - sound_call Branch_fbe10 - sound_call Branch_fbd6b - sound_call Branch_fbdb7 - sound_call Branch_fbdf0 - sound_call Branch_fbdca - octave 2 - note G_, 6 - rest 7 - note G_, 13 - inc_octave - note G_, 6 - rest 7 - dec_octave - note A_, 6 - rest 7 - note A_, 6 - rest 7 - speed 13 - note B_, 2 - note G_, 1 - speed 1 - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbd91 - sound_call Branch_fbda4 - sound_call Branch_fbdb7 - sound_call Branch_fbe3d - octave 2 - note B_, 6 - rest 7 - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbddd - octave 2 -.Loop16 - note A#, 6 - rest 7 - sound_loop 2, .Loop16 - inc_octave - ;cutoff 4 - note F_, 13 - dec_octave - ;cutoff 8 - note A#, 6 - rest 7 - note A#, 6 - inc_octave - note F_, 7 - note G#, 6 - inc_octave - note C_, 7 - note D#, 6 - note G_, 7 - dec_octave - dec_octave - note A#, 6 - rest 7 - ; + sound_call Branch_fbc46 speed 1 octave 2 .Loop5 @@ -3110,11 +2582,11 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note D#, 13 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note G#, 6 rest 7 sound_loop 2, .Loop5 @@ -3125,10 +2597,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note C#, 6 rest 7 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note C#, 6 rest 7 sound_loop 2, .Loop6 @@ -3137,10 +2609,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note C_, 6 rest 7 inc_octave - ;cutoff 4 +; cutoff 4 note C_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 6 rest 7 note C_, 6 @@ -3154,24 +2626,887 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 speed 13 note C_, 8 - ;tie +; tie note C_, 1 rest 2 sound_ret +Branch_fbc46: + speed 1 + octave 3 +; sound_call Branch_fbd47 + octave 3 +.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 + note C_, 6 + rest 7 + sound_loop 2, .Loop8 +; cutoff 4 + note A_, 13 +; cutoff 8 + note C_, 6 + rest 7 +.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 + 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 + note C_, 6 + rest 7 + sound_loop 2, .Loop11 +; cutoff 4 + note A_, 13 +; cutoff 8 + note C_, 6 + rest 7 +.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 + 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 + note C_, 6 + rest 7 + sound_loop 2, .Loop14 +; cutoff 4 + note A_, 13 +; cutoff 8 + note C_, 6 + rest 7 +.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 + note C_, 6 + rest 7 + sound_loop 2, .Loop16 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 +.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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + dec_octave + note C_, 13 + rest 13 + note D_, 13 + rest 13 + note E_, 13 + rest 13 + note C_, 6 + rest 7 +; sound_ret +; sound_call Branch_fbd91 + octave 2 +.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 + 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 + 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 + 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 + 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 + 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 + 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 + dec_octave + note C_, 13 + rest 13 + note D_, 13 + rest 13 + note E_, 13 + rest 13 + note C_, 6 + rest 7 +; sound_ret +; sound_call Branch_fbd91 + octave 2 +.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 + 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 + 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 + 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 + 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 + 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 + 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 + note G_, 13 + inc_octave + note G_, 6 + rest 7 + dec_octave + note A_, 6 + rest 7 + note A_, 6 + rest 7 + speed 13 + note B_, 2 + note G_, 1 + speed 1 +; sound_call Branch_fbd47 + octave 3 +.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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + inc_octave + note F_, 7 + note G#, 6 + inc_octave + note C_, 7 + note D#, 6 + note G_, 7 + dec_octave + dec_octave + note A#, 6 + rest 7 + sound_ret + Branch_fbd47: octave 3 .Loop12 - ;rept 2 note C_, 6 rest 7 - ;--- note C_, 6 rest 7 - ;endr - ;cutoff 4 +; cutoff 4 note G_, 13 - ;cutoff 8 +; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop12 @@ -3180,18 +3515,15 @@ Branch_fbd47: Branch_fbd58: octave 2 .Loop13 - ;rept 2 note B_, 6 rest 7 - ;--- note B_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note B_, 6 rest 7 sound_loop 2, .Loop13 @@ -3200,18 +3532,15 @@ Branch_fbd58: Branch_fbd6b: octave 2 .Loop14 - ;rept 2 note A_, 6 rest 7 - ;--- note A_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop14 @@ -3220,18 +3549,15 @@ Branch_fbd6b: Branch_fbd7e: octave 2 .Loop15 - ;rept 2 note G_, 6 rest 7 - ;--- note G_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop15 @@ -3240,18 +3566,15 @@ Branch_fbd7e: Branch_fbd91: octave 2 .Loop16 - ;rept 2 note F_, 6 rest 7 - ;--- note F_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 6 rest 7 sound_loop 2, .Loop16 @@ -3260,18 +3583,15 @@ Branch_fbd91: Branch_fbda4: octave 2 .Loop17 - ;rept 2 note E_, 6 rest 7 - ;--- note E_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note E_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 6 rest 7 sound_loop 2, .Loop17 @@ -3280,18 +3600,15 @@ Branch_fbda4: Branch_fbdb7: octave 2 .Loop18 - ;rept 2 note D_, 6 rest 7 - ;--- note D_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 6 rest 7 sound_loop 2, .Loop18 @@ -3300,18 +3617,15 @@ Branch_fbdb7: Branch_fbdca: octave 2 .Loop19 - ;rept 2 note G_, 6 rest 7 - ;--- note G_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop19 @@ -3320,18 +3634,15 @@ Branch_fbdca: Branch_fbddd: octave 2 .Loop20 - ;rept 2 note F_, 6 rest 7 - ;--- note F_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G#, 13 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 6 rest 7 sound_loop 2, .Loop20 @@ -3340,18 +3651,15 @@ Branch_fbddd: Branch_fbdf0: octave 2 .Loop21 - ;rept 2 note A#, 6 rest 7 - ;--- note A#, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note A#, 6 rest 7 sound_loop 2, .Loop21 @@ -3375,18 +3683,15 @@ Branch_fbe03: Branch_fbe10: octave 2 .Loop22 - ;rept 2 note E_, 6 rest 7 - ;--- note E_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 6 rest 7 sound_loop 2, .Loop22 @@ -3398,18 +3703,18 @@ Branch_fbe23: note C_, 6 rest 7 sound_loop 2, .Loop23 - ;cutoff 4 +; cutoff 4 note A_, 13 - ;cutoff 8 +; cutoff 8 note C_, 6 rest 7 .Loop24 note C_, 6 rest 7 sound_loop 2, .Loop24 - ;cutoff 4 +; cutoff 4 note F_, 13 - ;cutoff 8 +; cutoff 8 note C_, 6 rest 7 sound_ret @@ -3421,10 +3726,10 @@ Branch_fbe3d: rest 7 sound_loop 2, .Loop25 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 6 rest 7 note G_, 6 @@ -3434,7 +3739,7 @@ Branch_fbe3d: sound_ret -Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) +Music_TCGCredits_Ch4: toggle_noise 6 drum_speed 1 octave 1 @@ -3448,10 +3753,43 @@ Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) drum_note 2, 6 drum_note 2, 7 sound_loop 4, .Loop3 - ; - ;sound_call Branch_fbe86 -.Loop7 + sound_call Branch_fbe86 +.Loop4 sound_call Branch_fbed1 + sound_loop 7, .Loop4 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 4 + drum_note 3, 3 +.Loop5 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 4, .Loop5 + sound_call Branch_fbe86 +.Loop6 + sound_call Branch_fbed1 + sound_loop 2, .Loop6 + sound_call Branch_fbeea + drum_speed 13 + drum_note 6, 8 + rest 3 + sound_ret + +Branch_fbe86: +.Loop7 +; sound_call Branch_fbed1 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + 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 @@ -3466,55 +3804,89 @@ Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) drum_note 2, 2 drum_speed 1 .Loop8 - sound_call Branch_fbed1 +; sound_call Branch_fbed1 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 5, 13 +; sound_ret sound_loop 15, .Loop8 - sound_call Branch_fbedb +; 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 - sound_call Branch_fbed1 - sound_loop 7, .Loop9 - sound_call Branch_fbedb + drum_note 2, 6 + drum_note 3, 4 + drum_note 3, 3 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 2, .Loop9 + drum_note 2, 13 +; sound_ret .Loop10 - sound_call Branch_fbed1 +; sound_call Branch_fbed1 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 5, 13 +; sound_ret sound_loop 7, .Loop10 - sound_call Branch_fbeea +; 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 - sound_call Branch_fbed1 - sound_loop 7, .Loop11 - drum_note 1, 13 - drum_note 4, 13 - drum_note 2, 13 - drum_note 4, 6 - drum_note 4, 7 - drum_note 1, 13 - drum_note 4, 6 + drum_note 2, 6 drum_note 3, 4 drum_note 3, 3 drum_note 2, 6 drum_note 2, 7 + sound_loop 2, .Loop11 drum_note 2, 13 +; sound_ret .Loop12 - sound_call Branch_fbed1 - sound_loop 5, .Loop12 - sound_call Branch_fbeea - ; -.Loop4 - sound_call Branch_fbed1 - sound_loop 7, .Loop4 +; sound_call Branch_fbed1 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + 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 -.Loop5 - drum_note 2, 6 - drum_note 2, 7 - sound_loop 4, .Loop5 - ; - ;sound_call Branch_fbe86 .Loop13 - sound_call Branch_fbed1 - sound_loop 6, .Loop13 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 3, .Loop13 + drum_note 2, 13 +; sound_ret +.Loop14 +; sound_call Branch_fbed1 drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 @@ -3523,25 +3895,9 @@ Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 - drum_speed 13 - drum_note 6, 7 - drum_note 2, 2 - drum_speed 1 -.Loop14 - sound_call Branch_fbed1 - sound_loop 15, .Loop14 - sound_call Branch_fbedb -.Loop15 - sound_call Branch_fbed1 - sound_loop 7, .Loop15 - sound_call Branch_fbedb -.Loop16 - sound_call Branch_fbed1 - sound_loop 7, .Loop16 - sound_call Branch_fbeea -.Loop17 - sound_call Branch_fbed1 - sound_loop 7, .Loop17 + drum_note 5, 13 +; sound_ret + sound_loop 7, .Loop14 drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 @@ -3554,18 +3910,32 @@ Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) drum_note 2, 6 drum_note 2, 7 drum_note 2, 13 -.Loop18 - sound_call Branch_fbed1 - sound_loop 5, .Loop18 - sound_call Branch_fbeea - ; -.Loop6 - sound_call Branch_fbed1 - sound_loop 2, .Loop6 - sound_call Branch_fbeea - drum_speed 13 - drum_note 6, 8 - rest 3 +.Loop15 +; sound_call Branch_fbed1 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + 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 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 3, .Loop16 + drum_note 2, 13 +; sound_ret sound_ret Branch_fbed1: @@ -3609,4 +3979,3 @@ Branch_fbeea: sound_loop 3, .Loop14 drum_note 2, 13 sound_ret -; 0xfbef7 diff --git a/crysaudio/music/TCG/deckmachine.asm b/crysaudio/music/TCG/deckmachine.asm index cf1ff9b5..3ef8127a 100644 --- a/crysaudio/music/TCG/deckmachine.asm +++ b/crysaudio/music/TCG/deckmachine.asm @@ -5,98 +5,98 @@ Music_DeckMachine: channel 3, Music_DeckMachine_Ch3 channel 4, Music_DeckMachine_Ch4 -Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) - ;stereo_panning 1, 1 - fade_wave 8 +Music_DeckMachine_Ch1: + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 3 .MainLoop octave 5 speed 1 .Loop1 - fade_wave 6 - channel_volume 9 +; cutoff 6 + volume_envelope 9, 1 note C_, 7 - channel_volume 3 + volume_envelope 3, 1 note C_, 8 - channel_volume 4 + volume_envelope 4, 1 note C_, 8 - channel_volume 9 + volume_envelope 9, 1 note G_, 7 - channel_volume 3 + volume_envelope 3, 1 note G_, 8 - channel_volume 4 + volume_envelope 4, 1 note C_, 7 - channel_volume 9 + volume_envelope 9, 1 note E_, 7 - channel_volume 3 + volume_envelope 3, 1 note E_, 8 - channel_volume 4 + volume_envelope 4, 1 note E_, 8 - channel_volume 9 + volume_envelope 9, 1 note C_, 7 - channel_volume 3 + volume_envelope 3, 1 note C_, 8 - channel_volume 4 + volume_envelope 4, 1 note C_, 7 - channel_volume 9 + volume_envelope 9, 1 note G_, 7 - channel_volume 3 + volume_envelope 3, 1 note G_, 8 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 1 +; cutoff 4 note F_, 7 - fade_wave 5 - channel_volume 4 +; cutoff 5 + volume_envelope 4, 1 note G_, 8 sound_loop 9, .Loop1 - channel_volume 9 + volume_envelope 9, 1 note C_, 7 - channel_volume 3 + volume_envelope 3, 1 note C_, 8 - channel_volume 4 + volume_envelope 4, 1 note C_, 15 speed 10 rest 9 sound_loop 0, .MainLoop -Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) - ;stereo_panning 1, 1 - fade_wave 8 +Music_DeckMachine_Ch2: + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 1 - fade_wave 7 +; cutoff 7 .MainLoop octave 3 speed 1 .Loop1 rest 15 - channel_volume 11 + volume_envelope 11, 2 rest 7 note C_, 8 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 rest 7 - channel_volume 11 + volume_envelope 11, 2 note C_, 7 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 rest 7 - channel_volume 11 + volume_envelope 11, 2 dec_octave note A_, 8 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 7 inc_octave - channel_volume 11 + volume_envelope 11, 2 note C_, 7 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 rest 15 sound_loop 9, .Loop1 - channel_volume 11 + volume_envelope 11, 2 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 rest 15 speed 10 @@ -104,12 +104,12 @@ Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) sound_loop 0, .MainLoop -Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) - ;stereo_panning 1, 1 +Music_DeckMachine_Ch3: + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 96 - ;cutoff 8 +; echo 96 +; cutoff 8 .MainLoop octave 3 speed 1 @@ -118,32 +118,32 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 note G_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 8 - ;cutoff 8 +; cutoff 8 rest 7 dec_octave note C_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note E_, 7 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 8 note D_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note C_, 8 dec_octave rest 7 - ;cutoff 8 +; cutoff 8 note A_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 7 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note A_, 8 inc_octave note D_, 7 @@ -152,31 +152,31 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 note G_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 8 rest 7 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note E_, 7 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 8 note F_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note C_, 8 rest 7 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 7 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 8 note D_, 7 rest 8 @@ -185,33 +185,33 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 note G_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 8 rest 7 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note E_, 7 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note G_, 8 inc_octave note C_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note C_, 8 rest 7 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 7 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 8 note D_, 7 rest 8 @@ -231,7 +231,7 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) sound_loop 0, .MainLoop -Music_DeckMachine_Ch4: ; f7018 (3d:7018) +Music_DeckMachine_Ch4: toggle_noise 6 drum_speed 1 octave 1 @@ -263,4 +263,3 @@ Branch_f7031: drum_note 1, 7 drum_note 4, 8 sound_ret -; 0xf703a diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm index e9529cd8..3903a442 100644 --- a/crysaudio/music/TCG/dueltheme1.asm +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -5,12 +5,12 @@ Music_DuelTheme1: channel 3, Music_DuelTheme1_Ch3 channel 4, Music_DuelTheme1_Ch4 -Music_DuelTheme1_Ch1: ; f532a (3d:532a) +Music_DuelTheme1_Ch1: speed 7 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 2 .MainLoop octave 2 @@ -21,128 +21,128 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) .Loop2 rest 3 sound_call Branch_f54f9 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 1 rest 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note D_, 10 - channel_volume 3 + volume_envelope 3, 7 note D_, 12 sound_call Branch_f54f9 - channel_volume 10 + volume_envelope 10, 0 note F#, 2 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 13 - channel_volume 3 + volume_envelope 3, 7 note A_, 10 - channel_volume 10 + volume_envelope 10, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 1 note G_, 1 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 15 - channel_volume 3 + volume_envelope 3, 7 note B_, 4 - channel_volume 10 + volume_envelope 10, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 3 note A_, 3 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 2 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 15 - channel_volume 3 + volume_envelope 3, 7 note A_, 4 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 3 note G_, 4 note F#, 2 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 15 - channel_volume 3 + volume_envelope 3, 7 note G_, 4 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 3 note F#, 4 note E_, 3 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 4 note E_, 3 - ;tie +; tie speed 7 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 13 - channel_volume 3 + volume_envelope 3, 7 note D_, 9 dec_octave sound_loop 2, .Loop2 inc_octave duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note C#, 4 note D_, 3 - ;tie +; tie speed 7 note D_, 1 rest 1 @@ -154,37 +154,37 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 5 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 1 inc_octave speed 1 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 10 + volume_envelope 10, 0 note F#, 4 - channel_volume 3 + volume_envelope 3, 7 note F#, 3 - channel_volume 10 + volume_envelope 10, 0 note A_, 4 - channel_volume 3 + volume_envelope 3, 7 note A_, 3 speed 7 rest 3 dec_octave duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 .Loop3 note A_, 1 rest 2 @@ -193,7 +193,7 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) speed 1 note C#, 4 note D_, 3 - ;tie +; tie speed 7 note D_, 1 rest 1 @@ -205,48 +205,48 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 5 - ;tie +; tie note A_, 10 - ;tie +; tie note A_, 6 - channel_volume 3 + volume_envelope 3, 7 note A_, 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 speed 1 note C#, 4 note D_, 3 - ;tie +; tie speed 7 note D_, 2 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 13 - ;tie +; tie note A_, 6 - channel_volume 3 + volume_envelope 3, 7 note A_, 2 dec_octave - channel_volume 8 + volume_envelope 7, -1 speed 1 note A_, 5 inc_octave @@ -266,16 +266,16 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note A_, 4 dec_octave sound_call Branch_f5580 - channel_volume 10 + volume_envelope 10, 0 note A_, 2 - ;tie +; tie note A_, 8 - ;tie +; tie note A_, 8 - ;tie +; tie note A_, 6 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 dec_octave note B_, 4 @@ -290,100 +290,100 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note G_, 2 duty_cycle 2 sound_call Branch_f5580 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 5 note G_, 2 note F#, 2 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 - channel_volume 10 + volume_envelope 10, 0 note E_, 2 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 5 note F#, 2 note E_, 2 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 2 - channel_volume 3 + volume_envelope 3, 7 note D_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 8 - ;tie +; tie note D_, 8 note D_, 8 - ;tie +; tie note D_, 8 - channel_volume 3 + volume_envelope 3, 7 note D_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 12 - channel_volume 3 + volume_envelope 3, 7 note D_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 6 - ;tie +; tie note D_, 8 rest 4 sound_loop 0, .MainLoop Branch_f54f9: octave 2 - channel_volume 10 + volume_envelope 10, 0 note A_, 1 note B_, 1 inc_octave note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 10 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 4 note E_, 3 - ;tie +; tie speed 7 note E_, 5 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 2 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 - channel_volume 10 + volume_envelope 10, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 sound_ret @@ -396,26 +396,26 @@ Branch_f5538: note G_, 1 rest 2 duty_cycle 2 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 inc_octave speed 1 note C_, 4 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 10 + volume_envelope 10, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 10 + volume_envelope 10, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 speed 7 rest 3 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 dec_octave .Loop4 note G_, 1 @@ -423,120 +423,116 @@ Branch_f5538: sound_loop 3, .Loop4 inc_octave duty_cycle 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 2 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 sound_ret Branch_f5580: speed 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 9 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note B_, 2 - channel_volume 3 + volume_envelope 3, 7 note B_, 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 speed 1 note F_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 7 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C#, 2 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 9 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 8 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 4 note G_, 4 note F#, 10 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 10 note E_, 2 note F#, 2 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 sound_ret -Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) +Music_DuelTheme1_Ch2: speed 7 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 .MainLoop duty_cycle 1 - channel_volume 9 + volume_envelope 9, 0 octave 2 .Loop1 - ;rept 3 note D_, 1 rest 2 - ;--- note D_, 1 rest 2 - ;--- note D_, 1 rest 2 - ;endr rest 1 dec_octave note A_, 1 @@ -552,8 +548,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note D_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 2 sound_call Branch_f59f9 sound_loop 4, .Loop2 @@ -563,8 +559,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 sound_call Branch_f59f9 octave 2 @@ -573,13 +569,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note C_, 2 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -587,13 +583,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 1 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 1 rest 2 inc_octave @@ -604,8 +600,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 sound_call Branch_f59f9 sound_loop 3, .Loop3 @@ -615,13 +611,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note C_, 2 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -629,13 +625,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 1 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 1 rest 2 inc_octave @@ -644,8 +640,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 sound_call Branch_f59f9 octave 2 @@ -654,24 +650,24 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note F#, 1 rest 1 .Loop4 @@ -679,23 +675,23 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note G_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note G_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 rest 2 sound_loop 2, .Loop4 @@ -703,8 +699,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note F#, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 inc_octave note C#, 2 sound_call Branch_f5a17 @@ -714,66 +710,66 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note F#, 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note E_, 2 sound_call Branch_f5a17 note E_, 1 rest 2 note E_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note B_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note G_, 1 rest 2 note A_, 1 rest 2 note A_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note A_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note A_, 1 rest 2 note D_, 1 rest 2 note D_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -781,13 +777,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 1 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 1 rest 2 inc_octave @@ -795,12 +791,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note D_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -808,46 +804,46 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - channel_volume 7 - ;frequency_offset 0 + volume_envelope 7, 0 +; frequency_offset 0 note E_, 1 note F#, 1 note A_, 1 rest 1 - channel_volume 7 + volume_envelope 7, 0 sound_call Branch_f594d - channel_volume 7 + volume_envelope 7, 0 octave 3 speed 1 note C#, 4 note D_, 3 - ;tie +; tie speed 7 note D_, 1 rest 1 dec_octave note F#, 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note F#, 2 - channel_volume 7 - fade_wave 8 + volume_envelope 7, 0 +; cutoff 8 note A_, 10 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 inc_octave note D_, 2 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -855,38 +851,38 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note E_, 1 note F#, 1 note A_, 1 rest 1 sound_call Branch_f594d - channel_volume 7 + volume_envelope 7, 0 octave 3 note D_, 2 rest 1 note F#, 13 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note D_, 1 rest 1 note D_, 1 @@ -896,96 +892,96 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 15 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note G_, 1 rest 2 note G_, 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 2 rest 1 note F#, 3 rest 1 dec_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note E_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 15 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note F#, 1 rest 2 note F#, 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note E_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 2 rest 1 note E_, 3 rest 1 dec_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note D#, 4 note E_, 3 - ;tie +; tie speed 7 note E_, 15 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note A_, 1 rest 2 note A_, 1 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 2 rest 1 @@ -996,36 +992,36 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 1 rest 1 note F#, 13 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 2 note D_, 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 dec_octave - ;frequency_offset 0 +; frequency_offset 0 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 2 sound_call Branch_f59b4 octave 3 speed 1 - channel_volume 7 + volume_envelope 7, 0 note F_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 1 rest 1 @@ -1045,23 +1041,23 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 3 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 .Loop5 note D_, 1 rest 2 sound_loop 3, .Loop5 sound_call Branch_f59b4 - channel_volume 8 + volume_envelope 8, 0 octave 3 note D_, 16 - ;tie +; tie note D_, 6 rest 2 speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 2 note A_, 1 @@ -1074,7 +1070,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note C#, 6 rest 2 dec_octave - channel_volume 8 + volume_envelope 7, -1 speed 1 note E_, 5 note A_, 5 @@ -1098,12 +1094,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) speed 7 sound_call Branch_f598c note D_, 8 - ;tie +; tie note D_, 8 note C#, 6 dec_octave duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 speed 1 note G_, 4 note G#, 3 @@ -1131,10 +1127,10 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note A_, 2 rest 2 note G_, 8 - ;tie +; tie note G_, 8 note F#, 8 - ;tie +; tie note F#, 8 rest 2 note G_, 12 @@ -1148,51 +1144,51 @@ Branch_f594d: speed 1 note C#, 4 note D_, 3 - ;tie +; tie speed 7 note D_, 9 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 0 dec_octave note A_, 1 rest 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note A_, 3 rest 1 inc_octave note C_, 6 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note D#, 4 note E_, 3 - ;tie +; tie speed 7 note E_, 2 note D_, 1 dec_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 2 inc_octave - channel_volume 7 - fade_wave 8 + volume_envelope 7, 0 +; cutoff 8 note C_, 1 rest 1 sound_ret Branch_f598c: - channel_volume 8 + volume_envelope 8, 0 note D_, 10 rest 2 note E_, 1 @@ -1229,16 +1225,16 @@ Branch_f598c: note D_, 2 rest 2 note D_, 2 - ;tie +; tie sound_ret Branch_f59b4: octave 2 - channel_volume 8 + volume_envelope 8, 0 speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 1 rest 1 @@ -1253,7 +1249,7 @@ Branch_f59b4: note C_, 1 rest 2 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note E_, 1 speed 1 note G_, 4 @@ -1265,21 +1261,21 @@ Branch_f59b4: rest 3 speed 7 rest 3 - fade_wave 8 +; cutoff 8 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 .Loop6 note C_, 1 rest 2 sound_loop 3, .Loop6 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 2 note F#, 1 @@ -1291,8 +1287,8 @@ Branch_f59b4: Branch_f59f9: octave 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -1300,13 +1296,13 @@ Branch_f59f9: rest 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 1 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 1 rest 2 sound_ret @@ -1314,44 +1310,40 @@ Branch_f59f9: Branch_f5a17: octave 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note F#, 1 rest 3 note C#, 1 rest 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 rest 2 sound_ret -Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) +Music_DuelTheme1_Ch3: speed 7 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 14 - ;echo 96 - ;cutoff 8 +; echo 96 +; cutoff 8 octave 2 .MainLoop .Loop1 - ;rept 3 note D_, 1 rest 2 - ;--- note D_, 1 rest 2 - ;--- note D_, 1 rest 2 - ;endr rest 1 sound_call Branch_f5c47 sound_loop 4, .Loop1 @@ -1361,11 +1353,11 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) note D_, 1 inc_octave inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1375,10 +1367,10 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note F#, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1387,11 +1379,11 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) note D_, 1 inc_octave inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1400,10 +1392,10 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1411,10 +1403,10 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 2 note D_, 2 @@ -1470,30 +1462,30 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 sound_call Branch_f5c60 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 rest 1 note E_, 2 - ;cutoff 6 +; cutoff 6 note B_, 2 sound_call Branch_f5c60 octave 2 - ;cutoff 8 +; cutoff 8 note F#, 2 note G_, 2 - ;cutoff 6 +; cutoff 6 note G#, 2 sound_call Branch_f5c6f octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 rest 1 note A_, 2 - ;cutoff 6 +; cutoff 6 note E_, 2 sound_call Branch_f5c6f octave 2 - ;cutoff 8 +; cutoff 8 note B_, 2 inc_octave note C_, 2 @@ -1511,9 +1503,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 note E_, 1 rest 1 - ;cutoff 7 +; cutoff 7 note E_, 1 - ;cutoff 8 +; cutoff 8 note E_, 1 rest 1 note E_, 2 @@ -1527,9 +1519,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 note F#, 1 rest 1 - ;cutoff 7 +; cutoff 7 note F#, 1 - ;cutoff 8 +; cutoff 8 note F#, 1 rest 1 note F#, 2 @@ -1543,9 +1535,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 note G_, 1 rest 1 - ;cutoff 7 +; cutoff 7 note G_, 1 - ;cutoff 8 +; cutoff 8 note F#, 1 rest 1 note E_, 2 @@ -1560,9 +1552,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 note B_, 1 rest 1 - ;cutoff 7 +; cutoff 7 note B_, 1 - ;cutoff 8 +; cutoff 8 note F#, 1 rest 1 note F_, 2 @@ -1604,9 +1596,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 note D_, 1 rest 1 - ;cutoff 7 +; cutoff 7 note D_, 1 - ;cutoff 8 +; cutoff 8 note D_, 1 rest 1 note A_, 14 @@ -1618,102 +1610,97 @@ Branch_f5b8d: rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 - ; - ;sound_call Branch_f5c47 +; 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 +; cutoff 3 note G_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 - ; - ;sound_call Branch_f5c47 +; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 - ; +; sound_ret .Loop7 note D_, 1 rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 - ; - ;sound_call Branch_f5c47 +; 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 +; cutoff 3 note G_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 - ; - ;sound_call Branch_f5c47 +; 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 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 - ; - ;sound_call Branch_f5c47 +; 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 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 note D_, 1 @@ -1726,10 +1713,10 @@ Branch_f5b8d: rest 2 note G_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note B_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 1 rest 3 note D_, 1 @@ -1742,10 +1729,10 @@ Branch_f5b8d: rest 2 note F#, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note F#, 1 rest 3 note C#, 1 @@ -1758,11 +1745,11 @@ Branch_f5b8d: note F#, 1 inc_octave inc_octave - ;cutoff 3 +; cutoff 3 note C#, 2 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note F#, 1 rest 3 note C#, 1 @@ -1774,10 +1761,10 @@ Branch_f5b8d: rest 2 note E_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note B_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 1 rest 3 note E_, 1 @@ -1789,10 +1776,10 @@ Branch_f5b8d: rest 2 note A_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note B_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note A_, 1 rest 3 note E_, 1 @@ -1821,9 +1808,9 @@ Branch_f5c4d: rest 1 note D_, 1 rest 1 - ;cutoff 7 +; cutoff 7 note D_, 1 - ;cutoff 8 +; cutoff 8 note D_, 1 rest 1 note D_, 2 @@ -1831,7 +1818,7 @@ Branch_f5c4d: Branch_f5c60: octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 rest 1 note E_, 1 @@ -1840,13 +1827,13 @@ Branch_f5c60: rest 1 note E_, 1 rest 1 - ;cutoff 6 +; cutoff 6 note E_, 1 sound_ret Branch_f5c6f: octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 rest 1 note A_, 1 @@ -1855,7 +1842,7 @@ Branch_f5c6f: rest 1 note A_, 1 rest 1 - ;cutoff 6 +; cutoff 6 note A_, 1 sound_ret @@ -1886,7 +1873,7 @@ Branch_f5c7e: sound_ret -Music_DuelTheme1_Ch4: ; f5c9a (3d:5c9a) +Music_DuelTheme1_Ch4: toggle_noise 6 drum_speed 7 octave 1 @@ -2053,4 +2040,3 @@ Branch_f5d58: drum_note 2, 1 sound_loop 8, .Loop12 sound_ret -; 0xf5d68 diff --git a/crysaudio/music/TCG/dueltheme2.asm b/crysaudio/music/TCG/dueltheme2.asm index 826f97fe..8a10752e 100644 --- a/crysaudio/music/TCG/dueltheme2.asm +++ b/crysaudio/music/TCG/dueltheme2.asm @@ -5,15 +5,15 @@ Music_DuelTheme2: channel 3, Music_DuelTheme2_Ch3 channel 4, Music_DuelTheme2_Ch4 -Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) +Music_DuelTheme2_Ch1: speed 9 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 1 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 4 .Loop1 note D_, 2 note D_, 1 @@ -25,7 +25,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 sound_loop 23, .Loop2 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 inc_octave inc_octave speed 1 @@ -41,57 +41,57 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) speed 9 sound_call Branch_f5f3d note C_, 6 - ;tie +; tie speed 1 note C_, 12 - channel_volume 3 + volume_envelope 3, 7 note C_, 6 - channel_volume 10 + volume_envelope 10, 0 dec_octave note B_, 12 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 - channel_volume 10 + volume_envelope 10, 0 note G_, 12 - channel_volume 3 + volume_envelope 3, 7 note G_, 6 speed 9 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note D_, 1 - fade_wave 8 +; cutoff 8 note D_, 9 - ;tie +; tie note D_, 9 - channel_volume 4 + volume_envelope 4, 7 note D_, 3 duty_cycle 2 - fade_wave 8 - channel_volume 3 +; cutoff 8 + volume_envelope 2, -7 note E_, 4 - channel_volume 6 + volume_envelope 6, 0 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 1 - channel_volume 6 + volume_envelope 5, -7 note G_, 4 - channel_volume 8 + volume_envelope 8, 0 speed 1 note G_, 12 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 inc_octave speed 9 - channel_volume 8 - fade_wave 8 + volume_envelope 7, -7 +; cutoff 8 note C_, 3 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 dec_octave speed 1 note C_, 3 @@ -105,58 +105,58 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note C_, 3 speed 9 sound_call Branch_f5f3d - fade_wave 8 +; cutoff 8 note C_, 4 - ;tie +; tie speed 1 note C_, 4 note E_, 5 note F_, 4 note F#, 5 note G_, 12 - channel_volume 3 + volume_envelope 3, 7 note G_, 6 - channel_volume 10 + volume_envelope 10, 0 note E_, 12 - channel_volume 3 + volume_envelope 3, 7 note E_, 6 speed 9 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 dec_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note A_, 1 inc_octave - fade_wave 8 +; cutoff 8 note D_, 9 - ;tie +; tie note D_, 10 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 - fade_wave 8 +; cutoff 8 note D_, 4 note D#, 5 speed 9 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 inc_octave - fade_wave 8 +; cutoff 8 note C_, 3 dec_octave speed 1 @@ -171,10 +171,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note C_, 3 sound_call Branch_f5f90 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 4 octave 1 note D_, 1 .Loop3 @@ -182,7 +182,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 sound_loop 3, .Loop3 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 inc_octave inc_octave note G_, 1 @@ -197,99 +197,99 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 note B_, 1 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 sound_call Branch_f5f62 octave 4 - channel_volume 4 + volume_envelope 4, 7 note F#, 12 - channel_volume 10 + volume_envelope 10, 0 note C#, 9 - channel_volume 4 + volume_envelope 4, 7 note C#, 1 - channel_volume 10 + volume_envelope 10, 0 note C#, 1 note D_, 1 note E_, 3 note D_, 3 note C#, 3 dec_octave - fade_wave 6 +; cutoff 6 note B_, 3 - fade_wave 8 +; cutoff 8 note B_, 4 - channel_volume 4 + volume_envelope 4, 7 note B_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 speed 1 note C#, 4 dec_octave note B_, 5 speed 9 note A_, 6 - channel_volume 4 + volume_envelope 4, 7 note A_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 3 +; cutoff 8 note D_, 2 note D_, 2 rest 2 note C#, 2 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 sound_call Branch_f5f62 octave 4 - channel_volume 4 + volume_envelope 4, 7 note F#, 6 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 2 inc_octave note C#, 2 note D_, 1 - channel_volume 4 + volume_envelope 4, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 9 - channel_volume 4 + volume_envelope 4, 7 note D_, 1 - channel_volume 10 - fade_wave 7 + volume_envelope 10, 0 +; cutoff 7 note C#, 1 note D_, 1 - fade_wave 8 +; cutoff 8 note E_, 3 note D_, 3 note C#, 3 dec_octave - fade_wave 6 +; cutoff 6 note A_, 3 inc_octave - fade_wave 8 +; cutoff 8 note F_, 10 - fade_wave 7 +; cutoff 7 note E_, 1 note F_, 1 - fade_wave 8 +; cutoff 8 note G_, 3 note F_, 3 note E_, 3 speed 1 note C_, 2 - ;tie +; tie note C_, 16 - channel_volume 4 + volume_envelope 4, 7 note C_, 9 speed 9 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 note A_, 10 - fade_wave 7 +; cutoff 7 note G_, 1 note F_, 1 - fade_wave 8 +; cutoff 8 note G_, 6 inc_octave note C_, 3 @@ -306,10 +306,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note C_, 3 sound_call Branch_f5f90 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 4 octave 1 note D_, 1 .Loop4 @@ -317,8 +317,8 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 sound_loop 3, .Loop4 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 octave 5 note D_, 1 note C_, 1 @@ -336,40 +336,40 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note F_, 1 note C_, 1 note D_, 12 - ;tie +; tie note D_, 12 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 4 sound_loop 0, .MainLoop Branch_f5f3d: - fade_wave 8 +; cutoff 8 note D_, 12 - ;tie +; tie note D_, 4 - ;tie +; tie speed 1 note D_, 7 - channel_volume 4 + volume_envelope 4, 7 note D_, 2 - ;tie +; tie speed 9 note D_, 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 4 - ;tie +; tie speed 1 note A_, 7 - channel_volume 4 + volume_envelope 4, 7 note A_, 2 - ;tie +; tie speed 9 note A_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 12 - ;tie +; tie sound_ret Branch_f5f62: @@ -390,10 +390,10 @@ Branch_f5f62: dec_octave note A_, 2 note F#, 5 - channel_volume 4 + volume_envelope 4, 7 note F#, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note D_, 2 note C#, 2 dec_octave @@ -402,13 +402,13 @@ Branch_f5f62: note G_, 2 note A_, 2 note B_, 1 - channel_volume 4 + volume_envelope 4, 7 note B_, 1 - channel_volume 10 + volume_envelope 10, 0 inc_octave - fade_wave 6 +; cutoff 6 note F#, 1 - fade_wave 8 +; cutoff 8 note F#, 9 sound_ret @@ -417,47 +417,41 @@ Branch_f5f90: speed 9 .Loop5 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 4 octave 1 note D_, 1 - ;rept 5 note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;endr note D_, 2 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 octave 5 note C_, 4 sound_loop 3, .Loop5 sound_ret -Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) +Music_DuelTheme2_Ch2: speed 9 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 15, 3, 3 - fade_wave 8 +; cutoff 8 octave 2 duty_cycle 1 - channel_volume 7 - ;frequency_offset 5 + volume_envelope 7, 4 +; frequency_offset 5 .Loop1 note D_, 2 note D_, 1 @@ -468,8 +462,8 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note D_, 1 sound_loop 24, .Loop2 duty_cycle 2 - channel_volume 7 - ;frequency_offset 0 + volume_envelope 6, -3 +; frequency_offset 0 .Loop3 inc_octave note D_, 1 @@ -489,17 +483,17 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note C_, 1 note G_, 1 duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 dec_octave note D_, 1 rest 1 dec_octave - fade_wave 6 +; cutoff 6 note A_, 1 - fade_wave 8 +; cutoff 8 note A_, 9 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 .Loop5 note A_, 1 note D_, 1 @@ -507,24 +501,24 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) sound_loop 4, .Loop5 duty_cycle 2 inc_octave - fade_wave 8 - channel_volume 3 +; cutoff 8 + volume_envelope 2, -7 note C_, 4 - channel_volume 6 + volume_envelope 6, 0 note C_, 7 rest 1 - channel_volume 6 + volume_envelope 5, -7 note E_, 4 speed 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 12 rest 6 speed 9 - channel_volume 8 + volume_envelope 7, -7 note G_, 3 dec_octave duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 speed 1 note G_, 3 note A_, 4 @@ -537,7 +531,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note G_, 3 speed 9 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 .Loop6 note A_, 1 note D_, 1 @@ -555,7 +549,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) speed 1 note G_, 4 duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 inc_octave note C_, 5 note D_, 4 @@ -571,19 +565,19 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) rest 1 note A_, 1 rest 1 - fade_wave 6 +; cutoff 6 note D_, 1 - fade_wave 8 +; cutoff 8 note A_, 9 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 .Loop9 note A_, 1 note D_, 1 sound_loop 5, .Loop9 note A_, 1 duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 speed 1 note A#, 4 note B_, 5 @@ -609,8 +603,8 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note A_, 1 rest 1 duty_cycle 1 - channel_volume 7 - ;frequency_offset 5 + volume_envelope 7, 4 +; frequency_offset 5 dec_octave dec_octave note D_, 1 @@ -619,8 +613,8 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note D_, 1 sound_loop 3, .Loop10 duty_cycle 2 - channel_volume 7 - ;frequency_offset 0 + volume_envelope 6, -3 +; frequency_offset 0 inc_octave note E_, 1 rest 1 @@ -638,7 +632,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave note C#, 1 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 sound_call Branch_f6173 octave 4 .Loop11 @@ -666,21 +660,21 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave sound_loop 2, .Loop12 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 3 octave 2 rest 1 - fade_wave 8 +; cutoff 8 note B_, 2 note B_, 2 rest 2 note A_, 2 inc_octave - fade_wave 8 +; cutoff 8 note C#, 1 note D_, 1 note E_, 1 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 sound_call Branch_f6173 octave 3 .Loop13 @@ -768,7 +762,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave note C_, 1 duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 dec_octave speed 1 note G_, 3 @@ -784,8 +778,8 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note A_, 1 rest 1 duty_cycle 1 - channel_volume 7 - ;frequency_offset 5 + volume_envelope 7, 4 +; frequency_offset 5 dec_octave dec_octave note D_, 1 @@ -795,16 +789,16 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) sound_loop 3, .Loop17 rest 12 duty_cycle 1 - channel_volume 7 - ;frequency_offset 0 + volume_envelope 7, 0 +; frequency_offset 0 inc_octave note A_, 12 - ;tie +; tie note A_, 12 dec_octave duty_cycle 1 - channel_volume 7 - ;frequency_offset 5 + volume_envelope 7, 4 +; frequency_offset 5 sound_loop 0, .MainLoop Branch_f6173: @@ -841,30 +835,24 @@ Branch_f618f: .Loop20 note A_, 1 rest 1 - channel_volume 7 - ;frequency_offset 5 + volume_envelope 7, 4 +; frequency_offset 5 dec_octave dec_octave note D_, 1 - ;rept 5 note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;endr note D_, 2 - channel_volume 7 - ;frequency_offset 0 + volume_envelope 7, 0 +; frequency_offset 0 inc_octave inc_octave note G_, 4 @@ -872,13 +860,13 @@ Branch_f618f: sound_ret -Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) +Music_DuelTheme2_Ch3: speed 9 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 64 - ;cutoff 7 +; echo 64 +; cutoff 7 octave 2 .Loop1 sound_call Branch_f62e5 @@ -888,17 +876,13 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_call Branch_f62e5 sound_loop 44, .Loop2 .Loop3 - ;rept 3 sound_call Branch_f62e5 - ;--- sound_call Branch_f62e5 - ;--- sound_call Branch_f62e5 - ;endr octave 2 - ;cutoff 4 +; cutoff 4 note D_, 2 - ;cutoff 7 +; cutoff 7 note C_, 3 note E_, 1 sound_loop 3, .Loop3 @@ -906,7 +890,7 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_call Branch_f62e5 sound_loop 2, .Loop4 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 inc_octave note E_, 1 @@ -932,9 +916,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_loop 4, .Loop5 octave 2 .Loop6 - ;cutoff 4 +; cutoff 4 note E_, 2 - ;cutoff 7 +; cutoff 7 note E_, 1 inc_octave note E_, 1 @@ -945,9 +929,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 4, .Loop6 .Loop7 - ;cutoff 4 +; cutoff 4 note A_, 2 - ;cutoff 7 +; cutoff 7 note A_, 1 inc_octave note A_, 1 @@ -961,7 +945,7 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_call Branch_f62e5 sound_loop 2, .Loop8 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 inc_octave note E_, 1 @@ -990,9 +974,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_loop 4, .Loop9 octave 2 .Loop10 - ;cutoff 4 +; cutoff 4 note E_, 2 - ;cutoff 7 +; cutoff 7 note E_, 1 inc_octave note E_, 1 @@ -1003,9 +987,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 4, .Loop10 .Loop11 - ;cutoff 4 +; cutoff 4 note G_, 2 - ;cutoff 7 +; cutoff 7 note G_, 1 inc_octave note G_, 1 @@ -1016,9 +1000,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 2, .Loop11 .Loop12 - ;cutoff 4 +; cutoff 4 note A_, 2 - ;cutoff 7 +; cutoff 7 note A_, 1 inc_octave note A_, 1 @@ -1029,9 +1013,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 2, .Loop12 .Loop13 - ;cutoff 4 +; cutoff 4 note A#, 2 - ;cutoff 7 +; cutoff 7 note A#, 1 inc_octave note A#, 1 @@ -1043,9 +1027,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_loop 2, .Loop13 inc_octave .Loop14 - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 7 +; cutoff 7 note C_, 1 inc_octave note C_, 1 @@ -1057,9 +1041,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_loop 2, .Loop14 dec_octave .Loop15 - ;cutoff 4 +; cutoff 4 note A#, 2 - ;cutoff 7 +; cutoff 7 note A#, 1 inc_octave note A#, 1 @@ -1071,9 +1055,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_loop 2, .Loop15 inc_octave .Loop16 - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 7 +; cutoff 7 note C_, 1 inc_octave note C_, 1 @@ -1084,17 +1068,13 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 2, .Loop16 .Loop17 - ;rept 3 sound_call Branch_f62e5 - ;--- sound_call Branch_f62e5 - ;--- sound_call Branch_f62e5 - ;endr octave 2 - ;cutoff 4 +; cutoff 4 note D_, 2 - ;cutoff 7 +; cutoff 7 note C_, 3 note E_, 1 sound_loop 3, .Loop17 @@ -1102,7 +1082,7 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_call Branch_f62e5 sound_loop 2, .Loop18 octave 3 - ;cutoff 8 +; cutoff 8 note D_, 1 note C_, 1 dec_octave @@ -1125,9 +1105,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) Branch_f62e5: octave 2 - ;cutoff 4 +; cutoff 4 note D_, 2 - ;cutoff 7 +; cutoff 7 note D_, 1 inc_octave note D_, 1 @@ -1138,7 +1118,7 @@ Branch_f62e5: sound_ret -Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) +Music_DuelTheme2_Ch4: toggle_noise 6 drum_speed 9 .Loop1 @@ -1168,19 +1148,12 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) sound_call Branch_f6396 .Loop6 sound_call Branch_f637c - ;rept 6 drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;endr drum_note 2, 2 drum_note 6, 3 drum_note 2, 1 @@ -1229,19 +1202,12 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) sound_call Branch_f6396 .Loop10 sound_call Branch_f637c - ;rept 6 drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;endr drum_note 2, 2 drum_note 6, 3 drum_note 2, 1 @@ -1295,4 +1261,3 @@ Branch_f6396: drum_note 2, 1 sound_loop 6, .Loop12 sound_ret -; 0xf63a1 diff --git a/crysaudio/music/TCG/dueltheme3.asm b/crysaudio/music/TCG/dueltheme3.asm index 283c8ce6..17f23730 100644 --- a/crysaudio/music/TCG/dueltheme3.asm +++ b/crysaudio/music/TCG/dueltheme3.asm @@ -5,50 +5,45 @@ Music_DuelTheme3: channel 3, Music_DuelTheme3_Ch3 channel 4, Music_DuelTheme3_Ch4 -Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) +Music_DuelTheme3_Ch1: speed 11 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 .MainLoop octave 2 duty_cycle 0 .Loop1 - ;rept 4 - channel_volume 9 + volume_envelope 9, 2 note F#, 2 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 2 note F#, 2 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 2 note F#, 2 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 2 note F#, 2 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note E_, 2 - channel_volume 9 + volume_envelope 9, 5 note F_, 2 sound_loop 4, .Loop1 .Loop2 sound_call Branch_f67b2 sound_loop 4, .Loop2 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 .Loop3 octave 3 note C#, 1 note F#, 1 speed 1 note G#, 5 - channel_volume 3 + volume_envelope 3, 7 note G#, 6 sound_call Branch_f65a7 octave 3 @@ -56,42 +51,42 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note F#, 1 speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 sound_call Branch_f65a7 sound_loop 2, .Loop3 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 3 dec_octave rest 2 speed 1 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 6 sound_call Branch_f65cf note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 speed 11 rest 1 dec_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 3 speed 1 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 6 sound_call Branch_f65cf speed 11 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 .Loop4 octave 3 note C#, 1 note F#, 1 speed 1 note G#, 5 - channel_volume 3 + volume_envelope 3, 7 note G#, 6 sound_call Branch_f65a7 octave 3 @@ -99,9 +94,9 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note F#, 1 speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 - channel_volume 10 + volume_envelope 10, 0 sound_call Branch_f65a7 sound_loop 2, .Loop4 vibrato 10, 3, 3 @@ -109,65 +104,65 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) .Loop5 octave 2 rest 4 - channel_volume 9 + volume_envelope 9, 0 note F#, 2 - channel_volume 2 + volume_envelope 2, 7 note F#, 2 rest 2 - channel_volume 9 + volume_envelope 9, 0 note E_, 2 - channel_volume 2 + volume_envelope 2, 7 note E_, 4 - channel_volume 9 + volume_envelope 9, 0 note D#, 2 - channel_volume 2 + volume_envelope 2, 7 note D#, 4 - channel_volume 9 + volume_envelope 9, 0 note D_, 2 note C#, 2 sound_loop 2, .Loop5 vibrato 20, 3, 3 duty_cycle 2 - fade_wave 6 +; cutoff 6 .Loop6 sound_call Branch_f661d sound_loop 4, .Loop6 octave 4 - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 .Loop7 sound_call Branch_f661d sound_loop 3, .Loop7 octave 4 - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 dec_octave speed 11 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 2 note C#, 2 dec_octave @@ -193,81 +188,71 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) duty_cycle 0 octave 2 .Loop8 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 sound_loop 2, .Loop8 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 octave 3 note C#, 1 note F#, 1 speed 1 note G#, 5 - channel_volume 3 + volume_envelope 3, 7 note G#, 6 sound_call Branch_f65a7 octave 3 @@ -275,16 +260,16 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note F#, 1 speed 1 note G#, 5 - channel_volume 3 + volume_envelope 3, 7 note G#, 6 inc_octave - channel_volume 10 + volume_envelope 10, 0 speed 11 note C#, 9 - channel_volume 3 + volume_envelope 3, 7 note C#, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 1 inc_octave note C#, 1 @@ -293,55 +278,55 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) dec_octave speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 speed 11 - channel_volume 10 + volume_envelope 10, 0 note F#, 9 - channel_volume 3 + volume_envelope 3, 7 note F#, 4 - channel_volume 10 + volume_envelope 10, 0 note G#, 1 note A_, 1 speed 1 note G#, 5 - channel_volume 3 + volume_envelope 3, 7 note G#, 6 - channel_volume 10 + volume_envelope 10, 0 speed 11 note B_, 8 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 2 note B_, 1 - ;tie +; tie speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 speed 11 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C#, 1 note D_, 1 speed 1 note C#, 5 - channel_volume 3 + volume_envelope 3, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 0 speed 11 note E_, 10 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 1 speed 1 note C#, 8 - channel_volume 3 + volume_envelope 3, 7 note C#, 3 dec_octave - channel_volume 10 + volume_envelope 10, 0 speed 11 note B_, 1 inc_octave @@ -349,91 +334,81 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) dec_octave speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 speed 11 - channel_volume 10 + volume_envelope 10, 0 note E_, 10 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 2 + volume_envelope 1, -7 note A_, 3 - channel_volume 6 + volume_envelope 6, 0 note A_, 5 inc_octave - channel_volume 4 + volume_envelope 3, -7 note E_, 3 - channel_volume 8 + volume_envelope 7, -7 note E_, 3 - channel_volume 10 + volume_envelope 10, 0 note E_, 2 duty_cycle 1 .Loop9 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 sound_loop 4, .Loop9 sound_loop 0, .MainLoop @@ -441,14 +416,14 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) Branch_f65a7: speed 11 octave 4 - channel_volume 10 + volume_envelope 10, 0 note C#, 5 - ;tie +; tie note C#, 4 - channel_volume 3 + volume_envelope 3, 7 note C#, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 1 inc_octave note C#, 1 @@ -457,17 +432,17 @@ Branch_f65a7: dec_octave speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 speed 11 - channel_volume 10 + volume_envelope 10, 0 inc_octave note C#, 5 - ;tie +; tie note C#, 4 - channel_volume 3 + volume_envelope 3, 7 note C#, 4 - channel_volume 10 + volume_envelope 10, 0 sound_ret Branch_f65cf: @@ -476,13 +451,13 @@ Branch_f65cf: speed 11 rest 2 speed 1 - channel_volume 10 + volume_envelope 10, 3 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 6 sound_loop 3, .Loop10 duty_cycle 2 - channel_volume 8 + volume_envelope 8, 0 note D_, 5 note G_, 6 note B_, 5 @@ -495,29 +470,29 @@ Branch_f65cf: note D_, 5 note G_, 6 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 dec_octave speed 1 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 6 .Loop11 speed 11 rest 2 speed 1 - channel_volume 10 + volume_envelope 10, 3 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 6 sound_loop 3, .Loop11 dec_octave duty_cycle 2 - channel_volume 8 + volume_envelope 8, 0 note B_, 5 inc_octave note E_, 6 @@ -533,202 +508,185 @@ Branch_f65cf: Branch_f661d: octave 4 speed 1 - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 sound_ret -Music_DuelTheme3_Ch2: ; f6649 (3d:6649) +Music_DuelTheme3_Ch2: speed 11 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 .MainLoop octave 2 duty_cycle 0 - ;frequency_offset 3 +; frequency_offset 3 .Loop1 - ;rept 4 - channel_volume 8 + volume_envelope 8, 2 note F#, 2 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 2 note F#, 2 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 2 note F#, 2 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 2 note F#, 2 rest 1 - ;endr - channel_volume 8 + volume_envelope 8, 0 note E_, 2 - channel_volume 8 + volume_envelope 8, 5 note F_, 2 sound_loop 4, .Loop1 - ;frequency_offset 0 +; frequency_offset 0 octave 3 .Loop2 rest 6 - channel_volume 10 + volume_envelope 10, 3 note E_, 1 - channel_volume 2 + volume_envelope 2, 7 note E_, 1 rest 8 sound_loop 4, .Loop2 .Loop3 - ;rept 2 sound_call Branch_f67b2 - ;--- sound_call Branch_f67b2 - ;endr - ;rept 2 sound_call Branch_f680a - ;--- sound_call Branch_f680a - ;endr sound_loop 2, .Loop3 octave 2 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 speed 1 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 sound_call Branch_f6866 octave 4 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave dec_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 3 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 sound_call Branch_f6866 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 0 .Loop4 - ;rept 2 sound_call Branch_f67b2 - ;--- sound_call Branch_f67b2 - ;endr - ;rept 2 sound_call Branch_f680a - ;--- sound_call Branch_f680a - ;endr sound_loop 2, .Loop4 vibrato 10, 3, 3 .Loop5 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 note F#, 1 note F#, 1 - fade_wave 8 +; cutoff 8 speed 1 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 speed 11 note F#, 1 inc_octave - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note C#, 2 dec_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 note F#, 1 note F#, 1 speed 1 - fade_wave 8 +; cutoff 8 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 speed 11 note F#, 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 note F#, 1 note F#, 1 - fade_wave 8 +; cutoff 8 speed 1 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 speed 11 note F#, 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 note F#, 1 note F#, 1 speed 1 - fade_wave 8 +; cutoff 8 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 speed 11 note F#, 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note A_, 2 note G#, 2 sound_loop 4, .Loop5 @@ -754,268 +712,248 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) note E_, 4 octave 3 .Loop6 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 sound_loop 6, .Loop6 duty_cycle 1 inc_octave .Loop7 - ;rept 4 - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - ;endr - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - ;rept 4 - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;endr - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 sound_loop 4, .Loop7 sound_loop 0, .MainLoop Branch_f67b2: octave 2 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 speed 1 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 - channel_volume 10 + volume_envelope 10, 3 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 speed 1 note F#, 5 - channel_volume 3 + volume_envelope 3, 7 note F#, 6 inc_octave - channel_volume 10 + volume_envelope 10, 3 speed 11 note C_, 1 dec_octave speed 1 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 6 speed 11 rest 1 speed 1 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 speed 11 rest 1 speed 1 - channel_volume 10 + volume_envelope 10, 3 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 4 note B_, 4 note A_, 3 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 speed 11 - channel_volume 9 + volume_envelope 9, 0 note E_, 1 - channel_volume 10 + volume_envelope 10, 3 note F_, 1 sound_ret Branch_f680a: octave 2 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 speed 1 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 - channel_volume 10 + volume_envelope 10, 3 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 6 - channel_volume 10 + volume_envelope 10, 3 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 speed 11 rest 1 speed 1 - channel_volume 10 + volume_envelope 10, 3 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 inc_octave - channel_volume 10 + volume_envelope 10, 3 speed 11 note C#, 1 speed 1 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 6 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 dec_octave speed 1 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 6 speed 11 rest 1 inc_octave speed 1 - channel_volume 10 + volume_envelope 10, 3 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave - channel_volume 10 + volume_envelope 10, 3 note B_, 4 inc_octave note C#, 4 dec_octave note B_, 3 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 speed 11 - channel_volume 9 + volume_envelope 9, 0 note B_, 1 - channel_volume 10 + volume_envelope 10, 3 note G_, 1 sound_ret @@ -1025,17 +963,17 @@ Branch_f6866: speed 11 rest 1 speed 1 - channel_volume 10 + volume_envelope 10, 3 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 sound_loop 3, .Loop8 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note B_, 5 inc_octave note D_, 6 @@ -1047,34 +985,34 @@ Branch_f6866: inc_octave note D_, 6 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave dec_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 3 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 .Loop9 speed 11 rest 1 speed 1 - channel_volume 10 + volume_envelope 10, 3 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 sound_loop 3, .Loop9 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note G_, 5 note B_, 6 inc_octave @@ -1090,36 +1028,31 @@ Branch_f6866: sound_ret -Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) +Music_DuelTheme3_Ch3: speed 11 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 96 - ;vibrato_type 8 +; echo 96 +; vibrato_type 8 vibrato 0, 3, 3 - ;cutoff 8 +; cutoff 8 .MainLoop octave 2 .Loop1 - ;rept 4 - ;cutoff 4 +; cutoff 4 note F#, 2 rest 1 - ;--- - ;cutoff 4 +; cutoff 4 note F#, 2 rest 1 - ;--- - ;cutoff 4 +; cutoff 4 note F#, 2 rest 1 - ;--- - ;cutoff 4 +; cutoff 4 note F#, 2 rest 1 - ;endr - ;cutoff 8 +; cutoff 8 note E_, 2 note F_, 2 sound_loop 4, .Loop1 @@ -1127,44 +1060,32 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) sound_call Branch_f6973 sound_loop 4, .Loop2 .Loop3 - sound_call Branch_f6973 sound_call Branch_f6992 sound_loop 2, .Loop3 octave 2 .Loop4 - ;rept 4 note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;endr note G_, 2 note G_, 2 - ;rept 4 note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;endr note E_, 2 note F_, 2 sound_loop 2, .Loop4 .Loop5 - sound_call Branch_f6973 sound_call Branch_f6992 sound_loop 2, .Loop5 vibrato 10, 3, 3 @@ -1173,7 +1094,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) sound_call Branch_f69f0 speed 11 octave 4 - ;cutoff 8 +; cutoff 8 note D_, 2 note C#, 2 dec_octave @@ -1181,7 +1102,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) sound_loop 3, .Loop6 sound_call Branch_f69f0 octave 2 - ;cutoff 8 +; cutoff 8 note F#, 2 note E_, 2 vibrato 0, 3, 3 @@ -1206,65 +1127,50 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) note E_, 4 dec_octave .Loop7 - ;rept 4 note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;endr note F#, 2 note F_, 2 - ;rept 4 note E_, 1 rest 2 - ;--- note E_, 1 rest 2 - ;--- note E_, 1 rest 2 - ;--- note E_, 1 rest 2 - ;endr note E_, 2 note F_, 2 sound_loop 6, .Loop7 - ;cutoff 7 +; cutoff 7 .Loop8 inc_octave - ;rept 4 note F#, 1 dec_octave note F#, 1 note F#, 1 inc_octave - ;--- note F#, 1 dec_octave note F#, 1 note F#, 1 inc_octave - ;--- note F#, 1 dec_octave note F#, 1 note F#, 1 inc_octave - ;--- note F#, 1 dec_octave note F#, 1 note F#, 1 inc_octave - ;endr note F#, 1 dec_octave note F#, 1 @@ -1273,31 +1179,26 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) dec_octave note F#, 1 inc_octave - ;rept 4 note E_, 1 dec_octave note E_, 1 note E_, 1 inc_octave - ;--- note E_, 1 dec_octave note E_, 1 note E_, 1 inc_octave - ;--- note E_, 1 dec_octave note E_, 1 note E_, 1 inc_octave - ;--- note E_, 1 dec_octave note E_, 1 note E_, 1 inc_octave - ;endr note E_, 1 dec_octave note E_, 1 @@ -1306,7 +1207,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) dec_octave note E_, 1 sound_loop 4, .Loop8 - ;cutoff 8 +; cutoff 8 sound_loop 0, .MainLoop Branch_f6973: @@ -1315,11 +1216,11 @@ Branch_f6973: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note F#, 1 rest 2 note F#, 1 @@ -1329,27 +1230,28 @@ Branch_f6973: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note E_, 2 note F_, 2 sound_ret Branch_f6992: octave 2 - ;sound_call Branch_f6973 +; sound_call Branch_f6973 + octave 2 note F#, 1 rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note F#, 1 rest 2 note F#, 1 @@ -1359,11 +1261,37 @@ Branch_f6992: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 1 dec_octave dec_octave - ;cutoff 8 +; 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 + rest 1 + rest 1 + note F#, 1 + 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 @@ -1371,11 +1299,11 @@ Branch_f6992: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note F#, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note G_, 1 rest 2 note G_, 1 @@ -1385,22 +1313,22 @@ Branch_f6992: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note F#, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note F_, 2 note F#, 2 note G_, 1 rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note F#, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note G_, 1 rest 2 note G_, 1 @@ -1410,11 +1338,11 @@ Branch_f6992: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note F#, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note G_, 1 rest 1 note F_, 2 @@ -1422,93 +1350,88 @@ Branch_f6992: Branch_f69f0: octave 2 - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave - ;cutoff 4 +; cutoff 4 note C#, 1 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave inc_octave - ;cutoff 8 +; cutoff 8 note F#, 2 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave - ;cutoff 4 +; cutoff 4 note C#, 1 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave inc_octave - ;cutoff 8 +; cutoff 8 note E_, 2 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave - ;cutoff 4 +; cutoff 4 note C#, 1 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave inc_octave - ;cutoff 8 +; cutoff 8 note D#, 2 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave - ;cutoff 4 +; cutoff 4 note C#, 1 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 sound_ret -Music_DuelTheme3_Ch4: ; f6a3f (3d:6a3f) +Music_DuelTheme3_Ch4: toggle_noise 6 drum_speed 11 .MainLoop .Loop1 - ;rept 4 drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 - ;--- drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 - ;--- drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 - ;--- drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 - ;endr drum_note 5, 1 drum_note 4, 1 drum_note 5, 1 @@ -1788,42 +1711,36 @@ Branch_f6b7e: Branch_f6b9a: drum_speed 11 .Loop9 - ;rept 5 drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - ;--- drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - ;--- drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - ;--- drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - ;--- drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - ;endr drum_note 1, 1 sound_loop 3, .Loop9 .Loop10 @@ -1835,4 +1752,3 @@ Branch_f6b9a: drum_note 2, 1 sound_loop 4, .Loop10 sound_ret -; 0xf6bb7 diff --git a/crysaudio/music/TCG/hallofhonor.asm b/crysaudio/music/TCG/hallofhonor.asm index 82a3f802..00a69b1a 100644 --- a/crysaudio/music/TCG/hallofhonor.asm +++ b/crysaudio/music/TCG/hallofhonor.asm @@ -4,10 +4,10 @@ Music_HallOfHonor: channel 2, Music_HallOfHonor_Ch2 channel 3, Music_HallOfHonor_Ch3 -Music_HallOfHonor_Ch1: ; fafea (3e:6fea) +Music_HallOfHonor_Ch1: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 .Loop1 sound_call Branch_fb016 @@ -17,15 +17,15 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea) sound_call Branch_fb016 sound_loop 8, .Loop2 octave 4 - channel_volume 5 + volume_envelope 5, 5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 sound_call Branch_fb044 .Loop3 - channel_volume 5 + volume_envelope 5, 5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 sound_call Branch_fb044 sound_loop 23, .Loop3 @@ -33,82 +33,82 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea) Branch_fb016: octave 4 - channel_volume 6 + volume_envelope 6, 5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 - channel_volume 6 + volume_envelope 6, 5 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 - channel_volume 6 + volume_envelope 6, 5 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 - channel_volume 6 + volume_envelope 6, 5 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 inc_octave - channel_volume 6 + volume_envelope 6, 5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 dec_octave - channel_volume 6 + volume_envelope 6, 5 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 - channel_volume 6 + volume_envelope 6, 5 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 sound_ret Branch_fb044: octave 4 - channel_volume 5 + volume_envelope 5, 5 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 - channel_volume 5 + volume_envelope 5, 5 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 - channel_volume 5 + volume_envelope 5, 5 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 inc_octave - channel_volume 5 + volume_envelope 5, 5 note C_, 1 dec_octave - channel_volume 2 + volume_envelope 2, 7 note F_, 1 - channel_volume 5 + volume_envelope 5, 5 note F_, 1 inc_octave - channel_volume 2 + volume_envelope 2, 7 note C_, 1 dec_octave - channel_volume 5 + volume_envelope 5, 5 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 sound_ret -Music_HallOfHonor_Ch2: ; fb06e (3e:706e) +Music_HallOfHonor_Ch2: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 - ;frequency_offset -1 +; frequency_offset -1 rest 2 speed 1 rest 4 speed 7 - channel_volume 1 + volume_envelope 1, 7 .Loop1 sound_call Branch_fb1ec sound_loop 3, .Loop1 @@ -129,66 +129,66 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) speed 1 rest 3 speed 7 - ;frequency_offset 0 +; frequency_offset 0 .MainLoop octave 1 duty_cycle 1 .Loop2 sound_call Branch_fb0bb octave 1 - channel_volume 7 + volume_envelope 6, -5 note E_, 5 - channel_volume 13 + volume_envelope 13, 0 note E_, 11 - ;tie +; tie note E_, 12 sound_loop 3, .Loop2 sound_call Branch_fb0bb octave 1 - channel_volume 7 + volume_envelope 6, -5 note G_, 5 - channel_volume 13 + volume_envelope 13, 0 note G_, 11 - ;tie +; tie note G_, 12 sound_loop 0, .MainLoop Branch_fb0bb: octave 1 - channel_volume 7 + volume_envelope 6, -5 note F_, 5 - channel_volume 13 + volume_envelope 13, 0 note F_, 11 - ;tie +; tie note F_, 12 - channel_volume 7 + volume_envelope 6, -5 note E_, 5 - channel_volume 13 + volume_envelope 13, 0 note E_, 11 - ;tie +; tie note E_, 12 - channel_volume 7 + volume_envelope 6, -5 note D_, 5 - channel_volume 13 + volume_envelope 13, 0 note D_, 11 - ;tie +; tie note D_, 12 sound_ret -Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) +Music_HallOfHonor_Ch3: speed 7 channel_volume 2 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE fade_wave 12 - ;vibrato_type 4 +; vibrato_type 4 vibrato 35, 2, 4 - ;cutoff 6 - ;echo 64 +; cutoff 6 +; echo 64 rest 3 channel_volume 3 - ;cutoff 8 - ;frequency_offset -1 +; cutoff 8 +; frequency_offset -1 .Loop1 rest 14 sound_loop 4, .Loop1 @@ -211,175 +211,175 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) dec_octave note F_, 1 channel_volume 1 - ;frequency_offset 0 +; frequency_offset 0 octave 5 speed 1 - ;cutoff 6 +; cutoff 6 note B_, 3 inc_octave note C_, 4 - ;tie +; tie speed 7 note C_, 15 - ;tie +; tie note C_, 8 dec_octave - ;cutoff 8 +; cutoff 8 note B_, 2 - ;cutoff 4 +; cutoff 4 note A_, 2 - ;cutoff 6 +; cutoff 6 note G_, 6 note C_, 10 - ;tie +; tie note C_, 12 speed 1 - ;cutoff 8 +; cutoff 8 note B_, 3 inc_octave - ;cutoff 6 +; cutoff 6 note C_, 4 - ;tie +; tie speed 7 note C_, 15 - ;tie +; tie note C_, 6 dec_octave - ;cutoff 8 +; cutoff 8 note B_, 2 inc_octave note C_, 2 - ;cutoff 4 +; cutoff 4 note D_, 2 dec_octave speed 1 - ;cutoff 8 +; cutoff 8 note F#, 3 - ;cutoff 6 +; cutoff 6 note G_, 4 - ;tie +; tie speed 7 note G_, 15 - ;tie +; tie note G_, 6 - ;cutoff 8 +; cutoff 8 note G_, 2 note A_, 2 - ;cutoff 4 +; cutoff 4 note B_, 2 speed 1 - ;cutoff 8 +; cutoff 8 note B_, 3 inc_octave note C_, 4 - ;tie +; tie speed 7 note C_, 15 - ;tie +; tie note C_, 8 dec_octave note B_, 2 - ;cutoff 4 +; cutoff 4 note A_, 2 - ;cutoff 6 +; cutoff 6 note G_, 6 - ;cutoff 8 +; cutoff 8 speed 1 note B_, 3 inc_octave - ;cutoff 6 +; cutoff 6 note C_, 4 - ;tie +; tie speed 7 note C_, 9 - ;tie +; tie note C_, 6 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 2 inc_octave note C_, 2 - ;cutoff 4 +; cutoff 4 note E_, 2 speed 1 - ;cutoff 8 +; cutoff 8 note E_, 3 note F_, 4 - ;tie +; tie speed 7 note F_, 1 note E_, 2 - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 7 +; cutoff 7 note C_, 10 - ;tie +; tie note C_, 10 - ;cutoff 4 +; cutoff 4 note E_, 2 speed 1 - ;cutoff 8 +; cutoff 8 note E_, 3 note F_, 4 - ;tie +; tie speed 7 note F_, 1 note E_, 2 - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 6 +; cutoff 6 note C_, 10 - ;tie +; tie note C_, 12 speed 1 - ;cutoff 8 +; cutoff 8 note F#, 3 - ;cutoff 7 +; cutoff 7 note G_, 4 - ;tie +; tie speed 7 note G_, 15 - ;tie +; tie note G_, 8 - ;cutoff 8 +; cutoff 8 note F_, 2 - ;cutoff 4 +; cutoff 4 note E_, 2 - ;cutoff 8 +; cutoff 8 note F_, 2 - ;cutoff 4 +; cutoff 4 note E_, 2 note C_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note G_, 10 - ;tie +; tie note G_, 10 - ;cutoff 8 +; cutoff 8 note E_, 2 note F_, 2 inc_octave - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 7 +; cutoff 7 note C_, 12 - ;tie +; tie note C_, 10 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 2 note F_, 2 inc_octave - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 6 +; cutoff 6 note C_, 12 - ;tie +; tie note C_, 12 rest 3 channel_volume 3 - ;frequency_offset -1 - ;cutoff 8 +; frequency_offset -1 +; cutoff 8 sound_loop 0, .MainLoop Branch_fb1ec: @@ -401,4 +401,3 @@ Branch_fb1ec: note G_, 1 rest 1 sound_ret -; 0xfb1fe diff --git a/crysaudio/music/TCG/imakuni.asm b/crysaudio/music/TCG/imakuni.asm index 0b2886a5..d6925016 100644 --- a/crysaudio/music/TCG/imakuni.asm +++ b/crysaudio/music/TCG/imakuni.asm @@ -5,14 +5,14 @@ Music_Imakuni: channel 3, Music_Imakuni_Ch3 channel 4, Music_Imakuni_Ch4 -Music_Imakuni_Ch1: ; fad55 (3e:6d55) +Music_Imakuni_Ch1: speed 3 - ;stereo_panning 1, 1 - ;vibrato_type 5 + stereo_panning TRUE, TRUE +; vibrato_type 5 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 2 - channel_volume 10 + volume_envelope 10, 0 .MainLoop .Loop1 rest 10 @@ -27,7 +27,7 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) rest 8 speed 9 note F_, 10 - ;tie +; tie speed 1 note F_, 7 rest 8 @@ -58,7 +58,7 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note F#, 7 rest 8 note G_, 15 - ;tie +; tie note G_, 7 note F#, 3 note G_, 2 @@ -160,7 +160,7 @@ Branch_fadf9: note E_, 7 rest 8 note F_, 15 - ;tie +; tie note F_, 7 note E_, 3 note F_, 2 @@ -183,7 +183,7 @@ Branch_fae1d: rest 8 speed 9 note F_, 10 - ;tie +; tie speed 1 note F_, 7 rest 8 @@ -192,30 +192,27 @@ Branch_fae1d: sound_ret -Music_Imakuni_Ch2: ; fae32 (3e:6e32) - ;stereo_panning 1, 1 - ;vibrato_type 0 +Music_Imakuni_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 0 vibrato 0, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 .Loop1 sound_call Branch_faea5 sound_loop 6, .Loop1 .Loop2 - ;rept 2 speed 3 rest 10 speed 1 note C_, 7 rest 8 - ;--- speed 3 rest 10 speed 1 note C_, 7 rest 8 - ;endr rest 15 note C_, 7 rest 8 @@ -237,7 +234,7 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) speed 1 octave 2 note F_, 15 - ;tie +; tie note F_, 7 inc_octave note F_, 8 @@ -253,7 +250,7 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) speed 1 dec_octave note D#, 15 - ;tie +; tie note D#, 7 inc_octave note D#, 8 @@ -270,18 +267,15 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) .Loop4 note D_, 7 rest 8 - ;rept 2 rest 15 - ;--- rest 15 - ;endr sound_loop 4, .Loop4 note D_, 7 rest 8 rest 15 vibrato 5, 3, 3 note D_, 15 - ;tie +; tie note D_, 7 rest 8 vibrato 0, 3, 3 @@ -292,15 +286,12 @@ Branch_faea5: speed 6 rest 10 speed 1 - ;rept 2 rest 15 note C#, 7 rest 8 - ;--- rest 15 note C#, 7 rest 8 - ;endr vibrato 8, 3, 3 speed 9 rest 10 @@ -310,20 +301,20 @@ Branch_faea5: sound_ret -Music_Imakuni_Ch3: ; faebc (3e:6ebc) - ;stereo_panning 1, 1 +Music_Imakuni_Ch3: + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;vibrato_type 6 +; vibrato_type 6 vibrato 0, 3, 3 - ;echo 0 - ;cutoff 8 +; echo 0 +; cutoff 8 .MainLoop sound_call Branch_faf7d vibrato 8, 3, 3 speed 1 note D_, 15 - ;tie +; tie note D_, 7 inc_octave vibrato 0, 3, 3 @@ -389,7 +380,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) speed 1 octave 2 note F_, 15 - ;tie +; tie note F_, 7 inc_octave note F_, 8 @@ -408,7 +399,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) speed 1 dec_octave note D#, 15 - ;tie +; tie note D#, 7 inc_octave note D#, 8 @@ -444,7 +435,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) octave 4 vibrato 5, 3, 3 note C_, 15 - ;tie +; tie note C_, 7 inc_octave vibrato 0, 3, 3 @@ -491,9 +482,8 @@ Branch_faf7d: sound_ret -Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) +Music_Imakuni_Ch4: toggle_noise 6 -.MainLoop drum_speed 1 octave 1 .Loop1 @@ -556,5 +546,4 @@ Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) drum_note 2, 7 drum_note 2, 15 drum_note 2, 15 - sound_loop 0, .MainLoop -; 0xfafea + sound_loop 0, Music_Imakuni_Ch4 diff --git a/crysaudio/music/TCG/matchdraw.asm b/crysaudio/music/TCG/matchdraw.asm index 64beceaf..8963cbbd 100644 --- a/crysaudio/music/TCG/matchdraw.asm +++ b/crysaudio/music/TCG/matchdraw.asm @@ -4,13 +4,13 @@ Music_MatchDraw: channel 2, Music_MatchDraw_Ch2 channel 3, Music_MatchDraw_Ch3 -Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) +Music_MatchDraw_Ch1: speed 3 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 4 duty_cycle 1 - channel_volume 11 + volume_envelope 11, 0 note C_, 4 dec_octave note B_, 2 @@ -29,35 +29,35 @@ Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) note B_, 2 note A#, 4 note B_, 2 - channel_volume 2 + volume_envelope 2, 7 note B_, 2 - channel_volume 11 + volume_envelope 11, 0 note F#, 4 note G_, 2 - channel_volume 2 + volume_envelope 2, 7 note G_, 2 - channel_volume 11 + volume_envelope 11, 0 note C_, 2 - channel_volume 2 + volume_envelope 2, 7 note C_, 4 inc_octave - channel_volume 11 + volume_envelope 11, 0 note E_, 1 note G_, 1 inc_octave note C_, 2 - channel_volume 2 + volume_envelope 2, 7 note C_, 2 sound_ret -Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) +Music_MatchDraw_Ch2: speed 3 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 3 duty_cycle 1 - channel_volume 11 + volume_envelope 11, 0 rest 16 note C_, 4 dec_octave @@ -69,34 +69,34 @@ Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) note F#, 2 note F_, 4 note F#, 2 - channel_volume 2 + volume_envelope 2, 7 note F#, 2 - channel_volume 11 + volume_envelope 11, 0 note C#, 4 note D_, 2 - channel_volume 2 + volume_envelope 2, 7 note D_, 2 dec_octave - channel_volume 11 + volume_envelope 11, 0 note G_, 2 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 inc_octave inc_octave - channel_volume 11 + volume_envelope 11, 0 note E_, 2 - channel_volume 2 + volume_envelope 2, 7 note E_, 2 sound_ret -Music_MatchDraw_Ch3: ; f7d47 (3d:7d47) +Music_MatchDraw_Ch3: speed 6 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;cutoff 8 - ;echo 0 +; cutoff 8 +; echo 0 octave 2 rest 16 note G_, 2 @@ -110,4 +110,3 @@ Music_MatchDraw_Ch3: ; f7d47 (3d:7d47) inc_octave note C_, 1 sound_ret -; 0xf7d60 diff --git a/crysaudio/music/TCG/matchloss.asm b/crysaudio/music/TCG/matchloss.asm index f9621ff4..eab3b5bb 100644 --- a/crysaudio/music/TCG/matchloss.asm +++ b/crysaudio/music/TCG/matchloss.asm @@ -4,80 +4,80 @@ Music_MatchLoss: channel 2, Music_MatchLoss_Ch2 channel 3, Music_MatchLoss_Ch3 -Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_MatchLoss_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 4 duty_cycle 2 - channel_volume 11 + volume_envelope 11, 0 speed 1 note E_, 3 note F_, 2 - ;tie +; tie speed 5 note F_, 3 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A#, 1 - channel_volume 3 + volume_envelope 3, 7 note A#, 3 inc_octave speed 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 note D#, 2 - ;tie +; tie note D#, 16 dec_octave note A#, 6 - channel_volume 3 + volume_envelope 3, 7 note A#, 16 - channel_volume 10 + volume_envelope 10, 0 note G#, 6 - channel_volume 3 + volume_envelope 3, 7 note G#, 16 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 3 note C#, 8 - ;tie +; tie note C#, 12 dec_octave speed 6 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 3 - channel_volume 10 + volume_envelope 10, 0 note F#, 1 speed 7 - channel_volume 3 + volume_envelope 3, 7 note F#, 3 speed 1 - channel_volume 10 + volume_envelope 10, 0 note B_, 5 inc_octave note C_, 4 - ;tie +; tie speed 9 note C_, 11 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 sound_ret -Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) - ;stereo_panning 1, 1 - ;vibrato_type 5 +Music_MatchLoss_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 5 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 3 duty_cycle 2 - channel_volume 9 + volume_envelope 9, 0 speed 9 rest 9 speed 11 @@ -87,50 +87,49 @@ Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) speed 9 rest 6 note G_, 6 - ;tie +; tie note G_, 6 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 sound_ret -Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) - ;stereo_panning 1, 1 +Music_MatchLoss_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;cutoff 8 - ;echo 64 +; cutoff 8 +; echo 64 octave 2 speed 5 note A#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 4 note A#, 4 dec_octave - ;cutoff 8 +; cutoff 8 speed 7 note G#, 3 inc_octave - ;cutoff 4 +; cutoff 4 speed 2 note D#, 11 note G#, 11 dec_octave - ;cutoff 8 +; cutoff 8 speed 1 note F#, 11 - ;tie +; tie note F#, 12 inc_octave - ;cutoff 4 +; cutoff 4 speed 12 note C#, 2 speed 2 note F#, 13 dec_octave speed 9 - ;cutoff 8 +; cutoff 8 note F_, 12 sound_ret -; 0xf7cdf diff --git a/crysaudio/music/TCG/matchstart1.asm b/crysaudio/music/TCG/matchstart1.asm index 0248bbb8..9434e605 100644 --- a/crysaudio/music/TCG/matchstart1.asm +++ b/crysaudio/music/TCG/matchstart1.asm @@ -2,13 +2,13 @@ Music_MatchStart1: channel_count 1 channel 1, Music_MatchStart1_Ch1 -Music_MatchStart1_Ch1: ; f7919 (3d:7919) +Music_MatchStart1_Ch1: speed 1 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 .Loop1 duty_cycle 2 - channel_volume 15 + volume_envelope 15, 0 octave 3 note C_, 1 inc_octave @@ -44,15 +44,14 @@ Music_MatchStart1_Ch1: ; f7919 (3d:7919) note A_, 1 sound_loop 3, .Loop1 octave 4 - channel_volume 6 + volume_envelope 6, 0 note E_, 1 inc_octave note E_, 1 octave 4 - channel_volume 2 + volume_envelope 2, 0 dec_octave note B_, 1 inc_octave note B_, 1 sound_ret -; 0xf7956 diff --git a/crysaudio/music/TCG/matchstart2.asm b/crysaudio/music/TCG/matchstart2.asm index 4f01e850..66ef0bae 100644 --- a/crysaudio/music/TCG/matchstart2.asm +++ b/crysaudio/music/TCG/matchstart2.asm @@ -3,12 +3,12 @@ Music_MatchStart2: channel 1, Music_MatchStart2_Ch1 channel 2, Music_MatchStart2_Ch2 -Music_MatchStart2_Ch1: ; f7956 (3d:7956) +Music_MatchStart2_Ch1: speed 1 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 2 - channel_volume 15 + volume_envelope 15, 0 duty_cycle 0 note C_, 1 note E_, 1 @@ -78,14 +78,14 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) note F_, 1 note B_, 1 dec_octave - channel_volume 6 + volume_envelope 6, 0 note E_, 1 note G_, 1 note B_, 1 inc_octave note C_, 1 note E_, 1 - channel_volume 2 + volume_envelope 2, 0 note G_, 1 note B_, 1 inc_octave @@ -93,14 +93,14 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) sound_ret -Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) +Music_MatchStart2_Ch2: speed 1 - ;stereo_panning 1, 1 - fade_wave 8 - ;frequency_offset 6 + stereo_panning TRUE, TRUE +; cutoff 8 +; frequency_offset 6 rest 4 octave 2 - channel_volume 6 + volume_envelope 6, 0 duty_cycle 0 note C_, 1 note E_, 1 @@ -170,7 +170,7 @@ Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) note F_, 1 note B_, 1 dec_octave - channel_volume 2 + volume_envelope 2, 0 note E_, 1 note G_, 1 note B_, 1 @@ -178,4 +178,3 @@ Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) note C_, 1 note E_, 1 sound_ret -; 0xf7a0f diff --git a/crysaudio/music/TCG/matchstart3.asm b/crysaudio/music/TCG/matchstart3.asm index c7baa4e6..f946c0be 100644 --- a/crysaudio/music/TCG/matchstart3.asm +++ b/crysaudio/music/TCG/matchstart3.asm @@ -3,12 +3,12 @@ Music_MatchStart3: channel 1, Music_MatchStart3_Ch1 channel 2, Music_MatchStart3_Ch2 -Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) +Music_MatchStart3_Ch1: speed 1 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 2 - channel_volume 15 + volume_envelope 15, 0 duty_cycle 1 note C_, 1 note E_, 1 @@ -153,14 +153,14 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) note D_, 1 dec_octave octave 4 - channel_volume 6 + volume_envelope 6, 0 note F_, 1 note A_, 1 inc_octave note C_, 1 dec_octave octave 5 - channel_volume 2 + volume_envelope 2, 0 note G_, 1 note B_, 1 inc_octave @@ -168,14 +168,14 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) sound_ret -Music_MatchStart3_Ch2: ; f7aba (3d:7aba) +Music_MatchStart3_Ch2: speed 1 - ;stereo_panning 1, 1 - fade_wave 8 - ;frequency_offset 6 + stereo_panning TRUE, TRUE +; cutoff 8 +; frequency_offset 6 rest 4 octave 2 - channel_volume 6 + volume_envelope 6, 0 duty_cycle 1 note C_, 1 note E_, 1 @@ -320,11 +320,10 @@ Music_MatchStart3_Ch2: ; f7aba (3d:7aba) note D_, 1 dec_octave octave 4 - channel_volume 2 + volume_envelope 2, 0 note F_, 1 note A_, 1 inc_octave note C_, 1 dec_octave sound_ret -; 0xf7b61 diff --git a/crysaudio/music/TCG/matchvictory.asm b/crysaudio/music/TCG/matchvictory.asm index 3743739a..69e6f96d 100644 --- a/crysaudio/music/TCG/matchvictory.asm +++ b/crysaudio/music/TCG/matchvictory.asm @@ -4,134 +4,134 @@ Music_MatchVictory: channel 2, Music_MatchVictory_Ch2 channel 3, Music_MatchVictory_Ch3 -Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_MatchVictory_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 3 duty_cycle 0 - channel_volume 11 + volume_envelope 11, 0 speed 1 note A_, 15 - ;tie +; tie note A_, 9 - channel_volume 2 + volume_envelope 2, 7 note A_, 5 - channel_volume 11 + volume_envelope 11, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 3 - channel_volume 11 + volume_envelope 11, 0 note F_, 7 - channel_volume 2 + volume_envelope 2, 7 note F_, 3 - channel_volume 11 + volume_envelope 11, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 2 - channel_volume 11 + volume_envelope 11, 0 note B_, 11 - channel_volume 2 + volume_envelope 2, 7 note B_, 10 inc_octave - channel_volume 11 + volume_envelope 11, 0 note C_, 10 - channel_volume 2 + volume_envelope 2, 7 note C_, 11 - channel_volume 11 + volume_envelope 11, 0 note D_, 10 - channel_volume 2 + volume_envelope 2, 7 note D_, 10 - channel_volume 11 + volume_envelope 11, 0 note C#, 8 - channel_volume 2 + volume_envelope 2, 7 note C#, 13 - channel_volume 11 + volume_envelope 11, 0 note D_, 5 - channel_volume 2 + volume_envelope 2, 7 note D_, 6 - channel_volume 11 + volume_envelope 11, 0 speed 8 note E_, 12 - channel_volume 2 + volume_envelope 2, 7 note E_, 4 sound_ret -Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_MatchVictory_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 3 duty_cycle 0 - channel_volume 11 + volume_envelope 11, 0 speed 1 note F_, 5 - channel_volume 2 + volume_envelope 2, 7 note F_, 5 dec_octave - channel_volume 11 + volume_envelope 11, 0 note A_, 5 inc_octave note C_, 5 note F_, 5 - channel_volume 2 + volume_envelope 2, 7 note F_, 4 - channel_volume 11 + volume_envelope 11, 0 note C_, 7 - channel_volume 2 + volume_envelope 2, 7 note C_, 3 dec_octave - channel_volume 11 + volume_envelope 11, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 3 inc_octave - channel_volume 11 + volume_envelope 11, 0 note C_, 7 - channel_volume 2 + volume_envelope 2, 7 note C_, 2 - channel_volume 11 + volume_envelope 11, 0 note G_, 11 - channel_volume 2 + volume_envelope 2, 7 note G_, 10 - channel_volume 11 + volume_envelope 11, 0 note A_, 10 - channel_volume 2 + volume_envelope 2, 7 note A_, 11 - channel_volume 11 + volume_envelope 11, 0 note B_, 10 - channel_volume 2 + volume_envelope 2, 7 note B_, 10 - channel_volume 11 + volume_envelope 11, 0 note A_, 8 - channel_volume 2 + volume_envelope 2, 7 note A_, 13 - channel_volume 11 + volume_envelope 11, 0 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 6 inc_octave - channel_volume 11 + volume_envelope 11, 0 speed 8 note C#, 12 - channel_volume 2 + volume_envelope 2, 7 note C#, 4 sound_ret -Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) - ;stereo_panning 1, 1 +Music_MatchVictory_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;cutoff 8 - ;echo 0 +; cutoff 8 +; echo 0 octave 2 speed 1 note F_, 15 - ;tie +; tie note F_, 9 rest 5 note F_, 7 @@ -153,4 +153,3 @@ Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) speed 8 note A_, 12 sound_ret -; 0xf7c2e diff --git a/crysaudio/music/TCG/medal.asm b/crysaudio/music/TCG/medal.asm index 32839d02..a78e973d 100644 --- a/crysaudio/music/TCG/medal.asm +++ b/crysaudio/music/TCG/medal.asm @@ -4,14 +4,14 @@ Music_Medal: channel 2, Music_Medal_Ch2 channel 3, Music_Medal_Ch3 -Music_Medal_Ch1: ; f7df8 (3d:7df8) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_Medal_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 2 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note E_, 5 note A_, 5 @@ -33,49 +33,49 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) note E_, 5 speed 15 note A_, 2 - ;tie +; tie speed 1 note A_, 10 - channel_volume 3 + volume_envelope 3, 7 note A_, 5 - channel_volume 10 - fade_wave 7 + volume_envelope 10, 0 +; cutoff 7 note A_, 5 note A_, 5 note A_, 5 - fade_wave 8 +; cutoff 8 note A_, 15 - channel_volume 3 + volume_envelope 3, 7 note A_, 5 - channel_volume 10 + volume_envelope 10, 0 note A_, 16 - channel_volume 3 + volume_envelope 3, 7 note A_, 5 - channel_volume 10 + volume_envelope 10, 0 note A_, 16 - channel_volume 3 + volume_envelope 3, 7 note A_, 6 - channel_volume 10 + volume_envelope 10, 0 speed 9 note A_, 5 - ;tie +; tie note A_, 8 - ;tie +; tie speed 1 note A_, 2 - channel_volume 3 + volume_envelope 3, 7 note A_, 16 sound_ret -Music_Medal_Ch2: ; f7e4b (3d:7e4b) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_Medal_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 1 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 0 speed 1 note A_, 5 inc_octave @@ -96,61 +96,61 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) inc_octave speed 15 note C_, 2 - ;tie +; tie speed 1 note C_, 10 - channel_volume 2 + volume_envelope 2, 7 note C_, 5 - channel_volume 10 - fade_wave 7 + volume_envelope 10, 0 +; cutoff 7 note C_, 5 note C_, 5 note C_, 5 - fade_wave 8 +; cutoff 8 note D_, 15 - channel_volume 3 + volume_envelope 3, 7 note D_, 5 - channel_volume 9 + volume_envelope 9, 0 note D_, 16 - channel_volume 2 + volume_envelope 2, 7 note D_, 5 - channel_volume 9 + volume_envelope 9, 0 note D_, 16 - channel_volume 3 + volume_envelope 3, 7 note D_, 6 - channel_volume 9 + volume_envelope 9, 0 speed 9 note C#, 5 - ;tie +; tie note C#, 8 - ;tie +; tie speed 1 note C#, 2 - channel_volume 2 + volume_envelope 2, 7 note C#, 16 sound_ret -Music_Medal_Ch3: ; f7e9d (3d:7e9d) - ;stereo_panning 1, 1 +Music_Medal_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;cutoff 8 - ;echo 0 +; cutoff 8 +; echo 0 octave 2 speed 1 speed 15 rest 4 note F_, 2 - ;tie +; tie speed 1 note F_, 10 rest 5 - ;cutoff 7 +; cutoff 7 note F_, 5 note F_, 5 note F_, 5 - ;cutoff 8 +; cutoff 8 note A#, 15 rest 5 note A#, 16 @@ -159,8 +159,7 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d) rest 6 speed 9 note A_, 13 - ;tie +; tie speed 1 note A_, 2 sound_ret -; 0xf7ec8 diff --git a/crysaudio/music/TCG/overworld.asm b/crysaudio/music/TCG/overworld.asm index fbbe2103..ee0ecc4b 100644 --- a/crysaudio/music/TCG/overworld.asm +++ b/crysaudio/music/TCG/overworld.asm @@ -5,14 +5,14 @@ Music_Overworld: channel 3, Music_Overworld_Ch3 channel 4, Music_Overworld_Ch4 -Music_Overworld_Ch1: ; f71a0 (3d:71a0) +Music_Overworld_Ch1: speed 7 duty_cycle 0 - ;stereo_panning 1, 1 - ;vibrato_type 9 + stereo_panning TRUE, TRUE +; vibrato_type 9 vibrato 25, 3, 3 - channel_volume 10 - fade_wave 7 + volume_envelope 10, 2 +; cutoff 7 octave 3 rest 3 sound_call Branch_f72ba @@ -20,184 +20,184 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) .MainLoop sound_call Branch_f72ba duty_cycle 1 - fade_wave 8 +; cutoff 8 octave 3 - channel_volume 10 + volume_envelope 10, 0 note A_, 5 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 5 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 3 speed 1 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 10 - channel_volume 10 + volume_envelope 10, 0 speed 7 note G_, 3 speed 1 note F_, 11 - channel_volume 3 + volume_envelope 3, 7 note F_, 10 speed 7 - channel_volume 10 + volume_envelope 10, 0 note C_, 12 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 duty_cycle 0 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 3 note E_, 4 note E_, 3 note E_, 3 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 sound_call Branch_f72fb note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 6 - channel_volume 10 + volume_envelope 10, 0 note C_, 3 note D_, 3 note E_, 3 note G_, 6 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 10 + volume_envelope 10, 0 note F_, 4 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 - channel_volume 10 + volume_envelope 10, 0 note C_, 3 dec_octave note A_, 6 note A#, 9 - channel_volume 3 + volume_envelope 3, 7 note A#, 6 - channel_volume 10 + volume_envelope 10, 0 note A#, 3 inc_octave note D_, 3 note F_, 3 note A_, 3 - channel_volume 3 + volume_envelope 3, 7 note A_, 6 - channel_volume 10 + volume_envelope 10, 0 note G_, 3 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 10 + volume_envelope 10, 0 note E_, 3 note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 10 + volume_envelope 10, 0 note E_, 2 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 note C_, 9 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 10 + volume_envelope 10, 0 dec_octave note A_, 3 inc_octave speed 1 note C_, 11 - channel_volume 4 + volume_envelope 4, 0 note C_, 10 speed 7 - channel_volume 10 + volume_envelope 10, 0 note G_, 3 speed 1 note F_, 11 - channel_volume 4 + volume_envelope 4, 0 note F_, 10 speed 7 - channel_volume 10 + volume_envelope 10, 0 note C_, 12 - channel_volume 3 + volume_envelope 3, 7 note C_, 6 duty_cycle 2 - fade_wave 8 - channel_volume 6 +; cutoff 8 + volume_envelope 5, -7 octave 4 note G_, 1 - ;tie +; tie note E_, 1 - ;tie +; tie note C_, 1 - ;tie +; tie dec_octave note G_, 1 - ;tie +; tie note E_, 1 - ;tie +; tie note C_, 1 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 sound_call Branch_f72fb note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 6 - channel_volume 10 + volume_envelope 10, 0 note C_, 3 note D_, 3 note E_, 3 note F_, 9 - channel_volume 3 + volume_envelope 3, 7 note F_, 12 - channel_volume 10 + volume_envelope 10, 0 note F_, 2 note G_, 1 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 2 - channel_volume 10 + volume_envelope 10, 0 note A_, 12 - channel_volume 3 + volume_envelope 3, 7 note A_, 3 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 note A_, 3 note A#, 9 - channel_volume 3 + volume_envelope 3, 7 note A#, 6 - channel_volume 10 + volume_envelope 10, 0 note A_, 5 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 0 note F_, 8 - ;tie +; tie note F_, 8 - ;tie +; tie note F_, 8 - ;tie +; tie note F_, 8 - ;tie +; tie note F_, 8 - ;tie +; tie note F_, 8 - channel_volume 3 + volume_envelope 3, 7 note F_, 3 duty_cycle 0 - channel_volume 10 - fade_wave 7 + volume_envelope 10, 2 +; cutoff 7 sound_loop 0, .MainLoop Branch_f72ba: @@ -206,23 +206,23 @@ Branch_f72ba: note F_, 2 note A_, 1 inc_octave - channel_volume 10 - fade_wave 4 + volume_envelope 10, 0 +; cutoff 4 note C_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A#, 3 note A#, 1 inc_octave - channel_volume 10 - fade_wave 4 + volume_envelope 10, 0 +; cutoff 4 note D_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note G_, 3 note A#, 3 rest 3 @@ -230,22 +230,22 @@ Branch_f72ba: note A_, 2 inc_octave note C_, 1 - channel_volume 10 - fade_wave 4 + volume_envelope 10, 0 +; cutoff 4 note C_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A#, 3 note A#, 1 inc_octave - channel_volume 10 - fade_wave 4 + volume_envelope 10, 0 +; cutoff 4 note D_, 1 rest 2 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C_, 3 dec_octave note A#, 3 @@ -253,83 +253,83 @@ Branch_f72ba: Branch_f72fb: octave 4 - channel_volume 10 + volume_envelope 10, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 5 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 3 speed 1 note G_, 11 - channel_volume 3 + volume_envelope 3, 7 note G_, 10 speed 7 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 3 dec_octave speed 1 note A#, 11 - channel_volume 3 + volume_envelope 3, 7 note A#, 10 speed 7 - channel_volume 10 + volume_envelope 10, 0 note C#, 12 - channel_volume 3 + volume_envelope 3, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 0 note D#, 3 speed 1 note C#, 11 - channel_volume 3 + volume_envelope 3, 7 note C#, 10 - channel_volume 10 + volume_envelope 10, 0 speed 7 sound_ret -Music_Overworld_Ch2: ; f7334 (3d:7334) +Music_Overworld_Ch2: speed 7 duty_cycle 0 - ;stereo_panning 1, 1 - ;vibrato_type 9 + stereo_panning TRUE, TRUE +; vibrato_type 9 vibrato 30, 3, 3 - fade_wave 7 +; cutoff 7 octave 3 sound_call Branch_f7535 .MainLoop sound_call Branch_f7535 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 rest 3 note C_, 5 note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C_, 4 note C_, 3 note C_, 3 rest 3 note C_, 5 note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note G_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note D_, 4 note D_, 3 note C_, 3 @@ -338,14 +338,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A#, 5 inc_octave note D_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C_, 4 note C_, 3 dec_octave @@ -354,14 +354,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A#, 5 inc_octave note C#, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C#, 4 dec_octave note F_, 3 @@ -371,40 +371,40 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note C_, 3 note E_, 2 note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note G_, 1 - fade_wave 7 - channel_volume 6 - fade_wave 8 +; cutoff 7 + volume_envelope 6, 0 +; cutoff 8 octave 3 note E_, 3 note F_, 3 note G_, 3 - fade_wave 7 +; cutoff 7 note A#, 6 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 3 note D_, 3 - channel_volume 6 - fade_wave 8 + volume_envelope 6, 0 +; cutoff 8 octave 3 note A_, 3 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 2 note A_, 2 inc_octave inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 dec_octave rest 2 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note D_, 4 note D_, 3 dec_octave @@ -415,16 +415,16 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note D_, 2 dec_octave note A#, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave inc_octave note F_, 1 rest 2 dec_octave dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A#, 4 note A#, 3 note A#, 3 @@ -434,14 +434,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note D_, 2 dec_octave note A#, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note A_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A#, 6 inc_octave note D_, 1 @@ -451,13 +451,13 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) inc_octave note C_, 5 note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 dec_octave note C_, 4 note C_, 3 @@ -465,48 +465,48 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) rest 3 note C_, 5 note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note G_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note D_, 4 duty_cycle 2 - channel_volume 6 - fade_wave 8 + volume_envelope 5, -7 +; cutoff 8 octave 4 note C_, 1 - ;tie +; tie dec_octave note G_, 1 - ;tie +; tie note E_, 1 - ;tie +; tie note C_, 1 - ;tie +; tie dec_octave note G_, 1 - ;tie +; tie note E_, 1 duty_cycle 0 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 2 rest 3 note A#, 5 inc_octave note D_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C_, 4 note C_, 3 dec_octave @@ -515,14 +515,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A#, 5 inc_octave note C#, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C#, 4 note C#, 3 note C#, 3 @@ -532,14 +532,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A_, 2 inc_octave note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note G_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C_, 4 note E_, 3 note C_, 3 @@ -549,221 +549,221 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note B_, 2 inc_octave inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note D_, 4 - channel_volume 6 - fade_wave 8 + volume_envelope 6, 0 +; cutoff 8 octave 4 note D_, 2 note E_, 1 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 2 - channel_volume 6 + volume_envelope 6, 0 note F_, 11 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 4 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 rest 2 dec_octave dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A#, 1 - channel_volume 6 - fade_wave 8 + volume_envelope 6, 0 +; cutoff 8 octave 3 note A#, 3 inc_octave note F_, 3 note G_, 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 3 note D_, 2 dec_octave note A#, 3 inc_octave inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 - fade_wave 8 - channel_volume 6 +; cutoff 8 + volume_envelope 6, 0 octave 4 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note A#, 5 - channel_volume 2 + volume_envelope 2, 7 note A#, 1 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 3 rest 3 note F_, 3 note C_, 2 note F_, 1 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note G_, 3 note G_, 3 speed 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 inc_octave note F_, 4 note C_, 3 speed 7 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note E_, 3 note G_, 2 inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 dec_octave rest 3 note A_, 3 note F_, 2 note A_, 1 inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note G_, 3 note G_, 3 speed 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 inc_octave note F_, 4 note C_, 3 dec_octave speed 7 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A_, 3 note G_, 2 inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 sound_loop 0, .MainLoop Branch_f7535: octave 3 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 rest 3 note C_, 3 note C_, 2 note F_, 1 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note G_, 3 note G_, 1 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 1 dec_octave - fade_wave 8 +; cutoff 8 speed 1 inc_octave note F_, 4 note C_, 3 speed 7 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 dec_octave note E_, 3 note G_, 2 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 dec_octave rest 3 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 2 +; cutoff 8 note F_, 3 note F_, 2 note A_, 1 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note G_, 3 note G_, 1 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 1 dec_octave - fade_wave 8 +; cutoff 8 speed 1 inc_octave note F_, 4 note C_, 3 speed 7 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 dec_octave note A_, 3 note G_, 2 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 dec_octave sound_ret -Music_Overworld_Ch3: ; f75a1 (3d:75a1) +Music_Overworld_Ch3: speed 7 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 64 - ;cutoff 7 +; echo 64 +; cutoff 7 octave 2 sound_call Branch_f77f8 note F_, 2 @@ -774,71 +774,71 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) note F_, 3 sound_call Branch_f7826 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 1 note A#, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note C#, 2 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 1 note A#, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 inc_octave note C#, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 1 octave 4 - ;cutoff 7 +; cutoff 7 note G_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 1 note F_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A#, 2 dec_octave - ;cutoff 8 +; cutoff 8 note A#, 1 octave 4 - ;cutoff 3 +; cutoff 3 note C#, 2 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 1 note A_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note E_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note G_, 2 - ;cutoff 7 +; cutoff 7 note E_, 1 - ;cutoff 8 +; cutoff 8 dec_octave note E_, 1 rest 1 inc_octave inc_octave - ;cutoff 3 +; cutoff 3 note E_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 rest 1 inc_octave @@ -859,240 +859,240 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) note D_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 inc_octave note D_, 2 dec_octave note A_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 inc_octave note C_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note D_, 2 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note D_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 - ;cutoff 8 +; cutoff 8 octave 2 note A_, 1 note G_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 - ;cutoff 7 +; cutoff 7 note D_, 1 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 1 - ;cutoff 3 +; cutoff 3 inc_octave note A#, 1 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 rest 1 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 - ;cutoff 8 +; cutoff 8 dec_octave note D_, 1 note C_, 2 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 - ;cutoff 7 +; cutoff 7 note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 1 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 inc_octave note C_, 1 rest 1 inc_octave - ;cutoff 7 +; cutoff 7 note F_, 1 - ;cutoff 3 +; cutoff 3 note E_, 2 - ;cutoff 8 +; cutoff 8 octave 2 note E_, 1 sound_call Branch_f7826 - ;cutoff 8 +; cutoff 8 octave 3 note C_, 1 note C#, 2 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note C#, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G#, 1 inc_octave note C#, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 inc_octave note C#, 1 octave 3 - ;cutoff 8 +; cutoff 8 note C#, 1 rest 1 inc_octave note G_, 1 dec_octave - ;cutoff 8 +; cutoff 8 note C#, 1 rest 1 dec_octave note G#, 1 octave 4 - ;cutoff 3 +; cutoff 3 note G_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C#, 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G#, 1 inc_octave note C_, 2 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note E_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note C_, 2 - ;cutoff 7 +; cutoff 7 note E_, 1 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 1 rest 1 octave 5 - ;cutoff 3 +; cutoff 3 note E_, 1 octave 3 - ;cutoff 8 +; cutoff 8 note C_, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note E_, 2 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note G_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note E_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 note B_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 1 note B_, 2 note F_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 inc_octave note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note B_, 2 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 1 note B_, 2 note F_, 1 @@ -1102,27 +1102,27 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) note A#, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 1 note A#, 2 note F_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 inc_octave note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 1 octave 4 - ;cutoff 7 +; cutoff 7 note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 2 note A#, 2 @@ -1133,33 +1133,33 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) note C_, 2 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 - ;cutoff 7 +; cutoff 7 note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 rest 1 octave 5 - ;cutoff 3 +; cutoff 3 note D_, 1 octave 3 - ;cutoff 8 +; cutoff 8 note C_, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 inc_octave note C_, 1 @@ -1171,13 +1171,13 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) note E_, 1 note F_, 3 octave 4 - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 inc_octave - ;cutoff 5 +; cutoff 5 note F_, 2 note A_, 1 inc_octave @@ -1193,24 +1193,24 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) rest 2 note G_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 inc_octave - ;cutoff 5 +; cutoff 5 note A#, 2 inc_octave note C_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 3 octave 5 - ;cutoff 3 +; cutoff 3 note C_, 2 octave 3 - ;cutoff 8 +; cutoff 8 note C_, 1 inc_octave - ;cutoff 5 +; cutoff 5 note A_, 2 inc_octave note C_, 1 @@ -1225,13 +1225,13 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) rest 2 note C_, 2 octave 3 - ;cutoff 8 +; cutoff 8 note C_, 1 inc_octave - ;cutoff 5 +; cutoff 5 note A#, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 sound_loop 0, .MainLoop @@ -1239,10 +1239,10 @@ Branch_f77f8: octave 2 note F_, 3 octave 4 - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 note F_, 2 note C_, 1 @@ -1261,10 +1261,10 @@ Branch_f77f8: dec_octave note F_, 3 octave 5 - ;cutoff 3 +; cutoff 3 note C_, 2 octave 3 - ;cutoff 8 +; cutoff 8 note C_, 1 note F_, 2 note C_, 1 @@ -1284,68 +1284,68 @@ Branch_f7826: note F_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 note F_, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 inc_octave note C_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 1 rest 1 octave 4 - ;cutoff 7 +; cutoff 7 note G_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 1 rest 1 note C_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note G_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 1 octave 4 - ;cutoff 7 +; cutoff 7 note F_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 note A_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note E_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 1 note A_, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note E_, 2 rest 1 inc_octave note C_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 rest 1 octave 4 - ;cutoff 7 +; cutoff 7 note E_, 1 octave 2 - ;cutoff 8 +; cutoff 8 .Loop1 note A_, 1 rest 1 @@ -1356,44 +1356,44 @@ Branch_f7826: note A#, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 1 note A#, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 inc_octave note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 1 octave 4 - ;cutoff 7 +; cutoff 7 note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 1 note F_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 sound_ret -Music_Overworld_Ch4: ; f78af (3d:78af) +Music_Overworld_Ch4: toggle_noise 6 drum_speed 7 octave 1 @@ -1478,4 +1478,3 @@ Branch_f790a: drum_note 2, 2 drum_note 2, 1 sound_ret -; 0xf7919 diff --git a/crysaudio/music/TCG/pausemenu.asm b/crysaudio/music/TCG/pausemenu.asm index 5ca8a900..327ca4c1 100644 --- a/crysaudio/music/TCG/pausemenu.asm +++ b/crysaudio/music/TCG/pausemenu.asm @@ -5,13 +5,13 @@ Music_PauseMenu: channel 3, Music_PauseMenu_Ch3 channel 4, Music_PauseMenu_Ch4 -Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) +Music_PauseMenu_Ch2: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 .MainLoop - channel_volume 7 + volume_envelope 7, 0 .Loop1 rest 16 sound_loop 4, .Loop1 @@ -22,195 +22,195 @@ Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) rest 3 note B_, 4 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note B_, 3 - channel_volume 7 + volume_envelope 7, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 sound_call Branch_f6c24 sound_call Branch_f6c60 - channel_volume 7 + volume_envelope 7, 0 octave 6 note C_, 4 dec_octave - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note B_, 4 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note B_, 3 - channel_volume 7 + volume_envelope 7, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 sound_call Branch_f6c24 sound_call Branch_f6c60 octave 6 - channel_volume 6 + volume_envelope 6, 0 note C_, 4 dec_octave - channel_volume 3 + volume_envelope 3, 7 note E_, 3 sound_call Branch_f6ce9 sound_call Branch_f6c80 .Loop2 octave 6 - fade_wave 4 +; cutoff 4 note C_, 1 sound_call Branch_f6ce9 sound_call Branch_f6c80 sound_loop 3, .Loop2 - fade_wave 8 +; cutoff 8 sound_loop 0, .MainLoop Branch_f6c24: .Loop3 octave 6 - channel_volume 7 + volume_envelope 7, 0 note C_, 4 dec_octave - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 7 + volume_envelope 7, 0 note B_, 4 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note B_, 3 - channel_volume 7 + volume_envelope 7, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 sound_loop 3, .Loop3 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C_, 4 dec_octave - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 7 + volume_envelope 7, 0 note B_, 4 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note B_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 sound_ret Branch_f6c60: .Loop4 octave 6 - channel_volume 7 + volume_envelope 7, 0 note C_, 4 dec_octave - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note B_, 4 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note B_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 sound_loop 3, .Loop4 sound_ret Branch_f6c80: octave 6 - fade_wave 4 +; cutoff 4 note C_, 1 octave 3 - channel_volume 7 - fade_wave 8 + volume_envelope 7, 0 +; cutoff 8 speed 1 note C_, 4 - channel_volume 2 + volume_envelope 2, 7 note C_, 3 - channel_volume 6 + volume_envelope 6, 0 speed 7 octave 5 - fade_wave 4 +; cutoff 4 note G_, 1 note E_, 1 octave 3 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 speed 1 note E_, 4 - channel_volume 2 + volume_envelope 2, 7 note E_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note B_, 1 note G_, 1 dec_octave - channel_volume 7 - fade_wave 8 + volume_envelope 7, 0 +; cutoff 8 speed 1 note C_, 4 - channel_volume 2 + volume_envelope 2, 7 note C_, 3 - channel_volume 6 + volume_envelope 6, 0 speed 7 octave 6 - fade_wave 4 +; cutoff 4 note C_, 1 octave 3 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 speed 1 note C_, 4 - channel_volume 2 + volume_envelope 2, 7 note C_, 3 speed 7 octave 5 - channel_volume 6 - fade_wave 4 + volume_envelope 6, 0 +; cutoff 4 note G_, 1 note E_, 1 - channel_volume 7 + volume_envelope 7, 0 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note E_, 4 - channel_volume 2 + volume_envelope 2, 7 note E_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note B_, 1 note G_, 1 note E_, 1 @@ -219,79 +219,79 @@ Branch_f6c80: Branch_f6ce9: octave 2 speed 1 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 note B_, 4 - channel_volume 2 + volume_envelope 2, 7 note B_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note G_, 1 note D_, 1 octave 3 - channel_volume 7 - fade_wave 8 + volume_envelope 7, 0 +; cutoff 8 speed 1 note D_, 4 - channel_volume 2 + volume_envelope 2, 7 note D_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note B_, 1 note G_, 1 - channel_volume 7 + volume_envelope 7, 0 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note B_, 4 - channel_volume 2 + volume_envelope 2, 7 note B_, 3 - channel_volume 6 + volume_envelope 6, 0 speed 7 octave 6 - fade_wave 4 +; cutoff 4 note C_, 1 - channel_volume 7 + volume_envelope 7, 0 octave 2 - fade_wave 8 +; cutoff 8 speed 1 note B_, 4 - channel_volume 2 + volume_envelope 2, 7 note B_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note G_, 1 note D_, 1 - channel_volume 7 + volume_envelope 7, 0 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note D_, 4 - channel_volume 2 + volume_envelope 2, 7 note D_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note B_, 1 note G_, 1 note D_, 1 sound_ret -Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) +Music_PauseMenu_Ch1: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 .MainLoop - channel_volume 8 + volume_envelope 8, 0 .Loop1 rest 16 sound_loop 7, .Loop1 @@ -308,66 +308,66 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) speed 7 .Loop3 octave 1 - channel_volume 13 + volume_envelope 13, 0 note G_, 1 octave 3 - channel_volume 7 + volume_envelope 7, 0 speed 1 note D_, 4 - channel_volume 2 + volume_envelope 2, 7 note D_, 3 - channel_volume 13 + volume_envelope 13, 0 speed 7 octave 1 - fade_wave 6 +; cutoff 6 note G_, 1 - fade_wave 4 +; cutoff 4 note G_, 1 octave 3 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 speed 1 note F#, 4 - channel_volume 2 + volume_envelope 2, 7 note F#, 3 dec_octave - channel_volume 13 + volume_envelope 13, 0 speed 7 note D_, 1 note G_, 1 octave 4 - channel_volume 7 + volume_envelope 7, 0 speed 1 note F#, 4 - channel_volume 2 + volume_envelope 2, 7 note F#, 3 speed 7 octave 1 - channel_volume 13 - fade_wave 8 + volume_envelope 13, 0 +; cutoff 8 note G_, 1 octave 3 - channel_volume 7 + volume_envelope 7, 0 speed 1 note D_, 4 - channel_volume 2 + volume_envelope 2, 7 note D_, 3 speed 7 - channel_volume 13 + volume_envelope 13, 0 octave 1 - fade_wave 6 +; cutoff 6 note G_, 1 - fade_wave 4 +; cutoff 4 note G_, 1 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note F#, 4 - channel_volume 2 + volume_envelope 2, 7 note F#, 3 speed 7 octave 1 - channel_volume 13 + volume_envelope 13, 0 note B_, 1 inc_octave note C_, 1 @@ -375,62 +375,62 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) dec_octave note D_, 1 octave 3 - channel_volume 7 + volume_envelope 7, 0 speed 1 note E_, 4 - channel_volume 2 + volume_envelope 2, 7 note E_, 3 - channel_volume 13 + volume_envelope 13, 0 speed 7 octave 1 - fade_wave 6 +; cutoff 6 note D_, 1 - fade_wave 4 +; cutoff 4 note D_, 1 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note G_, 4 - channel_volume 2 + volume_envelope 2, 7 note G_, 3 speed 7 dec_octave - channel_volume 13 + volume_envelope 13, 0 note C_, 1 note D_, 1 octave 4 - channel_volume 7 + volume_envelope 7, 0 speed 1 note G_, 4 - channel_volume 2 + volume_envelope 2, 7 note G_, 3 speed 7 octave 1 - channel_volume 13 - fade_wave 8 + volume_envelope 13, 0 +; cutoff 8 note D_, 1 octave 3 - channel_volume 7 + volume_envelope 7, 0 speed 1 note E_, 4 - channel_volume 2 + volume_envelope 2, 7 note E_, 3 speed 7 - channel_volume 13 - fade_wave 6 + volume_envelope 13, 0 +; cutoff 6 octave 1 note D_, 1 - fade_wave 4 +; cutoff 4 note D_, 1 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note G_, 4 - channel_volume 2 + volume_envelope 2, 7 note G_, 3 speed 7 octave 1 - channel_volume 13 + volume_envelope 13, 0 note C_, 1 note C#, 1 inc_octave @@ -439,16 +439,16 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) sound_loop 0, .MainLoop -Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) +Music_PauseMenu_Ch3: speed 1 fade_wave 13 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 2 - ;echo 96 - ;cutoff 4 +; echo 96 +; cutoff 4 octave 5 note G_, 7 - ;cutoff 8 +; cutoff 8 note F#, 4 channel_volume 3 note G_, 3 @@ -551,13 +551,12 @@ Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) sound_loop 0, .MainLoop -Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) +Music_PauseMenu_Ch4: toggle_noise 6 drum_speed 7 octave 1 .MainLoop .Loop1 - ;rept 7 drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -572,7 +571,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -587,7 +585,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -602,7 +599,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -617,7 +613,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -632,7 +627,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -647,7 +641,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -662,7 +655,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;endr drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -673,23 +665,13 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 3, 4 drum_note 3, 3 drum_speed 7 - ;rept 8 drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;--- drum_note 2, 1 - ;endr sound_loop 2, .Loop1 sound_loop 0, .MainLoop -; 0xf6ef1 diff --git a/crysaudio/music/TCG/pcmainmenu.asm b/crysaudio/music/TCG/pcmainmenu.asm index 6d6f3c76..825d1611 100644 --- a/crysaudio/music/TCG/pcmainmenu.asm +++ b/crysaudio/music/TCG/pcmainmenu.asm @@ -5,10 +5,10 @@ Music_PCMainMenu: channel 3, Music_PCMainMenu_Ch3 channel 4, Music_PCMainMenu_Ch4 -Music_PCMainMenu_Ch1: ; f9052 (3e:5052) +Music_PCMainMenu_Ch1: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 3 duty_cycle 2 .MainLoop @@ -16,66 +16,66 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052) rest 4 dec_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note F_, 1 rest 1 duty_cycle 2 - fade_wave 8 - channel_volume 12 +; cutoff 8 + volume_envelope 11, 4 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 2 inc_octave - channel_volume 12 + volume_envelope 11, 4 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note F_, 1 rest 1 duty_cycle 2 - fade_wave 8 - channel_volume 12 +; cutoff 8 + volume_envelope 11, 4 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 sound_call Branch_f90c2 rest 4 dec_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note F_, 1 rest 1 inc_octave duty_cycle 2 - fade_wave 8 - channel_volume 12 +; cutoff 8 + volume_envelope 11, 4 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 2 - channel_volume 12 + volume_envelope 11, 4 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 dec_octave note F_, 1 rest 1 inc_octave duty_cycle 2 - fade_wave 8 - channel_volume 12 +; cutoff 8 + volume_envelope 11, 4 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 sound_loop 0, .MainLoop @@ -83,38 +83,38 @@ Branch_f90c2: octave 3 rest 4 duty_cycle 1 - channel_volume 6 - fade_wave 5 + volume_envelope 6, 1 +; cutoff 5 note G_, 1 rest 3 - fade_wave 8 +; cutoff 8 duty_cycle 2 - channel_volume 12 + volume_envelope 11, 4 note B_, 2 inc_octave note D_, 1 - channel_volume 2 + volume_envelope 2, 7 note D_, 1 dec_octave duty_cycle 1 - channel_volume 6 - fade_wave 5 + volume_envelope 6, 1 +; cutoff 5 note G_, 1 rest 1 inc_octave duty_cycle 2 - fade_wave 8 - channel_volume 12 +; cutoff 8 + volume_envelope 11, 4 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 sound_ret -Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) +Music_PCMainMenu_Ch2: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 3 duty_cycle 2 .MainLoop @@ -122,67 +122,67 @@ Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) rest 4 inc_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note C_, 1 rest 1 dec_octave duty_cycle 2 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 4 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 rest 2 - channel_volume 8 + volume_envelope 8, 4 note A_, 1 - channel_volume 2 + volume_envelope 2, 7 note A_, 1 duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 inc_octave note C_, 1 rest 1 dec_octave duty_cycle 2 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 4 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 sound_call Branch_f915e rest 4 inc_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note C_, 1 rest 1 duty_cycle 2 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 4 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 rest 2 dec_octave - channel_volume 8 + volume_envelope 8, 4 note A_, 1 - channel_volume 2 + volume_envelope 2, 7 note A_, 1 duty_cycle 1 inc_octave - channel_volume 6 - fade_wave 5 + volume_envelope 6, 1 +; cutoff 5 note C_, 1 rest 1 dec_octave duty_cycle 2 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 4 note B_, 1 - channel_volume 2 + volume_envelope 2, 7 note B_, 1 sound_loop 0, .MainLoop @@ -190,165 +190,165 @@ Branch_f915e: octave 4 rest 4 duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note D_, 1 rest 3 duty_cycle 2 - fade_wave 8 +; cutoff 8 dec_octave - channel_volume 8 + volume_envelope 8, 4 note G_, 2 note B_, 1 - channel_volume 2 + volume_envelope 2, 7 note B_, 1 inc_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note D_, 1 rest 1 dec_octave duty_cycle 2 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 4 note A_, 1 - channel_volume 2 + volume_envelope 2, 7 note A_, 1 sound_ret -Music_PCMainMenu_Ch3: ; f9189 (3e:5189) +Music_PCMainMenu_Ch3: speed 7 channel_volume 1 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE fade_wave 11 - ;cutoff 7 - ;echo 0 +; cutoff 7 +; echo 0 .MainLoop octave 2 - ;cutoff 7 +; cutoff 7 note G_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note G_, 1 rest 1 speed 1 note A#, 4 - ;tie +; tie note B_, 3 - ;tie +; tie speed 7 note B_, 1 rest 1 - ;cutoff 4 +; cutoff 4 inc_octave note C_, 1 rest 1 note C_, 1 - ;cutoff 8 +; cutoff 8 note C#, 2 note D_, 2 dec_octave note G_, 1 - ;tie +; tie note F#, 1 - ;cutoff 7 +; cutoff 7 note F_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note F_, 1 rest 1 speed 1 note G#, 4 - ;tie +; tie note A_, 3 - ;tie +; tie speed 7 note A_, 1 rest 1 - ;cutoff 4 +; cutoff 4 note A#, 1 rest 1 note A#, 1 - ;cutoff 8 +; cutoff 8 note B_, 2 inc_octave note C_, 2 dec_octave note F_, 1 - ;tie +; tie note F#, 1 - ;cutoff 7 +; cutoff 7 note G_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note G_, 1 rest 1 speed 1 note A#, 4 - ;tie +; tie note B_, 3 - ;tie +; tie speed 7 note B_, 1 rest 1 - ;cutoff 4 +; cutoff 4 inc_octave note C_, 1 rest 1 note C_, 1 - ;cutoff 8 +; cutoff 8 note C#, 2 note D_, 2 dec_octave note G_, 1 - ;tie +; tie note F#, 1 - ;cutoff 7 +; cutoff 7 note F_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note F_, 1 rest 1 speed 1 note B_, 4 - ;tie +; tie inc_octave note C_, 3 - ;tie +; tie speed 7 note C_, 1 rest 1 - ;cutoff 8 +; cutoff 8 speed 1 note F#, 4 - ;tie +; tie note G_, 3 - ;tie +; tie speed 7 note G_, 1 - ;cutoff 4 +; cutoff 4 note F_, 1 - ;cutoff 8 +; cutoff 8 note C_, 2 note F_, 2 speed 1 note C_, 3 - ;tie +; tie dec_octave note B_, 3 - ;tie +; tie note A#, 3 - ;tie +; tie note A_, 3 - ;tie +; tie note G#, 2 speed 7 sound_loop 0, .MainLoop -Music_PCMainMenu_Ch4: ; f922b (3e:522b) +Music_PCMainMenu_Ch4: toggle_noise 6 drum_speed 7 octave 1 @@ -382,4 +382,3 @@ Branch_f9248: drum_note 1, 1 drum_note 3, 1 sound_ret -; 0xf9251 diff --git a/crysaudio/music/TCG/pokemondome.asm b/crysaudio/music/TCG/pokemondome.asm index f81b20da..a7653d8f 100644 --- a/crysaudio/music/TCG/pokemondome.asm +++ b/crysaudio/music/TCG/pokemondome.asm @@ -5,15 +5,15 @@ Music_PokemonDome: channel 3, Music_PokemonDome_Ch3 channel 4, Music_PokemonDome_Ch4 -Music_PokemonDome_Ch1: ; f9251 (3e:5251) +Music_PokemonDome_Ch1: speed 7 - ;stereo_panning 1, 1 - ;vibrato_type 9 + stereo_panning TRUE, TRUE +; vibrato_type 9 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 2 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G_, 5 note A_, 5 @@ -44,127 +44,127 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note F_, 5 note G_, 4 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 dec_octave speed 1 note C_, 11 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 8 + volume_envelope 8, 0 note C_, 11 - channel_volume 3 + volume_envelope 3, 7 note C_, 10 rest 7 - channel_volume 8 + volume_envelope 8, 0 note C_, 4 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 8 + volume_envelope 8, 0 note C_, 4 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 8 + volume_envelope 8, 0 note C_, 11 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 8 + volume_envelope 8, 0 note C_, 11 - channel_volume 3 + volume_envelope 3, 7 note C_, 10 speed 7 rest 3 - channel_volume 8 + volume_envelope 8, 0 speed 1 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 10 rest 7 - channel_volume 8 + volume_envelope 8, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 .MainLoop speed 7 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 4 octave 2 note G_, 4 inc_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 speed 1 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 8 + volume_envelope 8, 0 speed 1 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 10 rest 7 - channel_volume 8 + volume_envelope 8, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 8 + volume_envelope 8, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 8 + volume_envelope 8, 0 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 8 + volume_envelope 8, 0 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 10 speed 7 rest 3 - channel_volume 8 + volume_envelope 8, 0 speed 1 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 10 rest 7 speed 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 dec_octave speed 1 note B_, 4 @@ -181,150 +181,150 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note C_, 12 dec_octave note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note D_, 10 - channel_volume 3 + volume_envelope 3, 7 note D_, 2 - channel_volume 10 + volume_envelope 10, 0 note G_, 3 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 10 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 - channel_volume 10 + volume_envelope 10, 0 note C_, 3 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 10 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note E_, 12 dec_octave note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note D_, 8 dec_octave note A_, 4 inc_octave note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 14 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 10 - channel_volume 3 + volume_envelope 3, 7 note B_, 2 - channel_volume 10 + volume_envelope 10, 0 note G_, 4 note A_, 12 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note D_, 8 note E_, 4 note F_, 4 note G_, 8 - ;tie +; tie note G_, 8 - ;tie +; tie note G_, 8 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 10 + volume_envelope 10, 0 note F_, 2 note E_, 2 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note E_, 5 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 speed 7 - channel_volume 10 + volume_envelope 10, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 1 inc_octave note C_, 8 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 10 + volume_envelope 10, 0 note F_, 1 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 1 inc_octave note C_, 8 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 10 + volume_envelope 10, 0 note F_, 1 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note G#, 1 inc_octave note C_, 12 - ;tie +; tie note C_, 8 note D_, 8 note C_, 8 - ;tie +; tie note C_, 8 - ;tie +; tie note C_, 12 sound_loop 0, .MainLoop -Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) +Music_PokemonDome_Ch2: speed 7 - ;stereo_panning 1, 1 - ;vibrato_type 9 + stereo_panning TRUE, TRUE +; vibrato_type 9 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 1 duty_cycle 0 - channel_volume 8 + volume_envelope 8, 0 speed 1 note B_, 5 inc_octave @@ -356,69 +356,69 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note B_, 4 .MainLoop duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 octave 3 speed 1 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 10 rest 7 - channel_volume 7 + volume_envelope 7, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 10 speed 7 rest 3 sound_call Branch_f9554 speed 7 rest 4 - channel_volume 7 + volume_envelope 7, 0 speed 1 note G_, 11 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 7 + volume_envelope 7, 0 note G_, 11 - channel_volume 3 + volume_envelope 3, 7 note G_, 10 rest 7 - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 7 + volume_envelope 7, 0 note G_, 11 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 7 + volume_envelope 7, 0 note G_, 11 - channel_volume 3 + volume_envelope 3, 7 note G_, 10 speed 7 rest 3 sound_call Branch_f9554 duty_cycle 0 - channel_volume 8 + volume_envelope 8, 0 dec_octave speed 1 note G_, 4 @@ -435,10 +435,10 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note F_, 1 rest 1 note E_, 1 - channel_volume 2 + volume_envelope 2, 7 note E_, 1 rest 1 - channel_volume 7 + volume_envelope 7, 0 note G_, 1 note G_, 10 note A_, 2 @@ -462,9 +462,9 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note E_, 4 note F#, 8 note F#, 4 - fade_wave 6 +; cutoff 6 note F#, 3 - fade_wave 8 +; cutoff 8 speed 1 note F#, 5 rest 2 @@ -492,7 +492,7 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note A_, 1 note B_, 1 duty_cycle 1 - channel_volume 8 + volume_envelope 7, -7 speed 1 .Loop1 note F_, 5 @@ -546,31 +546,31 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) inc_octave note C#, 4 duty_cycle 0 - channel_volume 8 + volume_envelope 8, 0 speed 7 .Loop5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 rest 1 - channel_volume 7 + volume_envelope 7, 0 dec_octave note F_, 1 note A_, 8 inc_octave note E_, 1 - channel_volume 2 + volume_envelope 2, 7 note E_, 1 rest 1 - channel_volume 7 + volume_envelope 7, 0 note D_, 1 sound_loop 2, .Loop5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 rest 1 dec_octave - channel_volume 7 + volume_envelope 7, 0 note F_, 1 note G#, 12 note C_, 1 @@ -599,48 +599,48 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) Branch_f9554: speed 1 - channel_volume 7 + volume_envelope 7, 0 note F_, 11 - channel_volume 3 + volume_envelope 3, 7 note F_, 3 - channel_volume 7 + volume_envelope 7, 0 note F_, 11 - channel_volume 3 + volume_envelope 3, 7 note F_, 10 rest 7 - channel_volume 7 + volume_envelope 7, 0 note F_, 4 - channel_volume 3 + volume_envelope 3, 7 note F_, 3 - channel_volume 7 + volume_envelope 7, 0 note F_, 4 - channel_volume 3 + volume_envelope 3, 7 note F_, 3 .Loop6 - channel_volume 7 + volume_envelope 7, 0 note F_, 11 - channel_volume 3 + volume_envelope 3, 7 note F_, 3 sound_loop 2, .Loop6 sound_ret -Music_PokemonDome_Ch3: ; f9579 (3e:5579) +Music_PokemonDome_Ch3: speed 7 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 64 - ;cutoff 6 +; echo 64 +; cutoff 6 octave 2 - ;cutoff 4 +; cutoff 4 speed 1 .Loop1 note G_, 5 note G_, 5 note G_, 4 sound_loop 8, .Loop1 - ;cutoff 6 +; cutoff 6 speed 7 .MainLoop inc_octave @@ -651,10 +651,10 @@ Music_PokemonDome_Ch3: ; f9579 (3e:5579) note C_, 1 sound_call Branch_f9613 octave 2 - ;cutoff 4 +; cutoff 4 note C_, 2 inc_octave - ;cutoff 6 +; cutoff 6 note C_, 2 rest 2 note C_, 1 @@ -772,14 +772,14 @@ Branch_f9613: note C_, 2 note C_, 2 dec_octave - ;cutoff 4 +; cutoff 4 note G_, 2 - ;cutoff 6 +; cutoff 6 note G_, 2 sound_ret -Music_PokemonDome_Ch4: ; f9629 (3e:5629) +Music_PokemonDome_Ch4: toggle_noise 6 drum_speed 7 octave 1 @@ -804,4 +804,3 @@ Music_PokemonDome_Ch4: ; f9629 (3e:5629) drum_note 3, 3 sound_loop 2, .Loop2 sound_loop 0, .MainLoop -; 0xf9646 diff --git a/crysaudio/music/TCG/ronald.asm b/crysaudio/music/TCG/ronald.asm index 54e52aec..a2263db7 100644 --- a/crysaudio/music/TCG/ronald.asm +++ b/crysaudio/music/TCG/ronald.asm @@ -5,21 +5,21 @@ Music_Ronald: channel 3, Music_Ronald_Ch3 channel 4, Music_Ronald_Ch4 -Music_Ronald_Ch1: ; fa7a0 (3e:67a0) - ;stereo_panning 1, 1 - ;vibrato_type 8 +Music_Ronald_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 12, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 0 .MainLoop octave 3 speed 13 .Loop1 - channel_volume 9 - fade_wave 3 + volume_envelope 9, 2 +; cutoff 3 note D_, 1 note D_, 1 - fade_wave 4 +; cutoff 4 note F_, 1 rest 2 note D_, 1 @@ -30,17 +30,17 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 1 note F_, 1 rest 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 2 rest 1 dec_octave - channel_volume 9 - fade_wave 3 + volume_envelope 9, 2 +; cutoff 3 note G_, 1 inc_octave note D_, 1 - fade_wave 4 +; cutoff 4 note F_, 1 rest 2 note F_, 1 @@ -51,8 +51,8 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 1 note A_, 1 rest 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note G_, 2 rest 1 sound_loop 2, .Loop1 @@ -63,7 +63,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) octave 4 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 2 vibrato 12, 3, 3 @@ -76,7 +76,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) octave 4 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 2 vibrato 12, 3, 3 @@ -90,10 +90,10 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note D_, 3 rest 7 duty_cycle 2 - channel_volume 9 + volume_envelope 9, 0 rest 6 dec_octave - fade_wave 4 +; cutoff 4 note G_, 7 inc_octave note F_, 6 @@ -108,12 +108,12 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave note G_, 7 inc_octave - fade_wave 8 +; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - fade_wave 4 +; cutoff 4 note A#, 6 inc_octave note C_, 7 @@ -122,22 +122,22 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note G_, 7 note F_, 6 note F#, 7 - fade_wave 8 +; cutoff 8 note G_, 6 - fade_wave 4 +; cutoff 4 note C#, 7 note C_, 6 dec_octave note A#, 7 inc_octave - fade_wave 8 +; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave note A#, 6 inc_octave - fade_wave 4 +; cutoff 4 note C_, 7 dec_octave note A#, 6 @@ -145,7 +145,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note F_, 6 note F#, 7 note G_, 6 - fade_wave 8 +; cutoff 8 note A#, 7 inc_octave note C_, 6 @@ -158,10 +158,10 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note D_, 3 rest 7 duty_cycle 2 - channel_volume 9 + volume_envelope 9, 0 rest 6 dec_octave - fade_wave 4 +; cutoff 4 note G_, 7 inc_octave note F_, 6 @@ -176,12 +176,12 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave note G_, 7 inc_octave - fade_wave 8 +; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - fade_wave 4 +; cutoff 4 note A#, 6 inc_octave note C_, 7 @@ -191,20 +191,20 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note F_, 6 note F#, 7 note G_, 6 - fade_wave 8 +; cutoff 8 note A#, 7 inc_octave - fade_wave 4 +; cutoff 4 note C_, 6 dec_octave note A#, 7 inc_octave - fade_wave 8 +; cutoff 8 note C#, 4 note C_, 4 dec_octave note A#, 5 - fade_wave 4 +; cutoff 4 note G_, 6 note F_, 7 note G_, 6 @@ -213,15 +213,15 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave note A#, 7 inc_octave - fade_wave 8 +; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - fade_wave 4 +; cutoff 4 note A#, 6 note G_, 7 - fade_wave 8 +; cutoff 8 sound_call Branch_fa9cb speed 1 octave 4 @@ -229,21 +229,21 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note D_, 3 rest 7 duty_cycle 2 - channel_volume 9 + volume_envelope 9, 0 rest 13 - fade_wave 4 +; cutoff 4 note F_, 6 rest 7 - fade_wave 8 +; cutoff 8 note E_, 4 note F_, 4 note E_, 5 - fade_wave 4 +; cutoff 4 note D_, 6 rest 7 - fade_wave 8 +; cutoff 8 note E_, 6 - fade_wave 4 +; cutoff 4 note C_, 7 dec_octave note G_, 6 @@ -252,41 +252,41 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note C#, 6 note D_, 7 dec_octave - fade_wave 8 +; cutoff 8 note A#, 6 - fade_wave 4 +; cutoff 4 note G_, 7 rest 6 note F_, 7 - fade_wave 8 +; cutoff 8 note F#, 6 - fade_wave 4 +; cutoff 4 note G_, 7 - fade_wave 8 +; cutoff 8 note A#, 6 - fade_wave 4 +; cutoff 4 note G_, 7 note A#, 6 inc_octave note C_, 7 - fade_wave 8 +; cutoff 8 note C#, 6 - fade_wave 4 +; cutoff 4 note D_, 7 note F_, 6 note D_, 7 - fade_wave 8 +; cutoff 8 note F_, 6 dec_octave - fade_wave 4 +; cutoff 4 note G_, 7 dec_octave note G_, 6 inc_octave note D_, 7 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 sound_call Branch_fa9cb speed 1 octave 4 @@ -303,7 +303,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note F_, 4 vibrato 12, 3, 3 speed 1 - channel_volume 9 + volume_envelope 9, 3 note C_, 6 rest 7 rest 13 @@ -314,12 +314,12 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 7 rest 13 speed 13 - channel_volume 9 + volume_envelope 9, 0 note G_, 2 rest 1 vibrato 20, 3, 3 speed 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 3 note G_, 10 note A#, 3 @@ -413,7 +413,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 7 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 5 rest 1 @@ -427,7 +427,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) Branch_fa9aa: octave 4 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 rest 2 speed 1 note G#, 3 @@ -457,7 +457,7 @@ Branch_fa9aa: Branch_fa9cb: octave 4 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 3 note E_, 10 @@ -489,7 +489,7 @@ Branch_fa9cb: Branch_fa9ec: octave 3 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 speed 1 note F_, 6 rest 7 @@ -508,23 +508,23 @@ Branch_fa9ec: rest 7 rest 13 speed 13 - channel_volume 9 + volume_envelope 9, 0 note G_, 2 rest 1 sound_ret -Music_Ronald_Ch2: ; faa0e (3e:6a0e) - ;stereo_panning 1, 1 - ;vibrato_type 8 +Music_Ronald_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 12, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 0 .MainLoop octave 2 .Loop1 speed 1 - channel_volume 9 + volume_envelope 9, 2 note G_, 3 rest 3 note G_, 3 @@ -559,12 +559,12 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 7 rest 13 speed 13 - channel_volume 9 + volume_envelope 9, 0 note C_, 2 rest 1 dec_octave speed 1 - channel_volume 9 + volume_envelope 9, 2 note D_, 3 rest 3 note G_, 3 @@ -603,53 +603,53 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 7 rest 13 speed 13 - channel_volume 9 + volume_envelope 9, 0 note E_, 2 rest 1 dec_octave sound_loop 2, .Loop1 .Loop2 sound_call Branch_fab76 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note C_, 2 rest 1 sound_call Branch_fab76 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note E_, 2 rest 1 sound_loop 4, .Loop2 .Loop3 vibrato 20, 3, 3 - channel_volume 8 + volume_envelope 8, 0 speed 13 duty_cycle 1 octave 4 rest 2 - fade_wave 4 +; cutoff 4 note F_, 1 rest 1 - fade_wave 8 +; cutoff 8 note D_, 1 dec_octave dec_octave - fade_wave 4 +; cutoff 4 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 note A#, 1 rest 1 inc_octave inc_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note C_, 1 rest 1 - fade_wave 8 +; cutoff 8 note D_, 1 - fade_wave 3 +; cutoff 3 note E_, 1 - fade_wave 4 +; cutoff 4 note C_, 1 rest 1 dec_octave @@ -659,7 +659,7 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 2 vibrato 12, 3, 3 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 note F_, 1 rest 2 note F_, 1 @@ -672,8 +672,8 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note A_, 1 rest 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note G_, 2 rest 1 sound_loop 2, .Loop3 @@ -683,8 +683,8 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 2 vibrato 12, 3, 3 duty_cycle 0 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 2 +; cutoff 4 note F_, 1 rest 2 note F_, 1 @@ -697,8 +697,8 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note A_, 1 rest 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note G_, 2 rest 1 vibrato 20, 3, 3 @@ -706,7 +706,7 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) octave 3 rest 1 speed 1 - fade_wave 8 +; cutoff 8 note E_, 3 note F_, 10 note E_, 3 @@ -716,8 +716,8 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) dec_octave vibrato 12, 3, 3 duty_cycle 0 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 2 +; cutoff 4 note G_, 1 rest 1 inc_octave @@ -725,26 +725,26 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note D_, 1 rest 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note E_, 2 rest 1 sound_call Branch_fabb1 rest 1 - fade_wave 4 +; cutoff 4 octave 2 note A#, 1 rest 1 note A#, 1 rest 1 inc_octave - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note C_, 2 rest 1 - channel_volume 9 + volume_envelope 9, 2 rest 2 - fade_wave 4 +; cutoff 4 note F_, 1 rest 2 note F_, 1 @@ -755,35 +755,35 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note A_, 1 rest 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note F_, 2 rest 1 sound_call Branch_fabb1 rest 1 octave 2 - fade_wave 4 +; cutoff 4 note G_, 1 rest 1 note G_, 1 rest 1 inc_octave - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note C_, 2 rest 1 rest 2 dec_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 2 +; cutoff 4 note G_, 1 rest 2 note G_, 1 rest 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 note F#, 8 rest 1 duty_cycle 0 @@ -792,10 +792,10 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) Branch_fab76: octave 2 - channel_volume 9 + volume_envelope 9, 2 speed 13 rest 2 - fade_wave 4 +; cutoff 4 note A#, 1 rest 2 note A#, 1 @@ -812,13 +812,13 @@ Branch_fab76: Branch_fab8a: octave 4 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 speed 13 note C_, 1 - fade_wave 3 +; cutoff 3 note D_, 1 note E_, 1 - fade_wave 4 +; cutoff 4 note C_, 1 rest 1 dec_octave @@ -827,15 +827,15 @@ Branch_fab8a: note A#, 1 rest 1 inc_octave - fade_wave 8 +; cutoff 8 note C_, 1 - fade_wave 3 +; cutoff 3 note D_, 1 note E_, 1 - fade_wave 8 +; cutoff 8 note C_, 1 dec_octave - fade_wave 4 +; cutoff 4 note A_, 1 rest 1 note A#, 1 @@ -843,10 +843,10 @@ Branch_fab8a: Branch_fabb1: octave 2 - channel_volume 9 + volume_envelope 9, 2 speed 13 rest 2 - fade_wave 4 +; cutoff 4 note A#, 1 rest 2 note A#, 1 @@ -856,13 +856,13 @@ Branch_fabb1: sound_ret -Music_Ronald_Ch3: ; fabc0 (3e:6bc0) +Music_Ronald_Ch3: speed 1 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 0 - ;cutoff 8 +; echo 0 +; cutoff 8 .MainLoop octave 2 .Loop1 @@ -1131,7 +1131,7 @@ Branch_facc5: sound_ret -Music_Ronald_Ch4: ; face0 (3e:6ce0) +Music_Ronald_Ch4: toggle_noise 6 drum_speed 1 octave 1 @@ -1162,7 +1162,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 7 sound_loop 2, .Loop2 .Loop3 - ;rept 7 sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1174,7 +1173,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1186,7 +1184,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1198,7 +1195,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1210,7 +1206,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1222,7 +1217,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1234,7 +1228,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1246,25 +1239,19 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;endr sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f drum_note 3, 3 drum_note 3, 4 - ;rept 4 drum_note 2, 6 drum_note 2, 7 - ;--- drum_note 2, 6 drum_note 2, 7 - ;--- drum_note 2, 6 drum_note 2, 7 - ;--- drum_note 2, 6 drum_note 2, 7 - ;endr sound_loop 2, .Loop3 .Loop4 sound_call Branch_fad46 @@ -1288,14 +1275,13 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) sound_loop 0, .MainLoop Branch_fad46: - ; - ;sound_call Branch_fad4f +; 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 @@ -1310,4 +1296,3 @@ Branch_fad4f: drum_note 2, 13 drum_note 1, 6 sound_ret -; 0xfad55 diff --git a/crysaudio/music/TCG/titlescreen.asm b/crysaudio/music/TCG/titlescreen.asm index 951dfe42..51c66894 100644 --- a/crysaudio/music/TCG/titlescreen.asm +++ b/crysaudio/music/TCG/titlescreen.asm @@ -5,271 +5,271 @@ Music_TCGTitleScreen: channel 3, Music_TCGTitleScreen_Ch3 channel 4, Music_TCGTitleScreen_Ch4 -Music_TCGTitleScreen_Ch1: ; f5052 (3d:5052) +Music_TCGTitleScreen_Ch1: speed 7 duty_cycle 0 - ;stereo_panning 1, 1 - ;vibrato_type 1 + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 octave 3 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note F_, 1 - fade_wave 8 +; cutoff 8 note E_, 3 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 3 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 13 - fade_wave 6 + volume_envelope 13, 0 +; cutoff 6 note C_, 2 dec_octave - fade_wave 8 +; cutoff 8 note G_, 10 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 13 + volume_envelope 13, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note G_, 1 - fade_wave 8 +; cutoff 8 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note F_, 2 - fade_wave 8 +; cutoff 8 note F_, 2 speed 1 note E_, 5 - ;tie +; tie note F_, 4 - ;tie +; tie note E_, 5 speed 7 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 13 + volume_envelope 13, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note F_, 1 - fade_wave 8 +; cutoff 8 note E_, 3 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 3 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 13 - fade_wave 6 + volume_envelope 13, 0 +; cutoff 6 note E_, 2 dec_octave - fade_wave 8 +; cutoff 8 note G_, 8 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 13 + volume_envelope 13, 0 note E_, 2 note F_, 2 note G_, 2 note G#, 3 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 13 + volume_envelope 13, 0 inc_octave note C_, 3 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 13 - fade_wave 6 + volume_envelope 13, 0 +; cutoff 6 note C_, 2 - fade_wave 8 +; cutoff 8 note G_, 9 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 13 + volume_envelope 13, 0 note F_, 2 note C_, 2 note D_, 2 .Loop1 note E_, 10 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note E_, 1 - fade_wave 8 +; cutoff 8 sound_loop 2, .Loop1 note E_, 12 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 1 note C_, 1 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note G_, 1 - fade_wave 8 +; cutoff 8 note G_, 8 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 - fade_wave 7 +; cutoff 7 note G_, 5 note G_, 4 note G_, 5 - fade_wave 8 +; cutoff 8 speed 7 note G_, 9 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 2 note C_, 2 note D_, 2 note E_, 10 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 rest 1 - fade_wave 6 - channel_volume 10 +; cutoff 6 + volume_envelope 10, 0 note E_, 1 - fade_wave 8 +; cutoff 8 note E_, 6 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 3 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 2 - channel_volume 10 + volume_envelope 10, 0 inc_octave - fade_wave 6 +; cutoff 6 note C_, 1 - fade_wave 8 +; cutoff 8 note C_, 8 - ;tie +; tie note C_, 8 - ;tie +; tie note C_, 8 - channel_volume 3 + volume_envelope 3, 7 note C_, 8 sound_ret -Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) +Music_TCGTitleScreen_Ch2: speed 7 duty_cycle 0 - ;stereo_panning 1, 1 - ;vibrato_type 1 + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 octave 2 note B_, 1 - channel_volume 2 + volume_envelope 2, 7 note B_, 1 rest 1 inc_octave - channel_volume 8 - fade_wave 6 + volume_envelope 8, 0 +; cutoff 6 note D_, 1 - fade_wave 8 +; cutoff 8 note C_, 3 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 3 rest 1 note G_, 5 rest 1 - fade_wave 6 +; cutoff 6 note G_, 2 - fade_wave 8 +; cutoff 8 note E_, 10 rest 2 note C_, 1 rest 2 - fade_wave 6 +; cutoff 6 note E_, 1 - fade_wave 8 +; cutoff 8 note F_, 5 rest 1 - fade_wave 6 +; cutoff 6 note C_, 2 - fade_wave 7 +; cutoff 7 note C_, 2 - fade_wave 8 +; cutoff 8 note C_, 2 dec_octave note G_, 1 @@ -280,29 +280,29 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) note A_, 1 rest 2 inc_octave - fade_wave 6 +; cutoff 6 note C_, 1 dec_octave - fade_wave 8 +; cutoff 8 note B_, 3 rest 1 note B_, 1 rest 2 inc_octave - fade_wave 6 +; cutoff 6 note D_, 1 - fade_wave 8 +; cutoff 8 note C_, 3 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 3 rest 1 note G_, 5 rest 1 - fade_wave 6 +; cutoff 6 note G_, 2 - fade_wave 8 +; cutoff 8 note E_, 8 rest 2 note C_, 2 @@ -314,9 +314,9 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 1 note G#, 5 rest 1 - fade_wave 6 +; cutoff 6 note F_, 2 - fade_wave 8 +; cutoff 8 note G#, 9 rest 1 note G#, 2 @@ -327,64 +327,64 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 2 dec_octave note A_, 1 - channel_volume 2 + volume_envelope 2, 7 note A_, 1 rest 1 - channel_volume 8 + volume_envelope 8, 0 inc_octave - fade_wave 6 +; cutoff 6 note C_, 1 - fade_wave 8 +; cutoff 8 dec_octave note B_, 10 rest 2 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 rest 1 - channel_volume 8 - fade_wave 6 + volume_envelope 8, 0 +; cutoff 6 note B_, 1 - fade_wave 8 +; cutoff 8 note A_, 12 - channel_volume 2 + volume_envelope 2, 7 note A_, 2 - channel_volume 8 + volume_envelope 8, 0 note B_, 1 note A_, 1 note B_, 1 - channel_volume 2 + volume_envelope 2, 7 note B_, 1 rest 1 - channel_volume 8 + volume_envelope 8, 0 inc_octave - fade_wave 6 +; cutoff 6 note D_, 1 - fade_wave 8 +; cutoff 8 note D_, 8 rest 2 speed 1 - fade_wave 7 +; cutoff 7 note D_, 5 note D_, 4 note D_, 5 speed 7 - fade_wave 8 +; cutoff 8 note C_, 9 rest 1 note C_, 2 dec_octave - fade_wave 7 +; cutoff 7 note G#, 2 - fade_wave 8 +; cutoff 8 note G#, 2 note G_, 10 rest 2 note G_, 1 rest 2 - fade_wave 6 +; cutoff 6 note G_, 1 - fade_wave 8 +; cutoff 8 note A_, 6 rest 2 note F#, 3 @@ -395,13 +395,13 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 2 note F_, 5 rest 2 - fade_wave 6 +; cutoff 6 note F_, 1 - fade_wave 8 +; cutoff 8 note F_, 7 rest 1 speed 1 - fade_wave 8 +; cutoff 8 note F_, 14 rest 5 note D_, 13 @@ -410,18 +410,18 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 5 speed 7 note E_, 8 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 sound_ret -Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) +Music_TCGTitleScreen_Ch3: speed 7 fade_wave 14 channel_volume 1 - ;echo 0 - ;stereo_panning 1, 1 - ;cutoff 6 +; echo 0 + stereo_panning TRUE, TRUE +; cutoff 6 octave 3 rest 4 sound_call Branch_f52f0 @@ -486,17 +486,17 @@ Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) note C_, 4 speed 1 note C_, 9 - ;tie +; tie note C_, 10 dec_octave note G_, 9 - ;tie +; tie note G_, 9 note G_, 9 - ;tie +; tie note G_, 10 speed 7 - ;cutoff 8 +; cutoff 8 note C_, 8 sound_ret @@ -513,7 +513,7 @@ Branch_f52f0: sound_ret -Music_TCGTitleScreen_Ch4: ; f52fa (3d:52fa) +Music_TCGTitleScreen_Ch4: toggle_noise 6 drum_speed 7 octave 1 @@ -553,4 +553,3 @@ Branch_f531e: drum_note 3, 4 drum_note 3, 3 sound_ret -; 0xf532a