diff options
| author | dannye <33dannye@gmail.com> | 2019-07-27 23:21:39 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2019-07-27 23:21:39 -0500 |
| commit | 20c4116788d4d29b14c85ffce77e65faf89716b7 (patch) | |
| tree | 7dcc36a1b3568ebe5b98b3cc7ddb8344a2162cc9 /audio/music | |
| parent | Merge pull request #220 from Rangi42/master (diff) | |
| download | pokeyellow-20c4116788d4d29b14c85ffce77e65faf89716b7.tar.gz pokeyellow-20c4116788d4d29b14c85ffce77e65faf89716b7.tar.xz pokeyellow-20c4116788d4d29b14c85ffce77e65faf89716b7.zip | |
Update audio macro names
change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names
Diffstat (limited to 'audio/music')
46 files changed, 14621 insertions, 14621 deletions
diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index 87c7b5c2..58f1b7a5 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -1,673 +1,673 @@ -Music_BikeRiding_Ch0:: +Music_BikeRiding_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - G_ 2 + note G_, 2 Music_BikeRiding_branch_7dbc9:: octave 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 + 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 octave 3 - B_ 2 + note 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 - F_ 10 - notetype 12, 10, 6 - F_ 2 - E_ 2 - F_ 2 - G_ 10 - E_ 2 - D_ 2 - E_ 2 - F_ 6 - toggleperfectpitch - notetype 12, 11, 3 - E_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 2 - E_ 1 - F_ 1 - toggleperfectpitch - notetype 12, 11, 5 - G_ 6 - G_ 6 - A_ 2 - F_ 2 - G_ 6 - notetype 12, 11, 4 - G_ 2 - F_ 4 - notetype 12, 10, 4 - E_ 2 - D_ 2 - notetype 12, 9, 3 + 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 + note_type 12, 11, 6 + note F_, 10 + note_type 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 + toggle_perfect_pitch + note_type 12, 11, 3 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 2 + note E_, 1 + note F_, 1 + toggle_perfect_pitch + note_type 12, 11, 5 + note G_, 6 + note G_, 6 + note A_, 2 + note F_, 2 + note G_, 6 + note_type 12, 11, 4 + note G_, 2 + note F_, 4 + note_type 12, 10, 4 + note E_, 2 + note D_, 2 + note_type 12, 9, 3 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 3 - B_ 2 - A_ 1 - B_ 1 - A_ 2 - B_ 2 + note B_, 2 + note A_, 1 + note B_, 1 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - C_ 4 - C_ 2 + note C_, 2 + note C_, 4 + note C_, 2 octave 3 - A_ 2 - B_ 2 - B_ 2 - A_ 2 + note A_, 2 + note B_, 2 + note B_, 2 + note A_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 2 - B_ 1 + note A_, 2 + note B_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 2 + note B_, 2 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - D_ 1 + note C_, 1 + note D_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 4 - notetype 12, 3, 13 - C_ 4 - notetype 12, 11, 4 - 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 + note C_, 4 + note_type 12, 3, 13 + note C_, 4 + note_type 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 + note_type 12, 11, 5 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - C_ 4 - F_ 4 - D_ 4 - F# 4 + note E_, 4 + note C_, 4 + note F_, 4 + note D_, 4 + note F#, 4 vibrato 10, 2, 6 - notetype 12, 8, 0 - G_ 16 - G_ 4 - notetype 12, 8, 7 - G_ 12 - notetype 12, 11, 5 + note_type 12, 8, 0 + note G_, 16 + note G_, 4 + note_type 12, 8, 7 + note G_, 12 + note_type 12, 11, 5 vibrato 8, 1, 4 - loopchannel 0, Music_BikeRiding_branch_7dbc9 + sound_loop 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch1:: - duty 2 +Music_BikeRiding_Ch2:: + duty_cycle 2 vibrato 6, 1, 5 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - C_ 2 + note C_, 2 Music_BikeRiding_branch_7dc75:: - E_ 4 - F_ 4 - G_ 4 + note E_, 4 + note F_, 4 + note G_, 4 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 6 - A_ 1 - B_ 1 - A_ 10 - F_ 2 - G_ 2 - A_ 2 + note B_, 6 + note A_, 1 + note B_, 1 + note A_, 10 + note F_, 2 + note G_, 2 + note A_, 2 octave 5 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 - A_ 1 - B_ 1 + note B_, 2 + note A_, 1 + note B_, 1 octave 5 - C_ 6 + note C_, 6 octave 4 - A_ 2 - G_ 4 - duty 3 - notetype 12, 8, 4 - A# 6 - duty 2 - notetype 12, 12, 5 + note A_, 2 + note G_, 4 + duty_cycle 3 + note_type 12, 8, 4 + note A#, 6 + duty_cycle 2 + note_type 12, 12, 5 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - A_ 10 + note A_, 10 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 10 - notetype 12, 12, 3 + note G_, 10 + note_type 12, 12, 3 octave 5 - C_ 4 - E_ 2 - D_ 2 - C_ 2 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 - notetype 12, 11, 0 - D_ 4 - notetype 12, 12, 7 - D_ 10 - D_ 1 - C_ 1 - notetype 12, 11, 0 + note C_, 2 + note_type 12, 11, 0 + note D_, 4 + note_type 12, 12, 7 + note D_, 10 + note D_, 1 + note C_, 1 + note_type 12, 11, 0 octave 4 - B_ 4 - notetype 12, 12, 7 - B_ 12 - notetype 12, 12, 4 - 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 - F_ 1 - G_ 1 - A_ 1 - B_ 1 - notetype 12, 12, 3 + note B_, 4 + note_type 12, 12, 7 + note B_, 12 + note_type 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 + note_type 6, 12, 2 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + note_type 12, 12, 3 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 4 - A_ 4 - G_ 2 - A# 4 - A_ 2 - G_ 4 - F_ 2 - E_ 2 - notetype 8, 12, 4 - A_ 4 - G_ 4 - F_ 4 - B_ 4 - A_ 4 - G_ 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 + note_type 8, 12, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note B_, 4 + note A_, 4 + note G_, 4 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 5 - D_ 4 - E_ 4 - C_ 4 - notetype 12, 12, 7 - D_ 12 - C_ 4 - notetype 12, 11, 0 + note D_, 4 + note E_, 4 + note C_, 4 + note_type 12, 12, 7 + note D_, 12 + note C_, 4 + note_type 12, 11, 0 octave 4 - B_ 4 - notetype 12, 12, 7 - B_ 12 - notetype 12, 12, 3 - loopchannel 0, Music_BikeRiding_branch_7dc75 + note B_, 4 + note_type 12, 12, 7 + note B_, 12 + note_type 12, 12, 3 + sound_loop 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch2:: - notetype 12, 1, 3 +Music_BikeRiding_Ch3:: + note_type 12, 1, 3 rest 2 Music_BikeRiding_branch_7dd17:: octave 4 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - G_ 1 + note G_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - loopchannel 0, Music_BikeRiding_branch_7dd17 + sound_loop 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch3:: +Music_BikeRiding_Ch4:: dspeed 12 rest 2 Music_BikeRiding_branch_7de6a:: - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dec2 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dec2 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - loopchannel 0, Music_BikeRiding_branch_7de6a + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dec2 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dec2 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_loop 0, Music_BikeRiding_branch_7de6a Music_BikeRiding_branch_7dea7:: rest 2 @@ -678,7 +678,7 @@ Music_BikeRiding_branch_7dea7:: triangle3 2 rest 2 triangle3 2 - endchannel + sound_ret Music_BikeRiding_branch_7deb4:: rest 2 @@ -689,7 +689,7 @@ Music_BikeRiding_branch_7deb4:: triangle3 2 triangle3 2 triangle3 2 - endchannel + sound_ret Music_BikeRiding_branch_7dec2:: rest 2 @@ -701,4 +701,4 @@ Music_BikeRiding_branch_7dec2:: rest 2 triangle3 1 triangle3 1 - endchannel + sound_ret diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index a1699301..b64fc6dd 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -1,411 +1,411 @@ -Music_Celadon_Ch0:: +Music_Celadon_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 12, 2, 15 + duty_cycle 3 + toggle_perfect_pitch + note_type 12, 2, 15 rest 8 octave 3 - D_ 8 + note D_, 8 Music_Celadon_branch_b6d4:: - duty 2 - notetype 12, 11, 2 - G_ 4 - B_ 4 - G_ 2 - B_ 4 - G_ 2 - E_ 1 - E_ 1 - G_ 1 - E_ 1 - B_ 2 + duty_cycle 2 + note_type 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 - C_ 2 + note C_, 2 octave 3 - A_ 8 - F# 4 - A_ 4 - F# 2 - A_ 6 - A_ 1 - B_ 1 + note A_, 8 + note F#, 4 + note A_, 4 + note F#, 2 + note A_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - A_ 2 - B_ 2 - G_ 4 + note B_, 1 + note A_, 2 + note B_, 2 + note G_, 4 octave 4 - G_ 4 + note G_, 4 octave 3 - G_ 4 - B_ 4 - G_ 2 - B_ 4 - G_ 2 - E_ 1 - F# 1 - G_ 1 - A_ 1 - B_ 2 + 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 - C_ 2 + note C_, 2 octave 3 - A_ 8 - A_ 2 - B_ 2 + note A_, 8 + note A_, 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - 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 - B_ 8 - G_ 4 - D_ 4 - G_ 4 - A_ 2 + 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 + note_type 12, 9, 4 + note B_, 8 + note G_, 4 + note D_, 4 + note G_, 4 + note A_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - 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 + 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 - C_ 2 + note C_, 2 octave 3 - B_ 8 - A_ 8 - F# 4 - G_ 4 - A_ 4 - G_ 4 - F# 4 - A_ 4 - loopchannel 0, Music_Celadon_branch_b6d4 + note B_, 8 + note A_, 8 + note F#, 4 + note G_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + sound_loop 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch1:: - duty 3 - notetype 12, 12, 2 +Music_Celadon_Ch2:: + duty_cycle 3 + note_type 12, 12, 2 octave 4 - D_ 1 - C# 1 - D_ 1 - E_ 1 - F# 1 - E_ 1 - F# 1 - G_ 1 - notetype 12, 10, 0 - A_ 8 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note_type 12, 10, 0 + note A_, 8 Music_Celadon_branch_b74a:: - duty 2 - notetype 12, 12, 2 + duty_cycle 2 + note_type 12, 12, 2 octave 4 - B_ 4 - G_ 4 - B_ 2 - G_ 6 - B_ 1 - G_ 1 - A_ 1 - B_ 1 + note B_, 4 + note G_, 4 + note B_, 2 + note G_, 6 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 5 - C_ 2 + note 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 + 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 octave 3 - B_ 2 + note B_, 2 octave 4 - B_ 1 - G_ 1 - A_ 1 - B_ 1 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 5 - C_ 2 + note 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 + 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 octave 5 - D_ 8 - notetype 12, 11, 4 + note D_, 8 + note_type 12, 11, 4 octave 4 - D_ 8 - C_ 2 + note D_, 8 + note C_, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note B_, 2 octave 4 - E_ 4 - F# 4 - D_ 8 - C_ 8 + note E_, 4 + note F#, 4 + note D_, 8 + note C_, 8 octave 3 - A_ 2 - B_ 2 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - D_ 2 - E_ 2 - C_ 2 - D_ 2 - E_ 2 - D_ 8 - D_ 8 - C_ 2 + 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 octave 3 - B_ 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note 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 + 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 + sound_loop 0, Music_Celadon_branch_b74a -Music_Celadon_Ch2:: - notetype 12, 1, 3 +Music_Celadon_Ch3:: + note_type 12, 1, 3 rest 8 octave 5 - D_ 1 - C# 1 - D_ 1 - E_ 1 - F# 1 - E_ 1 - F# 1 - G_ 1 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 Music_Celadon_branch_b7c1:: octave 4 - 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 + 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 rest 6 - F# 2 + note F#, 2 rest 4 - F# 2 - G_ 2 + note F#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 - B_ 2 - G_ 2 + note G_, 2 + note B_, 2 + note G_, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - G_ 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 - B_ 2 - G_ 2 + note G_, 2 + note B_, 2 + note G_, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - G_ 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - loopchannel 0, Music_Celadon_branch_b7c1 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + sound_loop 0, Music_Celadon_branch_b7c1 diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index c6b3564d..69496af5 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -1,354 +1,354 @@ -Music_Cinnabar_Ch0:: +Music_Cinnabar_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_Cinnabar_branch_b878:: - notetype 12, 11, 5 + note_type 12, 11, 5 rest 4 octave 3 - D_ 4 - E_ 6 - C# 2 - notetype 12, 11, 1 - D_ 4 - notetype 12, 11, 5 - B_ 4 + note D_, 4 + note E_, 6 + note C#, 2 + note_type 12, 11, 1 + note D_, 4 + note_type 12, 11, 5 + note B_, 4 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - notetype 12, 11, 1 - B_ 4 - notetype 12, 11, 5 - G_ 4 - F# 4 - E_ 2 - F# 2 - notetype 12, 11, 1 - G_ 4 - notetype 12, 11, 5 - G_ 4 - F# 4 - E_ 4 - D_ 4 - E_ 4 - F# 6 - A_ 2 - notetype 12, 11, 1 - G_ 4 - notetype 12, 11, 5 - B_ 4 + note A_, 2 + note_type 12, 11, 1 + note B_, 4 + note_type 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 2 + note F#, 2 + note_type 12, 11, 1 + note G_, 4 + note_type 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note F#, 6 + note A_, 2 + note_type 12, 11, 1 + note G_, 4 + note_type 12, 11, 5 + note B_, 4 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - B_ 4 - G_ 4 - F# 3 - E_ 1 - F# 2 - A_ 2 - notetype 12, 10, 2 - G_ 4 + note A_, 2 + note B_, 4 + note G_, 4 + note F#, 3 + note E_, 1 + note F#, 2 + note A_, 2 + note_type 12, 10, 2 + note G_, 4 octave 4 - D_ 1 - E_ 1 - D_ 4 - notetype 12, 7, 2 - D_ 1 - E_ 1 - D_ 4 - notetype 12, 10, 7 + note D_, 1 + note E_, 1 + note D_, 4 + note_type 12, 7, 2 + note D_, 1 + note E_, 1 + note D_, 4 + note_type 12, 10, 7 octave 3 - B_ 6 - G_ 2 - E_ 8 + note B_, 6 + note G_, 2 + note E_, 8 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - F# 8 + note A_, 2 + note F#, 8 octave 4 - F# 6 - D_ 2 + note F#, 6 + note D_, 2 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - G_ 8 - F# 4 - E_ 4 - loopchannel 0, Music_Cinnabar_branch_b878 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 4 + note E_, 4 + sound_loop 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch1:: - duty 3 +Music_Cinnabar_Ch2:: + duty_cycle 3 vibrato 10, 2, 3 Music_Cinnabar_branch_b8d9:: - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - G_ 6 - A_ 1 - B_ 1 + note G_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 6 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 - G_ 4 - A_ 6 - G_ 1 - F# 1 - E_ 4 - D_ 4 - C_ 3 + note C_, 6 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 2 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 + note C_, 2 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 octave 3 - B_ 8 - A_ 4 - G_ 6 - A_ 1 - B_ 1 + note B_, 8 + note A_, 4 + note G_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 6 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 - G_ 4 - A_ 6 - G_ 1 - F# 1 - E_ 4 - D_ 4 - C_ 3 + note C_, 6 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 2 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 + note C_, 2 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 octave 3 - A_ 4 - G_ 4 - F# 4 - notetype 12, 11, 0 + note A_, 4 + note G_, 4 + note F#, 4 + note_type 12, 11, 0 octave 4 - D_ 6 + note D_, 6 octave 3 - B_ 2 - G_ 8 + note B_, 2 + note G_, 8 octave 4 - E_ 6 - C_ 2 + note E_, 6 + note C_, 2 octave 3 - A_ 8 + note A_, 8 octave 4 - A_ 6 - F# 2 - D_ 2 - C_ 2 + note A_, 6 + note F#, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - B_ 4 + note B_, 2 + note A_, 2 + note B_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 2 - A_ 6 - loopchannel 0, Music_Cinnabar_branch_b8d9 + note B_, 2 + note A_, 6 + sound_loop 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch2:: - notetype 12, 1, 0 +Music_Cinnabar_Ch3:: + note_type 12, 1, 0 Music_Cinnabar_branch_b93f:: octave 4 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 4 - A_ 1 + note B_, 4 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 1 + note B_, 1 rest 3 octave 5 - D_ 2 + note D_, 2 octave 4 - B_ 1 - B_ 1 - B_ 1 + note B_, 1 + note B_, 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 1 + note B_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 octave 5 - E_ 2 - C_ 1 - C_ 1 - C_ 1 + note E_, 2 + note C_, 1 + note C_, 1 + note C_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 2 - C_ 1 + note E_, 2 + note C_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 3 octave 5 - A_ 2 - F# 1 - F# 1 - D_ 1 + note A_, 2 + note F#, 1 + note F#, 1 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D_ 2 - C_ 1 + note D_, 2 + note C_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 3 octave 5 - D_ 2 - C_ 1 - C_ 1 + note D_, 2 + note C_, 1 + note C_, 1 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 2 + note A_, 2 octave 5 - C_ 1 + note C_, 1 rest 1 - loopchannel 0, Music_Cinnabar_branch_b93f + sound_loop 0, Music_Cinnabar_branch_b93f diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index bb54a456..ff3de714 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -1,149 +1,149 @@ -Music_CinnabarMansion_Ch0:: +Music_CinnabarMansion_Ch1:: tempo 144 volume 7, 7 vibrato 11, 2, 5 - duty 2 + duty_cycle 2 Music_CinnabarMansion_branch_7ed19:: - notetype 12, 6, 2 + note_type 12, 6, 2 octave 5 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 4 - B_ 1 - B_ 1 - C_ 1 + note B_, 1 + note B_, 1 + note C_, 1 rest 2 octave 5 - B_ 2 - E_ 2 + note B_, 2 + note E_, 2 octave 4 - C_ 2 - B_ 2 - E_ 2 - C_ 1 + note C_, 2 + note B_, 2 + note E_, 2 + note C_, 1 octave 5 - B_ 1 + note B_, 1 rest 2 - loopchannel 14, Music_CinnabarMansion_branch_7ed19 - notetype 12, 10, 5 + sound_loop 14, Music_CinnabarMansion_branch_7ed19 + note_type 12, 10, 5 rest 16 rest 16 rest 15 octave 4 - C_ 1 + note C_, 1 octave 5 - B_ 1 - B_ 2 - loopchannel 0, Music_CinnabarMansion_branch_7ed19 + note B_, 1 + note B_, 2 + sound_loop 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch1:: - duty 2 - toggleperfectpitch +Music_CinnabarMansion_Ch2:: + duty_cycle 2 + toggle_perfect_pitch vibrato 10, 2, 4 - notetype 12, 12, 2 + note_type 12, 12, 2 Music_CinnabarMansion_branch_7ed48:: rest 16 rest 16 - loopchannel 4, Music_CinnabarMansion_branch_7ed48 + sound_loop 4, Music_CinnabarMansion_branch_7ed48 Music_CinnabarMansion_branch_7ed4e:: - notetype 12, 12, 2 + note_type 12, 12, 2 Music_CinnabarMansion_branch_7ed50:: - callchannel Music_CinnabarMansion_branch_7ed6c - loopchannel 3, Music_CinnabarMansion_branch_7ed50 + sound_call Music_CinnabarMansion_branch_7ed6c + sound_loop 3, Music_CinnabarMansion_branch_7ed50 octave 3 - E_ 4 - D# 4 - B_ 4 - A# 4 - G_ 4 - G# 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 rest 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 + 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 + sound_loop 0, Music_CinnabarMansion_branch_7ed4e Music_CinnabarMansion_branch_7ed6c:: octave 3 - 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 + 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 rest 4 - A# 4 - endchannel + note A#, 4 + sound_ret -Music_CinnabarMansion_Ch2:: - notetype 12, 1, 1 +Music_CinnabarMansion_Ch3:: + note_type 12, 1, 1 Music_CinnabarMansion_branch_7ed80:: octave 2 - B_ 2 + note B_, 2 rest 2 octave 3 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - C_ 2 + note C_, 2 rest 2 octave 3 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - loopchannel 8, Music_CinnabarMansion_branch_7ed80 - E_ 16 - D# 16 - G_ 16 - G# 8 - D# 8 - loopchannel 0, Music_CinnabarMansion_branch_7ed80 + sound_loop 8, Music_CinnabarMansion_branch_7ed80 + note E_, 16 + note D#, 16 + note G_, 16 + note G#, 8 + note D#, 8 + sound_loop 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch3:: +Music_CinnabarMansion_Ch4:: dspeed 6 rest 16 rest 16 @@ -169,4 +169,4 @@ Music_CinnabarMansion_branch_7edb5:: rest 10 rest 8 cymbal3 8 - loopchannel 0, Music_CinnabarMansion_branch_7edb5 + sound_loop 0, Music_CinnabarMansion_branch_7edb5 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index 984202f6..3aef872b 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -1,604 +1,604 @@ Music_Cities1_branch_aa6f:: tempo 232 - loopchannel 0, Music_Cities1_branch_aa79 + sound_loop 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch0:: +Music_Cities1_Ch1:: tempo 144 Music_Cities1_branch_aa79:: volume 7, 7 vibrato 8, 2, 4 - duty 3 + duty_cycle 3 Music_Cities1_branch_aa80:: - notetype 12, 12, 5 + note_type 12, 12, 5 octave 3 - 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 - C# 4 + 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 + note_type 12, 10, 5 + note C#, 4 octave 2 - B_ 6 + note B_, 6 octave 3 - C# 2 - C# 4 + note C#, 2 + note C#, 4 octave 2 - B_ 4 - notetype 12, 12, 5 - callchannel Music_Cities1_branch_ab7d + note B_, 4 + note_type 12, 12, 5 + sound_call Music_Cities1_branch_ab7d octave 3 - D# 6 - E_ 2 + note D#, 6 + note E_, 2 octave 2 - B_ 4 - notetype 12, 10, 5 + note B_, 4 + note_type 12, 10, 5 octave 3 - C# 2 + note C#, 2 octave 2 - B_ 2 - A_ 4 - B_ 4 - B_ 2 + note B_, 2 + note A_, 4 + note B_, 4 + note B_, 2 octave 3 - C# 2 - D# 2 - E_ 2 - D# 2 - C# 2 - D# 2 - notetype 12, 12, 5 - 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 - C# 2 + note C#, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + note_type 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 + note_type 12, 10, 5 + note C#, 2 octave 2 - A_ 2 - B_ 6 + note A_, 2 + note B_, 6 octave 3 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 2 - B_ 2 - B_ 4 - notetype 12, 12, 5 - callchannel Music_Cities1_branch_ab7d + note B_, 2 + note B_, 4 + note_type 12, 12, 5 + sound_call Music_Cities1_branch_ab7d octave 3 - D# 4 - D# 2 - E_ 2 + note D#, 4 + note D#, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - G# 2 - E_ 4 + note C#, 2 + note G#, 2 + note E_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - notetype 12, 10, 5 - C# 4 + note E_, 2 + note_type 12, 10, 5 + note C#, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 4 - C# 2 - E_ 4 - notetype 12, 11, 3 - callchannel Music_Cities1_branch_ab8a - A_ 2 - B_ 2 - A_ 2 - G# 2 - A_ 4 - F# 4 - G# 2 - E_ 2 + note D#, 4 + note C#, 2 + note E_, 4 + note_type 12, 11, 3 + sound_call 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 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 4 - G# 2 + note E_, 4 + note G#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 Music_Cities1_branch_ab12:: - C# 2 - D# 2 - C# 2 + note C#, 2 + note D#, 2 + note C#, 2 octave 2 - B_ 4 - B_ 2 + note B_, 4 + note B_, 2 octave 3 - C# 2 - D# 2 - loopchannel 2, Music_Cities1_branch_ab12 - E_ 2 + note C#, 2 + note D#, 2 + sound_loop 2, Music_Cities1_branch_ab12 + note E_, 2 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - G# 2 - G# 2 + note C#, 2 + note G#, 2 + note G#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - callchannel Music_Cities1_branch_ab8a - A_ 2 - E_ 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - A_ 2 - F# 2 - G# 2 - E_ 2 + sound_call 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 octave 2 - B_ 2 + note B_, 2 octave 3 - 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 + 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 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 4 - F# 2 - D# 2 - D# 2 - F# 2 + note D#, 4 + note F#, 2 + note D#, 2 + note D#, 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D# 2 - notetype 12, 11, 6 - F# 8 - F# 4 - D# 4 - E_ 8 - notetype 12, 8, 4 + note D#, 2 + note_type 12, 11, 6 + note F#, 8 + note F#, 4 + note D#, 4 + note E_, 8 + note_type 12, 8, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 2 - F# 2 - loopchannel 0, Music_Cities1_branch_aa80 + note E_, 2 + note F#, 2 + sound_loop 0, Music_Cities1_branch_aa80 Music_Cities1_branch_ab7d:: octave 3 - F# 2 - D# 4 - E_ 2 - D# 4 - C# 4 + note F#, 2 + note D#, 4 + note E_, 2 + note D#, 4 + note C#, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - C# 2 - D# 2 - C# 2 - endchannel + note C#, 2 + note D#, 2 + note C#, 2 + sound_ret Music_Cities1_branch_ab8a:: - A_ 2 - E_ 2 - C# 2 - E_ 4 - A_ 2 - C# 2 - E_ 2 - endchannel + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 4 + note A_, 2 + note C#, 2 + note E_, 2 + sound_ret -Music_Cities1_Ch1:: +Music_Cities1_Ch2:: vibrato 5, 1, 5 - callchannel Music_Cities1_branch_ac00 + sound_call Music_Cities1_branch_ac00 octave 4 - G# 2 - notetype 12, 12, 4 - E_ 6 - notetype 12, 12, 5 - duty 3 + note G#, 2 + note_type 12, 12, 4 + note E_, 6 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - C# 4 - D# 4 - E_ 6 - F# 6 - G# 4 - callchannel Music_Cities1_branch_ac00 + note C#, 4 + note D#, 4 + note E_, 6 + note F#, 6 + note G#, 4 + sound_call Music_Cities1_branch_ac00 octave 4 - G# 2 - notetype 12, 12, 4 - E_ 14 - duty 3 + note G#, 2 + note_type 12, 12, 4 + note E_, 14 + duty_cycle 3 octave 3 - E_ 6 - F# 6 - G# 4 - notetype 12, 11, 7 - duty 2 + note E_, 6 + note F#, 6 + note G#, 4 + note_type 12, 11, 7 + duty_cycle 2 vibrato 8, 1, 7 octave 5 - C# 12 + note C#, 12 octave 4 - A_ 4 + note A_, 4 octave 5 - E_ 8 - F# 2 - E_ 2 - D# 2 - C# 2 + note E_, 8 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 4 - 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 + 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 octave 5 - C# 12 - D# 2 - E_ 2 - F# 4 - E_ 4 - D# 4 - C# 4 + note C#, 12 + note D#, 2 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 octave 4 - B_ 12 + note B_, 12 octave 5 - C# 2 - D# 2 - C# 4 + note C#, 2 + note D#, 2 + note C#, 4 octave 4 - B_ 4 - A_ 4 - G# 4 - A_ 12 - B_ 2 + note B_, 4 + note A_, 4 + note G#, 4 + note A_, 12 + note B_, 2 octave 5 - C_ 2 - C_ 4 + note C_, 2 + note C_, 4 octave 4 - B_ 4 - A_ 4 - F# 4 - notetype 12, 11, 7 - A_ 8 + note B_, 4 + note A_, 4 + note F#, 4 + note_type 12, 11, 7 + note A_, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - B_ 14 - notetype 12, 8, 4 - G# 1 - notetype 12, 10, 4 - A_ 1 - loopchannel 0, Music_Cities1_Ch1 + note B_, 14 + note_type 12, 8, 4 + note G#, 1 + note_type 12, 10, 4 + note A_, 1 + sound_loop 0, Music_Cities1_Ch2 Music_Cities1_branch_ac00:: - duty 2 - notetype 12, 12, 3 + duty_cycle 2 + note_type 12, 12, 3 octave 4 - B_ 4 - A_ 4 - notetype 12, 12, 4 - G# 10 - notetype 12, 12, 3 - G# 2 - A_ 2 - B_ 4 - B_ 2 - A_ 2 - G# 2 - A_ 2 - notetype 12, 12, 4 - F# 10 - notetype 12, 12, 5 - duty 3 + note B_, 4 + note A_, 4 + note_type 12, 12, 4 + note G#, 10 + note_type 12, 12, 3 + note G#, 2 + note A_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note_type 12, 12, 4 + note F#, 10 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - E_ 4 - D# 8 - E_ 4 - F# 4 - notetype 12, 12, 3 - duty 2 + note E_, 4 + note D#, 8 + note E_, 4 + note F#, 4 + note_type 12, 12, 3 + duty_cycle 2 octave 4 - A_ 4 - G# 4 - notetype 12, 12, 4 - F# 10 - notetype 12, 12, 3 - F# 2 - G# 2 - A_ 4 - A_ 2 - G# 2 - F# 2 - endchannel + note A_, 4 + note G#, 4 + note_type 12, 12, 4 + note F#, 10 + note_type 12, 12, 3 + note F#, 2 + note G#, 2 + note A_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + sound_ret -Music_Cities1_Ch2:: - notetype 12, 1, 1 - toggleperfectpitch +Music_Cities1_Ch3:: + note_type 12, 1, 1 + toggle_perfect_pitch Music_Cities1_branch_ac35:: vibrato 0, 0, 0 octave 4 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acce - G# 2 - E_ 2 - F# 2 - G# 2 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - callchannel Music_Cities1_branch_acc5 - B_ 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 + sound_call Music_Cities1_branch_acc5 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acce - G# 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - G# 2 - E_ 2 - B_ 2 + note G#, 2 + note E_, 2 + note B_, 2 rest 2 - E_ 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - B_ 2 - E_ 2 + note E_, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note E_, 2 vibrato 8, 2, 5 - 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 + 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 rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - 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 + 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 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - F# 2 - B_ 2 - A_ 2 - A_ 4 - G# 4 - F# 2 - D# 2 - A_ 2 - F# 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 rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 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 + 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 + sound_loop 0, Music_Cities1_branch_ac35 Music_Cities1_branch_acc5:: rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - endchannel + note E_, 2 + note F#, 2 + note G#, 2 + sound_ret Music_Cities1_branch_acce:: - A_ 2 - F# 2 - G# 2 - A_ 2 + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - F# 2 + note A_, 2 + note G#, 2 + note F#, 2 rest 2 - F# 2 - G# 2 - A_ 2 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - F# 2 - D# 2 - D# 2 - E_ 2 - F# 2 + note A_, 2 + note G#, 2 + note F#, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 - endchannel + note D#, 2 + note E_, 2 + note F#, 2 + sound_ret -Music_Cities1_Ch3:: +Music_Cities1_Ch4:: dspeed 12 - callchannel Music_Cities1_branch_ad36 + sound_call Music_Cities1_branch_ad36 Music_Cities1_branch_acf3:: - callchannel Music_Cities1_branch_ad36 - callchannel Music_Cities1_branch_ad45 - callchannel Music_Cities1_branch_ad45 - loopchannel 2, Music_Cities1_branch_acf3 - callchannel Music_Cities1_branch_ad36 - callchannel Music_Cities1_branch_ad5f - callchannel Music_Cities1_branch_ad52 + sound_call Music_Cities1_branch_ad36 + sound_call Music_Cities1_branch_ad45 + sound_call Music_Cities1_branch_ad45 + sound_loop 2, Music_Cities1_branch_acf3 + sound_call Music_Cities1_branch_ad36 + sound_call Music_Cities1_branch_ad5f + sound_call Music_Cities1_branch_ad52 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 + sound_call Music_Cities1_branch_ad6e + sound_call Music_Cities1_branch_ad5f + sound_call Music_Cities1_branch_ad52 + sound_call Music_Cities1_branch_ad6e + sound_call Music_Cities1_branch_ad52 triangle1 6 triangle1 6 triangle2 2 @@ -609,7 +609,7 @@ Music_Cities1_branch_acf3:: triangle1 6 snare6 6 snare6 4 - loopchannel 0, Music_Cities1_Ch3 + sound_loop 0, Music_Cities1_Ch4 Music_Cities1_branch_ad36:: snare6 6 @@ -619,7 +619,7 @@ Music_Cities1_branch_ad36:: snare6 6 snare6 2 snare6 2 - endchannel + sound_ret Music_Cities1_branch_ad45:: snare6 6 @@ -628,7 +628,7 @@ Music_Cities1_branch_ad45:: snare6 6 snare6 6 snare6 4 - endchannel + sound_ret Music_Cities1_branch_ad52:: triangle1 6 @@ -637,7 +637,7 @@ Music_Cities1_branch_ad52:: triangle1 6 triangle1 6 triangle2 4 - endchannel + sound_ret Music_Cities1_branch_ad5f:: triangle1 6 @@ -647,11 +647,11 @@ Music_Cities1_branch_ad5f:: triangle1 6 triangle2 2 triangle1 2 - endchannel + sound_ret Music_Cities1_branch_ad6e:: triangle1 6 triangle1 6 triangle2 2 triangle2 2 - endchannel + sound_ret diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index fb167999..6397f965 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -1,416 +1,416 @@ -Music_Cities2_Ch0:: +Music_Cities2_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 2 - toggleperfectpitch - notetype 12, 11, 6 + toggle_perfect_pitch + note_type 12, 11, 6 rest 8 octave 3 - E_ 2 - D# 2 - C# 2 - C_ 2 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 octave 2 - B_ 2 + note B_, 2 rest 14 Music_Cities2_branch_b51a:: octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 - D# 1 - D_ 1 - C# 4 + note C#, 2 + note D#, 1 + note D_, 1 + note C#, 4 octave 3 - B_ 4 - G# 8 - E_ 8 - A_ 4 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + 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 octave 4 - C# 2 + note C#, 2 rest 16 - C# 4 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 1 - D# 1 - C# 4 + note C#, 1 + note D#, 1 + note C#, 4 octave 3 - B_ 4 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 3 - G# 8 - B_ 4 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 - E_ 2 - F# 2 - G# 2 + 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 rest 2 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 4 - F# 2 - G# 2 - A_ 2 + note B_, 4 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 octave 4 - F# 4 - D# 4 + note F#, 4 + note D#, 4 octave 3 - E_ 2 + note E_, 2 rest 4 - F# 2 + note F#, 2 rest 4 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 16 rest 16 rest 14 - E_ 16 - F# 8 - G# 4 - F# 4 - E_ 2 + note E_, 16 + note F#, 8 + note G#, 4 + note F#, 4 + note E_, 2 rest 14 - loopchannel 0, Music_Cities2_branch_b51a + sound_loop 0, Music_Cities2_branch_b51a -Music_Cities2_Ch1:: - duty 3 +Music_Cities2_Ch2:: + duty_cycle 3 vibrato 8, 2, 3 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 6 - notetype 12, 12, 2 - duty 2 + note C#, 2 + note D#, 2 + note E_, 6 + note_type 12, 12, 2 + duty_cycle 2 octave 4 - E_ 1 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 Music_Cities2_branch_b58b:: - notetype 12, 10, 6 - G# 6 - notetype 12, 12, 2 - A_ 1 - G# 1 - notetype 12, 12, 4 - F# 14 - notetype 12, 12, 2 - E_ 1 + note_type 12, 10, 6 + note G#, 6 + note_type 12, 12, 2 + note A_, 1 + note G#, 1 + note_type 12, 12, 4 + note F#, 14 + note_type 12, 12, 2 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 4 - G# 6 - notetype 12, 12, 2 - E_ 1 - G# 1 - notetype 12, 12, 5 - B_ 14 - notetype 12, 12, 2 - E_ 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 4 + note G#, 6 + note_type 12, 12, 2 + note E_, 1 + note G#, 1 + note_type 12, 12, 5 + note B_, 14 + note_type 12, 12, 2 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 10, 6 - G# 6 - notetype 12, 12, 2 - A_ 1 - G# 1 - notetype 12, 12, 4 - F# 8 - notetype 12, 10, 1 - duty 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 10, 6 + note G#, 6 + note_type 12, 12, 2 + note A_, 1 + note G#, 1 + note_type 12, 12, 4 + note F#, 8 + note_type 12, 10, 1 + duty_cycle 1 octave 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - notetype 12, 12, 2 - duty 2 + note_type 12, 12, 2 + duty_cycle 2 octave 4 - E_ 1 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 4 - G# 6 - E_ 1 - G# 1 - notetype 12, 12, 6 - B_ 8 - notetype 12, 12, 2 - C# 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 4 + note G#, 6 + note E_, 1 + note G#, 1 + note_type 12, 12, 6 + note B_, 8 + note_type 12, 12, 2 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - D# 1 - E_ 4 - notetype 12, 12, 7 - G# 4 - E_ 4 - notetype 12, 12, 2 - D# 1 - C# 1 - D# 1 - E_ 1 - F# 4 - notetype 12, 12, 7 - B_ 4 - F# 4 - notetype 12, 12, 2 - C# 1 + note C#, 1 + note D#, 1 + note E_, 4 + note_type 12, 12, 7 + note G#, 4 + note E_, 4 + note_type 12, 12, 2 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note F#, 4 + note_type 12, 12, 7 + note B_, 4 + note F#, 4 + note_type 12, 12, 2 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - 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 + 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 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - D# 1 - F# 1 - notetype 12, 12, 2 - B_ 8 - notetype 12, 11, 7 + note C#, 1 + note D#, 1 + note F#, 1 + note_type 12, 12, 2 + note B_, 8 + note_type 12, 11, 7 octave 3 - E_ 8 + note E_, 8 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - G# 4 - A_ 4 - B_ 8 - B_ 8 - G# 4 + note F#, 4 + note G#, 4 + note A_, 4 + note B_, 8 + note B_, 8 + note G#, 4 octave 4 - D# 4 - C# 4 - D# 4 - E_ 2 - D# 2 - C# 2 - D# 2 - notetype 12, 12, 2 - E_ 6 - E_ 1 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + note_type 12, 12, 2 + note E_, 6 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - loopchannel 0, Music_Cities2_branch_b58b + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + sound_loop 0, Music_Cities2_branch_b58b -Music_Cities2_Ch2:: - notetype 12, 1, 1 +Music_Cities2_Ch3:: + note_type 12, 1, 1 rest 16 octave 4 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 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 Music_Cities2_branch_b64c:: - 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 + 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 rest 2 - E_ 4 - G# 4 - F# 2 - A_ 2 - F# 2 + note E_, 4 + note G#, 4 + note F#, 2 + note A_, 2 + note F#, 2 rest 2 - F# 4 - A_ 4 - C# 2 + note F#, 4 + note A_, 4 + note C#, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - G# 2 - A_ 2 - B_ 2 + note G#, 2 + note A_, 2 + note B_, 2 rest 8 - 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 + 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 + sound_loop 0, Music_Cities2_branch_b64c diff --git a/audio/music/credits.asm b/audio/music/credits.asm index f092326b..b8a6d7dd 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,820 +1,820 @@ -Music_Credits_Ch0:: +Music_Credits_Ch1:: tempo 140 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 4 - E_ 6 + note E_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - E_ 1 - D_ 6 + note E_, 1 + note D_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - D_ 1 - C# 6 + note D_, 1 + note C#, 6 octave 3 - F# 1 + note F#, 1 octave 4 - C# 1 - D_ 4 - E_ 2 - C# 1 - E_ 1 - C# 1 + note C#, 1 + note D_, 4 + note E_, 2 + note C#, 1 + note E_, 1 + note C#, 1 rest 1 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 - E_ 1 - F# 1 - G_ 1 - notetype 12, 11, 6 - 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 + note E_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note_type 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 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - D_ 4 - E_ 2 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - notetype 12, 11, 7 - E_ 6 - A_ 2 - G_ 4 - F# 4 - notetype 12, 12, 7 - A_ 4 - B_ 4 + 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 + note_type 12, 11, 7 + note E_, 6 + note A_, 2 + note G_, 4 + note F#, 4 + note_type 12, 12, 7 + note A_, 4 + note B_, 4 octave 4 - C# 4 - D_ 4 + note C#, 4 + note D_, 4 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 9, 0 - G_ 8 - F# 8 - E_ 8 - D_ 8 + 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_type 12, 9, 0 + note G_, 8 + note F#, 8 + note E_, 8 + note D_, 8 rest 16 rest 16 rest 8 - notetype 12, 11, 6 - E_ 6 - D# 1 - D_ 1 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 + note_type 12, 11, 6 + note E_, 6 + note D#, 1 + note D_, 1 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 rest 16 rest 16 rest 8 - E_ 6 - C# 1 - E_ 1 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 - notetype 12, 11, 6 - G_ 6 - D_ 4 - G_ 2 - B_ 4 - notetype 12, 11, 7 - G_ 8 - F# 4 - G# 4 - notetype 12, 9, 0 - A_ 8 - F# 8 - E_ 8 - C# 8 - notetype 12, 11, 7 - D_ 8 - C# 8 + note E_, 6 + note C#, 1 + note E_, 1 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 + note_type 12, 11, 6 + note G_, 6 + note D_, 4 + note G_, 2 + note B_, 4 + note_type 12, 11, 7 + note G_, 8 + note F#, 4 + note G#, 4 + note_type 12, 9, 0 + note A_, 8 + note F#, 8 + note E_, 8 + note C#, 8 + note_type 12, 11, 7 + note D_, 8 + note C#, 8 octave 2 - B_ 8 + note B_, 8 octave 3 - D_ 8 - notetype 12, 9, 0 - E_ 8 - D_ 8 - F# 8 - E_ 8 - notetype 12, 10, 0 - D_ 8 - E_ 8 - D_ 8 - C_ 8 - G_ 8 - F_ 8 - E_ 8 - D_ 8 - notetype 12, 10, 0 - C# 6 - notetype 12, 10, 7 - C# 6 - notetype 12, 11, 7 - D_ 4 - E_ 8 - G_ 6 - F# 1 - F_ 1 - notetype 12, 10, 0 - E_ 6 - notetype 12, 10, 7 - E_ 6 - notetype 12, 11, 7 - D_ 4 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 11, 7 - 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 - E_ 6 - notetype 12, 11, 7 - D_ 2 - G_ 4 - F# 4 - E_ 4 - F# 4 - A_ 4 - B_ 4 - notetype 12, 10, 0 + note D_, 8 + note_type 12, 9, 0 + note E_, 8 + note D_, 8 + note F#, 8 + note E_, 8 + note_type 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 + note_type 12, 10, 0 + note C#, 6 + note_type 12, 10, 7 + note C#, 6 + note_type 12, 11, 7 + note D_, 4 + note E_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + note_type 12, 10, 0 + note E_, 6 + note_type 12, 10, 7 + note E_, 6 + note_type 12, 11, 7 + note D_, 4 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 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 + note_type 12, 10, 0 + note E_, 6 + note_type 12, 11, 7 + note D_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 4 + note B_, 4 + note_type 12, 10, 0 octave 4 - C# 16 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 11, 5 + note C#, 16 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 12, 11, 5 octave 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - notetype 12, 11, 1 - A_ 8 - endchannel + note A_, 1 + note A_, 1 + note_type 12, 11, 1 + note A_, 8 + sound_ret -Music_Credits_Ch1:: - duty 3 +Music_Credits_Ch2:: + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 5 + note_type 12, 12, 5 octave 4 - A_ 6 - E_ 1 - A_ 1 - G_ 6 - D_ 1 - G_ 1 - notetype 12, 12, 7 - F# 12 - G# 2 - E_ 1 - G# 1 - notetype 12, 12, 2 - A_ 2 - notetype 12, 12, 1 + note A_, 6 + note E_, 1 + note A_, 1 + note G_, 6 + note D_, 1 + note G_, 1 + note_type 12, 12, 7 + note F#, 12 + note G#, 2 + note E_, 1 + note G#, 1 + note_type 12, 12, 2 + note A_, 2 + note_type 12, 12, 1 octave 3 - 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 - A_ 1 - F# 1 - A_ 1 - B_ 1 - notetype 12, 12, 7 + 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 + note_type 12, 12, 4 + note A_, 1 + note F#, 1 + note A_, 1 + note B_, 1 + note_type 12, 12, 7 octave 4 - C# 6 - C# 1 - D_ 1 - E_ 4 - C# 4 - G_ 4 - F# 4 - E_ 4 - D_ 4 - C# 6 + 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 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 8 + note E_, 8 octave 3 - A_ 6 - E_ 2 + note A_, 6 + note 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 + 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 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 8 + note E_, 8 octave 3 - A_ 6 - E_ 2 - notetype 12, 11, 0 + note A_, 6 + note E_, 2 + note_type 12, 11, 0 octave 4 - C# 8 - notetype 12, 12, 7 - D_ 6 + note C#, 8 + note_type 12, 12, 7 + note D_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 8 + note G_, 8 octave 3 - G_ 6 - D_ 2 - B_ 8 - notetype 12, 11, 0 + note G_, 6 + note D_, 2 + note B_, 8 + note_type 12, 11, 0 octave 4 - C# 6 - notetype 12, 11, 7 - C# 6 - D_ 4 - notetype 12, 10, 0 - E_ 8 - notetype 12, 10, 7 - E_ 8 - notetype 12, 12, 7 - D_ 6 + note C#, 6 + note_type 12, 11, 7 + note C#, 6 + note D_, 4 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 10, 7 + note E_, 8 + note_type 12, 12, 7 + note D_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 8 + note G_, 8 octave 3 - G_ 6 - D_ 2 - B_ 8 - notetype 12, 11, 0 + note G_, 6 + note D_, 2 + note B_, 8 + note_type 12, 11, 0 octave 4 - E_ 7 - notetype 12, 11, 7 - E_ 7 - notetype 12, 12, 3 - E_ 1 - G# 1 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 6 - G_ 4 - F# 4 - E_ 4 - D_ 4 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 9, 0 + note E_, 7 + note_type 12, 11, 7 + note E_, 7 + note_type 12, 12, 3 + note E_, 1 + note G#, 1 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 6 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 12, 9, 0 octave 3 - A_ 8 - notetype 12, 9, 7 - A_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 12, 7 - D_ 8 - G_ 6 - F# 1 - F_ 1 - E_ 8 - notetype 12, 11, 7 - G_ 6 - F# 1 - F_ 1 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 11, 0 - D_ 8 - notetype 12, 11, 7 - D_ 8 - notetype 12, 12, 7 + note A_, 8 + note_type 12, 9, 7 + note A_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 12, 7 + note D_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + note_type 12, 11, 7 + note G_, 6 + note F#, 1 + note F_, 1 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 11, 0 + note D_, 8 + note_type 12, 11, 7 + note D_, 8 + note_type 12, 12, 7 octave 2 - B_ 8 + note B_, 8 octave 3 - F# 6 - D_ 1 - F# 1 - E_ 8 - B_ 6 - G_ 1 - B_ 1 - notetype 12, 11, 0 + note F#, 6 + note D_, 1 + note F#, 1 + note E_, 8 + note B_, 6 + note G_, 1 + note B_, 1 + note_type 12, 11, 0 octave 4 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 11, 0 - D_ 8 - notetype 12, 11, 7 - D_ 8 - notetype 12, 12, 7 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 11, 0 + note D_, 8 + note_type 12, 11, 7 + note D_, 8 + note_type 12, 12, 7 octave 3 - B_ 8 + note B_, 8 octave 4 - D_ 6 + note D_, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - D_ 1 - notetype 12, 11, 0 - C# 6 - notetype 12, 11, 7 - C# 6 - notetype 12, 12, 7 + note D_, 1 + note_type 12, 11, 0 + note C#, 6 + note_type 12, 11, 7 + note C#, 6 + note_type 12, 12, 7 octave 3 - B_ 4 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 11, 0 - F# 6 - notetype 12, 11, 7 - F# 6 - notetype 12, 12, 7 - G# 4 - A_ 8 - F# 8 - notetype 12, 11, 0 - G# 6 - notetype 12, 11, 7 - G# 6 - notetype 12, 12, 7 - A_ 4 - B_ 8 - G# 8 - notetype 12, 11, 0 - A_ 6 - notetype 12, 11, 7 - A_ 6 - notetype 12, 12, 7 - B_ 4 + note B_, 4 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 11, 0 + note F#, 6 + note_type 12, 11, 7 + note F#, 6 + note_type 12, 12, 7 + note G#, 4 + note A_, 8 + note F#, 8 + note_type 12, 11, 0 + note G#, 6 + note_type 12, 11, 7 + note G#, 6 + note_type 12, 12, 7 + note A_, 4 + note B_, 8 + note G#, 8 + note_type 12, 11, 0 + note A_, 6 + note_type 12, 11, 7 + note A_, 6 + note_type 12, 12, 7 + note B_, 4 octave 4 - C_ 8 + note C_, 8 octave 3 - A_ 8 - notetype 12, 11, 0 - B_ 6 - notetype 12, 11, 7 - B_ 6 - notetype 12, 12, 7 + note A_, 8 + note_type 12, 11, 0 + note B_, 6 + note_type 12, 11, 7 + note B_, 6 + note_type 12, 12, 7 octave 4 - C_ 4 - notetype 12, 11, 0 - D_ 8 + note C_, 4 + note_type 12, 11, 0 + note D_, 8 octave 3 - B_ 8 - notetype 12, 11, 0 + note B_, 8 + note_type 12, 11, 0 octave 4 - C# 16 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 11, 0 + note C#, 16 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 11, 0 octave 3 - A_ 16 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 7 - G_ 6 - B_ 2 + note A_, 16 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 7 + note G_, 6 + note B_, 2 octave 4 - D_ 8 + note D_, 8 octave 3 - B_ 6 + note B_, 6 octave 4 - D_ 2 - G_ 6 - F# 1 - F_ 1 - E_ 8 + note D_, 2 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 octave 3 - G_ 6 - F# 1 - F_ 1 - E_ 8 - C# 4 - D_ 4 - G_ 6 - B_ 2 + 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 - D_ 8 + note D_, 8 octave 3 - B_ 6 + note B_, 6 octave 4 - D_ 2 - G_ 8 - notetype 12, 11, 0 - A_ 16 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 - notetype 12, 12, 1 - A_ 2 - A_ 4 - A_ 1 - A_ 1 - notetype 12, 12, 1 - A_ 8 - endchannel + note D_, 2 + note G_, 8 + note_type 12, 11, 0 + note A_, 16 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 + note_type 12, 12, 1 + note A_, 2 + note A_, 4 + note A_, 1 + note A_, 1 + note_type 12, 12, 1 + note A_, 8 + sound_ret -Music_Credits_Ch2:: - notetype 12, 1, 0 +Music_Credits_Ch3:: + note_type 12, 1, 0 octave 5 - C# 6 + note C#, 6 octave 4 - A_ 1 + note A_, 1 octave 5 - C# 1 - D_ 6 + note C#, 1 + note D_, 6 octave 4 - B_ 1 + note B_, 1 octave 5 - D_ 1 - F# 6 - D_ 1 - F# 1 - A_ 4 - G# 2 - E_ 1 - G# 1 - A_ 1 + 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 rest 15 rest 16 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffa4 octave 4 - 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 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffc1 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffc1 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - B_ 2 - A_ 2 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffc1 - callchannel Music_Credits_branch_7ffc1 + note B_, 2 + note A_, 2 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffc1 + sound_call Music_Credits_branch_7ffc1 octave 4 - G_ 4 - A_ 4 - B_ 4 + note G_, 4 + note A_, 4 + note B_, 4 octave 5 - D_ 4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 - 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 - 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 - 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 - 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 - callchannel Music_Credits_branch_7ffe4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffed - callchannel Music_Credits_branch_7ffed - A_ 1 + note D_, 4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffa4 + note E_, 4 + note A_, 2 + note E_, 4 + note A_, 2 + note E_, 2 + note A_, 2 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffae + sound_call 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 + sound_call Music_Credits_branch_7ffd2 + sound_call Music_Credits_branch_7ffd2 + sound_call Music_Credits_branch_7ffdb + sound_call 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 + sound_call Music_Credits_branch_7ffb8 + sound_call 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 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffe4 + sound_call Music_Credits_branch_7ffe4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffed + sound_call Music_Credits_branch_7ffed + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - A_ 1 + note A_, 1 + note A_, 1 + note A_, 1 rest 7 - endchannel + sound_ret Music_Credits_branch_7ffa4:: octave 4 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + sound_ret Music_Credits_branch_7ffae:: octave 4 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - endchannel + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + sound_ret Music_Credits_branch_7ffb8:: - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - endchannel + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + sound_ret Music_Credits_branch_7ffc1:: octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 - endchannel + note C#, 2 + sound_ret Music_Credits_branch_7ffd2:: - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - endchannel + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + sound_ret Music_Credits_branch_7ffdb:: - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - endchannel + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + sound_ret Music_Credits_branch_7ffe4:: - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - endchannel + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + sound_ret Music_Credits_branch_7ffed:: - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - A_ 1 + note A_, 1 + note A_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - endchannel + sound_ret diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index 1ea6c1ff..94c9eae3 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -1,607 +1,607 @@ -Music_DefeatedGymLeader_Ch0:: +Music_DefeatedGymLeader_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 18, 3, 1 - toggleperfectpitch + toggle_perfect_pitch tempo 112 - notetype 12, 10, 6 + note_type 12, 10, 6 octave 4 - D_ 6 + note D_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - D_ 1 - F# 6 - D_ 1 - F# 1 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 Music_DefeatedGymLeader_branch_23ccc:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - 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 + 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 + note_type 12, 11, 1 octave 2 - B_ 8 - notetype 12, 11, 2 + note B_, 8 + note_type 12, 11, 2 octave 3 - 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 + 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 + note_type 12, 11, 1 octave 2 - B_ 8 - notetype 12, 9, 7 + note B_, 8 + note_type 12, 9, 7 octave 3 - D_ 6 + note D_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - D_ 1 - F# 8 - notetype 12, 11, 0 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 9, 7 - E_ 6 - C# 1 - E_ 1 - G# 8 - notetype 12, 11, 0 - G# 6 - E_ 1 - G# 1 - B_ 8 - notetype 12, 9, 7 - C# 6 + note D_, 1 + note F#, 8 + note_type 12, 11, 0 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 9, 7 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + note_type 12, 11, 0 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + note_type 12, 9, 7 + note C#, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - C# 1 - E_ 8 - notetype 12, 11, 0 - E_ 6 - C# 1 - E_ 1 - E_ 4 - G_ 4 - notetype 12, 9, 0 - F# 8 - E_ 8 - D_ 8 - C# 8 - notetype 12, 9, 7 - D_ 6 + note C#, 1 + note E_, 8 + note_type 12, 11, 0 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + note_type 12, 9, 0 + note F#, 8 + note E_, 8 + note D_, 8 + note C#, 8 + note_type 12, 9, 7 + note D_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - D_ 1 - F# 8 - notetype 12, 11, 0 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 9, 7 - E_ 6 - C# 1 - E_ 1 - G# 8 - notetype 12, 11, 0 - G# 6 - E_ 1 - G# 1 - B_ 8 - notetype 12, 9, 7 - C# 6 + note D_, 1 + note F#, 8 + note_type 12, 11, 0 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 9, 7 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + note_type 12, 11, 0 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + note_type 12, 9, 7 + note C#, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - C# 1 - E_ 8 - notetype 12, 11, 0 - E_ 6 - C# 1 - E_ 1 - E_ 4 - G_ 4 - notetype 12, 9, 7 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 10, 7 - G_ 8 - E_ 8 - loopchannel 0, Music_DefeatedGymLeader_branch_23ccc + note C#, 1 + note E_, 8 + note_type 12, 11, 0 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + note_type 12, 9, 7 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 10, 7 + note G_, 8 + note E_, 8 + sound_loop 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch1:: - duty 2 +Music_DefeatedGymLeader_Ch2:: + duty_cycle 2 vibrato 24, 2, 4 - notetype 12, 12, 4 + note_type 12, 12, 4 octave 4 - A_ 6 - F# 1 - A_ 1 + note A_, 6 + note F#, 1 + note A_, 1 octave 5 - D_ 6 + note D_, 6 octave 4 - A_ 1 + note A_, 1 octave 5 - D_ 1 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 + note D_, 1 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 Music_DefeatedGymLeader_branch_23d84:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 4 - A_ 4 - A_ 4 - notetype 12, 12, 2 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 4 + note A_, 4 + note A_, 4 + note_type 12, 12, 2 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 1 - D_ 6 - notetype 6, 12, 2 - G_ 1 - A_ 1 - B_ 1 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 1 + note D_, 6 + note_type 6, 12, 2 + note G_, 1 + note A_, 1 + note B_, 1 octave 4 - C# 1 - notetype 12, 12, 2 - D_ 2 - C# 2 + note C#, 1 + note_type 12, 12, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 4 - A_ 4 - A_ 3 - notetype 6, 12, 2 - B_ 1 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 4 + note A_, 4 + note A_, 3 + note_type 6, 12, 2 + note B_, 1 octave 4 - C# 1 - notetype 12, 12, 2 - D_ 2 - C# 2 + note C#, 1 + note_type 12, 12, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 1 - D_ 8 - notetype 12, 12, 7 - A_ 6 - F# 1 - A_ 1 - notetype 12, 11, 0 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 1 + note D_, 8 + note_type 12, 12, 7 + note A_, 6 + note F#, 1 + note A_, 1 + note_type 12, 11, 0 octave 4 - D_ 8 - notetype 12, 10, 0 - D_ 8 - notetype 12, 9, 7 - D_ 8 - notetype 12, 12, 7 + note D_, 8 + note_type 12, 10, 0 + note D_, 8 + note_type 12, 9, 7 + note D_, 8 + note_type 12, 12, 7 octave 3 - B_ 6 - G# 1 - B_ 1 - notetype 12, 8, 0 + note B_, 6 + note G#, 1 + note B_, 1 + note_type 12, 8, 0 octave 4 - E_ 8 - notetype 12, 10, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 + note E_, 8 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 octave 3 - G_ 6 - E_ 1 - G_ 1 - notetype 12, 6, 15 + note G_, 6 + note E_, 1 + note G_, 1 + note_type 12, 6, 15 octave 4 - C# 8 - notetype 12, 12, 7 - C# 8 - F# 4 - E_ 4 - notetype 12, 11, 0 - D_ 14 + note C#, 8 + note_type 12, 12, 7 + note C#, 8 + note F#, 4 + note E_, 4 + note_type 12, 11, 0 + note D_, 14 octave 3 - B_ 2 - notetype 12, 10, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 7 - A_ 6 - F# 1 - A_ 1 - notetype 12, 11, 0 + note B_, 2 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 7 + note A_, 6 + note F#, 1 + note A_, 1 + note_type 12, 11, 0 octave 4 - D_ 8 - notetype 12, 10, 0 - D_ 8 - notetype 12, 9, 7 - D_ 8 - notetype 12, 12, 7 + note D_, 8 + note_type 12, 10, 0 + note D_, 8 + note_type 12, 9, 7 + note D_, 8 + note_type 12, 12, 7 octave 3 - B_ 6 - G# 1 - B_ 1 - notetype 12, 4, 15 + note B_, 6 + note G#, 1 + note B_, 1 + note_type 12, 4, 15 octave 4 - E_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 + note E_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 octave 3 - G_ 6 - E_ 1 - G_ 1 - notetype 12, 11, 0 + note G_, 6 + note E_, 1 + note G_, 1 + note_type 12, 11, 0 octave 4 - C# 8 - notetype 12, 11, 7 - C# 8 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 octave 3 - A_ 4 + note A_, 4 octave 4 - C# 4 - notetype 12, 11, 0 - D_ 14 - E_ 2 - D_ 12 - notetype 12, 12, 2 + note C#, 4 + note_type 12, 11, 0 + note D_, 14 + note E_, 2 + note D_, 12 + note_type 12, 12, 2 octave 3 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 4 - C# 1 - loopchannel 0, Music_DefeatedGymLeader_branch_23d84 + note C#, 1 + sound_loop 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch2:: - notetype 12, 1, 0 +Music_DefeatedGymLeader_Ch3:: + note_type 12, 1, 0 vibrato 16, 1, 2 octave 4 - F# 6 - D_ 1 - F# 1 - A_ 6 - F# 1 - A_ 1 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 6 + note F#, 1 + note A_, 1 octave 5 - D_ 6 + note D_, 6 octave 4 - A_ 1 + note A_, 1 octave 5 - D_ 1 - F# 8 + note D_, 1 + note F#, 8 Music_DefeatedGymLeader_branch_23e65:: octave 4 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F# 3 + note F#, 3 rest 1 - F# 3 + note F#, 3 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 5 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 3 + note G_, 3 rest 1 - D_ 3 + note D_, 3 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 7 - 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 + 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 + sound_loop 0, Music_DefeatedGymLeader_branch_23e65 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 87c5d2c9..158d755c 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -1,266 +1,266 @@ -Music_DefeatedTrainer_Ch0:: +Music_DefeatedTrainer_Ch1:: tempo 224 volume 7, 7 - duty 2 - toggleperfectpitch + duty_cycle 2 + toggle_perfect_pitch tempo 224 - notetype 4, 10, 2 + note_type 4, 10, 2 octave 4 - D_ 2 + note D_, 2 tempo 224 - notetype 4, 10, 2 - D_ 2 - D_ 2 - D_ 2 + note_type 4, 10, 2 + note D_, 2 + note D_, 2 + note D_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - notetype 4, 11, 3 - F# 12 - duty 1 + note D_, 2 + note_type 4, 11, 3 + note F#, 12 + duty_cycle 1 tempo 224 Music_DefeatedTrainer_branch_23a76:: - notetype 4, 6, 3 + note_type 4, 6, 3 octave 3 - A_ 6 - F# 3 - A_ 3 - B_ 6 - G# 3 - B_ 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 octave 4 - C# 3 + note C#, 3 octave 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 + 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 octave 4 - C# 3 - D_ 3 - E_ 3 - F# 3 - C# 3 + note C#, 3 + note D_, 3 + note E_, 3 + note F#, 3 + note C#, 3 octave 3 - B_ 3 - A_ 3 + note B_, 3 + note A_, 3 octave 4 - C# 3 + note C#, 3 octave 3 - A_ 6 - F# 3 - A_ 3 - B_ 6 - G# 3 - B_ 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - C_ 3 - D_ 3 + note C_, 3 + note D_, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - D_ 6 - C# 3 + note D_, 6 + note C#, 3 octave 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 + 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 + sound_loop 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch1:: - duty 2 - notetype 4, 12, 3 +Music_DefeatedTrainer_Ch2:: + duty_cycle 2 + note_type 4, 12, 3 octave 4 - A_ 2 - notetype 4, 12, 3 - A_ 2 - A_ 2 - A_ 2 - B_ 2 + note A_, 2 + note_type 4, 12, 3 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 2 octave 5 - C# 2 - notetype 4, 12, 4 - D_ 12 + note C#, 2 + note_type 4, 12, 4 + note D_, 12 Music_DefeatedTrainer_branch_23ad2:: - notetype 4, 8, 5 + note_type 4, 8, 5 octave 4 - D_ 6 + note D_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - D_ 3 - E_ 6 + note D_, 3 + note E_, 6 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - F# 3 - G_ 3 - A_ 6 - E_ 3 - F# 3 - G_ 6 - D_ 6 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note E_, 3 + note F#, 3 + note G_, 6 + note D_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - D_ 3 - E_ 6 + note D_, 3 + note E_, 6 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - F# 3 - G_ 3 - A_ 6 - F# 3 - G_ 3 - A_ 6 - D_ 6 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note F#, 3 + note G_, 3 + note A_, 6 + note D_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - D_ 3 - E_ 6 + note D_, 3 + note E_, 6 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - F_ 6 - C_ 3 - F_ 3 - G_ 3 - D_ 3 - G_ 6 - notetype 4, 7, 0 - F# 12 - notetype 4, 7, 7 - F# 12 - notetype 4, 6, 0 - E_ 12 - notetype 4, 6, 7 - E_ 12 - loopchannel 0, Music_DefeatedTrainer_branch_23ad2 + note E_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note G_, 3 + note D_, 3 + note G_, 6 + note_type 4, 7, 0 + note F#, 12 + note_type 4, 7, 7 + note F#, 12 + note_type 4, 6, 0 + note E_, 12 + note_type 4, 6, 7 + note E_, 12 + sound_loop 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch2:: - notetype 4, 1, 0 +Music_DefeatedTrainer_Ch3:: + note_type 4, 1, 0 octave 5 - D_ 2 - notetype 4, 1, 0 - D_ 2 - D_ 2 + note D_, 2 + note_type 4, 1, 0 + note D_, 2 + note D_, 2 octave 4 - B_ 2 - A_ 2 - G_ 2 - A_ 12 - notetype 4, 2, 1 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 12 + note_type 4, 2, 1 Music_DefeatedTrainer_branch_23b24:: - F# 3 + note F#, 3 rest 3 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - B_ 3 + note B_, 3 rest 3 - B_ 3 + note B_, 3 rest 3 - F# 3 + note F#, 3 rest 3 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 octave 5 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 octave 4 - A_ 3 - F# 3 + note A_, 3 + note F#, 3 octave 5 - D_ 3 + note D_, 3 octave 4 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 octave 5 - E_ 3 + note E_, 3 octave 4 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 octave 5 - F_ 3 + note F_, 3 octave 4 - A_ 3 + note A_, 3 rest 3 - B_ 3 + note B_, 3 octave 5 - G_ 3 + note G_, 3 octave 4 - B_ 3 - A# 3 - A_ 3 + note B_, 3 + note A#, 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 octave 5 - C_ 3 - C# 3 + note C_, 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 octave 4 - A_ 3 - loopchannel 0, Music_DefeatedTrainer_branch_23b24 + note A_, 3 + sound_loop 0, Music_DefeatedTrainer_branch_23b24 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index ea3f733f..364f548e 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,302 +1,302 @@ -Music_DefeatedWildMon_Ch0:: +Music_DefeatedWildMon_Ch1:: tempo 112 volume 7, 7 - executemusic - duty 3 + execute_music + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch + toggle_perfect_pitch tempo 112 - notetype 12, 11, 7 + note_type 12, 11, 7 octave 3 - B_ 1 - A_ 1 - G# 1 - F# 1 - E_ 12 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 12 Music_DefeatedWildMon_branch_23b8b:: - notetype 12, 6, 2 - 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 + note_type 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 + sound_loop 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch1:: - executemusic - duty 2 - notetype 12, 12, 3 +Music_DefeatedWildMon_Ch2:: + execute_music + duty_cycle 2 + note_type 12, 12, 3 octave 4 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 7 - B_ 12 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 7 + note B_, 12 Music_DefeatedWildMon_branch_23bce:: - notetype 12, 8, 2 + note_type 12, 8, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - B_ 2 - B_ 2 - B_ 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 octave 4 - C# 2 - C# 2 - C# 4 + note C#, 2 + note C#, 2 + note C#, 4 octave 3 - B_ 2 - B_ 2 - B_ 4 - B_ 2 - A_ 2 - G# 2 - A_ 2 - B_ 2 - B_ 2 - B_ 4 + 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 octave 4 - C# 2 - C# 2 - C# 4 + note C#, 2 + note C#, 2 + note C#, 4 octave 3 - B_ 8 + note B_, 8 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - A# 2 + note A#, 2 + note A_, 2 + note A#, 2 octave 4 - C_ 2 - C_ 2 - C_ 4 - D_ 2 - D_ 2 - D_ 4 - C_ 2 - C_ 2 - C_ 4 - C_ 2 + 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 octave 3 - A# 2 - A_ 2 - A# 2 + note A#, 2 + note A_, 2 + note A#, 2 octave 4 - C_ 2 - C_ 2 - C_ 4 - D_ 2 - D_ 2 - D_ 4 - C_ 8 - loopchannel 0, Music_DefeatedWildMon_branch_23bce + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 8 + sound_loop 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch2:: - executemusic - notetype 12, 2, 0 +Music_DefeatedWildMon_Ch3:: + execute_music + note_type 12, 2, 0 octave 5 - E_ 1 + note E_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 Music_DefeatedWildMon_branch_23c21:: octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 octave 5 - D# 1 + note D#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - D# 4 + note D#, 4 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - G_ 1 + note G_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 3 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - G_ 1 + note G_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - D# 4 - loopchannel 0, Music_DefeatedWildMon_branch_23c21 + note D#, 4 + sound_loop 0, Music_DefeatedWildMon_branch_23c21 diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index c6f6b105..a28b31e6 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -1,610 +1,610 @@ -Music_Dungeon1_Ch0:: +Music_Dungeon1_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 10, 1, 4 - notetype 12, 4, 13 + note_type 12, 4, 13 rest 8 - stereopanning 237 + stereo_panning 237 octave 4 - F# 8 - stereopanning 255 + note F#, 8 + stereo_panning 255 Music_Dungeon1_branch_7dee5:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 Music_Dungeon1_branch_7dee8:: - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 3, Music_Dungeon1_branch_7dee8 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 3, Music_Dungeon1_branch_7dee8 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 - A_ 1 - A# 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 Music_Dungeon1_branch_7deff:: - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 4, Music_Dungeon1_branch_7deff - callchannel Music_Dungeon1_branch_7dfd5 + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 4, Music_Dungeon1_branch_7deff + sound_call Music_Dungeon1_branch_7dfd5 octave 3 - G_ 1 - F# 1 - E_ 1 - G_ 1 - callchannel Music_Dungeon1_branch_7dfd5 + note G_, 1 + note F#, 1 + note E_, 1 + note G_, 1 + sound_call Music_Dungeon1_branch_7dfd5 octave 3 - A_ 1 - G_ 1 - E_ 1 - A_ 1 - callchannel Music_Dungeon1_branch_7dfd5 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + sound_call Music_Dungeon1_branch_7dfd5 octave 3 - B_ 1 - A_ 1 - G_ 1 - F# 1 - notetype 12, 12, 3 - G_ 4 - F# 4 - E_ 4 - D# 4 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfc5 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note_type 12, 12, 3 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfc5 octave 3 - B_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C# 3 - notetype 12, 12, 3 + note B_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C#, 3 + note_type 12, 12, 3 octave 3 - G_ 4 - F# 4 - E_ 4 - D# 4 - E_ 4 - D# 4 - C_ 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note E_, 4 + note D#, 4 + note C_, 4 octave 2 - B_ 4 - notetype 12, 12, 2 - B_ 1 - A# 1 - G_ 1 - A# 1 - B_ 1 - A# 1 - G_ 1 - A# 1 + note B_, 4 + note_type 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 - C_ 1 + note C_, 1 octave 2 - B_ 1 - G# 1 - B_ 1 + note B_, 1 + note G#, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - G# 1 - B_ 1 + note B_, 1 + note G#, 1 + note B_, 1 octave 3 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 2 - A_ 1 + note A_, 1 octave 3 - C_ 1 - C# 1 - C_ 1 + note C_, 1 + note C#, 1 + note C_, 1 octave 2 - A_ 1 + note A_, 1 octave 3 - C_ 1 - D_ 1 - C# 1 + note C_, 1 + note D_, 1 + note C#, 1 octave 2 - A# 1 + note A#, 1 octave 3 - C# 1 - D_ 1 - C# 1 + note C#, 1 + note D_, 1 + note C#, 1 octave 2 - A# 1 + note A#, 1 octave 3 - C# 1 + note C#, 1 Music_Dungeon1_branch_7df6e:: rest 16 - loopchannel 8, Music_Dungeon1_branch_7df6e - notetype 12, 12, 3 - callchannel Music_Dungeon1_branch_7dfbb - B_ 2 - G_ 2 + sound_loop 8, Music_Dungeon1_branch_7df6e + note_type 12, 12, 3 + sound_call Music_Dungeon1_branch_7dfbb + note B_, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 4 - F# 2 - callchannel Music_Dungeon1_branch_7dfbb - A# 2 - G_ 2 - B_ 4 - G_ 2 - F# 2 - G_ 2 - D# 2 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfc5 + note G_, 2 + note A_, 4 + note F#, 2 + sound_call 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 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfc5 octave 3 - B_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C# 3 - notetype 12, 12, 7 + note B_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C#, 3 + note_type 12, 12, 7 octave 3 - F# 8 - D# 8 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfaa - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 0, Music_Dungeon1_branch_7dee5 + note F#, 8 + note D#, 8 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfaa + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 0, Music_Dungeon1_branch_7dee5 Music_Dungeon1_branch_7dfaa:: - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + note A#, 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - endchannel + note A#, 1 + sound_ret Music_Dungeon1_branch_7dfbb:: octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - endchannel + note G_, 2 + note A#, 2 + sound_ret Music_Dungeon1_branch_7dfc5:: octave 3 - E_ 1 - E_ 1 - F_ 1 - E_ 1 - G_ 1 - E_ 1 - A_ 1 - E_ 1 - A# 1 - E_ 1 - B_ 1 - E_ 1 + 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 octave 4 - C_ 1 - endchannel + note C_, 1 + sound_ret Music_Dungeon1_branch_7dfd5:: - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 4 octave 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - endchannel + sound_ret -Music_Dungeon1_Ch1:: +Music_Dungeon1_Ch2:: vibrato 11, 1, 5 - duty 3 - notetype 12, 0, 15 + duty_cycle 3 + note_type 12, 0, 15 octave 4 - G# 8 - notetype 12, 4, 13 + note G#, 8 + note_type 12, 4, 13 octave 5 - D_ 8 + note D_, 8 Music_Dungeon1_branch_7dfeb:: - notetype 12, 12, 2 + note_type 12, 12, 2 Music_Dungeon1_branch_7dfed:: - callchannel Music_Dungeon1_branch_7e097 - loopchannel 3, Music_Dungeon1_branch_7dfed + sound_call Music_Dungeon1_branch_7e097 + sound_loop 3, Music_Dungeon1_branch_7dfed octave 2 - E_ 1 - E_ 1 - B_ 1 + note E_, 1 + note E_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 rest 2 - C_ 1 + note C_, 1 octave 2 - B_ 1 - E_ 1 - E_ 1 - A_ 1 - G_ 1 - F_ 1 - F# 1 - G_ 1 - D# 1 + 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 Music_Dungeon1_branch_7e006:: - callchannel Music_Dungeon1_branch_7e097 - loopchannel 4, Music_Dungeon1_branch_7e006 + sound_call Music_Dungeon1_branch_7e097 + sound_loop 4, Music_Dungeon1_branch_7e006 rest 2 - callchannel Music_Dungeon1_branch_7e0ab + sound_call Music_Dungeon1_branch_7e0ab octave 3 - C_ 4 - callchannel Music_Dungeon1_branch_7e0ab + note C_, 4 + sound_call Music_Dungeon1_branch_7e0ab octave 3 - C# 4 - callchannel Music_Dungeon1_branch_7e0ab + note C#, 4 + sound_call Music_Dungeon1_branch_7e0ab octave 3 - D# 4 - notetype 12, 13, 3 + note D#, 4 + note_type 12, 13, 3 octave 4 - E_ 4 - D# 4 - C_ 4 + note E_, 4 + note D#, 4 + note C_, 4 octave 3 - B_ 4 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0b5 + note B_, 4 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 - F# 4 - callchannel Music_Dungeon1_branch_7e0b5 + note F#, 4 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 - G_ 4 - callchannel Music_Dungeon1_branch_7e0b5 + note G_, 4 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 - A# 4 - notetype 12, 13, 3 + note A#, 4 + note_type 12, 13, 3 octave 4 - E_ 4 - D# 4 - C_ 4 + note E_, 4 + note D#, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 4 - G_ 4 - F# 2 - notetype 12, 13, 6 - E_ 8 - F_ 8 - F# 8 - G_ 8 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0ba + note B_, 4 + note G_, 4 + note F#, 2 + note_type 12, 13, 6 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0ba rest 10 - E_ 1 + note E_, 1 rest 1 - callchannel Music_Dungeon1_branch_7e0ba + sound_call Music_Dungeon1_branch_7e0ba rest 12 - callchannel Music_Dungeon1_branch_7e0ba + sound_call Music_Dungeon1_branch_7e0ba rest 12 - callchannel Music_Dungeon1_branch_7e0ba + sound_call Music_Dungeon1_branch_7e0ba rest 14 - notetype 12, 13, 3 - callchannel Music_Dungeon1_branch_7e0cd - D# 4 - callchannel Music_Dungeon1_branch_7e0cd - D# 2 + note_type 12, 13, 3 + sound_call Music_Dungeon1_branch_7e0cd + note D#, 4 + sound_call Music_Dungeon1_branch_7e0cd + note D#, 2 rest 2 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0c0 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0c0 rest 2 octave 3 - F# 4 + note F#, 4 octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 1 + note C_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 rest 2 octave 3 - G_ 4 - callchannel Music_Dungeon1_branch_7e0c0 + note G_, 4 + sound_call Music_Dungeon1_branch_7e0c0 octave 3 - A# 4 - notetype 12, 13, 6 - B_ 8 + note A#, 4 + note_type 12, 13, 6 + note B_, 8 octave 4 - D# 8 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e097 - callchannel Music_Dungeon1_branch_7e097 - loopchannel 0, Music_Dungeon1_branch_7dfeb + note D#, 8 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e097 + sound_call Music_Dungeon1_branch_7e097 + sound_loop 0, Music_Dungeon1_branch_7dfeb Music_Dungeon1_branch_7e097:: octave 2 - E_ 1 - E_ 1 - B_ 1 + note E_, 1 + note E_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 rest 2 - C_ 1 + note C_, 1 octave 2 - B_ 1 - E_ 1 - E_ 1 - B_ 1 + note B_, 1 + note E_, 1 + note E_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 rest 2 - C_ 1 + note C_, 1 octave 2 - B_ 1 - endchannel + note B_, 1 + sound_ret Music_Dungeon1_branch_7e0ab:: octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - endchannel + sound_ret Music_Dungeon1_branch_7e0b5:: octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 10 - endchannel + sound_ret Music_Dungeon1_branch_7e0ba:: octave 1 - E_ 1 - G_ 1 - E_ 1 - D# 1 - endchannel + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret Music_Dungeon1_branch_7e0c0:: octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 4 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - C# 1 - C_ 1 - endchannel + note C#, 1 + note C_, 1 + sound_ret Music_Dungeon1_branch_7e0cd:: octave 3 - E_ 6 - G_ 6 - E_ 4 - A_ 6 + note E_, 6 + note G_, 6 + note E_, 4 + note A_, 6 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 4 - G_ 6 - A# 6 - F# 4 - E_ 6 - F# 6 - endchannel + note B_, 4 + note G_, 6 + note A#, 6 + note F#, 4 + note E_, 6 + note F#, 6 + sound_ret -Music_Dungeon1_Ch2:: - notetype 12, 1, 1 +Music_Dungeon1_Ch3:: + note_type 12, 1, 1 vibrato 8, 2, 6 rest 14 octave 4 - D_ 1 - D# 1 + note D_, 1 + note D#, 1 Music_Dungeon1_branch_7e0e5:: - callchannel Music_Dungeon1_branch_7e140 - callchannel Music_Dungeon1_branch_7e140 + sound_call Music_Dungeon1_branch_7e140 + sound_call Music_Dungeon1_branch_7e140 octave 5 - E_ 2 + note E_, 2 rest 4 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 octave 4 - F# 4 - callchannel Music_Dungeon1_branch_7e154 + note F#, 4 + sound_call Music_Dungeon1_branch_7e154 octave 4 - G_ 4 - callchannel Music_Dungeon1_branch_7e154 + note G_, 4 + sound_call Music_Dungeon1_branch_7e154 octave 4 - A_ 4 - B_ 4 - A# 4 - G_ 4 - F# 4 + note A_, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 rest 6 - callchannel Music_Dungeon1_branch_7e177 - B_ 4 - A# 4 - G_ 4 - F# 4 - G_ 4 - F# 4 - E_ 4 - D# 4 - callchannel Music_Dungeon1_branch_7e15e + sound_call 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 + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 10 - E_ 1 + note E_, 1 rest 1 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 10 - D_ 1 - D# 1 - callchannel Music_Dungeon1_branch_7e164 - callchannel Music_Dungeon1_branch_7e164 - E_ 2 + note D_, 1 + note D#, 1 + sound_call Music_Dungeon1_branch_7e164 + sound_call Music_Dungeon1_branch_7e164 + note E_, 2 rest 4 - callchannel Music_Dungeon1_branch_7e177 - B_ 8 - F# 6 - D_ 1 - D# 1 + sound_call Music_Dungeon1_branch_7e177 + note B_, 8 + note F#, 6 + note D_, 1 + note D#, 1 rest 16 rest 16 - loopchannel 0, Music_Dungeon1_branch_7e0e5 + sound_loop 0, Music_Dungeon1_branch_7e0e5 Music_Dungeon1_branch_7e140:: octave 5 - E_ 4 - B_ 4 - A# 4 + note E_, 4 + note B_, 4 + note A#, 4 octave 6 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 5 - G# 4 - G_ 4 - B_ 4 - A# 4 - E_ 4 - D# 4 - A_ 4 - G# 4 - E_ 4 - F# 4 - D# 4 - endchannel + 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 + sound_ret Music_Dungeon1_branch_7e154:: octave 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 4 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - endchannel + sound_ret Music_Dungeon1_branch_7e15e:: octave 3 - E_ 1 - G_ 1 - E_ 1 - D# 1 - endchannel + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret Music_Dungeon1_branch_7e164:: - E_ 4 - B_ 4 - A# 4 + note E_, 4 + note B_, 4 + note A#, 4 octave 4 - D_ 4 - C# 4 + note D_, 4 + note 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 + 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 + sound_ret Music_Dungeon1_branch_7e177:: octave 4 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 4 + note F#, 4 rest 6 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - G_ 4 + note G_, 4 rest 6 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - A# 4 - endchannel + note E_, 1 + note E_, 1 + note A#, 4 + sound_ret -Music_Dungeon1_Ch3:: +Music_Dungeon1_Ch4:: dspeed 12 rest 14 cymbal1 1 cymbal1 1 Music_Dungeon1_branch_7e190:: - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 3, Music_Dungeon1_branch_7e190 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 3, Music_Dungeon1_branch_7e190 cymbal2 4 cymbal1 4 cymbal2 4 @@ -612,22 +612,22 @@ Music_Dungeon1_branch_7e190:: cymbal1 2 Music_Dungeon1_branch_7e1a1:: - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 3, Music_Dungeon1_branch_7e1a1 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 3, Music_Dungeon1_branch_7e1a1 cymbal2 4 cymbal1 4 cymbal2 4 cymbal2 4 Music_Dungeon1_branch_7e1b0:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1b0 - callchannel Music_Dungeon1_branch_7e202 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1b0 + sound_call Music_Dungeon1_branch_7e202 Music_Dungeon1_branch_7e1ba:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1ba - callchannel Music_Dungeon1_branch_7e202 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1ba + sound_call Music_Dungeon1_branch_7e202 snare7 4 snare8 4 snare8 4 @@ -637,39 +637,39 @@ Music_Dungeon1_branch_7e1ba:: Music_Dungeon1_branch_7e1cf:: rest 16 - loopchannel 13, Music_Dungeon1_branch_7e1cf + sound_loop 13, Music_Dungeon1_branch_7e1cf rest 12 Music_Dungeon1_branch_7e1d5:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1d5 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1d5 cymbal1 4 cymbal1 4 cymbal1 4 rest 2 cymbal1 1 cymbal1 1 - callchannel Music_Dungeon1_branch_7e1f1 - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 0, Music_Dungeon1_branch_7e190 + sound_call Music_Dungeon1_branch_7e1f1 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 0, Music_Dungeon1_branch_7e190 Music_Dungeon1_branch_7e1f1:: cymbal2 4 cymbal1 4 cymbal2 4 cymbal1 4 - endchannel + sound_ret Music_Dungeon1_branch_7e1fa:: cymbal1 1 cymbal1 1 rest 10 cymbal3 4 - endchannel + sound_ret Music_Dungeon1_branch_7e202:: snare7 4 snare8 4 snare8 4 snare9 4 - endchannel + sound_ret diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index d5f459fb..807c2f40 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -1,64 +1,64 @@ -Music_Dungeon2_Ch0:: +Music_Dungeon2_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 10, 1, 4 Music_Dungeon2_branch_7e892:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 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 + 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 octave 5 - C# 4 - C# 4 - C# 4 - C# 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 octave 3 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - A# 4 - A# 4 - A# 4 - A# 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 octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - B_ 2 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 4 - F# 2 - loopchannel 2, Music_Dungeon2_branch_7e892 - notetype 12, 1, 15 + note G_, 2 + note A_, 4 + note F#, 2 + sound_loop 2, Music_Dungeon2_branch_7e892 + note_type 12, 1, 15 octave 3 - E_ 16 - C_ 16 - D_ 16 + note E_, 16 + note C_, 16 + note D_, 16 octave 2 - A# 16 + note A#, 16 rest 16 rest 16 rest 16 @@ -67,242 +67,242 @@ Music_Dungeon2_branch_7e892:: rest 16 rest 16 rest 16 - loopchannel 0, Music_Dungeon2_branch_7e892 + sound_loop 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch1:: +Music_Dungeon2_Ch2:: vibrato 11, 1, 5 Music_Dungeon2_branch_7e8db:: - duty 3 - notetype 12, 12, 2 + duty_cycle 3 + note_type 12, 12, 2 octave 3 - 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 + 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 octave 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 + 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 + sound_loop 2, Music_Dungeon2_branch_7e8db octave 3 - E_ 2 - G_ 2 - E_ 2 - D# 2 - E_ 2 - E_ 2 + note E_, 2 + note G_, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note E_, 2 octave 5 - E_ 2 + note E_, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - C# 2 - C_ 2 + note C#, 2 + note C_, 2 octave 4 - E_ 2 - G_ 2 + note E_, 2 + note G_, 2 octave 3 - A# 2 - C# 2 - A# 2 - A_ 2 - A# 2 - G_ 2 + note A#, 2 + note C#, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note G_, 2 octave 5 - G_ 2 + note G_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - F_ 2 + note F_, 2 rest 2 - E_ 2 - D# 2 - D_ 2 - C# 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 rest 16 rest 16 rest 16 rest 16 - notetype 12, 12, 7 - duty 1 + note_type 12, 12, 7 + duty_cycle 1 octave 4 - E_ 16 - D_ 16 - C_ 16 - D_ 16 - loopchannel 0, Music_Dungeon2_branch_7e8db + note E_, 16 + note D_, 16 + note C_, 16 + note D_, 16 + sound_loop 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch2:: - notetype 12, 1, 3 +Music_Dungeon2_Ch3:: + note_type 12, 1, 3 vibrato 8, 2, 6 Music_Dungeon2_branch_7e940:: - callchannel Music_Dungeon2_branch_7e9d1 - loopchannel 16, Music_Dungeon2_branch_7e940 - E_ 4 + sound_call Music_Dungeon2_branch_7e9d1 + sound_loop 16, Music_Dungeon2_branch_7e940 + note E_, 4 rest 4 rest 4 - E_ 4 - C_ 4 + note E_, 4 + note C_, 4 rest 4 rest 4 - C_ 4 - D_ 4 + note C_, 4 + note D_, 4 rest 4 rest 4 - D_ 4 + note D_, 4 octave 3 - A# 4 + note A#, 4 rest 4 rest 4 - A# 4 + note A#, 4 Music_Dungeon2_branch_7e958:: octave 5 - E_ 2 + note E_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - A# 2 + note A#, 2 rest 2 octave 6 - D_ 2 + note D_, 2 rest 2 - C# 2 + note C#, 2 rest 2 octave 5 - G# 2 + note G#, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - A# 2 + note A#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - D# 2 + note D#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - loopchannel 3, Music_Dungeon2_branch_7e958 + sound_loop 3, Music_Dungeon2_branch_7e958 octave 4 - E_ 4 - B_ 4 - A# 4 + note E_, 4 + note B_, 4 + note A#, 4 octave 5 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 4 - G# 4 - G_ 4 - B_ 4 - A# 4 - E_ 4 - D# 4 - A_ 4 - G# 4 - E_ 4 - F# 4 - D# 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 octave 3 - E_ 16 - C_ 16 - D_ 16 + note E_, 16 + note C_, 16 + note D_, 16 octave 2 - A# 16 + note A#, 16 octave 3 - E_ 16 - F_ 16 - G_ 16 + note E_, 16 + note F_, 16 + note G_, 16 octave 3 - B_ 16 + note B_, 16 rest 16 rest 16 rest 16 rest 16 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - loopchannel 0, Music_Dungeon2_branch_7e940 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_loop 0, Music_Dungeon2_branch_7e940 octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 2 - A# 2 - G_ 2 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - G_ 2 + note G_, 2 + note A#, 2 + note G_, 2 rest 2 - endchannel + sound_ret Music_Dungeon2_branch_7e9d1:: octave 4 - E_ 2 + note E_, 2 rest 4 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 octave 4 - F# 4 - endchannel + note F#, 4 + sound_ret -Music_Dungeon2_Ch3:: +Music_Dungeon2_Ch4:: dspeed 12 Music_Dungeon2_branch_7e9dd:: @@ -314,4 +314,4 @@ Music_Dungeon2_branch_7e9dd:: cymbal2 4 snare9 4 snare7 4 - loopchannel 0, Music_Dungeon2_branch_7e9dd + sound_loop 0, Music_Dungeon2_branch_7e9dd diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index f9742a26..a72dea34 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -1,432 +1,432 @@ -Music_Dungeon3_Ch0:: +Music_Dungeon3_Ch1:: tempo 160 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 8, 1, 4 Music_Dungeon3_branch_7e9fc:: - notetype 12, 12, 3 + note_type 12, 12, 3 Music_Dungeon3_branch_7e9fe:: - callchannel Music_Dungeon3_branch_7eab2 - loopchannel 3, Music_Dungeon3_branch_7e9fe + sound_call Music_Dungeon3_branch_7eab2 + sound_loop 3, Music_Dungeon3_branch_7e9fe octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 - D# 2 - E_ 2 + note D#, 2 + note G_, 2 + note D#, 2 + note E_, 2 Music_Dungeon3_branch_7ea11:: - callchannel Music_Dungeon3_branch_7eac1 - loopchannel 4, Music_Dungeon3_branch_7ea11 + sound_call Music_Dungeon3_branch_7eac1 + sound_loop 4, Music_Dungeon3_branch_7ea11 Music_Dungeon3_branch_7ea18:: - callchannel Music_Dungeon3_branch_7eab2 - loopchannel 4, Music_Dungeon3_branch_7ea18 + sound_call Music_Dungeon3_branch_7eab2 + sound_loop 4, Music_Dungeon3_branch_7ea18 octave 4 - F_ 2 - F_ 2 + note F_, 2 + note F_, 2 rest 2 - F_ 2 - E_ 2 - E_ 2 - D# 2 - D# 2 + note F_, 2 + note E_, 2 + note E_, 2 + note D#, 2 + note D#, 2 rest 2 - D# 2 - D_ 2 - D_ 2 - callchannel Music_Dungeon3_branch_7eafc + note D#, 2 + note D_, 2 + note D_, 2 + sound_call Music_Dungeon3_branch_7eafc octave 4 - D_ 2 - D_ 2 + note D_, 2 + note D_, 2 rest 2 - D_ 2 - D# 2 - D# 2 - E_ 2 - E_ 2 + note D_, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note E_, 2 rest 2 - E_ 2 - F_ 2 - F_ 2 + note E_, 2 + note F_, 2 + note F_, 2 Music_Dungeon3_branch_7ea3c:: - callchannel Music_Dungeon3_branch_7eace - loopchannel 4, Music_Dungeon3_branch_7ea3c + sound_call Music_Dungeon3_branch_7eace + sound_loop 4, Music_Dungeon3_branch_7ea3c Music_Dungeon3_branch_7ea43:: - callchannel Music_Dungeon3_branch_7eadd - loopchannel 3, Music_Dungeon3_branch_7ea43 + sound_call Music_Dungeon3_branch_7eadd + sound_loop 3, Music_Dungeon3_branch_7ea43 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 - G# 2 - E_ 2 + note A_, 2 + note F_, 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 - callchannel Music_Dungeon3_branch_7eaea - callchannel Music_Dungeon3_branch_7eaea + note C_, 2 + sound_call Music_Dungeon3_branch_7eaea + sound_call Music_Dungeon3_branch_7eaea octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note 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 - D# 2 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + note D#, 2 rest 16 rest 16 - loopchannel 0, Music_Dungeon3_branch_7e9fc + sound_loop 0, Music_Dungeon3_branch_7e9fc Music_Dungeon3_branch_7eab2:: octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - endchannel + note D#, 2 + sound_ret Music_Dungeon3_branch_7eac1:: - E_ 2 - G# 2 + note E_, 2 + note G#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - E_ 2 - G# 2 + note E_, 2 + note G#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - E_ 2 - G# 2 - endchannel + note E_, 2 + note G#, 2 + sound_ret Music_Dungeon3_branch_7eace:: octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D# 2 + note G_, 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D# 2 + note G_, 2 + note D#, 2 octave 2 - B_ 2 - endchannel + note B_, 2 + sound_ret Music_Dungeon3_branch_7eadd:: - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 - endchannel + note A_, 2 + note F_, 2 + sound_ret Music_Dungeon3_branch_7eaea:: octave 3 - G# 2 - E_ 2 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 - endchannel + note C_, 2 + sound_ret Music_Dungeon3_branch_7eaf7:: - D# 2 - G_ 2 - D# 2 - C# 6 - endchannel + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + sound_ret Music_Dungeon3_branch_7eafc:: tempo 168 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 176 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 184 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 192 octave 1 - A_ 1 - A# 1 - B_ 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 tempo 200 octave 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 tempo 208 octave 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 + note C_, 1 + note C#, 1 + note D_, 1 tempo 216 octave 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 + note C_, 1 + note C#, 1 tempo 224 octave 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 + note C_, 1 tempo 160 - endchannel + sound_ret -Music_Dungeon3_Ch1:: +Music_Dungeon3_Ch2:: vibrato 11, 1, 5 - duty 3 + duty_cycle 3 Music_Dungeon3_branch_7eb6d:: - notetype 12, 13, 3 + note_type 12, 13, 3 octave 4 - D# 6 - C# 6 + note D#, 6 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 - A# 2 - B_ 6 + note B_, 2 + note A#, 2 + note B_, 6 octave 4 - C# 8 + note C#, 8 rest 2 - G# 6 - F# 6 - E_ 2 - F# 2 - G# 2 + note G#, 6 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G# 2 - F# 6 - E_ 2 - F# 2 - G# 2 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G# 2 - F# 6 - E_ 2 - D# 2 - E_ 6 - F# 6 - E_ 4 - D# 6 - C# 6 + 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 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 - A# 2 - B_ 6 + note B_, 2 + note A#, 2 + note B_, 6 octave 4 - C# 8 + note C#, 8 rest 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 rest 2 - G# 2 - A_ 2 - A_ 2 - A# 2 - A# 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A#, 2 + note A#, 2 rest 2 - A# 2 - B_ 2 - B_ 2 + note A#, 2 + note B_, 2 + note B_, 2 rest 8 rest 8 rest 8 @@ -436,179 +436,179 @@ Music_Dungeon3_branch_7eb6d:: rest 8 rest 8 octave 4 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 rest 2 - B_ 2 - A# 2 - A# 2 - A_ 2 - A_ 2 + note B_, 2 + note A#, 2 + note A#, 2 + note A_, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - G# 2 - C# 8 + note A_, 2 + note G#, 2 + note G#, 2 + note C#, 8 rest 2 octave 3 - B_ 6 - A# 2 - B_ 2 + note B_, 6 + note A#, 2 + note B_, 2 octave 4 - D# 2 - G_ 2 - D# 2 - C# 6 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 6 - G_ 6 + note C#, 2 + note D#, 6 + note G_, 6 octave 3 - G_ 8 + note G_, 8 rest 2 - F_ 6 - E_ 2 - F_ 2 - A_ 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - G_ 6 - F_ 2 - G_ 2 - A_ 2 + note A_, 2 + note G_, 6 + note F_, 2 + note G_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - G_ 6 - A_ 6 + note A_, 2 + note G_, 6 + note A_, 6 octave 4 - C# 6 - G_ 8 + note C#, 6 + note G_, 8 rest 2 - F_ 6 - E_ 2 - F_ 2 - A_ 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 - G_ 6 - A_ 2 + note A_, 2 + note G_, 6 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 - G_ 6 - A_ 6 + note A_, 2 + note G_, 6 + note A_, 6 octave 5 - C# 6 + note C#, 6 octave 4 - F# 8 + note F#, 8 rest 2 - E_ 6 - D# 2 - E_ 2 - G# 2 + note E_, 6 + note D#, 2 + note E_, 2 + note G#, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G# 2 - F# 6 - E_ 2 - F# 2 - G# 2 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G# 2 - F# 6 - G# 6 + note G#, 2 + note F#, 6 + note G#, 6 octave 5 - C_ 6 + note C_, 6 octave 3 - D# 2 - G_ 2 - D# 2 - C# 6 - D# 2 - G_ 2 - D# 2 - C# 6 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 2 - E_ 2 - G# 2 + note E_, 2 + note G#, 2 octave 3 - C_ 2 - E_ 2 - G# 2 + note C_, 2 + note E_, 2 + note 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 + 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 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - loopchannel 0, Music_Dungeon3_branch_7eb6d + note D#, 2 + sound_loop 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch2:: - notetype 12, 1, 2 +Music_Dungeon3_Ch3:: + note_type 12, 1, 2 rest 16 rest 16 rest 16 @@ -621,71 +621,71 @@ Music_Dungeon3_Ch2:: rest 16 rest 16 rest 12 - notetype 6, 1, 0 + note_type 6, 1, 0 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 rest 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 rest 16 rest 16 rest 10 octave 5 - E_ 8 + note E_, 8 octave 4 - B_ 8 + note B_, 8 octave 5 - D# 8 + note D#, 8 octave 4 - A# 8 + note A#, 8 octave 5 - D_ 8 + note D_, 8 octave 4 - A_ 8 + note A_, 8 octave 5 - C# 8 + note C#, 8 octave 4 - G# 8 + note G#, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - G_ 8 - B_ 8 - F# 8 - A# 8 - F_ 8 - A_ 8 - E_ 8 + note G_, 8 + note B_, 8 + note F#, 8 + note A#, 8 + note F_, 8 + note A_, 8 + note E_, 8 rest 16 rest 16 rest 8 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 rest 2 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 + note B_, 1 rest 10 rest 16 - notetype 12, 1, 0 + note_type 12, 1, 0 rest 16 rest 16 rest 16 @@ -707,10 +707,10 @@ Music_Dungeon3_Ch2:: rest 16 rest 16 rest 10 - loopchannel 0, Music_Dungeon3_Ch2 + sound_loop 0, Music_Dungeon3_Ch3 -Music_Dungeon3_Ch3:: +Music_Dungeon3_Ch4:: dspeed 12 rest 16 rest 16 @@ -753,4 +753,4 @@ Music_Dungeon3_Ch3:: rest 16 rest 16 rest 10 - endchannel + sound_ret diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index adb0f8b9..19fc01e5 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -1,1344 +1,1344 @@ -Music_FinalBattle_Ch0:: +Music_FinalBattle_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 octave 3 - F# 1 - F_ 1 - F# 1 - G_ 1 - F# 1 - G_ 1 - G# 1 - G_ 1 - notetype 12, 10, 2 - G# 1 - A_ 1 - G# 1 - A_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 - notetype 12, 9, 2 - A# 1 - B_ 1 + note F#, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note_type 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 + note_type 12, 9, 2 + note A#, 1 + note B_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - C_ 1 - C# 1 - notetype 12, 8, 2 - D_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - notetype 12, 12, 1 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note_type 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 + note_type 12, 12, 1 octave 3 - 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 - E_ 1 - E_ 3 - notetype 12, 11, 3 - E_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - G_ 1 - G_ 3 - notetype 12, 11, 3 - G_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 3 - E_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - G_ 1 - G_ 3 - notetype 12, 11, 3 - G_ 4 - notetype 12, 12, 1 - G# 1 - G# 3 - notetype 12, 11, 7 - D# 4 + 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 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 3 + note E_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note G_, 1 + note G_, 3 + note_type 12, 11, 3 + note G_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 3 + note E_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note G_, 1 + note G_, 3 + note_type 12, 11, 3 + note G_, 4 + note_type 12, 12, 1 + note G#, 1 + note G#, 3 + note_type 12, 11, 7 + note D#, 4 Music_FinalBattle_branch_23429:: - notetype 12, 11, 7 + note_type 12, 11, 7 octave 3 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 4 - notetype 12, 11, 1 - F# 2 - F_ 1 - F# 1 - A_ 1 - F# 2 - F# 1 - notetype 12, 11, 7 + note F#, 4 + note F_, 4 + note F#, 4 + note_type 12, 11, 1 + note F#, 2 + note F_, 1 + note F#, 1 + note A_, 1 + note F#, 2 + note F#, 1 + note_type 12, 11, 7 octave 2 - B_ 6 - notetype 12, 10, 0 + note B_, 6 + note_type 12, 10, 0 octave 3 - D_ 6 - notetype 12, 11, 7 - F# 4 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note D_, 6 + note_type 12, 11, 7 + note F#, 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - A# 4 - notetype 12, 5, 14 - B_ 12 - notetype 12, 11, 2 - 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 - E_ 1 - F# 1 - B_ 1 - F# 1 - notetype 12, 13, 2 - E_ 1 - F# 1 - B_ 1 - notetype 12, 12, 1 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 3 - notetype 12, 11, 5 - D_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 5 - F_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 5 - D_ 4 - notetype 12, 12, 1 - E_ 1 - notetype 12, 11, 7 - E_ 7 - notetype 12, 12, 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 + note F#, 4 + note F_, 4 + note F#, 12 + note A#, 4 + note_type 12, 5, 14 + note B_, 12 + note_type 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 + note_type 12, 12, 2 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note_type 12, 13, 2 + note E_, 1 + note F#, 1 + note B_, 1 + note_type 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 + note_type 12, 11, 5 + note D_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 5 + note F_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 5 + note D_, 4 + note_type 12, 12, 1 + note E_, 1 + note_type 12, 11, 7 + note E_, 7 + note_type 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 - C_ 1 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 3 - F_ 1 - E_ 3 - F_ 1 - E_ 3 - F_ 1 - E_ 3 - F_ 1 - E_ 1 - F# 2 + 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 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 3 + note C#, 1 + note C_, 3 octave 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 + 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 + note_type 12, 11, 7 octave 4 - C_ 2 - notetype 12, 11, 0 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 10, 0 + note C_, 2 + note_type 12, 11, 0 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 10, 0 octave 3 - F# 8 - F# 8 - notetype 12, 11, 0 + note F#, 8 + note F#, 8 + note_type 12, 11, 0 octave 3 - A_ 8 - notetype 12, 11, 7 - A_ 8 - G_ 4 - B_ 12 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 11, 0 - A# 8 - notetype 12, 11, 7 - A# 8 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note G_, 4 + note B_, 12 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 11, 0 + note A#, 8 + note_type 12, 11, 7 + note A#, 8 octave 4 - F_ 8 + note F_, 8 octave 3 - A# 8 + note A#, 8 octave 4 - C# 4 - E_ 12 + note C#, 4 + note E_, 12 octave 3 - A_ 4 + note A_, 4 octave 4 - C# 12 - notetype 12, 4, 0 - callchannel Music_FinalBattle_branch_23710 - callchannel Music_FinalBattle_branch_23710 - notetype 12, 11, 7 + note C#, 12 + note_type 12, 4, 0 + sound_call Music_FinalBattle_branch_23710 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 11, 7 octave 3 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - notetype 12, 11, 0 - A_ 8 - G_ 8 - notetype 12, 11, 7 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note F#, 4 + note F_, 4 + note F#, 12 + note_type 12, 11, 0 + note A_, 8 + note G_, 8 + note_type 12, 11, 7 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 + note F#, 4 + note F_, 4 + note F#, 12 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 octave 4 - C_ 8 - notetype 12, 11, 0 + note C_, 8 + note_type 12, 11, 0 octave 3 - B_ 8 - notetype 12, 11, 7 - B_ 8 - notetype 12, 11, 0 + note B_, 8 + note_type 12, 11, 7 + note B_, 8 + note_type 12, 11, 0 octave 4 - E_ 8 - notetype 12, 11, 7 - E_ 8 - loopchannel 0, Music_FinalBattle_branch_23429 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + sound_loop 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch1:: - duty 3 +Music_FinalBattle_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 5 - C_ 1 + note C_, 1 octave 4 - G# 1 - B_ 1 - F# 1 - A_ 1 - E_ 1 - G_ 1 + note G#, 1 + note B_, 1 + note F#, 1 + note A_, 1 + note E_, 1 + note G_, 1 octave 5 - C_ 1 + note C_, 1 octave 4 - F_ 1 - C# 1 - E_ 1 - C_ 1 - D# 1 + note F_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note D#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - D_ 1 + note D_, 1 octave 5 - C_ 1 + note C_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - G# 1 - B_ 1 - F# 1 - A# 1 - F_ 1 - A_ 1 + note G#, 1 + note B_, 1 + note F#, 1 + note A#, 1 + note F_, 1 + note A_, 1 octave 5 - C_ 1 + note C_, 1 octave 3 - G# 1 - D# 1 - G_ 1 - D_ 1 - F_ 1 - C# 1 - E_ 1 + note G#, 1 + note D#, 1 + note G_, 1 + note D_, 1 + note F_, 1 + note C#, 1 + note E_, 1 octave 5 - C_ 1 - notetype 12, 12, 1 + note C_, 1 + note_type 12, 12, 1 octave 4 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 3 - notetype 12, 12, 2 + 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 + note_type 12, 12, 2 octave 5 - E_ 4 - notetype 12, 12, 1 + note E_, 4 + note_type 12, 12, 1 octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 octave 5 - E_ 4 - notetype 12, 12, 1 + note E_, 4 + note_type 12, 12, 1 octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 octave 5 - E_ 4 - notetype 12, 12, 1 + note E_, 4 + note_type 12, 12, 1 octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 - D# 4 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - notetype 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + note D#, 4 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + note_type 12, 12, 1 octave 4 - E_ 1 - E_ 3 - notetype 12, 4, 10 + note E_, 1 + note E_, 3 + note_type 12, 4, 10 octave 3 - G# 4 + note G#, 4 Music_FinalBattle_branch_235e6:: - notetype 12, 13, 7 + note_type 12, 13, 7 octave 4 - E_ 8 - D# 8 - D_ 8 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - notetype 12, 13, 7 - A# 4 - B_ 12 - notetype 12, 11, 1 - F_ 2 - F# 3 - A_ 1 - B_ 1 - A_ 1 + note B_, 8 + note_type 12, 13, 7 + note A#, 4 + note B_, 12 + note_type 12, 11, 1 + note F_, 2 + note F#, 3 + note A_, 1 + note B_, 1 + note A_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 2 - A_ 1 - B_ 1 - B_ 1 - A_ 1 - A# 1 - notetype 12, 13, 7 + note B_, 2 + note A_, 1 + note B_, 1 + note B_, 1 + note A_, 1 + note A#, 1 + note_type 12, 13, 7 octave 4 - E_ 8 - D# 8 - D_ 8 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - notetype 12, 13, 7 - A# 4 - B_ 12 + note B_, 8 + note_type 12, 13, 7 + note A#, 4 + note B_, 12 octave 4 - D# 4 - E_ 12 - notetype 12, 10, 0 + note D#, 4 + note E_, 12 + note_type 12, 10, 0 octave 3 - B_ 8 + note B_, 8 octave 4 - D_ 8 - F_ 8 - D_ 8 - notetype 12, 13, 1 - E_ 1 - E_ 3 - notetype 12, 12, 4 + note D_, 8 + note F_, 8 + note D_, 8 + note_type 12, 13, 1 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 octave 3 - D_ 4 - notetype 12, 13, 1 + note D_, 4 + note_type 12, 13, 1 octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 octave 3 - F_ 4 - notetype 12, 13, 1 + note F_, 4 + note_type 12, 13, 1 octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 octave 3 - D_ 4 - notetype 12, 13, 1 + note D_, 4 + note_type 12, 13, 1 octave 4 - E_ 1 - E_ 1 - notetype 12, 12, 4 + note E_, 1 + note E_, 1 + note_type 12, 12, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - D_ 2 - notetype 12, 12, 2 + note D_, 2 + note_type 12, 12, 2 octave 4 - 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 + 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 + note_type 12, 12, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - D_ 2 - notetype 12, 13, 7 + note D_, 2 + note_type 12, 13, 7 octave 4 - E_ 4 - F_ 2 - F# 12 - notetype 12, 12, 2 + note E_, 4 + note F_, 2 + note F#, 12 + note_type 12, 12, 2 octave 3 - B_ 2 - B_ 4 - B_ 2 - B_ 4 - B_ 2 - notetype 12, 13, 7 + note B_, 2 + note B_, 4 + note B_, 2 + note B_, 4 + note B_, 2 + note_type 12, 13, 7 octave 4 - F_ 4 - F# 2 - G_ 12 - notetype 12, 12, 2 - C_ 2 - C_ 4 - C_ 2 - C_ 4 - C_ 2 - notetype 12, 13, 7 - F# 4 - G_ 2 - G# 12 - notetype 12, 8, 2 - C# 2 - C# 4 - notetype 12, 10, 2 - C# 2 - C# 4 - C# 4 - notetype 12, 13, 2 - C# 2 - C# 4 - notetype 12, 15, 2 - C# 2 - C# 4 - notetype 12, 12, 4 - E_ 1 - F_ 1 - notetype 12, 12, 0 - F# 12 - notetype 12, 12, 7 - F# 4 - notetype 12, 1, 15 + note F_, 4 + note F#, 2 + note G_, 12 + note_type 12, 12, 2 + note C_, 2 + note C_, 4 + note C_, 2 + note C_, 4 + note C_, 2 + note_type 12, 13, 7 + note F#, 4 + note G_, 2 + note G#, 12 + note_type 12, 8, 2 + note C#, 2 + note C#, 4 + note_type 12, 10, 2 + note C#, 2 + note C#, 4 + note C#, 4 + note_type 12, 13, 2 + note C#, 2 + note C#, 4 + note_type 12, 15, 2 + note C#, 2 + note C#, 4 + note_type 12, 12, 4 + note E_, 1 + note F_, 1 + note_type 12, 12, 0 + note F#, 12 + note_type 12, 12, 7 + note F#, 4 + note_type 12, 1, 15 octave 3 - F# 8 - notetype 12, 9, 0 - F# 8 - notetype 12, 12, 7 + note F#, 8 + note_type 12, 9, 0 + note F#, 8 + note_type 12, 12, 7 octave 4 - C# 4 - notetype 12, 12, 0 - D_ 12 - D_ 8 - notetype 12, 12, 7 - D_ 8 - notetype 12, 12, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 - notetype 12, 12, 0 + note C#, 4 + note_type 12, 12, 0 + note D_, 12 + note D_, 8 + note_type 12, 12, 7 + note D_, 8 + note_type 12, 12, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 + note_type 12, 12, 0 octave 3 - A_ 8 - notetype 12, 12, 7 - A_ 8 - notetype 12, 12, 0 + note A_, 8 + note_type 12, 12, 7 + note A_, 8 + note_type 12, 12, 0 octave 4 - F_ 8 - notetype 12, 12, 7 - F_ 8 + note F_, 8 + note_type 12, 12, 7 + note F_, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - A# 8 - notetype 12, 12, 0 - A_ 16 - A_ 8 - notetype 12, 12, 7 - A_ 8 - notetype 12, 12, 5 - callchannel Music_FinalBattle_branch_23710 - notetype 12, 11, 1 - callchannel Music_FinalBattle_branch_23710 - notetype 12, 13, 7 + note A#, 8 + note_type 12, 12, 0 + note A_, 16 + note A_, 8 + note_type 12, 12, 7 + note A_, 8 + note_type 12, 12, 5 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 11, 1 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 13, 7 octave 4 - E_ 8 - D# 8 - D_ 8 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - A# 4 - B_ 12 - notetype 12, 12, 7 + note B_, 8 + note A#, 4 + note B_, 12 + note_type 12, 12, 7 octave 4 - D_ 8 - notetype 12, 4, 12 - C_ 8 - notetype 12, 13, 7 - E_ 8 - D# 8 - D_ 8 + note D_, 8 + note_type 12, 4, 12 + note C_, 8 + note_type 12, 13, 7 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - A# 4 - B_ 12 - notetype 12, 5, 13 + note B_, 8 + note A#, 4 + note B_, 12 + note_type 12, 5, 13 octave 4 - D_ 8 - notetype 12, 12, 0 - F_ 8 - notetype 12, 12, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 - A# 4 - B_ 12 - loopchannel 0, Music_FinalBattle_branch_235e6 + note D_, 8 + note_type 12, 12, 0 + note F_, 8 + note_type 12, 12, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 + note A#, 4 + note B_, 12 + sound_loop 0, Music_FinalBattle_branch_235e6 Music_FinalBattle_branch_23704:: octave 4 - E_ 1 - E_ 1 - G_ 1 + note E_, 1 + note E_, 1 + note G_, 1 octave 5 - C_ 1 - E_ 1 - C_ 1 + note C_, 1 + note E_, 1 + note C_, 1 octave 4 - G_ 1 - F_ 1 - endchannel + note G_, 1 + note F_, 1 + sound_ret Music_FinalBattle_branch_23710:: octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - C# 2 - F# 2 - D_ 2 - endchannel + note C#, 2 + note D_, 2 + note C#, 2 + note F#, 2 + note D_, 2 + sound_ret -Music_FinalBattle_Ch2:: - notetype 12, 1, 1 +Music_FinalBattle_Ch3:: + note_type 12, 1, 1 octave 4 - E_ 4 + note E_, 4 octave 5 - E_ 4 + note E_, 4 octave 4 - F_ 4 + note F_, 4 octave 5 - D# 4 + note D#, 4 octave 4 - G_ 4 + note G_, 4 octave 5 - D_ 4 + note D_, 4 octave 4 - G# 4 - B_ 4 - E_ 1 - E_ 1 + note G#, 4 + note B_, 4 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - D# 4 - E_ 1 - E_ 1 + note D#, 4 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 5 - C_ 4 + note C_, 4 octave 4 - A# 2 - E_ 1 - E_ 1 + note A#, 2 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 5 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - E_ 1 - D# 1 - E_ 1 - G_ 1 + note E_, 1 + note D#, 1 + note E_, 1 + note G_, 1 Music_FinalBattle_branch_2377d:: octave 4 - E_ 1 + note E_, 1 octave 3 - E_ 1 + note E_, 1 rest 2 octave 4 - F# 4 - D# 1 + note F#, 4 + note D#, 1 octave 3 - D# 1 + note D#, 1 rest 2 octave 4 - F_ 4 - D_ 1 + note F_, 4 + note D_, 1 octave 3 - D_ 1 + note D_, 1 rest 2 octave 4 - E_ 4 - F# 1 + note E_, 4 + note F#, 1 octave 3 - F# 1 + note F#, 1 rest 2 octave 4 - F# 4 - F_ 4 + note F#, 4 + note F_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 - E_ 1 + note F#, 2 + note E_, 1 octave 3 - E_ 1 + note E_, 1 rest 2 octave 4 - F# 4 - D# 1 + note F#, 4 + note D#, 1 octave 3 - D# 1 + note D#, 1 rest 2 octave 4 - F_ 4 - D_ 1 + note F_, 4 + note D_, 1 octave 3 - D_ 1 + note D_, 1 rest 2 octave 4 - E_ 4 - F# 1 + note E_, 4 + note F#, 1 octave 3 - F# 1 + note F#, 1 rest 2 octave 4 - F# 4 - F_ 4 + note F#, 4 + note F_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note 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 + 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 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 rest 2 - F_ 4 - E_ 1 - E_ 1 + note F_, 4 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 octave 3 - B_ 6 + note B_, 6 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 rest 2 - F_ 4 - E_ 1 - E_ 1 + note F_, 4 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 octave 3 - B_ 6 + note B_, 6 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - B_ 2 - B_ 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - B_ 2 - F_ 2 + note B_, 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 2 - C_ 2 + note C_, 2 + note C_, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 2 - C_ 2 - D_ 2 - C_ 2 + note C_, 2 + note C_, 2 + note D_, 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 - E_ 2 - C# 2 + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 - E_ 2 - C# 2 - callchannel Music_FinalBattle_branch_2395b - callchannel Music_FinalBattle_branch_2395b + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 + sound_call Music_FinalBattle_branch_2395b + sound_call Music_FinalBattle_branch_2395b octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 1 - F# 1 - G_ 1 - G# 1 - callchannel Music_FinalBattle_branch_2396c - callchannel Music_FinalBattle_branch_2396c + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + sound_call Music_FinalBattle_branch_2396c + sound_call Music_FinalBattle_branch_2396c octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C# 2 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 4 - A# 2 - A_ 2 + note A#, 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 - G# 2 - G_ 2 + note A_, 2 + note G#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - 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 + 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 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 - F_ 2 - E_ 2 - B_ 2 + note F#, 2 + note F_, 2 + note E_, 2 + note B_, 2 octave 5 - E_ 4 + note E_, 4 octave 4 - E_ 2 - B_ 2 + note E_, 2 + note B_, 2 octave 5 - D# 4 + note D#, 4 octave 4 - E_ 2 - B_ 2 + note E_, 2 + note B_, 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 2 - A_ 2 - B_ 4 - loopchannel 0, Music_FinalBattle_branch_2377d + note E_, 2 + note A_, 2 + note B_, 4 + sound_loop 0, Music_FinalBattle_branch_2377d Music_FinalBattle_branch_2395b:: octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - endchannel + note C#, 2 + sound_ret Music_FinalBattle_branch_2396c:: octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 - endchannel + note E_, 2 + sound_ret diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 832bade6..f152d180 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,627 +1,627 @@ -Music_GameCorner_Ch0:: +Music_GameCorner_Ch1:: tempo 120 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 3 - A_ 6 - notetype 12, 11, 1 - G# 2 - F# 2 - E_ 2 - D# 2 - C# 2 - D# 16 + note A_, 6 + note_type 12, 11, 1 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 16 Music_GameCorner_branch_7e222:: - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - C# 4 + note C#, 4 octave 2 - G# 4 + note G#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - A_ 2 - G# 8 - notetype 12, 10, 7 - G# 2 - A_ 2 - B_ 2 - notetype 12, 11, 5 - G# 6 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - notetype 12, 10, 7 - F# 8 - D# 8 - notetype 12, 11, 5 - D# 4 + note A_, 2 + note G#, 8 + note_type 12, 10, 7 + note G#, 2 + note A_, 2 + note B_, 2 + note_type 12, 11, 5 + note G#, 6 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note_type 12, 10, 7 + note F#, 8 + note D#, 8 + note_type 12, 11, 5 + note D#, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - D# 4 - B_ 2 - A_ 8 - notetype 12, 11, 7 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + note_type 12, 11, 7 octave 4 - E_ 2 - D# 2 - E_ 2 - D# 6 - C# 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 6 + note C#, 2 octave 3 - D# 2 - E_ 2 - F# 2 - G_ 2 - G# 2 - notetype 12, 9, 7 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 2 - notetype 12, 11, 7 - F# 8 - notetype 12, 11, 5 - C# 4 + note D#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note_type 12, 9, 7 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 2 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 11, 5 + note C#, 4 octave 2 - G# 4 + note G#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - A_ 2 - G# 8 - notetype 12, 11, 7 - G# 2 - A_ 2 - B_ 2 - G# 6 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - F# 8 - notetype 12, 9, 7 - D# 4 - C# 4 - notetype 12, 11, 5 - D# 4 + note A_, 2 + note G#, 8 + note_type 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 + note_type 12, 9, 7 + note D#, 4 + note C#, 4 + note_type 12, 11, 5 + note D#, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - D# 4 - B_ 2 - A_ 8 - notetype 12, 11, 7 - F# 2 - G# 2 - A_ 2 - B_ 4 - A_ 4 - B_ 2 - A_ 2 - G# 2 - F# 2 - notetype 12, 12, 2 - E_ 4 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + note_type 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 + note_type 12, 12, 2 + note E_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 2 - E_ 4 - E_ 4 - notetype 12, 11, 7 + note E_, 2 + note E_, 4 + note E_, 4 + note_type 12, 11, 7 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D_ 2 - D# 10 + note C#, 2 + note D_, 2 + note D#, 10 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D# 2 - E_ 8 - notetype 12, 11, 5 + note C#, 2 + note D#, 2 + note E_, 8 + note_type 12, 11, 5 octave 4 - D# 4 + note D#, 4 octave 3 - B_ 4 - F# 4 - D# 4 - notetype 12, 11, 7 - E_ 3 - D# 1 - notetype 12, 11, 2 - C# 2 - D# 2 - E_ 10 - notetype 12, 11, 7 + note B_, 4 + note F#, 4 + note D#, 4 + note_type 12, 11, 7 + note E_, 3 + note D#, 1 + note_type 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 10 + note_type 12, 11, 7 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D_ 2 - D# 10 + note C#, 2 + note D_, 2 + note D#, 10 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D# 2 - E_ 8 - notetype 12, 11, 5 + note C#, 2 + note D#, 2 + note E_, 8 + note_type 12, 11, 5 octave 4 - D# 4 + note D#, 4 octave 3 - B_ 4 - F# 4 - A_ 4 - notetype 12, 11, 7 - G# 2 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 8 - loopchannel 0, Music_GameCorner_branch_7e222 + note B_, 4 + note F#, 4 + note A_, 4 + note_type 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 + sound_loop 0, Music_GameCorner_branch_7e222 -Music_GameCorner_Ch1:: - duty 2 +Music_GameCorner_Ch2:: + duty_cycle 2 vibrato 10, 2, 3 - notetype 12, 12, 6 + note_type 12, 12, 6 octave 4 - C# 6 - notetype 12, 12, 1 + note C#, 6 + note_type 12, 12, 1 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - duty 3 - B_ 1 - A# 1 - B_ 1 - A# 1 - B_ 1 - A# 1 - B_ 8 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + duty_cycle 3 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 8 Music_GameCorner_branch_7e2fa:: - duty 2 - notetype 12, 12, 7 + duty_cycle 2 + note_type 12, 12, 7 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - G# 4 - E_ 4 + note G#, 4 + note E_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 14 + note B_, 14 octave 4 - E_ 6 - D# 2 - C# 2 + note E_, 6 + note D#, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 16 - F# 4 - D# 4 - A_ 4 - F# 4 + 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 - D# 2 - C# 14 - F# 6 - E_ 2 - D# 2 - C# 2 + note D#, 2 + note C#, 14 + note F#, 6 + note E_, 2 + note D#, 2 + note C#, 2 octave 3 - B_ 2 - A# 2 - B_ 16 - E_ 4 + note B_, 2 + note A#, 2 + note B_, 16 + note E_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - G# 4 - E_ 4 + note G#, 4 + note E_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 14 + note B_, 14 octave 4 - E_ 6 - D# 2 - C# 2 + note E_, 6 + note D#, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 16 - F# 4 - D# 4 - A_ 4 - F# 4 + 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 - D# 2 - C# 14 - F# 6 - E_ 2 - D# 2 - E_ 2 - F# 2 - G# 2 - notetype 12, 12, 1 - E_ 2 - notetype 12, 10, 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 2 - notetype 12, 12, 7 + note D#, 2 + note C#, 14 + note F#, 6 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note_type 12, 12, 1 + note E_, 2 + note_type 12, 10, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 2 + note_type 12, 12, 7 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - D# 10 + note C#, 2 + note D_, 2 + note D#, 10 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 10 + note C#, 2 + note D#, 2 + note E_, 10 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - notetype 12, 12, 5 - F# 4 - D# 4 + note C#, 2 + note D#, 2 + note_type 12, 12, 5 + note F#, 4 + note D#, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - A_ 4 - G# 3 - A_ 1 - notetype 12, 12, 2 - G# 2 - F# 2 - E_ 2 - notetype 12, 12, 7 + note A_, 4 + note G#, 3 + note A_, 1 + note_type 12, 12, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note_type 12, 12, 7 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - D# 10 + note C#, 2 + note D_, 2 + note D#, 10 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 10 + note C#, 2 + note D#, 2 + note E_, 10 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - F# 4 - D# 4 - A_ 4 - F# 4 - B_ 16 - loopchannel 0, Music_GameCorner_branch_7e2fa + note C#, 2 + note D#, 2 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + note B_, 16 + sound_loop 0, Music_GameCorner_branch_7e2fa -Music_GameCorner_Ch2:: - notetype 12, 1, 3 +Music_GameCorner_Ch3:: + note_type 12, 1, 3 octave 5 - C# 1 + note C#, 1 rest 5 octave 4 - F# 1 + note F#, 1 rest 1 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - B_ 1 + note B_, 1 rest 9 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 Music_GameCorner_branch_7e3a5:: - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e42d - callchannel Music_GameCorner_branch_7e442 - callchannel Music_GameCorner_branch_7e457 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e481 - callchannel Music_GameCorner_branch_7e496 - D# 1 + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e42d + sound_call Music_GameCorner_branch_7e442 + sound_call Music_GameCorner_branch_7e457 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e481 + sound_call Music_GameCorner_branch_7e496 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e42d - callchannel Music_GameCorner_branch_7e442 - callchannel Music_GameCorner_branch_7e457 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e481 - callchannel Music_GameCorner_branch_7e496 - E_ 1 + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e42d + sound_call Music_GameCorner_branch_7e442 + sound_call Music_GameCorner_branch_7e457 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e481 + sound_call Music_GameCorner_branch_7e496 + note E_, 1 rest 3 octave 3 - B_ 1 + note B_, 1 rest 3 octave 4 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e4ab - E_ 1 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e4ab + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e4ab - callchannel Music_GameCorner_branch_7e42d - loopchannel 0, Music_GameCorner_branch_7e3a5 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e4ab + sound_call Music_GameCorner_branch_7e42d + sound_loop 0, Music_GameCorner_branch_7e3a5 Music_GameCorner_branch_7e418:: - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e42d:: - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e442:: - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e457:: - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e46c:: - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e481:: - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e496:: - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e4ab:: - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - endchannel + sound_ret diff --git a/audio/music/gym.asm b/audio/music/gym.asm index ad99bddd..1ffc4930 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,357 +1,357 @@ -Music_Gym_Ch0:: +Music_Gym_Ch1:: tempo 138 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 2, 2 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 3 - G_ 6 - C_ 1 - G_ 1 - F_ 6 + note G_, 6 + note C_, 1 + note G_, 1 + note F_, 6 octave 2 - A# 1 + note A#, 1 octave 3 - F_ 1 - E_ 6 + note F_, 1 + note E_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - E_ 1 - F_ 4 - G_ 4 + note E_, 1 + note F_, 4 + note G_, 4 Music_Gym_branch_bcd8:: - E_ 4 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - notetype 12, 11, 1 - D_ 3 - notetype 12, 11, 5 - 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 + note E_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note_type 12, 11, 1 + note D_, 3 + note_type 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 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - F_ 2 - notetype 12, 11, 1 - A# 3 - notetype 12, 11, 5 - F_ 1 - F_ 4 - E_ 2 - D_ 2 - E_ 2 - F_ 2 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note_type 12, 11, 1 + note A#, 3 + note_type 12, 11, 5 + note F_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - F_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 4 - A# 2 - F_ 1 - A# 1 + 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 octave 4 - D_ 4 + note D_, 4 octave 3 - 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 + 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 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_Gym_branch_bcd8 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_Gym_branch_bcd8 -Music_Gym_Ch1:: - duty 3 +Music_Gym_Ch2:: + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - A# 6 - F_ 1 - A# 1 - notetype 12, 10, 0 - A_ 12 - notetype 12, 12, 7 - B_ 4 + note A#, 6 + note F_, 1 + note A#, 1 + note_type 12, 10, 0 + note A_, 12 + note_type 12, 12, 7 + note B_, 4 Music_Gym_branch_bd82:: octave 4 - C_ 12 + note C_, 12 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - notetype 12, 12, 2 - D_ 3 + note C_, 2 + note_type 12, 12, 2 + note D_, 3 octave 3 - A# 1 - notetype 12, 12, 7 - A# 12 + note A#, 1 + note_type 12, 12, 7 + note A#, 12 octave 4 - C_ 12 + note C_, 12 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - notetype 12, 12, 4 + note C_, 2 + note_type 12, 12, 4 octave 3 - A# 2 - notetype 12, 12, 7 - A# 1 + note A#, 2 + note_type 12, 12, 7 + note A#, 1 octave 4 - C_ 1 - D_ 12 - E_ 12 - D_ 2 - E_ 2 - notetype 12, 12, 2 - F_ 3 - D_ 1 - notetype 12, 12, 7 - D_ 4 - notetype 12, 12, 2 - A# 3 - F_ 1 - notetype 12, 12, 7 - F_ 4 - E_ 12 - D_ 2 - E_ 2 - F_ 2 - D_ 1 - F_ 1 - A# 12 + note C_, 1 + note D_, 12 + note E_, 12 + note D_, 2 + note E_, 2 + note_type 12, 12, 2 + note F_, 3 + note D_, 1 + note_type 12, 12, 7 + note D_, 4 + note_type 12, 12, 2 + note A#, 3 + note F_, 1 + note_type 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 octave 3 - G_ 6 + note G_, 6 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 4 - A# 4 - A_ 4 - G_ 4 - F_ 4 - notetype 12, 12, 3 - E_ 2 - notetype 12, 12, 7 - E_ 1 - F_ 1 - G_ 6 - G_ 2 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note_type 12, 12, 3 + note E_, 2 + note_type 12, 12, 7 + note E_, 1 + note F_, 1 + note G_, 6 + note G_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - A# 4 - A_ 4 - G_ 4 - C_ 2 - D_ 2 - G_ 6 + note G_, 2 + note A#, 4 + note A_, 4 + note G_, 4 + note C_, 2 + note D_, 2 + note G_, 6 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 4 - A# 4 - A_ 4 - G_ 4 - F_ 4 - notetype 12, 12, 3 - E_ 2 - notetype 12, 12, 7 - E_ 1 - F_ 1 - G_ 4 - notetype 12, 12, 3 - G_ 2 - notetype 12, 12, 7 - G_ 1 - A_ 1 - A# 4 - notetype 12, 12, 4 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note_type 12, 12, 3 + note E_, 2 + note_type 12, 12, 7 + note E_, 1 + note F_, 1 + note G_, 4 + note_type 12, 12, 3 + note G_, 2 + note_type 12, 12, 7 + note G_, 1 + note A_, 1 + note A#, 4 + note_type 12, 12, 4 octave 4 - C_ 2 - notetype 12, 12, 7 - C_ 1 - D_ 1 - E_ 12 - loopchannel 0, Music_Gym_branch_bd82 + note C_, 2 + note_type 12, 12, 7 + note C_, 1 + note D_, 1 + note E_, 12 + sound_loop 0, Music_Gym_branch_bd82 -Music_Gym_Ch2:: - notetype 12, 1, 1 +Music_Gym_Ch3:: + note_type 12, 1, 1 rest 16 rest 10 octave 4 - G_ 2 - F_ 2 - D_ 2 + note G_, 2 + note F_, 2 + note D_, 2 Music_Gym_branch_be02:: - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - A_ 2 - F_ 2 - loopchannel 0, Music_Gym_branch_be02 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be4d + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be4d + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be4d + sound_call 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 + sound_loop 0, Music_Gym_branch_be02 Music_Gym_branch_be3b:: - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - endchannel + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + sound_ret Music_Gym_branch_be44:: - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - endchannel + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + sound_ret Music_Gym_branch_be4d:: - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - endchannel + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + sound_ret diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index 6c1cffb5..cebda01b 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -1,1400 +1,1400 @@ -Music_GymLeaderBattle_Ch0:: +Music_GymLeaderBattle_Ch1:: tempo 104 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 rest 6 octave 3 - 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 + 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 - B_ 1 + note B_, 1 octave 1 - G# 1 - A_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 - A# 1 - B_ 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 - F# 1 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - G_ 6 - F# 1 + note G_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - F_ 6 - F# 1 + note F_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - G_ 6 - F# 1 + note G_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - A_ 6 + note A_, 6 Music_GymLeaderBattle_branch_223b0:: - F# 1 + note 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 + 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 - E_ 1 - A_ 1 + note E_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 - F# 1 + note B_, 1 + note A_, 1 + note 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 + 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 - E_ 1 - A_ 1 + note E_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 rest 2 octave 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - E_ 4 + note E_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - E_ 4 + note E_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 rest 16 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - C# 12 - notetype 12, 11, 3 + note C#, 12 + note_type 12, 11, 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - A_ 12 - notetype 12, 11, 3 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 + note A_, 12 + note_type 12, 11, 3 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - F# 2 - B_ 2 - F# 2 - D# 2 - F# 2 + note C#, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D#, 2 + note F#, 2 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - A_ 12 - notetype 12, 11, 3 - C# 1 + note A_, 12 + note_type 12, 11, 3 + note C#, 1 octave 2 - B_ 1 + note 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 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - E_ 2 - D# 4 - C# 6 + 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 + note_type 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 rest 16 rest 10 - E_ 6 - D# 4 - E_ 4 - C# 2 - D# 6 - E_ 4 - D# 2 - C# 4 + 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 - B_ 6 + note 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 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 + note E_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch1:: - duty 3 +Music_GymLeaderBattle_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - C_ 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 octave 3 - B_ 1 + note B_, 1 rest 5 - 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 + 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 rest 15 - B_ 1 + note B_, 1 rest 9 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 15 - B_ 1 + note B_, 1 rest 9 - A# 6 + note A#, 6 octave 3 - B_ 1 + note B_, 1 rest 15 - B_ 1 + note B_, 1 rest 9 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 15 - B_ 1 + note B_, 1 rest 9 octave 4 - C# 6 + note C#, 6 Music_GymLeaderBattle_branch_225e0:: - notetype 12, 12, 5 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 - E_ 4 - D# 2 - C# 2 + note_type 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 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - notetype 12, 11, 7 - duty 2 + note C#, 2 + note D#, 2 + note_type 12, 11, 7 + duty_cycle 2 octave 3 - A_ 8 + note A_, 8 octave 4 - C# 8 - E_ 8 - C# 8 - notetype 12, 12, 5 - duty 3 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 - E_ 4 - D# 2 - C# 2 + note C#, 8 + note E_, 8 + note C#, 8 + note_type 12, 12, 5 + duty_cycle 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 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - notetype 12, 11, 7 - duty 2 - C# 8 + note C#, 2 + note D#, 2 + note_type 12, 11, 7 + duty_cycle 2 + note C#, 8 octave 3 - B_ 8 - A_ 8 - notetype 12, 12, 3 + note B_, 8 + note A_, 8 + note_type 12, 12, 3 octave 4 - E_ 4 - E_ 2 - C# 2 - notetype 12, 12, 5 - duty 3 + note E_, 4 + note E_, 2 + note C#, 2 + note_type 12, 12, 5 + duty_cycle 3 octave 1 - B_ 1 + note B_, 1 rest 3 octave 3 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - D_ 1 + note D_, 1 rest 4 - E_ 1 - D_ 1 + note E_, 1 + note D_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - E_ 1 + note E_, 1 rest 4 - F# 1 - E_ 1 - C# 1 - F# 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 rest 2 - E_ 1 - C# 1 - E_ 1 + note E_, 1 + note C#, 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - D_ 1 + note D_, 1 rest 4 - E_ 1 - D_ 1 + note E_, 1 + note D_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - E_ 1 + note E_, 1 rest 4 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 12, 11, 0 + note_type 12, 11, 0 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 - G_ 4 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 - notetype 12, 12, 3 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note A_, 4 + note G_, 4 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 + note_type 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 - 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 + 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 + note_type 12, 11, 0 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - C_ 4 - notetype 12, 11, 0 + note C_, 4 + note_type 12, 11, 0 octave 3 - B_ 16 - notetype 12, 3, 15 + note B_, 16 + note_type 12, 3, 15 octave 4 - F# 16 - notetype 12, 12, 3 - duty 3 + note F#, 16 + note_type 12, 12, 3 + duty_cycle 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - A_ 12 - notetype 12, 12, 3 + note A_, 12 + note_type 12, 12, 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 4 - C# 12 - notetype 12, 11, 0 - D# 16 - notetype 12, 11, 7 - D# 16 - notetype 12, 12, 3 + note C#, 12 + note_type 12, 11, 0 + note D#, 16 + note_type 12, 11, 7 + note D#, 16 + note_type 12, 12, 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 4 - C# 12 - notetype 12, 12, 0 - A_ 8 - E_ 8 - B_ 16 - notetype 12, 12, 7 - B_ 16 - notetype 12, 12, 4 + note C#, 12 + note_type 12, 12, 0 + note A_, 8 + note E_, 8 + note B_, 16 + note_type 12, 12, 7 + note B_, 16 + note_type 12, 12, 4 octave 3 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - A_ 2 - G# 4 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 rest 2 - B_ 1 + note B_, 1 octave 4 - D# 1 - F# 1 - A# 1 - notetype 12, 12, 0 - B_ 16 - F# 16 - A_ 16 + note D#, 1 + note F#, 1 + note A#, 1 + note_type 12, 12, 0 + note B_, 16 + note F#, 16 + note A_, 16 octave 5 - C# 8 + note C#, 8 rest 2 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - A_ 6 - loopchannel 0, Music_GymLeaderBattle_branch_225e0 + note A_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch2:: +Music_GymLeaderBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 3 + note_type 12, 1, 3 rest 12 octave 3 - B_ 1 + note B_, 1 octave 4 - 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 + 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 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F_ 6 + note F_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 6 - notetype 12, 1, 4 + note C#, 6 + note_type 12, 1, 4 Music_GymLeaderBattle_branch_227b1:: octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - C# 12 + note C#, 12 octave 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - E_ 12 - D# 16 + note E_, 12 + note D#, 16 octave 3 - B_ 16 - A_ 1 + note B_, 16 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - E_ 12 - C# 8 - E_ 8 + note E_, 12 + note C#, 8 + note E_, 8 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 6 + note G_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 6 - loopchannel 0, Music_GymLeaderBattle_branch_227b1 + note G_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_227b1 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 098c82c8..80dafaa6 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,96 +1,96 @@ -Music_HallOfFame_Ch0:: +Music_HallOfFame_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 2, 2 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 rest 16 rest 16 rest 16 rest 12 octave 3 - D_ 1 - E_ 1 - F_ 1 - F# 1 + note D_, 1 + note E_, 1 + note F_, 1 + note F#, 1 Music_HallOfFame_branch_7fbc5:: - notetype 12, 8, 0 + note_type 12, 8, 0 octave 4 - C_ 16 - E_ 16 - F# 16 - notetype 12, 6, 0 - F_ 16 - loopchannel 3, Music_HallOfFame_branch_7fbc5 + note C_, 16 + note E_, 16 + note F#, 16 + note_type 12, 6, 0 + note F_, 16 + sound_loop 3, Music_HallOfFame_branch_7fbc5 rest 16 rest 16 rest 16 rest 16 - loopchannel 0, Music_HallOfFame_branch_7fbc5 + sound_loop 0, Music_HallOfFame_branch_7fbc5 -Music_HallOfFame_Ch1:: +Music_HallOfFame_Ch2:: vibrato 8, 2, 5 - duty 3 + duty_cycle 3 Music_HallOfFame_branch_7fbdf:: - notetype 12, 12, 4 + note_type 12, 12, 4 octave 3 - G_ 2 - D_ 2 - G_ 2 - A_ 10 - G_ 2 - D_ 2 - G_ 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note G_, 2 + note D_, 2 + note G_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - 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 + 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 + sound_loop 0, Music_HallOfFame_branch_7fbdf -Music_HallOfFame_Ch2:: - notetype 12, 1, 2 +Music_HallOfFame_Ch3:: + note_type 12, 1, 2 Music_HallOfFame_branch_7fbfe:: octave 4 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - loopchannel 12, Music_HallOfFame_branch_7fbfe - 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_Ch2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + sound_loop 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 + sound_loop 0, Music_HallOfFame_Ch3 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index f139775b..f2ef8a7e 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,231 +1,231 @@ -Music_IndigoPlateau_Ch0:: +Music_IndigoPlateau_Ch1:: tempo 132 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 octave 2 - A_ 8 - A_ 8 - A_ 8 - A_ 4 - notetype 12, 10, 4 - A# 4 + note A_, 8 + note A_, 8 + note A_, 8 + note A_, 4 + note_type 12, 10, 4 + note A#, 4 Music_IndigoPlateau_branch_a605:: - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note D_, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D# 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note D#, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 10, 0 + note D_, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 10, 0 octave 2 - A# 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 13, 4 + note D_, 4 + note_type 12, 13, 4 octave 3 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - notetype 12, 11, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 13, 4 + note D#, 4 + note_type 12, 13, 4 octave 3 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - notetype 12, 11, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note_type 12, 11, 4 octave 3 - F_ 2 - notetype 12, 11, 4 + note F_, 2 + note_type 12, 11, 4 octave 3 - G_ 2 - notetype 12, 11, 0 - A_ 8 + note G_, 2 + note_type 12, 11, 0 + note A_, 8 octave 2 - A_ 8 - notetype 12, 11, 7 + note A_, 8 + note_type 12, 11, 7 octave 3 - F_ 8 - notetype 12, 4, 14 + note F_, 8 + note_type 12, 4, 14 octave 2 - A# 8 - loopchannel 0, Music_IndigoPlateau_branch_a605 + note A#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a605 Music_IndigoPlateau_branch_a659:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 2 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - endchannel + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + sound_ret -Music_IndigoPlateau_Ch1:: - duty 3 +Music_IndigoPlateau_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - D_ 8 - D_ 8 - D_ 8 - D_ 4 - notetype 12, 5, 10 - D# 4 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 4 + note_type 12, 5, 10 + note D#, 4 Music_IndigoPlateau_branch_a673:: - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 7 - C# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 7 + note C#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 octave 4 - C_ 2 - notetype 12, 12, 7 + note C_, 2 + note_type 12, 12, 7 octave 4 - C# 2 - D_ 8 + note C#, 2 + note D_, 8 octave 3 - D_ 8 + note D_, 8 octave 4 - C_ 8 - notetype 12, 4, 13 + note C_, 8 + note_type 12, 4, 13 octave 4 - D# 8 - loopchannel 0, Music_IndigoPlateau_branch_a673 + note D#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a673 Music_IndigoPlateau_branch_a6af:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - endchannel + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + sound_ret -Music_IndigoPlateau_Ch2:: - notetype 12, 1, 0 +Music_IndigoPlateau_Ch3:: + note_type 12, 1, 0 octave 4 - D_ 2 + note D_, 2 rest 6 - D_ 2 + note D_, 2 rest 6 - D_ 2 + note D_, 2 rest 6 - D_ 2 + note D_, 2 rest 2 - D# 4 + note D#, 4 Music_IndigoPlateau_branch_a6c6:: - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - D_ 2 + sound_call Music_IndigoPlateau_branch_a6fe + sound_call Music_IndigoPlateau_branch_a6fe + sound_call Music_IndigoPlateau_branch_a6fe + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - F# 4 - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - D_ 2 + note F#, 4 + sound_call Music_IndigoPlateau_branch_a6fe + sound_call Music_IndigoPlateau_branch_a6fe + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A_ 8 - D_ 8 - A# 8 - D# 8 - loopchannel 0, Music_IndigoPlateau_branch_a6c6 + note A_, 8 + note D_, 8 + note A#, 8 + note D#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a6c6 Music_IndigoPlateau_branch_a6fe:: octave 4 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - A_ 4 - endchannel + note A_, 4 + sound_ret -Music_IndigoPlateau_Ch3:: +Music_IndigoPlateau_Ch4:: dspeed 6 mutedsnare2 16 mutedsnare2 16 @@ -241,20 +241,20 @@ Music_IndigoPlateau_Ch3:: mutedsnare3 1 Music_IndigoPlateau_branch_a728:: - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a7a8 mutedsnare2 16 mutedsnare2 8 mutedsnare3 8 @@ -275,7 +275,7 @@ Music_IndigoPlateau_branch_a728:: mutedsnare2 1 mutedsnare2 1 mutedsnare2 1 - loopchannel 0, Music_IndigoPlateau_branch_a728 + sound_loop 0, Music_IndigoPlateau_branch_a728 Music_IndigoPlateau_branch_a77e:: mutedsnare2 4 @@ -287,7 +287,7 @@ Music_IndigoPlateau_branch_a77e:: mutedsnare4 4 mutedsnare4 2 mutedsnare3 2 - endchannel + sound_ret Music_IndigoPlateau_branch_a791:: mutedsnare2 4 @@ -301,7 +301,7 @@ Music_IndigoPlateau_branch_a791:: mutedsnare4 1 mutedsnare3 1 mutedsnare3 1 - endchannel + sound_ret Music_IndigoPlateau_branch_a7a8:: mutedsnare2 4 @@ -318,4 +318,4 @@ Music_IndigoPlateau_branch_a7a8:: mutedsnare3 1 mutedsnare3 1 mutedsnare3 1 - endchannel + sound_ret diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index 2aad0d88..4885e389 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -1,235 +1,235 @@ -Music_IntroBattle_Ch0:: +Music_IntroBattle_Ch1:: tempo 98 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 1 + toggle_perfect_pitch + note_type 12, 11, 1 rest 8 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 11, 1 + note D#, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 10, 0 - A# 4 - notetype 12, 11, 1 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 10, 0 + note A#, 4 + note_type 12, 11, 1 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 2, 9 + note A_, 2 + note A_, 2 + note_type 12, 2, 9 octave 3 - G_ 4 - notetype 12, 11, 0 - A_ 8 + note G_, 4 + note_type 12, 11, 0 + note A_, 8 octave 2 - A_ 8 - notetype 12, 11, 7 + note A_, 8 + note_type 12, 11, 7 octave 3 - F_ 8 - notetype 12, 4, 15 + note F_, 8 + note_type 12, 4, 15 octave 2 - F_ 8 - notetype 12, 11, 1 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note F_, 8 + note_type 12, 11, 1 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 11, 1 + note D#, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - F_ 4 - notetype 12, 11, 1 + note F_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - G_ 4 - notetype 12, 11, 0 - F# 16 - notetype 12, 11, 1 + note G_, 4 + note_type 12, 11, 0 + note F#, 16 + note_type 12, 11, 1 octave 4 - D_ 16 - endchannel + note D_, 16 + sound_ret -Music_IntroBattle_Ch1:: - duty 3 +Music_IntroBattle_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 rest 8 octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 11, 7 - C# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 11, 7 + note C#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 7 + note D_, 2 + note D_, 2 + note_type 12, 12, 7 octave 4 - C# 4 - D_ 8 + note C#, 4 + note D_, 8 octave 3 - D_ 8 + note D_, 8 octave 4 - C_ 8 + note C_, 8 octave 3 - C_ 8 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 + note C_, 8 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 octave 4 - C_ 4 - notetype 12, 12, 2 + note C_, 4 + note_type 12, 12, 2 octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 5 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 octave 4 - C# 4 - notetype 12, 2, 15 - D_ 16 - notetype 12, 12, 1 + note C#, 4 + note_type 12, 2, 15 + note D_, 16 + note_type 12, 12, 1 octave 5 - D_ 16 - endchannel + note D_, 16 + sound_ret -Music_IntroBattle_Ch2:: - notetype 12, 1, 0 +Music_IntroBattle_Ch3:: + note_type 12, 1, 0 rest 8 octave 4 - D_ 1 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 4 - D_ 1 + note F#, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 4 - A_ 8 - D_ 8 - A# 8 - D_ 8 - D_ 1 + note A#, 4 + note A_, 8 + note D_, 8 + note A#, 8 + note D_, 8 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 4 - D_ 1 + note A#, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 4 - A_ 16 - D_ 1 + note A#, 4 + note A_, 16 + note D_, 1 rest 15 - endchannel + sound_ret -Music_IntroBattle_Ch3:: +Music_IntroBattle_Ch4:: dspeed 6 mutedsnare4 1 mutedsnare4 1 @@ -326,4 +326,4 @@ Music_IntroBattle_Ch3:: mutedsnare2 2 rest 16 rest 14 - endchannel + sound_ret diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index 0b791a30..3c0d5234 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -1,40 +1,40 @@ -Music_JigglypuffSong_Ch0:: +Music_JigglypuffSong_Ch1:: tempo 144 volume 7, 7 vibrato 8, 2, 4 - duty 2 - dutycycle 165 - toggleperfectpitch - notetype 13, 6, 7 + duty_cycle 2 + duty_cycle_pattern 165 + toggle_perfect_pitch + note_type 13, 6, 7 octave 4 - E_ 8 - notetype 12, 6, 7 - B_ 2 - G# 6 - F# 8 - G# 2 - A_ 6 - G# 8 - F# 4 - G# 4 - E_ 10 - endchannel + note E_, 8 + note_type 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 + sound_ret -Music_JigglypuffSong_Ch1:: +Music_JigglypuffSong_Ch2:: vibrato 5, 1, 5 - duty 2 - dutycycle 10 - notetype 12, 10, 7 + duty_cycle 2 + duty_cycle_pattern 10 + note_type 12, 10, 7 octave 4 - E_ 8 - B_ 2 - G# 6 - F# 8 - G# 2 - A_ 6 - G# 8 - F# 4 - G# 4 - E_ 10 - endchannel + 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 + sound_ret diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index da58e489..671df650 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -1,192 +1,192 @@ -Music_Lavender_Ch0:: +Music_Lavender_Ch1:: tempo 152 volume 7, 7 - duty 1 - toggleperfectpitch + duty_cycle 1 + toggle_perfect_pitch vibrato 0, 8, 8 - notetype 12, 8, 7 + note_type 12, 8, 7 rest 16 rest 16 rest 16 rest 16 - notetype 12, 10, 7 + note_type 12, 10, 7 Music_Lavender_branch_bb6b:: octave 3 - 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 + 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 octave 4 - C_ 8 - C_ 8 + note C_, 8 + note C_, 8 octave 3 - 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 + 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 rest 16 rest 16 rest 16 rest 16 - loopchannel 0, Music_Lavender_branch_bb6b + sound_loop 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch1:: +Music_Lavender_Ch2:: vibrato 0, 3, 4 - duty 3 - notetype 12, 9, 1 + duty_cycle 3 + note_type 12, 9, 1 Music_Lavender_branch_bba5:: octave 5 - C_ 4 - G_ 4 - B_ 4 - F# 4 - loopchannel 0, Music_Lavender_branch_bba5 + note C_, 4 + note G_, 4 + note B_, 4 + note F#, 4 + sound_loop 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch2:: +Music_Lavender_Ch3:: vibrato 4, 1, 1 - notetype 12, 3, 5 + note_type 12, 3, 5 rest 16 rest 16 rest 16 rest 16 - notetype 12, 2, 5 + note_type 12, 2, 5 Music_Lavender_branch_bbb9:: octave 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - notetype 12, 3, 5 + note E_, 4 + note_type 12, 3, 5 octave 6 - B_ 4 - G_ 4 - F# 4 - B_ 4 - notetype 12, 2, 5 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note_type 12, 2, 5 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 7 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 4 - E_ 4 - G_ 4 - F# 4 - B_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 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 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - notetype 12, 2, 5 + note E_, 4 + note_type 12, 2, 5 octave 6 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 7 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 8 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 4 - E_ 4 - G_ 4 - F# 4 - B_ 4 - loopchannel 0, Music_Lavender_branch_bbb9 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + sound_loop 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch3:: +Music_Lavender_Ch4:: dspeed 12 rest 16 rest 16 @@ -196,4 +196,4 @@ Music_Lavender_Ch3:: Music_Lavender_branch_bc26:: triangle2 8 triangle2 8 - loopchannel 0, Music_Lavender_branch_bc26 + sound_loop 0, Music_Lavender_branch_bc26 diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index 941b0c34..eb4f05ae 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -1,80 +1,80 @@ -Music_MeetEvilTrainer_Ch0:: +Music_MeetEvilTrainer_Ch1:: tempo 124 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 11, 1 rest 4 octave 3 - D_ 2 - C# 2 - notetype 12, 4, 15 - D_ 4 + note D_, 2 + note C#, 2 + note_type 12, 4, 15 + note D_, 4 Music_MeetEvilTrainer_branch_7f6ae:: - notetype 12, 10, 1 - D_ 4 - D_ 4 - D_ 4 - notetype 12, 7, 0 - D_ 4 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae + note_type 12, 10, 1 + note D_, 4 + note D_, 4 + note D_, 4 + note_type 12, 7, 0 + note D_, 4 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch1:: - duty 1 - notetype 12, 11, 6 +Music_MeetEvilTrainer_Ch2:: + duty_cycle 1 + note_type 12, 11, 6 octave 3 - B_ 2 - A# 2 - B_ 8 + note B_, 2 + note A#, 2 + note B_, 8 Music_MeetEvilTrainer_branch_7f6c2:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - D# 2 - D_ 2 - C# 2 - C_ 2 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 octave 3 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - notetype 12, 4, 15 - A# 4 - notetype 12, 12, 2 - G_ 2 - G# 2 - A_ 2 - A# 2 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - notetype 12, 3, 15 - A# 4 - notetype 12, 12, 2 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note_type 12, 4, 15 + note A#, 4 + note_type 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 + note_type 12, 3, 15 + note A#, 4 + note_type 12, 12, 2 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch2:: - notetype 12, 1, 0 +Music_MeetEvilTrainer_Ch3:: + note_type 12, 1, 0 rest 8 octave 4 - F# 1 + note F#, 1 rest 1 - F_ 1 + note F_, 1 rest 1 Music_MeetEvilTrainer_branch_7f6ee:: - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - A# 4 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee + note A#, 4 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6ee diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index 2a5659b4..c76483e5 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -1,118 +1,118 @@ -Music_MeetFemaleTrainer_Ch0:: +Music_MeetFemaleTrainer_Ch1:: tempo 124 volume 7, 7 - duty 1 - toggleperfectpitch - notetype 12, 11, 2 + duty_cycle 1 + toggle_perfect_pitch + note_type 12, 11, 2 octave 3 - G# 6 + note G#, 6 octave 4 - E_ 2 - D# 2 - C# 2 - C_ 2 - notetype 12, 8, 1 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 + note_type 12, 8, 1 Music_MeetFemaleTrainer_branch_7f70c:: octave 3 - E_ 4 - loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c - E_ 4 + note E_, 4 + sound_loop 12, Music_MeetFemaleTrainer_branch_7f70c + note E_, 4 octave 2 - B_ 4 - B_ 4 + note B_, 4 + note B_, 4 octave 3 - E_ 4 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c + note E_, 4 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch1:: - duty 2 - notetype 12, 12, 2 +Music_MeetFemaleTrainer_Ch2:: + duty_cycle 2 + note_type 12, 12, 2 octave 3 - B_ 2 - notetype 12, 12, 7 + note B_, 2 + note_type 12, 12, 7 octave 4 - B_ 12 + note B_, 12 Music_MeetFemaleTrainer_branch_7f726:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - D# 4 - E_ 4 - D# 4 - C# 2 - C_ 2 + note D#, 4 + note E_, 4 + note D#, 4 + note C#, 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - A# 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - 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 + 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 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch2:: - notetype 12, 1, 0 +Music_MeetFemaleTrainer_Ch3:: + note_type 12, 1, 0 rest 8 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 Music_MeetFemaleTrainer_branch_7f756:: - callchannel Music_MeetFemaleTrainer_branch_7f770 - G# 1 + sound_call Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - callchannel Music_MeetFemaleTrainer_branch_7f770 - G# 1 + sound_call Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f756 Music_MeetFemaleTrainer_branch_7f770:: - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - endchannel + sound_ret diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index c13e40cb..a2786052 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -1,190 +1,190 @@ -Music_MeetMaleTrainer_Ch0:: +Music_MeetMaleTrainer_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 20, 3, 3 - toggleperfectpitch - notetype 12, 11, 4 + toggle_perfect_pitch + note_type 12, 11, 4 octave 3 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 12 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 12 rest 16 Music_MeetMaleTrainer_branch_7f78f:: octave 3 - B_ 4 - A_ 4 - G# 2 - F# 2 - E_ 2 - D# 2 - F# 4 - E_ 6 - F_ 2 - F# 4 - G_ 8 + 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 - D_ 8 - E_ 16 - loopchannel 0, Music_MeetMaleTrainer_branch_7f78f + note D_, 8 + note E_, 16 + sound_loop 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch1:: - duty 3 +Music_MeetMaleTrainer_Ch2:: + duty_cycle 3 vibrato 24, 2, 2 - notetype 12, 12, 4 + note_type 12, 12, 4 octave 4 - E_ 1 - D# 1 - D_ 1 - C# 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 octave 3 - B_ 12 + note B_, 12 rest 2 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 9 Music_MeetMaleTrainer_branch_7f7b5:: - notetype 12, 12, 4 + note_type 12, 12, 4 octave 4 - E_ 6 - D# 6 - C# 4 + note E_, 6 + note D#, 6 + note C#, 4 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - notetype 12, 12, 7 - F_ 16 - notetype 12, 12, 5 + note C#, 2 + note_type 12, 12, 7 + note F_, 16 + note_type 12, 12, 5 octave 3 - F# 8 + note F#, 8 octave 4 - C# 8 - loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 + note C#, 8 + sound_loop 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch2:: - notetype 12, 1, 0 +Music_MeetMaleTrainer_Ch3:: + note_type 12, 1, 0 rest 6 octave 4 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F# 1 + note F#, 1 rest 1 Music_MeetMaleTrainer_branch_7f7ea:: - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea + sound_loop 0, Music_MeetMaleTrainer_branch_7f7ea diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index 5c6ea13d..24c6741a 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -1,423 +1,423 @@ -Music_MeetProfOak_Ch0:: +Music_MeetProfOak_Ch1:: tempo 112 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 12, 11, 4 + duty_cycle 3 + toggle_perfect_pitch + note_type 12, 11, 4 octave 3 - F# 1 - B_ 1 + note F#, 1 + note B_, 1 octave 4 - D# 1 - E_ 1 - F# 12 - notetype 12, 10, 2 + note D#, 1 + note E_, 1 + note F#, 12 + note_type 12, 10, 2 octave 3 - 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 + 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 Music_MeetProfOak_branch_af85:: - 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 + 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 + sound_loop 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch1:: +Music_MeetProfOak_Ch2:: vibrato 8, 1, 1 - duty 2 - notetype 12, 12, 4 + duty_cycle 2 + note_type 12, 12, 4 octave 3 - B_ 1 + note B_, 1 octave 4 - D# 1 - F# 1 - A# 1 - B_ 12 - notetype 12, 11, 2 + note D#, 1 + note F#, 1 + note A#, 1 + note B_, 12 + note_type 12, 11, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 6, 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 6, 4 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 11, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 8, 1 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 8, 1 octave 4 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 11, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 11, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 6, 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 6, 4 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 11, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 8, 1 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 8, 1 octave 4 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 11, 5 Music_MeetProfOak_branch_b005:: octave 4 - C# 6 + note C#, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - C# 1 - E_ 6 - C# 1 - E_ 1 - F# 4 - E_ 4 - D# 4 - C# 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 octave 3 - B_ 6 - G# 1 - B_ 1 + note B_, 6 + note G#, 1 + note B_, 1 octave 4 - E_ 8 - notetype 12, 6, 5 + note E_, 8 + note_type 12, 6, 5 octave 4 - B_ 6 - G# 1 - B_ 1 + note B_, 6 + note G#, 1 + note B_, 1 octave 5 - E_ 8 - notetype 12, 11, 5 + note E_, 8 + note_type 12, 11, 5 octave 3 - A_ 6 - F# 1 - A_ 1 + note A_, 6 + note F#, 1 + note A_, 1 octave 4 - D# 8 - E_ 4 - D# 4 - C# 4 - C_ 4 + note D#, 8 + note E_, 4 + note D#, 4 + note C#, 4 + note C_, 4 octave 3 - B_ 6 - G# 1 - B_ 1 + note B_, 6 + note G#, 1 + note B_, 1 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - E_ 1 - notetype 12, 11, 7 - G# 16 - loopchannel 0, Music_MeetProfOak_branch_b005 + note E_, 1 + note_type 12, 11, 7 + note G#, 16 + sound_loop 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch2:: - notetype 12, 1, 2 +Music_MeetProfOak_Ch3:: + note_type 12, 1, 2 rest 10 octave 4 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 5 octave 5 - E_ 4 + note E_, 4 rest 6 octave 4 - B_ 1 + note B_, 1 rest 5 octave 5 - E_ 4 + note E_, 4 octave 4 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G# 1 + note G#, 1 rest 1 Music_MeetProfOak_branch_b0bc:: octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0bc + sound_loop 2, Music_MeetProfOak_branch_b0bc Music_MeetProfOak_branch_b0d8:: octave 4 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0d8 + sound_loop 2, Music_MeetProfOak_branch_b0d8 Music_MeetProfOak_branch_b0ed:: - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0ed + sound_loop 2, Music_MeetProfOak_branch_b0ed Music_MeetProfOak_branch_b101:: - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b101 - loopchannel 0, Music_MeetProfOak_branch_b0bc + sound_loop 2, Music_MeetProfOak_branch_b101 + sound_loop 0, Music_MeetProfOak_branch_b0bc diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index a6391247..958db7be 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -1,396 +1,396 @@ Music_MeetRival_branch_b119:: tempo 100 - loopchannel 0, Music_MeetRival_branch_b123 + sound_loop 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch0:: +Music_MeetRival_Ch1:: tempo 112 Music_MeetRival_branch_b123:: volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 4 - D_ 1 - C# 1 - C_ 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - A# 2 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 6 - D_ 1 + note B_, 1 + note A#, 2 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 6 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 5 - A_ 2 - G_ 2 - A_ 2 + note A_, 2 + note G_, 2 + note A_, 2 Music_MeetRival_branch_b140:: - B_ 4 - A# 2 - A_ 4 - G_ 2 + note B_, 4 + note A#, 2 + note A_, 4 + note G_, 2 octave 4 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 rest 4 - D_ 4 - C# 2 - C_ 2 + note D_, 4 + note C#, 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 4 - E_ 2 - D_ 4 - C_ 2 + note C_, 4 + note E_, 2 + note D_, 4 + note C_, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 2 + note C_, 2 rest 4 - G_ 4 - G_ 2 - F# 2 - E_ 2 - D_ 2 - F# 2 + note G_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - F# 2 + note D_, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - D_ 2 + note D_, 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - D_ 2 + note D_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 4 - C_ 2 - F_ 2 + note C_, 2 + note F_, 2 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - F_ 2 - D# 2 - C_ 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 octave 3 - A# 2 - G_ 2 + note A#, 2 + note G_, 2 rest 4 - A# 4 + note A#, 4 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 - notetype 12, 11, 7 + note C_, 2 + note_type 12, 11, 7 octave 3 - G_ 4 - D_ 2 - F_ 6 - F# 4 - D_ 2 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note D_, 2 rest 4 - D_ 4 - notetype 12, 11, 3 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_MeetRival_branch_b140 + note D_, 4 + note_type 12, 11, 3 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_MeetRival_branch_b140 Music_MeetRival_branch_b19b:: tempo 100 - loopchannel 0, Music_MeetRival_branch_b1a5 + sound_loop 0, Music_MeetRival_branch_b1a5 Music_MeetRival_branch_b1a2:: tempo 112 Music_MeetRival_branch_b1a5:: volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 5 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_MeetRival_branch_b140 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch1:: - duty 3 +Music_MeetRival_Ch2:: + duty_cycle 3 vibrato 10, 2, 6 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 4 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 2 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 6 + 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 octave 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 octave 4 - D_ 2 - F_ 2 - F# 2 + note D_, 2 + note F_, 2 + note F#, 2 Music_MeetRival_branch_b1d8:: - notetype 12, 12, 7 - G_ 4 - D_ 2 - F_ 6 - F# 4 - G_ 2 + note_type 12, 12, 7 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note G_, 2 rest 4 - G_ 4 - G_ 2 - A# 2 - B_ 2 + note G_, 4 + note G_, 2 + note A#, 2 + note B_, 2 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 2 - A# 6 - B_ 4 + note G_, 2 + note A#, 6 + note B_, 4 octave 5 - C_ 2 + note C_, 2 rest 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 - notetype 12, 11, 0 - D_ 16 - notetype 12, 11, 5 - D_ 6 - notetype 12, 12, 7 - F_ 4 - D_ 2 - C_ 2 - D_ 2 - notetype 12, 11, 0 - C_ 8 - notetype 12, 12, 7 - C_ 8 + note C_, 2 + note_type 12, 11, 0 + note D_, 16 + note_type 12, 11, 5 + note D_, 6 + note_type 12, 12, 7 + note F_, 4 + note D_, 2 + note C_, 2 + note D_, 2 + note_type 12, 11, 0 + note C_, 8 + note_type 12, 12, 7 + note C_, 8 octave 4 - C_ 2 + note C_, 2 rest 4 - A# 4 - G_ 2 - F_ 2 - notetype 12, 11, 0 - G_ 16 - notetype 12, 11, 3 - G_ 2 + note A#, 4 + note G_, 2 + note F_, 2 + note_type 12, 11, 0 + note G_, 16 + note_type 12, 11, 3 + note G_, 2 octave 3 - G_ 2 + note G_, 2 rest 4 - G_ 4 + note G_, 4 octave 4 - D_ 2 - F_ 2 - F# 2 - loopchannel 0, Music_MeetRival_branch_b1d8 + note D_, 2 + note F_, 2 + note F#, 2 + sound_loop 0, Music_MeetRival_branch_b1d8 Music_MeetRival_branch_b21d:: - duty 3 + duty_cycle 3 vibrato 10, 2, 6 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 octave 4 - D_ 2 - F_ 2 - F# 2 - loopchannel 0, Music_MeetRival_branch_b1d8 + note D_, 2 + note F_, 2 + note F#, 2 + sound_loop 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch2:: - notetype 12, 1, 4 +Music_MeetRival_Ch3:: + note_type 12, 1, 4 octave 5 - D_ 2 + note D_, 2 rest 2 - C# 2 + note C#, 2 rest 2 - C_ 2 + note C_, 2 rest 2 octave 4 - B_ 2 + note B_, 2 rest 2 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 Music_MeetRival_branch_b24b:: - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 4 octave 5 - D_ 4 + note D_, 4 octave 4 - G_ 2 - A# 2 - B_ 2 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 octave 5 - C_ 2 + note C_, 2 rest 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 4 - B_ 2 - A_ 2 - F# 2 - A_ 2 + note B_, 2 + note A_, 2 + note F#, 2 + note A_, 2 rest 2 - F# 2 - A_ 2 - F# 2 + note F#, 2 + note A_, 2 + note F#, 2 rest 2 - A_ 2 - F# 2 - A_ 2 + note A_, 2 + note F#, 2 + note A_, 2 rest 2 - F# 2 - A_ 2 - F# 2 + note F#, 2 + note A_, 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - A_ 2 - E_ 2 + note A_, 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 rest 2 octave 4 - E_ 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - E_ 2 - F_ 2 - G_ 2 - E_ 2 + note E_, 2 + note F_, 2 + note G_, 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 - A# 2 - A_ 2 - G_ 2 - A# 2 + note B_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note A#, 2 rest 2 - G_ 2 - A# 2 - G_ 2 + note G_, 2 + note A#, 2 + note G_, 2 rest 2 - A# 2 - G_ 2 + note A#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 - loopchannel 0, Music_MeetRival_branch_b24b + note D_, 2 + sound_loop 0, Music_MeetRival_branch_b24b Music_MeetRival_branch_b2b5:: - notetype 12, 1, 4 + note_type 12, 1, 4 octave 4 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - loopchannel 0, Music_MeetRival_branch_b24b + sound_loop 0, Music_MeetRival_branch_b24b diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index e41b37bd..80e4afd0 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -1,267 +1,267 @@ -Music_MuseumGuy_Ch0:: +Music_MuseumGuy_Ch1:: tempo 128 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 11, 1 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 octave 2 - B_ 4 - B_ 1 + note B_, 4 + note B_, 1 octave 3 - D# 1 - E_ 1 - G# 1 - B_ 10 - callchannel Music_MuseumGuy_branch_ade7 - callchannel Music_MuseumGuy_branch_adec - callchannel Music_MuseumGuy_branch_ade7 - E_ 4 - E_ 4 - E_ 2 - E_ 6 + note D#, 1 + note E_, 1 + note G#, 1 + note B_, 10 + sound_call Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_adec + sound_call Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 Music_MuseumGuy_branch_add6:: - callchannel Music_MuseumGuy_branch_ade7 - callchannel Music_MuseumGuy_branch_adec - callchannel Music_MuseumGuy_branch_ade7 - E_ 4 - E_ 4 - E_ 2 - E_ 6 - loopchannel 0, Music_MuseumGuy_branch_add6 + sound_call Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_adec + sound_call Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 + sound_loop 0, Music_MuseumGuy_branch_add6 Music_MuseumGuy_branch_ade7:: - E_ 2 - E_ 6 - F# 2 - F# 6 - endchannel + note E_, 2 + note E_, 6 + note F#, 2 + note F#, 6 + sound_ret Music_MuseumGuy_branch_adec:: - E_ 2 - E_ 6 - D_ 2 - D_ 6 - endchannel + note E_, 2 + note E_, 6 + note D_, 2 + note D_, 6 + sound_ret -Music_MuseumGuy_Ch1:: - duty 2 - notetype 12, 12, 1 +Music_MuseumGuy_Ch2:: + duty_cycle 2 + note_type 12, 12, 1 octave 4 - E_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - E_ 4 - E_ 1 - G# 1 - B_ 1 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 4 + note E_, 1 + note G#, 1 + note B_, 1 octave 4 - D# 1 - E_ 8 + note D#, 1 + note E_, 8 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 4 - D_ 2 - F# 2 - A_ 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + note A_, 4 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 4 - D_ 2 - C# 2 + note C#, 2 + note E_, 4 + note D_, 2 + note C#, 2 octave 3 - B_ 4 - A_ 2 + note B_, 4 + note A_, 2 octave 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 + 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 Music_MuseumGuy_branch_ae26:: octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 3 - notetype 12, 8, 1 - E_ 1 - notetype 12, 12, 1 - D_ 2 - F# 2 - A_ 3 - notetype 12, 9, 1 - A_ 1 - notetype 12, 12, 1 + note C#, 2 + note E_, 3 + note_type 12, 8, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 2 + note F#, 2 + note A_, 3 + note_type 12, 9, 1 + note A_, 1 + note_type 12, 12, 1 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 4 - D_ 1 - C# 1 - C_ 1 + note C#, 2 + note E_, 4 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - B_ 3 - notetype 12, 10, 1 - G# 1 - notetype 12, 12, 1 - A_ 2 + note B_, 1 + note B_, 3 + note_type 12, 10, 1 + note G#, 1 + note_type 12, 12, 1 + note A_, 2 octave 4 - C# 2 - E_ 3 - notetype 12, 9, 1 - E_ 1 - notetype 12, 12, 1 - D_ 2 - F# 2 - A_ 3 - notetype 12, 8, 1 - A_ 1 - notetype 12, 12, 1 - G# 2 - E_ 1 - notetype 12, 8, 1 - E_ 1 - notetype 12, 12, 1 - F# 2 - notetype 12, 8, 1 - F# 1 - notetype 12, 12, 1 - G# 1 - A_ 2 - A_ 2 - A_ 4 - loopchannel 0, Music_MuseumGuy_branch_ae26 + note C#, 2 + note E_, 3 + note_type 12, 9, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 2 + note F#, 2 + note A_, 3 + note_type 12, 8, 1 + note A_, 1 + note_type 12, 12, 1 + note G#, 2 + note E_, 1 + note_type 12, 8, 1 + note E_, 1 + note_type 12, 12, 1 + note F#, 2 + note_type 12, 8, 1 + note F#, 1 + note_type 12, 12, 1 + note G#, 1 + note A_, 2 + note A_, 2 + note A_, 4 + sound_loop 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch2:: - notetype 12, 1, 0 +Music_MuseumGuy_Ch3:: + note_type 12, 1, 0 rest 16 octave 4 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 9 - callchannel Music_MuseumGuy_branch_aeb8 - A_ 1 + sound_call Music_MuseumGuy_branch_aeb8 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 5 - G# 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 5 - callchannel Music_MuseumGuy_branch_aeb8 - B_ 1 + sound_call Music_MuseumGuy_branch_aeb8 + note B_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 Music_MuseumGuy_branch_ae8e:: - callchannel Music_MuseumGuy_branch_aec1 + sound_call Music_MuseumGuy_branch_aec1 rest 3 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - callchannel Music_MuseumGuy_branch_aec1 + sound_call Music_MuseumGuy_branch_aec1 rest 1 octave 6 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - loopchannel 0, Music_MuseumGuy_branch_ae8e + sound_loop 0, Music_MuseumGuy_branch_ae8e Music_MuseumGuy_branch_aeb8:: - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 5 - endchannel + sound_ret Music_MuseumGuy_branch_aec1:: octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 octave 6 - F# 1 + note F#, 1 rest 1 octave 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 - endchannel + note A_, 1 + sound_ret -Music_MuseumGuy_Ch3:: +Music_MuseumGuy_Ch4:: dspeed 12 rest 16 rest 16 @@ -334,4 +334,4 @@ Music_MuseumGuy_branch_aee1:: mutedsnare4 1 mutedsnare3 1 mutedsnare3 1 - loopchannel 0, Music_MuseumGuy_branch_aee1 + sound_loop 0, Music_MuseumGuy_branch_aee1 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 87245350..5af9f9a9 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -1,393 +1,393 @@ -Music_OaksLab_Ch0:: +Music_OaksLab_Ch1:: tempo 140 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 16, 1, 2 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 2 - B_ 1 + note B_, 1 octave 3 - C# 1 - D_ 1 - E_ 1 - F# 1 - G# 1 - A_ 1 - B_ 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note B_, 1 Music_OaksLab_branch_7eed0:: octave 4 - C# 4 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 4 - G# 2 - A_ 2 - B_ 1 + note A_, 4 + note G#, 2 + note A_, 2 + note B_, 1 rest 3 - A_ 6 - G# 1 - B_ 1 + note A_, 6 + note G#, 1 + note B_, 1 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 - G# 2 - A_ 2 - F# 4 - E_ 2 - F# 2 - G# 1 + note A_, 4 + note G#, 2 + note A_, 2 + note F#, 4 + note E_, 2 + note F#, 2 + note G#, 1 rest 3 - F# 8 - E_ 4 - A_ 6 - E_ 1 - A_ 1 + note F#, 8 + note E_, 4 + note A_, 6 + note E_, 1 + note A_, 1 octave 4 - D_ 8 - C# 6 + note D_, 8 + note C#, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - C# 1 - E_ 8 - D_ 4 - C# 4 + note C#, 1 + note E_, 8 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - G# 1 + note B_, 4 + note A_, 4 + note G#, 1 rest 3 - E_ 4 - F# 4 - G# 4 - loopchannel 0, Music_OaksLab_branch_7eed0 + note E_, 4 + note F#, 4 + note G#, 4 + sound_loop 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch1:: - duty 3 +Music_OaksLab_Ch2:: + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 4 + note_type 12, 12, 4 octave 3 - G# 1 - A_ 1 - B_ 1 + note G#, 1 + note A_, 1 + note B_, 1 octave 4 - C# 1 - D_ 1 - E_ 1 - F# 1 - G# 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 Music_OaksLab_branch_7ef16:: - A_ 6 - G# 1 - F# 1 - E_ 6 - D# 1 - E_ 1 - F# 1 + note A_, 6 + note G#, 1 + note F#, 1 + note E_, 6 + note D#, 1 + note E_, 1 + note F#, 1 rest 3 - E_ 8 - E_ 4 - F# 6 - E_ 1 - D_ 1 - C# 6 + note E_, 8 + note E_, 4 + note F#, 6 + note E_, 1 + note D_, 1 + note C#, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - D_ 1 + note C#, 1 + note D_, 1 rest 3 - C# 8 - C# 4 - D_ 6 + note C#, 8 + note C#, 4 + note D_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - 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 + 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 rest 1 octave 3 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - loopchannel 0, Music_OaksLab_branch_7ef16 + sound_loop 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch2:: - notetype 12, 1, 1 +Music_OaksLab_Ch3:: + note_type 12, 1, 1 rest 2 octave 4 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 Music_OaksLab_branch_7ef5c:: - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 5 - G# 1 + note G#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - loopchannel 0, Music_OaksLab_branch_7ef5c + sound_loop 0, Music_OaksLab_branch_7ef5c diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 5ad31f81..26e5710f 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,314 +1,314 @@ -Music_PalletTown_Ch0:: +Music_PalletTown_Ch1:: tempo 160 volume 7, 7 - duty 2 - notetype 12, 12, 3 + duty_cycle 2 + note_type 12, 12, 3 Music_PalletTown_branch_a7ce:: octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 2 - D_ 4 - G_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 4 - G_ 2 + note B_, 4 + note G_, 2 octave 4 - D_ 4 - D_ 2 - C_ 2 + note D_, 4 + note D_, 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 rest 2 - B_ 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 8 + note C_, 8 rest 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A_ 2 - B_ 2 - G_ 2 - A_ 2 - F# 2 - B_ 4 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note F#, 2 + note B_, 4 octave 4 - C_ 2 - D_ 4 - G_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 4 - G_ 2 + note B_, 4 + note G_, 2 octave 4 - D_ 4 - D_ 2 - G_ 2 - F# 2 - E_ 4 - D_ 2 - C_ 4 + note D_, 4 + note D_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note D_, 2 + note C_, 4 octave 3 - A_ 2 - B_ 2 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - G_ 4 - F# 4 + note B_, 2 + note A_, 2 + note G_, 4 + note F#, 4 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - E_ 2 - G_ 2 + note G_, 2 + note E_, 2 + note G_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 - F# 2 - A_ 2 - notetype 12, 11, 3 - B_ 2 - G_ 2 - D_ 2 - G_ 2 - B_ 2 - G_ 2 - D_ 2 - G_ 2 + note A_, 2 + note F#, 2 + note A_, 2 + note_type 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 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - E_ 2 - G_ 2 + note G_, 2 + note E_, 2 + note G_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - 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 + 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 + sound_loop 0, Music_PalletTown_branch_a7ce + sound_ret -Music_PalletTown_Ch1:: - duty 2 +Music_PalletTown_Ch2:: + duty_cycle 2 Music_PalletTown_branch_a861:: - notetype 12, 13, 3 + note_type 12, 13, 3 octave 5 - D_ 2 - notetype 12, 10, 3 - C_ 2 - notetype 12, 13, 3 + note D_, 2 + note_type 12, 10, 3 + note C_, 2 + note_type 12, 13, 3 octave 4 - B_ 2 - notetype 12, 11, 3 - A_ 2 - notetype 12, 13, 3 + note B_, 2 + note_type 12, 11, 3 + note A_, 2 + note_type 12, 13, 3 octave 5 - G_ 2 - notetype 12, 11, 3 - E_ 2 - notetype 12, 13, 3 - F# 2 - E_ 2 - D_ 6 + note G_, 2 + note_type 12, 11, 3 + note E_, 2 + note_type 12, 13, 3 + note F#, 2 + note E_, 2 + note D_, 6 octave 4 - B_ 2 - G_ 2 - G_ 2 - A_ 2 - B_ 2 + note B_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + note B_, 2 octave 5 - C_ 10 + note C_, 10 octave 4 - F# 2 - G_ 2 - A_ 2 - B_ 6 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 6 octave 5 - C_ 1 + note C_, 1 octave 4 - B_ 1 - A_ 8 + note B_, 1 + note A_, 8 octave 5 - D_ 2 - notetype 12, 10, 3 - C_ 2 - notetype 12, 13, 3 + note D_, 2 + note_type 12, 10, 3 + note C_, 2 + note_type 12, 13, 3 octave 4 - B_ 2 - notetype 12, 11, 3 + note B_, 2 + note_type 12, 11, 3 octave 5 - D_ 2 - notetype 12, 13, 3 - G_ 2 - notetype 12, 10, 3 - F# 2 - notetype 12, 11, 3 - F# 2 - notetype 12, 13, 3 - G_ 2 - E_ 6 - D_ 2 - D_ 8 - C_ 2 + note D_, 2 + note_type 12, 13, 3 + note G_, 2 + note_type 12, 10, 3 + note F#, 2 + note_type 12, 11, 3 + note F#, 2 + note_type 12, 13, 3 + note G_, 2 + note E_, 6 + note D_, 2 + note D_, 8 + note C_, 2 octave 4 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 octave 5 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 - A_ 2 - G_ 10 - G_ 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note G_, 10 + note G_, 2 + note A_, 2 + note B_, 2 octave 5 - C_ 8 - D_ 6 - C_ 2 + note C_, 8 + note D_, 6 + note C_, 2 octave 4 - B_ 8 + note B_, 8 rest 2 - G_ 2 - A_ 2 - B_ 2 + note G_, 2 + note A_, 2 + note B_, 2 octave 5 - C_ 4 - C_ 4 - D_ 6 - C_ 1 - D_ 1 + note C_, 4 + note C_, 4 + note D_, 6 + note C_, 1 + note D_, 1 octave 4 - B_ 8 + note B_, 8 rest 2 - 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 + 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 + sound_loop 0, Music_PalletTown_branch_a861 + sound_ret -Music_PalletTown_Ch2:: +Music_PalletTown_Ch3:: vibrato 24, 2, 8 - notetype 12, 1, 2 + note_type 12, 1, 2 Music_PalletTown_branch_a8e3:: octave 4 - 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 + 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 + sound_loop 0, Music_PalletTown_branch_a8e3 + sound_ret diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index 9d3cd3d0..f3b78d38 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -1,47 +1,47 @@ -Music_PkmnHealed_Ch0:: +Music_PkmnHealed_Ch1:: tempo 144 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 8, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 8, 1 rest 2 - pitchbend 0, 75 - B_ 2 - pitchbend 0, 84 - B_ 2 - pitchbend 0, 68 - E_ 2 + pitch_slide 0, 75 + note B_, 2 + pitch_slide 0, 84 + note B_, 2 + pitch_slide 0, 68 + note E_, 2 rest 4 - pitchbend 0, 59 - E_ 4 - pitchbend 0, 75 - B_ 4 - endchannel + pitch_slide 0, 59 + note E_, 4 + pitch_slide 0, 75 + note B_, 4 + sound_ret -Music_PkmnHealed_Ch1:: - duty 2 - notetype 12, 12, 3 +Music_PkmnHealed_Ch2:: + duty_cycle 2 + note_type 12, 12, 3 octave 4 - B_ 4 - B_ 4 - B_ 2 - G# 2 - notetype 12, 12, 4 + note B_, 4 + note B_, 4 + note B_, 2 + note G#, 2 + note_type 12, 12, 4 octave 5 - E_ 8 - endchannel + note E_, 8 + sound_ret -Music_PkmnHealed_Ch2:: - notetype 12, 1, 0 +Music_PkmnHealed_Ch3:: + note_type 12, 1, 0 octave 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 - G# 2 - E_ 6 + note E_, 2 + note G#, 2 + note E_, 6 rest 2 - endchannel + sound_ret diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index 83d161d7..a4a3f2bf 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -1,375 +1,375 @@ -Music_Pokecenter_Ch0:: +Music_Pokecenter_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 10, 2, 2 - toggleperfectpitch + toggle_perfect_pitch Music_Pokecenter_branch_be61:: - notetype 12, 10, 3 + note_type 12, 10, 3 octave 3 - F# 2 - F_ 2 - F# 2 - notetype 12, 11, 5 + note F#, 2 + note F_, 2 + note F#, 2 + note_type 12, 11, 5 octave 4 - D_ 4 - C# 2 + note D_, 4 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 10, 3 - A_ 2 - E_ 2 - A_ 2 - notetype 12, 11, 5 + 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 + note_type 12, 10, 3 + note A_, 2 + note E_, 2 + note A_, 2 + note_type 12, 11, 5 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - C# 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - notetype 12, 10, 3 - F# 2 - F_ 2 - F# 2 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note_type 12, 10, 3 + note F#, 2 + note F_, 2 + note F#, 2 + note_type 12, 11, 5 octave 4 - D_ 4 - C# 2 + note D_, 4 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 10, 3 - A_ 2 - E_ 2 - A_ 2 - notetype 12, 11, 5 + 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 + note_type 12, 10, 3 + note A_, 2 + note E_, 2 + note A_, 2 + note_type 12, 11, 5 octave 4 - C# 4 + note C#, 4 octave 3 - 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 + 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 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 - A_ 2 - B_ 2 + note B_, 4 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - E_ 2 - D_ 2 - C# 4 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - E_ 2 - C# 2 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 2 octave 3 - 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 + 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 + sound_loop 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch1:: +Music_Pokecenter_Ch2:: vibrato 8, 2, 5 Music_Pokecenter_branch_befc:: - callchannel Music_Pokecenter_branch_bf4e - duty 3 - notetype 12, 10, 5 + sound_call Music_Pokecenter_branch_bf4e + duty_cycle 3 + note_type 12, 10, 5 octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf60 - D_ 2 - F# 6 - duty 3 - notetype 12, 10, 5 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf60 + note D_, 2 + note F#, 6 + duty_cycle 3 + note_type 12, 10, 5 octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf4e - duty 3 - notetype 12, 10, 5 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf4e + duty_cycle 3 + note_type 12, 10, 5 octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf60 - D_ 8 - duty 3 - notetype 12, 10, 5 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf60 + note D_, 8 + duty_cycle 3 + note_type 12, 10, 5 octave 3 - D_ 4 - E_ 4 - duty 2 - notetype 12, 12, 6 + note D_, 4 + note E_, 4 + duty_cycle 2 + note_type 12, 12, 6 octave 4 - 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 + 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 + sound_loop 0, Music_Pokecenter_branch_befc Music_Pokecenter_branch_bf4e:: - duty 2 - notetype 12, 12, 2 + duty_cycle 2 + note_type 12, 12, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - notetype 12, 12, 3 - A_ 4 - G_ 4 - F# 2 - E_ 2 - C# 6 - endchannel + note D_, 2 + note_type 12, 12, 3 + note A_, 4 + note G_, 4 + note F#, 2 + note E_, 2 + note C#, 6 + sound_ret Music_Pokecenter_branch_bf60:: - duty 2 - notetype 12, 12, 2 + duty_cycle 2 + note_type 12, 12, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - notetype 12, 12, 3 - F# 4 - E_ 4 - C# 2 - endchannel + note C#, 2 + note_type 12, 12, 3 + note F#, 4 + note E_, 4 + note C#, 2 + sound_ret -Music_Pokecenter_Ch2:: - notetype 12, 1, 0 +Music_Pokecenter_Ch3:: + note_type 12, 1, 0 Music_Pokecenter_branch_bf72:: octave 4 - 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 - 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 - D_ 2 - F# 2 - D_ 2 - F# 2 - D_ 2 - B_ 2 - A_ 2 - G_ 2 - callchannel Music_Pokecenter_branch_bfeb - 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 - 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 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + sound_call Music_Pokecenter_branch_bfd9 + sound_call 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 + sound_call Music_Pokecenter_branch_bfd9 + sound_call 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 + sound_call 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 + sound_call 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 + sound_loop 0, Music_Pokecenter_branch_bf72 Music_Pokecenter_branch_bfd9:: - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + sound_ret Music_Pokecenter_branch_bfe2:: - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - G_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + sound_ret Music_Pokecenter_branch_bfeb:: - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - endchannel + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + sound_ret diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index 0f17ddeb..8f78c613 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -1,458 +1,458 @@ -Music_PokemonTower_Ch0:: +Music_PokemonTower_Ch1:: tempo 152 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 12, 2, 3 - notetype 12, 8, 0 + note_type 12, 8, 0 rest 4 octave 4 - B_ 12 + note B_, 12 Music_PokemonTower_branch_7f05a:: - notetype 12, 11, 4 + note_type 12, 11, 4 octave 4 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 octave 3 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 4 - F# 1 + note F#, 1 rest 7 - C_ 1 + note C_, 1 octave 3 - B_ 1 - G_ 1 + note B_, 1 + note G_, 1 rest 5 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - D_ 1 + note D_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 4 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C# 1 + note C#, 1 rest 7 - C# 1 + note C#, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 3 - notetype 12, 8, 4 - C_ 1 + note_type 12, 8, 4 + note C_, 1 rest 3 - notetype 12, 11, 4 - D_ 1 + note_type 12, 11, 4 + note D_, 1 rest 7 - D_ 1 + note D_, 1 rest 7 octave 3 - A_ 1 + note A_, 1 rest 7 - A_ 1 + note A_, 1 rest 7 - notetype 12, 10, 7 - B_ 8 - B_ 8 + note_type 12, 10, 7 + note B_, 8 + note B_, 8 octave 4 - C_ 8 - C_ 8 - C# 8 - C# 8 - notetype 12, 10, 6 - D_ 16 + note C_, 8 + note C_, 8 + note C#, 8 + note C#, 8 + note_type 12, 10, 6 + note D_, 16 rest 16 rest 16 rest 16 rest 16 - notetype 12, 9, 2 - B_ 4 + note_type 12, 9, 2 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 - G_ 4 - F# 4 - E_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 octave 5 - C_ 16 - C_ 16 - loopchannel 0, Music_PokemonTower_branch_7f05a + note C_, 16 + note C_, 16 + sound_loop 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch1:: +Music_PokemonTower_Ch2:: vibrato 20, 3, 4 - duty 3 - notetype 12, 10, 0 + duty_cycle 3 + note_type 12, 10, 0 octave 5 - C_ 12 + note C_, 12 octave 4 - E_ 4 + note E_, 4 Music_PokemonTower_branch_7f0ee:: - notetype 12, 12, 1 + note_type 12, 12, 1 octave 5 - C_ 8 + note C_, 8 octave 4 - B_ 4 - notetype 12, 12, 4 - G_ 1 - F# 1 - E_ 1 - D# 1 - notetype 12, 11, 0 - G_ 8 + note B_, 4 + note_type 12, 12, 4 + note G_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + note_type 12, 11, 0 + note G_, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - B_ 4 - G_ 4 - E_ 4 - G_ 4 + note B_, 4 + note G_, 4 + note E_, 4 + note G_, 4 octave 5 - C_ 8 - notetype 12, 11, 7 - C_ 8 - notetype 12, 12, 2 + note C_, 8 + note_type 12, 11, 7 + note C_, 8 + note_type 12, 12, 2 octave 4 - G_ 1 - F# 1 - E_ 1 + note G_, 1 + note F#, 1 + note E_, 1 rest 1 - notetype 12, 9, 6 + note_type 12, 9, 6 octave 3 - G_ 4 - notetype 12, 12, 7 - G_ 4 - B_ 4 - G_ 4 - B_ 4 + note G_, 4 + note_type 12, 12, 7 + note G_, 4 + note B_, 4 + note G_, 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 4 - notetype 12, 11, 0 + note B_, 4 + note_type 12, 11, 0 octave 4 - C_ 16 - E_ 8 - notetype 12, 11, 7 - E_ 12 - notetype 12, 12, 5 + note C_, 16 + note E_, 8 + note_type 12, 11, 7 + note E_, 12 + note_type 12, 12, 5 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 4 - G_ 4 - B_ 4 - G_ 4 - F# 4 - E_ 4 - notetype 12, 11, 0 - F# 12 - G_ 4 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 - notetype 12, 11, 0 - B_ 4 - G_ 4 - F# 4 - E_ 4 - B_ 16 - notetype 12, 11, 0 + note B_, 4 + note G_, 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note_type 12, 11, 0 + note F#, 12 + note G_, 4 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 11, 0 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 16 + note_type 12, 11, 0 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 4 - F# 4 - E_ 4 - notetype 12, 9, 0 + note G_, 4 + note F#, 4 + note E_, 4 + note_type 12, 9, 0 octave 5 - C_ 16 - notetype 12, 11, 0 - D_ 4 + note C_, 16 + note_type 12, 11, 0 + note D_, 4 octave 4 - A_ 4 - G# 4 - F# 4 - notetype 12, 2, 15 + note A_, 4 + note G#, 4 + note F#, 4 + note_type 12, 2, 15 octave 5 - D_ 16 - notetype 12, 12, 0 - E_ 4 + note D_, 16 + note_type 12, 12, 0 + note E_, 4 octave 4 - B_ 4 - A_ 4 - G_ 4 + note B_, 4 + note A_, 4 + note G_, 4 octave 5 - F_ 4 - C_ 4 + note F_, 4 + note C_, 4 octave 4 - A# 4 - G# 4 + note A#, 4 + note G#, 4 octave 5 - F# 4 - D_ 4 - C_ 4 + note F#, 4 + note D_, 4 + note C_, 4 octave 4 - A# 4 - G# 4 - F# 4 - E_ 4 - D_ 4 - notetype 12, 11, 0 - C_ 8 - notetype 12, 9, 0 - C_ 8 - notetype 12, 8, 0 - C_ 8 - notetype 12, 7, 0 - C_ 8 - notetype 12, 6, 0 - C_ 8 - notetype 12, 6, 7 - C_ 8 + note A#, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note_type 12, 11, 0 + note C_, 8 + note_type 12, 9, 0 + note C_, 8 + note_type 12, 8, 0 + note C_, 8 + note_type 12, 7, 0 + note C_, 8 + note_type 12, 6, 0 + note C_, 8 + note_type 12, 6, 7 + note C_, 8 rest 16 - notetype 12, 10, 0 + note_type 12, 10, 0 octave 5 - G_ 16 + note G_, 16 octave 6 - C_ 16 + note C_, 16 octave 5 - B_ 8 - G_ 8 - E_ 8 - G_ 8 + note B_, 8 + note G_, 8 + note E_, 8 + note G_, 8 octave 6 - C_ 16 + note C_, 16 vibrato 0, 3, 4 - notetype 12, 10, 7 - C_ 16 - loopchannel 0, Music_PokemonTower_branch_7f0ee + note_type 12, 10, 7 + note C_, 16 + sound_loop 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch2:: +Music_PokemonTower_Ch3:: vibrato 4, 1, 1 - notetype 12, 1, 3 + note_type 12, 1, 3 rest 8 octave 5 - G_ 8 + note G_, 8 Music_PokemonTower_branch_7f1a2:: - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 3 - E_ 1 - D# 1 - F# 1 - D# 1 - E_ 1 + note E_, 1 + note D#, 1 + note F#, 1 + note D#, 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - E_ 1 - D# 1 + note E_, 1 + note D#, 1 octave 4 - B_ 1 + note B_, 1 rest 5 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 5 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 octave 4 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 5 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - D_ 1 + note D_, 1 rest 7 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - F_ 1 + note F_, 1 rest 7 - F_ 1 + note F_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - G_ 1 + note G_, 1 rest 15 - notetype 12, 1, 5 + note_type 12, 1, 5 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 7 - notetype 12, 1, 3 + note_type 12, 1, 3 octave 6 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 7 octave 5 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_PokemonTower_branch_7f1a2 + sound_loop 0, Music_PokemonTower_branch_7f1a2 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index fc3227ce..9f326c39 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -1,315 +1,315 @@ -Music_Routes1_Ch0:: +Music_Routes1_Ch1:: tempo 152 volume 7, 7 vibrato 4, 2, 3 - duty 2 - toggleperfectpitch + duty_cycle 2 + toggle_perfect_pitch Music_Routes1_branch_9be9:: - notetype 12, 10, 1 + note_type 12, 10, 1 rest 4 octave 4 - D_ 2 - D_ 6 - D_ 2 - D_ 6 - D_ 2 - D_ 1 - C# 1 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 + note C#, 1 octave 3 - A_ 2 - A_ 2 - A_ 6 + note A_, 2 + note A_, 2 + note A_, 6 octave 4 - C# 2 - C# 6 - C# 2 - C# 4 + note C#, 2 + note C#, 6 + note C#, 2 + note C#, 4 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 2 - A_ 6 + note A_, 2 + note A_, 6 octave 4 - D_ 2 - D_ 6 - D_ 2 - D_ 6 - D_ 2 - D_ 1 - E_ 1 - D_ 1 - C# 1 + 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 octave 3 - B_ 2 - A_ 2 - A_ 6 + note B_, 2 + note A_, 2 + note A_, 6 octave 4 - C# 2 - C# 6 + note C#, 2 + note C#, 6 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 - notetype 12, 10, 2 + note A_, 2 + note_type 12, 10, 2 octave 4 - G_ 4 - E_ 4 - F# 2 - notetype 12, 10, 1 + note G_, 4 + note E_, 4 + note F#, 2 + note_type 12, 10, 1 octave 3 - A_ 2 - A_ 6 - A_ 2 - F# 2 - A_ 4 - B_ 2 + note A_, 2 + note A_, 6 + note A_, 2 + note F#, 2 + note A_, 4 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 4 - A_ 2 - F# 2 - A_ 4 - G_ 2 - E_ 2 - C# 4 - A_ 2 + 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 - D_ 2 + note D_, 2 octave 3 - A_ 4 - B_ 2 - G_ 2 - B_ 4 + note A_, 4 + note B_, 2 + note G_, 2 + note B_, 4 octave 4 - D_ 2 - E_ 2 - C# 2 - D_ 2 + note D_, 2 + note E_, 2 + note C#, 2 + note D_, 2 octave 3 - A_ 2 - A_ 2 - loopchannel 0, Music_Routes1_branch_9be9 - endchannel + note A_, 2 + note A_, 2 + sound_loop 0, Music_Routes1_branch_9be9 + sound_ret -Music_Routes1_Ch1:: - duty 2 +Music_Routes1_Ch2:: + duty_cycle 2 Music_Routes1_branch_9c53:: - notetype 12, 13, 1 - callchannel Music_Routes1_branch_9c65 - callchannel Music_Routes1_branch_9c78 - callchannel Music_Routes1_branch_9c65 - callchannel Music_Routes1_branch_9c8d - loopchannel 0, Music_Routes1_branch_9c53 + note_type 12, 13, 1 + sound_call Music_Routes1_branch_9c65 + sound_call Music_Routes1_branch_9c78 + sound_call Music_Routes1_branch_9c65 + sound_call Music_Routes1_branch_9c8d + sound_loop 0, Music_Routes1_branch_9c53 Music_Routes1_branch_9c65:: octave 4 - 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 + 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 + sound_ret Music_Routes1_branch_9c78:: - 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 + 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 + sound_ret Music_Routes1_branch_9c8d:: - C# 1 - D_ 1 - E_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C# 2 + note C#, 1 + note D_, 1 + note E_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - notetype 12, 13, 2 - B_ 4 - notetype 6, 13, 1 + note C#, 2 + note_type 12, 13, 2 + note B_, 4 + note_type 6, 13, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - notetype 12, 13, 1 + note C#, 1 + note_type 12, 13, 1 octave 3 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 4 - C# 1 - D_ 6 - notetype 12, 13, 2 - F# 1 - G_ 1 - A_ 2 - A_ 2 - F# 2 - D_ 2 + note C#, 1 + note D_, 6 + note_type 12, 13, 2 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note D_, 2 octave 5 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 2 + note 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 + 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 octave 5 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 4 - B_ 3 - G_ 1 - A_ 2 + note B_, 3 + note G_, 1 + note A_, 2 octave 5 - D_ 2 - C# 2 - E_ 2 - D_ 2 - notetype 12, 13, 1 + note D_, 2 + note C#, 2 + note E_, 2 + note D_, 2 + note_type 12, 13, 1 octave 4 - D_ 2 - D_ 2 - endchannel - endchannel + note D_, 2 + note D_, 2 + sound_ret + sound_ret -Music_Routes1_Ch2:: +Music_Routes1_Ch3:: vibrato 8, 2, 5 - notetype 12, 1, 3 + note_type 12, 1, 3 Music_Routes1_branch_9cdd:: rest 2 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 - B_ 4 - A_ 4 + note A_, 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C_ 4 - C# 4 + note C_, 4 + note C#, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 - B_ 4 - A_ 4 + note A_, 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - B_ 4 + note B_, 4 + note A_, 4 + note B_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 8 + note D_, 8 octave 3 - G_ 8 - A_ 8 + note G_, 8 + note A_, 8 octave 4 - C# 8 - D_ 8 + note C#, 8 + note D_, 8 octave 3 - G_ 8 - A_ 8 + note G_, 8 + note A_, 8 octave 4 - D_ 6 - loopchannel 0, Music_Routes1_branch_9cdd - endchannel + note D_, 6 + sound_loop 0, Music_Routes1_branch_9cdd + sound_ret -Music_Routes1_Ch3:: +Music_Routes1_Ch4:: dspeed 12 rest 4 mutedsnare1 2 @@ -400,5 +400,5 @@ Music_Routes1_Ch3:: rest 2 mutedsnare1 2 mutedsnare1 2 - loopchannel 0, Music_Routes1_Ch3 - endchannel + sound_loop 0, Music_Routes1_Ch4 + sound_ret diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index ae5b22d1..0115466e 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -1,330 +1,330 @@ -Music_Routes2_Ch0:: +Music_Routes2_Ch1:: tempo 152 volume 7, 7 vibrato 9, 2, 5 - duty 1 + duty_cycle 1 Music_Routes2_branch_9dc3:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 2 - B_ 4 + note B_, 4 octave 3 - G# 6 - F# 2 - E_ 2 - D# 1 - F# 1 - E_ 2 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - A_ 2 - G# 4 - F# 4 + note E_, 2 + note A_, 2 + note G#, 4 + note F#, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - G# 6 - F# 2 - E_ 2 - D# 1 - F# 1 - B_ 2 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note B_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - A_ 2 - G# 4 - B_ 4 - notetype 8, 11, 2 + note E_, 2 + note A_, 2 + note G#, 4 + note B_, 4 + note_type 8, 11, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 - D# 2 + note E_, 2 + note D#, 2 octave 3 - G# 2 + note G#, 2 octave 4 - D# 2 - D# 2 + note D#, 2 + note D#, 2 octave 3 - G# 2 + note G#, 2 octave 4 - D# 2 - C# 2 + note D#, 2 + note C#, 2 octave 3 - F# 2 + note F#, 2 octave 4 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 3 - F# 2 + note F#, 2 octave 4 - C# 2 + note 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 + 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 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 + note C#, 2 + note D_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - D_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 + note D_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - loopchannel 0, Music_Routes2_branch_9dc3 - endchannel + note E_, 2 + sound_loop 0, Music_Routes2_branch_9dc3 + sound_ret -Music_Routes2_Ch1:: +Music_Routes2_Ch2:: vibrato 8, 2, 6 - duty 3 + duty_cycle 3 Music_Routes2_branch_9e54:: - notetype 12, 13, 4 + note_type 12, 13, 4 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - E_ 1 - F# 6 - A_ 2 - G# 3 - E_ 1 - F# 8 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note F#, 8 octave 3 - D# 4 + note D#, 4 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - E_ 1 - F# 6 - A_ 2 - G# 3 - E_ 1 - B_ 8 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note B_, 8 octave 3 - G# 4 + note G#, 4 octave 5 - C# 6 + note C#, 6 octave 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 + 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 octave 5 - C# 4 + note C#, 4 octave 4 - B_ 3 - A_ 1 - G# 8 + note B_, 3 + note A_, 1 + note G#, 8 rest 4 - loopchannel 0, Music_Routes2_branch_9e54 - endchannel + sound_loop 0, Music_Routes2_branch_9e54 + sound_ret -Music_Routes2_Ch2:: +Music_Routes2_Ch3:: vibrato 9, 2, 8 Music_Routes2_branch_9e9e:: - notetype 12, 1, 1 + note_type 12, 1, 1 octave 3 - E_ 2 + note E_, 2 rest 2 octave 2 - B_ 6 + note B_, 6 octave 3 - D_ 1 - C# 1 - D_ 2 - D# 2 - E_ 2 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 rest 2 octave 2 - B_ 6 + note B_, 6 octave 3 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 octave 2 - A_ 2 + note A_, 2 octave 3 - C# 2 - E_ 2 + note C#, 2 + note E_, 2 rest 2 octave 2 - B_ 6 + note B_, 6 octave 3 - D_ 1 - C# 1 - D_ 2 - D# 2 - E_ 2 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 rest 2 octave 2 - B_ 4 + note B_, 4 octave 3 - C# 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 - F# 2 - E_ 2 + note D_, 2 + note F#, 2 + note E_, 2 rest 2 octave 2 - A_ 2 + note A_, 2 rest 2 octave 3 - D# 2 + note D#, 2 rest 2 octave 2 - G# 2 + note G#, 2 rest 2 octave 3 - C# 2 + note C#, 2 rest 2 octave 2 - F# 2 + note F#, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - E_ 2 - G# 2 - F# 2 + note E_, 2 + note G#, 2 + note F#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 octave 3 - C# 2 + note C#, 2 rest 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 rest 2 octave 3 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - loopchannel 0, Music_Routes2_branch_9e9e - endchannel + sound_loop 0, Music_Routes2_branch_9e9e + sound_ret -Music_Routes2_Ch3:: +Music_Routes2_Ch4:: dspeed 12 snare3 2 rest 2 @@ -421,5 +421,5 @@ Music_Routes2_Ch3:: rest 3 snare3 3 rest 3 - loopchannel 0, Music_Routes2_Ch3 - endchannel + sound_loop 0, Music_Routes2_Ch4 + sound_ret diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index b384308b..96aa2625 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -1,360 +1,360 @@ -Music_Routes3_Ch0:: +Music_Routes3_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 3 - E_ 1 - F# 1 - G_ 6 - F_ 1 - G_ 1 - E_ 1 + note E_, 1 + note F#, 1 + note G_, 6 + note F_, 1 + note G_, 1 + note E_, 1 rest 16 rest 15 Music_Routes3_branch_9fc3:: - notetype 12, 11, 5 - 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 - A# 8 - F_ 8 - D_ 8 - F_ 8 - notetype 12, 11, 5 - 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 - A# 8 - A# 8 - D_ 8 - F_ 8 - notetype 12, 11, 5 - E_ 4 - E_ 2 - F_ 2 - G_ 4 - F_ 2 - E_ 2 - B_ 2 + note_type 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 + note_type 12, 10, 7 + note A#, 8 + note F_, 8 + note D_, 8 + note F_, 8 + note_type 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 + note_type 12, 10, 7 + note A#, 8 + note A#, 8 + note D_, 8 + note F_, 8 + note_type 12, 11, 5 + note E_, 4 + note E_, 2 + note F_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + note B_, 2 octave 2 - G_ 4 + note G_, 4 octave 3 - B_ 8 - A_ 2 - notetype 8, 12, 3 - A_ 4 - F_ 4 - A_ 4 - notetype 8, 4, 15 - A_ 12 - notetype 8, 9, 0 - F_ 12 - G_ 12 - loopchannel 0, Music_Routes3_branch_9fc3 + note B_, 8 + note A_, 2 + note_type 8, 12, 3 + note A_, 4 + note F_, 4 + note A_, 4 + note_type 8, 4, 15 + note A_, 12 + note_type 8, 9, 0 + note F_, 12 + note G_, 12 + sound_loop 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch1:: +Music_Routes3_Ch2:: vibrato 8, 2, 3 - duty 2 - notetype 12, 12, 7 + duty_cycle 2 + note_type 12, 12, 7 octave 3 - G_ 1 - A# 1 - B_ 6 - A_ 1 - B_ 1 + note G_, 1 + note A#, 1 + note B_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 1 + note C_, 1 rest 15 rest 16 Music_Routes3_branch_a01a:: - notetype 12, 12, 7 - duty 2 + note_type 12, 12, 7 + duty_cycle 2 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 - E_ 10 + note C_, 1 + note E_, 10 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - D_ 8 - F_ 8 - notetype 12, 12, 5 - duty 3 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - A# 8 - A_ 8 - notetype 12, 12, 7 - duty 2 + note A#, 8 + note A_, 8 + note_type 12, 12, 7 + duty_cycle 2 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 - E_ 10 + note C_, 1 + note E_, 10 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - D_ 8 - F_ 8 - notetype 12, 12, 5 - duty 3 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - A# 8 + note A#, 8 octave 4 - D_ 6 - notetype 12, 12, 7 - duty 2 - C_ 1 - D_ 1 - E_ 2 - D_ 2 - E_ 2 - C_ 8 + note D_, 6 + note_type 12, 12, 7 + duty_cycle 2 + note C_, 1 + note D_, 1 + note E_, 2 + note D_, 2 + note E_, 2 + note C_, 8 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - D_ 2 + note C_, 1 + note D_, 2 octave 3 - G_ 4 + note G_, 4 octave 4 - G_ 8 - F_ 1 - E_ 1 - notetype 8, 13, 3 - F_ 4 - E_ 4 - notetype 8, 12, 4 - C_ 4 - notetype 8, 12, 5 - C_ 12 - notetype 12, 10, 0 - duty 3 + note G_, 8 + note F_, 1 + note E_, 1 + note_type 8, 13, 3 + note F_, 4 + note E_, 4 + note_type 8, 12, 4 + note C_, 4 + note_type 8, 12, 5 + note C_, 12 + note_type 12, 10, 0 + duty_cycle 3 octave 3 - A_ 8 - B_ 8 - loopchannel 0, Music_Routes3_branch_a01a + note A_, 8 + note B_, 8 + sound_loop 0, Music_Routes3_branch_a01a -Music_Routes3_Ch2:: +Music_Routes3_Ch3:: vibrato 4, 1, 0 - notetype 6, 1, 2 + note_type 6, 1, 2 octave 4 - G_ 2 - A# 2 - B_ 8 - A_ 8 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 8 + note A_, 8 + note G_, 2 rest 2 - G_ 7 + note G_, 7 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 2 + note G_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - G_ 8 - G_ 2 + note G_, 8 + note G_, 2 rest 2 - G_ 7 + note G_, 7 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 2 + note G_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - G_ 8 + note G_, 8 Music_Routes3_branch_a0a3:: - notetype 12, 1, 2 - E_ 1 + note_type 12, 1, 2 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 4 - E_ 1 + note G_, 4 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 2 - A_ 2 - F_ 1 + note G_, 2 + note A_, 2 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 4 - F_ 1 + note A#, 4 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 2 - F_ 2 - E_ 1 + note A#, 2 + note F_, 2 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 4 - E_ 1 + note G_, 4 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 2 - A_ 2 - F_ 1 + note G_, 2 + note A_, 2 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 4 - F_ 1 + note A#, 4 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 2 - A_ 2 - G_ 1 + note A#, 2 + note A_, 2 + note G_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 1 - G_ 1 - G_ 1 + note G_, 1 + note G_, 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 4 + note D_, 4 octave 4 - G_ 1 - G_ 1 - G_ 1 + note G_, 1 + note G_, 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 4 + note D_, 4 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - F_ 1 - F_ 1 - F_ 1 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - F_ 1 + note F_, 1 rest 1 - A_ 4 - F_ 1 - F_ 1 - F_ 1 + note A_, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 4 - loopchannel 0, Music_Routes3_branch_a0a3 + note A_, 4 + sound_loop 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch3:: +Music_Routes3_Ch4:: dspeed 6 mutedsnare4 1 mutedsnare4 1 @@ -512,4 +512,4 @@ Music_Routes3_branch_a17a:: mutedsnare3 1 mutedsnare3 1 mutedsnare3 1 - loopchannel 0, Music_Routes3_branch_a17a + sound_loop 0, Music_Routes3_branch_a17a diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index a9149f05..39f2ea89 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -1,512 +1,512 @@ -Music_Routes4_Ch0:: +Music_Routes4_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 10, 3, 4 - toggleperfectpitch - notetype 12, 10, 2 + toggle_perfect_pitch + note_type 12, 10, 2 octave 2 - G# 4 - G# 4 - G# 4 - notetype 12, 7, 15 - G# 4 - notetype 12, 10, 2 - G# 4 - G# 4 - G# 4 - notetype 12, 11, 7 - B_ 1 + note G#, 4 + note G#, 4 + note G#, 4 + note_type 12, 7, 15 + note G#, 4 + note_type 12, 10, 2 + note G#, 4 + note G#, 4 + note G#, 4 + note_type 12, 11, 7 + note B_, 1 octave 3 - E_ 1 - F# 1 - B_ 1 + note E_, 1 + note F#, 1 + note B_, 1 Music_Routes4_branch_a28a:: - notetype 12, 11, 7 - B_ 6 - E_ 2 - E_ 4 + note_type 12, 11, 7 + note B_, 6 + note E_, 2 + note E_, 4 octave 4 - E_ 4 - D_ 4 - C# 4 + note E_, 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - notetype 12, 11, 1 - G# 3 - notetype 12, 11, 7 - E_ 1 - F# 12 - E_ 8 - D# 4 - F# 4 - B_ 6 - E_ 2 - E_ 4 + note B_, 4 + note A_, 4 + note_type 12, 11, 1 + note G#, 3 + note_type 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 octave 4 - E_ 4 - D_ 4 - C# 4 + note E_, 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 4 - notetype 12, 11, 1 - E_ 3 - notetype 12, 11, 7 - D# 1 - E_ 12 + note C#, 4 + note_type 12, 11, 1 + note E_, 3 + note_type 12, 11, 7 + note D#, 1 + note E_, 12 octave 3 - B_ 3 - A_ 1 - G# 8 + note B_, 3 + note A_, 1 + note G#, 8 octave 4 - E_ 4 + note E_, 4 octave 3 - D_ 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - D_ 2 + note C#, 2 + note D_, 2 + note D_, 2 octave 3 - 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 + 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 octave 4 - D# 2 - E_ 2 + note D#, 2 + note E_, 2 octave 3 - B_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - B_ 2 - notetype 8, 11, 5 - A_ 4 - G# 4 - F# 4 + note B_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + note_type 8, 11, 5 + note A_, 4 + note G#, 4 + note F#, 4 octave 4 - E_ 4 - D# 4 - C# 4 - C# 4 + note E_, 4 + note D#, 4 + note C#, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - B_ 4 + note B_, 4 + note A_, 4 + note B_, 4 octave 4 - C# 4 - D# 4 + note C#, 4 + note D#, 4 octave 3 - E_ 3 - F# 3 - G# 3 - A_ 3 - B_ 4 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 4 octave 4 - C# 4 - D# 4 - E_ 3 + note C#, 4 + note D#, 4 + note E_, 3 octave 3 - B_ 3 - G# 3 - F# 3 - E_ 3 - F# 3 - G# 3 - A_ 3 - loopchannel 0, Music_Routes4_branch_a28a + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + sound_loop 0, Music_Routes4_branch_a28a -Music_Routes4_Ch1:: +Music_Routes4_Ch2:: vibrato 12, 2, 4 - duty 1 - notetype 12, 9, 2 + duty_cycle 1 + note_type 12, 9, 2 octave 3 - E_ 3 - F# 1 - notetype 12, 9, 0 - E_ 12 - notetype 12, 9, 2 + note E_, 3 + note F#, 1 + note_type 12, 9, 0 + note E_, 12 + note_type 12, 9, 2 octave 2 - B_ 3 + note B_, 3 octave 3 - C_ 1 - notetype 12, 9, 0 + note C_, 1 + note_type 12, 9, 0 octave 2 - B_ 8 - duty 3 - notetype 12, 12, 7 + note B_, 8 + duty_cycle 3 + note_type 12, 12, 7 octave 3 - E_ 1 - F# 1 - B_ 1 + note E_, 1 + note F#, 1 + note B_, 1 octave 4 - D# 1 + note D#, 1 Music_Routes4_branch_a325:: - notetype 12, 12, 7 - E_ 6 + note_type 12, 12, 7 + note E_, 6 octave 3 - B_ 2 - B_ 4 + note B_, 2 + note B_, 4 octave 4 - B_ 4 - A_ 4 - G# 4 - F# 4 - F# 1 - A_ 1 - G# 1 - F# 1 - notetype 12, 12, 2 - G# 3 - E_ 1 - notetype 12, 10, 0 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note_type 12, 12, 2 + note G#, 3 + note E_, 1 + note_type 12, 10, 0 octave 3 - B_ 12 - duty 0 - notetype 12, 12, 2 + note B_, 12 + duty_cycle 0 + note_type 12, 12, 2 octave 2 - B_ 3 - notetype 12, 12, 7 + note B_, 3 + note_type 12, 12, 7 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 8 + note B_, 8 octave 3 - D# 4 - duty 3 + note D#, 4 + duty_cycle 3 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 2 - B_ 4 + note B_, 2 + note B_, 4 octave 4 - B_ 4 - A_ 4 - G# 4 - F# 4 - A_ 1 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note A_, 1 octave 5 - C# 1 + note C#, 1 octave 4 - B_ 1 - A_ 1 - notetype 12, 12, 2 - B_ 3 - notetype 12, 12, 7 - A_ 1 - notetype 12, 11, 0 - G# 6 - notetype 12, 9, 0 - G# 6 - notetype 12, 7, 0 - G# 6 - notetype 12, 6, 15 - G# 6 - notetype 12, 12, 7 - G# 4 - notetype 8, 12, 3 - A_ 4 - G# 4 - F# 4 - notetype 8, 9, 0 - F# 6 - notetype 8, 7, 15 - F# 6 - duty 0 - notetype 8, 9, 0 + note B_, 1 + note A_, 1 + note_type 12, 12, 2 + note B_, 3 + note_type 12, 12, 7 + note A_, 1 + note_type 12, 11, 0 + note G#, 6 + note_type 12, 9, 0 + note G#, 6 + note_type 12, 7, 0 + note G#, 6 + note_type 12, 6, 15 + note G#, 6 + note_type 12, 12, 7 + note G#, 4 + note_type 8, 12, 3 + note A_, 4 + note G#, 4 + note F#, 4 + note_type 8, 9, 0 + note F#, 6 + note_type 8, 7, 15 + note F#, 6 + duty_cycle 0 + note_type 8, 9, 0 octave 3 - F# 4 - E_ 4 - F# 4 - A_ 6 - duty 3 - notetype 8, 12, 7 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 6 + duty_cycle 3 + note_type 8, 12, 7 octave 4 - F# 6 - G# 4 - F# 4 - notetype 8, 12, 4 - E_ 4 - notetype 8, 10, 0 - E_ 12 - duty 0 - notetype 8, 9, 0 + note F#, 6 + note G#, 4 + note F#, 4 + note_type 8, 12, 4 + note E_, 4 + note_type 8, 10, 0 + note E_, 12 + duty_cycle 0 + note_type 8, 9, 0 octave 3 - E_ 4 - D# 4 - E_ 4 - G# 6 - duty 3 - notetype 8, 12, 7 + note E_, 4 + note D#, 4 + note E_, 4 + note G#, 6 + duty_cycle 3 + note_type 8, 12, 7 octave 4 - E_ 6 - F# 4 - D# 4 + note E_, 6 + note F#, 4 + note D#, 4 octave 3 - B_ 4 - notetype 8, 10, 0 + note B_, 4 + note_type 8, 10, 0 octave 4 - B_ 16 - notetype 8, 10, 7 - B_ 8 - notetype 8, 11, 0 - A_ 6 - notetype 8, 11, 7 - A_ 6 - notetype 12, 10, 7 - G# 1 - F# 1 - notetype 12, 11, 0 - E_ 12 - notetype 12, 10, 0 - E_ 8 - notetype 12, 10, 7 - E_ 10 - loopchannel 0, Music_Routes4_branch_a325 + note B_, 16 + note_type 8, 10, 7 + note B_, 8 + note_type 8, 11, 0 + note A_, 6 + note_type 8, 11, 7 + note A_, 6 + note_type 12, 10, 7 + note G#, 1 + note F#, 1 + note_type 12, 11, 0 + note E_, 12 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 10, 7 + note E_, 10 + sound_loop 0, Music_Routes4_branch_a325 -Music_Routes4_Ch2:: - notetype 12, 1, 0 +Music_Routes4_Ch3:: + note_type 12, 1, 0 octave 4 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - D# 1 + note D#, 1 rest 3 Music_Routes4_branch_a3d7:: - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 - B_ 1 - B_ 1 - B_ 1 - B_ 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 3 - D_ 1 - D_ 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 - B_ 1 - B_ 1 - B_ 1 - B_ 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_Routes4_branch_a3d7 + sound_loop 0, Music_Routes4_branch_a3d7 -Music_Routes4_Ch3:: +Music_Routes4_Ch4:: dspeed 12 rest 16 rest 12 @@ -678,4 +678,4 @@ Music_Routes4_branch_a4a8:: mutedsnare2 2 mutedsnare2 2 mutedsnare2 2 - loopchannel 0, Music_Routes4_branch_a4a8 + sound_loop 0, Music_Routes4_branch_a4a8 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index e2853646..083d077a 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -1,111 +1,111 @@ -Music_SafariZone_Ch0:: +Music_SafariZone_Ch1:: tempo 132 volume 7, 7 vibrato 6, 3, 4 - toggleperfectpitch - duty 2 - notetype 12, 9, 2 + toggle_perfect_pitch + duty_cycle 2 + note_type 12, 9, 2 octave 3 - pitchbend 0, 73 - C_ 1 - pitchbend 0, 73 - G_ 1 - pitchbend 0, 73 - C_ 1 - pitchbend 0, 73 - G_ 1 + pitch_slide 0, 73 + note C_, 1 + pitch_slide 0, 73 + note G_, 1 + pitch_slide 0, 73 + note C_, 1 + pitch_slide 0, 73 + note G_, 1 rest 4 - duty 3 + duty_cycle 3 Music_SafariZone_branch_bc4f:: - callchannel Music_SafariZone_branch_bc5f - notetype 12, 10, 4 - F# 4 - callchannel Music_SafariZone_branch_bc5f - notetype 12, 10, 4 - F# 4 - loopchannel 0, Music_SafariZone_branch_bc4f + sound_call Music_SafariZone_branch_bc5f + note_type 12, 10, 4 + note F#, 4 + sound_call Music_SafariZone_branch_bc5f + note_type 12, 10, 4 + note F#, 4 + sound_loop 0, Music_SafariZone_branch_bc4f Music_SafariZone_branch_bc5f:: - notetype 12, 10, 2 + note_type 12, 10, 2 octave 3 - C_ 4 - G_ 4 - C_ 4 - G_ 4 - C_ 4 - G_ 4 - C_ 4 - endchannel + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + sound_ret -Music_SafariZone_Ch1:: - duty 2 +Music_SafariZone_Ch2:: + duty_cycle 2 vibrato 8, 2, 5 - notetype 12, 10, 2 + note_type 12, 10, 2 octave 4 - G_ 1 - D_ 1 - G_ 1 - D_ 1 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 rest 4 - duty 3 + duty_cycle 3 Music_SafariZone_branch_bc79:: - callchannel Music_SafariZone_branch_bc89 - notetype 12, 11, 5 - A_ 4 - callchannel Music_SafariZone_branch_bc89 - notetype 12, 11, 5 - B_ 4 - loopchannel 0, Music_SafariZone_branch_bc79 + sound_call Music_SafariZone_branch_bc89 + note_type 12, 11, 5 + note A_, 4 + sound_call Music_SafariZone_branch_bc89 + note_type 12, 11, 5 + note B_, 4 + sound_loop 0, Music_SafariZone_branch_bc79 Music_SafariZone_branch_bc89:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - G_ 4 - D_ 4 - G_ 4 - D_ 4 - G_ 4 - D_ 4 - G_ 4 - endchannel + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + sound_ret -Music_SafariZone_Ch2:: - notetype 12, 1, 0 +Music_SafariZone_Ch3:: + note_type 12, 1, 0 rest 8 Music_SafariZone_branch_bc97:: - callchannel Music_SafariZone_branch_bca5 + sound_call Music_SafariZone_branch_bca5 octave 4 - A_ 4 - callchannel Music_SafariZone_branch_bca5 + note A_, 4 + sound_call Music_SafariZone_branch_bca5 octave 4 - B_ 4 - loopchannel 0, Music_SafariZone_branch_bc97 + note B_, 4 + sound_loop 0, Music_SafariZone_branch_bc97 Music_SafariZone_branch_bca5:: octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 3e1ff3fc..58af9209 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -1,323 +1,323 @@ -Music_SilphCo_Ch0:: +Music_SilphCo_Ch1:: tempo 160 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 8, 2, 2 - notetype 6, 11, 3 + note_type 6, 11, 3 octave 2 - E_ 1 - F# 1 - G# 1 - A# 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 octave 3 - C_ 1 - notetype 6, 10, 0 - C_ 12 - notetype 6, 11, 3 - C_ 2 + note C_, 1 + note_type 6, 10, 0 + note C_, 12 + note_type 6, 11, 3 + note C_, 2 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - E_ 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 Music_SilphCo_branch_7f26d:: - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 octave 3 - C_ 2 + note C_, 2 rest 2 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 10 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 6, 10, 0 - B_ 12 - notetype 6, 11, 3 - B_ 1 - A_ 1 - G_ 1 - F_ 1 - E_ 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 6, 10, 0 + note B_, 12 + note_type 6, 11, 3 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 rest 11 - F_ 1 - G# 1 - A# 1 - B_ 1 - notetype 6, 10, 0 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + note_type 6, 10, 0 octave 3 - C_ 12 - notetype 6, 11, 3 - C_ 1 + note C_, 12 + note_type 6, 11, 3 + note C_, 1 octave 2 - B_ 1 - A_ 1 - G_ 1 - F_ 1 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 rest 11 - F# 1 - B_ 1 + note F#, 1 + note B_, 1 octave 3 - C_ 1 - C# 1 - notetype 6, 10, 0 - D_ 12 - notetype 6, 11, 3 - D_ 1 - C_ 1 + note C_, 1 + note C#, 1 + note_type 6, 10, 0 + note D_, 12 + note_type 6, 11, 3 + note D_, 1 + note C_, 1 octave 2 - A# 1 - G_ 1 - F_ 1 + note A#, 1 + note G_, 1 + note F_, 1 rest 11 - F_ 1 - G# 1 - A# 1 - B_ 1 - notetype 6, 10, 0 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + note_type 6, 10, 0 octave 3 - C_ 12 - notetype 6, 11, 3 - C_ 1 + note C_, 12 + note_type 6, 11, 3 + note C_, 1 octave 2 - B_ 1 - G# 1 - F_ 1 - E_ 1 + note B_, 1 + note G#, 1 + note F_, 1 + note E_, 1 rest 7 - notetype 6, 8, 0 - B_ 16 - notetype 6, 11, 0 + note_type 6, 8, 0 + note B_, 16 + note_type 6, 11, 0 octave 3 - E_ 8 + note E_, 8 tempo 124 - notetype 6, 11, 3 + note_type 6, 11, 3 octave 2 - B_ 2 + note B_, 2 rest 10 - B_ 2 + note B_, 2 rest 10 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 16 rest 6 - A_ 2 + note A_, 2 rest 6 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 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 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + sound_call Music_SilphCo_branch_7f3f0 + sound_call Music_SilphCo_branch_7f3f0 + sound_call Music_SilphCo_branch_7f3f0 rest 4 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 3 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 3 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 4 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 4 - E_ 2 + note E_, 2 rest 6 - E_ 2 + note E_, 2 rest 6 - D# 2 + note D#, 2 rest 6 - D# 2 + note D#, 2 rest 2 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - notetype 6, 6, 0 - E_ 16 - E_ 11 - notetype 6, 11, 3 - E_ 1 - F# 1 - G# 1 - A# 1 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note_type 6, 6, 0 + note E_, 16 + note E_, 11 + note_type 6, 11, 3 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 octave 3 - C_ 1 - notetype 6, 3, 15 - C_ 16 - notetype 6, 10, 0 - C_ 11 - notetype 6, 9, 3 + note C_, 1 + note_type 6, 3, 15 + note C_, 16 + note_type 6, 10, 0 + note C_, 11 + note_type 6, 9, 3 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - notetype 6, 3, 15 - E_ 16 - notetype 6, 9, 0 - E_ 11 - notetype 6, 11, 3 - F_ 1 - G_ 1 - A# 1 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note_type 6, 3, 15 + note E_, 16 + note_type 6, 9, 0 + note E_, 11 + note_type 6, 11, 3 + note F_, 1 + note G_, 1 + note A#, 1 octave 3 - C_ 1 - D_ 1 - notetype 6, 3, 15 - D_ 16 - notetype 6, 10, 7 - D_ 11 + note C_, 1 + note D_, 1 + note_type 6, 3, 15 + note D_, 16 + note_type 6, 10, 7 + note D_, 11 rest 4 rest 4 tempo 128 @@ -344,633 +344,633 @@ Music_SilphCo_branch_7f26d:: rest 4 tempo 160 rest 4 - notetype 6, 4, 3 + note_type 6, 4, 3 octave 2 - B_ 2 + note B_, 2 rest 6 - notetype 6, 6, 3 - B_ 2 + note_type 6, 6, 3 + note B_, 2 rest 6 - notetype 6, 8, 3 - B_ 2 + note_type 6, 8, 3 + note B_, 2 rest 6 - notetype 6, 5, 0 - B_ 8 - notetype 6, 11, 3 - B_ 2 + note_type 6, 5, 0 + note B_, 8 + note_type 6, 11, 3 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - loopchannel 0, Music_SilphCo_branch_7f26d + sound_loop 0, Music_SilphCo_branch_7f26d Music_SilphCo_branch_7f3f0:: octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 - endchannel + note C_, 2 + sound_ret -Music_SilphCo_Ch1:: +Music_SilphCo_Ch2:: vibrato 10, 3, 2 - duty 3 - notetype 6, 12, 3 + duty_cycle 3 + note_type 6, 12, 3 octave 3 - E_ 1 - F# 1 - G# 1 - A# 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 octave 4 - C_ 1 - notetype 6, 11, 0 - C_ 12 - notetype 6, 12, 3 - C_ 2 + note C_, 1 + note_type 6, 11, 0 + note C_, 12 + note_type 6, 12, 3 + note C_, 2 octave 3 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - E_ 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 rest 2 octave 2 - G_ 2 + note G_, 2 rest 6 - F# 2 + note F#, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G# 2 + note G#, 2 rest 2 Music_SilphCo_branch_7f42e:: - E_ 2 + note E_, 2 rest 2 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - F# 2 + note F#, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G# 2 + note G#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 2 - notetype 6, 11, 7 - duty 2 + note_type 6, 11, 7 + duty_cycle 2 octave 4 - 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 - E_ 16 - notetype 6, 12, 0 - B_ 16 - notetype 6, 12, 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 + duty_cycle 3 + note_type 6, 6, 15 + note E_, 16 + note_type 6, 12, 0 + note B_, 16 + note_type 6, 12, 4 octave 3 - 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 + 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 + note_type 6, 12, 2 + duty_cycle 1 octave 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 + 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_type 6, 12, 4 + duty_cycle 3 octave 3 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - D# 4 - E_ 4 - notetype 6, 12, 0 - F_ 8 - notetype 6, 11, 7 - F_ 8 - notetype 6, 8, 10 - F_ 4 - notetype 6, 12, 4 - duty 3 - F_ 4 - E_ 4 - F_ 4 - notetype 6, 10, 0 - F# 8 - notetype 6, 11, 0 - F# 8 - notetype 6, 9, 9 - F# 4 - notetype 6, 12, 4 - F# 4 - F_ 4 - F# 4 - notetype 6, 9, 0 - G_ 12 - notetype 6, 5, 9 - G_ 8 - notetype 6, 12, 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 - F_ 4 - F# 4 - G_ 4 - G# 4 - A_ 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - A# 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - B_ 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 + 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 + note_type 6, 12, 0 + note F_, 8 + note_type 6, 11, 7 + note F_, 8 + note_type 6, 8, 10 + note F_, 4 + note_type 6, 12, 4 + duty_cycle 3 + note F_, 4 + note E_, 4 + note F_, 4 + note_type 6, 10, 0 + note F#, 8 + note_type 6, 11, 0 + note F#, 8 + note_type 6, 9, 9 + note F#, 4 + note_type 6, 12, 4 + note F#, 4 + note F_, 4 + note F#, 4 + note_type 6, 9, 0 + note G_, 12 + note_type 6, 5, 9 + note G_, 8 + note_type 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 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A#, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note B_, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 octave 4 - C_ 4 - notetype 6, 11, 4 - duty 3 + note C_, 4 + note_type 6, 11, 4 + duty_cycle 3 octave 3 - D# 4 - D_ 4 - D# 4 + note D#, 4 + note D_, 4 + note D#, 4 rest 4 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 2 - duty 0 + duty_cycle 0 octave 4 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - duty 3 + duty_cycle 3 octave 3 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 2 - duty 0 + duty_cycle 0 octave 4 - E_ 2 + note E_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - duty 3 + duty_cycle 3 octave 3 - G_ 2 + note G_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 - notetype 6, 8, 7 + note_type 6, 8, 7 octave 5 - 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 + 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 rest 4 - notetype 6, 4, 3 + note_type 6, 4, 3 octave 2 - G_ 2 + note G_, 2 rest 6 - notetype 6, 6, 3 - F# 2 + note_type 6, 6, 3 + note F#, 2 rest 6 - notetype 6, 8, 3 - G_ 2 + note_type 6, 8, 3 + note G_, 2 rest 6 - notetype 6, 4, 15 - G# 8 - notetype 6, 11, 4 - G_ 2 + note_type 6, 4, 15 + note G#, 8 + note_type 6, 11, 4 + note G_, 2 rest 6 - F# 2 + note F#, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G# 2 + note G#, 2 rest 2 - loopchannel 0, Music_SilphCo_branch_7f42e + sound_loop 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch2:: +Music_SilphCo_Ch3:: vibrato 8, 1, 1 - notetype 12, 1, 1 + note_type 12, 1, 1 rest 12 octave 5 - E_ 4 - D# 4 - E_ 4 - F_ 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 Music_SilphCo_branch_7f5c9:: - 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 + 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 rest 1 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 5 - F_ 1 + note F_, 1 rest 5 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 11 - D# 1 + note D#, 1 rest 3 - E_ 1 + note E_, 1 rest 5 - F_ 1 + note F_, 1 rest 5 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 11 - D# 1 + note D#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - D# 1 + note D#, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - D_ 8 - F_ 8 - D_ 8 - F# 8 - D_ 8 - G_ 8 - D_ 8 - A_ 8 - E_ 4 - D# 4 - E_ 4 - F_ 4 + 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 octave 5 - E_ 2 - D# 2 - E_ 2 - F_ 2 - E_ 2 - D# 2 - D_ 2 - D# 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note D#, 2 octave 4 - E_ 4 - D# 4 - E_ 4 - F_ 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 octave 5 - E_ 2 - F_ 2 - F# 2 - G_ 2 - G# 2 - D# 2 - D_ 2 - D# 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note D_, 2 + note D#, 2 octave 6 - 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 + 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 + note_type 6, 1, 1 rest 4 rest 4 rest 4 @@ -987,14 +987,14 @@ Music_SilphCo_branch_7f5c9:: rest 4 rest 4 rest 4 - notetype 12, 1, 1 + note_type 12, 1, 1 rest 4 rest 4 rest 4 rest 4 octave 5 - E_ 4 - D# 4 - E_ 4 - F_ 4 - loopchannel 0, Music_SilphCo_branch_7f5c9 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + sound_loop 0, Music_SilphCo_branch_7f5c9 diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index 1356c8b1..4dae83bc 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -1,338 +1,338 @@ -Music_SSAnne_Ch0:: +Music_SSAnne_Ch1:: tempo 128 volume 7, 7 - duty 1 + duty_cycle 1 vibrato 8, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_SSAnne_branch_b3b2:: - notetype 12, 10, 4 + note_type 12, 10, 4 rest 12 octave 3 - E_ 2 - F# 2 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + note E_, 2 + note F#, 2 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 rest 4 - E_ 4 - G# 4 + note E_, 4 + note G#, 4 rest 4 - C# 2 - E_ 2 - F# 4 - D_ 4 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + 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 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 - F# 4 - E_ 4 - F# 4 + 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 rest 4 - C# 2 - E_ 2 - F# 4 - D_ 4 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + 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 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 - F# 8 - G# 4 - E_ 4 + 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 rest 4 - E_ 4 - F# 2 - E_ 2 - D_ 4 + note E_, 4 + note F#, 2 + note E_, 2 + note D_, 4 rest 4 - D_ 4 - E_ 4 - C# 4 + note D_, 4 + note E_, 4 + note C#, 4 rest 4 - C# 4 - D_ 2 - C# 2 + note C#, 4 + note D_, 2 + note C#, 2 octave 2 - B_ 4 - E_ 4 - B_ 4 + note B_, 4 + note E_, 4 + note B_, 4 octave 3 - D_ 2 + note D_, 2 octave 2 - B_ 2 - A_ 4 + note B_, 2 + note A_, 4 rest 4 - A_ 4 - B_ 2 - A_ 2 - G# 4 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 4 rest 4 - C# 4 - G# 4 - A_ 4 + note C#, 4 + note G#, 4 + note A_, 4 rest 4 - A_ 4 - B_ 4 - B_ 4 + note A_, 4 + note B_, 4 + note B_, 4 rest 4 octave 3 - D_ 8 - loopchannel 0, Music_SSAnne_branch_b3b2 + note D_, 8 + sound_loop 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch1:: - duty 0 +Music_SSAnne_Ch2:: + duty_cycle 0 vibrato 12, 2, 4 Music_SSAnne_branch_b41e:: - notetype 12, 12, 5 + note_type 12, 12, 5 octave 3 - A_ 2 - E_ 2 - A_ 4 - B_ 4 + note A_, 2 + note E_, 2 + note A_, 4 + note B_, 4 octave 4 - D_ 4 - notetype 8, 12, 5 - C# 2 - D_ 2 - C# 2 + note D_, 4 + note_type 8, 12, 5 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 octave 4 - C# 6 - D_ 6 - C# 3 + note C#, 6 + note D_, 6 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 6 - D_ 3 - C# 3 + note E_, 6 + note D_, 3 + note C#, 3 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 3 + note C#, 3 octave 3 - B_ 3 - A_ 3 - E_ 3 - A_ 6 - B_ 6 + note B_, 3 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 octave 4 - D_ 6 - C# 2 - D_ 2 - C# 2 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 octave 4 - C# 6 - D_ 6 - C# 3 + note C#, 6 + note D_, 6 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 6 - D_ 3 - C# 3 + note E_, 6 + note D_, 3 + note C#, 3 octave 3 - B_ 12 - A_ 3 - E_ 3 - A_ 6 - B_ 6 + note B_, 12 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 octave 4 - D_ 6 - C# 2 - D_ 2 - C# 2 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 octave 4 - C# 6 - D_ 6 - C# 3 + note C#, 6 + note D_, 6 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 6 - D_ 3 - C# 3 + note E_, 6 + note D_, 3 + note C#, 3 octave 3 - B_ 12 + note B_, 12 rest 3 octave 4 - C# 3 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - C# 3 - C# 3 - D_ 3 - C# 3 - D_ 3 - E_ 3 + note C#, 3 + note C#, 3 + note D_, 3 + note C#, 3 + note D_, 3 + note E_, 3 octave 3 - B_ 3 - G# 3 - F# 3 - E_ 3 - F# 3 - G# 3 - B_ 3 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 rest 3 - A_ 3 - G# 3 - A_ 3 - A_ 3 - B_ 3 - A_ 3 - B_ 3 + note A_, 3 + note G#, 3 + note A_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note B_, 3 octave 4 - C# 3 + note C#, 3 octave 3 - G# 3 - F# 3 - E_ 3 - E_ 3 - F# 3 - G# 3 - B_ 3 + note G#, 3 + note F#, 3 + note E_, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 rest 3 - F# 3 - E_ 3 - F# 3 - F# 3 - G# 3 - F# 3 - G# 3 - A_ 3 - E_ 3 - C# 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 octave 2 - B_ 3 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 3 octave 3 - C# 3 - E_ 3 + note C#, 3 + note E_, 3 rest 3 - F# 3 - E_ 3 - F# 3 - F# 3 - G# 3 - A_ 3 - B_ 3 + note F#, 3 + note E_, 3 + note F#, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 3 octave 4 - C# 3 - D_ 3 - C# 3 + note C#, 3 + note D_, 3 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - D_ 3 - C# 3 + note E_, 3 + note D_, 3 + note C#, 3 octave 3 - B_ 3 - loopchannel 0, Music_SSAnne_branch_b41e + note B_, 3 + sound_loop 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch2:: - notetype 12, 1, 3 +Music_SSAnne_Ch3:: + note_type 12, 1, 3 rest 16 rest 12 octave 4 - B_ 2 - G# 2 - A_ 8 - F# 8 - G# 4 + note B_, 2 + note G#, 2 + note A_, 8 + note F#, 8 + note G#, 4 rest 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 + 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 octave 5 - D_ 8 - C# 8 - C# 8 + note D_, 8 + note C#, 8 + note C#, 8 octave 4 - 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_Ch2 + 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 + sound_loop 0, Music_SSAnne_Ch3 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index c4507a55..4765f391 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -1,335 +1,335 @@ -Music_Surfing_Ch0:: +Music_Surfing_Ch1:: tempo 160 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 rest 6 octave 2 - A_ 2 - G# 3 - F# 1 - E_ 6 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 octave 3 - G# 2 - F# 2 - G# 4 + note G#, 2 + note F#, 2 + note G#, 4 Music_Surfing_branch_7fa30:: - notetype 12, 11, 2 - E_ 2 - E_ 4 - E_ 2 - E_ 4 - D_ 2 - D_ 4 - D_ 2 - D_ 4 - D_ 2 - D_ 4 - notetype 12, 11, 1 - F# 3 - notetype 12, 11, 2 - 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 - F# 3 - notetype 12, 11, 2 - G# 1 - notetype 12, 11, 4 - A_ 2 - B_ 2 + note_type 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 + note_type 12, 11, 1 + note F#, 3 + note_type 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 + note_type 12, 11, 1 + note F#, 3 + note_type 12, 11, 2 + note G#, 1 + note_type 12, 11, 4 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - notetype 12, 11, 7 - C# 6 - notetype 12, 11, 3 - D_ 2 - C# 2 + note C_, 2 + note_type 12, 11, 7 + note C#, 6 + note_type 12, 11, 3 + note D_, 2 + note C#, 2 octave 3 - 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 + 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 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - 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 + 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 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 4 - loopchannel 0, Music_Surfing_branch_7fa30 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 4 + sound_loop 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch1:: - duty 3 +Music_Surfing_Ch2:: + duty_cycle 3 vibrato 16, 2, 5 - notetype 12, 12, 6 + note_type 12, 12, 6 octave 3 - A_ 2 - G# 3 - F# 1 - E_ 6 - G# 6 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 + note G#, 6 octave 4 - E_ 2 - D_ 2 + note E_, 2 + note D_, 2 octave 3 - B_ 2 + note B_, 2 Music_Surfing_branch_7faae:: - notetype 12, 12, 6 + note_type 12, 12, 6 octave 4 - E_ 6 - C# 5 - E_ 1 - D_ 6 + note E_, 6 + note C#, 5 + note E_, 1 + note D_, 6 octave 3 - B_ 6 + note B_, 6 octave 4 - D_ 6 + note D_, 6 octave 3 - B_ 2 - notetype 12, 12, 1 + note B_, 2 + note_type 12, 12, 1 octave 4 - F# 3 - notetype 12, 12, 6 - D_ 1 - E_ 6 - C# 6 - E_ 6 - C# 5 - E_ 1 - F# 6 - D_ 6 - F# 6 - E_ 2 - notetype 12, 12, 1 - F# 3 - notetype 12, 12, 6 - 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 + note F#, 3 + note_type 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 + note_type 12, 12, 1 + note F#, 3 + note_type 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 octave 3 - B_ 1 + note B_, 1 octave 4 - 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 + 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 octave 5 - C# 6 - loopchannel 0, Music_Surfing_branch_7faae + note C#, 6 + sound_loop 0, Music_Surfing_branch_7faae -Music_Surfing_Ch2:: - notetype 12, 1, 0 +Music_Surfing_Ch3:: + note_type 12, 1, 0 rest 12 octave 5 - E_ 6 + note E_, 6 octave 4 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 Music_Surfing_branch_7fb03:: octave 3 - A_ 2 + note A_, 2 octave 4 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 1 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 rest 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 + 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 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 1 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 rest 2 - E_ 1 - C# 2 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 - D_ 2 - F# 2 - F# 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 octave 3 - A_ 2 + note A_, 2 octave 4 - F# 2 - F# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - A_ 2 - A_ 2 - E_ 2 - G# 2 - G# 2 + 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 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - A_ 2 - A_ 2 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - A_ 2 - A_ 2 - D_ 2 - F# 2 - F# 2 + note A_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - F# 2 - F# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - A_ 2 - A_ 2 - E_ 2 - G# 2 - G# 2 + 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 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - D_ 2 - E_ 2 - loopchannel 0, Music_Surfing_branch_7fb03 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + sound_loop 0, Music_Surfing_branch_7fb03 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 2d41b082..9483b20d 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,465 +1,465 @@ -Music_TitleScreen_Ch0:: +Music_TitleScreen_Ch1:: tempo 144 volume 7, 7 vibrato 9, 3, 4 - duty 3 - notetype 12, 12, 1 + duty_cycle 3 + note_type 12, 12, 1 octave 2 - E_ 1 - G_ 1 - B_ 1 + note E_, 1 + note G_, 1 + note B_, 1 octave 3 - D_ 1 + note D_, 1 octave 2 - G_ 4 - G_ 6 - G_ 1 - G_ 1 - G_ 4 - G_ 4 - G_ 4 - notetype 8, 12, 1 - A_ 2 - A_ 2 - A_ 2 - A_ 2 - A_ 2 - F# 2 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 4 + note G_, 4 + note G_, 4 + note_type 8, 12, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note F#, 2 Music_TitleScreen_branch_7e4e2:: - callchannel Music_TitleScreen_branch_7e541 - callchannel Music_TitleScreen_branch_7e54a - callchannel Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e54a + sound_call Music_TitleScreen_branch_7e541 octave 3 - C_ 8 - notetype 8, 12, 6 - E_ 4 - E_ 4 - C_ 4 - notetype 12, 12, 6 + note C_, 8 + note_type 8, 12, 6 + note E_, 4 + note E_, 4 + note C_, 4 + note_type 12, 12, 6 octave 2 - B_ 8 - notetype 8, 14, 7 + note B_, 8 + note_type 8, 14, 7 octave 3 - F_ 4 - E_ 4 - C_ 4 - notetype 12, 14, 7 - D_ 10 - notetype 12, 12, 6 + note F_, 4 + note E_, 4 + note C_, 4 + note_type 12, 14, 7 + note D_, 10 + note_type 12, 12, 6 octave 2 - B_ 2 + note B_, 2 octave 3 - C_ 2 - D_ 2 - callchannel Music_TitleScreen_branch_7e541 - callchannel Music_TitleScreen_branch_7e54a - callchannel Music_TitleScreen_branch_7e541 - C_ 6 - C_ 6 - E_ 4 - D_ 6 - F_ 2 - G_ 2 - D_ 4 - G_ 2 - G_ 6 - A_ 4 - F_ 2 - A_ 2 + note C_, 2 + note D_, 2 + sound_call Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e54a + sound_call 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 octave 4 - C_ 2 + note C_, 2 octave 3 - D_ 12 - E_ 4 - F_ 8 - G_ 4 - F_ 4 - E_ 12 - F_ 4 - G_ 8 - notetype 12, 11, 6 + note D_, 12 + note E_, 4 + note F_, 8 + note G_, 4 + note F_, 4 + note E_, 12 + note F_, 4 + note G_, 8 + note_type 12, 11, 6 octave 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e55c - notetype 8, 11, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e55c + note_type 8, 11, 4 octave 4 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e55c - notetype 8, 11, 2 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e55c + note_type 8, 11, 2 octave 3 - E_ 4 - E_ 4 - C# 4 - loopchannel 0, Music_TitleScreen_branch_7e4e2 + note E_, 4 + note E_, 4 + note C#, 4 + sound_loop 0, Music_TitleScreen_branch_7e4e2 Music_TitleScreen_branch_7e541:: - notetype 12, 12, 6 + note_type 12, 12, 6 octave 3 - D_ 6 + note D_, 6 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 8 - endchannel + note D_, 8 + sound_ret Music_TitleScreen_branch_7e54a:: - C_ 6 - F_ 6 - C_ 4 - D_ 8 - notetype 12, 14, 7 - F_ 6 - E_ 1 - D# 1 - D_ 8 - notetype 8, 12, 6 - C_ 4 + note C_, 6 + note F_, 6 + note C_, 4 + note D_, 8 + note_type 12, 14, 7 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + note_type 8, 12, 6 + note C_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - C_ 4 - endchannel + note C_, 4 + sound_ret Music_TitleScreen_branch_7e55c:: - notetype 12, 12, 1 - D_ 1 + note_type 12, 12, 1 + note D_, 1 rest 1 octave 2 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - endchannel + note D_, 1 + note D_, 1 + sound_ret -Music_TitleScreen_Ch1:: +Music_TitleScreen_Ch2:: vibrato 16, 4, 6 - duty 1 - notetype 12, 14, 1 + duty_cycle 1 + note_type 12, 14, 1 octave 2 - G_ 1 - B_ 1 + note G_, 1 + note B_, 1 octave 3 - D_ 1 - F# 1 - G_ 4 - G_ 6 - G_ 1 - G_ 1 - G_ 4 - G_ 4 - G_ 4 - notetype 8, 14, 1 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F# 2 + 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 + note_type 8, 14, 1 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F#, 2 Music_TitleScreen_branch_7e594:: vibrato 16, 4, 6 - callchannel Music_TitleScreen_branch_7e622 + sound_call Music_TitleScreen_branch_7e622 octave 2 - A_ 4 - F_ 4 - callchannel Music_TitleScreen_branch_7e62c + note A_, 4 + note F_, 4 + sound_call Music_TitleScreen_branch_7e62c octave 2 - A_ 8 - B_ 16 - callchannel Music_TitleScreen_branch_7e622 + note A_, 8 + note B_, 16 + sound_call Music_TitleScreen_branch_7e622 octave 2 - A_ 6 - F_ 2 - notetype 8, 14, 7 + note A_, 6 + note F_, 2 + note_type 8, 14, 7 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 - notetype 12, 14, 7 - D_ 8 - notetype 12, 9, 5 + note C_, 4 + note_type 12, 14, 7 + note D_, 8 + note_type 12, 9, 5 octave 2 - D_ 6 - D_ 1 - F# 1 - G_ 16 - callchannel Music_TitleScreen_branch_7e622 + note D_, 6 + note D_, 1 + note F#, 1 + note G_, 16 + sound_call Music_TitleScreen_branch_7e622 octave 2 - A_ 2 - F_ 6 - callchannel Music_TitleScreen_branch_7e62c + note A_, 2 + note F_, 6 + sound_call Music_TitleScreen_branch_7e62c octave 3 - C_ 2 + note C_, 2 octave 2 - A_ 6 - B_ 6 - G_ 2 - F_ 8 - callchannel Music_TitleScreen_branch_7e622 - notetype 8, 9, 5 + note A_, 6 + note B_, 6 + note G_, 2 + note F_, 8 + sound_call Music_TitleScreen_branch_7e622 + note_type 8, 9, 5 octave 2 - G_ 4 - F_ 5 - A_ 3 - notetype 8, 14, 6 + note G_, 4 + note F_, 5 + note A_, 3 + note_type 8, 14, 6 octave 4 - F_ 4 - E_ 4 - F_ 4 - notetype 12, 14, 7 - G_ 6 - A# 2 - G_ 8 + note F_, 4 + note E_, 4 + note F_, 4 + note_type 12, 14, 7 + note G_, 6 + note A#, 2 + note G_, 8 vibrato 16, 2, 6 - duty 3 - notetype 12, 0, 11 - G_ 8 - notetype 12, 14, 7 - A_ 8 - duty 1 - notetype 12, 14, 7 - A# 6 - F_ 2 - F_ 8 + duty_cycle 3 + note_type 12, 0, 11 + note G_, 8 + note_type 12, 14, 7 + note A_, 8 + duty_cycle 1 + note_type 12, 14, 7 + note A#, 6 + note F_, 2 + note F_, 8 octave 3 - D_ 8 + note D_, 8 octave 4 - A# 4 - B_ 4 + note A#, 4 + note B_, 4 octave 5 - C_ 6 + note C_, 6 octave 4 - G_ 2 - G_ 8 + note G_, 2 + note G_, 8 octave 3 - E_ 8 - notetype 12, 13, 7 + note E_, 8 + note_type 12, 13, 7 octave 5 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e636 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e636 rest 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 - notetype 8, 14, 5 + note D_, 1 + note_type 8, 14, 5 octave 5 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e636 - D_ 1 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e636 + note D_, 1 rest 2 - D_ 1 + note D_, 1 rest 3 - D_ 1 - notetype 8, 14, 3 + note D_, 1 + note_type 8, 14, 3 octave 5 - C_ 4 - C_ 4 + note C_, 4 + note C_, 4 octave 4 - B_ 4 - loopchannel 0, Music_TitleScreen_branch_7e594 + note B_, 4 + sound_loop 0, Music_TitleScreen_branch_7e594 Music_TitleScreen_branch_7e622:: - notetype 12, 14, 7 + note_type 12, 14, 7 octave 3 - G_ 6 - B_ 2 + note G_, 6 + note B_, 2 octave 4 - D_ 8 - notetype 12, 9, 5 - endchannel + note D_, 8 + note_type 12, 9, 5 + sound_ret Music_TitleScreen_branch_7e62c:: - notetype 12, 14, 7 + note_type 12, 14, 7 octave 4 - F_ 6 - E_ 1 - D# 1 - D_ 8 - notetype 12, 9, 5 - endchannel + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + note_type 12, 9, 5 + sound_ret Music_TitleScreen_branch_7e636:: - notetype 12, 14, 1 - D_ 1 + note_type 12, 14, 1 + note D_, 1 rest 2 octave 4 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 - endchannel + note D_, 1 + sound_ret -Music_TitleScreen_Ch2:: - notetype 12, 1, 0 +Music_TitleScreen_Ch3:: + note_type 12, 1, 0 octave 3 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 5 - G_ 1 - G_ 1 - G_ 1 + note G_, 1 + note G_, 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - notetype 8, 1, 0 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - A_ 2 + note_type 8, 1, 0 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note A_, 2 Music_TitleScreen_branch_7e65e:: - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6d0 + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6d0 Music_TitleScreen_branch_7e664:: - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6d0 - loopchannel 3, Music_TitleScreen_branch_7e664 - callchannel Music_TitleScreen_branch_7e6c9 - G_ 6 - D_ 3 - A_ 6 - F_ 3 - A_ 3 - F_ 3 - callchannel Music_TitleScreen_branch_7e6d7 - A# 3 - F_ 3 - callchannel Music_TitleScreen_branch_7e6d7 - B_ 3 - G_ 3 - callchannel Music_TitleScreen_branch_7e6dc + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6d0 + sound_loop 3, Music_TitleScreen_branch_7e664 + sound_call Music_TitleScreen_branch_7e6c9 + note G_, 6 + note D_, 3 + note A_, 6 + note F_, 3 + note A_, 3 + note F_, 3 + sound_call Music_TitleScreen_branch_7e6d7 + note A#, 3 + note F_, 3 + sound_call Music_TitleScreen_branch_7e6d7 + note B_, 3 + note G_, 3 + sound_call Music_TitleScreen_branch_7e6dc octave 4 - C_ 3 + note C_, 3 octave 3 - G_ 3 - callchannel Music_TitleScreen_branch_7e6dc + note G_, 3 + sound_call Music_TitleScreen_branch_7e6dc octave 4 - C# 3 + note C#, 3 octave 3 - A_ 3 - callchannel Music_TitleScreen_branch_7e6e5 + note A_, 3 + sound_call Music_TitleScreen_branch_7e6e5 octave 5 - pitchbend 0, 66 - D_ 4 + pitch_slide 0, 66 + note D_, 4 rest 4 octave 6 - pitchbend 0, 50 - D_ 4 + pitch_slide 0, 50 + note D_, 4 octave 5 - pitchbend 0, 66 - D_ 4 + pitch_slide 0, 66 + note D_, 4 rest 2 - notetype 8, 1, 0 + note_type 8, 1, 0 octave 4 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e6e5 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e6e5 octave 6 - pitchbend 0, 50 - D_ 4 + pitch_slide 0, 50 + note D_, 4 rest 4 octave 5 - pitchbend 0, 66 - D_ 4 + pitch_slide 0, 66 + note D_, 4 rest 6 - notetype 8, 1, 0 + note_type 8, 1, 0 octave 4 - C_ 4 - C_ 4 + note C_, 4 + note C_, 4 octave 3 - B_ 4 - loopchannel 0, Music_TitleScreen_branch_7e65e + note B_, 4 + sound_loop 0, Music_TitleScreen_branch_7e65e Music_TitleScreen_branch_7e6c9:: - G_ 6 - D_ 3 - G_ 6 - D_ 3 - G_ 3 - D_ 3 - endchannel + note G_, 6 + note D_, 3 + note G_, 6 + note D_, 3 + note G_, 3 + note D_, 3 + sound_ret Music_TitleScreen_branch_7e6d0:: - F_ 6 - C_ 3 - F_ 6 - C_ 3 - F_ 3 - C_ 3 - endchannel + note F_, 6 + note C_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note C_, 3 + sound_ret Music_TitleScreen_branch_7e6d7:: - A# 6 - F_ 3 - A# 6 - F_ 3 - endchannel + note A#, 6 + note F_, 3 + note A#, 6 + note F_, 3 + sound_ret Music_TitleScreen_branch_7e6dc:: octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 3 + note G_, 3 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 3 - endchannel + note G_, 3 + sound_ret Music_TitleScreen_branch_7e6e5:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - D_ 1 + note D_, 1 rest 5 - endchannel + sound_ret -Music_TitleScreen_Ch3:: +Music_TitleScreen_Ch4:: dspeed 6 rest 4 snare3 1 @@ -497,8 +497,8 @@ Music_TitleScreen_branch_7e716:: snare2 1 snare3 1 rest 3 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e834 snare2 1 rest 3 snare2 1 @@ -509,7 +509,7 @@ Music_TitleScreen_branch_7e716:: rest 1 snare3 1 snare2 1 - callchannel Music_TitleScreen_branch_7e842 + sound_call Music_TitleScreen_branch_7e842 snare2 1 rest 3 snare2 1 @@ -520,7 +520,7 @@ Music_TitleScreen_branch_7e716:: rest 1 snare2 1 rest 1 - callchannel Music_TitleScreen_branch_7e842 + sound_call Music_TitleScreen_branch_7e842 snare2 1 rest 3 snare2 1 @@ -535,8 +535,8 @@ Music_TitleScreen_branch_7e716:: snare4 1 snare4 1 dspeed 12 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e842 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e842 snare2 1 rest 3 snare2 1 @@ -555,8 +555,8 @@ Music_TitleScreen_branch_7e716:: rest 1 snare3 1 snare2 1 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e842 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e842 snare2 1 rest 3 snare2 1 @@ -652,7 +652,7 @@ Music_TitleScreen_branch_7e716:: snare2 4 snare3 4 snare2 4 - loopchannel 0, Music_TitleScreen_branch_7e716 + sound_loop 0, Music_TitleScreen_branch_7e716 Music_TitleScreen_branch_7e834:: snare2 1 @@ -663,7 +663,7 @@ Music_TitleScreen_branch_7e834:: snare3 1 snare2 1 rest 3 - endchannel + sound_ret Music_TitleScreen_branch_7e842:: snare2 1 @@ -674,4 +674,4 @@ Music_TitleScreen_branch_7e842:: snare2 1 snare2 1 rest 3 - endchannel + sound_ret diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index 5bd2c5f8..17e82ea9 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -1,1857 +1,1857 @@ -Music_TrainerBattle_Ch0:: +Music_TrainerBattle_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 rest 8 octave 3 - 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 + 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 - B_ 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A# 1 - B_ 1 - A# 1 - A_ 1 - A# 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note 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 + 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 Music_TrainerBattle_branch_22962:: - notetype 12, 11, 5 - D_ 2 - E_ 4 - C# 2 - D_ 4 + note_type 12, 11, 5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 octave 2 - B_ 4 - F# 4 + note B_, 4 + note F#, 4 octave 3 - E_ 2 - D_ 4 - C# 2 - D_ 2 - E_ 2 - F_ 8 - notetype 12, 11, 2 - 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 - D_ 2 - E_ 4 - C# 2 - D_ 4 + note E_, 2 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note F_, 8 + note_type 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 + note_type 12, 11, 5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 octave 2 - B_ 4 - F# 4 + note B_, 4 + note F#, 4 octave 3 - E_ 2 - D_ 4 - C# 2 + note E_, 2 + note D_, 4 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - notetype 12, 10, 7 - D_ 8 - C# 8 + note C#, 2 + note_type 12, 10, 7 + note D_, 8 + note C#, 8 octave 2 - B_ 8 + note B_, 8 octave 3 - C# 8 - notetype 12, 11, 5 - D_ 2 - C# 2 + note C#, 8 + note_type 12, 11, 5 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - E_ 4 + note C#, 2 + note E_, 4 octave 2 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 1 - D_ 4 + note C#, 1 + note D_, 4 octave 2 - F# 1 - G_ 1 - A_ 1 - B_ 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 1 - D_ 4 + note C#, 1 + note D_, 4 octave 2 - F# 1 - G_ 1 - A_ 1 - B_ 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - B_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note B_, 2 + note G_, 2 octave 3 - D_ 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - A_ 2 + 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 rest 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - G_ 2 - A_ 2 - E_ 2 - G_ 2 - F# 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 - B_ 1 + note 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 + 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 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note 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 + 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 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + 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 - 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 + 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 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + 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 - 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 + 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 octave 4 - 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 + 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 - B_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 2 - D_ 1 - E_ 1 - F# 1 - G_ 1 - G# 1 - A# 1 - B_ 2 + note A_, 2 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A#, 1 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - B_ 2 - F_ 2 - G_ 2 - A_ 2 + note G_, 2 + note B_, 2 + note F_, 2 + note G_, 2 + note A_, 2 octave 4 - C_ 2 - D_ 2 + note C_, 2 + note D_, 2 rest 2 octave 3 - A_ 4 + note A_, 4 octave 4 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 octave 3 - F_ 1 - G_ 1 - A_ 1 - B_ 1 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 4 - 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 + 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 octave 3 - B_ 2 - C_ 2 + note B_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C_ 2 - E_ 2 - D_ 2 + note C_, 2 + note E_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - D_ 2 - F_ 2 - C_ 2 + note D_, 2 + note F_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C_ 2 - E_ 2 - D_ 2 + note C_, 2 + note E_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - D_ 2 - F_ 2 - D_ 16 - C_ 16 + note D_, 2 + note F_, 2 + note D_, 16 + note C_, 16 octave 2 - A# 16 - G_ 12 + note A#, 16 + note G_, 12 octave 3 - D_ 1 - E_ 1 - G_ 1 + note D_, 1 + note E_, 1 + note G_, 1 octave 4 - C_ 1 - D_ 8 - F_ 8 + note C_, 1 + note D_, 8 + note F_, 8 octave 3 - A# 8 + note A#, 8 octave 4 - C_ 8 - D_ 8 - E_ 8 - F_ 8 - G_ 8 - E_ 2 + note C_, 8 + note D_, 8 + note E_, 8 + note F_, 8 + note G_, 8 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 octave 3 - C_ 2 - D_ 4 + note C_, 2 + note D_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 4 + note C#, 4 rest 2 - C# 1 - D_ 1 - E_ 1 + note C#, 1 + note D_, 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 2 - B_ 1 + note B_, 1 rest 1 octave 3 - C# 1 + note C#, 1 rest 9 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 + 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 rest 5 - C# 1 - D_ 1 - E_ 1 + note C#, 1 + note D_, 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 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 + 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 rest 9 - F# 2 - E_ 4 - D# 2 - E_ 2 - F# 2 - G# 2 - E_ 8 - F# 8 - G_ 8 + 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 octave 4 - C_ 4 + note C_, 4 octave 3 - G_ 1 - G# 1 - A_ 1 - A# 1 - loopchannel 0, Music_TrainerBattle_branch_22962 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + sound_loop 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch1:: - duty 3 +Music_TrainerBattle_Ch2:: + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - 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 + 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 - B_ 1 + note B_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - notetype 12, 14, 1 + note B_, 1 + note_type 12, 14, 1 octave 4 - B_ 16 + note B_, 16 rest 16 - notetype 12, 13, 1 - B_ 16 + note_type 12, 13, 1 + note B_, 16 rest 12 - A_ 4 - notetype 12, 12, 2 + note A_, 4 + note_type 12, 12, 2 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 6 - D_ 4 + note C#, 6 + note D_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 4 - D_ 6 - A_ 2 - A# 2 - B_ 6 + note C#, 4 + note D_, 6 + note A_, 2 + note A#, 2 + note B_, 6 octave 5 - C# 6 - D_ 4 + note C#, 6 + note D_, 4 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 4 - D_ 6 + note C#, 4 + note D_, 6 octave 4 - A_ 4 + note A_, 4 Music_TrainerBattle_branch_22bfc:: - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - B_ 6 - F# 14 - B_ 4 - F# 4 - B_ 4 - notetype 12, 5, 0 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + note_type 12, 5, 0 octave 4 - C_ 8 - notetype 12, 3, 0 - C_ 8 - notetype 12, 4, 14 - C_ 8 - notetype 12, 12, 7 - C_ 8 + note C_, 8 + note_type 12, 3, 0 + note C_, 8 + note_type 12, 4, 14 + note C_, 8 + note_type 12, 12, 7 + note C_, 8 octave 3 - B_ 6 - F# 14 - B_ 4 - F# 4 - B_ 4 - notetype 12, 9, 0 - A_ 8 - notetype 12, 5, 0 - A_ 8 - notetype 12, 4, 0 - A_ 8 - notetype 12, 3, 0 - A_ 8 - notetype 12, 12, 7 - G_ 16 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + note_type 12, 9, 0 + note A_, 8 + note_type 12, 5, 0 + note A_, 8 + note_type 12, 4, 0 + note A_, 8 + note_type 12, 3, 0 + note A_, 8 + note_type 12, 12, 7 + note G_, 16 octave 4 - D_ 8 + note D_, 8 octave 3 - G_ 8 - notetype 12, 8, 0 - A_ 8 - notetype 12, 5, 0 - A_ 8 - notetype 12, 4, 0 - A_ 8 - notetype 12, 6, 0 - A_ 8 - notetype 12, 12, 7 - G_ 16 + note G_, 8 + note_type 12, 8, 0 + note A_, 8 + note_type 12, 5, 0 + note A_, 8 + note_type 12, 4, 0 + note A_, 8 + note_type 12, 6, 0 + note A_, 8 + note_type 12, 12, 7 + note G_, 16 octave 4 - E_ 8 - F# 8 - E_ 16 - notetype 12, 12, 5 - G_ 4 - A_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - notetype 12, 11, 7 - F# 8 - notetype 12, 5, 0 - F# 8 - notetype 12, 6, 0 - F# 8 - notetype 12, 7, 0 - F# 8 - notetype 12, 10, 0 - G_ 8 - notetype 12, 10, 7 - G_ 8 - notetype 12, 11, 7 - G_ 4 - notetype 12, 12, 5 - A_ 2 - G_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - notetype 12, 10, 0 - G# 8 - notetype 12, 7, 0 - G# 8 - notetype 12, 8, 0 - G# 8 - notetype 12, 6, 0 - G# 8 - notetype 12, 10, 0 - A_ 16 - notetype 12, 11, 0 + note E_, 8 + note F#, 8 + note E_, 16 + note_type 12, 12, 5 + note G_, 4 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 5, 0 + note F#, 8 + note_type 12, 6, 0 + note F#, 8 + note_type 12, 7, 0 + note F#, 8 + note_type 12, 10, 0 + note G_, 8 + note_type 12, 10, 7 + note G_, 8 + note_type 12, 11, 7 + note G_, 4 + note_type 12, 12, 5 + note A_, 2 + note G_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note_type 12, 10, 0 + note G#, 8 + note_type 12, 7, 0 + note G#, 8 + note_type 12, 8, 0 + note G#, 8 + note_type 12, 6, 0 + note G#, 8 + note_type 12, 10, 0 + note A_, 16 + note_type 12, 11, 0 octave 5 - C# 8 - E_ 8 - notetype 12, 12, 0 - D_ 4 + note C#, 8 + note E_, 8 + note_type 12, 12, 0 + note D_, 4 octave 4 - A_ 4 + note A_, 4 octave 5 - C_ 2 - notetype 12, 12, 7 + note C_, 2 + note_type 12, 12, 7 octave 4 - B_ 8 - notetype 12, 6, 0 - B_ 8 - notetype 12, 6, 9 - B_ 6 - notetype 12, 9, 6 - B_ 6 + note B_, 8 + note_type 12, 6, 0 + note B_, 8 + note_type 12, 6, 9 + note B_, 6 + note_type 12, 9, 6 + note B_, 6 rest 2 - notetype 12, 12, 0 + note_type 12, 12, 0 octave 5 - D_ 4 + note D_, 4 octave 4 - A_ 4 - A# 2 - notetype 12, 11, 0 + note A_, 4 + note A#, 2 + note_type 12, 11, 0 octave 5 - F_ 14 - notetype 12, 6, 0 - G_ 16 - notetype 12, 5, 0 - E_ 16 - notetype 12, 4, 0 - E_ 16 - notetype 12, 12, 7 + note F_, 14 + note_type 12, 6, 0 + note G_, 16 + note_type 12, 5, 0 + note E_, 16 + note_type 12, 4, 0 + note E_, 16 + note_type 12, 12, 7 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 14 + note A_, 14 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 6 + note A#, 6 octave 4 - F_ 14 + note F_, 14 octave 3 - A# 4 + note A#, 4 octave 4 - F_ 4 - D_ 4 - C_ 6 + note F_, 4 + note D_, 4 + note C_, 6 octave 3 - A_ 14 + note A_, 14 octave 4 - C_ 4 - E_ 2 - D_ 2 - C_ 2 - E_ 2 - D_ 2 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note D_, 2 octave 3 - A# 4 + note A#, 4 octave 4 - F_ 10 - G_ 6 - F_ 6 - D_ 4 - notetype 12, 11, 0 - F_ 16 - E_ 16 - D_ 16 - E_ 16 - notetype 12, 10, 0 + note F_, 10 + note G_, 6 + note F_, 6 + note D_, 4 + note_type 12, 11, 0 + note F_, 16 + note E_, 16 + note D_, 16 + note E_, 16 + note_type 12, 10, 0 octave 5 - F_ 16 - E_ 16 - G_ 16 - F_ 16 - notetype 12, 13, 1 + note F_, 16 + note E_, 16 + note G_, 16 + note F_, 16 + note_type 12, 13, 1 octave 3 - A# 6 - A# 6 - A# 4 - A_ 6 - A_ 6 - A_ 4 + note A#, 6 + note A#, 6 + note A#, 4 + note A_, 6 + note A_, 6 + note A_, 4 octave 4 - C_ 6 - C_ 6 - C_ 4 + note C_, 6 + note C_, 6 + note C_, 4 octave 3 - A# 6 - A# 6 - A_ 4 - notetype 12, 12, 7 - A_ 4 - B_ 4 - G_ 2 - A_ 10 - B_ 2 + note A#, 6 + note A#, 6 + note A_, 4 + note_type 12, 12, 7 + note A_, 4 + note B_, 4 + note G_, 2 + note A_, 10 + note B_, 2 octave 4 - C# 2 - E_ 2 - D_ 2 - C# 2 + note C#, 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A# 16 + note B_, 2 + note A#, 16 rest 2 - A# 2 + note A#, 2 octave 4 - C_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 octave 3 - A# 2 - B_ 16 + note A#, 2 + note B_, 16 rest 2 - B_ 2 + note B_, 2 octave 4 - C# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 + note C#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 16 - E_ 8 - G_ 8 - loopchannel 0, Music_TrainerBattle_branch_22bfc + note C_, 16 + note E_, 8 + note G_, 8 + sound_loop 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch2:: +Music_TrainerBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 4 + note_type 12, 1, 4 octave 3 - 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 + 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 octave 2 - B_ 1 - A# 1 - B_ 1 - A# 1 - A_ 1 - G# 1 - A_ 2 - A# 2 - B_ 2 - B_ 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 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 Music_TrainerBattle_branch_22d9c:: octave 2 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - 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 + 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 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 2 - A_ 2 - G# 2 - G_ 2 + note A_, 2 + note G#, 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 - G# 2 - A_ 2 + note G_, 2 + note G#, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 - G# 2 - A_ 2 + note G_, 2 + note G#, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - 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 + 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 octave 2 - A_ 4 + note A_, 4 octave 3 - C_ 2 - G_ 2 + note C_, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D_ 4 + note G_, 2 + note D_, 4 octave 2 - A_ 4 - A# 2 + note A_, 4 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - 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 + 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 + sound_loop 0, Music_TrainerBattle_branch_22d9c diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index fb541581..a2291a2a 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -1,338 +1,338 @@ -Music_UnusedSong_Ch0:: +Music_UnusedSong_Ch1:: tempo 144 volume 7, 7 vibrato 5, 1, 6 Music_UnusedSong_branch_a91b:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - E_ 1 + note E_, 1 rest 4 - E_ 2 + note E_, 2 rest 2 - D# 1 + note D#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - D# 1 + note D#, 1 rest 8 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - D# 4 - C# 4 - D# 1 - E_ 1 + note D#, 4 + note C#, 4 + note D#, 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - B_ 2 + note B_, 2 rest 1 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - E_ 1 + note E_, 1 rest 8 - D# 1 + note D#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - D# 1 + note D#, 1 rest 4 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 2 + note D#, 2 rest 3 octave 5 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 2 + note C#, 2 rest 2 - E_ 2 - F# 8 + note E_, 2 + note F#, 8 rest 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 rest 2 octave 5 - G# 2 + note G#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 octave 6 - D# 2 - E_ 8 + note D#, 2 + note E_, 8 rest 2 - D# 2 - C# 2 - D# 2 + note D#, 2 + note C#, 2 + note D#, 2 octave 5 - A_ 2 - G# 2 - A_ 2 - A# 1 - B_ 1 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 1 + note B_, 1 rest 4 - F# 2 + note F#, 2 rest 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 6 - C_ 1 - C# 1 + note C_, 1 + note C#, 1 rest 8 octave 5 - F# 2 - F_ 2 - F# 2 - G# 2 - A_ 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 octave 6 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - loopchannel 0, Music_UnusedSong_branch_a91b - endchannel + sound_loop 0, Music_UnusedSong_branch_a91b + sound_ret -Music_UnusedSong_Ch1:: +Music_UnusedSong_Ch2:: tempo 144 volume 7, 7 - toggleperfectpitch + toggle_perfect_pitch vibrato 6, 1, 5 Music_UnusedSong_branch_a9d8:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 6 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 - G# 1 + note A_, 1 + note G#, 1 rest 8 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 - F# 1 + note G#, 1 + note F#, 1 rest 4 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 2 + note D#, 2 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 - G# 1 + note A_, 1 + note G#, 1 rest 4 - E_ 2 + note E_, 2 rest 2 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 - F# 1 + note G#, 1 + note F#, 1 rest 8 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 2 + note F#, 2 rest 1 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - D# 8 + note D#, 8 rest 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - F# 2 + note F#, 2 rest 2 - C# 8 + note C#, 8 rest 2 - D# 2 - C# 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 1 - F# 1 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 1 + note F#, 1 rest 8 - B_ 2 - A# 2 - B_ 2 - A_ 1 - G# 1 + note B_, 2 + note A#, 2 + note B_, 2 + note A_, 1 + note G#, 1 rest 4 - G# 2 + note G#, 2 rest 2 - F# 2 - F_ 2 - F# 2 - G# 2 - A_ 2 - E_ 2 - C# 2 - E_ 2 - F# 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 rest 6 - D# 2 + note D#, 2 rest 6 - loopchannel 0, Music_UnusedSong_branch_a9d8 - endchannel + sound_loop 0, Music_UnusedSong_branch_a9d8 + sound_ret diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index c89c9b3b..1858d138 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -1,292 +1,292 @@ -Music_Vermilion_Ch0:: +Music_Vermilion_Ch1:: tempo 156 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_Vermilion_branch_b9f6:: - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - 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 + 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 octave 4 - C# 2 - D_ 2 - C# 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 1 - A_ 1 - B_ 2 + note B_, 2 + note A_, 2 + note G#, 1 + note A_, 1 + note B_, 2 octave 4 - C# 2 - E_ 2 + note C#, 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - G# 2 + note G#, 2 octave 4 - C# 2 + note C#, 2 octave 3 - 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 + 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 + sound_loop 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch1:: - duty 3 +Music_Vermilion_Ch2:: + duty_cycle 3 vibrato 10, 2, 3 Music_Vermilion_branch_ba66:: - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - A_ 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 - A_ 1 - B_ 1 + note B_, 6 + note A_, 1 + note B_, 1 octave 4 - C# 8 + note C#, 8 octave 3 - A_ 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 1 + note C#, 1 octave 3 - B_ 1 - A_ 8 - A_ 8 + note B_, 1 + note A_, 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 - A_ 1 - B_ 1 + note B_, 6 + note A_, 1 + note B_, 1 octave 4 - C# 8 + note C#, 8 octave 3 - A_ 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 1 + note C#, 1 octave 3 - B_ 1 - A_ 8 - B_ 4 + note B_, 1 + note A_, 8 + note B_, 4 octave 4 - 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 + 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 + sound_loop 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch2:: - notetype 12, 1, 0 +Music_Vermilion_Ch3:: + note_type 12, 1, 0 Music_Vermilion_branch_baa8:: octave 4 - 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 + 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 + sound_loop 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch3:: +Music_Vermilion_Ch4:: dspeed 12 Music_Vermilion_branch_bb0e:: - callchannel Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f triangle1 2 triangle1 1 triangle1 1 @@ -300,12 +300,12 @@ Music_Vermilion_branch_bb0e:: triangle1 1 triangle1 1 triangle1 1 - loopchannel 4, Music_Vermilion_branch_bb0e - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - loopchannel 0, Music_Vermilion_branch_bb0e + sound_loop 4, Music_Vermilion_branch_bb0e + sound_call Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f + sound_loop 0, Music_Vermilion_branch_bb0e Music_Vermilion_branch_bb3f:: triangle1 2 @@ -320,4 +320,4 @@ Music_Vermilion_branch_bb3f:: triangle1 2 triangle1 1 triangle1 1 - endchannel + sound_ret diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index e9aad529..582b55eb 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -1,738 +1,738 @@ -Music_WildBattle_Ch0:: +Music_WildBattle_Ch1:: tempo 104 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 4 - C_ 1 + note C_, 1 octave 3 - 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 + 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 octave 2 - B_ 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 3 - C_ 1 - C# 1 - notetype 12, 11, 1 - G_ 6 - E_ 6 - D# 12 - C# 14 - E_ 6 - D# 10 - notetype 12, 4, 15 - C# 10 - notetype 12, 11, 1 - G_ 6 - E_ 6 - D# 12 - C# 14 - E_ 6 - D# 10 - C# 10 + note C_, 1 + note C#, 1 + note_type 12, 11, 1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + note_type 12, 4, 15 + note C#, 10 + note_type 12, 11, 1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + note C#, 10 Music_WildBattle_branch_230e0:: - notetype 12, 11, 3 - 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 + note_type 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 octave 2 - B_ 1 + note B_, 1 octave 3 - 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 - D_ 4 - C_ 4 - D_ 4 - F_ 4 - E_ 6 - D_ 6 - F_ 4 - notetype 12, 11, 7 - A_ 16 - G_ 16 - notetype 12, 11, 5 - D_ 4 - C_ 4 - D_ 4 - F_ 4 - G_ 6 - A_ 6 - B_ 4 - notetype 12, 11, 7 + 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 + note_type 12, 11, 5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note E_, 6 + note D_, 6 + note F_, 4 + note_type 12, 11, 7 + note A_, 16 + note G_, 16 + note_type 12, 11, 5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note G_, 6 + note A_, 6 + note B_, 4 + note_type 12, 11, 7 octave 4 - C_ 16 - notetype 12, 3, 15 - G_ 16 - notetype 12, 11, 5 + note C_, 16 + note_type 12, 3, 15 + note G_, 16 + note_type 12, 11, 5 octave 3 - C_ 12 - C_ 2 + note C_, 12 + note C_, 2 rest 2 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 rest 12 - C# 12 - C# 2 + note C#, 12 + note C#, 2 rest 2 - F_ 2 - notetype 12, 10, 3 - D# 6 - notetype 12, 10, 7 - C# 8 - loopchannel 0, Music_WildBattle_branch_230e0 + note F_, 2 + note_type 12, 10, 3 + note D#, 6 + note_type 12, 10, 7 + note C#, 8 + sound_loop 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch1:: - duty 3 +Music_WildBattle_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 - notetype 12, 12, 2 + note G_, 1 + note_type 12, 12, 2 octave 4 - G_ 6 + note G_, 6 octave 3 - G_ 6 - G_ 12 - G_ 14 - G_ 6 - G_ 10 - notetype 12, 9, 0 - F# 10 - notetype 12, 12, 2 - G_ 6 - G_ 6 - G_ 12 - G_ 14 - G_ 6 - G_ 10 - G_ 10 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + note_type 12, 9, 0 + note F#, 10 + note_type 12, 12, 2 + note G_, 6 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + note G_, 10 Music_WildBattle_branch_23225:: - notetype 12, 12, 5 - G_ 6 - F# 6 - E_ 4 - G_ 6 - A_ 6 - G_ 4 + note_type 12, 12, 5 + note G_, 6 + note F#, 6 + note E_, 4 + note G_, 6 + note A_, 6 + note G_, 4 octave 4 - G# 12 - G_ 2 + note G#, 12 + note G_, 2 rest 2 - G# 2 - G_ 2 + note G#, 2 + note G_, 2 rest 4 - notetype 12, 11, 7 + note_type 12, 11, 7 octave 5 - C# 8 - notetype 12, 12, 5 + note C#, 8 + note_type 12, 12, 5 octave 4 - C_ 6 + note C_, 6 octave 3 - A# 6 - G# 4 + note A#, 6 + note G#, 4 octave 4 - C# 6 - C_ 6 + note C#, 6 + note C_, 6 octave 3 - A# 4 + note A#, 4 octave 4 - F_ 6 - E_ 6 - D_ 4 - notetype 12, 12, 7 + note F_, 6 + note E_, 6 + note D_, 4 + note_type 12, 12, 7 octave 3 - A# 4 + note A#, 4 octave 4 - C_ 4 - D_ 4 - F_ 4 - notetype 12, 12, 0 - G# 16 - notetype 12, 11, 0 - G# 16 - notetype 12, 4, 14 - G_ 16 - notetype 12, 12, 7 - G_ 16 + note C_, 4 + note D_, 4 + note F_, 4 + note_type 12, 12, 0 + note G#, 16 + note_type 12, 11, 0 + note G#, 16 + note_type 12, 4, 14 + note G_, 16 + note_type 12, 12, 7 + note G_, 16 octave 3 - F_ 8 - A# 8 + note F_, 8 + note A#, 8 octave 4 - D_ 8 - F_ 8 - notetype 12, 12, 0 - E_ 16 - notetype 12, 12, 7 - E_ 16 + note D_, 8 + note F_, 8 + note_type 12, 12, 0 + note E_, 16 + note_type 12, 12, 7 + note E_, 16 octave 3 - F_ 8 - A# 8 + note F_, 8 + note A#, 8 octave 4 - D_ 8 - F_ 8 - notetype 12, 12, 0 - G_ 16 - notetype 12, 3, 15 + note D_, 8 + note F_, 8 + note_type 12, 12, 0 + note G_, 16 + note_type 12, 3, 15 octave 5 - C_ 16 - notetype 12, 12, 5 + note C_, 16 + note_type 12, 12, 5 octave 4 - E_ 12 - E_ 2 + note E_, 12 + note E_, 2 rest 2 - F_ 2 - notetype 12, 12, 1 - E_ 4 - notetype 12, 12, 5 + note F_, 2 + note_type 12, 12, 1 + note E_, 4 + note_type 12, 12, 5 rest 10 - F_ 12 - F_ 2 + note F_, 12 + note F_, 2 rest 2 - G# 2 - notetype 12, 10, 3 - G_ 6 - notetype 12, 12, 7 - F_ 8 - loopchannel 0, Music_WildBattle_branch_23225 + note G#, 2 + note_type 12, 10, 3 + note G_, 6 + note_type 12, 12, 7 + note F_, 8 + sound_loop 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch2:: +Music_WildBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 1 + note_type 12, 1, 1 octave 4 - C# 1 + note C#, 1 rest 1 - C# 1 - C_ 1 - D_ 1 + note C#, 1 + note C_, 1 + note D_, 1 rest 1 - D_ 1 - C_ 1 - D# 1 + note D_, 1 + note C_, 1 + note D#, 1 rest 1 - D# 1 - C_ 1 - E_ 1 + note D#, 1 + note C_, 1 + note E_, 1 rest 1 - E_ 1 - C_ 1 - F_ 1 + note E_, 1 + note C_, 1 + note F_, 1 rest 1 - F_ 1 - C_ 1 - F# 1 + note F_, 1 + note C_, 1 + note F#, 1 rest 1 - F# 1 - C_ 1 - G_ 1 + note F#, 1 + note C_, 1 + note G_, 1 rest 1 - G_ 1 - C_ 1 + note G_, 1 + note C_, 1 octave 3 - A# 2 - B_ 2 + note A#, 2 + note B_, 2 Music_WildBattle_branch_232b5:: octave 4 - 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 + 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 + sound_loop 2, Music_WildBattle_branch_232b5 Music_WildBattle_branch_232d8:: - 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 + 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 rest 2 - G# 2 - G_ 2 + note G#, 2 + note G_, 2 rest 4 - 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 + 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 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - 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 + 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 + sound_loop 0, Music_WildBattle_branch_232d8 |