diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-10 11:42:56 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-10 11:42:56 -0400 |
| commit | fee52c53a40f8e36dfccfbe73668bfc2858c2a95 (patch) | |
| tree | fa97722414873b5203cd650ff02a66868766837c /audio | |
| parent | f4e2814381364f295367d1b8da0ad9f73fc565d1 (diff) | |
Make each pitch/instrument its own macro
Diffstat (limited to 'audio')
65 files changed, 15033 insertions, 15033 deletions
diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index dded207e..662f2fc8 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -5,149 +5,149 @@ Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb) vibrato 8, 1, 4 notetype 12, 11, 5 octave 3 - note G_, 2 + G_ 2 Music_BikeRiding_branch_7dbc9:: octave 4 - note C_, 4 - note D_, 4 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note F_, 4 - note E_, 2 - note D_, 2 - note F_, 4 - note D_, 4 + C_ 4 + D_ 4 + E_ 2 + C_ 2 + E_ 2 + G_ 2 + G_ 2 + F_ 2 + E_ 2 + F_ 4 + E_ 2 + D_ 2 + F_ 4 + D_ 4 octave 3 - note B_, 2 - octave 4 - note F_, 4 - note D_, 4 - note E_, 2 - note F_, 2 - note G_, 2 - note C_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note E_, 2 + B_ 2 + octave 4 + F_ 4 + D_ 4 + E_ 2 + F_ 2 + G_ 2 + C_ 2 + E_ 2 + C_ 2 + D_ 2 + E_ 2 notetype 12, 11, 6 - note F_, 10 + F_ 10 notetype 12, 10, 6 - note F_, 2 - note E_, 2 - note F_, 2 - note G_, 10 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 6 + F_ 2 + E_ 2 + F_ 2 + G_ 10 + E_ 2 + D_ 2 + E_ 2 + F_ 6 toggleperfectpitch notetype 12, 11, 3 - note E_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F_, 2 - note E_, 1 - note F_, 1 + E_ 2 + D_ 2 + D_ 1 + E_ 1 + F_ 2 + E_ 1 + F_ 1 toggleperfectpitch notetype 12, 11, 5 - note G_, 6 - note G_, 6 - note A_, 2 - note F_, 2 - note G_, 6 + G_ 6 + G_ 6 + A_ 2 + F_ 2 + G_ 6 notetype 12, 11, 4 - note G_, 2 - note F_, 4 + G_ 2 + F_ 4 notetype 12, 10, 4 - note E_, 2 - note D_, 2 + E_ 2 + D_ 2 notetype 12, 9, 3 octave 3 - note A_, 2 + A_ 2 octave 4 - note C_, 4 - note C_, 2 + C_ 4 + C_ 2 octave 3 - note B_, 2 - note A_, 1 - note B_, 1 - note A_, 2 - note B_, 2 - octave 4 - note C_, 2 - note C_, 4 - note C_, 2 + B_ 2 + A_ 1 + B_ 1 + A_ 2 + B_ 2 + octave 4 + C_ 2 + C_ 4 + C_ 2 octave 3 - note A_, 2 - note B_, 2 - note B_, 2 - note A_, 2 + A_ 2 + B_ 2 + B_ 2 + A_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 2 - note B_, 1 + A_ 2 + B_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 2 + B_ 2 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 1 - note D_, 1 + C_ 1 + D_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 4 + C_ 4 notetype 12, 3, 13 - note C_, 4 + C_ 4 notetype 12, 11, 4 - note F_, 6 - note G_, 4 - note F_, 1 - note G_, 1 - note F_, 4 - note E_, 6 - note F_, 2 - note E_, 2 - note D_, 1 - note E_, 1 - note D_, 2 - note C_, 2 + F_ 6 + G_ 4 + F_ 1 + G_ 1 + F_ 4 + E_ 6 + F_ 2 + E_ 2 + D_ 1 + E_ 1 + D_ 2 + C_ 2 notetype 12, 11, 5 octave 3 - note A_, 4 + A_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 - note C_, 4 - note F_, 4 - note D_, 4 - note F#, 4 + E_ 4 + C_ 4 + F_ 4 + D_ 4 + F# 4 vibrato 10, 2, 6 notetype 12, 8, 0 - note G_, 16 - note G_, 4 + G_ 16 + G_ 4 notetype 12, 8, 7 - note G_, 12 + G_ 12 notetype 12, 11, 5 vibrato 8, 1, 4 loopchannel 0, Music_BikeRiding_branch_7dbc9 @@ -158,146 +158,146 @@ Music_BikeRiding_Ch2:: ; 7dc6c (1f:5c6c) vibrato 6, 1, 5 notetype 12, 12, 3 octave 4 - note C_, 2 + C_ 2 Music_BikeRiding_branch_7dc75:: - note E_, 4 - note F_, 4 - note G_, 4 + E_ 4 + F_ 4 + G_ 4 octave 5 - note C_, 4 - octave 4 - note B_, 6 - note A_, 1 - note B_, 1 - note A_, 10 - note F_, 2 - note G_, 2 - note A_, 2 + C_ 4 + octave 4 + B_ 6 + A_ 1 + B_ 1 + A_ 10 + F_ 2 + G_ 2 + A_ 2 octave 5 - note D_, 2 - note C_, 2 + D_ 2 + C_ 2 octave 4 - note B_, 2 - note A_, 1 - note B_, 1 + B_ 2 + A_ 1 + B_ 1 octave 5 - note C_, 6 + C_ 6 octave 4 - note A_, 2 - note G_, 4 + A_ 2 + G_ 4 duty 3 notetype 12, 8, 4 - note A#, 6 + A# 6 duty 2 notetype 12, 12, 5 octave 5 - note C_, 2 + C_ 2 octave 4 - note B_, 2 + B_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note A_, 10 + A_ 10 octave 5 - note C_, 2 + C_ 2 octave 4 - note B_, 2 + B_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G_, 10 + G_ 10 notetype 12, 12, 3 octave 5 - note C_, 4 - note E_, 2 - note D_, 2 - note C_, 2 + C_ 4 + E_ 2 + D_ 2 + C_ 2 octave 4 - note B_, 2 + B_ 2 octave 5 - note C_, 2 + C_ 2 notetype 12, 11, 0 - note D_, 4 + D_ 4 notetype 12, 12, 7 - note D_, 10 - note D_, 1 - note C_, 1 + D_ 10 + D_ 1 + C_ 1 notetype 12, 11, 0 octave 4 - note B_, 4 + B_ 4 notetype 12, 12, 7 - note B_, 12 + B_ 12 notetype 12, 12, 4 - note F_, 6 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 6 - note E_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note F_, 2 - note G_, 4 - note A_, 2 - note F_, 2 - note E_, 2 - note G_, 4 - note F_, 2 - note E_, 6 + F_ 6 + F_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + E_ 6 + E_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 + F_ 2 + E_ 2 + D_ 2 + F_ 2 + G_ 4 + A_ 2 + F_ 2 + E_ 2 + G_ 4 + F_ 2 + E_ 6 notetype 6, 12, 2 - note F_, 1 - note G_, 1 - note A_, 1 - note B_, 1 + F_ 1 + G_ 1 + A_ 1 + B_ 1 notetype 12, 12, 3 octave 5 - note C_, 2 + C_ 2 octave 4 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 5 - note C_, 2 - octave 4 - note B_, 4 - note A_, 4 - note G_, 2 - note A#, 4 - note A_, 2 - note G_, 4 - note F_, 2 - note E_, 2 + C_ 2 + octave 4 + B_ 4 + A_ 4 + G_ 2 + A# 4 + A_ 2 + G_ 4 + F_ 2 + E_ 2 notetype 8, 12, 4 - note A_, 4 - note G_, 4 - note F_, 4 - note B_, 4 - note A_, 4 - note G_, 4 + A_ 4 + G_ 4 + F_ 4 + B_ 4 + A_ 4 + G_ 4 octave 5 - note C_, 4 + C_ 4 octave 4 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 octave 5 - note D_, 4 - note E_, 4 - note C_, 4 + D_ 4 + E_ 4 + C_ 4 notetype 12, 12, 7 - note D_, 12 - note C_, 4 + D_ 12 + C_ 4 notetype 12, 11, 0 octave 4 - note B_, 4 + B_ 4 notetype 12, 12, 7 - note B_, 12 + B_ 12 notetype 12, 12, 3 loopchannel 0, Music_BikeRiding_branch_7dc75 @@ -308,337 +308,337 @@ Music_BikeRiding_Ch3:: ; 7dd14 (1f:5d14) Music_BikeRiding_branch_7dd17:: octave 4 - note C_, 1 + C_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 3 - note G_, 1 + G_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A#, 1 + A# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A#, 1 + A# 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A#, 1 + A# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 loopchannel 0, Music_BikeRiding_branch_7dd17 @@ -671,35 +671,35 @@ Music_BikeRiding_branch_7de6a:: Music_BikeRiding_branch_7dea7:: rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 endchannel Music_BikeRiding_branch_7deb4:: rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 - dnote 2, triangle3 - dnote 2, triangle3 + triangle3 2 + triangle3 2 + triangle3 2 endchannel Music_BikeRiding_branch_7dec2:: rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 1, triangle3 - dnote 1, triangle3 + triangle3 1 + triangle3 1 endchannel -; 0x7ded1
\ No newline at end of file +; 0x7ded1 diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index e07d8fef..77dc2ab8 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -6,104 +6,104 @@ Music_Celadon_Ch1:: ; b6c7 (2:76c7) notetype 12, 2, 15 rest 8 octave 3 - note D_, 8 + D_ 8 Music_Celadon_branch_b6d4:: duty 2 notetype 12, 11, 2 - note G_, 4 - note B_, 4 - note G_, 2 - note B_, 4 - note G_, 2 - note E_, 1 - note E_, 1 - note G_, 1 - note E_, 1 - note B_, 2 - octave 4 - note C_, 2 + G_ 4 + B_ 4 + G_ 2 + B_ 4 + G_ 2 + E_ 1 + E_ 1 + G_ 1 + E_ 1 + B_ 2 + octave 4 + C_ 2 octave 3 - note A_, 8 - note F#, 4 - note A_, 4 - note F#, 2 - note A_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C_, 1 + A_ 8 + F# 4 + A_ 4 + F# 2 + A_ 6 + A_ 1 + B_ 1 + octave 4 + C_ 1 octave 3 - note B_, 1 - note A_, 2 - note B_, 2 - note G_, 4 + B_ 1 + A_ 2 + B_ 2 + G_ 4 octave 4 - note G_, 4 + G_ 4 octave 3 - note G_, 4 - note B_, 4 - note G_, 2 - note B_, 4 - note G_, 2 - note E_, 1 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 2 - octave 4 - note C_, 2 + G_ 4 + B_ 4 + G_ 2 + B_ 4 + G_ 2 + E_ 1 + F# 1 + G_ 1 + A_ 1 + B_ 2 + octave 4 + C_ 2 octave 3 - note A_, 8 - note A_, 2 - note B_, 2 + A_ 8 + A_ 2 + B_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note F#, 4 - note D_, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note A_, 8 + B_ 2 + A_ 2 + G_ 2 + F# 2 + G_ 2 + F# 4 + D_ 1 + E_ 1 + F# 1 + G_ 1 + A_ 8 notetype 12, 9, 4 - note B_, 8 - note G_, 4 - note D_, 4 - note G_, 4 - note A_, 2 + B_ 8 + G_ 4 + D_ 4 + G_ 4 + A_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note B_, 8 - note A_, 8 - note F#, 4 - note G_, 4 - note A_, 4 - note G_, 4 - note F#, 4 - note A_, 4 - note B_, 8 - note G_, 4 - note D_, 4 - note G_, 4 - note A_, 2 - octave 4 - note C_, 2 + B_ 8 + A_ 8 + F# 4 + G_ 4 + A_ 4 + G_ 4 + F# 4 + A_ 4 + B_ 8 + G_ 4 + D_ 4 + G_ 4 + A_ 2 + octave 4 + C_ 2 octave 3 - note B_, 8 - note A_, 8 - note F#, 4 - note G_, 4 - note A_, 4 - note G_, 4 - note F#, 4 - note A_, 4 + B_ 8 + A_ 8 + F# 4 + G_ 4 + A_ 4 + G_ 4 + F# 4 + A_ 4 loopchannel 0, Music_Celadon_branch_b6d4 @@ -111,118 +111,118 @@ Music_Celadon_Ch2:: ; b73a (2:773a) duty 3 notetype 12, 12, 2 octave 4 - note D_, 1 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 + D_ 1 + C# 1 + D_ 1 + E_ 1 + F# 1 + E_ 1 + F# 1 + G_ 1 notetype 12, 10, 0 - note A_, 8 + A_ 8 Music_Celadon_branch_b74a:: duty 2 notetype 12, 12, 2 octave 4 - note B_, 4 - note G_, 4 - note B_, 2 - note G_, 6 - note B_, 1 - note G_, 1 - note A_, 1 - note B_, 1 + B_ 4 + G_ 4 + B_ 2 + G_ 6 + B_ 1 + G_ 1 + A_ 1 + B_ 1 octave 5 - note C_, 2 - octave 4 - note B_, 2 - note A_, 8 - note A_, 4 - note F#, 4 - note A_, 2 - note F#, 6 - note A_, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note A_, 2 - note B_, 2 - note G_, 4 - note B_, 4 - note B_, 4 - note G_, 4 - note B_, 2 - note G_, 4 + C_ 2 + octave 4 + B_ 2 + A_ 8 + A_ 4 + F# 4 + A_ 2 + F# 6 + A_ 1 + G_ 1 + F# 1 + G_ 1 + A_ 2 + B_ 2 + G_ 4 + B_ 4 + B_ 4 + G_ 4 + B_ 2 + G_ 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note B_, 1 - note G_, 1 - note A_, 1 - note B_, 1 + B_ 1 + G_ 1 + A_ 1 + B_ 1 octave 5 - note C_, 2 - octave 4 - note B_, 2 - note A_, 8 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C#, 2 - note D_, 8 + C_ 2 + octave 4 + B_ 2 + A_ 8 + A_ 2 + G_ 2 + F# 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + C# 2 + D_ 8 octave 5 - note D_, 8 + D_ 8 notetype 12, 11, 4 octave 4 - note D_, 8 - note C_, 2 + D_ 8 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - octave 4 - note E_, 4 - note F#, 4 - note D_, 8 - note C_, 8 + B_ 2 + A_ 2 + B_ 2 + octave 4 + E_ 4 + F# 4 + D_ 8 + C_ 8 octave 3 - note A_, 2 - note B_, 2 - octave 4 - note C_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note E_, 2 - note D_, 8 - note D_, 8 - note C_, 2 + A_ 2 + B_ 2 + octave 4 + C_ 2 + D_ 2 + E_ 2 + C_ 2 + D_ 2 + E_ 2 + D_ 8 + D_ 8 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - octave 4 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 8 - note C_, 8 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 8 + B_ 2 + A_ 2 + B_ 2 + octave 4 + E_ 4 + D_ 2 + E_ 2 + D_ 8 + C_ 8 + A_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 2 + D_ 8 loopchannel 0, Music_Celadon_branch_b74a @@ -230,183 +230,183 @@ Music_Celadon_Ch3:: ; b7b5 (2:77b5) notetype 12, 1, 3 rest 8 octave 5 - note D_, 1 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 + D_ 1 + C# 1 + D_ 1 + E_ 1 + F# 1 + E_ 1 + F# 1 + G_ 1 Music_Celadon_branch_b7c1:: octave 4 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note C#, 2 - note D_, 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + G_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + C# 2 + D_ 2 rest 6 - note F#, 2 + F# 2 rest 4 - note F#, 2 - note G_, 2 + F# 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 - note B_, 2 - note G_, 2 + G_ 2 + B_ 2 + G_ 2 octave 5 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 + E_ 2 + D_ 2 + C_ 2 + D_ 2 octave 4 - note B_, 2 - note G_, 2 + B_ 2 + G_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 + E_ 2 + D_ 2 + C_ 2 + D_ 2 octave 4 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 - note B_, 2 - note G_, 2 + G_ 2 + B_ 2 + G_ 2 octave 5 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 + E_ 2 + D_ 2 + C_ 2 + D_ 2 octave 4 - note B_, 2 - note G_, 2 + B_ 2 + G_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 - note C_, 2 - octave 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 + D_ 2 + C_ 2 + octave 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 loopchannel 0, Music_Celadon_branch_b7c1 -; 0xb86d
\ No newline at end of file +; 0xb86d diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index 12048703..4fcbe842 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -9,79 +9,79 @@ Music_Cinnabar_branch_b878:: notetype 12, 11, 5 rest 4 octave 3 - note D_, 4 - note E_, 6 - note C#, 2 + D_ 4 + E_ 6 + C# 2 notetype 12, 11, 1 - note D_, 4 + D_ 4 notetype 12, 11, 5 - note B_, 4 + B_ 4 octave 4 - note C_, 6 + C_ 6 octave 3 - note A_, 2 + A_ 2 notetype 12, 11, 1 - note B_, 4 + B_ 4 notetype 12, 11, 5 - note G_, 4 - note F#, 4 - note E_, 2 - note F#, 2 + G_ 4 + F# 4 + E_ 2 + F# 2 notetype 12, 11, 1 - note G_, 4 + G_ 4 notetype 12, 11, 5 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note E_, 4 - note F#, 6 - note A_, 2 + G_ 4 + F# 4 + E_ 4 + D_ 4 + E_ 4 + F# 6 + A_ 2 notetype 12, 11, 1 - note G_, 4 + G_ 4 notetype 12, 11, 5 - note B_, 4 + B_ 4 octave 4 - note C_, 6 + C_ 6 octave 3 - note A_, 2 - note B_, 4 - note G_, 4 - note F#, 3 - note E_, 1 - note F#, 2 - note A_, 2 + A_ 2 + B_ 4 + G_ 4 + F# 3 + E_ 1 + F# 2 + A_ 2 notetype 12, 10, 2 - note G_, 4 + G_ 4 octave 4 - note D_, 1 - note E_, 1 - note D_, 4 + D_ 1 + E_ 1 + D_ 4 notetype 12, 7, 2 - note D_, 1 - note E_, 1 - note D_, 4 + D_ 1 + E_ 1 + D_ 4 notetype 12, 10, 7 octave 3 - note B_, 6 - note G_, 2 - note E_, 8 + B_ 6 + G_ 2 + E_ 8 octave 4 - note C_, 6 + C_ 6 octave 3 - note A_, 2 - note F#, 8 + A_ 2 + F# 8 octave 4 - note F#, 6 - note D_, 2 + F# 6 + D_ 2 octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 8 - note F#, 4 - note E_, 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 + G_ 8 + F# 4 + E_ 4 loopchannel 0, Music_Cinnabar_branch_b878 @@ -92,90 +92,90 @@ Music_Cinnabar_Ch2:: ; b8d4 (2:78d4) Music_Cinnabar_branch_b8d9:: notetype 12, 12, 7 octave 3 - note G_, 6 - note A_, 1 - note B_, 1 + G_ 6 + A_ 1 + B_ 1 octave 4 - note C_, 6 - note D_, 1 - note E_, 1 + C_ 6 + D_ 1 + E_ 1 notetype 12, 12, 1 - note D_, 4 + D_ 4 notetype 12, 12, 7 - note G_, 4 - note A_, 6 - note G_, 1 - note F#, 1 - note E_, 4 - note D_, 4 - note C_, 3 + G_ 4 + A_ 6 + G_ 1 + F# 1 + E_ 4 + D_ 4 + C_ 3 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 2 - note D_, 1 - note E_, 1 + C_ 2 + D_ 1 + E_ 1 notetype 12, 12, 1 - note D_, 4 + D_ 4 notetype 12, 12, 7 octave 3 - note B_, 8 - note A_, 4 - note G_, 6 - note A_, 1 - note B_, 1 + B_ 8 + A_ 4 + G_ 6 + A_ 1 + B_ 1 octave 4 - note C_, 6 - note D_, 1 - note E_, 1 + C_ 6 + D_ 1 + E_ 1 notetype 12, 12, 1 - note D_, 4 + D_ 4 notetype 12, 12, 7 - note G_, 4 - note A_, 6 - note G_, 1 - note F#, 1 - note E_, 4 - note D_, 4 - note C_, 3 + G_ 4 + A_ 6 + G_ 1 + F# 1 + E_ 4 + D_ 4 + C_ 3 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 2 - note D_, 1 - note E_, 1 + C_ 2 + D_ 1 + E_ 1 notetype 12, 12, 1 - note D_, 4 + D_ 4 notetype 12, 12, 7 octave 3 - note A_, 4 - note G_, 4 - note F#, 4 + A_ 4 + G_ 4 + F# 4 notetype 12, 11, 0 octave 4 - note D_, 6 + D_ 6 octave 3 - note B_, 2 - note G_, 8 + B_ 2 + G_ 8 octave 4 - note E_, 6 - note C_, 2 + E_ 6 + C_ 2 octave 3 - note A_, 8 + A_ 8 octave 4 - note A_, 6 - note F#, 2 - note D_, 2 - note C_, 2 + A_ 6 + F# 2 + D_ 2 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 4 + B_ 2 + A_ 2 + B_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 2 - note A_, 6 + B_ 2 + A_ 6 loopchannel 0, Music_Cinnabar_branch_b8d9 @@ -184,172 +184,172 @@ Music_Cinnabar_Ch3:: ; b93d (2:793d) Music_Cinnabar_branch_b93f:: octave 4 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 4 - note A_, 1 + B_ 4 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note B_, 1 + B_ 1 rest 3 octave 5 - note D_, 2 + D_ 2 octave 4 - note B_, 1 - note B_, 1 - note B_, 1 + B_ 1 + B_ 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note B_, 1 + B_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 octave 5 - note E_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + E_ 2 + C_ 1 + C_ 1 + C_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note E_, 2 - note C_, 1 + E_ 2 + C_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 3 octave 5 - note A_, 2 - note F#, 1 - note F#, 1 - note D_, 1 + A_ 2 + F# 1 + F# 1 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note D_, 2 - note C_, 1 + D_ 2 + C_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 3 octave 5 - note D_, 2 - note C_, 1 - note C_, 1 + D_ 2 + C_ 1 + C_ 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 2 + A_ 2 octave 5 - note C_, 1 + C_ 1 rest 1 loopchannel 0, Music_Cinnabar_branch_b93f -; 0xb9eb
\ No newline at end of file +; 0xb9eb diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index 3a5ec6e3..690fb915 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -7,23 +7,23 @@ Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f) Music_CinnabarMansion_branch_7ed19:: notetype 12, 6, 2 octave 5 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 octave 4 - note B_, 1 - note B_, 1 - note C_, 1 + B_ 1 + B_ 1 + C_ 1 rest 2 octave 5 - note B_, 2 - note E_, 2 + B_ 2 + E_ 2 octave 4 - note C_, 2 - note B_, 2 - note E_, 2 - note C_, 1 + C_ 2 + B_ 2 + E_ 2 + C_ 1 octave 5 - note B_, 1 + B_ 1 rest 2 loopchannel 14, Music_CinnabarMansion_branch_7ed19 notetype 12, 10, 5 @@ -31,10 +31,10 @@ Music_CinnabarMansion_branch_7ed19:: rest 16 rest 15 octave 4 - note C_, 1 + C_ 1 octave 5 - note B_, 1 - note B_, 2 + B_ 1 + B_ 2 loopchannel 0, Music_CinnabarMansion_branch_7ed19 @@ -56,42 +56,42 @@ Music_CinnabarMansion_branch_7ed50:: callchannel Music_CinnabarMansion_branch_7ed6c loopchannel 3, Music_CinnabarMansion_branch_7ed50 octave 3 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 + E_ 4 + D# 4 + B_ 4 + A# 4 + G_ 4 + G# 4 rest 4 - note A#, 4 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 - note G_, 4 - note D#, 4 + A# 4 + E_ 4 + D# 4 + B_ 4 + A# 4 + G_ 4 + G# 4 + G_ 4 + D# 4 loopchannel 0, Music_CinnabarMansion_branch_7ed4e Music_CinnabarMansion_branch_7ed6c:: octave 3 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 - note A_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 + E_ 4 + D# 4 + B_ 4 + A# 4 + G_ 4 + G# 4 + A_ 4 + A# 4 + E_ 4 + D# 4 + B_ 4 + A# 4 + G_ 4 + G# 4 rest 4 - note A#, 4 + A# 4 endchannel @@ -100,46 +100,46 @@ Music_CinnabarMansion_Ch3:: ; 7ed7e (1f:6d7e) Music_CinnabarMansion_branch_7ed80:: octave 2 - note B_, 2 + B_ 2 rest 2 octave 3 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note C_, 2 + C_ 2 rest 2 octave 3 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 loopchannel 8, Music_CinnabarMansion_branch_7ed80 - note E_, 16 - note D#, 16 - note G_, 16 - note G#, 8 - note D#, 8 + E_ 16 + D# 16 + G_ 16 + G# 8 + D# 8 loopchannel 0, Music_CinnabarMansion_branch_7ed80 @@ -151,23 +151,23 @@ Music_CinnabarMansion_Ch4:: ; 7edb0 (1f:6db0) rest 16 Music_CinnabarMansion_branch_7edb5:: - dnote 2, cymbal1 - dnote 2, cymbal1 - dnote 4, cymbal2 - dnote 2, cymbal1 - dnote 2, cymbal1 - dnote 4, cymbal2 - dnote 2, cymbal1 - dnote 2, cymbal1 - dnote 4, cymbal2 - dnote 2, cymbal1 - dnote 2, cymbal1 - dnote 4, cymbal3 - dnote 2, cymbal1 - dnote 2, cymbal1 + cymbal1 2 + cymbal1 2 + cymbal2 4 + cymbal1 2 + cymbal1 2 + cymbal2 4 + cymbal1 2 + cymbal1 2 + cymbal2 4 + cymbal1 2 + cymbal1 2 + cymbal3 4 + cymbal1 2 + cymbal1 2 rest 2 rest 10 rest 8 - dnote 8, cymbal3 + cymbal3 8 loopchannel 0, Music_CinnabarMansion_branch_7edb5 -; 0x7edda
\ No newline at end of file +; 0x7edda diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index 03ac21e0..82754e0e 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -13,258 +13,258 @@ Music_Cities1_branch_aa79:: Music_Cities1_branch_aa80:: notetype 12, 12, 5 octave 3 - note G#, 4 - note F#, 4 - note E_, 2 - note E_, 2 - note F#, 2 - note D#, 2 - note E_, 2 - note E_, 2 - note D#, 2 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 4 - note C#, 2 - note E_, 2 - note E_, 4 + G# 4 + F# 4 + E_ 2 + E_ 2 + F# 2 + D# 2 + E_ 2 + E_ 2 + D# 2 + C# 4 + D# 4 + E_ 2 + D# 4 + C# 2 + E_ 2 + E_ 4 notetype 12, 10, 5 - note C#, 4 + C# 4 octave 2 - note B_, 6 + B_ 6 octave 3 - note C#, 2 - note C#, 4 + C# 2 + C# 4 octave 2 - note B_, 4 + B_ 4 notetype 12, 12, 5 callchannel Music_Cities1_branch_ab7d octave 3 - note D#, 6 - note E_, 2 + D# 6 + E_ 2 octave 2 - note B_, 4 + B_ 4 notetype 12, 10, 5 octave 3 - note C#, 2 + C# 2 octave 2 - note B_, 2 - note A_, 4 - note B_, 4 - note B_, 2 + B_ 2 + A_ 4 + B_ 4 + B_ 2 octave 3 - note C#, 2 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 2 + C# 2 + D# 2 + E_ 2 + D# 2 + C# 2 + D# 2 notetype 12, 12, 5 - note G#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note E_, 4 - note F#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 2 - note C#, 2 - note C#, 2 - note E_, 2 - note E_, 4 + G# 2 + E_ 2 + F# 2 + E_ 2 + E_ 4 + F# 2 + D# 2 + E_ 4 + D# 2 + C# 4 + D# 4 + E_ 2 + D# 2 + C# 2 + C# 2 + E_ 2 + E_ 4 notetype 12, 10, 5 - note C#, 2 + C# 2 octave 2 - note A_, 2 - note B_, 6 + A_ 2 + B_ 6 octave 3 - note C#, 2 - note C#, 2 + C# 2 + C# 2 octave 2 - note B_, 2 - note B_, 4 + B_ 2 + B_ 4 notetype 12, 12, 5 callchannel Music_Cities1_branch_ab7d octave 3 - note D#, 4 - note D#, 2 - note E_, 2 + D# 4 + D# 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note G#, 2 - note E_, 4 + C# 2 + G# 2 + E_ 4 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 notetype 12, 10, 5 - note C#, 4 + C# 4 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 4 - note C#, 2 - note E_, 4 + D# 4 + C# 2 + E_ 4 notetype 12, 11, 3 callchannel Music_Cities1_branch_ab8a - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note F#, 4 - note G#, 2 - note E_, 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + A_ 4 + F# 4 + G# 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 4 - note G#, 2 + E_ 4 + G# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 2 + E_ 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + D# 2 + C# 2 octave 2 - note B_, 2 + B_ 2 octave 3 Music_Cities1_branch_ab12:: - note C#, 2 - note D#, 2 - note C#, 2 + C# 2 + D# 2 + C# 2 octave 2 - note B_, 4 - note B_, 2 + B_ 4 + B_ 2 octave 3 - note C#, 2 - note D#, 2 + C# 2 + D# 2 loopchannel 2, Music_Cities1_branch_ab12 - note E_, 2 + E_ 2 octave 2 - note B_, 4 + B_ 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note G#, 2 - note G#, 2 + C# 2 + G# 2 + G# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 callchannel Music_Cities1_branch_ab8a - note A_, 2 - note E_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note F#, 2 - note G#, 2 - note E_, 2 + A_ 2 + E_ 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + A_ 2 + F# 2 + G# 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note D#, 2 - note B_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note E_, 4 - note G#, 2 - note F#, 2 - note D#, 2 + E_ 2 + C# 2 + G# 2 + C# 2 + D# 2 + B_ 2 + E_ 2 + G# 2 + E_ 2 + F# 2 + E_ 4 + G# 2 + F# 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 4 - note F#, 2 - note D#, 2 - note D#, 2 - note F#, 2 + D# 4 + F# 2 + D# 2 + D# 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 + D# 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D#, 2 + D# 2 notetype 12, 11, 6 - note F#, 8 - note F#, 4 - note D#, 4 - note E_, 8 + F# 8 + F# 4 + D# 4 + E_ 8 notetype 12, 8, 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note E_, 2 - note F#, 2 + E_ 2 + F# 2 loopchannel 0, Music_Cities1_branch_aa80 Music_Cities1_branch_ab7d:: octave 3 - note F#, 2 - note D#, 4 - note E_, 2 - note D#, 4 - note C#, 4 + F# 2 + D# 4 + E_ 2 + D# 4 + C# 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note C#, 2 - note D#, 2 - note C#, 2 + C# 2 + D# 2 + C# 2 endchannel Music_Cities1_branch_ab8a:: - note A_, 2 - note E_, 2 - note C#, 2 - note E_, 4 - note A_, 2 - note C#, 2 - note E_, 2 + A_ 2 + E_ 2 + C# 2 + E_ 4 + A_ 2 + C# 2 + E_ 2 endchannel @@ -272,132 +272,132 @@ Music_Cities1_Ch2:: ; ab92 (2:6b92) vibrato 5, 1, 5 callchannel Music_Cities1_branch_ac00 octave 4 - note G#, 2 + G# 2 notetype 12, 12, 4 - note E_, 6 + E_ 6 notetype 12, 12, 5 duty 3 octave 3 - note C#, 4 - note D#, 4 - note E_, 6 - note F#, 6 - note G#, 4 + C# 4 + D# 4 + E_ 6 + F# 6 + G# 4 callchannel Music_Cities1_branch_ac00 octave 4 - note G#, 2 + G# 2 notetype 12, 12, 4 - note E_, 14 + E_ 14 duty 3 octave 3 - note E_, 6 - note F#, 6 - note G#, 4 + E_ 6 + F# 6 + G# 4 notetype 12, 11, 7 duty 2 vibrato 8, 1, 7 octave 5 - note C#, 12 + C# 12 octave 4 - note A_, 4 + A_ 4 octave 5 - note E_, 8 - note F#, 2 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 8 + F# 2 + E_ 2 + D# 2 + C# 2 octave 4 - note B_, 12 - note G#, 4 - note B_, 16 - note F#, 12 - note G#, 2 - note A_, 2 - note B_, 4 - note A_, 4 - note G#, 4 - note F#, 4 - note G#, 12 - note E_, 4 - note B_, 16 + B_ 12 + G# 4 + B_ 16 + F# 12 + G# 2 + A_ 2 + B_ 4 + A_ 4 + G# 4 + F# 4 + G# 12 + E_ 4 + B_ 16 octave 5 - note C#, 12 - note D#, 2 - note E_, 2 - note F#, 4 - note E_, 4 - note D#, 4 - note C#, 4 + C# 12 + D# 2 + E_ 2 + F# 4 + E_ 4 + D# 4 + C# 4 octave 4 - note B_, 12 + B_ 12 octave 5 - note C#, 2 - note D#, 2 - note C#, 4 + C# 2 + D# 2 + C# 4 octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note A_, 12 - note B_, 2 + B_ 4 + A_ 4 + G# 4 + A_ 12 + B_ 2 octave 5 - note C_, 2 - note C_, 4 + C_ 2 + C_ 4 octave 4 - note B_, 4 - note A_, 4 - note F#, 4 + B_ 4 + A_ 4 + F# 4 notetype 12, 11, 7 - note A_, 8 + A_ 8 octave 5 - note C_, 8 + C_ 8 octave 4 - note B_, 14 + B_ 14 notetype 12, 8, 4 - note G#, 1 + G# 1 notetype 12, 10, 4 - note A_, 1 + A_ 1 loopchannel 0, Music_Cities1_Ch2 Music_Cities1_branch_ac00:: duty 2 notetype 12, 12, 3 octave 4 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 notetype 12, 12, 4 - note G#, 10 + G# 10 notetype 12, 12, 3 - note G#, 2 - note A_, 2 - note B_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 + G# 2 + A_ 2 + B_ 4 + B_ 2 + A_ 2 + G# 2 + A_ 2 notetype 12, 12, 4 - note F#, 10 + F# 10 notetype 12, 12, 5 duty 3 octave 3 - note E_, 4 - note D#, 8 - note E_, 4 - note F#, 4 + E_ 4 + D# 8 + E_ 4 + F# 4 notetype 12, 12, 3 duty 2 octave 4 - note A_, 4 - note G#, 4 + A_ 4 + G# 4 notetype 12, 12, 4 - note F#, 10 + F# 10 notetype 12, 12, 3 - note F#, 2 - note G#, 2 - note A_, 4 - note A_, 2 - note G#, 2 - note F#, 2 + F# 2 + G# 2 + A_ 4 + A_ 2 + G# 2 + F# 2 endchannel @@ -411,171 +411,171 @@ Music_Cities1_branch_ac35:: callchannel Music_Cities1_branch_acc5 callchannel Music_Cities1_branch_acc5 callchannel Music_Cities1_branch_acce - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 + G# 2 + E_ 2 + F# 2 + G# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 callchannel Music_Cities1_branch_acc5 - note B_, 2 - note E_, 2 - note F#, 2 - note G#, 2 + B_ 2 + E_ 2 + F# 2 + G# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 callchannel Music_Cities1_branch_acc5 callchannel Music_Cities1_branch_acce - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 + G# 2 + E_ 2 + F# 2 + G# 2 rest 2 - note G#, 2 - note E_, 2 - note B_, 2 + G# 2 + E_ 2 + B_ 2 rest 2 - note E_, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note B_, 2 - note E_, 2 + E_ 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + B_ 2 + E_ 2 vibrato 8, 2, 5 - note A_, 8 - note E_, 8 - note A_, 8 - note F#, 8 - note G#, 8 - note E_, 8 - note G#, 12 - note E_, 4 - note F#, 2 - note F#, 2 - note D#, 2 - note E_, 4 - note F#, 2 - note D#, 2 - note E_, 2 - note F#, 2 - note F#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 2 + A_ 8 + E_ 8 + A_ 8 + F# 8 + G# 8 + E_ 8 + G# 12 + E_ 4 + F# 2 + F# 2 + D# 2 + E_ 4 + F# 2 + D# 2 + E_ 2 + F# 2 + F# 2 + B_ 2 + A_ 2 + G# 2 + A_ 2 + G# 2 + F# 2 + G# 2 + G# 2 + E_ 2 + G# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note A_, 8 - note E_, 8 - note A_, 8 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 8 - note E_, 8 - note B_, 4 - note E_, 4 - note F#, 4 - note G#, 4 + E_ 2 + F# 2 + G# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + A_ 8 + E_ 8 + A_ 8 + B_ 2 + A_ 2 + G# 2 + F# 2 + G# 8 + E_ 8 + B_ 4 + E_ 4 + F# 4 + G# 4 rest 2 - note D#, 2 - note E_, 2 - note F#, 2 + D# 2 + E_ 2 + F# 2 rest 2 - note F#, 2 - note B_, 2 - note A_, 2 - note A_, 4 - note G#, 4 - note F#, 2 - note D#, 2 - note A_, 2 - note F#, 2 + F# 2 + B_ 2 + A_ 2 + A_ 4 + G# 4 + F# 2 + D# 2 + A_ 2 + F# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 rest 2 - note E_, 2 - note F#, 1 - note G#, 1 - note E_, 1 - note F#, 1 - note G#, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 + E_ 2 + F# 1 + G# 1 + E_ 1 + F# 1 + G# 4 + B_ 2 + A_ 2 + G# 2 + A_ 2 + G# 2 + F# 2 loopchannel 0, Music_Cities1_branch_ac35 Music_Cities1_branch_acc5:: rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 endchannel Music_Cities1_branch_acce:: - note A_, 2 - note F#, 2 - note G#, 2 - note A_, 2 + A_ 2 + F# 2 + G# 2 + A_ 2 rest 2 - note A_, 2 - note G#, 2 - note F#, 2 + A_ 2 + G# 2 + F# 2 rest 2 - note F#, 2 - note G#, 2 - note A_, 2 + F# 2 + G# 2 + A_ 2 rest 2 - note A_, 2 - note G#, 2 - note F#, 2 - note D#, 2 - note D#, 2 - note E_, 2 - note F#, 2 + A_ 2 + G# 2 + F# 2 + D# 2 + D# 2 + E_ 2 + F# 2 rest 2 - note D#, 2 - note E_, 2 - note F#, 2 + D# 2 + E_ 2 + F# 2 rest 2 - note D#, 2 - note E_, 2 - note F#, 2 + D# 2 + E_ 2 + F# 2 rest 2 - note D#, 2 - note E_, 2 - note F#, 2 + D# 2 + E_ 2 + F# 2 endchannel @@ -591,68 +591,68 @@ Music_Cities1_branch_acf3:: callchannel Music_Cities1_branch_ad36 callchannel Music_Cities1_branch_ad5f callchannel Music_Cities1_branch_ad52 - dnote 6, triangle1 - dnote 6, triangle1 - dnote 4, triangle2 + triangle1 6 + triangle1 6 + triangle2 4 callchannel Music_Cities1_branch_ad6e callchannel Music_Cities1_branch_ad5f callchannel Music_Cities1_branch_ad52 callchannel Music_Cities1_branch_ad6e callchannel Music_Cities1_branch_ad52 - dnote 6, triangle1 - dnote 6, triangle1 - dnote 2, triangle2 - dnote 2, triangle1 - dnote 6, triangle1 - dnote 6, triangle1 - dnote 4, triangle1 - dnote 6, triangle1 - dnote 6, snare6 - dnote 4, snare6 + triangle1 6 + triangle1 6 + triangle2 2 + triangle1 2 + triangle1 6 + triangle1 6 + triangle1 4 + triangle1 6 + snare6 6 + snare6 4 loopchannel 0, Music_Cities1_Ch4 Music_Cities1_branch_ad36:: - dnote 6, snare6 - dnote 6, snare6 - dnote 4, snare6 - dnote 6, snare6 - dnote 6, snare6 - dnote 2, snare6 - dnote 2, snare6 + snare6 6 + snare6 6 + snare6 4 + snare6 6 + snare6 6 + snare6 2 + snare6 2 endchannel Music_Cities1_branch_ad45:: - dnote 6, snare6 - dnote 6, snare6 - dnote 4, snare6 - dnote 6, snare6 - dnote 6, snare6 - dnote 4, snare6 + snare6 6 + snare6 6 + snare6 4 + snare6 6 + snare6 6 + snare6 4 endchannel Music_Cities1_branch_ad52:: - dnote 6, triangle1 - dnote 6, triangle1 - dnote 4, triangle2 - dnote 6, triangle1 - dnote 6, triangle1 - dnote 4, triangle2 + triangle1 6 + triangle1 6 + triangle2 4 + triangle1 6 + triangle1 6 + triangle2 4 endchannel Music_Cities1_branch_ad5f:: - dnote 6, triangle1 - dnote 6, triangle1 - dnote 4, triangle2 - dnote 6, triangle1 - dnote 6, triangle1 - dnote 2, triangle2 - dnote 2, triangle1 + triangle1 6 + triangle1 6 + triangle2 4 + triangle1 6 + triangle1 6 + triangle2 2 + triangle1 2 endchannel Music_Cities1_branch_ad6e:: - dnote 6, triangle1 - dnote 6, triangle1 - dnote 2, triangle2 - dnote 2, triangle2 + triangle1 6 + triangle1 6 + triangle2 2 + triangle2 2 endchannel -; 0xad77
\ No newline at end of file +; 0xad77 diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index 3f5f8c28..34297e68 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -7,89 +7,89 @@ Music_Cities2_Ch1:: ; b504 (2:7504) notetype 12, 11, 6 rest 8 octave 3 - note E_, 2 - note D#, 2 - note C#, 2 - note C_, 2 + E_ 2 + D# 2 + C# 2 + C_ 2 octave 2 - note B_, 2 + B_ 2 rest 14 Music_Cities2_branch_b51a:: octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 2 - note D#, 1 - note D_, 1 - note C#, 4 + C# 2 + D# 1 + D_ 1 + C# 4 octave 3 - note B_, 4 - note G#, 8 - note E_, 8 - note A_, 4 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 + B_ 4 + G# 8 + E_ 8 + A_ 4 + G# 2 + F# 2 + G# 2 + A_ 2 + B_ 2 octave 4 - note C#, 2 + C# 2 rest 16 - note C#, 4 + C# 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 1 - note D#, 1 - note C#, 4 + C# 1 + D# 1 + C# 4 octave 3 - note B_, 4 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + B_ 4 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 3 - note G#, 8 - note B_, 4 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note E_, 2 - note F#, 2 - note G#, 2 + G# 8 + B_ 4 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + B_ 2 + E_ 2 + F# 2 + G# 2 rest 2 octave 4 - note E_, 4 + E_ 4 octave 3 - note B_, 4 - note F#, 2 - note G#, 2 - note A_, 2 + B_ 4 + F# 2 + G# 2 + A_ 2 rest 2 octave 4 - note F#, 4 - note D#, 4 + F# 4 + D# 4 octave 3 - note E_, 2 + E_ 2 rest 4 - note F#, 2 + F# 2 rest 4 - note A_, 2 + A_ 2 rest 2 - note B_, 2 + B_ 2 rest 16 rest 16 rest 14 - note E_, 16 - note F#, 8 - note G#, 4 - note F#, 4 - note E_, 2 + E_ 16 + F# 8 + G# 4 + F# 4 + E_ 2 rest 14 loopchannel 0, Music_Cities2_branch_b51a @@ -99,184 +99,184 @@ Music_Cities2_Ch2:: ; b569 (2:7569) vibrato 8, 2, 3 notetype 12, 12, 2 octave 4 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 2 + D# 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 2 + B_ 2 + A_ 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note E_, 6 + C# 2 + D# 2 + E_ 6 notetype 12, 12, 2 duty 2 octave 4 - note E_, 1 + E_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + C# 2 + D# 2 + E_ 1 + F# 1 + G# 1 + A_ 1 Music_Cities2_branch_b58b:: notetype 12, 10, 6 - note G#, 6 + G# 6 notetype 12, 12, 2 - note A_, 1 - note G#, 1 + A_ 1 + G# 1 notetype 12, 12, 4 - note F#, 14 + F# 14 notetype 12, 12, 2 - note E_, 1 + E_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + C# 2 + D# 2 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 12, 12, 4 - note G#, 6 + G# 6 notetype 12, 12, 2 - note E_, 1 - note G#, 1 + E_ 1 + G# 1 notetype 12, 12, 5 - note B_, 14 + B_ 14 notetype 12, 12, 2 - note E_, 1 + E_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + C# 2 + D# 2 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 12, 10, 6 - note G#, 6 + G# 6 notetype 12, 12, 2 - note A_, 1 - note G#, 1 + A_ 1 + G# 1 notetype 12, 12, 4 - note F#, 8 + F# 8 notetype 12, 10, 1 duty 1 octave 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 + G# 1 + G# 1 + G# 1 + G# 1 + G# 1 rest 1 notetype 12, 12, 2 duty 2 octave 4 - note E_, 1 + E_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + C# 2 + D# 2 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 12, 12, 4 - note G#, 6 - note E_, 1 - note G#, 1 + G# 6 + E_ 1 + G# 1 notetype 12, 12, 6 - note B_, 8 + B_ 8 notetype 12, 12, 2 - note C#, 1 + C# 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 - note D#, 1 - note E_, 4 + C# 1 + D# 1 + E_ 4 notetype 12, 12, 7 - note G#, 4 - note E_, 4 + G# 4 + E_ 4 notetype 12, 12, 2 - note D#, 1 - note C#, 1 - note D#, 1 - note E_, 1 - note F#, 4 + D# 1 + C# 1 + D# 1 + E_ 1 + F# 4 notetype 12, 12, 7 - note B_, 4 - note F#, 4 + B_ 4 + F# 4 notetype 12, 12, 2 - note C#, 1 + C# 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 - note D#, 1 - note E_, 2 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note G#, 2 - note G#, 1 - note A_, 1 - note G#, 1 - note A_, 1 - note B_, 1 - note F#, 1 - note D#, 1 - note C#, 1 + C# 1 + D# 1 + E_ 2 + E_ 1 + D# 1 + E_ 1 + F# 1 + G# 2 + G# 1 + A_ 1 + G# 1 + A_ 1 + B_ 1 + F# 1 + D# 1 + C# 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 - note D#, 1 - note F#, 1 + C# 1 + D# 1 + F# 1 notetype 12, 12, 2 - note B_, 8 + B_ 8 notetype 12, 11, 7 octave 3 - note E_, 8 + E_ 8 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note G#, 4 - note A_, 4 - note B_, 8 - note B_, 8 - note G#, 4 + F# 4 + G# 4 + A_ 4 + B_ 8 + B_ 8 + G# 4 octave 4 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 2 + D# 4 + C# 4 + D# 4 + E_ 2 + D# 2 + C# 2 + D# 2 notetype 12, 12, 2 - note E_, 6 - note E_, 1 + E_ 6 + E_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + C# 2 + D# 2 + E_ 1 + F# 1 + G# 1 + A_ 1 loopchannel 0, Music_Cities2_branch_b58b @@ -284,134 +284,134 @@ Music_Cities2_Ch3:: ; b640 (2:7640) notetype 12, 1, 1 rest 16 octave 4 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 Music_Cities2_branch_b64c:: - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 rest 2 - note E_, 4 - note G#, 4 - note F#, 2 - note A_, 2 - note F#, 2 + E_ 4 + G# 4 + F# 2 + A_ 2 + F# 2 rest 2 - note F#, 4 - note A_, 4 - note C#, 2 + F# 4 + A_ 4 + C# 2 rest 4 - note E_, 2 + E_ 2 rest 4 - note G#, 2 - note A_, 2 - note B_, 2 + G# 2 + A_ 2 + B_ 2 rest 8 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 loopchannel 0, Music_Cities2_branch_b64c -; 0xb6c7
\ No newline at end of file +; 0xb6c7 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index e057730d..4c3fa487 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -6,281 +6,281 @@ Music_Credits_Ch1:: ; 7fc1f (1f:7c1f) toggleperfectpitch notetype 12, 11, 5 octave 4 - note E_, 6 + E_ 6 octave 3 - note A_, 1 + A_ 1 octave 4 - note E_, 1 - note D_, 6 + E_ 1 + D_ 6 octave 3 - note G_, 1 + G_ 1 octave 4 - note D_, 1 - note C#, 6 + D_ 1 + C# 6 octave 3 - note F#, 1 - octave 4 - note C#, 1 - note D_, 4 - note E_, 2 - note C#, 1 - note E_, 1 - note C#, 1 + F# 1 + octave 4 + C# 1 + D_ 4 + E_ 2 + C# 1 + E_ 1 + C# 1 rest 1 octave 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 - note E_, 1 - note F#, 1 - note G_, 1 + E_ 1 + E_ 1 + F# 1 + G_ 1 notetype 12, 11, 6 - note A_, 4 - note E_, 2 - note A_, 2 - note G_, 4 - note A_, 2 - note G_, 2 - note B_, 4 - note A_, 4 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C#, 6 - note E_, 2 - note A_, 4 - note C#, 4 - note E_, 4 - note D_, 2 - note C#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note A_, 4 - note E_, 2 - note A_, 2 - note G_, 4 - note A_, 2 - note G_, 2 - note B_, 4 - note A_, 4 - note G_, 2 - note A_, 2 - note F#, 2 - note D_, 2 - note E_, 6 - note C#, 2 - note A_, 4 - note C#, 4 - note E_, 4 - note D_, 2 - note C#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note G_, 4 - note D_, 2 - note G_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note D_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 6 - note A_, 2 - note G_, 4 - note F#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note G_, 4 - note D_, 2 - note G_, 2 - note B_, 2 - octave 4 - note C#, 2 + A_ 4 + E_ 2 + A_ 2 + G_ 4 + A_ 2 + G_ 2 + B_ 4 + A_ 4 + G_ 2 + F# 2 + E_ 2 + D_ 2 + C# 6 + E_ 2 + A_ 4 + C# 4 + E_ 4 + D_ 2 + C# 2 + E_ 2 + F# 2 + G_ 2 + F# 2 + A_ 4 + E_ 2 + A_ 2 + G_ 4 + A_ 2 + G_ 2 + B_ 4 + A_ 4 + G_ 2 + A_ 2 + F# 2 + D_ 2 + E_ 6 + C# 2 + A_ 4 + C# 4 + E_ 4 + D_ 2 + C# 2 + E_ 2 + F# 2 + G_ 2 + F# 2 + G_ 4 + D_ 2 + G_ 2 + B_ 2 + A_ 2 + G_ 2 + A_ 2 + D_ 4 + E_ 2 + F# 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 6 + A_ 2 + G_ 4 + F# 4 + G_ 4 + F# 4 + E_ 4 + D_ 4 + G_ 4 + D_ 2 + G_ 2 + B_ 2 + octave 4 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note D_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 + B_ 2 + A_ 2 + D_ 4 + E_ 2 + F# 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 notetype 12, 11, 7 - note E_, 6 - note A_, 2 - note G_, 4 - note F#, 4 + E_ 6 + A_ 2 + G_ 4 + F# 4 notetype 12, 12, 7 - note A_, 4 - note B_, 4 + A_ 4 + B_ 4 octave 4 - note C#, 4 - note D_, 4 + C# 4 + D_ 4 octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 + B_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 notetype 12, 9, 0 - note G_, 8 - note F#, 8 - note E_, 8 - note D_, 8 + G_ 8 + F# 8 + E_ 8 + D_ 8 rest 16 rest 16 rest 8 notetype 12, 11, 6 - note E_, 6 - note D#, 1 - note D_, 1 + E_ 6 + D# 1 + D_ 1 notetype 12, 10, 0 - note C#, 8 + C# 8 notetype 12, 10, 7 - note C#, 8 + C# 8 rest 16 rest 16 rest 8 - note E_, 6 - note C#, 1 - note E_, 1 + E_ 6 + C# 1 + E_ 1 notetype 12, 10, 0 - note A_, 8 + A_ 8 notetype 12, 10, 7 - note A_, 8 + A_ 8 notetype 12, 11, 6 - note G_, 6 - note D_, 4 - note G_, 2 - note B_, 4 + G_ 6 + D_ 4 + G_ 2 + B_ 4 notetype 12, 11, 7 - note G_, 8 - note F#, 4 - note G#, 4 + G_ 8 + F# 4 + G# 4 notetype 12, 9, 0 - note A_, 8 - note F#, 8 - note E_, 8 - note C#, 8 + A_ 8 + F# 8 + E_ 8 + C# 8 notetype 12, 11, 7 - note D_, 8 - note C#, 8 + D_ 8 + C# 8 octave 2 - note B_, 8 + B_ 8 octave 3 - note D_, 8 + D_ 8 notetype 12, 9, 0 - note E_, 8 - note D_, 8 - note F#, 8 - note E_, 8 + E_ 8 + D_ 8 + F# 8 + E_ 8 notetype 12, 10, 0 - note D_, 8 - note E_, 8 - note D_, 8 - note C_, 8 - note G_, 8 - note F_, 8 - note E_, 8 - note D_, 8 + D_ 8 + E_ 8 + D_ 8 + C_ 8 + G_ 8 + F_ 8 + E_ 8 + D_ 8 notetype 12, 10, 0 - note C#, 6 + C# 6 notetype 12, 10, 7 - note C#, 6 + C# 6 notetype 12, 11, 7 - note D_, 4 - note E_, 8 - note G_, 6 - note F#, 1 - note F_, 1 + D_ 4 + E_ 8 + G_ 6 + F# 1 + F_ 1 notetype 12, 10, 0 - note E_, 6 + E_ 6 notetype 12, 10, 7 - note E_, 6 + E_ 6 notetype 12, 11, 7 - note D_, 4 + D_ 4 notetype 12, 10, 0 - note C#, 8 + C# 8 notetype 12, 10, 7 - note C#, 8 + C# 8 notetype 12, 11, 7 - note E_, 6 - note D_, 2 - note G_, 4 - note F#, 4 - note E_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note E_, 4 - note D_, 4 - note C#, 4 - note D_, 4 - note C#, 4 - note C#, 4 - note E_, 4 - note F#, 4 + E_ 6 + D_ 2 + G_ 4 + F# 4 + E_ 4 + F# 4 + E_ 4 + D_ 4 + E_ 4 + D_ 4 + C# 4 + D_ 4 + C# 4 + C# 4 + E_ 4 + F# 4 notetype 12, 10, 0 - note E_, 6 + E_ 6 notetype 12, 11, 7 - note D_, 2 - note G_, 4 - note F#, 4 - note E_, 4 - note F#, 4 - note A_, 4 - note B_, 4 + D_ 2 + G_ 4 + F# 4 + E_ 4 + F# 4 + A_ 4 + B_ 4 notetype 12, 10, 0 octave 4 - note C#, 16 - note C#, 8 + C# 16 + C# 8 notetype 12, 10, 7 - note C#, 8 + C# 8 notetype 12, 11, 5 octave 3 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 - note A_, 1 + A_ 1 + A_ 1 notetype 12, 11, 1 - note A_, 8 + A_ 8 endchannel @@ -289,326 +289,326 @@ Music_Credits_Ch2:: ; 7fd5f (1f:7d5f) vibrato 10, 2, 5 notetype 12, 12, 5 octave 4 - note A_, 6 - note E_, 1 - note A_, 1 - note G_, 6 - note D_, 1 - note G_, 1 + A_ 6 + E_ 1 + A_ 1 + G_ 6 + D_ 1 + G_ 1 notetype 12, 12, 7 - note F#, 12 - note G#, 2 - note E_, 1 - note G#, 1 + F# 12 + G# 2 + E_ 1 + G# 1 notetype 12, 12, 2 - note A_, 2 + A_ 2 notetype 12, 12, 1 octave 3 - note A_, 4 - note A_, 1 - note A_, 1 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 2 - note A_, 4 - note A_, 1 - note A_, 1 - note A_, 2 - note A_, 2 + A_ 4 + A_ 1 + A_ 1 + A_ 2 + A_ 2 + A_ 4 + A_ 2 + A_ 4 + A_ 1 + A_ 1 + A_ 2 + A_ 2 notetype 12, 12, 4 - note A_, 1 - note F#, 1 - note A_, 1 - note B_, 1 + A_ 1 + F# 1 + A_ 1 + B_ 1 notetype 12, 12, 7 octave 4 - note C#, 6 - note C#, 1 - note D_, 1 - note E_, 4 - note C#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note C#, 6 + C# 6 + C# 1 + D_ 1 + E_ 4 + C# 4 + G_ 4 + F# 4 + E_ 4 + D_ 4 + C# 6 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 8 + E_ 8 octave 3 - note A_, 6 - note E_, 2 - octave 4 - note C#, 8 - note C#, 6 - note C#, 1 - note D_, 1 - note E_, 4 - note C#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note C#, 6 + A_ 6 + E_ 2 + octave 4 + C# 8 + C# 6 + C# 1 + D_ 1 + E_ 4 + C# 4 + G_ 4 + F# 4 + E_ 4 + D_ 4 + C# 6 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 8 + E_ 8 octave 3 - note A_, 6 - note E_, 2 + A_ 6 + E_ 2 notetype 12, 11, 0 octave 4 - note C#, 8 + C# 8 notetype 12, 12, 7 - note D_, 6 + D_ 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note G_, 8 + G_ 8 octave 3 - note G_, 6 - note D_, 2 - note B_, 8 + G_ 6 + D_ 2 + B_ 8 notetype 12, 11, 0 octave 4 - note C#, 6 + C# 6 notetype 12, 11, 7 - note C#, 6 - note D_, 4 + C# 6 + D_ 4 notetype 12, 10, 0 - note E_, 8 + E_ 8 notetype 12, 10, 7 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note D_, 6 + D_ 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note G_, 8 + G_ 8 octave 3 - note G_, 6 - note D_, 2 - note B_, 8 + G_ 6 + D_ 2 + B_ 8 notetype 12, 11, 0 octave 4 - note E_, 7 + E_ 7 notetype 12, 11, 7 - note E_, 7 + E_ 7 notetype 12, 12, 3 - note E_, 1 - note G#, 1 + E_ 1 + G# 1 notetype 12, 11, 0 - note A_, 8 + A_ 8 notetype 12, 11, 7 - note A_, 8 + A_ 8 notetype 12, 12, 6 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 + G_ 4 + F# 4 + E_ 4 + D_ 4 notetype 12, 10, 0 - note C#, 8 + C# 8 notetype 12, 10, 7 - note C#, 8 + C# 8 notetype 12, 9, 0 octave 3 - note A_, 8 + A_ 8 notetype 12, 9, 7 - note A_, 8 + A_ 8 notetype 12, 11, 0 - note E_, 8 + E_ 8 notetype 12, 11, 7 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note D_, 8 - note G_, 6 - note F#, 1 - note F_, 1 - note E_, 8 + D_ 8 + G_ 6 + F# 1 + F_ 1 + E_ 8 notetype 12, 11, 7 - note G_, 6 - note F#, 1 - note F_, 1 + G_ 6 + F# 1 + F_ 1 notetype 12, 11, 0 - note E_, 8 + E_ 8 notetype 12, 11, 7 - note E_, 8 + E_ 8 notetype 12, 11, 0 - note D_, 8 + D_ 8 notetype 12, 11, 7 - note D_, 8 + D_ 8 notetype 12, 12, 7 octave 2 - note B_, 8 + B_ 8 octave 3 - note F#, 6 - note D_, 1 - note F#, 1 - note E_, 8 - note B_, 6 - note G_, 1 - note B_, 1 + F# 6 + D_ 1 + F# 1 + E_ 8 + B_ 6 + G_ 1 + B_ 1 notetype 12, 11, 0 octave 4 - note C#, 8 + C# 8 notetype 12, 11, 7 - note C#, 8 + C# 8 notetype 12, 11, 0 - note D_, 8 + D_ 8 notetype 12, 11, 7 - note D_, 8 + D_ 8 notetype 12, 12, 7 octave 3 - note B_, 8 + B_ 8 octave 4 - note D_, 6 + D_ 6 octave 3 - note B_, 1 + B_ 1 octave 4 - note D_, 1 + D_ 1 notetype 12, 11, 0 - note C#, 6 + C# 6 notetype 12, 11, 7 - note C#, 6 + C# 6 notetype 12, 12, 7 octave 3 - note B_, 4 + B_ 4 notetype 12, 11, 0 - note A_, 8 + A_ 8 notetype 12, 11, 7 - note A_, 8 + A_ 8 notetype 12, 11, 0 - note F#, 6 + F# 6 notetype 12, 11, 7 - note F#, 6 + F# 6 notetype 12, 12, 7 - note G#, 4 - note A_, 8 - note F#, 8 + G# 4 + A_ 8 + F# 8 notetype 12, 11, 0 - note G#, 6 + G# 6 notetype 12, 11, 7 - note G#, 6 + G# 6 notetype 12, 12, 7 - note A_, 4 - note B_, 8 - note G#, 8 + A_ 4 + B_ 8 + G# 8 notetype 12, 11, 0 - note A_, 6 + A_ 6 notetype 12, 11, 7 - note A_, 6 + A_ 6 notetype 12, 12, 7 - note B_, 4 + B_ 4 octave 4 - note C_, 8 + C_ 8 octave 3 - note A_, 8 + A_ 8 notetype 12, 11, 0 - note B_, 6 + B_ 6 notetype 12, 11, 7 - note B_, 6 + B_ 6 notetype 12, 12, 7 octave 4 - note C_, 4 + C_ 4 notetype 12, 11, 0 - note D_, 8 + D_ 8 octave 3 - note B_, 8 + B_ 8 notetype 12, 11, 0 octave 4 - note C#, 16 - note C#, 8 + C# 16 + C# 8 notetype 12, 11, 7 - note C#, 8 + C# 8 notetype 12, 11, 0 octave 3 - note A_, 16 - note A_, 8 + A_ 16 + A_ 8 notetype 12, 11, 7 - note A_, 8 + A_ 8 notetype 12, 12, 7 - note G_, 6 - note B_, 2 + G_ 6 + B_ 2 octave 4 - note D_, 8 + D_ 8 octave 3 - note B_, 6 + B_ 6 octave 4 - note D_, 2 - note G_, 6 - note F#, 1 - note F_, 1 - note E_, 8 + D_ 2 + G_ 6 + F# 1 + F_ 1 + E_ 8 octave 3 - note G_, 6 - note F#, 1 - note F_, 1 - note E_, 8 - note C#, 4 - note D_, 4 - note G_, 6 - note B_, 2 - octave 4 - note D_, 8 + G_ 6 + F# 1 + F_ 1 + E_ 8 + C# 4 + D_ 4 + G_ 6 + B_ 2 + octave 4 + D_ 8 octave 3 - note B_, 6 + B_ 6 octave 4 - note D_, 2 - note G_, 8 + D_ 2 + G_ 8 notetype 12, 11, 0 - note A_, 16 + A_ 16 notetype 12, 10, 0 - note A_, 8 + A_ 8 notetype 12, 10, 7 - note A_, 8 + A_ 8 notetype 12, 12, 1 - note A_, 2 - note A_, 4 - note A_, 1 - note A_, 1 + A_ 2 + A_ 4 + A_ 1 + A_ 1 notetype 12, 12, 1 - note A_, 8 + A_ 8 endchannel Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) notetype 12, 1, 0 octave 5 - note C#, 6 + C# 6 octave 4 - note A_, 1 + A_ 1 octave 5 - note C#, 1 - note D_, 6 + C# 1 + D_ 6 octave 4 - note B_, 1 + B_ 1 octave 5 - note D_, 1 - note F#, 6 - note D_, 1 - note F#, 1 - note A_, 4 - note G#, 2 - note E_, 1 - note G#, 1 - note A_, 1 + D_ 1 + F# 6 + D_ 1 + F# 1 + A_ 4 + G# 2 + E_ 1 + G# 1 + A_ 1 rest 15 rest 16 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffa4 octave 4 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffa4 @@ -617,30 +617,30 @@ Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) callchannel Music_Credits_branch_7ffb8 callchannel Music_Credits_branch_7ffc1 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 callchannel Music_Credits_branch_7ffb8 callchannel Music_Credits_branch_7ffb8 callchannel Music_Credits_branch_7ffc1 callchannel Music_Credits_branch_7ffc1 octave 4 - note G_, 4 - note A_, 4 - note B_, 4 + G_ 4 + A_ 4 + B_ 4 octave 5 - note D_, 4 + D_ 4 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffa4 @@ -650,53 +650,53 @@ Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffa4 - note E_, 4 - note A_, 2 - note E_, 4 - note A_, 2 - note E_, 2 - note A_, 2 + E_ 4 + A_ 2 + E_ 4 + A_ 2 + E_ 2 + A_ 2 callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffa4 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note A_, 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + G# 2 + A_ 2 callchannel Music_Credits_branch_7ffd2 callchannel Music_Credits_branch_7ffd2 callchannel Music_Credits_branch_7ffdb callchannel Music_Credits_branch_7ffdb - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 + F_ 2 + A_ 2 + F_ 2 + A_ 2 + F_ 2 + A_ 2 + F_ 2 + A_ 2 + F_ 2 + A_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + E_ 2 + F_ 2 callchannel Music_Credits_branch_7ffb8 callchannel Music_Credits_branch_7ffb8 - note E_, 4 - note A_, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note A_, 4 + E_ 4 + A_ 4 + E_ 4 + A_ 4 + E_ 4 + A_ 4 + E_ 4 + A_ 4 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffe4 @@ -707,115 +707,115 @@ Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) callchannel Music_Credits_branch_7ffb8 callchannel Music_Credits_branch_7ffed callchannel Music_Credits_branch_7ffed - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 - note A_, 1 - note A_, 1 + A_ 1 + A_ 1 + A_ 1 rest 7 endchannel Music_Credits_branch_7ffa4:: octave 4 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 endchannel Music_Credits_branch_7ffae:: octave 4 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 endchannel Music_Credits_branch_7ffb8:: - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 endchannel Music_Credits_branch_7ffc1:: octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 endchannel Music_Credits_branch_7ffd2:: - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 endchannel Music_Credits_branch_7ffdb:: - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 endchannel Music_Credits_branch_7ffe4:: - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 endchannel Music_Credits_branch_7ffed:: - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 - note A_, 1 - note A_, 1 + A_ 1 + A_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 endchannel -; 0x7fffa
\ No newline at end of file +; 0x7fffa diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index b5bf18d9..96c2b9fc 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -7,158 +7,158 @@ Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad) tempo 112 notetype 12, 10, 6 octave 4 - note D_, 6 + D_ 6 octave 3 - note A_, 1 + A_ 1 octave 4 - note D_, 1 - note F#, 6 - note D_, 1 - note F#, 1 + D_ 1 + F# 6 + D_ 1 + F# 1 notetype 12, 10, 0 - note A_, 8 + A_ 8 notetype 12, 10, 7 - note A_, 8 + A_ 8 Music_DefeatedGymLeader_branch_23ccc:: notetype 12, 11, 2 octave 3 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 4 - note D_, 4 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note C#, 2 + A_ 2 + A_ 2 + F# 4 + G_ 2 + G_ 2 + E_ 4 + D_ 2 + E_ 2 + D_ 2 + E_ 2 + D_ 4 + D_ 4 + A_ 2 + A_ 2 + F# 4 + G_ 2 + G_ 2 + E_ 4 + D_ 2 + E_ 2 + D_ 2 + C# 2 notetype 12, 11, 1 octave 2 - note B_, 8 + B_ 8 notetype 12, 11, 2 octave 3 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 4 - note D_, 4 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note C#, 2 + A_ 2 + A_ 2 + F# 4 + G_ 2 + G_ 2 + E_ 4 + D_ 2 + E_ 2 + D_ 2 + E_ 2 + D_ 4 + D_ 4 + A_ 2 + A_ 2 + F# 4 + G_ 2 + G_ 2 + E_ 4 + D_ 2 + E_ 2 + D_ 2 + C# 2 notetype 12, 11, 1 octave 2 - note B_, 8 + B_ 8 notetype 12, 9, 7 octave 3 - note D_, 6 + D_ 6 octave 2 - note A_, 1 + A_ 1 octave 3 - note D_, 1 - note F#, 8 + D_ 1 + F# 8 notetype 12, 11, 0 - note F#, 6 - note E_, 1 - note F#, 1 - note A_, 8 + F# 6 + E_ 1 + F# 1 + A_ 8 notetype 12, 9, 7 - note E_, 6 - note C#, 1 - note E_, 1 - note G#, 8 + E_ 6 + C# 1 + E_ 1 + G# 8 notetype 12, 11, 0 - note G#, 6 - note E_, 1 - note G#, 1 - note B_, 8 + G# 6 + E_ 1 + G# 1 + B_ 8 notetype 12, 9, 7 - note C#, 6 + C# 6 octave 2 - note A_, 1 + A_ 1 octave 3 - note C#, 1 - note E_, 8 + C# 1 + E_ 8 notetype 12, 11, 0 - note E_, 6 - note C#, 1 - note E_, 1 - note E_, 4 - note G_, 4 + E_ 6 + C# 1 + E_ 1 + E_ 4 + G_ 4 notetype 12, 9, 0 - note F#, 8 - note E_, 8 - note D_, 8 - note C#, 8 + F# 8 + E_ 8 + D_ 8 + C# 8 notetype 12, 9, 7 - note D_, 6 + D_ 6 octave 2 - note A_, 1 + A_ 1 octave 3 - note D_, 1 - note F#, 8 + D_ 1 + F# 8 notetype 12, 11, 0 - note F#, 6 - note E_, 1 - note F#, 1 - note A_, 8 + F# 6 + E_ 1 + F# 1 + A_ 8 notetype 12, 9, 7 - note E_, 6 - note C#, 1 - note E_, 1 - note G#, 8 + E_ 6 + C# 1 + E_ 1 + G# 8 notetype 12, 11, 0 - note G#, 6 - note E_, 1 - note G#, 1 - note B_, 8 + G# 6 + E_ 1 + G# 1 + B_ 8 notetype 12, 9, 7 - note C#, 6 + C# 6 octave 2 - note A_, 1 + A_ 1 octave 3 - note C#, 1 - note E_, 8 + C# 1 + E_ 8 notetype 12, 11, 0 - note E_, 6 - note C#, 1 - note E_, 1 - note E_, 4 - note G_, 4 + E_ 6 + C# 1 + E_ 1 + E_ 4 + G_ 4 notetype 12, 9, 7 - note F#, 6 - note E_, 1 - note F#, 1 - note A_, 8 + F# 6 + E_ 1 + F# 1 + A_ 8 notetype 12, 10, 7 - note G_, 8 - note E_, 8 + G_ 8 + E_ 8 loopchannel 0, Music_DefeatedGymLeader_branch_23ccc @@ -167,188 +167,188 @@ Music_DefeatedGymLeader_Ch2:: ; 23d6d (8:7d6d) vibrato 24, 2, 4 notetype 12, 12, 4 octave 4 - note A_, 6 - note F#, 1 - note A_, 1 + A_ 6 + F# 1 + A_ 1 octave 5 - note D_, 6 + D_ 6 octave 4 - note A_, 1 + A_ 1 octave 5 - note D_, 1 + D_ 1 notetype 12, 11, 0 - note F#, 8 + F# 8 notetype 12, 11, 7 - note F#, 8 + F# 8 Music_DefeatedGymLeader_branch_23d84:: notetype 12, 12, 2 octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 + B_ 2 + A_ 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 notetype 12, 12, 4 - note A_, 4 - note A_, 4 + A_ 4 + A_ 4 notetype 12, 12, 2 octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 + B_ 2 + A_ 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 notetype 12, 12, 1 - note D_, 6 + D_ 6 notetype 6, 12, 2 - note G_, 1 - note A_, 1 - note B_, 1 + G_ 1 + A_ 1 + B_ 1 octave 4 - note C#, 1 + C# 1 notetype 12, 12, 2 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 + B_ 2 + A_ 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 notetype 12, 12, 4 - note A_, 4 - note A_, 3 + A_ 4 + A_ 3 notetype 6, 12, 2 - note B_, 1 + B_ 1 octave 4 - note C#, 1 + C# 1 notetype 12, 12, 2 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 + B_ 2 + A_ 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 notetype 12, 12, 1 - note D_, 8 + D_ 8 notetype 12, 12, 7 - note A_, 6 - note F#, 1 - note A_, 1 + A_ 6 + F# 1 + A_ 1 notetype 12, 11, 0 octave 4 - note D_, 8 + D_ 8 notetype 12, 10, 0 - note D_, 8 + D_ 8 notetype 12, 9, 7 - note D_, 8 + D_ 8 notetype 12, 12, 7 octave 3 - note B_, 6 - note G#, 1 - note B_, 1 + B_ 6 + G# 1 + B_ 1 notetype 12, 8, 0 octave 4 - note E_, 8 + E_ 8 notetype 12, 10, 0 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note E_, 8 + E_ 8 octave 3 - note G_, 6 - note E_, 1 - note G_, 1 + G_ 6 + E_ 1 + G_ 1 notetype 12, 6, 15 octave 4 - note C#, 8 + C# 8 notetype 12, 12, 7 - note C#, 8 - note F#, 4 - note E_, 4 + C# 8 + F# 4 + E_ 4 notetype 12, 11, 0 - note D_, 14 + D_ 14 octave 3 - note B_, 2 + B_ 2 notetype 12, 10, 0 - note A_, 8 + A_ 8 notetype 12, 11, 7 - note A_, 8 + A_ 8 notetype 12, 12, 7 - note A_, 6 - note F#, 1 - note A_, 1 + A_ 6 + F# 1 + A_ 1 notetype 12, 11, 0 octave 4 - note D_, 8 + D_ 8 notetype 12, 10, 0 - note D_, 8 + D_ 8 notetype 12, 9, 7 - note D_, 8 + D_ 8 notetype 12, 12, 7 octave 3 - note B_, 6 - note G#, 1 - note B_, 1 + B_ 6 + G# 1 + B_ 1 notetype 12, 4, 15 octave 4 - note E_, 8 + E_ 8 notetype 12, 11, 0 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note E_, 8 + E_ 8 octave 3 - note G_, 6 - note E_, 1 - note G_, 1 + G_ 6 + E_ 1 + G_ 1 notetype 12, 11, 0 octave 4 - note C#, 8 + C# 8 notetype 12, 11, 7 - note C#, 8 + C# 8 octave 3 - note A_, 4 + A_ 4 octave 4 - note C#, 4 + C# 4 notetype 12, 11, 0 - note D_, 14 - note E_, 2 - note D_, 12 + D_ 14 + E_ 2 + D_ 12 notetype 12, 12, 2 octave 3 - note G_, 1 - note A_, 1 - note B_, 1 + G_ 1 + A_ 1 + B_ 1 octave 4 - note C#, 1 + C# 1 loopchannel 0, Music_DefeatedGymLeader_branch_23d84 @@ -356,253 +356,253 @@ Music_DefeatedGymLeader_Ch3:: ; 23e52 (8:7e52) notetype 12, 1, 0 vibrato 16, 1, 2 octave 4 - note F#, 6 - note D_, 1 - note F#, 1 - note A_, 6 - note F#, 1 - note A_, 1 + F# 6 + D_ 1 + F# 1 + A_ 6 + F# 1 + A_ 1 octave 5 - note D_, 6 + D_ 6 octave 4 - note A_, 1 + A_ 1 octave 5 - note D_, 1 - note F#, 8 + D_ 1 + F# 8 Music_DefeatedGymLeader_branch_23e65:: octave 4 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F#, 3 + F# 3 rest 1 - note F#, 3 + F# 3 rest 1 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note D_, 1 + D_ 1 rest 5 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 3 + G_ 3 rest 1 - note D_, 3 + D_ 3 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 7 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note E_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note E_, 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + G_ 2 + A_ 2 + G_ 2 + E_ 2 loopchannel 0, Music_DefeatedGymLeader_branch_23e65 -; 0x23f52
\ No newline at end of file +; 0x23f52 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 0f7a91dc..624190f6 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -6,92 +6,92 @@ Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53) tempo 224 notetype 4, 10, 2 octave 4 - note D_, 2 + D_ 2 tempo 224 notetype 4, 10, 2 - note D_, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 + D_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note D_, 2 + D_ 2 notetype 4, 11, 3 - note F#, 12 + F# 12 duty 1 tempo 224 Music_DefeatedTrainer_branch_23a76:: notetype 4, 6, 3 octave 3 - note A_, 6 - note F#, 3 - note A_, 3 - note B_, 6 - note G#, 3 - note B_, 3 + A_ 6 + F# 3 + A_ 3 + B_ 6 + G# 3 + B_ 3 octave 4 - note C#, 3 + C# 3 octave 3 - note B_, 3 - note A_, 3 - note G_, 3 - note A_, 3 - note B_, 3 - note A_, 3 - note G_, 3 - note A_, 6 - note F#, 3 - note A_, 3 - note B_, 6 - note G#, 3 - note B_, 3 + B_ 3 + A_ 3 + G_ 3 + A_ 3 + B_ 3 + A_ 3 + G_ 3 + A_ 6 + F# 3 + A_ 3 + B_ 6 + G# 3 + B_ 3 octave 4 - note C#, 3 - note D_, 3 - note E_, 3 - note F#, 3 - note C#, 3 + C# 3 + D_ 3 + E_ 3 + F# 3 + C# 3 octave 3 - note B_, 3 - note A_, 3 + B_ 3 + A_ 3 octave 4 - note C#, 3 + C# 3 octave 3 - note A_, 6 - note F#, 3 - note A_, 3 - note B_, 6 - note G#, 3 - note B_, 3 + A_ 6 + F# 3 + A_ 3 + B_ 6 + G# 3 + B_ 3 octave 4 - note C_, 6 + C_ 6 octave 3 - note A_, 3 + A_ 3 octave 4 - note C_, 3 - note D_, 3 + C_ 3 + D_ 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note D_, 6 - note C#, 3 + D_ 6 + C# 3 octave 3 - note B_, 3 - note A_, 3 - note G_, 3 - note F#, 3 - note G_, 3 - note A_, 3 - note B_, 3 - note A_, 3 - note G_, 3 - note F#, 3 - note E_, 3 - note F#, 3 - note G_, 3 - note A_, 3 - note B_, 3 + B_ 3 + A_ 3 + G_ 3 + F# 3 + G_ 3 + A_ 3 + B_ 3 + A_ 3 + G_ 3 + F# 3 + E_ 3 + F# 3 + G_ 3 + A_ 3 + B_ 3 loopchannel 0, Music_DefeatedTrainer_branch_23a76 @@ -99,169 +99,169 @@ Music_DefeatedTrainer_Ch2:: ; 23ac1 (8:7ac1) duty 2 notetype 4, 12, 3 octave 4 - note A_, 2 + A_ 2 notetype 4, 12, 3 - note A_, 2 - note A_, 2 - note A_, 2 - note B_, 2 + A_ 2 + A_ 2 + A_ 2 + B_ 2 octave 5 - note C#, 2 + C# 2 notetype 4, 12, 4 - note D_, 12 + D_ 12 Music_DefeatedTrainer_branch_23ad2:: notetype 4, 8, 5 octave 4 - note D_, 6 + D_ 6 octave 3 - note A_, 3 + A_ 3 octave 4 - note D_, 3 - note E_, 6 + D_ 3 + E_ 6 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 3 - note F#, 3 - note G_, 3 - note A_, 6 - note E_, 3 - note F#, 3 - note G_, 6 - note D_, 6 + E_ 3 + F# 3 + G_ 3 + A_ 6 + E_ 3 + F# 3 + G_ 6 + D_ 6 octave 3 - note A_, 3 + A_ 3 octave 4 - note D_, 3 - note E_, 6 + D_ 3 + E_ 6 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 3 - note F#, 3 - note G_, 3 - note A_, 6 - note F#, 3 - note G_, 3 - note A_, 6 - note D_, 6 + E_ 3 + F# 3 + G_ 3 + A_ 6 + F# 3 + G_ 3 + A_ 6 + D_ 6 octave 3 - note A_, 3 + A_ 3 octave 4 - note D_, 3 - note E_, 6 + D_ 3 + E_ 6 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 3 - note F_, 6 - note C_, 3 - note F_, 3 - note G_, 3 - note D_, 3 - note G_, 6 + E_ 3 + F_ 6 + C_ 3 + F_ 3 + G_ 3 + D_ 3 + G_ 6 notetype 4, 7, 0 - note F#, 12 + F# 12 notetype 4, 7, 7 - note F#, 12 + F# 12 notetype 4, 6, 0 - note E_, 12 + E_ 12 notetype 4, 6, 7 - note E_, 12 + E_ 12 loopchannel 0, Music_DefeatedTrainer_branch_23ad2 Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15) notetype 4, 1, 0 octave 5 - note D_, 2 + D_ 2 notetype 4, 1, 0 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 octave 4 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 12 + B_ 2 + A_ 2 + G_ 2 + A_ 12 notetype 4, 2, 1 Music_DefeatedTrainer_branch_23b24:: - note F#, 3 + F# 3 rest 3 - note F#, 3 + F# 3 rest 3 - note G#, 3 + G# 3 rest 3 - note G#, 3 + G# 3 rest 3 - note A_, 3 + A_ 3 rest 3 - note A_, 3 + A_ 3 rest 3 - note B_, 3 + B_ 3 rest 3 - note B_, 3 + B_ 3 rest 3 - note F#, 3 + F# 3 rest 3 - note F#, 3 + F# 3 rest 3 - note G#, 3 + G# 3 rest 3 - note G#, 3 + G# 3 rest 3 - note A_, 3 + A_ 3 rest 3 - note A_, 3 + A_ 3 rest 3 octave 5 - note C#, 3 + C# 3 rest 3 - note C#, 3 + C# 3 octave 4 - note A_, 3 - note F#, 3 + A_ 3 + F# 3 octave 5 - note D_, 3 + D_ 3 octave 4 - note F#, 3 + F# 3 rest 3 - note G#, 3 + G# 3 octave 5 - note E_, 3 + E_ 3 octave 4 - note G#, 3 + G# 3 rest 3 - note A_, 3 + A_ 3 octave 5 - note F_, 3 + F_ 3 octave 4 - note A_, 3 + A_ 3 rest 3 - note B_, 3 + B_ 3 octave 5 - note G_, 3 + G_ 3 octave 4 - note B_, 3 - note A#, 3 - note A_, 3 + B_ 3 + A# 3 + A_ 3 rest 3 - note A_, 3 + A_ 3 rest 3 - note A_, 3 + A_ 3 rest 3 - note A_, 3 + A_ 3 octave 5 - note C_, 3 - note C#, 3 + C_ 3 + C# 3 rest 3 - note C#, 3 + C# 3 rest 3 - note C#, 3 + C# 3 rest 3 - note C#, 3 + C# 3 octave 4 - note A_, 3 + A_ 3 loopchannel 0, Music_DefeatedTrainer_branch_23b24 -; 0x23b74
\ No newline at end of file +; 0x23b74 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index 6340afd3..93b4d3ff 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -8,62 +8,62 @@ Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74) tempo 112 notetype 12, 11, 7 octave 3 - note B_, 1 - note A_, 1 - note G#, 1 - note F#, 1 - note E_, 12 + B_ 1 + A_ 1 + G# 1 + F# 1 + E_ 12 Music_DefeatedWildMon_branch_23b8b:: notetype 12, 6, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note G#, 2 - note G#, 2 - note G#, 4 - note E_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note G#, 8 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note A_, 2 - note A_, 4 - note A#, 2 - note A#, 2 - note A#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note A_, 2 - note A_, 4 - note A#, 2 - note A#, 2 - note A#, 4 - note A_, 8 + E_ 2 + F# 2 + E_ 2 + F# 2 + G# 2 + G# 2 + G# 4 + A_ 2 + A_ 2 + A_ 4 + G# 2 + G# 2 + G# 4 + E_ 2 + F# 2 + E_ 2 + F# 2 + G# 2 + G# 2 + G# 4 + A_ 2 + A_ 2 + A_ 4 + G# 8 + F_ 2 + G_ 2 + F_ 2 + G_ 2 + A_ 2 + A_ 2 + A_ 4 + A# 2 + A# 2 + A# 4 + A_ 2 + A_ 2 + A_ 4 + F_ 2 + G_ 2 + F_ 2 + G_ 2 + A_ 2 + A_ 2 + A_ 4 + A# 2 + A# 2 + A# 4 + A_ 8 loopchannel 0, Music_DefeatedWildMon_branch_23b8b @@ -72,73 +72,73 @@ Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1) duty 2 notetype 12, 12, 3 octave 4 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 12, 12, 7 - note B_, 12 + B_ 12 Music_DefeatedWildMon_branch_23bce:: notetype 12, 8, 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 2 + B_ 2 + B_ 2 + B_ 4 octave 4 - note C#, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 2 + C# 4 octave 3 - note B_, 2 - note B_, 2 - note B_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note B_, 2 - note B_, 4 + B_ 2 + B_ 2 + B_ 4 + B_ 2 + A_ 2 + G# 2 + A_ 2 + B_ 2 + B_ 2 + B_ 4 octave 4 - note C#, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 2 + C# 4 octave 3 - note B_, 8 + B_ 8 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note A#, 2 + A# 2 + A_ 2 + A# 2 octave 4 - note C_, 2 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C_, 2 - note C_, 2 - note C_, 4 - note C_, 2 + C_ 2 + C_ 2 + C_ 4 + D_ 2 + D_ 2 + D_ 4 + C_ 2 + C_ 2 + C_ 4 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note A#, 2 + A# 2 + A_ 2 + A# 2 octave 4 - note C_, 2 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C_, 8 + C_ 2 + C_ 2 + C_ 4 + D_ 2 + D_ 2 + D_ 4 + C_ 8 loopchannel 0, Music_DefeatedWildMon_branch_23bce @@ -146,158 +146,158 @@ Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e) executemusic notetype 12, 2, 0 octave 5 - note E_, 1 + E_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 Music_DefeatedWildMon_branch_23c21:: octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 3 octave 5 - note E_, 1 + E_ 1 rest 3 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note F#, 1 + F# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 octave 5 - note D#, 1 + D# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 3 octave 5 - note E_, 1 + E_ 1 rest 3 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note F#, 1 + F# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 3 octave 5 - note E_, 1 + E_ 1 rest 3 octave 4 - note D#, 4 + D# 4 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 3 octave 5 - note F_, 1 + F_ 1 rest 3 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note G_, 1 + G_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 3 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 3 octave 5 - note F_, 1 + F_ 1 rest 3 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note G_, 1 + G_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 3 octave 5 - note F_, 1 + F_ 1 rest 3 octave 4 - note D#, 4 + D# 4 loopchannel 0, Music_DefeatedWildMon_branch_23c21 -; 0x23cad
\ No newline at end of file +; 0x23cad diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index bebb6091..e73eb707 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -8,7 +8,7 @@ Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1) rest 8 stereopanning 237 octave 4 - note F#, 8 + F# 8 stereopanning 255 Music_Dungeon1_branch_7dee5:: @@ -18,210 +18,210 @@ Music_Dungeon1_branch_7dee5:: Music_Dungeon1_branch_7dee8:: callchannel Music_Dungeon1_branch_7dfaa loopchannel 3, Music_Dungeon1_branch_7dee8 - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 + E_ 1 + D# 1 + B_ 1 + A# 1 + G_ 1 + G# 1 rest 1 - note A#, 1 - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 + A# 1 + E_ 1 + D# 1 + B_ 1 + A# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 Music_Dungeon1_branch_7deff:: callchannel Music_Dungeon1_branch_7dfaa loopchannel 4, Music_Dungeon1_branch_7deff callchannel Music_Dungeon1_branch_7dfd5 octave 3 - note G_, 1 - note F#, 1 - note E_, 1 - note G_, 1 + G_ 1 + F# 1 + E_ 1 + G_ 1 callchannel Music_Dungeon1_branch_7dfd5 octave 3 - note A_, 1 - note G_, 1 - note E_, 1 - note A_, 1 + A_ 1 + G_ 1 + E_ 1 + A_ 1 callchannel Music_Dungeon1_branch_7dfd5 octave 3 - note B_, 1 - note A_, 1 - note G_, 1 - note F#, 1 + B_ 1 + A_ 1 + G_ 1 + F# 1 notetype 12, 12, 3 - note G_, 4 - note F#, 4 - note E_, 4 - note D#, 4 + G_ 4 + F# 4 + E_ 4 + D# 4 notetype 12, 12, 2 callchannel Music_Dungeon1_branch_7dfc5 octave 3 - note B_, 3 + B_ 3 callchannel Music_Dungeon1_branch_7dfc5 - note C_, 3 + C_ 3 callchannel Music_Dungeon1_branch_7dfc5 - note C#, 3 + C# 3 notetype 12, 12, 3 octave 3 - note G_, 4 - note F#, 4 - note E_, 4 - note D#, 4 - note E_, 4 - note D#, 4 - note C_, 4 + G_ 4 + F# 4 + E_ 4 + D# 4 + E_ 4 + D# 4 + C_ 4 octave 2 - note B_, 4 + B_ 4 notetype 12, 12, 2 - note B_, 1 - note A#, 1 - note G_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note A#, 1 - octave 3 - note C_, 1 + B_ 1 + A# 1 + G_ 1 + A# 1 + B_ 1 + A# 1 + G_ 1 + A# 1 + octave 3 + C_ 1 octave 2 - note B_, 1 - note G#, 1 - note B_, 1 + B_ 1 + G# 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note G#, 1 - note B_, 1 + B_ 1 + G# 1 + B_ 1 octave 3 - note C#, 1 - note C_, 1 + C# 1 + C_ 1 octave 2 - note A_, 1 + A_ 1 octave 3 - note C_, 1 - note C#, 1 - note C_, 1 + C_ 1 + C# 1 + C_ 1 octave 2 - note A_, 1 + A_ 1 octave 3 - note C_, 1 - note D_, 1 - note C#, 1 + C_ 1 + D_ 1 + C# 1 octave 2 - note A#, 1 + A# 1 octave 3 - note C#, 1 - note D_, 1 - note C#, 1 + C# 1 + D_ 1 + C# 1 octave 2 - note A#, 1 + A# 1 octave 3 - note C#, 1 + C# 1 Music_Dungeon1_branch_7df6e:: rest 16 loopchannel 8, Music_Dungeon1_branch_7df6e notetype 12, 12, 3 callchannel Music_Dungeon1_branch_7dfbb - note B_, 2 - note G_, 2 + B_ 2 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A_, 4 - note F#, 2 + G_ 2 + A_ 4 + F# 2 callchannel Music_Dungeon1_branch_7dfbb - note A#, 2 - note G_, 2 - note B_, 4 - note G_, 2 - note F#, 2 - note G_, 2 - note D#, 2 + A# 2 + G_ 2 + B_ 4 + G_ 2 + F# 2 + G_ 2 + D# 2 notetype 12, 12, 2 callchannel Music_Dungeon1_branch_7dfc5 octave 3 - note B_, 3 + B_ 3 callchannel Music_Dungeon1_branch_7dfc5 - note C_, 3 + C_ 3 callchannel Music_Dungeon1_branch_7dfc5 - note C#, 3 + C# 3 notetype 12, 12, 7 octave 3 - note F#, 8 - note D#, 8 + F# 8 + D# 8 notetype 12, 12, 2 callchannel Music_Dungeon1_branch_7dfaa callchannel Music_Dungeon1_branch_7dfaa loopchannel 0, Music_Dungeon1_branch_7dee5 Music_Dungeon1_branch_7dfaa:: - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 + E_ 1 + D# 1 + B_ 1 + A# 1 + G_ 1 + G# 1 rest 1 - note A#, 1 - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 + A# 1 + E_ 1 + D# 1 + B_ 1 + A# 1 + G_ 1 + G# 1 rest 1 - note A#, 1 + A# 1 endchannel Music_Dungeon1_branch_7dfbb:: octave 2 - note G_, 2 - note A#, 4 - note G_, 2 + G_ 2 + A# 4 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A#, 2 + G_ 2 + A# 2 endchannel Music_Dungeon1_branch_7dfc5:: octave 3 - note E_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note G_, 1 - note E_, 1 - note A_, 1 - note E_, 1 - note A#, 1 - note E_, 1 - note B_, 1 - note E_, 1 + E_ 1 + E_ 1 + F_ 1 + E_ 1 + G_ 1 + E_ 1 + A_ 1 + E_ 1 + A# 1 + E_ 1 + B_ 1 + E_ 1 octave 4 - note C_, 1 + C_ 1 endchannel Music_Dungeon1_branch_7dfd5:: - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 4 octave 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 endchannel @@ -231,10 +231,10 @@ Music_Dungeon1_Ch2:: ; 7dfde (1f:5fde) duty 3 notetype 12, 0, 15 octave 4 - note G#, 8 + G# 8 notetype 12, 4, 13 octave 5 - note D_, 8 + D_ 8 Music_Dungeon1_branch_7dfeb:: notetype 12, 12, 2 @@ -243,23 +243,23 @@ Music_Dungeon1_branch_7dfed:: callchannel Music_Dungeon1_branch_7e097 loopchannel 3, Music_Dungeon1_branch_7dfed octave 2 - note E_, 1 - note E_, 1 - note B_, 1 + E_ 1 + E_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 rest 2 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note E_, 1 - note E_, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note D#, 1 + B_ 1 + E_ 1 + E_ 1 + A_ 1 + G_ 1 + F_ 1 + F# 1 + G_ 1 + D# 1 Music_Dungeon1_branch_7e006:: callchannel Music_Dungeon1_branch_7e097 @@ -267,52 +267,52 @@ Music_Dungeon1_branch_7e006:: rest 2 callchannel Music_Dungeon1_branch_7e0ab octave 3 - note C_, 4 + C_ 4 callchannel Music_Dungeon1_branch_7e0ab octave 3 - note C#, 4 + C# 4 callchannel Music_Dungeon1_branch_7e0ab octave 3 - note D#, 4 + D# 4 notetype 12, 13, 3 octave 4 - note E_, 4 - note D#, 4 - note C_, 4 + E_ 4 + D# 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 notetype 12, 13, 2 callchannel Music_Dungeon1_branch_7e0b5 octave 3 - note F#, 4 + F# 4 callchannel Music_Dungeon1_branch_7e0b5 octave 3 - note G_, 4 + G_ 4 callchannel Music_Dungeon1_branch_7e0b5 octave 3 - note A#, 4 + A# 4 notetype 12, 13, 3 octave 4 - note E_, 4 - note D#, 4 - note C_, 4 + E_ 4 + D# 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 4 - note G_, 4 - note F#, 2 + B_ 4 + G_ 4 + F# 2 notetype 12, 13, 6 - note E_, 8 - note F_, 8 - note F#, 8 - note G_, 8 + E_ 8 + F_ 8 + F# 8 + G_ 8 notetype 12, 13, 2 callchannel Music_Dungeon1_branch_7e0ba rest 10 - note E_, 1 + E_ 1 rest 1 callchannel Music_Dungeon1_branch_7e0ba rest 12 @@ -322,38 +322,38 @@ Music_Dungeon1_branch_7e006:: rest 14 notetype 12, 13, 3 callchannel Music_Dungeon1_branch_7e0cd - note D#, 4 + D# 4 callchannel Music_Dungeon1_branch_7e0cd - note D#, 2 + D# 2 rest 2 notetype 12, 13, 2 callchannel Music_Dungeon1_branch_7e0c0 rest 2 octave 3 - note F#, 4 + F# 4 octave 2 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C_, 1 + C_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note D_, 1 - note C#, 1 + D_ 1 + C# 1 rest 2 octave 3 - note G_, 4 + G_ 4 callchannel Music_Dungeon1_branch_7e0c0 octave 3 - note A#, 4 + A# 4 notetype 12, 13, 6 - note B_, 8 + B_ 8 octave 4 - note D#, 8 + D# 8 notetype 12, 13, 2 callchannel Music_Dungeon1_branch_7e097 callchannel Music_Dungeon1_branch_7e097 @@ -361,83 +361,83 @@ Music_Dungeon1_branch_7e006:: Music_Dungeon1_branch_7e097:: octave 2 - note E_, 1 - note E_, 1 - note B_, 1 + E_ 1 + E_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 rest 2 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note E_, 1 - note E_, 1 - note B_, 1 + B_ 1 + E_ 1 + E_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 rest 2 - note C_, 1 + C_ 1 octave 2 - note B_, 1 + B_ 1 endchannel Music_Dungeon1_branch_7e0ab:: octave 2 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 octave 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 endchannel Music_Dungeon1_branch_7e0b5:: octave 2 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 10 endchannel Music_Dungeon1_branch_7e0ba:: octave 1 - note E_, 1 - note G_, 1 - note E_, 1 - note D#, 1 + E_ 1 + G_ 1 + E_ 1 + D# 1 endchannel Music_Dungeon1_branch_7e0c0:: octave 2 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 octave 4 - note E_, 1 + E_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note C#, 1 - note C_, 1 + C# 1 + C_ 1 endchannel Music_Dungeon1_branch_7e0cd:: octave 3 - note E_, 6 - note G_, 6 - note E_, 4 - note A_, 6 + E_ 6 + G_ 6 + E_ 4 + A_ 6 octave 4 - note C_, 6 - octave 3 - note B_, 4 - note G_, 6 - note A#, 6 - note F#, 4 - note E_, 6 - note F#, 6 + C_ 6 + octave 3 + B_ 4 + G_ 6 + A# 6 + F# 4 + E_ 6 + F# 6 endchannel @@ -446,49 +446,49 @@ Music_Dungeon1_Ch3:: ; 7e0dc (1f:60dc) vibrato 8, 2, 6 rest 14 octave 4 - note D_, 1 - note D#, 1 + D_ 1 + D# 1 Music_Dungeon1_branch_7e0e5:: callchannel Music_Dungeon1_branch_7e140 callchannel Music_Dungeon1_branch_7e140 octave 5 - note E_, 2 + E_ 2 rest 4 octave 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 octave 4 - note F#, 4 + F# 4 callchannel Music_Dungeon1_branch_7e154 octave 4 - note G_, 4 + G_ 4 callchannel Music_Dungeon1_branch_7e154 octave 4 - note A_, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note F#, 4 + A_ 4 + B_ 4 + A# 4 + G_ 4 + F# 4 rest 6 callchannel Music_Dungeon1_branch_7e177 - note B_, 4 - note A#, 4 - note G_, 4 - note F#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D#, 4 + B_ 4 + A# 4 + G_ 4 + F# 4 + G_ 4 + F# 4 + E_ 4 + D# 4 callchannel Music_Dungeon1_branch_7e15e rest 12 callchannel Music_Dungeon1_branch_7e15e rest 12 callchannel Music_Dungeon1_branch_7e15e rest 10 - note E_, 1 + E_ 1 rest 1 callchannel Music_Dungeon1_branch_7e15e rest 12 @@ -496,128 +496,128 @@ Music_Dungeon1_branch_7e0e5:: rest 12 callchannel Music_Dungeon1_branch_7e15e rest 10 - note D_, 1 - note D#, 1 + D_ 1 + D# 1 callchannel Music_Dungeon1_branch_7e164 callchannel Music_Dungeon1_branch_7e164 - note E_, 2 + E_ 2 rest 4 callchannel Music_Dungeon1_branch_7e177 - note B_, 8 - note F#, 6 - note D_, 1 - note D#, 1 + B_ 8 + F# 6 + D_ 1 + D# 1 rest 16 rest 16 loopchannel 0, Music_Dungeon1_branch_7e0e5 Music_Dungeon1_branch_7e140:: octave 5 - note E_, 4 - note B_, 4 - note A#, 4 + E_ 4 + B_ 4 + A# 4 octave 6 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 5 - note G#, 4 - note G_, 4 - note B_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note A_, 4 - note G#, 4 - note E_, 4 - note F#, 4 - note D#, 4 + G# 4 + G_ 4 + B_ 4 + A# 4 + E_ 4 + D# 4 + A_ 4 + G# 4 + E_ 4 + F# 4 + D# 4 endchannel Music_Dungeon1_branch_7e154:: octave 6 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 4 octave 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 endchannel Music_Dungeon1_branch_7e15e:: octave 3 - note E_, 1 - note G_, 1 - note E_, 1 - note D#, 1 + E_ 1 + G_ 1 + E_ 1 + D# 1 endchannel Music_Dungeon1_branch_7e164:: - note E_, 4 - note B_, 4 - note A#, 4 + E_ 4 + B_ 4 + A# 4 octave 4 - note D_, 4 - note C#, 4 - octave 3 - note G#, 4 - note G_, 4 - note B_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note A_, 4 - note G#, 4 - note E_, 4 - note F#, 4 - note D#, 4 + D_ 4 + C# 4 + octave 3 + G# 4 + G_ 4 + B_ 4 + A# 4 + E_ 4 + D# 4 + A_ 4 + G# 4 + E_ 4 + F# 4 + D# 4 endchannel Music_Dungeon1_branch_7e177:: octave 4 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F#, 4 + F# 4 rest 6 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note G_, 4 + G_ 4 rest 6 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note A#, 4 + E_ 1 + E_ 1 + A# 4 endchannel Music_Dungeon1_Ch4:: ; 7e18a (1f:618a) dspeed 12 rest 14 - dnote 1, cymbal1 - dnote 1, cymbal1 + cymbal1 1 + cymbal1 1 Music_Dungeon1_branch_7e190:: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 3, Music_Dungeon1_branch_7e190 - dnote 4, cymbal2 - dnote 4, cymbal1 - dnote 4, cymbal2 - dnote 2, cymbal1 - dnote 2, cymbal1 + cymbal2 4 + cymbal1 4 + cymbal2 4 + cymbal1 2 + cymbal1 2 Music_Dungeon1_branch_7e1a1:: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 3, Music_Dungeon1_branch_7e1a1 - dnote 4, cymbal2 - dnote 4, cymbal1 - dnote 4, cymbal2 - dnote 4, cymbal2 + cymbal2 4 + cymbal1 4 + cymbal2 4 + cymbal2 4 Music_Dungeon1_branch_7e1b0:: callchannel Music_Dungeon1_branch_7e1fa @@ -628,12 +628,12 @@ Music_Dungeon1_branch_7e1ba:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1ba callchannel Music_Dungeon1_branch_7e202 - dnote 4, snare7 - dnote 4, snare8 - dnote 4, snare8 + snare7 4 + snare8 4 + snare8 4 rest 2 - dnote 2, snare7 - dnote 4, cymbal2 + snare7 2 + cymbal2 4 Music_Dungeon1_branch_7e1cf:: rest 16 @@ -643,34 +643,34 @@ Music_Dungeon1_branch_7e1cf:: Music_Dungeon1_branch_7e1d5:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1d5 - dnote 4, cymbal1 - dnote 4, cymbal1 - dnote 4, cymbal1 + cymbal1 4 + cymbal1 4 + cymbal1 4 rest 2 - dnote 1, cymbal1 - dnote 1, cymbal1 + cymbal1 1 + cymbal1 1 callchannel Music_Dungeon1_branch_7e1f1 callchannel Music_Dungeon1_branch_7e1f1 loopchannel 0, Music_Dungeon1_branch_7e190 Music_Dungeon1_branch_7e1f1:: - dnote 4, cymbal2 - dnote 4, cymbal1 - dnote 4, cymbal2 - dnote 4, cymbal1 + cymbal2 4 + cymbal1 4 + cymbal2 4 + cymbal1 4 endchannel Music_Dungeon1_branch_7e1fa:: - dnote 1, cymbal1 - dnote 1, cymbal1 + cymbal1 1 + cymbal1 1 rest 10 - dnote 4, cymbal3 + cymbal3 4 endchannel Music_Dungeon1_branch_7e202:: - dnote 4, snare7 - dnote 4, snare8 - dnote 4, snare8 - dnote 4, snare9 + snare7 4 + snare8 4 + snare8 4 + snare9 4 endchannel -; 0x7e20b
\ No newline at end of file +; 0x7e20b diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 98e39dcf..e65de5be 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -8,57 +8,57 @@ Music_Dungeon2_Ch1:: ; 7e887 (1f:6887) Music_Dungeon2_branch_7e892:: notetype 12, 11, 2 octave 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + A# 4 + A# 4 + A# 4 + A# 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 octave 5 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 + C# 4 + C# 4 + C# 4 + C# 4 octave 3 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + A# 4 + A# 4 + A# 4 + A# 4 octave 2 - note G_, 2 - note A#, 4 - note G_, 2 + G_ 2 + A# 4 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A#, 2 - note B_, 2 - note G_, 2 + G_ 2 + A# 2 + B_ 2 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A_, 4 - note F#, 2 + G_ 2 + A_ 4 + F# 2 loopchannel 2, Music_Dungeon2_branch_7e892 notetype 12, 1, 15 octave 3 - note E_, 16 - note C_, 16 - note D_, 16 + E_ 16 + C_ 16 + D_ 16 octave 2 - note A#, 16 + A# 16 rest 16 rest 16 rest 16 @@ -77,77 +77,77 @@ Music_Dungeon2_branch_7e8db:: duty 3 notetype 12, 12, 2 octave 3 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + C_ 4 + C_ 4 + C_ 4 + C_ 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + C_ 4 + C_ 4 + C_ 4 + C_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 octave 4 - note F#, 4 - note F#, 4 - note F#, 4 - note F#, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note G_, 4 - note G_, 4 - note G_, 4 - note F#, 4 + F# 4 + F# 4 + F# 4 + F# 4 + D_ 4 + D_ 4 + D_ 4 + D_ 4 + G_ 4 + G_ 4 + G_ 4 + F# 4 loopchannel 2, Music_Dungeon2_branch_7e8db octave 3 - note E_, 2 - note G_, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note E_, 2 + E_ 2 + G_ 2 + E_ 2 + D# 2 + E_ 2 + E_ 2 octave 5 - note E_, 2 + E_ 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note C#, 2 - note C_, 2 + C# 2 + C_ 2 octave 4 - note E_, 2 - note G_, 2 + E_ 2 + G_ 2 octave 3 - note A#, 2 - note C#, 2 - note A#, 2 - note A_, 2 - note A#, 2 - note G_, 2 + A# 2 + C# 2 + A# 2 + A_ 2 + A# 2 + G_ 2 octave 5 - note G_, 2 + G_ 2 rest 2 - note F#, 2 + F# 2 rest 2 - note F_, 2 + F_ 2 rest 2 - note E_, 2 - note D#, 2 - note D_, 2 - note C#, 2 + E_ 2 + D# 2 + D_ 2 + C# 2 rest 16 rest 16 rest 16 @@ -155,10 +155,10 @@ Music_Dungeon2_branch_7e8db:: notetype 12, 12, 7 duty 1 octave 4 - note E_, 16 - note D_, 16 - note C_, 16 - note D_, 16 + E_ 16 + D_ 16 + C_ 16 + D_ 16 loopchannel 0, Music_Dungeon2_branch_7e8db @@ -169,92 +169,92 @@ Music_Dungeon2_Ch3:: ; 7e93b (1f:693b) Music_Dungeon2_branch_7e940:: callchannel Music_Dungeon2_branch_7e9d1 loopchannel 16, Music_Dungeon2_branch_7e940 - note E_, 4 + E_ 4 rest 4 rest 4 - note E_, 4 - note C_, 4 + E_ 4 + C_ 4 rest 4 rest 4 - note C_, 4 - note D_, 4 + C_ 4 + D_ 4 rest 4 rest 4 - note D_, 4 + D_ 4 octave 3 - note A#, 4 + A# 4 rest 4 rest 4 - note A#, 4 + A# 4 Music_Dungeon2_branch_7e958:: octave 5 - note E_, 2 + E_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note A#, 2 + A# 2 rest 2 octave 6 - note D_, 2 + D_ 2 rest 2 - note C#, 2 + C# 2 rest 2 octave 5 - note G#, 2 + G# 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note A#, 2 + A# 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note D#, 2 + D# 2 rest 2 - note A_, 2 + A_ 2 rest 2 - note G#, 2 + G# 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note F#, 2 + F# 2 rest 2 - note D#, 2 + D# 2 rest 2 loopchannel 3, Music_Dungeon2_branch_7e958 octave 4 - note E_, 4 - note B_, 4 - note A#, 4 + E_ 4 + B_ 4 + A# 4 octave 5 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 4 - note G#, 4 - note G_, 4 - note B_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note A_, 4 - note G#, 4 - note E_, 4 - note F#, 4 - note D#, 4 + G# 4 + G_ 4 + B_ 4 + A# 4 + E_ 4 + D# 4 + A_ 4 + G# 4 + E_ 4 + F# 4 + D# 4 octave 3 - note E_, 16 - note C_, 16 - note D_, 16 + E_ 16 + C_ 16 + D_ 16 octave 2 - note A#, 16 + A# 16 octave 3 - note E_, 16 - note F_, 16 - note G_, 16 + E_ 16 + F_ 16 + G_ 16 octave 3 - note B_, 16 + B_ 16 rest 16 rest 16 rest 16 @@ -269,36 +269,36 @@ Music_Dungeon2_branch_7e958:: callchannel Music_Dungeon2_branch_7e9d1 loopchannel 0, Music_Dungeon2_branch_7e940 octave 2 - note G_, 2 - note A#, 4 - note G_, 2 + G_ 2 + A# 4 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A_, 2 - note A#, 2 - note G_, 2 + G_ 2 + A_ 2 + A# 2 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A#, 2 - note G_, 2 + G_ 2 + A# 2 + G_ 2 rest 2 endchannel Music_Dungeon2_branch_7e9d1:: octave 4 - note E_, 2 + E_ 2 rest 4 octave 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 octave 4 - note F#, 4 + F# 4 endchannel @@ -306,13 +306,13 @@ Music_Dungeon2_Ch4:: ; 7e9dc (1f:69dc) dspeed 12 Music_Dungeon2_branch_7e9dd:: - dnote 4, cymbal1 - dnote 4, cymbal2 - dnote 4, cymbal1 - dnote 4, snare8 - dnote 4, cymbal1 - dnote 4, cymbal2 - dnote 4, snare9 - dnote 4, snare7 + cymbal1 4 + cymbal2 4 + cymbal1 4 + snare8 4 + cymbal1 4 + cymbal2 4 + snare9 4 + snare7 4 loopchannel 0, Music_Dungeon2_branch_7e9dd -; 0x7e9f1
\ No newline at end of file +; 0x7e9f1 diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index 8d13d5c7..1bfdb682 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -12,17 +12,17 @@ Music_Dungeon3_branch_7e9fe:: callchannel Music_Dungeon3_branch_7eab2 loopchannel 3, Music_Dungeon3_branch_7e9fe octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 - note D#, 2 - note E_, 2 + D# 2 + G_ 2 + D# 2 + E_ 2 Music_Dungeon3_branch_7ea11:: callchannel Music_Dungeon3_branch_7eac1 @@ -32,32 +32,32 @@ Music_Dungeon3_branch_7ea18:: callchannel Music_Dungeon3_branch_7eab2 loopchannel 4, Music_Dungeon3_branch_7ea18 octave 4 - note F_, 2 - note F_, 2 + F_ 2 + F_ 2 rest 2 - note F_, 2 - note E_, 2 - note E_, 2 - note D#, 2 - note D#, 2 + F_ 2 + E_ 2 + E_ 2 + D# 2 + D# 2 rest 2 - note D#, 2 - note D_, 2 - note D_, 2 + D# 2 + D_ 2 + D_ 2 callchannel Music_Dungeon3_branch_7eafc octave 4 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 rest 2 - note D_, 2 - note D#, 2 - note D#, 2 - note E_, 2 - note E_, 2 + D_ 2 + D# 2 + D# 2 + E_ 2 + E_ 2 rest 2 - note E_, 2 - note F_, 2 - note F_, 2 + E_ 2 + F_ 2 + F_ 2 Music_Dungeon3_branch_7ea3c:: callchannel Music_Dungeon3_branch_7eace @@ -67,270 +67,270 @@ Music_Dungeon3_branch_7ea43:: callchannel Music_Dungeon3_branch_7eadd loopchannel 3, Music_Dungeon3_branch_7ea43 octave 3 - note C#, 2 + C# 2 octave 2 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 3 - note C#, 2 + C# 2 octave 2 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 - note G#, 2 - note E_, 2 + A_ 2 + F_ 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 callchannel Music_Dungeon3_branch_7eaea callchannel Music_Dungeon3_branch_7eaea octave 3 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 rest 16 rest 8 callchannel Music_Dungeon3_branch_7eaf7 callchannel Music_Dungeon3_branch_7eaf7 callchannel Music_Dungeon3_branch_7eaf7 callchannel Music_Dungeon3_branch_7eaf7 - note D#, 2 + D# 2 rest 16 rest 16 loopchannel 0, Music_Dungeon3_branch_7e9fc Music_Dungeon3_branch_7eab2:: octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 + D# 2 endchannel Music_Dungeon3_branch_7eac1:: - note E_, 2 - note G#, 2 + E_ 2 + G# 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note E_, 2 - note G#, 2 + E_ 2 + G# 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note E_, 2 - note G#, 2 + E_ 2 + G# 2 endchannel Music_Dungeon3_branch_7eace:: octave 3 - note D#, 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 - note D#, 2 + G_ 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 - note D#, 2 + G_ 2 + D# 2 octave 2 - note B_, 2 + B_ 2 endchannel Music_Dungeon3_branch_7eadd:: - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 3 - note C#, 2 + C# 2 octave 2 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 3 - note C#, 2 + C# 2 octave 2 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 endchannel Music_Dungeon3_branch_7eaea:: octave 3 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 endchannel Music_Dungeon3_branch_7eaf7:: - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + D# 2 + G_ 2 + D# 2 + C# 6 endchannel Music_Dungeon3_branch_7eafc:: tempo 168 octave 1 - note A#, 1 - note B_, 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 tempo 176 octave 1 - note A#, 1 - note B_, 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 tempo 184 octave 1 - note A#, 1 - note B_, 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 tempo 192 octave 1 - note A_, 1 - note A#, 1 - note B_, 1 + A_ 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 tempo 200 octave 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 tempo 208 octave 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 + C_ 1 + C# 1 + D_ 1 tempo 216 octave 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 + C_ 1 + C# 1 tempo 224 octave 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 2 - note C_, 1 + C_ 1 tempo 160 endchannel @@ -342,91 +342,91 @@ Music_Dungeon3_Ch2:: ; 7eb68 (1f:6b68) Music_Dungeon3_branch_7eb6d:: notetype 12, 13, 3 octave 4 - note D#, 6 - note C#, 6 + D# 6 + C# 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + C# 2 + D# 2 + G_ 2 + D# 2 + C# 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + C# 2 + D# 2 + G_ 2 + D# 2 + C# 6 octave 3 - note B_, 2 - note A#, 2 - note B_, 6 + B_ 2 + A# 2 + B_ 6 octave 4 - note C#, 8 + C# 8 rest 2 - note G#, 6 - note F#, 6 - note E_, 2 - note F#, 2 - note G#, 2 + G# 6 + F# 6 + E_ 2 + F# 2 + G# 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G#, 2 - note F#, 6 - note E_, 2 - note F#, 2 - note G#, 2 + G# 2 + F# 6 + E_ 2 + F# 2 + G# 2 octave 5 - note C_, 2 - octave 4 - note G#, 2 - note F#, 6 - note E_, 2 - note D#, 2 - note E_, 6 - note F#, 6 - note E_, 4 - note D#, 6 - note C#, 6 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 3 - note B_, 2 - note A#, 2 - note B_, 6 - octave 4 - note C#, 8 + C_ 2 + octave 4 + G# 2 + F# 6 + E_ 2 + D# 2 + E_ 6 + F# 6 + E_ 4 + D# 6 + C# 6 + octave 3 + B_ 2 + octave 4 + C# 2 + D# 2 + G_ 2 + D# 2 + C# 6 + octave 3 + B_ 2 + octave 4 + C# 2 + D# 2 + G_ 2 + D# 2 + C# 6 + octave 3 + B_ 2 + A# 2 + B_ 6 + octave 4 + C# 8 rest 2 - note G#, 2 - note G#, 2 + G# 2 + G# 2 rest 2 - note G#, 2 - note A_, 2 - note A_, 2 - note A#, 2 - note A#, 2 + G# 2 + A_ 2 + A_ 2 + A# 2 + A# 2 rest 2 - note A#, 2 - note B_, 2 - note B_, 2 + A# 2 + B_ 2 + B_ 2 rest 8 rest 8 rest 8 @@ -436,174 +436,174 @@ Music_Dungeon3_branch_7eb6d:: rest 8 rest 8 octave 4 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 rest 2 - note B_, 2 - note A#, 2 - note A#, 2 - note A_, 2 - note A_, 2 + B_ 2 + A# 2 + A# 2 + A_ 2 + A_ 2 rest 2 - note A_, 2 - note G#, 2 - note G#, 2 - note C#, 8 + A_ 2 + G# 2 + G# 2 + C# 8 rest 2 octave 3 - note B_, 6 - note A#, 2 - note B_, 2 + B_ 6 + A# 2 + B_ 2 octave 4 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + D# 2 + G_ 2 + D# 2 + C# 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + C# 2 + D# 2 + G_ 2 + D# 2 + C# 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 6 - note G_, 6 + C# 2 + D# 6 + G_ 6 octave 3 - note G_, 8 + G_ 8 rest 2 - note F_, 6 - note E_, 2 - note F_, 2 - note A_, 2 + F_ 6 + E_ 2 + F_ 2 + A_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note G_, 6 - note F_, 2 - note G_, 2 - note A_, 2 + A_ 2 + G_ 6 + F_ 2 + G_ 2 + A_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note G_, 6 - note A_, 6 + A_ 2 + G_ 6 + A_ 6 octave 4 - note C#, 6 - note G_, 8 + C# 6 + G_ 8 rest 2 - note F_, 6 - note E_, 2 - note F_, 2 - note A_, 2 + F_ 6 + E_ 2 + F_ 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 - note G_, 6 - note A_, 2 + A_ 2 + G_ 6 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 - note G_, 6 - note A_, 6 + A_ 2 + G_ 6 + A_ 6 octave 5 - note C#, 6 + C# 6 octave 4 - note F#, 8 + F# 8 rest 2 - note E_, 6 - note D#, 2 - note E_, 2 - note G#, 2 + E_ 6 + D# 2 + E_ 2 + G# 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G#, 2 - note F#, 6 - note E_, 2 - note F#, 2 - note G#, 2 + G# 2 + F# 6 + E_ 2 + F# 2 + G# 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G#, 2 - note F#, 6 - note G#, 6 + G# 2 + F# 6 + G# 6 octave 5 - note C_, 6 - octave 3 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + C_ 6 + octave 3 + D# 2 + G_ 2 + D# 2 + C# 6 + D# 2 + G_ 2 + D# 2 + C# 6 octave 2 - note E_, 2 - note G#, 2 - octave 3 - note C_, 2 - note E_, 2 - note G#, 2 - octave 4 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note D#, 2 + E_ 2 + G# 2 + octave 3 + C_ 2 + E_ 2 + G# 2 + octave 4 + C_ 2 + E_ 2 + G# 2 + C_ 2 + E_ 2 + G# 2 + C_ 2 + E_ 2 + G# 2 + C_ 2 + E_ 2 + G# 2 + C_ 2 + E_ 2 + G# 2 + C_ 2 + E_ 2 + G# 2 + C_ 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 + D# 2 loopchannel 0, Music_Dungeon3_branch_7eb6d @@ -623,66 +623,66 @@ Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a) rest 12 notetype 6, 1, 0 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 rest 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 rest 16 rest 16 rest 10 octave 5 - note E_, 8 + E_ 8 octave 4 - note B_, 8 + B_ 8 octave 5 - note D#, 8 + D# 8 octave 4 - note A#, 8 + A# 8 octave 5 - note D_, 8 + D_ 8 octave 4 - note A_, 8 + A_ 8 octave 5 - note C#, 8 + C# 8 octave 4 - note G#, 8 + G# 8 octave 5 - note C_, 8 + C_ 8 octave 4 - note G_, 8 - note B_, 8 - note F#, 8 - note A#, 8 - note F_, 8 - note A_, 8 - note E_, 8 + G_ 8 + B_ 8 + F# 8 + A# 8 + F_ 8 + A_ 8 + E_ 8 rest 16 rest 16 rest 8 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 rest 2 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 octave 3 - note B_, 1 + B_ 1 rest 10 rest 16 notetype 12, 1, 0 @@ -754,4 +754,4 @@ Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4) rest 16 rest 10 endchannel -; 0x7ed0f
\ No newline at end of file +; 0x7ed0f diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index 80882db7..eabc06ec 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -6,378 +6,378 @@ Music_FinalBattle_Ch1:: ; 233a6 (8:73a6) toggleperfectpitch notetype 12, 11, 2 octave 3 - note F#, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note G_, 1 + F# 1 + F_ 1 + F# 1 + G_ 1 + F# 1 + G_ 1 + G# 1 + G_ 1 notetype 12, 10, 2 - note G#, 1 - note A_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + G# 1 + A_ 1 + G# 1 + A_ 1 + A# 1 + A_ 1 + A# 1 + B_ 1 notetype 12, 9, 2 - note A#, 1 - note B_, 1 + A# 1 + B_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note C_, 1 - note C#, 1 + C_ 1 + C# 1 + C_ 1 + C# 1 notetype 12, 8, 2 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 notetype 12, 12, 1 octave 3 - note E_, 1 - note E_, 7 - note F_, 1 - note F_, 7 - note G_, 1 - note G_, 7 - note F_, 1 - note F_, 7 - note E_, 1 - note E_, 7 - note F_, 1 - note F_, 7 - note G_, 1 - note G_, 7 - note G#, 1 - note G#, 3 - note D#, 4 + E_ 1 + E_ 7 + F_ 1 + F_ 7 + G_ 1 + G_ 7 + F_ 1 + F_ 7 + E_ 1 + E_ 7 + F_ 1 + F_ 7 + G_ 1 + G_ 7 + G# 1 + G# 3 + D# 4 notetype 12, 12, 1 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 11, 3 - note E_, 4 + E_ 4 notetype 12, 12, 1 - note F_, 1 - note F_, 3 + F_ 1 + F_ 3 notetype 12, 11, 3 - note F_, 4 + F_ 4 notetype 12, 12, 1 - note G_, 1 - note G_, 3 + G_ 1 + G_ 3 notetype 12, 11, 3 - note G_, 4 + G_ 4 notetype 12, 12, 1 - note F_, 1 - note F_, 3 + F_ 1 + F_ 3 notetype 12, 11, 3 - note F_, 4 + F_ 4 notetype 12, 12, 1 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 11, 3 - note E_, 4 + E_ 4 notetype 12, 12, 1 - note F_, 1 - note F_, 3 + F_ 1 + F_ 3 notetype 12, 11, 3 - note F_, 4 + F_ 4 notetype 12, 12, 1 - note G_, 1 - note G_, 3 + G_ 1 + G_ 3 notetype 12, 11, 3 - note G_, 4 + G_ 4 notetype 12, 12, 1 - note G#, 1 - note G#, 3 + G# 1 + G# 3 notetype 12, 11, 7 - note D#, 4 + D# 4 Music_FinalBattle_branch_23429:: notetype 12, 11, 7 octave 3 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 + E_ 4 + B_ 4 + D# 4 + A# 4 + D_ 4 + A_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note F_, 4 - note F#, 4 + F# 4 + F_ 4 + F# 4 notetype 12, 11, 1 - note F#, 2 - note F_, 1 - note F#, 1 - note A_, 1 - note F#, 2 - note F#, 1 + F# 2 + F_ 1 + F# 1 + A_ 1 + F# 2 + F# 1 notetype 12, 11, 7 octave 2 - note B_, 6 + B_ 6 notetype 12, 10, 0 octave 3 - note D_, 6 + D_ 6 notetype 12, 11, 7 - note F#, 4 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 + F# 4 + E_ 4 + B_ 4 + D# 4 + A# 4 + D_ 4 + A_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note F_, 4 - note F#, 12 - note A#, 4 + F# 4 + F_ 4 + F# 12 + A# 4 notetype 12, 5, 14 - note B_, 12 + B_ 12 notetype 12, 11, 2 - note E_, 3 - note E_, 3 - note E_, 2 - note E_, 1 - note F#, 1 - note E_, 1 - note B_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 + E_ 3 + E_ 3 + E_ 2 + E_ 1 + F# 1 + E_ 1 + B_ 1 + F# 1 + E_ 1 + F# 1 + B_ 1 + F# 1 + E_ 1 + F# 1 + B_ 1 + F# 1 + E_ 1 + F# 1 + B_ 1 + F# 1 notetype 12, 12, 2 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 + E_ 1 + F# 1 + B_ 1 + F# 1 notetype 12, 13, 2 - note E_, 1 - note F#, 1 - note B_, 1 + E_ 1 + F# 1 + B_ 1 notetype 12, 12, 1 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 3 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 3 notetype 12, 11, 5 - note D_, 4 + D_ 4 notetype 12, 12, 1 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 11, 5 - note F_, 4 + F_ 4 notetype 12, 12, 1 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 11, 5 - note D_, 4 + D_ 4 notetype 12, 12, 1 - note E_, 1 + E_ 1 notetype 12, 11, 7 - note E_, 7 + E_ 7 notetype 12, 12, 1 - note E_, 2 - note B_, 1 - note A_, 1 - note E_, 2 - note B_, 1 - note A_, 1 - note E_, 2 - note B_, 1 - note A_, 1 - note E_, 2 - note B_, 1 - note A_, 3 - note E_, 1 - note D_, 3 - note E_, 1 - note D_, 3 - note E_, 1 - note D_, 3 - note E_, 1 - note D_, 1 - note F_, 2 - octave 4 - note C_, 1 + E_ 2 + B_ 1 + A_ 1 + E_ 2 + B_ 1 + A_ 1 + E_ 2 + B_ 1 + A_ 1 + E_ 2 + B_ 1 + A_ 3 + E_ 1 + D_ 3 + E_ 1 + D_ 3 + E_ 1 + D_ 3 + E_ 1 + D_ 1 + F_ 2 + octave 4 + C_ 1 octave 3 - note B_, 1 - note F_, 2 + B_ 1 + F_ 2 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 1 - note F_, 2 + B_ 1 + F_ 2 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 1 - note F_, 2 + B_ 1 + F_ 2 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 3 - note F_, 1 - note E_, 3 - note F_, 1 - note E_, 3 - note F_, 1 - note E_, 3 - note F_, 1 - note E_, 1 - note F#, 2 - octave 4 - note C#, 1 - note C_, 1 + B_ 3 + F_ 1 + E_ 3 + F_ 1 + E_ 3 + F_ 1 + E_ 3 + F_ 1 + E_ 1 + F# 2 + octave 4 + C# 1 + C_ 1 octave 3 - note F#, 2 + F# 2 octave 4 - note C#, 1 - note C_, 1 + C# 1 + C_ 1 octave 3 - note F#, 2 + F# 2 octave 4 - note C#, 1 - note C_, 1 + C# 1 + C_ 1 octave 3 - note F#, 2 + F# 2 octave 4 - note C#, 1 - note C_, 3 + C# 1 + C_ 3 octave 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 + F# 1 + F_ 3 + F# 1 + F_ 3 + F# 1 + F_ 3 + F# 1 + F_ 3 + F# 1 + F_ 3 + F# 1 + F_ 3 + F# 1 + F_ 3 notetype 12, 11, 7 octave 4 - note C_, 2 + C_ 2 notetype 12, 11, 0 - note C#, 8 + C# 8 notetype 12, 11, 7 - note C#, 8 + C# 8 notetype 12, 10, 0 octave 3 - note F#, 8 - note F#, 8 + F# 8 + F# 8 notetype 12, 11, 0 octave 3 - note A_, 8 + A_ 8 notetype 12, 11, 7 - note A_, 8 - note G_, 4 - note B_, 12 + A_ 8 + G_ 4 + B_ 12 notetype 12, 11, 0 - note A_, 8 + A_ 8 notetype 12, 11, 7 - note A_, 8 + A_ 8 notetype 12, 11, 0 - note E_, 8 + E_ 8 notetype 12, 11, 7 - note E_, 8 + E_ 8 notetype 12, 11, 0 - note A#, 8 + A# 8 notetype 12, 11, 7 - note A#, 8 + A# 8 octave 4 - note F_, 8 + F_ 8 octave 3 - note A#, 8 + A# 8 octave 4 - note C#, 4 - note E_, 12 + C# 4 + E_ 12 octave 3 - note A_, 4 + A_ 4 octave 4 - note C#, 12 + C# 12 notetype 12, 4, 0 callchannel Music_FinalBattle_branch_23710 callchannel Music_FinalBattle_branch_23710 notetype 12, 11, 7 octave 3 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 + E_ 4 + B_ 4 + D# 4 + A# 4 + D_ 4 + A_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note F_, 4 - note F#, 12 + F# 4 + F_ 4 + F# 12 notetype 12, 11, 0 - note A_, 8 - note G_, 8 + A_ 8 + G_ 8 notetype 12, 11, 7 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 + E_ 4 + B_ 4 + D# 4 + A# 4 + D_ 4 + A_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note F_, 4 - note F#, 12 + F# 4 + F_ 4 + F# 12 notetype 12, 11, 0 - note A_, 8 + A_ 8 notetype 12, 11, 7 octave 4 - note C_, 8 + C_ 8 notetype 12, 11, 0 octave 3 - note B_, 8 + B_ 8 notetype 12, 11, 7 - note B_, 8 + B_ 8 notetype 12, 11, 0 octave 4 - note E_, 8 + E_ 8 notetype 12, 11, 7 - note E_, 8 + E_ 8 loopchannel 0, Music_FinalBattle_branch_23429 @@ -386,84 +386,84 @@ Music_FinalBattle_Ch2:: ; 2356a (8:756a) vibrato 8, 2, 5 notetype 12, 12, 2 octave 5 - note C_, 1 + C_ 1 octave 4 - note G#, 1 - note B_, 1 - note F#, 1 - note A_, 1 - note E_, 1 - note G_, 1 + G# 1 + B_ 1 + F# 1 + A_ 1 + E_ 1 + G_ 1 octave 5 - note C_, 1 + C_ 1 octave 4 - note F_, 1 - note C#, 1 - note E_, 1 - note C_, 1 - note D#, 1 + F_ 1 + C# 1 + E_ 1 + C_ 1 + D# 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note D_, 1 + D_ 1 octave 5 - note C_, 1 + C_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note G#, 1 - note B_, 1 - note F#, 1 - note A#, 1 - note F_, 1 - note A_, 1 - octave 5 - note C_, 1 + G# 1 + B_ 1 + F# 1 + A# 1 + F_ 1 + A_ 1 + octave 5 + C_ 1 octave 3 - note G#, 1 - note D#, 1 - note G_, 1 - note D_, 1 - note F_, 1 - note C#, 1 - note E_, 1 - octave 5 - note C_, 1 + G# 1 + D# 1 + G_ 1 + D_ 1 + F_ 1 + C# 1 + E_ 1 + octave 5 + C_ 1 notetype 12, 12, 1 octave 4 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 3 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 3 notetype 12, 12, 2 octave 5 - note E_, 4 + E_ 4 notetype 12, 12, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 2 octave 5 - note E_, 4 + E_ 4 notetype 12, 12, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 2 octave 5 - note E_, 4 + E_ 4 notetype 12, 12, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 2 - note D#, 4 + D# 4 callchannel Music_FinalBattle_branch_23704 callchannel Music_FinalBattle_branch_23704 callchannel Music_FinalBattle_branch_23704 @@ -473,873 +473,873 @@ Music_FinalBattle_Ch2:: ; 2356a (8:756a) callchannel Music_FinalBattle_branch_23704 notetype 12, 12, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 4, 10 octave 3 - note G#, 4 + G# 4 Music_FinalBattle_branch_235e6:: notetype 12, 13, 7 octave 4 - note E_, 8 - note D#, 8 - note D_, 8 + E_ 8 + D# 8 + D_ 8 octave 3 - note B_, 8 + B_ 8 notetype 12, 13, 7 - note A#, 4 - note B_, 12 + A# 4 + B_ 12 notetype 12, 11, 1 - note F_, 2 - note F#, 3 - note A_, 1 - note B_, 1 - note A_, 1 + F_ 2 + F# 3 + A_ 1 + B_ 1 + A_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 2 - note A_, 1 - note B_, 1 - note B_, 1 - note A_, 1 - note A#, 1 + B_ 2 + A_ 1 + B_ 1 + B_ 1 + A_ 1 + A# 1 notetype 12, 13, 7 octave 4 - note E_, 8 - note D#, 8 - note D_, 8 + E_ 8 + D# 8 + D_ 8 octave 3 - note B_, 8 + B_ 8 notetype 12, 13, 7 - note A#, 4 - note B_, 12 + A# 4 + B_ 12 octave 4 - note D#, 4 - note E_, 12 + D# 4 + E_ 12 notetype 12, 10, 0 octave 3 - note B_, 8 + B_ 8 octave 4 - note D_, 8 - note F_, 8 - note D_, 8 + D_ 8 + F_ 8 + D_ 8 notetype 12, 13, 1 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 13, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 4 octave 3 - note F_, 4 + F_ 4 notetype 12, 13, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 13, 1 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 notetype 12, 12, 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note D_, 2 + D_ 2 notetype 12, 12, 2 octave 4 - note E_, 1 - note E_, 1 - note D_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note F_, 1 - note E_, 1 - note E_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + D_ 1 + E_ 1 + F_ 1 + E_ 1 + D_ 1 + F_ 1 + E_ 1 + E_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + F# 1 + E_ 1 + E_ 1 + F_ 1 + E_ 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + E_ 1 notetype 12, 12, 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note D_, 2 + D_ 2 notetype 12, 13, 7 octave 4 - note E_, 4 - note F_, 2 - note F#, 12 + E_ 4 + F_ 2 + F# 12 notetype 12, 12, 2 octave 3 - note B_, 2 - note B_, 4 - note B_, 2 - note B_, 4 - note B_, 2 + B_ 2 + B_ 4 + B_ 2 + B_ 4 + B_ 2 notetype 12, 13, 7 octave 4 - note F_, 4 - note F#, 2 - note G_, 12 + F_ 4 + F# 2 + G_ 12 notetype 12, 12, 2 - note C_, 2 - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 2 + C_ 2 + C_ 4 + C_ 2 + C_ 4 + C_ 2 notetype 12, 13, 7 - note F#, 4 - note G_, 2 - note G#, 12 + F# 4 + G_ 2 + G# 12 notetype 12, 8, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 4 notetype 12, 10, 2 - note C#, 2 - note C#, 4 - note C#, 4 + C# 2 + C# 4 + C# 4 notetype 12, 13, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 4 notetype 12, 15, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 4 notetype 12, 12, 4 - note E_, 1 - note F_, 1 + E_ 1 + F_ 1 notetype 12, 12, 0 - note F#, 12 + F# 12 notetype 12, 12, 7 - note F#, 4 + F# 4 notetype 12, 1, 15 octave 3 - note F#, 8 + F# 8 notetype 12, 9, 0 - note F#, 8 + F# 8 notetype 12, 12, 7 octave 4 - note C#, 4 + C# 4 notetype 12, 12, 0 - note D_, 12 - note D_, 8 + D_ 12 + D_ 8 notetype 12, 12, 7 - note D_, 8 + D_ 8 notetype 12, 12, 0 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note E_, 8 + E_ 8 notetype 12, 12, 0 octave 3 - note A_, 8 + A_ 8 notetype 12, 12, 7 - note A_, 8 + A_ 8 notetype 12, 12, 0 octave 4 - note F_, 8 + F_ 8 notetype 12, 12, 7 - note F_, 8 + F_ 8 octave 5 - note C_, 8 + C_ 8 octave 4 - note A#, 8 + A# 8 notetype 12, 12, 0 - note A_, 16 - note A_, 8 + A_ 16 + A_ 8 notetype 12, 12, 7 - note A_, 8 + A_ 8 notetype 12, 12, 5 callchannel Music_FinalBattle_branch_23710 notetype 12, 11, 1 callchannel Music_FinalBattle_branch_23710 notetype 12, 13, 7 octave 4 - note E_, 8 - note D#, 8 - note D_, 8 + E_ 8 + D# 8 + D_ 8 octave 3 - note B_, 8 - note A#, 4 - note B_, 12 + B_ 8 + A# 4 + B_ 12 notetype 12, 12, 7 octave 4 - note D_, 8 + D_ 8 notetype 12, 4, 12 - note C_, 8 + C_ 8 notetype 12, 13, 7 - note E_, 8 - note D#, 8 - note D_, 8 + E_ 8 + D# 8 + D_ 8 octave 3 - note B_, 8 - note A#, 4 - note B_, 12 + B_ 8 + A# 4 + B_ 12 notetype 12, 5, 13 octave 4 - note D_, 8 + D_ 8 notetype 12, 12, 0 - note F_, 8 + F_ 8 notetype 12, 12, 0 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note E_, 8 - note A#, 4 - note B_, 12 + E_ 8 + A# 4 + B_ 12 loopchannel 0, Music_FinalBattle_branch_235e6 Music_FinalBattle_branch_23704:: octave 4 - note E_, 1 - note E_, 1 - note G_, 1 + E_ 1 + E_ 1 + G_ 1 octave 5 - note C_, 1 - note E_, 1 - note C_, 1 + C_ 1 + E_ 1 + C_ 1 octave 4 - note G_, 1 - note F_, 1 + G_ 1 + F_ 1 endchannel Music_FinalBattle_branch_23710:: octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note C#, 2 - note F#, 2 - note D_, 2 + C# 2 + D_ 2 + C# 2 + F# 2 + D_ 2 endchannel Music_FinalBattle_Ch3:: ; 2371c (8:771c) notetype 12, 1, 1 octave 4 - note E_, 4 + E_ 4 octave 5 - note E_, 4 + E_ 4 octave 4 - note F_, 4 + F_ 4 octave 5 - note D#, 4 + D# 4 octave 4 - note G_, 4 + G_ 4 octave 5 - note D_, 4 + D_ 4 octave 4 - note G#, 4 - note B_, 4 - note E_, 1 - note E_, 1 + G# 4 + B_ 4 + E_ 1 + E_ 1 rest 6 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 6 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 6 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 - note D#, 4 - note E_, 1 - note E_, 1 + D# 4 + E_ 1 + E_ 1 rest 2 - note B_, 4 - note E_, 1 - note E_, 1 + B_ 4 + E_ 1 + E_ 1 rest 2 octave 5 - note C_, 4 + C_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 octave 5 - note D_, 4 + D_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note A#, 2 - note E_, 1 - note E_, 1 + A# 2 + E_ 1 + E_ 1 rest 2 - note B_, 4 - note E_, 1 - note E_, 1 + B_ 4 + E_ 1 + E_ 1 rest 2 octave 5 - note C_, 4 + C_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 octave 5 - note D_, 4 + D_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 octave 5 - note C_, 4 - note D_, 2 + C_ 4 + D_ 2 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 - note B_, 4 - note E_, 1 - note E_, 1 + B_ 4 + E_ 1 + E_ 1 rest 2 octave 5 - note C_, 4 + C_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 octave 5 - note D_, 4 + D_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 - note E_, 1 - note D#, 1 - note E_, 1 - note G_, 1 + E_ 1 + D# 1 + E_ 1 + G_ 1 Music_FinalBattle_branch_2377d:: octave 4 - note E_, 1 + E_ 1 octave 3 - note E_, 1 + E_ 1 rest 2 octave 4 - note F#, 4 - note D#, 1 + F# 4 + D# 1 octave 3 - note D#, 1 + D# 1 rest 2 octave 4 - note F_, 4 - note D_, 1 + F_ 4 + D_ 1 octave 3 - note D_, 1 + D_ 1 rest 2 octave 4 - note E_, 4 - note F#, 1 + E_ 4 + F# 1 octave 3 - note F#, 1 + F# 1 rest 2 octave 4 - note F#, 4 - note F_, 4 + F# 4 + F_ 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 - note E_, 1 + F# 2 + E_ 1 octave 3 - note E_, 1 + E_ 1 rest 2 octave 4 - note F#, 4 - note D#, 1 + F# 4 + D# 1 octave 3 - note D#, 1 + D# 1 rest 2 octave 4 - note F_, 4 - note D_, 1 + F_ 4 + D_ 1 octave 3 - note D_, 1 + D_ 1 rest 2 octave 4 - note E_, 4 - note F#, 1 + E_ 4 + F# 1 octave 3 - note F#, 1 + F# 1 rest 2 octave 4 - note F#, 4 - note F_, 4 + F# 4 + F_ 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 - octave 4 - note F#, 2 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 1 - note E_, 1 + B_ 2 + octave 4 + F# 2 + E_ 1 + D# 1 + E_ 1 + F# 1 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 1 + E_ 1 rest 2 - note D_, 4 - note E_, 1 - note E_, 1 + D_ 4 + E_ 1 + E_ 1 rest 2 - note F_, 4 - note E_, 1 - note E_, 1 + F_ 4 + E_ 1 + E_ 1 rest 2 - note D_, 4 - note E_, 1 - note E_, 1 + D_ 4 + E_ 1 + E_ 1 octave 3 - note B_, 6 + B_ 6 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 - note D_, 4 - note E_, 1 - note E_, 1 + D_ 4 + E_ 1 + E_ 1 rest 2 - note F_, 4 - note E_, 1 - note E_, 1 + F_ 4 + E_ 1 + E_ 1 rest 2 - note D_, 4 - note E_, 1 - note E_, 1 + D_ 4 + E_ 1 + E_ 1 octave 3 - note B_, 6 + B_ 6 octave 4 - note E_, 2 + E_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note E_, 2 + E_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note E_, 2 + E_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note E_, 2 + E_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 + E_ 2 + B_ 2 + B_ 2 + E_ 2 + B_ 2 + B_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note B_, 2 - note F_, 2 + B_ 2 + F_ 2 octave 5 - note D#, 2 + D# 2 octave 4 - note F_, 2 + F_ 2 octave 5 - note D#, 2 + D# 2 octave 4 - note F_, 2 + F_ 2 octave 5 - note D#, 2 + D# 2 octave 4 - note F_, 2 + F_ 2 octave 5 - note D#, 2 + D# 2 octave 4 - note F_, 2 + F_ 2 octave 5 - note C_, 2 - note C_, 2 + C_ 2 + C_ 2 octave 4 - note F_, 2 + F_ 2 octave 5 - note C_, 2 - note C_, 2 - note D_, 2 - note C_, 2 + C_ 2 + C_ 2 + D_ 2 + C_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 - note C#, 2 + C# 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 - note C#, 2 - note E_, 2 - note C#, 2 + C# 2 + C# 2 + E_ 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 - note C#, 2 + C# 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 - note C#, 2 - note E_, 2 - note C#, 2 + C# 2 + C# 2 + E_ 2 + C# 2 callchannel Music_FinalBattle_branch_2395b callchannel Music_FinalBattle_branch_2395b octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 1 - note F#, 1 - note G_, 1 - note G#, 1 + G_ 1 + F# 1 + G_ 1 + G# 1 callchannel Music_FinalBattle_branch_2396c callchannel Music_FinalBattle_branch_2396c octave 4 - note A#, 2 + A# 2 octave 5 - note F_, 2 + F_ 2 octave 4 - note A#, 2 + A# 2 octave 5 - note F_, 2 + F_ 2 octave 4 - note A#, 2 + A# 2 octave 5 - note F_, 2 + F_ 2 octave 4 - note A#, 2 + A# 2 octave 5 - note F_, 2 + F_ 2 octave 4 - note A#, 2 + A# 2 octave 5 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C#, 2 + F_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + C# 2 octave 4 - note A#, 2 - note A_, 2 + A# 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 - note G#, 2 - note G_, 2 + A_ 2 + G# 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note D#, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note F#, 2 + G_ 1 + F# 1 + G_ 1 + G# 1 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + F_ 2 + F# 2 + G_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + D# 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + F_ 2 + F# 2 + G_ 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 - note F_, 2 - note E_, 2 - note B_, 2 - octave 5 - note E_, 4 - octave 4 - note E_, 2 - note B_, 2 - octave 5 - note D#, 4 - octave 4 - note E_, 2 - note B_, 2 - octave 5 - note D_, 4 - octave 4 - note E_, 2 - note A_, 2 - note B_, 4 + F# 2 + F_ 2 + E_ 2 + B_ 2 + octave 5 + E_ 4 + octave 4 + E_ 2 + B_ 2 + octave 5 + D# 4 + octave 4 + E_ 2 + B_ 2 + octave 5 + D_ 4 + octave 4 + E_ 2 + A_ 2 + B_ 4 loopchannel 0, Music_FinalBattle_branch_2377d Music_FinalBattle_branch_2395b:: octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 + C# 2 endchannel Music_FinalBattle_branch_2396c:: octave 4 - note A_, 2 + A_ 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note E_, 2 + E_ 2 endchannel -; 0x2397d
\ No newline at end of file +; 0x2397d diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 33a49243..a80652e3 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -6,180 +6,180 @@ Music_GameCorner_Ch1:: ; 7e20b (1f:620b) toggleperfectpitch notetype 12, 11, 5 octave 3 - note A_, 6 + A_ 6 notetype 12, 11, 1 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 16 + G# 2 + F# 2 + E_ 2 + D# 2 + C# 2 + D# 16 Music_GameCorner_branch_7e222:: notetype 12, 11, 5 octave 3 - note C#, 4 + C# 4 octave 2 - note G#, 4 + G# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note A_, 2 - note G#, 8 + A_ 2 + G# 8 notetype 12, 10, 7 - note G#, 2 - note A_, 2 - note B_, 2 + G# 2 + A_ 2 + B_ 2 notetype 12, 11, 5 - note G#, 6 - note E_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 + G# 6 + E_ 2 + F# 2 + E_ 2 + D# 2 + E_ 2 notetype 12, 10, 7 - note F#, 8 - note D#, 8 + F# 8 + D# 8 notetype 12, 11, 5 - note D#, 4 + D# 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note D#, 4 - note B_, 2 - note A_, 8 + F# 4 + D# 4 + B_ 2 + A_ 8 notetype 12, 11, 7 octave 4 - note E_, 2 - note D#, 2 - note E_, 2 - note D#, 6 - note C#, 2 - octave 3 - note D#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note G#, 2 + E_ 2 + D# 2 + E_ 2 + D# 6 + C# 2 + octave 3 + D# 2 + E_ 2 + F# 2 + G_ 2 + G# 2 notetype 12, 9, 7 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 2 + G# 1 + G_ 1 + G# 1 + G_ 1 + G# 2 notetype 12, 11, 7 - note F#, 8 + F# 8 notetype 12, 11, 5 - note C#, 4 + C# 4 octave 2 - note G#, 4 + G# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note A_, 2 - note G#, 8 + A_ 2 + G# 8 notetype 12, 11, 7 - note G#, 2 - note A_, 2 - note B_, 2 - note G#, 6 - note E_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note F#, 8 + G# 2 + A_ 2 + B_ 2 + G# 6 + E_ 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + F# 8 notetype 12, 9, 7 - note D#, 4 - note C#, 4 + D# 4 + C# 4 notetype 12, 11, 5 - note D#, 4 + D# 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note D#, 4 - note B_, 2 - note A_, 8 + F# 4 + D# 4 + B_ 2 + A_ 8 notetype 12, 11, 7 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 4 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 + F# 2 + G# 2 + A_ 2 + B_ 4 + A_ 4 + B_ 2 + A_ 2 + G# 2 + F# 2 notetype 12, 12, 2 - note E_, 4 + E_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note E_, 2 - note E_, 4 - note E_, 4 + E_ 2 + E_ 4 + E_ 4 notetype 12, 11, 7 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note D_, 2 - note D#, 10 + C# 2 + D_ 2 + D# 10 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note D#, 2 - note E_, 8 + C# 2 + D# 2 + E_ 8 notetype 12, 11, 5 octave 4 - note D#, 4 + D# 4 octave 3 - note B_, 4 - note F#, 4 - note D#, 4 + B_ 4 + F# 4 + D# 4 notetype 12, 11, 7 - note E_, 3 - note D#, 1 + E_ 3 + D# 1 notetype 12, 11, 2 - note C#, 2 - note D#, 2 - note E_, 10 + C# 2 + D# 2 + E_ 10 notetype 12, 11, 7 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note D_, 2 - note D#, 10 + C# 2 + D_ 2 + D# 10 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note D#, 2 - note E_, 8 + C# 2 + D# 2 + E_ 8 notetype 12, 11, 5 octave 4 - note D#, 4 + D# 4 octave 3 - note B_, 4 - note F#, 4 - note A_, 4 + B_ 4 + F# 4 + A_ 4 notetype 12, 11, 7 - note G#, 2 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 8 + G# 2 + G# 1 + G_ 1 + G# 1 + G_ 1 + G# 1 + G_ 1 + G# 8 loopchannel 0, Music_GameCorner_branch_7e222 @@ -188,186 +188,186 @@ Music_GameCorner_Ch2:: ; 7e2df (1f:62df) vibrato 10, 2, 3 notetype 12, 12, 6 octave 4 - note C#, 6 + C# 6 notetype 12, 12, 1 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 duty 3 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 8 + B_ 1 + A# 1 + B_ 1 + A# 1 + B_ 1 + A# 1 + B_ 8 Music_GameCorner_branch_7e2fa:: duty 2 notetype 12, 12, 7 octave 3 - note E_, 4 + E_ 4 octave 2 - note B_, 4 - octave 3 - note G#, 4 - note E_, 4 - octave 4 - note C#, 2 - octave 3 - note B_, 14 - octave 4 - note E_, 6 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 16 - note F#, 4 - note D#, 4 - note A_, 4 - note F#, 4 - octave 4 - note D#, 2 - note C#, 14 - note F#, 6 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A#, 2 - note B_, 16 - note E_, 4 + B_ 4 + octave 3 + G# 4 + E_ 4 + octave 4 + C# 2 + octave 3 + B_ 14 + octave 4 + E_ 6 + D# 2 + C# 2 + octave 3 + B_ 2 + A_ 2 + G# 2 + A_ 16 + F# 4 + D# 4 + A_ 4 + F# 4 + octave 4 + D# 2 + C# 14 + F# 6 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 2 + A# 2 + B_ 16 + E_ 4 octave 2 - note B_, 4 - octave 3 - note G#, 4 - note E_, 4 - octave 4 - note C#, 2 - octave 3 - note B_, 14 - octave 4 - note E_, 6 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 16 - note F#, 4 - note D#, 4 - note A_, 4 - note F#, 4 - octave 4 - note D#, 2 - note C#, 14 - note F#, 6 - note E_, 2 - note D#, 2 - note E_, 2 - note F#, 2 - note G#, 2 + B_ 4 + octave 3 + G# 4 + E_ 4 + octave 4 + C# 2 + octave 3 + B_ 14 + octave 4 + E_ 6 + D# 2 + C# 2 + octave 3 + B_ 2 + A_ 2 + G# 2 + A_ 16 + F# 4 + D# 4 + A_ 4 + F# 4 + octave 4 + D# 2 + C# 14 + F# 6 + E_ 2 + D# 2 + E_ 2 + F# 2 + G# 2 notetype 12, 12, 1 - note E_, 2 + E_ 2 notetype 12, 10, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 2 + E_ 1 + D# 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + E_ 2 notetype 12, 12, 7 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note D#, 10 + C# 2 + D_ 2 + D# 10 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note E_, 10 + C# 2 + D# 2 + E_ 10 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 + C# 2 + D# 2 notetype 12, 12, 5 - note F#, 4 - note D#, 4 + F# 4 + D# 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note A_, 4 - note G#, 3 - note A_, 1 + A_ 4 + G# 3 + A_ 1 notetype 12, 12, 2 - note G#, 2 - note F#, 2 - note E_, 2 + G# 2 + F# 2 + E_ 2 notetype 12, 12, 7 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note D#, 10 + C# 2 + D_ 2 + D# 10 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note E_, 10 + C# 2 + D# 2 + E_ 10 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note F#, 4 - note D#, 4 - note A_, 4 - note F#, 4 - note B_, 16 + C# 2 + D# 2 + F# 4 + D# 4 + A_ 4 + F# 4 + B_ 16 loopchannel 0, Music_GameCorner_branch_7e2fa Music_GameCorner_Ch3:: ; 7e38b (1f:638b) notetype 12, 1, 3 octave 5 - note C#, 1 + C# 1 rest 5 octave 4 - note F#, 1 + F# 1 rest 1 - note G#, 1 + G# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A#, 1 + A# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note B_, 1 + B_ 1 rest 9 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 Music_GameCorner_branch_7e3a5:: @@ -378,23 +378,23 @@ Music_GameCorner_branch_7e3a5:: callchannel Music_GameCorner_branch_7e46c callchannel Music_GameCorner_branch_7e481 callchannel Music_GameCorner_branch_7e496 - note D#, 1 + D# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 callchannel Music_GameCorner_branch_7e418 callchannel Music_GameCorner_branch_7e42d @@ -403,38 +403,38 @@ Music_GameCorner_branch_7e3a5:: callchannel Music_GameCorner_branch_7e46c callchannel Music_GameCorner_branch_7e481 callchannel Music_GameCorner_branch_7e496 - note E_, 1 + E_ 1 rest 3 octave 3 - note B_, 1 + B_ 1 rest 3 octave 4 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note B_, 1 + B_ 1 rest 1 callchannel Music_GameCorner_branch_7e46c callchannel Music_GameCorner_branch_7e418 callchannel Music_GameCorner_branch_7e4ab - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 callchannel Music_GameCorner_branch_7e46c callchannel Music_GameCorner_branch_7e418 @@ -443,186 +443,186 @@ Music_GameCorner_branch_7e3a5:: loopchannel 0, Music_GameCorner_branch_7e3a5 Music_GameCorner_branch_7e418:: - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 endchannel Music_GameCorner_branch_7e42d:: - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 endchannel Music_GameCorner_branch_7e442:: - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 endchannel Music_GameCorner_branch_7e457:: - note D#, 1 + D# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 endchannel Music_GameCorner_branch_7e46c:: - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 endchannel Music_GameCorner_branch_7e481:: - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 endchannel Music_GameCorner_branch_7e496:: - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 endchannel Music_GameCorner_branch_7e4ab:: - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 endchannel -; 0x7e4c0
\ No newline at end of file +; 0x7e4c0 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index 44cc0cb8..b4cb2a8d 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -6,162 +6,162 @@ Music_Gym_Ch1:: ; bcbb (2:7cbb) toggleperfectpitch notetype 12, 11, 5 octave 3 - note G_, 6 - note C_, 1 - note G_, 1 - note F_, 6 + G_ 6 + C_ 1 + G_ 1 + F_ 6 octave 2 - note A#, 1 + A# 1 octave 3 - note F_, 1 - note E_, 6 + F_ 1 + E_ 6 octave 2 - note A_, 1 + A_ 1 octave 3 - note E_, 1 - note F_, 4 - note G_, 4 + E_ 1 + F_ 4 + G_ 4 Music_Gym_branch_bcd8:: - note E_, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 + E_ 4 + F_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 notetype 12, 11, 1 - note D_, 3 + D_ 3 notetype 12, 11, 5 - note E_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note E_, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 + E_ 1 + F_ 4 + E_ 2 + D_ 2 + E_ 2 + F_ 2 + E_ 4 + F_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 + D_ 2 + D_ 1 + E_ 1 + F_ 4 + E_ 2 + D_ 2 + E_ 2 + F_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note A#, 2 + A# 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note G_, 2 - note F_, 2 + A# 2 + A_ 2 + G_ 2 + F_ 2 notetype 12, 11, 1 - note A#, 3 + A# 3 notetype 12, 11, 5 - note F_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 + F_ 1 + F_ 4 + E_ 2 + D_ 2 + E_ 2 + F_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note A#, 2 + A# 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F_, 4 - note A#, 2 - note F_, 1 - note A#, 1 + A# 2 + A_ 2 + G_ 2 + F_ 2 + D_ 2 + D_ 1 + E_ 1 + F_ 4 + A# 2 + F_ 1 + A# 1 octave 4 - note D_, 4 + D_ 4 octave 3 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - note C_, 1 - note D_, 1 - note E_, 4 - note C_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note E_, 2 - note C_, 1 - note E_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - note C_, 1 - note D_, 1 - note E_, 4 - note D_, 2 - note E_, 2 - note F_, 2 - note F_, 2 - note G_, 2 - note E_, 1 - note G_, 1 - note A#, 2 + E_ 2 + C_ 2 + E_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + E_ 2 + F_ 2 + D_ 2 + E_ 2 + C_ 2 + D_ 2 + E_ 2 + C_ 2 + D_ 2 + C_ 2 + C_ 1 + D_ 1 + E_ 4 + C_ 2 + E_ 2 + D_ 2 + C_ 2 + E_ 2 + C_ 1 + E_ 1 + F_ 4 + E_ 2 + D_ 2 + E_ 2 + F_ 2 + E_ 2 + C_ 2 + E_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + E_ 2 + D_ 2 + F_ 2 + D_ 2 + E_ 2 + C_ 2 + D_ 2 + C_ 2 + D_ 2 + C_ 2 + C_ 1 + D_ 1 + E_ 4 + D_ 2 + E_ 2 + F_ 2 + F_ 2 + G_ 2 + E_ 1 + G_ 1 + A# 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 + A# 2 + A_ 2 + G_ 2 + A_ 2 loopchannel 0, Music_Gym_branch_bcd8 @@ -170,121 +170,121 @@ Music_Gym_Ch2:: ; bd6b (2:7d6b) vibrato 10, 2, 5 notetype 12, 12, 7 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 1 + G_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note A#, 6 - note F_, 1 - note A#, 1 + A# 6 + F_ 1 + A# 1 notetype 12, 10, 0 - note A_, 12 + A_ 12 notetype 12, 12, 7 - note B_, 4 + B_ 4 Music_Gym_branch_bd82:: octave 4 - note C_, 12 + C_ 12 octave 3 - note G_, 2 + G_ 2 octave 4 - note C_, 2 + C_ 2 notetype 12, 12, 2 - note D_, 3 + D_ 3 octave 3 - note A#, 1 + A# 1 notetype 12, 12, 7 - note A#, 12 + A# 12 octave 4 - note C_, 12 + C_ 12 octave 3 - note G_, 2 + G_ 2 octave 4 - note C_, 2 + C_ 2 notetype 12, 12, 4 octave 3 - note A#, 2 + A# 2 notetype 12, 12, 7 - note A#, 1 + A# 1 octave 4 - note C_, 1 - note D_, 12 - note E_, 12 - note D_, 2 - note E_, 2 + C_ 1 + D_ 12 + E_ 12 + D_ 2 + E_ 2 notetype 12, 12, 2 - note F_, 3 - note D_, 1 + F_ 3 + D_ 1 notetype 12, 12, 7 - note D_, 4 + D_ 4 notetype 12, 12, 2 - note A#, 3 - note F_, 1 + A# 3 + F_ 1 notetype 12, 12, 7 - note F_, 4 - note E_, 12 - note D_, 2 - note E_, 2 - note F_, 2 - note D_, 1 - note F_, 1 - note A#, 12 + F_ 4 + E_ 12 + D_ 2 + E_ 2 + F_ 2 + D_ 1 + F_ 1 + A# 12 octave 3 - note G_, 6 + G_ 6 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 4 - note A#, 4 - note A_, 4 - note G_, 4 - note F_, 4 + G_ 4 + A# 4 + A_ 4 + G_ 4 + F_ 4 notetype 12, 12, 3 - note E_, 2 + E_ 2 notetype 12, 12, 7 - note E_, 1 - note F_, 1 - note G_, 6 - note G_, 2 + E_ 1 + F_ 1 + G_ 6 + G_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G_, 2 - note A#, 4 - note A_, 4 - note G_, 4 - note C_, 2 - note D_, 2 - note G_, 6 + G_ 2 + A# 4 + A_ 4 + G_ 4 + C_ 2 + D_ 2 + G_ 6 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 4 - note A#, 4 - note A_, 4 - note G_, 4 - note F_, 4 + G_ 4 + A# 4 + A_ 4 + G_ 4 + F_ 4 notetype 12, 12, 3 - note E_, 2 + E_ 2 notetype 12, 12, 7 - note E_, 1 - note F_, 1 - note G_, 4 + E_ 1 + F_ 1 + G_ 4 notetype 12, 12, 3 - note G_, 2 + G_ 2 notetype 12, 12, 7 - note G_, 1 - note A_, 1 - note A#, 4 + G_ 1 + A_ 1 + A# 4 notetype 12, 12, 4 octave 4 - note C_, 2 + C_ 2 notetype 12, 12, 7 - note C_, 1 - note D_, 1 - note E_, 12 + C_ 1 + D_ 1 + E_ 12 loopchannel 0, Music_Gym_branch_bd82 @@ -293,9 +293,9 @@ Music_Gym_Ch3:: ; bdfa (2:7dfa) rest 16 rest 10 octave 4 - note G_, 2 - note F_, 2 - note D_, 2 + G_ 2 + F_ 2 + D_ 2 Music_Gym_branch_be02:: callchannel Music_Gym_branch_be3b @@ -313,46 +313,46 @@ Music_Gym_branch_be02:: callchannel Music_Gym_branch_be3b callchannel Music_Gym_branch_be4d callchannel Music_Gym_branch_be3b - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note A_, 2 - note F_, 2 + F_ 2 + A# 2 + F_ 2 + A# 2 + F_ 2 + A# 2 + A_ 2 + F_ 2 loopchannel 0, Music_Gym_branch_be02 Music_Gym_branch_be3b:: - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 endchannel Music_Gym_branch_be44:: - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 endchannel Music_Gym_branch_be4d:: - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 + F_ 2 + A# 2 + F_ 2 + A# 2 + F_ 2 + A# 2 + F_ 2 + A# 2 endchannel -; 0xbe56
\ No newline at end of file +; 0xbe56 diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index edd73717..c4e7907e 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -7,543 +7,543 @@ Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370) notetype 12, 11, 3 rest 6 octave 3 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 + F# 1 + F_ 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + C# 1 + C_ 1 + C# 1 + C_ 1 + octave 2 + B_ 1 octave 1 - note G#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - octave 2 - note F#, 1 + G# 1 + A_ 1 + A# 1 + A_ 1 + A# 1 + B_ 1 + A# 1 + B_ 1 + octave 2 + F# 1 rest 15 - note F#, 1 + F# 1 rest 9 - note G_, 6 - note F#, 1 + G_ 6 + F# 1 rest 15 - note F#, 1 + F# 1 rest 9 - note F_, 6 - note F#, 1 + F_ 6 + F# 1 rest 15 - note F#, 1 + F# 1 rest 9 - note G_, 6 - note F#, 1 + G_ 6 + F# 1 rest 15 - note F#, 1 + F# 1 rest 9 - note A_, 6 + A_ 6 Music_GymLeaderBattle_branch_223b0:: - note F#, 1 - octave 3 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - octave 2 - note E_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 + F# 1 + octave 3 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + octave 2 + E_ 1 + A_ 1 + octave 3 + C# 1 + octave 2 + B_ 1 + A_ 1 + octave 3 + C# 1 + octave 2 + B_ 1 + A_ 1 + octave 3 + C# 1 + octave 2 + B_ 1 + A_ 1 + octave 3 + C# 1 + octave 2 + B_ 1 + A_ 1 + octave 3 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 - note F#, 1 + B_ 1 + A_ 1 + F# 1 octave 3 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 octave 2 - note E_, 1 - note A_, 1 + E_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 rest 2 octave 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note D_, 4 + D_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note E_, 4 + E_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note D_, 4 + D_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note C#, 2 + C# 2 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note D_, 4 + D_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note E_, 4 + E_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note D_, 4 + D_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note C#, 2 + C# 2 octave 1 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 2 - note C#, 2 + C# 2 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 rest 16 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 11, 5 octave 3 - note C#, 12 + C# 12 notetype 12, 11, 3 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 11, 5 octave 3 - note A_, 12 + A_ 12 notetype 12, 11, 3 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note F#, 4 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note D#, 2 - note F#, 2 + D# 4 + C# 4 + D# 4 + E_ 2 + F# 4 + octave 2 + B_ 2 + octave 3 + C# 2 + F# 2 + B_ 2 + F# 2 + D# 2 + F# 2 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 11, 5 octave 3 - note A_, 12 + A_ 12 notetype 12, 11, 3 - note C#, 1 - octave 2 - note B_, 1 - octave 3 - note C#, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note A_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note D#, 1 - note C#, 1 + C# 1 + octave 2 + B_ 1 + octave 3 + C# 1 + D# 1 + E_ 1 + D# 1 + E_ 1 + F# 1 + A_ 1 + G# 1 + F# 1 + E_ 1 + F# 1 + E_ 1 + D# 1 + C# 1 notetype 12, 11, 5 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note F#, 4 - note E_, 2 - note D#, 4 - note C#, 6 + D# 4 + E_ 4 + C# 2 + D# 6 + F# 4 + E_ 2 + D# 4 + C# 6 rest 16 rest 10 - note E_, 6 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note E_, 4 - note D#, 2 - note C#, 4 - octave 2 - note B_, 6 - octave 3 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note F#, 4 - note A_, 2 - note G#, 4 - note E_, 6 + E_ 6 + D# 4 + E_ 4 + C# 2 + D# 6 + E_ 4 + D# 2 + C# 4 + octave 2 + B_ 6 + octave 3 + D# 4 + E_ 4 + C# 2 + D# 6 + F# 4 + A_ 2 + G# 4 + E_ 6 loopchannel 0, Music_GymLeaderBattle_branch_223b0 @@ -552,299 +552,299 @@ Music_GymLeaderBattle_Ch2:: ; 225a1 (8:65a1) vibrato 8, 2, 5 notetype 12, 12, 3 octave 4 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + C# 1 + C_ 1 + octave 3 + B_ 1 rest 5 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note B_, 1 + F# 1 + F_ 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + C# 1 + B_ 1 rest 15 - note B_, 1 + B_ 1 rest 9 octave 4 - note C_, 6 + C_ 6 octave 3 - note B_, 1 + B_ 1 rest 15 - note B_, 1 + B_ 1 rest 9 - note A#, 6 + A# 6 octave 3 - note B_, 1 + B_ 1 rest 15 - note B_, 1 + B_ 1 rest 9 octave 4 - note C_, 6 + C_ 6 octave 3 - note B_, 1 + B_ 1 rest 15 - note B_, 1 + B_ 1 rest 9 octave 4 - note C#, 6 + C# 6 Music_GymLeaderBattle_branch_225e0:: notetype 12, 12, 5 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note F#, 4 - note E_, 4 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 + D# 4 + C# 4 + D# 4 + E_ 2 + F# 4 + E_ 4 + D# 2 + C# 2 + octave 3 + B_ 2 + octave 4 + C# 2 + D# 2 notetype 12, 11, 7 duty 2 octave 3 - note A_, 8 + A_ 8 octave 4 - note C#, 8 - note E_, 8 - note C#, 8 + C# 8 + E_ 8 + C# 8 notetype 12, 12, 5 duty 3 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note F#, 4 - note E_, 4 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 + D# 4 + C# 4 + D# 4 + E_ 2 + F# 4 + E_ 4 + D# 2 + C# 2 + octave 3 + B_ 2 + octave 4 + C# 2 + D# 2 notetype 12, 11, 7 duty 2 - note C#, 8 + C# 8 octave 3 - note B_, 8 - note A_, 8 + B_ 8 + A_ 8 notetype 12, 12, 3 octave 4 - note E_, 4 - note E_, 2 - note C#, 2 + E_ 4 + E_ 2 + C# 2 notetype 12, 12, 5 duty 3 octave 1 - note B_, 1 + B_ 1 rest 3 octave 3 - note D_, 1 - note C#, 1 + D_ 1 + C# 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note D_, 1 + D_ 1 rest 4 - note E_, 1 - note D_, 1 + E_ 1 + D_ 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note E_, 1 + E_ 1 rest 4 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 + F# 1 + E_ 1 + C# 1 + F# 1 rest 2 - note E_, 1 - note C#, 1 - note E_, 1 + E_ 1 + C# 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note D_, 1 - note C#, 1 + D_ 1 + C# 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note D_, 1 + D_ 1 rest 4 - note E_, 1 - note D_, 1 + E_ 1 + D_ 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note E_, 1 + E_ 1 rest 4 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 notetype 12, 11, 0 octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 4 - note B_, 4 + A_ 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 4 - note G_, 4 + A_ 4 + G_ 4 notetype 12, 11, 0 - note F#, 8 + F# 8 notetype 12, 11, 7 - note F#, 8 + F# 8 notetype 12, 12, 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + octave 2 + B_ 1 + A_ 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + A_ 1 + B_ 1 notetype 12, 11, 0 octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 4 - note B_, 4 + A_ 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note C_, 4 + C_ 4 notetype 12, 11, 0 octave 3 - note B_, 16 + B_ 16 notetype 12, 3, 15 octave 4 - note F#, 16 + F# 16 notetype 12, 12, 3 duty 3 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 12, 7 octave 3 - note A_, 12 + A_ 12 notetype 12, 12, 3 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 12, 7 octave 4 - note C#, 12 + C# 12 notetype 12, 11, 0 - note D#, 16 + D# 16 notetype 12, 11, 7 - note D#, 16 + D# 16 notetype 12, 12, 3 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 12, 7 octave 4 - note C#, 12 + C# 12 notetype 12, 12, 0 - note A_, 8 - note E_, 8 - note B_, 16 + A_ 8 + E_ 8 + B_ 16 notetype 12, 12, 7 - note B_, 16 + B_ 16 notetype 12, 12, 4 octave 3 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note F#, 4 - note A_, 2 - note G#, 4 + D# 4 + E_ 4 + C# 2 + D# 6 + F# 4 + A_ 2 + G# 4 rest 2 - note B_, 1 + B_ 1 octave 4 - note D#, 1 - note F#, 1 - note A#, 1 + D# 1 + F# 1 + A# 1 notetype 12, 12, 0 - note B_, 16 - note F#, 16 - note A_, 16 + B_ 16 + F# 16 + A_ 16 octave 5 - note C#, 8 + C# 8 rest 2 notetype 12, 12, 3 octave 4 - note A_, 6 + A_ 6 loopchannel 0, Music_GymLeaderBattle_branch_225e0 @@ -853,549 +853,549 @@ Music_GymLeaderBattle_Ch3:: ; 226ef (8:66ef) notetype 12, 1, 3 rest 12 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note F#, 1 + C_ 1 + C# 1 + C_ 1 + C# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + E_ 1 + F_ 1 + E_ 1 + F_ 1 + F# 1 + F_ 1 + F# 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C_, 6 + C_ 6 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F_, 6 + F_ 6 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C_, 6 + C_ 6 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 6 + C# 6 notetype 12, 1, 4 Music_GymLeaderBattle_branch_227b1:: octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note E_, 4 + E_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note E_, 4 + E_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 4 - note C#, 12 + C# 12 octave 3 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 4 - note E_, 12 - note D#, 16 + E_ 12 + D# 16 octave 3 - note B_, 16 - note A_, 1 + B_ 16 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 4 - note E_, 12 - note C#, 8 - note E_, 8 + E_ 12 + C# 8 + E_ 8 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note E_, 6 + E_ 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G_, 6 + G_ 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 6 + C_ 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G_, 6 + G_ 6 loopchannel 0, Music_GymLeaderBattle_branch_227b1 -; 0x22919
\ No newline at end of file +; 0x22919 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index e9df42e4..d2347aa6 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -10,19 +10,19 @@ Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf) rest 16 rest 12 octave 3 - note D_, 1 - note E_, 1 - note F_, 1 - note F#, 1 + D_ 1 + E_ 1 + F_ 1 + F# 1 Music_HallOfFame_branch_7fbc5:: notetype 12, 8, 0 octave 4 - note C_, 16 - note E_, 16 - note F#, 16 + C_ 16 + E_ 16 + F# 16 notetype 12, 6, 0 - note F_, 16 + F_ 16 loopchannel 3, Music_HallOfFame_branch_7fbc5 rest 16 rest 16 @@ -38,28 +38,28 @@ Music_HallOfFame_Ch2:: ; 7fbda (1f:7bda) Music_HallOfFame_branch_7fbdf:: notetype 12, 12, 4 octave 3 - note G_, 2 - note D_, 2 - note G_, 2 - note A_, 10 - note G_, 2 - note D_, 2 - note G_, 2 + G_ 2 + D_ 2 + G_ 2 + A_ 10 + G_ 2 + D_ 2 + G_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 4 - note A_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note A_, 10 - note F_, 2 - note C_, 2 - note F_, 2 - note A#, 4 - note A_, 4 - note F_, 2 + B_ 4 + A_ 2 + G_ 2 + D_ 2 + G_ 2 + A_ 10 + F_ 2 + C_ 2 + F_ 2 + A# 4 + A_ 4 + F_ 2 loopchannel 0, Music_HallOfFame_branch_7fbdf @@ -68,30 +68,30 @@ Music_HallOfFame_Ch3:: ; 7fbfc (1f:7bfc) Music_HallOfFame_branch_7fbfe:: octave 4 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 loopchannel 12, Music_HallOfFame_branch_7fbfe - note D_, 4 - note G_, 4 - note D_, 4 - note G_, 4 - note E_, 4 - note G_, 4 - note E_, 4 - note G_, 4 - note F#, 4 - note A_, 4 - note F#, 4 - note A_, 4 - note E_, 4 - note G_, 4 - note E_, 4 - note G_, 4 + D_ 4 + G_ 4 + D_ 4 + G_ 4 + E_ 4 + G_ 4 + E_ 4 + G_ 4 + F# 4 + A_ 4 + F# 4 + A_ 4 + E_ 4 + G_ 4 + E_ 4 + G_ 4 loopchannel 0, Music_HallOfFame_Ch3 -; 0x7fc1f
\ No newline at end of file +; 0x7fc1f diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index 28f40cec..32ce02c2 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -6,83 +6,83 @@ Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0) toggleperfectpitch notetype 12, 11, 2 octave 2 - note A_, 8 - note A_, 8 - note A_, 8 - note A_, 4 + A_ 8 + A_ 8 + A_ 8 + A_ 4 notetype 12, 10, 4 - note A#, 4 + A# 4 Music_IndigoPlateau_branch_a605:: callchannel Music_IndigoPlateau_branch_a659 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 callchannel Music_IndigoPlateau_branch_a659 notetype 12, 11, 4 octave 3 - note D#, 4 + D# 4 callchannel Music_IndigoPlateau_branch_a659 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 callchannel Music_IndigoPlateau_branch_a659 notetype 12, 10, 0 octave 2 - note A#, 4 + A# 4 callchannel Music_IndigoPlateau_branch_a659 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 13, 4 octave 3 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 notetype 12, 11, 4 octave 3 - note D#, 4 + D# 4 notetype 12, 13, 4 octave 3 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 + A# 4 + A# 4 + A# 4 + A# 4 + A# 4 + A# 4 + A# 4 notetype 12, 11, 4 octave 3 - note F_, 2 + F_ 2 notetype 12, 11, 4 octave 3 - note G_, 2 + G_ 2 notetype 12, 11, 0 - note A_, 8 + A_ 8 octave 2 - note A_, 8 + A_ 8 notetype 12, 11, 7 octave 3 - note F_, 8 + F_ 8 notetype 12, 4, 14 octave 2 - note A#, 8 + A# 8 loopchannel 0, Music_IndigoPlateau_branch_a605 Music_IndigoPlateau_branch_a659:: notetype 12, 11, 2 octave 2 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 endchannel @@ -91,154 +91,154 @@ Music_IndigoPlateau_Ch2:: ; a664 (2:6664) vibrato 8, 2, 5 notetype 12, 12, 2 octave 3 - note D_, 8 - note D_, 8 - note D_, 8 - note D_, 4 + D_ 8 + D_ 8 + D_ 8 + D_ 4 notetype 12, 5, 10 - note D#, 4 + D# 4 Music_IndigoPlateau_branch_a673:: callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 - note A_, 4 + A_ 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 - note A#, 4 + A# 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 - note A_, 4 + A_ 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 7 - note C#, 4 + C# 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 - note A_, 4 + A_ 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 - note A#, 4 + A# 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 octave 4 - note C_, 2 + C_ 2 notetype 12, 12, 7 octave 4 - note C#, 2 - note D_, 8 + C# 2 + D_ 8 octave 3 - note D_, 8 + D_ 8 octave 4 - note C_, 8 + C_ 8 notetype 12, 4, 13 octave 4 - note D#, 8 + D# 8 loopchannel 0, Music_IndigoPlateau_branch_a673 Music_IndigoPlateau_branch_a6af:: notetype 12, 12, 2 octave 3 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 + D_ 4 + D_ 4 + D_ 4 + D_ 4 + D_ 4 + D_ 4 + D_ 4 endchannel Music_IndigoPlateau_Ch3:: ; a6ba (2:66ba) notetype 12, 1, 0 octave 4 - note D_, 2 + D_ 2 rest 6 - note D_, 2 + D_ 2 rest 6 - note D_, 2 + D_ 2 rest 6 - note D_, 2 + D_ 2 rest 2 - note D#, 4 + D# 4 Music_IndigoPlateau_branch_a6c6:: callchannel Music_IndigoPlateau_branch_a6fe callchannel Music_IndigoPlateau_branch_a6fe callchannel Music_IndigoPlateau_branch_a6fe - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note F#, 4 + F# 4 callchannel Music_IndigoPlateau_branch_a6fe callchannel Music_IndigoPlateau_branch_a6fe - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note A#, 1 + A# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note A_, 8 - note D_, 8 - note A#, 8 - note D#, 8 + A_ 8 + D_ 8 + A# 8 + D# 8 loopchannel 0, Music_IndigoPlateau_branch_a6c6 Music_IndigoPlateau_branch_a6fe:: octave 4 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note A_, 4 + A_ 4 endchannel Music_IndigoPlateau_Ch4:: ; a70f (2:670f) dspeed 6 - dnote 16, mutedsnare2 - dnote 16, mutedsnare2 - dnote 16, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare2 16 + mutedsnare2 16 + mutedsnare2 16 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 Music_IndigoPlateau_branch_a728:: callchannel Music_IndigoPlateau_branch_a791 @@ -255,68 +255,68 @@ Music_IndigoPlateau_branch_a728:: callchannel Music_IndigoPlateau_branch_a7a8 callchannel Music_IndigoPlateau_branch_a77e callchannel Music_IndigoPlateau_branch_a7a8 - dnote 16, mutedsnare2 - dnote 8, mutedsnare2 - dnote 8, mutedsnare3 - dnote 16, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 + mutedsnare2 16 + mutedsnare2 8 + mutedsnare3 8 + mutedsnare2 16 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 1 loopchannel 0, Music_IndigoPlateau_branch_a728 Music_IndigoPlateau_branch_a77e:: - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare4 - dnote 4, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare4 - dnote 2, mutedsnare4 - dnote 2, mutedsnare3 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare4 4 + mutedsnare3 4 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare4 4 + mutedsnare4 2 + mutedsnare3 2 endchannel Music_IndigoPlateau_branch_a791:: - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare4 - dnote 4, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare4 4 + mutedsnare3 4 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare4 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 endchannel Music_IndigoPlateau_branch_a7a8:: - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 endchannel -; 0xa7c5
\ No newline at end of file +; 0xa7c5 diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index 1297ddf4..d3464680 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -7,86 +7,86 @@ Music_IntroBattle_Ch1:: ; 7f844 (1f:7844) notetype 12, 11, 1 rest 8 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D#, 4 + D# 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 10, 0 - note A#, 4 + A# 4 notetype 12, 11, 1 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 2, 9 octave 3 - note G_, 4 + G_ 4 notetype 12, 11, 0 - note A_, 8 + A_ 8 octave 2 - note A_, 8 + A_ 8 notetype 12, 11, 7 octave 3 - note F_, 8 + F_ 8 notetype 12, 4, 15 octave 2 - note F_, 8 + F_ 8 notetype 12, 11, 1 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D#, 4 + D# 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note F_, 4 + F_ 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note G_, 4 + G_ 4 notetype 12, 11, 0 - note F#, 16 + F# 16 notetype 12, 11, 1 octave 4 - note D_, 16 + D_ 16 endchannel @@ -96,72 +96,72 @@ Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc) notetype 12, 12, 2 rest 8 octave 3 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A_, 4 + A_ 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A#, 4 + A# 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A_, 4 + A_ 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 11, 7 - note C#, 4 + C# 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A_, 4 + A_ 4 notetype 12, 12, 2 octave 3 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 7 octave 4 - note C#, 4 - note D_, 8 + C# 4 + D_ 8 octave 3 - note D_, 8 + D_ 8 octave 4 - note C_, 8 + C_ 8 octave 3 - note C_, 8 + C_ 8 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A_, 4 + A_ 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A#, 4 + A# 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 octave 4 - note C_, 4 + C_ 4 notetype 12, 12, 2 octave 3 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 octave 4 - note C#, 4 + C# 4 notetype 12, 2, 15 - note D_, 16 + D_ 16 notetype 12, 12, 1 octave 5 - note D_, 16 + D_ 16 endchannel @@ -169,162 +169,162 @@ Music_IntroBattle_Ch3:: ; 7f91d (1f:791d) notetype 12, 1, 0 rest 8 octave 4 - note D_, 1 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 4 - note D_, 1 + F# 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A#, 4 - note A_, 8 - note D_, 8 - note A#, 8 - note D_, 8 - note D_, 1 + A# 4 + A_ 8 + D_ 8 + A# 8 + D_ 8 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A#, 4 - note D_, 1 + A# 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A#, 4 - note A_, 16 - note D_, 1 + A# 4 + A_ 16 + D_ 1 rest 15 endchannel Music_IntroBattle_Ch4:: ; 7f95b (1f:795b) dspeed 6 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 16, mutedsnare2 - dnote 16, mutedsnare2 - dnote 16, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 16, mutedsnare2 - dnote 16, mutedsnare2 - dnote 2, mutedsnare2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 16 + mutedsnare2 16 + mutedsnare2 16 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 16 + mutedsnare2 16 + mutedsnare2 2 rest 16 rest 14 endchannel -; 0x7fa19
\ No newline at end of file +; 0x7fa19 diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index 216a3166..8d676150 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -7,17 +7,17 @@ Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d) toggleperfectpitch notetype 13, 6, 7 octave 4 - note E_, 8 + E_ 8 notetype 12, 6, 7 - note B_, 2 - note G#, 6 - note F#, 8 - note G#, 2 - note A_, 6 - note G#, 8 - note F#, 4 - note G#, 4 - note E_, 10 + B_ 2 + G# 6 + F# 8 + G# 2 + A_ 6 + G# 8 + F# 4 + G# 4 + E_ 10 endchannel @@ -27,15 +27,15 @@ Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a) dutycycle 10 notetype 12, 10, 7 octave 4 - note E_, 8 - note B_, 2 - note G#, 6 - note F#, 8 - note G#, 2 - note A_, 6 - note G#, 8 - note F#, 4 - note G#, 4 - note E_, 10 + E_ 8 + B_ 2 + G# 6 + F# 8 + G# 2 + A_ 6 + G# 8 + F# 4 + G# 4 + E_ 10 endchannel -; 0x7fbaf
\ No newline at end of file +; 0x7fbaf diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index b506508a..b2d36593 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -13,48 +13,48 @@ Music_Lavender_Ch1:: ; bb58 (2:7b58) Music_Lavender_branch_bb6b:: octave 3 - note G_, 8 - note G_, 8 - note E_, 8 - note E_, 8 - note G_, 4 - note F#, 4 - note E_, 4 - note B_, 4 - note C#, 8 - note C#, 8 - note G_, 8 - note G_, 8 - note F#, 8 - note F#, 8 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + G_ 8 + G_ 8 + E_ 8 + E_ 8 + G_ 4 + F# 4 + E_ 4 + B_ 4 + C# 8 + C# 8 + G_ 8 + G_ 8 + F# 8 + F# 8 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 4 - note C_, 8 - note C_, 8 + C_ 8 + C_ 8 octave 3 - note G_, 8 - note G_, 8 - note E_, 8 - note E_, 8 - note G_, 4 - note F#, 4 - note E_, 4 - note B_, 4 - note C#, 8 - note C#, 8 - note G_, 8 - note G_, 8 - note F#, 8 - note F#, 8 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - note C_, 8 - note C_, 8 + G_ 8 + G_ 8 + E_ 8 + E_ 8 + G_ 4 + F# 4 + E_ 4 + B_ 4 + C# 8 + C# 8 + G_ 8 + G_ 8 + F# 8 + F# 8 + B_ 4 + G_ 4 + F# 4 + B_ 4 + C_ 8 + C_ 8 rest 16 rest 16 rest 16 @@ -69,10 +69,10 @@ Music_Lavender_Ch2:: ; bb9e (2:7b9e) Music_Lavender_branch_bba5:: octave 5 - note C_, 4 - note G_, 4 - note B_, 4 - note F#, 4 + C_ 4 + G_ 4 + B_ 4 + F# 4 loopchannel 0, Music_Lavender_branch_bba5 @@ -87,102 +87,102 @@ Music_Lavender_Ch3:: ; bbae (2:7bae) Music_Lavender_branch_bbb9:: octave 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 + E_ 4 notetype 12, 3, 5 octave 6 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 notetype 12, 2, 5 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 7 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 4 - note E_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 4 + G_ 4 + F# 4 + B_ 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 + E_ 4 notetype 12, 2, 5 octave 6 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 7 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 8 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 4 - note E_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + E_ 4 + G_ 4 + F# 4 + B_ 4 loopchannel 0, Music_Lavender_branch_bbb9 @@ -194,7 +194,7 @@ Music_Lavender_Ch4:: ; bc21 (2:7c21) rest 16 Music_Lavender_branch_bc26:: - dnote 8, triangle2 - dnote 8, triangle2 + triangle2 8 + triangle2 8 loopchannel 0, Music_Lavender_branch_bc26 -; 0xbc2e
\ No newline at end of file +; 0xbc2e diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index b8266fd7..af4245ba 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -6,18 +6,18 @@ Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d) notetype 12, 11, 1 rest 4 octave 3 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 notetype 12, 4, 15 - note D_, 4 + D_ 4 Music_MeetEvilTrainer_branch_7f6ae:: notetype 12, 10, 1 - note D_, 4 - note D_, 4 - note D_, 4 + D_ 4 + D_ 4 + D_ 4 notetype 12, 7, 0 - note D_, 4 + D_ 4 loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae @@ -25,37 +25,37 @@ Music_MeetEvilTrainer_Ch2:: ; 7f6ba (1f:76ba) duty 1 notetype 12, 11, 6 octave 3 - note B_, 2 - note A#, 2 - note B_, 8 + B_ 2 + A# 2 + B_ 8 Music_MeetEvilTrainer_branch_7f6c2:: notetype 12, 12, 2 octave 4 - note D#, 2 - note D_, 2 - note C#, 2 - note C_, 2 + D# 2 + D_ 2 + C# 2 + C_ 2 octave 3 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 notetype 12, 4, 15 - note A#, 4 + A# 4 notetype 12, 12, 2 - note G_, 2 - note G#, 2 - note A_, 2 - note A#, 2 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 + G_ 2 + G# 2 + A_ 2 + A# 2 + B_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 notetype 12, 3, 15 - note A#, 4 + A# 4 notetype 12, 12, 2 loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 @@ -64,18 +64,18 @@ Music_MeetEvilTrainer_Ch3:: ; 7f6e6 (1f:76e6) notetype 12, 1, 0 rest 8 octave 4 - note F#, 1 + F# 1 rest 1 - note F_, 1 + F_ 1 rest 1 Music_MeetEvilTrainer_branch_7f6ee:: - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note A#, 4 + A# 4 loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee -; 0x7f6f9
\ No newline at end of file +; 0x7f6f9 diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index 69130fb3..35c6ec16 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -5,24 +5,24 @@ Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9) toggleperfectpitch notetype 12, 11, 2 octave 3 - note G#, 6 + G# 6 octave 4 - note E_, 2 - note D#, 2 - note C#, 2 - note C_, 2 + E_ 2 + D# 2 + C# 2 + C_ 2 notetype 12, 8, 1 Music_MeetFemaleTrainer_branch_7f70c:: octave 3 - note E_, 4 + E_ 4 loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c - note E_, 4 + E_ 4 octave 2 - note B_, 4 - note B_, 4 + B_ 4 + B_ 4 octave 3 - note E_, 4 + E_ 4 loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c @@ -30,44 +30,44 @@ Music_MeetFemaleTrainer_Ch2:: ; 7f71c (1f:771c) duty 2 notetype 12, 12, 2 octave 3 - note B_, 2 + B_ 2 notetype 12, 12, 7 octave 4 - note B_, 12 + B_ 12 Music_MeetFemaleTrainer_branch_7f726:: notetype 12, 12, 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note D#, 4 - note E_, 4 - note D#, 4 - note C#, 2 - note C_, 2 + D# 4 + E_ 4 + D# 4 + C# 2 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note A#, 2 + B_ 2 + A_ 2 + G# 2 + A_ 2 + A# 2 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 + B_ 4 + A_ 4 + G# 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + F# 2 + G# 2 + A_ 2 loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 @@ -75,45 +75,45 @@ Music_MeetFemaleTrainer_Ch3:: ; 7f74b (1f:774b) notetype 12, 1, 0 rest 8 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 Music_MeetFemaleTrainer_branch_7f756:: callchannel Music_MeetFemaleTrainer_branch_7f770 - note G#, 1 + G# 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note E_, 1 + E_ 1 rest 3 callchannel Music_MeetFemaleTrainer_branch_7f770 - note G#, 1 + G# 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note B_, 1 + B_ 1 rest 3 loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 Music_MeetFemaleTrainer_branch_7f770:: - note G#, 1 + G# 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 endchannel -; 0x7f77b
\ No newline at end of file +; 0x7f77b diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index f3b19ab5..8a937fc3 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -6,29 +6,29 @@ Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b) toggleperfectpitch notetype 12, 11, 4 octave 3 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 12 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 12 rest 16 Music_MeetMaleTrainer_branch_7f78f:: octave 3 - note B_, 4 - note A_, 4 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note F#, 4 - note E_, 6 - note F_, 2 - note F#, 4 - note G_, 8 - octave 4 - note D_, 8 - note E_, 16 + B_ 4 + A_ 4 + G# 2 + F# 2 + E_ 2 + D# 2 + F# 4 + E_ 6 + F_ 2 + F# 4 + G_ 8 + octave 4 + D_ 8 + E_ 16 loopchannel 0, Music_MeetMaleTrainer_branch_7f78f @@ -37,41 +37,41 @@ Music_MeetMaleTrainer_Ch2:: ; 7f7a2 (1f:77a2) vibrato 24, 2, 2 notetype 12, 12, 4 octave 4 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 + E_ 1 + D# 1 + D_ 1 + C# 1 octave 3 - note B_, 12 + B_ 12 rest 2 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 9 Music_MeetMaleTrainer_branch_7f7b5:: notetype 12, 12, 4 octave 4 - note E_, 6 - note D#, 6 - note C#, 4 + E_ 6 + D# 6 + C# 4 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - octave 4 - note C#, 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + B_ 2 + octave 4 + C# 2 notetype 12, 12, 7 - note F_, 16 + F_ 16 notetype 12, 12, 5 octave 3 - note F#, 8 + F# 8 octave 4 - note C#, 8 + C# 8 loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 @@ -79,113 +79,113 @@ Music_MeetMaleTrainer_Ch3:: ; 7f7d2 (1f:77d2) notetype 12, 1, 0 rest 6 octave 4 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F#, 1 + F# 1 rest 1 Music_MeetMaleTrainer_branch_7f7ea:: - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 1 + D_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 1 + D_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 1 + D_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 1 + D_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea -; 0x7f844
\ No newline at end of file +; 0x7f844 diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index 35d4ccdb..e095557d 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -5,72 +5,72 @@ Music_MeetProfOak_Ch1:: ; af59 (2:6f59) toggleperfectpitch notetype 12, 11, 4 octave 3 - note F#, 1 - note B_, 1 + F# 1 + B_ 1 octave 4 - note D#, 1 - note E_, 1 - note F#, 12 + D# 1 + E_ 1 + F# 12 notetype 12, 10, 2 octave 3 - note E_, 6 - note B_, 10 - note E_, 6 - note B_, 10 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note B_, 10 - note E_, 6 - note B_, 10 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 + E_ 6 + B_ 10 + E_ 6 + B_ 10 + E_ 6 + D# 4 + F# 2 + F# 4 + E_ 6 + D# 4 + F# 2 + F# 4 + E_ 6 + B_ 10 + E_ 6 + B_ 10 + E_ 6 + D# 4 + F# 2 + F# 4 + E_ 6 + D# 4 + F# 2 + F# 4 Music_MeetProfOak_branch_af85:: - note F#, 6 - note E_, 4 - note A_, 2 - note A_, 4 - note F#, 6 - note E_, 4 - note A_, 2 - note A_, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 + F# 6 + E_ 4 + A_ 2 + A_ 4 + F# 6 + E_ 4 + A_ 2 + A_ 4 + F# 6 + E_ 4 + G# 2 + G# 4 + F# 6 + E_ 4 + G# 2 + G# 4 + E_ 6 + D# 4 + F# 2 + F# 4 + E_ 6 + D# 4 + F# 2 + F# 4 + F# 6 + E_ 4 + G# 2 + G# 4 + F# 6 + E_ 4 + G# 2 + G# 4 loopchannel 0, Music_MeetProfOak_branch_af85 @@ -79,132 +79,132 @@ Music_MeetProfOak_Ch2:: ; afa9 (2:6fa9) duty 2 notetype 12, 12, 4 octave 3 - note B_, 1 + B_ 1 octave 4 - note D#, 1 - note F#, 1 - note A#, 1 - note B_, 12 + D# 1 + F# 1 + A# 1 + B_ 12 notetype 12, 11, 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 + C# 2 + D# 2 + E_ 4 + D# 2 + C# 4 notetype 12, 6, 4 octave 4 - note B_, 2 + B_ 2 octave 5 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 + C# 2 + D# 2 + E_ 4 + D# 2 + C# 4 notetype 12, 11, 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 4 + B_ 2 + B_ 4 notetype 12, 8, 1 octave 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 4 + B_ 2 + B_ 4 notetype 12, 11, 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 + C# 2 + D# 2 + E_ 4 + D# 2 + C# 4 notetype 12, 6, 4 octave 4 - note B_, 2 + B_ 2 octave 5 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 + C# 2 + D# 2 + E_ 4 + D# 2 + C# 4 notetype 12, 11, 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 4 + B_ 2 + B_ 4 notetype 12, 8, 1 octave 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 4 + B_ 2 + B_ 4 notetype 12, 11, 5 Music_MeetProfOak_branch_b005:: octave 4 - note C#, 6 + C# 6 octave 3 - note A_, 1 + A_ 1 octave 4 - note C#, 1 - note E_, 6 - note C#, 1 - note E_, 1 - note F#, 4 - note E_, 4 - note D#, 4 - note C#, 4 + C# 1 + E_ 6 + C# 1 + E_ 1 + F# 4 + E_ 4 + D# 4 + C# 4 octave 3 - note B_, 6 - note G#, 1 - note B_, 1 + B_ 6 + G# 1 + B_ 1 octave 4 - note E_, 8 + E_ 8 notetype 12, 6, 5 octave 4 - note B_, 6 - note G#, 1 - note B_, 1 + B_ 6 + G# 1 + B_ 1 octave 5 - note E_, 8 + E_ 8 notetype 12, 11, 5 octave 3 - note A_, 6 - note F#, 1 - note A_, 1 + A_ 6 + F# 1 + A_ 1 octave 4 - note D#, 8 - note E_, 4 - note D#, 4 - note C#, 4 - note C_, 4 + D# 8 + E_ 4 + D# 4 + C# 4 + C_ 4 octave 3 - note B_, 6 - note G#, 1 - note B_, 1 + B_ 6 + G# 1 + B_ 1 octave 4 - note E_, 6 + E_ 6 octave 3 - note B_, 1 + B_ 1 octave 4 - note E_, 1 + E_ 1 notetype 12, 11, 7 - note G#, 16 + G# 16 loopchannel 0, Music_MeetProfOak_branch_b005 @@ -212,213 +212,213 @@ Music_MeetProfOak_Ch3:: ; b03d (2:703d) notetype 12, 1, 2 rest 10 octave 4 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 5 octave 5 - note E_, 4 + E_ 4 rest 6 octave 4 - note B_, 1 + B_ 1 rest 5 octave 5 - note E_, 4 + E_ 4 octave 4 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G#, 1 + G# 1 rest 1 Music_MeetProfOak_branch_b0bc:: octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 loopchannel 2, Music_MeetProfOak_branch_b0bc Music_MeetProfOak_branch_b0d8:: octave 4 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 loopchannel 2, Music_MeetProfOak_branch_b0d8 Music_MeetProfOak_branch_b0ed:: - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 loopchannel 2, Music_MeetProfOak_branch_b0ed Music_MeetProfOak_branch_b101:: - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 loopchannel 2, Music_MeetProfOak_branch_b101 loopchannel 0, Music_MeetProfOak_branch_b0bc -; 0xb119
\ No newline at end of file +; 0xb119 diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index 8d956626..fb138e61 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -12,111 +12,111 @@ Music_MeetRival_branch_b123:: toggleperfectpitch notetype 12, 11, 3 octave 4 - note D_, 1 - note C#, 1 - note C_, 1 + D_ 1 + C# 1 + C_ 1 octave 3 - note B_, 1 - note A#, 2 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 6 - note D_, 1 + B_ 1 + A# 2 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 6 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 5 - note A_, 2 - note G_, 2 - note A_, 2 + A_ 2 + G_ 2 + A_ 2 Music_MeetRival_branch_b140:: - note B_, 4 - note A#, 2 - note A_, 4 - note G_, 2 + B_ 4 + A# 2 + A_ 4 + G_ 2 octave 4 - note C_, 4 - note D_, 2 + C_ 4 + D_ 2 rest 4 - note D_, 4 - note C#, 2 - note C_, 2 + D_ 4 + C# 2 + C_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 4 - note E_, 2 - note D_, 4 - note C_, 2 + C_ 4 + E_ 2 + D_ 4 + C_ 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 2 + C_ 2 rest 4 - note G_, 4 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note F#, 2 + G_ 4 + G_ 2 + F# 2 + E_ 2 + D_ 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note D_, 2 - note F#, 2 + D_ 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note D_, 2 + D_ 2 octave 3 - note D_, 2 + D_ 2 octave 4 - note D_, 2 + D_ 2 rest 2 octave 3 - note D_, 2 + D_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 4 - note C_, 2 - note F_, 2 + C_ 2 + F_ 2 octave 3 - note G_, 2 + G_ 2 octave 4 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 + C_ 2 + F_ 2 + D# 2 + C_ 2 octave 3 - note A#, 2 - note G_, 2 + A# 2 + G_ 2 rest 4 - note A#, 4 + A# 4 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note C_, 2 + C_ 2 notetype 12, 11, 7 octave 3 - note G_, 4 - note D_, 2 - note F_, 6 - note F#, 4 - note D_, 2 + G_ 4 + D_ 2 + F_ 6 + F# 4 + D_ 2 rest 4 - note D_, 4 + D_ 4 notetype 12, 11, 3 - note A_, 2 - note G_, 2 - note A_, 2 + A_ 2 + G_ 2 + A_ 2 loopchannel 0, Music_MeetRival_branch_b140 Music_MeetRival_branch_b19b:: @@ -133,13 +133,13 @@ Music_MeetRival_branch_b1a5:: toggleperfectpitch notetype 12, 11, 3 octave 3 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 5 - note A_, 2 - note G_, 2 - note A_, 2 + A_ 2 + G_ 2 + A_ 2 loopchannel 0, Music_MeetRival_branch_b140 @@ -148,86 +148,86 @@ Music_MeetRival_Ch2:: ; b1bb (2:71bb) vibrato 10, 2, 6 notetype 12, 12, 7 octave 4 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 2 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 6 + B_ 1 + A# 1 + A_ 1 + G# 1 + G_ 2 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 6 octave 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note D_, 1 + D_ 1 rest 1 octave 4 - note D_, 2 - note F_, 2 - note F#, 2 + D_ 2 + F_ 2 + F# 2 Music_MeetRival_branch_b1d8:: notetype 12, 12, 7 - note G_, 4 - note D_, 2 - note F_, 6 - note F#, 4 - note G_, 2 + G_ 4 + D_ 2 + F_ 6 + F# 4 + G_ 2 rest 4 - note G_, 4 - note G_, 2 - note A#, 2 - note B_, 2 + G_ 4 + G_ 2 + A# 2 + B_ 2 octave 5 - note C_, 4 + C_ 4 octave 4 - note G_, 2 - note A#, 6 - note B_, 4 + G_ 2 + A# 6 + B_ 4 octave 5 - note C_, 2 + C_ 2 rest 4 - note C_, 4 - note C_, 2 + C_ 4 + C_ 2 octave 4 - note B_, 2 + B_ 2 octave 5 - note C_, 2 + C_ 2 notetype 12, 11, 0 - note D_, 16 + D_ 16 notetype 12, 11, 5 - note D_, 6 + D_ 6 notetype 12, 12, 7 - note F_, 4 - note D_, 2 - note C_, 2 - note D_, 2 + F_ 4 + D_ 2 + C_ 2 + D_ 2 notetype 12, 11, 0 - note C_, 8 + C_ 8 notetype 12, 12, 7 - note C_, 8 + C_ 8 octave 4 - note C_, 2 + C_ 2 rest 4 - note A#, 4 - note G_, 2 - note F_, 2 + A# 4 + G_ 2 + F_ 2 notetype 12, 11, 0 - note G_, 16 + G_ 16 notetype 12, 11, 3 - note G_, 2 + G_ 2 octave 3 - note G_, 2 + G_ 2 rest 4 - note G_, 4 + G_ 4 octave 4 - note D_, 2 - note F_, 2 - note F#, 2 + D_ 2 + F_ 2 + F# 2 loopchannel 0, Music_MeetRival_branch_b1d8 Music_MeetRival_branch_b21d:: @@ -235,163 +235,163 @@ Music_MeetRival_branch_b21d:: vibrato 10, 2, 6 notetype 12, 12, 7 octave 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note D_, 1 + D_ 1 rest 1 octave 4 - note D_, 2 - note F_, 2 - note F#, 2 + D_ 2 + F_ 2 + F# 2 loopchannel 0, Music_MeetRival_branch_b1d8 Music_MeetRival_Ch3:: ; b233 (2:7233) notetype 12, 1, 4 octave 5 - note D_, 2 + D_ 2 rest 2 - note C#, 2 + C# 2 rest 2 - note C_, 2 + C_ 2 rest 2 octave 4 - note B_, 2 + B_ 2 rest 2 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 Music_MeetRival_branch_b24b:: - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 rest 4 octave 5 - note D_, 4 + D_ 4 octave 4 - note G_, 2 - note A#, 2 - note B_, 2 - note G_, 2 + G_ 2 + A# 2 + B_ 2 + G_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 octave 5 - note C_, 2 + C_ 2 rest 4 - note C_, 4 - note C_, 2 + C_ 4 + C_ 2 octave 4 - note B_, 2 - note A_, 2 - note F#, 2 - note A_, 2 + B_ 2 + A_ 2 + F# 2 + A_ 2 rest 2 - note F#, 2 - note A_, 2 - note F#, 2 + F# 2 + A_ 2 + F# 2 rest 2 - note A_, 2 - note F#, 2 - note A_, 2 + A_ 2 + F# 2 + A_ 2 rest 2 - note F#, 2 - note A_, 2 - note F#, 2 + F# 2 + A_ 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note A_, 2 - note E_, 2 + A_ 2 + E_ 2 octave 5 - note C_, 2 + C_ 2 rest 2 octave 4 - note E_, 2 + E_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note E_, 2 - note F_, 2 - note G_, 2 - note E_, 2 + E_ 2 + F_ 2 + G_ 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note B_, 2 - note A#, 2 - note A_, 2 - note G_, 2 - note A#, 2 + B_ 2 + A# 2 + A_ 2 + G_ 2 + A# 2 rest 2 - note G_, 2 - note A#, 2 - note G_, 2 + G_ 2 + A# 2 + G_ 2 rest 2 - note A#, 2 - note G_, 2 + A# 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 octave 5 - note D_, 2 + D_ 2 loopchannel 0, Music_MeetRival_branch_b24b Music_MeetRival_branch_b2b5:: notetype 12, 1, 4 octave 4 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 loopchannel 0, Music_MeetRival_branch_b24b -; 0xb2c8
\ No newline at end of file +; 0xb2c8 diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index 083222c0..533ac343 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -5,52 +5,52 @@ Music_MuseumGuy_Ch1:: ; adae (2:6dae) toggleperfectpitch notetype 12, 11, 1 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 + B_ 2 + A_ 2 + G# 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + D# 2 octave 2 - note B_, 4 - note B_, 1 + B_ 4 + B_ 1 octave 3 - note D#, 1 - note E_, 1 - note G#, 1 - note B_, 10 + D# 1 + E_ 1 + G# 1 + B_ 10 callchannel Music_MuseumGuy_branch_ade7 callchannel Music_MuseumGuy_branch_adec callchannel Music_MuseumGuy_branch_ade7 - note E_, 4 - note E_, 4 - note E_, 2 - note E_, 6 + E_ 4 + E_ 4 + E_ 2 + E_ 6 Music_MuseumGuy_branch_add6:: callchannel Music_MuseumGuy_branch_ade7 callchannel Music_MuseumGuy_branch_adec callchannel Music_MuseumGuy_branch_ade7 - note E_, 4 - note E_, 4 - note E_, 2 - note E_, 6 + E_ 4 + E_ 4 + E_ 2 + E_ 6 loopchannel 0, Music_MuseumGuy_branch_add6 Music_MuseumGuy_branch_ade7:: - note E_, 2 - note E_, 6 - note F#, 2 - note F#, 6 + E_ 2 + E_ 6 + F# 2 + F# 6 endchannel Music_MuseumGuy_branch_adec:: - note E_, 2 - note E_, 6 - note D_, 2 - note D_, 6 + E_ 2 + E_ 6 + D_ 2 + D_ 6 endchannel @@ -58,110 +58,110 @@ Music_MuseumGuy_Ch2:: ; adf1 (2:6df1) duty 2 notetype 12, 12, 1 octave 4 - note E_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 + E_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note E_, 4 - note E_, 1 - note G#, 1 - note B_, 1 + B_ 2 + A_ 2 + G# 2 + E_ 4 + E_ 1 + G# 1 + B_ 1 octave 4 - note D#, 1 - note E_, 8 + D# 1 + E_ 8 octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 - note E_, 4 - note D_, 2 - note F#, 2 - note A_, 4 + C# 2 + E_ 4 + D_ 2 + F# 2 + A_ 4 octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 - note E_, 4 - note D_, 2 - note C#, 2 + C# 2 + E_ 4 + D_ 2 + C# 2 octave 3 - note B_, 4 - note A_, 2 + B_ 4 + A_ 2 octave 4 - note C#, 2 - note E_, 4 - note D_, 2 - note F#, 2 - note A_, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note A_, 2 - note A_, 4 + C# 2 + E_ 4 + D_ 2 + F# 2 + A_ 2 + A_ 2 + G# 2 + E_ 2 + F# 2 + G# 2 + A_ 2 + A_ 2 + A_ 4 Music_MuseumGuy_branch_ae26:: octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 - note E_, 3 + C# 2 + E_ 3 notetype 12, 8, 1 - note E_, 1 + E_ 1 notetype 12, 12, 1 - note D_, 2 - note F#, 2 - note A_, 3 + D_ 2 + F# 2 + A_ 3 notetype 12, 9, 1 - note A_, 1 + A_ 1 notetype 12, 12, 1 octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 - note E_, 4 - note D_, 1 - note C#, 1 - note C_, 1 + C# 2 + E_ 4 + D_ 1 + C# 1 + C_ 1 octave 3 - note B_, 1 - note B_, 3 + B_ 1 + B_ 3 notetype 12, 10, 1 - note G#, 1 + G# 1 notetype 12, 12, 1 - note A_, 2 + A_ 2 octave 4 - note C#, 2 - note E_, 3 + C# 2 + E_ 3 notetype 12, 9, 1 - note E_, 1 + E_ 1 notetype 12, 12, 1 - note D_, 2 - note F#, 2 - note A_, 3 + D_ 2 + F# 2 + A_ 3 notetype 12, 8, 1 - note A_, 1 + A_ 1 notetype 12, 12, 1 - note G#, 2 - note E_, 1 + G# 2 + E_ 1 notetype 12, 8, 1 - note E_, 1 + E_ 1 notetype 12, 12, 1 - note F#, 2 + F# 2 notetype 12, 8, 1 - note F#, 1 + F# 1 notetype 12, 12, 1 - note G#, 1 - note A_, 2 - note A_, 2 - note A_, 4 + G# 1 + A_ 2 + A_ 2 + A_ 4 loopchannel 0, Music_MuseumGuy_branch_ae26 @@ -169,95 +169,95 @@ Music_MuseumGuy_Ch3:: ; ae6e (2:6e6e) notetype 12, 1, 0 rest 16 octave 4 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 9 callchannel Music_MuseumGuy_branch_aeb8 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 5 - note G#, 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 5 callchannel Music_MuseumGuy_branch_aeb8 - note B_, 1 + B_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 Music_MuseumGuy_branch_ae8e:: callchannel Music_MuseumGuy_branch_aec1 rest 3 octave 6 - note E_, 1 + E_ 1 rest 1 octave 5 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 callchannel Music_MuseumGuy_branch_aec1 rest 1 octave 6 - note E_, 1 + E_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 loopchannel 0, Music_MuseumGuy_branch_ae8e Music_MuseumGuy_branch_aeb8:: - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 5 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 5 endchannel Music_MuseumGuy_branch_aec1:: octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 octave 6 - note F#, 1 + F# 1 rest 1 octave 5 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 endchannel @@ -270,69 +270,69 @@ Music_MuseumGuy_Ch4:: ; aed1 (2:6ed1) rest 16 rest 14 dspeed 6 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 Music_MuseumGuy_branch_aee1:: - dnote 4, mutedsnare2 - dnote 6, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 6, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 4, mutedsnare2 - dnote 6, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 6, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 2, mutedsnare2 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 6, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare2 4 + mutedsnare2 6 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 6 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 4 + mutedsnare2 6 + mutedsnare2 2 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 6 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 2 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 6 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 loopchannel 0, Music_MuseumGuy_branch_aee1 -; 0xaf59
\ No newline at end of file +; 0xaf59 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 92ed2be4..51c6cbf6 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -6,66 +6,66 @@ Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9) toggleperfectpitch notetype 12, 11, 3 octave 2 - note B_, 1 + B_ 1 octave 3 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 - note B_, 1 + C# 1 + D_ 1 + E_ 1 + F# 1 + G# 1 + A_ 1 + B_ 1 Music_OaksLab_branch_7eed0:: octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 4 - note G#, 2 - note A_, 2 - note B_, 1 + A_ 4 + G# 2 + A_ 2 + B_ 1 rest 3 - note A_, 6 - note G#, 1 - note B_, 1 + A_ 6 + G# 1 + B_ 1 octave 4 - note C#, 4 + C# 4 octave 3 - note A_, 4 - note G#, 2 - note A_, 2 - note F#, 4 - note E_, 2 - note F#, 2 - note G#, 1 + A_ 4 + G# 2 + A_ 2 + F# 4 + E_ 2 + F# 2 + G# 1 rest 3 - note F#, 8 - note E_, 4 - note A_, 6 - note E_, 1 - note A_, 1 + F# 8 + E_ 4 + A_ 6 + E_ 1 + A_ 1 octave 4 - note D_, 8 - note C#, 6 + D_ 8 + C# 6 octave 3 - note A_, 1 + A_ 1 octave 4 - note C#, 1 - note E_, 8 - note D_, 4 - note C#, 4 + C# 1 + E_ 8 + D_ 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 - note G#, 1 + B_ 4 + A_ 4 + G# 1 rest 3 - note E_, 4 - note F#, 4 - note G#, 4 + E_ 4 + F# 4 + G# 4 loopchannel 0, Music_OaksLab_branch_7eed0 @@ -74,72 +74,72 @@ Music_OaksLab_Ch2:: ; 7ef05 (1f:6f05) vibrato 10, 2, 5 notetype 12, 12, 4 octave 3 - note G#, 1 - note A_, 1 - note B_, 1 + G# 1 + A_ 1 + B_ 1 octave 4 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note G#, 1 + C# 1 + D_ 1 + E_ 1 + F# 1 + G# 1 Music_OaksLab_branch_7ef16:: - note A_, 6 - note G#, 1 - note F#, 1 - note E_, 6 - note D#, 1 - note E_, 1 - note F#, 1 + A_ 6 + G# 1 + F# 1 + E_ 6 + D# 1 + E_ 1 + F# 1 rest 3 - note E_, 8 - note E_, 4 - note F#, 6 - note E_, 1 - note D_, 1 - note C#, 6 + E_ 8 + E_ 4 + F# 6 + E_ 1 + D_ 1 + C# 6 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 - note D_, 1 + C# 1 + D_ 1 rest 3 - note C#, 8 - note C#, 4 - note D_, 6 + C# 8 + C# 4 + D_ 6 octave 3 - note A_, 1 + A_ 1 octave 4 - note D_, 1 - note F#, 8 - note E_, 6 - note C#, 1 - note E_, 1 - note A_, 8 - note G#, 4 - note A_, 2 - note G#, 2 - note F#, 4 - note G#, 2 - note F#, 2 - note E_, 1 + D_ 1 + F# 8 + E_ 6 + C# 1 + E_ 1 + A_ 8 + G# 4 + A_ 2 + G# 2 + F# 4 + G# 2 + F# 2 + E_ 1 rest 1 octave 3 - note G#, 1 + G# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 loopchannel 0, Music_OaksLab_branch_7ef16 @@ -148,247 +148,247 @@ Music_OaksLab_Ch3:: ; 7ef52 (1f:6f52) notetype 12, 1, 1 rest 2 octave 4 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 Music_OaksLab_branch_7ef5c:: - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note C#, 1 + C# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note C#, 1 + C# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 5 - note G#, 1 + G# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note C#, 1 + C# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note C#, 1 + C# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note E_, 1 + E_ 1 rest 3 loopchannel 0, Music_OaksLab_branch_7ef5c -; 0x7f04a
\ No newline at end of file +; 0x7f04a diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 1a185d72..71be9eb1 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -6,144 +6,144 @@ Music_PalletTown_Ch1:: ; a7c5 (2:67c5) Music_PalletTown_branch_a7ce:: octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 2 - note D_, 4 - note G_, 2 - note D_, 2 - note C_, 2 + C_ 2 + D_ 4 + G_ 2 + D_ 2 + C_ 2 octave 3 - note B_, 4 - note G_, 2 + B_ 4 + G_ 2 octave 4 - note D_, 4 - note D_, 2 - note C_, 2 + D_ 4 + D_ 2 + C_ 2 octave 3 - note B_, 2 + B_ 2 rest 2 - note B_, 2 + B_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 8 + C_ 8 rest 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note A_, 2 - note B_, 2 - note G_, 2 - note A_, 2 - note F#, 2 - note B_, 4 + A_ 2 + B_ 2 + G_ 2 + A_ 2 + F# 2 + B_ 4 octave 4 - note C_, 2 - note D_, 4 - note G_, 2 - note D_, 2 - note C_, 2 + C_ 2 + D_ 4 + G_ 2 + D_ 2 + C_ 2 octave 3 - note B_, 4 - note G_, 2 + B_ 4 + G_ 2 octave 4 - note D_, 4 - note D_, 2 - note G_, 2 - note F#, 2 - note E_, 4 - note D_, 2 - note C_, 4 + D_ 4 + D_ 2 + G_ 2 + F# 2 + E_ 4 + D_ 2 + C_ 4 octave 3 - note A_, 2 - note B_, 2 + A_ 2 + B_ 2 octave 4 - note C_, 2 - note D_, 2 - note C_, 2 + C_ 2 + D_ 2 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note G_, 4 - note F#, 4 + B_ 2 + A_ 2 + G_ 4 + F# 4 octave 4 - note C_, 2 + C_ 2 octave 3 - note G_, 2 - note E_, 2 - note G_, 2 + G_ 2 + E_ 2 + G_ 2 octave 4 - note D_, 2 + D_ 2 octave 3 - note A_, 2 - note F#, 2 - note A_, 2 + A_ 2 + F# 2 + A_ 2 notetype 12, 11, 3 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 + B_ 2 + G_ 2 + D_ 2 + G_ 2 + B_ 2 + G_ 2 + D_ 2 + G_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G_, 2 - note E_, 2 - note G_, 2 + G_ 2 + E_ 2 + G_ 2 octave 4 - note D_, 2 + D_ 2 octave 3 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note F#, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note G_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note F#, 2 - note D_, 2 - note C_, 2 - note D_, 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + G_ 2 + D_ 2 + G_ 2 + B_ 2 + G_ 2 + D_ 2 + G_ 2 + A_ 2 + E_ 2 + C_ 2 + E_ 2 + A_ 2 + E_ 2 + C_ 2 + E_ 2 + A_ 2 + E_ 2 + C_ 2 + E_ 2 + A_ 2 + E_ 2 + C_ 2 + E_ 2 + F# 2 + D_ 2 + C_ 2 + D_ 2 + G_ 2 + E_ 2 + C_ 2 + E_ 2 + G_ 2 + E_ 2 + C_ 2 + E_ 2 + F# 2 + D_ 2 + C_ 2 + D_ 2 loopchannel 0, Music_PalletTown_branch_a7ce endchannel @@ -154,110 +154,110 @@ Music_PalletTown_Ch2:: ; a85f (2:685f) Music_PalletTown_branch_a861:: notetype 12, 13, 3 octave 5 - note D_, 2 + D_ 2 notetype 12, 10, 3 - note C_, 2 + C_ 2 notetype 12, 13, 3 octave 4 - note B_, 2 + B_ 2 notetype 12, 11, 3 - note A_, 2 + A_ 2 notetype 12, 13, 3 octave 5 - note G_, 2 + G_ 2 notetype 12, 11, 3 - note E_, 2 + E_ 2 notetype 12, 13, 3 - note F#, 2 - note E_, 2 - note D_, 6 + F# 2 + E_ 2 + D_ 6 octave 4 - note B_, 2 - note G_, 2 - note G_, 2 - note A_, 2 - note B_, 2 + B_ 2 + G_ 2 + G_ 2 + A_ 2 + B_ 2 octave 5 - note C_, 10 + C_ 10 octave 4 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 6 + F# 2 + G_ 2 + A_ 2 + B_ 6 octave 5 - note C_, 1 + C_ 1 octave 4 - note B_, 1 - note A_, 8 + B_ 1 + A_ 8 octave 5 - note D_, 2 + D_ 2 notetype 12, 10, 3 - note C_, 2 + C_ 2 notetype 12, 13, 3 octave 4 - note B_, 2 + B_ 2 notetype 12, 11, 3 octave 5 - note D_, 2 + D_ 2 notetype 12, 13, 3 - note G_, 2 + G_ 2 notetype 12, 10, 3 - note F#, 2 + F# 2 notetype 12, 11, 3 - note F#, 2 + F# 2 notetype 12, 13, 3 - note G_, 2 - note E_, 6 - note D_, 2 - note D_, 8 - note C_, 2 + G_ 2 + E_ 6 + D_ 2 + D_ 8 + C_ 2 octave 4 - note B_, 2 - note A_, 2 - note G_, 2 + B_ 2 + A_ 2 + G_ 2 octave 5 - note D_, 2 - note C_, 2 + D_ 2 + C_ 2 octave 4 - note B_, 2 - note A_, 2 - note G_, 10 - note G_, 2 - note A_, 2 - note B_, 2 + B_ 2 + A_ 2 + G_ 10 + G_ 2 + A_ 2 + B_ 2 octave 5 - note C_, 8 - note D_, 6 - note C_, 2 + C_ 8 + D_ 6 + C_ 2 octave 4 - note B_, 8 + B_ 8 rest 2 - note G_, 2 - note A_, 2 - note B_, 2 + G_ 2 + A_ 2 + B_ 2 octave 5 - note C_, 4 - note C_, 4 - note D_, 6 - note C_, 1 - note D_, 1 + C_ 4 + C_ 4 + D_ 6 + C_ 1 + D_ 1 octave 4 - note B_, 8 + B_ 8 rest 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 8 - note E_, 4 - note B_, 4 - note A_, 8 - note G_, 4 - note E_, 4 - note F#, 8 - note G_, 4 - note B_, 4 - note B_, 8 - note A_, 8 + B_ 2 + A_ 2 + G_ 2 + A_ 8 + E_ 4 + B_ 4 + A_ 8 + G_ 4 + E_ 4 + F# 8 + G_ 4 + B_ 4 + B_ 8 + A_ 8 loopchannel 0, Music_PalletTown_branch_a861 endchannel @@ -268,48 +268,48 @@ Music_PalletTown_Ch3:: ; a8de (2:68de) Music_PalletTown_branch_a8e3:: octave 4 - note G_, 6 - note E_, 6 - note F#, 4 - note G_, 6 - note A_, 6 - note G_, 4 - note E_, 6 - note F#, 6 - note E_, 4 - note G_, 6 - note E_, 6 - note D_, 4 - note G_, 6 - note E_, 6 - note F#, 4 - note G_, 6 - note A_, 6 - note G_, 4 - note E_, 6 - note F#, 6 - note A_, 4 - note G_, 6 - note E_, 6 - note D_, 4 - note C_, 8 - note D_, 8 - note G_, 8 - note E_, 4 - note D_, 4 - note C_, 8 - note D_, 8 - note G_, 8 - note A_, 4 - note G_, 4 - note E_, 8 - note A_, 8 - note E_, 8 - note G_, 8 - note F#, 8 - note E_, 8 - note E_, 8 - note F#, 8 + G_ 6 + E_ 6 + F# 4 + G_ 6 + A_ 6 + G_ 4 + E_ 6 + F# 6 + E_ 4 + G_ 6 + E_ 6 + D_ 4 + G_ 6 + E_ 6 + F# 4 + G_ 6 + A_ 6 + G_ 4 + E_ 6 + F# 6 + A_ 4 + G_ 6 + E_ 6 + D_ 4 + C_ 8 + D_ 8 + G_ 8 + E_ 4 + D_ 4 + C_ 8 + D_ 8 + G_ 8 + A_ 4 + G_ 4 + E_ 8 + A_ 8 + E_ 8 + G_ 8 + F# 8 + E_ 8 + E_ 8 + F# 8 loopchannel 0, Music_PalletTown_branch_a8e3 endchannel -; 0xa913
\ No newline at end of file +; 0xa913 diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index 61e7fea8..24247326 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -6,16 +6,16 @@ Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3) notetype 12, 8, 1 rest 2 pitchbend 0, 75 - note B_, 2 + B_ 2 pitchbend 0, 84 - note B_, 2 + B_ 2 pitchbend 0, 68 - note E_, 2 + E_ 2 rest 4 pitchbend 0, 59 - note E_, 4 + E_ 4 pitchbend 0, 75 - note B_, 4 + B_ 4 endchannel @@ -23,26 +23,26 @@ Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4) duty 2 notetype 12, 12, 3 octave 4 - note B_, 4 - note B_, 4 - note B_, 2 - note G#, 2 + B_ 4 + B_ 4 + B_ 2 + G# 2 notetype 12, 12, 4 octave 5 - note E_, 8 + E_ 8 endchannel Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2) notetype 12, 1, 0 octave 4 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 - note G#, 2 - note E_, 6 + E_ 2 + G# 2 + E_ 6 rest 2 endchannel -; 0x9bde
\ No newline at end of file +; 0x9bde diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index 5c74592e..de6e0873 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -8,144 +8,144 @@ Music_Pokecenter_Ch1:: ; be56 (2:7e56) Music_Pokecenter_branch_be61:: notetype 12, 10, 3 octave 3 - note F#, 2 - note F_, 2 - note F#, 2 + F# 2 + F_ 2 + F# 2 notetype 12, 11, 5 octave 4 - note D_, 4 - note C#, 2 + D_ 4 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 + B_ 2 + A_ 2 + B_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 notetype 12, 10, 3 - note A_, 2 - note E_, 2 - note A_, 2 + A_ 2 + E_ 2 + A_ 2 notetype 12, 11, 5 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note A_, 2 - note B_, 2 + B_ 2 + A_ 2 + G_ 2 + F# 2 + A_ 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note C#, 2 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 notetype 12, 10, 3 - note F#, 2 - note F_, 2 - note F#, 2 + F# 2 + F_ 2 + F# 2 notetype 12, 11, 5 octave 4 - note D_, 4 - note C#, 2 + D_ 4 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 + B_ 2 + A_ 2 + B_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 notetype 12, 10, 3 - note A_, 2 - note E_, 2 - note A_, 2 + A_ 2 + E_ 2 + A_ 2 notetype 12, 11, 5 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note F#, 2 - note E_, 2 - note D_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 4 - note C#, 2 - note D_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note A_, 8 + B_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 + B_ 2 + F# 2 + E_ 2 + D_ 4 + E_ 2 + F# 2 + G_ 2 + A_ 2 + B_ 2 + A_ 2 + G_ 4 + E_ 2 + F# 2 + G_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 4 + C# 2 + D_ 2 + E_ 2 + G_ 2 + F# 2 + G_ 2 + A_ 2 + B_ 2 + A_ 8 octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 4 - note A_, 2 - note B_, 2 + B_ 4 + A_ 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note E_, 2 - note D_, 2 - note C#, 4 + C# 2 + D_ 2 + E_ 2 + D_ 2 + C# 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note E_, 2 - note C#, 2 + C# 2 + D_ 2 + E_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 4 - note G_, 2 - note A_, 2 - note B_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note G_, 2 + B_ 2 + A_ 4 + G_ 2 + A_ 2 + B_ 2 + G_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 2 + F# 2 + G_ 2 loopchannel 0, Music_Pokecenter_branch_be61 @@ -157,94 +157,94 @@ Music_Pokecenter_branch_befc:: duty 3 notetype 12, 10, 5 octave 3 - note A_, 4 - note E_, 4 + A_ 4 + E_ 4 callchannel Music_Pokecenter_branch_bf60 - note D_, 2 - note F#, 6 + D_ 2 + F# 6 duty 3 notetype 12, 10, 5 octave 3 - note A_, 4 - note E_, 4 + A_ 4 + E_ 4 callchannel Music_Pokecenter_branch_bf4e duty 3 notetype 12, 10, 5 octave 3 - note A_, 4 - note E_, 4 + A_ 4 + E_ 4 callchannel Music_Pokecenter_branch_bf60 - note D_, 8 + D_ 8 duty 3 notetype 12, 10, 5 octave 3 - note D_, 4 - note E_, 4 + D_ 4 + E_ 4 duty 2 notetype 12, 12, 6 octave 4 - note F#, 8 - note A_, 8 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 8 - note C#, 8 - note E_, 8 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 8 - note F#, 8 - note A_, 8 - note G_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 8 - note A_, 4 - note G_, 2 - note F#, 2 - note G_, 8 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 8 + F# 8 + A_ 8 + G_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 8 + C# 8 + E_ 8 + F# 2 + G_ 2 + F# 2 + E_ 2 + D_ 8 + F# 8 + A_ 8 + G_ 2 + F# 2 + G_ 2 + A_ 2 + B_ 8 + A_ 4 + G_ 2 + F# 2 + G_ 8 + F# 2 + G_ 2 + F# 2 + E_ 2 + D_ 8 loopchannel 0, Music_Pokecenter_branch_befc Music_Pokecenter_branch_bf4e:: duty 2 notetype 12, 12, 2 octave 4 - note D_, 2 + D_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note D_, 2 + D_ 2 notetype 12, 12, 3 - note A_, 4 - note G_, 4 - note F#, 2 - note E_, 2 - note C#, 6 + A_ 4 + G_ 4 + F# 2 + E_ 2 + C# 6 endchannel Music_Pokecenter_branch_bf60:: duty 2 notetype 12, 12, 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 + C# 2 notetype 12, 12, 3 - note F#, 4 - note E_, 4 - note C#, 2 + F# 4 + E_ 4 + C# 2 endchannel @@ -253,124 +253,124 @@ Music_Pokecenter_Ch3:: ; bf70 (2:7f70) Music_Pokecenter_branch_bf72:: octave 4 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note G_, 2 - note F#, 2 + D_ 2 + F# 2 + D_ 2 + F# 2 + D_ 2 + F# 2 + G_ 2 + F# 2 callchannel Music_Pokecenter_branch_bfd9 callchannel Music_Pokecenter_branch_bfe2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note G_, 2 - note F#, 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + G_ 2 + A_ 2 + D_ 2 + F# 2 + D_ 2 + F# 2 + D_ 2 + F# 2 + G_ 2 + F# 2 callchannel Music_Pokecenter_branch_bfd9 callchannel Music_Pokecenter_branch_bfe2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note B_, 2 - note A_, 2 - note G_, 2 + D_ 2 + F# 2 + D_ 2 + F# 2 + D_ 2 + B_ 2 + A_ 2 + G_ 2 callchannel Music_Pokecenter_branch_bfeb - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note A_, 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + G# 2 + A_ 2 callchannel Music_Pokecenter_branch_bfeb - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + G_ 2 + F# 2 + E_ 2 loopchannel 0, Music_Pokecenter_branch_bf72 Music_Pokecenter_branch_bfd9:: - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 endchannel Music_Pokecenter_branch_bfe2:: - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note G_, 2 - note A_, 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + G_ 2 + A_ 2 endchannel Music_Pokecenter_branch_bfeb:: - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 endchannel -; 0xbff4
\ No newline at end of file +; 0xbff4 diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index 68651f38..e04dcb30 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -7,136 +7,136 @@ Music_PokemonTower_Ch1:: ; 7f04a (1f:704a) notetype 12, 8, 0 rest 4 octave 4 - note B_, 12 + B_ 12 Music_PokemonTower_branch_7f05a:: notetype 12, 11, 4 octave 4 - note G_, 1 + G_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 octave 3 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 octave 4 - note F#, 1 + F# 1 rest 7 - note C_, 1 + C_ 1 octave 3 - note B_, 1 - note G_, 1 + B_ 1 + G_ 1 rest 5 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note F#, 1 + F# 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note F#, 1 + F# 1 rest 7 - note F#, 1 + F# 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note D_, 1 + D_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note F#, 1 + F# 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 octave 4 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C#, 1 + C# 1 rest 7 - note C#, 1 + C# 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 3 notetype 12, 8, 4 - note C_, 1 + C_ 1 rest 3 notetype 12, 11, 4 - note D_, 1 + D_ 1 rest 7 - note D_, 1 + D_ 1 rest 7 octave 3 - note A_, 1 + A_ 1 rest 7 - note A_, 1 + A_ 1 rest 7 notetype 12, 10, 7 - note B_, 8 - note B_, 8 + B_ 8 + B_ 8 octave 4 - note C_, 8 - note C_, 8 - note C#, 8 - note C#, 8 + C_ 8 + C_ 8 + C# 8 + C# 8 notetype 12, 10, 6 - note D_, 16 + D_ 16 rest 16 rest 16 rest 16 rest 16 notetype 12, 9, 2 - note B_, 4 + B_ 4 octave 5 - note E_, 4 - note D_, 4 - note C_, 4 + E_ 4 + D_ 4 + C_ 4 octave 4 - note B_, 4 + B_ 4 octave 5 - note E_, 4 - note D_, 4 - note C_, 4 + E_ 4 + D_ 4 + C_ 4 octave 4 - note B_, 4 + B_ 4 octave 5 - note E_, 4 - note D_, 4 - note C_, 4 + E_ 4 + D_ 4 + C_ 4 octave 4 - note B_, 4 - note G_, 4 - note F#, 4 - note E_, 4 + B_ 4 + G_ 4 + F# 4 + E_ 4 octave 5 - note C_, 16 - note C_, 16 + C_ 16 + C_ 16 loopchannel 0, Music_PokemonTower_branch_7f05a @@ -145,150 +145,150 @@ Music_PokemonTower_Ch2:: ; 7f0e3 (1f:70e3) duty 3 notetype 12, 10, 0 octave 5 - note C_, 12 + C_ 12 octave 4 - note E_, 4 + E_ 4 Music_PokemonTower_branch_7f0ee:: notetype 12, 12, 1 octave 5 - note C_, 8 + C_ 8 octave 4 - note B_, 4 + B_ 4 notetype 12, 12, 4 - note G_, 1 - note F#, 1 - note E_, 1 - note D#, 1 + G_ 1 + F# 1 + E_ 1 + D# 1 notetype 12, 11, 0 - note G_, 8 + G_ 8 octave 5 - note C_, 8 + C_ 8 octave 4 - note B_, 4 - note G_, 4 - note E_, 4 - note G_, 4 + B_ 4 + G_ 4 + E_ 4 + G_ 4 octave 5 - note C_, 8 + C_ 8 notetype 12, 11, 7 - note C_, 8 + C_ 8 notetype 12, 12, 2 octave 4 - note G_, 1 - note F#, 1 - note E_, 1 + G_ 1 + F# 1 + E_ 1 rest 1 notetype 12, 9, 6 octave 3 - note G_, 4 + G_ 4 notetype 12, 12, 7 - note G_, 4 - note B_, 4 - note G_, 4 - note B_, 4 + G_ 4 + B_ 4 + G_ 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 notetype 12, 11, 0 octave 4 - note C_, 16 - note E_, 8 + C_ 16 + E_ 8 notetype 12, 11, 7 - note E_, 12 + E_ 12 notetype 12, 12, 5 octave 5 - note C_, 4 + C_ 4 octave 4 - note B_, 4 - note G_, 4 - note B_, 4 - note G_, 4 - note F#, 4 - note E_, 4 + B_ 4 + G_ 4 + B_ 4 + G_ 4 + F# 4 + E_ 4 notetype 12, 11, 0 - note F#, 12 - note G_, 4 + F# 12 + G_ 4 notetype 12, 11, 0 - note F#, 8 + F# 8 notetype 12, 11, 7 - note F#, 8 + F# 8 notetype 12, 11, 0 - note B_, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note B_, 16 + B_ 4 + G_ 4 + F# 4 + E_ 4 + B_ 16 notetype 12, 11, 0 octave 5 - note C_, 4 + C_ 4 octave 4 - note G_, 4 - note F#, 4 - note E_, 4 + G_ 4 + F# 4 + E_ 4 notetype 12, 9, 0 octave 5 - note C_, 16 + C_ 16 notetype 12, 11, 0 - note D_, 4 + D_ 4 octave 4 - note A_, 4 - note G#, 4 - note F#, 4 + A_ 4 + G# 4 + F# 4 notetype 12, 2, 15 octave 5 - note D_, 16 + D_ 16 notetype 12, 12, 0 - note E_, 4 + E_ 4 octave 4 - note B_, 4 - note A_, 4 - note G_, 4 + B_ 4 + A_ 4 + G_ 4 octave 5 - note F_, 4 - note C_, 4 + F_ 4 + C_ 4 octave 4 - note A#, 4 - note G#, 4 + A# 4 + G# 4 octave 5 - note F#, 4 - note D_, 4 - note C_, 4 + F# 4 + D_ 4 + C_ 4 octave 4 - note A#, 4 - note G#, 4 - note F#, 4 - note E_, 4 - note D_, 4 + A# 4 + G# 4 + F# 4 + E_ 4 + D_ 4 notetype 12, 11, 0 - note C_, 8 + C_ 8 notetype 12, 9, 0 - note C_, 8 + C_ 8 notetype 12, 8, 0 - note C_, 8 + C_ 8 notetype 12, 7, 0 - note C_, 8 + C_ 8 notetype 12, 6, 0 - note C_, 8 + C_ 8 notetype 12, 6, 7 - note C_, 8 + C_ 8 rest 16 notetype 12, 10, 0 octave 5 - note G_, 16 + G_ 16 octave 6 - note C_, 16 + C_ 16 octave 5 - note B_, 8 - note G_, 8 - note E_, 8 - note G_, 8 + B_ 8 + G_ 8 + E_ 8 + G_ 8 octave 6 - note C_, 16 + C_ 16 vibrato 0, 3, 4 notetype 12, 10, 7 - note C_, 16 + C_ 16 loopchannel 0, Music_PokemonTower_branch_7f0ee @@ -297,163 +297,163 @@ Music_PokemonTower_Ch3:: ; 7f19a (1f:719a) notetype 12, 1, 3 rest 8 octave 5 - note G_, 8 + G_ 8 Music_PokemonTower_branch_7f1a2:: - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note D#, 1 - note F#, 1 - note D#, 1 - note E_, 1 + E_ 1 + D# 1 + F# 1 + D# 1 + E_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note E_, 1 - note D#, 1 + E_ 1 + D# 1 octave 4 - note B_, 1 + B_ 1 rest 5 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 octave 5 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 octave 4 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 octave 5 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 7 - note F#, 1 + F# 1 rest 7 - note D_, 1 + D_ 1 rest 7 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note F_, 1 + F_ 1 rest 7 - note F_, 1 + F_ 1 rest 7 - note F#, 1 + F# 1 rest 7 - note F#, 1 + F# 1 rest 7 - note G_, 1 + G_ 1 rest 15 notetype 12, 1, 5 octave 4 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 15 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 7 notetype 12, 1, 3 octave 6 - note E_, 1 + E_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 15 - note E_, 1 + E_ 1 rest 15 - note E_, 1 + E_ 1 rest 15 - note E_, 1 + E_ 1 rest 15 - note E_, 1 + E_ 1 rest 15 - note E_, 1 + E_ 1 rest 7 octave 5 - note E_, 1 + E_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 loopchannel 0, Music_PokemonTower_branch_7f1a2 -; 0x7f243
\ No newline at end of file +; 0x7f243 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index bf425b5a..9876b0ea 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -9,99 +9,99 @@ Music_Routes1_branch_9be9:: notetype 12, 10, 1 rest 4 octave 4 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 1 - note C#, 1 + D_ 2 + D_ 6 + D_ 2 + D_ 6 + D_ 2 + D_ 1 + C# 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 + C# 1 octave 3 - note A_, 2 - note A_, 2 - note A_, 6 - octave 4 - note C#, 2 - note C#, 6 - note C#, 2 - note C#, 4 + A_ 2 + A_ 2 + A_ 6 + octave 4 + C# 2 + C# 6 + C# 2 + C# 4 octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 4 + C# 4 octave 3 - note A_, 2 - note A_, 6 - octave 4 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 1 - note E_, 1 - note D_, 1 - note C#, 1 + A_ 2 + A_ 6 + octave 4 + D_ 2 + D_ 6 + D_ 2 + D_ 6 + D_ 2 + D_ 1 + E_ 1 + D_ 1 + C# 1 octave 3 - note B_, 2 - note A_, 2 - note A_, 6 + B_ 2 + A_ 2 + A_ 6 octave 4 - note C#, 2 - note C#, 6 + C# 2 + C# 6 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 notetype 12, 10, 2 octave 4 - note G_, 4 - note E_, 4 - note F#, 2 + G_ 4 + E_ 4 + F# 2 notetype 12, 10, 1 octave 3 - note A_, 2 - note A_, 6 - note A_, 2 - note F#, 2 - note A_, 4 - note B_, 2 - octave 4 - note C#, 2 + A_ 2 + A_ 6 + A_ 2 + F# 2 + A_ 4 + B_ 2 + octave 4 + C# 2 octave 3 - note B_, 4 - note A_, 2 - note F#, 2 - note A_, 4 - note G_, 2 - note E_, 2 - note C#, 4 - note A_, 2 - octave 4 - note D_, 2 + B_ 4 + A_ 2 + F# 2 + A_ 4 + G_ 2 + E_ 2 + C# 4 + A_ 2 + octave 4 + D_ 2 octave 3 - note A_, 4 - note B_, 2 - note G_, 2 - note B_, 4 - octave 4 - note D_, 2 - note E_, 2 - note C#, 2 - note D_, 2 + A_ 4 + B_ 2 + G_ 2 + B_ 4 + octave 4 + D_ 2 + E_ 2 + C# 2 + D_ 2 octave 3 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 loopchannel 0, Music_Routes1_branch_9be9 endchannel @@ -119,117 +119,117 @@ Music_Routes1_branch_9c53:: Music_Routes1_branch_9c65:: octave 4 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 2 - note G_, 3 - note F#, 1 - note E_, 6 + D_ 1 + E_ 1 + F# 2 + F# 2 + F# 2 + D_ 1 + E_ 1 + F# 2 + F# 2 + F# 2 + D_ 1 + E_ 1 + F# 2 + F# 2 + G_ 3 + F# 1 + E_ 6 endchannel Music_Routes1_branch_9c78:: - note C#, 1 - note D_, 1 - note E_, 2 - note E_, 2 - note E_, 2 - note C#, 1 - note D_, 1 - note E_, 2 - note E_, 2 - note E_, 2 - note C#, 1 - note D_, 1 - note E_, 2 - note E_, 2 - note F#, 1 - note E_, 1 - note E_, 1 - note F#, 1 - note D_, 4 - note F#, 2 + C# 1 + D_ 1 + E_ 2 + E_ 2 + E_ 2 + C# 1 + D_ 1 + E_ 2 + E_ 2 + E_ 2 + C# 1 + D_ 1 + E_ 2 + E_ 2 + F# 1 + E_ 1 + E_ 1 + F# 1 + D_ 4 + F# 2 endchannel Music_Routes1_branch_9c8d:: - note C#, 1 - note D_, 1 - note E_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C#, 2 + C# 1 + D_ 1 + E_ 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + C# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 + C# 2 notetype 12, 13, 2 - note B_, 4 + B_ 4 notetype 6, 13, 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 + C# 1 notetype 12, 13, 1 octave 3 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 4 - note C#, 1 - note D_, 6 + C# 1 + D_ 6 notetype 12, 13, 2 - note F#, 1 - note G_, 1 - note A_, 2 - note A_, 2 - note F#, 2 - note D_, 2 + F# 1 + G_ 1 + A_ 2 + A_ 2 + F# 2 + D_ 2 octave 5 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 4 - note B_, 2 + B_ 2 octave 5 - note C#, 2 - octave 4 - note A_, 2 - note F#, 2 - note D_, 3 - note F#, 1 - note E_, 6 - note F#, 1 - note G_, 1 - note A_, 2 - note A_, 2 - note F#, 2 - note A_, 2 + C# 2 + octave 4 + A_ 2 + F# 2 + D_ 3 + F# 1 + E_ 6 + F# 1 + G_ 1 + A_ 2 + A_ 2 + F# 2 + A_ 2 octave 5 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 4 - note B_, 3 - note G_, 1 - note A_, 2 + B_ 3 + G_ 1 + A_ 2 octave 5 - note D_, 2 - note C#, 2 - note E_, 2 - note D_, 2 + D_ 2 + C# 2 + E_ 2 + D_ 2 notetype 12, 13, 1 octave 4 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 endchannel endchannel @@ -241,70 +241,70 @@ Music_Routes1_Ch3:: ; 9cd8 (2:5cd8) Music_Routes1_branch_9cdd:: rest 2 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note A_, 4 - note B_, 4 - note A_, 4 + A_ 4 + B_ 4 + A_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note A_, 4 - note B_, 4 + A_ 4 + B_ 4 octave 4 - note C_, 4 - note C#, 4 + C_ 4 + C# 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note A_, 4 - note B_, 4 - note A_, 4 + A_ 4 + B_ 4 + A_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 - note B_, 4 + B_ 4 + A_ 4 + B_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note D_, 8 + D_ 8 octave 3 - note G_, 8 - note A_, 8 + G_ 8 + A_ 8 octave 4 - note C#, 8 - note D_, 8 + C# 8 + D_ 8 octave 3 - note G_, 8 - note A_, 8 + G_ 8 + A_ 8 octave 4 - note D_, 6 + D_ 6 loopchannel 0, Music_Routes1_branch_9cdd endchannel @@ -312,94 +312,94 @@ Music_Routes1_branch_9cdd:: Music_Routes1_Ch4:: ; 9d24 (2:5d24) dspeed 12 rest 4 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 loopchannel 0, Music_Routes1_Ch4 endchannel -; 0x9db9
\ No newline at end of file +; 0x9db9 diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index 732396c0..9ba376ce 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -7,137 +7,137 @@ Music_Routes2_Ch1:: ; 9db9 (2:5db9) Music_Routes2_branch_9dc3:: notetype 12, 11, 2 octave 2 - note B_, 4 - octave 3 - note G#, 6 - note F#, 2 - note E_, 2 - note D#, 1 - note F#, 1 - note E_, 2 + B_ 4 + octave 3 + G# 6 + F# 2 + E_ 2 + D# 1 + F# 1 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 - note A_, 2 - note G#, 4 - note F#, 4 + E_ 2 + A_ 2 + G# 4 + F# 4 octave 2 - note B_, 4 - octave 3 - note G#, 6 - note F#, 2 - note E_, 2 - note D#, 1 - note F#, 1 - note B_, 2 + B_ 4 + octave 3 + G# 6 + F# 2 + E_ 2 + D# 1 + F# 1 + B_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 - note A_, 2 - note G#, 4 - note B_, 4 + E_ 2 + A_ 2 + G# 4 + B_ 4 notetype 8, 11, 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 - note D#, 2 + E_ 2 + D# 2 octave 3 - note G#, 2 + G# 2 octave 4 - note D#, 2 - note D#, 2 + D# 2 + D# 2 octave 3 - note G#, 2 + G# 2 octave 4 - note D#, 2 - note C#, 2 + D# 2 + C# 2 octave 3 - note F#, 2 + F# 2 octave 4 - note C#, 2 - note C#, 2 + C# 2 + C# 2 octave 3 - note F#, 2 + F# 2 octave 4 - note C#, 2 - octave 3 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 + C# 2 + octave 3 + B_ 2 + E_ 2 + B_ 2 + B_ 2 + E_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + G# 2 + A_ 2 + A_ 2 + F# 2 + A_ 2 + G# 2 + E_ 2 + B_ 2 + B_ 2 + E_ 2 + B_ 2 + B_ 2 + E_ 2 + B_ 2 + B_ 2 + E_ 2 + B_ 2 + A_ 2 + B_ 2 + A_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 + C# 2 + D_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note D_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 + D_ 2 + F# 2 + E_ 2 + D# 2 + E_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note E_, 2 + E_ 2 loopchannel 0, Music_Routes2_branch_9dc3 endchannel @@ -149,68 +149,68 @@ Music_Routes2_Ch2:: ; 9e4f (2:5e4f) Music_Routes2_branch_9e54:: notetype 12, 13, 4 octave 4 - note E_, 6 + E_ 6 octave 3 - note B_, 1 + B_ 1 octave 4 - note E_, 1 - note F#, 6 - note A_, 2 - note G#, 3 - note E_, 1 - note F#, 8 - octave 3 - note D#, 4 + E_ 1 + F# 6 + A_ 2 + G# 3 + E_ 1 + F# 8 + octave 3 + D# 4 octave 4 - note E_, 6 + E_ 6 octave 3 - note B_, 1 + B_ 1 octave 4 - note E_, 1 - note F#, 6 - note A_, 2 - note G#, 3 - note E_, 1 - note B_, 8 - octave 3 - note G#, 4 + E_ 1 + F# 6 + A_ 2 + G# 3 + E_ 1 + B_ 8 + octave 3 + G# 4 octave 5 - note C#, 6 + C# 6 octave 4 - note B_, 1 - note A_, 1 - note B_, 6 - note A_, 1 - note G#, 1 - note A_, 6 - note G#, 1 - note F#, 1 - note G#, 4 - note F#, 2 - note E_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 8 - note A_, 4 - note G#, 3 - note F#, 1 - note E_, 8 - note F#, 2 - note E_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 1 - note G#, 1 - note A_, 4 + B_ 1 + A_ 1 + B_ 6 + A_ 1 + G# 1 + A_ 6 + G# 1 + F# 1 + G# 4 + F# 2 + E_ 2 + D_ 2 + D_ 1 + E_ 1 + F# 8 + A_ 4 + G# 3 + F# 1 + E_ 8 + F# 2 + E_ 2 + D_ 2 + D_ 1 + E_ 1 + F# 2 + F# 1 + G# 1 + A_ 4 octave 5 - note C#, 4 + C# 4 octave 4 - note B_, 3 - note A_, 1 - note G#, 8 + B_ 3 + A_ 1 + G# 8 rest 4 loopchannel 0, Music_Routes2_branch_9e54 endchannel @@ -222,103 +222,103 @@ Music_Routes2_Ch3:: ; 9e9b (2:5e9b) Music_Routes2_branch_9e9e:: notetype 12, 1, 1 octave 3 - note E_, 2 + E_ 2 rest 2 octave 2 - note B_, 6 + B_ 6 octave 3 - note D_, 1 - note C#, 1 - note D_, 2 - note D#, 2 - note E_, 2 + D_ 1 + C# 1 + D_ 2 + D# 2 + E_ 2 rest 2 octave 2 - note B_, 6 + B_ 6 octave 3 - note D_, 1 - note C#, 1 + D_ 1 + C# 1 octave 2 - note A_, 2 + A_ 2 octave 3 - note C#, 2 - note E_, 2 + C# 2 + E_ 2 rest 2 octave 2 - note B_, 6 + B_ 6 octave 3 - note D_, 1 - note C#, 1 - note D_, 2 - note D#, 2 - note E_, 2 + D_ 1 + C# 1 + D_ 2 + D# 2 + E_ 2 rest 2 octave 2 - note B_, 4 + B_ 4 octave 3 - note C#, 2 + C# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 2 - note F#, 2 - note E_, 2 + D_ 2 + F# 2 + E_ 2 rest 2 octave 2 - note A_, 2 + A_ 2 rest 2 octave 3 - note D#, 2 + D# 2 rest 2 octave 2 - note G#, 2 + G# 2 rest 2 octave 3 - note C#, 2 + C# 2 rest 2 octave 2 - note F#, 2 + F# 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note E_, 2 - note G#, 2 - note F#, 2 + E_ 2 + G# 2 + F# 2 rest 2 - note A_, 2 + A_ 2 rest 2 - note F#, 2 + F# 2 rest 2 - note A_, 2 + A_ 2 rest 2 - note G#, 2 + G# 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G#, 2 + G# 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note F#, 2 + F# 2 rest 2 - note A_, 2 + A_ 2 rest 2 octave 3 - note C#, 2 + C# 2 rest 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note C#, 2 + C# 2 octave 2 - note B_, 2 + B_ 2 rest 2 octave 3 - note E_, 2 + E_ 2 rest 2 - note G#, 2 + G# 2 rest 2 - note E_, 2 + E_ 2 rest 2 loopchannel 0, Music_Routes2_branch_9e9e endchannel @@ -326,101 +326,101 @@ Music_Routes2_branch_9e9e:: Music_Routes2_Ch4:: ; 9f08 (2:5f08) dspeed 12 - dnote 2, snare3 + snare3 2 rest 2 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare3 - dnote 1, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 1 + snare3 1 + snare3 2 + snare3 2 + snare3 2 rest 2 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 - dnote 3, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 + snare3 3 dspeed 12 - dnote 1, snare3 + snare3 1 rest 3 - dnote 2, snare3 + snare3 2 rest 2 - dnote 2, snare3 + snare3 2 rest 4 - dnote 1, snare3 - dnote 1, snare3 - dnote 2, snare3 + snare3 1 + snare3 1 + snare3 2 rest 2 - dnote 2, snare3 + snare3 2 rest 2 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 - dnote 3, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 + snare3 3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 rest 3 dspeed 12 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare3 - dnote 1, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 1 + snare3 1 + snare3 2 + snare3 2 + snare3 2 rest 2 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 rest 3 dspeed 12 - dnote 1, snare3 + snare3 1 rest 3 - dnote 2, snare3 + snare3 2 rest 2 - dnote 2, snare3 + snare3 2 rest 4 - dnote 1, snare3 - dnote 1, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 1 + snare3 1 + snare3 2 + snare3 2 + snare3 2 rest 2 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 rest 3 - dnote 3, snare3 - dnote 3, snare3 - dnote 3, snare3 + snare3 3 + snare3 3 + snare3 3 rest 3 dspeed 12 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare3 - dnote 1, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 1 + snare3 1 + snare3 2 + snare3 2 + snare3 2 rest 2 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 rest 3 - dnote 3, snare3 + snare3 3 rest 3 loopchannel 0, Music_Routes2_Ch4 endchannel -; 0x9fad
\ No newline at end of file +; 0x9fad diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index b8cd4b47..e62ca9bd 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -6,74 +6,74 @@ Music_Routes3_Ch1:: ; 9fad (2:5fad) toggleperfectpitch notetype 12, 11, 5 octave 3 - note E_, 1 - note F#, 1 - note G_, 6 - note F_, 1 - note G_, 1 - note E_, 1 + E_ 1 + F# 1 + G_ 6 + F_ 1 + G_ 1 + E_ 1 rest 16 rest 15 Music_Routes3_branch_9fc3:: notetype 12, 11, 5 - note E_, 6 - note D_, 1 - note E_, 1 - note C_, 4 - note E_, 4 - note C_, 6 - note D_, 1 - note E_, 1 - note F_, 2 - note G_, 2 - note G_, 2 - note A_, 2 + E_ 6 + D_ 1 + E_ 1 + C_ 4 + E_ 4 + C_ 6 + D_ 1 + E_ 1 + F_ 2 + G_ 2 + G_ 2 + A_ 2 notetype 12, 10, 7 - note A#, 8 - note F_, 8 - note D_, 8 - note F_, 8 + A# 8 + F_ 8 + D_ 8 + F_ 8 notetype 12, 11, 5 - note E_, 6 - note D_, 1 - note E_, 1 - note C_, 4 - note E_, 4 - note C_, 6 - note D_, 1 - note E_, 1 - note F_, 2 - note G_, 2 - note G_, 2 - note A_, 2 + E_ 6 + D_ 1 + E_ 1 + C_ 4 + E_ 4 + C_ 6 + D_ 1 + E_ 1 + F_ 2 + G_ 2 + G_ 2 + A_ 2 notetype 12, 10, 7 - note A#, 8 - note A#, 8 - note D_, 8 - note F_, 8 + A# 8 + A# 8 + D_ 8 + F_ 8 notetype 12, 11, 5 - note E_, 4 - note E_, 2 - note F_, 2 - note G_, 4 - note F_, 2 - note E_, 2 - note B_, 2 + E_ 4 + E_ 2 + F_ 2 + G_ 4 + F_ 2 + E_ 2 + B_ 2 octave 2 - note G_, 4 + G_ 4 octave 3 - note B_, 8 - note A_, 2 + B_ 8 + A_ 2 notetype 8, 12, 3 - note A_, 4 - note F_, 4 - note A_, 4 + A_ 4 + F_ 4 + A_ 4 notetype 8, 4, 15 - note A_, 12 + A_ 12 notetype 8, 9, 0 - note F_, 12 - note G_, 12 + F_ 12 + G_ 12 loopchannel 0, Music_Routes3_branch_9fc3 @@ -82,13 +82,13 @@ Music_Routes3_Ch2:: ; a009 (2:6009) duty 2 notetype 12, 12, 7 octave 3 - note G_, 1 - note A#, 1 - note B_, 6 - note A_, 1 - note B_, 1 + G_ 1 + A# 1 + B_ 6 + A_ 1 + B_ 1 octave 4 - note C_, 1 + C_ 1 rest 15 rest 16 @@ -96,85 +96,85 @@ Music_Routes3_branch_a01a:: notetype 12, 12, 7 duty 2 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 1 + G_ 1 octave 4 - note C_, 1 - note E_, 10 + C_ 1 + E_ 10 octave 3 - note G_, 2 + G_ 2 octave 4 - note C_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 8 - note F_, 8 + C_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 + D_ 8 + F_ 8 notetype 12, 12, 5 duty 3 octave 3 - note A#, 8 - note A_, 8 + A# 8 + A_ 8 notetype 12, 12, 7 duty 2 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 1 + G_ 1 octave 4 - note C_, 1 - note E_, 10 + C_ 1 + E_ 10 octave 3 - note G_, 2 + G_ 2 octave 4 - note C_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 8 - note F_, 8 + C_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 + D_ 8 + F_ 8 notetype 12, 12, 5 duty 3 octave 3 - note A#, 8 + A# 8 octave 4 - note D_, 6 + D_ 6 notetype 12, 12, 7 duty 2 - note C_, 1 - note D_, 1 - note E_, 2 - note D_, 2 - note E_, 2 - note C_, 8 + C_ 1 + D_ 1 + E_ 2 + D_ 2 + E_ 2 + C_ 8 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 1 - note D_, 2 + C_ 1 + D_ 2 octave 3 - note G_, 4 + G_ 4 octave 4 - note G_, 8 - note F_, 1 - note E_, 1 + G_ 8 + F_ 1 + E_ 1 notetype 8, 13, 3 - note F_, 4 - note E_, 4 + F_ 4 + E_ 4 notetype 8, 12, 4 - note C_, 4 + C_ 4 notetype 8, 12, 5 - note C_, 12 + C_ 12 notetype 12, 10, 0 duty 3 octave 3 - note A_, 8 - note B_, 8 + A_ 8 + B_ 8 loopchannel 0, Music_Routes3_branch_a01a @@ -182,335 +182,335 @@ Music_Routes3_Ch3:: ; a07f (2:607f) vibrato 4, 1, 0 notetype 6, 1, 2 octave 4 - note G_, 2 - note A#, 2 - note B_, 8 - note A_, 8 - note G_, 2 + G_ 2 + A# 2 + B_ 8 + A_ 8 + G_ 2 rest 2 - note G_, 7 + G_ 7 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 2 + G_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note G_, 8 - note G_, 2 + G_ 8 + G_ 2 rest 2 - note G_, 7 + G_ 7 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 2 + G_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note G_, 8 + G_ 8 Music_Routes3_branch_a0a3:: notetype 12, 1, 2 - note E_, 1 + E_ 1 rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 + G_ 4 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 4 - note E_, 1 + G_ 4 + E_ 1 rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 + G_ 4 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 2 - note A_, 2 - note F_, 1 + G_ 2 + A_ 2 + F_ 1 rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 + A# 4 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A#, 4 - note F_, 1 + A# 4 + F_ 1 rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 + A# 4 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A#, 2 - note F_, 2 - note E_, 1 + A# 2 + F_ 2 + E_ 1 rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 + G_ 4 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 4 - note E_, 1 + G_ 4 + E_ 1 rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 + G_ 4 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 2 - note A_, 2 - note F_, 1 + G_ 2 + A_ 2 + F_ 1 rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 + A# 4 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A#, 4 - note F_, 1 + A# 4 + F_ 1 rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 + A# 4 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A#, 2 - note A_, 2 - note G_, 1 + A# 2 + A_ 2 + G_ 1 rest 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note G_, 1 - note G_, 1 - note G_, 1 + G_ 1 + G_ 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 4 + D_ 4 octave 4 - note G_, 1 - note G_, 1 - note G_, 1 + G_ 1 + G_ 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 4 + D_ 4 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note F_, 1 - note F_, 1 - note F_, 1 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note F_, 1 + F_ 1 rest 1 - note A_, 4 - note F_, 1 - note F_, 1 - note F_, 1 + A_ 4 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 4 + A_ 4 loopchannel 0, Music_Routes3_branch_a0a3 Music_Routes3_Ch4:: ; a131 (2:6131) dspeed 6 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare3 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare3 2 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 Music_Routes3_branch_a17a:: - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare3 - dnote 4, mutedsnare2 - dnote 10, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare4 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 10, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 10, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare3 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare3 2 + mutedsnare2 4 + mutedsnare2 10 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare4 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 10 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 10 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 loopchannel 0, Music_Routes3_branch_a17a -; 0xa26a
\ No newline at end of file +; 0xa26a diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index b897e3d6..742244bc 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -6,135 +6,135 @@ Music_Routes4_Ch1:: ; a26a (2:626a) toggleperfectpitch notetype 12, 10, 2 octave 2 - note G#, 4 - note G#, 4 - note G#, 4 + G# 4 + G# 4 + G# 4 notetype 12, 7, 15 - note G#, 4 + G# 4 notetype 12, 10, 2 - note G#, 4 - note G#, 4 - note G#, 4 + G# 4 + G# 4 + G# 4 notetype 12, 11, 7 - note B_, 1 + B_ 1 octave 3 - note E_, 1 - note F#, 1 - note B_, 1 + E_ 1 + F# 1 + B_ 1 Music_Routes4_branch_a28a:: notetype 12, 11, 7 - note B_, 6 - note E_, 2 - note E_, 4 + B_ 6 + E_ 2 + E_ 4 octave 4 - note E_, 4 - note D_, 4 - note C#, 4 + E_ 4 + D_ 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 notetype 12, 11, 1 - note G#, 3 + G# 3 notetype 12, 11, 7 - note E_, 1 - note F#, 12 - note E_, 8 - note D#, 4 - note F#, 4 - note B_, 6 - note E_, 2 - note E_, 4 + E_ 1 + F# 12 + E_ 8 + D# 4 + F# 4 + B_ 6 + E_ 2 + E_ 4 octave 4 - note E_, 4 - note D_, 4 - note C#, 4 + E_ 4 + D_ 4 + C# 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 4 + C# 4 notetype 12, 11, 1 - note E_, 3 + E_ 3 notetype 12, 11, 7 - note D#, 1 - note E_, 12 + D# 1 + E_ 12 octave 3 - note B_, 3 - note A_, 1 - note G#, 8 + B_ 3 + A_ 1 + G# 8 octave 4 - note E_, 4 + E_ 4 octave 3 - note D_, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 + D_ 2 + E_ 2 + F# 2 + G# 2 + A_ 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note D_, 2 + C# 2 + D_ 2 + D_ 2 octave 3 - note A_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 + A_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 2 + F# 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + G# 2 + A_ 2 + B_ 2 octave 4 - note D#, 2 - note E_, 2 + D# 2 + E_ 2 octave 3 - note B_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note B_, 2 + B_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + G# 2 + B_ 2 notetype 8, 11, 5 - note A_, 4 - note G#, 4 - note F#, 4 + A_ 4 + G# 4 + F# 4 octave 4 - note E_, 4 - note D#, 4 - note C#, 4 - note C#, 4 + E_ 4 + D# 4 + C# 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 - note B_, 4 + B_ 4 + A_ 4 + B_ 4 octave 4 - note C#, 4 - note D#, 4 + C# 4 + D# 4 octave 3 - note E_, 3 - note F#, 3 - note G#, 3 - note A_, 3 - note B_, 4 + E_ 3 + F# 3 + G# 3 + A_ 3 + B_ 4 octave 4 - note C#, 4 - note D#, 4 - note E_, 3 + C# 4 + D# 4 + E_ 3 octave 3 - note B_, 3 - note G#, 3 - note F#, 3 - note E_, 3 - note F#, 3 - note G#, 3 - note A_, 3 + B_ 3 + G# 3 + F# 3 + E_ 3 + F# 3 + G# 3 + A_ 3 loopchannel 0, Music_Routes4_branch_a28a @@ -143,365 +143,365 @@ Music_Routes4_Ch2:: ; a304 (2:6304) duty 1 notetype 12, 9, 2 octave 3 - note E_, 3 - note F#, 1 + E_ 3 + F# 1 notetype 12, 9, 0 - note E_, 12 + E_ 12 notetype 12, 9, 2 octave 2 - note B_, 3 + B_ 3 octave 3 - note C_, 1 + C_ 1 notetype 12, 9, 0 octave 2 - note B_, 8 + B_ 8 duty 3 notetype 12, 12, 7 octave 3 - note E_, 1 - note F#, 1 - note B_, 1 + E_ 1 + F# 1 + B_ 1 octave 4 - note D#, 1 + D# 1 Music_Routes4_branch_a325:: notetype 12, 12, 7 - note E_, 6 + E_ 6 octave 3 - note B_, 2 - note B_, 4 + B_ 2 + B_ 4 octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note F#, 4 - note F#, 1 - note A_, 1 - note G#, 1 - note F#, 1 + B_ 4 + A_ 4 + G# 4 + F# 4 + F# 1 + A_ 1 + G# 1 + F# 1 notetype 12, 12, 2 - note G#, 3 - note E_, 1 + G# 3 + E_ 1 notetype 12, 10, 0 octave 3 - note B_, 12 + B_ 12 duty 0 notetype 12, 12, 2 octave 2 - note B_, 3 + B_ 3 notetype 12, 12, 7 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 8 + B_ 8 octave 3 - note D#, 4 + D# 4 duty 3 octave 4 - note E_, 6 + E_ 6 octave 3 - note B_, 2 - note B_, 4 + B_ 2 + B_ 4 octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note F#, 4 - note A_, 1 + B_ 4 + A_ 4 + G# 4 + F# 4 + A_ 1 octave 5 - note C#, 1 + C# 1 octave 4 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 notetype 12, 12, 2 - note B_, 3 + B_ 3 notetype 12, 12, 7 - note A_, 1 + A_ 1 notetype 12, 11, 0 - note G#, 6 + G# 6 notetype 12, 9, 0 - note G#, 6 + G# 6 notetype 12, 7, 0 - note G#, 6 + G# 6 notetype 12, 6, 15 - note G#, 6 + G# 6 notetype 12, 12, 7 - note G#, 4 + G# 4 notetype 8, 12, 3 - note A_, 4 - note G#, 4 - note F#, 4 + A_ 4 + G# 4 + F# 4 notetype 8, 9, 0 - note F#, 6 + F# 6 notetype 8, 7, 15 - note F#, 6 + F# 6 duty 0 notetype 8, 9, 0 octave 3 - note F#, 4 - note E_, 4 - note F#, 4 - note A_, 6 + F# 4 + E_ 4 + F# 4 + A_ 6 duty 3 notetype 8, 12, 7 octave 4 - note F#, 6 - note G#, 4 - note F#, 4 + F# 6 + G# 4 + F# 4 notetype 8, 12, 4 - note E_, 4 + E_ 4 notetype 8, 10, 0 - note E_, 12 + E_ 12 duty 0 notetype 8, 9, 0 octave 3 - note E_, 4 - note D#, 4 - note E_, 4 - note G#, 6 + E_ 4 + D# 4 + E_ 4 + G# 6 duty 3 notetype 8, 12, 7 octave 4 - note E_, 6 - note F#, 4 - note D#, 4 + E_ 6 + F# 4 + D# 4 octave 3 - note B_, 4 + B_ 4 notetype 8, 10, 0 octave 4 - note B_, 16 + B_ 16 notetype 8, 10, 7 - note B_, 8 + B_ 8 notetype 8, 11, 0 - note A_, 6 + A_ 6 notetype 8, 11, 7 - note A_, 6 + A_ 6 notetype 12, 10, 7 - note G#, 1 - note F#, 1 + G# 1 + F# 1 notetype 12, 11, 0 - note E_, 12 + E_ 12 notetype 12, 10, 0 - note E_, 8 + E_ 8 notetype 12, 10, 7 - note E_, 10 + E_ 10 loopchannel 0, Music_Routes4_branch_a325 Music_Routes4_Ch3:: ; a3c4 (2:63c4) notetype 12, 1, 0 octave 4 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note D#, 1 + D# 1 rest 3 Music_Routes4_branch_a3d7:: - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 + F# 1 + F# 1 + F# 1 + F# 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 + G# 1 + G# 1 + G# 1 + G# 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 + G# 1 + G# 1 + G# 1 + G# 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 + F# 1 + F# 1 + F# 1 + F# 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 + B_ 1 + B_ 1 + B_ 1 + B_ 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 + F# 1 + F# 1 + F# 1 + F# 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 3 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 + G# 1 + G# 1 + G# 1 + G# 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 + F# 1 + F# 1 + F# 1 + F# 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 + B_ 1 + B_ 1 + B_ 1 + B_ 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 + G# 1 + G# 1 + G# 1 + G# 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note D#, 1 + D# 1 rest 1 loopchannel 0, Music_Routes4_branch_a3d7 @@ -510,173 +510,173 @@ Music_Routes4_Ch4:: ; a49d (2:649d) dspeed 12 rest 16 rest 12 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 Music_Routes4_branch_a4a8:: - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare3 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 loopchannel 0, Music_Routes4_branch_a4a8 -; 0xa5f0
\ No newline at end of file +; 0xa5f0 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index 69d97a49..3e0657fd 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -7,35 +7,35 @@ Music_SafariZone_Ch1:: ; bc2e (2:7c2e) notetype 12, 9, 2 octave 3 pitchbend 0, 73 - note C_, 1 + C_ 1 pitchbend 0, 73 - note G_, 1 + G_ 1 pitchbend 0, 73 - note C_, 1 + C_ 1 pitchbend 0, 73 - note G_, 1 + G_ 1 rest 4 duty 3 Music_SafariZone_branch_bc4f:: callchannel Music_SafariZone_branch_bc5f notetype 12, 10, 4 - note F#, 4 + F# 4 callchannel Music_SafariZone_branch_bc5f notetype 12, 10, 4 - note F#, 4 + F# 4 loopchannel 0, Music_SafariZone_branch_bc4f Music_SafariZone_branch_bc5f:: notetype 12, 10, 2 octave 3 - note C_, 4 - note G_, 4 - note C_, 4 - note G_, 4 - note C_, 4 - note G_, 4 - note C_, 4 + C_ 4 + G_ 4 + C_ 4 + G_ 4 + C_ 4 + G_ 4 + C_ 4 endchannel @@ -44,32 +44,32 @@ Music_SafariZone_Ch2:: ; bc6a (2:7c6a) vibrato 8, 2, 5 notetype 12, 10, 2 octave 4 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 + G_ 1 + D_ 1 + G_ 1 + D_ 1 rest 4 duty 3 Music_SafariZone_branch_bc79:: callchannel Music_SafariZone_branch_bc89 notetype 12, 11, 5 - note A_, 4 + A_ 4 callchannel Music_SafariZone_branch_bc89 notetype 12, 11, 5 - note B_, 4 + B_ 4 loopchannel 0, Music_SafariZone_branch_bc79 Music_SafariZone_branch_bc89:: notetype 12, 11, 2 octave 3 - note G_, 4 - note D_, 4 - note G_, 4 - note D_, 4 - note G_, 4 - note D_, 4 - note G_, 4 + G_ 4 + D_ 4 + G_ 4 + D_ 4 + G_ 4 + D_ 4 + G_ 4 endchannel @@ -80,33 +80,33 @@ Music_SafariZone_Ch3:: ; bc94 (2:7c94) Music_SafariZone_branch_bc97:: callchannel Music_SafariZone_branch_bca5 octave 4 - note A_, 4 + A_ 4 callchannel Music_SafariZone_branch_bca5 octave 4 - note B_, 4 + B_ 4 loopchannel 0, Music_SafariZone_branch_bc97 Music_SafariZone_branch_bca5:: octave 3 - note A_, 2 + A_ 2 rest 2 octave 4 - note D_, 2 + D_ 2 rest 2 octave 3 - note A_, 2 + A_ 2 rest 2 octave 4 - note D_, 2 + D_ 2 rest 2 octave 3 - note A_, 2 + A_ 2 rest 2 octave 4 - note D_, 2 + D_ 2 rest 2 octave 3 - note A_, 2 + A_ 2 rest 2 endchannel -; 0xbcbb
\ No newline at end of file +; 0xbcbb diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 2906ac4c..c5cb1675 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -6,318 +6,318 @@ Music_SilphCo_Ch1:: ; 7f243 (1f:7243) vibrato 8, 2, 2 notetype 6, 11, 3 octave 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A#, 1 + E_ 1 + F# 1 + G# 1 + A# 1 octave 3 - note C_, 1 + C_ 1 notetype 6, 10, 0 - note C_, 12 + C_ 12 notetype 6, 11, 3 - note C_, 2 + C_ 2 octave 2 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note E_, 2 + B_ 1 + A# 1 + G# 1 + F# 1 + E_ 1 + E_ 2 rest 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 2 Music_SilphCo_branch_7f26d:: - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note A#, 2 + A# 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 2 octave 3 - note C_, 2 + C_ 2 rest 2 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 octave 2 - note A#, 2 + A# 2 rest 6 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 10 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 6, 10, 0 - note B_, 12 + B_ 12 notetype 6, 11, 3 - note B_, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note E_, 1 + B_ 1 + A_ 1 + G_ 1 + F_ 1 + E_ 1 rest 11 - note F_, 1 - note G#, 1 - note A#, 1 - note B_, 1 + F_ 1 + G# 1 + A# 1 + B_ 1 notetype 6, 10, 0 octave 3 - note C_, 12 + C_ 12 notetype 6, 11, 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note G_, 1 - note F_, 1 + B_ 1 + A_ 1 + G_ 1 + F_ 1 rest 11 - note F#, 1 - note B_, 1 + F# 1 + B_ 1 octave 3 - note C_, 1 - note C#, 1 + C_ 1 + C# 1 notetype 6, 10, 0 - note D_, 12 + D_ 12 notetype 6, 11, 3 - note D_, 1 - note C_, 1 + D_ 1 + C_ 1 octave 2 - note A#, 1 - note G_, 1 - note F_, 1 + A# 1 + G_ 1 + F_ 1 rest 11 - note F_, 1 - note G#, 1 - note A#, 1 - note B_, 1 + F_ 1 + G# 1 + A# 1 + B_ 1 notetype 6, 10, 0 octave 3 - note C_, 12 + C_ 12 notetype 6, 11, 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note G#, 1 - note F_, 1 - note E_, 1 + B_ 1 + G# 1 + F_ 1 + E_ 1 rest 7 notetype 6, 8, 0 - note B_, 16 + B_ 16 notetype 6, 11, 0 octave 3 - note E_, 8 + E_ 8 tempo 124 notetype 6, 11, 3 octave 2 - note B_, 2 + B_ 2 rest 10 - note B_, 2 + B_ 2 rest 10 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 16 rest 6 - note A_, 2 + A_ 2 rest 6 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - note A#, 2 - note A_, 2 - note A#, 2 - note B_, 2 - note A#, 2 + B_ 2 + A# 2 + B_ 2 + A# 2 + A_ 2 + A# 2 + B_ 2 + A# 2 callchannel Music_SilphCo_branch_7f3f0 callchannel Music_SilphCo_branch_7f3f0 callchannel Music_SilphCo_branch_7f3f0 rest 4 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 octave 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note A#, 2 + A# 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A#, 2 + A# 2 rest 6 - note A#, 2 + A# 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 octave 3 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 octave 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 octave 3 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 octave 4 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 octave 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 octave 4 - note E_, 2 + E_ 2 rest 6 - note E_, 2 + E_ 2 rest 6 - note D#, 2 + D# 2 rest 6 - note D#, 2 + D# 2 rest 2 octave 2 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 + B_ 1 + A# 1 + G# 1 + F# 1 + E_ 1 notetype 6, 6, 0 - note E_, 16 - note E_, 11 + E_ 16 + E_ 11 notetype 6, 11, 3 - note E_, 1 - note F#, 1 - note G#, 1 - note A#, 1 + E_ 1 + F# 1 + G# 1 + A# 1 octave 3 - note C_, 1 + C_ 1 notetype 6, 3, 15 - note C_, 16 + C_ 16 notetype 6, 10, 0 - note C_, 11 + C_ 11 notetype 6, 9, 3 octave 2 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 + B_ 1 + A# 1 + G# 1 + F# 1 + E_ 1 notetype 6, 3, 15 - note E_, 16 + E_ 16 notetype 6, 9, 0 - note E_, 11 + E_ 11 notetype 6, 11, 3 - note F_, 1 - note G_, 1 - note A#, 1 + F_ 1 + G_ 1 + A# 1 octave 3 - note C_, 1 - note D_, 1 + C_ 1 + D_ 1 notetype 6, 3, 15 - note D_, 16 + D_ 16 notetype 6, 10, 7 - note D_, 11 + D_ 11 rest 4 rest 4 tempo 128 @@ -346,52 +346,52 @@ Music_SilphCo_branch_7f26d:: rest 4 notetype 6, 4, 3 octave 2 - note B_, 2 + B_ 2 rest 6 notetype 6, 6, 3 - note B_, 2 + B_ 2 rest 6 notetype 6, 8, 3 - note B_, 2 + B_ 2 rest 6 notetype 6, 5, 0 - note B_, 8 + B_ 8 notetype 6, 11, 3 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 2 loopchannel 0, Music_SilphCo_branch_7f26d Music_SilphCo_branch_7f3f0:: octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 endchannel @@ -400,382 +400,382 @@ Music_SilphCo_Ch2:: ; 7f409 (1f:7409) duty 3 notetype 6, 12, 3 octave 3 - note E_, 1 - note F#, 1 - note G#, 1 - note A#, 1 + E_ 1 + F# 1 + G# 1 + A# 1 octave 4 - note C_, 1 + C_ 1 notetype 6, 11, 0 - note C_, 12 + C_ 12 notetype 6, 12, 3 - note C_, 2 + C_ 2 octave 3 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note E_, 2 + B_ 1 + A# 1 + G# 1 + F# 1 + E_ 1 + E_ 2 rest 2 octave 2 - note G_, 2 + G_ 2 rest 6 - note F#, 2 + F# 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G#, 2 + G# 2 rest 2 Music_SilphCo_branch_7f42e:: - note E_, 2 + E_ 2 rest 2 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note F#, 2 + F# 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G#, 2 + G# 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 2 notetype 6, 11, 7 duty 2 octave 4 - note E_, 8 - note D#, 8 - note E_, 8 - note F_, 8 - note E_, 8 - note D#, 8 - note D_, 8 - note D#, 8 - note E_, 8 - note F_, 8 - note F#, 8 - note G_, 8 - note G#, 8 - note D#, 8 - note D_, 8 - note D#, 8 + E_ 8 + D# 8 + E_ 8 + F_ 8 + E_ 8 + D# 8 + D_ 8 + D# 8 + E_ 8 + F_ 8 + F# 8 + G_ 8 + G# 8 + D# 8 + D_ 8 + D# 8 duty 3 notetype 6, 6, 15 - note E_, 16 + E_ 16 notetype 6, 12, 0 - note B_, 16 + B_ 16 notetype 6, 12, 4 octave 3 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 + E_ 4 + D# 4 + D_ 4 + D# 4 + E_ 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + D# 4 + D_ 4 + D# 4 notetype 6, 12, 2 duty 1 octave 4 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 + E_ 4 + D# 4 + D_ 4 + D# 4 + E_ 4 notetype 6, 12, 4 duty 3 octave 3 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note D#, 4 - note E_, 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + D# 4 + D_ 4 + D# 4 + E_ 4 + D# 4 + E_ 4 notetype 6, 12, 0 - note F_, 8 + F_ 8 notetype 6, 11, 7 - note F_, 8 + F_ 8 notetype 6, 8, 10 - note F_, 4 + F_ 4 notetype 6, 12, 4 duty 3 - note F_, 4 - note E_, 4 - note F_, 4 + F_ 4 + E_ 4 + F_ 4 notetype 6, 10, 0 - note F#, 8 + F# 8 notetype 6, 11, 0 - note F#, 8 + F# 8 notetype 6, 9, 9 - note F#, 4 + F# 4 notetype 6, 12, 4 - note F#, 4 - note F_, 4 - note F#, 4 + F# 4 + F_ 4 + F# 4 notetype 6, 9, 0 - note G_, 12 + G_ 12 notetype 6, 5, 9 - note G_, 8 + G_ 8 notetype 6, 12, 4 - note G_, 4 - note F#, 4 - note G_, 4 - note F#, 4 - note F_, 4 - note F#, 4 - note F_, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note C#, 4 - note D_, 4 - note D#, 4 - note D_, 4 + G_ 4 + F# 4 + G_ 4 + F# 4 + F_ 4 + F# 4 + F_ 4 + E_ 4 + F_ 4 + E_ 4 + D# 4 + D_ 4 + C# 4 + D_ 4 + D# 4 + D_ 4 notetype 6, 12, 2 duty 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note A_, 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + A_ 4 notetype 6, 11, 4 duty 3 - note D#, 4 - note D_, 4 - note D#, 4 + D# 4 + D_ 4 + D# 4 notetype 6, 12, 2 duty 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note A#, 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + A# 4 notetype 6, 11, 4 duty 3 - note D#, 4 - note D_, 4 - note D#, 4 + D# 4 + D_ 4 + D# 4 notetype 6, 12, 2 duty 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note B_, 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + B_ 4 notetype 6, 11, 4 duty 3 - note D#, 4 - note D_, 4 - note D#, 4 + D# 4 + D_ 4 + D# 4 notetype 6, 12, 2 duty 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 + F_ 4 + F# 4 + G_ 4 + G# 4 octave 4 - note C_, 4 + C_ 4 notetype 6, 11, 4 duty 3 octave 3 - note D#, 4 - note D_, 4 - note D#, 4 + D# 4 + D_ 4 + D# 4 rest 4 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 2 duty 0 octave 4 - note E_, 2 + E_ 2 rest 2 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 duty 3 octave 3 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 2 duty 0 octave 4 - note E_, 2 + E_ 2 rest 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 2 duty 3 octave 3 - note G_, 2 + G_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 notetype 6, 8, 7 octave 5 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 + E_ 4 + D# 4 + D_ 4 + D# 4 + E_ 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + D# 4 + D_ 4 + D# 4 rest 4 notetype 6, 4, 3 octave 2 - note G_, 2 + G_ 2 rest 6 notetype 6, 6, 3 - note F#, 2 + F# 2 rest 6 notetype 6, 8, 3 - note G_, 2 + G_ 2 rest 6 notetype 6, 4, 15 - note G#, 8 + G# 8 notetype 6, 11, 4 - note G_, 2 + G_ 2 rest 6 - note F#, 2 + F# 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G#, 2 + G# 2 rest 2 loopchannel 0, Music_SilphCo_branch_7f42e @@ -785,191 +785,191 @@ Music_SilphCo_Ch3:: ; 7f5be (1f:75be) notetype 12, 1, 1 rest 12 octave 5 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 Music_SilphCo_branch_7f5c9:: - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 1 + E_ 4 + D# 4 + D_ 4 + D# 4 + E_ 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + D# 4 + D_ 4 + D# 4 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G#, 1 + G# 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 5 - note F_, 1 + F_ 1 rest 5 - note F_, 1 + F_ 1 rest 3 - note E_, 1 + E_ 1 rest 11 - note D#, 1 + D# 1 rest 3 - note E_, 1 + E_ 1 rest 5 - note F_, 1 + F_ 1 rest 5 - note F_, 1 + F_ 1 rest 3 - note E_, 1 + E_ 1 rest 11 - note D#, 1 + D# 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 3 - note F_, 1 + F_ 1 rest 3 - note F_, 1 + F_ 1 rest 3 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F_, 1 + F_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note F_, 1 + F_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note D#, 1 + D# 1 rest 3 - note D_, 1 + D_ 1 rest 1 - note D_, 8 - note F_, 8 - note D_, 8 - note F#, 8 - note D_, 8 - note G_, 8 - note D_, 8 - note A_, 8 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 + D_ 8 + F_ 8 + D_ 8 + F# 8 + D_ 8 + G_ 8 + D_ 8 + A_ 8 + E_ 4 + D# 4 + E_ 4 + F_ 4 octave 5 - note E_, 2 - note D#, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note D#, 2 - note D_, 2 - note D#, 2 + E_ 2 + D# 2 + E_ 2 + F_ 2 + E_ 2 + D# 2 + D_ 2 + D# 2 octave 4 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 octave 5 - note E_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note G#, 2 - note D#, 2 - note D_, 2 - note D#, 2 + E_ 2 + F_ 2 + F# 2 + G_ 2 + G# 2 + D# 2 + D_ 2 + D# 2 octave 6 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 + E_ 4 + D# 4 + D_ 4 + D# 4 + E_ 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + D# 4 + D_ 4 + D# 4 notetype 6, 1, 1 rest 4 rest 4 @@ -993,9 +993,9 @@ Music_SilphCo_branch_7f5c9:: rest 4 rest 4 octave 5 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 loopchannel 0, Music_SilphCo_branch_7f5c9 -; 0x7f69d
\ No newline at end of file +; 0x7f69d diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index f1f92ad9..db55e3b6 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -9,101 +9,101 @@ Music_SSAnne_branch_b3b2:: notetype 12, 10, 4 rest 12 octave 3 - note E_, 2 - note F#, 2 - note E_, 4 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 + E_ 2 + F# 2 + E_ 4 + D_ 4 + C# 2 + D_ 2 + E_ 2 rest 2 - note E_, 4 - note F#, 2 - note D_, 2 - note E_, 4 - note F#, 4 - note G#, 4 + E_ 4 + F# 2 + D_ 2 + E_ 4 + F# 4 + G# 4 rest 4 - note E_, 4 - note G#, 4 + E_ 4 + G# 4 rest 4 - note C#, 2 - note E_, 2 - note F#, 4 - note D_, 4 - note E_, 4 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 + C# 2 + E_ 2 + F# 4 + D_ 4 + E_ 4 + D_ 4 + C# 2 + D_ 2 + E_ 2 rest 2 - note E_, 4 - note F#, 2 - note D_, 2 - note E_, 4 - note F#, 4 - note G#, 4 - note F#, 4 - note E_, 4 - note F#, 4 + E_ 4 + F# 2 + D_ 2 + E_ 4 + F# 4 + G# 4 + F# 4 + E_ 4 + F# 4 rest 4 - note C#, 2 - note E_, 2 - note F#, 4 - note D_, 4 - note E_, 4 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 + C# 2 + E_ 2 + F# 4 + D_ 4 + E_ 4 + D_ 4 + C# 2 + D_ 2 + E_ 2 rest 2 - note E_, 4 - note F#, 2 - note D_, 2 - note E_, 4 - note F#, 4 - note G#, 4 - note F#, 8 - note G#, 4 - note E_, 4 + E_ 4 + F# 2 + D_ 2 + E_ 4 + F# 4 + G# 4 + F# 8 + G# 4 + E_ 4 rest 4 - note E_, 4 - note F#, 2 - note E_, 2 - note D_, 4 + E_ 4 + F# 2 + E_ 2 + D_ 4 rest 4 - note D_, 4 - note E_, 4 - note C#, 4 + D_ 4 + E_ 4 + C# 4 rest 4 - note C#, 4 - note D_, 2 - note C#, 2 + C# 4 + D_ 2 + C# 2 octave 2 - note B_, 4 - note E_, 4 - note B_, 4 + B_ 4 + E_ 4 + B_ 4 octave 3 - note D_, 2 + D_ 2 octave 2 - note B_, 2 - note A_, 4 + B_ 2 + A_ 4 rest 4 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 4 + A_ 4 + B_ 2 + A_ 2 + G# 4 rest 4 - note C#, 4 - note G#, 4 - note A_, 4 + C# 4 + G# 4 + A_ 4 rest 4 - note A_, 4 - note B_, 4 - note B_, 4 + A_ 4 + B_ 4 + B_ 4 rest 4 octave 3 - note D_, 8 + D_ 8 loopchannel 0, Music_SSAnne_branch_b3b2 @@ -114,171 +114,171 @@ Music_SSAnne_Ch2:: ; b419 (2:7419) Music_SSAnne_branch_b41e:: notetype 12, 12, 5 octave 3 - note A_, 2 - note E_, 2 - note A_, 4 - note B_, 4 + A_ 2 + E_ 2 + A_ 4 + B_ 4 octave 4 - note D_, 4 + D_ 4 notetype 8, 12, 5 - note C#, 2 - note D_, 2 - note C#, 2 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 3 - note A_, 3 - note B_, 6 - note G#, 6 - note A_, 3 - note B_, 3 + B_ 3 + A_ 3 + B_ 6 + G# 6 + A_ 3 + B_ 3 octave 4 - note C#, 6 - note D_, 6 - note C#, 3 + C# 6 + D_ 6 + C# 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 6 - note D_, 3 - note C#, 3 + E_ 6 + D_ 3 + C# 3 octave 3 - note B_, 6 + B_ 6 octave 4 - note C#, 3 + C# 3 octave 3 - note B_, 3 - note A_, 3 - note E_, 3 - note A_, 6 - note B_, 6 + B_ 3 + A_ 3 + E_ 3 + A_ 6 + B_ 6 octave 4 - note D_, 6 - note C#, 2 - note D_, 2 - note C#, 2 + D_ 6 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 3 - note A_, 3 - note B_, 6 - note G#, 6 - note A_, 3 - note B_, 3 + B_ 3 + A_ 3 + B_ 6 + G# 6 + A_ 3 + B_ 3 octave 4 - note C#, 6 - note D_, 6 - note C#, 3 + C# 6 + D_ 6 + C# 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 6 - note D_, 3 - note C#, 3 + E_ 6 + D_ 3 + C# 3 octave 3 - note B_, 12 - note A_, 3 - note E_, 3 - note A_, 6 - note B_, 6 + B_ 12 + A_ 3 + E_ 3 + A_ 6 + B_ 6 octave 4 - note D_, 6 - note C#, 2 - note D_, 2 - note C#, 2 + D_ 6 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 3 - note A_, 3 - note B_, 6 - note G#, 6 - note A_, 3 - note B_, 3 + B_ 3 + A_ 3 + B_ 6 + G# 6 + A_ 3 + B_ 3 octave 4 - note C#, 6 - note D_, 6 - note C#, 3 + C# 6 + D_ 6 + C# 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 6 - note D_, 3 - note C#, 3 + E_ 6 + D_ 3 + C# 3 octave 3 - note B_, 12 + B_ 12 rest 3 octave 4 - note C#, 3 + C# 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note C#, 3 - note C#, 3 - note D_, 3 - note C#, 3 - note D_, 3 - note E_, 3 + C# 3 + C# 3 + D_ 3 + C# 3 + D_ 3 + E_ 3 octave 3 - note B_, 3 - note G#, 3 - note F#, 3 - note E_, 3 - note F#, 3 - note G#, 3 - note B_, 3 + B_ 3 + G# 3 + F# 3 + E_ 3 + F# 3 + G# 3 + B_ 3 rest 3 - note A_, 3 - note G#, 3 - note A_, 3 - note A_, 3 - note B_, 3 - note A_, 3 - note B_, 3 + A_ 3 + G# 3 + A_ 3 + A_ 3 + B_ 3 + A_ 3 + B_ 3 octave 4 - note C#, 3 + C# 3 octave 3 - note G#, 3 - note F#, 3 - note E_, 3 - note E_, 3 - note F#, 3 - note G#, 3 - note B_, 3 + G# 3 + F# 3 + E_ 3 + E_ 3 + F# 3 + G# 3 + B_ 3 rest 3 - note F#, 3 - note E_, 3 - note F#, 3 - note F#, 3 - note G#, 3 - note F#, 3 - note G#, 3 - note A_, 3 - note E_, 3 - note C#, 3 + F# 3 + E_ 3 + F# 3 + F# 3 + G# 3 + F# 3 + G# 3 + A_ 3 + E_ 3 + C# 3 octave 2 - note B_, 3 - note A_, 3 - note B_, 3 + B_ 3 + A_ 3 + B_ 3 octave 3 - note C#, 3 - note E_, 3 + C# 3 + E_ 3 rest 3 - note F#, 3 - note E_, 3 - note F#, 3 - note F#, 3 - note G#, 3 - note A_, 3 - note B_, 3 + F# 3 + E_ 3 + F# 3 + F# 3 + G# 3 + A_ 3 + B_ 3 octave 4 - note C#, 3 - note D_, 3 - note C#, 3 + C# 3 + D_ 3 + C# 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 3 - note D_, 3 - note C#, 3 + E_ 3 + D_ 3 + C# 3 octave 3 - note B_, 3 + B_ 3 loopchannel 0, Music_SSAnne_branch_b41e @@ -287,53 +287,53 @@ Music_SSAnne_Ch3:: ; b4cb (2:74cb) rest 16 rest 12 octave 4 - note B_, 2 - note G#, 2 - note A_, 8 - note F#, 8 - note G#, 4 + B_ 2 + G# 2 + A_ 8 + F# 8 + G# 4 rest 4 - note B_, 8 - note A_, 8 - note B_, 8 - note A_, 8 - note G#, 8 - note A_, 8 - note F#, 8 - note G#, 8 - note B_, 8 - note A_, 4 - note E_, 4 - note B_, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note G#, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note A_, 4 + B_ 8 + A_ 8 + B_ 8 + A_ 8 + G# 8 + A_ 8 + F# 8 + G# 8 + B_ 8 + A_ 4 + E_ 4 + B_ 4 + E_ 4 + A_ 4 + E_ 4 + G# 4 + E_ 4 + A_ 4 + E_ 4 + F# 4 + G_ 4 + G# 4 + A_ 4 octave 5 - note D_, 8 - note C#, 8 - note C#, 8 + D_ 8 + C# 8 + C# 8 octave 4 - note B_, 8 - note B_, 8 - note A_, 8 - note A_, 8 - note G#, 8 - note G#, 8 - note F#, 8 - note F#, 8 - note E_, 8 - note E_, 8 - note F#, 8 - note F#, 8 - note G#, 8 - note B_, 8 + B_ 8 + B_ 8 + A_ 8 + A_ 8 + G# 8 + G# 8 + F# 8 + F# 8 + E_ 8 + E_ 8 + F# 8 + F# 8 + G# 8 + B_ 8 loopchannel 0, Music_SSAnne_Ch3 -; 0xb504
\ No newline at end of file +; 0xb504 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index a309a7ef..2b829caf 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -7,112 +7,112 @@ Music_Surfing_Ch1:: ; 7fa19 (1f:7a19) notetype 12, 11, 5 rest 6 octave 2 - note A_, 2 - note G#, 3 - note F#, 1 - note E_, 6 + A_ 2 + G# 3 + F# 1 + E_ 6 octave 3 - note G#, 2 - note F#, 2 - note G#, 4 + G# 2 + F# 2 + G# 4 Music_Surfing_branch_7fa30:: notetype 12, 11, 2 - note E_, 2 - note E_, 4 - note E_, 2 - note E_, 4 - note D_, 2 - note D_, 4 - note D_, 2 - note D_, 4 - note D_, 2 - note D_, 4 + E_ 2 + E_ 4 + E_ 2 + E_ 4 + D_ 2 + D_ 4 + D_ 2 + D_ 4 + D_ 2 + D_ 4 notetype 12, 11, 1 - note F#, 3 + F# 3 notetype 12, 11, 2 - note D_, 3 - note E_, 2 - note E_, 4 - note E_, 2 - note E_, 4 - note A_, 2 - note A_, 4 - note G#, 2 - note G#, 4 - note F#, 2 - note F#, 4 - note E_, 2 - note E_, 4 - note G#, 2 - note G#, 4 + D_ 3 + E_ 2 + E_ 4 + E_ 2 + E_ 4 + A_ 2 + A_ 4 + G# 2 + G# 4 + F# 2 + F# 4 + E_ 2 + E_ 4 + G# 2 + G# 4 notetype 12, 11, 1 - note F#, 3 + F# 3 notetype 12, 11, 2 - note G#, 1 + G# 1 notetype 12, 11, 4 - note A_, 2 - note B_, 2 + A_ 2 + B_ 2 octave 4 - note C_, 2 + C_ 2 notetype 12, 11, 7 - note C#, 6 + C# 6 notetype 12, 11, 3 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + G# 2 + A_ 2 + G# 2 + F# 2 + G# 2 + F# 2 + E_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + B_ 2 octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note B_, 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + G# 2 + A_ 2 + G# 2 + A_ 2 + E_ 2 + G# 2 + B_ 2 octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 4 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 4 loopchannel 0, Music_Surfing_branch_7fa30 @@ -121,85 +121,85 @@ Music_Surfing_Ch2:: ; 7fa9c (1f:7a9c) vibrato 16, 2, 5 notetype 12, 12, 6 octave 3 - note A_, 2 - note G#, 3 - note F#, 1 - note E_, 6 - note G#, 6 + A_ 2 + G# 3 + F# 1 + E_ 6 + G# 6 octave 4 - note E_, 2 - note D_, 2 + E_ 2 + D_ 2 octave 3 - note B_, 2 + B_ 2 Music_Surfing_branch_7faae:: notetype 12, 12, 6 octave 4 - note E_, 6 - note C#, 5 - note E_, 1 - note D_, 6 + E_ 6 + C# 5 + E_ 1 + D_ 6 octave 3 - note B_, 6 + B_ 6 octave 4 - note D_, 6 + D_ 6 octave 3 - note B_, 2 + B_ 2 notetype 12, 12, 1 octave 4 - note F#, 3 + F# 3 notetype 12, 12, 6 - note D_, 1 - note E_, 6 - note C#, 6 - note E_, 6 - note C#, 5 - note E_, 1 - note F#, 6 - note D_, 6 - note F#, 6 - note E_, 2 + D_ 1 + E_ 6 + C# 6 + E_ 6 + C# 5 + E_ 1 + F# 6 + D_ 6 + F# 6 + E_ 2 notetype 12, 12, 1 - note F#, 3 + F# 3 notetype 12, 12, 6 - note E_, 1 - note A_, 6 - note A_, 6 - note B_, 2 - note A_, 3 - note D_, 1 - note F#, 6 - note E_, 2 - note F#, 3 - note E_, 1 - note C#, 6 - note D_, 2 - note C#, 3 + E_ 1 + A_ 6 + A_ 6 + B_ 2 + A_ 3 + D_ 1 + F# 6 + E_ 2 + F# 3 + E_ 1 + C# 6 + D_ 2 + C# 3 octave 3 - note B_, 1 + B_ 1 octave 4 - note F#, 6 - note E_, 2 - note D#, 3 - note E_, 1 - note A_, 6 - note B_, 2 - note A_, 3 - note D_, 1 - note F#, 6 - note E_, 2 - note F#, 3 - note G#, 1 - note A_, 6 - note G#, 2 - note F#, 3 - note E_, 1 - note G#, 6 - note A_, 2 - note G#, 3 - note A_, 1 + F# 6 + E_ 2 + D# 3 + E_ 1 + A_ 6 + B_ 2 + A_ 3 + D_ 1 + F# 6 + E_ 2 + F# 3 + G# 1 + A_ 6 + G# 2 + F# 3 + E_ 1 + G# 6 + A_ 2 + G# 3 + A_ 1 octave 5 - note C#, 6 + C# 6 loopchannel 0, Music_Surfing_branch_7faae @@ -207,130 +207,130 @@ Music_Surfing_Ch3:: ; 7fafa (1f:7afa) notetype 12, 1, 0 rest 12 octave 5 - note E_, 6 + E_ 6 octave 4 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 Music_Surfing_branch_7fb03:: octave 3 - note A_, 2 + A_ 2 octave 4 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 + E_ 2 + A_ 2 + A_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note G#, 2 + G# 2 + G# 2 + E_ 2 + G# 2 + G# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 1 + G# 2 + G# 2 + E_ 2 + G# 1 rest 2 - note E_, 1 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 + E_ 1 + C# 2 + A_ 2 + A_ 2 + E_ 2 + A_ 2 + A_ 2 + C# 2 + A_ 2 + A_ 2 + E_ 2 + A_ 2 + A_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note G#, 2 + G# 2 + G# 2 + E_ 2 + G# 2 + G# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 1 + G# 2 + G# 2 + E_ 2 + G# 1 rest 2 - note E_, 1 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note D_, 2 - note F#, 2 - note F#, 2 + E_ 1 + C# 2 + A_ 2 + A_ 2 + E_ 2 + A_ 2 + A_ 2 + D_ 2 + F# 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note F#, 2 - note F#, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note G#, 2 + F# 2 + F# 2 + E_ 2 + A_ 2 + A_ 2 + C# 2 + A_ 2 + A_ 2 + E_ 2 + G# 2 + G# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note A_, 2 + G# 2 + G# 2 + E_ 2 + A_ 2 + A_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note A_, 2 - note A_, 2 - note D_, 2 - note F#, 2 - note F#, 2 + A_ 2 + A_ 2 + D_ 2 + F# 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note F#, 2 - note F#, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note G#, 2 + F# 2 + F# 2 + E_ 2 + A_ 2 + A_ 2 + C# 2 + A_ 2 + A_ 2 + E_ 2 + G# 2 + G# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note D_, 2 - note E_, 2 + G# 2 + G# 2 + E_ 2 + A_ 2 + A_ 2 + C# 2 + D_ 2 + E_ 2 loopchannel 0, Music_Surfing_branch_7fb03 -; 0x7fb7d
\ No newline at end of file +; 0x7fb7d diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index e4c46df4..359ff877 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -5,152 +5,152 @@ Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0) duty 3 notetype 12, 12, 1 octave 2 - note E_, 1 - note G_, 1 - note B_, 1 + E_ 1 + G_ 1 + B_ 1 octave 3 - note D_, 1 + D_ 1 octave 2 - note G_, 4 - note G_, 6 - note G_, 1 - note G_, 1 - note G_, 4 - note G_, 4 - note G_, 4 + G_ 4 + G_ 6 + G_ 1 + G_ 1 + G_ 4 + G_ 4 + G_ 4 notetype 8, 12, 1 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note F#, 2 + A_ 2 + A_ 2 + A_ 2 + A_ 2 + A_ 2 + F# 2 Music_TitleScreen_branch_7e4e2:: callchannel Music_TitleScreen_branch_7e541 callchannel Music_TitleScreen_branch_7e54a callchannel Music_TitleScreen_branch_7e541 octave 3 - note C_, 8 + C_ 8 notetype 8, 12, 6 - note E_, 4 - note E_, 4 - note C_, 4 + E_ 4 + E_ 4 + C_ 4 notetype 12, 12, 6 octave 2 - note B_, 8 + B_ 8 notetype 8, 14, 7 octave 3 - note F_, 4 - note E_, 4 - note C_, 4 + F_ 4 + E_ 4 + C_ 4 notetype 12, 14, 7 - note D_, 10 + D_ 10 notetype 12, 12, 6 octave 2 - note B_, 2 + B_ 2 octave 3 - note C_, 2 - note D_, 2 + C_ 2 + D_ 2 callchannel Music_TitleScreen_branch_7e541 callchannel Music_TitleScreen_branch_7e54a callchannel Music_TitleScreen_branch_7e541 - note C_, 6 - note C_, 6 - note E_, 4 - note D_, 6 - note F_, 2 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 6 - note A_, 4 - note F_, 2 - note A_, 2 + C_ 6 + C_ 6 + E_ 4 + D_ 6 + F_ 2 + G_ 2 + D_ 4 + G_ 2 + G_ 6 + A_ 4 + F_ 2 + A_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note D_, 12 - note E_, 4 - note F_, 8 - note G_, 4 - note F_, 4 - note E_, 12 - note F_, 4 - note G_, 8 + D_ 12 + E_ 4 + F_ 8 + G_ 4 + F_ 4 + E_ 12 + F_ 4 + G_ 8 notetype 12, 11, 6 octave 4 - note C_, 4 - note C#, 4 + C_ 4 + C# 4 callchannel Music_TitleScreen_branch_7e55c notetype 8, 11, 4 octave 4 - note C_, 4 - note C_, 4 - note C#, 4 + C_ 4 + C_ 4 + C# 4 callchannel Music_TitleScreen_branch_7e55c notetype 8, 11, 2 octave 3 - note E_, 4 - note E_, 4 - note C#, 4 + E_ 4 + E_ 4 + C# 4 loopchannel 0, Music_TitleScreen_branch_7e4e2 Music_TitleScreen_branch_7e541:: notetype 12, 12, 6 octave 3 - note D_, 6 + D_ 6 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 8 + D_ 8 endchannel Music_TitleScreen_branch_7e54a:: - note C_, 6 - note F_, 6 - note C_, 4 - note D_, 8 + C_ 6 + F_ 6 + C_ 4 + D_ 8 notetype 12, 14, 7 - note F_, 6 - note E_, 1 - note D#, 1 - note D_, 8 + F_ 6 + E_ 1 + D# 1 + D_ 8 notetype 8, 12, 6 - note C_, 4 + C_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note C_, 4 + C_ 4 endchannel Music_TitleScreen_branch_7e55c:: notetype 12, 12, 1 - note D_, 1 + D_ 1 rest 1 octave 2 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 endchannel @@ -159,194 +159,194 @@ Music_TitleScreen_Ch2:: ; 7e578 (1f:6578) duty 1 notetype 12, 14, 1 octave 2 - note G_, 1 - note B_, 1 + G_ 1 + B_ 1 octave 3 - note D_, 1 - note F#, 1 - note G_, 4 - note G_, 6 - note G_, 1 - note G_, 1 - note G_, 4 - note G_, 4 - note G_, 4 + D_ 1 + F# 1 + G_ 4 + G_ 6 + G_ 1 + G_ 1 + G_ 4 + G_ 4 + G_ 4 notetype 8, 14, 1 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note F#, 2 + F_ 2 + F_ 2 + F_ 2 + F_ 2 + F_ 2 + F# 2 Music_TitleScreen_branch_7e594:: vibrato 16, 4, 6 callchannel Music_TitleScreen_branch_7e622 octave 2 - note A_, 4 - note F_, 4 + A_ 4 + F_ 4 callchannel Music_TitleScreen_branch_7e62c octave 2 - note A_, 8 - note B_, 16 + A_ 8 + B_ 16 callchannel Music_TitleScreen_branch_7e622 octave 2 - note A_, 6 - note F_, 2 + A_ 6 + F_ 2 notetype 8, 14, 7 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 notetype 12, 14, 7 - note D_, 8 + D_ 8 notetype 12, 9, 5 octave 2 - note D_, 6 - note D_, 1 - note F#, 1 - note G_, 16 + D_ 6 + D_ 1 + F# 1 + G_ 16 callchannel Music_TitleScreen_branch_7e622 octave 2 - note A_, 2 - note F_, 6 + A_ 2 + F_ 6 callchannel Music_TitleScreen_branch_7e62c octave 3 - note C_, 2 + C_ 2 octave 2 - note A_, 6 - note B_, 6 - note G_, 2 - note F_, 8 + A_ 6 + B_ 6 + G_ 2 + F_ 8 callchannel Music_TitleScreen_branch_7e622 notetype 8, 9, 5 octave 2 - note G_, 4 - note F_, 5 - note A_, 3 + G_ 4 + F_ 5 + A_ 3 notetype 8, 14, 6 octave 4 - note F_, 4 - note E_, 4 - note F_, 4 + F_ 4 + E_ 4 + F_ 4 notetype 12, 14, 7 - note G_, 6 - note A#, 2 - note G_, 8 + G_ 6 + A# 2 + G_ 8 vibrato 16, 2, 6 duty 3 notetype 12, 0, 11 - note G_, 8 + G_ 8 notetype 12, 14, 7 - note A_, 8 + A_ 8 duty 1 notetype 12, 14, 7 - note A#, 6 - note F_, 2 - note F_, 8 + A# 6 + F_ 2 + F_ 8 octave 3 - note D_, 8 + D_ 8 octave 4 - note A#, 4 - note B_, 4 + A# 4 + B_ 4 octave 5 - note C_, 6 + C_ 6 octave 4 - note G_, 2 - note G_, 8 + G_ 2 + G_ 8 octave 3 - note E_, 8 + E_ 8 notetype 12, 13, 7 octave 5 - note C_, 4 - note C#, 4 + C_ 4 + C# 4 callchannel Music_TitleScreen_branch_7e636 rest 3 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 notetype 8, 14, 5 octave 5 - note C_, 4 - note C_, 4 - note C#, 4 + C_ 4 + C_ 4 + C# 4 callchannel Music_TitleScreen_branch_7e636 - note D_, 1 + D_ 1 rest 2 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 notetype 8, 14, 3 octave 5 - note C_, 4 - note C_, 4 + C_ 4 + C_ 4 octave 4 - note B_, 4 + B_ 4 loopchannel 0, Music_TitleScreen_branch_7e594 Music_TitleScreen_branch_7e622:: notetype 12, 14, 7 octave 3 - note G_, 6 - note B_, 2 + G_ 6 + B_ 2 octave 4 - note D_, 8 + D_ 8 notetype 12, 9, 5 endchannel Music_TitleScreen_branch_7e62c:: notetype 12, 14, 7 octave 4 - note F_, 6 - note E_, 1 - note D#, 1 - note D_, 8 + F_ 6 + E_ 1 + D# 1 + D_ 8 notetype 12, 9, 5 endchannel Music_TitleScreen_branch_7e636:: notetype 12, 14, 1 - note D_, 1 + D_ 1 rest 2 octave 4 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 endchannel Music_TitleScreen_Ch3:: ; 7e643 (1f:6643) notetype 12, 1, 0 octave 3 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 5 - note G_, 1 - note G_, 1 - note G_, 1 + G_ 1 + G_ 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 notetype 8, 1, 0 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note A_, 2 + F_ 2 + F_ 2 + F_ 2 + F_ 2 + F_ 2 + A_ 2 Music_TitleScreen_branch_7e65e:: callchannel Music_TitleScreen_branch_7e6c9 @@ -359,102 +359,102 @@ Music_TitleScreen_branch_7e664:: callchannel Music_TitleScreen_branch_7e6d0 loopchannel 3, Music_TitleScreen_branch_7e664 callchannel Music_TitleScreen_branch_7e6c9 - note G_, 6 - note D_, 3 - note A_, 6 - note F_, 3 - note A_, 3 - note F_, 3 + G_ 6 + D_ 3 + A_ 6 + F_ 3 + A_ 3 + F_ 3 callchannel Music_TitleScreen_branch_7e6d7 - note A#, 3 - note F_, 3 + A# 3 + F_ 3 callchannel Music_TitleScreen_branch_7e6d7 - note B_, 3 - note G_, 3 + B_ 3 + G_ 3 callchannel Music_TitleScreen_branch_7e6dc octave 4 - note C_, 3 + C_ 3 octave 3 - note G_, 3 + G_ 3 callchannel Music_TitleScreen_branch_7e6dc octave 4 - note C#, 3 + C# 3 octave 3 - note A_, 3 + A_ 3 callchannel Music_TitleScreen_branch_7e6e5 octave 5 pitchbend 0, 66 - note D_, 4 + D_ 4 rest 4 octave 6 pitchbend 0, 50 - note D_, 4 + D_ 4 octave 5 pitchbend 0, 66 - note D_, 4 + D_ 4 rest 2 notetype 8, 1, 0 octave 4 - note C_, 4 - note C_, 4 - note C#, 4 + C_ 4 + C_ 4 + C# 4 callchannel Music_TitleScreen_branch_7e6e5 octave 6 pitchbend 0, 50 - note D_, 4 + D_ 4 rest 4 octave 5 pitchbend 0, 66 - note D_, 4 + D_ 4 rest 6 notetype 8, 1, 0 octave 4 - note C_, 4 - note C_, 4 + C_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 loopchannel 0, Music_TitleScreen_branch_7e65e Music_TitleScreen_branch_7e6c9:: - note G_, 6 - note D_, 3 - note G_, 6 - note D_, 3 - note G_, 3 - note D_, 3 + G_ 6 + D_ 3 + G_ 6 + D_ 3 + G_ 3 + D_ 3 endchannel Music_TitleScreen_branch_7e6d0:: - note F_, 6 - note C_, 3 - note F_, 6 - note C_, 3 - note F_, 3 - note C_, 3 + F_ 6 + C_ 3 + F_ 6 + C_ 3 + F_ 3 + C_ 3 endchannel Music_TitleScreen_branch_7e6d7:: - note A#, 6 - note F_, 3 - note A#, 6 - note F_, 3 + A# 6 + F_ 3 + A# 6 + F_ 3 endchannel Music_TitleScreen_branch_7e6dc:: octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 3 + G_ 3 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 3 + G_ 3 endchannel Music_TitleScreen_branch_7e6e5:: notetype 12, 1, 0 octave 4 - note D_, 1 + D_ 1 rest 5 endchannel @@ -462,217 +462,217 @@ Music_TitleScreen_branch_7e6e5:: Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb) dspeed 6 rest 4 - dnote 1, snare3 - dnote 1, snare3 - dnote 1, snare4 - dnote 1, snare4 + snare3 1 + snare3 1 + snare4 1 + snare4 1 dspeed 12 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare2 - dnote 1, snare2 + snare2 1 + snare2 1 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 3 dspeed 8 - dnote 2, snare3 - dnote 2, snare4 - dnote 2, snare2 - dnote 2, snare3 - dnote 2, snare2 - dnote 2, snare1 + snare3 2 + snare4 2 + snare2 2 + snare3 2 + snare2 2 + snare1 2 Music_TitleScreen_branch_7e716:: dspeed 12 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare2 - dnote 1, snare3 + snare2 1 + snare2 1 + snare3 1 rest 3 callchannel Music_TitleScreen_branch_7e834 callchannel Music_TitleScreen_branch_7e834 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare2 - dnote 1, snare3 + snare2 1 + snare2 1 + snare3 1 rest 1 - dnote 1, snare3 - dnote 1, snare2 + snare3 1 + snare2 1 callchannel Music_TitleScreen_branch_7e842 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 1 - dnote 1, snare2 + snare2 1 rest 1 callchannel Music_TitleScreen_branch_7e842 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 1 dspeed 6 - dnote 1, snare3 - dnote 1, snare3 - dnote 1, snare4 - dnote 1, snare4 + snare3 1 + snare3 1 + snare4 1 + snare4 1 dspeed 12 callchannel Music_TitleScreen_branch_7e834 callchannel Music_TitleScreen_branch_7e842 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare2 + snare3 1 + snare2 1 + snare2 1 rest 1 - dnote 1, snare3 - dnote 1, snare2 + snare3 1 + snare2 1 callchannel Music_TitleScreen_branch_7e834 callchannel Music_TitleScreen_branch_7e842 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare2 + snare3 1 + snare2 1 + snare2 1 rest 1 - dnote 1, snare4 - dnote 1, snare3 - dnote 1, snare2 + snare4 1 + snare3 1 + snare2 1 rest 3 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare2 - dnote 1, snare4 - dnote 1, snare2 + snare2 1 + snare4 1 + snare2 1 rest 1 dspeed 6 - dnote 1, snare3 - dnote 1, snare3 - dnote 1, snare4 - dnote 1, snare4 + snare3 1 + snare3 1 + snare4 1 + snare4 1 dspeed 12 - dnote 1, snare1 + snare1 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare1 + snare3 1 + snare2 1 + snare1 1 rest 3 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare3 + snare3 1 + snare2 1 + snare3 1 rest 3 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare4 + snare2 1 + snare3 1 + snare4 1 rest 1 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare2 + snare3 1 + snare2 1 + snare2 1 rest 3 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 3 - dnote 1, snare5 + snare5 1 rest 5 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare1 + snare3 1 + snare2 1 + snare1 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 1 - dnote 1, snare1 + snare1 1 rest 1 dspeed 8 - dnote 4, snare2 - dnote 4, snare3 - dnote 4, snare1 + snare2 4 + snare3 4 + snare1 4 dspeed 12 - dnote 1, snare5 + snare5 1 rest 5 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare3 + snare3 1 + snare2 1 + snare3 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare1 + snare2 1 + snare3 1 + snare1 1 rest 1 - dnote 1, snare3 - dnote 1, snare2 + snare3 1 + snare2 1 dspeed 8 - dnote 4, snare2 - dnote 4, snare3 - dnote 4, snare2 + snare2 4 + snare3 4 + snare2 4 loopchannel 0, Music_TitleScreen_branch_7e716 Music_TitleScreen_branch_7e834:: - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 3 endchannel Music_TitleScreen_branch_7e842:: - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare2 + snare3 1 + snare2 1 + snare2 1 rest 3 endchannel -; 0x7e850
\ No newline at end of file +; 0x7e850 diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index be5f12ce..52642fdc 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -7,645 +7,645 @@ Music_TrainerBattle_Ch1:: ; 22919 (8:6919) notetype 12, 11, 2 rest 8 octave 3 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - octave 3 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 4 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 2 - note C#, 2 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 4 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 2 - note C#, 2 + F_ 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + C# 1 + C_ 1 + C# 1 + C_ 1 + octave 2 + B_ 1 + octave 3 + C_ 1 + octave 2 + B_ 1 + A# 1 + B_ 1 + A# 1 + A_ 1 + A# 1 + octave 3 + D_ 6 + E_ 6 + F_ 4 + D_ 2 + E_ 4 + F_ 6 + C_ 4 + D_ 6 + E_ 6 + F_ 4 + D_ 2 + E_ 4 + F_ 6 + C_ 2 + C# 2 + D_ 6 + E_ 6 + F_ 4 + D_ 2 + E_ 4 + F_ 6 + C_ 4 + D_ 6 + E_ 6 + F_ 4 + D_ 2 + E_ 4 + F_ 6 + C_ 2 + C# 2 Music_TrainerBattle_branch_22962:: notetype 12, 11, 5 - note D_, 2 - note E_, 4 - note C#, 2 - note D_, 4 - octave 2 - note B_, 4 - note F#, 4 - octave 3 - note E_, 2 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 - note F_, 8 + D_ 2 + E_ 4 + C# 2 + D_ 4 + octave 2 + B_ 4 + F# 4 + octave 3 + E_ 2 + D_ 4 + C# 2 + D_ 2 + E_ 2 + F_ 8 notetype 12, 11, 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C_ 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C_ 1 notetype 12, 11, 5 - note D_, 2 - note E_, 4 - note C#, 2 - note D_, 4 + D_ 2 + E_ 4 + C# 2 + D_ 4 octave 2 - note B_, 4 - note F#, 4 + B_ 4 + F# 4 octave 3 - note E_, 2 - note D_, 4 - note C#, 2 + E_ 2 + D_ 4 + C# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 + C# 2 notetype 12, 10, 7 - note D_, 8 - note C#, 8 + D_ 8 + C# 8 octave 2 - note B_, 8 + B_ 8 octave 3 - note C#, 8 + C# 8 notetype 12, 11, 5 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 2 - note B_, 2 - note A_, 2 - note G_, 2 + B_ 2 + A_ 2 + G_ 2 rest 2 octave 3 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 2 - note B_, 2 - note A_, 2 - note G_, 2 + B_ 2 + A_ 2 + G_ 2 rest 2 octave 3 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note E_, 4 + C# 2 + E_ 4 octave 2 - note G_, 1 - note A_, 1 - note B_, 1 + G_ 1 + A_ 1 + B_ 1 octave 3 - note C#, 1 - note D_, 4 + C# 1 + D_ 4 octave 2 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 1 + F# 1 + G_ 1 + A_ 1 + B_ 1 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 1 - note A_, 1 - note B_, 1 + G_ 1 + A_ 1 + B_ 1 octave 3 - note C#, 1 - note D_, 4 + C# 1 + D_ 4 octave 2 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 1 + F# 1 + G_ 1 + A_ 1 + B_ 1 octave 3 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 2 - note B_, 2 - note A_, 2 - note G_, 2 + B_ 2 + A_ 2 + G_ 2 rest 2 octave 3 - note D_, 2 - note C#, 2 - octave 2 - note B_, 2 - note A_, 2 - note B_, 2 - note G_, 2 - octave 3 - note D_, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 2 + D_ 2 + C# 2 + octave 2 + B_ 2 + A_ 2 + B_ 2 + G_ 2 + octave 3 + D_ 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 + B_ 2 + A_ 2 + G_ 2 + A_ 2 rest 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + A_ 2 + B_ 2 + A_ 2 + G_ 2 + F# 2 + G_ 2 + A_ 2 + E_ 2 + G_ 2 + F# 2 + octave 2 + B_ 1 + octave 3 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + octave 3 + B_ 1 + A# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + octave 3 + B_ 1 + A# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + octave 3 + B_ 1 + A# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note B_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + octave 3 + B_ 1 + A# 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - octave 3 - note A_, 4 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + octave 3 + A_ 4 octave 4 - note D_, 4 - octave 3 - note A_, 2 - note D_, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A#, 1 - note B_, 2 + D_ 4 + octave 3 + A_ 2 + D_ 1 + E_ 1 + F# 1 + G_ 1 + G# 1 + A# 1 + B_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G_, 2 - note B_, 2 - note F_, 2 - note G_, 2 - note A_, 2 + G_ 2 + B_ 2 + F_ 2 + G_ 2 + A_ 2 octave 4 - note C_, 2 - note D_, 2 + C_ 2 + D_ 2 rest 2 octave 3 - note A_, 4 + A_ 4 octave 4 - note C_, 4 - note D_, 2 + C_ 4 + D_ 2 octave 3 - note F_, 1 - note G_, 1 - note A_, 1 - note B_, 1 + F_ 1 + G_ 1 + A_ 1 + B_ 1 octave 4 - note C_, 1 - note D_, 1 - note E_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 + C_ 1 + D_ 1 + E_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 octave 3 - note B_, 2 - note C_, 2 + B_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note C_, 2 - note E_, 2 - note D_, 2 + C_ 2 + E_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note D_, 2 - note F_, 2 - note C_, 2 + D_ 2 + F_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note C_, 2 - note E_, 2 - note D_, 2 + C_ 2 + E_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note D_, 2 - note F_, 2 - note D_, 16 - note C_, 16 + D_ 2 + F_ 2 + D_ 16 + C_ 16 octave 2 - note A#, 16 - note G_, 12 + A# 16 + G_ 12 octave 3 - note D_, 1 - note E_, 1 - note G_, 1 + D_ 1 + E_ 1 + G_ 1 octave 4 - note C_, 1 - note D_, 8 - note F_, 8 + C_ 1 + D_ 8 + F_ 8 octave 3 - note A#, 8 + A# 8 octave 4 - note C_, 8 - note D_, 8 - note E_, 8 - note F_, 8 - note G_, 8 - note E_, 2 + C_ 8 + D_ 8 + E_ 8 + F_ 8 + G_ 8 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 2 octave 3 - note C_, 2 - note D_, 4 + C_ 2 + D_ 4 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 4 + C# 4 rest 2 - note C#, 1 - note D_, 1 - note E_, 1 + C# 1 + D_ 1 + E_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 octave 2 - note B_, 1 + B_ 1 rest 1 octave 3 - note C#, 1 + C# 1 rest 9 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 rest 5 - note C#, 1 - note D_, 1 - note E_, 1 + C# 1 + D_ 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note D_, 2 - note E_, 2 - note F_, 2 - note G_, 2 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 + D_ 2 + E_ 2 + F_ 2 + G_ 2 + D# 1 + E_ 1 + F_ 1 + F# 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 rest 9 - note F#, 2 - note E_, 4 - note D#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note E_, 8 - note F#, 8 - note G_, 8 + F# 2 + E_ 4 + D# 2 + E_ 2 + F# 2 + G# 2 + E_ 8 + F# 8 + G_ 8 octave 4 - note C_, 4 + C_ 4 octave 3 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 + G_ 1 + G# 1 + A_ 1 + A# 1 loopchannel 0, Music_TrainerBattle_branch_22962 @@ -654,302 +654,302 @@ Music_TrainerBattle_Ch2:: ; 22bae (8:6bae) vibrato 10, 2, 5 notetype 12, 12, 2 octave 4 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note A_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note A_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note A_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note A_, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note A_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note A_, 1 - note C_, 1 - note C#, 1 - note C_, 1 - note A_, 1 - octave 3 - note B_, 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + A_ 1 + F_ 1 + F# 1 + F_ 1 + A_ 1 + E_ 1 + F_ 1 + E_ 1 + A_ 1 + D# 1 + E_ 1 + D# 1 + A_ 1 + D_ 1 + D# 1 + D_ 1 + A_ 1 + C# 1 + D_ 1 + C# 1 + A_ 1 + C_ 1 + C# 1 + C_ 1 + A_ 1 + octave 3 + B_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 1 + B_ 1 notetype 12, 14, 1 octave 4 - note B_, 16 + B_ 16 rest 16 notetype 12, 13, 1 - note B_, 16 + B_ 16 rest 12 - note A_, 4 + A_ 4 notetype 12, 12, 2 octave 3 - note B_, 6 + B_ 6 octave 4 - note C#, 6 - note D_, 4 + C# 6 + D_ 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 4 - note D_, 6 - note A_, 2 - note A#, 2 - note B_, 6 + C# 4 + D_ 6 + A_ 2 + A# 2 + B_ 6 octave 5 - note C#, 6 - note D_, 4 + C# 6 + D_ 4 octave 4 - note B_, 2 + B_ 2 octave 5 - note C#, 4 - note D_, 6 + C# 4 + D_ 6 octave 4 - note A_, 4 + A_ 4 Music_TrainerBattle_branch_22bfc:: notetype 12, 12, 7 octave 3 - note B_, 6 - note F#, 14 - note B_, 4 - note F#, 4 - note B_, 4 + B_ 6 + F# 14 + B_ 4 + F# 4 + B_ 4 notetype 12, 5, 0 octave 4 - note C_, 8 + C_ 8 notetype 12, 3, 0 - note C_, 8 + C_ 8 notetype 12, 4, 14 - note C_, 8 + C_ 8 notetype 12, 12, 7 - note C_, 8 + C_ 8 octave 3 - note B_, 6 - note F#, 14 - note B_, 4 - note F#, 4 - note B_, 4 + B_ 6 + F# 14 + B_ 4 + F# 4 + B_ 4 notetype 12, 9, 0 - note A_, 8 + A_ 8 notetype 12, 5, 0 - note A_, 8 + A_ 8 notetype 12, 4, 0 - note A_, 8 + A_ 8 notetype 12, 3, 0 - note A_, 8 + A_ 8 notetype 12, 12, 7 - note G_, 16 + G_ 16 octave 4 - note D_, 8 + D_ 8 octave 3 - note G_, 8 + G_ 8 notetype 12, 8, 0 - note A_, 8 + A_ 8 notetype 12, 5, 0 - note A_, 8 + A_ 8 notetype 12, 4, 0 - note A_, 8 + A_ 8 notetype 12, 6, 0 - note A_, 8 + A_ 8 notetype 12, 12, 7 - note G_, 16 + G_ 16 octave 4 - note E_, 8 - note F#, 8 - note E_, 16 + E_ 8 + F# 8 + E_ 16 notetype 12, 12, 5 - note G_, 4 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 + G_ 4 + A_ 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 2 notetype 12, 11, 7 - note F#, 8 + F# 8 notetype 12, 5, 0 - note F#, 8 + F# 8 notetype 12, 6, 0 - note F#, 8 + F# 8 notetype 12, 7, 0 - note F#, 8 + F# 8 notetype 12, 10, 0 - note G_, 8 + G_ 8 notetype 12, 10, 7 - note G_, 8 + G_ 8 notetype 12, 11, 7 - note G_, 4 + G_ 4 notetype 12, 12, 5 - note A_, 2 - note G_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 + A_ 2 + G_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 notetype 12, 10, 0 - note G#, 8 + G# 8 notetype 12, 7, 0 - note G#, 8 + G# 8 notetype 12, 8, 0 - note G#, 8 + G# 8 notetype 12, 6, 0 - note G#, 8 + G# 8 notetype 12, 10, 0 - note A_, 16 + A_ 16 notetype 12, 11, 0 octave 5 - note C#, 8 - note E_, 8 + C# 8 + E_ 8 notetype 12, 12, 0 - note D_, 4 + D_ 4 octave 4 - note A_, 4 + A_ 4 octave 5 - note C_, 2 + C_ 2 notetype 12, 12, 7 octave 4 - note B_, 8 + B_ 8 notetype 12, 6, 0 - note B_, 8 + B_ 8 notetype 12, 6, 9 - note B_, 6 + B_ 6 notetype 12, 9, 6 - note B_, 6 + B_ 6 rest 2 notetype 12, 12, 0 octave 5 - note D_, 4 + D_ 4 octave 4 - note A_, 4 - note A#, 2 + A_ 4 + A# 2 notetype 12, 11, 0 octave 5 - note F_, 14 + F_ 14 notetype 12, 6, 0 - note G_, 16 + G_ 16 notetype 12, 5, 0 - note E_, 16 + E_ 16 notetype 12, 4, 0 - note E_, 16 + E_ 16 notetype 12, 12, 7 octave 4 - note C_, 6 + C_ 6 octave 3 - note A_, 14 + A_ 14 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note A#, 6 + A# 6 octave 4 - note F_, 14 + F_ 14 octave 3 - note A#, 4 + A# 4 octave 4 - note F_, 4 - note D_, 4 - note C_, 6 + F_ 4 + D_ 4 + C_ 6 octave 3 - note A_, 14 + A_ 14 octave 4 - note C_, 4 - note E_, 2 - note D_, 2 - note C_, 2 - note E_, 2 - note D_, 2 - octave 3 - note A#, 4 + C_ 4 + E_ 2 + D_ 2 + C_ 2 + E_ 2 + D_ 2 + octave 3 + A# 4 octave 4 - note F_, 10 - note G_, 6 - note F_, 6 - note D_, 4 + F_ 10 + G_ 6 + F_ 6 + D_ 4 notetype 12, 11, 0 - note F_, 16 - note E_, 16 - note D_, 16 - note E_, 16 + F_ 16 + E_ 16 + D_ 16 + E_ 16 notetype 12, 10, 0 octave 5 - note F_, 16 - note E_, 16 - note G_, 16 - note F_, 16 + F_ 16 + E_ 16 + G_ 16 + F_ 16 notetype 12, 13, 1 octave 3 - note A#, 6 - note A#, 6 - note A#, 4 - note A_, 6 - note A_, 6 - note A_, 4 + A# 6 + A# 6 + A# 4 + A_ 6 + A_ 6 + A_ 4 octave 4 - note C_, 6 - note C_, 6 - note C_, 4 + C_ 6 + C_ 6 + C_ 4 octave 3 - note A#, 6 - note A#, 6 - note A_, 4 + A# 6 + A# 6 + A_ 4 notetype 12, 12, 7 - note A_, 4 - note B_, 4 - note G_, 2 - note A_, 10 - note B_, 2 + A_ 4 + B_ 4 + G_ 2 + A_ 10 + B_ 2 octave 4 - note C#, 2 - note E_, 2 - note D_, 2 - note C#, 2 + C# 2 + E_ 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A#, 16 + B_ 2 + A# 16 rest 2 - note A#, 2 + A# 2 octave 4 - note C_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - octave 3 - note A#, 2 - note B_, 16 + C_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 + octave 3 + A# 2 + B_ 16 rest 2 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 + C# 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 16 - note E_, 8 - note G_, 8 + C_ 16 + E_ 8 + G_ 8 loopchannel 0, Music_TrainerBattle_branch_22bfc @@ -957,902 +957,902 @@ Music_TrainerBattle_Ch3:: ; 22d10 (8:6d10) vibrato 0, 2, 0 notetype 12, 1, 4 octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 + B_ 1 + A# 1 + A_ 1 + G# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + C# 1 + C_ 1 octave 2 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note A_, 2 - note A#, 2 - note B_, 2 - note B_, 2 + B_ 1 + A# 1 + B_ 1 + A# 1 + A_ 1 + G# 1 + A_ 2 + A# 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F_, 2 - note E_, 2 - note D_, 2 + F_ 2 + E_ 2 + D_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F_, 2 - note E_, 2 - note D_, 2 + F_ 2 + E_ 2 + D_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F_, 2 - note E_, 2 - note D_, 2 + F_ 2 + E_ 2 + D_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F_, 2 - note E_, 2 - note D_, 2 + F_ 2 + E_ 2 + D_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note C_, 2 + C_ 2 Music_TrainerBattle_branch_22d9c:: octave 2 - note A#, 1 - note B_, 1 + A# 1 + B_ 1 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C_, 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + C_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 + E_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 octave 2 - note A_, 2 - note G#, 2 - note G_, 2 + A_ 2 + G# 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 - note G#, 2 - note A_, 2 + G_ 2 + G# 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 - note G#, 2 - note A_, 2 + G_ 2 + G# 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note D_, 2 - note C#, 2 + E_ 2 + D_ 2 + C# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note F#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note D#, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note D#, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 4 + F# 2 + D_ 2 + E_ 2 + F# 2 + E_ 2 + D_ 2 + F# 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + D# 2 + F_ 2 + G_ 2 + F_ 2 + D# 2 + G_ 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + E_ 2 + F# 2 + G# 2 + F# 2 + E_ 2 + G# 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + F_ 2 + G_ 2 + A_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 4 octave 2 - note A_, 4 + A_ 4 octave 3 - note C_, 2 - note G_, 2 + C_ 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 - note D_, 4 + G_ 2 + D_ 4 octave 2 - note A_, 4 - note A#, 2 + A_ 4 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 4 + A# 4 octave 3 - note F_, 4 + F_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note F_, 4 + F_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note D_, 4 + D_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note D_, 4 + D_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note F_, 4 + F_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note F_, 4 + F_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note D_, 4 + D_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note D_, 4 + D_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C_, 2 + F# 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 + E_ 2 + D_ 2 + C_ 2 loopchannel 0, Music_TrainerBattle_branch_22d9c -; 0x23099
\ No newline at end of file +; 0x23099 diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index 4e021fd8..fb51fd15 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -6,177 +6,177 @@ Music_UnusedSong_Ch1:: ; a913 (2:6913) Music_UnusedSong_branch_a91b:: notetype 12, 1, 0 octave 6 - note E_, 1 + E_ 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 octave 6 - note E_, 1 + E_ 1 rest 4 - note E_, 2 + E_ 2 rest 2 - note D#, 1 + D# 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 octave 6 - note D#, 1 + D# 1 rest 8 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note C#, 1 + C# 1 octave 5 - note B_, 1 + B_ 1 rest 2 octave 6 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note C#, 1 + C# 1 octave 5 - note B_, 1 + B_ 1 rest 2 octave 6 - note D#, 4 - note C#, 4 - note D#, 1 - note E_, 1 + D# 4 + C# 4 + D# 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 5 - note B_, 2 + B_ 2 rest 1 octave 6 - note E_, 1 + E_ 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 octave 6 - note E_, 1 + E_ 1 rest 8 - note D#, 1 + D# 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 octave 6 - note D#, 1 + D# 1 rest 4 octave 5 - note B_, 2 + B_ 2 rest 2 octave 6 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note C#, 1 + C# 1 octave 5 - note B_, 1 + B_ 1 rest 2 octave 6 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 - note F#, 1 + E_ 1 + F# 1 rest 2 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 + F# 4 + E_ 4 + F# 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D#, 2 + D# 2 rest 3 octave 5 - note A_, 2 + A_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 octave 6 - note C#, 2 + C# 2 rest 2 - note E_, 2 - note F#, 8 + E_ 2 + F# 8 rest 2 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 2 + D# 2 + C# 2 rest 2 octave 5 - note G#, 2 + G# 2 rest 2 - note A_, 2 + A_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 octave 6 - note D#, 2 - note E_, 8 + D# 2 + E_ 8 rest 2 - note D#, 2 - note C#, 2 - note D#, 2 + D# 2 + C# 2 + D# 2 octave 5 - note A_, 2 - note G#, 2 - note A_, 2 - note A#, 1 - note B_, 1 + A_ 2 + G# 2 + A_ 2 + A# 1 + B_ 1 rest 4 - note F#, 2 + F# 2 rest 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 6 - note C_, 1 - note C#, 1 + C_ 1 + C# 1 rest 8 octave 5 - note F#, 2 - note F_, 2 - note F#, 2 - note G#, 2 - note A_, 2 + F# 2 + F_ 2 + F# 2 + G# 2 + A_ 2 octave 6 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 2 + D# 2 + C# 2 octave 5 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 loopchannel 0, Music_UnusedSong_branch_a91b endchannel @@ -191,149 +191,149 @@ Music_UnusedSong_Ch2:: ; a9cf (2:69cf) Music_UnusedSong_branch_a9d8:: notetype 12, 1, 0 octave 6 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 - note G#, 1 + A_ 1 + G# 1 rest 8 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 - note F#, 1 + G# 1 + F# 1 rest 4 octave 5 - note B_, 2 + B_ 2 rest 2 octave 6 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 - note F#, 1 + E_ 1 + F# 1 rest 2 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 - note F#, 1 + E_ 1 + F# 1 rest 2 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 + F# 4 + E_ 4 + F# 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D#, 2 + D# 2 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 - note G#, 1 + A_ 1 + G# 1 rest 4 - note E_, 2 + E_ 2 rest 2 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 - note F#, 1 + G# 1 + F# 1 rest 8 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 - note F#, 1 + E_ 1 + F# 1 rest 2 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 - note F#, 1 + E_ 1 + F# 1 rest 2 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 + F# 4 + E_ 4 + F# 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 2 + F# 2 rest 1 - note C#, 2 + C# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note G#, 2 + G# 2 rest 2 - note D#, 8 + D# 8 rest 2 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 2 + D# 2 + C# 2 octave 5 - note B_, 2 + B_ 2 rest 2 octave 6 - note C#, 2 + C# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note F#, 2 + F# 2 rest 2 - note C#, 8 + C# 8 rest 2 - note D#, 2 - note C#, 2 + D# 2 + C# 2 octave 5 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 1 - note F#, 1 + B_ 2 + A_ 2 + G# 2 + A_ 2 + G# 1 + F# 1 rest 8 - note B_, 2 - note A#, 2 - note B_, 2 - note A_, 1 - note G#, 1 + B_ 2 + A# 2 + B_ 2 + A_ 1 + G# 1 rest 4 - note G#, 2 - rest 2 - note F#, 2 - note F_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note E_, 2 - note C#, 2 - note E_, 2 - note F#, 2 + G# 2 + rest 2 + F# 2 + F_ 2 + F# 2 + G# 2 + A_ 2 + E_ 2 + C# 2 + E_ 2 + F# 2 rest 6 - note D#, 2 + D# 2 rest 6 loopchannel 0, Music_UnusedSong_branch_a9d8 endchannel -; 0xaa6f
\ No newline at end of file +; 0xaa6f diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index eab17a08..5dfd5702 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -8,106 +8,106 @@ Music_Vermilion_Ch1:: ; b9eb (2:79eb) Music_Vermilion_branch_b9f6:: notetype 12, 11, 5 octave 3 - note E_, 4 - note C#, 1 - note D_, 1 - note E_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note A_, 4 - note F#, 1 - note G#, 1 - note A_, 2 - note E_, 4 - note C#, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note C#, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note E_, 4 - note C#, 1 - note D_, 1 - note E_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note A_, 4 - note F#, 1 - note G#, 1 - note A_, 2 - note E_, 4 - note C#, 1 - note D_, 1 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note F#, 4 - note E_, 4 - note F#, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note B_, 2 - note A_, 2 + E_ 4 + C# 1 + D_ 1 + E_ 2 + A_ 4 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + A_ 4 + F# 1 + G# 1 + A_ 2 + E_ 4 + C# 2 + E_ 2 + A_ 2 + G# 2 + B_ 2 + A_ 2 + G# 2 + E_ 2 + F# 2 + G# 2 + C# 2 + D_ 2 + E_ 2 + F# 2 + E_ 4 + C# 1 + D_ 1 + E_ 2 + A_ 4 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + A_ 4 + F# 1 + G# 1 + A_ 2 + E_ 4 + C# 1 + D_ 1 + E_ 2 + A_ 2 + G# 2 + F# 2 + A_ 2 + G# 2 + E_ 2 + F# 2 + G# 2 + F# 4 + E_ 4 + F# 2 + G# 2 + F# 2 + A_ 2 + G# 2 + B_ 2 + A_ 2 octave 4 - note C#, 2 - note D_, 2 - note C#, 2 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 1 - note A_, 1 - note B_, 2 + B_ 2 + A_ 2 + G# 1 + A_ 1 + B_ 2 octave 4 - note C#, 2 - note E_, 2 + C# 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note D_, 2 + D_ 2 octave 3 - note G#, 2 + G# 2 octave 4 - note C#, 2 + C# 2 octave 3 - note F#, 2 - note B_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note B_, 2 + F# 2 + B_ 2 + G# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + G# 2 + B_ 2 loopchannel 0, Music_Vermilion_branch_b9f6 @@ -118,63 +118,63 @@ Music_Vermilion_Ch2:: ; ba61 (2:7a61) Music_Vermilion_branch_ba66:: notetype 12, 12, 7 octave 3 - note A_, 8 + A_ 8 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 6 - note A_, 1 - note B_, 1 + B_ 6 + A_ 1 + B_ 1 octave 4 - note C#, 8 + C# 8 octave 3 - note A_, 8 + A_ 8 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 6 + B_ 6 octave 4 - note C#, 1 + C# 1 octave 3 - note B_, 1 - note A_, 8 - note A_, 8 + B_ 1 + A_ 8 + A_ 8 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 6 - note A_, 1 - note B_, 1 + B_ 6 + A_ 1 + B_ 1 octave 4 - note C#, 8 + C# 8 octave 3 - note A_, 8 + A_ 8 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 6 + B_ 6 octave 4 - note C#, 1 + C# 1 octave 3 - note B_, 1 - note A_, 8 - note B_, 4 + B_ 1 + A_ 8 + B_ 4 octave 4 - note C#, 4 - note D_, 4 - note E_, 4 - note F#, 8 - note B_, 8 - note A_, 4 - note G#, 4 - note F#, 4 - note E_, 4 - note F#, 8 - note E_, 8 + C# 4 + D_ 4 + E_ 4 + F# 8 + B_ 8 + A_ 4 + G# 4 + F# 4 + E_ 4 + F# 8 + E_ 8 loopchannel 0, Music_Vermilion_branch_ba66 @@ -183,102 +183,102 @@ Music_Vermilion_Ch3:: ; baa6 (2:7aa6) Music_Vermilion_branch_baa8:: octave 4 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + B_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + A_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 loopchannel 0, Music_Vermilion_branch_baa8 @@ -287,19 +287,19 @@ Music_Vermilion_Ch4:: ; bb0d (2:7b0d) Music_Vermilion_branch_bb0e:: callchannel Music_Vermilion_branch_bb3f - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 1 + triangle1 1 + triangle1 1 + triangle1 1 loopchannel 4, Music_Vermilion_branch_bb0e callchannel Music_Vermilion_branch_bb3f callchannel Music_Vermilion_branch_bb3f @@ -308,17 +308,17 @@ Music_Vermilion_branch_bb0e:: loopchannel 0, Music_Vermilion_branch_bb0e Music_Vermilion_branch_bb3f:: - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 2 + triangle1 1 + triangle1 1 endchannel -; 0xbb58
\ No newline at end of file +; 0xbb58 diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index e94c6a07..70ce7d3f 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -6,297 +6,297 @@ Music_WildBattle_Ch1:: ; 23099 (8:7099) toggleperfectpitch notetype 12, 11, 3 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 + B_ 1 + A# 1 + A_ 1 + A# 1 + A_ 1 + G# 1 + G_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + C# 1 + C_ 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + B_ 1 + A# 1 + A_ 1 + A# 1 + B_ 1 octave 3 - note C_, 1 - note C#, 1 + C_ 1 + C# 1 notetype 12, 11, 1 - note G_, 6 - note E_, 6 - note D#, 12 - note C#, 14 - note E_, 6 - note D#, 10 + G_ 6 + E_ 6 + D# 12 + C# 14 + E_ 6 + D# 10 notetype 12, 4, 15 - note C#, 10 + C# 10 notetype 12, 11, 1 - note G_, 6 - note E_, 6 - note D#, 12 - note C#, 14 - note E_, 6 - note D#, 10 - note C#, 10 + G_ 6 + E_ 6 + D# 12 + C# 14 + E_ 6 + D# 10 + C# 10 Music_WildBattle_branch_230e0:: notetype 12, 11, 3 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 + C# 1 + D_ 1 + C# 1 + C_ 1 + C# 1 + D_ 1 + C# 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + F_ 1 + E_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 notetype 12, 11, 5 - note D_, 4 - note C_, 4 - note D_, 4 - note F_, 4 - note E_, 6 - note D_, 6 - note F_, 4 + D_ 4 + C_ 4 + D_ 4 + F_ 4 + E_ 6 + D_ 6 + F_ 4 notetype 12, 11, 7 - note A_, 16 - note G_, 16 + A_ 16 + G_ 16 notetype 12, 11, 5 - note D_, 4 - note C_, 4 - note D_, 4 - note F_, 4 - note G_, 6 - note A_, 6 - note B_, 4 + D_ 4 + C_ 4 + D_ 4 + F_ 4 + G_ 6 + A_ 6 + B_ 4 notetype 12, 11, 7 octave 4 - note C_, 16 + C_ 16 notetype 12, 3, 15 - note G_, 16 + G_ 16 notetype 12, 11, 5 octave 3 - note C_, 12 - note C_, 2 + C_ 12 + C_ 2 rest 2 - note D_, 2 - note C_, 2 + D_ 2 + C_ 2 rest 12 - note C#, 12 - note C#, 2 + C# 12 + C# 2 rest 2 - note F_, 2 + F_ 2 notetype 12, 10, 3 - note D#, 6 + D# 6 notetype 12, 10, 7 - note C#, 8 + C# 8 loopchannel 0, Music_WildBattle_branch_230e0 @@ -305,160 +305,160 @@ Music_WildBattle_Ch2:: ; 231d8 (8:71d8) vibrato 8, 2, 5 notetype 12, 12, 3 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 notetype 12, 12, 2 octave 4 - note G_, 6 + G_ 6 octave 3 - note G_, 6 - note G_, 12 - note G_, 14 - note G_, 6 - note G_, 10 + G_ 6 + G_ 12 + G_ 14 + G_ 6 + G_ 10 notetype 12, 9, 0 - note F#, 10 + F# 10 notetype 12, 12, 2 - note G_, 6 - note G_, 6 - note G_, 12 - note G_, 14 - note G_, 6 - note G_, 10 - note G_, 10 + G_ 6 + G_ 6 + G_ 12 + G_ 14 + G_ 6 + G_ 10 + G_ 10 Music_WildBattle_branch_23225:: notetype 12, 12, 5 - note G_, 6 - note F#, 6 - note E_, 4 - note G_, 6 - note A_, 6 - note G_, 4 + G_ 6 + F# 6 + E_ 4 + G_ 6 + A_ 6 + G_ 4 octave 4 - note G#, 12 - note G_, 2 + G# 12 + G_ 2 rest 2 - note G#, 2 - note G_, 2 + G# 2 + G_ 2 rest 4 notetype 12, 11, 7 octave 5 - note C#, 8 + C# 8 notetype 12, 12, 5 octave 4 - note C_, 6 + C_ 6 octave 3 - note A#, 6 - note G#, 4 + A# 6 + G# 4 octave 4 - note C#, 6 - note C_, 6 + C# 6 + C_ 6 octave 3 - note A#, 4 + A# 4 octave 4 - note F_, 6 - note E_, 6 - note D_, 4 + F_ 6 + E_ 6 + D_ 4 notetype 12, 12, 7 octave 3 - note A#, 4 + A# 4 octave 4 - note C_, 4 - note D_, 4 - note F_, 4 + C_ 4 + D_ 4 + F_ 4 notetype 12, 12, 0 - note G#, 16 + G# 16 notetype 12, 11, 0 - note G#, 16 + G# 16 notetype 12, 4, 14 - note G_, 16 + G_ 16 notetype 12, 12, 7 - note G_, 16 + G_ 16 octave 3 - note F_, 8 - note A#, 8 + F_ 8 + A# 8 octave 4 - note D_, 8 - note F_, 8 + D_ 8 + F_ 8 notetype 12, 12, 0 - note E_, 16 + E_ 16 notetype 12, 12, 7 - note E_, 16 + E_ 16 octave 3 - note F_, 8 - note A#, 8 + F_ 8 + A# 8 octave 4 - note D_, 8 - note F_, 8 + D_ 8 + F_ 8 notetype 12, 12, 0 - note G_, 16 + G_ 16 notetype 12, 3, 15 octave 5 - note C_, 16 + C_ 16 notetype 12, 12, 5 octave 4 - note E_, 12 - note E_, 2 + E_ 12 + E_ 2 rest 2 - note F_, 2 + F_ 2 notetype 12, 12, 1 - note E_, 4 + E_ 4 notetype 12, 12, 5 rest 10 - note F_, 12 - note F_, 2 + F_ 12 + F_ 2 rest 2 - note G#, 2 + G# 2 notetype 12, 10, 3 - note G_, 6 + G_ 6 notetype 12, 12, 7 - note F_, 8 + F_ 8 loopchannel 0, Music_WildBattle_branch_23225 @@ -466,274 +466,274 @@ Music_WildBattle_Ch3:: ; 23290 (8:7290) vibrato 0, 2, 0 notetype 12, 1, 1 octave 4 - note C#, 1 + C# 1 rest 1 - note C#, 1 - note C_, 1 - note D_, 1 + C# 1 + C_ 1 + D_ 1 rest 1 - note D_, 1 - note C_, 1 - note D#, 1 + D_ 1 + C_ 1 + D# 1 rest 1 - note D#, 1 - note C_, 1 - note E_, 1 + D# 1 + C_ 1 + E_ 1 rest 1 - note E_, 1 - note C_, 1 - note F_, 1 + E_ 1 + C_ 1 + F_ 1 rest 1 - note F_, 1 - note C_, 1 - note F#, 1 + F_ 1 + C_ 1 + F# 1 rest 1 - note F#, 1 - note C_, 1 - note G_, 1 + F# 1 + C_ 1 + G_ 1 rest 1 - note G_, 1 - note C_, 1 + G_ 1 + C_ 1 octave 3 - note A#, 2 - note B_, 2 + A# 2 + B_ 2 Music_WildBattle_branch_232b5:: octave 4 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 4 - note G#, 2 - note A#, 2 - note G#, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 4 - note G#, 2 - note A#, 2 - note G#, 2 - note F_, 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C# 2 + G# 2 + C# 4 + G# 2 + A# 2 + G# 2 + G_ 2 + C# 2 + G# 2 + C# 4 + G# 2 + A# 2 + G# 2 + F_ 2 loopchannel 2, Music_WildBattle_branch_232b5 Music_WildBattle_branch_232d8:: - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note G#, 12 - note G_, 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + G# 12 + G_ 2 rest 2 - note G#, 2 - note G_, 2 + G# 2 + G_ 2 rest 4 - note F_, 2 - note E_, 2 - note D_, 2 - note C#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 + F_ 2 + E_ 2 + D_ 2 + C# 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 + F_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 loopchannel 0, Music_WildBattle_branch_232d8 -; 0x233a6
\ No newline at end of file +; 0x233a6 diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm index cd749f91..5ef52491 100644 --- a/audio/music/yellow/meetjessiejames.asm +++ b/audio/music/yellow/meetjessiejames.asm @@ -1,310 +1,310 @@ -Music_MeetJessieJames_Ch1: ; 8316d (20:716d) +Music_MeetJessieJames_Ch1:: ; 8316d (20:716d) tempo 144 volume 7, 7 duty 3 vibrato 8, 1, 4 notetype 12, 11, 2 octave 3 - note G#, 1 - note G_, 1 - note F#, 2 - note F_, 2 - note E_, 2 - note D#, 2 - note D_, 2 - note C#, 2 - note C_, 2 + G# 1 + G_ 1 + F# 2 + F_ 2 + E_ 2 + D# 2 + D_ 2 + C# 2 + C_ 2 notetype 12, 11, 6 - note D#, 12 - note C_, 4 + D# 12 + C_ 4 -Music_MeetJessieJames_branch_83187: +Music_MeetJessieJames_branch_83187:: notetype 12, 11, 2 octave 4 - note D_, 16 + D_ 16 rest 12 notetype 12, 11, 4 octave 3 - note A#, 4 + A# 4 rest 16 rest 8 notetype 12, 11, 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note A#, 2 - note A_, 4 - note D_, 1 - note D#, 1 - note D#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note F_, 2 - note D_, 1 - note D#, 1 - note D#, 2 - note D#, 2 - note D_, 2 + A# 2 + A_ 4 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + D# 2 + D_ 2 + D# 2 + F_ 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 octave 2 - note A#, 4 + A# 4 notetype 12, 11, 4 octave 3 - note B_, 4 + B_ 4 notetype 12, 11, 2 - note D_, 1 - note D#, 1 - note D#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note F_, 2 - note D_, 1 - note D#, 1 - note D#, 2 - note D#, 2 - note D_, 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + D# 2 + D_ 2 + D# 2 + F_ 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note B_, 2 + B_ 2 notetype 12, 11, 4 - note A#, 4 + A# 4 loopchannel 0, Music_MeetJessieJames_branch_83187 -Music_MeetJessieJames_Ch2: ; 831c8 (20:71c8) +Music_MeetJessieJames_Ch2:: ; 831c8 (20:71c8) duty 3 vibrato 6, 1, 5 notetype 12, 12, 2 octave 4 - note D_, 1 - note C#, 1 - note C_, 2 + D_ 1 + C# 1 + C_ 2 octave 3 - note B_, 2 - note A#, 2 - note A_, 2 - note G#, 2 - note G_, 2 - note F#, 2 + B_ 2 + A# 2 + A_ 2 + G# 2 + G_ 2 + F# 2 notetype 12, 12, 7 - note A_, 12 + A_ 12 octave 4 - note C#, 4 + C# 4 -Music_MeetJessieJames_branch_831df: +Music_MeetJessieJames_branch_831df:: notetype 12, 12, 2 octave 3 - note C#, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note E_, 2 - note C#, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note C#, 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 octave 2 - note A_, 4 + A_ 4 notetype 12, 12, 5 octave 4 - note C#, 4 + C# 4 notetype 12, 12, 2 - note D_, 1 + D_ 1 octave 3 - note D_, 1 - note D_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note E_, 2 - note C#, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note C#, 2 + D_ 1 + D_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 notetype 12, 12, 6 octave 4 - note D_, 8 + D_ 8 notetype 12, 12, 2 - note D#, 6 - note F_, 4 - note D#, 4 + D# 6 + F_ 4 + D# 4 octave 3 - note A#, 2 + A# 2 octave 4 - note D#, 6 - note F_, 4 - note D#, 2 + D# 6 + F_ 4 + D# 2 notetype 12, 12, 5 - note D_, 4 + D_ 4 notetype 12, 12, 2 - note D#, 6 - note F_, 4 - note D#, 4 + D# 6 + F_ 4 + D# 4 octave 3 - note A#, 2 + A# 2 octave 4 - note D#, 4 - note F_, 4 + D# 4 + F_ 4 notetype 12, 12, 5 - note D#, 8 + D# 8 loopchannel 0, Music_MeetJessieJames_branch_831df -Music_MeetJessieJames_Ch3: ; 8322a (20:722a) +Music_MeetJessieJames_Ch3:: ; 8322a (20:722a) notetype 12, 1, 0 rest 16 rest 8 octave 4 - note D_, 2 + D_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note C_, 2 - note D#, 2 + C_ 2 + D# 2 -Music_MeetJessieJames_branch_83235: - note D_, 1 +Music_MeetJessieJames_branch_83235:: + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A#, 2 - note A_, 2 - note D#, 2 - note D_, 1 + A# 2 + A_ 2 + D# 2 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 octave 3 - note A_, 2 + A_ 2 octave 4 - note C_, 2 - note D_, 2 - note D#, 1 + C_ 2 + D_ 2 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 octave 3 - note A#, 1 + A# 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 octave 3 - note A#, 1 + A# 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note E_, 1 + E_ 1 rest 1 loopchannel 0, Music_MeetJessieJames_branch_83235 endchannel -; 0x832ba
\ No newline at end of file +; 0x832ba diff --git a/audio/music/yellow/surfingpikachu.asm b/audio/music/yellow/surfingpikachu.asm index 632da3c5..1832bb03 100644 --- a/audio/music/yellow/surfingpikachu.asm +++ b/audio/music/yellow/surfingpikachu.asm @@ -1,691 +1,691 @@ -Music_SurfingPikachu_Ch1: ; 82ce8 (20:6ce8) +Music_SurfingPikachu_Ch1:: ; 82ce8 (20:6ce8) tempo 117 volume 7, 7 duty 3 vibrato 8, 1, 4 notetype 12, 11, 3 octave 3 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note F#, 2 + F# 2 notetype 12, 11, 3 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note F#, 16 + F# 16 rest 2 notetype 12, 11, 3 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note A_, 2 + A_ 2 notetype 12, 11, 3 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note A_, 14 + A_ 14 notetype 12, 11, 2 - note D#, 2 - note C#, 1 - note D#, 1 + D# 2 + C# 1 + D# 1 octave 2 - note B_, 6 - octave 3 - note E_, 4 - note E_, 4 - note E_, 8 - note G#, 4 - note G#, 4 - note G#, 2 + B_ 6 + octave 3 + E_ 4 + E_ 4 + E_ 8 + G# 4 + G# 4 + G# 2 -Music_SurfingPikachu_branch_82d1a: +Music_SurfingPikachu_branch_82d1a:: notetype 12, 11, 3 octave 3 - note G#, 4 - note E_, 4 - note F#, 4 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 6 - note F#, 2 - note A_, 8 + G# 4 + E_ 4 + F# 4 + E_ 2 + A_ 2 + G# 2 + F# 2 + G# 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + D# 2 + C# 6 + F# 2 + A_ 8 octave 2 - note B_, 6 - octave 3 - note E_, 2 - note G#, 8 - note G#, 4 - note E_, 4 - note F#, 4 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note F#, 6 - note E_, 2 - note F#, 1 + B_ 6 + octave 3 + E_ 2 + G# 8 + G# 4 + E_ 4 + F# 4 + E_ 2 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + F# 6 + E_ 2 + F# 1 rest 3 - note A_, 4 + A_ 4 duty 0 notetype 12, 11, 2 - note G#, 1 - note F#, 1 - note G#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note F#, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note B_, 1 - note A#, 1 - note B_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note G_, 2 - note G#, 2 - note A_, 2 - octave 4 - note C#, 2 - note C_, 2 - note C#, 3 - octave 3 - note F#, 1 - note A_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note E_, 3 - note E_, 1 - note B_, 2 - note A_, 2 - note G#, 6 - note E_, 1 - note F_, 1 - note F#, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note B_, 1 - note A#, 1 - note B_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note G_, 2 - note G#, 2 - note A_, 2 - octave 4 - note C#, 2 - note C_, 2 - note C#, 3 - octave 3 - note F#, 1 - note A_, 2 - note G#, 2 - note A_, 2 - octave 4 - note D#, 2 - note E_, 2 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 8 + G# 1 + F# 1 + G# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + D# 2 + F# 2 + F# 2 + D# 2 + F# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + B_ 1 + A# 1 + B_ 2 + G# 2 + E_ 2 + G# 2 + G_ 2 + G# 2 + A_ 2 + octave 4 + C# 2 + C_ 2 + C# 3 + octave 3 + F# 1 + A_ 2 + G# 2 + F# 2 + A_ 2 + E_ 3 + E_ 1 + B_ 2 + A_ 2 + G# 6 + E_ 1 + F_ 1 + F# 2 + F# 2 + D# 2 + F# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + B_ 1 + A# 1 + B_ 2 + G# 2 + E_ 2 + G# 2 + G_ 2 + G# 2 + A_ 2 + octave 4 + C# 2 + C_ 2 + C# 3 + octave 3 + F# 1 + A_ 2 + G# 2 + A_ 2 + octave 4 + D# 2 + E_ 2 + E_ 1 + D# 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + E_ 8 duty 3 loopchannel 0, Music_SurfingPikachu_branch_82d1a -Music_SurfingPikachu_Ch2: ; 82d9d (20:6d9d) +Music_SurfingPikachu_Ch2:: ; 82d9d (20:6d9d) duty 3 vibrato 6, 1, 5 notetype 12, 12, 4 octave 3 - note B_, 6 + B_ 6 notetype 12, 12, 2 octave 4 - note E_, 2 + E_ 2 notetype 12, 12, 4 octave 3 - note B_, 6 + B_ 6 notetype 12, 12, 2 octave 4 - note E_, 2 + E_ 2 notetype 12, 11, 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note C#, 2 + C# 2 + D# 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 + B_ 2 + A_ 2 + G# 2 + F# 2 notetype 12, 12, 4 octave 4 - note C#, 6 + C# 6 notetype 12, 12, 2 - note F#, 2 + F# 2 notetype 12, 12, 4 - note C#, 6 + C# 6 notetype 12, 12, 2 - note F#, 2 + F# 2 notetype 12, 11, 2 - note C#, 2 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 + C# 2 + D# 2 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 2 + A_ 2 + G# 2 notetype 12, 12, 2 - note E_, 6 - note B_, 4 - note B_, 4 - note B_, 8 - note B_, 4 - note B_, 4 - note B_, 2 + E_ 6 + B_ 4 + B_ 4 + B_ 8 + B_ 4 + B_ 4 + B_ 2 -Music_SurfingPikachu_branch_82de0: +Music_SurfingPikachu_branch_82de0:: notetype 12, 12, 6 octave 4 - note E_, 4 + E_ 4 octave 3 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 6 - note A_, 2 - note G#, 8 - note F#, 6 - note A_, 2 + B_ 6 + A_ 2 + G# 8 + F# 6 + A_ 2 octave 4 - note C#, 8 + C# 8 octave 3 - note E_, 6 - note G#, 2 - note B_, 8 + E_ 6 + G# 2 + B_ 8 octave 4 - note E_, 4 + E_ 4 octave 3 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 6 + B_ 6 octave 4 - note D#, 2 - note E_, 8 - note D#, 6 - note C#, 2 - note D#, 1 + D# 2 + E_ 8 + D# 6 + C# 2 + D# 1 rest 3 - note F#, 4 - note E_, 10 + F# 4 + E_ 10 notetype 12, 12, 6 duty 2 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 6 - octave 4 - note C#, 2 - note D#, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 6 - note F#, 2 - note G#, 8 - note A_, 6 - note G#, 2 - note A_, 4 - note F#, 4 - note G#, 10 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 6 - octave 4 - note C#, 2 - note D#, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 6 - note F#, 2 - note G#, 8 - note A_, 4 - note F#, 4 - note D#, 4 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 6 + octave 4 + C# 2 + D# 4 + octave 3 + B_ 4 + octave 4 + E_ 6 + F# 2 + G# 8 + A_ 6 + G# 2 + A_ 4 + F# 4 + G# 10 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 6 + octave 4 + C# 2 + D# 4 + octave 3 + B_ 4 + octave 4 + E_ 6 + F# 2 + G# 8 + A_ 4 + F# 4 + D# 4 octave 5 - note C#, 4 + C# 4 octave 4 - note B_, 8 + B_ 8 notetype 12, 12, 2 octave 5 - note E_, 4 + E_ 4 notetype 12, 12, 6 duty 3 octave 3 - note B_, 1 - note A#, 1 - note B_, 1 + B_ 1 + A# 1 + B_ 1 octave 4 - note C#, 1 + C# 1 loopchannel 0, Music_SurfingPikachu_branch_82de0 -Music_SurfingPikachu_Ch3: ; 82e45 (20:6e45) +Music_SurfingPikachu_Ch3:: ; 82e45 (20:6e45) notetype 12, 1, 0 octave 4 - note B_, 6 + B_ 6 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 6 + B_ 6 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 6 + A_ 6 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 6 + A_ 6 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note G#, 1 + G# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 -Music_SurfingPikachu_branch_82ea0: - note E_, 1 +Music_SurfingPikachu_branch_82ea0:: + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 - note C_, 1 - note C#, 1 + C# 1 + C_ 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 - note D#, 1 - note E_, 1 + E_ 1 + D# 1 + E_ 1 rest 1 octave 4 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note B_, 1 - note A#, 1 - note B_, 1 + B_ 1 + A# 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 loopchannel 0, Music_SurfingPikachu_branch_82ea0 -; 0x82fbe
\ No newline at end of file +; 0x82fbe diff --git a/audio/music/yellow/yellowintro.asm b/audio/music/yellow/yellowintro.asm index a5e1ba24..4d9cf938 100644 --- a/audio/music/yellow/yellowintro.asm +++ b/audio/music/yellow/yellowintro.asm @@ -1,485 +1,485 @@ -Music_YellowIntro_Ch1: ; 7f65c (1f:765c) +Music_YellowIntro_Ch1:: ; 7f65c (1f:765c) tempo 116 volume 7, 7 duty 3 vibrato 8, 1, 4 notetype 12, 11, 2 octave 3 - note G#, 2 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 3 - note A#, 1 - note B_, 2 - note B_, 10 + G# 2 + B_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 3 + A# 1 + B_ 2 + B_ 10 notetype 12, 11, 6 octave 4 - note C#, 1 - note C_, 1 - note C#, 10 + C# 1 + C_ 1 + C# 10 octave 3 - note G#, 1 - note G_, 1 - note G#, 4 - note B_, 4 - octave 4 - note E_, 4 - note F#, 8 - note E_, 8 + G# 1 + G_ 1 + G# 4 + B_ 4 + octave 4 + E_ 4 + F# 8 + E_ 8 octave 3 - note A_, 4 - note B_, 4 + A_ 4 + B_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 4 - note G#, 6 + B_ 4 + G# 6 notetype 12, 11, 2 - note B_, 2 + B_ 2 notetype 12, 11, 6 - note G#, 6 + G# 6 notetype 12, 11, 2 - note B_, 2 + B_ 2 notetype 12, 11, 6 octave 4 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note G#, 2 + G# 2 notetype 12, 11, 6 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note G#, 2 + G# 2 notetype 12, 11, 6 octave 3 - note A_, 4 - note F#, 4 - note A_, 4 - note B_, 4 - note F#, 4 - note G#, 4 - note A_, 2 - note G#, 2 - note F#, 2 - note D#, 2 + A_ 4 + F# 4 + A_ 4 + B_ 4 + F# 4 + G# 4 + A_ 2 + G# 2 + F# 2 + D# 2 notetype 12, 11, 3 - note B_, 2 - octave 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 2 - note C#, 2 - note F#, 4 - note F#, 3 - note D#, 1 - note F#, 2 - note F#, 8 + B_ 2 + octave 4 + E_ 4 + E_ 4 + E_ 4 + E_ 2 + C# 2 + F# 4 + F# 3 + D# 1 + F# 2 + F# 8 notetype 12, 11, 6 - note F#, 1 - note F_, 1 - note F#, 8 + F# 1 + F_ 1 + F# 8 octave 3 - note B_, 1 - note A#, 1 - note B_, 8 + B_ 1 + A# 1 + B_ 8 octave 4 - note F#, 1 - note F_, 1 - note F#, 2 + F# 1 + F_ 1 + F# 2 notetype 12, 11, 3 - note F#, 1 - note E_, 1 - note D#, 1 - note C#, 1 + F# 1 + E_ 1 + D# 1 + C# 1 notetype 12, 11, 2 octave 3 - note B_, 16 + B_ 16 endchannel -Music_YellowIntro_Ch2: ; 7f6d3 (1f:76d3) +Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3) duty 2 vibrato 6, 1, 5 notetype 12, 12, 2 octave 3 - note B_, 2 - octave 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 3 - note D#, 1 - note E_, 2 - note E_, 4 + B_ 2 + octave 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + E_ 3 + D# 1 + E_ 2 + E_ 4 notetype 12, 12, 5 - note G#, 1 - note G_, 1 - note G#, 10 + G# 1 + G_ 1 + G# 10 octave 3 - note B_, 1 - note A#, 1 - note B_, 6 + B_ 1 + A# 1 + B_ 6 notetype 12, 12, 7 octave 4 - note E_, 4 - note G#, 4 - note B_, 4 + E_ 4 + G# 4 + B_ 4 octave 5 - note C#, 16 + C# 16 octave 4 - note A_, 4 - note G#, 4 - note F#, 4 - note E_, 4 + A_ 4 + G# 4 + F# 4 + E_ 4 octave 3 - note B_, 6 + B_ 6 notetype 12, 12, 2 octave 4 - note E_, 2 + E_ 2 notetype 12, 12, 7 octave 3 - note B_, 6 + B_ 6 notetype 12, 12, 2 octave 4 - note E_, 2 + E_ 2 notetype 12, 12, 7 - note G#, 6 + G# 6 notetype 12, 12, 2 - note B_, 2 + B_ 2 notetype 12, 12, 7 - note G#, 6 + G# 6 notetype 12, 12, 2 - note B_, 2 + B_ 2 notetype 12, 12, 7 - note C#, 4 + C# 4 octave 3 - note A_, 4 - octave 4 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 4 - note D#, 2 - note C#, 2 + A_ 4 + octave 4 + C# 4 + D# 4 + E_ 2 + D# 2 + C# 2 + D# 4 + D# 2 + C# 2 octave 3 - note B_, 2 + B_ 2 notetype 12, 12, 3 octave 4 - note E_, 2 - note G#, 4 - note G#, 4 - note G#, 4 - note G#, 2 - note F#, 2 - note A_, 4 - note A_, 3 - note F#, 1 - note A_, 2 - note A_, 4 + E_ 2 + G# 4 + G# 4 + G# 4 + G# 2 + F# 2 + A_ 4 + A_ 3 + F# 1 + A_ 2 + A_ 4 notetype 12, 12, 7 - note B_, 1 - note A#, 1 - note B_, 8 - note B_, 1 - note A#, 1 - note B_, 8 - note B_, 1 - note A#, 1 - note B_, 6 + B_ 1 + A# 1 + B_ 8 + B_ 1 + A# 1 + B_ 8 + B_ 1 + A# 1 + B_ 6 notetype 12, 12, 3 - note B_, 1 - note A_, 1 - note G#, 1 - note F#, 1 + B_ 1 + A_ 1 + G# 1 + F# 1 notetype 12, 12, 2 - note E_, 16 + E_ 16 endchannel -Music_YellowIntro_Ch3: ; 7f749 (1f:7749) +Music_YellowIntro_Ch3:: ; 7f749 (1f:7749) notetype 12, 1, 0 octave 4 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note F#, 1 + F# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 3 - note F#, 1 + F# 1 rest 1 octave 4 - note F#, 1 - note G#, 1 - note A_, 1 + F# 1 + G# 1 + A_ 1 octave 5 - note C#, 1 - note E_, 1 + C# 1 + E_ 1 rest 15 endchannel -; 0x7f860
\ No newline at end of file +; 0x7f860 diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm index 0198c17e..e8c2a7ba 100644 --- a/audio/music/yellow/yellowunusedsong.asm +++ b/audio/music/yellow/yellowunusedsong.asm @@ -1,51 +1,51 @@ -Music_YellowUnusedSong_Ch1: ; 82fbe (20:6fbe) +Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe) tempo 140 volume 7, 7 duty 3 vibrato 8, 1, 4 notetype 8, 11, 2 octave 3 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note G_, 6 - note G_, 6 - note A_, 6 - note E_, 6 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note A_, 6 - note G_, 6 - note A_, 12 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 + G_ 6 + A_ 6 + E_ 6 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + A_ 6 + G_ 6 + A_ 12 -Music_YellowUnusedSong_branch_82fde: - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note G_, 6 - note G_, 6 - note A_, 6 - note E_, 6 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note G_, 6 +Music_YellowUnusedSong_branch_82fde:: + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 + G_ 6 + A_ 6 + E_ 6 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 octave 4 - note D#, 6 - note D_, 12 + D# 6 + D_ 12 rest 16 rest 16 rest 16 @@ -53,275 +53,275 @@ Music_YellowUnusedSong_branch_82fde: rest 16 rest 16 octave 3 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note G_, 6 - note G_, 6 - note A_, 6 - note E_, 6 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note A_, 6 - note G_, 6 - note A_, 12 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 + G_ 6 + A_ 6 + E_ 6 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + A_ 6 + G_ 6 + A_ 12 loopchannel 0, Music_YellowUnusedSong_branch_82fde -Music_YellowUnusedSong_Ch2: ; 83010 (20:7010) +Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010) duty 2 notetype 8, 12, 2 octave 4 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note C_, 6 - note C_, 6 - note D_, 6 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + C_ 6 + D_ 6 octave 3 - note A_, 6 + A_ 6 octave 4 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note D_, 6 - note A#, 6 - note A_, 12 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + D_ 6 + A# 6 + A_ 12 -Music_YellowUnusedSong_branch_8302a: - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note C_, 6 - note C_, 6 - note D_, 6 +Music_YellowUnusedSong_branch_8302a:: + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + C_ 6 + D_ 6 octave 3 - note A_, 6 + A_ 6 octave 4 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note C_, 6 - note G#, 6 - note G_, 12 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + G# 6 + G_ 12 notetype 8, 9, 0 octave 3 - note D#, 16 - note D#, 8 - note D#, 16 - note D#, 8 + D# 16 + D# 8 + D# 16 + D# 8 octave 2 - note A#, 16 - note A#, 8 + A# 16 + A# 8 octave 3 - note D#, 12 - note F_, 12 + D# 12 + F_ 12 notetype 8, 12, 2 octave 4 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note C_, 6 - note C_, 6 - note D_, 6 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + C_ 6 + D_ 6 octave 3 - note A_, 6 + A_ 6 octave 4 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note D_, 6 - note A#, 6 - note A_, 12 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + D_ 6 + A# 6 + A_ 12 loopchannel 0, Music_YellowUnusedSong_branch_8302a -Music_YellowUnusedSong_Ch3: ; 83068 (20:7068) +Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068) notetype 12, 1, 0 vibrato 2, 1, 5 rest 16 rest 12 octave 4 - note C_, 4 - note D_, 8 - note D#, 8 - note G_, 8 - note A#, 8 + C_ 4 + D_ 8 + D# 8 + G_ 8 + A# 8 -Music_YellowUnusedSong_branch_83075: - note A_, 8 - note A#, 8 - note G_, 8 - note A_, 4 - note D_, 4 - note A_, 8 - note A#, 8 +Music_YellowUnusedSong_branch_83075:: + A_ 8 + A# 8 + G_ 8 + A_ 4 + D_ 4 + A_ 8 + A# 8 octave 5 - note C#, 8 - note D_, 8 - note D#, 16 - note D#, 16 + C# 8 + D_ 8 + D# 16 + D# 16 octave 4 - note A#, 16 + A# 16 octave 5 - note D#, 8 - note F_, 8 + D# 8 + F_ 8 octave 4 - note D_, 16 - note D_, 16 + D_ 16 + D_ 16 octave 4 - note D_, 8 - note D#, 8 - note G_, 8 - note A#, 8 + D_ 8 + D# 8 + G_ 8 + A# 8 loopchannel 0, Music_YellowUnusedSong_branch_83075 -Music_YellowUnusedSong_Ch4: ; 83092 (20:7092) +Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092) dspeed 12 - dnote 4, snare3 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 4 -Music_YellowUnusedSong_branch_830c3: - dnote 4, snare3 +Music_YellowUnusedSong_branch_830c3:: + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 4 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 4, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 2 + snare3 2 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 4 loopchannel 0, Music_YellowUnusedSong_branch_830c3 -; 0x8316d
\ No newline at end of file +; 0x8316d diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/sfx_02_3a.asm index 5dc9a318..1844b2ab 100644 --- a/audio/sfx/sfx_02_3a.asm +++ b/audio/sfx/sfx_02_3a.asm @@ -7,12 +7,12 @@ SFX_02_3a_Ch1: ; ad77 (2:6d77) toggleperfectpitch notetype 4, 11, 1 octave 3 - note G#, 2 - note G#, 2 - note G#, 2 + G# 2 + G# 2 + G# 2 notetype 12, 11, 3 octave 4 - note E_, 4 + E_ 4 endchannel @@ -22,11 +22,11 @@ SFX_02_3a_Ch2: ; ad8e (2:6d8e) duty 2 notetype 4, 12, 1 octave 4 - note E_, 2 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 + E_ 2 notetype 12, 12, 3 - note B_, 4 + B_ 4 endchannel @@ -34,15 +34,15 @@ SFX_02_3a_Ch3: ; ad9e (2:6d9e) executemusic notetype 4, 1, 0 octave 4 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 notetype 12, 1, 0 octave 4 - note B_, 2 + B_ 2 rest 2 endchannel ; 0xadae
\ No newline at end of file diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/sfx_02_3b.asm index efe43b48..9c59d670 100644 --- a/audio/sfx/sfx_02_3b.asm +++ b/audio/sfx/sfx_02_3b.asm @@ -6,22 +6,22 @@ SFX_02_3b_Ch1: ; b316 (2:7316) toggleperfectpitch notetype 5, 11, 4 octave 4 - note D_, 4 - note C_, 4 + D_ 4 + C_ 4 octave 3 - note A_, 8 + A_ 8 notetype 5, 11, 2 octave 4 - note D#, 2 - note D#, 2 - note D_, 2 - note C_, 2 - note C_, 2 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 octave 3 - note A#, 2 + A# 2 notetype 5, 11, 4 octave 4 - note C_, 8 + C_ 8 endchannel @@ -31,18 +31,18 @@ SFX_02_3b_Ch2: ; b335 (2:7335) duty 2 notetype 5, 12, 5 octave 4 - note A_, 4 - note F_, 4 - note C_, 8 + A_ 4 + F_ 4 + C_ 8 notetype 5, 12, 2 - note A#, 2 - note A#, 2 - note A#, 2 - note G_, 2 - note G_, 2 - note A#, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 notetype 5, 12, 4 - note A_, 8 + A_ 8 endchannel @@ -50,21 +50,21 @@ SFX_02_3b_Ch3: ; b34d (2:734d) executemusic notetype 5, 1, 0 octave 5 - note F_, 4 - note D#, 4 - note C_, 8 - note D#, 1 + F_ 4 + D# 4 + C_ 8 + D# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A_, 8 + A_ 8 endchannel ; 0xb362
\ No newline at end of file diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/sfx_02_41.asm index 0a261b84..de5be1c7 100644 --- a/audio/sfx/sfx_02_41.asm +++ b/audio/sfx/sfx_02_41.asm @@ -5,19 +5,19 @@ SFX_02_41_Ch1: ; b2c8 (2:72c8) duty 2 notetype 5, 11, 1 octave 3 - note A_, 2 - note A_, 2 - note G_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note A_, 2 + A_ 2 + A_ 2 + G_ 2 + G_ 2 + F_ 2 + E_ 2 + F_ 2 + A_ 2 octave 4 - note C_, 4 - note E_, 4 + C_ 4 + E_ 4 octave 3 - note F_, 4 + F_ 4 endchannel @@ -26,21 +26,21 @@ SFX_02_41_Ch2: ; b2e1 (2:72e1) duty 2 notetype 5, 12, 2 octave 5 - note F_, 2 - note E_, 1 + F_ 2 + E_ 1 rest 1 - note D_, 2 - note C_, 1 + D_ 2 + C_ 1 rest 1 octave 4 - note A#, 2 + A# 2 octave 5 - note C_, 2 - note D_, 2 - note E_, 2 - note F_, 4 - note G_, 4 - note F_, 4 + C_ 2 + D_ 2 + E_ 2 + F_ 4 + G_ 4 + F_ 4 endchannel @@ -48,31 +48,31 @@ SFX_02_41_Ch3: ; b2f7 (2:72f7) executemusic notetype 5, 1, 0 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note F_, 2 + F_ 2 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note A#, 1 + A# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 3 - note C_, 1 + C_ 1 rest 3 octave 4 - note F_, 2 + F_ 2 rest 2 endchannel ; 0xb316
\ No newline at end of file diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/sfx_02_42.asm index c2f3f8a4..5dfcb574 100644 --- a/audio/sfx/sfx_02_42.asm +++ b/audio/sfx/sfx_02_42.asm @@ -6,20 +6,20 @@ SFX_02_42_Ch1: ; b362 (2:7362) toggleperfectpitch notetype 5, 10, 4 octave 3 - note A#, 4 + A# 4 notetype 5, 11, 1 octave 4 - note C_, 2 - note C_, 1 - note C_, 1 + C_ 2 + C_ 1 + C_ 1 notetype 5, 10, 4 - note D#, 4 + D# 4 notetype 5, 11, 1 - note F_, 2 - note F_, 1 - note F_, 1 + F_ 2 + F_ 1 + F_ 1 notetype 5, 11, 4 - note A#, 8 + A# 8 endchannel @@ -29,21 +29,21 @@ SFX_02_42_Ch2: ; b381 (2:7381) duty 2 notetype 5, 13, 1 octave 4 - note G_, 2 - note G_, 1 - note G_, 1 + G_ 2 + G_ 1 + G_ 1 notetype 5, 12, 4 - note D#, 4 + D# 4 notetype 5, 13, 1 - note G#, 2 - note G#, 1 - note G#, 1 - note A#, 2 - note A#, 1 - note A#, 1 + G# 2 + G# 1 + G# 1 + A# 2 + A# 1 + A# 1 notetype 5, 12, 4 octave 5 - note D#, 8 + D# 8 endchannel @@ -51,10 +51,10 @@ SFX_02_42_Ch3: ; b39d (2:739d) executemusic notetype 5, 1, 0 octave 4 - note D#, 4 - note G#, 4 - note G_, 4 - note F_, 4 - note D#, 8 + D# 4 + G# 4 + G_ 4 + F_ 4 + D# 8 endchannel ; 0xb3a7
\ No newline at end of file diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/sfx_02_5e.asm index ad47ebf0..ade4d200 100644 --- a/audio/sfx/sfx_02_5e.asm +++ b/audio/sfx/sfx_02_5e.asm @@ -2,21 +2,21 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca) vibrato 16, 1, 4 notetype 12, 1, 0 octave 5 - note E_, 2 - note F_, 2 - note G_, 4 - note A_, 2 - note G_, 2 + E_ 2 + F_ 2 + G_ 4 + A_ 2 + G_ 2 octave 6 - note C_, 4 - note C_, 2 - note D_, 2 - note C_, 2 + C_ 4 + C_ 2 + D_ 2 + C_ 2 octave 5 - note G_, 2 - note A_, 2 - note F_, 2 - note G_, 8 + G_ 2 + A_ 2 + F_ 2 + G_ 8 rest 12 endchannel ; 0x83e1
\ No newline at end of file diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/sfx_08_3a.asm index a81d8775..24cb206c 100644 --- a/audio/sfx/sfx_08_3a.asm +++ b/audio/sfx/sfx_08_3a.asm @@ -6,17 +6,17 @@ SFX_08_3a_Ch1: ; 2397d (8:797d) toggleperfectpitch notetype 6, 11, 4 octave 4 - note F_, 4 + F_ 4 notetype 4, 11, 2 - note C_, 2 - note F_, 2 - note C_, 2 + C_ 2 + F_ 2 + C_ 2 notetype 6, 11, 3 - note D#, 2 - note D#, 2 - note E_, 2 + D# 2 + D# 2 + E_ 2 notetype 6, 11, 4 - note F_, 8 + F_ 8 endchannel @@ -26,17 +26,17 @@ SFX_08_3a_Ch2: ; 23998 (8:7998) duty 2 notetype 6, 12, 4 octave 4 - note A_, 4 + A_ 4 notetype 4, 12, 2 - note A_, 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 + A_ 2 notetype 6, 12, 4 - note A#, 2 - note A#, 2 - note A#, 2 + A# 2 + A# 2 + A# 2 notetype 6, 12, 4 - note A_, 8 + A_ 8 endchannel @@ -44,21 +44,21 @@ SFX_08_3a_Ch3: ; 239b0 (8:79b0) executemusic notetype 6, 1, 0 octave 5 - note A_, 4 + A_ 4 notetype 4, 1, 0 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 notetype 6, 1, 0 - note G_, 1 + G_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A_, 8 + A_ 8 endchannel ; 0x239c7
\ No newline at end of file diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/sfx_08_3b.asm index a829a112..910cf9dc 100644 --- a/audio/sfx/sfx_08_3b.asm +++ b/audio/sfx/sfx_08_3b.asm @@ -6,22 +6,22 @@ SFX_08_3b_Ch1: ; 239c7 (8:79c7) toggleperfectpitch notetype 5, 11, 4 octave 4 - note D_, 4 - note C_, 4 + D_ 4 + C_ 4 octave 3 - note A_, 8 + A_ 8 notetype 5, 11, 2 octave 4 - note D#, 2 - note D#, 2 - note D_, 2 - note C_, 2 - note C_, 2 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 octave 3 - note A#, 2 + A# 2 notetype 5, 11, 4 octave 4 - note C_, 8 + C_ 8 endchannel @@ -31,18 +31,18 @@ SFX_08_3b_Ch2: ; 239e6 (8:79e6) duty 2 notetype 5, 12, 5 octave 4 - note A_, 4 - note F_, 4 - note C_, 8 + A_ 4 + F_ 4 + C_ 8 notetype 5, 12, 2 - note A#, 2 - note A#, 2 - note A#, 2 - note G_, 2 - note G_, 2 - note A#, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 notetype 5, 12, 4 - note A_, 8 + A_ 8 endchannel @@ -50,21 +50,21 @@ SFX_08_3b_Ch3: ; 239fe (8:79fe) executemusic notetype 5, 1, 0 octave 5 - note F_, 4 - note D#, 4 - note C_, 8 - note D#, 1 + F_ 4 + D# 4 + C_ 8 + D# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A_, 8 + A_ 8 endchannel ; 0x23a13
\ No newline at end of file diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/sfx_08_46.asm index 33a5ab25..b1d35eb1 100644 --- a/audio/sfx/sfx_08_46.asm +++ b/audio/sfx/sfx_08_46.asm @@ -6,19 +6,19 @@ SFX_08_46_Ch1: ; 23a13 (8:7a13) toggleperfectpitch notetype 6, 11, 2 octave 3 - note E_, 2 - note F#, 2 - note G#, 2 - note G#, 1 - note G#, 1 - note B_, 2 + E_ 2 + F# 2 + G# 2 + G# 1 + G# 1 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note D#, 1 - note D#, 1 + C# 2 + D# 2 + D# 1 + D# 1 notetype 6, 11, 5 - note E_, 8 + E_ 8 endchannel @@ -27,20 +27,20 @@ SFX_08_46_Ch2: ; 23a2e (8:7a2e) duty 2 notetype 6, 12, 2 octave 4 - note G#, 2 - note G#, 1 - note G#, 1 - note E_, 2 - note E_, 1 - note E_, 1 - note B_, 2 - note B_, 1 - note B_, 1 - note A_, 2 - note A_, 1 - note A_, 1 + G# 2 + G# 1 + G# 1 + E_ 2 + E_ 1 + E_ 1 + B_ 2 + B_ 1 + B_ 1 + A_ 2 + A_ 1 + A_ 1 notetype 6, 12, 5 - note G#, 8 + G# 8 endchannel @@ -48,15 +48,15 @@ SFX_08_46_Ch3: ; 23a44 (8:7a44) executemusic notetype 6, 1, 0 octave 4 - note B_, 2 + B_ 2 rest 2 octave 5 - note C#, 2 + C# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note F#, 2 - note G_, 2 - note G#, 4 + F# 2 + G_ 2 + G# 4 endchannel ; 0x23a53
\ No newline at end of file diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/sfx_08_75.asm index 39990ae3..0a25cb45 100644 --- a/audio/sfx/sfx_08_75.asm +++ b/audio/sfx/sfx_08_75.asm @@ -4,12 +4,12 @@ SFX_08_75_Ch1: ; 208e0 (8:48e0) duty 2 notetype 10, 8, 7 octave 5 - note G#, 8 + G# 8 octave 6 - note F#, 4 - note E_, 4 + F# 4 + E_ 4 octave 5 - note G#, 8 + G# 8 endchannel @@ -19,12 +19,12 @@ SFX_08_75_Ch2: ; 208f0 (8:48f0) duty 2 notetype 11, 6, 7 octave 5 - note G#, 8 + G# 8 notetype 10, 6, 7 octave 6 - note F#, 4 - note E_, 4 + F# 4 + E_ 4 octave 5 - note G#, 8 + G# 8 endchannel ; 0x20902
\ No newline at end of file diff --git a/audio/sfx/sfx_08_pokeflute_ch3.asm b/audio/sfx/sfx_08_pokeflute_ch3.asm index 28f1dfd7..cf3f32a7 100755 --- a/audio/sfx/sfx_08_pokeflute_ch3.asm +++ b/audio/sfx/sfx_08_pokeflute_ch3.asm @@ -3,12 +3,12 @@ SFX_08_PokeFlute_Ch3: ; 2049b (8:449b) vibrato 16, 1, 4 notetype 8, 1, 0 octave 5 - note E_, 3 - note F_, 3 - note G_, 7 - note A_, 3 - note G_, 3 + E_ 3 + F_ 3 + G_ 7 + A_ 3 + G_ 3 octave 6 - note C_, 13 + C_ 13 endchannel ; 0x204aa
\ No newline at end of file diff --git a/audio/sfx/sfx_08_unused2.asm b/audio/sfx/sfx_08_unused2.asm index c0e2ce76..0bfe4dd3 100755 --- a/audio/sfx/sfx_08_unused2.asm +++ b/audio/sfx/sfx_08_unused2.asm @@ -7,13 +7,13 @@ SFX_08_unused2_Ch1: ; 2232f (8:632f) toggleperfectpitch notetype 6, 11, 1 octave 3 - note G#, 2 - note G#, 2 + G# 2 + G# 2 notetype 6, 11, 3 - note G#, 2 - note B_, 2 + G# 2 + B_ 2 octave 4 - note E_, 8 + E_ 8 endchannel @@ -23,13 +23,13 @@ SFX_08_unused2_Ch2: ; 22347 (8:6347) duty 2 notetype 6, 12, 1 octave 4 - note E_, 2 - note E_, 1 - note E_, 1 + E_ 2 + E_ 1 + E_ 1 notetype 6, 12, 3 - note E_, 2 - note G#, 2 - note B_, 8 + E_ 2 + G# 2 + B_ 8 endchannel @@ -37,21 +37,21 @@ SFX_08_unused2_Ch3: ; 22359 (8:6359) executemusic notetype 6, 1, 0 octave 4 - note B_, 1 + B_ 1 rest 1 notetype 3, 1, 0 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 notetype 6, 1, 0 - note B_, 1 + B_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note B_, 4 + B_ 4 rest 4 endchannel ; 0x22370
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/sfx_1f_3a.asm index 45fcecca..1d92127e 100644 --- a/audio/sfx/sfx_1f_3a.asm +++ b/audio/sfx/sfx_1f_3a.asm @@ -7,12 +7,12 @@ SFX_1f_3a_Ch1: ; 7e850 (1f:6850) toggleperfectpitch notetype 4, 11, 1 octave 3 - note G#, 2 - note G#, 2 - note G#, 2 + G# 2 + G# 2 + G# 2 notetype 12, 11, 3 octave 4 - note E_, 4 + E_ 4 endchannel @@ -22,11 +22,11 @@ SFX_1f_3a_Ch2: ; 7e867 (1f:6867) duty 2 notetype 4, 12, 1 octave 4 - note E_, 2 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 + E_ 2 notetype 12, 12, 3 - note B_, 4 + B_ 4 endchannel @@ -34,15 +34,15 @@ SFX_1f_3a_Ch3: ; 7e877 (1f:6877) executemusic notetype 4, 1, 0 octave 4 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 notetype 12, 1, 0 octave 4 - note B_, 2 + B_ 2 rest 2 endchannel ; 0x7e887
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/sfx_1f_3b.asm index 16507623..3ce00c8a 100644 --- a/audio/sfx/sfx_1f_3b.asm +++ b/audio/sfx/sfx_1f_3b.asm @@ -6,22 +6,22 @@ SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28) toggleperfectpitch notetype 5, 11, 4 octave 4 - note D_, 4 - note C_, 4 + D_ 4 + C_ 4 octave 3 - note A_, 8 + A_ 8 notetype 5, 11, 2 octave 4 - note D#, 2 - note D#, 2 - note D_, 2 - note C_, 2 - note C_, 2 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 octave 3 - note A#, 2 + A# 2 notetype 5, 11, 4 octave 4 - note C_, 8 + C_ 8 endchannel @@ -31,18 +31,18 @@ SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47) duty 2 notetype 5, 12, 5 octave 4 - note A_, 4 - note F_, 4 - note C_, 8 + A_ 4 + F_ 4 + C_ 8 notetype 5, 12, 2 - note A#, 2 - note A#, 2 - note A#, 2 - note G_, 2 - note G_, 2 - note A#, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 notetype 5, 12, 4 - note A_, 8 + A_ 8 endchannel @@ -50,21 +50,21 @@ SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f) executemusic notetype 5, 1, 0 octave 5 - note F_, 4 - note D#, 4 - note C_, 8 - note D#, 1 + F_ 4 + D# 4 + C_ 8 + D# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A_, 8 + A_ 8 endchannel ; 0x7ee74
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/sfx_1f_41.asm index d5564ddd..6f854c74 100644 --- a/audio/sfx/sfx_1f_41.asm +++ b/audio/sfx/sfx_1f_41.asm @@ -5,19 +5,19 @@ SFX_1f_41_Ch1: ; 7edda (1f:6dda) duty 2 notetype 5, 11, 1 octave 3 - note A_, 2 - note A_, 2 - note G_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note A_, 2 + A_ 2 + A_ 2 + G_ 2 + G_ 2 + F_ 2 + E_ 2 + F_ 2 + A_ 2 octave 4 - note C_, 4 - note E_, 4 + C_ 4 + E_ 4 octave 3 - note F_, 4 + F_ 4 endchannel @@ -26,21 +26,21 @@ SFX_1f_41_Ch2: ; 7edf3 (1f:6df3) duty 2 notetype 5, 12, 2 octave 5 - note F_, 2 - note E_, 1 + F_ 2 + E_ 1 rest 1 - note D_, 2 - note C_, 1 + D_ 2 + C_ 1 rest 1 octave 4 - note A#, 2 + A# 2 octave 5 - note C_, 2 - note D_, 2 - note E_, 2 - note F_, 4 - note G_, 4 - note F_, 4 + C_ 2 + D_ 2 + E_ 2 + F_ 4 + G_ 4 + F_ 4 endchannel @@ -48,31 +48,31 @@ SFX_1f_41_Ch3: ; 7ee09 (1f:6e09) executemusic notetype 5, 1, 0 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note F_, 2 + F_ 2 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note A#, 1 + A# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 3 - note C_, 1 + C_ 1 rest 3 octave 4 - note F_, 2 + F_ 2 rest 2 endchannel ; 0x7ee28
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/sfx_1f_42.asm index bf231d23..6c8c388a 100644 --- a/audio/sfx/sfx_1f_42.asm +++ b/audio/sfx/sfx_1f_42.asm @@ -6,20 +6,20 @@ SFX_1f_42_Ch1: ; 7ee74 (1f:6e74) toggleperfectpitch notetype 5, 10, 4 octave 3 - note A#, 4 + A# 4 notetype 5, 11, 1 octave 4 - note C_, 2 - note C_, 1 - note C_, 1 + C_ 2 + C_ 1 + C_ 1 notetype 5, 10, 4 - note D#, 4 + D# 4 notetype 5, 11, 1 - note F_, 2 - note F_, 1 - note F_, 1 + F_ 2 + F_ 1 + F_ 1 notetype 5, 11, 4 - note A#, 8 + A# 8 endchannel @@ -29,21 +29,21 @@ SFX_1f_42_Ch2: ; 7ee93 (1f:6e93) duty 2 notetype 5, 13, 1 octave 4 - note G_, 2 - note G_, 1 - note G_, 1 + G_ 2 + G_ 1 + G_ 1 notetype 5, 12, 4 - note D#, 4 + D# 4 notetype 5, 13, 1 - note G#, 2 - note G#, 1 - note G#, 1 - note A#, 2 - note A#, 1 - note A#, 1 + G# 2 + G# 1 + G# 1 + A# 2 + A# 1 + A# 1 notetype 5, 12, 4 octave 5 - note D#, 8 + D# 8 endchannel @@ -51,10 +51,10 @@ SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf) executemusic notetype 5, 1, 0 octave 4 - note D#, 4 - note G#, 4 - note G_, 4 - note F_, 4 - note D#, 8 + D# 4 + G# 4 + G_ 4 + F_ 4 + D# 8 endchannel ; 0x7eeb9
\ No newline at end of file |