diff options
| author | yenatch <yenatch@gmail.com> | 2014-01-27 16:22:41 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-01-27 16:24:13 -0500 |
| commit | 1b9ee46af9f8baac0d266a54130115a719788377 (patch) | |
| tree | 8ac61c0752dc74da0677cb26fe4db6362db5b2b7 /music | |
| parent | 6bde08504fdc336b1d458bab0bed4ef649cae25a (diff) | |
Get rid of globals.asm. Use ::s to export labels between objects.
globals.asm was a hack that:
- gave rgbasm an extra 100k lines to read
- increased reliance on the python preprocessor
- made the makefile a mess
- gave object creation an extra step
- wasn't even necessary
This speeds up build time by at least a third.
Diffstat (limited to 'music')
52 files changed, 784 insertions, 784 deletions
diff --git a/music/bikeriding.asm b/music/bikeriding.asm index 7c4ad149..13776fe1 100644 --- a/music/bikeriding.asm +++ b/music/bikeriding.asm @@ -1,4 +1,4 @@ -Music_BikeRiding_Ch1: ; 7dbbb (1f:5bbb) +Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb) tempo 0, 144 stereopanning 119 duty 3 @@ -7,7 +7,7 @@ Music_BikeRiding_Ch1: ; 7dbbb (1f:5bbb) octave 3 note G_, 2 -Music_BikeRiding_branch_7dbc9: +Music_BikeRiding_branch_7dbc9:: octave 4 note C_, 4 note D_, 4 @@ -153,14 +153,14 @@ Music_BikeRiding_branch_7dbc9: loopchannel 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch2: ; 7dc6c (1f:5c6c) +Music_BikeRiding_Ch2:: ; 7dc6c (1f:5c6c) duty 2 vibrato 6, 1, 5 notetype 12, 12, 3 octave 4 note C_, 2 -Music_BikeRiding_branch_7dc75: +Music_BikeRiding_branch_7dc75:: note E_, 4 note F_, 4 note G_, 4 @@ -302,11 +302,11 @@ Music_BikeRiding_branch_7dc75: loopchannel 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch3: ; 7dd14 (1f:5d14) +Music_BikeRiding_Ch3:: ; 7dd14 (1f:5d14) notetype 12, 1, 3 rest 2 -Music_BikeRiding_branch_7dd17: +Music_BikeRiding_branch_7dd17:: octave 4 note C_, 1 rest 1 @@ -643,11 +643,11 @@ Music_BikeRiding_branch_7dd17: loopchannel 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch4: ; 7de68 (1f:5e68) +Music_BikeRiding_Ch4:: ; 7de68 (1f:5e68) dspeed 12 rest 2 -Music_BikeRiding_branch_7de6a: +Music_BikeRiding_branch_7de6a:: callchannel Music_BikeRiding_branch_7dea7 callchannel Music_BikeRiding_branch_7deb4 callchannel Music_BikeRiding_branch_7dea7 @@ -669,7 +669,7 @@ Music_BikeRiding_branch_7de6a: callchannel Music_BikeRiding_branch_7dea7 loopchannel 0, Music_BikeRiding_branch_7de6a -Music_BikeRiding_branch_7dea7: +Music_BikeRiding_branch_7dea7:: rest 2 dnote 2, triangle3 rest 2 @@ -680,7 +680,7 @@ Music_BikeRiding_branch_7dea7: dnote 2, triangle3 endchannel -Music_BikeRiding_branch_7deb4: +Music_BikeRiding_branch_7deb4:: rest 2 dnote 2, triangle3 rest 2 @@ -691,7 +691,7 @@ Music_BikeRiding_branch_7deb4: dnote 2, triangle3 endchannel -Music_BikeRiding_branch_7dec2: +Music_BikeRiding_branch_7dec2:: rest 2 dnote 2, triangle3 rest 2 diff --git a/music/celadon.asm b/music/celadon.asm index fc736084..a965bc80 100644 --- a/music/celadon.asm +++ b/music/celadon.asm @@ -1,4 +1,4 @@ -Music_Celadon_Ch1: ; b6c7 (2:76c7) +Music_Celadon_Ch1:: ; b6c7 (2:76c7) tempo 0, 144 stereopanning 119 duty 3 @@ -8,7 +8,7 @@ Music_Celadon_Ch1: ; b6c7 (2:76c7) octave 3 note D_, 8 -Music_Celadon_branch_b6d4: +Music_Celadon_branch_b6d4:: duty 2 notetype 12, 11, 2 note G_, 4 @@ -107,7 +107,7 @@ Music_Celadon_branch_b6d4: loopchannel 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch2: ; b73a (2:773a) +Music_Celadon_Ch2:: ; b73a (2:773a) duty 3 notetype 12, 12, 2 octave 4 @@ -122,7 +122,7 @@ Music_Celadon_Ch2: ; b73a (2:773a) notetype 12, 10, 0 note A_, 8 -Music_Celadon_branch_b74a: +Music_Celadon_branch_b74a:: duty 2 notetype 12, 12, 2 octave 4 @@ -226,7 +226,7 @@ Music_Celadon_branch_b74a: loopchannel 0, Music_Celadon_branch_b74a -Music_Celadon_Ch3: ; b7b5 (2:77b5) +Music_Celadon_Ch3:: ; b7b5 (2:77b5) notetype 12, 1, 3 rest 8 octave 5 @@ -239,7 +239,7 @@ Music_Celadon_Ch3: ; b7b5 (2:77b5) note F#, 1 note G_, 1 -Music_Celadon_branch_b7c1: +Music_Celadon_branch_b7c1:: octave 4 note D_, 2 note B_, 2 diff --git a/music/cinnabar.asm b/music/cinnabar.asm index 7bed4592..db344c64 100644 --- a/music/cinnabar.asm +++ b/music/cinnabar.asm @@ -1,11 +1,11 @@ -Music_Cinnabar_Ch1: ; b86d (2:786d) +Music_Cinnabar_Ch1:: ; b86d (2:786d) tempo 0, 144 stereopanning 119 duty 3 vibrato 12, 3, 4 togglecall -Music_Cinnabar_branch_b878: +Music_Cinnabar_branch_b878:: notetype 12, 11, 5 rest 4 octave 3 @@ -85,11 +85,11 @@ Music_Cinnabar_branch_b878: loopchannel 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch2: ; b8d4 (2:78d4) +Music_Cinnabar_Ch2:: ; b8d4 (2:78d4) duty 3 vibrato 10, 2, 3 -Music_Cinnabar_branch_b8d9: +Music_Cinnabar_branch_b8d9:: notetype 12, 12, 7 octave 3 note G_, 6 @@ -179,10 +179,10 @@ Music_Cinnabar_branch_b8d9: loopchannel 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch3: ; b93d (2:793d) +Music_Cinnabar_Ch3:: ; b93d (2:793d) notetype 12, 1, 0 -Music_Cinnabar_branch_b93f: +Music_Cinnabar_branch_b93f:: octave 4 note G_, 1 rest 3 diff --git a/music/cinnabarmansion.asm b/music/cinnabarmansion.asm index f406b536..1560e89d 100644 --- a/music/cinnabarmansion.asm +++ b/music/cinnabarmansion.asm @@ -1,10 +1,10 @@ -Music_CinnabarMansion_Ch1: ; 7ed0f (1f:6d0f) +Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f) tempo 0, 144 stereopanning 119 vibrato 11, 2, 5 duty 2 -Music_CinnabarMansion_branch_7ed19: +Music_CinnabarMansion_branch_7ed19:: notetype 12, 6, 2 octave 5 note E_, 1 @@ -38,21 +38,21 @@ Music_CinnabarMansion_branch_7ed19: loopchannel 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch2: ; 7ed40 (1f:6d40) +Music_CinnabarMansion_Ch2:: ; 7ed40 (1f:6d40) duty 2 togglecall vibrato 10, 2, 4 notetype 12, 12, 2 -Music_CinnabarMansion_branch_7ed48: +Music_CinnabarMansion_branch_7ed48:: rest 16 rest 16 loopchannel 4, Music_CinnabarMansion_branch_7ed48 -Music_CinnabarMansion_branch_7ed4e: +Music_CinnabarMansion_branch_7ed4e:: notetype 12, 12, 2 -Music_CinnabarMansion_branch_7ed50: +Music_CinnabarMansion_branch_7ed50:: callchannel Music_CinnabarMansion_branch_7ed6c loopchannel 3, Music_CinnabarMansion_branch_7ed50 octave 3 @@ -74,7 +74,7 @@ Music_CinnabarMansion_branch_7ed50: note D#, 4 loopchannel 0, Music_CinnabarMansion_branch_7ed4e -Music_CinnabarMansion_branch_7ed6c: +Music_CinnabarMansion_branch_7ed6c:: octave 3 note E_, 4 note D#, 4 @@ -95,10 +95,10 @@ Music_CinnabarMansion_branch_7ed6c: endchannel -Music_CinnabarMansion_Ch3: ; 7ed7e (1f:6d7e) +Music_CinnabarMansion_Ch3:: ; 7ed7e (1f:6d7e) notetype 12, 1, 1 -Music_CinnabarMansion_branch_7ed80: +Music_CinnabarMansion_branch_7ed80:: octave 2 note B_, 2 rest 2 @@ -143,14 +143,14 @@ Music_CinnabarMansion_branch_7ed80: loopchannel 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch4: ; 7edb0 (1f:6db0) +Music_CinnabarMansion_Ch4:: ; 7edb0 (1f:6db0) dspeed 6 rest 16 rest 16 rest 16 rest 16 -Music_CinnabarMansion_branch_7edb5: +Music_CinnabarMansion_branch_7edb5:: dnote 2, cymbal1 dnote 2, cymbal1 dnote 4, cymbal2 diff --git a/music/cities1.asm b/music/cities1.asm index c1ac1b90..f7b9cc81 100644 --- a/music/cities1.asm +++ b/music/cities1.asm @@ -1,16 +1,16 @@ -Music_Cities1_branch_aa6f: +Music_Cities1_branch_aa6f:: tempo 0, 232 loopchannel 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch1: ; aa76 (2:6a76) +Music_Cities1_Ch1:: ; aa76 (2:6a76) tempo 0, 144 -Music_Cities1_branch_aa79: +Music_Cities1_branch_aa79:: stereopanning 119 vibrato 8, 2, 4 duty 3 -Music_Cities1_branch_aa80: +Music_Cities1_branch_aa80:: notetype 12, 12, 5 octave 3 note G#, 4 @@ -143,7 +143,7 @@ Music_Cities1_branch_aa80: note B_, 2 octave 3 -Music_Cities1_branch_ab12: +Music_Cities1_branch_ab12:: note C#, 2 note D#, 2 note C#, 2 @@ -242,7 +242,7 @@ Music_Cities1_branch_ab12: note F#, 2 loopchannel 0, Music_Cities1_branch_aa80 -Music_Cities1_branch_ab7d: +Music_Cities1_branch_ab7d:: octave 3 note F#, 2 note D#, 4 @@ -257,7 +257,7 @@ Music_Cities1_branch_ab7d: note C#, 2 endchannel -Music_Cities1_branch_ab8a: +Music_Cities1_branch_ab8a:: note A_, 2 note E_, 2 note C#, 2 @@ -268,7 +268,7 @@ Music_Cities1_branch_ab8a: endchannel -Music_Cities1_Ch2: ; ab92 (2:6b92) +Music_Cities1_Ch2:: ; ab92 (2:6b92) vibrato 5, 1, 5 callchannel Music_Cities1_branch_ac00 octave 4 @@ -359,7 +359,7 @@ Music_Cities1_Ch2: ; ab92 (2:6b92) note A_, 1 loopchannel 0, Music_Cities1_Ch2 -Music_Cities1_branch_ac00: +Music_Cities1_branch_ac00:: duty 2 notetype 12, 12, 3 octave 4 @@ -401,11 +401,11 @@ Music_Cities1_branch_ac00: endchannel -Music_Cities1_Ch3: ; ac32 (2:6c32) +Music_Cities1_Ch3:: ; ac32 (2:6c32) notetype 12, 1, 1 togglecall -Music_Cities1_branch_ac35: +Music_Cities1_branch_ac35:: vibrato 0, 0, 0 octave 4 callchannel Music_Cities1_branch_acc5 @@ -532,7 +532,7 @@ Music_Cities1_branch_ac35: note F#, 2 loopchannel 0, Music_Cities1_branch_ac35 -Music_Cities1_branch_acc5: +Music_Cities1_branch_acc5:: rest 2 note E_, 2 note F#, 2 @@ -543,7 +543,7 @@ Music_Cities1_branch_acc5: note G#, 2 endchannel -Music_Cities1_branch_acce: +Music_Cities1_branch_acce:: note A_, 2 note F#, 2 note G#, 2 @@ -579,11 +579,11 @@ Music_Cities1_branch_acce: endchannel -Music_Cities1_Ch4: ; acef (2:6cef) +Music_Cities1_Ch4:: ; acef (2:6cef) dspeed 12 callchannel Music_Cities1_branch_ad36 -Music_Cities1_branch_acf3: +Music_Cities1_branch_acf3:: callchannel Music_Cities1_branch_ad36 callchannel Music_Cities1_branch_ad45 callchannel Music_Cities1_branch_ad45 @@ -611,7 +611,7 @@ Music_Cities1_branch_acf3: dnote 4, snare6 loopchannel 0, Music_Cities1_Ch4 -Music_Cities1_branch_ad36: +Music_Cities1_branch_ad36:: dnote 6, snare6 dnote 6, snare6 dnote 4, snare6 @@ -621,7 +621,7 @@ Music_Cities1_branch_ad36: dnote 2, snare6 endchannel -Music_Cities1_branch_ad45: +Music_Cities1_branch_ad45:: dnote 6, snare6 dnote 6, snare6 dnote 4, snare6 @@ -630,7 +630,7 @@ Music_Cities1_branch_ad45: dnote 4, snare6 endchannel -Music_Cities1_branch_ad52: +Music_Cities1_branch_ad52:: dnote 6, triangle1 dnote 6, triangle1 dnote 4, triangle2 @@ -639,7 +639,7 @@ Music_Cities1_branch_ad52: dnote 4, triangle2 endchannel -Music_Cities1_branch_ad5f: +Music_Cities1_branch_ad5f:: dnote 6, triangle1 dnote 6, triangle1 dnote 4, triangle2 @@ -649,7 +649,7 @@ Music_Cities1_branch_ad5f: dnote 2, triangle1 endchannel -Music_Cities1_branch_ad6e: +Music_Cities1_branch_ad6e:: dnote 6, triangle1 dnote 6, triangle1 dnote 2, triangle2 diff --git a/music/cities2.asm b/music/cities2.asm index d26decd8..97eadde8 100644 --- a/music/cities2.asm +++ b/music/cities2.asm @@ -1,4 +1,4 @@ -Music_Cities2_Ch1: ; b504 (2:7504) +Music_Cities2_Ch1:: ; b504 (2:7504) tempo 0, 148 stereopanning 119 duty 3 @@ -15,7 +15,7 @@ Music_Cities2_Ch1: ; b504 (2:7504) note B_, 2 rest 14 -Music_Cities2_branch_b51a: +Music_Cities2_branch_b51a:: octave 3 note B_, 4 octave 4 @@ -94,7 +94,7 @@ Music_Cities2_branch_b51a: loopchannel 0, Music_Cities2_branch_b51a -Music_Cities2_Ch2: ; b569 (2:7569) +Music_Cities2_Ch2:: ; b569 (2:7569) duty 3 vibrato 8, 2, 3 notetype 12, 12, 2 @@ -124,7 +124,7 @@ Music_Cities2_Ch2: ; b569 (2:7569) note G#, 1 note A_, 1 -Music_Cities2_branch_b58b: +Music_Cities2_branch_b58b:: notetype 12, 10, 6 note G#, 6 notetype 12, 12, 2 @@ -280,7 +280,7 @@ Music_Cities2_branch_b58b: loopchannel 0, Music_Cities2_branch_b58b -Music_Cities2_Ch3: ; b640 (2:7640) +Music_Cities2_Ch3:: ; b640 (2:7640) notetype 12, 1, 1 rest 16 octave 4 @@ -293,7 +293,7 @@ Music_Cities2_Ch3: ; b640 (2:7640) note E_, 2 note G#, 2 -Music_Cities2_branch_b64c: +Music_Cities2_branch_b64c:: note F#, 2 note A_, 2 note F#, 2 diff --git a/music/credits.asm b/music/credits.asm index 485e1c61..cdedef62 100644 --- a/music/credits.asm +++ b/music/credits.asm @@ -1,4 +1,4 @@ -Music_Credits_Ch1: ; 7fc1f (1f:7c1f) +Music_Credits_Ch1:: ; 7fc1f (1f:7c1f) tempo 0, 140 stereopanning 119 duty 3 @@ -284,7 +284,7 @@ Music_Credits_Ch1: ; 7fc1f (1f:7c1f) endchannel -Music_Credits_Ch2: ; 7fd5f (1f:7d5f) +Music_Credits_Ch2:: ; 7fd5f (1f:7d5f) duty 3 vibrato 10, 2, 5 notetype 12, 12, 5 @@ -574,7 +574,7 @@ Music_Credits_Ch2: ; 7fd5f (1f:7d5f) endchannel -Music_Credits_Ch3: ; 7fec2 (1f:7ec2) +Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) notetype 12, 1, 0 octave 5 note C#, 6 @@ -717,7 +717,7 @@ Music_Credits_Ch3: ; 7fec2 (1f:7ec2) rest 7 endchannel -Music_Credits_branch_7ffa4: +Music_Credits_branch_7ffa4:: octave 4 note E_, 2 note A_, 2 @@ -729,7 +729,7 @@ Music_Credits_branch_7ffa4: note A_, 2 endchannel -Music_Credits_branch_7ffae: +Music_Credits_branch_7ffae:: octave 4 note D_, 2 note G_, 2 @@ -741,7 +741,7 @@ Music_Credits_branch_7ffae: note G_, 2 endchannel -Music_Credits_branch_7ffb8: +Music_Credits_branch_7ffb8:: note G_, 2 note B_, 2 note G_, 2 @@ -752,7 +752,7 @@ Music_Credits_branch_7ffb8: note B_, 2 endchannel -Music_Credits_branch_7ffc1: +Music_Credits_branch_7ffc1:: octave 4 note A_, 2 octave 5 @@ -771,7 +771,7 @@ Music_Credits_branch_7ffc1: note C#, 2 endchannel -Music_Credits_branch_7ffd2: +Music_Credits_branch_7ffd2:: note D_, 2 note A_, 2 note D_, 2 @@ -782,7 +782,7 @@ Music_Credits_branch_7ffd2: note A_, 2 endchannel -Music_Credits_branch_7ffdb: +Music_Credits_branch_7ffdb:: note E_, 2 note G#, 2 note E_, 2 @@ -793,7 +793,7 @@ Music_Credits_branch_7ffdb: note G#, 2 endchannel -Music_Credits_branch_7ffe4: +Music_Credits_branch_7ffe4:: note E_, 2 note B_, 2 note E_, 2 @@ -804,7 +804,7 @@ Music_Credits_branch_7ffe4: note B_, 2 endchannel -Music_Credits_branch_7ffed: +Music_Credits_branch_7ffed:: note A_, 1 rest 1 note A_, 1 diff --git a/music/defeatedgymleader.asm b/music/defeatedgymleader.asm index 71e3081a..0e24d904 100644 --- a/music/defeatedgymleader.asm +++ b/music/defeatedgymleader.asm @@ -1,4 +1,4 @@ -Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad) +Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad) tempo 0, 112 stereopanning 119 duty 3 @@ -20,7 +20,7 @@ Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad) notetype 12, 10, 7 note A_, 8 -Music_DefeatedGymLeader_branch_23ccc: +Music_DefeatedGymLeader_branch_23ccc:: notetype 12, 11, 2 octave 3 note A_, 2 @@ -162,7 +162,7 @@ Music_DefeatedGymLeader_branch_23ccc: loopchannel 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch2: ; 23d6d (8:7d6d) +Music_DefeatedGymLeader_Ch2:: ; 23d6d (8:7d6d) duty 2 vibrato 24, 2, 4 notetype 12, 12, 4 @@ -181,7 +181,7 @@ Music_DefeatedGymLeader_Ch2: ; 23d6d (8:7d6d) notetype 12, 11, 7 note F#, 8 -Music_DefeatedGymLeader_branch_23d84: +Music_DefeatedGymLeader_branch_23d84:: notetype 12, 12, 2 octave 4 note D_, 2 @@ -352,7 +352,7 @@ Music_DefeatedGymLeader_branch_23d84: loopchannel 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch3: ; 23e52 (8:7e52) +Music_DefeatedGymLeader_Ch3:: ; 23e52 (8:7e52) notetype 12, 1, 0 vibrato 16, 1, 2 octave 4 @@ -370,7 +370,7 @@ Music_DefeatedGymLeader_Ch3: ; 23e52 (8:7e52) note D_, 1 note F#, 8 -Music_DefeatedGymLeader_branch_23e65: +Music_DefeatedGymLeader_branch_23e65:: octave 4 note F#, 1 rest 1 diff --git a/music/defeatedtrainer.asm b/music/defeatedtrainer.asm index 5872b290..5585066a 100644 --- a/music/defeatedtrainer.asm +++ b/music/defeatedtrainer.asm @@ -1,4 +1,4 @@ -Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53) +Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53) tempo 0, 224 stereopanning 119 duty 2 @@ -21,7 +21,7 @@ Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53) duty 1 tempo 0, 224 -Music_DefeatedTrainer_branch_23a76: +Music_DefeatedTrainer_branch_23a76:: notetype 4, 6, 3 octave 3 note A_, 6 @@ -95,7 +95,7 @@ Music_DefeatedTrainer_branch_23a76: loopchannel 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch2: ; 23ac1 (8:7ac1) +Music_DefeatedTrainer_Ch2:: ; 23ac1 (8:7ac1) duty 2 notetype 4, 12, 3 octave 4 @@ -110,7 +110,7 @@ Music_DefeatedTrainer_Ch2: ; 23ac1 (8:7ac1) notetype 4, 12, 4 note D_, 12 -Music_DefeatedTrainer_branch_23ad2: +Music_DefeatedTrainer_branch_23ad2:: notetype 4, 8, 5 octave 4 note D_, 6 @@ -172,7 +172,7 @@ Music_DefeatedTrainer_branch_23ad2: loopchannel 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15) +Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15) notetype 4, 1, 0 octave 5 note D_, 2 @@ -186,7 +186,7 @@ Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15) note A_, 12 notetype 4, 2, 1 -Music_DefeatedTrainer_branch_23b24: +Music_DefeatedTrainer_branch_23b24:: note F#, 3 rest 3 note F#, 3 diff --git a/music/defeatedwildmon.asm b/music/defeatedwildmon.asm index ac4b875a..c56c6471 100644 --- a/music/defeatedwildmon.asm +++ b/music/defeatedwildmon.asm @@ -1,4 +1,4 @@ -Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) +Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74) tempo 0, 112 stereopanning 119 executemusic @@ -14,7 +14,7 @@ Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) note F#, 1 note E_, 12 -Music_DefeatedWildMon_branch_23b8b: +Music_DefeatedWildMon_branch_23b8b:: notetype 12, 6, 2 note E_, 2 note F#, 2 @@ -67,7 +67,7 @@ Music_DefeatedWildMon_branch_23b8b: loopchannel 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1) +Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1) executemusic duty 2 notetype 12, 12, 3 @@ -79,7 +79,7 @@ Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1) notetype 12, 12, 7 note B_, 12 -Music_DefeatedWildMon_branch_23bce: +Music_DefeatedWildMon_branch_23bce:: notetype 12, 8, 2 octave 3 note B_, 2 @@ -142,7 +142,7 @@ Music_DefeatedWildMon_branch_23bce: loopchannel 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) +Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e) executemusic notetype 12, 2, 0 octave 5 @@ -162,7 +162,7 @@ Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) note E_, 1 rest 3 -Music_DefeatedWildMon_branch_23c21: +Music_DefeatedWildMon_branch_23c21:: octave 4 note E_, 1 rest 1 diff --git a/music/dungeon1.asm b/music/dungeon1.asm index 9c69b773..c9bf6dba 100644 --- a/music/dungeon1.asm +++ b/music/dungeon1.asm @@ -1,4 +1,4 @@ -Music_Dungeon1_Ch1: ; 7ded1 (1f:5ed1) +Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1) tempo 0, 144 stereopanning 119 duty 3 @@ -11,11 +11,11 @@ Music_Dungeon1_Ch1: ; 7ded1 (1f:5ed1) note F#, 8 unknownmusic0xee 255 -Music_Dungeon1_branch_7dee5: +Music_Dungeon1_branch_7dee5:: notetype 12, 11, 2 octave 3 -Music_Dungeon1_branch_7dee8: +Music_Dungeon1_branch_7dee8:: callchannel Music_Dungeon1_branch_7dfaa loopchannel 3, Music_Dungeon1_branch_7dee8 note E_, 1 @@ -35,7 +35,7 @@ Music_Dungeon1_branch_7dee8: note A_, 1 note A#, 1 -Music_Dungeon1_branch_7deff: +Music_Dungeon1_branch_7deff:: callchannel Music_Dungeon1_branch_7dfaa loopchannel 4, Music_Dungeon1_branch_7deff callchannel Music_Dungeon1_branch_7dfd5 @@ -127,7 +127,7 @@ Music_Dungeon1_branch_7deff: octave 3 note C#, 1 -Music_Dungeon1_branch_7df6e: +Music_Dungeon1_branch_7df6e:: rest 16 loopchannel 8, Music_Dungeon1_branch_7df6e notetype 12, 12, 3 @@ -165,7 +165,7 @@ Music_Dungeon1_branch_7df6e: callchannel Music_Dungeon1_branch_7dfaa loopchannel 0, Music_Dungeon1_branch_7dee5 -Music_Dungeon1_branch_7dfaa: +Music_Dungeon1_branch_7dfaa:: note E_, 1 note D#, 1 note B_, 1 @@ -184,7 +184,7 @@ Music_Dungeon1_branch_7dfaa: note A#, 1 endchannel -Music_Dungeon1_branch_7dfbb: +Music_Dungeon1_branch_7dfbb:: octave 2 note G_, 2 note A#, 4 @@ -196,7 +196,7 @@ Music_Dungeon1_branch_7dfbb: note A#, 2 endchannel -Music_Dungeon1_branch_7dfc5: +Music_Dungeon1_branch_7dfc5:: octave 3 note E_, 1 note E_, 1 @@ -214,7 +214,7 @@ Music_Dungeon1_branch_7dfc5: note C_, 1 endchannel -Music_Dungeon1_branch_7dfd5: +Music_Dungeon1_branch_7dfd5:: note E_, 1 note E_, 1 rest 4 @@ -226,7 +226,7 @@ Music_Dungeon1_branch_7dfd5: endchannel -Music_Dungeon1_Ch2: ; 7dfde (1f:5fde) +Music_Dungeon1_Ch2:: ; 7dfde (1f:5fde) vibrato 11, 1, 5 duty 3 notetype 12, 0, 15 @@ -236,10 +236,10 @@ Music_Dungeon1_Ch2: ; 7dfde (1f:5fde) octave 5 note D_, 8 -Music_Dungeon1_branch_7dfeb: +Music_Dungeon1_branch_7dfeb:: notetype 12, 12, 2 -Music_Dungeon1_branch_7dfed: +Music_Dungeon1_branch_7dfed:: callchannel Music_Dungeon1_branch_7e097 loopchannel 3, Music_Dungeon1_branch_7dfed octave 2 @@ -261,7 +261,7 @@ Music_Dungeon1_branch_7dfed: note G_, 1 note D#, 1 -Music_Dungeon1_branch_7e006: +Music_Dungeon1_branch_7e006:: callchannel Music_Dungeon1_branch_7e097 loopchannel 4, Music_Dungeon1_branch_7e006 rest 2 @@ -359,7 +359,7 @@ Music_Dungeon1_branch_7e006: callchannel Music_Dungeon1_branch_7e097 loopchannel 0, Music_Dungeon1_branch_7dfeb -Music_Dungeon1_branch_7e097: +Music_Dungeon1_branch_7e097:: octave 2 note E_, 1 note E_, 1 @@ -381,7 +381,7 @@ Music_Dungeon1_branch_7e097: note B_, 1 endchannel -Music_Dungeon1_branch_7e0ab: +Music_Dungeon1_branch_7e0ab:: octave 2 note E_, 1 note E_, 1 @@ -393,14 +393,14 @@ Music_Dungeon1_branch_7e0ab: rest 3 endchannel -Music_Dungeon1_branch_7e0b5: +Music_Dungeon1_branch_7e0b5:: octave 2 note E_, 1 note E_, 1 rest 10 endchannel -Music_Dungeon1_branch_7e0ba: +Music_Dungeon1_branch_7e0ba:: octave 1 note E_, 1 note G_, 1 @@ -408,7 +408,7 @@ Music_Dungeon1_branch_7e0ba: note D#, 1 endchannel -Music_Dungeon1_branch_7e0c0: +Music_Dungeon1_branch_7e0c0:: octave 2 note E_, 1 note E_, 1 @@ -423,7 +423,7 @@ Music_Dungeon1_branch_7e0c0: note C_, 1 endchannel -Music_Dungeon1_branch_7e0cd: +Music_Dungeon1_branch_7e0cd:: octave 3 note E_, 6 note G_, 6 @@ -441,7 +441,7 @@ Music_Dungeon1_branch_7e0cd: endchannel -Music_Dungeon1_Ch3: ; 7e0dc (1f:60dc) +Music_Dungeon1_Ch3:: ; 7e0dc (1f:60dc) notetype 12, 1, 1 vibrato 8, 2, 6 rest 14 @@ -449,7 +449,7 @@ Music_Dungeon1_Ch3: ; 7e0dc (1f:60dc) note D_, 1 note D#, 1 -Music_Dungeon1_branch_7e0e5: +Music_Dungeon1_branch_7e0e5:: callchannel Music_Dungeon1_branch_7e140 callchannel Music_Dungeon1_branch_7e140 octave 5 @@ -511,7 +511,7 @@ Music_Dungeon1_branch_7e0e5: rest 16 loopchannel 0, Music_Dungeon1_branch_7e0e5 -Music_Dungeon1_branch_7e140: +Music_Dungeon1_branch_7e140:: octave 5 note E_, 4 note B_, 4 @@ -533,7 +533,7 @@ Music_Dungeon1_branch_7e140: note D#, 4 endchannel -Music_Dungeon1_branch_7e154: +Music_Dungeon1_branch_7e154:: octave 6 note E_, 1 note E_, 1 @@ -545,7 +545,7 @@ Music_Dungeon1_branch_7e154: rest 1 endchannel -Music_Dungeon1_branch_7e15e: +Music_Dungeon1_branch_7e15e:: octave 3 note E_, 1 note G_, 1 @@ -553,7 +553,7 @@ Music_Dungeon1_branch_7e15e: note D#, 1 endchannel -Music_Dungeon1_branch_7e164: +Music_Dungeon1_branch_7e164:: note E_, 4 note B_, 4 note A#, 4 @@ -574,7 +574,7 @@ Music_Dungeon1_branch_7e164: note D#, 4 endchannel -Music_Dungeon1_branch_7e177: +Music_Dungeon1_branch_7e177:: octave 4 note E_, 1 rest 3 @@ -596,13 +596,13 @@ Music_Dungeon1_branch_7e177: endchannel -Music_Dungeon1_Ch4: ; 7e18a (1f:618a) +Music_Dungeon1_Ch4:: ; 7e18a (1f:618a) dspeed 12 rest 14 dnote 1, cymbal1 dnote 1, cymbal1 -Music_Dungeon1_branch_7e190: +Music_Dungeon1_branch_7e190:: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 3, Music_Dungeon1_branch_7e190 dnote 4, cymbal2 @@ -611,7 +611,7 @@ Music_Dungeon1_branch_7e190: dnote 2, cymbal1 dnote 2, cymbal1 -Music_Dungeon1_branch_7e1a1: +Music_Dungeon1_branch_7e1a1:: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 3, Music_Dungeon1_branch_7e1a1 dnote 4, cymbal2 @@ -619,12 +619,12 @@ Music_Dungeon1_branch_7e1a1: dnote 4, cymbal2 dnote 4, cymbal2 -Music_Dungeon1_branch_7e1b0: +Music_Dungeon1_branch_7e1b0:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1b0 callchannel Music_Dungeon1_branch_7e202 -Music_Dungeon1_branch_7e1ba: +Music_Dungeon1_branch_7e1ba:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1ba callchannel Music_Dungeon1_branch_7e202 @@ -635,12 +635,12 @@ Music_Dungeon1_branch_7e1ba: dnote 2, snare7 dnote 4, cymbal2 -Music_Dungeon1_branch_7e1cf: +Music_Dungeon1_branch_7e1cf:: rest 16 loopchannel 13, Music_Dungeon1_branch_7e1cf rest 12 -Music_Dungeon1_branch_7e1d5: +Music_Dungeon1_branch_7e1d5:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1d5 dnote 4, cymbal1 @@ -653,21 +653,21 @@ Music_Dungeon1_branch_7e1d5: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 0, Music_Dungeon1_branch_7e190 -Music_Dungeon1_branch_7e1f1: +Music_Dungeon1_branch_7e1f1:: dnote 4, cymbal2 dnote 4, cymbal1 dnote 4, cymbal2 dnote 4, cymbal1 endchannel -Music_Dungeon1_branch_7e1fa: +Music_Dungeon1_branch_7e1fa:: dnote 1, cymbal1 dnote 1, cymbal1 rest 10 dnote 4, cymbal3 endchannel -Music_Dungeon1_branch_7e202: +Music_Dungeon1_branch_7e202:: dnote 4, snare7 dnote 4, snare8 dnote 4, snare8 diff --git a/music/dungeon2.asm b/music/dungeon2.asm index 07ab047e..028d6785 100644 --- a/music/dungeon2.asm +++ b/music/dungeon2.asm @@ -1,11 +1,11 @@ -Music_Dungeon2_Ch1: ; 7e887 (1f:6887) +Music_Dungeon2_Ch1:: ; 7e887 (1f:6887) tempo 0, 144 stereopanning 119 duty 3 togglecall vibrato 10, 1, 4 -Music_Dungeon2_branch_7e892: +Music_Dungeon2_branch_7e892:: notetype 12, 11, 2 octave 4 note E_, 4 @@ -70,10 +70,10 @@ Music_Dungeon2_branch_7e892: loopchannel 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch2: ; 7e8d8 (1f:68d8) +Music_Dungeon2_Ch2:: ; 7e8d8 (1f:68d8) vibrato 11, 1, 5 -Music_Dungeon2_branch_7e8db: +Music_Dungeon2_branch_7e8db:: duty 3 notetype 12, 12, 2 octave 3 @@ -162,11 +162,11 @@ Music_Dungeon2_branch_7e8db: loopchannel 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch3: ; 7e93b (1f:693b) +Music_Dungeon2_Ch3:: ; 7e93b (1f:693b) notetype 12, 1, 3 vibrato 8, 2, 6 -Music_Dungeon2_branch_7e940: +Music_Dungeon2_branch_7e940:: callchannel Music_Dungeon2_branch_7e9d1 loopchannel 16, Music_Dungeon2_branch_7e940 note E_, 4 @@ -187,7 +187,7 @@ Music_Dungeon2_branch_7e940: rest 4 note A#, 4 -Music_Dungeon2_branch_7e958: +Music_Dungeon2_branch_7e958:: octave 5 note E_, 2 rest 2 @@ -288,7 +288,7 @@ Music_Dungeon2_branch_7e958: rest 2 endchannel -Music_Dungeon2_branch_7e9d1: +Music_Dungeon2_branch_7e9d1:: octave 4 note E_, 2 rest 4 @@ -302,10 +302,10 @@ Music_Dungeon2_branch_7e9d1: endchannel -Music_Dungeon2_Ch4: ; 7e9dc (1f:69dc) +Music_Dungeon2_Ch4:: ; 7e9dc (1f:69dc) dspeed 12 -Music_Dungeon2_branch_7e9dd: +Music_Dungeon2_branch_7e9dd:: dnote 4, cymbal1 dnote 4, cymbal2 dnote 4, cymbal1 diff --git a/music/dungeon3.asm b/music/dungeon3.asm index 59941fc1..dd4acc4c 100644 --- a/music/dungeon3.asm +++ b/music/dungeon3.asm @@ -1,14 +1,14 @@ -Music_Dungeon3_Ch1: ; 7e9f1 (1f:69f1) +Music_Dungeon3_Ch1:: ; 7e9f1 (1f:69f1) tempo 0, 160 stereopanning 119 duty 3 togglecall vibrato 8, 1, 4 -Music_Dungeon3_branch_7e9fc: +Music_Dungeon3_branch_7e9fc:: notetype 12, 12, 3 -Music_Dungeon3_branch_7e9fe: +Music_Dungeon3_branch_7e9fe:: callchannel Music_Dungeon3_branch_7eab2 loopchannel 3, Music_Dungeon3_branch_7e9fe octave 2 @@ -24,11 +24,11 @@ Music_Dungeon3_branch_7e9fe: note D#, 2 note E_, 2 -Music_Dungeon3_branch_7ea11: +Music_Dungeon3_branch_7ea11:: callchannel Music_Dungeon3_branch_7eac1 loopchannel 4, Music_Dungeon3_branch_7ea11 -Music_Dungeon3_branch_7ea18: +Music_Dungeon3_branch_7ea18:: callchannel Music_Dungeon3_branch_7eab2 loopchannel 4, Music_Dungeon3_branch_7ea18 octave 4 @@ -59,11 +59,11 @@ Music_Dungeon3_branch_7ea18: note F_, 2 note F_, 2 -Music_Dungeon3_branch_7ea3c: +Music_Dungeon3_branch_7ea3c:: callchannel Music_Dungeon3_branch_7eace loopchannel 4, Music_Dungeon3_branch_7ea3c -Music_Dungeon3_branch_7ea43: +Music_Dungeon3_branch_7ea43:: callchannel Music_Dungeon3_branch_7eadd loopchannel 3, Music_Dungeon3_branch_7ea43 octave 3 @@ -156,7 +156,7 @@ Music_Dungeon3_branch_7ea43: rest 16 loopchannel 0, Music_Dungeon3_branch_7e9fc -Music_Dungeon3_branch_7eab2: +Music_Dungeon3_branch_7eab2:: octave 2 note B_, 2 octave 3 @@ -173,7 +173,7 @@ Music_Dungeon3_branch_7eab2: note D#, 2 endchannel -Music_Dungeon3_branch_7eac1: +Music_Dungeon3_branch_7eac1:: note E_, 2 note G#, 2 octave 4 @@ -188,7 +188,7 @@ Music_Dungeon3_branch_7eac1: note G#, 2 endchannel -Music_Dungeon3_branch_7eace: +Music_Dungeon3_branch_7eace:: octave 3 note D#, 2 octave 2 @@ -205,7 +205,7 @@ Music_Dungeon3_branch_7eace: note B_, 2 endchannel -Music_Dungeon3_branch_7eadd: +Music_Dungeon3_branch_7eadd:: note A_, 2 note F_, 2 octave 3 @@ -220,7 +220,7 @@ Music_Dungeon3_branch_7eadd: note F_, 2 endchannel -Music_Dungeon3_branch_7eaea: +Music_Dungeon3_branch_7eaea:: octave 3 note G#, 2 note E_, 2 @@ -235,14 +235,14 @@ Music_Dungeon3_branch_7eaea: note C_, 2 endchannel -Music_Dungeon3_branch_7eaf7: +Music_Dungeon3_branch_7eaf7:: note D#, 2 note G_, 2 note D#, 2 note C#, 6 endchannel -Music_Dungeon3_branch_7eafc: +Music_Dungeon3_branch_7eafc:: tempo 0, 168 octave 1 note A#, 1 @@ -335,11 +335,11 @@ Music_Dungeon3_branch_7eafc: endchannel -Music_Dungeon3_Ch2: ; 7eb68 (1f:6b68) +Music_Dungeon3_Ch2:: ; 7eb68 (1f:6b68) vibrato 11, 1, 5 duty 3 -Music_Dungeon3_branch_7eb6d: +Music_Dungeon3_branch_7eb6d:: notetype 12, 13, 3 octave 4 note D#, 6 @@ -607,7 +607,7 @@ Music_Dungeon3_branch_7eb6d: loopchannel 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) +Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a) notetype 12, 1, 2 rest 16 rest 16 @@ -710,7 +710,7 @@ Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) loopchannel 0, Music_Dungeon3_Ch3 -Music_Dungeon3_Ch4: ; 7ece4 (1f:6ce4) +Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4) dspeed 12 rest 16 rest 16 diff --git a/music/finalbattle.asm b/music/finalbattle.asm index fcfb709d..c0b7e144 100644 --- a/music/finalbattle.asm +++ b/music/finalbattle.asm @@ -1,4 +1,4 @@ -Music_FinalBattle_Ch1: ; 233a6 (8:73a6) +Music_FinalBattle_Ch1:: ; 233a6 (8:73a6) tempo 0, 112 stereopanning 119 duty 3 @@ -104,7 +104,7 @@ Music_FinalBattle_Ch1: ; 233a6 (8:73a6) notetype 12, 11, 7 note D#, 4 -Music_FinalBattle_branch_23429: +Music_FinalBattle_branch_23429:: notetype 12, 11, 7 octave 3 note E_, 4 @@ -381,7 +381,7 @@ Music_FinalBattle_branch_23429: loopchannel 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch2: ; 2356a (8:756a) +Music_FinalBattle_Ch2:: ; 2356a (8:756a) duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -479,7 +479,7 @@ Music_FinalBattle_Ch2: ; 2356a (8:756a) octave 3 note G#, 4 -Music_FinalBattle_branch_235e6: +Music_FinalBattle_branch_235e6:: notetype 12, 13, 7 octave 4 note E_, 8 @@ -709,7 +709,7 @@ Music_FinalBattle_branch_235e6: note B_, 12 loopchannel 0, Music_FinalBattle_branch_235e6 -Music_FinalBattle_branch_23704: +Music_FinalBattle_branch_23704:: octave 4 note E_, 1 note E_, 1 @@ -723,7 +723,7 @@ Music_FinalBattle_branch_23704: note F_, 1 endchannel -Music_FinalBattle_branch_23710: +Music_FinalBattle_branch_23710:: octave 4 note D_, 2 note C#, 2 @@ -738,7 +738,7 @@ Music_FinalBattle_branch_23710: endchannel -Music_FinalBattle_Ch3: ; 2371c (8:771c) +Music_FinalBattle_Ch3:: ; 2371c (8:771c) notetype 12, 1, 1 octave 4 note E_, 4 @@ -836,7 +836,7 @@ Music_FinalBattle_Ch3: ; 2371c (8:771c) note E_, 1 note G_, 1 -Music_FinalBattle_branch_2377d: +Music_FinalBattle_branch_2377d:: octave 4 note E_, 1 octave 3 @@ -1305,7 +1305,7 @@ Music_FinalBattle_branch_2377d: note B_, 4 loopchannel 0, Music_FinalBattle_branch_2377d -Music_FinalBattle_branch_2395b: +Music_FinalBattle_branch_2395b:: octave 4 note F#, 2 octave 5 @@ -1324,7 +1324,7 @@ Music_FinalBattle_branch_2395b: note C#, 2 endchannel -Music_FinalBattle_branch_2396c: +Music_FinalBattle_branch_2396c:: octave 4 note A_, 2 octave 5 diff --git a/music/gamecorner.asm b/music/gamecorner.asm index 6fd4b15f..ea89ff2f 100644 --- a/music/gamecorner.asm +++ b/music/gamecorner.asm @@ -1,4 +1,4 @@ -Music_GameCorner_Ch1: ; 7e20b (1f:620b) +Music_GameCorner_Ch1:: ; 7e20b (1f:620b) tempo 0, 120 stereopanning 119 duty 3 @@ -15,7 +15,7 @@ Music_GameCorner_Ch1: ; 7e20b (1f:620b) note C#, 2 note D#, 16 -Music_GameCorner_branch_7e222: +Music_GameCorner_branch_7e222:: notetype 12, 11, 5 octave 3 note C#, 4 @@ -183,7 +183,7 @@ Music_GameCorner_branch_7e222: loopchannel 0, Music_GameCorner_branch_7e222 -Music_GameCorner_Ch2: ; 7e2df (1f:62df) +Music_GameCorner_Ch2:: ; 7e2df (1f:62df) duty 2 vibrato 10, 2, 3 notetype 12, 12, 6 @@ -206,7 +206,7 @@ Music_GameCorner_Ch2: ; 7e2df (1f:62df) note A#, 1 note B_, 8 -Music_GameCorner_branch_7e2fa: +Music_GameCorner_branch_7e2fa:: duty 2 notetype 12, 12, 7 octave 3 @@ -343,7 +343,7 @@ Music_GameCorner_branch_7e2fa: loopchannel 0, Music_GameCorner_branch_7e2fa -Music_GameCorner_Ch3: ; 7e38b (1f:638b) +Music_GameCorner_Ch3:: ; 7e38b (1f:638b) notetype 12, 1, 3 octave 5 note C#, 1 @@ -370,7 +370,7 @@ Music_GameCorner_Ch3: ; 7e38b (1f:638b) note D#, 1 rest 1 -Music_GameCorner_branch_7e3a5: +Music_GameCorner_branch_7e3a5:: callchannel Music_GameCorner_branch_7e418 callchannel Music_GameCorner_branch_7e42d callchannel Music_GameCorner_branch_7e442 @@ -442,7 +442,7 @@ Music_GameCorner_branch_7e3a5: callchannel Music_GameCorner_branch_7e42d loopchannel 0, Music_GameCorner_branch_7e3a5 -Music_GameCorner_branch_7e418: +Music_GameCorner_branch_7e418:: note E_, 1 rest 1 note G#, 1 @@ -465,7 +465,7 @@ Music_GameCorner_branch_7e418: rest 1 endchannel -Music_GameCorner_branch_7e42d: +Music_GameCorner_branch_7e42d:: note E_, 1 rest 1 note G#, 1 @@ -488,7 +488,7 @@ Music_GameCorner_branch_7e42d: rest 1 endchannel -Music_GameCorner_branch_7e442: +Music_GameCorner_branch_7e442:: note E_, 1 rest 1 note B_, 1 @@ -511,7 +511,7 @@ Music_GameCorner_branch_7e442: rest 1 endchannel -Music_GameCorner_branch_7e457: +Music_GameCorner_branch_7e457:: note D#, 1 rest 1 note A_, 1 @@ -534,7 +534,7 @@ Music_GameCorner_branch_7e457: rest 1 endchannel -Music_GameCorner_branch_7e46c: +Music_GameCorner_branch_7e46c:: note D#, 1 rest 1 note F#, 1 @@ -557,7 +557,7 @@ Music_GameCorner_branch_7e46c: rest 1 endchannel -Music_GameCorner_branch_7e481: +Music_GameCorner_branch_7e481:: note D#, 1 rest 1 note F#, 1 @@ -580,7 +580,7 @@ Music_GameCorner_branch_7e481: rest 1 endchannel -Music_GameCorner_branch_7e496: +Music_GameCorner_branch_7e496:: note F#, 1 rest 1 note B_, 1 @@ -603,7 +603,7 @@ Music_GameCorner_branch_7e496: rest 1 endchannel -Music_GameCorner_branch_7e4ab: +Music_GameCorner_branch_7e4ab:: note F#, 1 rest 1 note A_, 1 diff --git a/music/gym.asm b/music/gym.asm index a7529d0d..b846ca73 100644 --- a/music/gym.asm +++ b/music/gym.asm @@ -1,4 +1,4 @@ -Music_Gym_Ch1: ; bcbb (2:7cbb) +Music_Gym_Ch1:: ; bcbb (2:7cbb) tempo 0, 138 stereopanning 119 duty 3 @@ -22,7 +22,7 @@ Music_Gym_Ch1: ; bcbb (2:7cbb) note F_, 4 note G_, 4 -Music_Gym_branch_bcd8: +Music_Gym_branch_bcd8:: note E_, 4 note F_, 2 note G_, 2 @@ -165,7 +165,7 @@ Music_Gym_branch_bcd8: loopchannel 0, Music_Gym_branch_bcd8 -Music_Gym_Ch2: ; bd6b (2:7d6b) +Music_Gym_Ch2:: ; bd6b (2:7d6b) duty 3 vibrato 10, 2, 5 notetype 12, 12, 7 @@ -184,7 +184,7 @@ Music_Gym_Ch2: ; bd6b (2:7d6b) notetype 12, 12, 7 note B_, 4 -Music_Gym_branch_bd82: +Music_Gym_branch_bd82:: octave 4 note C_, 12 octave 3 @@ -288,7 +288,7 @@ Music_Gym_branch_bd82: loopchannel 0, Music_Gym_branch_bd82 -Music_Gym_Ch3: ; bdfa (2:7dfa) +Music_Gym_Ch3:: ; bdfa (2:7dfa) notetype 12, 1, 1 rest 16 rest 10 @@ -297,7 +297,7 @@ Music_Gym_Ch3: ; bdfa (2:7dfa) note F_, 2 note D_, 2 -Music_Gym_branch_be02: +Music_Gym_branch_be02:: callchannel Music_Gym_branch_be3b callchannel Music_Gym_branch_be44 callchannel Music_Gym_branch_be3b @@ -323,7 +323,7 @@ Music_Gym_branch_be02: note F_, 2 loopchannel 0, Music_Gym_branch_be02 -Music_Gym_branch_be3b: +Music_Gym_branch_be3b:: note E_, 2 note G_, 2 note E_, 2 @@ -334,7 +334,7 @@ Music_Gym_branch_be3b: note G_, 2 endchannel -Music_Gym_branch_be44: +Music_Gym_branch_be44:: note D_, 2 note F_, 2 note D_, 2 @@ -345,7 +345,7 @@ Music_Gym_branch_be44: note F_, 2 endchannel -Music_Gym_branch_be4d: +Music_Gym_branch_be4d:: note F_, 2 note A#, 2 note F_, 2 diff --git a/music/gymleaderbattle.asm b/music/gymleaderbattle.asm index a469c425..97162408 100644 --- a/music/gymleaderbattle.asm +++ b/music/gymleaderbattle.asm @@ -1,4 +1,4 @@ -Music_GymLeaderBattle_Ch1: ; 22370 (8:6370) +Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370) tempo 0, 104 stereopanning 119 duty 3 @@ -57,7 +57,7 @@ Music_GymLeaderBattle_Ch1: ; 22370 (8:6370) rest 9 note A_, 6 -Music_GymLeaderBattle_branch_223b0: +Music_GymLeaderBattle_branch_223b0:: note F#, 1 octave 3 note C#, 1 @@ -547,7 +547,7 @@ Music_GymLeaderBattle_branch_223b0: loopchannel 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch2: ; 225a1 (8:65a1) +Music_GymLeaderBattle_Ch2:: ; 225a1 (8:65a1) duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -608,7 +608,7 @@ Music_GymLeaderBattle_Ch2: ; 225a1 (8:65a1) octave 4 note C#, 6 -Music_GymLeaderBattle_branch_225e0: +Music_GymLeaderBattle_branch_225e0:: notetype 12, 12, 5 note D#, 4 note C#, 4 @@ -848,7 +848,7 @@ Music_GymLeaderBattle_branch_225e0: loopchannel 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch3: ; 226ef (8:66ef) +Music_GymLeaderBattle_Ch3:: ; 226ef (8:66ef) vibrato 0, 2, 0 notetype 12, 1, 3 rest 12 @@ -1040,7 +1040,7 @@ Music_GymLeaderBattle_Ch3: ; 226ef (8:66ef) note C#, 6 notetype 12, 1, 4 -Music_GymLeaderBattle_branch_227b1: +Music_GymLeaderBattle_branch_227b1:: octave 3 note B_, 2 octave 4 diff --git a/music/halloffame.asm b/music/halloffame.asm index d5523acd..2900cec7 100644 --- a/music/halloffame.asm +++ b/music/halloffame.asm @@ -1,4 +1,4 @@ -Music_HallOfFame_Ch1: ; 7fbaf (1f:7baf) +Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf) tempo 0, 112 stereopanning 119 duty 3 @@ -15,7 +15,7 @@ Music_HallOfFame_Ch1: ; 7fbaf (1f:7baf) note F_, 1 note F#, 1 -Music_HallOfFame_branch_7fbc5: +Music_HallOfFame_branch_7fbc5:: notetype 12, 8, 0 octave 4 note C_, 16 @@ -31,11 +31,11 @@ Music_HallOfFame_branch_7fbc5: loopchannel 0, Music_HallOfFame_branch_7fbc5 -Music_HallOfFame_Ch2: ; 7fbda (1f:7bda) +Music_HallOfFame_Ch2:: ; 7fbda (1f:7bda) vibrato 8, 2, 5 duty 3 -Music_HallOfFame_branch_7fbdf: +Music_HallOfFame_branch_7fbdf:: notetype 12, 12, 4 octave 3 note G_, 2 @@ -63,10 +63,10 @@ Music_HallOfFame_branch_7fbdf: loopchannel 0, Music_HallOfFame_branch_7fbdf -Music_HallOfFame_Ch3: ; 7fbfc (1f:7bfc) +Music_HallOfFame_Ch3:: ; 7fbfc (1f:7bfc) notetype 12, 1, 2 -Music_HallOfFame_branch_7fbfe: +Music_HallOfFame_branch_7fbfe:: octave 4 note D_, 2 note G_, 2 diff --git a/music/headers/musicheaders02.asm b/music/headers/musicheaders02.asm index ebee47ef..3adb23c5 100644 --- a/music/headers/musicheaders02.asm +++ b/music/headers/musicheaders02.asm @@ -1,4 +1,4 @@ -Music_PalletTown: ; 822e (2:422e) +Music_PalletTown:: ; 822e (2:422e) db ( $80 | CH0 ) dw Music_PalletTown_Ch1 db CH1 @@ -6,7 +6,7 @@ Music_PalletTown: ; 822e (2:422e) db CH2 dw Music_PalletTown_Ch3 -Music_Pokecenter: ; 8237 (2:4237) +Music_Pokecenter:: ; 8237 (2:4237) db ( $80 | CH0 ) dw Music_Pokecenter_Ch1 db CH1 @@ -14,7 +14,7 @@ Music_Pokecenter: ; 8237 (2:4237) db CH2 dw Music_Pokecenter_Ch3 -Music_Gym: ; 8240 (2:4240) +Music_Gym:: ; 8240 (2:4240) db ( $80 | CH0 ) dw Music_Gym_Ch1 db CH1 @@ -23,7 +23,7 @@ Music_Gym: ; 8240 (2:4240) dw Music_Gym_Ch3 ; Viridian City, Pewter City, Saffron City -Music_Cities1: ; 8249 (2:4249) +Music_Cities1:: ; 8249 (2:4249) db ( $C0 | CH0 ) dw Music_Cities1_Ch1 db CH1 @@ -34,7 +34,7 @@ Music_Cities1: ; 8249 (2:4249) dw Music_Cities1_Ch4 ; Cerulean City, Fuchsia City -Music_Cities2: ; 8255 (2:4255) +Music_Cities2:: ; 8255 (2:4255) db ( $80 | CH0 ) dw Music_Cities2_Ch1 db CH1 @@ -42,7 +42,7 @@ Music_Cities2: ; 8255 (2:4255) db CH2 dw Music_Cities2_Ch3 -Music_Celadon: ; 825e (2:425e) +Music_Celadon:: ; 825e (2:425e) db ( $80 | CH0 ) dw Music_Celadon_Ch1 db CH1 @@ -50,7 +50,7 @@ Music_Celadon: ; 825e (2:425e) db CH2 dw Music_Celadon_Ch3 -Music_Cinnabar: ; 8267 (2:4267) +Music_Cinnabar:: ; 8267 (2:4267) db ( $80 | CH0 ) dw Music_Cinnabar_Ch1 db CH1 @@ -58,7 +58,7 @@ Music_Cinnabar: ; 8267 (2:4267) db CH2 dw Music_Cinnabar_Ch3 -Music_Vermilion: ; 8270 (2:4270) +Music_Vermilion:: ; 8270 (2:4270) db ( $C0 | CH0 ) dw Music_Vermilion_Ch1 db CH1 @@ -68,7 +68,7 @@ Music_Vermilion: ; 8270 (2:4270) db CH3 dw Music_Vermilion_Ch4 -Music_Lavender: ; 827c (2:427c) +Music_Lavender:: ; 827c (2:427c) db ( $C0 | CH0 ) dw Music_Lavender_Ch1 db CH1 @@ -78,7 +78,7 @@ Music_Lavender: ; 827c (2:427c) db CH3 dw Music_Lavender_Ch4 -Music_SSAnne: ; 8288 (2:4288) +Music_SSAnne:: ; 8288 (2:4288) db ( $80 | CH0 ) dw Music_SSAnne_Ch1 db CH1 @@ -86,7 +86,7 @@ Music_SSAnne: ; 8288 (2:4288) db CH2 dw Music_SSAnne_Ch3 -Music_MeetProfOak: ; 8291 (2:4291) +Music_MeetProfOak:: ; 8291 (2:4291) db ( $80 | CH0 ) dw Music_MeetProfOak_Ch1 db CH1 @@ -94,7 +94,7 @@ Music_MeetProfOak: ; 8291 (2:4291) db CH2 dw Music_MeetProfOak_Ch3 -Music_MeetRival: ; 829a (2:429a) +Music_MeetRival:: ; 829a (2:429a) db ( $80 | CH0 ) dw Music_MeetRival_Ch1 db CH1 @@ -102,7 +102,7 @@ Music_MeetRival: ; 829a (2:429a) db CH2 dw Music_MeetRival_Ch3 -Music_MuseumGuy: ; 82a3 (2:42a3) +Music_MuseumGuy:: ; 82a3 (2:42a3) db ( $C0 | CH0 ) dw Music_MuseumGuy_Ch1 db CH1 @@ -112,7 +112,7 @@ Music_MuseumGuy: ; 82a3 (2:42a3) db CH3 dw Music_MuseumGuy_Ch4 -Music_SafariZone: ; 82af (2:42af) +Music_SafariZone:: ; 82af (2:42af) db ( $80 | CH0 ) dw Music_SafariZone_Ch1 db CH1 @@ -120,7 +120,7 @@ Music_SafariZone: ; 82af (2:42af) db CH2 dw Music_SafariZone_Ch3 -Music_PkmnHealed: ; 82b8 (2:42b8) +Music_PkmnHealed:: ; 82b8 (2:42b8) db ( $80 | CH0 ) dw Music_PkmnHealed_Ch1 db CH1 @@ -129,7 +129,7 @@ Music_PkmnHealed: ; 82b8 (2:42b8) dw Music_PkmnHealed_Ch3 ; Routes 1 and 2 -Music_Routes1: ; 82c1 (2:42c1) +Music_Routes1:: ; 82c1 (2:42c1) db ( $C0 | CH0 ) dw Music_Routes1_Ch1 db CH1 @@ -140,7 +140,7 @@ Music_Routes1: ; 82c1 (2:42c1) dw Music_Routes1_Ch4 ; Routes 24 and 25 -Music_Routes2: ; 82cd (2:42cd) +Music_Routes2:: ; 82cd (2:42cd) db ( $C0 | CH0 ) dw Music_Routes2_Ch1 db CH1 @@ -151,7 +151,7 @@ Music_Routes2: ; 82cd (2:42cd) dw Music_Routes2_Ch4 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 -Music_Routes3: ; 82d9 (2:42d9) +Music_Routes3:: ; 82d9 (2:42d9) db ( $C0 | CH0 ) dw Music_Routes3_Ch1 db CH1 @@ -162,7 +162,7 @@ Music_Routes3: ; 82d9 (2:42d9) dw Music_Routes3_Ch4 ; Routes 11, 12, 13, 14, 15 -Music_Routes4: ; 82d5 (2:42d5) +Music_Routes4:: ; 82d5 (2:42d5) db ( $C0 | CH0 ) dw Music_Routes4_Ch1 db CH1 @@ -173,7 +173,7 @@ Music_Routes4: ; 82d5 (2:42d5) dw Music_Routes4_Ch4 ; Route 23, Indigo Plateau -Music_IndigoPlateau: ; 82f1 (2:42f1) +Music_IndigoPlateau:: ; 82f1 (2:42f1) db ( $C0 | CH0 ) dw Music_IndigoPlateau_Ch1 db CH1 diff --git a/music/headers/musicheaders08.asm b/music/headers/musicheaders08.asm index f3def95d..fbc3f9ae 100644 --- a/music/headers/musicheaders08.asm +++ b/music/headers/musicheaders08.asm @@ -1,4 +1,4 @@ -Music_GymLeaderBattle: ; 202be (8:42be) +Music_GymLeaderBattle:: ; 202be (8:42be) db ( $80 | CH0 ) dw Music_GymLeaderBattle_Ch1 db CH1 @@ -6,7 +6,7 @@ Music_GymLeaderBattle: ; 202be (8:42be) db CH2 dw Music_GymLeaderBattle_Ch3 -Music_TrainerBattle: ; 202c7 (8:42c7) +Music_TrainerBattle:: ; 202c7 (8:42c7) db ( $80 | CH0 ) dw Music_TrainerBattle_Ch1 db CH1 @@ -14,7 +14,7 @@ Music_TrainerBattle: ; 202c7 (8:42c7) db CH2 dw Music_TrainerBattle_Ch3 -Music_WildBattle: ; 202d0 (8:42d0) +Music_WildBattle:: ; 202d0 (8:42d0) db ( $80 | CH0 ) dw Music_WildBattle_Ch1 db CH1 @@ -22,7 +22,7 @@ Music_WildBattle: ; 202d0 (8:42d0) db CH2 dw Music_WildBattle_Ch3 -Music_FinalBattle: ; 202d9 (8:42d9) +Music_FinalBattle:: ; 202d9 (8:42d9) db ( $80 | CH0 ) dw Music_FinalBattle_Ch1 db CH1 @@ -30,7 +30,7 @@ Music_FinalBattle: ; 202d9 (8:42d9) db CH2 dw Music_FinalBattle_Ch3 -Music_DefeatedTrainer: ; 202e2 (8:42e2) +Music_DefeatedTrainer:: ; 202e2 (8:42e2) db ( $80 | CH0 ) dw Music_DefeatedTrainer_Ch1 db CH1 @@ -38,7 +38,7 @@ Music_DefeatedTrainer: ; 202e2 (8:42e2) db CH2 dw Music_DefeatedTrainer_Ch3 -Music_DefeatedWildMon: ; 202eb (8:42eb) +Music_DefeatedWildMon:: ; 202eb (8:42eb) db ( $80 | CH0 ) dw Music_DefeatedWildMon_Ch1 db CH1 @@ -46,7 +46,7 @@ Music_DefeatedWildMon: ; 202eb (8:42eb) db CH2 dw Music_DefeatedWildMon_Ch3 -Music_DefeatedGymLeader: ; 202f4 (8:42f4) +Music_DefeatedGymLeader:: ; 202f4 (8:42f4) db ( $80 | CH0 ) dw Music_DefeatedGymLeader_Ch1 db CH1 diff --git a/music/headers/musicheaders1f.asm b/music/headers/musicheaders1f.asm index f85b791d..beb70cf4 100644 --- a/music/headers/musicheaders1f.asm +++ b/music/headers/musicheaders1f.asm @@ -1,4 +1,4 @@ -Music_TitleScreen: ; 7c249 (1f:4249) +Music_TitleScreen:: ; 7c249 (1f:4249) db ( $C0 | CH0 ) dw Music_TitleScreen_Ch1 db CH1 @@ -8,7 +8,7 @@ Music_TitleScreen: ; 7c249 (1f:4249) db CH3 dw Music_TitleScreen_Ch4 -Music_Credits: ; 7c255 (1f:4255) +Music_Credits:: ; 7c255 (1f:4255) db ( $80 | CH0 ) dw Music_Credits_Ch1 db CH1 @@ -16,7 +16,7 @@ Music_Credits: ; 7c255 (1f:4255) db CH2 dw Music_Credits_Ch3 -Music_HallOfFame: ; 7c25e (1f:425e) +Music_HallOfFame:: ; 7c25e (1f:425e) db ( $80 | CH0 ) dw Music_HallOfFame_Ch1 db CH1 @@ -24,7 +24,7 @@ Music_HallOfFame: ; 7c25e (1f:425e) db CH2 dw Music_HallOfFame_Ch3 -Music_OaksLab: ; 7c267 (1f:4267) +Music_OaksLab:: ; 7c267 (1f:4267) db ( $80 | CH0 ) dw Music_OaksLab_Ch1 db CH1 @@ -32,13 +32,13 @@ Music_OaksLab: ; 7c267 (1f:4267) db CH2 dw Music_OaksLab_Ch3 -Music_JigglypuffSong: ; 7c270 (1f:4270) +Music_JigglypuffSong:: ; 7c270 (1f:4270) db $40 dw Music_JigglypuffSong_Ch1 db CH1 dw Music_JigglypuffSong_Ch2 -Music_BikeRiding: ; 7c276 (1f:4276) +Music_BikeRiding:: ; 7c276 (1f:4276) db ( $C0 | CH0 ) dw Music_BikeRiding_Ch1 db CH1 @@ -48,7 +48,7 @@ Music_BikeRiding: ; 7c276 (1f:4276) db CH3 dw Music_BikeRiding_Ch4 -Music_Surfing: ; 7c282 (1f:4282) +Music_Surfing:: ; 7c282 (1f:4282) db ( $80 | CH0 ) dw Music_Surfing_Ch1 db CH1 @@ -56,7 +56,7 @@ Music_Surfing: ; 7c282 (1f:4282) db CH2 dw Music_Surfing_Ch3 -Music_GameCorner: ; 7c28b (1f:428b) +Music_GameCorner:: ; 7c28b (1f:428b) db ( $80 | CH0 ) dw Music_GameCorner_Ch1 db CH1 @@ -64,7 +64,7 @@ Music_GameCorner: ; 7c28b (1f:428b) db CH2 dw Music_GameCorner_Ch3 -Music_IntroBattle: ; 7c294 (1f:4294) +Music_IntroBattle:: ; 7c294 (1f:4294) db ( $C0 | CH0 ) dw Music_IntroBattle_Ch1 db CH1 @@ -75,7 +75,7 @@ Music_IntroBattle: ; 7c294 (1f:4294) dw Music_IntroBattle_Ch4 ; Power Plant, Unknown Dungeon, Rocket HQ -Music_Dungeon1: ; 7c2a0 (1f:42a0) +Music_Dungeon1:: ; 7c2a0 (1f:42a0) db ( $C0 | CH0 ) dw Music_Dungeon1_Ch1 db CH1 @@ -86,7 +86,7 @@ Music_Dungeon1: ; 7c2a0 (1f:42a0) dw Music_Dungeon1_Ch4 ; Viridian Forest, Seafoam Islands -Music_Dungeon2: ; 7c2ac (1f:42ac) +Music_Dungeon2:: ; 7c2ac (1f:42ac) db ( $C0 | CH0 ) dw Music_Dungeon2_Ch1 db CH1 @@ -97,7 +97,7 @@ Music_Dungeon2: ; 7c2ac (1f:42ac) dw Music_Dungeon2_Ch4 ; Mt. Moon, Rock Tunnel, Victory Road -Music_Dungeon3: ; 7c2b8 (1f:42b8) +Music_Dungeon3:: ; 7c2b8 (1f:42b8) db ( $C0 | CH0 ) dw Music_Dungeon3_Ch1 db CH1 @@ -107,7 +107,7 @@ Music_Dungeon3: ; 7c2b8 (1f:42b8) db CH3 dw Music_Dungeon3_Ch4 -Music_CinnabarMansion: ; 7c2c4 (1f:42c4) +Music_CinnabarMansion:: ; 7c2c4 (1f:42c4) db ( $C0 | CH0 ) dw Music_CinnabarMansion_Ch1 db CH1 @@ -117,7 +117,7 @@ Music_CinnabarMansion: ; 7c2c4 (1f:42c4) db CH3 dw Music_CinnabarMansion_Ch4 -Music_PokemonTower: ; 7c2d0 (1f:42d0) +Music_PokemonTower:: ; 7c2d0 (1f:42d0) db ( $80 | CH0 ) dw Music_PokemonTower_Ch1 db CH1 @@ -125,7 +125,7 @@ Music_PokemonTower: ; 7c2d0 (1f:42d0) db CH2 dw Music_PokemonTower_Ch3 -Music_SilphCo: ; 7c2d9 (1f:42d9) +Music_SilphCo:: ; 7c2d9 (1f:42d9) db ( $80 | CH0 ) dw Music_SilphCo_Ch1 db CH1 @@ -133,7 +133,7 @@ Music_SilphCo: ; 7c2d9 (1f:42d9) db CH2 dw Music_SilphCo_Ch3 -Music_MeetEvilTrainer: ; 7c2e2 (1f:42e2) +Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2) db ( $80 | CH0 ) dw Music_MeetEvilTrainer_Ch1 db CH1 @@ -141,7 +141,7 @@ Music_MeetEvilTrainer: ; 7c2e2 (1f:42e2) db CH2 dw Music_MeetEvilTrainer_Ch3 -Music_MeetFemaleTrainer: ; 7c2eb (1f:42eb) +Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb) db ( $80 | CH0 ) dw Music_MeetFemaleTrainer_Ch1 db CH1 @@ -149,7 +149,7 @@ Music_MeetFemaleTrainer: ; 7c2eb (1f:42eb) db CH2 dw Music_MeetFemaleTrainer_Ch3 -Music_MeetMaleTrainer: ; 7c2f4 (1f:42f4) +Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4) db ( $80 | CH0 ) dw Music_MeetMaleTrainer_Ch1 db CH1 diff --git a/music/headers/sfxheaders02.asm b/music/headers/sfxheaders02.asm index dc30f2b9..d1c185c0 100644 --- a/music/headers/sfxheaders02.asm +++ b/music/headers/sfxheaders02.asm @@ -1,83 +1,83 @@ -SFX_Headers_02: +SFX_Headers_02:: db $ff, $ff, $ff ; padding -SFX_02_01: ; 8003 (2:4003) +SFX_02_01:: ; 8003 (2:4003) db CH7 dw SFX_02_01_Ch1 -SFX_02_02: ; 8006 (2:4006) +SFX_02_02:: ; 8006 (2:4006) db CH7 dw SFX_02_02_Ch1 -SFX_02_03: ; 8009 (2:4009) +SFX_02_03:: ; 8009 (2:4009) db CH7 dw SFX_02_03_Ch1 -SFX_02_04: ; 800c (2:400c) +SFX_02_04:: ; 800c (2:400c) db CH7 dw SFX_02_04_Ch1 -SFX_02_05: ; 800f (2:400f) +SFX_02_05:: ; 800f (2:400f) db CH7 dw SFX_02_05_Ch1 -SFX_02_06: ; 8012 (2:4012) +SFX_02_06:: ; 8012 (2:4012) db CH7 dw SFX_02_06_Ch1 -SFX_02_07: ; 8015 (2:4015) +SFX_02_07:: ; 8015 (2:4015) db CH7 dw SFX_02_07_Ch1 -SFX_02_08: ; 8018 (2:4018) +SFX_02_08:: ; 8018 (2:4018) db CH7 dw SFX_02_08_Ch1 -SFX_02_09: ; 801b (2:401b) +SFX_02_09:: ; 801b (2:401b) db CH7 dw SFX_02_09_Ch1 -SFX_02_0a: ; 801e (2:401e) +SFX_02_0a:: ; 801e (2:401e) db CH7 dw SFX_02_0a_Ch1 -SFX_02_0b: ; 8021 (2:4021) +SFX_02_0b:: ; 8021 (2:4021) db CH7 dw SFX_02_0b_Ch1 -SFX_02_0c: ; 8024 (2:4024) +SFX_02_0c:: ; 8024 (2:4024) db CH7 dw SFX_02_0c_Ch1 -SFX_02_0d: ; 8027 (2:4027) +SFX_02_0d:: ; 8027 (2:4027) db CH7 dw SFX_02_0d_Ch1 -SFX_02_0e: ; 802a (2:402a) +SFX_02_0e:: ; 802a (2:402a) db CH7 dw SFX_02_0e_Ch1 -SFX_02_0f: ; 802d (2:402d) +SFX_02_0f:: ; 802d (2:402d) db CH7 dw SFX_02_0f_Ch1 -SFX_02_10: ; 8030 (2:4030) +SFX_02_10:: ; 8030 (2:4030) db CH7 dw SFX_02_10_Ch1 -SFX_02_11: ; 8033 (2:4033) +SFX_02_11:: ; 8033 (2:4033) db CH7 dw SFX_02_11_Ch1 -SFX_02_12: ; 8036 (2:4036) +SFX_02_12:: ; 8036 (2:4036) db CH7 dw SFX_02_12_Ch1 -SFX_02_13: ; 8039 (2:4039) +SFX_02_13:: ; 8039 (2:4039) db CH7 dw SFX_02_13_Ch1 -SFX_02_14: ; 803c (2:403c) +SFX_02_14:: ; 803c (2:403c) db ( $80 | CH4 ) dw SFX_02_14_Ch1 db CH5 @@ -85,7 +85,7 @@ SFX_02_14: ; 803c (2:403c) db CH7 dw SFX_02_14_Ch3 -SFX_02_15: ; 8045 (2:4045) +SFX_02_15:: ; 8045 (2:4045) db ( $80 | CH4 ) dw SFX_02_15_Ch1 db CH5 @@ -93,7 +93,7 @@ SFX_02_15: ; 8045 (2:4045) db CH7 dw SFX_02_15_Ch3 -SFX_02_16: ; 804e (2:404e) +SFX_02_16:: ; 804e (2:404e) db ( $80 | CH4 ) dw SFX_02_16_Ch1 db CH5 @@ -101,7 +101,7 @@ SFX_02_16: ; 804e (2:404e) db CH7 dw SFX_02_16_Ch3 -SFX_02_17: ; 8057 (2:4057) +SFX_02_17:: ; 8057 (2:4057) db ( $80 | CH4 ) dw SFX_02_17_Ch1 db CH5 @@ -109,7 +109,7 @@ SFX_02_17: ; 8057 (2:4057) db CH7 dw SFX_02_17_Ch3 -SFX_02_18: ; 8060 (2:4060) +SFX_02_18:: ; 8060 (2:4060) db ( $80 | CH4 ) dw SFX_02_18_Ch1 db CH5 @@ -117,7 +117,7 @@ SFX_02_18: ; 8060 (2:4060) db CH7 dw SFX_02_18_Ch3 -SFX_02_19: ; 8069 (2:4069) +SFX_02_19:: ; 8069 (2:4069) db ( $80 | CH4 ) dw SFX_02_19_Ch1 db CH5 @@ -125,7 +125,7 @@ SFX_02_19: ; 8069 (2:4069) db CH7 dw SFX_02_19_Ch3 -SFX_02_1a: ; 8072 (2:4072) +SFX_02_1a:: ; 8072 (2:4072) db ( $80 | CH4 ) dw SFX_02_1a_Ch1 db CH5 @@ -133,7 +133,7 @@ SFX_02_1a: ; 8072 (2:4072) db CH7 dw SFX_02_1a_Ch3 -SFX_02_1b: ; 807b (2:407b) +SFX_02_1b:: ; 807b (2:407b) db ( $80 | CH4 ) dw SFX_02_1b_Ch1 db CH5 @@ -141,7 +141,7 @@ SFX_02_1b: ; 807b (2:407b) db CH7 dw SFX_02_1b_Ch3 -SFX_02_1c: ; 8084 (2:4084) +SFX_02_1c:: ; 8084 (2:4084) db ( $80 | CH4 ) dw SFX_02_1c_Ch1 db CH5 @@ -149,7 +149,7 @@ SFX_02_1c: ; 8084 (2:4084) db CH7 dw SFX_02_1c_Ch3 -SFX_02_1d: ; 808d (2:408d) +SFX_02_1d:: ; 808d (2:408d) db ( $80 | CH4 ) dw SFX_02_1d_Ch1 db CH5 @@ -157,7 +157,7 @@ SFX_02_1d: ; 808d (2:408d) db CH7 dw SFX_02_1d_Ch3 -SFX_02_1e: ; 8096 (2:4096) +SFX_02_1e:: ; 8096 (2:4096) db ( $80 | CH4 ) dw SFX_02_1e_Ch1 db CH5 @@ -165,7 +165,7 @@ SFX_02_1e: ; 8096 (2:4096) db CH7 dw SFX_02_1e_Ch3 -SFX_02_1f: ; 809f (2:409f) +SFX_02_1f:: ; 809f (2:409f) db ( $80 | CH4 ) dw SFX_02_1f_Ch1 db CH5 @@ -173,7 +173,7 @@ SFX_02_1f: ; 809f (2:409f) db CH7 dw SFX_02_1f_Ch3 -SFX_02_20: ; 80a8 (2:40a8) +SFX_02_20:: ; 80a8 (2:40a8) db ( $80 | CH4 ) dw SFX_02_20_Ch1 db CH5 @@ -181,7 +181,7 @@ SFX_02_20: ; 80a8 (2:40a8) db CH7 dw SFX_02_20_Ch3 -SFX_02_21: ; 80b1 (2:40b1) +SFX_02_21:: ; 80b1 (2:40b1) db ( $80 | CH4 ) dw SFX_02_21_Ch1 db CH5 @@ -189,7 +189,7 @@ SFX_02_21: ; 80b1 (2:40b1) db CH7 dw SFX_02_21_Ch3 -SFX_02_22: ; 80ba (2:40ba) +SFX_02_22:: ; 80ba (2:40ba) db ( $80 | CH4 ) dw SFX_02_22_Ch1 db CH5 @@ -197,7 +197,7 @@ SFX_02_22: ; 80ba (2:40ba) db CH7 dw SFX_02_22_Ch3 -SFX_02_23: ; 80c3 (2:40c3) +SFX_02_23:: ; 80c3 (2:40c3) db ( $80 | CH4 ) dw SFX_02_23_Ch1 db CH5 @@ -205,7 +205,7 @@ SFX_02_23: ; 80c3 (2:40c3) db CH7 dw SFX_02_23_Ch3 -SFX_02_24: ; 80cc (2:40cc) +SFX_02_24:: ; 80cc (2:40cc) db ( $80 | CH4 ) dw SFX_02_24_Ch1 db CH5 @@ -213,7 +213,7 @@ SFX_02_24: ; 80cc (2:40cc) db CH7 dw SFX_02_24_Ch3 -SFX_02_25: ; 80d5 (2:40d5) +SFX_02_25:: ; 80d5 (2:40d5) db ( $80 | CH4 ) dw SFX_02_25_Ch1 db CH5 @@ -221,7 +221,7 @@ SFX_02_25: ; 80d5 (2:40d5) db CH7 dw SFX_02_25_Ch3 -SFX_02_26: ; 80de (2:40de) +SFX_02_26:: ; 80de (2:40de) db ( $80 | CH4 ) dw SFX_02_26_Ch1 db CH5 @@ -229,7 +229,7 @@ SFX_02_26: ; 80de (2:40de) db CH7 dw SFX_02_26_Ch3 -SFX_02_27: ; 80e7 (2:40e7) +SFX_02_27:: ; 80e7 (2:40e7) db ( $80 | CH4 ) dw SFX_02_27_Ch1 db CH5 @@ -237,7 +237,7 @@ SFX_02_27: ; 80e7 (2:40e7) db CH7 dw SFX_02_27_Ch3 -SFX_02_28: ; 80f0 (2:40f0) +SFX_02_28:: ; 80f0 (2:40f0) db ( $80 | CH4 ) dw SFX_02_28_Ch1 db CH5 @@ -245,7 +245,7 @@ SFX_02_28: ; 80f0 (2:40f0) db CH7 dw SFX_02_28_Ch3 -SFX_02_29: ; 80f9 (2:40f9) +SFX_02_29:: ; 80f9 (2:40f9) db ( $80 | CH4 ) dw SFX_02_29_Ch1 db CH5 @@ -253,7 +253,7 @@ SFX_02_29: ; 80f9 (2:40f9) db CH7 dw SFX_02_29_Ch3 -SFX_02_2a: ; 8102 (2:4102) +SFX_02_2a:: ; 8102 (2:4102) db ( $80 | CH4 ) dw SFX_02_2a_Ch1 db CH5 @@ -261,7 +261,7 @@ SFX_02_2a: ; 8102 (2:4102) db CH7 dw SFX_02_2a_Ch3 -SFX_02_2b: ; 810b (2:410b) +SFX_02_2b:: ; 810b (2:410b) db ( $80 | CH4 ) dw SFX_02_2b_Ch1 db CH5 @@ -269,7 +269,7 @@ SFX_02_2b: ; 810b (2:410b) db CH7 dw SFX_02_2b_Ch3 -SFX_02_2c: ; 8114 (2:4114) +SFX_02_2c:: ; 8114 (2:4114) db ( $80 | CH4 ) dw SFX_02_2c_Ch1 db CH5 @@ -277,7 +277,7 @@ SFX_02_2c: ; 8114 (2:4114) db CH7 dw SFX_02_2c_Ch3 -SFX_02_2d: ; 811d (2:411d) +SFX_02_2d:: ; 811d (2:411d) db ( $80 | CH4 ) dw SFX_02_2d_Ch1 db CH5 @@ -285,7 +285,7 @@ SFX_02_2d: ; 811d (2:411d) db CH7 dw SFX_02_2d_Ch3 -SFX_02_2e: ; 8126 (2:4126) +SFX_02_2e:: ; 8126 (2:4126) db ( $80 | CH4 ) dw SFX_02_2e_Ch1 db CH5 @@ -293,7 +293,7 @@ SFX_02_2e: ; 8126 (2:4126) db CH7 dw SFX_02_2e_Ch3 -SFX_02_2f: ; 812f (2:412f) +SFX_02_2f:: ; 812f (2:412f) db ( $80 | CH4 ) dw SFX_02_2f_Ch1 db CH5 @@ -301,7 +301,7 @@ SFX_02_2f: ; 812f (2:412f) db CH7 dw SFX_02_2f_Ch3 -SFX_02_30: ; 8138 (2:4138) +SFX_02_30:: ; 8138 (2:4138) db ( $80 | CH4 ) dw SFX_02_30_Ch1 db CH5 @@ -309,7 +309,7 @@ SFX_02_30: ; 8138 (2:4138) db CH7 dw SFX_02_30_Ch3 -SFX_02_31: ; 8141 (2:4141) +SFX_02_31:: ; 8141 (2:4141) db ( $80 | CH4 ) dw SFX_02_31_Ch1 db CH5 @@ -317,7 +317,7 @@ SFX_02_31: ; 8141 (2:4141) db CH7 dw SFX_02_31_Ch3 -SFX_02_32: ; 814a (2:414a) +SFX_02_32:: ; 814a (2:414a) db ( $80 | CH4 ) dw SFX_02_32_Ch1 db CH5 @@ -325,7 +325,7 @@ SFX_02_32: ; 814a (2:414a) db CH7 dw SFX_02_32_Ch3 -SFX_02_33: ; 8153 (2:4153) +SFX_02_33:: ; 8153 (2:4153) db ( $80 | CH4 ) dw SFX_02_33_Ch1 db CH5 @@ -333,7 +333,7 @@ SFX_02_33: ; 8153 (2:4153) db CH7 dw SFX_02_33_Ch3 -SFX_02_34: ; 815c (2:415c) +SFX_02_34:: ; 815c (2:415c) db ( $80 | CH4 ) dw SFX_02_34_Ch1 db CH5 @@ -341,7 +341,7 @@ SFX_02_34: ; 815c (2:415c) db CH7 dw SFX_02_34_Ch3 -SFX_02_35: ; 8165 (2:4165) +SFX_02_35:: ; 8165 (2:4165) db ( $80 | CH4 ) dw SFX_02_35_Ch1 db CH5 @@ -349,7 +349,7 @@ SFX_02_35: ; 8165 (2:4165) db CH7 dw SFX_02_35_Ch3 -SFX_02_36: ; 816e (2:416e) +SFX_02_36:: ; 816e (2:416e) db ( $80 | CH4 ) dw SFX_02_36_Ch1 db CH5 @@ -357,7 +357,7 @@ SFX_02_36: ; 816e (2:416e) db CH7 dw SFX_02_36_Ch3 -SFX_02_37: ; 8177 (2:4177) +SFX_02_37:: ; 8177 (2:4177) db ( $80 | CH4 ) dw SFX_02_37_Ch1 db CH5 @@ -365,7 +365,7 @@ SFX_02_37: ; 8177 (2:4177) db CH7 dw SFX_02_37_Ch3 -SFX_02_38: ; 8180 (2:4180) +SFX_02_38:: ; 8180 (2:4180) db ( $80 | CH4 ) dw SFX_02_38_Ch1 db CH5 @@ -373,7 +373,7 @@ SFX_02_38: ; 8180 (2:4180) db CH7 dw SFX_02_38_Ch3 -SFX_02_39: ; 8189 (2:4189) +SFX_02_39:: ; 8189 (2:4189) db ( $80 | CH4 ) dw SFX_02_39_Ch1 db CH5 @@ -381,7 +381,7 @@ SFX_02_39: ; 8189 (2:4189) db CH7 dw SFX_02_39_Ch3 -SFX_02_3a: ; 8192 (2:4192) +SFX_02_3a:: ; 8192 (2:4192) db ( $80 | CH4 ) dw SFX_02_3a_Ch1 db CH5 @@ -389,7 +389,7 @@ SFX_02_3a: ; 8192 (2:4192) db CH6 dw SFX_02_3a_Ch3 -SFX_02_3b: ; 819b (2:419b) +SFX_02_3b:: ; 819b (2:419b) db ( $80 | CH4 ) dw SFX_02_3b_Ch1 db CH5 @@ -397,27 +397,27 @@ SFX_02_3b: ; 819b (2:419b) db CH6 dw SFX_02_3b_Ch3 -SFX_02_3c: ; 81a4 (2:41a4) +SFX_02_3c:: ; 81a4 (2:41a4) db CH4 dw SFX_02_3c_Ch1 -SFX_02_3d: ; 81a7 (2:41a7) +SFX_02_3d:: ; 81a7 (2:41a7) db CH4 dw SFX_02_3d_Ch1 -SFX_02_3e: ; 81aa (2:41aa) +SFX_02_3e:: ; 81aa (2:41aa) db CH4 dw SFX_02_3e_Ch1 -SFX_02_3f: ; 81ad (2:41ad) +SFX_02_3f:: ; 81ad (2:41ad) db CH7 dw SFX_02_3f_Ch1 -SFX_02_40: ; 81b0 (2:41b0) +SFX_02_40:: ; 81b0 (2:41b0) db CH4 dw SFX_02_40_Ch1 -SFX_02_41: ; 81b3 (2:41b3) +SFX_02_41:: ; 81b3 (2:41b3) db ( $80 | CH4 ) dw SFX_02_41_Ch1 db CH5 @@ -425,7 +425,7 @@ SFX_02_41: ; 81b3 (2:41b3) db CH6 dw SFX_02_41_Ch3 -SFX_02_42: ; 81bc (2:41bc) +SFX_02_42:: ; 81bc (2:41bc) db ( $80 | CH4 ) dw SFX_02_42_Ch1 db CH5 @@ -433,131 +433,131 @@ SFX_02_42: ; 81bc (2:41bc) db CH6 dw SFX_02_42_Ch3 -SFX_02_43: ; 81c5 (2:41c5) +SFX_02_43:: ; 81c5 (2:41c5) db CH4 dw SFX_02_43_Ch1 -SFX_02_44: ; 81c8 (2:41c8) +SFX_02_44:: ; 81c8 (2:41c8) db CH4 dw SFX_02_44_Ch1 -SFX_02_45: ; 81cb (2:41cb) +SFX_02_45:: ; 81cb (2:41cb) db CH4 dw SFX_02_45_Ch1 -SFX_02_46: ; 81ce (2:41ce) +SFX_02_46:: ; 81ce (2:41ce) db CH4 dw SFX_02_46_Ch1 -SFX_02_47: ; 81d1 (2:41d1) +SFX_02_47:: ; 81d1 (2:41d1) db CH4 dw SFX_02_47_Ch1 -SFX_02_48: ; 81d4 (2:41d4) +SFX_02_48:: ; 81d4 (2:41d4) db CH4 dw SFX_02_48_Ch1 -SFX_02_49: ; 81d7 (2:41d7) +SFX_02_49:: ; 81d7 (2:41d7) db CH4 dw SFX_02_49_Ch1 -SFX_02_4a: ; 81da (2:41da) +SFX_02_4a:: ; 81da (2:41da) db CH4 dw SFX_02_4a_Ch1 -SFX_02_4b: ; 81dd (2:41dd) +SFX_02_4b:: ; 81dd (2:41dd) db CH4 dw SFX_02_4b_Ch1 -SFX_02_4c: ; 81e0 (2:41e0) +SFX_02_4c:: ; 81e0 (2:41e0) db CH4 dw SFX_02_4c_Ch1 -SFX_02_4d: ; 81e3 (2:41e3) +SFX_02_4d:: ; 81e3 (2:41e3) db CH4 dw SFX_02_4d_Ch1 -SFX_02_4e: ; 81e6 (2:41e6) +SFX_02_4e:: ; 81e6 (2:41e6) db CH4 dw SFX_02_4e_Ch1 -SFX_02_4f: ; 81e9 (2:41e9) +SFX_02_4f:: ; 81e9 (2:41e9) db CH7 dw SFX_02_4f_Ch1 -SFX_02_50: ; 81ec (2:41ec) +SFX_02_50:: ; 81ec (2:41ec) db CH7 dw SFX_02_50_Ch1 -SFX_02_51: ; 81ef (2:41ef) +SFX_02_51:: ; 81ef (2:41ef) db ( $40 | CH4 ) dw SFX_02_51_Ch1 db CH5 dw SFX_02_51_Ch2 -SFX_02_52: ; 81f5 (2:41f5) +SFX_02_52:: ; 81f5 (2:41f5) db CH4 dw SFX_02_52_Ch1 -SFX_02_53: ; 81f8 (2:41f8) +SFX_02_53:: ; 81f8 (2:41f8) db CH7 dw SFX_02_53_Ch1 -SFX_02_54: ; 81fb (2:41fb) +SFX_02_54:: ; 81fb (2:41fb) db ( $40 | CH4 ) dw SFX_02_54_Ch1 db CH5 dw SFX_02_54_Ch2 -SFX_02_55: ; 8201 (2:4201) +SFX_02_55:: ; 8201 (2:4201) db CH4 dw SFX_02_55_Ch1 -SFX_02_56: ; 8204 (2:4204) +SFX_02_56:: ; 8204 (2:4204) db CH7 dw SFX_02_56_Ch1 -SFX_02_57: ; 8207 (2:4207) +SFX_02_57:: ; 8207 (2:4207) db CH7 dw SFX_02_57_Ch1 -SFX_02_58: ; 820a (2:420a) +SFX_02_58:: ; 820a (2:420a) db ( $40 | CH4 ) dw SFX_02_58_Ch1 db CH5 dw SFX_02_58_Ch2 -SFX_02_59: ; 8210 (2:4210) +SFX_02_59:: ; 8210 (2:4210) db ( $40 | CH4 ) dw SFX_02_59_Ch1 db CH5 dw SFX_02_59_Ch2 -SFX_02_5a: ; 8216 (2:4216) +SFX_02_5a:: ; 8216 (2:4216) db ( $40 | CH4 ) dw SFX_02_5a_Ch1 db CH5 dw SFX_02_5a_Ch2 -SFX_02_5b: ; 821c (2:421c) +SFX_02_5b:: ; 821c (2:421c) db CH4 dw SFX_02_5b_Ch1 -SFX_02_5c: ; 821f (2:421f) +SFX_02_5c:: ; 821f (2:421f) db CH7 dw SFX_02_5c_Ch1 -SFX_02_5d: ; 8222 (2:4222) +SFX_02_5d:: ; 8222 (2:4222) db ( $40 | CH4 ) dw SFX_02_5d_Ch1 db CH5 dw SFX_02_5d_Ch2 -SFX_02_5e: ; 8228 (2:4228) +SFX_02_5e:: ; 8228 (2:4228) db CH2 dw SFX_02_5e_Ch1 -SFX_02_5f: ; 822b (2:422b) +SFX_02_5f:: ; 822b (2:422b) db CH4 dw SFX_02_5f_Ch1 diff --git a/music/headers/sfxheaders08.asm b/music/headers/sfxheaders08.asm index 16af945e..547c8d4a 100644 --- a/music/headers/sfxheaders08.asm +++ b/music/headers/sfxheaders08.asm @@ -1,83 +1,83 @@ -SFX_Headers_08: +SFX_Headers_08:: db $ff, $ff, $ff ; padding -SFX_08_01: ; 20003 (8:4003) +SFX_08_01:: ; 20003 (8:4003) db CH7 dw SFX_08_01_Ch1 -SFX_08_02: ; 20006 (8:4006) +SFX_08_02:: ; 20006 (8:4006) db CH7 dw SFX_08_02_Ch1 -SFX_08_03: ; 20009 (8:4009) +SFX_08_03:: ; 20009 (8:4009) db CH7 dw SFX_08_03_Ch1 -SFX_08_04: ; 2000c (8:400c) +SFX_08_04:: ; 2000c (8:400c) db CH7 dw SFX_08_04_Ch1 -SFX_08_05: ; 2000f (8:400f) +SFX_08_05:: ; 2000f (8:400f) db CH7 dw SFX_08_05_Ch1 -SFX_08_06: ; 20012 (8:4012) +SFX_08_06:: ; 20012 (8:4012) db CH7 dw SFX_08_06_Ch1 -SFX_08_07: ; 20015 (8:4015) +SFX_08_07:: ; 20015 (8:4015) db CH7 dw SFX_08_07_Ch1 -SFX_08_08: ; 20018 (8:4018) +SFX_08_08:: ; 20018 (8:4018) db CH7 dw SFX_08_08_Ch1 -SFX_08_09: ; 2001b (8:401b) +SFX_08_09:: ; 2001b (8:401b) db CH7 dw SFX_08_09_Ch1 -SFX_08_0a: ; 2001e (8:401e) +SFX_08_0a:: ; 2001e (8:401e) db CH7 dw SFX_08_0a_Ch1 -SFX_08_0b: ; 20021 (8:4021) +SFX_08_0b:: ; 20021 (8:4021) db CH7 dw SFX_08_0b_Ch1 -SFX_08_0c: ; 20024 (8:4024) +SFX_08_0c:: ; 20024 (8:4024) db CH7 dw SFX_08_0c_Ch1 -SFX_08_0d: ; 20027 (8:4027) +SFX_08_0d:: ; 20027 (8:4027) db CH7 dw SFX_08_0d_Ch1 -SFX_08_0e: ; 2002a (8:402a) +SFX_08_0e:: ; 2002a (8:402a) db CH7 dw SFX_08_0e_Ch1 -SFX_08_0f: ; 2002d (8:402d) +SFX_08_0f:: ; 2002d (8:402d) db CH7 dw SFX_08_0f_Ch1 -SFX_08_10: ; 20030 (8:4030) +SFX_08_10:: ; 20030 (8:4030) db CH7 dw SFX_08_10_Ch1 -SFX_08_11: ; 20033 (8:4033) +SFX_08_11:: ; 20033 (8:4033) db CH7 dw SFX_08_11_Ch1 -SFX_08_12: ; 20036 (8:4036) +SFX_08_12:: ; 20036 (8:4036) db CH7 dw SFX_08_12_Ch1 -SFX_08_13: ; 20039 (8:4039) +SFX_08_13:: ; 20039 (8:4039) db CH7 dw SFX_08_13_Ch1 -SFX_08_14: ; 2003c (8:403c) +SFX_08_14:: ; 2003c (8:403c) db ( $80 | CH4 ) dw SFX_08_14_Ch1 db CH5 @@ -85,7 +85,7 @@ SFX_08_14: ; 2003c (8:403c) db CH7 dw SFX_08_14_Ch3 -SFX_08_15: ; 20045 (8:4045) +SFX_08_15:: ; 20045 (8:4045) db ( $80 | CH4 ) dw SFX_08_15_Ch1 db CH5 @@ -93,7 +93,7 @@ SFX_08_15: ; 20045 (8:4045) db CH7 dw SFX_08_15_Ch3 -SFX_08_16: ; 2004e (8:404e) +SFX_08_16:: ; 2004e (8:404e) db ( $80 | CH4 ) dw SFX_08_16_Ch1 db CH5 @@ -101,7 +101,7 @@ SFX_08_16: ; 2004e (8:404e) db CH7 dw SFX_08_16_Ch3 -SFX_08_17: ; 20057 (8:4057) +SFX_08_17:: ; 20057 (8:4057) db ( $80 | CH4 ) dw SFX_08_17_Ch1 db CH5 @@ -109,7 +109,7 @@ SFX_08_17: ; 20057 (8:4057) db CH7 dw SFX_08_17_Ch3 -SFX_08_18: ; 20060 (8:4060) +SFX_08_18:: ; 20060 (8:4060) db ( $80 | CH4 ) dw SFX_08_18_Ch1 db CH5 @@ -117,7 +117,7 @@ SFX_08_18: ; 20060 (8:4060) db CH7 dw SFX_08_18_Ch3 -SFX_08_19: ; 20069 (8:4069) +SFX_08_19:: ; 20069 (8:4069) db ( $80 | CH4 ) dw SFX_08_19_Ch1 db CH5 @@ -125,7 +125,7 @@ SFX_08_19: ; 20069 (8:4069) db CH7 dw SFX_08_19_Ch3 -SFX_08_1a: ; 20072 (8:4072) +SFX_08_1a:: ; 20072 (8:4072) db ( $80 | CH4 ) dw SFX_08_1a_Ch1 db CH5 @@ -133,7 +133,7 @@ SFX_08_1a: ; 20072 (8:4072) db CH7 dw SFX_08_1a_Ch3 -SFX_08_1b: ; 2007b (8:407b) +SFX_08_1b:: ; 2007b (8:407b) db ( $80 | CH4 ) dw SFX_08_1b_Ch1 db CH5 @@ -141,7 +141,7 @@ SFX_08_1b: ; 2007b (8:407b) db CH7 dw SFX_08_1b_Ch3 -SFX_08_1c: ; 20084 (8:4084) +SFX_08_1c:: ; 20084 (8:4084) db ( $80 | CH4 ) dw SFX_08_1c_Ch1 db CH5 @@ -149,7 +149,7 @@ SFX_08_1c: ; 20084 (8:4084) db CH7 dw SFX_08_1c_Ch3 -SFX_08_1d: ; 2008d (8:408d) +SFX_08_1d:: ; 2008d (8:408d) db ( $80 | CH4 ) dw SFX_08_1d_Ch1 db CH5 @@ -157,7 +157,7 @@ SFX_08_1d: ; 2008d (8:408d) db CH7 dw SFX_08_1d_Ch3 -SFX_08_1e: ; 20096 (8:4096) +SFX_08_1e:: ; 20096 (8:4096) db ( $80 | CH4 ) dw SFX_08_1e_Ch1 db CH5 @@ -165,7 +165,7 @@ SFX_08_1e: ; 20096 (8:4096) db CH7 dw SFX_08_1e_Ch3 -SFX_08_1f: ; 2009f (8:409f) +SFX_08_1f:: ; 2009f (8:409f) db ( $80 | CH4 ) dw SFX_08_1f_Ch1 db CH5 @@ -173,7 +173,7 @@ SFX_08_1f: ; 2009f (8:409f) db CH7 dw SFX_08_1f_Ch3 -SFX_08_20: ; 200a8 (8:40a8) +SFX_08_20:: ; 200a8 (8:40a8) db ( $80 | CH4 ) dw SFX_08_20_Ch1 db CH5 @@ -181,7 +181,7 @@ SFX_08_20: ; 200a8 (8:40a8) db CH7 dw SFX_08_20_Ch3 -SFX_08_21: ; 200b1 (8:40b1) +SFX_08_21:: ; 200b1 (8:40b1) db ( $80 | CH4 ) dw SFX_08_21_Ch1 db CH5 @@ -189,7 +189,7 @@ SFX_08_21: ; 200b1 (8:40b1) db CH7 dw SFX_08_21_Ch3 -SFX_08_22: ; 200ba (8:40ba) +SFX_08_22:: ; 200ba (8:40ba) db ( $80 | CH4 ) dw SFX_08_22_Ch1 db CH5 @@ -197,7 +197,7 @@ SFX_08_22: ; 200ba (8:40ba) db CH7 dw SFX_08_22_Ch3 -SFX_08_23: ; 200c3 (8:40c3) +SFX_08_23:: ; 200c3 (8:40c3) db ( $80 | CH4 ) dw SFX_08_23_Ch1 db CH5 @@ -205,7 +205,7 @@ SFX_08_23: ; 200c3 (8:40c3) db CH7 dw SFX_08_23_Ch3 -SFX_08_24: ; 200cc (8:40cc) +SFX_08_24:: ; 200cc (8:40cc) db ( $80 | CH4 ) dw SFX_08_24_Ch1 db CH5 @@ -213,7 +213,7 @@ SFX_08_24: ; 200cc (8:40cc) db CH7 dw SFX_08_24_Ch3 -SFX_08_25: ; 200d5 (8:40d5) +SFX_08_25:: ; 200d5 (8:40d5) db ( $80 | CH4 ) dw SFX_08_25_Ch1 db CH5 @@ -221,7 +221,7 @@ SFX_08_25: ; 200d5 (8:40d5) db CH7 dw SFX_08_25_Ch3 -SFX_08_26: ; 200de (8:40de) +SFX_08_26:: ; 200de (8:40de) db ( $80 | CH4 ) dw SFX_08_26_Ch1 db CH5 @@ -229,7 +229,7 @@ SFX_08_26: ; 200de (8:40de) db CH7 dw SFX_08_26_Ch3 -SFX_08_27: ; 200e7 (8:40e7) +SFX_08_27:: ; 200e7 (8:40e7) db ( $80 | CH4 ) dw SFX_08_27_Ch1 db CH5 @@ -237,7 +237,7 @@ SFX_08_27: ; 200e7 (8:40e7) db CH7 dw SFX_08_27_Ch3 -SFX_08_28: ; 200f0 (8:40f0) +SFX_08_28:: ; 200f0 (8:40f0) db ( $80 | CH4 ) dw SFX_08_28_Ch1 db CH5 @@ -245,7 +245,7 @@ SFX_08_28: ; 200f0 (8:40f0) db CH7 dw SFX_08_28_Ch3 -SFX_08_29: ; 200f9 (8:40f9) +SFX_08_29:: ; 200f9 (8:40f9) db ( $80 | CH4 ) dw SFX_08_29_Ch1 db CH5 @@ -253,7 +253,7 @@ SFX_08_29: ; 200f9 (8:40f9) db CH7 dw SFX_08_29_Ch3 -SFX_08_2a: ; 20102 (8:4102) +SFX_08_2a:: ; 20102 (8:4102) db ( $80 | CH4 ) dw SFX_08_2a_Ch1 db CH5 @@ -261,7 +261,7 @@ SFX_08_2a: ; 20102 (8:4102) db CH7 dw SFX_08_2a_Ch3 -SFX_08_2b: ; 2010b (8:410b) +SFX_08_2b:: ; 2010b (8:410b) db ( $80 | CH4 ) dw SFX_08_2b_Ch1 db CH5 @@ -269,7 +269,7 @@ SFX_08_2b: ; 2010b (8:410b) db CH7 dw SFX_08_2b_Ch3 -SFX_08_2c: ; 20114 (8:4114) +SFX_08_2c:: ; 20114 (8:4114) db ( $80 | CH4 ) dw SFX_08_2c_Ch1 db CH5 @@ -277,7 +277,7 @@ SFX_08_2c: ; 20114 (8:4114) db CH7 dw SFX_08_2c_Ch3 -SFX_08_2d: ; 2011d (8:411d) +SFX_08_2d:: ; 2011d (8:411d) db ( $80 | CH4 ) dw SFX_08_2d_Ch1 db CH5 @@ -285,7 +285,7 @@ SFX_08_2d: ; 2011d (8:411d) db CH7 dw SFX_08_2d_Ch3 -SFX_08_2e: ; 20126 (8:4126) +SFX_08_2e:: ; 20126 (8:4126) db ( $80 | CH4 ) dw SFX_08_2e_Ch1 db CH5 @@ -293,7 +293,7 @@ SFX_08_2e: ; 20126 (8:4126) db CH7 dw SFX_08_2e_Ch3 -SFX_08_2f: ; 2012f (8:412f) +SFX_08_2f:: ; 2012f (8:412f) db ( $80 | CH4 ) dw SFX_08_2f_Ch1 db CH5 @@ -301,7 +301,7 @@ SFX_08_2f: ; 2012f (8:412f) db CH7 dw SFX_08_2f_Ch3 -SFX_08_30: ; 20138 (8:4138) +SFX_08_30:: ; 20138 (8:4138) db ( $80 | CH4 ) dw SFX_08_30_Ch1 db CH5 @@ -309,7 +309,7 @@ SFX_08_30: ; 20138 (8:4138) db CH7 dw SFX_08_30_Ch3 -SFX_08_31: ; 20141 (8:4141) +SFX_08_31:: ; 20141 (8:4141) db ( $80 | CH4 ) dw SFX_08_31_Ch1 db CH5 @@ -317,7 +317,7 @@ SFX_08_31: ; 20141 (8:4141) db CH7 dw SFX_08_31_Ch3 -SFX_08_32: ; 2014a (8:414a) +SFX_08_32:: ; 2014a (8:414a) db ( $80 | CH4 ) dw SFX_08_32_Ch1 db CH5 @@ -325,7 +325,7 @@ SFX_08_32: ; 2014a (8:414a) db CH7 dw SFX_08_32_Ch3 -SFX_08_33: ; 20153 (8:4153) +SFX_08_33:: ; 20153 (8:4153) db ( $80 | CH4 ) dw SFX_08_33_Ch1 db CH5 @@ -333,7 +333,7 @@ SFX_08_33: ; 20153 (8:4153) db CH7 dw SFX_08_33_Ch3 -SFX_08_34: ; 2015c (8:415c) +SFX_08_34:: ; 2015c (8:415c) db ( $80 | CH4 ) dw SFX_08_34_Ch1 db CH5 @@ -341,7 +341,7 @@ SFX_08_34: ; 2015c (8:415c) db CH7 dw SFX_08_34_Ch3 -SFX_08_35: ; 20165 (8:4165) +SFX_08_35:: ; 20165 (8:4165) db ( $80 | CH4 ) dw SFX_08_35_Ch1 db CH5 @@ -349,7 +349,7 @@ SFX_08_35: ; 20165 (8:4165) db CH7 dw SFX_08_35_Ch3 -SFX_08_36: ; 2016e (8:416e) +SFX_08_36:: ; 2016e (8:416e) db ( $80 | CH4 ) dw SFX_08_36_Ch1 db CH5 @@ -357,7 +357,7 @@ SFX_08_36: ; 2016e (8:416e) db CH7 dw SFX_08_36_Ch3 -SFX_08_37: ; 20177 (8:4177) +SFX_08_37:: ; 20177 (8:4177) db ( $80 | CH4 ) dw SFX_08_37_Ch1 db CH5 @@ -365,7 +365,7 @@ SFX_08_37: ; 20177 (8:4177) db CH7 dw SFX_08_37_Ch3 -SFX_08_38: ; 20180 (8:4180) +SFX_08_38:: ; 20180 (8:4180) db ( $80 | CH4 ) dw SFX_08_38_Ch1 db CH5 @@ -373,7 +373,7 @@ SFX_08_38: ; 20180 (8:4180) db CH7 dw SFX_08_38_Ch3 -SFX_08_39: ; 20189 (8:4189) +SFX_08_39:: ; 20189 (8:4189) db ( $80 | CH4 ) dw SFX_08_39_Ch1 db CH5 @@ -381,7 +381,7 @@ SFX_08_39: ; 20189 (8:4189) db CH7 dw SFX_08_39_Ch3 -SFX_08_3a: ; 20192 (8:4192) +SFX_08_3a:: ; 20192 (8:4192) db ( $80 | CH4 ) dw SFX_08_3a_Ch1 db CH5 @@ -389,7 +389,7 @@ SFX_08_3a: ; 20192 (8:4192) db CH6 dw SFX_08_3a_Ch3 -SFX_08_3b: ; 2019b (8:419b) +SFX_08_3b:: ; 2019b (8:419b) db ( $80 | CH4 ) dw SFX_08_3b_Ch1 db CH5 @@ -397,55 +397,55 @@ SFX_08_3b: ; 2019b (8:419b) db CH6 dw SFX_08_3b_Ch3 -SFX_08_3c: ; 201a4 (8:41a4) +SFX_08_3c:: ; 201a4 (8:41a4) db CH4 dw SFX_08_3c_Ch1 -SFX_08_3d: ; 201a7 (8:41a7) +SFX_08_3d:: ; 201a7 (8:41a7) db CH4 dw SFX_08_3d_Ch1 -SFX_08_3e: ; 201aa (8:41aa) +SFX_08_3e:: ; 201aa (8:41aa) db CH4 dw SFX_08_3e_Ch1 -SFX_08_3f: ; 201ad (8:41ad) +SFX_08_3f:: ; 201ad (8:41ad) db CH7 dw SFX_08_3f_Ch1 -SFX_08_40: ; 201b0 (8:41b0) +SFX_08_40:: ; 201b0 (8:41b0) db CH4 dw SFX_08_40_Ch1 -SFX_08_41: ; 201b3 (8:41b3) +SFX_08_41:: ; 201b3 (8:41b3) db ( $40 | CH4 ) dw SFX_08_41_Ch1 db CH5 dw SFX_08_41_Ch2 -SFX_08_42: ; 201b9 (8:41b9) +SFX_08_42:: ; 201b9 (8:41b9) db ( $40 | CH4 ) dw SFX_08_42_Ch1 db CH7 dw SFX_08_42_Ch2 -SFX_08_43: ; 201bf (8:41bf) +SFX_08_43:: ; 201bf (8:41bf) db ( $40 | CH4 ) dw SFX_08_43_Ch1 db CH7 dw SFX_08_43_Ch2 -SFX_08_44: ; 201c5 (8:41c5) +SFX_08_44:: ; 201c5 (8:41c5) db CH7 dw SFX_08_44_Ch1 -SFX_08_45: ; 201c8 (8:41c8) +SFX_08_45:: ; 201c8 (8:41c8) db ( $40 | CH4 ) dw SFX_08_45_Ch1 db CH5 dw SFX_08_45_Ch2 -SFX_08_46: ; 201ce (8:41ce) +SFX_08_46:: ; 201ce (8:41ce) db ( $80 | CH4 ) dw SFX_08_46_Ch1 db CH5 @@ -453,139 +453,139 @@ SFX_08_46: ; 201ce (8:41ce) db CH6 dw SFX_08_46_Ch3 -SFX_08_47: ; 201d7 (8:41d7) +SFX_08_47:: ; 201d7 (8:41d7) db CH7 dw SFX_08_47_Ch1 -SFX_08_48: ; 201da (8:41da) +SFX_08_48:: ; 201da (8:41da) db CH4 dw SFX_08_48_Ch1 -SFX_08_49: ; 201dd (8:41dd) +SFX_08_49:: ; 201dd (8:41dd) db CH4 dw SFX_08_49_Ch1 -SFX_08_4a: ; 201e0 (8:41e0) +SFX_08_4a:: ; 201e0 (8:41e0) db CH7 dw SFX_08_4a_Ch1 -SFX_08_4b: ; 201e3 (8:41e3) +SFX_08_4b:: ; 201e3 (8:41e3) db CH7 dw SFX_08_4b_Ch1 -SFX_08_4c: ; 201e6 (8:41e6) +SFX_08_4c:: ; 201e6 (8:41e6) db CH7 dw SFX_08_4c_Ch1 -SFX_08_4d: ; 201e9 (8:41e9) +SFX_08_4d:: ; 201e9 (8:41e9) db CH7 dw SFX_08_4d_Ch1 -SFX_08_4e: ; 201ec (8:41ec) +SFX_08_4e:: ; 201ec (8:41ec) db CH7 dw SFX_08_4e_Ch1 -SFX_08_4f: ; 201ef (8:41ef) +SFX_08_4f:: ; 201ef (8:41ef) db CH7 dw SFX_08_4f_Ch1 -SFX_08_50: ; 201f2 (8:41f2) +SFX_08_50:: ; 201f2 (8:41f2) db CH7 dw SFX_08_50_Ch1 -SFX_08_51: ; 201f5 (8:41f5) +SFX_08_51:: ; 201f5 (8:41f5) db CH7 dw SFX_08_51_Ch1 -SFX_08_52: ; 201f8 (8:41f8) +SFX_08_52:: ; 201f8 (8:41f8) db CH7 dw SFX_08_52_Ch1 -SFX_08_53: ; 201fb (8:41fb) +SFX_08_53:: ; 201fb (8:41fb) db CH7 dw SFX_08_53_Ch1 -SFX_08_54: ; 201fe (8:41fe) +SFX_08_54:: ; 201fe (8:41fe) db CH7 dw SFX_08_54_Ch1 -SFX_08_55: ; 20201 (8:4201) +SFX_08_55:: ; 20201 (8:4201) db CH7 dw SFX_08_55_Ch1 -SFX_08_56: ; 20204 (8:4204) +SFX_08_56:: ; 20204 (8:4204) db CH7 dw SFX_08_56_Ch1 -SFX_08_57: ; 20207 (8:4207) +SFX_08_57:: ; 20207 (8:4207) db CH7 dw SFX_08_57_Ch1 -SFX_08_58: ; 2020a (8:420a) +SFX_08_58:: ; 2020a (8:420a) db CH7 dw SFX_08_58_Ch1 -SFX_08_59: ; 2020d (8:420d) +SFX_08_59:: ; 2020d (8:420d) db CH7 dw SFX_08_59_Ch1 -SFX_08_5a: ; 20210 (8:4210) +SFX_08_5a:: ; 20210 (8:4210) db CH7 dw SFX_08_5a_Ch1 -SFX_08_5b: ; 20213 (8:4213) +SFX_08_5b:: ; 20213 (8:4213) db CH7 dw SFX_08_5b_Ch1 -SFX_08_5c: ; 20216 (8:4216) +SFX_08_5c:: ; 20216 (8:4216) db CH7 dw SFX_08_5c_Ch1 -SFX_08_5d: ; 20219 (8:4219) +SFX_08_5d:: ; 20219 (8:4219) db CH7 dw SFX_08_5d_Ch1 -SFX_08_5e: ; 2021c (8:421c) +SFX_08_5e:: ; 2021c (8:421c) db ( $40 | CH4 ) dw SFX_08_5e_Ch1 db CH7 dw SFX_08_5e_Ch2 -SFX_08_5f: ; 20222 (8:4222) +SFX_08_5f:: ; 20222 (8:4222) db CH7 dw SFX_08_5f_Ch1 -SFX_08_60: ; 20225 (8:4225) +SFX_08_60:: ; 20225 (8:4225) db CH7 dw SFX_08_60_Ch1 -SFX_08_61: ; 20228 (8:4228) +SFX_08_61:: ; 20228 (8:4228) db CH7 dw SFX_08_61_Ch1 -SFX_08_62: ; 2022b (8:422b) +SFX_08_62:: ; 2022b (8:422b) db CH7 dw SFX_08_62_Ch1 -SFX_08_63: ; 2022e (8:422e) +SFX_08_63:: ; 2022e (8:422e) db CH7 dw SFX_08_63_Ch1 -SFX_08_64: ; 20231 (8:4231) +SFX_08_64:: ; 20231 (8:4231) db ( $40 | CH4 ) dw SFX_08_64_Ch1 db CH7 dw SFX_08_64_Ch2 -SFX_08_65: ; 20237 (8:4237) +SFX_08_65:: ; 20237 (8:4237) db CH7 dw SFX_08_65_Ch1 -SFX_08_66: ; 2023a (8:423a) +SFX_08_66:: ; 2023a (8:423a) db CH7 dw SFX_08_66_Ch1 -SFX_08_67: ; 2023d (8:423d) +SFX_08_67:: ; 2023d (8:423d) db ( $80 | CH4 ) dw SFX_08_67_Ch1 db CH5 @@ -593,7 +593,7 @@ SFX_08_67: ; 2023d (8:423d) db CH7 dw SFX_08_67_Ch3 -SFX_08_68: ; 20246 (8:4246) +SFX_08_68:: ; 20246 (8:4246) db ( $80 | CH4 ) dw SFX_08_68_Ch1 db CH5 @@ -601,13 +601,13 @@ SFX_08_68: ; 20246 (8:4246) db CH7 dw SFX_08_68_Ch3 -SFX_08_69: ; 2024f (8:424f) +SFX_08_69:: ; 2024f (8:424f) db ( $40 | CH4 ) dw SFX_08_69_Ch1 db CH7 dw SFX_08_69_Ch2 -SFX_08_6a: ; 20255 (8:4255) +SFX_08_6a:: ; 20255 (8:4255) db ( $80 | CH4 ) dw SFX_08_6a_Ch1 db CH5 @@ -615,13 +615,13 @@ SFX_08_6a: ; 20255 (8:4255) db CH7 dw SFX_08_6a_Ch3 -SFX_08_6b: ; 2025e (8:425e) +SFX_08_6b:: ; 2025e (8:425e) db ( $40 | CH4 ) dw SFX_08_6b_Ch1 db CH7 dw SFX_08_6b_Ch2 -SFX_08_6c: ; 20264 (8:4264) +SFX_08_6c:: ; 20264 (8:4264) db ( $80 | CH4 ) dw SFX_08_6c_Ch1 db CH5 @@ -629,7 +629,7 @@ SFX_08_6c: ; 20264 (8:4264) db CH7 dw SFX_08_6c_Ch3 -SFX_08_6d: ; 2026d (8:426d) +SFX_08_6d:: ; 2026d (8:426d) db ( $80 | CH4 ) dw SFX_08_6d_Ch1 db CH5 @@ -637,7 +637,7 @@ SFX_08_6d: ; 2026d (8:426d) db CH7 dw SFX_08_6d_Ch3 -SFX_08_6e: ; 20276 (8:4276) +SFX_08_6e:: ; 20276 (8:4276) db ( $80 | CH4 ) dw SFX_08_6e_Ch1 db CH5 @@ -645,7 +645,7 @@ SFX_08_6e: ; 20276 (8:4276) db CH7 dw SFX_08_6e_Ch3 -SFX_08_6f: ; 2027f (8:427f) +SFX_08_6f:: ; 2027f (8:427f) db ( $80 | CH4 ) dw SFX_08_6f_Ch1 db CH5 @@ -653,7 +653,7 @@ SFX_08_6f: ; 2027f (8:427f) db CH7 dw SFX_08_6f_Ch3 -SFX_08_70: ; 20288 (8:4288) +SFX_08_70:: ; 20288 (8:4288) db ( $80 | CH4 ) dw SFX_08_70_Ch1 db CH5 @@ -661,25 +661,25 @@ SFX_08_70: ; 20288 (8:4288) db CH7 dw SFX_08_70_Ch3 -SFX_08_71: ; 20291 (8:4291) +SFX_08_71:: ; 20291 (8:4291) db ( $40 | CH4 ) dw SFX_08_71_Ch1 db CH5 dw SFX_08_71_Ch2 -SFX_08_72: ; 20297 (8:4297) +SFX_08_72:: ; 20297 (8:4297) db ( $40 | CH4 ) dw SFX_08_72_Ch1 db CH5 dw SFX_08_72_Ch2 -SFX_08_73: ; 2029d (8:429d) +SFX_08_73:: ; 2029d (8:429d) db ( $40 | CH4 ) dw SFX_08_73_Ch1 db CH5 dw SFX_08_73_Ch2 -SFX_08_74: ; 202a3 (8:42a3) +SFX_08_74:: ; 202a3 (8:42a3) db ( $80 | CH4 ) dw SFX_08_74_Ch1 db CH5 @@ -687,13 +687,13 @@ SFX_08_74: ; 202a3 (8:42a3) db CH7 dw SFX_08_74_Ch3 -SFX_08_75: ; 202ac (8:42ac) +SFX_08_75:: ; 202ac (8:42ac) db ( $40 | CH4 ) dw SFX_08_75_Ch1 db CH5 dw SFX_08_75_Ch2 -SFX_08_76: ; 202b2 (8:42b2) +SFX_08_76:: ; 202b2 (8:42b2) db ( $80 | CH4 ) dw SFX_08_76_Ch1 db CH5 @@ -701,7 +701,7 @@ SFX_08_76: ; 202b2 (8:42b2) db CH7 dw SFX_08_76_Ch3 -SFX_08_77: ; 202bb (8:42bb) +SFX_08_77:: ; 202bb (8:42bb) db CH4 dw SFX_08_77_Ch1 diff --git a/music/headers/sfxheaders1f.asm b/music/headers/sfxheaders1f.asm index e302e3c1..4db63a59 100644 --- a/music/headers/sfxheaders1f.asm +++ b/music/headers/sfxheaders1f.asm @@ -1,83 +1,83 @@ -SFX_Headers_1f: +SFX_Headers_1f:: db $ff, $ff, $ff ; padding -SFX_1f_01: ; 7c003 (1f:4003) +SFX_1f_01:: ; 7c003 (1f:4003) db CH7 dw SFX_1f_01_Ch1 -SFX_1f_02: ; 7c006 (1f:4006) +SFX_1f_02:: ; 7c006 (1f:4006) db CH7 dw SFX_1f_02_Ch1 -SFX_1f_03: ; 7c009 (1f:4009) +SFX_1f_03:: ; 7c009 (1f:4009) db CH7 dw SFX_1f_03_Ch1 -SFX_1f_04: ; 7c00c (1f:400c) +SFX_1f_04:: ; 7c00c (1f:400c) db CH7 dw SFX_1f_04_Ch1 -SFX_1f_05: ; 7c00f (1f:400f) +SFX_1f_05:: ; 7c00f (1f:400f) db CH7 dw SFX_1f_05_Ch1 -SFX_1f_06: ; 7c012 (1f:4012) +SFX_1f_06:: ; 7c012 (1f:4012) db CH7 dw SFX_1f_06_Ch1 -SFX_1f_07: ; 7c015 (1f:4015) +SFX_1f_07:: ; 7c015 (1f:4015) db CH7 dw SFX_1f_07_Ch1 -SFX_1f_08: ; 7c018 (1f:4018) +SFX_1f_08:: ; 7c018 (1f:4018) db CH7 dw SFX_1f_08_Ch1 -SFX_1f_09: ; 7c01b (1f:401b) +SFX_1f_09:: ; 7c01b (1f:401b) db CH7 dw SFX_1f_09_Ch1 -SFX_1f_0a: ; 7c01e (1f:401e) +SFX_1f_0a:: ; 7c01e (1f:401e) db CH7 dw SFX_1f_0a_Ch1 -SFX_1f_0b: ; 7c021 (1f:4021) +SFX_1f_0b:: ; 7c021 (1f:4021) db CH7 dw SFX_1f_0b_Ch1 -SFX_1f_0c: ; 7c024 (1f:4024) +SFX_1f_0c:: ; 7c024 (1f:4024) db CH7 dw SFX_1f_0c_Ch1 -SFX_1f_0d: ; 7c027 (1f:4027) +SFX_1f_0d:: ; 7c027 (1f:4027) db CH7 dw SFX_1f_0d_Ch1 -SFX_1f_0e: ; 7c02a (1f:402a) +SFX_1f_0e:: ; 7c02a (1f:402a) db CH7 dw SFX_1f_0e_Ch1 -SFX_1f_0f: ; 7c02d (1f:402d) +SFX_1f_0f:: ; 7c02d (1f:402d) db CH7 dw SFX_1f_0f_Ch1 -SFX_1f_10: ; 7c030 (1f:4030) +SFX_1f_10:: ; 7c030 (1f:4030) db CH7 dw SFX_1f_10_Ch1 -SFX_1f_11: ; 7c033 (1f:4033) +SFX_1f_11:: ; 7c033 (1f:4033) db CH7 dw SFX_1f_11_Ch1 -SFX_1f_12: ; 7c036 (1f:4036) +SFX_1f_12:: ; 7c036 (1f:4036) db CH7 dw SFX_1f_12_Ch1 -SFX_1f_13: ; 7c039 (1f:4039) +SFX_1f_13:: ; 7c039 (1f:4039) db CH7 dw SFX_1f_13_Ch1 -SFX_1f_14: ; 7c03c (1f:403c) +SFX_1f_14:: ; 7c03c (1f:403c) db ( $80 | CH4 ) dw SFX_1f_14_Ch1 db CH5 @@ -85,7 +85,7 @@ SFX_1f_14: ; 7c03c (1f:403c) db CH7 dw SFX_1f_14_Ch3 -SFX_1f_15: ; 7c045 (1f:4045) +SFX_1f_15:: ; 7c045 (1f:4045) db ( $80 | CH4 ) dw SFX_1f_15_Ch1 db CH5 @@ -93,7 +93,7 @@ SFX_1f_15: ; 7c045 (1f:4045) db CH7 dw SFX_1f_15_Ch3 -SFX_1f_16: ; 7c04e (1f:404e) +SFX_1f_16:: ; 7c04e (1f:404e) db ( $80 | CH4 ) dw SFX_1f_16_Ch1 db CH5 @@ -101,7 +101,7 @@ SFX_1f_16: ; 7c04e (1f:404e) db CH7 dw SFX_1f_16_Ch3 -SFX_1f_17: ; 7c057 (1f:4057) +SFX_1f_17:: ; 7c057 (1f:4057) db ( $80 | CH4 ) dw SFX_1f_17_Ch1 db CH5 @@ -109,7 +109,7 @@ SFX_1f_17: ; 7c057 (1f:4057) db CH7 dw SFX_1f_17_Ch3 -SFX_1f_18: ; 7c060 (1f:4060) +SFX_1f_18:: ; 7c060 (1f:4060) db ( $80 | CH4 ) dw SFX_1f_18_Ch1 db CH5 @@ -117,7 +117,7 @@ SFX_1f_18: ; 7c060 (1f:4060) db CH7 dw SFX_1f_18_Ch3 -SFX_1f_19: ; 7c069 (1f:4069) +SFX_1f_19:: ; 7c069 (1f:4069) db ( $80 | CH4 ) dw SFX_1f_19_Ch1 db CH5 @@ -125,7 +125,7 @@ SFX_1f_19: ; 7c069 (1f:4069) db CH7 dw SFX_1f_19_Ch3 -SFX_1f_1a: ; 7c072 (1f:4072) +SFX_1f_1a:: ; 7c072 (1f:4072) db ( $80 | CH4 ) dw SFX_1f_1a_Ch1 db CH5 @@ -133,7 +133,7 @@ SFX_1f_1a: ; 7c072 (1f:4072) db CH7 dw SFX_1f_1a_Ch3 -SFX_1f_1b: ; 7c07b (1f:407b) +SFX_1f_1b:: ; 7c07b (1f:407b) db ( $80 | CH4 ) dw SFX_1f_1b_Ch1 db CH5 @@ -141,7 +141,7 @@ SFX_1f_1b: ; 7c07b (1f:407b) db CH7 dw SFX_1f_1b_Ch3 -SFX_1f_1c: ; 7c084 (1f:4084) +SFX_1f_1c:: ; 7c084 (1f:4084) db ( $80 | CH4 ) dw SFX_1f_1c_Ch1 db CH5 @@ -149,7 +149,7 @@ SFX_1f_1c: ; 7c084 (1f:4084) db CH7 dw SFX_1f_1c_Ch3 -SFX_1f_1d: ; 7c08d (1f:408d) +SFX_1f_1d:: ; 7c08d (1f:408d) db ( $80 | CH4 ) dw SFX_1f_1d_Ch1 db CH5 @@ -157,7 +157,7 @@ SFX_1f_1d: ; 7c08d (1f:408d) db CH7 dw SFX_1f_1d_Ch3 -SFX_1f_1e: ; 7c096 (1f:4096) +SFX_1f_1e:: ; 7c096 (1f:4096) db ( $80 | CH4 ) dw SFX_1f_1e_Ch1 db CH5 @@ -165,7 +165,7 @@ SFX_1f_1e: ; 7c096 (1f:4096) db CH7 dw SFX_1f_1e_Ch3 -SFX_1f_1f: ; 7c09f (1f:409f) +SFX_1f_1f:: ; 7c09f (1f:409f) db ( $80 | CH4 ) dw SFX_1f_1f_Ch1 db CH5 @@ -173,7 +173,7 @@ SFX_1f_1f: ; 7c09f (1f:409f) db CH7 dw SFX_1f_1f_Ch3 -SFX_1f_20: ; 7c0a8 (1f:40a8) +SFX_1f_20:: ; 7c0a8 (1f:40a8) db ( $80 | CH4 ) dw SFX_1f_20_Ch1 db CH5 @@ -181,7 +181,7 @@ SFX_1f_20: ; 7c0a8 (1f:40a8) db CH7 dw SFX_1f_20_Ch3 -SFX_1f_21: ; 7c0b1 (1f:40b1) +SFX_1f_21:: ; 7c0b1 (1f:40b1) db ( $80 | CH4 ) dw SFX_1f_21_Ch1 db CH5 @@ -189,7 +189,7 @@ SFX_1f_21: ; 7c0b1 (1f:40b1) db CH7 dw SFX_1f_21_Ch3 -SFX_1f_22: ; 7c0ba (1f:40ba) +SFX_1f_22:: ; 7c0ba (1f:40ba) db ( $80 | CH4 ) dw SFX_1f_22_Ch1 db CH5 @@ -197,7 +197,7 @@ SFX_1f_22: ; 7c0ba (1f:40ba) db CH7 dw SFX_1f_22_Ch3 -SFX_1f_23: ; 7c0c3 (1f:40c3) +SFX_1f_23:: ; 7c0c3 (1f:40c3) db ( $80 | CH4 ) dw SFX_1f_23_Ch1 db CH5 @@ -205,7 +205,7 @@ SFX_1f_23: ; 7c0c3 (1f:40c3) db CH7 dw SFX_1f_23_Ch3 -SFX_1f_24: ; 7c0cc (1f:40cc) +SFX_1f_24:: ; 7c0cc (1f:40cc) db ( $80 | CH4 ) dw SFX_1f_24_Ch1 db CH5 @@ -213,7 +213,7 @@ SFX_1f_24: ; 7c0cc (1f:40cc) db CH7 dw SFX_1f_24_Ch3 -SFX_1f_25: ; 7c0d5 (1f:40d5) +SFX_1f_25:: ; 7c0d5 (1f:40d5) db ( $80 | CH4 ) dw SFX_1f_25_Ch1 db CH5 @@ -221,7 +221,7 @@ SFX_1f_25: ; 7c0d5 (1f:40d5) db CH7 dw SFX_1f_25_Ch3 -SFX_1f_26: ; 7c0de (1f:40de) +SFX_1f_26:: ; 7c0de (1f:40de) db ( $80 | CH4 ) dw SFX_1f_26_Ch1 db CH5 @@ -229,7 +229,7 @@ SFX_1f_26: ; 7c0de (1f:40de) db CH7 dw SFX_1f_26_Ch3 -SFX_1f_27: ; 7c0e7 (1f:40e7) +SFX_1f_27:: ; 7c0e7 (1f:40e7) db ( $80 | CH4 ) dw SFX_1f_27_Ch1 db CH5 @@ -237,7 +237,7 @@ SFX_1f_27: ; 7c0e7 (1f:40e7) db CH7 dw SFX_1f_27_Ch3 -SFX_1f_28: ; 7c0f0 (1f:40f0) +SFX_1f_28:: ; 7c0f0 (1f:40f0) db ( $80 | CH4 ) dw SFX_1f_28_Ch1 db CH5 @@ -245,7 +245,7 @@ SFX_1f_28: ; 7c0f0 (1f:40f0) db CH7 dw SFX_1f_28_Ch3 -SFX_1f_29: ; 7c0f9 (1f:40f9) +SFX_1f_29:: ; 7c0f9 (1f:40f9) db ( $80 | CH4 ) dw SFX_1f_29_Ch1 db CH5 @@ -253,7 +253,7 @@ SFX_1f_29: ; 7c0f9 (1f:40f9) db CH7 dw SFX_1f_29_Ch3 -SFX_1f_2a: ; 7c102 (1f:4102) +SFX_1f_2a:: ; 7c102 (1f:4102) db ( $80 | CH4 ) dw SFX_1f_2a_Ch1 db CH5 @@ -261,7 +261,7 @@ SFX_1f_2a: ; 7c102 (1f:4102) db CH7 dw SFX_1f_2a_Ch3 -SFX_1f_2b: ; 7c10b (1f:410b) +SFX_1f_2b:: ; 7c10b (1f:410b) db ( $80 | CH4 ) dw SFX_1f_2b_Ch1 db CH5 @@ -269,7 +269,7 @@ SFX_1f_2b: ; 7c10b (1f:410b) db CH7 dw SFX_1f_2b_Ch3 -SFX_1f_2c: ; 7c114 (1f:4114) +SFX_1f_2c:: ; 7c114 (1f:4114) db ( $80 | CH4 ) dw SFX_1f_2c_Ch1 db CH5 @@ -277,7 +277,7 @@ SFX_1f_2c: ; 7c114 (1f:4114) db CH7 dw SFX_1f_2c_Ch3 -SFX_1f_2d: ; 7c11d (1f:411d) +SFX_1f_2d:: ; 7c11d (1f:411d) db ( $80 | CH4 ) dw SFX_1f_2d_Ch1 db CH5 @@ -285,7 +285,7 @@ SFX_1f_2d: ; 7c11d (1f:411d) db CH7 dw SFX_1f_2d_Ch3 -SFX_1f_2e: ; 7c126 (1f:4126) +SFX_1f_2e:: ; 7c126 (1f:4126) db ( $80 | CH4 ) dw SFX_1f_2e_Ch1 db CH5 @@ -293,7 +293,7 @@ SFX_1f_2e: ; 7c126 (1f:4126) db CH7 dw SFX_1f_2e_Ch3 -SFX_1f_2f: ; 7c12f (1f:412f) +SFX_1f_2f:: ; 7c12f (1f:412f) db ( $80 | CH4 ) dw SFX_1f_2f_Ch1 db CH5 @@ -301,7 +301,7 @@ SFX_1f_2f: ; 7c12f (1f:412f) db CH7 dw SFX_1f_2f_Ch3 -SFX_1f_30: ; 7c138 (1f:4138) +SFX_1f_30:: ; 7c138 (1f:4138) db ( $80 | CH4 ) dw SFX_1f_30_Ch1 db CH5 @@ -309,7 +309,7 @@ SFX_1f_30: ; 7c138 (1f:4138) db CH7 dw SFX_1f_30_Ch3 -SFX_1f_31: ; 7c141 (1f:4141) +SFX_1f_31:: ; 7c141 (1f:4141) db ( $80 | CH4 ) dw SFX_1f_31_Ch1 db CH5 @@ -317,7 +317,7 @@ SFX_1f_31: ; 7c141 (1f:4141) db CH7 dw SFX_1f_31_Ch3 -SFX_1f_32: ; 7c14a (1f:414a) +SFX_1f_32:: ; 7c14a (1f:414a) db ( $80 | CH4 ) dw SFX_1f_32_Ch1 db CH5 @@ -325,7 +325,7 @@ SFX_1f_32: ; 7c14a (1f:414a) db CH7 dw SFX_1f_32_Ch3 -SFX_1f_33: ; 7c153 (1f:4153) +SFX_1f_33:: ; 7c153 (1f:4153) db ( $80 | CH4 ) dw SFX_1f_33_Ch1 db CH5 @@ -333,7 +333,7 @@ SFX_1f_33: ; 7c153 (1f:4153) db CH7 dw SFX_1f_33_Ch3 -SFX_1f_34: ; 7c15c (1f:415c) +SFX_1f_34:: ; 7c15c (1f:415c) db ( $80 | CH4 ) dw SFX_1f_34_Ch1 db CH5 @@ -341,7 +341,7 @@ SFX_1f_34: ; 7c15c (1f:415c) db CH7 dw SFX_1f_34_Ch3 -SFX_1f_35: ; 7c165 (1f:4165) +SFX_1f_35:: ; 7c165 (1f:4165) db ( $80 | CH4 ) dw SFX_1f_35_Ch1 db CH5 @@ -349,7 +349,7 @@ SFX_1f_35: ; 7c165 (1f:4165) db CH7 dw SFX_1f_35_Ch3 -SFX_1f_36: ; 7c16e (1f:416e) +SFX_1f_36:: ; 7c16e (1f:416e) db ( $80 | CH4 ) dw SFX_1f_36_Ch1 db CH5 @@ -357,7 +357,7 @@ SFX_1f_36: ; 7c16e (1f:416e) db CH7 dw SFX_1f_36_Ch3 -SFX_1f_37: ; 7c177 (1f:4177) +SFX_1f_37:: ; 7c177 (1f:4177) db ( $80 | CH4 ) dw SFX_1f_37_Ch1 db CH5 @@ -365,7 +365,7 @@ SFX_1f_37: ; 7c177 (1f:4177) db CH7 dw SFX_1f_37_Ch3 -SFX_1f_38: ; 7c180 (1f:4180) +SFX_1f_38:: ; 7c180 (1f:4180) db ( $80 | CH4 ) dw SFX_1f_38_Ch1 db CH5 @@ -373,7 +373,7 @@ SFX_1f_38: ; 7c180 (1f:4180) db CH7 dw SFX_1f_38_Ch3 -SFX_1f_39: ; 7c189 (1f:4189) +SFX_1f_39:: ; 7c189 (1f:4189) db ( $80 | CH4 ) dw SFX_1f_39_Ch1 db CH5 @@ -381,7 +381,7 @@ SFX_1f_39: ; 7c189 (1f:4189) db CH7 dw SFX_1f_39_Ch3 -SFX_1f_3a: ; 7c192 (1f:4192) +SFX_1f_3a:: ; 7c192 (1f:4192) db ( $80 | CH4 ) dw SFX_1f_3a_Ch1 db CH5 @@ -389,7 +389,7 @@ SFX_1f_3a: ; 7c192 (1f:4192) db CH6 dw SFX_1f_3a_Ch3 -SFX_1f_3b: ; 7c19b (1f:419b) +SFX_1f_3b:: ; 7c19b (1f:419b) db ( $80 | CH4 ) dw SFX_1f_3b_Ch1 db CH5 @@ -397,27 +397,27 @@ SFX_1f_3b: ; 7c19b (1f:419b) db CH6 dw SFX_1f_3b_Ch3 -SFX_1f_3c: ; 7c1a4 (1f:41a4) +SFX_1f_3c:: ; 7c1a4 (1f:41a4) db CH4 dw SFX_1f_3c_Ch1 -SFX_1f_3d: ; 7c1a7 (1f:41a7) +SFX_1f_3d:: ; 7c1a7 (1f:41a7) db CH4 dw SFX_1f_3d_Ch1 -SFX_1f_3e: ; 7c1aa (1f:41aa) +SFX_1f_3e:: ; 7c1aa (1f:41aa) db CH4 dw SFX_1f_3e_Ch1 -SFX_1f_3f: ; 7c1ad (1f:41ad) +SFX_1f_3f:: ; 7c1ad (1f:41ad) db CH7 dw SFX_1f_3f_Ch1 -SFX_1f_40: ; 7c1b0 (1f:41b0) +SFX_1f_40:: ; 7c1b0 (1f:41b0) db CH4 dw SFX_1f_40_Ch1 -SFX_1f_41: ; 7c1b3 (1f:41b3) +SFX_1f_41:: ; 7c1b3 (1f:41b3) db ( $80 | CH4 ) dw SFX_1f_41_Ch1 db CH5 @@ -425,7 +425,7 @@ SFX_1f_41: ; 7c1b3 (1f:41b3) db CH6 dw SFX_1f_41_Ch3 -SFX_1f_42: ; 7c1bc (1f:41bc) +SFX_1f_42:: ; 7c1bc (1f:41bc) db ( $80 | CH4 ) dw SFX_1f_42_Ch1 db CH5 @@ -433,165 +433,165 @@ SFX_1f_42: ; 7c1bc (1f:41bc) db CH6 dw SFX_1f_42_Ch3 -SFX_1f_43: ; 7c1c5 (1f:41c5) +SFX_1f_43:: ; 7c1c5 (1f:41c5) db CH4 dw SFX_1f_43_Ch1 -SFX_1f_44: ; 7c1c8 (1f:41c8) +SFX_1f_44:: ; 7c1c8 (1f:41c8) db CH4 dw SFX_1f_44_Ch1 -SFX_1f_45: ; 7c1cb (1f:41cb) +SFX_1f_45:: ; 7c1cb (1f:41cb) db CH4 dw SFX_1f_45_Ch1 -SFX_1f_46: ; 7c1ce (1f:41ce) +SFX_1f_46:: ; 7c1ce (1f:41ce) db CH4 dw SFX_1f_46_Ch1 -SFX_1f_47: ; 7c1d1 (1f:41d1) +SFX_1f_47:: ; 7c1d1 (1f:41d1) db CH4 dw SFX_1f_47_Ch1 -SFX_1f_48: ; 7c1d4 (1f:41d4) +SFX_1f_48:: ; 7c1d4 (1f:41d4) db CH4 dw SFX_1f_48_Ch1 -SFX_1f_49: ; 7c1d7 (1f:41d7) +SFX_1f_49:: ; 7c1d7 (1f:41d7) db CH4 dw SFX_1f_49_Ch1 -SFX_1f_4a: ; 7c1da (1f:41da) +SFX_1f_4a:: ; 7c1da (1f:41da) db CH4 dw SFX_1f_4a_Ch1 -SFX_1f_4b: ; 7c1dd (1f:41dd) +SFX_1f_4b:: ; 7c1dd (1f:41dd) db CH4 dw SFX_1f_4b_Ch1 -SFX_1f_4c: ; 7c1e0 (1f:41e0) +SFX_1f_4c:: ; 7c1e0 (1f:41e0) db CH4 dw SFX_1f_4c_Ch1 -SFX_1f_4d: ; 7c1e3 (1f:41e3) +SFX_1f_4d:: ; 7c1e3 (1f:41e3) db CH4 dw SFX_1f_4d_Ch1 -SFX_1f_4e: ; 7c1e6 (1f:41e6) +SFX_1f_4e:: ; 7c1e6 (1f:41e6) db CH4 dw SFX_1f_4e_Ch1 -SFX_1f_4f: ; 7c1e9 (1f:41e9) +SFX_1f_4f:: ; 7c1e9 (1f:41e9) db CH7 dw SFX_1f_4f_Ch1 -SFX_1f_50: ; 7c1ec (1f:41ec) +SFX_1f_50:: ; 7c1ec (1f:41ec) db CH7 dw SFX_1f_50_Ch1 -SFX_1f_51: ; 7c1ef (1f:41ef) +SFX_1f_51:: ; 7c1ef (1f:41ef) db ( $40 | CH4 ) dw SFX_1f_51_Ch1 db CH5 dw SFX_1f_51_Ch2 -SFX_1f_52: ; 7c1f5 (1f:41f5) +SFX_1f_52:: ; 7c1f5 (1f:41f5) db CH4 dw SFX_1f_52_Ch1 -SFX_1f_53: ; 7c1f8 (1f:41f8) +SFX_1f_53:: ; 7c1f8 (1f:41f8) db CH7 dw SFX_1f_53_Ch1 -SFX_1f_54: ; 7c1fb (1f:41fb) +SFX_1f_54:: ; 7c1fb (1f:41fb) db ( $40 | CH4 ) dw SFX_1f_54_Ch1 db CH5 dw SFX_1f_54_Ch2 -SFX_1f_55: ; 7c201 (1f:4201) +SFX_1f_55:: ; 7c201 (1f:4201) db CH4 dw SFX_1f_55_Ch1 -SFX_1f_56: ; 7c204 (1f:4204) +SFX_1f_56:: ; 7c204 (1f:4204) db CH7 dw SFX_1f_56_Ch1 -SFX_1f_57: ; 7c207 (1f:4207) +SFX_1f_57:: ; 7c207 (1f:4207) db CH7 dw SFX_1f_57_Ch1 -SFX_1f_58: ; 7c20a (1f:420a) +SFX_1f_58:: ; 7c20a (1f:420a) db ( $40 | CH4 ) dw SFX_1f_58_Ch1 db CH5 dw SFX_1f_58_Ch2 -SFX_1f_59: ; 7c210 (1f:4210) +SFX_1f_59:: ; 7c210 (1f:4210) db ( $40 | CH4 ) dw SFX_1f_59_Ch1 db CH5 dw SFX_1f_59_Ch2 -SFX_1f_5a: ; 7c216 (1f:4216) +SFX_1f_5a:: ; 7c216 (1f:4216) db ( $40 | CH4 ) dw SFX_1f_5a_Ch1 db CH5 dw SFX_1f_5a_Ch2 -SFX_1f_5b: ; 7c21c (1f:421c) +SFX_1f_5b:: ; 7c21c (1f:421c) db CH4 dw SFX_1f_5b_Ch1 -SFX_1f_5c: ; 7c21f (1f:421f) +SFX_1f_5c:: ; 7c21f (1f:421f) db CH7 dw SFX_1f_5c_Ch1 -SFX_1f_5d: ; 7c222 (1f:4222) +SFX_1f_5d:: ; 7c222 (1f:4222) db ( $40 | CH4 ) dw SFX_1f_5d_Ch1 db CH5 dw SFX_1f_5d_Ch2 -SFX_1f_5e: ; 7c228 (1f:4228) +SFX_1f_5e:: ; 7c228 (1f:4228) db CH7 dw SFX_1f_5e_Ch1 -SFX_1f_5f: ; 7c22b (1f:422b) +SFX_1f_5f:: ; 7c22b (1f:422b) db CH4 dw SFX_1f_5f_Ch1 -SFX_1f_60: ; 7c22e (1f:422e) +SFX_1f_60:: ; 7c22e (1f:422e) db CH4 dw SFX_1f_60_Ch1 -SFX_1f_61: ; 7c231 (1f:4231) +SFX_1f_61:: ; 7c231 (1f:4231) db CH7 dw SFX_1f_61_Ch1 -SFX_1f_62: ; 7c234 (1f:4234) +SFX_1f_62:: ; 7c234 (1f:4234) db CH7 dw SFX_1f_62_Ch1 -SFX_1f_63: ; 7c237 (1f:4237) +SFX_1f_63:: ; 7c237 (1f:4237) db CH7 dw SFX_1f_63_Ch1 -SFX_1f_64: ; 7c23a (1f:423a) +SFX_1f_64:: ; 7c23a (1f:423a) db CH4 dw SFX_1f_64_Ch1 -SFX_1f_65: ; 7c23d (1f:423d) +SFX_1f_65:: ; 7c23d (1f:423d) db CH4 dw SFX_1f_65_Ch1 -SFX_1f_66: ; 7c240 (1f:4240) +SFX_1f_66:: ; 7c240 (1f:4240) db ( $40 | CH4 ) dw SFX_1f_66_Ch1 db CH5 dw SFX_1f_66_Ch2 -SFX_1f_67: ; 7c246 (1f:4246) +SFX_1f_67:: ; 7c246 (1f:4246) db CH4 dw SFX_1f_67_Ch1 diff --git a/music/indigoplateau.asm b/music/indigoplateau.asm index fde15664..e0ea6ff3 100644 --- a/music/indigoplateau.asm +++ b/music/indigoplateau.asm @@ -1,4 +1,4 @@ -Music_IndigoPlateau_Ch1: ; a5f0 (2:65f0) +Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0) tempo 0, 132 stereopanning 119 duty 3 @@ -13,7 +13,7 @@ Music_IndigoPlateau_Ch1: ; a5f0 (2:65f0) notetype 12, 10, 4 note A#, 4 -Music_IndigoPlateau_branch_a605: +Music_IndigoPlateau_branch_a605:: callchannel Music_IndigoPlateau_branch_a659 notetype 12, 11, 4 octave 3 @@ -73,7 +73,7 @@ Music_IndigoPlateau_branch_a605: note A#, 8 loopchannel 0, Music_IndigoPlateau_branch_a605 -Music_IndigoPlateau_branch_a659: +Music_IndigoPlateau_branch_a659:: notetype 12, 11, 2 octave 2 note A_, 4 @@ -86,7 +86,7 @@ Music_IndigoPlateau_branch_a659: endchannel -Music_IndigoPlateau_Ch2: ; a664 (2:6664) +Music_IndigoPlateau_Ch2:: ; a664 (2:6664) duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -98,7 +98,7 @@ Music_IndigoPlateau_Ch2: ; a664 (2:6664) notetype 12, 5, 10 note D#, 4 -Music_IndigoPlateau_branch_a673: +Music_IndigoPlateau_branch_a673:: callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 note A_, 4 @@ -134,7 +134,7 @@ Music_IndigoPlateau_branch_a673: note D#, 8 loopchannel 0, Music_IndigoPlateau_branch_a673 -Music_IndigoPlateau_branch_a6af: +Music_IndigoPlateau_branch_a6af:: notetype 12, 12, 2 octave 3 note D_, 4 @@ -147,7 +147,7 @@ Music_IndigoPlateau_branch_a6af: endchannel -Music_IndigoPlateau_Ch3: ; a6ba (2:66ba) +Music_IndigoPlateau_Ch3:: ; a6ba (2:66ba) notetype 12, 1, 0 octave 4 note D_, 2 @@ -160,7 +160,7 @@ Music_IndigoPlateau_Ch3: ; a6ba (2:66ba) rest 2 note D#, 4 -Music_IndigoPlateau_branch_a6c6: +Music_IndigoPlateau_branch_a6c6:: callchannel Music_IndigoPlateau_branch_a6fe callchannel Music_IndigoPlateau_branch_a6fe callchannel Music_IndigoPlateau_branch_a6fe @@ -205,7 +205,7 @@ Music_IndigoPlateau_branch_a6c6: note D#, 8 loopchannel 0, Music_IndigoPlateau_branch_a6c6 -Music_IndigoPlateau_branch_a6fe: +Music_IndigoPlateau_branch_a6fe:: octave 4 note D_, 2 rest 2 @@ -225,7 +225,7 @@ Music_IndigoPlateau_branch_a6fe: endchannel -Music_IndigoPlateau_Ch4: ; a70f (2:670f) +Music_IndigoPlateau_Ch4:: ; a70f (2:670f) dspeed 6 dnote 16, mutedsnare2 dnote 16, mutedsnare2 @@ -240,7 +240,7 @@ Music_IndigoPlateau_Ch4: ; a70f (2:670f) dnote 1, mutedsnare3 dnote 1, mutedsnare3 -Music_IndigoPlateau_branch_a728: +Music_IndigoPlateau_branch_a728:: callchannel Music_IndigoPlateau_branch_a791 callchannel Music_IndigoPlateau_branch_a77e callchannel Music_IndigoPlateau_branch_a791 @@ -277,7 +277,7 @@ Music_IndigoPlateau_branch_a728: dnote 1, mutedsnare2 loopchannel 0, Music_IndigoPlateau_branch_a728 -Music_IndigoPlateau_branch_a77e: +Music_IndigoPlateau_branch_a77e:: dnote 4, mutedsnare2 dnote 4, mutedsnare3 dnote 4, mutedsnare4 @@ -289,7 +289,7 @@ Music_IndigoPlateau_branch_a77e: dnote 2, mutedsnare3 endchannel -Music_IndigoPlateau_branch_a791: +Music_IndigoPlateau_branch_a791:: dnote 4, mutedsnare2 dnote 4, mutedsnare3 dnote 4, mutedsnare4 @@ -303,7 +303,7 @@ Music_IndigoPlateau_branch_a791: dnote 1, mutedsnare3 endchannel -Music_IndigoPlateau_branch_a7a8: +Music_IndigoPlateau_branch_a7a8:: dnote 4, mutedsnare2 dnote 4, mutedsnare3 dnote 4, mutedsnare2 diff --git a/music/introbattle.asm b/music/introbattle.asm index f17f127e..81730736 100644 --- a/music/introbattle.asm +++ b/music/introbattle.asm @@ -1,4 +1,4 @@ -Music_IntroBattle_Ch1: ; 7f844 (1f:7844) +Music_IntroBattle_Ch1:: ; 7f844 (1f:7844) tempo 0, 98 stereopanning 119 duty 3 @@ -90,7 +90,7 @@ Music_IntroBattle_Ch1: ; 7f844 (1f:7844) endchannel -Music_IntroBattle_Ch2: ; 7f8bc (1f:78bc) +Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc) duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -165,7 +165,7 @@ Music_IntroBattle_Ch2: ; 7f8bc (1f:78bc) endchannel -Music_IntroBattle_Ch3: ; 7f91d (1f:791d) +Music_IntroBattle_Ch3:: ; 7f91d (1f:791d) notetype 12, 1, 0 rest 8 octave 4 @@ -229,7 +229,7 @@ Music_IntroBattle_Ch3: ; 7f91d (1f:791d) endchannel -Music_IntroBattle_Ch4: ; 7f95b (1f:795b) +Music_IntroBattle_Ch4:: ; 7f95b (1f:795b) dspeed 6 dnote 1, mutedsnare4 dnote 1, mutedsnare4 diff --git a/music/jigglypuffsong.asm b/music/jigglypuffsong.asm index fb484898..b3c6fb4b 100644 --- a/music/jigglypuffsong.asm +++ b/music/jigglypuffsong.asm @@ -1,4 +1,4 @@ -Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) +Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d) tempo 0, 144 stereopanning 119 vibrato 8, 2, 4 @@ -21,7 +21,7 @@ Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) endchannel -Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a) +Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a) vibrato 5, 1, 5 duty 2 dutycycle 10 diff --git a/music/lavender.asm b/music/lavender.asm index eafb8677..318da8a8 100644 --- a/music/lavender.asm +++ b/music/lavender.asm @@ -1,4 +1,4 @@ -Music_Lavender_Ch1: ; bb58 (2:7b58) +Music_Lavender_Ch1:: ; bb58 (2:7b58) tempo 0, 152 stereopanning 119 duty 1 @@ -11,7 +11,7 @@ Music_Lavender_Ch1: ; bb58 (2:7b58) rest 16 notetype 12, 10, 7 -Music_Lavender_branch_bb6b: +Music_Lavender_branch_bb6b:: octave 3 note G_, 8 note G_, 8 @@ -62,12 +62,12 @@ Music_Lavender_branch_bb6b: loopchannel 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch2: ; bb9e (2:7b9e) +Music_Lavender_Ch2:: ; bb9e (2:7b9e) vibrato 0, 3, 4 duty 3 notetype 12, 9, 1 -Music_Lavender_branch_bba5: +Music_Lavender_branch_bba5:: octave 5 note C_, 4 note G_, 4 @@ -76,7 +76,7 @@ Music_Lavender_branch_bba5: loopchannel 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch3: ; bbae (2:7bae) +Music_Lavender_Ch3:: ; bbae (2:7bae) vibrato 4, 1, 1 notetype 12, 3, 5 rest 16 @@ -85,7 +85,7 @@ Music_Lavender_Ch3: ; bbae (2:7bae) rest 16 notetype 12, 2, 5 -Music_Lavender_branch_bbb9: +Music_Lavender_branch_bbb9:: octave 4 note E_, 16 note D_, 16 @@ -186,14 +186,14 @@ Music_Lavender_branch_bbb9: loopchannel 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch4: ; bc21 (2:7c21) +Music_Lavender_Ch4:: ; bc21 (2:7c21) dspeed 12 rest 16 rest 16 rest 16 rest 16 -Music_Lavender_branch_bc26: +Music_Lavender_branch_bc26:: dnote 8, triangle2 dnote 8, triangle2 loopchannel 0, Music_Lavender_branch_bc26 diff --git a/music/meeteviltrainer.asm b/music/meeteviltrainer.asm index 7ef5fc6e..46385127 100644 --- a/music/meeteviltrainer.asm +++ b/music/meeteviltrainer.asm @@ -1,4 +1,4 @@ -Music_MeetEvilTrainer_Ch1: ; 7f69d (1f:769d) +Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d) tempo 0, 124 stereopanning 119 duty 2 @@ -11,7 +11,7 @@ Music_MeetEvilTrainer_Ch1: ; 7f69d (1f:769d) notetype 12, 4, 15 note D_, 4 -Music_MeetEvilTrainer_branch_7f6ae: +Music_MeetEvilTrainer_branch_7f6ae:: notetype 12, 10, 1 note D_, 4 note D_, 4 @@ -21,7 +21,7 @@ Music_MeetEvilTrainer_branch_7f6ae: loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch2: ; 7f6ba (1f:76ba) +Music_MeetEvilTrainer_Ch2:: ; 7f6ba (1f:76ba) duty 1 notetype 12, 11, 6 octave 3 @@ -29,7 +29,7 @@ Music_MeetEvilTrainer_Ch2: ; 7f6ba (1f:76ba) note A#, 2 note B_, 8 -Music_MeetEvilTrainer_branch_7f6c2: +Music_MeetEvilTrainer_branch_7f6c2:: notetype 12, 12, 2 octave 4 note D#, 2 @@ -60,7 +60,7 @@ Music_MeetEvilTrainer_branch_7f6c2: loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch3: ; 7f6e6 (1f:76e6) +Music_MeetEvilTrainer_Ch3:: ; 7f6e6 (1f:76e6) notetype 12, 1, 0 rest 8 octave 4 @@ -69,7 +69,7 @@ Music_MeetEvilTrainer_Ch3: ; 7f6e6 (1f:76e6) note F_, 1 rest 1 -Music_MeetEvilTrainer_branch_7f6ee: +Music_MeetEvilTrainer_branch_7f6ee:: note F#, 1 rest 3 note F#, 1 diff --git a/music/meetfemaletrainer.asm b/music/meetfemaletrainer.asm index 6d8a6273..1b097f58 100644 --- a/music/meetfemaletrainer.asm +++ b/music/meetfemaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9) +Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9) tempo 0, 124 stereopanning 119 duty 1 @@ -13,7 +13,7 @@ Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9) note C_, 2 notetype 12, 8, 1 -Music_MeetFemaleTrainer_branch_7f70c: +Music_MeetFemaleTrainer_branch_7f70c:: octave 3 note E_, 4 loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c @@ -26,7 +26,7 @@ Music_MeetFemaleTrainer_branch_7f70c: loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch2: ; 7f71c (1f:771c) +Music_MeetFemaleTrainer_Ch2:: ; 7f71c (1f:771c) duty 2 notetype 12, 12, 2 octave 3 @@ -35,7 +35,7 @@ Music_MeetFemaleTrainer_Ch2: ; 7f71c (1f:771c) octave 4 note B_, 12 -Music_MeetFemaleTrainer_branch_7f726: +Music_MeetFemaleTrainer_branch_7f726:: notetype 12, 12, 2 octave 3 note B_, 4 @@ -71,7 +71,7 @@ Music_MeetFemaleTrainer_branch_7f726: loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch3: ; 7f74b (1f:774b) +Music_MeetFemaleTrainer_Ch3:: ; 7f74b (1f:774b) notetype 12, 1, 0 rest 8 octave 5 @@ -83,7 +83,7 @@ Music_MeetFemaleTrainer_Ch3: ; 7f74b (1f:774b) note A_, 1 rest 1 -Music_MeetFemaleTrainer_branch_7f756: +Music_MeetFemaleTrainer_branch_7f756:: callchannel Music_MeetFemaleTrainer_branch_7f770 note G#, 1 rest 3 @@ -104,7 +104,7 @@ Music_MeetFemaleTrainer_branch_7f756: rest 3 loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 -Music_MeetFemaleTrainer_branch_7f770: +Music_MeetFemaleTrainer_branch_7f770:: note G#, 1 rest 3 note E_, 1 diff --git a/music/meetmaletrainer.asm b/music/meetmaletrainer.asm index 9a3d7ba1..3c56aca6 100644 --- a/music/meetmaletrainer.asm +++ b/music/meetmaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b) +Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b) tempo 0, 112 stereopanning 119 duty 3 @@ -13,7 +13,7 @@ Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b) note F_, 12 rest 16 -Music_MeetMaleTrainer_branch_7f78f: +Music_MeetMaleTrainer_branch_7f78f:: octave 3 note B_, 4 note A_, 4 @@ -32,7 +32,7 @@ Music_MeetMaleTrainer_branch_7f78f: loopchannel 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch2: ; 7f7a2 (1f:77a2) +Music_MeetMaleTrainer_Ch2:: ; 7f7a2 (1f:77a2) duty 3 vibrato 24, 2, 2 notetype 12, 12, 4 @@ -49,7 +49,7 @@ Music_MeetMaleTrainer_Ch2: ; 7f7a2 (1f:77a2) note E_, 1 rest 9 -Music_MeetMaleTrainer_branch_7f7b5: +Music_MeetMaleTrainer_branch_7f7b5:: notetype 12, 12, 4 octave 4 note E_, 6 @@ -75,7 +75,7 @@ Music_MeetMaleTrainer_branch_7f7b5: loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch3: ; 7f7d2 (1f:77d2) +Music_MeetMaleTrainer_Ch3:: ; 7f7d2 (1f:77d2) notetype 12, 1, 0 rest 6 octave 4 @@ -100,7 +100,7 @@ Music_MeetMaleTrainer_Ch3: ; 7f7d2 (1f:77d2) note F#, 1 rest 1 -Music_MeetMaleTrainer_branch_7f7ea: +Music_MeetMaleTrainer_branch_7f7ea:: note E_, 1 rest 1 note B_, 1 diff --git a/music/meetprofoak.asm b/music/meetprofoak.asm index e2db6e25..303dd2f7 100644 --- a/music/meetprofoak.asm +++ b/music/meetprofoak.asm @@ -1,4 +1,4 @@ -Music_MeetProfOak_Ch1: ; af59 (2:6f59) +Music_MeetProfOak_Ch1:: ; af59 (2:6f59) tempo 0, 112 stereopanning 119 duty 3 @@ -38,7 +38,7 @@ Music_MeetProfOak_Ch1: ; af59 (2:6f59) note F#, 2 note F#, 4 -Music_MeetProfOak_branch_af85: +Music_MeetProfOak_branch_af85:: note F#, 6 note E_, 4 note A_, 2 @@ -74,7 +74,7 @@ Music_MeetProfOak_branch_af85: loopchannel 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) +Music_MeetProfOak_Ch2:: ; afa9 (2:6fa9) vibrato 8, 1, 1 duty 2 notetype 12, 12, 4 @@ -155,7 +155,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note B_, 4 notetype 12, 11, 5 -Music_MeetProfOak_branch_b005: +Music_MeetProfOak_branch_b005:: octave 4 note C#, 6 octave 3 @@ -208,7 +208,7 @@ Music_MeetProfOak_branch_b005: loopchannel 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch3: ; b03d (2:703d) +Music_MeetProfOak_Ch3:: ; b03d (2:703d) notetype 12, 1, 2 rest 10 octave 4 @@ -336,7 +336,7 @@ Music_MeetProfOak_Ch3: ; b03d (2:703d) note G#, 1 rest 1 -Music_MeetProfOak_branch_b0bc: +Music_MeetProfOak_branch_b0bc:: octave 4 note A_, 1 rest 1 @@ -363,7 +363,7 @@ Music_MeetProfOak_branch_b0bc: rest 1 loopchannel 2, Music_MeetProfOak_branch_b0bc -Music_MeetProfOak_branch_b0d8: +Music_MeetProfOak_branch_b0d8:: octave 4 note G#, 1 rest 1 @@ -383,7 +383,7 @@ Music_MeetProfOak_branch_b0d8: rest 1 loopchannel 2, Music_MeetProfOak_branch_b0d8 -Music_MeetProfOak_branch_b0ed: +Music_MeetProfOak_branch_b0ed:: note F#, 1 rest 1 note A_, 1 @@ -402,7 +402,7 @@ Music_MeetProfOak_branch_b0ed: rest 1 loopchannel 2, Music_MeetProfOak_branch_b0ed -Music_MeetProfOak_branch_b101: +Music_MeetProfOak_branch_b101:: note G#, 1 rest 1 note B_, 1 diff --git a/music/meetrival.asm b/music/meetrival.asm index 196eeea9..1e45ba42 100644 --- a/music/meetrival.asm +++ b/music/meetrival.asm @@ -1,11 +1,11 @@ -Music_MeetRival_branch_b119: +Music_MeetRival_branch_b119:: tempo 0, 100 loopchannel 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch1: ; b120 (2:7120) +Music_MeetRival_Ch1:: ; b120 (2:7120) tempo 0, 112 -Music_MeetRival_branch_b123: +Music_MeetRival_branch_b123:: stereopanning 119 duty 3 vibrato 6, 3, 4 @@ -31,7 +31,7 @@ Music_MeetRival_branch_b123: note G_, 2 note A_, 2 -Music_MeetRival_branch_b140: +Music_MeetRival_branch_b140:: note B_, 4 note A#, 2 note A_, 4 @@ -119,14 +119,14 @@ Music_MeetRival_branch_b140: note A_, 2 loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_branch_b19b: +Music_MeetRival_branch_b19b:: tempo 0, 100 loopchannel 0, Music_MeetRival_branch_b1a5 -Music_MeetRival_branch_b1a2: +Music_MeetRival_branch_b1a2:: tempo 0, 112 -Music_MeetRival_branch_b1a5: +Music_MeetRival_branch_b1a5:: stereopanning 119 duty 3 vibrato 6, 3, 4 @@ -143,7 +143,7 @@ Music_MeetRival_branch_b1a5: loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch2: ; b1bb (2:71bb) +Music_MeetRival_Ch2:: ; b1bb (2:71bb) duty 3 vibrato 10, 2, 6 notetype 12, 12, 7 @@ -170,7 +170,7 @@ Music_MeetRival_Ch2: ; b1bb (2:71bb) note F_, 2 note F#, 2 -Music_MeetRival_branch_b1d8: +Music_MeetRival_branch_b1d8:: notetype 12, 12, 7 note G_, 4 note D_, 2 @@ -230,7 +230,7 @@ Music_MeetRival_branch_b1d8: note F#, 2 loopchannel 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_branch_b21d: +Music_MeetRival_branch_b21d:: duty 3 vibrato 10, 2, 6 notetype 12, 12, 7 @@ -248,7 +248,7 @@ Music_MeetRival_branch_b21d: loopchannel 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch3: ; b233 (2:7233) +Music_MeetRival_Ch3:: ; b233 (2:7233) notetype 12, 1, 4 octave 5 note D_, 2 @@ -273,7 +273,7 @@ Music_MeetRival_Ch3: ; b233 (2:7233) note G_, 1 rest 1 -Music_MeetRival_branch_b24b: +Music_MeetRival_branch_b24b:: note G_, 2 octave 5 note D_, 2 @@ -378,7 +378,7 @@ Music_MeetRival_branch_b24b: note D_, 2 loopchannel 0, Music_MeetRival_branch_b24b -Music_MeetRival_branch_b2b5: +Music_MeetRival_branch_b2b5:: notetype 12, 1, 4 octave 4 note G_, 1 diff --git a/music/museumguy.asm b/music/museumguy.asm index ef1c3bd7..0f3b266f 100644 --- a/music/museumguy.asm +++ b/music/museumguy.asm @@ -1,4 +1,4 @@ -Music_MuseumGuy_Ch1: ; adae (2:6dae) +Music_MuseumGuy_Ch1:: ; adae (2:6dae) tempo 0, 128 stereopanning 119 duty 2 @@ -29,7 +29,7 @@ Music_MuseumGuy_Ch1: ; adae (2:6dae) note E_, 2 note E_, 6 -Music_MuseumGuy_branch_add6: +Music_MuseumGuy_branch_add6:: callchannel Music_MuseumGuy_branch_ade7 callchannel Music_MuseumGuy_branch_adec callchannel Music_MuseumGuy_branch_ade7 @@ -39,14 +39,14 @@ Music_MuseumGuy_branch_add6: note E_, 6 loopchannel 0, Music_MuseumGuy_branch_add6 -Music_MuseumGuy_branch_ade7: +Music_MuseumGuy_branch_ade7:: note E_, 2 note E_, 6 note F#, 2 note F#, 6 endchannel -Music_MuseumGuy_branch_adec: +Music_MuseumGuy_branch_adec:: note E_, 2 note E_, 6 note D_, 2 @@ -54,7 +54,7 @@ Music_MuseumGuy_branch_adec: endchannel -Music_MuseumGuy_Ch2: ; adf1 (2:6df1) +Music_MuseumGuy_Ch2:: ; adf1 (2:6df1) duty 2 notetype 12, 12, 1 octave 4 @@ -107,7 +107,7 @@ Music_MuseumGuy_Ch2: ; adf1 (2:6df1) note A_, 2 note A_, 4 -Music_MuseumGuy_branch_ae26: +Music_MuseumGuy_branch_ae26:: octave 3 note A_, 2 octave 4 @@ -165,7 +165,7 @@ Music_MuseumGuy_branch_ae26: loopchannel 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch3: ; ae6e (2:6e6e) +Music_MuseumGuy_Ch3:: ; ae6e (2:6e6e) notetype 12, 1, 0 rest 16 octave 4 @@ -194,7 +194,7 @@ Music_MuseumGuy_Ch3: ; ae6e (2:6e6e) note A_, 1 rest 3 -Music_MuseumGuy_branch_ae8e: +Music_MuseumGuy_branch_ae8e:: callchannel Music_MuseumGuy_branch_aec1 rest 3 octave 6 @@ -231,7 +231,7 @@ Music_MuseumGuy_branch_ae8e: rest 3 loopchannel 0, Music_MuseumGuy_branch_ae8e -Music_MuseumGuy_branch_aeb8: +Music_MuseumGuy_branch_aeb8:: note A_, 1 rest 1 note A_, 1 @@ -242,7 +242,7 @@ Music_MuseumGuy_branch_aeb8: rest 5 endchannel -Music_MuseumGuy_branch_aec1: +Music_MuseumGuy_branch_aec1:: octave 6 note C#, 1 rest 1 @@ -261,7 +261,7 @@ Music_MuseumGuy_branch_aec1: endchannel -Music_MuseumGuy_Ch4: ; aed1 (2:6ed1) +Music_MuseumGuy_Ch4:: ; aed1 (2:6ed1) dspeed 12 rest 16 rest 16 @@ -275,7 +275,7 @@ Music_MuseumGuy_Ch4: ; aed1 (2:6ed1) dnote 1, mutedsnare3 dnote 1, mutedsnare3 -Music_MuseumGuy_branch_aee1: +Music_MuseumGuy_branch_aee1:: dnote 4, mutedsnare2 dnote 6, mutedsnare2 dnote 2, mutedsnare2 diff --git a/music/oakslab.asm b/music/oakslab.asm index 6988099a..f7302471 100644 --- a/music/oakslab.asm +++ b/music/oakslab.asm @@ -1,4 +1,4 @@ -Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9) +Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9) tempo 0, 140 stereopanning 119 duty 3 @@ -16,7 +16,7 @@ Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9) note A_, 1 note B_, 1 -Music_OaksLab_branch_7eed0: +Music_OaksLab_branch_7eed0:: octave 4 note C#, 4 octave 3 @@ -69,7 +69,7 @@ Music_OaksLab_branch_7eed0: loopchannel 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch2: ; 7ef05 (1f:6f05) +Music_OaksLab_Ch2:: ; 7ef05 (1f:6f05) duty 3 vibrato 10, 2, 5 notetype 12, 12, 4 @@ -84,7 +84,7 @@ Music_OaksLab_Ch2: ; 7ef05 (1f:6f05) note F#, 1 note G#, 1 -Music_OaksLab_branch_7ef16: +Music_OaksLab_branch_7ef16:: note A_, 6 note G#, 1 note F#, 1 @@ -144,7 +144,7 @@ Music_OaksLab_branch_7ef16: loopchannel 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch3: ; 7ef52 (1f:6f52) +Music_OaksLab_Ch3:: ; 7ef52 (1f:6f52) notetype 12, 1, 1 rest 2 octave 4 @@ -155,7 +155,7 @@ Music_OaksLab_Ch3: ; 7ef52 (1f:6f52) note E_, 1 rest 1 -Music_OaksLab_branch_7ef5c: +Music_OaksLab_branch_7ef5c:: note C#, 1 rest 1 note A_, 1 diff --git a/music/pallettown.asm b/music/pallettown.asm index a1d4dd50..15162c3a 100644 --- a/music/pallettown.asm +++ b/music/pallettown.asm @@ -1,10 +1,10 @@ -Music_PalletTown_Ch1: ; a7c5 (2:67c5) +Music_PalletTown_Ch1:: ; a7c5 (2:67c5) tempo 0, 160 stereopanning 119 duty 2 notetype 12, 12, 3 -Music_PalletTown_branch_a7ce: +Music_PalletTown_branch_a7ce:: octave 3 note B_, 4 octave 4 @@ -148,10 +148,10 @@ Music_PalletTown_branch_a7ce: endchannel -Music_PalletTown_Ch2: ; a85f (2:685f) +Music_PalletTown_Ch2:: ; a85f (2:685f) duty 2 -Music_PalletTown_branch_a861: +Music_PalletTown_branch_a861:: notetype 12, 13, 3 octave 5 note D_, 2 @@ -262,11 +262,11 @@ Music_PalletTown_branch_a861: endchannel -Music_PalletTown_Ch3: ; a8de (2:68de) +Music_PalletTown_Ch3:: ; a8de (2:68de) vibrato 24, 2, 8 notetype 12, 1, 2 -Music_PalletTown_branch_a8e3: +Music_PalletTown_branch_a8e3:: octave 4 note G_, 6 note E_, 6 diff --git a/music/pkmnhealed.asm b/music/pkmnhealed.asm index 9c41bc4e..9a16b435 100644 --- a/music/pkmnhealed.asm +++ b/music/pkmnhealed.asm @@ -1,4 +1,4 @@ -Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3) +Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3) tempo 0, 144 stereopanning 119 duty 2 @@ -19,7 +19,7 @@ Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3) endchannel -Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4) +Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4) duty 2 notetype 12, 12, 3 octave 4 @@ -33,7 +33,7 @@ Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4) endchannel -Music_PkmnHealed_Ch3: ; 9bd2 (2:5bd2) +Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2) notetype 12, 1, 0 octave 4 note E_, 2 diff --git a/music/pokecenter.asm b/music/pokecenter.asm index a4d30ac7..4e139b9a 100644 --- a/music/pokecenter.asm +++ b/music/pokecenter.asm @@ -1,11 +1,11 @@ -Music_Pokecenter_Ch1: ; be56 (2:7e56) +Music_Pokecenter_Ch1:: ; be56 (2:7e56) tempo 0, 144 stereopanning 119 duty 3 vibrato 10, 2, 2 togglecall -Music_Pokecenter_branch_be61: +Music_Pokecenter_branch_be61:: notetype 12, 10, 3 octave 3 note F#, 2 @@ -149,10 +149,10 @@ Music_Pokecenter_branch_be61: loopchannel 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch2: ; bef9 (2:7ef9) +Music_Pokecenter_Ch2:: ; bef9 (2:7ef9) vibrato 8, 2, 5 -Music_Pokecenter_branch_befc: +Music_Pokecenter_branch_befc:: callchannel Music_Pokecenter_branch_bf4e duty 3 notetype 12, 10, 5 @@ -215,7 +215,7 @@ Music_Pokecenter_branch_befc: note D_, 8 loopchannel 0, Music_Pokecenter_branch_befc -Music_Pokecenter_branch_bf4e: +Music_Pokecenter_branch_bf4e:: duty 2 notetype 12, 12, 2 octave 4 @@ -232,7 +232,7 @@ Music_Pokecenter_branch_bf4e: note C#, 6 endchannel -Music_Pokecenter_branch_bf60: +Music_Pokecenter_branch_bf60:: duty 2 notetype 12, 12, 2 octave 4 @@ -248,10 +248,10 @@ Music_Pokecenter_branch_bf60: endchannel -Music_Pokecenter_Ch3: ; bf70 (2:7f70) +Music_Pokecenter_Ch3:: ; bf70 (2:7f70) notetype 12, 1, 0 -Music_Pokecenter_branch_bf72: +Music_Pokecenter_branch_bf72:: octave 4 note D_, 2 note F#, 2 @@ -341,7 +341,7 @@ Music_Pokecenter_branch_bf72: note E_, 2 loopchannel 0, Music_Pokecenter_branch_bf72 -Music_Pokecenter_branch_bfd9: +Music_Pokecenter_branch_bfd9:: note E_, 2 note A_, 2 note E_, 2 @@ -352,7 +352,7 @@ Music_Pokecenter_branch_bfd9: note A_, 2 endchannel -Music_Pokecenter_branch_bfe2: +Music_Pokecenter_branch_bfe2:: note E_, 2 note A_, 2 note E_, 2 @@ -363,7 +363,7 @@ Music_Pokecenter_branch_bfe2: note A_, 2 endchannel -Music_Pokecenter_branch_bfeb: +Music_Pokecenter_branch_bfeb:: note F#, 2 note A_, 2 note F#, 2 diff --git a/music/pokemontower.asm b/music/pokemontower.asm index 09e22afc..915c656d 100644 --- a/music/pokemontower.asm +++ b/music/pokemontower.asm @@ -1,4 +1,4 @@ -Music_PokemonTower_Ch1: ; 7f04a (1f:704a) +Music_PokemonTower_Ch1:: ; 7f04a (1f:704a) tempo 0, 152 stereopanning 119 duty 3 @@ -9,7 +9,7 @@ Music_PokemonTower_Ch1: ; 7f04a (1f:704a) octave 4 note B_, 12 -Music_PokemonTower_branch_7f05a: +Music_PokemonTower_branch_7f05a:: notetype 12, 11, 4 octave 4 note G_, 1 @@ -140,7 +140,7 @@ Music_PokemonTower_branch_7f05a: loopchannel 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch2: ; 7f0e3 (1f:70e3) +Music_PokemonTower_Ch2:: ; 7f0e3 (1f:70e3) vibrato 20, 3, 4 duty 3 notetype 12, 10, 0 @@ -149,7 +149,7 @@ Music_PokemonTower_Ch2: ; 7f0e3 (1f:70e3) octave 4 note E_, 4 -Music_PokemonTower_branch_7f0ee: +Music_PokemonTower_branch_7f0ee:: notetype 12, 12, 1 octave 5 note C_, 8 @@ -292,14 +292,14 @@ Music_PokemonTower_branch_7f0ee: loopchannel 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch3: ; 7f19a (1f:719a) +Music_PokemonTower_Ch3:: ; 7f19a (1f:719a) vibrato 4, 1, 1 notetype 12, 1, 3 rest 8 octave 5 note G_, 8 -Music_PokemonTower_branch_7f1a2: +Music_PokemonTower_branch_7f1a2:: note E_, 1 rest 7 note E_, 1 diff --git a/music/routes1.asm b/music/routes1.asm index 237bfaac..a5c1b40d 100644 --- a/music/routes1.asm +++ b/music/routes1.asm @@ -1,11 +1,11 @@ -Music_Routes1_Ch1: ; 9bde (2:5bde) +Music_Routes1_Ch1:: ; 9bde (2:5bde) tempo 0, 152 stereopanning 119 vibrato 4, 2, 3 duty 2 togglecall -Music_Routes1_branch_9be9: +Music_Routes1_branch_9be9:: notetype 12, 10, 1 rest 4 octave 4 @@ -106,10 +106,10 @@ Music_Routes1_branch_9be9: endchannel -Music_Routes1_Ch2: ; 9c51 (2:5c51) +Music_Routes1_Ch2:: ; 9c51 (2:5c51) duty 2 -Music_Routes1_branch_9c53: +Music_Routes1_branch_9c53:: notetype 12, 13, 1 callchannel Music_Routes1_branch_9c65 callchannel Music_Routes1_branch_9c78 @@ -117,7 +117,7 @@ Music_Routes1_branch_9c53: callchannel Music_Routes1_branch_9c8d loopchannel 0, Music_Routes1_branch_9c53 -Music_Routes1_branch_9c65: +Music_Routes1_branch_9c65:: octave 4 note D_, 1 note E_, 1 @@ -138,7 +138,7 @@ Music_Routes1_branch_9c65: note E_, 6 endchannel -Music_Routes1_branch_9c78: +Music_Routes1_branch_9c78:: note C#, 1 note D_, 1 note E_, 2 @@ -161,7 +161,7 @@ Music_Routes1_branch_9c78: note F#, 2 endchannel -Music_Routes1_branch_9c8d: +Music_Routes1_branch_9c8d:: note C#, 1 note D_, 1 note E_, 2 @@ -234,11 +234,11 @@ Music_Routes1_branch_9c8d: endchannel -Music_Routes1_Ch3: ; 9cd8 (2:5cd8) +Music_Routes1_Ch3:: ; 9cd8 (2:5cd8) vibrato 8, 2, 5 notetype 12, 1, 3 -Music_Routes1_branch_9cdd: +Music_Routes1_branch_9cdd:: rest 2 octave 4 note D_, 4 @@ -309,7 +309,7 @@ Music_Routes1_branch_9cdd: endchannel -Music_Routes1_Ch4: ; 9d24 (2:5d24) +Music_Routes1_Ch4:: ; 9d24 (2:5d24) dspeed 12 rest 4 dnote 2, mutedsnare1 diff --git a/music/routes2.asm b/music/routes2.asm index f3f19c72..a1362569 100644 --- a/music/routes2.asm +++ b/music/routes2.asm @@ -1,10 +1,10 @@ -Music_Routes2_Ch1: ; 9db9 (2:5db9) +Music_Routes2_Ch1:: ; 9db9 (2:5db9) tempo 0, 152 stereopanning 119 vibrato 9, 2, 5 duty 1 -Music_Routes2_branch_9dc3: +Music_Routes2_branch_9dc3:: notetype 12, 11, 2 octave 2 note B_, 4 @@ -142,11 +142,11 @@ Music_Routes2_branch_9dc3: endchannel -Music_Routes2_Ch2: ; 9e4f (2:5e4f) +Music_Routes2_Ch2:: ; 9e4f (2:5e4f) vibrato 8, 2, 6 duty 3 -Music_Routes2_branch_9e54: +Music_Routes2_branch_9e54:: notetype 12, 13, 4 octave 4 note E_, 6 @@ -216,10 +216,10 @@ Music_Routes2_branch_9e54: endchannel -Music_Routes2_Ch3: ; 9e9b (2:5e9b) +Music_Routes2_Ch3:: ; 9e9b (2:5e9b) vibrato 9, 2, 8 -Music_Routes2_branch_9e9e: +Music_Routes2_branch_9e9e:: notetype 12, 1, 1 octave 3 note E_, 2 @@ -324,7 +324,7 @@ Music_Routes2_branch_9e9e: endchannel -Music_Routes2_Ch4: ; 9f08 (2:5f08) +Music_Routes2_Ch4:: ; 9f08 (2:5f08) dspeed 12 dnote 2, snare3 rest 2 diff --git a/music/routes3.asm b/music/routes3.asm index 0b78bba1..781d5c32 100644 --- a/music/routes3.asm +++ b/music/routes3.asm @@ -1,4 +1,4 @@ -Music_Routes3_Ch1: ; 9fad (2:5fad) +Music_Routes3_Ch1:: ; 9fad (2:5fad) tempo 0, 148 stereopanning 119 duty 3 @@ -15,7 +15,7 @@ Music_Routes3_Ch1: ; 9fad (2:5fad) rest 16 rest 15 -Music_Routes3_branch_9fc3: +Music_Routes3_branch_9fc3:: notetype 12, 11, 5 note E_, 6 note D_, 1 @@ -77,7 +77,7 @@ Music_Routes3_branch_9fc3: loopchannel 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch2: ; a009 (2:6009) +Music_Routes3_Ch2:: ; a009 (2:6009) vibrato 8, 2, 3 duty 2 notetype 12, 12, 7 @@ -92,7 +92,7 @@ Music_Routes3_Ch2: ; a009 (2:6009) rest 15 rest 16 -Music_Routes3_branch_a01a: +Music_Routes3_branch_a01a:: notetype 12, 12, 7 duty 2 octave 4 @@ -178,7 +178,7 @@ Music_Routes3_branch_a01a: loopchannel 0, Music_Routes3_branch_a01a -Music_Routes3_Ch3: ; a07f (2:607f) +Music_Routes3_Ch3:: ; a07f (2:607f) vibrato 4, 1, 0 notetype 6, 1, 2 octave 4 @@ -213,7 +213,7 @@ Music_Routes3_Ch3: ; a07f (2:607f) rest 2 note G_, 8 -Music_Routes3_branch_a0a3: +Music_Routes3_branch_a0a3:: notetype 12, 1, 2 note E_, 1 rest 1 @@ -354,7 +354,7 @@ Music_Routes3_branch_a0a3: loopchannel 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch4: ; a131 (2:6131) +Music_Routes3_Ch4:: ; a131 (2:6131) dspeed 6 dnote 1, mutedsnare4 dnote 1, mutedsnare4 @@ -393,7 +393,7 @@ Music_Routes3_Ch4: ; a131 (2:6131) dnote 1, mutedsnare3 dnote 1, mutedsnare3 -Music_Routes3_branch_a17a: +Music_Routes3_branch_a17a:: dnote 12, mutedsnare2 dnote 2, mutedsnare2 dnote 2, mutedsnare3 diff --git a/music/routes4.asm b/music/routes4.asm index ab6ec299..3f0858be 100644 --- a/music/routes4.asm +++ b/music/routes4.asm @@ -1,4 +1,4 @@ -Music_Routes4_Ch1: ; a26a (2:626a) +Music_Routes4_Ch1:: ; a26a (2:626a) tempo 0, 148 stereopanning 119 duty 3 @@ -22,7 +22,7 @@ Music_Routes4_Ch1: ; a26a (2:626a) note F#, 1 note B_, 1 -Music_Routes4_branch_a28a: +Music_Routes4_branch_a28a:: notetype 12, 11, 7 note B_, 6 note E_, 2 @@ -138,7 +138,7 @@ Music_Routes4_branch_a28a: loopchannel 0, Music_Routes4_branch_a28a -Music_Routes4_Ch2: ; a304 (2:6304) +Music_Routes4_Ch2:: ; a304 (2:6304) vibrato 12, 2, 4 duty 1 notetype 12, 9, 2 @@ -164,7 +164,7 @@ Music_Routes4_Ch2: ; a304 (2:6304) octave 4 note D#, 1 -Music_Routes4_branch_a325: +Music_Routes4_branch_a325:: notetype 12, 12, 7 note E_, 6 octave 3 @@ -288,7 +288,7 @@ Music_Routes4_branch_a325: loopchannel 0, Music_Routes4_branch_a325 -Music_Routes4_Ch3: ; a3c4 (2:63c4) +Music_Routes4_Ch3:: ; a3c4 (2:63c4) notetype 12, 1, 0 octave 4 note E_, 1 @@ -308,7 +308,7 @@ Music_Routes4_Ch3: ; a3c4 (2:63c4) note D#, 1 rest 3 -Music_Routes4_branch_a3d7: +Music_Routes4_branch_a3d7:: note E_, 1 rest 3 note E_, 1 @@ -506,7 +506,7 @@ Music_Routes4_branch_a3d7: loopchannel 0, Music_Routes4_branch_a3d7 -Music_Routes4_Ch4: ; a49d (2:649d) +Music_Routes4_Ch4:: ; a49d (2:649d) dspeed 12 rest 16 rest 12 @@ -515,7 +515,7 @@ Music_Routes4_Ch4: ; a49d (2:649d) dnote 1, mutedsnare3 dnote 1, mutedsnare3 -Music_Routes4_branch_a4a8: +Music_Routes4_branch_a4a8:: dnote 4, mutedsnare2 dnote 1, mutedsnare4 dnote 1, mutedsnare4 diff --git a/music/safarizone.asm b/music/safarizone.asm index 1a984ddf..679ba0bd 100644 --- a/music/safarizone.asm +++ b/music/safarizone.asm @@ -1,4 +1,4 @@ -Music_SafariZone_Ch1: ; bc2e (2:7c2e) +Music_SafariZone_Ch1:: ; bc2e (2:7c2e) tempo 0, 132 stereopanning 119 vibrato 6, 3, 4 @@ -17,7 +17,7 @@ Music_SafariZone_Ch1: ; bc2e (2:7c2e) rest 4 duty 3 -Music_SafariZone_branch_bc4f: +Music_SafariZone_branch_bc4f:: callchannel Music_SafariZone_branch_bc5f notetype 12, 10, 4 note F#, 4 @@ -26,7 +26,7 @@ Music_SafariZone_branch_bc4f: note F#, 4 loopchannel 0, Music_SafariZone_branch_bc4f -Music_SafariZone_branch_bc5f: +Music_SafariZone_branch_bc5f:: notetype 12, 10, 2 octave 3 note C_, 4 @@ -39,7 +39,7 @@ Music_SafariZone_branch_bc5f: endchannel -Music_SafariZone_Ch2: ; bc6a (2:7c6a) +Music_SafariZone_Ch2:: ; bc6a (2:7c6a) duty 2 vibrato 8, 2, 5 notetype 12, 10, 2 @@ -51,7 +51,7 @@ Music_SafariZone_Ch2: ; bc6a (2:7c6a) rest 4 duty 3 -Music_SafariZone_branch_bc79: +Music_SafariZone_branch_bc79:: callchannel Music_SafariZone_branch_bc89 notetype 12, 11, 5 note A_, 4 @@ -60,7 +60,7 @@ Music_SafariZone_branch_bc79: note B_, 4 loopchannel 0, Music_SafariZone_branch_bc79 -Music_SafariZone_branch_bc89: +Music_SafariZone_branch_bc89:: notetype 12, 11, 2 octave 3 note G_, 4 @@ -73,11 +73,11 @@ Music_SafariZone_branch_bc89: endchannel -Music_SafariZone_Ch3: ; bc94 (2:7c94) +Music_SafariZone_Ch3:: ; bc94 (2:7c94) notetype 12, 1, 0 rest 8 -Music_SafariZone_branch_bc97: +Music_SafariZone_branch_bc97:: callchannel Music_SafariZone_branch_bca5 octave 4 note A_, 4 @@ -86,7 +86,7 @@ Music_SafariZone_branch_bc97: note B_, 4 loopchannel 0, Music_SafariZone_branch_bc97 -Music_SafariZone_branch_bca5: +Music_SafariZone_branch_bca5:: octave 3 note A_, 2 rest 2 diff --git a/music/silphco.asm b/music/silphco.asm index b8d57955..b6c70ec7 100644 --- a/music/silphco.asm +++ b/music/silphco.asm @@ -1,4 +1,4 @@ -Music_SilphCo_Ch1: ; 7f243 (1f:7243) +Music_SilphCo_Ch1:: ; 7f243 (1f:7243) tempo 0, 160 stereopanning 119 duty 3 @@ -33,7 +33,7 @@ Music_SilphCo_Ch1: ; 7f243 (1f:7243) note B_, 2 rest 2 -Music_SilphCo_branch_7f26d: +Music_SilphCo_branch_7f26d:: note G_, 2 rest 2 note B_, 2 @@ -367,7 +367,7 @@ Music_SilphCo_branch_7f26d: rest 2 loopchannel 0, Music_SilphCo_branch_7f26d -Music_SilphCo_branch_7f3f0: +Music_SilphCo_branch_7f3f0:: octave 2 note B_, 2 note A#, 2 @@ -395,7 +395,7 @@ Music_SilphCo_branch_7f3f0: endchannel -Music_SilphCo_Ch2: ; 7f409 (1f:7409) +Music_SilphCo_Ch2:: ; 7f409 (1f:7409) vibrato 10, 3, 2 duty 3 notetype 6, 12, 3 @@ -428,7 +428,7 @@ Music_SilphCo_Ch2: ; 7f409 (1f:7409) note G#, 2 rest 2 -Music_SilphCo_branch_7f42e: +Music_SilphCo_branch_7f42e:: note E_, 2 rest 2 note G_, 2 @@ -780,7 +780,7 @@ Music_SilphCo_branch_7f42e: loopchannel 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch3: ; 7f5be (1f:75be) +Music_SilphCo_Ch3:: ; 7f5be (1f:75be) vibrato 8, 1, 1 notetype 12, 1, 1 rest 12 @@ -790,7 +790,7 @@ Music_SilphCo_Ch3: ; 7f5be (1f:75be) note E_, 4 note F_, 4 -Music_SilphCo_branch_7f5c9: +Music_SilphCo_branch_7f5c9:: note E_, 4 note D#, 4 note D_, 4 diff --git a/music/ssanne.asm b/music/ssanne.asm index a27d5e56..675b67d1 100644 --- a/music/ssanne.asm +++ b/music/ssanne.asm @@ -1,11 +1,11 @@ -Music_SSAnne_Ch1: ; b3a7 (2:73a7) +Music_SSAnne_Ch1:: ; b3a7 (2:73a7) tempo 0, 128 stereopanning 119 duty 1 vibrato 8, 3, 4 togglecall -Music_SSAnne_branch_b3b2: +Music_SSAnne_branch_b3b2:: notetype 12, 10, 4 rest 12 octave 3 @@ -107,11 +107,11 @@ Music_SSAnne_branch_b3b2: loopchannel 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch2: ; b419 (2:7419) +Music_SSAnne_Ch2:: ; b419 (2:7419) duty 0 vibrato 12, 2, 4 -Music_SSAnne_branch_b41e: +Music_SSAnne_branch_b41e:: notetype 12, 12, 5 octave 3 note A_, 2 @@ -282,7 +282,7 @@ Music_SSAnne_branch_b41e: loopchannel 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch3: ; b4cb (2:74cb) +Music_SSAnne_Ch3:: ; b4cb (2:74cb) notetype 12, 1, 3 rest 16 rest 12 diff --git a/music/surfing.asm b/music/surfing.asm index 7e98d0c6..c96e796a 100644 --- a/music/surfing.asm +++ b/music/surfing.asm @@ -1,4 +1,4 @@ -Music_Surfing_Ch1: ; 7fa19 (1f:7a19) +Music_Surfing_Ch1:: ; 7fa19 (1f:7a19) tempo 0, 160 stereopanning 119 duty 3 @@ -16,7 +16,7 @@ Music_Surfing_Ch1: ; 7fa19 (1f:7a19) note F#, 2 note G#, 4 -Music_Surfing_branch_7fa30: +Music_Surfing_branch_7fa30:: notetype 12, 11, 2 note E_, 2 note E_, 4 @@ -116,7 +116,7 @@ Music_Surfing_branch_7fa30: loopchannel 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch2: ; 7fa9c (1f:7a9c) +Music_Surfing_Ch2:: ; 7fa9c (1f:7a9c) duty 3 vibrato 16, 2, 5 notetype 12, 12, 6 @@ -132,7 +132,7 @@ Music_Surfing_Ch2: ; 7fa9c (1f:7a9c) octave 3 note B_, 2 -Music_Surfing_branch_7faae: +Music_Surfing_branch_7faae:: notetype 12, 12, 6 octave 4 note E_, 6 @@ -203,7 +203,7 @@ Music_Surfing_branch_7faae: loopchannel 0, Music_Surfing_branch_7faae -Music_Surfing_Ch3: ; 7fafa (1f:7afa) +Music_Surfing_Ch3:: ; 7fafa (1f:7afa) notetype 12, 1, 0 rest 12 octave 5 @@ -213,7 +213,7 @@ Music_Surfing_Ch3: ; 7fafa (1f:7afa) note F#, 2 note G#, 2 -Music_Surfing_branch_7fb03: +Music_Surfing_branch_7fb03:: octave 3 note A_, 2 octave 4 diff --git a/music/titlescreen.asm b/music/titlescreen.asm index 70f72772..a3ab8031 100644 --- a/music/titlescreen.asm +++ b/music/titlescreen.asm @@ -1,4 +1,4 @@ -Music_TitleScreen_Ch1: ; 7e4c0 (1f:64c0) +Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0) tempo 0, 144 stereopanning 119 vibrato 9, 3, 4 @@ -26,7 +26,7 @@ Music_TitleScreen_Ch1: ; 7e4c0 (1f:64c0) note A_, 2 note F#, 2 -Music_TitleScreen_branch_7e4e2: +Music_TitleScreen_branch_7e4e2:: callchannel Music_TitleScreen_branch_7e541 callchannel Music_TitleScreen_branch_7e54a callchannel Music_TitleScreen_branch_7e541 @@ -96,7 +96,7 @@ Music_TitleScreen_branch_7e4e2: note C#, 4 loopchannel 0, Music_TitleScreen_branch_7e4e2 -Music_TitleScreen_branch_7e541: +Music_TitleScreen_branch_7e541:: notetype 12, 12, 6 octave 3 note D_, 6 @@ -106,7 +106,7 @@ Music_TitleScreen_branch_7e541: note D_, 8 endchannel -Music_TitleScreen_branch_7e54a: +Music_TitleScreen_branch_7e54a:: note C_, 6 note F_, 6 note C_, 4 @@ -124,7 +124,7 @@ Music_TitleScreen_branch_7e54a: note C_, 4 endchannel -Music_TitleScreen_branch_7e55c: +Music_TitleScreen_branch_7e55c:: notetype 12, 12, 1 note D_, 1 rest 1 @@ -154,7 +154,7 @@ Music_TitleScreen_branch_7e55c: endchannel -Music_TitleScreen_Ch2: ; 7e578 (1f:6578) +Music_TitleScreen_Ch2:: ; 7e578 (1f:6578) vibrato 16, 4, 6 duty 1 notetype 12, 14, 1 @@ -179,7 +179,7 @@ Music_TitleScreen_Ch2: ; 7e578 (1f:6578) note F_, 2 note F#, 2 -Music_TitleScreen_branch_7e594: +Music_TitleScreen_branch_7e594:: vibrato 16, 4, 6 callchannel Music_TitleScreen_branch_7e622 octave 2 @@ -286,7 +286,7 @@ Music_TitleScreen_branch_7e594: note B_, 4 loopchannel 0, Music_TitleScreen_branch_7e594 -Music_TitleScreen_branch_7e622: +Music_TitleScreen_branch_7e622:: notetype 12, 14, 7 octave 3 note G_, 6 @@ -296,7 +296,7 @@ Music_TitleScreen_branch_7e622: notetype 12, 9, 5 endchannel -Music_TitleScreen_branch_7e62c: +Music_TitleScreen_branch_7e62c:: notetype 12, 14, 7 octave 4 note F_, 6 @@ -306,7 +306,7 @@ Music_TitleScreen_branch_7e62c: notetype 12, 9, 5 endchannel -Music_TitleScreen_branch_7e636: +Music_TitleScreen_branch_7e636:: notetype 12, 14, 1 note D_, 1 rest 2 @@ -321,7 +321,7 @@ Music_TitleScreen_branch_7e636: endchannel -Music_TitleScreen_Ch3: ; 7e643 (1f:6643) +Music_TitleScreen_Ch3:: ; 7e643 (1f:6643) notetype 12, 1, 0 octave 3 note G_, 1 @@ -348,11 +348,11 @@ Music_TitleScreen_Ch3: ; 7e643 (1f:6643) note F_, 2 note A_, 2 -Music_TitleScreen_branch_7e65e: +Music_TitleScreen_branch_7e65e:: callchannel Music_TitleScreen_branch_7e6c9 callchannel Music_TitleScreen_branch_7e6d0 -Music_TitleScreen_branch_7e664: +Music_TitleScreen_branch_7e664:: callchannel Music_TitleScreen_branch_7e6c9 callchannel Music_TitleScreen_branch_7e6c9 callchannel Music_TitleScreen_branch_7e6c9 @@ -415,7 +415,7 @@ Music_TitleScreen_branch_7e664: note B_, 4 loopchannel 0, Music_TitleScreen_branch_7e65e -Music_TitleScreen_branch_7e6c9: +Music_TitleScreen_branch_7e6c9:: note G_, 6 note D_, 3 note G_, 6 @@ -424,7 +424,7 @@ Music_TitleScreen_branch_7e6c9: note D_, 3 endchannel -Music_TitleScreen_branch_7e6d0: +Music_TitleScreen_branch_7e6d0:: note F_, 6 note C_, 3 note F_, 6 @@ -433,14 +433,14 @@ Music_TitleScreen_branch_7e6d0: note C_, 3 endchannel -Music_TitleScreen_branch_7e6d7: +Music_TitleScreen_branch_7e6d7:: note A#, 6 note F_, 3 note A#, 6 note F_, 3 endchannel -Music_TitleScreen_branch_7e6dc: +Music_TitleScreen_branch_7e6dc:: octave 4 note C_, 6 octave 3 @@ -451,7 +451,7 @@ Music_TitleScreen_branch_7e6dc: note G_, 3 endchannel -Music_TitleScreen_branch_7e6e5: +Music_TitleScreen_branch_7e6e5:: notetype 12, 1, 0 octave 4 note D_, 1 @@ -459,7 +459,7 @@ Music_TitleScreen_branch_7e6e5: endchannel -Music_TitleScreen_Ch4: ; 7e6eb (1f:66eb) +Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb) dspeed 6 rest 4 dnote 1, snare3 @@ -487,7 +487,7 @@ Music_TitleScreen_Ch4: ; 7e6eb (1f:66eb) dnote 2, snare2 dnote 2, snare1 -Music_TitleScreen_branch_7e716: +Music_TitleScreen_branch_7e716:: dspeed 12 dnote 1, snare2 rest 3 @@ -654,7 +654,7 @@ Music_TitleScreen_branch_7e716: dnote 4, snare2 loopchannel 0, Music_TitleScreen_branch_7e716 -Music_TitleScreen_branch_7e834: +Music_TitleScreen_branch_7e834:: dnote 1, snare2 rest 3 dnote 1, snare2 @@ -665,7 +665,7 @@ Music_TitleScreen_branch_7e834: rest 3 endchannel -Music_TitleScreen_branch_7e842: +Music_TitleScreen_branch_7e842:: dnote 1, snare2 rest 3 dnote 1, snare2 diff --git a/music/trainerbattle.asm b/music/trainerbattle.asm index 3014887e..2e4bcdaf 100644 --- a/music/trainerbattle.asm +++ b/music/trainerbattle.asm @@ -1,4 +1,4 @@ -Music_TrainerBattle_Ch1: ; 22919 (8:6919) +Music_TrainerBattle_Ch1:: ; 22919 (8:6919) tempo 0, 112 stereopanning 119 duty 3 @@ -66,7 +66,7 @@ Music_TrainerBattle_Ch1: ; 22919 (8:6919) note C_, 2 note C#, 2 -Music_TrainerBattle_branch_22962: +Music_TrainerBattle_branch_22962:: notetype 12, 11, 5 note D_, 2 note E_, 4 @@ -649,7 +649,7 @@ Music_TrainerBattle_branch_22962: loopchannel 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch2: ; 22bae (8:6bae) +Music_TrainerBattle_Ch2:: ; 22bae (8:6bae) duty 3 vibrato 10, 2, 5 notetype 12, 12, 2 @@ -722,7 +722,7 @@ Music_TrainerBattle_Ch2: ; 22bae (8:6bae) octave 4 note A_, 4 -Music_TrainerBattle_branch_22bfc: +Music_TrainerBattle_branch_22bfc:: notetype 12, 12, 7 octave 3 note B_, 6 @@ -953,7 +953,7 @@ Music_TrainerBattle_branch_22bfc: loopchannel 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch3: ; 22d10 (8:6d10) +Music_TrainerBattle_Ch3:: ; 22d10 (8:6d10) vibrato 0, 2, 0 notetype 12, 1, 4 octave 3 @@ -1092,7 +1092,7 @@ Music_TrainerBattle_Ch3: ; 22d10 (8:6d10) octave 3 note C_, 2 -Music_TrainerBattle_branch_22d9c: +Music_TrainerBattle_branch_22d9c:: octave 2 note A#, 1 note B_, 1 diff --git a/music/unusedsong.asm b/music/unusedsong.asm index b68295da..ee73de3f 100644 --- a/music/unusedsong.asm +++ b/music/unusedsong.asm @@ -1,9 +1,9 @@ -Music_UnusedSong_Ch1: ; a913 (2:6913) +Music_UnusedSong_Ch1:: ; a913 (2:6913) tempo 0, 144 stereopanning 119 vibrato 5, 1, 6 -Music_UnusedSong_branch_a91b: +Music_UnusedSong_branch_a91b:: notetype 12, 1, 0 octave 6 note E_, 1 @@ -182,13 +182,13 @@ Music_UnusedSong_branch_a91b: endchannel -Music_UnusedSong_Ch2: ; a9cf (2:69cf) +Music_UnusedSong_Ch2:: ; a9cf (2:69cf) tempo 0, 144 stereopanning 119 togglecall vibrato 6, 1, 5 -Music_UnusedSong_branch_a9d8: +Music_UnusedSong_branch_a9d8:: notetype 12, 1, 0 octave 6 note E_, 1 diff --git a/music/vermilion.asm b/music/vermilion.asm index c48918f2..4d358528 100644 --- a/music/vermilion.asm +++ b/music/vermilion.asm @@ -1,11 +1,11 @@ -Music_Vermilion_Ch1: ; b9eb (2:79eb) +Music_Vermilion_Ch1:: ; b9eb (2:79eb) tempo 0, 156 stereopanning 119 duty 3 vibrato 12, 3, 4 togglecall -Music_Vermilion_branch_b9f6: +Music_Vermilion_branch_b9f6:: notetype 12, 11, 5 octave 3 note E_, 4 @@ -111,11 +111,11 @@ Music_Vermilion_branch_b9f6: loopchannel 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch2: ; ba61 (2:7a61) +Music_Vermilion_Ch2:: ; ba61 (2:7a61) duty 3 vibrato 10, 2, 3 -Music_Vermilion_branch_ba66: +Music_Vermilion_branch_ba66:: notetype 12, 12, 7 octave 3 note A_, 8 @@ -178,10 +178,10 @@ Music_Vermilion_branch_ba66: loopchannel 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch3: ; baa6 (2:7aa6) +Music_Vermilion_Ch3:: ; baa6 (2:7aa6) notetype 12, 1, 0 -Music_Vermilion_branch_baa8: +Music_Vermilion_branch_baa8:: octave 4 note A_, 2 note E_, 2 @@ -282,10 +282,10 @@ Music_Vermilion_branch_baa8: loopchannel 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch4: ; bb0d (2:7b0d) +Music_Vermilion_Ch4:: ; bb0d (2:7b0d) dspeed 12 -Music_Vermilion_branch_bb0e: +Music_Vermilion_branch_bb0e:: callchannel Music_Vermilion_branch_bb3f dnote 2, triangle1 dnote 1, triangle1 @@ -307,7 +307,7 @@ Music_Vermilion_branch_bb0e: callchannel Music_Vermilion_branch_bb3f loopchannel 0, Music_Vermilion_branch_bb0e -Music_Vermilion_branch_bb3f: +Music_Vermilion_branch_bb3f:: dnote 2, triangle1 dnote 1, triangle1 dnote 1, triangle1 diff --git a/music/wildbattle.asm b/music/wildbattle.asm index 280e1137..b2b80e6e 100644 --- a/music/wildbattle.asm +++ b/music/wildbattle.asm @@ -1,4 +1,4 @@ -Music_WildBattle_Ch1: ; 23099 (8:7099) +Music_WildBattle_Ch1:: ; 23099 (8:7099) tempo 0, 104 stereopanning 119 duty 3 @@ -61,7 +61,7 @@ Music_WildBattle_Ch1: ; 23099 (8:7099) note D#, 10 note C#, 10 -Music_WildBattle_branch_230e0: +Music_WildBattle_branch_230e0:: notetype 12, 11, 3 note C#, 1 note D_, 1 @@ -300,7 +300,7 @@ Music_WildBattle_branch_230e0: loopchannel 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch2: ; 231d8 (8:71d8) +Music_WildBattle_Ch2:: ; 231d8 (8:71d8) duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -372,7 +372,7 @@ Music_WildBattle_Ch2: ; 231d8 (8:71d8) note G_, 10 note G_, 10 -Music_WildBattle_branch_23225: +Music_WildBattle_branch_23225:: notetype 12, 12, 5 note G_, 6 note F#, 6 @@ -462,7 +462,7 @@ Music_WildBattle_branch_23225: loopchannel 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch3: ; 23290 (8:7290) +Music_WildBattle_Ch3:: ; 23290 (8:7290) vibrato 0, 2, 0 notetype 12, 1, 1 octave 4 @@ -498,7 +498,7 @@ Music_WildBattle_Ch3: ; 23290 (8:7290) note A#, 2 note B_, 2 -Music_WildBattle_branch_232b5: +Music_WildBattle_branch_232b5:: octave 4 note C_, 2 note G_, 2 @@ -532,7 +532,7 @@ Music_WildBattle_branch_232b5: note F_, 2 loopchannel 2, Music_WildBattle_branch_232b5 -Music_WildBattle_branch_232d8: +Music_WildBattle_branch_232d8:: note C_, 2 note G_, 2 note C_, 2 |