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/vermilion.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 '')
| -rw-r--r-- | audio/music/vermilion.asm | 498 |
1 files changed, 249 insertions, 249 deletions
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 |