diff options
| -rw-r--r-- | audio/song_header_pointers.inc | 26 | ||||
| -rwxr-xr-x | audio/songs/bicycle.asm | 920 | ||||
| -rwxr-xr-x | audio/songs/evolution.asm | 162 | ||||
| -rwxr-xr-x | audio/songs/heal.asm | 80 | ||||
| -rwxr-xr-x | audio/songs/leaderbattle.asm | 1772 | ||||
| -rwxr-xr-x | audio/songs/nidorinointro.asm | 541 | ||||
| -rwxr-xr-x | audio/songs/none.asm | 25 | ||||
| -rwxr-xr-x | audio/songs/oakintro.asm | 634 | ||||
| -rwxr-xr-x | audio/songs/route1.asm | 620 | ||||
| -rwxr-xr-x | audio/songs/spottedrocket.asm | 132 | ||||
| -rwxr-xr-x | audio/songs/title.asm | 1025 | ||||
| -rwxr-xr-x | audio/songs/trainerbattle.asm | 2654 | ||||
| -rwxr-xr-x | audio/songs/victorytrainer.asm | 378 | ||||
| -rwxr-xr-x | audio/songs/viridiancity.asm | 1092 | ||||
| -rw-r--r-- | constants/audio_constants.asm | 15 | ||||
| -rwxr-xr-x | macros/audio.asm | 397 |
16 files changed, 5233 insertions, 5240 deletions
diff --git a/audio/song_header_pointers.inc b/audio/song_header_pointers.inc index b67a7ac..b43798b 100644 --- a/audio/song_header_pointers.inc +++ b/audio/song_header_pointers.inc @@ -1,14 +1,14 @@ SongHeaderPointers: - dba Song_None - dba Song_Title - dba Song_Route1 - dba Song_OakIntro - dba Song_LeaderBattle - dba Song_TrainerBattle - dba Song_NidorinoIntro - dba Song_ViridianCity - dba Song_Heal - dba Song_Bicycle - dba Song_SpottedRocket - dba Song_VictoryTrainer - dba Song_Evolution + dba Music_None + dba Music_Title + dba Music_Route1 + dba Music_OakIntro + dba Music_LeaderBattle + dba Music_TrainerBattle + dba Music_NidorinoIntro + dba Music_ViridianCity + dba Music_Heal + dba Music_Bicycle + dba Music_SpottedRocket + dba Music_VictoryTrainer + dba Music_Evolution diff --git a/audio/songs/bicycle.asm b/audio/songs/bicycle.asm index dedc608..116c579 100755 --- a/audio/songs/bicycle.asm +++ b/audio/songs/bicycle.asm @@ -2,722 +2,714 @@ INCLUDE "constants.asm" SECTION "audio/songs/bicycle.asm", ROMX -Song_Bicycle:: - db 3 << 6 | 0 - dw Song_Bicycle_Ch0 - db 1 - dw Song_Bicycle_Ch1 - db 2 - dw Song_Bicycle_Ch2 - db 3 - dw Song_Bicycle_Ch3 +Music_Bicycle:: + channel_count 4 + channel 1, Music_Bicycle_Ch1 + channel 2, Music_Bicycle_Ch2 + channel 3, Music_Bicycle_Ch3 + channel 4, Music_Bicycle_Ch4 -Song_Bicycle_Ch0:: +Music_Bicycle_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 -Song_Bicycle_branch_ed659:: - 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 +Music_Bicycle_branch_ed659:: + octave 4 + note C_, 4 + note D_, 4 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 4 + note E_, 2 + note D_, 2 + note F_, 4 + note D_, 4 octave 3 - 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 - rest 1 - rest 2 - notetype 12, 11, 3 - E_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 2 - E_ 1 - F_ 1 - toggleperfectpitch - rest 1 - rest 2 - 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 B_, 2 + octave 4 + note F_, 4 + note D_, 4 + note E_, 2 + note F_, 2 + note G_, 2 + note C_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + 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 + pitch_offset 1 + 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 + pitch_offset 1 + 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 - octave 4 - C_ 2 - C_ 4 - C_ 2 + note B_, 2 + note A_, 1 + note B_, 1 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note C_, 4 + note C_, 2 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 - 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 B_, 1 + octave 4 + 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, Song_Bicycle_branch_ed659 + sound_loop 0, Music_Bicycle_branch_ed659 -Song_Bicycle_Ch1:: - duty 2 +Music_Bicycle_Ch2:: + duty_cycle 2 vibrato 6, 1, 5 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - C_ 2 + note C_, 2 -Song_Bicycle_branch_ed717:: - E_ 4 - F_ 4 - G_ 4 +Music_Bicycle_branch_ed717:: + note E_, 4 + note F_, 4 + note G_, 4 octave 5 - C_ 4 - octave 4 - B_ 6 - A_ 1 - B_ 1 - A_ 10 - F_ 2 - G_ 2 - A_ 2 + note C_, 4 + octave 4 + note B_, 6 + note A_, 1 + note B_, 1 + note A_, 10 + note F_, 2 + note G_, 2 + note A_, 2 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 - octave 4 - A_ 2 - G_ 4 - duty 3 - notetype 12, 8, 4 - A# 6 - duty 2 - notetype 12, 12, 5 + note C_, 6 + octave 4 + 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 - 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 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 + 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 - 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 C_, 2 + octave 4 + note B_, 4 + note A_, 4 + note G_, 2 + note A#, 4 + note A_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + 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 - octave 4 - B_ 4 - notetype 12, 12, 7 - B_ 12 - notetype 12, 12, 3 - loopchannel 0, Song_Bicycle_branch_ed717 + 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 + note B_, 4 + note_type 12, 12, 7 + note B_, 12 + note_type 12, 12, 3 + sound_loop 0, Music_Bicycle_branch_ed717 -Song_Bicycle_Ch2:: - notetype 12, 1, 3 +Music_Bicycle_Ch3:: + note_type 12, 1, 3 rest 2 -Song_Bicycle_branch_ed7c9:: +Music_Bicycle_branch_ed7c9:: 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, Song_Bicycle_branch_ed7c9 - + sound_loop 0, Music_Bicycle_branch_ed7c9 -Song_Bicycle_Ch3:: - drumset 1 - dspeed 12 +Music_Bicycle_Ch4:: + toggle_noise 1 + drum_speed 12 rest 2 -Song_Bicycle_branch_ed91f:: - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed965 - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed96e - callchannel Song_Bicycle_branch_ed965 - callchannel Song_Bicycle_branch_ed965 - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed965 - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed96e - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed965 - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed95c - callchannel Song_Bicycle_branch_ed95c - loopchannel 0, Song_Bicycle_branch_ed91f +Music_Bicycle_branch_ed91f:: + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed965 + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed96e + sound_call Music_Bicycle_branch_ed965 + sound_call Music_Bicycle_branch_ed965 + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed965 + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed96e + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed965 + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed95c + sound_call Music_Bicycle_branch_ed95c + sound_loop 0, Music_Bicycle_branch_ed91f -Song_Bicycle_branch_ed95c:: +Music_Bicycle_branch_ed95c:: rest 2 - snare7 2 + drum_note 9, 2 rest 2 - snare7 2 + drum_note 9, 2 rest 2 - snare7 2 + drum_note 9, 2 rest 2 - snare7 2 - endchannel + drum_note 9, 2 + sound_ret -Song_Bicycle_branch_ed965:: +Music_Bicycle_branch_ed965:: rest 2 - snare7 2 + drum_note 9, 2 rest 2 - snare7 2 + drum_note 9, 2 rest 2 - snare7 2 - snare7 2 - snare7 2 - endchannel + drum_note 9, 2 + drum_note 9, 2 + drum_note 9, 2 + sound_ret -Song_Bicycle_branch_ed96e:: +Music_Bicycle_branch_ed96e:: rest 2 - snare7 2 + drum_note 9, 2 rest 2 - snare7 2 + drum_note 9, 2 rest 2 - snare7 2 + drum_note 9, 2 rest 2 - snare7 1 - snare7 1 - endchannel + drum_note 9, 1 + drum_note 9, 1 + sound_ret diff --git a/audio/songs/evolution.asm b/audio/songs/evolution.asm index cd874cc..839fadf 100755 --- a/audio/songs/evolution.asm +++ b/audio/songs/evolution.asm @@ -2,124 +2,120 @@ INCLUDE "constants.asm" SECTION "audio/songs/evolution.asm", ROMX -Song_Evolution:: - db 2 << 6 | 0 - dw Song_Evolution_Ch0 - db 1 - dw Song_Evolution_Ch1 - db 2 - dw Song_Evolution_Ch2 +Music_Evolution:: + channel_count 3 + channel 1, Music_Evolution_Ch1 + channel 2, Music_Evolution_Ch2 + channel 3, Music_Evolution_Ch3 -Song_Evolution_Ch0:: +Music_Evolution_Ch1:: tempo 132 volume 7, 7 vibrato 6, 3, 4 - toggleperfectpitch - rest 1 - rest 2 - duty 2 - notetype 12, 9, 2 + pitch_offset 1 + duty_cycle 2 + note_type 12, 9, 2 octave 3 - pitchbend 0, 74 - C_ 1 - pitchbend 0, 74 - G_ 1 - pitchbend 0, 74 - C_ 1 - pitchbend 0, 74 - G_ 1 + pitch_slide 1, 4, A_ + note C_, 1 + pitch_slide 1, 4, A_ + note G_, 1 + pitch_slide 1, 4, A_ + note C_, 1 + pitch_slide 1, 4, A_ + note G_, 1 rest 4 - duty 3 + duty_cycle 3 -Song_Evolution_branch_edb49:: - callchannel Song_Evolution_branch_edb5b - notetype 12, 10, 4 - F# 4 - callchannel Song_Evolution_branch_edb5b - notetype 12, 10, 4 - F# 4 - loopchannel 0, Song_Evolution_branch_edb49 +Music_Evolution_branch_edb49:: + sound_call Music_Evolution_branch_edb5b + note_type 12, 10, 4 + note F#, 4 + sound_call Music_Evolution_branch_edb5b + note_type 12, 10, 4 + note F#, 4 + sound_loop 0, Music_Evolution_branch_edb49 -Song_Evolution_branch_edb5b:: - notetype 12, 10, 2 +Music_Evolution_branch_edb5b:: + 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 -Song_Evolution_Ch1:: - duty 2 +Music_Evolution_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 -Song_Evolution_branch_edb77:: - callchannel Song_Evolution_branch_edb89 - notetype 12, 11, 5 - A_ 4 - callchannel Song_Evolution_branch_edb89 - notetype 12, 11, 5 - B_ 4 - loopchannel 0, Song_Evolution_branch_edb77 +Music_Evolution_branch_edb77:: + sound_call Music_Evolution_branch_edb89 + note_type 12, 11, 5 + note A_, 4 + sound_call Music_Evolution_branch_edb89 + note_type 12, 11, 5 + note B_, 4 + sound_loop 0, Music_Evolution_branch_edb77 -Song_Evolution_branch_edb89:: - notetype 12, 11, 2 +Music_Evolution_branch_edb89:: + 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 -Song_Evolution_Ch2:: - notetype 12, 1, 0 +Music_Evolution_Ch3:: + note_type 12, 1, 0 rest 8 -Song_Evolution_branch_edb99:: - callchannel Song_Evolution_branch_edba7 +Music_Evolution_branch_edb99:: + sound_call Music_Evolution_branch_edba7 octave 4 - A_ 4 - callchannel Song_Evolution_branch_edba7 + note A_, 4 + sound_call Music_Evolution_branch_edba7 octave 4 - B_ 4 - loopchannel 0, Song_Evolution_branch_edb99 + note B_, 4 + sound_loop 0, Music_Evolution_branch_edb99 -Song_Evolution_branch_edba7:: +Music_Evolution_branch_edba7:: 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/songs/heal.asm b/audio/songs/heal.asm index e48ecb5..2bb7c35 100755 --- a/audio/songs/heal.asm +++ b/audio/songs/heal.asm @@ -2,60 +2,56 @@ INCLUDE "constants.asm" SECTION "audio/songs/heal.asm", ROMX -Song_Heal:: - db 2 << 6 | 0 - dw Song_Heal_Ch0 - db 1 - dw Song_Heal_Ch1 - db 2 - dw Song_Heal_Ch2 +Music_Heal:: + channel_count 3 + channel 1, Music_Heal_Ch1 + channel 2, Music_Heal_Ch2 + channel 3, Music_Heal_Ch3 -Song_Heal_Ch0:: +Music_Heal_Ch1:: tempo 144 volume 7, 7 - duty 2 - toggleperfectpitch - rest 1 + duty_cycle 2 + pitch_offset 1 + note_type 12, 8, 1 rest 2 - notetype 12, 8, 1 - rest 2 - pitchbend 0, 64 - B_ 2 - pitchbend 0, 85 - B_ 2 - pitchbend 0, 69 - E_ 2 + pitch_slide 1, 4, B_ + note B_, 2 + pitch_slide 1, 3, E_ + note B_, 2 + pitch_slide 1, 4, E_ + note E_, 2 rest 4 - pitchbend 0, 48 - E_ 4 - pitchbend 0, 64 - B_ 4 - endchannel + pitch_slide 1, 5, B_ + note E_, 4 + pitch_slide 1, 4, B_ + note B_, 4 + sound_ret -Song_Heal_Ch1:: - duty 2 - notetype 12, 12, 3 +Music_Heal_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 -Song_Heal_Ch2:: - notetype 12, 1, 0 +Music_Heal_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/songs/leaderbattle.asm b/audio/songs/leaderbattle.asm index 928a74d..45e68c8 100755 --- a/audio/songs/leaderbattle.asm +++ b/audio/songs/leaderbattle.asm @@ -2,1413 +2,1409 @@ INCLUDE "constants.asm" SECTION "audio/songs/leaderbattle.asm", ROMX -Song_LeaderBattle:: - db 2 << 6 | 0 - dw Song_LeaderBattle_Ch0 - db 1 - dw Song_LeaderBattle_Ch1 - db 2 - dw Song_LeaderBattle_Ch2 +Music_LeaderBattle:: + channel_count 3 + channel 1, Music_LeaderBattle_Ch1 + channel 2, Music_LeaderBattle_Ch2 + channel 3, Music_LeaderBattle_Ch3 -Song_LeaderBattle_Ch0:: +Music_LeaderBattle_Ch1:: tempo 104 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 4 - toggleperfectpitch - rest 1 - rest 2 - notetype 12, 11, 3 + pitch_offset 1 + 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 - octave 2 - 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 C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 octave 1 - G# 1 - A_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 - A# 1 - B_ 1 - octave 2 - F# 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + octave 2 + note F#, 1 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 -Song_LeaderBattle_branch_ec8a4:: - F# 1 - octave 3 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - octave 2 - E_ 1 - A_ 1 - octave 3 - C# 1 - octave 2 - B_ 1 - A_ 1 - octave 3 - C# 1 - octave 2 - B_ 1 - A_ 1 - octave 3 - C# 1 - octave 2 - B_ 1 - A_ 1 - octave 3 - C# 1 - octave 2 - B_ 1 - A_ 1 - octave 3 - C# 1 - octave 2 - B_ 1 - A_ 1 +Music_LeaderBattle_branch_ec8a4:: + note F#, 1 + octave 3 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + octave 2 + note E_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + 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 - rest 1 - A_ 1 - rest 1 - notetype 12, 11, 5 - octave 3 - A_ 12 - notetype 12, 11, 3 - C# 1 - octave 2 - B_ 1 - octave 3 - C# 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - F# 1 - A_ 1 - G# 1 - F# 1 - E_ 1 - F# 1 - E_ 1 - D# 1 - C# 1 - notetype 12, 11, 5 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - E_ 2 - D# 4 - C# 6 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note_type 12, 11, 5 + octave 3 + note A_, 12 + note_type 12, 11, 3 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + 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 - octave 2 - B_ 6 - octave 3 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - A_ 2 - G# 4 - E_ 6 - loopchannel 0, Song_LeaderBattle_branch_ec8a4 + note E_, 6 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note E_, 4 + note D#, 2 + note C#, 4 + octave 2 + note B_, 6 + octave 3 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 + note E_, 6 + sound_loop 0, Music_LeaderBattle_branch_ec8a4 -Song_LeaderBattle_Ch1:: - duty 3 +Music_LeaderBattle_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 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 - octave 3 - B_ 1 + note_type 12, 12, 3 + octave 4 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 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 -Song_LeaderBattle_branch_ecadc:: - notetype 12, 12, 5 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 - E_ 4 - D# 2 - C# 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - notetype 12, 11, 7 - duty 2 - octave 3 - 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 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - notetype 12, 11, 7 - duty 2 - C# 8 - octave 3 - B_ 8 - A_ 8 - notetype 12, 12, 3 - octave 4 - E_ 4 - E_ 2 - C# 2 - notetype 12, 12, 5 - duty 3 +Music_LeaderBattle_branch_ecadc:: + 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 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note_type 12, 11, 7 + duty_cycle 2 + octave 3 + note A_, 8 + octave 4 + 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 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note_type 12, 11, 7 + duty_cycle 2 + note C#, 8 + octave 3 + note B_, 8 + note A_, 8 + note_type 12, 12, 3 + octave 4 + 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 - rest 1 - A_ 1 - rest 1 - notetype 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 - octave 3 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - A_ 2 - G# 4 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note_type 12, 12, 7 + octave 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 + 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 - octave 4 - D# 1 - F# 1 - A# 1 - notetype 12, 12, 0 - B_ 16 - F# 16 - A_ 16 + note B_, 1 + octave 4 + 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, Song_LeaderBattle_branch_ecadc + note A_, 6 + sound_loop 0, Music_LeaderBattle_branch_ecadc -Song_LeaderBattle_Ch2:: +Music_LeaderBattle_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 -Song_LeaderBattle_branch_eccc9:: +Music_LeaderBattle_branch_eccc9:: 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, Song_LeaderBattle_branch_eccc9 + note G_, 6 + sound_loop 0, Music_LeaderBattle_branch_eccc9 diff --git a/audio/songs/nidorinointro.asm b/audio/songs/nidorinointro.asm index 3808992..9a8568b 100755 --- a/audio/songs/nidorinointro.asm +++ b/audio/songs/nidorinointro.asm @@ -2,345 +2,340 @@ INCLUDE "constants.asm" SECTION "audio/songs/nidorinointro.asm", ROMX -Song_NidorinoIntro:: - db 3 << 6 | 0 - dw Song_NidorinoIntro_Ch0 - db 1 - dw Song_NidorinoIntro_Ch1 - db 2 - dw Song_NidorinoIntro_Ch2 - db 3 - dw Song_NidorinoIntro_Ch3 +Music_NidorinoIntro:: + channel_count 4 + channel 1, Music_NidorinoIntro_Ch1 + channel 2, Music_NidorinoIntro_Ch2 + channel 3, Music_NidorinoIntro_Ch3 + channel 4, Music_NidorinoIntro_Ch4 -Song_NidorinoIntro_Ch0:: +Music_NidorinoIntro_Ch1:: tempo 102 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - rest 1 - rest 2 - notetype 12, 11, 1 + pitch_offset 1 + 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 -Song_NidorinoIntro_Ch1:: - duty 3 +Music_NidorinoIntro_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 -Song_NidorinoIntro_Ch2:: - notetype 12, 1, 0 +Music_NidorinoIntro_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 -Song_NidorinoIntro_Ch3:: - drumset 2 - dspeed 6 - snare4 1 - snare4 1 - snare4 1 - snare4 1 - snare3 1 - snare4 1 - snare3 1 - snare4 1 - snare3 1 - snare4 1 - snare3 1 - snare3 1 - snare3 1 - snare3 1 - snare2 1 - snare2 1 - snare2 4 - snare2 4 - snare4 1 - snare4 1 - snare4 1 - snare4 1 - snare3 1 - snare3 1 - snare3 1 - snare3 1 - snare2 4 - snare2 4 - snare2 8 - snare2 4 - snare2 4 - snare2 8 - snare2 4 - snare2 4 - snare4 1 - snare4 1 - snare4 1 - snare4 1 - snare3 1 - snare3 1 - snare3 1 - snare3 1 - snare2 4 - snare2 4 - snare2 8 - snare2 4 - snare2 4 - snare2 4 - snare4 1 - snare4 1 - snare3 1 - snare3 1 - snare2 16 - snare2 16 - snare2 16 - snare4 1 - snare4 1 - snare4 1 - snare4 1 - snare3 1 - snare4 1 - snare3 1 - snare4 1 - snare3 1 - snare3 1 - snare3 1 - snare3 1 - snare2 1 - snare2 1 - snare2 1 - snare2 1 - snare2 4 - snare2 4 - snare2 8 - snare2 4 - snare2 4 - snare4 1 - snare4 1 - snare4 1 - snare4 1 - snare3 1 - snare3 1 - snare3 1 - snare3 1 - snare2 4 - snare2 4 - snare2 8 - snare2 4 - snare2 8 - snare2 4 - snare2 16 - snare2 16 - snare2 2 +Music_NidorinoIntro_Ch4:: + toggle_noise 2 + drum_speed 6 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 4 + drum_note 2, 4 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 8 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 8 + drum_note 2, 4 + drum_note 2, 4 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 8 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 4 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 16 + drum_note 2, 16 + drum_note 2, 16 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 8 + drum_note 2, 4 + drum_note 2, 4 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 8 + drum_note 2, 4 + drum_note 2, 8 + drum_note 2, 4 + drum_note 2, 16 + drum_note 2, 16 + drum_note 2, 2 rest 16 rest 14 - endchannel + sound_ret diff --git a/audio/songs/none.asm b/audio/songs/none.asm index cb255ed..852ff11 100755 --- a/audio/songs/none.asm +++ b/audio/songs/none.asm @@ -2,18 +2,15 @@ INCLUDE "constants.asm" SECTION "audio/songs/none.asm", ROMX -Song_None:: - db 3 << 6 | 0 - dw Song_None_Ch0 - db 1 - dw Song_None_Ch1 - db 2 - dw Song_None_Ch2 - db 3 - dw Song_None_Ch3 +Music_None:: + channel_count 4 + channel 1, Music_None_Ch1 + channel 2, Music_None_Ch2 + channel 3, Music_None_Ch3 + channel 4, Music_None_Ch4 -Song_None_Ch0:: -Song_None_Ch1:: -Song_None_Ch2:: -Song_None_Ch3:: - endchannel +Music_None_Ch1:: +Music_None_Ch2:: +Music_None_Ch3:: +Music_None_Ch4:: + sound_ret diff --git a/audio/songs/oakintro.asm b/audio/songs/oakintro.asm index de28d56..204c163 100755 --- a/audio/songs/oakintro.asm +++ b/audio/songs/oakintro.asm @@ -2,443 +2,439 @@ INCLUDE "constants.asm" SECTION "audio/songs/oakintro.asm", ROMX -Song_OakIntro:: - db 3 << 6 | 0 - dw Song_OakIntro_Ch0 - db 1 - dw Song_OakIntro_Ch1 - db 2 - dw Song_OakIntro_Ch2 - db 3 - dw Song_OakIntro_Ch3 +Music_OakIntro:: + channel_count 4 + channel 1, Music_OakIntro_Ch1 + channel 2, Music_OakIntro_Ch2 + channel 3, Music_OakIntro_Ch3 + channel 4, Music_OakIntro_Ch4 -Song_OakIntro_Ch0:: +Music_OakIntro_Ch1:: tempo 152 volume 7, 7 vibrato 9, 2, 5 - duty 1 + duty_cycle 1 -Song_OakIntro_branch_ec69b:: - notetype 12, 11, 2 +Music_OakIntro_branch_ec69b:: + note_type 12, 11, 2 octave 2 - B_ 4 - octave 3 - G# 6 - F# 2 - E_ 2 - D# 1 - F# 1 - E_ 2 + note B_, 4 + octave 3 + 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 - octave 3 - G# 6 - F# 2 - E_ 2 - D# 1 - F# 1 - B_ 2 + note B_, 4 + octave 3 + 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 - 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 C#, 2 + octave 3 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 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, Song_OakIntro_branch_ec69b - endchannel + note E_, 2 + sound_loop 0, Music_OakIntro_branch_ec69b + sound_ret -Song_OakIntro_Ch1:: +Music_OakIntro_Ch2:: vibrato 8, 2, 6 - duty 3 + duty_cycle 3 -Song_OakIntro_branch_ec72e:: - notetype 12, 13, 4 +Music_OakIntro_branch_ec72e:: + 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 - octave 3 - D# 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note F#, 8 + octave 3 + 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 - octave 3 - G# 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note B_, 8 + octave 3 + 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 - stereopanning 70 - D# 6 - 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 + unknownmusic0xee Music_Route1_Ch2 + + 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, Song_OakIntro_branch_ec72e - endchannel + sound_loop 0, Music_OakIntro_branch_ec72e + sound_ret -Song_OakIntro_Ch2:: +Music_OakIntro_Ch3:: vibrato 9, 2, 8 -Song_OakIntro_branch_ec77c:: - notetype 12, 1, 1 +Music_OakIntro_branch_ec77c:: + 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, Song_OakIntro_branch_ec77c - endchannel - + sound_loop 0, Music_OakIntro_branch_ec77c + sound_ret -Song_OakIntro_Ch3:: - drumset 0 - -Song_OakIntro_branch_ec7e9:: - dspeed 12 - snare3 2 - rest 2 - snare3 1 +Music_OakIntro_Ch4:: + toggle_noise 0 + +Music_OakIntro_branch_ec7e9:: + drum_speed 12 + drum_note 3, 2 + rest 2 + drum_note 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 - rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 - snare3 3 - dspeed 12 - snare3 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_speed 12 + drum_note 3, 1 rest 3 - snare3 2 + drum_note 3, 2 rest 2 - snare3 2 + drum_note 3, 2 rest 4 - snare3 1 - snare3 1 - snare3 2 - rest 2 - snare3 2 - rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 - snare3 3 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + rest 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dspeed 12 - snare3 1 + drum_speed 12 + drum_note 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 - rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dspeed 12 - snare3 1 + drum_speed 12 + drum_note 3, 1 rest 3 - snare3 2 + drum_note 3, 2 rest 2 - snare3 2 + drum_note 3, 2 rest 4 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 - rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - snare3 3 - snare3 3 - snare3 3 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 3 rest 3 - dspeed 12 - snare3 1 + drum_speed 12 + drum_note 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 - rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - snare3 3 + drum_note 3, 3 rest 3 - loopchannel 0, Song_OakIntro_branch_ec7e9 - endchannel + sound_loop 0, Music_OakIntro_branch_ec7e9 + sound_ret diff --git a/audio/songs/route1.asm b/audio/songs/route1.asm index 77f2a50..7dc50b4 100755 --- a/audio/songs/route1.asm +++ b/audio/songs/route1.asm @@ -2,424 +2,418 @@ INCLUDE "constants.asm" SECTION "audio/songs/route1.asm", ROMX -Song_Route1:: - db 3 << 6 | 0 - dw Song_Route1_Ch0 - db 1 - dw Song_Route1_Ch1 - db 2 - dw Song_Route1_Ch2 - db 3 - dw Song_Route1_Ch3 +Music_Route1:: + channel_count 4 + channel 1, Music_Route1_Ch1 + channel 2, Music_Route1_Ch2 + channel 3, Music_Route1_Ch3 + channel 4, Music_Route1_Ch4 -Song_Route1_Ch0:: +Music_Route1_Ch1:: tempo 152 volume 7, 7 vibrato 4, 2, 3 - duty 2 - toggleperfectpitch - rest 1 - rest 2 + duty_cycle 2 + pitch_offset 1 -Song_Route1_branch_ec4db:: - notetype 12, 10, 1 +Music_Route1_branch_ec4db:: + 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 - octave 4 - C# 2 - C# 6 - C# 2 - C# 4 + note A_, 2 + note A_, 2 + note A_, 6 + octave 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 - octave 4 - D_ 2 - D_ 6 - D_ 2 - D_ 6 - D_ 2 - D_ 1 - E_ 1 - D_ 1 - C# 1 + note A_, 2 + note A_, 6 + octave 4 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note E_, 1 + note D_, 1 + note C#, 1 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 - octave 4 - C# 2 + note A_, 2 + note A_, 6 + note A_, 2 + note F#, 2 + note A_, 4 + note B_, 2 + octave 4 + note C#, 2 octave 3 - B_ 4 - A_ 2 - F# 2 - A_ 4 - G_ 2 - E_ 2 - C# 4 - A_ 2 - octave 4 - D_ 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 + note D_, 2 octave 3 - A_ 4 - B_ 2 - G_ 2 - B_ 4 - octave 4 - D_ 2 - E_ 2 - C# 2 - D_ 2 + note A_, 4 + note B_, 2 + note G_, 2 + note B_, 4 + octave 4 + note D_, 2 + note E_, 2 + note C#, 2 + note D_, 2 octave 3 - A_ 2 - A_ 2 - loopchannel 0, Song_Route1_branch_ec4db - endchannel + note A_, 2 + note A_, 2 + sound_loop 0, Music_Route1_branch_ec4db + sound_ret + +Music_Route1_Ch2:: + duty_cycle 2 -Song_Route1_Ch1:: - duty 2 +Music_Route1_branch_ec548:: + note_type 12, 13, 1 + sound_call Music_Route1_branch_ec55b + sound_call Music_Route1_branch_ec56e + sound_call Music_Route1_branch_ec55b + sound_call Music_Route1_branch_ec586 + sound_loop 0, Music_Route1_branch_ec548 -Song_Route1_branch_ec548:: - notetype 12, 13, 1 - callchannel Song_Route1_branch_ec55b - callchannel Song_Route1_branch_ec56e - callchannel Song_Route1_branch_ec55b - callchannel Song_Route1_branch_ec586 - loopchannel 0, Song_Route1_branch_ec548 +Music_Route1_branch_ec55b:: + octave 4 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note G_, 3 + note F#, 1 + note E_, 6 + sound_ret -Song_Route1_branch_ec55b:: - 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 +Music_Route1_branch_ec56e:: + 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 + unknownmusic0xee Music_OakIntro_Ch2 -Song_Route1_branch_ec56e:: - C# 1 - D_ 1 - E_ 2 - E_ 2 - E_ 2 - C# 1 - D_ 1 - E_ 2 - E_ 2 - E_ 2 - C# 1 - D_ 1 - stereopanning 41 - D# 8 - E_ 2 - E_ 2 - F# 1 - E_ 1 - E_ 1 - F# 1 - D_ 4 - F# 2 - endchannel + 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 -Song_Route1_branch_ec586:: - C# 1 - D_ 1 - E_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C# 2 +Music_Route1_branch_ec586:: + 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 - octave 4 - C# 1 - D_ 6 - notetype 12, 13, 2 - F# 1 - G_ 1 - A_ 2 - A_ 2 - F# 2 - D_ 2 + note B_, 1 + note A_, 1 + octave 4 + 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 - 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 C#, 2 + octave 4 + note A_, 2 + note F#, 2 + note D_, 3 + note F#, 1 + note E_, 6 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 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 - octave 4 - D_ 2 - D_ 2 - endchannel - endchannel + note D_, 2 + note C#, 2 + note E_, 2 + note D_, 2 + note_type 12, 13, 1 + octave 4 + note D_, 2 + note D_, 2 + sound_ret + sound_ret -Song_Route1_Ch2:: +Music_Route1_Ch3:: vibrato 8, 2, 5 - notetype 12, 1, 3 + note_type 12, 1, 3 -Song_Route1_branch_ec5dc:: +Music_Route1_branch_ec5dc:: 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, Song_Route1_branch_ec5dc - endchannel - - -Song_Route1_Ch3:: - drumset 2 + note D_, 6 + sound_loop 0, Music_Route1_branch_ec5dc + sound_ret -Song_Route1_branch_ec625:: - dspeed 12 +Music_Route1_Ch4:: + toggle_noise 2 + +Music_Route1_branch_ec625: + drum_speed 12 rest 4 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 rest 4 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 - snare4 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 rest 4 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 rest 4 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 + drum_note 4, 2 rest 2 - snare4 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 rest 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 rest 4 - snare4 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 rest 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 rest 4 - snare4 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 rest 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 rest 4 - snare4 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 rest 2 - snare4 2 - snare4 2 - snare4 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 rest 2 - snare4 2 - snare4 2 - loopchannel 0, Song_Route1_branch_ec625 - endchannel + drum_note 4, 2 + drum_note 4, 2 + sound_loop 0, Music_Route1_branch_ec625 + sound_ret diff --git a/audio/songs/spottedrocket.asm b/audio/songs/spottedrocket.asm index a014fbf..9ea935e 100755 --- a/audio/songs/spottedrocket.asm +++ b/audio/songs/spottedrocket.asm @@ -2,93 +2,89 @@ INCLUDE "constants.asm" SECTION "audio/songs/spottedrocket.asm", ROMX -Song_SpottedRocket:: - db 2 << 6 | 0 - dw Song_SpottedRocket_Ch0 - db 1 - dw Song_SpottedRocket_Ch1 - db 2 - dw Song_SpottedRocket_Ch2 +Music_SpottedRocket:: + channel_count 3 + channel 1, Music_SpottedRocket_Ch1 + channel 2, Music_SpottedRocket_Ch2 + channel 3, Music_SpottedRocket_Ch3 -Song_SpottedRocket_Ch0:: +Music_SpottedRocket_Ch1:: tempo 124 volume 7, 7 - duty 2 - toggleperfectpitch - rest 1 - rest 2 - notetype 12, 11, 1 + duty_cycle 2 + pitch_offset 1 + 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 -Song_SpottedRocket_branch_ed996:: - notetype 12, 10, 1 - D_ 4 - D_ 4 - D_ 4 - notetype 12, 7, 0 - D_ 4 - loopchannel 0, Song_SpottedRocket_branch_ed996 +Music_SpottedRocket_branch_ed996:: + 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_SpottedRocket_branch_ed996 -Song_SpottedRocket_Ch1:: - duty 1 - notetype 12, 11, 6 +Music_SpottedRocket_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 -Song_SpottedRocket_branch_ed9ad:: - notetype 12, 12, 2 +Music_SpottedRocket_branch_ed9ad:: + 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, Song_SpottedRocket_branch_ed9ad + 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_SpottedRocket_branch_ed9ad -Song_SpottedRocket_Ch2:: - notetype 12, 1, 0 +Music_SpottedRocket_Ch3:: + note_type 12, 1, 0 rest 8 octave 4 - F# 1 + note F#, 1 rest 1 - F_ 1 + note F_, 1 rest 1 -Song_SpottedRocket_branch_ed9df:: - F# 1 +Music_SpottedRocket_branch_ed9df:: + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - A# 4 - loopchannel 0, Song_SpottedRocket_branch_ed9df + note A#, 4 + sound_loop 0, Music_SpottedRocket_branch_ed9df diff --git a/audio/songs/title.asm b/audio/songs/title.asm index 3ef80cd..da1ee69 100755 --- a/audio/songs/title.asm +++ b/audio/songs/title.asm @@ -2,693 +2,690 @@ INCLUDE "constants.asm" SECTION "audio/songs/title.asm", ROMX -Song_Title:: - db 3 << 6 | 0 - dw Song_Title_Ch0 - db 1 - dw Song_Title_Ch1 - db 2 - dw Song_Title_Ch2 - db 3 - dw Song_Title_Ch3 +Music_Title:: + channel_count 4 + channel 1, Music_Title_Ch1 + channel 2, Music_Title_Ch2 + channel 3, Music_Title_Ch3 + channel 4, Music_Title_Ch4 -Song_Title_Ch0:: +Music_Title_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 -Song_Title_branch_f232e:: - callchannel Song_Title_branch_f2395 - callchannel Song_Title_branch_f239f - callchannel Song_Title_branch_f2395 +Music_Title_branch_f232e:: + sound_call Music_Title_branch_f2395 + sound_call Music_Title_branch_f239f + sound_call Music_Title_branch_f2395 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 Song_Title_branch_f2395 - callchannel Song_Title_branch_f239f - callchannel Song_Title_branch_f2395 - 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_Title_branch_f2395 + sound_call Music_Title_branch_f239f + sound_call Music_Title_branch_f2395 + 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 Song_Title_branch_f23b3 - notetype 8, 11, 4 + note C_, 4 + note C#, 4 + sound_call Music_Title_branch_f23b3 + note_type 8, 11, 4 octave 4 - C_ 4 - C_ 4 - C# 4 - callchannel Song_Title_branch_f23b3 - notetype 8, 11, 2 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_Title_branch_f23b3 + note_type 8, 11, 2 octave 3 - E_ 4 - E_ 4 - C# 4 - loopchannel 0, Song_Title_branch_f232e + note E_, 4 + note E_, 4 + note C#, 4 + sound_loop 0, Music_Title_branch_f232e -Song_Title_branch_f2395:: - notetype 12, 12, 6 +Music_Title_branch_f2395:: + 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 -Song_Title_branch_f239f:: - 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 +Music_Title_branch_f239f:: + 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 -Song_Title_branch_f23b3:: - notetype 12, 12, 1 - D_ 1 +Music_Title_branch_f23b3:: + 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 -Song_Title_Ch1:: +Music_Title_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 -Song_Title_branch_f23ee:: +Music_Title_branch_f23ee:: vibrato 16, 4, 6 - callchannel Song_Title_branch_f248a - unknown_f9 + sound_call Music_Title_branch_f248a + unknownmusic0xf9 octave 2 - A_ 4 - F_ 4 - callchannel Song_Title_branch_f2496 + note A_, 4 + note F_, 4 + sound_call Music_Title_branch_f2496 octave 2 - A_ 8 - B_ 16 - callchannel Song_Title_branch_f248a + note A_, 8 + note B_, 16 + sound_call Music_Title_branch_f248a 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 Song_Title_branch_f248a + note D_, 6 + note D_, 1 + note F#, 1 + note G_, 16 + sound_call Music_Title_branch_f248a octave 2 - A_ 2 - F_ 6 - callchannel Song_Title_branch_f2496 + note A_, 2 + note F_, 6 + sound_call Music_Title_branch_f2496 octave 3 - C_ 2 + note C_, 2 octave 2 - A_ 6 - B_ 6 - G_ 2 - F_ 8 - callchannel Song_Title_branch_f248a - notetype 8, 9, 5 + note A_, 6 + note B_, 6 + note G_, 2 + note F_, 8 + sound_call Music_Title_branch_f248a + 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 - unknown_f9 + note F_, 4 + note E_, 4 + note F_, 4 + note_type 12, 14, 7 + note G_, 6 + note A#, 2 + note G_, 8 + unknownmusic0xf9 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 Song_Title_branch_f24a2 + note C_, 4 + note C#, 4 + sound_call Music_Title_branch_f24a2 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 Song_Title_branch_f24a2 - D_ 1 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_Title_branch_f24a2 + 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, Song_Title_branch_f23ee + note B_, 4 + sound_loop 0, Music_Title_branch_f23ee -Song_Title_branch_f248a:: - notetype 12, 14, 7 +Music_Title_branch_f248a:: + 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 -Song_Title_branch_f2496:: - notetype 12, 14, 7 +Music_Title_branch_f2496:: + 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 -Song_Title_branch_f24a2:: - notetype 12, 14, 1 - D_ 1 +Music_Title_branch_f24a2:: + 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 -Song_Title_Ch2:: - notetype 12, 1, 0 +Music_Title_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 -Song_Title_branch_f24cd:: - callchannel Song_Title_branch_f253a - callchannel Song_Title_branch_f2541 +Music_Title_branch_f24cd:: + sound_call Music_Title_branch_f253a + sound_call Music_Title_branch_f2541 -Song_Title_branch_f24d3:: - callchannel Song_Title_branch_f253a - callchannel Song_Title_branch_f253a - callchannel Song_Title_branch_f253a - callchannel Song_Title_branch_f2541 - loopchannel 3, Song_Title_branch_f24d3 - callchannel Song_Title_branch_f253a - G_ 6 - D_ 3 - A_ 6 - F_ 3 - A_ 3 - F_ 3 - callchannel Song_Title_branch_f2548 - A# 3 - F_ 3 - callchannel Song_Title_branch_f2548 - B_ 3 - G_ 3 - callchannel Song_Title_branch_f254d +Music_Title_branch_f24d3:: + sound_call Music_Title_branch_f253a + sound_call Music_Title_branch_f253a + sound_call Music_Title_branch_f253a + sound_call Music_Title_branch_f2541 + sound_loop 3, Music_Title_branch_f24d3 + sound_call Music_Title_branch_f253a + note G_, 6 + note D_, 3 + note A_, 6 + note F_, 3 + note A_, 3 + note F_, 3 + sound_call Music_Title_branch_f2548 + note A#, 3 + note F_, 3 + sound_call Music_Title_branch_f2548 + note B_, 3 + note G_, 3 + sound_call Music_Title_branch_f254d octave 4 - C_ 3 + note C_, 3 octave 3 - G_ 3 - callchannel Song_Title_branch_f254d + note G_, 3 + sound_call Music_Title_branch_f254d octave 4 - C# 3 + note C#, 3 octave 3 - A_ 3 - callchannel Song_Title_branch_f2556 + note A_, 3 + sound_call Music_Title_branch_f2556 octave 5 - pitchbend 0, 67 - D_ 4 + pitch_slide 1, 4, D_ + note D_, 4 rest 4 octave 6 - pitchbend 0, 51 - D_ 4 + pitch_slide 1, 5, D_ + note D_, 4 octave 5 - pitchbend 0, 67 - D_ 4 + pitch_slide 1, 4, D_ + note D_, 4 rest 2 - notetype 8, 1, 0 + note_type 8, 1, 0 octave 4 - C_ 4 - C_ 4 - C# 4 - callchannel Song_Title_branch_f2556 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_Title_branch_f2556 octave 6 - pitchbend 0, 51 - D_ 4 + pitch_slide 1, 5, D_ + note D_, 4 rest 4 octave 5 - pitchbend 0, 67 - D_ 4 + pitch_slide 1, 4, D_ + 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, Song_Title_branch_f24cd + note B_, 4 + sound_loop 0, Music_Title_branch_f24cd -Song_Title_branch_f253a:: - G_ 6 - D_ 3 - G_ 6 - D_ 3 - G_ 3 - D_ 3 - endchannel +Music_Title_branch_f253a:: + note G_, 6 + note D_, 3 + note G_, 6 + note D_, 3 + note G_, 3 + note D_, 3 + sound_ret -Song_Title_branch_f2541:: - F_ 6 - C_ 3 - F_ 6 - C_ 3 - F_ 3 - C_ 3 - endchannel +Music_Title_branch_f2541:: + note F_, 6 + note C_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note C_, 3 + sound_ret -Song_Title_branch_f2548:: - A# 6 - F_ 3 - A# 6 - F_ 3 - endchannel +Music_Title_branch_f2548:: + note A#, 6 + note F_, 3 + note A#, 6 + note F_, 3 + sound_ret -Song_Title_branch_f254d:: +Music_Title_branch_f254d:: 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 -Song_Title_branch_f2556:: - notetype 12, 1, 0 +Music_Title_branch_f2556:: + note_type 12, 1, 0 octave 4 - D_ 1 + note D_, 1 rest 5 - endchannel + sound_ret -Song_Title_Ch3:: - drumset 0 - dspeed 6 +Music_Title_Ch4:: + toggle_noise 0 + drum_speed 6 rest 4 - snare3 1 - snare3 1 - snare4 1 - snare4 1 - dspeed 12 - snare2 1 - rest 3 - snare2 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 2, 1 + rest 3 + drum_note 2, 1 rest 5 - snare2 1 - snare2 1 - snare2 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - dspeed 8 - snare3 2 - snare4 2 - snare2 2 - snare3 2 - snare2 2 - snare1 2 + drum_speed 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 1, 2 -Song_Title_branch_f257c:: - dspeed 12 - snare2 1 +Music_Title_branch_f257c:: + drum_speed 12 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare2 1 - snare3 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 rest 3 - callchannel Song_Title_branch_f263c - callchannel Song_Title_branch_f263c - snare2 1 + sound_call Music_Title_branch_f263c + sound_call Music_Title_branch_f263c + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare2 1 - snare3 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 rest 1 - snare3 1 - snare2 1 - callchannel Song_Title_branch_f2645 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + sound_call Music_Title_branch_f2645 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - snare2 1 + drum_note 2, 1 rest 1 - callchannel Song_Title_branch_f2645 - snare2 1 + sound_call Music_Title_branch_f2645 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - dspeed 6 - snare3 1 - snare3 1 - snare4 1 - snare4 1 - dspeed 12 - callchannel Song_Title_branch_f263c - callchannel Song_Title_branch_f2645 - snare2 1 - rest 3 - snare2 1 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + sound_call Music_Title_branch_f263c + sound_call Music_Title_branch_f2645 + drum_note 2, 1 + rest 3 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 1 - snare3 1 - snare2 1 - callchannel Song_Title_branch_f263c - callchannel Song_Title_branch_f2645 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + sound_call Music_Title_branch_f263c + sound_call Music_Title_branch_f2645 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 1 - snare4 1 - snare3 1 - snare2 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare2 1 - snare4 1 - snare2 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 2, 1 rest 1 - dspeed 6 - snare3 1 - snare3 1 - snare4 1 - snare4 1 - dspeed 12 - snare1 1 - rest 3 - snare2 1 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 1, 1 + rest 3 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare1 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare3 1 - snare2 1 - snare3 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare2 1 - snare3 1 - snare4 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 4, 1 rest 1 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - snare5 1 + drum_note 5, 1 rest 5 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 - snare2 1 - snare1 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - snare1 1 + drum_note 1, 1 rest 1 - dspeed 8 - snare2 4 - snare3 4 - snare1 4 - dspeed 12 - snare5 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 1, 4 + drum_speed 12 + drum_note 5, 1 rest 5 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 - snare2 1 - snare3 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 rest 5 - snare2 1 - snare3 1 - snare1 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 1, 1 rest 1 - snare3 1 - snare2 1 - dspeed 8 - snare2 4 - snare3 4 - snare2 4 - loopchannel 0, Song_Title_branch_f257c + drum_note 3, 1 + drum_note 2, 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 2, 4 + sound_loop 0, Music_Title_branch_f257c -Song_Title_branch_f263c:: - snare2 1 +Music_Title_branch_f263c:: + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - endchannel + sound_ret -Song_Title_branch_f2645:: - snare2 1 +Music_Title_branch_f2645:: + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - endchannel + sound_ret diff --git a/audio/songs/trainerbattle.asm b/audio/songs/trainerbattle.asm index 68b3174..0583b1b 100755 --- a/audio/songs/trainerbattle.asm +++ b/audio/songs/trainerbattle.asm @@ -2,1870 +2,1866 @@ INCLUDE "constants.asm" SECTION "audio/songs/trainerbattle.asm", ROMX -Song_TrainerBattle:: - db 2 << 6 | 0 - dw Song_TrainerBattle_Ch0 - db 1 - dw Song_TrainerBattle_Ch1 - db 2 - dw Song_TrainerBattle_Ch2 +Music_TrainerBattle:: + channel_count 3 + channel 1, Music_TrainerBattle_Ch1 + channel 2, Music_TrainerBattle_Ch2 + channel 3, Music_TrainerBattle_Ch3 -Song_TrainerBattle_Ch0:: +Music_TrainerBattle_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - rest 1 - rest 2 - notetype 12, 11, 2 + pitch_offset 1 + 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 - octave 2 - B_ 1 - octave 3 - C_ 1 - octave 2 - B_ 1 - A# 1 - B_ 1 - A# 1 - A_ 1 - A# 1 - octave 3 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 4 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 2 - C# 2 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 4 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 2 - C# 2 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + octave 3 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 4 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 2 + note C#, 2 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 4 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 2 + note C#, 2 -Song_TrainerBattle_branch_ece86:: - notetype 12, 11, 5 - D_ 2 - E_ 4 - C# 2 - D_ 4 - octave 2 - B_ 4 - F# 4 - octave 3 - E_ 2 - D_ 4 - C# 2 - D_ 2 - E_ 2 - F_ 8 - notetype 12, 11, 2 - 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 - octave 2 - B_ 4 - F# 4 - octave 3 - E_ 2 - D_ 4 - C# 2 - octave 2 - B_ 2 - octave 3 - C# 2 - notetype 12, 10, 7 - D_ 8 - C# 8 - octave 2 - B_ 8 - octave 3 - C# 8 - notetype 12, 11, 5 - D_ 2 - C# 2 - octave 2 - B_ 2 - A_ 2 - G_ 2 +Music_TrainerBattle_branch_ece86:: + note_type 12, 11, 5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 + octave 2 + note B_, 4 + note F#, 4 + octave 3 + note E_, 2 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note F_, 8 + 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 + note B_, 4 + note F#, 4 + octave 3 + note E_, 2 + note D_, 4 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note_type 12, 10, 7 + note D_, 8 + note C#, 8 + octave 2 + note B_, 8 + octave 3 + note C#, 8 + note_type 12, 11, 5 + note D_, 2 + note C#, 2 + octave 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 - octave 2 - B_ 2 - A_ 2 - B_ 2 - G_ 2 - octave 3 - D_ 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - A_ 2 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note B_, 2 + note G_, 2 + octave 3 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 rest 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - G_ 2 - A_ 2 - E_ 2 - G_ 2 - F# 2 - octave 2 - B_ 1 - octave 3 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 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 - octave 3 - B_ 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 F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - octave 3 - A_ 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + octave 3 + note A_, 4 octave 4 - D_ 4 - octave 3 - A_ 2 - D_ 1 - E_ 1 - F# 1 - G_ 1 - G# 1 - A# 1 - B_ 2 + note D_, 4 + octave 3 + note A_, 2 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A#, 1 + note B_, 2 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, Song_TrainerBattle_branch_ece86 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + sound_loop 0, Music_TrainerBattle_branch_ece86 -Song_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 - octave 3 - B_ 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 + 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 -Song_TrainerBattle_branch_ed129:: - notetype 12, 12, 7 - octave 3 - B_ 6 - F# 14 - B_ 4 - F# 4 - B_ 4 - notetype 12, 5, 0 +Music_TrainerBattle_branch_ed129:: + note_type 12, 12, 7 + octave 3 + 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 - 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 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 + 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 - 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 D_, 8 + octave 3 + 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 - octave 3 - A# 4 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note D_, 2 + octave 3 + 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 - octave 3 - A# 6 - A# 6 - A# 4 - A_ 6 - A_ 6 - A_ 4 + note F_, 16 + note E_, 16 + note G_, 16 + note F_, 16 + note_type 12, 13, 1 + octave 3 + 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 - octave 3 - A# 6 - A# 6 - A_ 4 - notetype 12, 12, 7 - A_ 4 - B_ 4 - G_ 2 - A_ 10 - B_ 2 + note C_, 6 + note C_, 6 + note C_, 4 + octave 3 + 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 - octave 3 - A# 2 - B_ 16 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + 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, Song_TrainerBattle_branch_ed129 + note C_, 16 + note E_, 8 + note G_, 8 + sound_loop 0, Music_TrainerBattle_branch_ed129 -Song_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 -Song_TrainerBattle_branch_ed2f7:: +Music_TrainerBattle_branch_ed2f7:: 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, Song_TrainerBattle_branch_ed2f7 + 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_ed2f7 diff --git a/audio/songs/victorytrainer.asm b/audio/songs/victorytrainer.asm index f930076..d620c13 100755 --- a/audio/songs/victorytrainer.asm +++ b/audio/songs/victorytrainer.asm @@ -2,276 +2,272 @@ INCLUDE "constants.asm" SECTION "audio/songs/victorytrainer.asm", ROMX -Song_VictoryTrainer:: - db 2 << 6 | 0 - dw Song_VictoryTrainer_Ch0 - db 1 - dw Song_VictoryTrainer_Ch1 - db 2 - dw Song_VictoryTrainer_Ch2 +Music_VictoryTrainer:: + channel_count 3 + channel 1, Music_VictoryTrainer_Ch1 + channel 2, Music_VictoryTrainer_Ch2 + channel 3, Music_VictoryTrainer_Ch3 -Song_VictoryTrainer_Ch0:: +Music_VictoryTrainer_Ch1:: tempo 224 volume 7, 7 - duty 2 - toggleperfectpitch - rest 1 - rest 2 + duty_cycle 2 + pitch_offset 1 tempo 224 - notetype 4, 10, 2 + note_type 4, 10, 2 octave 4 - D_ 2 + note D_, 2 tempo 224 - D_ 2 - D_ 2 - D_ 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 -Song_VictoryTrainer_branch_eda18:: - notetype 4, 6, 3 +Music_VictoryTrainer_branch_eda18:: + 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, Song_VictoryTrainer_branch_eda18 + 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_VictoryTrainer_branch_eda18 -Song_VictoryTrainer_Ch1:: - duty 2 - notetype 4, 12, 3 +Music_VictoryTrainer_Ch2:: + duty_cycle 2 + note_type 4, 12, 3 octave 4 - A_ 2 - A_ 2 - A_ 2 - A_ 2 - B_ 2 + note A_, 2 + 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 -Song_VictoryTrainer_branch_eda75:: - notetype 4, 8, 5 +Music_VictoryTrainer_branch_eda75:: + 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, Song_VictoryTrainer_branch_eda75 + 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_VictoryTrainer_branch_eda75 -Song_VictoryTrainer_Ch2:: - notetype 4, 1, 0 +Music_VictoryTrainer_Ch3:: + note_type 4, 1, 0 octave 5 - D_ 2 - D_ 2 - D_ 2 + note D_, 2 + 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 -Song_VictoryTrainer_branch_edacc:: - F# 3 +Music_VictoryTrainer_branch_edacc:: + 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, Song_VictoryTrainer_branch_edacc + note A_, 3 + sound_loop 0, Music_VictoryTrainer_branch_edacc diff --git a/audio/songs/viridiancity.asm b/audio/songs/viridiancity.asm index d9d6c5c..2beb430 100755 --- a/audio/songs/viridiancity.asm +++ b/audio/songs/viridiancity.asm @@ -2,675 +2,669 @@ INCLUDE "constants.asm" SECTION "audio/songs/viridiancity.asm", ROMX -Song_ViridianCity:: - db 3 << 6 | 0 - dw Song_ViridianCity_Ch0 - db 1 - dw Song_ViridianCity_Ch1 - db 2 - dw Song_ViridianCity_Ch2 - db 3 - dw Song_ViridianCity_Ch3 +Music_ViridianCity:: + channel_count 4 + channel 1, Music_ViridianCity_Ch1 + channel 2, Music_ViridianCity_Ch2 + channel 3, Music_ViridianCity_Ch3 + channel 4, Music_ViridianCity_Ch4 -Song_ViridianCity_branch_ec1c5:: +Music_ViridianCity_branch_ec1c5:: tempo 232 - loopchannel 0, Song_ViridianCity_branch_ec1cf + sound_loop 0, Music_ViridianCity_branch_ec1cf -Song_ViridianCity_Ch0:: +Music_ViridianCity_Ch1:: tempo 144 -Song_ViridianCity_branch_ec1cf:: +Music_ViridianCity_branch_ec1cf:: volume 7, 7 vibrato 8, 2, 4 - duty 3 + duty_cycle 3 -Song_ViridianCity_branch_ec1d6:: - notetype 12, 12, 5 +Music_ViridianCity_branch_ec1d6:: + 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 Song_ViridianCity_branch_ec2de + note B_, 4 + note_type 12, 12, 5 + sound_call Music_ViridianCity_branch_ec2de 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 Song_ViridianCity_branch_ec2de + note B_, 2 + note B_, 4 + note_type 12, 12, 5 + sound_call Music_ViridianCity_branch_ec2de 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 Song_ViridianCity_branch_ec2eb - 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_ViridianCity_branch_ec2eb + 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 -Song_ViridianCity_branch_ec271:: - C# 2 - D# 2 - C# 2 +Music_ViridianCity_branch_ec271:: + 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, Song_ViridianCity_branch_ec271 - E_ 2 + note C#, 2 + note D#, 2 + sound_loop 2, Music_ViridianCity_branch_ec271 + 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 Song_ViridianCity_branch_ec2eb - A_ 2 - E_ 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - A_ 2 - F# 2 - G# 2 - E_ 2 + sound_call Music_ViridianCity_branch_ec2eb + 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, Song_ViridianCity_branch_ec1d6 + note E_, 2 + note F#, 2 + sound_loop 0, Music_ViridianCity_branch_ec1d6 -Song_ViridianCity_branch_ec2de:: +Music_ViridianCity_branch_ec2de:: 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 -Song_ViridianCity_branch_ec2eb:: - A_ 2 - E_ 2 - C# 2 - E_ 4 - A_ 2 - C# 2 - E_ 2 - endchannel +Music_ViridianCity_branch_ec2eb:: + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 4 + note A_, 2 + note C#, 2 + note E_, 2 + sound_ret -Song_ViridianCity_Ch1:: +Music_ViridianCity_Ch2:: vibrato 5, 1, 5 - callchannel Song_ViridianCity_branch_ec368 + sound_call Music_ViridianCity_branch_ec368 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 Song_ViridianCity_branch_ec368 + note C#, 4 + note D#, 4 + note E_, 6 + note F#, 6 + note G#, 4 + sound_call Music_ViridianCity_branch_ec368 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, Song_ViridianCity_Ch1 + note B_, 14 + note_type 12, 8, 4 + note G#, 1 + note_type 12, 10, 4 + note A_, 1 + sound_loop 0, Music_ViridianCity_Ch2 -Song_ViridianCity_branch_ec368:: - duty 2 - notetype 12, 12, 3 +Music_ViridianCity_branch_ec368:: + 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 -Song_ViridianCity_Ch2:: - notetype 12, 1, 1 - toggleperfectpitch - rest 1 - rest 2 +Music_ViridianCity_Ch3:: + note_type 12, 1, 1 + pitch_offset 1 -Song_ViridianCity_branch_ec3a8:: +Music_ViridianCity_branch_ec3a8:: vibrato 0, 0, 0 octave 4 - callchannel Song_ViridianCity_branch_ec438 - callchannel Song_ViridianCity_branch_ec438 - callchannel Song_ViridianCity_branch_ec441 - G# 2 - E_ 2 - F# 2 - G# 2 + sound_call Music_ViridianCity_branch_ec438 + sound_call Music_ViridianCity_branch_ec438 + sound_call Music_ViridianCity_branch_ec441 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - callchannel Song_ViridianCity_branch_ec438 - B_ 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 + sound_call Music_ViridianCity_branch_ec438 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - callchannel Song_ViridianCity_branch_ec438 - callchannel Song_ViridianCity_branch_ec441 - G# 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 + sound_call Music_ViridianCity_branch_ec438 + sound_call Music_ViridianCity_branch_ec441 + 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, Song_ViridianCity_branch_ec3a8 + 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_ViridianCity_branch_ec3a8 -Song_ViridianCity_branch_ec438:: +Music_ViridianCity_branch_ec438:: 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 -Song_ViridianCity_branch_ec441:: - A_ 2 - F# 2 - G# 2 - A_ 2 +Music_ViridianCity_branch_ec441:: + 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 -Song_ViridianCity_Ch3:: - drumset 0 +Music_ViridianCity_Ch4:: + toggle_noise 0 -Song_ViridianCity_branch_ec464:: - dspeed 12 - callchannel Song_ViridianCity_branch_ec49f +Music_ViridianCity_branch_ec464:: + drum_speed 12 + sound_call Music_ViridianCity_branch_ec49f -Song_ViridianCity_branch_ec469:: - callchannel Song_ViridianCity_branch_ec49f - callchannel Song_ViridianCity_branch_ec4a7 - callchannel Song_ViridianCity_branch_ec4a7 - loopchannel 2, Song_ViridianCity_branch_ec469 - callchannel Song_ViridianCity_branch_ec49f - callchannel Song_ViridianCity_branch_ec4b5 - callchannel Song_ViridianCity_branch_ec4ae - triangle1 6 - triangle1 6 - triangle2 4 - callchannel Song_ViridianCity_branch_ec4bd - callchannel Song_ViridianCity_branch_ec4b5 - callchannel Song_ViridianCity_branch_ec4ae - callchannel Song_ViridianCity_branch_ec4bd - callchannel Song_ViridianCity_branch_ec4ae - triangle1 6 - triangle1 6 - triangle2 2 - triangle1 2 - triangle1 6 - triangle1 6 - triangle1 4 - triangle1 6 - snare6 6 - snare6 4 - loopchannel 0, Song_ViridianCity_branch_ec464 +Music_ViridianCity_branch_ec469:: + sound_call Music_ViridianCity_branch_ec49f + sound_call Music_ViridianCity_branch_ec4a7 + sound_call Music_ViridianCity_branch_ec4a7 + sound_loop 2, Music_ViridianCity_branch_ec469 + sound_call Music_ViridianCity_branch_ec49f + sound_call Music_ViridianCity_branch_ec4b5 + sound_call Music_ViridianCity_branch_ec4ae + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + sound_call Music_ViridianCity_branch_ec4bd + sound_call Music_ViridianCity_branch_ec4b5 + sound_call Music_ViridianCity_branch_ec4ae + sound_call Music_ViridianCity_branch_ec4bd + sound_call Music_ViridianCity_branch_ec4ae + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 + drum_note 6, 6 + drum_note 6, 6 + drum_note 6, 4 + drum_note 6, 6 + drum_note 8, 6 + drum_note 8, 4 + sound_loop 0, Music_ViridianCity_branch_ec464 -Song_ViridianCity_branch_ec49f:: - snare6 6 - snare6 6 - snare6 4 - snare6 6 - snare6 6 - snare6 2 - snare6 2 - endchannel +Music_ViridianCity_branch_ec49f:: + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 2 + drum_note 8, 2 + sound_ret -Song_ViridianCity_branch_ec4a7:: - snare6 6 - snare6 6 - snare6 4 - snare6 6 - snare6 6 - snare6 4 - endchannel +Music_ViridianCity_branch_ec4a7:: + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + sound_ret -Song_ViridianCity_branch_ec4ae:: - triangle1 6 - triangle1 6 - triangle2 4 - triangle1 6 - triangle1 6 - triangle2 4 - endchannel +Music_ViridianCity_branch_ec4ae:: + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + sound_ret -Song_ViridianCity_branch_ec4b5:: - triangle1 6 - triangle1 6 - triangle2 4 - triangle1 6 - triangle1 6 - triangle2 2 - triangle1 2 - endchannel +Music_ViridianCity_branch_ec4b5:: + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 + sound_ret -Song_ViridianCity_branch_ec4bd:: - triangle1 6 - triangle1 6 - triangle2 2 - triangle2 2 - endchannel +Music_ViridianCity_branch_ec4bd:: + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 7, 2 + sound_ret diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index 9c11e36..51dc36f 100644 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -1,3 +1,18 @@ +; pitch + const_def 1 + const C_ ; 1 + const C# ; 2 + const D_ ; 3 + const D# ; 4 + const E_ ; 5 + const F_ ; 6 + const F# ; 7 + const G_ ; 8 + const G# ; 9 + const A_ ; a + const A# ; b + const B_ ; c + ; channel const_def const CHAN1 diff --git a/macros/audio.asm b/macros/audio.asm index 8ebf840..3300a25 100755 --- a/macros/audio.asm +++ b/macros/audio.asm @@ -1,278 +1,315 @@ -Ch0 EQU 0 -Ch1 EQU 1 -Ch2 EQU 2 -Ch3 EQU 3 -Ch4 EQU 4 -Ch5 EQU 5 -Ch6 EQU 6 -Ch7 EQU 7 - -audio: MACRO - db (_NARG - 2) << 6 | \2 - dw \1_\2 - IF _NARG > 2 - db \3 - dw \1_\3 - ENDC - IF _NARG > 3 - db \4 - dw \1_\4 - ENDC - IF _NARG > 4 - db \5 - dw \1_\5 - ENDC +channel_count: MACRO +_num_channels = \1 - 1 ENDM -;format: length [0, 7], pitch change [-7, 7] -pitchenvelope: MACRO - db $10 - IF \2 > 0 - db (\1 << 4) | \2 - ELSE - db (\1 << 4) | (%1000 | (\2 * -1)) - ENDC +channel: MACRO + dn (_num_channels << 2), \1 - 1 ; channel id + dw \2 ; address +_num_channels = 0 ENDM -;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch -squarenote: MACRO - db $20 | \1 +note: MACRO + dn (\1), (\2) - 1 ; pitch, length +ENDM + +drum_note: MACRO + note \1, \2 ; drum instrument, length +ENDM + +rest: MACRO + note 0, \1 ; length +ENDM + +square_note: MACRO + db \1 ; length IF \3 < 0 - db (\2 << 4) | (%1000 | (\3 * -1)) + dn \2, %1000 | (\3 * -1) ; volume envelope ELSE - db (\2 << 4) | \3 + dn \2, \3 ; volume envelope ENDC - dw \4 + dw \4 ; frequency ENDM -;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch -noisenote: MACRO - db $20 | \1 +noise_note: MACRO + db \1 ; length IF \3 < 0 - db (\2 << 4) | (%1000 | (\3 * -1)) + dn \2, %1000 | (\3 * -1) ; volume envelope ELSE - db (\2 << 4) | \3 + dn \2, \3 ; volume envelope ENDC - db \4 + db \4 ; frequency ENDM -;format: rest length (in 16ths) -rest: MACRO - db $00 | (\1 - 1) -ENDM +; MusicCommands indexes (see audio/engine.asm) + const_def $d0 +FIRST_MUSIC_CMD EQU const_value -;format: pitch length (in 16ths) -C_: MACRO - db $10 | (\1 - 1) + const octave_cmd ; $d0 +octave: MACRO + db octave_cmd | 8 - (\1) ; octave ENDM -C#: MACRO - db $20 | (\1 - 1) -ENDM + const_skip 7 ; all octave values -D_: MACRO - db $30 | (\1 - 1) + const note_type_cmd ; $d8 +note_type: MACRO + db note_type_cmd + db \1 ; note length + IF _NARG >= 2 + IF \3 < 0 + dn \2, %1000 | (\3 * -1) ; volume envelope + ELSE + dn \2, \3 ; volume envelope + ENDC + ENDC ENDM -D#: MACRO - db $40 | (\1 - 1) +; only valid on the noise channel +drum_speed: MACRO + note_type \1 ; note length ENDM -E_: MACRO - db $50 | (\1 - 1) + const transpose_cmd ; $d9 +transpose: MACRO + db transpose_cmd + dn \1, \2 ; num octaves, num pitches ENDM -F_: MACRO - db $60 | (\1 - 1) + const tempo_cmd ; $da +tempo: MACRO + db tempo_cmd + bigdw \1 ; tempo ENDM -F#: MACRO - db $70 | (\1 - 1) + const duty_cycle_cmd ; $db +duty_cycle: MACRO + db duty_cycle_cmd + db \1 ; duty cycle ENDM -G_: MACRO - db $80 | (\1 - 1) + const volume_envelope_cmd ; $dc +volume_envelope: MACRO + db volume_envelope_cmd + IF \2 < 0 + dn \1, %1000 | (\2 * -1) ; volume envelope + ELSE + dn \1, \2 ; volume envelope + ENDC ENDM -G#: MACRO - db $90 | (\1 - 1) + const pitch_sweep_cmd ; $dd +pitch_sweep: MACRO + db pitch_sweep_cmd + IF \2 < 0 + dn \1, %1000 | (\2 * -1) ; pitch sweep + ELSE + dn \1, \2 ; pitch sweep + ENDC ENDM -A_: MACRO - db $A0 | (\1 - 1) + const duty_cycle_pattern_cmd ; $de +duty_cycle_pattern: MACRO + db duty_cycle_pattern_cmd + db (\1 << 6) | (\2 << 4) | (\3 << 2) | (\4 << 0) ; duty cycle pattern ENDM -A#: MACRO - db $B0 | (\1 - 1) + const toggle_sfx_cmd ; $df +toggle_sfx: MACRO + db toggle_sfx_cmd ENDM -B_: MACRO - db $C0 | (\1 - 1) + const pitch_slide_cmd ; $e0 +pitch_slide: MACRO + db pitch_slide_cmd + db \1 - 1 ; duration + dn 8 - \2, \3 % 12 ; octave, pitch ENDM -;format: instrument length (in 16ths) -snare1: MACRO - db $10 | (\1 - 1) + const vibrato_cmd ; $e1 +vibrato: MACRO + db vibrato_cmd + db \1 ; delay + IF _NARG > 2 + dn \2, \3 ; extent, rate + ELSE + db \2 ; LEGACY: Support for 1-arg extent + ENDC ENDM -snare2: MACRO - db $20 | (\1 - 1) + const unknownmusic0xe2_cmd ; $e2 +unknownmusic0xe2: MACRO + db unknownmusic0xe2_cmd + db \1 ; unknown ENDM -snare3: MACRO - db $30 | (\1 - 1) + const toggle_noise_cmd ; $e3 +toggle_noise: MACRO + db toggle_noise_cmd + IF _NARG > 0 + db \1 ; drum kit + ENDC ENDM -snare4: MACRO - db $40 | (\1 - 1) + const force_stereo_panning_cmd ; $e4 +force_stereo_panning: MACRO + db force_stereo_panning_cmd + dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable ENDM -snare5: MACRO - db $50 | (\1 - 1) + const volume_cmd ; $e5 +volume: MACRO + db volume_cmd + IF _NARG > 1 + dn \1, \2 ; left volume, right volume + ELSE + db \1 ; LEGACY: Support for 1-arg volume + ENDC ENDM -triangle1: MACRO - db $60 | (\1 - 1) + const pitch_offset_cmd ; $e6 +pitch_offset: MACRO + db pitch_offset_cmd + bigdw \1 ; pitch offset ENDM -triangle2: MACRO - db $70 | (\1 - 1) + const unknownmusic0xe7_cmd ; $e7 +unknownmusic0xe7: MACRO + db unknownmusic0xe7_cmd + db \1 ; unknown ENDM -snare6: MACRO - db $80 | (\1 - 1) + const unknownmusic0xe8_cmd ; $e8 +unknownmusic0xe8: MACRO + db unknownmusic0xe8_cmd + db \1 ; unknown ENDM -snare7: MACRO - db $90 | (\1 - 1) + const tempo_relative_cmd ; $e9 +tempo_relative: MACRO + db tempo_relative_cmd + bigdw \1 ; tempo adjustment ENDM -snare8: MACRO - db $A0 | (\1 - 1) + const restart_channel_cmd ; $ea +restart_channel: MACRO + db restart_channel_cmd + dw \1 ; address ENDM -snare9: MACRO - db $B0 | (\1 - 1) + const new_song_cmd ; $eb +new_song: MACRO + db new_song_cmd + bigdw \1 ; id ENDM -cymbal1: MACRO - db $C0 | (\1 - 1) + const sfx_priority_on_cmd ; $ec +sfx_priority_on: MACRO + db sfx_priority_on_cmd ENDM -cymbal2: MACRO - db $D0 | (\1 - 1) + const sfx_priority_off_cmd ; $ed +sfx_priority_off: MACRO + db sfx_priority_off_cmd ENDM -cymbal3: MACRO - db $E0 | (\1 - 1) + const unknownmusic0xee_cmd ; $ee +unknownmusic0xee: MACRO + db unknownmusic0xee_cmd + dw \1 ; address ENDM -mutedsnare1: MACRO - db $F0 | (\1 - 1) + const unknownmusic0xef_cmd ; $ef +unknownmusic0xef: MACRO + db unknownmusic0xef_cmd + dw \1 ; address ENDM -; TODO: clean up handling of drumsets -;triangle3: MACRO -; db $10 | (\1 - 1) -;ENDM - -;mutedsnare2: MACRO -; db $11 | (\1 - 1) -;ENDM - -;mutedsnare3: MACRO -; db $12 | (\1 - 1) -;ENDM - -;mutedsnare4: MACRO -; db $13 | (\1 - 1) -;ENDM - -octave: MACRO - db $D8 - \1 + const sfx_toggle_noise_cmd ; $f0 +sfx_toggle_noise: MACRO + db sfx_toggle_noise_cmd + IF _NARG > 0 + db \1 ; drum kit + ENDC ENDM -; format: notetype speed, volume, fade -notetype: MACRO - db $D8 - db \1 - db (\2 << 4) | \3 + const music0xf1_cmd ; $f1 +music0xf1: MACRO + db music0xf1_cmd ENDM -dspeed: MACRO - db $D8 - db \1 + const music0xf2_cmd ; $f2 +music0xf2: MACRO + db music0xf2_cmd ENDM -tempo: MACRO - db $DA - db \1 / $100 - db \1 % $100 + const music0xf3_cmd ; $f3 +music0xf3: MACRO + db music0xf3_cmd ENDM -duty: MACRO - db $DB - db \1 + const music0xf4_cmd ; $f4 +music0xf4: MACRO + db music0xf4_cmd ENDM -pitchbend: MACRO - db $E0 - db \1 - db \2 + const music0xf5_cmd ; $f5 +music0xf5: MACRO + db music0xf5_cmd ENDM -;format: vibrato delay, rate, depth -vibrato: MACRO - db $E1 - db \1 - db (\2 << 4) | \3 + const music0xf6_cmd ; $f6 +music0xf6: MACRO + db music0xf6_cmd ENDM -drumset: MACRO - db $E3 - db \1 + const music0xf7_cmd ; $f7 +music0xf7: MACRO + db music0xf7_cmd ENDM -volume: MACRO - db $E5 - db (\1 << 4) | \2 + const music0xf8_cmd ; $f8 +music0xf8: MACRO + db music0xf8_cmd ENDM -toggleperfectpitch: MACRO - db $E6 + const unknownmusic0xf9_cmd ; $f9 +unknownmusic0xf9: MACRO + db unknownmusic0xf9_cmd ENDM -stereopanning: MACRO - db $EE - db \1 + const set_condition_cmd ; $fa +set_condition: MACRO + db set_condition_cmd + db \1 ; condition ENDM -;executemusic: MACRO -; db $F8 -;ENDM - -unknown_f9: MACRO - db $F9 + const sound_jump_if_cmd ; $fb +sound_jump_if: MACRO + db sound_jump_if_cmd + db \1 ; condition + dw \2 ; address ENDM -;dutycycle: MACRO -; db $FC -; db \1 -;ENDM + const sound_jump_cmd ; $fc +sound_jump: MACRO + db sound_jump_cmd + dw \1 ; address +ENDM -;format: loopchannel count, address -loopchannel: MACRO - db $FD - db \1 - dw \2 + const sound_loop_cmd ; $fd +sound_loop: MACRO + db sound_loop_cmd + db \1 ; count + dw \2 ; address ENDM -;format: callchannel address -callchannel: MACRO - db $FE - dw \1 + const sound_call_cmd ; $fe +sound_call: MACRO + db sound_call_cmd + dw \1 ; address ENDM -endchannel: MACRO - db $FF + const sound_ret_cmd ; $ff +sound_ret: MACRO + db sound_ret_cmd ENDM |