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/cities1.asm | |
| 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/cities1.asm')
| -rw-r--r-- | audio/music/cities1.asm | 950 |
1 files changed, 475 insertions, 475 deletions
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 |