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/museumguy.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/museumguy.asm')
| -rw-r--r-- | audio/music/museumguy.asm | 360 |
1 files changed, 180 insertions, 180 deletions
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 |