diff options
Diffstat (limited to 'audio/music/kantogymbattle.asm')
| -rw-r--r-- | audio/music/kantogymbattle.asm | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/audio/music/kantogymbattle.asm b/audio/music/kantogymbattle.asm index 0b5eccbf1..17fce2d6d 100644 --- a/audio/music/kantogymbattle.asm +++ b/audio/music/kantogymbattle.asm @@ -4,7 +4,6 @@ Music_KantoGymBattle: ; ec720 dbw $02, Music_KantoGymBattle_Ch3 ; ec729 - Music_KantoGymBattle_Ch1: ; ec729 tempo 101 volume $77 @@ -87,7 +86,6 @@ Music_KantoGymBattle_Ch1: ; ec729 note E_, 4 note E_, 4 note E_, 2 - Music_KantoGymBattle_branch_ec78b: ; ec78b callchannel Music_KantoGymBattle_branch_ec832 octave 2 @@ -254,13 +252,13 @@ Music_KantoGymBattle_branch_ec832: ; ec832 note D#, 2 note C#, 2 endchannel +; ec847 Music_KantoGymBattle_Ch2: ; ec847 dutycycle $3 vibrato $8, $36 tone $0001 notetype $c, $c2 - Music_KantoGymBattle_branch_ec852: ; ec852 octave 4 note A#, 1 @@ -270,7 +268,6 @@ Music_KantoGymBattle_branch_ec852: ; ec852 note D#, 1 loopchannel 8, Music_KantoGymBattle_branch_ec852 octave 3 - Music_KantoGymBattle_branch_ec85d: ; ec85d intensity $c2 note D#, 2 @@ -319,7 +316,6 @@ Music_KantoGymBattle_branch_ec85d: ; ec85d intensity $c2 octave 4 loopchannel 2, Music_KantoGymBattle_branch_ec85d - Music_KantoGymBattle_branch_ec894: ; ec894 callchannel Music_KantoGymBattle_branch_ec907 note E_, 8 @@ -441,13 +437,13 @@ Music_KantoGymBattle_branch_ec907: ; ec907 dutycycle $3 intensity $b0 endchannel +; ec92e Music_KantoGymBattle_Ch3: ; ec92e notetype $c, $19 octave 2 note E_, 1 note __, 1 - Music_KantoGymBattle_branch_ec934: ; ec934 note B_, 3 note __, 1 @@ -455,7 +451,6 @@ Music_KantoGymBattle_branch_ec934: ; ec934 note B_, 2 note G#, 2 note B_, 2 - Music_KantoGymBattle_branch_ec93d: ; ec93d note D#, 1 note __, 1 @@ -494,13 +489,11 @@ Music_KantoGymBattle_branch_ec93d: ; ec93d note __, 1 note E_, 2 loopchannel 2, Music_KantoGymBattle_branch_ec93d - Music_KantoGymBattle_branch_ec965: ; ec965 octave 2 note D#, 2 note A#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec965 - Music_KantoGymBattle_branch_ec96c: ; ec96c note E_, 2 note B_, 2 @@ -518,14 +511,12 @@ Music_KantoGymBattle_branch_ec96c: ; ec96c note E_, 2 octave 2 note B_, 2 - Music_KantoGymBattle_branch_ec97f: ; ec97f octave 2 note F#, 2 octave 3 note C#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec97f - Music_KantoGymBattle_branch_ec987: ; ec987 octave 2 note E_, 2 @@ -535,7 +526,6 @@ Music_KantoGymBattle_branch_ec987: ; ec987 note E_, 2 octave 2 note B_, 2 - Music_KantoGymBattle_branch_ec992: ; ec992 note D#, 1 note __, 1 @@ -556,7 +546,6 @@ Music_KantoGymBattle_branch_ec992: ; ec992 note __, 1 note E_, 2 loopchannel 2, Music_KantoGymBattle_branch_ec992 - Music_KantoGymBattle_branch_ec9a8: ; ec9a8 note D#, 2 note A#, 2 @@ -574,13 +563,11 @@ Music_KantoGymBattle_branch_ec9a8: ; ec9a8 note B_, 2 octave 3 note E_, 2 - Music_KantoGymBattle_branch_ec9bb: ; ec9bb octave 2 note E_, 2 note B_, 2 loopchannel 5, Music_KantoGymBattle_branch_ec9bb - Music_KantoGymBattle_branch_ec9c2: ; ec9c2 octave 2 note F#, 2 @@ -601,18 +588,15 @@ Music_KantoGymBattle_branch_ec9c2: ; ec9c2 note F#, 2 note E_, 2 note C#, 2 - Music_KantoGymBattle_branch_ec9d8: ; ec9d8 octave 2 note D#, 2 note A#, 2 loopchannel 4, Music_KantoGymBattle_branch_ec9d8 - Music_KantoGymBattle_branch_ec9df: ; ec9df note C#, 2 note G#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec9df - Music_KantoGymBattle_branch_ec9e5: ; ec9e5 note D#, 2 note A#, 2 @@ -630,3 +614,5 @@ Music_KantoGymBattle_branch_ec9e5: ; ec9e5 note F_, 2 loopchannel 0, Music_KantoGymBattle_branch_ec965 ; ec9fa + + |