diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index a1306def..e4726126 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -1517,7 +1517,7 @@ MusicF5: ret MusicF6: -;notetype0 +;speed call GetMusicByte ld hl, CHANNEL_NOTE_LENGTH add hl, bc @@ -1525,7 +1525,7 @@ MusicF6: ret MusicF7: -;notetype1 +;channel_volume call GetMusicByte ld hl, CHANNEL_VOLUME_ENVELOPE add hl, bc @@ -1544,7 +1544,7 @@ MusicF7: ret MusicF8: -;notetype2 +;fade_wave call GetMusicByte ld hl, CHANNEL_VOLUME_ENVELOPE add hl, bc diff --git a/crysaudio/macros.asm b/crysaudio/macros.asm index d42bdb7a..14651239 100644 --- a/crysaudio/macros.asm +++ b/crysaudio/macros.asm @@ -403,14 +403,14 @@ dec_octave: MACRO db $f5 ENDM -notetype0: MACRO +speed: MACRO db $f6, \1 ENDM -notetype1: MACRO +channel_volume: MACRO db $f7, \1 ENDM -notetype2: MACRO +fade_wave: MACRO db $f8, \1 ENDM diff --git a/crysaudio/music/TCG/boosterpack.asm b/crysaudio/music/TCG/boosterpack.asm index d120c5d9..b73378c9 100644 --- a/crysaudio/music/TCG/boosterpack.asm +++ b/crysaudio/music/TCG/boosterpack.asm @@ -8,43 +8,43 @@ Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 4 duty_cycle 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note D#, 5 - notetype1 3 + channel_volume 3 note D#, 1 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note A#, 5 - notetype1 3 + channel_volume 3 note A#, 2 - notetype1 10 + channel_volume 10 note F_, 5 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 3 + channel_volume 3 note A_, 1 inc_octave - notetype1 10 + channel_volume 10 note C_, 5 - notetype1 3 + channel_volume 3 note C_, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 16 ;tie note B_, 16 ;tie note B_, 6 - notetype1 3 + channel_volume 3 note B_, 9 sound_ret @@ -53,54 +53,54 @@ Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 1 - notetype0 1 - notetype1 9 + speed 1 + channel_volume 9 note A#, 5 - notetype1 2 + channel_volume 2 note A#, 1 inc_octave - notetype1 9 + channel_volume 9 note D#, 5 - notetype1 2 + channel_volume 2 note D#, 1 - notetype1 9 + channel_volume 9 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 2 - notetype1 9 + channel_volume 9 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 1 - notetype1 9 + channel_volume 9 note F_, 5 - notetype1 2 + channel_volume 2 note F_, 1 - notetype1 9 + channel_volume 9 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 2 - notetype1 9 + channel_volume 9 note G_, 16 ;tie note G_, 16 ;tie note G_, 6 - notetype1 2 + channel_volume 2 note G_, 9 sound_ret Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) ;stereo_panning 1, 1 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;cutoff 8 ;echo 0 octave 2 - notetype0 1 + speed 1 note D#, 6 note A#, 6 inc_octave diff --git a/crysaudio/music/TCG/cardpop.asm b/crysaudio/music/TCG/cardpop.asm index 489e8a48..77612bfe 100644 --- a/crysaudio/music/TCG/cardpop.asm +++ b/crysaudio/music/TCG/cardpop.asm @@ -6,11 +6,11 @@ Music_CardPop: channel 4, Music_CardPop_Ch4 Music_CardPop_Ch1: ; f703a (3d:703a) - notetype0 4 + speed 4 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 - notetype1 9 + channel_volume 9 .MainLoop .Loop1 rest 16 @@ -18,50 +18,50 @@ Music_CardPop_Ch1: ; f703a (3d:703a) rest 14 .Loop2 octave 5 - notetype2 8 + fade_wave 8 note F#, 1 note G_, 1 - notetype2 6 + fade_wave 6 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note F#, 1 dec_octave - notetype1 9 + channel_volume 9 note A_, 1 inc_octave - notetype1 3 + channel_volume 3 note D_, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note G_, 1 dec_octave - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 inc_octave note D_, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 note F#, 1 @@ -69,57 +69,57 @@ Music_CardPop_Ch1: ; f703a (3d:703a) rest 16 rest 14 octave 5 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 note F_, 1 - notetype2 6 + fade_wave 6 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note E_, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 inc_octave - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note E_, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 inc_octave note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note F_, 1 rest 1 note E_, 1 rest 12 rest 16 - notetype1 9 + channel_volume 9 rest 14 sound_loop 2, .Loop2 rest 2 @@ -127,12 +127,12 @@ Music_CardPop_Ch1: ; f703a (3d:703a) Music_CardPop_Ch2: ; f70df (3d:70df) - notetype0 4 + speed 4 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 - notetype1 6 - notetype2 3 + channel_volume 6 + fade_wave 3 .Loop1 octave 2 note A_, 2 @@ -213,10 +213,10 @@ Music_CardPop_Ch2: ; f70df (3d:70df) Music_CardPop_Ch3: ; f713a (3d:713a) - notetype0 4 - notetype2 11 + speed 4 + fade_wave 11 ;stereo_panning 1, 1 - notetype1 1 + channel_volume 1 ;echo 0 ;cutoff 8 sound_call Branch_f715b diff --git a/crysaudio/music/TCG/challengehall.asm b/crysaudio/music/TCG/challengehall.asm index e9b27ec5..615f85a0 100644 --- a/crysaudio/music/TCG/challengehall.asm +++ b/crysaudio/music/TCG/challengehall.asm @@ -9,64 +9,64 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 15, 3, 3 - notetype2 7 + fade_wave 7 octave 3 duty_cycle 2 - notetype1 8 - notetype2 8 - notetype0 1 + channel_volume 8 + fade_wave 8 + speed 1 note A_, 7 note G#, 4 - notetype1 1 + channel_volume 1 note G#, 4 - notetype1 8 + channel_volume 8 note A_, 4 - notetype1 1 + channel_volume 1 note A_, 3 - notetype1 8 + channel_volume 8 note B_, 4 - notetype1 1 + channel_volume 1 note B_, 4 inc_octave - notetype1 8 + channel_volume 8 note C#, 7 note C_, 4 - notetype1 1 + channel_volume 1 note C_, 4 - notetype1 8 + channel_volume 8 note C#, 4 - notetype1 1 + channel_volume 1 note C#, 3 - notetype1 8 + channel_volume 8 note D_, 4 - notetype1 1 + channel_volume 1 note D_, 4 - notetype1 8 + channel_volume 8 note E_, 7 note D#, 4 - notetype1 1 + channel_volume 1 note D#, 4 - notetype1 8 + channel_volume 8 note E_, 4 - notetype1 1 + channel_volume 1 note E_, 3 - notetype1 8 + channel_volume 8 note F#, 4 - notetype1 1 + channel_volume 1 note F#, 4 - notetype1 8 + channel_volume 8 note G#, 4 - notetype1 1 + channel_volume 1 note G#, 3 - notetype1 8 + channel_volume 8 note A_, 8 note B_, 7 inc_octave note C#, 4 note D_, 4 .MainLoop - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 octave 5 .Loop1 note E_, 4 @@ -75,278 +75,278 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) note F#, 4 sound_loop 8, .Loop1 duty_cycle 1 - notetype1 8 + channel_volume 8 dec_octave dec_octave dec_octave note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 dec_octave - notetype1 8 + channel_volume 8 note B_, 7 note B_, 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 - notetype1 8 + channel_volume 8 note B_, 15 inc_octave note D_, 15 note E_, 15 inc_octave duty_cycle 0 - notetype1 10 + channel_volume 10 sound_call Branch_f9848 - notetype1 10 + channel_volume 10 note D_, 8 - notetype0 10 + speed 10 note C#, 6 ;tie note C#, 6 - notetype1 3 - notetype0 1 + channel_volume 3 + speed 1 note C#, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 rest 15 - notetype1 8 + channel_volume 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 rest 15 - notetype1 8 + channel_volume 8 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 rest 15 - notetype1 8 + channel_volume 8 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 duty_cycle 0 - notetype1 10 + channel_volume 10 sound_call Branch_f9848 - notetype1 10 + channel_volume 10 note C#, 8 dec_octave - notetype0 10 + speed 10 note A_, 6 ;tie note A_, 6 - notetype1 3 - notetype0 1 + channel_volume 3 + speed 1 note A_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 inc_octave note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 rest 15 - notetype1 8 + channel_volume 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 rest 15 - notetype1 8 + channel_volume 8 note C#, 15 note D_, 15 note E_, 15 - notetype1 2 + channel_volume 2 note E_, 15 duty_cycle 0 - notetype1 10 + channel_volume 10 note F#, 7 note F_, 7 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note F#, 7 note F_, 8 note F#, 7 note G#, 7 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 10 - notetype0 10 + channel_volume 10 + speed 10 note A_, 3 ;tie - notetype0 1 + speed 1 note A_, 15 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 duty_cycle 0 - notetype1 10 + channel_volume 10 rest 15 inc_octave note E_, 7 note D#, 7 - notetype1 3 + channel_volume 3 note D#, 1 - notetype1 10 + channel_volume 10 note E_, 7 note D#, 8 note E_, 7 note G#, 7 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 10 - notetype0 9 + channel_volume 10 + speed 9 note A_, 5 - notetype0 1 + speed 1 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 duty_cycle 0 - notetype1 10 + channel_volume 10 rest 15 inc_octave note D_, 7 note C#, 8 note D_, 7 - notetype1 3 + channel_volume 3 note D_, 8 - notetype1 10 + channel_volume 10 note A_, 7 - notetype1 3 + channel_volume 3 note A_, 8 - notetype1 10 + channel_volume 10 note G#, 15 ;tie note G#, 7 - notetype1 3 + channel_volume 3 note G#, 8 - notetype1 10 + channel_volume 10 note F#, 15 - notetype1 3 + channel_volume 3 note F#, 7 - notetype1 10 + channel_volume 10 note G#, 8 - notetype0 10 + speed 10 note E_, 6 - notetype0 1 - notetype1 3 + speed 1 + channel_volume 3 note E_, 15 - notetype1 10 + channel_volume 10 note C#, 15 note D_, 15 note E_, 15 - notetype1 3 + channel_volume 3 note E_, 15 - notetype1 10 + channel_volume 10 note F#, 7 note F_, 7 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note F#, 7 note F_, 8 note F#, 6 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 + channel_volume 10 note G#, 6 - notetype1 3 + channel_volume 3 note G#, 2 - notetype1 10 - notetype0 10 + channel_volume 10 + speed 10 note A_, 3 - notetype0 1 + speed 1 note G#, 15 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note B_, 7 inc_octave duty_cycle 0 - notetype1 10 + channel_volume 10 note F#, 6 - notetype1 3 + channel_volume 3 note F#, 2 - notetype1 10 + channel_volume 10 note E_, 15 - notetype1 3 + channel_volume 3 note E_, 15 - notetype1 10 + channel_volume 10 note B_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 dec_octave note B_, 7 inc_octave duty_cycle 0 - notetype1 10 + channel_volume 10 note G#, 6 - notetype1 3 + channel_volume 3 note G#, 2 - notetype1 10 - notetype0 10 + channel_volume 10 + speed 10 note A_, 3 - notetype0 1 - notetype1 3 + speed 1 + channel_volume 3 note A_, 15 - notetype1 10 + channel_volume 10 note B_, 6 - notetype1 3 + channel_volume 3 note B_, 1 inc_octave - notetype1 10 + channel_volume 10 note C#, 6 - notetype1 3 + channel_volume 3 note C#, 2 - notetype1 10 - notetype0 10 + channel_volume 10 + speed 10 note D_, 3 - notetype0 1 - notetype1 3 + speed 1 + channel_volume 3 note D_, 15 dec_octave - notetype1 10 + channel_volume 10 note F#, 6 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 + channel_volume 10 note B_, 6 - notetype1 3 + channel_volume 3 note B_, 2 - notetype1 10 + channel_volume 10 note A_, 15 - notetype1 3 + channel_volume 3 note A_, 15 - notetype1 10 + channel_volume 10 note G#, 11 - notetype1 3 + channel_volume 3 note G#, 4 rest 7 - notetype1 10 + channel_volume 10 note A_, 7 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 - notetype0 10 + channel_volume 10 + speed 10 note A_, 6 duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 inc_octave note C#, 7 note C_, 8 @@ -364,44 +364,44 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) Branch_f9848: note C#, 15 - notetype1 3 + channel_volume 3 note C#, 15 - notetype1 10 + channel_volume 10 note E_, 15 - notetype1 3 + channel_volume 3 note E_, 7 - notetype1 10 + channel_volume 10 note C#, 8 note D_, 15 - notetype1 3 + channel_volume 3 note D_, 15 - notetype1 10 + channel_volume 10 note F#, 15 - notetype1 3 + channel_volume 3 note F#, 7 - notetype1 10 + channel_volume 10 note D_, 8 note E_, 7 - notetype1 3 + channel_volume 3 note E_, 8 - notetype1 10 + channel_volume 10 note A_, 15 note G#, 7 - notetype1 3 + channel_volume 3 note G#, 8 - notetype1 10 + channel_volume 10 note F#, 7 - notetype1 3 + channel_volume 3 note F#, 8 - notetype1 10 + channel_volume 10 note E_, 15 note D_, 7 - notetype1 3 + channel_volume 3 note D_, 8 dec_octave - notetype1 10 + channel_volume 10 note B_, 15 - notetype1 3 + channel_volume 3 note B_, 7 inc_octave sound_ret @@ -411,151 +411,151 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 15, 3, 3 - notetype2 7 + fade_wave 7 octave 3 - notetype0 10 + speed 10 .Loop1 rest 6 sound_loop 2, .Loop1 .MainLoop duty_cycle 1 - notetype1 9 - notetype2 8 - notetype0 10 + channel_volume 9 + fade_wave 8 + speed 10 note E_, 6 ;tie note E_, 6 - notetype0 1 + speed 1 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 dec_octave - notetype1 8 + channel_volume 8 note E_, 7 note E_, 8 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 8 + channel_volume 8 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 8 + channel_volume 8 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 8 + channel_volume 8 note E_, 15 note F#, 15 note G#, 15 sound_call Branch_f9a28 note B_, 8 - notetype0 10 + speed 10 note A_, 6 ;tie note A_, 6 - notetype0 1 + speed 1 rest 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 rest 15 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 rest 15 - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 rest 15 - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 sound_call Branch_f9a28 note G#, 8 - notetype0 10 + speed 10 note E_, 6 ;tie note E_, 6 - notetype0 1 + speed 1 rest 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 rest 15 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 rest 15 - notetype1 8 + channel_volume 8 note A_, 15 note B_, 15 inc_octave note C#, 15 - notetype1 2 + channel_volume 2 note C#, 15 - notetype1 8 + channel_volume 8 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 rest 15 dec_octave - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 rest 15 inc_octave - notetype1 8 + channel_volume 8 note D_, 7 duty_cycle 2 - notetype1 6 + channel_volume 6 inc_octave note D_, 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 6 + channel_volume 6 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 - notetype1 6 + channel_volume 6 .Loop2 note E_, 4 note F#, 3 note E_, 4 note F#, 4 sound_loop 4, .Loop2 - notetype1 2 + channel_volume 2 note F#, 5 rest 10 dec_octave dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note C#, 7 inc_octave duty_cycle 2 - notetype1 6 + channel_volume 6 note E_, 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 6 + channel_volume 6 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 - notetype1 5 + channel_volume 5 .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 - notetype1 2 + channel_volume 2 note D_, 8 - notetype1 5 + channel_volume 5 note C#, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 octave 2 note B_, 7 inc_octave inc_octave ;vibrato_type 1 duty_cycle 2 - notetype1 5 + channel_volume 5 note B_, 8 inc_octave - notetype0 10 + speed 10 note C#, 6 - notetype1 2 - notetype0 1 + channel_volume 2 + speed 1 note C#, 15 ;vibrato_type 8 duty_cycle 0 - notetype1 7 + channel_volume 7 octave 2 note E_, 15 note F#, 15 note A#, 15 rest 15 duty_cycle 1 - notetype1 8 + channel_volume 8 inc_octave note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 rest 15 dec_octave - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 rest 15 inc_octave - notetype1 8 + channel_volume 8 note D_, 7 inc_octave duty_cycle 2 - notetype1 6 + channel_volume 6 note D_, 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 6 + channel_volume 6 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 - notetype1 6 + channel_volume 6 .Loop4 note E_, 4 note F#, 3 @@ -630,162 +630,162 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note F#, 4 sound_loop 2, .Loop4 duty_cycle 0 - notetype1 7 + channel_volume 7 dec_octave dec_octave note F_, 15 rest 7 note F_, 6 rest 2 - notetype0 10 + speed 10 note F#, 3 - notetype0 1 + speed 1 rest 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note C#, 7 duty_cycle 0 - notetype1 7 + channel_volume 7 note E_, 6 rest 2 - notetype0 10 + speed 10 note F#, 3 - notetype0 1 + speed 1 rest 15 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note B_, 7 inc_octave duty_cycle 0 - notetype1 7 + channel_volume 7 note D_, 6 rest 2 note E_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 duty_cycle 0 - notetype1 7 + channel_volume 7 note D_, 11 rest 4 duty_cycle 1 - notetype1 8 + channel_volume 8 dec_octave note B_, 7 inc_octave duty_cycle 0 - notetype1 7 + channel_volume 7 note D_, 6 rest 2 note C#, 15 duty_cycle 1 - notetype1 8 - notetype2 7 + channel_volume 8 + fade_wave 7 note C#, 5 note C#, 5 note C#, 5 - notetype2 8 + fade_wave 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 - notetype1 8 + channel_volume 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 duty_cycle 0 - notetype1 10 + channel_volume 10 note A_, 7 - notetype1 3 + channel_volume 3 note A_, 8 rest 15 - notetype0 10 + speed 10 rest 3 sound_loop 0, .MainLoop Branch_f9a28: duty_cycle 0 - notetype1 7 + channel_volume 7 note A_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 duty_cycle 0 - notetype1 7 + channel_volume 7 inc_octave note C#, 15 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 duty_cycle 0 - notetype1 7 + channel_volume 7 note A_, 8 note B_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 duty_cycle 0 - notetype1 7 + channel_volume 7 inc_octave note D_, 15 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note B_, 7 duty_cycle 0 - notetype1 7 + channel_volume 7 note B_, 8 inc_octave note C#, 7 - notetype1 3 + channel_volume 3 note C#, 8 duty_cycle 1 - notetype1 8 + channel_volume 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 duty_cycle 0 - notetype1 7 + channel_volume 7 note E_, 7 rest 8 note E_, 7 rest 8 - notetype1 7 + channel_volume 7 note D_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 dec_octave duty_cycle 0 - notetype1 7 + channel_volume 7 note G#, 15 inc_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note D_, 7 dec_octave duty_cycle 0 - notetype1 7 + channel_volume 7 sound_ret Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 0 ;cutoff 8 ;cutoff 8 - notetype0 10 + speed 10 .Loop1 rest 6 sound_loop 2, .Loop1 @@ -795,7 +795,7 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) note E_, 6 ;tie note E_, 6 - notetype0 1 + speed 1 inc_octave note E_, 7 rest 8 @@ -984,7 +984,7 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) note A_, 7 rest 8 rest 15 - notetype0 10 + speed 10 rest 3 sound_loop 0, .MainLoop diff --git a/crysaudio/music/TCG/club1.asm b/crysaudio/music/TCG/club1.asm index 8405c309..ec58ab53 100644 --- a/crysaudio/music/TCG/club1.asm +++ b/crysaudio/music/TCG/club1.asm @@ -6,15 +6,15 @@ Music_Club1: channel 4, Music_Club1_Ch4 Music_Club1_Ch1: ; f9be5 (3e:5be5) - notetype0 5 + speed 5 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 0 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note C#, 2 dec_octave note A_, 2 @@ -22,22 +22,22 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 2 note A_, 2 duty_cycle 2 - notetype1 7 + channel_volume 7 inc_octave - notetype0 1 + speed 1 note C#, 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 6 + channel_volume 6 note A_, 4 - notetype1 7 + channel_volume 7 note A_, 4 - notetype1 2 + channel_volume 2 note A_, 2 dec_octave duty_cycle 0 - notetype1 9 - notetype0 5 + channel_volume 9 + speed 5 note C#, 2 dec_octave note A#, 2 @@ -45,14 +45,14 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 2 note A#, 2 duty_cycle 2 - notetype1 7 + channel_volume 7 inc_octave - notetype0 1 + speed 1 note C#, 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype0 5 - notetype1 8 + speed 5 + channel_volume 8 dec_octave note B_, 1 inc_octave @@ -68,17 +68,17 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 4 dec_octave note B_, 2 - notetype1 2 + channel_volume 2 note B_, 2 rest 2 duty_cycle 0 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 6 rest 2 .MainLoop duty_cycle 0 - notetype1 10 + channel_volume 10 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 - notetype1 4 + channel_volume 4 note C#, 4 - notetype1 10 + channel_volume 10 note C#, 2 note D_, 4 note E_, 2 - notetype1 4 + channel_volume 4 note E_, 2 rest 2 - notetype1 10 + channel_volume 10 note D#, 1 note E_, 7 note D_, 6 dec_octave note A_, 4 note F#, 2 - notetype1 4 + channel_volume 4 note F#, 2 rest 2 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note C#, 3 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 2 note C_, 4 dec_octave note B_, 6 - notetype1 9 + channel_volume 9 note D_, 4 rest 2 dec_octave note A_, 2 ;vibrato_type 1 duty_cycle 2 - notetype1 5 + channel_volume 5 inc_octave inc_octave inc_octave @@ -135,7 +135,7 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) dec_octave ;vibrato_type 8 duty_cycle 0 - notetype1 10 + channel_volume 10 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 - notetype1 9 + channel_volume 9 note A#, 1 rest 5 inc_octave inc_octave - notetype1 10 + channel_volume 10 note C#, 2 note D_, 4 note E_, 2 - notetype1 4 + channel_volume 4 note E_, 2 rest 2 - notetype1 10 + channel_volume 10 note D#, 1 note E_, 7 note D_, 6 dec_octave note A_, 4 note F#, 2 - notetype1 4 + channel_volume 4 note F#, 2 rest 2 - notetype1 10 + channel_volume 10 inc_octave note C_, 1 note C#, 3 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 2 note C_, 4 dec_octave note B_, 8 - notetype1 4 + channel_volume 4 note B_, 4 - notetype1 10 + channel_volume 10 note E_, 2 note F_, 1 note F#, 5 note A_, 6 note B_, 4 note A_, 2 - notetype1 4 + channel_volume 4 note A_, 2 rest 2 - notetype1 10 + channel_volume 10 note E_, 1 note F_, 7 note A_, 6 note B_, 4 note A_, 2 - notetype1 4 + channel_volume 4 note A_, 2 rest 2 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note C#, 5 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 4 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 4 note C_, 2 note C#, 4 dec_octave note F#, 2 - notetype1 4 + channel_volume 4 note F#, 2 rest 2 inc_octave - notetype1 10 + channel_volume 10 note D#, 1 note E_, 5 note D_, 6 note C#, 4 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 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 - notetype1 4 + channel_volume 4 note F#, 2 rest 2 - notetype1 10 + channel_volume 10 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 - notetype1 4 + channel_volume 4 note F#, 2 rest 2 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note C#, 5 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 4 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 4 dec_octave note A_, 2 @@ -270,58 +270,58 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) dec_octave note B_, 14 duty_cycle 2 - notetype1 6 + channel_volume 6 note G#, 2 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 inc_octave - notetype1 6 + channel_volume 6 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 6 + channel_volume 6 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 6 + channel_volume 6 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 inc_octave - notetype1 6 + channel_volume 6 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 sound_loop 0, .MainLoop Music_Club1_Ch2: ; f9d5f (3e:5d5f) - notetype0 5 + speed 5 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 7 + fade_wave 7 octave 2 duty_cycle 0 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note A_, 2 note E_, 2 note A_, 2 inc_octave note C#, 2 duty_cycle 2 - notetype1 5 - notetype0 1 + channel_volume 5 + speed 1 note A_, 8 rest 2 inc_octave note C#, 8 rest 2 - notetype0 5 + speed 5 duty_cycle 0 - notetype1 9 + channel_volume 9 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 - notetype1 5 - notetype0 1 + channel_volume 5 + speed 1 note A#, 8 rest 2 dec_octave - notetype0 5 + speed 5 duty_cycle 0 - notetype1 9 + channel_volume 9 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 - notetype1 9 + channel_volume 9 note B_, 6 rest 2 .MainLoop octave 2 rest 4 inc_octave - notetype1 9 + channel_volume 9 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 - notetype1 5 + channel_volume 5 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 - notetype1 9 + channel_volume 9 note E_, 4 rest 2 ;vibrato_type 1 duty_cycle 2 - notetype1 5 + channel_volume 5 octave 5 note C_, 1 note C#, 5 duty_cycle 0 - notetype1 9 + channel_volume 9 octave 3 note D_, 2 duty_cycle 2 - notetype1 5 + channel_volume 5 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 - notetype1 9 + channel_volume 9 rest 2 dec_octave note C#, 2 - notetype1 6 + channel_volume 6 note C#, 4 - notetype1 3 + channel_volume 3 note C#, 4 rest 2 - notetype1 9 + channel_volume 9 note C#, 2 ;vibrato_type 8 - notetype1 6 + channel_volume 6 note D#, 4 note E_, 6 - notetype1 3 + channel_volume 3 note E_, 2 inc_octave inc_octave ;vibrato_type 1 duty_cycle 2 - notetype1 5 + channel_volume 5 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 - notetype1 9 + channel_volume 9 note D_, 2 duty_cycle 2 - notetype1 5 + channel_volume 5 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 - notetype1 9 + channel_volume 9 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 - notetype1 5 + channel_volume 5 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 - notetype1 9 + channel_volume 9 note D_, 4 rest 2 dec_octave @@ -485,14 +485,14 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) inc_octave inc_octave duty_cycle 2 - notetype1 5 + channel_volume 5 note E_, 1 note F_, 3 note D_, 2 note C#, 4 dec_octave duty_cycle 0 - notetype1 9 + channel_volume 9 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 - notetype1 5 + channel_volume 5 note E_, 4 note G#, 2 note B_, 4 @@ -511,13 +511,13 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) dec_octave ;vibrato_type 8 duty_cycle 0 - notetype1 6 + channel_volume 6 note A#, 2 - notetype1 3 + channel_volume 3 note A#, 2 rest 2 inc_octave - notetype1 6 + channel_volume 6 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 - notetype1 9 + channel_volume 9 note D_, 2 - notetype1 6 + channel_volume 6 note F#, 4 note D_, 2 note F#, 4 dec_octave - notetype1 9 + channel_volume 9 note A_, 4 rest 2 - notetype1 6 + channel_volume 6 inc_octave note G#, 1 note A_, 5 - notetype1 9 + channel_volume 9 note D_, 2 - notetype1 6 + channel_volume 6 note F#, 4 note D_, 2 note F#, 4 dec_octave - notetype1 9 + channel_volume 9 note A_, 4 rest 2 inc_octave - notetype1 6 + channel_volume 6 note G#, 1 note A_, 5 - notetype1 9 + channel_volume 9 note D_, 2 - notetype1 6 + channel_volume 6 note A_, 4 rest 2 note A_, 4 dec_octave - notetype1 9 + channel_volume 9 note A_, 2 inc_octave - notetype1 6 + channel_volume 6 note A_, 4 note G#, 12 dec_octave - notetype1 9 + channel_volume 9 note A_, 4 rest 2 note B_, 4 @@ -579,10 +579,10 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) Music_Club1_Ch3: ; f9ec4 (3e:5ec4) - notetype0 5 + speed 5 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 96 ;cutoff 7 octave 2 diff --git a/crysaudio/music/TCG/club2.asm b/crysaudio/music/TCG/club2.asm index 5706dc9b..6a404acd 100644 --- a/crysaudio/music/TCG/club2.asm +++ b/crysaudio/music/TCG/club2.asm @@ -5,58 +5,58 @@ Music_Club2: channel 3, Music_Club2_Ch3 Music_Club2_Ch1: ; fa077 (3e:6077) - notetype0 6 + speed 6 duty_cycle 2 ;stereo_panning 1, 1 - notetype2 6 + fade_wave 6 .MainLoop octave 4 .Loop1 - notetype1 7 + channel_volume 7 note G_, 4 note E_, 4 note C_, 4 - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note F#, 4 ;tie - notetype2 6 + fade_wave 6 note F#, 16 - notetype1 7 + channel_volume 7 note G_, 4 note A_, 4 note B_, 4 - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note F#, 4 ;tie - notetype2 6 + fade_wave 6 note F#, 16 sound_loop 8, .Loop1 - notetype1 7 + channel_volume 7 note G_, 4 note D_, 4 dec_octave note B_, 4 inc_octave - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note B_, 4 ;tie - notetype2 6 + fade_wave 6 note B_, 16 - notetype1 7 + channel_volume 7 note G_, 4 note D_, 4 note C_, 4 - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note B_, 4 ;tie - notetype2 6 + fade_wave 6 note B_, 16 dec_octave - notetype1 7 + channel_volume 7 note F#, 4 dec_octave note D_, 4 @@ -92,92 +92,92 @@ Music_Club2_Ch1: ; fa077 (3e:6077) note A_, 4 note A_, 3 ;tie - notetype0 1 + speed 1 note A_, 3 inc_octave - notetype1 7 + channel_volume 7 rest 4 note D_, 5 ;tie - notetype0 6 - notetype2 0 + speed 6 + fade_wave 0 note D_, 15 ;tie - notetype2 6 + fade_wave 6 note D_, 16 sound_loop 0, .MainLoop Music_Club2_Ch2: ; fa0e3 (3e:60e3) - notetype0 6 + speed 6 duty_cycle 2 ;stereo_panning 1, 1 - notetype2 6 + fade_wave 6 .MainLoop octave 2 .Loop1 - notetype1 7 + channel_volume 7 note C_, 4 note G_, 4 inc_octave note G_, 4 inc_octave - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note D_, 4 ;tie - notetype2 6 + fade_wave 6 note D_, 16 dec_octave dec_octave - notetype1 7 + channel_volume 7 note C_, 4 note G_, 4 inc_octave inc_octave note C_, 4 - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note D_, 4 ;tie - notetype2 6 + fade_wave 6 note D_, 16 dec_octave dec_octave sound_loop 8, .Loop1 dec_octave - notetype1 7 + channel_volume 7 note B_, 4 inc_octave note G_, 4 inc_octave note G_, 4 inc_octave - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note G_, 4 ;tie - notetype2 6 + fade_wave 6 note G_, 16 dec_octave dec_octave dec_octave - notetype1 7 + channel_volume 7 note A_, 4 inc_octave note A_, 4 inc_octave note A_, 4 inc_octave - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note C_, 4 ;tie - notetype2 6 + fade_wave 6 note C_, 16 dec_octave dec_octave - notetype1 7 + channel_volume 7 note D_, 4 octave 2 note F#, 4 @@ -214,35 +214,35 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) note D_, 4 note E_, 3 ;tie - notetype0 1 + speed 1 note E_, 3 dec_octave - notetype1 7 + channel_volume 7 note A_, 8 inc_octave - notetype1 7 + channel_volume 7 note F#, 7 ;tie - notetype0 6 - notetype2 0 + speed 6 + fade_wave 0 note F#, 14 ;tie - notetype2 6 + fade_wave 6 note F#, 16 sound_loop 0, .MainLoop Music_Club2_Ch3: ; fa164 (3e:6164) - notetype0 6 - notetype1 1 + speed 6 + channel_volume 1 ;stereo_panning 1, 1 - notetype2 10 + fade_wave 10 ;vibrato_type 4 vibrato 35, 3, 3 ;cutoff 6 ;echo 64 .MainLoop - notetype1 3 + channel_volume 3 ;cutoff 8 rest 2 octave 5 @@ -258,7 +258,7 @@ Music_Club2_Ch3: ; fa164 (3e:6164) note F#, 2 rest 2 rest 14 - notetype1 2 + channel_volume 2 ;echo 96 sound_call Branch_fa1cf octave 5 @@ -266,7 +266,7 @@ Music_Club2_Ch3: ; fa164 (3e:6164) note G_, 8 sound_call Branch_fa1cf ;echo 64 - notetype1 1 + channel_volume 1 octave 4 ;cutoff 8 note G_, 8 diff --git a/crysaudio/music/TCG/club3.asm b/crysaudio/music/TCG/club3.asm index b3f81b42..2ff0b16c 100644 --- a/crysaudio/music/TCG/club3.asm +++ b/crysaudio/music/TCG/club3.asm @@ -6,59 +6,59 @@ Music_Club3: channel 4, Music_Club3_Ch4 Music_Club3_Ch1: ; fa210 (3e:6210) - notetype0 9 + speed 9 ;stereo_panning 1, 1 ;vibrato_type 5 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 .MainLoop duty_cycle 0 .Loop1 octave 2 - notetype1 9 + channel_volume 9 rest 4 note G_, 2 - notetype1 3 + channel_volume 3 note G_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 2 dec_octave - notetype1 9 + channel_volume 9 note A#, 6 ;tie note A#, 12 - notetype1 3 + channel_volume 3 note A#, 4 rest 4 - notetype1 9 + channel_volume 9 note G_, 2 - notetype1 3 + channel_volume 3 note G_, 1 inc_octave - notetype1 9 - notetype0 1 + channel_volume 9 + speed 1 note C_, 5 ;tie note C#, 4 ;tie - notetype0 9 + speed 9 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note A#, 6 ;tie note A#, 12 - notetype1 3 + channel_volume 3 note A#, 4 sound_loop 2, .Loop1 duty_cycle 1 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 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 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 4 - notetype0 9 - notetype1 8 + speed 9 + channel_volume 8 note C#, 1 note C_, 1 dec_octave note A#, 1 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 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 - notetype1 7 - notetype0 1 - notetype2 8 + channel_volume 7 + speed 1 + fade_wave 8 note G_, 5 note C#, 4 note C_, 5 @@ -143,8 +143,8 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave note A#, 4 duty_cycle 1 - notetype2 7 - notetype0 9 + fade_wave 7 + speed 9 sound_call Branch_fa370 sound_call Branch_fa403 note A#, 1 @@ -172,13 +172,13 @@ Music_Club3_Ch1: ; fa210 (3e:6210) octave 2 note G_, 1 inc_octave - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 4 - notetype0 9 - notetype1 8 + speed 9 + channel_volume 8 note C#, 1 note C_, 1 dec_octave @@ -213,9 +213,9 @@ Music_Club3_Ch1: ; fa210 (3e:6210) note A#, 1 inc_octave duty_cycle 2 - notetype0 1 - notetype2 8 - notetype1 7 + speed 1 + fade_wave 8 + channel_volume 7 note G_, 5 note C#, 4 note C_, 5 @@ -226,8 +226,8 @@ Music_Club3_Ch1: ; fa210 (3e:6210) note C_, 5 dec_octave note A#, 4 - notetype0 9 - notetype2 8 + speed 9 + fade_wave 8 sound_loop 0, .MainLoop Branch_fa330: @@ -251,12 +251,12 @@ Branch_fa330: inc_octave note A#, 1 dec_octave - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F_, 5 note F#, 4 - notetype0 9 - notetype2 7 + speed 9 + fade_wave 7 note G_, 1 inc_octave note E_, 1 @@ -294,8 +294,8 @@ Branch_fa330: Branch_fa370: octave 2 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 1 inc_octave note D_, 1 @@ -315,55 +315,55 @@ Branch_fa370: inc_octave note A#, 1 dec_octave - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F_, 5 note F#, 4 octave 4 duty_cycle 2 - notetype1 7 + channel_volume 7 note G_, 3 - notetype1 1 + channel_volume 1 note G_, 2 inc_octave - notetype1 7 + channel_volume 7 note D_, 2 - notetype1 1 + channel_volume 1 dec_octave note G_, 2 inc_octave - notetype1 7 + channel_volume 7 note G_, 3 - notetype1 1 + channel_volume 1 note D_, 2 - notetype1 7 + channel_volume 7 note D_, 2 - notetype1 1 + channel_volume 1 note G_, 2 dec_octave - notetype1 7 + channel_volume 7 note G_, 3 - notetype1 1 + channel_volume 1 inc_octave note D_, 2 - notetype1 7 + channel_volume 7 note D_, 2 - notetype1 1 + channel_volume 1 dec_octave note G_, 2 inc_octave - notetype1 7 + channel_volume 7 note G_, 3 - notetype1 1 + channel_volume 1 note D_, 2 - notetype1 7 + channel_volume 7 note D_, 2 - notetype1 1 + channel_volume 1 note G_, 2 - notetype0 9 + speed 9 duty_cycle 1 - notetype2 7 - notetype1 9 + fade_wave 7 + channel_volume 9 octave 2 note G_, 1 inc_octave @@ -388,9 +388,9 @@ Branch_fa370: note G_, 1 octave 5 duty_cycle 2 - notetype0 1 - notetype2 8 - notetype1 7 + speed 1 + fade_wave 8 + channel_volume 7 octave 5 note G_, 5 note C#, 4 @@ -402,10 +402,10 @@ Branch_fa370: note C_, 5 dec_octave note A#, 4 - notetype0 9 + speed 9 duty_cycle 1 - notetype2 7 - notetype1 9 + fade_wave 7 + channel_volume 9 sound_ret Branch_fa403: @@ -429,271 +429,271 @@ Branch_fa403: inc_octave note A#, 1 dec_octave - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F_, 5 note F#, 4 - notetype0 9 - notetype2 7 + speed 9 + fade_wave 7 note G_, 1 sound_ret Music_Club3_Ch2: ; fa423 (3e:6423) - notetype0 9 + speed 9 ;stereo_panning 1, 1 ;vibrato_type 5 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 .MainLoop duty_cycle 0 .Loop1 octave 2 - notetype1 7 + channel_volume 7 rest 4 note D_, 2 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 7 + channel_volume 7 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 2 - notetype1 7 + channel_volume 7 note E_, 6 ;tie note E_, 12 - notetype1 3 + channel_volume 3 note E_, 4 rest 4 - notetype1 7 + channel_volume 7 note D_, 2 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F_, 5 ;tie note F#, 4 - notetype0 9 + speed 9 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 7 + channel_volume 7 note E_, 6 ;tie note E_, 12 - notetype1 3 + channel_volume 3 note E_, 4 sound_loop 2, .Loop1 duty_cycle 1 .Loop2 sound_call Branch_fa5a6 - notetype0 9 + speed 9 rest 1 inc_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype2 8 - notetype1 8 + speed 1 + fade_wave 8 + channel_volume 8 note F_, 5 note F#, 4 inc_octave - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 2 dec_octave - notetype1 9 + channel_volume 9 note D_, 1 inc_octave inc_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype1 9 - notetype0 9 + channel_volume 9 + speed 9 rest 1 dec_octave - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note G_, 5 note D_, 4 dec_octave note A#, 5 - notetype1 3 + channel_volume 3 note A#, 4 inc_octave inc_octave - notetype1 9 + channel_volume 9 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 8 + speed 9 + channel_volume 8 rest 1 dec_octave - notetype0 1 + speed 1 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype2 8 - notetype1 8 + speed 1 + fade_wave 8 + channel_volume 8 note F_, 5 note F#, 4 inc_octave - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note A#, 1 - notetype1 3 + channel_volume 3 note A#, 2 inc_octave - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 5 - notetype1 3 + channel_volume 3 note C_, 4 - notetype0 9 + speed 9 rest 1 dec_octave - notetype1 8 - notetype2 8 + channel_volume 8 + fade_wave 8 note A#, 1 note B_, 1 inc_octave note C_, 1 sound_call Branch_fa5a6 - notetype0 9 + speed 9 rest 1 inc_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype2 8 - notetype1 8 + speed 1 + fade_wave 8 + channel_volume 8 note F_, 5 note F#, 4 inc_octave - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 2 - notetype1 9 + channel_volume 9 note D_, 1 inc_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 4 - notetype0 9 + speed 9 rest 1 dec_octave dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 4 inc_octave - notetype1 8 + channel_volume 8 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 + speed 9 rest 1 rest 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype2 8 - notetype1 8 + speed 1 + fade_wave 8 + channel_volume 8 note F_, 5 note F#, 4 inc_octave inc_octave - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 2 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note F_, 5 - notetype1 3 + channel_volume 3 note F_, 4 - notetype1 8 - notetype0 9 + channel_volume 8 + speed 9 rest 1 dec_octave - notetype2 8 + fade_wave 8 note D_, 1 note D#, 1 note E_, 1 @@ -703,113 +703,113 @@ Music_Club3_Ch2: ; fa423 (3e:6423) Branch_fa5a6: octave 3 rest 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype1 8 - notetype2 8 + speed 1 + channel_volume 8 + fade_wave 8 note F_, 5 note F#, 4 inc_octave - notetype0 9 - notetype2 7 - notetype1 9 + speed 9 + fade_wave 7 + channel_volume 9 note G_, 1 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 2 - notetype1 9 + channel_volume 9 note E_, 1 inc_octave - notetype1 8 - notetype2 8 - notetype0 1 + channel_volume 8 + fade_wave 8 + speed 1 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype1 8 - notetype0 9 + channel_volume 8 + speed 9 rest 1 dec_octave - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note G_, 5 note D_, 4 dec_octave note A#, 5 - notetype1 3 + channel_volume 3 note A#, 4 - notetype1 8 + channel_volume 8 inc_octave inc_octave note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 + speed 9 rest 1 dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype1 8 - notetype2 8 + speed 1 + channel_volume 8 + fade_wave 8 note F_, 5 note F#, 4 - notetype0 9 + speed 9 inc_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note A#, 1 - notetype1 3 + channel_volume 3 note A#, 2 inc_octave - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 dec_octave - notetype1 9 + channel_volume 9 note A#, 1 - notetype1 3 + channel_volume 3 note A#, 1 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note A#, 1 - notetype1 3 + channel_volume 3 note A#, 2 sound_ret Music_Club3_Ch3: ; fa63e (3e:663e) - notetype0 9 + speed 9 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 0 ;cutoff 8 .Loop1 diff --git a/crysaudio/music/TCG/credits.asm b/crysaudio/music/TCG/credits.asm index 1e639714..82c1a641 100644 --- a/crysaudio/music/TCG/credits.asm +++ b/crysaudio/music/TCG/credits.asm @@ -6,269 +6,269 @@ Music_TCGCredits: channel 4, Music_TCGCredits_Ch4 Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) - notetype0 13 + speed 13 ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 2 duty_cycle 1 - notetype1 5 + channel_volume 5 note F_, 1 - notetype1 6 + channel_volume 6 note F_, 2 ;tie - notetype0 1 + speed 1 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 7 - notetype0 13 - notetype1 7 + speed 13 + channel_volume 7 note G_, 1 - notetype1 7 + channel_volume 7 note G_, 2 ;tie - notetype0 1 + speed 1 note G_, 6 - notetype1 4 + channel_volume 4 note G_, 7 - notetype0 13 - notetype1 7 + speed 13 + channel_volume 7 note A_, 1 - notetype1 8 + channel_volume 8 note A_, 2 ;tie - notetype0 1 + speed 1 note A_, 6 - notetype1 4 + channel_volume 4 note A_, 7 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note B_, 3 - notetype1 4 + channel_volume 4 note B_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 sound_call Branch_fb5bc octave 2 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 ; ;sound_call Branch_fb36b - notetype0 13 + speed 13 octave 2 - notetype1 8 + channel_volume 8 note A_, 1 rest 1 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 8 + channel_volume 8 note A_, 1 note B_, 1 inc_octave note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 rest 1 sound_call Branch_fb5bc octave 2 note A_, 2 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 8 + channel_volume 8 note B_, 1 inc_octave sound_call Branch_fb5e4 octave 4 - notetype1 10 + channel_volume 10 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 10 + channel_volume 10 note G_, 4 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 2 note E_, 1 ;tie - notetype0 1 + speed 1 note E_, 6 note F_, 4 note E_, 3 note D_, 13 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 4 ;tie note D_, 8 - notetype1 3 + channel_volume 3 note D_, 2 sound_call Branch_fb5e4 octave 4 - notetype1 10 + channel_volume 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 dec_octave - notetype1 10 + channel_volume 10 note G_, 4 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 + channel_volume 10 note G_, 3 note G#, 10 ;tie note G#, 13 - notetype1 3 + channel_volume 3 note G#, 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 2 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note C_, 1 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 8 sound_call Branch_fb60c - notetype0 13 + speed 13 octave 4 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 3 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note F_, 13 - notetype1 3 + channel_volume 3 note F_, 13 - notetype1 10 + channel_volume 10 note E_, 13 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note E_, 6 note F_, 7 note E_, 13 dec_octave note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 inc_octave - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 13 rest 7 - notetype1 10 + channel_volume 10 note A_, 13 inc_octave note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype1 10 + channel_volume 10 note D#, 3 note E_, 10 ;tie note E_, 13 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 7 - notetype1 10 + channel_volume 10 note E_, 6 - notetype1 3 + channel_volume 3 note E_, 7 - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie @@ -279,117 +279,117 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note B_, 13 inc_octave note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype1 10 + channel_volume 10 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 - notetype0 13 + channel_volume 10 + speed 13 note E_, 5 sound_call Branch_fb60c - notetype0 13 + speed 13 octave 4 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype0 1 + speed 1 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 - notetype1 10 + channel_volume 10 note B_, 6 - notetype1 3 + channel_volume 3 note B_, 7 - notetype1 10 + channel_volume 10 note B_, 3 inc_octave note C_, 10 - notetype1 3 + channel_volume 3 note C_, 13 dec_octave - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note F_, 13 - notetype1 3 + channel_volume 3 note F_, 13 - notetype1 10 + channel_volume 10 note E_, 13 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note E_, 3 note F_, 10 ;tie note F_, 13 note E_, 13 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 rest 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 dec_octave note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 inc_octave - notetype1 10 + channel_volume 10 note E_, 3 note F_, 10 ;tie note F_, 13 note E_, 13 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note G#, 6 - notetype1 3 + channel_volume 3 note G#, 7 rest 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 rest 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 dec_octave dec_octave - notetype1 8 + channel_volume 8 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 - notetype1 8 + channel_volume 8 note B_, 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note G_, 3 note A_, 3 note B_, 3 @@ -401,453 +401,453 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note G_, 4 sound_call Branch_fb651 octave 3 - notetype1 10 + channel_volume 10 note G#, 3 note A_, 10 ;tie note A_, 13 - notetype1 3 + channel_volume 3 note A_, 13 - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie note G_, 13 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note D#, 3 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note D_, 13 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 4 ;tie note D_, 8 - notetype1 3 + channel_volume 3 note D_, 1 dec_octave - notetype1 8 + channel_volume 8 note G_, 1 - notetype0 1 + speed 1 note A_, 6 - notetype1 2 + channel_volume 2 note A_, 7 - notetype1 8 + channel_volume 8 note B_, 6 - notetype1 2 + channel_volume 2 note B_, 7 sound_call Branch_fb651 octave 3 - notetype1 10 + channel_volume 10 note G_, 3 note G#, 10 ;tie note G#, 13 - notetype1 3 + channel_volume 3 note G#, 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 2 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note C_, 1 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 ; octave 4 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note F_, 1 - notetype0 1 + speed 1 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 8 - notetype0 13 - notetype1 10 + speed 13 + channel_volume 10 note E_, 5 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note F_, 1 - notetype0 1 + speed 1 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 8 - notetype0 13 - notetype1 10 + speed 13 + channel_volume 10 note C_, 5 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 13 rest 7 inc_octave - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 2 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 10 + channel_volume 10 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype0 1 + speed 1 note A_, 5 - notetype1 3 + channel_volume 3 note A_, 8 - notetype1 10 + channel_volume 10 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 8 - notetype1 10 + channel_volume 10 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 2 ;tie - notetype0 1 + speed 1 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 dec_octave - notetype1 10 + channel_volume 10 note B_, 3 inc_octave note C_, 10 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 8 - notetype1 10 + channel_volume 10 note E_, 5 - notetype1 3 + channel_volume 3 note E_, 8 - notetype0 13 - notetype1 10 + speed 13 + channel_volume 10 note F_, 3 note E_, 1 - notetype0 1 + speed 1 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 dec_octave - notetype1 10 + channel_volume 10 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 13 rest 7 - notetype1 10 + channel_volume 10 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 2 ;tie - notetype0 1 + speed 1 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 2 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C_, 8 ;tie note C_, 8 ;tie note C_, 8 - notetype1 3 + channel_volume 3 note C_, 1 ; ;sound_call Branch_fb36b - notetype0 13 + speed 13 octave 2 - notetype1 8 + channel_volume 8 note A_, 1 rest 1 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 8 + channel_volume 8 note A_, 1 note B_, 1 inc_octave note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 rest 1 sound_call Branch_fb5bc octave 2 note A_, 2 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 8 + channel_volume 8 note B_, 1 inc_octave sound_call Branch_fb5e4 octave 4 - notetype1 10 + channel_volume 10 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 10 + channel_volume 10 note G_, 4 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 2 note E_, 1 ;tie - notetype0 1 + speed 1 note E_, 6 note F_, 4 note E_, 3 note D_, 13 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 4 ;tie note D_, 8 - notetype1 3 + channel_volume 3 note D_, 2 sound_call Branch_fb5e4 octave 4 - notetype1 10 + channel_volume 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 dec_octave - notetype1 10 + channel_volume 10 note G_, 4 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 + channel_volume 10 note G_, 3 note G#, 10 ;tie note G#, 13 - notetype1 3 + channel_volume 3 note G#, 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 2 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note C_, 1 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 8 sound_call Branch_fb60c - notetype0 13 + speed 13 octave 4 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 3 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note F_, 13 - notetype1 3 + channel_volume 3 note F_, 13 - notetype1 10 + channel_volume 10 note E_, 13 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note E_, 6 note F_, 7 note E_, 13 dec_octave note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 inc_octave - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 13 rest 7 - notetype1 10 + channel_volume 10 note A_, 13 inc_octave note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype1 10 + channel_volume 10 note D#, 3 note E_, 10 ;tie note E_, 13 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 7 - notetype1 10 + channel_volume 10 note E_, 6 - notetype1 3 + channel_volume 3 note E_, 7 - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie @@ -858,117 +858,117 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note B_, 13 inc_octave note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype1 10 + channel_volume 10 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 - notetype0 13 + channel_volume 10 + speed 13 note E_, 5 sound_call Branch_fb60c - notetype0 13 + speed 13 octave 4 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype0 1 + speed 1 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 - notetype1 10 + channel_volume 10 note B_, 6 - notetype1 3 + channel_volume 3 note B_, 7 - notetype1 10 + channel_volume 10 note B_, 3 inc_octave note C_, 10 - notetype1 3 + channel_volume 3 note C_, 13 dec_octave - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note F_, 13 - notetype1 3 + channel_volume 3 note F_, 13 - notetype1 10 + channel_volume 10 note E_, 13 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note E_, 3 note F_, 10 ;tie note F_, 13 note E_, 13 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 rest 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 dec_octave note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 inc_octave - notetype1 10 + channel_volume 10 note E_, 3 note F_, 10 ;tie note F_, 13 note E_, 13 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note G#, 6 - notetype1 3 + channel_volume 3 note G#, 7 rest 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 rest 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 dec_octave dec_octave - notetype1 8 + channel_volume 8 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 - notetype1 8 + channel_volume 8 note B_, 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note G_, 3 note A_, 3 note B_, 3 @@ -980,136 +980,136 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note G_, 4 sound_call Branch_fb651 octave 3 - notetype1 10 + channel_volume 10 note G#, 3 note A_, 10 ;tie note A_, 13 - notetype1 3 + channel_volume 3 note A_, 13 - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie note G_, 13 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note D#, 3 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note D_, 13 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 4 ;tie note D_, 8 - notetype1 3 + channel_volume 3 note D_, 1 dec_octave - notetype1 8 + channel_volume 8 note G_, 1 - notetype0 1 + speed 1 note A_, 6 - notetype1 2 + channel_volume 2 note A_, 7 - notetype1 8 + channel_volume 8 note B_, 6 - notetype1 2 + channel_volume 2 note B_, 7 sound_call Branch_fb651 octave 3 - notetype1 10 + channel_volume 10 note G_, 3 note G#, 10 ;tie note G#, 13 - notetype1 3 + channel_volume 3 note G#, 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 2 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note C_, 1 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 ; octave 4 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note D_, 3 note D#, 10 ;tie - notetype0 13 + speed 13 note D#, 4 - notetype1 3 + channel_volume 3 note D#, 1 - notetype1 10 + channel_volume 10 note D_, 1 - notetype0 1 + speed 1 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype1 10 + channel_volume 10 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 3 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note D#, 1 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 4 dec_octave dec_octave - notetype0 1 - notetype1 9 + speed 1 + channel_volume 9 note E_, 6 note A_, 7 inc_octave @@ -1121,42 +1121,42 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note C_, 7 note F_, 6 note D_, 7 - notetype0 13 + speed 13 note E_, 8 ;tie note E_, 1 - notetype1 3 + channel_volume 3 note E_, 2 sound_ret Branch_fb5bc: octave 2 - notetype0 13 + speed 13 rest 2 - notetype1 8 + channel_volume 8 note G_, 1 inc_octave note C_, 1 rest 1 dec_octave note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 2 - notetype1 8 + channel_volume 8 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 - notetype1 8 + channel_volume 8 note A_, 1 rest 1 inc_octave note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 rest 3 dec_octave - notetype1 8 + channel_volume 8 note G_, 1 inc_octave note C_, 1 @@ -1165,78 +1165,78 @@ Branch_fb5bc: Branch_fb5e4: octave 3 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 3 note G_, 10 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 7 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 inc_octave - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 1 sound_ret Branch_fb60c: octave 4 - notetype0 13 - notetype1 3 + speed 13 + channel_volume 3 note E_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 - notetype0 13 - notetype1 3 + speed 13 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G#, 3 note A_, 10 ;tie - notetype0 13 + speed 13 note A_, 8 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G#, 3 note A_, 10 - notetype1 3 + channel_volume 3 note A_, 13 - notetype1 10 + channel_volume 10 note G_, 13 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note F_, 13 - notetype1 3 + channel_volume 3 note F_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie @@ -1244,46 +1244,46 @@ Branch_fb60c: Branch_fb651: octave 3 - notetype1 10 + channel_volume 10 note D#, 3 note E_, 10 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 7 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 8 inc_octave - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie note D_, 13 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 dec_octave - notetype0 13 - notetype1 10 + speed 13 + channel_volume 10 note G_, 6 ;tie note G_, 6 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 note F_, 5 - notetype1 3 + channel_volume 3 note F_, 8 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 8 sound_ret @@ -1292,96 +1292,96 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 1 octave 2 - notetype0 13 - notetype1 4 + speed 13 + channel_volume 4 note A_, 1 - notetype1 7 + channel_volume 7 note A_, 2 ;tie - notetype0 1 + speed 1 note A_, 6 - notetype1 2 + channel_volume 2 note A_, 7 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note B_, 1 - notetype1 8 + channel_volume 8 note B_, 2 ;tie - notetype0 1 + speed 1 note B_, 6 - notetype1 3 + channel_volume 3 note B_, 7 inc_octave - notetype0 13 - notetype1 6 + speed 13 + channel_volume 6 note C_, 1 - notetype1 9 + channel_volume 9 note C_, 2 ;tie - notetype0 1 + speed 1 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note D_, 3 - notetype1 3 + channel_volume 3 note D_, 1 ; ;sound_call Branch_fb79e - notetype0 13 + speed 13 octave 3 - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 sound_call Branch_fba68 octave 2 - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 9 + channel_volume 9 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 note D_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 sound_call Branch_fba68 - notetype1 9 + channel_volume 9 octave 3 - notetype0 1 + speed 1 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 9 + channel_volume 9 note D_, 3 - notetype1 9 + channel_volume 9 duty_cycle 1 .Loop1 rest 2 @@ -1399,7 +1399,7 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) sound_call Branch_fba9d rest 2 duty_cycle 1 - notetype1 9 + channel_volume 9 octave 3 note C_, 1 rest 1 @@ -1410,29 +1410,29 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) sound_loop 4, .Loop3 rest 2 duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 3 note F_, 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 - notetype1 7 + channel_volume 7 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 dec_octave - notetype1 9 + channel_volume 9 duty_cycle 1 note C_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note E_, 3 note F_, 10 ;tie @@ -1442,53 +1442,53 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note E_, 4 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 duty_cycle 2 - notetype1 7 + channel_volume 7 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 - notetype1 7 + channel_volume 7 note C#, 3 note D_, 10 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 rest 13 dec_octave - notetype1 8 + channel_volume 8 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 3 rest 1 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 3 note B_, 10 ;tie - notetype0 13 + speed 13 note B_, 4 rest 1 inc_octave note C_, 1 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 8 + channel_volume 8 note E_, 5 rest 1 sound_call Branch_fba9d @@ -1496,237 +1496,237 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) octave 3 note C_, 1 note D_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 rest 1 note F_, 1 rest 1 note G#, 1 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 3 note D#, 10 ;tie - notetype0 13 + speed 13 note D#, 2 dec_octave dec_octave - notetype1 9 + channel_volume 9 note G#, 1 rest 1 inc_octave - notetype1 8 + channel_volume 8 note G#, 1 note A#, 1 dec_octave - notetype1 9 + channel_volume 9 note G#, 1 inc_octave inc_octave - notetype1 8 + channel_volume 8 note C_, 3 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note F#, 3 note G_, 10 inc_octave - notetype0 13 - notetype2 4 + speed 13 + fade_wave 4 note C_, 1 dec_octave note B_, 1 - notetype2 8 + fade_wave 8 note A#, 1 rest 1 sound_call Branch_fbacb octave 3 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note B_, 3 inc_octave note C_, 10 - notetype0 13 + speed 13 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 note C_, 1 dec_octave - notetype2 4 + fade_wave 4 note F_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note D_, 1 rest 1 - notetype2 8 + fade_wave 8 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 2 - notetype2 4 + fade_wave 4 note D_, 1 dec_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note A_, 1 rest 1 - notetype2 8 + fade_wave 8 note B_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note A_, 1 - notetype2 8 + fade_wave 8 note G_, 1 - notetype2 4 + fade_wave 4 note A_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 2 dec_octave - notetype0 1 + speed 1 note B_, 3 inc_octave note C_, 10 dec_octave - notetype0 13 - notetype2 4 + speed 13 + fade_wave 4 note B_, 1 - notetype2 6 + fade_wave 6 note A#, 2 sound_call Branch_fbacb octave 4 note G_, 1 - notetype2 8 + fade_wave 8 note E_, 1 - notetype0 13 + speed 13 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype2 7 + channel_volume 8 + fade_wave 7 note C_, 2 - notetype2 8 + fade_wave 8 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note F_, 1 rest 1 - notetype2 8 + fade_wave 8 note A_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype2 7 + channel_volume 8 + fade_wave 7 note C_, 2 - notetype2 8 + fade_wave 8 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note F_, 1 rest 1 note G#, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 3 rest 1 dec_octave note A_, 1 inc_octave - notetype2 4 + fade_wave 4 note C_, 1 dec_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 3 note B_, 10 rest 13 dec_octave - notetype1 9 + channel_volume 9 note A#, 3 note B_, 10 - notetype1 2 + channel_volume 2 note B_, 13 inc_octave - notetype1 9 + channel_volume 9 note C_, 13 - notetype1 2 + channel_volume 2 note C_, 13 - notetype1 9 - notetype0 13 + channel_volume 9 + speed 13 note D_, 2 - notetype1 2 + channel_volume 2 note D_, 1 sound_call Branch_fbb10 rest 1 @@ -1736,83 +1736,83 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note B_, 1 note A_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note E_, 2 rest 1 note C_, 1 rest 1 dec_octave - notetype2 7 + fade_wave 7 note G_, 1 - notetype2 8 + fade_wave 8 note G_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 rest 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F_, 13 note A_, 6 - notetype1 2 + channel_volume 2 note A_, 7 inc_octave - notetype1 7 + channel_volume 7 note C_, 6 - notetype1 2 + channel_volume 2 note C_, 7 - notetype1 7 + channel_volume 7 note E_, 6 - notetype1 2 + channel_volume 2 note E_, 7 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 7 + channel_volume 7 note D_, 5 - notetype1 2 + channel_volume 2 note D_, 8 - notetype0 13 + speed 13 rest 1 dec_octave dec_octave - notetype1 9 + channel_volume 9 duty_cycle 1 note B_, 1 inc_octave - notetype0 1 + speed 1 note C_, 6 - notetype1 2 + channel_volume 2 note C_, 7 - notetype1 9 + channel_volume 9 note D_, 6 - notetype1 2 + channel_volume 2 note D_, 7 sound_call Branch_fbb10 octave 3 @@ -1821,24 +1821,24 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) rest 1 note G#, 1 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 3 note D#, 10 ;tie - notetype0 13 + speed 13 note D#, 2 dec_octave dec_octave - notetype1 9 + channel_volume 9 note G#, 1 rest 1 - notetype0 1 + speed 1 rest 6 - notetype1 9 + channel_volume 9 note G#, 7 inc_octave note C_, 6 @@ -1847,147 +1847,147 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note A#, 7 ; octave 4 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note C_, 3 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 rest 2 inc_octave - notetype1 8 + channel_volume 8 note D_, 1 - notetype2 4 + fade_wave 4 note E_, 1 - notetype2 8 + fade_wave 8 note C_, 3 dec_octave - notetype1 9 + channel_volume 9 note D_, 1 rest 2 inc_octave - notetype1 8 + channel_volume 8 note D_, 1 - notetype2 4 + fade_wave 4 note E_, 1 dec_octave - notetype2 8 + fade_wave 8 note A_, 3 - notetype1 9 + channel_volume 9 note C_, 1 rest 2 - notetype2 4 - notetype1 8 + fade_wave 4 + channel_volume 8 note F_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note G#, 3 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note G#, 1 rest 1 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note E_, 3 - notetype1 9 + channel_volume 9 note D_, 1 rest 1 dec_octave - notetype1 8 + channel_volume 8 note B_, 1 inc_octave - notetype2 4 + fade_wave 4 note C_, 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 - notetype1 8 + channel_volume 8 note E_, 3 - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 8 + channel_volume 8 note E_, 1 - notetype2 4 + fade_wave 4 note F_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note A_, 3 - notetype1 9 + channel_volume 9 note C_, 1 - notetype2 4 + fade_wave 4 note A_, 1 rest 1 note F_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note A_, 3 - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 8 + channel_volume 8 note G#, 3 rest 1 ; ;sound_call Branch_fb79e - notetype0 13 + speed 13 octave 3 - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 sound_call Branch_fba68 octave 2 - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 9 + channel_volume 9 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 note D_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 sound_call Branch_fba68 - notetype1 9 + channel_volume 9 octave 3 - notetype0 1 + speed 1 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 9 + channel_volume 9 note D_, 3 - notetype1 9 + channel_volume 9 duty_cycle 1 .Loop4 rest 2 @@ -2005,7 +2005,7 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) sound_call Branch_fba9d rest 2 duty_cycle 1 - notetype1 9 + channel_volume 9 octave 3 note C_, 1 rest 1 @@ -2016,29 +2016,29 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) sound_loop 4, .Loop6 rest 2 duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 3 note F_, 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 - notetype1 7 + channel_volume 7 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 dec_octave - notetype1 9 + channel_volume 9 duty_cycle 1 note C_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note E_, 3 note F_, 10 ;tie @@ -2048,53 +2048,53 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note E_, 4 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 duty_cycle 2 - notetype1 7 + channel_volume 7 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 - notetype1 7 + channel_volume 7 note C#, 3 note D_, 10 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 rest 13 dec_octave - notetype1 8 + channel_volume 8 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 3 rest 1 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 3 note B_, 10 ;tie - notetype0 13 + speed 13 note B_, 4 rest 1 inc_octave note C_, 1 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 8 + channel_volume 8 note E_, 5 rest 1 sound_call Branch_fba9d @@ -2102,237 +2102,237 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) octave 3 note C_, 1 note D_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 rest 1 note F_, 1 rest 1 note G#, 1 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 3 note D#, 10 ;tie - notetype0 13 + speed 13 note D#, 2 dec_octave dec_octave - notetype1 9 + channel_volume 9 note G#, 1 rest 1 inc_octave - notetype1 8 + channel_volume 8 note G#, 1 note A#, 1 dec_octave - notetype1 9 + channel_volume 9 note G#, 1 inc_octave inc_octave - notetype1 8 + channel_volume 8 note C_, 3 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note F#, 3 note G_, 10 inc_octave - notetype0 13 - notetype2 4 + speed 13 + fade_wave 4 note C_, 1 dec_octave note B_, 1 - notetype2 8 + fade_wave 8 note A#, 1 rest 1 sound_call Branch_fbacb octave 3 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note B_, 3 inc_octave note C_, 10 - notetype0 13 + speed 13 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 note C_, 1 dec_octave - notetype2 4 + fade_wave 4 note F_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note D_, 1 rest 1 - notetype2 8 + fade_wave 8 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 2 - notetype2 4 + fade_wave 4 note D_, 1 dec_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note A_, 1 rest 1 - notetype2 8 + fade_wave 8 note B_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note A_, 1 - notetype2 8 + fade_wave 8 note G_, 1 - notetype2 4 + fade_wave 4 note A_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 2 dec_octave - notetype0 1 + speed 1 note B_, 3 inc_octave note C_, 10 dec_octave - notetype0 13 - notetype2 4 + speed 13 + fade_wave 4 note B_, 1 - notetype2 6 + fade_wave 6 note A#, 2 sound_call Branch_fbacb octave 4 note G_, 1 - notetype2 8 + fade_wave 8 note E_, 1 - notetype0 13 + speed 13 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype2 7 + channel_volume 8 + fade_wave 7 note C_, 2 - notetype2 8 + fade_wave 8 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note F_, 1 rest 1 - notetype2 8 + fade_wave 8 note A_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype2 7 + channel_volume 8 + fade_wave 7 note C_, 2 - notetype2 8 + fade_wave 8 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note F_, 1 rest 1 note G#, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 3 rest 1 dec_octave note A_, 1 inc_octave - notetype2 4 + fade_wave 4 note C_, 1 dec_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 3 note B_, 10 rest 13 dec_octave - notetype1 9 + channel_volume 9 note A#, 3 note B_, 10 - notetype1 2 + channel_volume 2 note B_, 13 inc_octave - notetype1 9 + channel_volume 9 note C_, 13 - notetype1 2 + channel_volume 2 note C_, 13 - notetype1 9 - notetype0 13 + channel_volume 9 + speed 13 note D_, 2 - notetype1 2 + channel_volume 2 note D_, 1 sound_call Branch_fbb10 rest 1 @@ -2342,83 +2342,83 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note B_, 1 note A_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note E_, 2 rest 1 note C_, 1 rest 1 dec_octave - notetype2 7 + fade_wave 7 note G_, 1 - notetype2 8 + fade_wave 8 note G_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 rest 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F_, 13 note A_, 6 - notetype1 2 + channel_volume 2 note A_, 7 inc_octave - notetype1 7 + channel_volume 7 note C_, 6 - notetype1 2 + channel_volume 2 note C_, 7 - notetype1 7 + channel_volume 7 note E_, 6 - notetype1 2 + channel_volume 2 note E_, 7 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 7 + channel_volume 7 note D_, 5 - notetype1 2 + channel_volume 2 note D_, 8 - notetype0 13 + speed 13 rest 1 dec_octave dec_octave - notetype1 9 + channel_volume 9 duty_cycle 1 note B_, 1 inc_octave - notetype0 1 + speed 1 note C_, 6 - notetype1 2 + channel_volume 2 note C_, 7 - notetype1 9 + channel_volume 9 note D_, 6 - notetype1 2 + channel_volume 2 note D_, 7 sound_call Branch_fbb10 octave 3 @@ -2427,24 +2427,24 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) rest 1 note G#, 1 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 3 note D#, 10 ;tie - notetype0 13 + speed 13 note D#, 2 dec_octave dec_octave - notetype1 9 + channel_volume 9 note G#, 1 rest 1 - notetype0 1 + speed 1 rest 6 - notetype1 9 + channel_volume 9 note G#, 7 inc_octave note C_, 6 @@ -2453,48 +2453,48 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note A#, 7 ; octave 4 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note C_, 1 ;tie note C_, 2 dec_octave dec_octave - notetype1 9 + channel_volume 9 note G#, 1 rest 2 inc_octave - notetype1 8 + channel_volume 8 note A#, 1 dec_octave - notetype1 9 + channel_volume 9 note G#, 1 inc_octave inc_octave - notetype1 8 + channel_volume 8 note C_, 1 ;tie note C_, 2 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 rest 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note E_, 1 ;tie note E_, 4 dec_octave dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note C_, 6 note F_, 7 note A_, 6 @@ -2506,90 +2506,90 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) dec_octave note B_, 7 inc_octave - notetype0 13 + speed 13 note C_, 8 ;tie note C_, 1 - notetype1 2 + channel_volume 2 note C_, 2 sound_ret Branch_fba68: octave 3 - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 9 + channel_volume 9 note C_, 1 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 rest 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 9 + channel_volume 9 note C_, 1 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 sound_ret Branch_fba9d: octave 4 duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F#, 3 note G_, 10 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 7 + channel_volume 7 note E_, 3 note F_, 10 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 dec_octave - notetype0 13 + speed 13 duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 1 duty_cycle 2 - notetype1 7 + channel_volume 7 note G_, 1 sound_ret Branch_fbacb: octave 3 - notetype2 8 + fade_wave 8 .Loop4 note A#, 1 rest 1 @@ -2597,156 +2597,156 @@ Branch_fbacb: inc_octave note C_, 3 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 8 + channel_volume 8 note A_, 1 inc_octave - notetype2 4 + fade_wave 4 note C_, 1 dec_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 3 note B_, 16 rest 7 note A#, 3 note B_, 10 dec_octave - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note B_, 1 inc_octave - notetype1 8 + channel_volume 8 note B_, 1 rest 1 note A_, 1 dec_octave - notetype1 9 + channel_volume 9 note B_, 1 inc_octave - notetype1 8 + channel_volume 8 note B_, 3 - notetype1 9 + channel_volume 9 note D_, 1 rest 1 - notetype1 8 + channel_volume 8 note B_, 1 inc_octave - notetype2 4 + fade_wave 4 note D_, 1 sound_ret Branch_fbb10: octave 3 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note C_, 1 - notetype2 3 + fade_wave 3 note D_, 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note C_, 1 - notetype1 8 + channel_volume 8 note B_, 2 - notetype2 3 + fade_wave 3 note A_, 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 2 - notetype1 9 + channel_volume 9 note D_, 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 8 - notetype1 7 + channel_volume 7 note F_, 5 note G_, 4 note F_, 4 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note D_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 - notetype1 7 + channel_volume 7 note D_, 13 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 dec_octave - notetype0 13 - notetype1 7 + speed 13 + channel_volume 7 note E_, 4 inc_octave inc_octave - notetype0 1 + speed 1 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 dec_octave - notetype1 7 + channel_volume 7 note B_, 13 inc_octave note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 dec_octave - notetype1 7 + channel_volume 7 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 8 - notetype1 7 + channel_volume 7 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 8 dec_octave dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note B_, 3 inc_octave note C_, 10 - notetype0 13 - notetype2 3 + speed 13 + fade_wave 3 note D_, 1 note E_, 1 - notetype2 8 + fade_wave 8 note F_, 2 sound_ret Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 96 ;cutoff 8 octave 2 @@ -2765,7 +2765,7 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note G_, 7 ; ;sound_call Branch_fbc46 - notetype0 1 + speed 1 octave 3 sound_call Branch_fbd47 sound_call Branch_fbe23 @@ -2812,10 +2812,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) ;cutoff 8 note G_, 13 ;tie - notetype0 13 + speed 13 note G_, 7 rest 1 - notetype0 1 + speed 1 sound_call Branch_fbd47 sound_call Branch_fbd58 sound_call Branch_fbd6b @@ -2859,10 +2859,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 note A_, 6 rest 7 - notetype0 13 + speed 13 note B_, 2 note G_, 1 - notetype0 1 + speed 1 sound_call Branch_fbd47 sound_call Branch_fbd58 sound_call Branch_fbd6b @@ -2962,7 +2962,7 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note B_, 13 ; ;sound_call Branch_fbc46 - notetype0 1 + speed 1 octave 3 sound_call Branch_fbd47 sound_call Branch_fbe23 @@ -3009,10 +3009,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) ;cutoff 8 note G_, 13 ;tie - notetype0 13 + speed 13 note G_, 7 rest 1 - notetype0 1 + speed 1 sound_call Branch_fbd47 sound_call Branch_fbd58 sound_call Branch_fbd6b @@ -3056,10 +3056,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 note A_, 6 rest 7 - notetype0 13 + speed 13 note B_, 2 note G_, 1 - notetype0 1 + speed 1 sound_call Branch_fbd47 sound_call Branch_fbd58 sound_call Branch_fbd6b @@ -3101,7 +3101,7 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note A#, 6 rest 7 ; - notetype0 1 + speed 1 octave 2 .Loop5 note G#, 6 @@ -3152,7 +3152,7 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 note G_, 6 rest 7 - notetype0 13 + speed 13 note C_, 8 ;tie note C_, 1 diff --git a/crysaudio/music/TCG/deckmachine.asm b/crysaudio/music/TCG/deckmachine.asm index 3c4f29f6..cf1ff9b5 100644 --- a/crysaudio/music/TCG/deckmachine.asm +++ b/crysaudio/music/TCG/deckmachine.asm @@ -7,112 +7,112 @@ Music_DeckMachine: Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 3 .MainLoop octave 5 - notetype0 1 + speed 1 .Loop1 - notetype2 6 - notetype1 9 + fade_wave 6 + channel_volume 9 note C_, 7 - notetype1 3 + channel_volume 3 note C_, 8 - notetype1 4 + channel_volume 4 note C_, 8 - notetype1 9 + channel_volume 9 note G_, 7 - notetype1 3 + channel_volume 3 note G_, 8 - notetype1 4 + channel_volume 4 note C_, 7 - notetype1 9 + channel_volume 9 note E_, 7 - notetype1 3 + channel_volume 3 note E_, 8 - notetype1 4 + channel_volume 4 note E_, 8 - notetype1 9 + channel_volume 9 note C_, 7 - notetype1 3 + channel_volume 3 note C_, 8 - notetype1 4 + channel_volume 4 note C_, 7 - notetype1 9 + channel_volume 9 note G_, 7 - notetype1 3 + channel_volume 3 note G_, 8 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 7 - notetype2 5 - notetype1 4 + fade_wave 5 + channel_volume 4 note G_, 8 sound_loop 9, .Loop1 - notetype1 9 + channel_volume 9 note C_, 7 - notetype1 3 + channel_volume 3 note C_, 8 - notetype1 4 + channel_volume 4 note C_, 15 - notetype0 10 + speed 10 rest 9 sound_loop 0, .MainLoop Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 1 - notetype2 7 + fade_wave 7 .MainLoop octave 3 - notetype0 1 + speed 1 .Loop1 rest 15 - notetype1 11 + channel_volume 11 rest 7 note C_, 8 - notetype1 2 + channel_volume 2 note C_, 8 rest 7 - notetype1 11 + channel_volume 11 note C_, 7 - notetype1 2 + channel_volume 2 note C_, 8 rest 7 - notetype1 11 + channel_volume 11 dec_octave note A_, 8 - notetype1 2 + channel_volume 2 note A_, 8 rest 7 inc_octave - notetype1 11 + channel_volume 11 note C_, 7 - notetype1 2 + channel_volume 2 note C_, 8 rest 15 sound_loop 9, .Loop1 - notetype1 11 + channel_volume 11 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 rest 15 - notetype0 10 + speed 10 rest 9 sound_loop 0, .MainLoop Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 96 ;cutoff 8 .MainLoop octave 3 - notetype0 1 + speed 1 .Loop1 note C_, 7 rest 8 @@ -217,9 +217,9 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 note C_, 15 rest 15 - notetype0 10 + speed 10 rest 3 - notetype0 1 + speed 1 rest 7 dec_octave note G_, 15 diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm index 12eab8cf..e9529cd8 100644 --- a/crysaudio/music/TCG/dueltheme1.asm +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -6,11 +6,11 @@ Music_DuelTheme1: channel 4, Music_DuelTheme1_Ch4 Music_DuelTheme1_Ch1: ; f532a (3d:532a) - notetype0 7 + speed 7 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 2 .MainLoop octave 2 @@ -21,129 +21,129 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) .Loop2 rest 3 sound_call Branch_f54f9 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 1 rest 2 inc_octave - notetype1 10 + channel_volume 10 note D_, 10 - notetype1 3 + channel_volume 3 note D_, 12 sound_call Branch_f54f9 - notetype1 10 + channel_volume 10 note F#, 2 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 + channel_volume 10 note A_, 13 - notetype1 3 + channel_volume 3 note A_, 10 - notetype1 10 + channel_volume 10 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 + channel_volume 10 note F#, 1 note G_, 1 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 15 - notetype1 3 + channel_volume 3 note B_, 4 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 3 note A_, 3 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note G_, 2 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 15 - notetype1 3 + channel_volume 3 note A_, 4 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 3 note G_, 4 note F#, 2 - notetype1 3 + channel_volume 3 note F#, 2 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 15 - notetype1 3 + channel_volume 3 note G_, 4 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 3 note F#, 4 note E_, 3 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 4 note E_, 3 ;tie - notetype0 7 + speed 7 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note D_, 13 - notetype1 3 + channel_volume 3 note D_, 9 dec_octave sound_loop 2, .Loop2 inc_octave duty_cycle 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note C#, 4 note D_, 3 ;tie - notetype0 7 + speed 7 note D_, 1 rest 1 note D_, 1 @@ -151,50 +151,50 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note C#, 1 rest 1 sound_call Branch_f5538 - notetype0 1 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note F#, 5 - notetype1 3 + channel_volume 3 note F#, 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 1 inc_octave - notetype0 1 + speed 1 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 10 + channel_volume 10 note F#, 4 - notetype1 3 + channel_volume 3 note F#, 3 - notetype1 10 + channel_volume 10 note A_, 4 - notetype1 3 + channel_volume 3 note A_, 3 - notetype0 7 + speed 7 rest 3 dec_octave duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 .Loop3 note A_, 1 rest 2 sound_loop 3, .Loop3 inc_octave - notetype0 1 + speed 1 note C#, 4 note D_, 3 ;tie - notetype0 7 + speed 7 note D_, 1 rest 1 note D_, 1 @@ -202,52 +202,52 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note C#, 1 rest 1 sound_call Branch_f5538 - notetype0 1 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 5 ;tie note A_, 10 ;tie note A_, 6 - notetype1 3 + channel_volume 3 note A_, 2 inc_octave - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note C#, 4 note D_, 3 ;tie - notetype0 7 + speed 7 note D_, 2 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 - notetype1 10 + channel_volume 10 note A_, 13 ;tie note A_, 6 - notetype1 3 + channel_volume 3 note A_, 2 dec_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note A_, 5 inc_octave note C#, 5 @@ -266,7 +266,7 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note A_, 4 dec_octave sound_call Branch_f5580 - notetype1 10 + channel_volume 10 note A_, 2 ;tie note A_, 8 @@ -275,13 +275,13 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) ;tie note A_, 6 duty_cycle 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 dec_octave note B_, 4 inc_octave note C_, 3 - notetype0 7 + speed 7 note C#, 1 rest 1 note C#, 1 @@ -290,50 +290,50 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note G_, 2 duty_cycle 2 sound_call Branch_f5580 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 5 note G_, 2 note F#, 2 - notetype1 3 + channel_volume 3 note F#, 2 - notetype1 10 + channel_volume 10 note E_, 2 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 5 note F#, 2 note E_, 2 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 + channel_volume 10 note D_, 2 - notetype1 3 + channel_volume 3 note D_, 2 - notetype1 10 + channel_volume 10 note D_, 8 ;tie note D_, 8 note D_, 8 ;tie note D_, 8 - notetype1 3 + channel_volume 3 note D_, 2 - notetype1 10 + channel_volume 10 note D_, 12 - notetype1 3 + channel_volume 3 note D_, 2 - notetype1 10 + channel_volume 10 note D_, 6 ;tie note D_, 8 @@ -342,48 +342,48 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) Branch_f54f9: octave 2 - notetype1 10 + channel_volume 10 note A_, 1 note B_, 1 inc_octave note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 10 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 + channel_volume 10 note D_, 3 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 4 note E_, 3 ;tie - notetype0 7 + speed 7 note E_, 5 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 2 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 2 - notetype1 10 + channel_volume 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 sound_ret @@ -396,26 +396,26 @@ Branch_f5538: note G_, 1 rest 2 duty_cycle 2 - notetype1 10 + channel_volume 10 note G_, 1 inc_octave - notetype0 1 + speed 1 note C_, 4 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 10 + channel_volume 10 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 10 + channel_volume 10 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype0 7 + speed 7 rest 3 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 dec_octave .Loop4 note G_, 1 @@ -423,108 +423,108 @@ Branch_f5538: sound_loop 3, .Loop4 inc_octave duty_cycle 2 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 2 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 sound_ret Branch_f5580: - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note F_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 9 - notetype1 3 + channel_volume 3 note F#, 2 - notetype1 10 + channel_volume 10 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note B_, 2 - notetype1 3 + channel_volume 3 note B_, 2 inc_octave - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 7 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C#, 2 - notetype1 3 + channel_volume 3 note C#, 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 8 - notetype1 3 + channel_volume 3 note B_, 1 - notetype1 10 + channel_volume 10 note A_, 4 note G_, 4 note F#, 10 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note D_, 10 note E_, 2 note F#, 2 - notetype1 3 + channel_volume 3 note F#, 2 sound_ret Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) - notetype0 7 + speed 7 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 .MainLoop duty_cycle 1 - notetype1 9 + channel_volume 9 octave 2 .Loop1 ;rept 3 @@ -552,8 +552,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note D_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 2 sound_call Branch_f59f9 sound_loop 4, .Loop2 @@ -563,8 +563,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 sound_call Branch_f59f9 octave 2 @@ -573,13 +573,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note C_, 2 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -587,13 +587,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 1 rest 2 inc_octave @@ -604,8 +604,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 sound_call Branch_f59f9 sound_loop 3, .Loop3 @@ -615,13 +615,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note C_, 2 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -629,13 +629,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 1 rest 2 inc_octave @@ -644,8 +644,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 sound_call Branch_f59f9 octave 2 @@ -654,24 +654,24 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note F#, 1 rest 1 .Loop4 @@ -679,23 +679,23 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note G_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note G_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 rest 2 sound_loop 2, .Loop4 @@ -703,8 +703,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note F#, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 inc_octave note C#, 2 sound_call Branch_f5a17 @@ -714,66 +714,66 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note F#, 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note E_, 2 sound_call Branch_f5a17 note E_, 1 rest 2 note E_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note B_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note G_, 1 rest 2 note A_, 1 rest 2 note A_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note A_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note A_, 1 rest 2 note D_, 1 rest 2 note D_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -781,13 +781,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 1 rest 2 inc_octave @@ -795,12 +795,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note D_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -808,46 +808,46 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 ;frequency_offset 0 note E_, 1 note F#, 1 note A_, 1 rest 1 - notetype1 7 + channel_volume 7 sound_call Branch_f594d - notetype1 7 + channel_volume 7 octave 3 - notetype0 1 + speed 1 note C#, 4 note D_, 3 ;tie - notetype0 7 + speed 7 note D_, 1 rest 1 dec_octave note F#, 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F#, 2 - notetype1 7 - notetype2 8 + channel_volume 7 + fade_wave 8 note A_, 10 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 inc_octave note D_, 2 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -855,185 +855,185 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note E_, 1 note F#, 1 note A_, 1 rest 1 sound_call Branch_f594d - notetype1 7 + channel_volume 7 octave 3 note D_, 2 rest 1 note F#, 13 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note D_, 1 rest 1 note D_, 1 note E_, 1 note F#, 1 rest 1 - notetype0 1 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 15 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note G_, 1 rest 2 note G_, 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 2 rest 1 note F#, 3 rest 1 dec_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 15 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note F#, 1 rest 2 note F#, 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 2 rest 1 note E_, 3 rest 1 dec_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note D#, 4 note E_, 3 ;tie - notetype0 7 + speed 7 note E_, 15 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note A_, 1 rest 2 note A_, 1 duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 2 rest 1 note A_, 3 rest 1 note G_, 3 rest 1 - notetype0 1 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 1 rest 1 note F#, 13 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 2 note D_, 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 dec_octave ;frequency_offset 0 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 2 sound_call Branch_f59b4 octave 3 - notetype0 1 - notetype1 7 + speed 1 + channel_volume 7 note F_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 1 rest 1 note D_, 5 rest 1 dec_octave note F#, 1 - notetype0 1 + speed 1 note A_, 4 rest 3 inc_octave @@ -1041,28 +1041,28 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 3 note F#, 4 rest 3 - notetype0 7 + speed 7 rest 3 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 .Loop5 note D_, 1 rest 2 sound_loop 3, .Loop5 sound_call Branch_f59b4 - notetype1 8 + channel_volume 8 octave 3 note D_, 16 ;tie note D_, 6 rest 2 - notetype0 1 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 2 note A_, 1 rest 2 @@ -1074,8 +1074,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note C#, 6 rest 2 dec_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note E_, 5 note A_, 5 inc_octave @@ -1095,7 +1095,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note C#, 5 note E_, 4 dec_octave - notetype0 7 + speed 7 sound_call Branch_f598c note D_, 8 ;tie @@ -1103,11 +1103,11 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note C#, 6 dec_octave duty_cycle 1 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note G_, 4 note G#, 3 - notetype0 7 + speed 7 note A_, 1 rest 1 note A_, 1 @@ -1145,54 +1145,54 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) Branch_f594d: octave 3 - notetype0 1 + speed 1 note C#, 4 note D_, 3 ;tie - notetype0 7 + speed 7 note D_, 9 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 dec_octave note A_, 1 rest 1 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note A_, 3 rest 1 inc_octave note C_, 6 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note D#, 4 note E_, 3 ;tie - notetype0 7 + speed 7 note E_, 2 note D_, 1 dec_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 2 inc_octave - notetype1 7 - notetype2 8 + channel_volume 7 + fade_wave 8 note C_, 1 rest 1 sound_ret Branch_f598c: - notetype1 8 + channel_volume 8 note D_, 10 rest 2 note E_, 1 @@ -1234,12 +1234,12 @@ Branch_f598c: Branch_f59b4: octave 2 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 1 rest 1 note A_, 1 @@ -1253,9 +1253,9 @@ Branch_f59b4: note C_, 1 rest 2 duty_cycle 2 - notetype1 7 + channel_volume 7 note E_, 1 - notetype0 1 + speed 1 note G_, 4 rest 3 inc_octave @@ -1263,24 +1263,24 @@ Branch_f59b4: rest 3 note E_, 4 rest 3 - notetype0 7 + speed 7 rest 3 - notetype2 8 + fade_wave 8 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 .Loop6 note C_, 1 rest 2 sound_loop 3, .Loop6 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 2 note F#, 1 rest 1 @@ -1291,8 +1291,8 @@ Branch_f59b4: Branch_f59f9: octave 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -1300,13 +1300,13 @@ Branch_f59f9: rest 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 1 rest 2 sound_ret @@ -1314,29 +1314,29 @@ Branch_f59f9: Branch_f5a17: octave 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note F#, 1 rest 3 note C#, 1 rest 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 rest 2 sound_ret Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype1 1 - notetype2 14 + channel_volume 1 + fade_wave 14 ;echo 96 ;cutoff 8 octave 2 @@ -1439,7 +1439,7 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) sound_loop 3, .Loop3 inc_octave note D_, 1 - notetype0 1 + speed 1 note F#, 4 rest 3 note A_, 4 @@ -1447,7 +1447,7 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) inc_octave note D_, 4 rest 3 - notetype0 7 + speed 7 rest 3 dec_octave dec_octave @@ -1867,7 +1867,7 @@ Branch_f5c7e: sound_loop 3, .Loop9 inc_octave note C_, 1 - notetype0 1 + speed 1 note E_, 4 rest 3 note G_, 4 @@ -1875,7 +1875,7 @@ Branch_f5c7e: inc_octave note C_, 4 rest 3 - notetype0 7 + speed 7 rest 3 dec_octave dec_octave diff --git a/crysaudio/music/TCG/dueltheme2.asm b/crysaudio/music/TCG/dueltheme2.asm index a8493ac3..826f97fe 100644 --- a/crysaudio/music/TCG/dueltheme2.asm +++ b/crysaudio/music/TCG/dueltheme2.asm @@ -6,14 +6,14 @@ Music_DuelTheme2: channel 4, Music_DuelTheme2_Ch4 Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) - notetype0 9 + speed 9 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 1 duty_cycle 1 - notetype1 9 + channel_volume 9 .Loop1 note D_, 2 note D_, 1 @@ -25,10 +25,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 sound_loop 23, .Loop2 duty_cycle 1 - notetype1 10 + channel_volume 10 inc_octave inc_octave - notetype0 1 + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -38,62 +38,62 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note B_, 3 inc_octave note C_, 3 - notetype0 9 + speed 9 sound_call Branch_f5f3d note C_, 6 ;tie - notetype0 1 + speed 1 note C_, 12 - notetype1 3 + channel_volume 3 note C_, 6 - notetype1 10 + channel_volume 10 dec_octave note B_, 12 - notetype1 3 + channel_volume 3 note B_, 6 - notetype1 10 + channel_volume 10 note G_, 12 - notetype1 3 + channel_volume 3 note G_, 6 - notetype0 9 - notetype1 10 - notetype2 8 + speed 9 + channel_volume 10 + fade_wave 8 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 1 - notetype2 8 + fade_wave 8 note D_, 9 ;tie note D_, 9 - notetype1 4 + channel_volume 4 note D_, 3 duty_cycle 2 - notetype2 8 - notetype1 3 + fade_wave 8 + channel_volume 3 note E_, 4 - notetype1 6 + channel_volume 6 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 1 - notetype1 6 + channel_volume 6 note G_, 4 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note G_, 12 - notetype1 2 + channel_volume 2 note G_, 6 inc_octave - notetype0 9 - notetype1 8 - notetype2 8 + speed 9 + channel_volume 8 + fade_wave 8 note C_, 3 duty_cycle 1 - notetype1 10 + channel_volume 10 dec_octave - notetype0 1 + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -103,63 +103,63 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note B_, 3 inc_octave note C_, 3 - notetype0 9 + speed 9 sound_call Branch_f5f3d - notetype2 8 + fade_wave 8 note C_, 4 ;tie - notetype0 1 + speed 1 note C_, 4 note E_, 5 note F_, 4 note F#, 5 note G_, 12 - notetype1 3 + channel_volume 3 note G_, 6 - notetype1 10 + channel_volume 10 note E_, 12 - notetype1 3 + channel_volume 3 note E_, 6 - notetype0 9 - notetype1 10 - notetype2 8 + speed 9 + channel_volume 10 + fade_wave 8 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 + channel_volume 10 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 dec_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 inc_octave - notetype2 8 + fade_wave 8 note D_, 9 ;tie note D_, 10 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 - notetype0 1 - notetype2 8 + channel_volume 10 + speed 1 + fade_wave 8 note D_, 4 note D#, 5 - notetype0 9 + speed 9 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 inc_octave - notetype2 8 + fade_wave 8 note C_, 3 dec_octave - notetype0 1 + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -171,10 +171,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note C_, 3 sound_call Branch_f5f90 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 duty_cycle 1 - notetype1 9 + channel_volume 9 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 - notetype1 7 + channel_volume 7 inc_octave inc_octave note G_, 1 @@ -197,104 +197,104 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 note B_, 1 duty_cycle 1 - notetype1 10 + channel_volume 10 sound_call Branch_f5f62 octave 4 - notetype1 4 + channel_volume 4 note F#, 12 - notetype1 10 + channel_volume 10 note C#, 9 - notetype1 4 + channel_volume 4 note C#, 1 - notetype1 10 + channel_volume 10 note C#, 1 note D_, 1 note E_, 3 note D_, 3 note C#, 3 dec_octave - notetype2 6 + fade_wave 6 note B_, 3 - notetype2 8 + fade_wave 8 note B_, 4 - notetype1 4 + channel_volume 4 note B_, 1 inc_octave - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note C#, 4 dec_octave note B_, 5 - notetype0 9 + speed 9 note A_, 6 - notetype1 4 + channel_volume 4 note A_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 2 note D_, 2 rest 2 note C#, 2 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 sound_call Branch_f5f62 octave 4 - notetype1 4 + channel_volume 4 note F#, 6 dec_octave - notetype1 10 + channel_volume 10 note B_, 2 inc_octave note C#, 2 note D_, 1 - notetype1 4 + channel_volume 4 note D_, 1 - notetype1 10 + channel_volume 10 note D_, 9 - notetype1 4 + channel_volume 4 note D_, 1 - notetype1 10 - notetype2 7 + channel_volume 10 + fade_wave 7 note C#, 1 note D_, 1 - notetype2 8 + fade_wave 8 note E_, 3 note D_, 3 note C#, 3 dec_octave - notetype2 6 + fade_wave 6 note A_, 3 inc_octave - notetype2 8 + fade_wave 8 note F_, 10 - notetype2 7 + fade_wave 7 note E_, 1 note F_, 1 - notetype2 8 + fade_wave 8 note G_, 3 note F_, 3 note E_, 3 - notetype0 1 + speed 1 note C_, 2 ;tie note C_, 16 - notetype1 4 + channel_volume 4 note C_, 9 - notetype0 9 - notetype1 10 - notetype2 8 + speed 9 + channel_volume 10 + fade_wave 8 note A_, 10 - notetype2 7 + fade_wave 7 note G_, 1 note F_, 1 - notetype2 8 + fade_wave 8 note G_, 6 inc_octave note C_, 3 dec_octave - notetype0 1 + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -306,10 +306,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note C_, 3 sound_call Branch_f5f90 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 duty_cycle 1 - notetype1 9 + channel_volume 9 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 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 octave 5 note D_, 1 note C_, 1 @@ -339,42 +339,42 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) ;tie note D_, 12 duty_cycle 1 - notetype1 9 + channel_volume 9 sound_loop 0, .MainLoop Branch_f5f3d: - notetype2 8 + fade_wave 8 note D_, 12 ;tie note D_, 4 ;tie - notetype0 1 + speed 1 note D_, 7 - notetype1 4 + channel_volume 4 note D_, 2 ;tie - notetype0 9 + speed 9 note D_, 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 4 ;tie - notetype0 1 + speed 1 note A_, 7 - notetype1 4 + channel_volume 4 note A_, 2 ;tie - notetype0 9 + speed 9 note A_, 1 inc_octave - notetype1 10 + channel_volume 10 note C_, 12 ;tie sound_ret Branch_f5f62: octave 3 - notetype0 1 + speed 1 note C#, 3 note D_, 4 note E_, 3 @@ -384,16 +384,16 @@ Branch_f5f62: note B_, 3 inc_octave note C#, 3 - notetype0 9 + speed 9 note D_, 2 note C#, 2 dec_octave note A_, 2 note F#, 5 - notetype1 4 + channel_volume 4 note F#, 1 inc_octave - notetype1 10 + channel_volume 10 note D_, 2 note C#, 2 dec_octave @@ -402,25 +402,25 @@ Branch_f5f62: note G_, 2 note A_, 2 note B_, 1 - notetype1 4 + channel_volume 4 note B_, 1 - notetype1 10 + channel_volume 10 inc_octave - notetype2 6 + fade_wave 6 note F#, 1 - notetype2 8 + fade_wave 8 note F#, 9 sound_ret Branch_f5f90: octave 5 - notetype0 9 + speed 9 .Loop5 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 duty_cycle 1 - notetype1 9 + channel_volume 9 octave 1 note D_, 1 ;rept 5 @@ -441,7 +441,7 @@ Branch_f5f90: ;endr note D_, 2 duty_cycle 1 - notetype1 10 + channel_volume 10 octave 5 note C_, 4 sound_loop 3, .Loop5 @@ -449,14 +449,14 @@ Branch_f5f90: Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) - notetype0 9 + speed 9 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 15, 3, 3 - notetype2 8 + fade_wave 8 octave 2 duty_cycle 1 - notetype1 7 + channel_volume 7 ;frequency_offset 5 .Loop1 note D_, 2 @@ -468,7 +468,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note D_, 1 sound_loop 24, .Loop2 duty_cycle 2 - notetype1 7 + channel_volume 7 ;frequency_offset 0 .Loop3 inc_octave @@ -489,17 +489,17 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note C_, 1 note G_, 1 duty_cycle 1 - notetype1 7 + channel_volume 7 dec_octave note D_, 1 rest 1 dec_octave - notetype2 6 + fade_wave 6 note A_, 1 - notetype2 8 + fade_wave 8 note A_, 9 duty_cycle 2 - notetype1 7 + channel_volume 7 .Loop5 note A_, 1 note D_, 1 @@ -507,25 +507,25 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) sound_loop 4, .Loop5 duty_cycle 2 inc_octave - notetype2 8 - notetype1 3 + fade_wave 8 + channel_volume 3 note C_, 4 - notetype1 6 + channel_volume 6 note C_, 7 rest 1 - notetype1 6 + channel_volume 6 note E_, 4 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note E_, 12 rest 6 - notetype0 9 - notetype1 8 + speed 9 + channel_volume 8 note G_, 3 dec_octave duty_cycle 1 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note G_, 3 note A_, 4 note B_, 3 @@ -535,9 +535,9 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note E_, 4 note F_, 3 note G_, 3 - notetype0 9 + speed 9 duty_cycle 2 - notetype1 7 + channel_volume 7 .Loop6 note A_, 1 note D_, 1 @@ -552,42 +552,42 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note G_, 1 note C_, 1 sound_loop 8, .Loop8 - notetype0 1 + speed 1 note G_, 4 duty_cycle 1 - notetype1 7 + channel_volume 7 inc_octave note C_, 5 note D_, 4 note D#, 5 - notetype0 1 + speed 1 note E_, 12 rest 6 note C_, 12 rest 6 - notetype0 9 + speed 9 dec_octave note G_, 1 rest 1 note A_, 1 rest 1 - notetype2 6 + fade_wave 6 note D_, 1 - notetype2 8 + fade_wave 8 note A_, 9 duty_cycle 2 - notetype1 7 + channel_volume 7 .Loop9 note A_, 1 note D_, 1 sound_loop 5, .Loop9 note A_, 1 duty_cycle 1 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note A#, 4 note B_, 5 - notetype0 9 + speed 9 inc_octave note C_, 11 rest 1 @@ -595,7 +595,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) rest 1 note G_, 3 dec_octave - notetype0 1 + speed 1 note G_, 3 note A_, 4 note B_, 3 @@ -609,7 +609,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note A_, 1 rest 1 duty_cycle 1 - notetype1 7 + channel_volume 7 ;frequency_offset 5 dec_octave dec_octave @@ -619,7 +619,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note D_, 1 sound_loop 3, .Loop10 duty_cycle 2 - notetype1 7 + channel_volume 7 ;frequency_offset 0 inc_octave note E_, 1 @@ -638,7 +638,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave note C#, 1 duty_cycle 2 - notetype1 7 + channel_volume 7 sound_call Branch_f6173 octave 4 .Loop11 @@ -666,21 +666,21 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave sound_loop 2, .Loop12 duty_cycle 1 - notetype1 9 + channel_volume 9 octave 2 rest 1 - notetype2 8 + fade_wave 8 note B_, 2 note B_, 2 rest 2 note A_, 2 inc_octave - notetype2 8 + fade_wave 8 note C#, 1 note D_, 1 note E_, 1 duty_cycle 2 - notetype1 7 + channel_volume 7 sound_call Branch_f6173 octave 3 .Loop13 @@ -768,9 +768,9 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave note C_, 1 duty_cycle 1 - notetype1 7 + channel_volume 7 dec_octave - notetype0 1 + speed 1 note G_, 3 note A_, 4 note B_, 3 @@ -784,7 +784,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note A_, 1 rest 1 duty_cycle 1 - notetype1 7 + channel_volume 7 ;frequency_offset 5 dec_octave dec_octave @@ -795,7 +795,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) sound_loop 3, .Loop17 rest 12 duty_cycle 1 - notetype1 7 + channel_volume 7 ;frequency_offset 0 inc_octave note A_, 12 @@ -803,7 +803,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note A_, 12 dec_octave duty_cycle 1 - notetype1 7 + channel_volume 7 ;frequency_offset 5 sound_loop 0, .MainLoop @@ -837,11 +837,11 @@ Branch_f6173: Branch_f618f: octave 4 - notetype0 9 + speed 9 .Loop20 note A_, 1 rest 1 - notetype1 7 + channel_volume 7 ;frequency_offset 5 dec_octave dec_octave @@ -863,7 +863,7 @@ Branch_f618f: note D_, 1 ;endr note D_, 2 - notetype1 7 + channel_volume 7 ;frequency_offset 0 inc_octave inc_octave @@ -873,10 +873,10 @@ Branch_f618f: Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) - notetype0 9 + speed 9 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 64 ;cutoff 7 octave 2 diff --git a/crysaudio/music/TCG/dueltheme3.asm b/crysaudio/music/TCG/dueltheme3.asm index f8b2974b..283c8ce6 100644 --- a/crysaudio/music/TCG/dueltheme3.asm +++ b/crysaudio/music/TCG/dueltheme3.asm @@ -6,102 +6,102 @@ Music_DuelTheme3: channel 4, Music_DuelTheme3_Ch4 Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) - notetype0 11 + speed 11 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 .MainLoop octave 2 duty_cycle 0 .Loop1 ;rept 4 - notetype1 9 + channel_volume 9 note F#, 2 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 2 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 2 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 2 rest 1 ;endr - notetype1 9 + channel_volume 9 note E_, 2 - notetype1 9 + channel_volume 9 note F_, 2 sound_loop 4, .Loop1 .Loop2 sound_call Branch_f67b2 sound_loop 4, .Loop2 duty_cycle 1 - notetype1 10 + channel_volume 10 .Loop3 octave 3 note C#, 1 note F#, 1 - notetype0 1 + speed 1 note G#, 5 - notetype1 3 + channel_volume 3 note G#, 6 sound_call Branch_f65a7 octave 3 note D_, 1 note F#, 1 - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 sound_call Branch_f65a7 sound_loop 2, .Loop3 duty_cycle 0 - notetype1 10 + channel_volume 10 dec_octave rest 2 - notetype0 1 + speed 1 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 6 sound_call Branch_f65cf note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype0 11 + speed 11 rest 1 dec_octave duty_cycle 0 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 6 sound_call Branch_f65cf - notetype0 11 + speed 11 duty_cycle 1 - notetype1 10 + channel_volume 10 .Loop4 octave 3 note C#, 1 note F#, 1 - notetype0 1 + speed 1 note G#, 5 - notetype1 3 + channel_volume 3 note G#, 6 sound_call Branch_f65a7 octave 3 note D_, 1 note F#, 1 - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 - notetype1 10 + channel_volume 10 sound_call Branch_f65a7 sound_loop 2, .Loop4 vibrato 10, 3, 3 @@ -109,380 +109,380 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) .Loop5 octave 2 rest 4 - notetype1 9 + channel_volume 9 note F#, 2 - notetype1 2 + channel_volume 2 note F#, 2 rest 2 - notetype1 9 + channel_volume 9 note E_, 2 - notetype1 2 + channel_volume 2 note E_, 4 - notetype1 9 + channel_volume 9 note D#, 2 - notetype1 2 + channel_volume 2 note D#, 4 - notetype1 9 + channel_volume 9 note D_, 2 note C#, 2 sound_loop 2, .Loop5 vibrato 20, 3, 3 duty_cycle 2 - notetype2 6 + fade_wave 6 .Loop6 sound_call Branch_f661d sound_loop 4, .Loop6 octave 4 - notetype1 7 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 .Loop7 sound_call Branch_f661d sound_loop 3, .Loop7 octave 4 - notetype1 7 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 inc_octave - notetype1 7 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 dec_octave - notetype0 11 + speed 11 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 2 note C#, 2 dec_octave note F#, 3 inc_octave - notetype0 1 + speed 1 note D_, 3 note D#, 2 note E_, 3 note F_, 3 - notetype0 11 + speed 11 note F#, 4 dec_octave note G#, 3 inc_octave - notetype0 1 + speed 1 note E_, 3 note F_, 2 note F#, 3 note G_, 3 - notetype0 11 + speed 11 note G#, 4 duty_cycle 0 octave 2 .Loop8 ;rept 4 - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 ;rept 4 - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 sound_loop 2, .Loop8 duty_cycle 1 - notetype1 10 + channel_volume 10 octave 3 note C#, 1 note F#, 1 - notetype0 1 + speed 1 note G#, 5 - notetype1 3 + channel_volume 3 note G#, 6 sound_call Branch_f65a7 octave 3 note C#, 1 note F#, 1 - notetype0 1 + speed 1 note G#, 5 - notetype1 3 + channel_volume 3 note G#, 6 inc_octave - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note C#, 9 - notetype1 3 + channel_volume 3 note C#, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 1 inc_octave note C#, 1 note F#, 1 note C#, 1 dec_octave - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 - notetype0 11 - notetype1 10 + speed 11 + channel_volume 10 note F#, 9 - notetype1 3 + channel_volume 3 note F#, 4 - notetype1 10 + channel_volume 10 note G#, 1 note A_, 1 - notetype0 1 + speed 1 note G#, 5 - notetype1 3 + channel_volume 3 note G#, 6 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note B_, 8 - notetype1 3 + channel_volume 3 note B_, 1 - notetype1 10 + channel_volume 10 note A_, 2 note B_, 1 ;tie - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 - notetype0 11 + speed 11 inc_octave - notetype1 10 + channel_volume 10 note C#, 1 note D_, 1 - notetype0 1 + speed 1 note C#, 5 - notetype1 3 + channel_volume 3 note C#, 6 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note D_, 1 - notetype0 1 + speed 1 note C#, 8 - notetype1 3 + channel_volume 3 note C#, 3 dec_octave - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note B_, 1 inc_octave note C#, 1 dec_octave - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 - notetype0 11 - notetype1 10 + speed 11 + channel_volume 10 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 2 + channel_volume 2 note A_, 3 - notetype1 6 + channel_volume 6 note A_, 5 inc_octave - notetype1 4 + channel_volume 4 note E_, 3 - notetype1 8 + channel_volume 8 note E_, 3 - notetype1 10 + channel_volume 10 note E_, 2 duty_cycle 1 .Loop9 ;rept 4 - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 ;rept 4 - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 sound_loop 4, .Loop9 sound_loop 0, .MainLoop Branch_f65a7: - notetype0 11 + speed 11 octave 4 - notetype1 10 + channel_volume 10 note C#, 5 ;tie note C#, 4 - notetype1 3 + channel_volume 3 note C#, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 1 inc_octave note C#, 1 note F#, 1 note C#, 1 dec_octave - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 - notetype0 11 - notetype1 10 + speed 11 + channel_volume 10 inc_octave note C#, 5 ;tie note C#, 4 - notetype1 3 + channel_volume 3 note C#, 4 - notetype1 10 + channel_volume 10 sound_ret Branch_f65cf: octave 3 .Loop10 - notetype0 11 + speed 11 rest 2 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 6 sound_loop 3, .Loop10 duty_cycle 2 - notetype1 8 + channel_volume 8 note D_, 5 note G_, 6 note B_, 5 @@ -495,29 +495,29 @@ Branch_f65cf: note D_, 5 note G_, 6 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 duty_cycle 0 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 dec_octave - notetype0 1 + speed 1 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 6 .Loop11 - notetype0 11 + speed 11 rest 2 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 6 sound_loop 3, .Loop11 dec_octave duty_cycle 2 - notetype1 8 + channel_volume 8 note B_, 5 inc_octave note E_, 6 @@ -532,78 +532,78 @@ Branch_f65cf: Branch_f661d: octave 4 - notetype0 1 - notetype1 7 + speed 1 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 inc_octave - notetype1 7 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 inc_octave - notetype1 7 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 sound_ret Music_DuelTheme3_Ch2: ; f6649 (3d:6649) - notetype0 11 + speed 11 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 .MainLoop octave 2 duty_cycle 0 ;frequency_offset 3 .Loop1 ;rept 4 - notetype1 8 + channel_volume 8 note F#, 2 rest 1 ;--- - notetype1 8 + channel_volume 8 note F#, 2 rest 1 ;--- - notetype1 8 + channel_volume 8 note F#, 2 rest 1 ;--- - notetype1 8 + channel_volume 8 note F#, 2 rest 1 ;endr - notetype1 8 + channel_volume 8 note E_, 2 - notetype1 8 + channel_volume 8 note F_, 2 sound_loop 4, .Loop1 ;frequency_offset 0 octave 3 .Loop2 rest 6 - notetype1 10 + channel_volume 10 note E_, 1 - notetype1 2 + channel_volume 2 note E_, 1 rest 8 sound_loop 4, .Loop2 @@ -620,36 +620,36 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) ;endr sound_loop 2, .Loop3 octave 2 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 - notetype0 1 + speed 1 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 sound_call Branch_f6866 octave 4 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave dec_octave duty_cycle 0 - notetype1 10 + channel_volume 10 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 sound_call Branch_f6866 duty_cycle 0 - notetype1 9 + channel_volume 9 .Loop4 ;rept 2 sound_call Branch_f67b2 @@ -664,378 +664,378 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) sound_loop 2, .Loop4 vibrato 10, 3, 3 .Loop5 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F#, 1 note F#, 1 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 - notetype2 6 - notetype0 11 + channel_volume 10 + fade_wave 6 + speed 11 note F#, 1 inc_octave - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note C#, 2 dec_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F#, 1 note F#, 1 - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 - notetype2 6 - notetype0 11 + channel_volume 10 + fade_wave 6 + speed 11 note F#, 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F#, 1 note F#, 1 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 - notetype2 6 - notetype0 11 + channel_volume 10 + fade_wave 6 + speed 11 note F#, 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F#, 1 note F#, 1 - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 - notetype2 6 - notetype0 11 + channel_volume 10 + fade_wave 6 + speed 11 note F#, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note A_, 2 note G#, 2 sound_loop 4, .Loop5 vibrato 20, 3, 3 note D_, 3 - notetype0 1 + speed 1 note A#, 3 note B_, 2 inc_octave note C_, 3 note C#, 3 - notetype0 11 + speed 11 note D_, 4 dec_octave note E_, 3 inc_octave - notetype0 1 + speed 1 note C_, 3 note C#, 2 note D_, 3 note D#, 3 - notetype0 11 + speed 11 note E_, 4 octave 3 .Loop6 ;rept 4 - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 ;rept 4 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 sound_loop 6, .Loop6 duty_cycle 1 inc_octave .Loop7 ;rept 4 - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 ;endr - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 ;rept 4 - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;endr - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 sound_loop 4, .Loop7 sound_loop 0, .MainLoop Branch_f67b2: octave 2 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 - notetype0 1 + speed 1 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 - notetype1 10 + channel_volume 10 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 - notetype0 1 + speed 1 note F#, 5 - notetype1 3 + channel_volume 3 note F#, 6 inc_octave - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note C_, 1 dec_octave - notetype0 1 + speed 1 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 6 - notetype0 11 + speed 11 rest 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 - notetype0 11 + speed 11 rest 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 6 - notetype1 10 + channel_volume 10 note A_, 4 note B_, 4 note A_, 3 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype0 11 - notetype1 9 + speed 11 + channel_volume 9 note E_, 1 - notetype1 10 + channel_volume 10 note F_, 1 sound_ret Branch_f680a: octave 2 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 - notetype0 1 + speed 1 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 6 - notetype1 10 + channel_volume 10 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 6 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 6 - notetype0 11 + speed 11 rest 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 6 inc_octave - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note C#, 1 - notetype0 1 + speed 1 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 6 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 dec_octave - notetype0 1 + speed 1 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 6 - notetype0 11 + speed 11 rest 1 inc_octave - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave - notetype1 10 + channel_volume 10 note B_, 4 inc_octave note C#, 4 dec_octave note B_, 3 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 6 - notetype0 11 - notetype1 9 + speed 11 + channel_volume 9 note B_, 1 - notetype1 10 + channel_volume 10 note G_, 1 sound_ret Branch_f6866: octave 2 .Loop8 - notetype0 11 + speed 11 rest 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 sound_loop 3, .Loop8 duty_cycle 2 - notetype1 7 + channel_volume 7 note B_, 5 inc_octave note D_, 6 @@ -1047,34 +1047,34 @@ Branch_f6866: inc_octave note D_, 6 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave dec_octave duty_cycle 0 - notetype1 10 + channel_volume 10 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 .Loop9 - notetype0 11 + speed 11 rest 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 sound_loop 3, .Loop9 duty_cycle 2 - notetype1 7 + channel_volume 7 note G_, 5 note B_, 6 inc_octave @@ -1091,10 +1091,10 @@ Branch_f6866: Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) - notetype0 11 + speed 11 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 96 ;vibrato_type 8 vibrato 0, 3, 3 @@ -1171,7 +1171,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) octave 2 .Loop6 sound_call Branch_f69f0 - notetype0 11 + speed 11 octave 4 ;cutoff 8 note D_, 2 @@ -1186,23 +1186,23 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) note E_, 2 vibrato 0, 3, 3 note D_, 3 - notetype0 1 + speed 1 note A#, 3 note B_, 2 inc_octave note C_, 3 note C#, 3 - notetype0 11 + speed 11 note D_, 4 dec_octave note E_, 3 inc_octave - notetype0 1 + speed 1 note C_, 3 note C#, 2 note D_, 3 note D#, 3 - notetype0 11 + speed 11 note E_, 4 dec_octave .Loop7 diff --git a/crysaudio/music/TCG/hallofhonor.asm b/crysaudio/music/TCG/hallofhonor.asm index e8535181..82a3f802 100644 --- a/crysaudio/music/TCG/hallofhonor.asm +++ b/crysaudio/music/TCG/hallofhonor.asm @@ -5,9 +5,9 @@ Music_HallOfHonor: channel 3, Music_HallOfHonor_Ch3 Music_HallOfHonor_Ch1: ; fafea (3e:6fea) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 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 - notetype1 5 + channel_volume 5 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 sound_call Branch_fb044 .Loop3 - notetype1 5 + channel_volume 5 note C_, 1 - notetype1 2 + channel_volume 2 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 - notetype1 6 + channel_volume 6 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 - notetype1 6 + channel_volume 6 note F_, 1 - notetype1 2 + channel_volume 2 note F_, 1 - notetype1 6 + channel_volume 6 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 - notetype1 6 + channel_volume 6 note F_, 1 - notetype1 2 + channel_volume 2 note F_, 1 inc_octave - notetype1 6 + channel_volume 6 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 dec_octave - notetype1 6 + channel_volume 6 note F_, 1 - notetype1 2 + channel_volume 2 note F_, 1 - notetype1 6 + channel_volume 6 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 sound_ret Branch_fb044: octave 4 - notetype1 5 + channel_volume 5 note F_, 1 - notetype1 2 + channel_volume 2 note C_, 1 - notetype1 5 + channel_volume 5 note G_, 1 - notetype1 2 + channel_volume 2 note F_, 1 - notetype1 5 + channel_volume 5 note F_, 1 - notetype1 2 + channel_volume 2 note G_, 1 inc_octave - notetype1 5 + channel_volume 5 note C_, 1 dec_octave - notetype1 2 + channel_volume 2 note F_, 1 - notetype1 5 + channel_volume 5 note F_, 1 inc_octave - notetype1 2 + channel_volume 2 note C_, 1 dec_octave - notetype1 5 + channel_volume 5 note G_, 1 - notetype1 2 + channel_volume 2 note F_, 1 sound_ret Music_HallOfHonor_Ch2: ; fb06e (3e:706e) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 ;frequency_offset -1 rest 2 - notetype0 1 + speed 1 rest 4 - notetype0 7 - notetype1 1 + speed 7 + channel_volume 1 .Loop1 sound_call Branch_fb1ec sound_loop 3, .Loop1 @@ -126,9 +126,9 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) rest 1 dec_octave note F_, 1 - notetype0 1 + speed 1 rest 3 - notetype0 7 + speed 7 ;frequency_offset 0 .MainLoop octave 1 @@ -136,18 +136,18 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) .Loop2 sound_call Branch_fb0bb octave 1 - notetype1 7 + channel_volume 7 note E_, 5 - notetype1 13 + channel_volume 13 note E_, 11 ;tie note E_, 12 sound_loop 3, .Loop2 sound_call Branch_fb0bb octave 1 - notetype1 7 + channel_volume 7 note G_, 5 - notetype1 13 + channel_volume 13 note G_, 11 ;tie note G_, 12 @@ -155,21 +155,21 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) Branch_fb0bb: octave 1 - notetype1 7 + channel_volume 7 note F_, 5 - notetype1 13 + channel_volume 13 note F_, 11 ;tie note F_, 12 - notetype1 7 + channel_volume 7 note E_, 5 - notetype1 13 + channel_volume 13 note E_, 11 ;tie note E_, 12 - notetype1 7 + channel_volume 7 note D_, 5 - notetype1 13 + channel_volume 13 note D_, 11 ;tie note D_, 12 @@ -177,16 +177,16 @@ Branch_fb0bb: Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) - notetype0 7 - notetype1 2 + speed 7 + channel_volume 2 ;stereo_panning 1, 1 - notetype2 12 + fade_wave 12 ;vibrato_type 4 vibrato 35, 2, 4 ;cutoff 6 ;echo 64 rest 3 - notetype1 3 + channel_volume 3 ;cutoff 8 ;frequency_offset -1 .Loop1 @@ -210,16 +210,16 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) rest 1 dec_octave note F_, 1 - notetype1 1 + channel_volume 1 ;frequency_offset 0 octave 5 - notetype0 1 + speed 1 ;cutoff 6 note B_, 3 inc_octave note C_, 4 ;tie - notetype0 7 + speed 7 note C_, 15 ;tie note C_, 8 @@ -233,14 +233,14 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 10 ;tie note C_, 12 - notetype0 1 + speed 1 ;cutoff 8 note B_, 3 inc_octave ;cutoff 6 note C_, 4 ;tie - notetype0 7 + speed 7 note C_, 15 ;tie note C_, 6 @@ -252,13 +252,13 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) ;cutoff 4 note D_, 2 dec_octave - notetype0 1 + speed 1 ;cutoff 8 note F#, 3 ;cutoff 6 note G_, 4 ;tie - notetype0 7 + speed 7 note G_, 15 ;tie note G_, 6 @@ -267,13 +267,13 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note A_, 2 ;cutoff 4 note B_, 2 - notetype0 1 + speed 1 ;cutoff 8 note B_, 3 inc_octave note C_, 4 ;tie - notetype0 7 + speed 7 note C_, 15 ;tie note C_, 8 @@ -284,13 +284,13 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) ;cutoff 6 note G_, 6 ;cutoff 8 - notetype0 1 + speed 1 note B_, 3 inc_octave ;cutoff 6 note C_, 4 ;tie - notetype0 7 + speed 7 note C_, 9 ;tie note C_, 6 @@ -301,12 +301,12 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 2 ;cutoff 4 note E_, 2 - notetype0 1 + speed 1 ;cutoff 8 note E_, 3 note F_, 4 ;tie - notetype0 7 + speed 7 note F_, 1 note E_, 2 ;cutoff 4 @@ -317,12 +317,12 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 10 ;cutoff 4 note E_, 2 - notetype0 1 + speed 1 ;cutoff 8 note E_, 3 note F_, 4 ;tie - notetype0 7 + speed 7 note F_, 1 note E_, 2 ;cutoff 4 @@ -331,13 +331,13 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 10 ;tie note C_, 12 - notetype0 1 + speed 1 ;cutoff 8 note F#, 3 ;cutoff 7 note G_, 4 ;tie - notetype0 7 + speed 7 note G_, 15 ;tie note G_, 8 @@ -377,7 +377,7 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) ;tie note C_, 12 rest 3 - notetype1 3 + channel_volume 3 ;frequency_offset -1 ;cutoff 8 sound_loop 0, .MainLoop diff --git a/crysaudio/music/TCG/imakuni.asm b/crysaudio/music/TCG/imakuni.asm index 255e4f59..0b2886a5 100644 --- a/crysaudio/music/TCG/imakuni.asm +++ b/crysaudio/music/TCG/imakuni.asm @@ -6,13 +6,13 @@ Music_Imakuni: channel 4, Music_Imakuni_Ch4 Music_Imakuni_Ch1: ; fad55 (3e:6d55) - notetype0 3 + speed 3 ;stereo_panning 1, 1 ;vibrato_type 5 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 2 - notetype1 10 + channel_volume 10 .MainLoop .Loop1 rest 10 @@ -25,17 +25,17 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) rest 8 note G_, 7 rest 8 - notetype0 9 + speed 9 note F_, 10 ;tie - notetype0 1 + speed 1 note F_, 7 rest 8 - notetype0 9 + speed 9 rest 10 sound_call Branch_fadf9 sound_call Branch_fae1d - notetype0 1 + speed 1 octave 4 note E_, 7 rest 15 @@ -47,9 +47,9 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note G#, 15 note A_, 7 rest 8 - notetype0 3 + speed 3 rest 15 - notetype0 1 + speed 1 rest 15 rest 15 inc_octave @@ -73,14 +73,14 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) dec_octave note G#, 7 rest 8 - notetype0 7 + speed 7 note F#, 15 - notetype0 9 + speed 9 rest 10 sound_call Branch_fadf9 sound_call Branch_fae1d dec_octave - notetype0 1 + speed 1 note F_, 7 rest 8 note B_, 7 @@ -97,9 +97,9 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) dec_octave note G#, 7 note A_, 8 - notetype0 3 + speed 3 note F_, 10 - notetype0 1 + speed 1 note D#, 7 rest 8 note A_, 7 @@ -112,9 +112,9 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note A#, 8 note F#, 7 note G_, 8 - notetype0 3 + speed 3 note D#, 10 - notetype0 1 + speed 1 .Loop2 note D_, 7 dec_octave @@ -131,13 +131,13 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note D_, 7 note A_, 8 vibrato 5, 3, 3 - notetype0 3 + speed 3 note D_, 10 vibrato 20, 3, 3 sound_loop 0, .MainLoop Branch_fadf9: - notetype0 1 + speed 1 octave 4 note C#, 7 rest 15 @@ -150,9 +150,9 @@ Branch_fadf9: inc_octave note D_, 7 rest 8 - notetype0 5 + speed 5 rest 9 - notetype0 1 + speed 1 rest 15 rest 15 note D_, 7 @@ -181,13 +181,13 @@ Branch_fae1d: inc_octave note G_, 7 rest 8 - notetype0 9 + speed 9 note F_, 10 ;tie - notetype0 1 + speed 1 note F_, 7 rest 8 - notetype0 9 + speed 9 rest 10 sound_ret @@ -196,36 +196,36 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) ;stereo_panning 1, 1 ;vibrato_type 0 vibrato 0, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 1 - notetype1 10 + channel_volume 10 .Loop1 sound_call Branch_faea5 sound_loop 6, .Loop1 .Loop2 ;rept 2 - notetype0 3 + speed 3 rest 10 - notetype0 1 + speed 1 note C_, 7 rest 8 ;--- - notetype0 3 + speed 3 rest 10 - notetype0 1 + speed 1 note C_, 7 rest 8 ;endr rest 15 note C_, 7 rest 8 - notetype0 3 + speed 3 rest 10 - notetype0 1 + speed 1 note C_, 7 rest 8 rest 15 - notetype0 3 + speed 3 rest 10 vibrato 8, 3, 3 note C_, 10 @@ -234,7 +234,7 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) .Loop3 sound_call Branch_faea5 sound_loop 2, .Loop3 - notetype0 1 + speed 1 octave 2 note F_, 15 ;tie @@ -248,9 +248,9 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) note A_, 8 note F_, 7 note D#, 8 - notetype0 3 + speed 3 rest 10 - notetype0 1 + speed 1 dec_octave note D#, 15 ;tie @@ -264,9 +264,9 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) note G_, 8 note D#, 7 note C#, 8 - notetype0 3 + speed 3 rest 10 - notetype0 1 + speed 1 .Loop4 note D_, 7 rest 8 @@ -289,9 +289,9 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) Branch_faea5: octave 3 - notetype0 6 + speed 6 rest 10 - notetype0 1 + speed 1 ;rept 2 rest 15 note C#, 7 @@ -302,9 +302,9 @@ Branch_faea5: rest 8 ;endr vibrato 8, 3, 3 - notetype0 9 + speed 9 rest 10 - notetype0 3 + speed 3 note C#, 10 vibrato 0, 3, 3 sound_ret @@ -312,8 +312,8 @@ Branch_faea5: Music_Imakuni_Ch3: ; faebc (3e:6ebc) ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;vibrato_type 6 vibrato 0, 3, 3 ;echo 0 @@ -321,7 +321,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) .MainLoop sound_call Branch_faf7d vibrato 8, 3, 3 - notetype0 1 + speed 1 note D_, 15 ;tie note D_, 7 @@ -344,34 +344,34 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) sound_loop 4, .Loop1 .Loop2 octave 3 - notetype0 3 + speed 3 note C_, 5 rest 5 inc_octave - notetype0 1 + speed 1 note E_, 7 rest 8 dec_octave - notetype0 3 + speed 3 note G#, 5 note A_, 5 inc_octave - notetype0 1 + speed 1 note D#, 7 rest 8 rest 15 note D#, 7 rest 8 - notetype0 3 + speed 3 rest 5 dec_octave note C_, 5 inc_octave - notetype0 1 + speed 1 note E_, 7 rest 8 dec_octave - notetype0 3 + speed 3 note G#, 5 note A_, 5 rest 5 @@ -386,7 +386,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) note D_, 10 vibrato 0, 3, 3 sound_loop 2, .Loop3 - notetype0 1 + speed 1 octave 2 note F_, 15 ;tie @@ -402,10 +402,10 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) note F_, 7 note D#, 8 vibrato 5, 3, 3 - notetype0 3 + speed 3 note F_, 10 vibrato 0, 3, 3 - notetype0 1 + speed 1 dec_octave note D#, 15 ;tie @@ -421,10 +421,10 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) note D#, 7 note C#, 8 vibrato 5, 3, 3 - notetype0 3 + speed 3 note D#, 10 vibrato 0, 3, 3 - notetype0 1 + speed 1 .Loop4 octave 4 note C_, 7 @@ -453,37 +453,37 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) note G_, 2 dec_octave note G_, 3 - notetype0 8 + speed 8 sound_loop 0, .MainLoop Branch_faf7d: - notetype0 3 + speed 3 octave 2 note G_, 5 rest 5 inc_octave - notetype0 1 + speed 1 note G_, 7 rest 8 - notetype0 3 + speed 3 note C#, 5 note D_, 5 inc_octave - notetype0 1 + speed 1 note D_, 7 rest 8 rest 15 note D_, 7 rest 8 - notetype0 3 + speed 3 rest 5 octave 2 note G_, 5 inc_octave - notetype0 1 + speed 1 note G_, 7 rest 8 - notetype0 3 + speed 3 note C#, 5 note D_, 5 rest 5 diff --git a/crysaudio/music/TCG/matchdraw.asm b/crysaudio/music/TCG/matchdraw.asm index 1c1222ad..64beceaf 100644 --- a/crysaudio/music/TCG/matchdraw.asm +++ b/crysaudio/music/TCG/matchdraw.asm @@ -5,12 +5,12 @@ Music_MatchDraw: channel 3, Music_MatchDraw_Ch3 Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) - notetype0 3 + speed 3 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 4 duty_cycle 1 - notetype1 11 + channel_volume 11 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 - notetype1 2 + channel_volume 2 note B_, 2 - notetype1 11 + channel_volume 11 note F#, 4 note G_, 2 - notetype1 2 + channel_volume 2 note G_, 2 - notetype1 11 + channel_volume 11 note C_, 2 - notetype1 2 + channel_volume 2 note C_, 4 inc_octave - notetype1 11 + channel_volume 11 note E_, 1 note G_, 1 inc_octave note C_, 2 - notetype1 2 + channel_volume 2 note C_, 2 sound_ret Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) - notetype0 3 + speed 3 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 1 - notetype1 11 + channel_volume 11 rest 16 note C_, 4 dec_octave @@ -69,32 +69,32 @@ Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) note F#, 2 note F_, 4 note F#, 2 - notetype1 2 + channel_volume 2 note F#, 2 - notetype1 11 + channel_volume 11 note C#, 4 note D_, 2 - notetype1 2 + channel_volume 2 note D_, 2 dec_octave - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 2 + channel_volume 2 note G_, 6 inc_octave inc_octave - notetype1 11 + channel_volume 11 note E_, 2 - notetype1 2 + channel_volume 2 note E_, 2 sound_ret Music_MatchDraw_Ch3: ; f7d47 (3d:7d47) - notetype0 6 + speed 6 ;stereo_panning 1, 1 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;cutoff 8 ;echo 0 octave 2 diff --git a/crysaudio/music/TCG/matchloss.asm b/crysaudio/music/TCG/matchloss.asm index cbce6207..f9621ff4 100644 --- a/crysaudio/music/TCG/matchloss.asm +++ b/crysaudio/music/TCG/matchloss.asm @@ -8,64 +8,64 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 4 duty_cycle 2 - notetype1 11 - notetype0 1 + channel_volume 11 + speed 1 note E_, 3 note F_, 2 ;tie - notetype0 5 + speed 5 note F_, 3 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 10 + channel_volume 10 note A#, 1 - notetype1 3 + channel_volume 3 note A#, 3 inc_octave - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note D_, 3 note D#, 2 ;tie note D#, 16 dec_octave note A#, 6 - notetype1 3 + channel_volume 3 note A#, 16 - notetype1 10 + channel_volume 10 note G#, 6 - notetype1 3 + channel_volume 3 note G#, 16 inc_octave - notetype1 10 + channel_volume 10 note C_, 3 note C#, 8 ;tie note C#, 12 dec_octave - notetype0 6 + speed 6 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 3 - notetype1 10 + channel_volume 10 note F#, 1 - notetype0 7 - notetype1 3 + speed 7 + channel_volume 3 note F#, 3 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note B_, 5 inc_octave note C_, 4 ;tie - notetype0 9 + speed 9 note C_, 11 - notetype1 3 + channel_volume 3 note C_, 2 sound_ret @@ -74,34 +74,34 @@ Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) ;stereo_panning 1, 1 ;vibrato_type 5 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 2 - notetype1 9 - notetype0 9 + channel_volume 9 + speed 9 rest 9 - notetype0 11 + speed 11 rest 5 - notetype0 1 + speed 1 rest 8 - notetype0 9 + speed 9 rest 6 note G_, 6 ;tie note G_, 6 - notetype1 3 + channel_volume 3 note G_, 2 sound_ret Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) ;stereo_panning 1, 1 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;cutoff 8 ;echo 64 octave 2 - notetype0 5 + speed 5 note A#, 4 inc_octave ;cutoff 4 @@ -109,27 +109,27 @@ Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) note A#, 4 dec_octave ;cutoff 8 - notetype0 7 + speed 7 note G#, 3 inc_octave ;cutoff 4 - notetype0 2 + speed 2 note D#, 11 note G#, 11 dec_octave ;cutoff 8 - notetype0 1 + speed 1 note F#, 11 ;tie note F#, 12 inc_octave ;cutoff 4 - notetype0 12 + speed 12 note C#, 2 - notetype0 2 + speed 2 note F#, 13 dec_octave - notetype0 9 + speed 9 ;cutoff 8 note F_, 12 sound_ret diff --git a/crysaudio/music/TCG/matchstart1.asm b/crysaudio/music/TCG/matchstart1.asm index 2be4cd86..0248bbb8 100644 --- a/crysaudio/music/TCG/matchstart1.asm +++ b/crysaudio/music/TCG/matchstart1.asm @@ -3,12 +3,12 @@ Music_MatchStart1: channel 1, Music_MatchStart1_Ch1 Music_MatchStart1_Ch1: ; f7919 (3d:7919) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 .Loop1 duty_cycle 2 - notetype1 15 + channel_volume 15 octave 3 note C_, 1 inc_octave @@ -44,12 +44,12 @@ Music_MatchStart1_Ch1: ; f7919 (3d:7919) note A_, 1 sound_loop 3, .Loop1 octave 4 - notetype1 6 + channel_volume 6 note E_, 1 inc_octave note E_, 1 octave 4 - notetype1 2 + channel_volume 2 dec_octave note B_, 1 inc_octave diff --git a/crysaudio/music/TCG/matchstart2.asm b/crysaudio/music/TCG/matchstart2.asm index 951b6ec4..4f01e850 100644 --- a/crysaudio/music/TCG/matchstart2.asm +++ b/crysaudio/music/TCG/matchstart2.asm @@ -4,11 +4,11 @@ Music_MatchStart2: channel 2, Music_MatchStart2_Ch2 Music_MatchStart2_Ch1: ; f7956 (3d:7956) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 2 - notetype1 15 + channel_volume 15 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 - notetype1 6 + channel_volume 6 note E_, 1 note G_, 1 note B_, 1 inc_octave note C_, 1 note E_, 1 - notetype1 2 + channel_volume 2 note G_, 1 note B_, 1 inc_octave @@ -94,13 +94,13 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 ;frequency_offset 6 rest 4 octave 2 - notetype1 6 + channel_volume 6 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 - notetype1 2 + channel_volume 2 note E_, 1 note G_, 1 note B_, 1 diff --git a/crysaudio/music/TCG/matchstart3.asm b/crysaudio/music/TCG/matchstart3.asm index 03c535a7..c7baa4e6 100644 --- a/crysaudio/music/TCG/matchstart3.asm +++ b/crysaudio/music/TCG/matchstart3.asm @@ -4,11 +4,11 @@ Music_MatchStart3: channel 2, Music_MatchStart3_Ch2 Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 2 - notetype1 15 + channel_volume 15 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 - notetype1 6 + channel_volume 6 note F_, 1 note A_, 1 inc_octave note C_, 1 dec_octave octave 5 - notetype1 2 + channel_volume 2 note G_, 1 note B_, 1 inc_octave @@ -169,13 +169,13 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) Music_MatchStart3_Ch2: ; f7aba (3d:7aba) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 ;frequency_offset 6 rest 4 octave 2 - notetype1 6 + channel_volume 6 duty_cycle 1 note C_, 1 note E_, 1 @@ -320,7 +320,7 @@ Music_MatchStart3_Ch2: ; f7aba (3d:7aba) note D_, 1 dec_octave octave 4 - notetype1 2 + channel_volume 2 note F_, 1 note A_, 1 inc_octave diff --git a/crysaudio/music/TCG/matchvictory.asm b/crysaudio/music/TCG/matchvictory.asm index a57d6505..3743739a 100644 --- a/crysaudio/music/TCG/matchvictory.asm +++ b/crysaudio/music/TCG/matchvictory.asm @@ -8,53 +8,53 @@ Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 0 - notetype1 11 - notetype0 1 + channel_volume 11 + speed 1 note A_, 15 ;tie note A_, 9 - notetype1 2 + channel_volume 2 note A_, 5 - notetype1 11 + channel_volume 11 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 3 - notetype1 11 + channel_volume 11 note F_, 7 - notetype1 2 + channel_volume 2 note F_, 3 - notetype1 11 + channel_volume 11 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 2 - notetype1 11 + channel_volume 11 note B_, 11 - notetype1 2 + channel_volume 2 note B_, 10 inc_octave - notetype1 11 + channel_volume 11 note C_, 10 - notetype1 2 + channel_volume 2 note C_, 11 - notetype1 11 + channel_volume 11 note D_, 10 - notetype1 2 + channel_volume 2 note D_, 10 - notetype1 11 + channel_volume 11 note C#, 8 - notetype1 2 + channel_volume 2 note C#, 13 - notetype1 11 + channel_volume 11 note D_, 5 - notetype1 2 + channel_volume 2 note D_, 6 - notetype1 11 - notetype0 8 + channel_volume 11 + speed 8 note E_, 12 - notetype1 2 + channel_volume 2 note E_, 4 sound_ret @@ -63,73 +63,73 @@ Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 0 - notetype1 11 - notetype0 1 + channel_volume 11 + speed 1 note F_, 5 - notetype1 2 + channel_volume 2 note F_, 5 dec_octave - notetype1 11 + channel_volume 11 note A_, 5 inc_octave note C_, 5 note F_, 5 - notetype1 2 + channel_volume 2 note F_, 4 - notetype1 11 + channel_volume 11 note C_, 7 - notetype1 2 + channel_volume 2 note C_, 3 dec_octave - notetype1 11 + channel_volume 11 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 3 inc_octave - notetype1 11 + channel_volume 11 note C_, 7 - notetype1 2 + channel_volume 2 note C_, 2 - notetype1 11 + channel_volume 11 note G_, 11 - notetype1 2 + channel_volume 2 note G_, 10 - notetype1 11 + channel_volume 11 note A_, 10 - notetype1 2 + channel_volume 2 note A_, 11 - notetype1 11 + channel_volume 11 note B_, 10 - notetype1 2 + channel_volume 2 note B_, 10 - notetype1 11 + channel_volume 11 note A_, 8 - notetype1 2 + channel_volume 2 note A_, 13 - notetype1 11 + channel_volume 11 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 6 inc_octave - notetype1 11 - notetype0 8 + channel_volume 11 + speed 8 note C#, 12 - notetype1 2 + channel_volume 2 note C#, 4 sound_ret Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) ;stereo_panning 1, 1 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;cutoff 8 ;echo 0 octave 2 - notetype0 1 + speed 1 note F_, 15 ;tie note F_, 9 @@ -150,7 +150,7 @@ Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) rest 13 note E_, 5 rest 6 - notetype0 8 + speed 8 note A_, 12 sound_ret ; 0xf7c2e diff --git a/crysaudio/music/TCG/medal.asm b/crysaudio/music/TCG/medal.asm index 2c6de78d..32839d02 100644 --- a/crysaudio/music/TCG/medal.asm +++ b/crysaudio/music/TCG/medal.asm @@ -8,11 +8,11 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 2 duty_cycle 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note E_, 5 note A_, 5 inc_octave @@ -31,39 +31,39 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) inc_octave note C#, 5 note E_, 5 - notetype0 15 + speed 15 note A_, 2 ;tie - notetype0 1 + speed 1 note A_, 10 - notetype1 3 + channel_volume 3 note A_, 5 - notetype1 10 - notetype2 7 + channel_volume 10 + fade_wave 7 note A_, 5 note A_, 5 note A_, 5 - notetype2 8 + fade_wave 8 note A_, 15 - notetype1 3 + channel_volume 3 note A_, 5 - notetype1 10 + channel_volume 10 note A_, 16 - notetype1 3 + channel_volume 3 note A_, 5 - notetype1 10 + channel_volume 10 note A_, 16 - notetype1 3 + channel_volume 3 note A_, 6 - notetype1 10 - notetype0 9 + channel_volume 10 + speed 9 note A_, 5 ;tie note A_, 8 ;tie - notetype0 1 + speed 1 note A_, 2 - notetype1 3 + channel_volume 3 note A_, 16 sound_ret @@ -72,11 +72,11 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 1 duty_cycle 0 - notetype1 9 - notetype0 1 + channel_volume 9 + speed 1 note A_, 5 inc_octave note C#, 5 @@ -94,56 +94,56 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) note E_, 5 note A_, 5 inc_octave - notetype0 15 + speed 15 note C_, 2 ;tie - notetype0 1 + speed 1 note C_, 10 - notetype1 2 + channel_volume 2 note C_, 5 - notetype1 10 - notetype2 7 + channel_volume 10 + fade_wave 7 note C_, 5 note C_, 5 note C_, 5 - notetype2 8 + fade_wave 8 note D_, 15 - notetype1 3 + channel_volume 3 note D_, 5 - notetype1 9 + channel_volume 9 note D_, 16 - notetype1 2 + channel_volume 2 note D_, 5 - notetype1 9 + channel_volume 9 note D_, 16 - notetype1 3 + channel_volume 3 note D_, 6 - notetype1 9 - notetype0 9 + channel_volume 9 + speed 9 note C#, 5 ;tie note C#, 8 ;tie - notetype0 1 + speed 1 note C#, 2 - notetype1 2 + channel_volume 2 note C#, 16 sound_ret Music_Medal_Ch3: ; f7e9d (3d:7e9d) ;stereo_panning 1, 1 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;cutoff 8 ;echo 0 octave 2 - notetype0 1 - notetype0 15 + speed 1 + speed 15 rest 4 note F_, 2 ;tie - notetype0 1 + speed 1 note F_, 10 rest 5 ;cutoff 7 @@ -157,10 +157,10 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d) rest 5 note A#, 16 rest 6 - notetype0 9 + speed 9 note A_, 13 ;tie - notetype0 1 + speed 1 note A_, 2 sound_ret ; 0xf7ec8 diff --git a/crysaudio/music/TCG/overworld.asm b/crysaudio/music/TCG/overworld.asm index 1e912814..fbbe2103 100644 --- a/crysaudio/music/TCG/overworld.asm +++ b/crysaudio/music/TCG/overworld.asm @@ -6,13 +6,13 @@ Music_Overworld: channel 4, Music_Overworld_Ch4 Music_Overworld_Ch1: ; f71a0 (3d:71a0) - notetype0 7 + speed 7 duty_cycle 0 ;stereo_panning 1, 1 ;vibrato_type 9 vibrato 25, 3, 3 - notetype1 10 - notetype2 7 + channel_volume 10 + fade_wave 7 octave 3 rest 3 sound_call Branch_f72ba @@ -20,116 +20,116 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) .MainLoop sound_call Branch_f72ba duty_cycle 1 - notetype2 8 + fade_wave 8 octave 3 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 3 + channel_volume 3 note A_, 1 inc_octave - notetype1 10 + channel_volume 10 note C_, 5 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 + channel_volume 10 note F_, 3 - notetype0 1 + speed 1 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 10 - notetype1 10 - notetype0 7 + channel_volume 10 + speed 7 note G_, 3 - notetype0 1 + speed 1 note F_, 11 - notetype1 3 + channel_volume 3 note F_, 10 - notetype0 7 - notetype1 10 + speed 7 + channel_volume 10 note C_, 12 - notetype1 3 + channel_volume 3 note C_, 2 duty_cycle 0 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 3 note E_, 4 note E_, 3 note E_, 3 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 sound_call Branch_f72fb note C_, 6 - notetype1 3 + channel_volume 3 note C_, 6 - notetype1 10 + channel_volume 10 note C_, 3 note D_, 3 note E_, 3 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 10 + channel_volume 10 note F_, 4 - notetype1 3 + channel_volume 3 note F_, 2 - notetype1 10 + channel_volume 10 note C_, 3 dec_octave note A_, 6 note A#, 9 - notetype1 3 + channel_volume 3 note A#, 6 - notetype1 10 + channel_volume 10 note A#, 3 inc_octave note D_, 3 note F_, 3 note A_, 3 - notetype1 3 + channel_volume 3 note A_, 6 - notetype1 10 + channel_volume 10 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 10 + channel_volume 10 note E_, 3 note D_, 3 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 10 + channel_volume 10 note E_, 2 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 note C_, 9 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 10 + channel_volume 10 dec_octave note A_, 3 inc_octave - notetype0 1 + speed 1 note C_, 11 - notetype1 4 + channel_volume 4 note C_, 10 - notetype0 7 - notetype1 10 + speed 7 + channel_volume 10 note G_, 3 - notetype0 1 + speed 1 note F_, 11 - notetype1 4 + channel_volume 4 note F_, 10 - notetype0 7 - notetype1 10 + speed 7 + channel_volume 10 note C_, 12 - notetype1 3 + channel_volume 3 note C_, 6 duty_cycle 2 - notetype2 8 - notetype1 6 + fade_wave 8 + channel_volume 6 octave 4 note G_, 1 ;tie @@ -144,44 +144,44 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) ;tie note C_, 1 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 sound_call Branch_f72fb note C_, 6 - notetype1 3 + channel_volume 3 note C_, 6 - notetype1 10 + channel_volume 10 note C_, 3 note D_, 3 note E_, 3 note F_, 9 - notetype1 3 + channel_volume 3 note F_, 12 - notetype1 10 + channel_volume 10 note F_, 2 note G_, 1 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 2 - notetype1 10 + channel_volume 10 note A_, 12 - notetype1 3 + channel_volume 3 note A_, 3 - notetype1 10 + channel_volume 10 note D_, 3 note A_, 3 note A#, 9 - notetype1 3 + channel_volume 3 note A#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note F_, 8 ;tie note F_, 8 @@ -193,11 +193,11 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) note F_, 8 ;tie note F_, 8 - notetype1 3 + channel_volume 3 note F_, 3 duty_cycle 0 - notetype1 10 - notetype2 7 + channel_volume 10 + fade_wave 7 sound_loop 0, .MainLoop Branch_f72ba: @@ -206,23 +206,23 @@ Branch_f72ba: note F_, 2 note A_, 1 inc_octave - notetype1 10 - notetype2 4 + channel_volume 10 + fade_wave 4 note C_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note A#, 3 note A#, 1 inc_octave - notetype1 10 - notetype2 4 + channel_volume 10 + fade_wave 4 note D_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 3 note A#, 3 rest 3 @@ -230,22 +230,22 @@ Branch_f72ba: note A_, 2 inc_octave note C_, 1 - notetype1 10 - notetype2 4 + channel_volume 10 + fade_wave 4 note C_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note A#, 3 note A#, 1 inc_octave - notetype1 10 - notetype2 4 + channel_volume 10 + fade_wave 4 note D_, 1 rest 2 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note C_, 3 dec_octave note A#, 3 @@ -253,83 +253,83 @@ Branch_f72ba: Branch_f72fb: octave 4 - notetype1 10 + channel_volume 10 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note F_, 5 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note A_, 3 - notetype0 1 + speed 1 note G_, 11 - notetype1 3 + channel_volume 3 note G_, 10 - notetype0 7 + speed 7 inc_octave - notetype1 10 + channel_volume 10 note C_, 3 dec_octave - notetype0 1 + speed 1 note A#, 11 - notetype1 3 + channel_volume 3 note A#, 10 - notetype0 7 - notetype1 10 + speed 7 + channel_volume 10 note C#, 12 - notetype1 3 + channel_volume 3 note C#, 6 - notetype1 10 + channel_volume 10 note D#, 3 - notetype0 1 + speed 1 note C#, 11 - notetype1 3 + channel_volume 3 note C#, 10 - notetype1 10 - notetype0 7 + channel_volume 10 + speed 7 sound_ret Music_Overworld_Ch2: ; f7334 (3d:7334) - notetype0 7 + speed 7 duty_cycle 0 ;stereo_panning 1, 1 ;vibrato_type 9 vibrato 30, 3, 3 - notetype2 7 + fade_wave 7 octave 3 sound_call Branch_f7535 .MainLoop sound_call Branch_f7535 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 rest 3 note C_, 5 note C_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note C_, 4 note C_, 3 note C_, 3 rest 3 note C_, 5 note C_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note G_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 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 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 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 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 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 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note G_, 1 - notetype2 7 - notetype1 6 - notetype2 8 + fade_wave 7 + channel_volume 6 + fade_wave 8 octave 3 note E_, 3 note F_, 3 note G_, 3 - notetype2 7 + fade_wave 7 note A#, 6 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 3 note D_, 3 - notetype1 6 - notetype2 8 + channel_volume 6 + fade_wave 8 octave 3 note A_, 3 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 2 note A_, 2 inc_octave inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 dec_octave rest 2 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 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 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave inc_octave note F_, 1 rest 2 dec_octave dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 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 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note A_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 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 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 dec_octave note C_, 4 note C_, 3 @@ -465,18 +465,18 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) rest 3 note C_, 5 note C_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note G_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note D_, 4 duty_cycle 2 - notetype1 6 - notetype2 8 + channel_volume 6 + fade_wave 8 octave 4 note C_, 1 ;tie @@ -492,21 +492,21 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) ;tie note E_, 1 duty_cycle 0 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 2 rest 3 note A#, 5 inc_octave note D_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 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 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 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 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note G_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note C_, 4 note E_, 3 note C_, 3 @@ -549,208 +549,208 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note B_, 2 inc_octave inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note D_, 4 - notetype1 6 - notetype2 8 + channel_volume 6 + fade_wave 8 octave 4 note D_, 2 note E_, 1 note F_, 1 - notetype1 2 + channel_volume 2 note F_, 2 - notetype1 6 + channel_volume 6 note F_, 11 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 4 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 rest 2 dec_octave dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note A#, 1 - notetype1 6 - notetype2 8 + channel_volume 6 + fade_wave 8 octave 3 note A#, 3 inc_octave note F_, 3 note G_, 9 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 3 note D_, 2 dec_octave note A#, 3 inc_octave inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 - notetype2 8 - notetype1 6 + fade_wave 8 + channel_volume 6 octave 4 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note A#, 5 - notetype1 2 + channel_volume 2 note A#, 1 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 3 rest 3 note F_, 3 note C_, 2 note F_, 1 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 3 note G_, 3 - notetype0 1 - notetype1 9 - notetype2 8 + speed 1 + channel_volume 9 + fade_wave 8 inc_octave note F_, 4 note C_, 3 - notetype0 7 + speed 7 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note E_, 3 note G_, 2 inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 dec_octave rest 3 note A_, 3 note F_, 2 note A_, 1 inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 3 note G_, 3 - notetype0 1 - notetype1 9 - notetype2 8 + speed 1 + channel_volume 9 + fade_wave 8 inc_octave note F_, 4 note C_, 3 dec_octave - notetype0 7 - notetype1 9 - notetype2 7 + speed 7 + channel_volume 9 + fade_wave 7 note A_, 3 note G_, 2 inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 sound_loop 0, .MainLoop Branch_f7535: octave 3 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 rest 3 note C_, 3 note C_, 2 note F_, 1 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 3 note G_, 1 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 1 dec_octave - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 inc_octave note F_, 4 note C_, 3 - notetype0 7 - notetype1 9 - notetype2 7 + speed 7 + channel_volume 9 + fade_wave 7 dec_octave note E_, 3 note G_, 2 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 dec_octave rest 3 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note F_, 3 note F_, 2 note A_, 1 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 3 note G_, 1 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 1 dec_octave - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 inc_octave note F_, 4 note C_, 3 - notetype0 7 - notetype1 9 - notetype2 7 + speed 7 + channel_volume 9 + fade_wave 7 dec_octave note A_, 3 note G_, 2 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 dec_octave @@ -758,10 +758,10 @@ Branch_f7535: Music_Overworld_Ch3: ; f75a1 (3d:75a1) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 64 ;cutoff 7 octave 2 diff --git a/crysaudio/music/TCG/pausemenu.asm b/crysaudio/music/TCG/pausemenu.asm index 00a6ddf0..5ca8a900 100644 --- a/crysaudio/music/TCG/pausemenu.asm +++ b/crysaudio/music/TCG/pausemenu.asm @@ -6,211 +6,211 @@ Music_PauseMenu: channel 4, Music_PauseMenu_Ch4 Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 .MainLoop - notetype1 7 + channel_volume 7 .Loop1 rest 16 sound_loop 4, .Loop1 - notetype0 1 + speed 1 octave 6 note C_, 4 dec_octave rest 3 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note B_, 3 - notetype1 7 + channel_volume 7 note D_, 4 - notetype1 3 + channel_volume 3 note G_, 3 sound_call Branch_f6c24 sound_call Branch_f6c60 - notetype1 7 + channel_volume 7 octave 6 note C_, 4 dec_octave - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note B_, 3 - notetype1 7 + channel_volume 7 note D_, 4 - notetype1 3 + channel_volume 3 note G_, 3 sound_call Branch_f6c24 sound_call Branch_f6c60 octave 6 - notetype1 6 + channel_volume 6 note C_, 4 dec_octave - notetype1 3 + channel_volume 3 note E_, 3 sound_call Branch_f6ce9 sound_call Branch_f6c80 .Loop2 octave 6 - notetype2 4 + fade_wave 4 note C_, 1 sound_call Branch_f6ce9 sound_call Branch_f6c80 sound_loop 3, .Loop2 - notetype2 8 + fade_wave 8 sound_loop 0, .MainLoop Branch_f6c24: .Loop3 octave 6 - notetype1 7 + channel_volume 7 note C_, 4 dec_octave - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 7 + channel_volume 7 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note B_, 3 - notetype1 7 + channel_volume 7 note D_, 4 - notetype1 3 + channel_volume 3 note G_, 3 sound_loop 3, .Loop3 inc_octave - notetype1 7 + channel_volume 7 note C_, 4 dec_octave - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 7 + channel_volume 7 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note B_, 3 - notetype1 7 + channel_volume 7 note E_, 4 - notetype1 3 + channel_volume 3 note G_, 3 sound_ret Branch_f6c60: .Loop4 octave 6 - notetype1 7 + channel_volume 7 note C_, 4 dec_octave - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note B_, 3 - notetype1 7 + channel_volume 7 note E_, 4 - notetype1 3 + channel_volume 3 note G_, 3 sound_loop 3, .Loop4 sound_ret Branch_f6c80: octave 6 - notetype2 4 + fade_wave 4 note C_, 1 octave 3 - notetype1 7 - notetype2 8 - notetype0 1 + channel_volume 7 + fade_wave 8 + speed 1 note C_, 4 - notetype1 2 + channel_volume 2 note C_, 3 - notetype1 6 - notetype0 7 + channel_volume 6 + speed 7 octave 5 - notetype2 4 + fade_wave 4 note G_, 1 note E_, 1 octave 3 - notetype2 8 - notetype1 7 - notetype0 1 + fade_wave 8 + channel_volume 7 + speed 1 note E_, 4 - notetype1 2 + channel_volume 2 note E_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note B_, 1 note G_, 1 dec_octave - notetype1 7 - notetype2 8 - notetype0 1 + channel_volume 7 + fade_wave 8 + speed 1 note C_, 4 - notetype1 2 + channel_volume 2 note C_, 3 - notetype1 6 - notetype0 7 + channel_volume 6 + speed 7 octave 6 - notetype2 4 + fade_wave 4 note C_, 1 octave 3 - notetype2 8 - notetype1 7 - notetype0 1 + fade_wave 8 + channel_volume 7 + speed 1 note C_, 4 - notetype1 2 + channel_volume 2 note C_, 3 - notetype0 7 + speed 7 octave 5 - notetype1 6 - notetype2 4 + channel_volume 6 + fade_wave 4 note G_, 1 note E_, 1 - notetype1 7 + channel_volume 7 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note E_, 4 - notetype1 2 + channel_volume 2 note E_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note B_, 1 note G_, 1 note E_, 1 @@ -218,67 +218,67 @@ Branch_f6c80: Branch_f6ce9: octave 2 - notetype0 1 - notetype2 8 - notetype1 7 + speed 1 + fade_wave 8 + channel_volume 7 note B_, 4 - notetype1 2 + channel_volume 2 note B_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note G_, 1 note D_, 1 octave 3 - notetype1 7 - notetype2 8 - notetype0 1 + channel_volume 7 + fade_wave 8 + speed 1 note D_, 4 - notetype1 2 + channel_volume 2 note D_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note B_, 1 note G_, 1 - notetype1 7 + channel_volume 7 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note B_, 4 - notetype1 2 + channel_volume 2 note B_, 3 - notetype1 6 - notetype0 7 + channel_volume 6 + speed 7 octave 6 - notetype2 4 + fade_wave 4 note C_, 1 - notetype1 7 + channel_volume 7 octave 2 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note B_, 4 - notetype1 2 + channel_volume 2 note B_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note G_, 1 note D_, 1 - notetype1 7 + channel_volume 7 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note D_, 4 - notetype1 2 + channel_volume 2 note D_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note B_, 1 note G_, 1 note D_, 1 @@ -286,18 +286,18 @@ Branch_f6ce9: Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 .MainLoop - notetype1 8 + channel_volume 8 .Loop1 rest 16 sound_loop 7, .Loop1 octave 5 rest 8 - notetype0 1 + speed 1 .Loop2 note B_, 4 note G_, 3 @@ -305,69 +305,69 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) note C_, 3 dec_octave sound_loop 4, .Loop2 - notetype0 7 + speed 7 .Loop3 octave 1 - notetype1 13 + channel_volume 13 note G_, 1 octave 3 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note D_, 4 - notetype1 2 + channel_volume 2 note D_, 3 - notetype1 13 - notetype0 7 + channel_volume 13 + speed 7 octave 1 - notetype2 6 + fade_wave 6 note G_, 1 - notetype2 4 + fade_wave 4 note G_, 1 octave 3 - notetype2 8 - notetype1 7 - notetype0 1 + fade_wave 8 + channel_volume 7 + speed 1 note F#, 4 - notetype1 2 + channel_volume 2 note F#, 3 dec_octave - notetype1 13 - notetype0 7 + channel_volume 13 + speed 7 note D_, 1 note G_, 1 octave 4 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F#, 4 - notetype1 2 + channel_volume 2 note F#, 3 - notetype0 7 + speed 7 octave 1 - notetype1 13 - notetype2 8 + channel_volume 13 + fade_wave 8 note G_, 1 octave 3 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note D_, 4 - notetype1 2 + channel_volume 2 note D_, 3 - notetype0 7 - notetype1 13 + speed 7 + channel_volume 13 octave 1 - notetype2 6 + fade_wave 6 note G_, 1 - notetype2 4 + fade_wave 4 note G_, 1 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note F#, 4 - notetype1 2 + channel_volume 2 note F#, 3 - notetype0 7 + speed 7 octave 1 - notetype1 13 + channel_volume 13 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 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 4 - notetype1 2 + channel_volume 2 note E_, 3 - notetype1 13 - notetype0 7 + channel_volume 13 + speed 7 octave 1 - notetype2 6 + fade_wave 6 note D_, 1 - notetype2 4 + fade_wave 4 note D_, 1 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note G_, 4 - notetype1 2 + channel_volume 2 note G_, 3 - notetype0 7 + speed 7 dec_octave - notetype1 13 + channel_volume 13 note C_, 1 note D_, 1 octave 4 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note G_, 4 - notetype1 2 + channel_volume 2 note G_, 3 - notetype0 7 + speed 7 octave 1 - notetype1 13 - notetype2 8 + channel_volume 13 + fade_wave 8 note D_, 1 octave 3 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 4 - notetype1 2 + channel_volume 2 note E_, 3 - notetype0 7 - notetype1 13 - notetype2 6 + speed 7 + channel_volume 13 + fade_wave 6 octave 1 note D_, 1 - notetype2 4 + fade_wave 4 note D_, 1 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note G_, 4 - notetype1 2 + channel_volume 2 note G_, 3 - notetype0 7 + speed 7 octave 1 - notetype1 13 + channel_volume 13 note C_, 1 note C#, 1 inc_octave @@ -440,113 +440,113 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) - notetype0 1 - notetype2 13 + speed 1 + fade_wave 13 ;stereo_panning 1, 1 - notetype1 2 + channel_volume 2 ;echo 96 ;cutoff 4 octave 5 note G_, 7 ;cutoff 8 note F#, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 2 + channel_volume 2 note D_, 4 - notetype1 3 + channel_volume 3 note F#, 3 dec_octave - notetype1 2 + channel_volume 2 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note D_, 3 .MainLoop octave 5 .Loop1 - notetype1 2 + channel_volume 2 note G_, 4 dec_octave - notetype1 3 + channel_volume 3 note B_, 3 inc_octave - notetype1 2 + channel_volume 2 note F#, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 2 + channel_volume 2 note D_, 4 - notetype1 3 + channel_volume 3 note F#, 3 dec_octave - notetype1 2 + channel_volume 2 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note D_, 3 sound_loop 3, .Loop1 - notetype1 2 + channel_volume 2 note G_, 4 dec_octave - notetype1 3 + channel_volume 3 note B_, 3 inc_octave - notetype1 2 + channel_volume 2 note E_, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 2 + channel_volume 2 note C_, 4 - notetype1 3 + channel_volume 3 note E_, 3 dec_octave - notetype1 2 + channel_volume 2 note A_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 .Loop2 - notetype1 2 + channel_volume 2 note G_, 4 dec_octave - notetype1 3 + channel_volume 3 note A_, 3 inc_octave - notetype1 2 + channel_volume 2 note E_, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 2 + channel_volume 2 note C_, 4 - notetype1 3 + channel_volume 3 note E_, 3 dec_octave - notetype1 2 + channel_volume 2 note A_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 sound_loop 3, .Loop2 - notetype1 2 + channel_volume 2 note G_, 4 dec_octave - notetype1 3 + channel_volume 3 note A_, 3 inc_octave - notetype1 2 + channel_volume 2 note F#, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 2 + channel_volume 2 note D_, 4 - notetype1 3 + channel_volume 3 note F#, 3 dec_octave - notetype1 2 + channel_volume 2 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note D_, 3 sound_loop 0, .MainLoop diff --git a/crysaudio/music/TCG/pcmainmenu.asm b/crysaudio/music/TCG/pcmainmenu.asm index 519977df..6d6f3c76 100644 --- a/crysaudio/music/TCG/pcmainmenu.asm +++ b/crysaudio/music/TCG/pcmainmenu.asm @@ -6,9 +6,9 @@ Music_PCMainMenu: channel 4, Music_PCMainMenu_Ch4 Music_PCMainMenu_Ch1: ; f9052 (3e:5052) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 2 .MainLoop @@ -16,66 +16,66 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052) rest 4 dec_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note F_, 1 rest 1 duty_cycle 2 - notetype2 8 - notetype1 12 + fade_wave 8 + channel_volume 12 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 2 inc_octave - notetype1 12 + channel_volume 12 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note F_, 1 rest 1 duty_cycle 2 - notetype2 8 - notetype1 12 + fade_wave 8 + channel_volume 12 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 sound_call Branch_f90c2 rest 4 dec_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note F_, 1 rest 1 inc_octave duty_cycle 2 - notetype2 8 - notetype1 12 + fade_wave 8 + channel_volume 12 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 2 - notetype1 12 + channel_volume 12 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 dec_octave note F_, 1 rest 1 inc_octave duty_cycle 2 - notetype2 8 - notetype1 12 + fade_wave 8 + channel_volume 12 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 sound_loop 0, .MainLoop @@ -83,38 +83,38 @@ Branch_f90c2: octave 3 rest 4 duty_cycle 1 - notetype1 6 - notetype2 5 + channel_volume 6 + fade_wave 5 note G_, 1 rest 3 - notetype2 8 + fade_wave 8 duty_cycle 2 - notetype1 12 + channel_volume 12 note B_, 2 inc_octave note D_, 1 - notetype1 2 + channel_volume 2 note D_, 1 dec_octave duty_cycle 1 - notetype1 6 - notetype2 5 + channel_volume 6 + fade_wave 5 note G_, 1 rest 1 inc_octave duty_cycle 2 - notetype2 8 - notetype1 12 + fade_wave 8 + channel_volume 12 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 sound_ret Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 2 .MainLoop @@ -122,67 +122,67 @@ Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) rest 4 inc_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note C_, 1 rest 1 dec_octave duty_cycle 2 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note F_, 1 - notetype1 2 + channel_volume 2 note F_, 1 rest 2 - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 inc_octave note C_, 1 rest 1 dec_octave duty_cycle 2 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 sound_call Branch_f915e rest 4 inc_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note C_, 1 rest 1 duty_cycle 2 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 rest 2 dec_octave - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 duty_cycle 1 inc_octave - notetype1 6 - notetype2 5 + channel_volume 6 + fade_wave 5 note C_, 1 rest 1 dec_octave duty_cycle 2 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note B_, 1 - notetype1 2 + channel_volume 2 note B_, 1 sound_loop 0, .MainLoop @@ -190,39 +190,39 @@ Branch_f915e: octave 4 rest 4 duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note D_, 1 rest 3 duty_cycle 2 - notetype2 8 + fade_wave 8 dec_octave - notetype1 8 + channel_volume 8 note G_, 2 note B_, 1 - notetype1 2 + channel_volume 2 note B_, 1 inc_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note D_, 1 rest 1 dec_octave duty_cycle 2 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 sound_ret Music_PCMainMenu_Ch3: ; f9189 (3e:5189) - notetype0 7 - notetype1 1 + speed 7 + channel_volume 1 ;stereo_panning 1, 1 - notetype2 11 + fade_wave 11 ;cutoff 7 ;echo 0 .MainLoop @@ -233,12 +233,12 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) ;cutoff 8 note G_, 1 rest 1 - notetype0 1 + speed 1 note A#, 4 ;tie note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 1 rest 1 ;cutoff 4 @@ -259,12 +259,12 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) ;cutoff 8 note F_, 1 rest 1 - notetype0 1 + speed 1 note G#, 4 ;tie note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 1 rest 1 ;cutoff 4 @@ -285,12 +285,12 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) ;cutoff 8 note G_, 1 rest 1 - notetype0 1 + speed 1 note A#, 4 ;tie note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 1 rest 1 ;cutoff 4 @@ -311,29 +311,29 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) ;cutoff 8 note F_, 1 rest 1 - notetype0 1 + speed 1 note B_, 4 ;tie inc_octave note C_, 3 ;tie - notetype0 7 + speed 7 note C_, 1 rest 1 ;cutoff 8 - notetype0 1 + speed 1 note F#, 4 ;tie note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 1 ;cutoff 4 note F_, 1 ;cutoff 8 note C_, 2 note F_, 2 - notetype0 1 + speed 1 note C_, 3 ;tie dec_octave @@ -344,7 +344,7 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) note A_, 3 ;tie note G#, 2 - notetype0 7 + speed 7 sound_loop 0, .MainLoop diff --git a/crysaudio/music/TCG/pokemondome.asm b/crysaudio/music/TCG/pokemondome.asm index 9fdae5fb..f81b20da 100644 --- a/crysaudio/music/TCG/pokemondome.asm +++ b/crysaudio/music/TCG/pokemondome.asm @@ -6,15 +6,15 @@ Music_PokemonDome: channel 4, Music_PokemonDome_Ch4 Music_PokemonDome_Ch1: ; f9251 (3e:5251) - notetype0 7 + speed 7 ;stereo_panning 1, 1 ;vibrato_type 9 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 2 duty_cycle 0 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G_, 5 note A_, 5 note B_, 4 @@ -44,129 +44,129 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note F_, 5 note G_, 4 duty_cycle 1 - notetype1 8 + channel_volume 8 dec_octave - notetype0 1 + speed 1 note C_, 11 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 8 + channel_volume 8 note C_, 11 - notetype1 3 + channel_volume 3 note C_, 10 rest 7 - notetype1 8 + channel_volume 8 note C_, 4 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 8 + channel_volume 8 note C_, 4 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 8 + channel_volume 8 note C_, 11 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 8 + channel_volume 8 note C_, 11 - notetype1 3 + channel_volume 3 note C_, 10 - notetype0 7 + speed 7 rest 3 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 10 rest 7 - notetype1 8 + channel_volume 8 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 .MainLoop - notetype0 7 + speed 7 duty_cycle 1 - notetype1 10 + channel_volume 10 octave 2 note G_, 4 inc_octave duty_cycle 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 10 rest 7 - notetype1 8 + channel_volume 8 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 8 + channel_volume 8 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 8 + channel_volume 8 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 8 + channel_volume 8 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 10 - notetype0 7 + speed 7 rest 3 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 10 rest 7 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 duty_cycle 0 - notetype1 10 + channel_volume 10 dec_octave - notetype0 1 + speed 1 note B_, 4 inc_octave note C_, 3 @@ -176,75 +176,75 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note G_, 3 note A_, 4 note B_, 3 - notetype0 7 + speed 7 inc_octave note C_, 12 dec_octave note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note D_, 10 - notetype1 3 + channel_volume 3 note D_, 2 - notetype1 10 + channel_volume 10 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note F_, 10 - notetype1 3 + channel_volume 3 note F_, 2 - notetype1 10 + channel_volume 10 note C_, 3 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 + channel_volume 10 note F_, 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note D_, 3 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note E_, 12 dec_octave note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note D_, 8 dec_octave note A_, 4 inc_octave note D_, 3 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C_, 14 - notetype1 3 + channel_volume 3 note C_, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 10 - notetype1 3 + channel_volume 3 note B_, 2 - notetype1 10 + channel_volume 10 note G_, 4 note A_, 12 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 2 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note D_, 8 note E_, 4 @@ -254,54 +254,54 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note G_, 8 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 10 + channel_volume 10 note F_, 2 note E_, 2 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note E_, 5 - notetype1 3 + channel_volume 3 note E_, 2 - notetype0 7 - notetype1 10 + speed 7 + channel_volume 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 1 inc_octave note C_, 8 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 10 + channel_volume 10 note F_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 1 inc_octave note C_, 8 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 10 + channel_volume 10 note F_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 dec_octave - notetype1 10 + channel_volume 10 note G#, 1 inc_octave note C_, 12 @@ -317,15 +317,15 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) - notetype0 7 + speed 7 ;stereo_panning 1, 1 ;vibrato_type 9 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 1 duty_cycle 0 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note B_, 5 inc_octave note C_, 5 @@ -356,71 +356,71 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note B_, 4 .MainLoop duty_cycle 1 - notetype1 7 + channel_volume 7 octave 3 - notetype0 1 + speed 1 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 10 rest 7 - notetype1 7 + channel_volume 7 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 10 - notetype0 7 + speed 7 rest 3 sound_call Branch_f9554 - notetype0 7 + speed 7 rest 4 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note G_, 11 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 7 + channel_volume 7 note G_, 11 - notetype1 3 + channel_volume 3 note G_, 10 rest 7 - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 7 + channel_volume 7 note G_, 11 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 7 + channel_volume 7 note G_, 11 - notetype1 3 + channel_volume 3 note G_, 10 - notetype0 7 + speed 7 rest 3 sound_call Branch_f9554 duty_cycle 0 - notetype1 8 + channel_volume 8 dec_octave - notetype0 1 + speed 1 note G_, 4 note A_, 3 note B_, 4 @@ -430,15 +430,15 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note E_, 3 note F_, 4 note F#, 3 - notetype0 7 + speed 7 note G_, 10 note F_, 1 rest 1 note E_, 1 - notetype1 2 + channel_volume 2 note E_, 1 rest 1 - notetype1 7 + channel_volume 7 note G_, 1 note G_, 10 note A_, 2 @@ -462,13 +462,13 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note E_, 4 note F#, 8 note F#, 4 - notetype2 6 + fade_wave 6 note F#, 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note F#, 5 rest 2 - notetype0 7 + speed 7 note F_, 14 rest 2 dec_octave @@ -492,8 +492,8 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note A_, 1 note B_, 1 duty_cycle 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 .Loop1 note F_, 5 note C_, 5 @@ -546,31 +546,31 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) inc_octave note C#, 4 duty_cycle 0 - notetype1 8 - notetype0 7 + channel_volume 8 + speed 7 .Loop5 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 rest 1 - notetype1 7 + channel_volume 7 dec_octave note F_, 1 note A_, 8 inc_octave note E_, 1 - notetype1 2 + channel_volume 2 note E_, 1 rest 1 - notetype1 7 + channel_volume 7 note D_, 1 sound_loop 2, .Loop5 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 rest 1 dec_octave - notetype1 7 + channel_volume 7 note F_, 1 note G#, 12 note C_, 1 @@ -598,50 +598,50 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) sound_loop 0, .MainLoop Branch_f9554: - notetype0 1 - notetype1 7 + speed 1 + channel_volume 7 note F_, 11 - notetype1 3 + channel_volume 3 note F_, 3 - notetype1 7 + channel_volume 7 note F_, 11 - notetype1 3 + channel_volume 3 note F_, 10 rest 7 - notetype1 7 + channel_volume 7 note F_, 4 - notetype1 3 + channel_volume 3 note F_, 3 - notetype1 7 + channel_volume 7 note F_, 4 - notetype1 3 + channel_volume 3 note F_, 3 .Loop6 - notetype1 7 + channel_volume 7 note F_, 11 - notetype1 3 + channel_volume 3 note F_, 3 sound_loop 2, .Loop6 sound_ret Music_PokemonDome_Ch3: ; f9579 (3e:5579) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 64 ;cutoff 6 octave 2 ;cutoff 4 - notetype0 1 + speed 1 .Loop1 note G_, 5 note G_, 5 note G_, 4 sound_loop 8, .Loop1 ;cutoff 6 - notetype0 7 + speed 7 .MainLoop inc_octave note C_, 2 diff --git a/crysaudio/music/TCG/ronald.asm b/crysaudio/music/TCG/ronald.asm index 7cf909d6..54e52aec 100644 --- a/crysaudio/music/TCG/ronald.asm +++ b/crysaudio/music/TCG/ronald.asm @@ -9,17 +9,17 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 12, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 0 .MainLoop octave 3 - notetype0 13 + speed 13 .Loop1 - notetype1 9 - notetype2 3 + channel_volume 9 + fade_wave 3 note D_, 1 note D_, 1 - notetype2 4 + fade_wave 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 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 2 rest 1 dec_octave - notetype1 9 - notetype2 3 + channel_volume 9 + fade_wave 3 note G_, 1 inc_octave note D_, 1 - notetype2 4 + fade_wave 4 note F_, 1 rest 2 note F_, 1 @@ -51,20 +51,20 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 1 note A_, 1 rest 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note G_, 2 rest 1 sound_loop 2, .Loop1 .Loop2 vibrato 20, 3, 3 sound_call Branch_fa9aa - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 2 vibrato 12, 3, 3 sound_call Branch_fa9ec @@ -72,28 +72,28 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) .Loop3 vibrato 20, 3, 3 sound_call Branch_fa9cb - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 2 vibrato 12, 3, 3 sound_call Branch_fa9ec sound_loop 2, .Loop3 sound_call Branch_fa9aa vibrato 20, 3, 3 - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 3 rest 7 duty_cycle 2 - notetype1 9 + channel_volume 9 rest 6 dec_octave - notetype2 4 + fade_wave 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 - notetype2 8 + fade_wave 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - notetype2 4 + fade_wave 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 - notetype2 8 + fade_wave 8 note G_, 6 - notetype2 4 + fade_wave 4 note C#, 7 note C_, 6 dec_octave note A#, 7 inc_octave - notetype2 8 + fade_wave 8 note C_, 4 note C#, 4 note C_, 5 dec_octave note A#, 6 inc_octave - notetype2 4 + fade_wave 4 note C_, 7 dec_octave note A#, 6 @@ -145,23 +145,23 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note F_, 6 note F#, 7 note G_, 6 - notetype2 8 + fade_wave 8 note A#, 7 inc_octave note C_, 6 note D_, 7 - notetype0 13 + speed 13 sound_call Branch_fa9aa - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 3 rest 7 duty_cycle 2 - notetype1 9 + channel_volume 9 rest 6 dec_octave - notetype2 4 + fade_wave 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 - notetype2 8 + fade_wave 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - notetype2 4 + fade_wave 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 - notetype2 8 + fade_wave 8 note A#, 7 inc_octave - notetype2 4 + fade_wave 4 note C_, 6 dec_octave note A#, 7 inc_octave - notetype2 8 + fade_wave 8 note C#, 4 note C_, 4 dec_octave note A#, 5 - notetype2 4 + fade_wave 4 note G_, 6 note F_, 7 note G_, 6 @@ -213,37 +213,37 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave note A#, 7 inc_octave - notetype2 8 + fade_wave 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - notetype2 4 + fade_wave 4 note A#, 6 note G_, 7 - notetype2 8 + fade_wave 8 sound_call Branch_fa9cb - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 3 rest 7 duty_cycle 2 - notetype1 9 + channel_volume 9 rest 13 - notetype2 4 + fade_wave 4 note F_, 6 rest 7 - notetype2 8 + fade_wave 8 note E_, 4 note F_, 4 note E_, 5 - notetype2 4 + fade_wave 4 note D_, 6 rest 7 - notetype2 8 + fade_wave 8 note E_, 6 - notetype2 4 + fade_wave 4 note C_, 7 dec_octave note G_, 6 @@ -252,43 +252,43 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note C#, 6 note D_, 7 dec_octave - notetype2 8 + fade_wave 8 note A#, 6 - notetype2 4 + fade_wave 4 note G_, 7 rest 6 note F_, 7 - notetype2 8 + fade_wave 8 note F#, 6 - notetype2 4 + fade_wave 4 note G_, 7 - notetype2 8 + fade_wave 8 note A#, 6 - notetype2 4 + fade_wave 4 note G_, 7 note A#, 6 inc_octave note C_, 7 - notetype2 8 + fade_wave 8 note C#, 6 - notetype2 4 + fade_wave 4 note D_, 7 note F_, 6 note D_, 7 - notetype2 8 + fade_wave 8 note F_, 6 dec_octave - notetype2 4 + fade_wave 4 note G_, 7 dec_octave note G_, 6 inc_octave note D_, 7 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 sound_call Branch_fa9cb - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 3 @@ -299,11 +299,11 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note G#, 10 note G_, 3 rest 10 - notetype0 13 + speed 13 note F_, 4 vibrato 12, 3, 3 - notetype0 1 - notetype1 9 + speed 1 + channel_volume 9 note C_, 6 rest 7 rest 13 @@ -313,13 +313,13 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note A_, 6 rest 7 rest 13 - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note G_, 2 rest 1 vibrato 20, 3, 3 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note F#, 3 note G_, 10 note A#, 3 @@ -396,10 +396,10 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 10 note G_, 3 rest 10 - notetype0 13 + speed 13 note A#, 3 rest 4 - notetype0 1 + speed 1 note B_, 3 inc_octave note C_, 16 @@ -414,7 +414,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 5 rest 1 dec_octave @@ -427,9 +427,9 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) Branch_fa9aa: octave 4 duty_cycle 1 - notetype1 10 + channel_volume 10 rest 2 - notetype0 1 + speed 1 note G#, 3 note A_, 3 rest 7 @@ -440,10 +440,10 @@ Branch_fa9aa: rest 13 note E_, 6 rest 7 - notetype0 13 + speed 13 rest 1 note F_, 1 - notetype0 1 + speed 1 note G_, 3 rest 10 note E_, 6 @@ -457,8 +457,8 @@ Branch_fa9aa: Branch_fa9cb: octave 4 duty_cycle 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 note F_, 3 @@ -489,26 +489,26 @@ Branch_fa9cb: Branch_fa9ec: octave 3 duty_cycle 0 - notetype1 9 - notetype0 1 + channel_volume 9 + speed 1 note F_, 6 rest 7 - notetype0 13 + speed 13 rest 2 - notetype0 1 + speed 1 note F_, 6 rest 7 - notetype0 13 + speed 13 rest 3 - notetype0 1 + speed 1 note F_, 6 rest 7 rest 13 note A_, 6 rest 7 rest 13 - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note G_, 2 rest 1 sound_ret @@ -518,13 +518,13 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 12, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 0 .MainLoop octave 2 .Loop1 - notetype0 1 - notetype1 9 + speed 1 + channel_volume 9 note G_, 3 rest 3 note G_, 3 @@ -558,13 +558,13 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) note D_, 6 rest 7 rest 13 - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note C_, 2 rest 1 dec_octave - notetype0 1 - notetype1 9 + speed 1 + channel_volume 9 note D_, 3 rest 3 note G_, 3 @@ -602,54 +602,54 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) note F_, 6 rest 7 rest 13 - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note E_, 2 rest 1 dec_octave sound_loop 2, .Loop1 .Loop2 sound_call Branch_fab76 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note C_, 2 rest 1 sound_call Branch_fab76 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note E_, 2 rest 1 sound_loop 4, .Loop2 .Loop3 vibrato 20, 3, 3 - notetype1 8 - notetype0 13 + channel_volume 8 + speed 13 duty_cycle 1 octave 4 rest 2 - notetype2 4 + fade_wave 4 note F_, 1 rest 1 - notetype2 8 + fade_wave 8 note D_, 1 dec_octave dec_octave - notetype2 4 + fade_wave 4 duty_cycle 0 - notetype1 9 + channel_volume 9 note A#, 1 rest 1 inc_octave inc_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note C_, 1 rest 1 - notetype2 8 + fade_wave 8 note D_, 1 - notetype2 3 + fade_wave 3 note E_, 1 - notetype2 4 + fade_wave 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 - notetype1 9 + channel_volume 9 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 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 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 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 rest 2 note F_, 1 @@ -697,27 +697,27 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note A_, 1 rest 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note G_, 2 rest 1 vibrato 20, 3, 3 sound_call Branch_fab8a octave 3 rest 1 - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note E_, 3 note F_, 10 note E_, 3 rest 10 - notetype0 13 + speed 13 note D_, 4 dec_octave vibrato 12, 3, 3 duty_cycle 0 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 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 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note E_, 2 rest 1 sound_call Branch_fabb1 rest 1 - notetype2 4 + fade_wave 4 octave 2 note A#, 1 rest 1 note A#, 1 rest 1 inc_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 2 rest 1 - notetype1 9 + channel_volume 9 rest 2 - notetype2 4 + fade_wave 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 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note F_, 2 rest 1 sound_call Branch_fabb1 rest 1 octave 2 - notetype2 4 + fade_wave 4 note G_, 1 rest 1 note G_, 1 rest 1 inc_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 2 rest 1 rest 2 dec_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note G_, 1 rest 2 note G_, 1 rest 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 1 - notetype1 7 + channel_volume 7 note F#, 8 rest 1 duty_cycle 0 @@ -792,10 +792,10 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) Branch_fab76: octave 2 - notetype1 9 - notetype0 13 + channel_volume 9 + speed 13 rest 2 - notetype2 4 + fade_wave 4 note A#, 1 rest 2 note A#, 1 @@ -812,13 +812,13 @@ Branch_fab76: Branch_fab8a: octave 4 duty_cycle 1 - notetype1 8 - notetype0 13 + channel_volume 8 + speed 13 note C_, 1 - notetype2 3 + fade_wave 3 note D_, 1 note E_, 1 - notetype2 4 + fade_wave 4 note C_, 1 rest 1 dec_octave @@ -827,15 +827,15 @@ Branch_fab8a: note A#, 1 rest 1 inc_octave - notetype2 8 + fade_wave 8 note C_, 1 - notetype2 3 + fade_wave 3 note D_, 1 note E_, 1 - notetype2 8 + fade_wave 8 note C_, 1 dec_octave - notetype2 4 + fade_wave 4 note A_, 1 rest 1 note A#, 1 @@ -843,10 +843,10 @@ Branch_fab8a: Branch_fabb1: octave 2 - notetype1 9 - notetype0 13 + channel_volume 9 + speed 13 rest 2 - notetype2 4 + fade_wave 4 note A#, 1 rest 2 note A#, 1 @@ -857,10 +857,10 @@ Branch_fabb1: Music_Ronald_Ch3: ; fabc0 (3e:6bc0) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 0 ;cutoff 8 .MainLoop @@ -1042,10 +1042,10 @@ Music_Ronald_Ch3: ; fabc0 (3e:6bc0) dec_octave note A_, 6 rest 7 - notetype0 13 + speed 13 note G#, 8 rest 1 - notetype0 1 + speed 1 sound_loop 0, .MainLoop Branch_fac94: diff --git a/crysaudio/music/TCG/titlescreen.asm b/crysaudio/music/TCG/titlescreen.asm index 58e89095..951dfe42 100644 --- a/crysaudio/music/TCG/titlescreen.asm +++ b/crysaudio/music/TCG/titlescreen.asm @@ -6,270 +6,270 @@ Music_TCGTitleScreen: channel 4, Music_TCGTitleScreen_Ch4 Music_TCGTitleScreen_Ch1: ; f5052 (3d:5052) - notetype0 7 + speed 7 duty_cycle 0 ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 octave 3 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F_, 1 - notetype2 8 + fade_wave 8 note E_, 3 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 inc_octave - notetype1 10 + channel_volume 10 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 13 - notetype2 6 + channel_volume 13 + fade_wave 6 note C_, 2 dec_octave - notetype2 8 + fade_wave 8 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 13 + channel_volume 13 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 - notetype2 8 + fade_wave 8 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F_, 2 - notetype2 8 + fade_wave 8 note F_, 2 - notetype0 1 + speed 1 note E_, 5 ;tie note F_, 4 ;tie note E_, 5 - notetype0 7 + speed 7 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 13 + channel_volume 13 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F_, 1 - notetype2 8 + fade_wave 8 note E_, 3 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 inc_octave - notetype1 10 + channel_volume 10 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 13 - notetype2 6 + channel_volume 13 + fade_wave 6 note E_, 2 dec_octave - notetype2 8 + fade_wave 8 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 13 + channel_volume 13 note E_, 2 note F_, 2 note G_, 2 note G#, 3 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 13 + channel_volume 13 inc_octave note C_, 3 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 + channel_volume 10 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 13 - notetype2 6 + channel_volume 13 + fade_wave 6 note C_, 2 - notetype2 8 + fade_wave 8 note G_, 9 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 13 + channel_volume 13 note F_, 2 note C_, 2 note D_, 2 .Loop1 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 + channel_volume 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note E_, 1 - notetype2 8 + fade_wave 8 sound_loop 2, .Loop1 note E_, 12 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 + channel_volume 10 note D_, 1 note C_, 1 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 - notetype2 8 + fade_wave 8 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 10 - notetype0 1 - notetype2 7 + channel_volume 10 + speed 1 + fade_wave 7 note G_, 5 note G_, 4 note G_, 5 - notetype2 8 - notetype0 7 + fade_wave 8 + speed 7 note G_, 9 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note F_, 2 note C_, 2 note D_, 2 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 + channel_volume 10 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 rest 1 - notetype2 6 - notetype1 10 + fade_wave 6 + channel_volume 10 note E_, 1 - notetype2 8 + fade_wave 8 note E_, 6 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 + channel_volume 10 note D_, 3 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C_, 3 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 2 - notetype1 10 + channel_volume 10 inc_octave - notetype2 6 + fade_wave 6 note C_, 1 - notetype2 8 + fade_wave 8 note C_, 8 ;tie note C_, 8 ;tie note C_, 8 - notetype1 3 + channel_volume 3 note C_, 8 sound_ret Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) - notetype0 7 + speed 7 duty_cycle 0 ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype1 8 - notetype2 8 + channel_volume 8 + fade_wave 8 octave 2 note B_, 1 - notetype1 2 + channel_volume 2 note B_, 1 rest 1 inc_octave - notetype1 8 - notetype2 6 + channel_volume 8 + fade_wave 6 note D_, 1 - notetype2 8 + fade_wave 8 note C_, 3 - notetype1 2 + channel_volume 2 note C_, 1 - notetype1 8 + channel_volume 8 note E_, 3 rest 1 note G_, 5 rest 1 - notetype2 6 + fade_wave 6 note G_, 2 - notetype2 8 + fade_wave 8 note E_, 10 rest 2 note C_, 1 rest 2 - notetype2 6 + fade_wave 6 note E_, 1 - notetype2 8 + fade_wave 8 note F_, 5 rest 1 - notetype2 6 + fade_wave 6 note C_, 2 - notetype2 7 + fade_wave 7 note C_, 2 - notetype2 8 + fade_wave 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 - notetype2 6 + fade_wave 6 note C_, 1 dec_octave - notetype2 8 + fade_wave 8 note B_, 3 rest 1 note B_, 1 rest 2 inc_octave - notetype2 6 + fade_wave 6 note D_, 1 - notetype2 8 + fade_wave 8 note C_, 3 - notetype1 2 + channel_volume 2 note C_, 1 - notetype1 8 + channel_volume 8 note E_, 3 rest 1 note G_, 5 rest 1 - notetype2 6 + fade_wave 6 note G_, 2 - notetype2 8 + fade_wave 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 - notetype2 6 + fade_wave 6 note F_, 2 - notetype2 8 + fade_wave 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 - notetype1 2 + channel_volume 2 note A_, 1 rest 1 - notetype1 8 + channel_volume 8 inc_octave - notetype2 6 + fade_wave 6 note C_, 1 - notetype2 8 + fade_wave 8 dec_octave note B_, 10 rest 2 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 rest 1 - notetype1 8 - notetype2 6 + channel_volume 8 + fade_wave 6 note B_, 1 - notetype2 8 + fade_wave 8 note A_, 12 - notetype1 2 + channel_volume 2 note A_, 2 - notetype1 8 + channel_volume 8 note B_, 1 note A_, 1 note B_, 1 - notetype1 2 + channel_volume 2 note B_, 1 rest 1 - notetype1 8 + channel_volume 8 inc_octave - notetype2 6 + fade_wave 6 note D_, 1 - notetype2 8 + fade_wave 8 note D_, 8 rest 2 - notetype0 1 - notetype2 7 + speed 1 + fade_wave 7 note D_, 5 note D_, 4 note D_, 5 - notetype0 7 - notetype2 8 + speed 7 + fade_wave 8 note C_, 9 rest 1 note C_, 2 dec_octave - notetype2 7 + fade_wave 7 note G#, 2 - notetype2 8 + fade_wave 8 note G#, 2 note G_, 10 rest 2 note G_, 1 rest 2 - notetype2 6 + fade_wave 6 note G_, 1 - notetype2 8 + fade_wave 8 note A_, 6 rest 2 note F#, 3 @@ -395,30 +395,30 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 2 note F_, 5 rest 2 - notetype2 6 + fade_wave 6 note F_, 1 - notetype2 8 + fade_wave 8 note F_, 7 rest 1 - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F_, 14 rest 5 note D_, 13 rest 5 note F_, 14 rest 5 - notetype0 7 + speed 7 note E_, 8 - notetype1 2 + channel_volume 2 note E_, 8 sound_ret Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) - notetype0 7 - notetype2 14 - notetype1 1 + speed 7 + fade_wave 14 + channel_volume 1 ;echo 0 ;stereo_panning 1, 1 ;cutoff 6 @@ -484,7 +484,7 @@ Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) inc_octave note C_, 4 note C_, 4 - notetype0 1 + speed 1 note C_, 9 ;tie note C_, 10 @@ -495,7 +495,7 @@ Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) note G_, 9 ;tie note G_, 10 - notetype0 7 + speed 7 ;cutoff 8 note C_, 8 sound_ret diff --git a/crysaudio/music/TCG2/credits.asm b/crysaudio/music/TCG2/credits.asm index fb710bae..4b9e154c 100644 --- a/crysaudio/music/TCG2/credits.asm +++ b/crysaudio/music/TCG2/credits.asm @@ -6,10 +6,10 @@ Music_TCG2Credits: channel 4, Music_TCG2Credits_Ch4 Music_TCG2Credits_Ch2: ; 1de32a (77:632a) - notetype1 10 + channel_volume 10 duty_cycle 2 - notetype1 15 - notetype0 1 + channel_volume 15 + speed 1 ;musicdc 255 octave 1 note G_, 16 @@ -136,7 +136,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note G_, 16 ;tie note G_, 4 - notetype1 13 + channel_volume 13 rest 15 inc_octave note D_, 14 @@ -409,7 +409,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note G_, 14 duty_cycle 1 octave 2 - notetype1 10 + channel_volume 10 ;musice4 203 note D_, 4 ;tie @@ -422,7 +422,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;musice4 242 note D_, 3 ;musice4 0 - notetype1 14 + channel_volume 14 note D_, 4 ;tie note D_, 3 @@ -525,9 +525,9 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;vibrato_type 5 vibrato 29, 3, 3 octave 1 - notetype1 10 + channel_volume 10 note G_, 15 - notetype1 14 + channel_volume 14 note G_, 14 ;tie note G_, 15 @@ -578,9 +578,9 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie ;musice4 0 note D_, 7 - notetype1 10 + channel_volume 10 note G_, 15 - notetype1 14 + channel_volume 14 note G_, 14 ;tie note G_, 15 @@ -623,7 +623,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie note C_, 15 note G_, 14 - notetype1 10 + channel_volume 10 inc_octave ;musice4 196 note C_, 4 @@ -637,7 +637,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;musice4 241 note C_, 3 ;musice4 0 - notetype1 14 + channel_volume 14 note C_, 14 ;tie note C_, 15 @@ -677,14 +677,14 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie ;musice4 0 note A_, 3 - notetype0 4 + speed 4 note E_, 15 ;tie note E_, 14 note A_, 15 ;tie note A_, 14 - notetype0 1 + speed 1 inc_octave ;musice4 203 note D_, 4 @@ -736,22 +736,22 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note G_, 15 note A_, 4 duty_cycle 2 - notetype1 13 - notetype0 1 + channel_volume 13 + speed 1 ;musicdc 255 vibrato 0, 3, 3 octave 2 note B_, 10 inc_octave - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 - notetype0 1 + speed 1 duty_cycle 1 ;vibrato_type 5 vibrato 29, 3, 3 - notetype1 14 + channel_volume 14 octave 1 note C_, 15 ;tie @@ -775,11 +775,11 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;musice4 0 note G_, 7 inc_octave - notetype0 4 + speed 4 note C_, 15 ;tie note C_, 14 - notetype0 1 + speed 1 dec_octave note B_, 15 ;tie @@ -806,11 +806,11 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie ;musice4 0 note A_, 3 - notetype0 4 + speed 4 note E_, 15 ;tie note E_, 14 - notetype0 1 + speed 1 note A_, 15 ;tie note A_, 14 @@ -918,7 +918,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie ;musice4 0 note G_, 7 - notetype0 4 + speed 4 note C_, 15 ;tie note C_, 14 @@ -928,7 +928,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note A#, 15 ;tie note A#, 14 - notetype0 1 + speed 1 note A_, 15 ;tie note A_, 14 @@ -1013,9 +1013,9 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie ;musice4 0 note D_, 7 - notetype1 10 + channel_volume 10 note G_, 15 - notetype1 14 + channel_volume 14 note G_, 14 ;tie note G_, 15 @@ -1041,12 +1041,12 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note G_, 3 ;musice4 0 dec_octave - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 ;tie - notetype0 1 + speed 1 note G_, 15 ;tie note G_, 14 @@ -1061,7 +1061,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note A_, 15 note B_, 14 inc_octave - notetype0 4 + speed 4 note C_, 15 ;tie note C_, 14 @@ -1069,7 +1069,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note B_, 15 ;tie note B_, 14 - notetype0 1 + speed 1 note A_, 15 ;tie note A_, 14 @@ -1103,7 +1103,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 14 note E_, 15 note F#, 14 - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 @@ -1116,7 +1116,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note E_, 15 ;tie note E_, 14 - notetype0 1 + speed 1 note A_, 15 ;tie note A_, 14 @@ -1158,9 +1158,9 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note C_, 15 ;tie note C_, 14 - notetype1 10 + channel_volume 10 note D_, 15 - notetype1 14 + channel_volume 14 note D_, 14 ;tie note D_, 15 @@ -1192,7 +1192,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) duty_cycle 1 ;vibrato_type 5 vibrato 29, 3, 3 - notetype1 14 + channel_volume 14 octave 1 note G_, 15 ;tie @@ -1204,8 +1204,8 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 14 rest 15 duty_cycle 2 - notetype1 13 - notetype0 1 + channel_volume 13 + speed 1 vibrato 0, 3, 3 octave 3 rest 4 @@ -1228,7 +1228,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) duty_cycle 1 ;vibrato_type 5 vibrato 29, 3, 3 - notetype1 14 + channel_volume 14 octave 1 note D_, 14 octave 1 @@ -1242,8 +1242,8 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 14 rest 15 duty_cycle 2 - notetype1 13 - notetype0 1 + channel_volume 13 + speed 1 vibrato 0, 3, 3 octave 3 rest 4 @@ -1259,7 +1259,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) duty_cycle 1 ;vibrato_type 5 vibrato 29, 3, 3 - notetype1 14 + channel_volume 14 octave 1 note A#, 4 ;tie @@ -1285,8 +1285,8 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 14 rest 15 duty_cycle 2 - notetype1 13 - notetype0 1 + channel_volume 13 + speed 1 vibrato 0, 3, 3 octave 3 rest 4 @@ -1309,7 +1309,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) duty_cycle 1 ;vibrato_type 5 vibrato 29, 3, 3 - notetype1 14 + channel_volume 14 octave 1 note D_, 14 note G_, 15 @@ -1475,11 +1475,11 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note A_, 15 note B_, 14 inc_octave - notetype1 7 + channel_volume 7 note C_, 15 ;tie note C_, 14 - notetype1 14 + channel_volume 14 note C_, 15 ;tie note C_, 14 @@ -1673,7 +1673,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) rest 4 note C#, 11 rest 3 - notetype0 2 + speed 2 note D_, 15 ;tie note D_, 14 @@ -1681,7 +1681,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 15 ;tie note D_, 14 - notetype0 1 + speed 1 .Loop6 rept 4 note G_, 11 @@ -1703,20 +1703,20 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) rest 3 sound_loop 4, .Loop7 ;musicf1 102 - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 - notetype0 2 + speed 2 note G_, 14 sound_ret Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) - notetype1 10 + channel_volume 10 duty_cycle 2 - notetype1 13 - notetype0 1 + channel_volume 13 + speed 1 ;musicdc 255 rest 15 octave 2 @@ -1834,7 +1834,7 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note C_, 16 ;tie note C_, 4 - notetype1 13 + channel_volume 13 dec_octave dec_octave note G_, 16 @@ -2333,14 +2333,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 15 inc_octave note C_, 10 - notetype1 13 + channel_volume 13 note D_, 4 ;tie - notetype0 4 + speed 4 note D_, 15 ;tie note G_, 14 - notetype0 1 + speed 1 ;musicf0 5 ;musicf1 71 octave 3 @@ -3053,11 +3053,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 7 ;tie - notetype0 3 + speed 3 note F_, 15 ;tie note F_, 14 - notetype0 1 + speed 1 rest 15 rest 14 rest 15 @@ -3074,11 +3074,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 7 ;tie - notetype0 3 + speed 3 note F_, 15 ;tie note F_, 14 - notetype0 1 + speed 1 rest 15 rest 14 rest 15 @@ -3095,11 +3095,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 7 ;tie - notetype0 3 + speed 3 note F_, 15 ;tie note F_, 14 - notetype0 1 + speed 1 rest 15 rest 14 rest 15 @@ -3116,11 +3116,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 7 ;tie - notetype0 3 + speed 3 note F_, 15 ;tie note F_, 14 - notetype0 1 + speed 1 rest 15 rest 14 octave 1 @@ -4045,24 +4045,24 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G_, 15 ;tie note G_, 14 - notetype0 2 + speed 2 note G_, 14 sound_ret Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) - notetype1 10 - ;notetype2 16 + channel_volume 10 + ;fade_wave 16 load_wave 12, 12, 12, 12, 12, 12, 12, 12, 11, 12, 12, 12, 11, 12, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11 ;musicdc 255 - notetype0 1 - notetype1 1 + speed 1 + channel_volume 1 ;musice9 96 octave 5 ;musice8 8 ;vibrato_type 3 vibrato 15, 3, 3 - notetype1 2 + channel_volume 2 ;musice8 8 note G#, 3 note A_, 12 @@ -4113,17 +4113,17 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;musice8 1 note G_, 14 ;tie - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 ;tie - notetype0 2 + speed 2 note G_, 15 ;tie note G_, 14 ;musice8 8 - notetype0 1 + speed 1 note G#, 3 note A_, 12 ;tie @@ -4173,19 +4173,19 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;musice8 1 note G_, 14 ;tie - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 ;tie - notetype0 1 + speed 1 note G_, 2 ;tie - notetype0 3 + speed 3 note G_, 9 - notetype0 1 + speed 1 ;musice8 8 - notetype1 1 + channel_volume 1 rest 15 rest 14 rest 15 @@ -4303,19 +4303,19 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note A_, 14 vibrato 0, 3, 3 ;musice8 8 - notetype1 2 + channel_volume 2 note B_, 15 ;tie note B_, 14 ;tie note B_, 15 dec_octave - notetype1 1 + channel_volume 1 sound_call Branch_1dfa9d sound_call Branch_1dfb57 - notetype0 2 + speed 2 note G_, 14 - notetype0 1 + speed 1 rest 1 rest 15 rest 14 @@ -4569,23 +4569,23 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;musice8 1 note D_, 14 ;tie - notetype0 4 + speed 4 note D_, 15 ;tie note D_, 14 ;tie - notetype0 2 + speed 2 note D_, 15 ;tie note D_, 14 ;tie - notetype0 1 + speed 1 note D_, 1 ;tie - notetype0 2 + speed 2 note D_, 14 ;musice8 8 - notetype0 1 + speed 1 vibrato 0, 3, 3 note C#, 3 note D_, 12 @@ -4628,15 +4628,15 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note G_, 15 vibrato 14, 3, 3 ;musice8 1 - notetype0 1 + speed 1 note D_, 14 ;tie - notetype0 4 + speed 4 note D_, 15 ;tie note D_, 14 ;tie - notetype0 1 + speed 1 note D_, 15 ;tie note D_, 14 @@ -4696,20 +4696,20 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;tie note A_, 15 vibrato 0, 3, 3 - notetype1 2 + channel_volume 2 inc_octave ;musice8 1 note C_, 7 ;tie - notetype0 2 + speed 2 note C_, 11 - notetype0 8 - notetype0 1 + speed 8 + speed 1 note E_, 7 ;tie - notetype0 2 + speed 2 note E_, 11 - notetype0 1 + speed 1 ;musice8 8 note D_, 14 ;tie @@ -4723,7 +4723,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note F#, 14 inc_octave ;musice8 8 - notetype1 1 + channel_volume 1 note C#, 3 note D_, 12 note C_, 14 @@ -4782,7 +4782,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note D_, 15 vibrato 0, 3, 3 dec_octave - notetype1 2 + channel_volume 2 note B_, 3 inc_octave note C_, 11 @@ -4796,7 +4796,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note F_, 15 inc_octave ;musice8 8 - notetype1 1 + channel_volume 1 note C_, 14 dec_octave note B_, 15 @@ -4879,7 +4879,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note G_, 15 dec_octave note G_, 7 - notetype1 2 + channel_volume 2 note G_, 7 ;tie note G_, 15 @@ -4890,7 +4890,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;tie note G_, 14 ;tie - notetype1 2 + channel_volume 2 ;musice8 1 note G_, 15 ;tie @@ -4903,7 +4903,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) rest 14 rest 8 octave 3 - notetype1 2 + channel_volume 2 ;musice4 253 note D_, 14 note G_, 15 @@ -4913,9 +4913,9 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) dec_octave note G_, 7 ;musice4 0 - notetype1 1 + channel_volume 1 note G_, 7 - notetype1 2 + channel_volume 2 note G_, 7 ;tie note G_, 15 @@ -4926,7 +4926,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;tie note G_, 14 ;tie - notetype1 2 + channel_volume 2 ;musice8 1 note G_, 15 ;tie @@ -4939,7 +4939,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) rest 14 rest 8 octave 3 - notetype1 2 + channel_volume 2 ;musice4 253 note D_, 14 note G_, 15 @@ -4950,9 +4950,9 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note G_, 7 ;musice4 0 inc_octave - notetype1 1 + channel_volume 1 note C_, 7 - notetype1 2 + channel_volume 2 note C_, 7 ;tie note C_, 15 @@ -4966,11 +4966,11 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note C_, 15 ;tie note C_, 14 - notetype1 3 + channel_volume 3 note C_, 15 vibrato 0, 3, 3 rest 14 - notetype1 1 + channel_volume 1 rest 15 rest 14 rest 15 @@ -5029,9 +5029,9 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;tie note F_, 1 ;tie - notetype0 2 + speed 2 note F_, 14 - notetype0 1 + speed 1 ;musice8 8 vibrato 29, 3, 3 note F#, 15 @@ -5147,9 +5147,9 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;tie note G_, 1 ;tie - notetype0 2 + speed 2 note G_, 14 - notetype0 1 + speed 1 vibrato 0, 3, 3 ;musice8 8 note F#, 3 @@ -5317,10 +5317,10 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note B_, 14 vibrato 0, 3, 3 ;musice8 1 - notetype0 1 - notetype1 2 + speed 1 + channel_volume 2 note B_, 14 - notetype1 3 + channel_volume 3 note B_, 7 rest 7 sound_ret diff --git a/crysaudio/music/TCG2/diddly1.asm b/crysaudio/music/TCG2/diddly1.asm index 08150658..3f6e739e 100644 --- a/crysaudio/music/TCG2/diddly1.asm +++ b/crysaudio/music/TCG2/diddly1.asm @@ -5,9 +5,9 @@ Music_Diddly1: channel 3, Music_Diddly1_Ch3 Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 octave 2 note D#, 2 note E_, 3 @@ -92,9 +92,9 @@ Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57) Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 octave 1 ;musicef 1 note G_, 2 @@ -184,16 +184,16 @@ Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5) Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) - notetype1 10 - ;notetype2 15 + channel_volume 10 + ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - notetype0 1 + speed 1 ;musicdc 255 octave 2 - notetype1 1 + channel_volume 1 note C_, 2 note C#, 3 - notetype1 2 + channel_volume 2 ;musicef 252 note C_, 3 note C#, 3 @@ -212,7 +212,7 @@ Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) note E_, 2 note G_, 3 note A#, 3 - notetype1 1 + channel_volume 1 inc_octave note C_, 3 dec_octave @@ -243,14 +243,14 @@ Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) note C_, 3 note E_, 3 dec_octave - notetype1 2 + channel_volume 2 note G_, 2 note A#, 3 inc_octave note C_, 3 note E_, 3 dec_octave - notetype1 128 + channel_volume 128 note G_, 2 note A#, 3 inc_octave diff --git a/crysaudio/music/TCG2/diddly2.asm b/crysaudio/music/TCG2/diddly2.asm index c579bcfe..f4d5d82c 100644 --- a/crysaudio/music/TCG2/diddly2.asm +++ b/crysaudio/music/TCG2/diddly2.asm @@ -5,9 +5,9 @@ Music_Diddly2: channel 3, Music_Diddly2_Ch3 Music_Diddly2_Ch2: ; 1ebd67 (7a:7d67) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 octave 2 note B_, 5 @@ -75,9 +75,9 @@ Music_Diddly2_Ch2: ; 1ebd67 (7a:7d67) Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 octave 2 note F_, 4 @@ -173,16 +173,16 @@ Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) - notetype1 10 - notetype2 14 - notetype0 1 + channel_volume 10 + fade_wave 14 + speed 1 ;musice9 128 ;musicdc 255 ;musice8 7 - notetype1 1 + channel_volume 1 octave 2 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 4 note G_, 4 note G_, 4 @@ -194,23 +194,23 @@ Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) note G_, 4 note G_, 4 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 5 note G_, 4 note G_, 4 note G_, 4 note G_, 4 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 5 note G_, 4 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 4 - notetype1 2 + channel_volume 2 note G_, 4 note G_, 4 - notetype1 1 + channel_volume 1 note G_, 5 note G_, 4 note G_, 4 @@ -218,14 +218,14 @@ Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) note G_, 4 note G_, 4 note G_, 4 - notetype1 2 + channel_volume 2 note G_, 5 note G_, 4 note G_, 4 note G_, 4 note G_, 4 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 5 note G_, 4 note G_, 4 diff --git a/crysaudio/music/TCG2/diddly3.asm b/crysaudio/music/TCG2/diddly3.asm index 591ae08d..1558f770 100644 --- a/crysaudio/music/TCG2/diddly3.asm +++ b/crysaudio/music/TCG2/diddly3.asm @@ -5,9 +5,9 @@ Music_Diddly3: channel 3, Music_Diddly3_Ch3 Music_Diddly3_Ch2: ; 1ebe5d (7a:7e5d) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 octave 5 note C_, 3 @@ -28,9 +28,9 @@ Music_Diddly3_Ch2: ; 1ebe5d (7a:7e5d) Music_Diddly3_Ch1: ; 1ebe76 (7a:7e76) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 ;musicef 253 rest 1 @@ -53,14 +53,14 @@ Music_Diddly3_Ch1: ; 1ebe76 (7a:7e76) Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) - notetype1 10 - ;notetype2 15 + channel_volume 10 + ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - notetype0 1 - notetype1 2 + speed 1 + channel_volume 2 ;musice9 128 ;musicdc 255 - notetype0 1 + speed 1 ;musice8 7 octave 5 note G_, 3 @@ -72,7 +72,7 @@ Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) note E_, 3 inc_octave note C_, 4 - notetype1 128 + channel_volume 128 note C_, 4 sound_ret ; 0x1ebeae diff --git a/crysaudio/music/TCG2/diddly4.asm b/crysaudio/music/TCG2/diddly4.asm index 27424bf2..57c9f15c 100644 --- a/crysaudio/music/TCG2/diddly4.asm +++ b/crysaudio/music/TCG2/diddly4.asm @@ -5,9 +5,9 @@ Music_Diddly4: channel 3, Music_Diddly4_Ch3 Music_Diddly4_Ch2: ; 1ebeae (7a:7eae) - notetype1 10 + channel_volume 10 ;musicf0 0 - notetype0 1 + speed 1 ;musicdc 255 octave 3 ;musicf1 87 @@ -30,9 +30,9 @@ Music_Diddly4_Ch2: ; 1ebeae (7a:7eae) Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7) - notetype1 10 + channel_volume 10 ;musicf0 0 - notetype0 1 + speed 1 ;musicdc 255 octave 2 ;musicf1 87 @@ -55,13 +55,13 @@ Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7) Music_Diddly4_Ch3: ; 1ebee0 (7a:7ee0) - notetype1 10 - notetype2 14 - notetype0 1 - notetype1 2 + channel_volume 10 + fade_wave 14 + speed 1 + channel_volume 2 ;musice9 128 ;musicdc 255 - notetype0 1 + speed 1 ;musice8 1 rest 6 rest 5 diff --git a/crysaudio/music/TCG2/diddly5.asm b/crysaudio/music/TCG2/diddly5.asm index 1f230cb1..28c68703 100644 --- a/crysaudio/music/TCG2/diddly5.asm +++ b/crysaudio/music/TCG2/diddly5.asm @@ -4,9 +4,9 @@ Music_Diddly5: channel 2, Music_Diddly5_Ch2 Music_Diddly5_Ch2: ; 1ebefa (7a:7efa) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 octave 3 note G_, 2 @@ -37,9 +37,9 @@ Music_Diddly5_Ch2: ; 1ebefa (7a:7efa) Music_Diddly5_Ch1: ; 1ebf1b (7a:7f1b) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 ;musicef 254 octave 2 diff --git a/crysaudio/music/TCG2/diddly6.asm b/crysaudio/music/TCG2/diddly6.asm index df4019c1..d024c2b5 100644 --- a/crysaudio/music/TCG2/diddly6.asm +++ b/crysaudio/music/TCG2/diddly6.asm @@ -6,9 +6,9 @@ Music_Diddly6: channel 4, Music_Diddly6_Ch4 Music_Diddly6_Ch2: ; 1f76dc (7d:76dc) - notetype1 10 + channel_volume 10 ;musicf0 34 - notetype0 1 + speed 1 ;musicdc 255 ;musicef 252 octave 3 @@ -79,15 +79,15 @@ Music_Diddly6_Ch2: ; 1f76dc (7d:76dc) note B_, 16 ;tie note B_, 2 - notetype0 2 + speed 2 note B_, 10 sound_ret Music_Diddly6_Ch1: ; 1f7731 (7d:7731) - notetype1 10 + channel_volume 10 ;musicf0 23 - notetype0 1 + speed 1 ;musicdc 255 ;musicef 252 octave 3 @@ -227,18 +227,18 @@ Music_Diddly6_Ch1: ; 1f7731 (7d:7731) note G_, 16 ;tie note G_, 2 - notetype0 2 + speed 2 note G_, 10 sound_ret Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) - notetype1 10 - ;notetype2 15 + channel_volume 10 + ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - notetype1 1 + channel_volume 1 ;musice9 96 - notetype0 1 + speed 1 ;musicdc 17 rest 10 rest 10 @@ -268,12 +268,12 @@ Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) note D_, 2 .Loop1 ;musice8 4 - notetype0 7 + speed 7 note G_, 3 - notetype0 10 + speed 10 note D_, 2 sound_loop 4, .Loop1 - notetype0 1 + speed 1 note G_, 16 ;tie note G_, 16 @@ -285,7 +285,7 @@ Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) note G_, 16 ;tie note G_, 2 - notetype0 2 + speed 2 ;musice8 1 note G_, 10 sound_ret diff --git a/crysaudio/music/TCG2/fort1.asm b/crysaudio/music/TCG2/fort1.asm index 9d165c69..f9b9d3ef 100644 --- a/crysaudio/music/TCG2/fort1.asm +++ b/crysaudio/music/TCG2/fort1.asm @@ -6,8 +6,8 @@ Music_Fort1: channel 4, Music_Fort1_Ch4 Music_Fort1_Ch2: ; 1ed6cc (7b:56cc) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 17 ;musicf0 16 octave 2 @@ -466,10 +466,10 @@ Branch_1ed8a8: Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 duty_cycle 0 - notetype1 9 + channel_volume 9 ;musicdc 17 ;vibrato_type 10 vibrato 18, 3, 3 @@ -517,7 +517,7 @@ Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) note C#, 10 rest 15 ;musicf3 - notetype1 8 + channel_volume 8 note D#, 3 note E_, 13 ;tie @@ -1004,10 +1004,10 @@ Branch_1edb5a: Music_Fort1_Ch3: ; 1edb66 (7b:5b66) - notetype1 10 - notetype0 1 - notetype2 14 - notetype1 1 + channel_volume 10 + speed 1 + fade_wave 14 + channel_volume 1 ;musice9 96 ;musicdc 17 octave 2 diff --git a/crysaudio/music/TCG2/fort2.asm b/crysaudio/music/TCG2/fort2.asm index a638e27a..6a379992 100644 --- a/crysaudio/music/TCG2/fort2.asm +++ b/crysaudio/music/TCG2/fort2.asm @@ -6,8 +6,8 @@ Music_Fort2: channel 4, Music_Fort2_Ch4 Music_Fort2_Ch2: ; 1edefc (7b:5efc) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 17 .MainLoop octave 3 @@ -545,8 +545,8 @@ Branch_1ee109: Music_Fort2_Ch1: ; 1ee12f (7b:612f) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 17 .MainLoop ;musicf0 23 @@ -996,16 +996,16 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) Music_Fort2_Ch3: ; 1ee319 (7b:6319) - notetype1 10 - ;notetype2 15 + channel_volume 10 + ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - notetype1 2 + channel_volume 2 ;musice9 0 ;musicdc 17 octave 4 ;musicf3 octave 3 - notetype0 1 + speed 1 rest 15 rest 15 octave 4 @@ -1054,7 +1054,7 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note D_, 4 rest 4 rest 7 - notetype1 1 + channel_volume 1 ;musice8 8 octave 2 note A_, 2 @@ -1725,9 +1725,9 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) ;tie note F#, 8 octave 4 - notetype1 2 + channel_volume 2 note E_, 7 - notetype1 1 + channel_volume 1 octave 3 note E_, 8 note F_, 7 @@ -1736,17 +1736,17 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note F#, 7 note B_, 8 octave 4 - notetype1 2 + channel_volume 2 note D_, 7 octave 3 - notetype1 2 + channel_volume 2 note A_, 8 note A#, 7 note B_, 8 - notetype1 2 + channel_volume 2 octave 5 note D_, 7 - notetype1 1 + channel_volume 1 octave 2 note E_, 8 rest 7 diff --git a/crysaudio/music/TCG2/fort3.asm b/crysaudio/music/TCG2/fort3.asm index 8c3826b1..59d89274 100644 --- a/crysaudio/music/TCG2/fort3.asm +++ b/crysaudio/music/TCG2/fort3.asm @@ -6,8 +6,8 @@ Music_Fort3: channel 4, Music_Fort3_Ch4 Music_Fort3_Ch2: ; 1ee797 (7b:6797) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 rest 14 .MainLoop ;musicf0 9 @@ -713,8 +713,8 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 rest 14 .MainLoop ;musicf0 9 @@ -1291,11 +1291,11 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) - notetype1 10 - notetype0 1 - notetype2 11 + channel_volume 10 + speed 1 + fade_wave 11 ;musicdc 255 - notetype1 1 + channel_volume 1 ;musice9 96 ;musicec 244 octave 3 @@ -1310,7 +1310,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) ;musice8 4 note D_, 14 ;musice8 8 - notetype1 2 + channel_volume 2 note F_, 4 ;tie note F#, 4 @@ -1337,10 +1337,10 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) note F_, 15 ;tie note F_, 14 - notetype1 3 + channel_volume 3 note F_, 15 dec_octave - notetype1 1 + channel_volume 1 note F_, 7 note F#, 7 note G_, 15 @@ -1348,7 +1348,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) ;musice8 4 note D_, 14 ;musice8 8 - notetype1 2 + channel_volume 2 note D#, 4 ;tie note E_, 4 @@ -1375,10 +1375,10 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) note D#, 15 ;tie note D#, 14 - notetype1 3 + channel_volume 3 note D#, 15 dec_octave - notetype1 1 + channel_volume 1 note F_, 7 note F#, 7 note G_, 15 @@ -1386,7 +1386,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) ;musice8 4 note D_, 14 ;musice8 8 - notetype1 2 + channel_volume 2 note F_, 4 ;tie note F#, 4 @@ -1413,10 +1413,10 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) note F_, 15 ;tie note F_, 14 - notetype1 3 + channel_volume 3 note F_, 15 dec_octave - notetype1 1 + channel_volume 1 note F_, 7 note F#, 7 note G_, 15 @@ -1424,7 +1424,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) ;musice8 4 note D_, 14 ;musice8 8 - notetype1 2 + channel_volume 2 note D#, 4 ;tie note E_, 4 @@ -1446,7 +1446,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) ;tie note D#, 15 dec_octave - notetype1 1 + channel_volume 1 note F_, 7 ;musice8 3 note G_, 15 @@ -1995,12 +1995,12 @@ Branch_1ef040: sound_ret Branch_1ef06a: - notetype1 1 + channel_volume 1 vibrato 12, 3, 3 sound_ret Branch_1ef06f: - notetype1 1 + channel_volume 1 vibrato 0, 3, 3 sound_ret diff --git a/crysaudio/music/TCG2/fort4.asm b/crysaudio/music/TCG2/fort4.asm index 912374d6..2db9ca63 100644 --- a/crysaudio/music/TCG2/fort4.asm +++ b/crysaudio/music/TCG2/fort4.asm @@ -6,21 +6,21 @@ Music_Fort4: channel 4, Music_Fort4_Ch4 Music_Fort4_Ch2: ; 1f16cc (7c:56cc) - notetype1 10 + channel_volume 10 ;musicf0 22 - notetype0 1 + speed 1 ;musicdc 255 octave 2 note C_, 16 .MainLoop ;musicf0 9 - notetype0 1 + speed 1 ;musicdc 255 ;musicef 255 ;musicf1 71 octave 2 - notetype0 4 - notetype2 7 + speed 4 + fade_wave 7 ;musicf2 .Loop1 note D_, 1 @@ -45,13 +45,13 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) sound_loop 4, .Loop1 duty_cycle 1 octave 3 - notetype2 8 - notetype0 8 + fade_wave 8 + speed 8 ;musicf1 103 ;musicf3 - notetype1 2 + channel_volume 2 note E_, 14 - notetype1 11 + channel_volume 11 ;vibrato_type 5 vibrato 1, 3, 3 ;musicf2 @@ -68,20 +68,20 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note E_, 4 note E_, 2 ;musicf3 - notetype1 1 + channel_volume 1 note D_, 10 - notetype1 11 + channel_volume 11 ;musicf2 note D_, 14 note D_, 2 ;musicf3 - notetype1 11 + channel_volume 11 note D_, 4 note D_, 2 ;musicf3 - notetype1 2 + channel_volume 2 note G_, 10 - notetype1 11 + channel_volume 11 ;musicf2 note G_, 6 note G_, 2 @@ -90,12 +90,12 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note C_, 3 note F_, 2 vibrato 40, 3, 3 - notetype0 1 + speed 1 note E_, 4 - notetype0 8 - notetype0 1 + speed 8 + speed 1 note F_, 4 - notetype0 8 + speed 8 ;musicf2 note E_, 5 ;tie @@ -104,9 +104,9 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note E_, 12 note E_, 4 ;musicf3 - notetype1 2 + channel_volume 2 note E_, 14 - notetype1 11 + channel_volume 11 ;vibrato_type 5 vibrato 1, 3, 3 ;musicf2 @@ -123,83 +123,83 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note A_, 4 note A_, 2 ;musicf3 - notetype1 1 + channel_volume 1 note G_, 10 - notetype1 11 + channel_volume 11 ;musicf2 note G_, 14 note G_, 2 ;musicf3 vibrato 0, 3, 3 - notetype1 1 + channel_volume 1 ;musicf2 note A_, 4 note A_, 2 - notetype1 11 + channel_volume 11 ;musicf3 note G_, 6 ;musicf2 note D_, 2 note D_, 2 - notetype1 1 + channel_volume 1 note G_, 6 note G_, 2 ;musicf3 note F_, 4 - notetype1 11 + channel_volume 11 note G_, 3 - notetype0 4 + speed 4 note F_, 1 note G_, 1 - notetype0 8 + speed 8 vibrato 0, 3, 3 - notetype1 1 + channel_volume 1 note F_, 7 - notetype1 11 + channel_volume 11 vibrato 1, 3, 3 note F_, 8 vibrato 0, 3, 3 - notetype0 4 + speed 4 note E_, 1 note F_, 1 - notetype0 8 + speed 8 vibrato 48, 3, 3 note E_, 8 - notetype1 1 + channel_volume 1 note F_, 4 - notetype1 11 + channel_volume 11 note G_, 4 - notetype1 1 + channel_volume 1 note A_, 6 - notetype1 11 + channel_volume 11 note A_, 2 - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 1 + channel_volume 1 inc_octave note C_, 6 - notetype1 11 + channel_volume 11 note C_, 2 dec_octave - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 12 + channel_volume 12 ;musicf2 note A_, 1 note A_, 1 rest 2 ;musicf3 ;musicf0 9 - notetype0 1 + speed 1 ;musicdc 255 octave 3 ;musicf1 96 - notetype0 4 - notetype2 7 + speed 4 + fade_wave 7 ;musicf2 note E_, 1 rest 1 @@ -239,41 +239,41 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) sound_loop 3, .Loop2 duty_cycle 1 octave 3 - notetype2 8 + fade_wave 8 vibrato 0, 3, 3 - notetype0 8 + speed 8 ;musicf1 103 ;musicf3 .Loop3 - notetype1 1 + channel_volume 1 note A_, 6 - notetype1 11 + channel_volume 11 note A_, 2 - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 1 + channel_volume 1 inc_octave note C_, 6 - notetype1 11 + channel_volume 11 note C_, 2 dec_octave - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 sound_loop 2, .Loop3 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note A_, 4 - notetype0 8 - notetype0 1 - notetype1 9 + speed 8 + speed 1 + channel_volume 9 note A#, 4 - notetype0 8 + speed 8 vibrato 40, 3, 3 - notetype1 8 + channel_volume 8 note A_, 15 note A_, 16 ;tie @@ -282,8 +282,8 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note A_, 8 note A_, 1 dec_octave - notetype0 1 - notetype1 12 + speed 1 + channel_volume 12 ;musicf1 102 ;musicf3 note A#, 8 @@ -307,13 +307,13 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) Music_Fort4_Ch1: ; 1f1852 (7c:5852) - notetype1 10 - notetype1 15 + channel_volume 10 + channel_volume 15 duty_cycle 2 ;musicee 28 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 octave 3 ;musicef 250 note G_, 5 @@ -321,19 +321,19 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note G_, 5 ;musicef 4 note G_, 6 - notetype0 8 + speed 8 note G_, 4 ;musicee 0 rest 12 .MainLoop ;musicee 0 - notetype0 8 + speed 8 rest 16 rest 16 rest 16 ;musicf0 23 ;musicf1 23 - notetype0 4 + speed 4 octave 4 ;musicf3 rest 1 @@ -982,62 +982,62 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 duty_cycle 1 octave 3 - notetype2 8 - notetype0 8 + fade_wave 8 + speed 8 ;musicf1 103 ;musicf3 octave 3 - notetype1 1 + channel_volume 1 note F_, 6 - notetype1 11 + channel_volume 11 note F_, 2 - notetype1 1 + channel_volume 1 note D_, 6 - notetype1 11 + channel_volume 11 note D_, 2 - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 1 + channel_volume 1 note D_, 6 - notetype1 11 + channel_volume 11 note D_, 2 - notetype1 12 + channel_volume 12 ;musicf2 note E_, 1 note E_, 1 rest 1 ;musicf3 - notetype1 15 + channel_volume 15 duty_cycle 2 ;musicee 28 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 octave 3 ;musicef 250 note G_, 4 ;musicef 2 note G_, 4 ;musicef 4 - notetype0 8 + speed 8 note G_, 4 rest 4 inc_octave note C_, 4 dec_octave .Loop4 - notetype0 8 + speed 8 rest 3 - notetype0 1 + speed 1 octave 3 ;musicef 250 note G_, 4 ;musicef 2 note G_, 4 ;musicef 4 - notetype0 8 + speed 8 note G_, 4 inc_octave rest 4 @@ -1047,58 +1047,58 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) ;musicee 0 duty_cycle 1 octave 3 - notetype2 8 - notetype0 8 + fade_wave 8 + speed 8 ;musicf1 103 ;musicf3 octave 3 - notetype1 1 + channel_volume 1 note D#, 6 - notetype1 11 + channel_volume 11 note D#, 2 - notetype1 1 + channel_volume 1 note C#, 6 - notetype1 11 + channel_volume 11 note C#, 2 - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 1 + channel_volume 1 note C#, 6 sound_call Branch_1f1c7c duty_cycle 1 octave 3 - notetype2 8 - notetype0 8 + fade_wave 8 + speed 8 ;musicf1 103 ;musicf3 octave 3 - notetype1 1 + channel_volume 1 note E_, 6 - notetype1 11 + channel_volume 11 note E_, 2 - notetype1 1 + channel_volume 1 note D_, 6 - notetype1 11 + channel_volume 11 note D_, 2 - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 1 + channel_volume 1 note D_, 6 - notetype1 11 + channel_volume 11 note D_, 2 ;musicee 0 ;musicf0 4 octave 3 ;musicf1 80 ;musicf3 - notetype0 1 + speed 1 note E_, 4 note F_, 4 - notetype0 8 + speed 8 note E_, 5 sound_call Branch_1f1c69 ;musicf0 4 @@ -1138,10 +1138,10 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note F_, 1 note F_, 2 ;musicf3 - notetype0 1 + speed 1 note E_, 4 note F_, 4 - notetype0 8 + speed 8 note E_, 5 sound_call Branch_1f1c69 ;musicf0 4 @@ -1162,15 +1162,15 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note D_, 1 note D_, 2 ;musicf3 - notetype0 1 + speed 1 note C#, 4 note D_, 4 - notetype0 8 + speed 8 ;musicf2 note C#, 7 note C#, 1 ;musicf3 - notetype0 1 + speed 1 octave 2 note G_, 8 ;musicf2 @@ -1189,30 +1189,30 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note C#, 5 note C#, 3 ;musicf3 - notetype0 8 + speed 8 rest 16 sound_loop 0, .MainLoop Branch_1f1c69: - notetype1 15 + channel_volume 15 duty_cycle 2 ;musicee 28 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 octave 3 note G_, 16 ;musicee 0 - notetype0 8 + speed 8 sound_ret Branch_1f1c7c: - notetype1 15 + channel_volume 15 duty_cycle 2 ;musicee 28 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 octave 3 ;musicef 250 note G_, 5 @@ -1221,30 +1221,30 @@ Branch_1f1c7c: ;musicef 2 note G_, 6 ;musicee 0 - notetype0 8 + speed 8 sound_ret Branch_1f1c97: - notetype1 15 + channel_volume 15 duty_cycle 2 ;musicee 28 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 octave 4 note G_, 8 ;musicee 0 - notetype0 8 + speed 8 sound_ret Music_Fort4_Ch3: ; 1f1caa (7c:5caa) - notetype1 10 - notetype2 11 - notetype1 1 + channel_volume 10 + fade_wave 11 + channel_volume 1 ;musice9 96 ;musicdc 255 - notetype0 1 + speed 1 octave 2 note C_, 16 .MainLoop @@ -1256,7 +1256,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1271,14 +1271,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1298,7 +1298,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 sound_loop 2, .Loop1 .Loop2 @@ -1308,7 +1308,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G#, 4 rest 4 @@ -1323,14 +1323,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G#, 4 rest 4 @@ -1350,7 +1350,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 sound_loop 2, .Loop2 .Loop3 @@ -1360,7 +1360,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1375,14 +1375,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1402,7 +1402,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 sound_loop 2, .Loop3 ;musice8 6 @@ -1411,7 +1411,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1426,14 +1426,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1453,7 +1453,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 ;musice8 6 note D_, 16 @@ -1461,7 +1461,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1476,14 +1476,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1491,7 +1491,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note G#, 4 ;tie note A_, 4 @@ -1510,7 +1510,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1525,14 +1525,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1552,7 +1552,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 sound_loop 2, .Loop4 .Loop5 @@ -1562,7 +1562,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1577,14 +1577,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1604,7 +1604,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 sound_loop 2, .Loop5 ;musice8 6 @@ -1613,7 +1613,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1628,14 +1628,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1655,7 +1655,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 ;musice8 6 note D_, 16 @@ -1663,7 +1663,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1678,14 +1678,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1705,7 +1705,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note G_, 16 ;musice8 6 note A_, 16 @@ -1713,7 +1713,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note F_, 4 rest 4 @@ -1728,14 +1728,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note A_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note F_, 4 rest 4 @@ -1755,7 +1755,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note G_, 16 ;musice8 6 note A_, 16 @@ -1763,7 +1763,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note E_, 4 rest 4 @@ -1778,14 +1778,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note A_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note E_, 4 rest 4 @@ -1805,7 +1805,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note G_, 8 note A_, 8 ;vibrato_type 5 @@ -1854,14 +1854,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) sound_call Branch_1f1ff8 ;vibrato_type 5 vibrato 48, 3, 3 - notetype0 8 + speed 8 note D#, 16 ;tie note D#, 16 note E_, 16 ;tie note E_, 16 - notetype0 1 + speed 1 ;musice8 6 note A_, 16 rest 16 @@ -1942,10 +1942,10 @@ Branch_1f1ff8: ;musice8 7 note F_, 5 rest 3 - notetype1 2 + channel_volume 2 note F_, 5 rest 3 - notetype1 1 + channel_volume 1 ;musice8 6 dec_octave dec_octave @@ -1955,10 +1955,10 @@ Branch_1f1ff8: ;musice8 7 note A_, 5 rest 3 - notetype1 2 + channel_volume 2 note A_, 5 rest 3 - notetype1 1 + channel_volume 1 ;musice8 6 dec_octave rest 16 @@ -1973,10 +1973,10 @@ Branch_1f1ff8: ;musice8 7 note F_, 5 rest 3 - notetype1 2 + channel_volume 2 note F_, 5 rest 3 - notetype1 1 + channel_volume 1 ;musice8 6 dec_octave dec_octave @@ -1986,10 +1986,10 @@ Branch_1f1ff8: ;musice8 7 note A_, 5 rest 3 - notetype1 2 + channel_volume 2 note A_, 5 rest 3 - notetype1 1 + channel_volume 1 ;musice8 6 dec_octave rest 16 diff --git a/crysaudio/music/TCG2/gamecorner.asm b/crysaudio/music/TCG2/gamecorner.asm index fb425859..dea37aeb 100644 --- a/crysaudio/music/TCG2/gamecorner.asm +++ b/crysaudio/music/TCG2/gamecorner.asm @@ -6,13 +6,13 @@ Music_TCG2GameCorner: channel 4, Music_TCG2GameCorner_Ch4 Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) - notetype1 10 + channel_volume 10 .MainLoop ;musicf0 17 octave 1 ;musicf3 vibrato 1, 3, 3 - notetype0 1 + speed 1 .Loop1 note A_, 1 ;tie @@ -372,14 +372,14 @@ Branch_1e75c7: Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c) - notetype1 10 + channel_volume 10 .MainLoop - notetype1 12 + channel_volume 12 duty_cycle 2 ;musicee 30 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 .Loop1 octave 4 rest 16 @@ -829,11 +829,11 @@ Branch_1e778f: Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f) - notetype1 10 - notetype2 11 - notetype1 1 + channel_volume 10 + fade_wave 11 + channel_volume 1 ;musice9 64 - notetype0 1 + speed 1 ;musicdc 255 .MainLoop octave 2 diff --git a/crysaudio/music/TCG2/grblimp.asm b/crysaudio/music/TCG2/grblimp.asm index 8ce64198..a14ea62b 100644 --- a/crysaudio/music/TCG2/grblimp.asm +++ b/crysaudio/music/TCG2/grblimp.asm @@ -6,14 +6,14 @@ Music_GRBlimp: channel 4, Music_GRBlimp_Ch4 Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) - notetype1 10 + channel_volume 10 ;musicdc 17 ;vibrato_type 1 vibrato 28, 3, 3 - notetype2 8 + fade_wave 8 octave 4 duty_cycle 2 - notetype1 7 + channel_volume 7 vibrato 28, 3, 3 ;musicf0 0 ;musicdc 255 @@ -40,9 +40,9 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) note A#, 5 note D#, 14 note G_, 4 - notetype0 6 + speed 6 note F_, 14 - notetype0 1 + speed 1 note F_, 14 sound_call Branch_1e7cf5 note G#, 16 @@ -67,13 +67,13 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) note A#, 14 note A#, 4 inc_octave - notetype0 6 + speed 6 note C_, 14 - notetype0 1 + speed 1 note C_, 14 ;musicf0 2 ;musicf3 - notetype0 1 + speed 1 note C_, 5 note C#, 5 note D#, 4 @@ -215,25 +215,25 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) inc_octave vibrato 28, 3, 3 ;musicf1 70 - notetype0 7 + speed 7 note D_, 16 note D_, 2 sound_ret Branch_1e7cf5: octave 4 - notetype0 1 + speed 1 ;musicf2 note C_, 4 note C_, 3 note D_, 4 note C_, 3 ;musicf1 69 - notetype0 7 + speed 7 note D#, 10 note D#, 2 ;musicf1 48 - notetype0 1 + speed 1 note D_, 4 note D_, 3 note C_, 4 @@ -245,12 +245,12 @@ Branch_1e7cf5: note D_, 4 dec_octave note A#, 3 - notetype0 7 + speed 7 inc_octave note C_, 12 note C_, 2 dec_octave - notetype0 1 + speed 1 note A_, 4 note A_, 3 note A_, 4 @@ -292,11 +292,11 @@ Branch_1e7cf5: note C_, 3 note D_, 4 note C_, 3 - notetype0 7 + speed 7 note D#, 10 note D#, 2 ;musicf1 64 - notetype0 1 + speed 1 note D_, 4 note D_, 3 note C_, 4 @@ -333,12 +333,12 @@ Branch_1e7cf5: Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) - notetype1 10 + channel_volume 10 ;musicdc 17 ;vibrato_type 1 vibrato 28, 3, 3 - notetype2 8 - notetype0 7 + fade_wave 8 + speed 7 octave 3 ;musicf0 1 ;musicf1 64 @@ -590,7 +590,7 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note D#, 4 vibrato 28, 3, 3 ;musicf1 70 - notetype0 7 + speed 7 note A#, 16 note A#, 2 sound_ret @@ -598,15 +598,15 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) Branch_1e7e8a: octave 3 ;musicf2 - notetype0 1 + speed 1 note A_, 4 note A_, 3 note A_, 4 note A_, 3 - notetype0 7 + speed 7 note A#, 10 note A#, 2 - notetype0 1 + speed 1 ;musicf1 64 note A#, 4 note A#, 3 @@ -616,10 +616,10 @@ Branch_1e7e8a: note A#, 3 note A#, 4 note G_, 3 - notetype0 7 + speed 7 note A_, 12 note A_, 2 - notetype0 1 + speed 1 note F_, 4 note F_, 3 note F_, 4 @@ -656,10 +656,10 @@ Branch_1e7e8a: note A_, 3 note A_, 4 note A_, 3 - notetype0 7 + speed 7 note A#, 10 note A#, 2 - notetype0 1 + speed 1 ;musicf1 64 note A#, 4 note A#, 3 @@ -689,16 +689,16 @@ Branch_1e7e8a: Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) - notetype1 10 + channel_volume 10 ;musicdc 17 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;musice8 3 ;musice9 96 octave 2 - notetype0 1 + speed 1 rest 14 - notetype0 7 + speed 7 .Loop1 note F_, 4 note C_, 4 @@ -754,7 +754,7 @@ Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) note D#, 4 note A#, 4 ;musice8 2 - notetype0 1 + speed 1 note G#, 10 ;tie note G#, 9 @@ -771,7 +771,7 @@ Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) ;tie note A#, 6 ;tie - notetype0 7 + speed 7 note A#, 14 ;tie note A#, 2 diff --git a/crysaudio/music/TCG2/grcastle.asm b/crysaudio/music/TCG2/grcastle.asm index 3edd1cf4..38032b6c 100644 --- a/crysaudio/music/TCG2/grcastle.asm +++ b/crysaudio/music/TCG2/grcastle.asm @@ -6,8 +6,8 @@ Music_GRCastle: channel 4, Music_GRCastle_Ch4 Music_GRCastle_Ch2: ; 1f213c (7c:613c) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 rest 12 ;musicf0 8 octave 1 @@ -93,11 +93,11 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) ;musicf0 0 ;musicf3 octave 2 - notetype1 7 + channel_volume 7 note E_, 16 ;tie note E_, 9 - notetype1 11 + channel_volume 11 note E_, 16 ;tie note E_, 9 @@ -521,7 +521,7 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) ;musicf1 71 ;musicf3 octave 2 - notetype1 8 + channel_volume 8 note B_, 16 ;tie note B_, 9 @@ -903,8 +903,8 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) Music_GRCastle_Ch1: ; 1f2525 (7c:6525) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 rest 12 ;musicf0 8 octave 1 @@ -1818,12 +1818,12 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) Music_GRCastle_Ch3: ; 1f2903 (7c:6903) - notetype1 10 - notetype2 11 - notetype1 1 + channel_volume 10 + fade_wave 11 + channel_volume 1 ;musice9 96 ;musicdc 255 - notetype0 1 + speed 1 rest 12 ;vibrato_type 5 vibrato 0, 3, 3 @@ -2328,7 +2328,7 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903) vibrato 50, 3, 3 ;musicec 244 octave 2 - notetype0 10 + speed 10 note E_, 10 ;tie note E_, 10 @@ -2341,12 +2341,12 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903) ;tie note E_, 10 ;tie - notetype0 5 - notetype1 3 + speed 5 + channel_volume 3 note E_, 15 - notetype1 1 + channel_volume 1 ;musicec 0 - notetype0 1 + speed 1 note D_, 13 note E_, 12 rest 13 @@ -2366,7 +2366,7 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903) sound_loop 0, .MainLoop Branch_1f2b72: - notetype1 2 + channel_volume 2 octave 2 note B_, 2 rest 2 @@ -2379,13 +2379,13 @@ Branch_1f2b72: ;tie note B_, 12 vibrato 0, 3, 3 - notetype1 1 + channel_volume 1 octave 2 ;musicec 0 sound_ret Branch_1f2b88: - notetype1 2 + channel_volume 2 octave 3 note C_, 2 rest 1 @@ -2398,24 +2398,24 @@ Branch_1f2b88: ;tie note F_, 12 vibrato 0, 3, 3 - notetype1 1 + channel_volume 1 octave 2 ;musicec 0 sound_ret Branch_1f2b9e: - notetype1 2 + channel_volume 2 octave 3 note D_, 12 ;tie note D_, 13 - notetype1 1 + channel_volume 1 octave 2 ;musicec 0 sound_ret Branch_1f2baa: - notetype1 2 + channel_volume 2 octave 2 note B_, 13 note B_, 2 @@ -2429,12 +2429,12 @@ Branch_1f2baa: ;tie note B_, 12 vibrato 0, 3, 3 - notetype1 1 + channel_volume 1 octave 2 sound_ret Branch_1f2bbf: - notetype1 2 + channel_volume 2 octave 2 note B_, 2 rest 3 @@ -2442,7 +2442,7 @@ Branch_1f2bbf: rest 3 note B_, 1 rest 3 - notetype1 1 + channel_volume 1 sound_ret diff --git a/crysaudio/music/TCG2/grchallengecup.asm b/crysaudio/music/TCG2/grchallengecup.asm index 732b99d0..6d9ce1c7 100644 --- a/crysaudio/music/TCG2/grchallengecup.asm +++ b/crysaudio/music/TCG2/grchallengecup.asm @@ -7,8 +7,8 @@ Music_GRChallengeCup: Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) ;.MainLoop - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 17 ;musicf0 0 octave 4 @@ -70,16 +70,16 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note B_, 15 note B_, 5 ;musicef 250 - notetype1 2 + channel_volume 2 ;musicf3 - notetype0 6 + speed 6 note A_, 10 ;tie - notetype0 1 + speed 1 note A_, 15 ;tie note A_, 10 - notetype1 10 + channel_volume 10 ;musicf1 54 note A_, 5 note A_, 15 @@ -91,7 +91,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) .Loop1 octave 2 ;musicf2 - notetype2 8 + fade_wave 8 note E_, 5 note E_, 10 note E_, 5 @@ -113,7 +113,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) .Loop2 octave 2 ;musicf2 - notetype2 8 + fade_wave 8 note F_, 5 note F_, 10 note F_, 5 @@ -131,7 +131,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) .Loop3 octave 2 ;musicf2 - notetype2 8 + fade_wave 8 note F#, 5 note F#, 10 note F#, 5 @@ -148,7 +148,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) sound_loop 2, .Loop3 octave 2 ;musicf2 - notetype2 8 + fade_wave 8 note F_, 5 note F_, 10 note F_, 5 @@ -164,7 +164,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note F_, 2 octave 2 ;musicf2 - notetype2 8 + fade_wave 8 note F_, 5 note F_, 10 note F_, 5 @@ -482,8 +482,8 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) ;.MainLoop - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 17 ;musicf0 1 ;musicef 255 @@ -550,16 +550,16 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note D_, 15 note D_, 5 ;musicef 250 - notetype1 2 + channel_volume 2 ;musicf3 - notetype0 6 + speed 6 note C#, 10 ;tie - notetype0 1 + speed 1 note C#, 15 ;tie note C#, 10 - notetype1 9 + channel_volume 9 ;musicf1 54 note C#, 5 note C#, 15 @@ -570,7 +570,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) .Loop1 octave 1 ;musicf2 - notetype2 8 + fade_wave 8 note A_, 5 note A_, 10 note A_, 5 @@ -592,7 +592,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) .Loop2 octave 1 ;musicf2 - notetype2 8 + fade_wave 8 note A_, 5 note A_, 10 note A_, 5 @@ -611,7 +611,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) sound_loop 5, .Loop2 octave 1 ;musicf2 - notetype2 8 + fade_wave 8 note A_, 5 note A_, 10 note A_, 5 @@ -625,7 +625,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note B_, 8 dec_octave ;musicf0 21 - notetype1 8 + channel_volume 8 octave 2 note A_, 5 rest 2 @@ -820,11 +820,11 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) ;tie note E_, 15 inc_octave - notetype1 6 + channel_volume 6 note D_, 15 ;tie note D_, 15 - notetype1 6 + channel_volume 6 note C#, 15 ;tie note C#, 15 @@ -872,7 +872,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) ;musicf3 note B_, 15 ;musicf2 - notetype2 8 + fade_wave 8 note E_, 5 note E_, 3 note E_, 5 @@ -910,17 +910,17 @@ Branch_1f3150: note G_, 4 note G_, 3 ;musicf0 21 - notetype1 8 + channel_volume 8 octave 3 ;musicf3 sound_ret Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) - notetype1 10 - notetype0 1 - notetype2 11 - notetype1 1 + channel_volume 10 + speed 1 + fade_wave 11 + channel_volume 1 ;musice9 96 ;musicdc 17 octave 5 @@ -1290,10 +1290,10 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) Branch_1f333b: octave 3 - notetype1 2 + channel_volume 2 ;musice8 8 note A_, 15 - notetype1 1 + channel_volume 1 ;musice8 4 ;musicec 0 octave 2 diff --git a/crysaudio/music/TCG2/grdueltheme1.asm b/crysaudio/music/TCG2/grdueltheme1.asm index 49dd84b0..9a5399f6 100644 --- a/crysaudio/music/TCG2/grdueltheme1.asm +++ b/crysaudio/music/TCG2/grdueltheme1.asm @@ -6,9 +6,9 @@ Music_GRDuelTheme1: channel 4, Music_GRDuelTheme1_Ch4 Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) - notetype1 10 + channel_volume 10 ;musicdc 255 - notetype0 1 + speed 1 ;musicf0 16 octave 3 ;musicf1 54 @@ -906,9 +906,9 @@ Branch_1f5ae8: Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) - notetype1 10 + channel_volume 10 ;musicdc 255 - notetype0 1 + speed 1 ;musicf0 16 ;musicef 255 octave 3 @@ -1871,7 +1871,7 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) ;musicf0 16 octave 3 ;musicf1 53 - notetype1 7 + channel_volume 7 .Loop6 note C#, 15 ;tie @@ -1914,10 +1914,10 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) - notetype1 10 - notetype0 1 - notetype2 11 - notetype1 1 + channel_volume 10 + speed 1 + fade_wave 11 + channel_volume 1 ;musice9 64 ;musicdc 17 octave 3 @@ -1931,388 +1931,388 @@ Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) .Loop2 sound_call Branch_1f6313 sound_loop 6, .Loop2 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note C_, 2 - notetype0 1 + speed 1 note C#, 14 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 inc_octave - notetype0 1 + speed 1 note C_, 14 dec_octave - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note F#, 14 - notetype0 11 + speed 11 note F_, 2 inc_octave note C_, 2 - notetype0 1 + speed 1 note F_, 14 dec_octave - notetype0 11 + speed 11 note F_, 2 inc_octave note C_, 2 dec_octave dec_octave - notetype0 1 + speed 1 note A_, 14 - notetype0 11 + speed 11 note A#, 2 inc_octave note F_, 2 - notetype0 1 + speed 1 note A#, 14 dec_octave - notetype0 11 + speed 11 note A#, 2 inc_octave note F_, 2 - notetype0 1 + speed 1 note E_, 14 - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 - notetype0 1 + speed 1 note D#, 14 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note G_, 2 inc_octave note D_, 2 - notetype0 1 + speed 1 note G_, 14 dec_octave - notetype0 11 + speed 11 note G_, 2 inc_octave note D_, 2 - notetype0 1 + speed 1 note C#, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 inc_octave - notetype0 1 + speed 1 note C_, 14 dec_octave - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note A#, 14 - notetype0 11 + speed 11 note G#, 2 inc_octave note D#, 2 dec_octave - notetype0 1 + speed 1 note D#, 14 - notetype0 11 + speed 11 note G#, 2 inc_octave note D#, 2 dec_octave - notetype0 1 + speed 1 note G#, 14 sound_call Branch_1f6313 sound_call Branch_1f6313 sound_call Branch_1f6313 sound_call Branch_1f6313 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note C_, 2 - notetype0 1 + speed 1 note C#, 14 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 inc_octave - notetype0 1 + speed 1 note C_, 14 dec_octave - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note F#, 14 - notetype0 11 + speed 11 note F_, 2 inc_octave note C_, 2 - notetype0 1 + speed 1 note F_, 14 dec_octave - notetype0 11 + speed 11 note F_, 2 inc_octave note C_, 2 dec_octave dec_octave - notetype0 1 + speed 1 note A_, 14 - notetype0 11 + speed 11 note A#, 2 inc_octave note F_, 2 - notetype0 1 + speed 1 note A#, 14 dec_octave - notetype0 11 + speed 11 note A#, 2 inc_octave note F_, 2 - notetype0 1 + speed 1 note E_, 14 - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 - notetype0 1 + speed 1 note D#, 14 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note G_, 2 inc_octave note D_, 2 - notetype0 1 + speed 1 note G_, 14 dec_octave - notetype0 11 + speed 11 note G_, 2 inc_octave note D_, 2 - notetype0 1 + speed 1 note C#, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 inc_octave - notetype0 1 + speed 1 note C_, 14 dec_octave - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note A#, 14 - notetype0 11 + speed 11 note G#, 2 inc_octave note D#, 2 dec_octave - notetype0 1 + speed 1 note D#, 14 - notetype0 11 + speed 11 note G#, 2 inc_octave note D#, 2 dec_octave - notetype0 1 + speed 1 note G#, 14 sound_call Branch_1f6313 sound_call Branch_1f6313 sound_call Branch_1f6313 - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 note D#, 16 ;tie note D#, 13 rest 16 rest 13 - notetype0 1 + speed 1 note G_, 15 note A_, 14 note A#, 15 @@ -2401,55 +2401,55 @@ Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) sound_call Branch_1f6313 sound_call Branch_1f6313 sound_call Branch_1f6313 - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note C_, 14 - notetype0 11 + speed 11 note A#, 2 note F_, 2 - notetype0 1 + speed 1 note A#, 14 - notetype0 11 + speed 11 note A_, 2 note E_, 2 - notetype0 1 + speed 1 note A_, 14 - notetype0 11 + speed 11 note G_, 2 note D_, 2 - notetype0 1 + speed 1 note G_, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note C_, 14 - notetype0 11 + speed 11 note F_, 2 note C_, 2 dec_octave - notetype0 1 + speed 1 note B_, 14 - notetype0 11 + speed 11 note A#, 2 inc_octave note F_, 2 - notetype0 1 + speed 1 note A#, 14 - notetype0 11 + speed 11 note G_, 2 note D_, 2 - notetype0 1 + speed 1 note G_, 14 ;musice8 7 - notetype0 1 + speed 1 note D#, 16 ;tie note D#, 13 @@ -2465,15 +2465,15 @@ Branch_1f6313: octave 3 ;musicec 244 ;musice8 7 - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note D#, 2 note A#, 2 - notetype0 1 + speed 1 note D#, 14 sound_ret diff --git a/crysaudio/music/TCG2/grdueltheme2.asm b/crysaudio/music/TCG2/grdueltheme2.asm index a725bebe..8e910231 100644 --- a/crysaudio/music/TCG2/grdueltheme2.asm +++ b/crysaudio/music/TCG2/grdueltheme2.asm @@ -6,10 +6,10 @@ Music_GRDuelTheme2: channel 4, Music_GRDuelTheme2_Ch4 Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) - notetype1 10 + channel_volume 10 ;musicf0 0 octave 3 - notetype0 1 + speed 1 ;musicdc 255 ;musicf1 71 ;musicf3 @@ -1107,10 +1107,10 @@ Branch_1ef628: Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) - notetype1 10 + channel_volume 10 ;musicf0 9 octave 2 - notetype0 1 + speed 1 ;musicdc 255 octave 3 note E_, 14 @@ -2148,11 +2148,11 @@ Branch_1efa62: Music_GRDuelTheme2_Ch3: ; 1efa74 (7b:7a74) - notetype1 10 - ;notetype2 15 + channel_volume 10 + ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - notetype0 1 - notetype1 1 + speed 1 + channel_volume 1 ;musice9 96 ;musicdc 255 octave 2 diff --git a/crysaudio/music/TCG2/grdueltheme3.asm b/crysaudio/music/TCG2/grdueltheme3.asm index 1edac673..8ac2eabb 100644 --- a/crysaudio/music/TCG2/grdueltheme3.asm +++ b/crysaudio/music/TCG2/grdueltheme3.asm @@ -6,12 +6,12 @@ Music_GRDuelTheme3: channel 4, Music_GRDuelTheme3_Ch4 Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) - notetype1 10 + channel_volume 10 .MainLoop ;musicf0 27 ;musicdc 255 ;musicf3 - notetype0 1 + speed 1 ;musicef 1 .Loop1 octave 3 @@ -797,12 +797,12 @@ Branch_1f672f: Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) - notetype1 10 + channel_volume 10 .MainLoop ;musicf0 27 ;musicef 255 ;musicdc 255 - notetype0 1 + speed 1 ;musicf1 80 .Loop1 octave 2 @@ -2146,11 +2146,11 @@ Branch_1f6df4: Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) - notetype1 10 - notetype2 11 + channel_volume 10 + fade_wave 11 ;musicdc 255 - notetype0 1 - notetype1 1 + speed 1 + channel_volume 1 ;musice9 96 .MainLoop octave 3 @@ -2191,9 +2191,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note E_, 14 ;tie note E_, 7 - notetype1 3 + channel_volume 3 note E_, 6 - notetype1 1 + channel_volume 1 sound_loop 3, .Loop1 note D_, 14 ;tie @@ -2220,9 +2220,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note E_, 14 ;tie note E_, 13 - notetype1 3 + channel_volume 3 note E_, 7 - notetype1 1 + channel_volume 1 inc_octave note D_, 7 note E_, 7 @@ -2268,9 +2268,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note E_, 14 ;tie note E_, 7 - notetype1 3 + channel_volume 3 note E_, 6 - notetype1 1 + channel_volume 1 note D_, 14 ;tie note D_, 7 @@ -2296,9 +2296,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note E_, 14 ;tie note E_, 13 - notetype1 3 + channel_volume 3 note E_, 7 - notetype1 1 + channel_volume 1 note B_, 7 inc_octave note D_, 7 @@ -2343,9 +2343,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note F_, 14 ;tie note F_, 7 - notetype1 3 + channel_volume 3 note F_, 6 - notetype1 1 + channel_volume 1 vibrato 48, 3, 3 note F#, 14 ;tie @@ -2369,9 +2369,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note B_, 14 ;tie note B_, 13 - notetype1 3 + channel_volume 3 note B_, 7 - notetype1 1 + channel_volume 1 note B_, 7 inc_octave note D_, 7 diff --git a/crysaudio/music/TCG2/groverworld.asm b/crysaudio/music/TCG2/groverworld.asm index 46954b4d..d9db8ccd 100644 --- a/crysaudio/music/TCG2/groverworld.asm +++ b/crysaudio/music/TCG2/groverworld.asm @@ -6,7 +6,7 @@ Music_GROverworld: channel 4, Music_GROverworld_Ch4 Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) - notetype1 10 + channel_volume 10 .MainLoop sound_call Branch_1eae1e note A#, 16 @@ -25,10 +25,10 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) note A_, 6 note F_, 16 note F_, 6 - notetype0 11 + speed 11 note G_, 12 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -244,15 +244,15 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) note A#, 16 note A#, 6 ;musicf3 - notetype0 11 + speed 11 note A#, 6 note A_, 6 note G_, 6 - notetype0 1 - notetype0 11 + speed 1 + speed 11 note F_, 3 ;tie - notetype0 1 + speed 1 note F_, 1 ;tie note F_, 16 @@ -261,7 +261,7 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) Branch_1eae1e: ;musicf0 13 octave 3 - notetype0 1 + speed 1 ;musicdc 17 vibrato 33, 3, 3 ;musicef 1 @@ -401,12 +401,12 @@ Branch_1eae1e: Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 rest 16 .MainLoop ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -561,7 +561,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) rest 1 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note B_, 5 @@ -570,7 +570,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 5 note C_, 3 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -632,7 +632,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note A_, 5 @@ -641,7 +641,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 5 note C_, 3 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -697,7 +697,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note B_, 4 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note B_, 5 @@ -706,7 +706,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D_, 5 note D_, 3 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -768,13 +768,13 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 ;musicf0 15 octave 3 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note C_, 8 note C_, 8 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -830,7 +830,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note B_, 4 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note B_, 5 @@ -839,7 +839,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 5 note C_, 3 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -901,7 +901,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note A_, 5 @@ -910,7 +910,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 5 note C_, 3 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -966,7 +966,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note B_, 4 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note B_, 5 @@ -990,11 +990,11 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note E_, 16 note E_, 6 ;musicf3 - notetype0 11 + speed 11 note G_, 6 note F#, 3 ;musicef 2 - notetype0 1 + speed 1 ;musicf0 14 ;musicef 254 octave 2 @@ -1006,7 +1006,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note A#, 5 ;musicef 2 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -1079,7 +1079,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note D_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -1147,7 +1147,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D_, 4 note A_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -1219,7 +1219,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note C_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -1290,7 +1290,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note D_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -1355,7 +1355,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 note G_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 4 ;musicf1 70 @@ -1418,7 +1418,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note F_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -1490,13 +1490,13 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) ;musicf0 14 octave 3 ;musicf3 - notetype0 11 + speed 11 note F_, 12 note D#, 6 - notetype0 11 + speed 11 note C_, 3 ;tie - notetype0 1 + speed 1 note C_, 1 ;tie note C_, 16 @@ -1505,13 +1505,13 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) - notetype1 10 + channel_volume 10 ;musicdc 17 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;musice8 1 ;musice9 96 - notetype0 1 + speed 1 rest 16 .MainLoop ;musice8 1 @@ -1735,7 +1735,7 @@ Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) ;tie note C_, 8 ;musice8 1 - notetype0 1 + speed 1 note D_, 16 ;tie note D_, 16 @@ -1930,14 +1930,14 @@ Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) ;musice8 8 ;vibrato_type 5 vibrato 32, 3, 3 - notetype0 11 + speed 11 note F_, 3 ;tie note F_, 3 ;tie note F_, 3 ;tie - notetype0 1 + speed 1 note F_, 16 ;tie note A#, 4 @@ -1946,14 +1946,14 @@ Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) ;tie inc_octave note C_, 9 - notetype0 11 + speed 11 note F_, 3 ;tie note F_, 3 ;tie note F_, 3 ;tie - notetype0 1 + speed 1 note F_, 16 rest 16 rest 1 diff --git a/crysaudio/music/TCG2/herecomesgr.asm b/crysaudio/music/TCG2/herecomesgr.asm index e69920e9..20d004a3 100644 --- a/crysaudio/music/TCG2/herecomesgr.asm +++ b/crysaudio/music/TCG2/herecomesgr.asm @@ -6,9 +6,9 @@ Music_HereComesGR: channel 4, Music_HereComesGR_Ch4 Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) - notetype1 10 + channel_volume 10 .MainLoop - notetype0 1 + speed 1 ;musicdc 17 ;musicf0 8 ;musicf1 55 @@ -87,7 +87,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) sound_call Branch_1ea5ed ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note D_, 10 note D_, 11 @@ -101,7 +101,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 ;musicef 254 .Loop1 note G_, 3 @@ -124,7 +124,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) sound_call Branch_1ea5ed ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf1 55 ;musicf2 note D_, 10 @@ -133,7 +133,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) rest 10 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note B_, 6 ;tie inc_octave @@ -155,7 +155,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) sound_call Branch_1ea5ed ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note D_, 10 note D_, 11 @@ -169,7 +169,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 ;musicef 254 .Loop2 note G_, 3 @@ -191,14 +191,14 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf1 55 sound_call Branch_1ea5ed ;musicf0 9 - notetype2 4 - notetype2 4 + fade_wave 4 + fade_wave 4 octave 4 ;musicf2 note G_, 10 note G_, 11 ;musicf0 8 - notetype2 8 + fade_wave 8 octave 3 ;musicf2 note G_, 10 @@ -228,11 +228,11 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf3 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note D_, 11 ;musicf0 9 octave 3 - notetype2 8 + fade_wave 8 note C#, 10 ;musicf2 note D_, 6 @@ -264,7 +264,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf0 9 ;musicf1 16 octave 4 - notetype2 6 + fade_wave 6 ;musicf3 note F_, 10 rest 11 @@ -272,7 +272,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) rest 11 ;musicef 1 ;musicf1 55 - notetype2 8 + fade_wave 8 ;musicf3 octave 3 note C#, 10 @@ -303,11 +303,11 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf3 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note D_, 11 ;musicf0 9 octave 3 - notetype2 8 + fade_wave 8 note C#, 10 ;musicf2 note D_, 6 @@ -359,13 +359,13 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musice4 0 note G#, 1 ;musicf0 8 - notetype2 8 + fade_wave 8 octave 2 note A#, 16 ;tie note A#, 5 ;musicf0 9 - notetype2 8 + fade_wave 8 ;musicef 2 octave 1 note A_, 3 @@ -400,7 +400,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 ;musicf1 103 note G_, 5 rest 6 @@ -411,13 +411,13 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicef 252 ;musicf1 39 octave 3 - notetype2 4 + fade_wave 4 rest 11 ;musicf2 note F_, 10 note F_, 11 ;musicf3 - notetype2 8 + fade_wave 8 ;musicef 4 ;musicf1 55 ;musicf3 @@ -429,7 +429,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) rest 1 note C_, 1 ;musicf0 8 - notetype2 8 + fade_wave 8 octave 2 note B_, 6 ;tie @@ -448,7 +448,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) octave 3 note C_, 11 ;musicf0 9 - notetype2 8 + fade_wave 8 inc_octave ;musicf2 note F_, 4 @@ -463,14 +463,14 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) inc_octave inc_octave ;musicf0 9 - notetype2 8 + fade_wave 8 ;musicf2 note E_, 4 note E_, 7 dec_octave dec_octave ;musicf0 8 - notetype2 8 + fade_wave 8 note B_, 5 note B_, 5 ;musicf3 @@ -478,7 +478,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf0 9 inc_octave inc_octave - notetype2 8 + fade_wave 8 ;musicf2 note D#, 4 note D#, 6 @@ -486,7 +486,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) dec_octave ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note A#, 5 note A#, 6 ;musicf3 @@ -494,14 +494,14 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf0 9 inc_octave inc_octave - notetype2 8 + fade_wave 8 ;musicf2 note C#, 4 note C#, 7 dec_octave dec_octave ;musicf0 8 - notetype2 8 + fade_wave 8 note G#, 5 note G#, 5 ;musicf3 @@ -557,14 +557,14 @@ Branch_1ea603: ;musicf3 ;musicf0 9 octave 4 - notetype2 8 + fade_wave 8 ;musicf2 note C_, 4 note C_, 6 ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 ;musicf1 55 note G_, 5 rest 6 @@ -575,12 +575,12 @@ Branch_1ea603: ;musicef 252 ;musicf1 39 octave 3 - notetype2 4 + fade_wave 4 rest 11 ;musicf2 note F_, 10 note F_, 11 - notetype2 8 + fade_wave 8 ;musicf3 ;musicef 4 ;musicf1 55 @@ -604,7 +604,7 @@ Branch_1ea603: Branch_1ea64e: ;musicf0 8 - notetype2 8 + fade_wave 8 octave 3 ;musicef 255 note G#, 16 @@ -635,7 +635,7 @@ Branch_1ea64e: Branch_1ea66f: ;musicf0 8 - notetype2 8 + fade_wave 8 octave 2 note E_, 16 ;tie @@ -651,9 +651,9 @@ Branch_1ea66f: Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) - notetype1 10 + channel_volume 10 .MainLoop - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf0 8 @@ -723,7 +723,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) sound_call Branch_1ea5f8 ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note C_, 10 note C_, 11 @@ -732,14 +732,14 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 11 dec_octave ;musicef 252 - notetype2 4 + fade_wave 4 note A#, 10 ;musicef 4 ;musicf1 55 ;musicf3 ;musicf0 9 octave 1 - notetype2 8 + fade_wave 8 ;musicef 254 .Loop1 note D_, 2 @@ -757,7 +757,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) sound_call Branch_1ea5f8 ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note C_, 10 note C_, 11 @@ -765,7 +765,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) ;musicf3 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note F#, 6 ;tie note G_, 5 @@ -785,7 +785,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) sound_call Branch_1ea5f8 ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note C_, 10 note C_, 11 @@ -800,7 +800,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 ;musicef 254 .Loop2 note D_, 2 @@ -817,14 +817,14 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) sound_call Branch_1ea5f8 ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note C_, 10 note C_, 11 ;musicf3 ;musicf0 8 octave 3 - notetype2 8 + fade_wave 8 note C_, 10 dec_octave rest 11 @@ -842,7 +842,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) note G#, 5 note G_, 10 ;musicf0 8 - notetype2 8 + fade_wave 8 octave 2 note A#, 11 note G_, 10 @@ -859,19 +859,19 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 5 octave 4 rest 11 - notetype2 4 + fade_wave 4 note C_, 10 rest 11 dec_octave ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note F_, 10 sound_call Branch_1ea5ed rest 10 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note G_, 16 ;tie note G_, 5 @@ -888,7 +888,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 5 rest 11 ;musicf0 9 - notetype2 6 + fade_wave 6 ;musicf1 16 octave 3 ;musicf3 @@ -900,7 +900,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) ;musicf3 ;musicf0 8 ;musicf1 55 - notetype2 8 + fade_wave 8 octave 2 note G_, 10 note F_, 11 @@ -911,7 +911,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) note D_, 10 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note G_, 11 ;tie note G_, 10 @@ -928,13 +928,13 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 5 octave 4 rest 11 - notetype2 4 + fade_wave 4 note C_, 10 rest 11 dec_octave ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note F_, 10 ;musicf2 note G_, 8 @@ -949,7 +949,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) ;musicf3 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note G_, 16 ;tie note G_, 5 @@ -1018,7 +1018,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) octave 2 sound_call Branch_1ea5ed ;musicf0 9 - notetype2 4 + fade_wave 4 octave 3 ;musicf2 note A#, 10 @@ -1026,18 +1026,18 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 rest 10 ;musicf0 9 ;musicef 252 ;musicf1 55 octave 2 - notetype2 4 + fade_wave 4 rest 11 note A#, 10 note A#, 11 ;musicf3 - notetype2 8 + fade_wave 8 ;musicef 4 ;musicf1 55 ;musicf3 @@ -1049,7 +1049,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 1 note C_, 1 ;musicf0 8 - notetype2 8 + fade_wave 8 octave 2 note F#, 6 ;tie @@ -1067,7 +1067,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) octave 2 note G_, 11 ;musicf0 9 - notetype2 8 + fade_wave 8 inc_octave inc_octave ;musicf2 @@ -1082,40 +1082,40 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) note F#, 10 inc_octave ;musicf0 9 - notetype2 8 + fade_wave 8 ;musicf2 note B_, 4 note B_, 7 dec_octave ;musicf0 8 - notetype2 8 + fade_wave 8 note F#, 5 note F#, 5 ;musicf3 note F_, 11 ;musicf0 9 inc_octave - notetype2 8 + fade_wave 8 ;musicf2 note A#, 4 note A#, 6 dec_octave ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note F_, 5 note F_, 6 ;musicf3 note D#, 10 ;musicf0 9 inc_octave - notetype2 8 + fade_wave 8 ;musicf2 note G#, 4 note G#, 7 dec_octave ;musicf0 8 - notetype2 8 + fade_wave 8 note D#, 5 note D#, 5 ;musicf3 @@ -1143,18 +1143,18 @@ Branch_1ea8d3: note G_, 11 ;musicf0 9 octave 3 - notetype2 4 + fade_wave 4 note A#, 10 note A#, 11 ;musicf3 rest 10 ;musicef 252 octave 2 - notetype2 4 + fade_wave 4 rest 11 note A#, 10 rest 11 - notetype2 8 + fade_wave 8 ;musicef 4 ;musicf1 55 ;musicf3 @@ -1217,10 +1217,10 @@ Branch_1ea90c: Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) - notetype1 10 - notetype0 1 - notetype2 11 - notetype1 1 + channel_volume 10 + speed 1 + fade_wave 11 + channel_volume 1 ;musice9 128 ;musicdc 17 .MainLoop @@ -1295,11 +1295,11 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note C#, 10 note D_, 11 inc_octave - notetype1 2 + channel_volume 2 ;musice8 8 note C_, 10 ;musice8 8 - notetype1 1 + channel_volume 1 dec_octave note C#, 11 note C_, 10 @@ -1310,7 +1310,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) dec_octave note F_, 11 note G#, 10 - notetype1 1 + channel_volume 1 octave 2 note G_, 8 rest 3 @@ -1321,11 +1321,11 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) octave 5 ;musice8 4 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 11 ;musice8 8 octave 2 - notetype1 2 + channel_volume 2 note F_, 10 note G_, 11 octave 5 @@ -1333,7 +1333,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note F_, 10 ;musice8 8 octave 2 - notetype1 1 + channel_volume 1 rest 10 rest 11 note C_, 5 @@ -1344,7 +1344,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note F_, 16 ;tie note F_, 5 - notetype1 1 + channel_volume 1 octave 2 note G_, 8 rest 3 @@ -1355,10 +1355,10 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) octave 5 ;musice8 4 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 11 ;musice8 8 - notetype1 1 + channel_volume 1 octave 2 rest 10 note G#, 6 @@ -1373,7 +1373,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note A_, 16 ;tie note A_, 10 - notetype1 1 + channel_volume 1 octave 2 note G_, 8 rest 3 @@ -1384,18 +1384,18 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) octave 5 ;musice8 4 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 11 ;musice8 8 octave 2 - notetype1 2 + channel_volume 2 note F_, 10 note G_, 11 octave 5 ;musice8 4 note F_, 10 ;musice8 8 - notetype1 1 + channel_volume 1 octave 2 rest 10 rest 11 @@ -1497,12 +1497,12 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) inc_octave ;musice8 4 note F_, 10 - notetype1 3 + channel_volume 3 note F_, 11 ;musice8 8 dec_octave dec_octave - notetype1 2 + channel_volume 2 dec_octave note C_, 10 note D_, 8 @@ -1513,7 +1513,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) dec_octave note G_, 3 rest 7 - notetype1 1 + channel_volume 1 note C_, 16 ;tie note C_, 5 @@ -1532,12 +1532,12 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) inc_octave ;musice8 4 note F_, 10 - notetype1 3 + channel_volume 3 note F_, 11 ;musice8 8 dec_octave dec_octave - notetype1 2 + channel_volume 2 dec_octave note C_, 10 note D_, 8 @@ -1548,7 +1548,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) dec_octave note G_, 3 rest 7 - notetype1 1 + channel_volume 1 note C#, 6 ;tie note D_, 5 @@ -1568,12 +1568,12 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) inc_octave ;musice8 4 note F_, 10 - notetype1 3 + channel_volume 3 note F_, 11 ;musice8 8 dec_octave dec_octave - notetype1 2 + channel_volume 2 dec_octave note C_, 10 note D_, 8 @@ -1584,7 +1584,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) dec_octave note G_, 3 rest 7 - notetype1 1 + channel_volume 1 note C_, 16 ;tie note C_, 5 @@ -1656,7 +1656,7 @@ Branch_1eaaf6: note F#, 16 ;tie note F#, 5 - notetype1 1 + channel_volume 1 octave 2 note G_, 8 rest 3 @@ -1667,11 +1667,11 @@ Branch_1eaaf6: octave 5 ;musice8 4 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 11 ;musice8 8 octave 2 - notetype1 1 + channel_volume 1 rest 10 rest 16 rest 16 diff --git a/crysaudio/music/TCG2/imakuni2.asm b/crysaudio/music/TCG2/imakuni2.asm index c43a54db..0a1707af 100644 --- a/crysaudio/music/TCG2/imakuni2.asm +++ b/crysaudio/music/TCG2/imakuni2.asm @@ -6,12 +6,12 @@ Music_Imakuni2: channel 4, Music_Imakuni2_Ch4 Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) - notetype1 10 + channel_volume 10 .MainLoop ;musicf0 31 ;musicf3 ;musicdc 255 - notetype0 1 + speed 1 octave 2 ;musicf0 31 note A_, 9 @@ -230,7 +230,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) dec_octave note A_, 5 rest 12 - notetype1 9 + channel_volume 9 note G_, 16 ;tie note G_, 9 @@ -335,7 +335,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) inc_octave note A_, 5 rest 12 - notetype1 8 + channel_volume 8 note G_, 16 ;tie note G_, 9 @@ -449,7 +449,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) dec_octave note A#, 5 rest 12 - notetype1 9 + channel_volume 9 note G#, 16 ;tie note G#, 9 @@ -543,7 +543,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) inc_octave note A_, 5 rest 12 - notetype1 8 + channel_volume 8 note G_, 16 ;tie note G_, 9 @@ -749,7 +749,7 @@ Branch_1f3762: ;musicf1 101 ;musicf3 ;musicdc 255 - notetype0 1 + speed 1 ;musicef 255 octave 4 note C#, 5 @@ -767,13 +767,13 @@ Branch_1f3762: Music_Imakuni2_Ch1: ; 1f377a (7c:777a) - notetype1 10 + channel_volume 10 .MainLoop ;musicf0 9 ;musicf1 103 ;musicf3 ;musicdc 255 - notetype0 1 + speed 1 ;musicef 255 octave 4 rest 9 @@ -1371,7 +1371,7 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) note C_, 8 dec_octave note F_, 8 - notetype1 4 + channel_volume 4 note E_, 16 ;tie note E_, 16 @@ -1415,11 +1415,11 @@ Branch_1f3a58: Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) - notetype1 10 - notetype0 1 - notetype2 11 + channel_volume 10 + speed 1 + fade_wave 11 ;musicdc 255 - notetype1 1 + channel_volume 1 ;musice9 96 .MainLoop ;musice8 8 @@ -1436,10 +1436,10 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 16 rest 9 dec_octave - notetype1 2 + channel_volume 2 note G_, 16 note A_, 9 - notetype1 1 + channel_volume 1 rest 16 rest 8 rest 9 @@ -1465,13 +1465,13 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 9 rest 8 dec_octave - notetype1 2 + channel_volume 2 note G_, 16 note A_, 9 - notetype1 1 + channel_volume 1 sound_call Branch_1f3d18 octave 2 - notetype1 1 + channel_volume 1 rest 8 note E_, 8 rest 8 @@ -1503,10 +1503,10 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 9 rest 8 dec_octave - notetype1 2 + channel_volume 2 note G_, 16 note A_, 9 - notetype1 1 + channel_volume 1 rest 16 rest 8 rest 9 @@ -1538,7 +1538,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 8 rest 16 octave 2 - notetype1 1 + channel_volume 1 note A_, 9 ;tie note A#, 16 @@ -1560,9 +1560,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -1610,9 +1610,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -1620,7 +1620,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note A_, 9 sound_call Branch_1f3d18 octave 2 - notetype1 1 + channel_volume 1 rest 8 note E_, 8 rest 8 @@ -1657,9 +1657,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -1705,9 +1705,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -1766,9 +1766,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note G#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note F#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave note C#, 16 @@ -1814,9 +1814,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note G#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note F#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave note C#, 16 @@ -1825,7 +1825,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) sound_call Branch_1f3d18 ;musicec 0 octave 2 - notetype1 1 + channel_volume 1 rest 16 rest 8 note A_, 9 @@ -1849,9 +1849,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -1899,9 +1899,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -2014,14 +2014,14 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D_, 4 note E_, 9 rest 2 - notetype1 2 + channel_volume 2 note E_, 4 rest 6 - notetype1 3 + channel_volume 3 note E_, 4 rest 6 rest 2 - notetype1 1 + channel_volume 1 dec_octave note G_, 16 ;tie @@ -2042,29 +2042,29 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) Branch_1f3d18: ;musice8 1 - notetype1 1 + channel_volume 1 .Loop1 - notetype1 1 + channel_volume 1 octave 7 note C#, 1 - notetype1 3 + channel_volume 3 dec_octave note C#, 7 sound_loop 2, .Loop1 rest 8 octave 7 - notetype1 1 + channel_volume 1 note C#, 1 - notetype1 3 + channel_volume 3 dec_octave note C#, 7 rest 1 rest 16 .Loop2 - notetype1 1 + channel_volume 1 octave 7 note C#, 1 - notetype1 3 + channel_volume 3 dec_octave note C#, 7 sound_loop 2, .Loop2 diff --git a/crysaudio/music/TCG2/ishihara.asm b/crysaudio/music/TCG2/ishihara.asm index 5a6c5e26..fd995579 100644 --- a/crysaudio/music/TCG2/ishihara.asm +++ b/crysaudio/music/TCG2/ishihara.asm @@ -6,8 +6,8 @@ Music_Ishihara: channel 4, Music_Ishihara_Ch4 Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 255 rest 13 rest 14 @@ -747,8 +747,8 @@ Branch_1dd880: Music_Ishihara_Ch1: ; 1dd9de (77:59de) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 255 ;musicf1 86 rest 13 @@ -1729,12 +1729,12 @@ Branch_1ddc75: Music_Ishihara_Ch3: ; 1dde54 (77:5e54) - notetype1 10 - notetype2 11 - notetype1 1 + channel_volume 10 + fade_wave 11 + channel_volume 1 ;musice9 96 ;musicdc 255 - notetype0 1 + speed 1 rest 13 octave 2 note C_, 14 @@ -2282,10 +2282,10 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) inc_octave inc_octave note F_, 7 - notetype1 3 + channel_volume 3 note F_, 7 rest 13 - notetype1 1 + channel_volume 1 sound_loop 0, .MainLoop Branch_1de0c5: diff --git a/crysaudio/music/TCG2/titlescreen.asm b/crysaudio/music/TCG2/titlescreen.asm index c5b59274..3303cc5f 100644 --- a/crysaudio/music/TCG2/titlescreen.asm +++ b/crysaudio/music/TCG2/titlescreen.asm @@ -6,10 +6,10 @@ Music_TCG2TitleScreen: channel 4, Music_TCG2TitleScreen_Ch4 Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) - notetype1 10 + channel_volume 10 ;musicf0 0 octave 3 - notetype0 1 + speed 1 ;musicdc 17 note G_, 3 note A_, 4 @@ -45,18 +45,18 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) note G_, 4 note A_, 4 sound_loop 8, .Loop2 - notetype0 10 + speed 10 note G_, 3 octave 2 - notetype2 4 + fade_wave 4 duty_cycle 2 ;musicef 252 note F_, 3 note E_, 3 ;musicf0 0 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 ;musicf1 101 ;musicf2 note G_, 8 @@ -67,7 +67,7 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) ;musicdc 17 note F_, 5 note F_, 2 - notetype0 5 + speed 5 note E_, 3 ;musicdc 1 note E_, 3 @@ -81,20 +81,20 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) note D_, 6 ;musicdc 1 note D_, 3 - notetype0 1 + speed 1 ;musicdc 17 note C_, 7 ;musicdc 1 note C_, 8 dec_octave vibrato 30, 3, 3 - notetype0 10 + speed 10 ;musicdc 17 note G_, 6 ;musicdc 1 note G_, 3 ;musicdc 17 - notetype0 1 + speed 1 note E_, 8 ;musicdc 1 note E_, 15 @@ -149,7 +149,7 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) ;musicdc 1 note F_, 2 ;musicdc 17 - notetype0 5 + speed 5 note E_, 3 ;musicdc 1 note E_, 3 @@ -163,24 +163,24 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) note D_, 6 ;musicdc 1 note D_, 3 - notetype0 1 + speed 1 ;musicdc 17 note E_, 8 ;musicdc 1 note E_, 7 dec_octave vibrato 30, 3, 3 - notetype0 10 + speed 10 ;musicdc 17 note G_, 6 ;musicdc 1 - notetype0 5 + speed 5 note G_, 3 ;musicdc 17 ;musicf3 note E_, 3 note F_, 3 - notetype0 1 + speed 1 ;musicf1 101 ;musicf2 note G_, 8 @@ -480,7 +480,7 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) ;musicdc 1 note D#, 4 ;musicdc 17 - notetype0 5 + speed 5 note G_, 12 ;tie note G_, 6 @@ -493,7 +493,7 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) note G_, 1 note A_, 1 note B_, 1 - notetype0 1 + speed 1 vibrato 20, 3, 3 inc_octave note C_, 15 @@ -591,7 +591,7 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) ;musicf0 7 ;musicf1 80 ;musicf2 - notetype2 8 + fade_wave 8 octave 3 note D_, 8 ;musicdc 1 @@ -759,10 +759,10 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) - notetype1 10 + channel_volume 10 ;musicf0 1 octave 3 - notetype0 1 + speed 1 ;musice4 255 ;musicef 252 rest 2 @@ -834,17 +834,17 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicdc 17 sound_loop 3, .Loop4 vibrato 28, 3, 3 - notetype0 10 + speed 10 note G_, 12 ;tie note G_, 3 rest 3 rest 3 - notetype0 1 + speed 1 octave 2 octave 2 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 ;musicf2 note B_, 8 ;musicdc 16 @@ -855,7 +855,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note D_, 5 ;musicdc 16 note D_, 2 - notetype0 5 + speed 5 ;musicdc 17 note C_, 3 ;musicdc 16 @@ -869,7 +869,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note G_, 6 ;musicdc 16 note G_, 3 - notetype0 1 + speed 1 ;musicdc 17 note G_, 8 ;musicdc 16 @@ -899,7 +899,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note A_, 4 sound_loop 2, .Loop5 ;musicf0 1 - notetype0 1 + speed 1 ;musicf1 85 ;musicf2 octave 3 @@ -990,7 +990,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 1 ;musicf3 octave 3 - notetype0 5 + speed 5 ;musicdc 17 ;musicf2 note C_, 3 @@ -1005,7 +1005,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note G_, 6 ;musicdc 16 note G_, 3 - notetype0 1 + speed 1 ;musicdc 17 note G_, 8 ;musicdc 16 @@ -1035,7 +1035,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicef 255 note A_, 4 ;musicf0 1 - notetype0 1 + speed 1 ;musicf3 ;musicdc 17 octave 3 @@ -1065,7 +1065,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf1 87 ;musicf2 octave 3 - notetype0 1 + speed 1 ;musicdc 17 note G#, 16 ;tie @@ -1144,7 +1144,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicdc 16 note G#, 2 ;musicf3 - notetype1 3 + channel_volume 3 ;musicdc 16 note C_, 3 ;musicf1 39 @@ -1155,7 +1155,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 12 ;musicf3 ;musicdc 17 - notetype0 1 + speed 1 octave 3 ;musicf1 55 ;musicf2 @@ -1626,7 +1626,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 0 ;musicf3 octave 4 - notetype2 8 + fade_wave 8 ;musicdc 17 note E_, 16 ;tie @@ -1634,7 +1634,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 7 ;musicf1 80 ;musicf2 - notetype2 8 + fade_wave 8 octave 3 note C_, 8 ;musicdc 1 @@ -1642,7 +1642,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) dec_octave ;musicf1 39 ;musicf2 - notetype2 8 + fade_wave 8 ;musicdc 17 note E_, 5 ;musicdc 16 @@ -1660,7 +1660,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) inc_octave ;musicf1 64 ;musicf2 - notetype2 8 + fade_wave 8 ;musicdc 17 note C_, 8 ;musicdc 1 @@ -1671,14 +1671,14 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicdc 17 octave 4 ;musicf2 - notetype2 8 + fade_wave 8 note E_, 5 note E_, 2 sound_loop 2, .Loop6 ;musicf0 0 ;musicf3 octave 4 - notetype2 8 + fade_wave 8 ;musicdc 17 note E_, 16 ;tie @@ -1686,7 +1686,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 7 ;musicf1 80 ;musicf2 - notetype2 8 + fade_wave 8 octave 3 note C_, 8 ;musicdc 1 @@ -1694,7 +1694,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) dec_octave ;musicf1 55 ;musicf2 - notetype2 8 + fade_wave 8 ;musicdc 17 note F_, 5 ;musicdc 16 @@ -1710,7 +1710,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 0 ;musicf1 85 octave 4 - notetype2 8 + fade_wave 8 ;musicdc 17 note E_, 8 ;musicdc 16 @@ -1719,7 +1719,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf1 80 ;musicf2 octave 3 - notetype2 8 + fade_wave 8 ;musicdc 17 note C_, 8 ;musicdc 1 @@ -1729,7 +1729,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf2 ;musicdc 17 octave 4 - notetype2 8 + fade_wave 8 note D_, 5 ;musicdc 16 note D_, 3 @@ -1917,16 +1917,16 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) - notetype1 10 + channel_volume 10 ;musicdc 17 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;musice8 3 ;musice9 96 - notetype0 1 + speed 1 rest 14 rest 14 - notetype0 5 + speed 5 octave 3 ;musice8 6 note D_, 9 @@ -1953,7 +1953,7 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note A_, 1 note A_, 1 note A_, 1 - notetype0 10 + speed 10 ;musice8 1 note G_, 12 ;tie @@ -1962,7 +1962,7 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note F_, 3 note E_, 3 note D_, 3 - notetype0 5 + speed 5 octave 3 note C_, 6 note C_, 6 @@ -2002,16 +2002,16 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note A#, 6 note A#, 6 note A_, 6 - notetype0 5 + speed 5 ;musice8 6 note G#, 3 ;musice8 4 note G#, 6 - notetype0 1 + speed 1 ;musice8 4 note G#, 7 note G#, 8 - notetype0 5 + speed 5 ;musice8 6 note G#, 3 ;musice8 4 @@ -2022,11 +2022,11 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note G_, 3 ;musice8 4 note G_, 6 - notetype0 1 + speed 1 ;musice8 4 note G_, 7 note G_, 8 - notetype0 5 + speed 5 ;musice8 6 note G_, 3 ;musice8 4 @@ -2037,11 +2037,11 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note F_, 3 ;musice8 4 note F_, 6 - notetype0 1 + speed 1 ;musice8 4 note F_, 7 note F_, 8 - notetype0 5 + speed 5 ;musice8 6 note A#, 3 ;musice8 4 @@ -2052,11 +2052,11 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note D#, 3 ;musice8 4 note D#, 6 - notetype0 1 + speed 1 ;musice8 4 note D#, 7 note D#, 8 - notetype0 5 + speed 5 ;musice8 6 note D#, 3 ;musice8 8 @@ -2079,62 +2079,62 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note G_, 6 note G_, 6 note G_, 6 - notetype0 5 + speed 5 ;musice8 7 octave 2 .Loop1 - notetype0 5 + speed 5 ;musice8 7 note A_, 3 note A_, 3 sound_call Branch_1ea254 - notetype0 1 + speed 1 ;musice8 4 note A_, 7 note A_, 8 sound_loop 2, .Loop1 .Loop2 - notetype0 5 + speed 5 ;musice8 7 note G_, 3 note G_, 3 sound_call Branch_1ea254 - notetype0 1 + speed 1 ;musice8 4 note G_, 7 note G_, 8 sound_loop 2, .Loop2 .Loop3 - notetype0 5 + speed 5 ;musice8 7 note F_, 3 note F_, 3 sound_call Branch_1ea254 - notetype0 1 + speed 1 ;musice8 4 note F_, 7 note F_, 8 sound_loop 2, .Loop3 - notetype0 5 + speed 5 ;musice8 7 note E_, 3 note E_, 3 sound_call Branch_1ea254 - notetype0 1 + speed 1 ;musice8 4 note E_, 7 note E_, 8 - notetype0 5 + speed 5 ;musice8 7 note E_, 3 note E_, 3 sound_call Branch_1ea26d - notetype0 1 + speed 1 ;musice8 4 note E_, 7 note E_, 8 ;musice8 4 - notetype0 5 + speed 5 octave 2 note G#, 6 note G#, 6 @@ -2168,40 +2168,40 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note G_, 4 note G_, 4 ;musice8 6 - notetype0 10 + speed 10 note C_, 12 sound_ret Branch_1ea254: - notetype0 1 + speed 1 octave 4 ;musice8 4 ;musicdc 17 ;musice8 6 - notetype1 1 + channel_volume 1 note E_, 8 ;musicdc 16 - notetype1 3 + channel_volume 3 note E_, 7 ;musicdc 17 - notetype1 1 + channel_volume 1 octave 2 ;musice8 7 sound_ret Branch_1ea26d: - notetype0 1 + speed 1 octave 4 ;musice8 4 ;musicdc 17 ;musice8 6 - notetype1 1 + channel_volume 1 note G_, 8 ;musicdc 16 - notetype1 3 + channel_volume 3 note G_, 7 ;musicdc 17 - notetype1 1 + channel_volume 1 octave 2 ;musice8 7 sound_ret