ref: 2a0089b92bfacdddd7bcd43c42b67893046048a9
parent: 1a02ed6b37c91daeb5afeb6e9243b1e961fc4f63
author: yenatch <[email protected]>
date: Sun Sep 1 08:08:19 EDT 2013
shorten some overly long music filenames
--- a/audio/music/bugcatchingcontestresults.asm
+++ /dev/null
@@ -1,177 +1,0 @@
-_Music_BugCatchingContestResults: ; 0xefb3e
- db $c0
- dw _Music_BugCatchingContestResults_Ch1
- db $01
- dw _Music_BugCatchingContestResults_Ch2
- db $02
- dw _Music_BugCatchingContestResults_Ch3
- db $03
- dw _Music_BugCatchingContestResults_Ch4
-; 0xefb4a
-
-_Music_BugCatchingContestResults_Ch1: ; 0xefb4a
- tempo $9000
- volume $77
- notetype $0c, $51
- note $01
- octave2
- note $80
- note $02
- note $80
- note $02
- note $80
- note $02
- note $80
- note $00
- note $01
- note $a0
- note $02
- note $a0
- note $02
- note $a0
- note $02
- note $a0
- note $00
- note $01
- note $a0
- note $02
- note $a0
- note $02
- note $a0
- note $02
- note $a0
- note $00
- note $01
- note $c0
- note $02
- note $b0
- note $02
- note $a0
- note $02
- note $80
- note $00
- loopchannel $00, $7b52 ; end
-; 0xefb7b
-
-_Music_BugCatchingContestResults_Ch2: ; 0xefb7b
- notetype $0c, $61
- octave2
- note $11
- octave3
- note $50
- note $00
- octave1
- note $81
- octave3
- note $50
- note $00
- octave1
- note $a1
- octave3
- note $50
- note $00
- octave1
- note $c1
- octave3
- note $50
- note $00
- octave2
- note $31
- octave3
- note $60
- note $00
- octave1
- note $a1
- octave3
- note $60
- note $00
- octave1
- note $c1
- octave3
- note $60
- note $00
- octave2
- note $21
- octave3
- note $60
- note $00
- octave2
- note $31
- octave3
- note $60
- note $00
- octave1
- note $a1
- octave3
- note $60
- note $00
- loopchannel $02, $7ba6
- octave2
- note $81
- octave3
- note $80
- note $00
- octave2
- note $31
- octave3
- note $70
- note $00
- octave2
- note $81
- octave3
- note $60
- note $00
- octave2
- note $31
- octave3
- note $30
- note $00
- loopchannel $00, $7b7e ; end
-; 0xefbcc
-
-_Music_BugCatchingContestResults_Ch3: ; 0xefbcc
- vibrato $08, $24
- notetype $0c, $23
- octave4
- note $54
- note $00
- note $50
- note $60
- note $83
- octave5
- note $13
- octave4
- note $c7
- note $a7
- note $34
- note $00
- note $30
- note $50
- note $63
- note $c3
- note $a7
- note $87
- loopchannel $00, $7bd2 ; end
-; 0xefbe9
-
-_Music_BugCatchingContestResults_Ch4: ; 0xefbe9
- togglenoise $04
- notetype $06
- note $23
- note $23
- note $21
- note $21
- note $21
- note $21
- note $23
- note $23
- note $80
- note $80
- note $80
- note $80
- note $80
- note $80
- note $80
- note $80
- loopchannel $00, $7bed ; end
-; 0xefc01
--- /dev/null
+++ b/audio/music/contestresults.asm
@@ -1,0 +1,177 @@
+_Music_BugCatchingContestResults: ; 0xefb3e
+ db $c0
+ dw _Music_BugCatchingContestResults_Ch1
+ db $01
+ dw _Music_BugCatchingContestResults_Ch2
+ db $02
+ dw _Music_BugCatchingContestResults_Ch3
+ db $03
+ dw _Music_BugCatchingContestResults_Ch4
+; 0xefb4a
+
+_Music_BugCatchingContestResults_Ch1: ; 0xefb4a
+ tempo $9000
+ volume $77
+ notetype $0c, $51
+ note $01
+ octave2
+ note $80
+ note $02
+ note $80
+ note $02
+ note $80
+ note $02
+ note $80
+ note $00
+ note $01
+ note $a0
+ note $02
+ note $a0
+ note $02
+ note $a0
+ note $02
+ note $a0
+ note $00
+ note $01
+ note $a0
+ note $02
+ note $a0
+ note $02
+ note $a0
+ note $02
+ note $a0
+ note $00
+ note $01
+ note $c0
+ note $02
+ note $b0
+ note $02
+ note $a0
+ note $02
+ note $80
+ note $00
+ loopchannel $00, $7b52 ; end
+; 0xefb7b
+
+_Music_BugCatchingContestResults_Ch2: ; 0xefb7b
+ notetype $0c, $61
+ octave2
+ note $11
+ octave3
+ note $50
+ note $00
+ octave1
+ note $81
+ octave3
+ note $50
+ note $00
+ octave1
+ note $a1
+ octave3
+ note $50
+ note $00
+ octave1
+ note $c1
+ octave3
+ note $50
+ note $00
+ octave2
+ note $31
+ octave3
+ note $60
+ note $00
+ octave1
+ note $a1
+ octave3
+ note $60
+ note $00
+ octave1
+ note $c1
+ octave3
+ note $60
+ note $00
+ octave2
+ note $21
+ octave3
+ note $60
+ note $00
+ octave2
+ note $31
+ octave3
+ note $60
+ note $00
+ octave1
+ note $a1
+ octave3
+ note $60
+ note $00
+ loopchannel $02, $7ba6
+ octave2
+ note $81
+ octave3
+ note $80
+ note $00
+ octave2
+ note $31
+ octave3
+ note $70
+ note $00
+ octave2
+ note $81
+ octave3
+ note $60
+ note $00
+ octave2
+ note $31
+ octave3
+ note $30
+ note $00
+ loopchannel $00, $7b7e ; end
+; 0xefbcc
+
+_Music_BugCatchingContestResults_Ch3: ; 0xefbcc
+ vibrato $08, $24
+ notetype $0c, $23
+ octave4
+ note $54
+ note $00
+ note $50
+ note $60
+ note $83
+ octave5
+ note $13
+ octave4
+ note $c7
+ note $a7
+ note $34
+ note $00
+ note $30
+ note $50
+ note $63
+ note $c3
+ note $a7
+ note $87
+ loopchannel $00, $7bd2 ; end
+; 0xefbe9
+
+_Music_BugCatchingContestResults_Ch4: ; 0xefbe9
+ togglenoise $04
+ notetype $06
+ note $23
+ note $23
+ note $21
+ note $21
+ note $21
+ note $21
+ note $23
+ note $23
+ note $80
+ note $80
+ note $80
+ note $80
+ note $80
+ note $80
+ note $80
+ note $80
+ loopchannel $00, $7bed ; end
+; 0xefc01
--- /dev/null
+++ b/audio/music/johtogymbattle.asm
@@ -1,0 +1,1039 @@
+_Music_JohtoGymLeaderBattle: ; 0xea50d
+ db $80
+ dw _Music_JohtoGymLeaderBattle_Ch1
+ db $01
+ dw _Music_JohtoGymLeaderBattle_Ch2
+ db $02
+ dw _Music_JohtoGymLeaderBattle_Ch3
+; 0xea516
+
+_Music_JohtoGymLeaderBattle_Ch1: ; 0xea516
+ tempo $6500
+ volume $77
+ dutycycle $03
+ tone $0200
+ vibrato $12, $15
+ notetype $0c, $b2
+ octave3
+ note $b0
+ note $a0
+ note $90
+ note $a0
+ loopchannel $04, $6526
+ note $20
+ note $10
+ octave2
+ note $b0
+ octave3
+ note $10
+ loopchannel $03, $652f
+ intensity $4b
+ note $23
+ intensity $b2
+ note $35
+ note $45
+ note $13
+ note $65
+ note $35
+ note $43
+ note $35
+ note $45
+ note $13
+ note $65
+ note $85
+ intensity $b7
+ note $13
+ intensity $b2
+ note $85
+ note $95
+ note $63
+ note $95
+ note $65
+ note $93
+ note $85
+ note $95
+ note $63
+ note $95
+ octave4
+ note $15
+ octave3
+ note $91
+ note $61
+ intensity $b5
+ note $35
+ note $85
+ note $61
+ note $81
+ note $93
+ note $83
+ note $63
+ note $83
+ intensity $b7
+ note $9b
+ intensity $b2
+ note $83
+ intensity $b7
+ octave4
+ note $2b
+ intensity $b2
+ note $13
+ intensity $b5
+ octave3
+ note $35
+ note $85
+ note $61
+ note $81
+ note $93
+ note $83
+ note $63
+ note $83
+ intensity $b7
+ note $97
+ note $87
+ note $67
+ note $47
+ intensity $70
+ note $17
+ intensity $77
+ note $17
+ intensity $b4
+ note $41
+ note $51
+ note $65
+ note $81
+ note $43
+ intensity $77
+ octave2
+ note $b7
+ note $b7
+ intensity $c5
+ octave3
+ note $81
+ note $91
+ note $b5
+ note $b1
+ note $93
+ intensity $c7
+ note $87
+ note $63
+ note $51
+ note $21
+ intensity $a0
+ note $17
+ intensity $a7
+ note $17
+ intensity $b2
+ note $65
+ note $63
+ note $51
+ note $63
+ note $65
+ note $65
+ note $61
+ note $91
+ note $55
+ note $53
+ note $61
+ note $51
+ note $21
+ note $15
+ note $15
+ note $13
+ note $65
+ note $61
+ note $91
+ note $51
+ note $61
+ note $91
+ note $61
+ note $13
+ note $65
+ note $51
+ note $91
+ note $51
+ note $83
+ note $53
+ note $61
+ note $51
+ note $61
+ note $85
+ note $83
+ octave4
+ note $11
+ octave3
+ note $81
+ note $11
+ note $15
+ note $15
+ note $13
+ note $25
+ note $25
+ note $23
+ note $35
+ note $35
+ note $33
+ note $45
+ note $45
+ note $43
+ intensity $80
+ note $8f
+ intensity $90
+ note $9f
+ intensity $a0
+ note $a7
+ note $b1
+ note $a1
+ note $91
+ note $a1
+ intensity $b0
+ note $b7
+ note $c1
+ note $b1
+ note $a1
+ octave4
+ note $21
+ intensity $b7
+ note $17
+ note $23
+ note $13
+ octave3
+ note $91
+ octave4
+ note $11
+ octave3
+ note $91
+ octave4
+ note $41
+ octave3
+ note $91
+ octave4
+ note $21
+ octave3
+ note $91
+ octave4
+ note $11
+ note $93
+ note $43
+ note $93
+ note $43
+ note $43
+ octave3
+ note $93
+ octave4
+ note $43
+ octave3
+ note $93
+ note $97
+ note $a3
+ note $93
+ note $41
+ note $91
+ note $41
+ octave4
+ note $21
+ octave3
+ note $41
+ note $a1
+ note $41
+ note $81
+ octave4
+ note $23
+ octave3
+ note $93
+ octave4
+ note $23
+ octave3
+ note $93
+ note $93
+ note $23
+ note $93
+ note $23
+ note $c7
+ note $a7
+ note $97
+ note $77
+ intensity $b4
+ note $a3
+ octave4
+ note $23
+ octave3
+ note $c3
+ octave4
+ note $53
+ intensity $92
+ note $41
+ note $41
+ note $41
+ note $41
+ intensity $b2
+ note $41
+ note $41
+ note $41
+ note $41
+ intensity $c2
+ note $4f
+ intensity $50
+ octave3
+ note $1f
+ note $6f
+ note $5f
+ intensity $97
+ note $49
+ intensity $b4
+ octave2
+ note $b1
+ octave3
+ note $41
+ note $71
+ loopchannel $00, $655d ; end
+; 0xea65f
+
+_Music_JohtoGymLeaderBattle_Ch2: ; 0xea65f
+ dutycycle $03
+ vibrato $08, $36
+ tone $0100
+ notetype $0c, $c2
+ octave4
+ note $70
+ note $60
+ note $50
+ note $b0
+ loopchannel $04, $666a
+ note $70
+ note $60
+ note $70
+ note $b0
+ loopchannel $04, $6673
+ note $a5
+ octave3
+ note $b5
+ note $83
+ octave4
+ note $35
+ octave3
+ note $a5
+ note $b3
+ note $a5
+ note $b5
+ note $83
+ octave4
+ note $35
+ note $45
+ intensity $b0
+ octave3
+ note $43
+ intensity $c2
+ octave4
+ note $31
+ intensity $92
+ octave3
+ note $31
+ note $31
+ intensity $c2
+ octave4
+ note $43
+ intensity $92
+ octave3
+ note $31
+ intensity $c2
+ octave4
+ note $13
+ note $81
+ notetype $0c, $92
+ octave3
+ note $31
+ note $31
+ intensity $c2
+ octave4
+ note $33
+ intensity $92
+ octave3
+ note $31
+ intensity $c2
+ octave4
+ note $41
+ intensity $92
+ octave3
+ note $41
+ intensity $c2
+ octave4
+ note $31
+ intensity $92
+ octave3
+ note $31
+ note $31
+ intensity $c2
+ octave4
+ note $43
+ intensity $92
+ octave3
+ note $31
+ intensity $c2
+ octave4
+ note $11
+ intensity $92
+ octave3
+ note $41
+ intensity $c2
+ octave4
+ note $81
+ intensity $92
+ octave3
+ note $61
+ note $61
+ intensity $c2
+ octave4
+ note $91
+ intensity $92
+ octave3
+ note $61
+ note $61
+ intensity $c2
+ octave4
+ note $71
+ intensity $b2
+ octave3
+ note $90
+ note $a0
+ intensity $c7
+ note $b7
+ intensity $c4
+ octave4
+ note $31
+ note $11
+ octave3
+ note $b1
+ octave4
+ note $11
+ intensity $c7
+ note $27
+ intensity $c4
+ note $61
+ note $41
+ note $21
+ note $41
+ intensity $b0
+ note $65
+ intensity $b7
+ note $65
+ intensity $c2
+ note $43
+ intensity $b0
+ note $95
+ intensity $b7
+ note $95
+ intensity $c2
+ note $63
+ intensity $c7
+ octave3
+ note $b7
+ intensity $c4
+ octave4
+ note $31
+ note $11
+ octave3
+ note $b1
+ octave4
+ note $11
+ intensity $c7
+ note $27
+ intensity $c4
+ note $61
+ note $41
+ note $21
+ note $41
+ intensity $b0
+ note $2f
+ intensity $b7
+ note $2f
+ intensity $a4
+ octave3
+ note $65
+ note $45
+ note $63
+ intensity $c6
+ octave4
+ note $15
+ octave3
+ note $b5
+ octave4
+ note $13
+ intensity $a4
+ octave3
+ note $25
+ note $15
+ note $23
+ intensity $c6
+ octave4
+ note $25
+ note $15
+ note $23
+ intensity $3c
+ note $19
+ intensity $b7
+ note $15
+ intensity $b0
+ note $57
+ intensity $b7
+ note $57
+ intensity $b0
+ octave3
+ note $2f
+ octave2
+ note $b7
+ octave3
+ note $25
+ note $41
+ note $1f
+ note $5f
+ intensity $a0
+ octave5
+ note $23
+ intensity $a7
+ octave5
+ note $2b
+ intensity $b7
+ octave4
+ note $b7
+ octave5
+ note $25
+ note $41
+ intensity $a0
+ note $17
+ intensity $a7
+ note $17
+ intensity $3e
+ note $55
+ intensity $a6
+ note $59
+ intensity $c2
+ octave3
+ note $65
+ note $65
+ note $63
+ note $75
+ note $75
+ note $73
+ note $85
+ note $85
+ note $83
+ note $95
+ note $95
+ note $93
+ intensity $90
+ octave4
+ note $1f
+ intensity $a0
+ note $2f
+ intensity $b0
+ note $3f
+ intensity $b7
+ note $47
+ intensity $4c
+ note $45
+ intensity $c2
+ note $70
+ note $80
+ intensity $c7
+ note $97
+ note $a1
+ note $91
+ note $71
+ note $a1
+ note $93
+ octave5
+ note $13
+ octave4
+ note $a3
+ note $93
+ octave5
+ note $43
+ octave4
+ note $93
+ octave5
+ note $43
+ octave4
+ note $93
+ octave5
+ note $41
+ note $21
+ note $11
+ note $21
+ note $11
+ octave4
+ note $a1
+ note $91
+ note $a1
+ note $47
+ note $51
+ note $41
+ note $21
+ note $51
+ note $43
+ note $93
+ note $53
+ note $23
+ note $93
+ note $23
+ note $93
+ note $23
+ note $a1
+ note $91
+ note $71
+ note $51
+ note $41
+ note $51
+ note $41
+ note $21
+ note $47
+ note $27
+ octave3
+ note $c7
+ note $a7
+ octave4
+ note $43
+ note $93
+ note $53
+ note $a3
+ intensity $c0
+ note $97
+ intensity $c7
+ note $97
+ intensity $c2
+ note $9f
+ intensity $80
+ octave3
+ note $6f
+ octave4
+ note $1f
+ octave3
+ note $cf
+ note $8f
+ loopchannel $00, $66ee ; end
+; 0xea7f4
+
+_Music_JohtoGymLeaderBattle_Ch3: ; 0xea7f4
+ notetype $0c, $19
+ octave4
+ note $60
+ note $00
+ octave3
+ note $a1
+ octave4
+ note $60
+ note $00
+ octave3
+ note $91
+ octave4
+ note $60
+ note $00
+ octave3
+ note $81
+ octave4
+ note $60
+ note $00
+ octave3
+ note $71
+ octave4
+ note $90
+ note $00
+ octave3
+ note $61
+ octave4
+ note $90
+ note $00
+ octave3
+ note $51
+ note $61
+ note $81
+ note $93
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea952
+ note $81
+ note $31
+ note $61
+ note $81
+ note $91
+ note $91
+ note $81
+ note $61
+ note $81
+ note $31
+ note $61
+ note $81
+ note $91
+ note $41
+ note $73
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea952
+ note $81
+ note $31
+ note $61
+ note $81
+ note $91
+ note $91
+ note $81
+ note $61
+ note $81
+ note $31
+ note $61
+ note $81
+ note $91
+ octave4
+ note $11
+ octave3
+ note $b1
+ note $91
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea963
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea963
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
+ note $21
+ note $91
+ note $21
+ note $91
+ note $21
+ note $b1
+ note $a1
+ note $91
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea963
+ note $31
+ note $81
+ note $31
+ note $81
+ note $31
+ note $81
+ note $91
+ note $81
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
+ note $11
+ note $81
+ note $b1
+ note $11
+ note $41
+ note $61
+ note $81
+ note $b1
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea978
+ octave3
+ note $81
+ note $91
+ note $61
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
+ note $11
+ note $81
+ note $11
+ note $81
+ note $11
+ note $51
+ note $61
+ note $81
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea978
+ octave3
+ note $11
+ note $21
+ note $91
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
+ note $11
+ note $81
+ note $11
+ note $81
+ note $61
+ note $51
+ note $61
+ note $81
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea978
+ octave3
+ note $61
+ octave2
+ note $b1
+ octave3
+ note $91
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
+ note $11
+ note $81
+ note $11
+ octave4
+ note $11
+ octave3
+ note $b1
+ note $81
+ note $61
+ note $81
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea983
+ note $01
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea990
+ octave4
+ note $21
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea99c
+ note $01
+ note $41
+ note $b1
+ octave4
+ note $41
+ octave3
+ note $41
+ note $b1
+ octave4
+ note $41
+ octave3
+ note $41
+ octave4
+ note $41
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea983
+ note $81
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea990
+ note $91
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea99c
+ note $a1
+ octave4
+ note $41
+ octave3
+ note $b1
+ note $41
+ octave4
+ note $41
+ octave3
+ note $41
+ octave4
+ note $41
+ note $33
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea9a9
+ note $41
+ note $91
+ note $41
+ octave4
+ note $21
+ octave3
+ note $41
+ note $a1
+ note $41
+ note $91
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea9a9
+ note $41
+ note $91
+ note $41
+ note $91
+ note $41
+ note $a1
+ note $91
+ note $71
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b1
+ note $21
+ note $71
+ note $21
+ octave4
+ note $21
+ octave3
+ note $21
+ note $a1
+ note $21
+ note $81
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b1
+ note $21
+ note $71
+ note $21
+ note $71
+ note $21
+ note $41
+ note $51
+ note $a1
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea9a9
+ note $41
+ note $91
+ note $41
+ note $91
+ note $41
+ note $91
+ note $a1
+ octave4
+ note $21
+ octave3
+ note $41
+ note $91
+ note $41
+ note $a1
+ note $41
+ note $c1
+ note $41
+ octave4
+ note $21
+ octave3
+ note $91
+ note $41
+ note $71
+ note $91
+ note $a1
+ note $a1
+ note $91
+ note $71
+ note $91
+ note $41
+ note $71
+ note $91
+ note $71
+ note $71
+ note $51
+ note $71
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b8
+ note $61
+ note $11
+ note $41
+ note $61
+ note $41
+ note $41
+ note $21
+ note $41
+ callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b8
+ note $61
+ note $11
+ note $41
+ note $61
+ note $41
+ note $71
+ note $61
+ note $41
+ loopchannel $00, $683f ; end
+; 0xea952
+
+_Music_JohtoGymLeaderBattle_sub_0xea952: ; 0xea952
+; subroutine
+ note $81
+ note $31
+ note $61
+ note $81
+ note $91
+ note $91
+ note $81
+ note $61
+ note $81
+ note $31
+ note $61
+ note $81
+ note $61
+ note $61
+ note $41
+ note $61
+ endchannel ; end
+; 0xea963
+
+_Music_JohtoGymLeaderBattle_sub_0xea963: ; 0xea963
+; subroutine
+ note $31
+ note $81
+ loopchannel $04, $6963
+ endchannel ; end
+; 0xea96a
+
+_Music_JohtoGymLeaderBattle_sub_0xea96a: ; 0xea96a
+; subroutine
+ note $21
+ note $91
+ loopchannel $04, $696a
+ endchannel ; end
+; 0xea971
+
+_Music_JohtoGymLeaderBattle_sub_0xea971: ; 0xea971
+; subroutine
+ note $11
+ note $81
+ loopchannel $04, $6971
+ endchannel ; end
+; 0xea978
+
+_Music_JohtoGymLeaderBattle_sub_0xea978: ; 0xea978
+; subroutine
+ octave2
+ note $b1
+ octave3
+ note $61
+ octave2
+ note $b1
+ octave3
+ note $61
+ octave2
+ note $b1
+ endchannel ; end
+; 0xea983
+
+_Music_JohtoGymLeaderBattle_sub_0xea983: ; 0xea983
+; subroutine
+ octave3
+ note $11
+ note $81
+ octave4
+ note $11
+ octave3
+ note $11
+ note $81
+ octave4
+ note $11
+ octave3
+ note $11
+ endchannel ; end
+; 0xea990
+
+_Music_JohtoGymLeaderBattle_sub_0xea990: ; 0xea990
+; subroutine
+ note $21
+ note $91
+ octave4
+ note $21
+ octave3
+ note $21
+ note $91
+ octave4
+ note $21
+ octave3
+ note $21
+ endchannel ; end
+; 0xea99c
+
+_Music_JohtoGymLeaderBattle_sub_0xea99c: ; 0xea99c
+; subroutine
+ octave3
+ note $31
+ note $a1
+ octave4
+ note $31
+ octave3
+ note $31
+ note $a1
+ octave4
+ note $31
+ octave3
+ note $31
+ endchannel ; end
+; 0xea9a9
+
+_Music_JohtoGymLeaderBattle_sub_0xea9a9: ; 0xea9a9
+; subroutine
+ octave3
+ note $41
+ note $91
+ loopchannel $04, $69a9
+ endchannel ; end
+; 0xea9b1
+
+_Music_JohtoGymLeaderBattle_sub_0xea9b1: ; 0xea9b1
+; subroutine
+ note $21
+ note $71
+ loopchannel $04, $69b1
+ endchannel ; end
+; 0xea9b8
+
+_Music_JohtoGymLeaderBattle_sub_0xea9b8: ; 0xea9b8
+; subroutine
+ note $61
+ note $11
+ note $41
+ note $61
+ note $71
+ note $71
+ note $61
+ note $41
+ endchannel ; end
+; 0xea9c1
--- a/audio/music/johtogymleaderbattle.asm
+++ /dev/null
@@ -1,1039 +1,0 @@
-_Music_JohtoGymLeaderBattle: ; 0xea50d
- db $80
- dw _Music_JohtoGymLeaderBattle_Ch1
- db $01
- dw _Music_JohtoGymLeaderBattle_Ch2
- db $02
- dw _Music_JohtoGymLeaderBattle_Ch3
-; 0xea516
-
-_Music_JohtoGymLeaderBattle_Ch1: ; 0xea516
- tempo $6500
- volume $77
- dutycycle $03
- tone $0200
- vibrato $12, $15
- notetype $0c, $b2
- octave3
- note $b0
- note $a0
- note $90
- note $a0
- loopchannel $04, $6526
- note $20
- note $10
- octave2
- note $b0
- octave3
- note $10
- loopchannel $03, $652f
- intensity $4b
- note $23
- intensity $b2
- note $35
- note $45
- note $13
- note $65
- note $35
- note $43
- note $35
- note $45
- note $13
- note $65
- note $85
- intensity $b7
- note $13
- intensity $b2
- note $85
- note $95
- note $63
- note $95
- note $65
- note $93
- note $85
- note $95
- note $63
- note $95
- octave4
- note $15
- octave3
- note $91
- note $61
- intensity $b5
- note $35
- note $85
- note $61
- note $81
- note $93
- note $83
- note $63
- note $83
- intensity $b7
- note $9b
- intensity $b2
- note $83
- intensity $b7
- octave4
- note $2b
- intensity $b2
- note $13
- intensity $b5
- octave3
- note $35
- note $85
- note $61
- note $81
- note $93
- note $83
- note $63
- note $83
- intensity $b7
- note $97
- note $87
- note $67
- note $47
- intensity $70
- note $17
- intensity $77
- note $17
- intensity $b4
- note $41
- note $51
- note $65
- note $81
- note $43
- intensity $77
- octave2
- note $b7
- note $b7
- intensity $c5
- octave3
- note $81
- note $91
- note $b5
- note $b1
- note $93
- intensity $c7
- note $87
- note $63
- note $51
- note $21
- intensity $a0
- note $17
- intensity $a7
- note $17
- intensity $b2
- note $65
- note $63
- note $51
- note $63
- note $65
- note $65
- note $61
- note $91
- note $55
- note $53
- note $61
- note $51
- note $21
- note $15
- note $15
- note $13
- note $65
- note $61
- note $91
- note $51
- note $61
- note $91
- note $61
- note $13
- note $65
- note $51
- note $91
- note $51
- note $83
- note $53
- note $61
- note $51
- note $61
- note $85
- note $83
- octave4
- note $11
- octave3
- note $81
- note $11
- note $15
- note $15
- note $13
- note $25
- note $25
- note $23
- note $35
- note $35
- note $33
- note $45
- note $45
- note $43
- intensity $80
- note $8f
- intensity $90
- note $9f
- intensity $a0
- note $a7
- note $b1
- note $a1
- note $91
- note $a1
- intensity $b0
- note $b7
- note $c1
- note $b1
- note $a1
- octave4
- note $21
- intensity $b7
- note $17
- note $23
- note $13
- octave3
- note $91
- octave4
- note $11
- octave3
- note $91
- octave4
- note $41
- octave3
- note $91
- octave4
- note $21
- octave3
- note $91
- octave4
- note $11
- note $93
- note $43
- note $93
- note $43
- note $43
- octave3
- note $93
- octave4
- note $43
- octave3
- note $93
- note $97
- note $a3
- note $93
- note $41
- note $91
- note $41
- octave4
- note $21
- octave3
- note $41
- note $a1
- note $41
- note $81
- octave4
- note $23
- octave3
- note $93
- octave4
- note $23
- octave3
- note $93
- note $93
- note $23
- note $93
- note $23
- note $c7
- note $a7
- note $97
- note $77
- intensity $b4
- note $a3
- octave4
- note $23
- octave3
- note $c3
- octave4
- note $53
- intensity $92
- note $41
- note $41
- note $41
- note $41
- intensity $b2
- note $41
- note $41
- note $41
- note $41
- intensity $c2
- note $4f
- intensity $50
- octave3
- note $1f
- note $6f
- note $5f
- intensity $97
- note $49
- intensity $b4
- octave2
- note $b1
- octave3
- note $41
- note $71
- loopchannel $00, $655d ; end
-; 0xea65f
-
-_Music_JohtoGymLeaderBattle_Ch2: ; 0xea65f
- dutycycle $03
- vibrato $08, $36
- tone $0100
- notetype $0c, $c2
- octave4
- note $70
- note $60
- note $50
- note $b0
- loopchannel $04, $666a
- note $70
- note $60
- note $70
- note $b0
- loopchannel $04, $6673
- note $a5
- octave3
- note $b5
- note $83
- octave4
- note $35
- octave3
- note $a5
- note $b3
- note $a5
- note $b5
- note $83
- octave4
- note $35
- note $45
- intensity $b0
- octave3
- note $43
- intensity $c2
- octave4
- note $31
- intensity $92
- octave3
- note $31
- note $31
- intensity $c2
- octave4
- note $43
- intensity $92
- octave3
- note $31
- intensity $c2
- octave4
- note $13
- note $81
- notetype $0c, $92
- octave3
- note $31
- note $31
- intensity $c2
- octave4
- note $33
- intensity $92
- octave3
- note $31
- intensity $c2
- octave4
- note $41
- intensity $92
- octave3
- note $41
- intensity $c2
- octave4
- note $31
- intensity $92
- octave3
- note $31
- note $31
- intensity $c2
- octave4
- note $43
- intensity $92
- octave3
- note $31
- intensity $c2
- octave4
- note $11
- intensity $92
- octave3
- note $41
- intensity $c2
- octave4
- note $81
- intensity $92
- octave3
- note $61
- note $61
- intensity $c2
- octave4
- note $91
- intensity $92
- octave3
- note $61
- note $61
- intensity $c2
- octave4
- note $71
- intensity $b2
- octave3
- note $90
- note $a0
- intensity $c7
- note $b7
- intensity $c4
- octave4
- note $31
- note $11
- octave3
- note $b1
- octave4
- note $11
- intensity $c7
- note $27
- intensity $c4
- note $61
- note $41
- note $21
- note $41
- intensity $b0
- note $65
- intensity $b7
- note $65
- intensity $c2
- note $43
- intensity $b0
- note $95
- intensity $b7
- note $95
- intensity $c2
- note $63
- intensity $c7
- octave3
- note $b7
- intensity $c4
- octave4
- note $31
- note $11
- octave3
- note $b1
- octave4
- note $11
- intensity $c7
- note $27
- intensity $c4
- note $61
- note $41
- note $21
- note $41
- intensity $b0
- note $2f
- intensity $b7
- note $2f
- intensity $a4
- octave3
- note $65
- note $45
- note $63
- intensity $c6
- octave4
- note $15
- octave3
- note $b5
- octave4
- note $13
- intensity $a4
- octave3
- note $25
- note $15
- note $23
- intensity $c6
- octave4
- note $25
- note $15
- note $23
- intensity $3c
- note $19
- intensity $b7
- note $15
- intensity $b0
- note $57
- intensity $b7
- note $57
- intensity $b0
- octave3
- note $2f
- octave2
- note $b7
- octave3
- note $25
- note $41
- note $1f
- note $5f
- intensity $a0
- octave5
- note $23
- intensity $a7
- octave5
- note $2b
- intensity $b7
- octave4
- note $b7
- octave5
- note $25
- note $41
- intensity $a0
- note $17
- intensity $a7
- note $17
- intensity $3e
- note $55
- intensity $a6
- note $59
- intensity $c2
- octave3
- note $65
- note $65
- note $63
- note $75
- note $75
- note $73
- note $85
- note $85
- note $83
- note $95
- note $95
- note $93
- intensity $90
- octave4
- note $1f
- intensity $a0
- note $2f
- intensity $b0
- note $3f
- intensity $b7
- note $47
- intensity $4c
- note $45
- intensity $c2
- note $70
- note $80
- intensity $c7
- note $97
- note $a1
- note $91
- note $71
- note $a1
- note $93
- octave5
- note $13
- octave4
- note $a3
- note $93
- octave5
- note $43
- octave4
- note $93
- octave5
- note $43
- octave4
- note $93
- octave5
- note $41
- note $21
- note $11
- note $21
- note $11
- octave4
- note $a1
- note $91
- note $a1
- note $47
- note $51
- note $41
- note $21
- note $51
- note $43
- note $93
- note $53
- note $23
- note $93
- note $23
- note $93
- note $23
- note $a1
- note $91
- note $71
- note $51
- note $41
- note $51
- note $41
- note $21
- note $47
- note $27
- octave3
- note $c7
- note $a7
- octave4
- note $43
- note $93
- note $53
- note $a3
- intensity $c0
- note $97
- intensity $c7
- note $97
- intensity $c2
- note $9f
- intensity $80
- octave3
- note $6f
- octave4
- note $1f
- octave3
- note $cf
- note $8f
- loopchannel $00, $66ee ; end
-; 0xea7f4
-
-_Music_JohtoGymLeaderBattle_Ch3: ; 0xea7f4
- notetype $0c, $19
- octave4
- note $60
- note $00
- octave3
- note $a1
- octave4
- note $60
- note $00
- octave3
- note $91
- octave4
- note $60
- note $00
- octave3
- note $81
- octave4
- note $60
- note $00
- octave3
- note $71
- octave4
- note $90
- note $00
- octave3
- note $61
- octave4
- note $90
- note $00
- octave3
- note $51
- note $61
- note $81
- note $93
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea952
- note $81
- note $31
- note $61
- note $81
- note $91
- note $91
- note $81
- note $61
- note $81
- note $31
- note $61
- note $81
- note $91
- note $41
- note $73
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea952
- note $81
- note $31
- note $61
- note $81
- note $91
- note $91
- note $81
- note $61
- note $81
- note $31
- note $61
- note $81
- note $91
- octave4
- note $11
- octave3
- note $b1
- note $91
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea963
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea963
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
- note $21
- note $91
- note $21
- note $91
- note $21
- note $b1
- note $a1
- note $91
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea963
- note $31
- note $81
- note $31
- note $81
- note $31
- note $81
- note $91
- note $81
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
- note $11
- note $81
- note $b1
- note $11
- note $41
- note $61
- note $81
- note $b1
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea978
- octave3
- note $81
- note $91
- note $61
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
- note $11
- note $81
- note $11
- note $81
- note $11
- note $51
- note $61
- note $81
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea978
- octave3
- note $11
- note $21
- note $91
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
- note $11
- note $81
- note $11
- note $81
- note $61
- note $51
- note $61
- note $81
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea978
- octave3
- note $61
- octave2
- note $b1
- octave3
- note $91
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
- note $11
- note $81
- note $11
- octave4
- note $11
- octave3
- note $b1
- note $81
- note $61
- note $81
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea983
- note $01
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea990
- octave4
- note $21
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea99c
- note $01
- note $41
- note $b1
- octave4
- note $41
- octave3
- note $41
- note $b1
- octave4
- note $41
- octave3
- note $41
- octave4
- note $41
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea983
- note $81
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea990
- note $91
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea99c
- note $a1
- octave4
- note $41
- octave3
- note $b1
- note $41
- octave4
- note $41
- octave3
- note $41
- octave4
- note $41
- note $33
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea9a9
- note $41
- note $91
- note $41
- octave4
- note $21
- octave3
- note $41
- note $a1
- note $41
- note $91
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea9a9
- note $41
- note $91
- note $41
- note $91
- note $41
- note $a1
- note $91
- note $71
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b1
- note $21
- note $71
- note $21
- octave4
- note $21
- octave3
- note $21
- note $a1
- note $21
- note $81
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b1
- note $21
- note $71
- note $21
- note $71
- note $21
- note $41
- note $51
- note $a1
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea9a9
- note $41
- note $91
- note $41
- note $91
- note $41
- note $91
- note $a1
- octave4
- note $21
- octave3
- note $41
- note $91
- note $41
- note $a1
- note $41
- note $c1
- note $41
- octave4
- note $21
- octave3
- note $91
- note $41
- note $71
- note $91
- note $a1
- note $a1
- note $91
- note $71
- note $91
- note $41
- note $71
- note $91
- note $71
- note $71
- note $51
- note $71
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b8
- note $61
- note $11
- note $41
- note $61
- note $41
- note $41
- note $21
- note $41
- callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b8
- note $61
- note $11
- note $41
- note $61
- note $41
- note $71
- note $61
- note $41
- loopchannel $00, $683f ; end
-; 0xea952
-
-_Music_JohtoGymLeaderBattle_sub_0xea952: ; 0xea952
-; subroutine
- note $81
- note $31
- note $61
- note $81
- note $91
- note $91
- note $81
- note $61
- note $81
- note $31
- note $61
- note $81
- note $61
- note $61
- note $41
- note $61
- endchannel ; end
-; 0xea963
-
-_Music_JohtoGymLeaderBattle_sub_0xea963: ; 0xea963
-; subroutine
- note $31
- note $81
- loopchannel $04, $6963
- endchannel ; end
-; 0xea96a
-
-_Music_JohtoGymLeaderBattle_sub_0xea96a: ; 0xea96a
-; subroutine
- note $21
- note $91
- loopchannel $04, $696a
- endchannel ; end
-; 0xea971
-
-_Music_JohtoGymLeaderBattle_sub_0xea971: ; 0xea971
-; subroutine
- note $11
- note $81
- loopchannel $04, $6971
- endchannel ; end
-; 0xea978
-
-_Music_JohtoGymLeaderBattle_sub_0xea978: ; 0xea978
-; subroutine
- octave2
- note $b1
- octave3
- note $61
- octave2
- note $b1
- octave3
- note $61
- octave2
- note $b1
- endchannel ; end
-; 0xea983
-
-_Music_JohtoGymLeaderBattle_sub_0xea983: ; 0xea983
-; subroutine
- octave3
- note $11
- note $81
- octave4
- note $11
- octave3
- note $11
- note $81
- octave4
- note $11
- octave3
- note $11
- endchannel ; end
-; 0xea990
-
-_Music_JohtoGymLeaderBattle_sub_0xea990: ; 0xea990
-; subroutine
- note $21
- note $91
- octave4
- note $21
- octave3
- note $21
- note $91
- octave4
- note $21
- octave3
- note $21
- endchannel ; end
-; 0xea99c
-
-_Music_JohtoGymLeaderBattle_sub_0xea99c: ; 0xea99c
-; subroutine
- octave3
- note $31
- note $a1
- octave4
- note $31
- octave3
- note $31
- note $a1
- octave4
- note $31
- octave3
- note $31
- endchannel ; end
-; 0xea9a9
-
-_Music_JohtoGymLeaderBattle_sub_0xea9a9: ; 0xea9a9
-; subroutine
- octave3
- note $41
- note $91
- loopchannel $04, $69a9
- endchannel ; end
-; 0xea9b1
-
-_Music_JohtoGymLeaderBattle_sub_0xea9b1: ; 0xea9b1
-; subroutine
- note $21
- note $71
- loopchannel $04, $69b1
- endchannel ; end
-; 0xea9b8
-
-_Music_JohtoGymLeaderBattle_sub_0xea9b8: ; 0xea9b8
-; subroutine
- note $61
- note $11
- note $41
- note $61
- note $71
- note $71
- note $61
- note $41
- endchannel ; end
-; 0xea9c1
--- /dev/null
+++ b/audio/music/johtowildbattle.asm
@@ -1,0 +1,579 @@
+_Music_JohtoWildPokemonBattle: ; 0xf5dc5
+ db $80
+ dw _Music_JohtoWildPokemonBattle_Ch1
+ db $01
+ dw _Music_JohtoWildPokemonBattle_Ch2
+ db $02
+ dw _Music_JohtoWildPokemonBattle_Ch3
+; 0xf5dce
+
+_Music_JohtoWildPokemonBattle_Ch1: ; 0xf5dce
+ tempo $6800
+ volume $77
+ dutycycle $03
+ tone $0200
+ vibrato $12, $15
+ notetype $0c, $b2
+ octave4
+ note $10
+ octave3
+ note $c0
+ note $b0
+ note $a0
+ note $b0
+ note $a0
+ note $90
+ note $80
+ note $90
+ note $80
+ note $70
+ note $60
+ note $70
+ note $60
+ note $50
+ note $40
+ note $50
+ note $40
+ note $30
+ note $20
+ note $30
+ note $20
+ note $10
+ octave2
+ note $c0
+ octave3
+ note $10
+ octave2
+ note $c0
+ note $b0
+ note $a0
+ note $b0
+ note $c0
+ octave3
+ note $10
+ note $20
+ intensity $b2
+ note $85
+ octave2
+ note $b5
+ octave3
+ note $33
+ note $13
+ note $23
+ note $37
+ note $45
+ octave2
+ note $b5
+ octave3
+ note $43
+ note $13
+ note $33
+ intensity $b5
+ note $47
+ intensity $b2
+ octave4
+ note $35
+ octave3
+ note $b5
+ octave4
+ note $33
+ note $13
+ note $23
+ note $37
+ note $45
+ octave3
+ note $b5
+ octave4
+ note $43
+ note $13
+ note $33
+ intensity $6f
+ note $47
+ intensity $b6
+ octave3
+ note $35
+ octave2
+ note $c5
+ note $c3
+ octave3
+ note $65
+ note $55
+ note $13
+ note $97
+ note $b0
+ note $a0
+ note $80
+ note $70
+ note $80
+ note $90
+ note $a0
+ note $b0
+ octave4
+ note $17
+ octave3
+ note $c0
+ note $b0
+ note $90
+ note $80
+ note $90
+ note $a0
+ note $b0
+ note $c0
+ note $35
+ octave2
+ note $c5
+ note $c3
+ octave3
+ note $65
+ note $55
+ note $33
+ note $57
+ note $37
+ note $17
+ note $67
+ note $45
+ note $15
+ note $13
+ note $75
+ note $65
+ note $23
+ note $a7
+ note $c0
+ note $b0
+ note $90
+ note $80
+ note $90
+ note $a0
+ note $b0
+ note $c0
+ octave4
+ note $27
+ note $10
+ octave3
+ note $c0
+ note $a0
+ note $90
+ note $a0
+ note $b0
+ note $c0
+ octave4
+ note $10
+ octave3
+ note $45
+ note $15
+ note $13
+ note $75
+ note $65
+ note $23
+ note $67
+ note $47
+ note $27
+ note $77
+ intensity $b7
+ note $55
+ note $35
+ note $53
+ note $65
+ note $55
+ note $13
+ note $67
+ note $17
+ note $55
+ note $35
+ note $63
+ note $8f
+ octave4
+ note $37
+ note $87
+ note $8f
+ note $3f
+ octave3
+ note $13
+ note $33
+ note $13
+ octave2
+ note $c3
+ octave3
+ note $1f
+ note $33
+ note $53
+ note $33
+ note $73
+ note $8f
+ loopchannel $00, $5e2d ; end
+; 0xf5ea2
+
+_Music_JohtoWildPokemonBattle_Ch2: ; 0xf5ea2
+ dutycycle $03
+ vibrato $08, $36
+ tone $0100
+ callchannel _Music_JohtoWildPokemonBattle_sub_0xf5f5d
+ notetype $0c, $c2
+ octave4
+ note $85
+ octave3
+ note $35
+ note $83
+ note $63
+ note $73
+ note $87
+ note $95
+ note $35
+ note $93
+ note $63
+ note $83
+ intensity $c7
+ note $97
+ intensity $c2
+ octave4
+ note $85
+ note $35
+ note $83
+ note $63
+ note $73
+ note $87
+ note $95
+ note $35
+ note $93
+ note $63
+ note $83
+ intensity $6f
+ note $97
+ intensity $c4
+ octave3
+ note $85
+ note $35
+ note $31
+ note $81
+ octave4
+ note $11
+ octave3
+ note $c1
+ note $a1
+ note $81
+ note $61
+ note $81
+ note $a1
+ octave4
+ note $21
+ intensity $b0
+ note $4f
+ intensity $b7
+ note $4f
+ intensity $c4
+ octave3
+ note $85
+ note $35
+ note $31
+ note $81
+ octave4
+ note $13
+ octave3
+ note $c3
+ note $a3
+ note $c3
+ intensity $b0
+ note $af
+ intensity $b6
+ note $af
+ intensity $c4
+ note $95
+ note $45
+ note $41
+ note $91
+ octave4
+ note $21
+ note $11
+ octave3
+ note $b1
+ note $91
+ note $71
+ note $91
+ note $b1
+ octave4
+ note $31
+ intensity $b0
+ note $5f
+ intensity $b7
+ note $5f
+ intensity $c4
+ octave3
+ note $95
+ note $45
+ note $41
+ note $91
+ octave4
+ note $23
+ note $13
+ octave3
+ note $b3
+ note $93
+ intensity $b0
+ note $bf
+ intensity $b5
+ note $bf
+ intensity $c6
+ octave4
+ note $cb
+ note $81
+ note $c1
+ octave5
+ note $31
+ note $11
+ octave4
+ note $c1
+ note $a1
+ note $81
+ note $a1
+ note $c1
+ note $81
+ note $ab
+ octave3
+ note $61
+ note $a1
+ octave4
+ note $11
+ octave3
+ note $c1
+ note $a1
+ note $81
+ note $61
+ note $81
+ note $a1
+ octave4
+ note $11
+ intensity $c7
+ note $3f
+ note $87
+ octave5
+ note $17
+ octave4
+ note $cf
+ note $8f
+ octave3
+ note $53
+ note $73
+ note $53
+ note $33
+ note $5f
+ note $83
+ note $a3
+ note $83
+ note $b3
+ note $cf
+ loopchannel $00, $5ed1 ; end
+; 0xf5f5d
+
+_Music_JohtoWildPokemonBattle_sub_0xf5f5d: ; 0xf5f5d
+; subroutine
+ notetype $0c, $c2
+ octave4
+ note $60
+ note $70
+ note $80
+ octave5
+ note $80
+ octave4
+ note $60
+ note $70
+ note $80
+ octave5
+ note $80
+ octave4
+ note $60
+ note $70
+ note $80
+ octave5
+ note $80
+ octave4
+ note $60
+ note $70
+ note $80
+ octave5
+ note $80
+ octave4
+ note $60
+ note $70
+ note $80
+ octave5
+ note $80
+ octave4
+ note $60
+ note $70
+ note $80
+ octave5
+ note $80
+ octave4
+ note $60
+ note $70
+ note $80
+ octave5
+ note $80
+ octave4
+ note $60
+ note $70
+ note $80
+ octave5
+ note $80
+ endchannel ; end
+; 0xf5f91
+
+_Music_JohtoWildPokemonBattle_Ch3: ; 0xf5f91
+ notetype $0c, $14
+ octave4
+ note $81
+ octave5
+ note $31
+ octave4
+ note $81
+ octave5
+ note $21
+ octave4
+ note $71
+ octave5
+ note $11
+ octave4
+ note $71
+ note $c1
+ note $61
+ note $b1
+ note $61
+ note $a1
+ note $61
+ note $31
+ note $81
+ note $61
+ note $31
+ note $81
+ note $31
+ note $81
+ note $31
+ note $81
+ note $31
+ note $81
+ note $31
+ note $81
+ note $31
+ note $81
+ note $31
+ note $51
+ note $61
+ note $81
+ callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
+ note $41
+ note $91
+ note $41
+ note $91
+ note $41
+ note $41
+ note $81
+ note $61
+ note $31
+ note $81
+ loopchannel $06, $5fc6
+ note $31
+ note $51
+ note $61
+ note $81
+ callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
+ note $61
+ note $61
+ note $81
+ note $81
+ note $91
+ note $81
+ note $61
+ note $41
+ note $31
+ note $81
+ loopchannel $07, $5fdb
+ note $73
+ callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
+ callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
+ note $31
+ note $81
+ loopchannel $07, $5fe8
+ note $31
+ note $a1
+ note $11
+ note $61
+ loopchannel $05, $5ff0
+ note $51
+ note $31
+ note $11
+ note $31
+ note $51
+ note $61
+ callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
+ note $41
+ note $91
+ note $41
+ note $91
+ note $41
+ note $91
+ note $83
+ note $51
+ note $a1
+ loopchannel $08, $6006
+ callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
+ note $41
+ note $91
+ note $41
+ note $91
+ note $41
+ note $91
+ note $41
+ note $b1
+ note $21
+ note $71
+ note $21
+ note $71
+ note $21
+ note $71
+ note $21
+ note $71
+ note $21
+ note $71
+ note $61
+ note $71
+ note $91
+ note $71
+ note $61
+ note $41
+ note $31
+ note $81
+ loopchannel $08, $6027
+ note $11
+ note $61
+ loopchannel $07, $602d
+ note $51
+ note $11
+ note $33
+ note $83
+ note $33
+ note $83
+ note $31
+ note $81
+ loopchannel $0c, $6039
+ note $11
+ note $51
+ loopchannel $07, $603f
+ note $61
+ note $71
+ note $31
+ note $81
+ loopchannel $06, $6047
+ note $a1
+ note $81
+ note $71
+ note $51
+ loopchannel $00, $5fdb ; end
+; 0xf6055
+
+_Music_JohtoWildPokemonBattle_sub_0xf6055: ; 0xf6055
+; subroutine
+ note $41
+ note $91
+ loopchannel $04, $6055
+ endchannel ; end
+; 0xf605c
--- /dev/null
+++ b/audio/music/johtowildbattlenight.asm
@@ -1,0 +1,35 @@
+_Music_JohtoWildPokemonBattleNight: ; 0xf605c
+ db $80
+ dw _Music_JohtoWildPokemonBattleNight_Ch1
+ db $01
+ dw _Music_JohtoWildPokemonBattleNight_Ch2
+ db $02
+ dw _Music_JohtoWildPokemonBattleNight_Ch3
+; 0xf6065
+
+_Music_JohtoWildPokemonBattleNight_Ch1: ; 0xf6065
+ tempo $6b00
+ volume $77
+ dutycycle $03
+ tone $0200
+ vibrato $10, $25
+ loopchannel $00, $5ddb ; end
+; 0xf6076
+
+_Music_JohtoWildPokemonBattleNight_Ch2: ; 0xf6076
+ dutycycle $03
+ vibrato $20, $36
+ tone $0100
+ callchannel _Music_JohtoWildPokemonBattle_sub_0xf5f5d
+ notetype $0c, $c2
+ octave4
+ note $85
+ tone $0100
+ dutycycle $02
+ loopchannel $00, $5eb2 ; end
+; 0xf608f
+
+_Music_JohtoWildPokemonBattleNight_Ch3: ; 0xf608f
+ notetype $0c, $11
+ loopchannel $00, $5f94 ; end
+; 0xf6096
--- a/audio/music/johtowildpokemonbattle.asm
+++ /dev/null
@@ -1,579 +1,0 @@
-_Music_JohtoWildPokemonBattle: ; 0xf5dc5
- db $80
- dw _Music_JohtoWildPokemonBattle_Ch1
- db $01
- dw _Music_JohtoWildPokemonBattle_Ch2
- db $02
- dw _Music_JohtoWildPokemonBattle_Ch3
-; 0xf5dce
-
-_Music_JohtoWildPokemonBattle_Ch1: ; 0xf5dce
- tempo $6800
- volume $77
- dutycycle $03
- tone $0200
- vibrato $12, $15
- notetype $0c, $b2
- octave4
- note $10
- octave3
- note $c0
- note $b0
- note $a0
- note $b0
- note $a0
- note $90
- note $80
- note $90
- note $80
- note $70
- note $60
- note $70
- note $60
- note $50
- note $40
- note $50
- note $40
- note $30
- note $20
- note $30
- note $20
- note $10
- octave2
- note $c0
- octave3
- note $10
- octave2
- note $c0
- note $b0
- note $a0
- note $b0
- note $c0
- octave3
- note $10
- note $20
- intensity $b2
- note $85
- octave2
- note $b5
- octave3
- note $33
- note $13
- note $23
- note $37
- note $45
- octave2
- note $b5
- octave3
- note $43
- note $13
- note $33
- intensity $b5
- note $47
- intensity $b2
- octave4
- note $35
- octave3
- note $b5
- octave4
- note $33
- note $13
- note $23
- note $37
- note $45
- octave3
- note $b5
- octave4
- note $43
- note $13
- note $33
- intensity $6f
- note $47
- intensity $b6
- octave3
- note $35
- octave2
- note $c5
- note $c3
- octave3
- note $65
- note $55
- note $13
- note $97
- note $b0
- note $a0
- note $80
- note $70
- note $80
- note $90
- note $a0
- note $b0
- octave4
- note $17
- octave3
- note $c0
- note $b0
- note $90
- note $80
- note $90
- note $a0
- note $b0
- note $c0
- note $35
- octave2
- note $c5
- note $c3
- octave3
- note $65
- note $55
- note $33
- note $57
- note $37
- note $17
- note $67
- note $45
- note $15
- note $13
- note $75
- note $65
- note $23
- note $a7
- note $c0
- note $b0
- note $90
- note $80
- note $90
- note $a0
- note $b0
- note $c0
- octave4
- note $27
- note $10
- octave3
- note $c0
- note $a0
- note $90
- note $a0
- note $b0
- note $c0
- octave4
- note $10
- octave3
- note $45
- note $15
- note $13
- note $75
- note $65
- note $23
- note $67
- note $47
- note $27
- note $77
- intensity $b7
- note $55
- note $35
- note $53
- note $65
- note $55
- note $13
- note $67
- note $17
- note $55
- note $35
- note $63
- note $8f
- octave4
- note $37
- note $87
- note $8f
- note $3f
- octave3
- note $13
- note $33
- note $13
- octave2
- note $c3
- octave3
- note $1f
- note $33
- note $53
- note $33
- note $73
- note $8f
- loopchannel $00, $5e2d ; end
-; 0xf5ea2
-
-_Music_JohtoWildPokemonBattle_Ch2: ; 0xf5ea2
- dutycycle $03
- vibrato $08, $36
- tone $0100
- callchannel _Music_JohtoWildPokemonBattle_sub_0xf5f5d
- notetype $0c, $c2
- octave4
- note $85
- octave3
- note $35
- note $83
- note $63
- note $73
- note $87
- note $95
- note $35
- note $93
- note $63
- note $83
- intensity $c7
- note $97
- intensity $c2
- octave4
- note $85
- note $35
- note $83
- note $63
- note $73
- note $87
- note $95
- note $35
- note $93
- note $63
- note $83
- intensity $6f
- note $97
- intensity $c4
- octave3
- note $85
- note $35
- note $31
- note $81
- octave4
- note $11
- octave3
- note $c1
- note $a1
- note $81
- note $61
- note $81
- note $a1
- octave4
- note $21
- intensity $b0
- note $4f
- intensity $b7
- note $4f
- intensity $c4
- octave3
- note $85
- note $35
- note $31
- note $81
- octave4
- note $13
- octave3
- note $c3
- note $a3
- note $c3
- intensity $b0
- note $af
- intensity $b6
- note $af
- intensity $c4
- note $95
- note $45
- note $41
- note $91
- octave4
- note $21
- note $11
- octave3
- note $b1
- note $91
- note $71
- note $91
- note $b1
- octave4
- note $31
- intensity $b0
- note $5f
- intensity $b7
- note $5f
- intensity $c4
- octave3
- note $95
- note $45
- note $41
- note $91
- octave4
- note $23
- note $13
- octave3
- note $b3
- note $93
- intensity $b0
- note $bf
- intensity $b5
- note $bf
- intensity $c6
- octave4
- note $cb
- note $81
- note $c1
- octave5
- note $31
- note $11
- octave4
- note $c1
- note $a1
- note $81
- note $a1
- note $c1
- note $81
- note $ab
- octave3
- note $61
- note $a1
- octave4
- note $11
- octave3
- note $c1
- note $a1
- note $81
- note $61
- note $81
- note $a1
- octave4
- note $11
- intensity $c7
- note $3f
- note $87
- octave5
- note $17
- octave4
- note $cf
- note $8f
- octave3
- note $53
- note $73
- note $53
- note $33
- note $5f
- note $83
- note $a3
- note $83
- note $b3
- note $cf
- loopchannel $00, $5ed1 ; end
-; 0xf5f5d
-
-_Music_JohtoWildPokemonBattle_sub_0xf5f5d: ; 0xf5f5d
-; subroutine
- notetype $0c, $c2
- octave4
- note $60
- note $70
- note $80
- octave5
- note $80
- octave4
- note $60
- note $70
- note $80
- octave5
- note $80
- octave4
- note $60
- note $70
- note $80
- octave5
- note $80
- octave4
- note $60
- note $70
- note $80
- octave5
- note $80
- octave4
- note $60
- note $70
- note $80
- octave5
- note $80
- octave4
- note $60
- note $70
- note $80
- octave5
- note $80
- octave4
- note $60
- note $70
- note $80
- octave5
- note $80
- octave4
- note $60
- note $70
- note $80
- octave5
- note $80
- endchannel ; end
-; 0xf5f91
-
-_Music_JohtoWildPokemonBattle_Ch3: ; 0xf5f91
- notetype $0c, $14
- octave4
- note $81
- octave5
- note $31
- octave4
- note $81
- octave5
- note $21
- octave4
- note $71
- octave5
- note $11
- octave4
- note $71
- note $c1
- note $61
- note $b1
- note $61
- note $a1
- note $61
- note $31
- note $81
- note $61
- note $31
- note $81
- note $31
- note $81
- note $31
- note $81
- note $31
- note $81
- note $31
- note $81
- note $31
- note $81
- note $31
- note $51
- note $61
- note $81
- callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
- note $41
- note $91
- note $41
- note $91
- note $41
- note $41
- note $81
- note $61
- note $31
- note $81
- loopchannel $06, $5fc6
- note $31
- note $51
- note $61
- note $81
- callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
- note $61
- note $61
- note $81
- note $81
- note $91
- note $81
- note $61
- note $41
- note $31
- note $81
- loopchannel $07, $5fdb
- note $73
- callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
- callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
- note $31
- note $81
- loopchannel $07, $5fe8
- note $31
- note $a1
- note $11
- note $61
- loopchannel $05, $5ff0
- note $51
- note $31
- note $11
- note $31
- note $51
- note $61
- callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
- note $41
- note $91
- note $41
- note $91
- note $41
- note $91
- note $83
- note $51
- note $a1
- loopchannel $08, $6006
- callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
- note $41
- note $91
- note $41
- note $91
- note $41
- note $91
- note $41
- note $b1
- note $21
- note $71
- note $21
- note $71
- note $21
- note $71
- note $21
- note $71
- note $21
- note $71
- note $61
- note $71
- note $91
- note $71
- note $61
- note $41
- note $31
- note $81
- loopchannel $08, $6027
- note $11
- note $61
- loopchannel $07, $602d
- note $51
- note $11
- note $33
- note $83
- note $33
- note $83
- note $31
- note $81
- loopchannel $0c, $6039
- note $11
- note $51
- loopchannel $07, $603f
- note $61
- note $71
- note $31
- note $81
- loopchannel $06, $6047
- note $a1
- note $81
- note $71
- note $51
- loopchannel $00, $5fdb ; end
-; 0xf6055
-
-_Music_JohtoWildPokemonBattle_sub_0xf6055: ; 0xf6055
-; subroutine
- note $41
- note $91
- loopchannel $04, $6055
- endchannel ; end
-; 0xf605c
--- a/audio/music/johtowildpokemonbattlenight.asm
+++ /dev/null
@@ -1,35 +1,0 @@
-_Music_JohtoWildPokemonBattleNight: ; 0xf605c
- db $80
- dw _Music_JohtoWildPokemonBattleNight_Ch1
- db $01
- dw _Music_JohtoWildPokemonBattleNight_Ch2
- db $02
- dw _Music_JohtoWildPokemonBattleNight_Ch3
-; 0xf6065
-
-_Music_JohtoWildPokemonBattleNight_Ch1: ; 0xf6065
- tempo $6b00
- volume $77
- dutycycle $03
- tone $0200
- vibrato $10, $25
- loopchannel $00, $5ddb ; end
-; 0xf6076
-
-_Music_JohtoWildPokemonBattleNight_Ch2: ; 0xf6076
- dutycycle $03
- vibrato $20, $36
- tone $0100
- callchannel _Music_JohtoWildPokemonBattle_sub_0xf5f5d
- notetype $0c, $c2
- octave4
- note $85
- tone $0100
- dutycycle $02
- loopchannel $00, $5eb2 ; end
-; 0xf608f
-
-_Music_JohtoWildPokemonBattleNight_Ch3: ; 0xf608f
- notetype $0c, $11
- loopchannel $00, $5f94 ; end
-; 0xf6096
--- /dev/null
+++ b/audio/music/kantogymbattle.asm
@@ -1,0 +1,604 @@
+_Music_KantoGymLeaderBattle: ; 0xec720
+ db $80
+ dw _Music_KantoGymLeaderBattle_Ch1
+ db $01
+ dw _Music_KantoGymLeaderBattle_Ch2
+ db $02
+ dw _Music_KantoGymLeaderBattle_Ch3
+; 0xec729
+
+_Music_KantoGymLeaderBattle_Ch1: ; 0xec729
+ tempo $6500
+ volume $77
+ dutycycle $03
+ tone $0200
+ vibrato $12, $15
+ notetype $0c, $b2
+ octave3
+ note $b0
+ note $a0
+ note $90
+ note $80
+ note $90
+ note $80
+ note $70
+ note $80
+ note $70
+ note $60
+ note $70
+ note $60
+ note $50
+ note $60
+ note $50
+ note $40
+ note $50
+ note $40
+ note $30
+ note $40
+ note $30
+ note $20
+ note $30
+ note $20
+ note $10
+ note $20
+ note $10
+ octave2
+ note $c0
+ octave3
+ note $10
+ octave2
+ note $c0
+ note $b0
+ note $c0
+ note $b1
+ note $b5
+ note $b1
+ note $b5
+ note $b1
+ note $b7
+ intensity $b7
+ note $c1
+ intensity $b2
+ note $b1
+ note $b5
+ note $b1
+ note $b5
+ note $b1
+ note $b7
+ intensity $b7
+ octave3
+ note $51
+ intensity $b2
+ octave2
+ note $b1
+ note $b5
+ note $b1
+ note $b5
+ note $b1
+ note $b7
+ intensity $b7
+ note $c1
+ intensity $b2
+ note $b1
+ note $b5
+ note $b1
+ note $b5
+ note $b1
+ intensity $b4
+ octave3
+ note $53
+ note $53
+ note $51
+ callchannel _Music_KantoGymLeaderBattle_sub_0xec832
+ octave2
+ note $b1
+ intensity $b7
+ note $97
+ note $c7
+ octave3
+ note $49
+ note $55
+ callchannel _Music_KantoGymLeaderBattle_sub_0xec832
+ note $41
+ intensity $b7
+ note $27
+ octave2
+ note $c7
+ note $99
+ octave3
+ note $55
+ intensity $b2
+ note $41
+ note $41
+ note $80
+ note $50
+ note $40
+ note $80
+ note $41
+ note $41
+ note $b0
+ note $90
+ note $50
+ note $b0
+ note $41
+ note $41
+ note $c0
+ note $b0
+ note $90
+ note $c0
+ note $41
+ intensity $b7
+ note $51
+ intensity $b2
+ note $41
+ note $41
+ note $80
+ note $50
+ note $40
+ note $80
+ note $41
+ note $41
+ note $b0
+ note $90
+ note $50
+ note $b0
+ note $41
+ note $41
+ note $c0
+ note $b0
+ note $90
+ note $c0
+ note $91
+ intensity $b5
+ note $c1
+ note $41
+ note $21
+ octave2
+ note $b3
+ note $41
+ note $91
+ note $c1
+ octave3
+ note $51
+ note $43
+ note $21
+ octave2
+ note $b1
+ note $b1
+ note $41
+ note $b1
+ octave3
+ note $21
+ intensity $b7
+ octave2
+ note $c7
+ note $b7
+ note $99
+ note $c5
+ intensity $b5
+ octave3
+ note $41
+ note $21
+ octave2
+ note $b3
+ note $41
+ note $91
+ note $c1
+ octave3
+ note $51
+ note $43
+ note $21
+ octave2
+ note $b1
+ note $b1
+ note $91
+ note $b1
+ octave3
+ note $21
+ intensity $b7
+ note $57
+ note $77
+ note $8f
+ intensity $b2
+ octave2
+ note $91
+ note $91
+ intensity $b7
+ octave3
+ note $2b
+ intensity $b2
+ note $91
+ note $63
+ intensity $b5
+ octave2
+ note $63
+ note $81
+ note $91
+ note $b1
+ intensity $b2
+ note $b1
+ note $b1
+ intensity $b7
+ octave3
+ note $4b
+ intensity $b2
+ note $b1
+ note $83
+ intensity $b7
+ octave4
+ note $45
+ intensity $4c
+ octave3
+ note $33
+ loopchannel $00, $478b ; end
+; 0xec832
+
+_Music_KantoGymLeaderBattle_sub_0xec832: ; 0xec832
+; subroutine
+ intensity $b5
+ note $41
+ octave2
+ note $b1
+ octave3
+ note $41
+ note $53
+ note $41
+ note $21
+ octave2
+ note $b1
+ note $41
+ note $91
+ note $b1
+ octave3
+ note $41
+ note $51
+ note $41
+ note $21
+ endchannel ; end
+; 0xec847
+
+_Music_KantoGymLeaderBattle_Ch2: ; 0xec847
+ dutycycle $03
+ vibrato $08, $36
+ tone $0100
+ notetype $0c, $c2
+ octave4
+ note $b0
+ note $90
+ note $b0
+ octave5
+ note $40
+ loopchannel $08, $4852
+ octave3
+ intensity $c2
+ note $41
+ note $41
+ note $70
+ note $50
+ note $40
+ note $70
+ note $41
+ note $41
+ note $b0
+ note $90
+ note $70
+ note $b0
+ note $41
+ note $41
+ note $c0
+ note $b0
+ note $90
+ note $c0
+ note $31
+ intensity $c7
+ note $51
+ intensity $c2
+ note $41
+ note $41
+ note $70
+ note $50
+ note $40
+ note $70
+ note $41
+ note $41
+ note $b0
+ note $90
+ note $70
+ note $b0
+ note $41
+ note $41
+ note $c0
+ note $b0
+ note $90
+ note $c0
+ note $91
+ intensity $c7
+ note $c1
+ intensity $c2
+ octave4
+ loopchannel $02, $485d
+ callchannel _Music_KantoGymLeaderBattle_sub_0xec907
+ note $57
+ note $97
+ note $c9
+ note $95
+ callchannel _Music_KantoGymLeaderBattle_sub_0xec907
+ note $57
+ note $97
+ note $c9
+ octave4
+ note $55
+ note $47
+ intensity $b7
+ note $47
+ intensity $a2
+ note $05
+ octave5
+ note $53
+ note $53
+ note $51
+ intensity $a0
+ note $47
+ intensity $a7
+ note $47
+ note $0b
+ intensity $c5
+ octave3
+ note $b3
+ note $c3
+ note $93
+ note $b3
+ note $c3
+ note $93
+ note $53
+ intensity $b0
+ note $47
+ note $4f
+ intensity $b7
+ note $4b
+ intensity $c5
+ note $b3
+ note $c3
+ note $93
+ note $b3
+ note $c3
+ note $93
+ note $c3
+ intensity $b0
+ note $b7
+ intensity $b7
+ note $b7
+ intensity $b0
+ octave4
+ note $47
+ intensity $b7
+ note $47
+ intensity $c2
+ octave3
+ note $21
+ note $21
+ intensity $c7
+ note $67
+ intensity $c2
+ octave4
+ note $23
+ note $61
+ note $23
+ intensity $c7
+ note $93
+ note $81
+ note $61
+ note $41
+ intensity $c2
+ octave3
+ note $41
+ note $41
+ intensity $c7
+ note $87
+ intensity $c2
+ octave4
+ note $43
+ note $81
+ note $43
+ intensity $c7
+ note $b5
+ octave3
+ note $a3
+ loopchannel $00, $4894 ; end
+; 0xec907
+
+_Music_KantoGymLeaderBattle_sub_0xec907: ; 0xec907
+; subroutine
+ dutycycle $02
+ intensity $d1
+ octave3
+ note $b1
+ intensity $a2
+ note $b1
+ intensity $d1
+ note $91
+ intensity $a2
+ note $91
+ intensity $d1
+ note $b1
+ intensity $a2
+ note $b1
+ intensity $c5
+ note $c1
+ octave4
+ note $21
+ note $21
+ octave3
+ note $c3
+ note $b1
+ note $91
+ note $71
+ note $91
+ note $b1
+ dutycycle $03
+ intensity $b0
+ endchannel ; end
+; 0xec92e
+
+_Music_KantoGymLeaderBattle_Ch3: ; 0xec92e
+ notetype $0c, $19
+ octave2
+ note $50
+ note $00
+ note $c2
+ note $00
+ loopchannel $06, $4934
+ note $c1
+ note $91
+ note $c1
+ note $40
+ note $00
+ note $40
+ note $00
+ note $73
+ note $40
+ note $00
+ note $40
+ note $00
+ note $b3
+ note $40
+ note $00
+ note $40
+ note $00
+ note $c3
+ note $30
+ note $00
+ note $61
+ note $40
+ note $00
+ note $40
+ note $00
+ note $73
+ note $40
+ note $00
+ note $40
+ note $00
+ note $b3
+ note $40
+ note $00
+ note $40
+ note $00
+ note $c3
+ note $40
+ note $00
+ note $51
+ loopchannel $02, $493d
+ octave2
+ note $41
+ note $b1
+ loopchannel $08, $4965
+ note $51
+ note $c1
+ loopchannel $04, $496c
+ octave1
+ note $c1
+ octave2
+ note $51
+ octave1
+ note $c1
+ octave2
+ note $53
+ note $c1
+ octave3
+ note $51
+ octave2
+ note $c1
+ octave2
+ note $71
+ octave3
+ note $21
+ loopchannel $08, $497f
+ octave2
+ note $51
+ note $c1
+ loopchannel $07, $4987
+ octave3
+ note $51
+ octave2
+ note $c1
+ note $40
+ note $00
+ note $40
+ note $00
+ note $b3
+ note $40
+ note $00
+ note $40
+ note $00
+ note $c3
+ note $40
+ note $00
+ note $40
+ note $00
+ note $b3
+ note $40
+ note $00
+ note $51
+ loopchannel $02, $4992
+ note $41
+ note $b1
+ loopchannel $07, $49a8
+ octave3
+ note $21
+ octave2
+ note $b1
+ note $51
+ note $c1
+ octave3
+ note $51
+ octave2
+ note $51
+ note $c1
+ octave3
+ note $51
+ octave2
+ note $51
+ note $c1
+ loopchannel $05, $49bb
+ octave2
+ note $71
+ octave3
+ note $21
+ loopchannel $07, $49c2
+ octave2
+ note $b1
+ octave3
+ note $21
+ octave2
+ note $51
+ note $b1
+ octave3
+ note $51
+ note $71
+ note $91
+ note $71
+ note $51
+ note $21
+ octave2
+ note $41
+ note $b1
+ loopchannel $04, $49d8
+ note $21
+ note $91
+ loopchannel $08, $49df
+ note $41
+ note $b1
+ loopchannel $04, $49e5
+ octave3
+ note $41
+ octave2
+ note $b1
+ note $41
+ note $31
+ note $31
+ note $b1
+ octave3
+ note $41
+ note $61
+ loopchannel $00, $4965 ; end
+; 0xec9fa
--- a/audio/music/kantogymleaderbattle.asm
+++ /dev/null
@@ -1,604 +1,0 @@
-_Music_KantoGymLeaderBattle: ; 0xec720
- db $80
- dw _Music_KantoGymLeaderBattle_Ch1
- db $01
- dw _Music_KantoGymLeaderBattle_Ch2
- db $02
- dw _Music_KantoGymLeaderBattle_Ch3
-; 0xec729
-
-_Music_KantoGymLeaderBattle_Ch1: ; 0xec729
- tempo $6500
- volume $77
- dutycycle $03
- tone $0200
- vibrato $12, $15
- notetype $0c, $b2
- octave3
- note $b0
- note $a0
- note $90
- note $80
- note $90
- note $80
- note $70
- note $80
- note $70
- note $60
- note $70
- note $60
- note $50
- note $60
- note $50
- note $40
- note $50
- note $40
- note $30
- note $40
- note $30
- note $20
- note $30
- note $20
- note $10
- note $20
- note $10
- octave2
- note $c0
- octave3
- note $10
- octave2
- note $c0
- note $b0
- note $c0
- note $b1
- note $b5
- note $b1
- note $b5
- note $b1
- note $b7
- intensity $b7
- note $c1
- intensity $b2
- note $b1
- note $b5
- note $b1
- note $b5
- note $b1
- note $b7
- intensity $b7
- octave3
- note $51
- intensity $b2
- octave2
- note $b1
- note $b5
- note $b1
- note $b5
- note $b1
- note $b7
- intensity $b7
- note $c1
- intensity $b2
- note $b1
- note $b5
- note $b1
- note $b5
- note $b1
- intensity $b4
- octave3
- note $53
- note $53
- note $51
- callchannel _Music_KantoGymLeaderBattle_sub_0xec832
- octave2
- note $b1
- intensity $b7
- note $97
- note $c7
- octave3
- note $49
- note $55
- callchannel _Music_KantoGymLeaderBattle_sub_0xec832
- note $41
- intensity $b7
- note $27
- octave2
- note $c7
- note $99
- octave3
- note $55
- intensity $b2
- note $41
- note $41
- note $80
- note $50
- note $40
- note $80
- note $41
- note $41
- note $b0
- note $90
- note $50
- note $b0
- note $41
- note $41
- note $c0
- note $b0
- note $90
- note $c0
- note $41
- intensity $b7
- note $51
- intensity $b2
- note $41
- note $41
- note $80
- note $50
- note $40
- note $80
- note $41
- note $41
- note $b0
- note $90
- note $50
- note $b0
- note $41
- note $41
- note $c0
- note $b0
- note $90
- note $c0
- note $91
- intensity $b5
- note $c1
- note $41
- note $21
- octave2
- note $b3
- note $41
- note $91
- note $c1
- octave3
- note $51
- note $43
- note $21
- octave2
- note $b1
- note $b1
- note $41
- note $b1
- octave3
- note $21
- intensity $b7
- octave2
- note $c7
- note $b7
- note $99
- note $c5
- intensity $b5
- octave3
- note $41
- note $21
- octave2
- note $b3
- note $41
- note $91
- note $c1
- octave3
- note $51
- note $43
- note $21
- octave2
- note $b1
- note $b1
- note $91
- note $b1
- octave3
- note $21
- intensity $b7
- note $57
- note $77
- note $8f
- intensity $b2
- octave2
- note $91
- note $91
- intensity $b7
- octave3
- note $2b
- intensity $b2
- note $91
- note $63
- intensity $b5
- octave2
- note $63
- note $81
- note $91
- note $b1
- intensity $b2
- note $b1
- note $b1
- intensity $b7
- octave3
- note $4b
- intensity $b2
- note $b1
- note $83
- intensity $b7
- octave4
- note $45
- intensity $4c
- octave3
- note $33
- loopchannel $00, $478b ; end
-; 0xec832
-
-_Music_KantoGymLeaderBattle_sub_0xec832: ; 0xec832
-; subroutine
- intensity $b5
- note $41
- octave2
- note $b1
- octave3
- note $41
- note $53
- note $41
- note $21
- octave2
- note $b1
- note $41
- note $91
- note $b1
- octave3
- note $41
- note $51
- note $41
- note $21
- endchannel ; end
-; 0xec847
-
-_Music_KantoGymLeaderBattle_Ch2: ; 0xec847
- dutycycle $03
- vibrato $08, $36
- tone $0100
- notetype $0c, $c2
- octave4
- note $b0
- note $90
- note $b0
- octave5
- note $40
- loopchannel $08, $4852
- octave3
- intensity $c2
- note $41
- note $41
- note $70
- note $50
- note $40
- note $70
- note $41
- note $41
- note $b0
- note $90
- note $70
- note $b0
- note $41
- note $41
- note $c0
- note $b0
- note $90
- note $c0
- note $31
- intensity $c7
- note $51
- intensity $c2
- note $41
- note $41
- note $70
- note $50
- note $40
- note $70
- note $41
- note $41
- note $b0
- note $90
- note $70
- note $b0
- note $41
- note $41
- note $c0
- note $b0
- note $90
- note $c0
- note $91
- intensity $c7
- note $c1
- intensity $c2
- octave4
- loopchannel $02, $485d
- callchannel _Music_KantoGymLeaderBattle_sub_0xec907
- note $57
- note $97
- note $c9
- note $95
- callchannel _Music_KantoGymLeaderBattle_sub_0xec907
- note $57
- note $97
- note $c9
- octave4
- note $55
- note $47
- intensity $b7
- note $47
- intensity $a2
- note $05
- octave5
- note $53
- note $53
- note $51
- intensity $a0
- note $47
- intensity $a7
- note $47
- note $0b
- intensity $c5
- octave3
- note $b3
- note $c3
- note $93
- note $b3
- note $c3
- note $93
- note $53
- intensity $b0
- note $47
- note $4f
- intensity $b7
- note $4b
- intensity $c5
- note $b3
- note $c3
- note $93
- note $b3
- note $c3
- note $93
- note $c3
- intensity $b0
- note $b7
- intensity $b7
- note $b7
- intensity $b0
- octave4
- note $47
- intensity $b7
- note $47
- intensity $c2
- octave3
- note $21
- note $21
- intensity $c7
- note $67
- intensity $c2
- octave4
- note $23
- note $61
- note $23
- intensity $c7
- note $93
- note $81
- note $61
- note $41
- intensity $c2
- octave3
- note $41
- note $41
- intensity $c7
- note $87
- intensity $c2
- octave4
- note $43
- note $81
- note $43
- intensity $c7
- note $b5
- octave3
- note $a3
- loopchannel $00, $4894 ; end
-; 0xec907
-
-_Music_KantoGymLeaderBattle_sub_0xec907: ; 0xec907
-; subroutine
- dutycycle $02
- intensity $d1
- octave3
- note $b1
- intensity $a2
- note $b1
- intensity $d1
- note $91
- intensity $a2
- note $91
- intensity $d1
- note $b1
- intensity $a2
- note $b1
- intensity $c5
- note $c1
- octave4
- note $21
- note $21
- octave3
- note $c3
- note $b1
- note $91
- note $71
- note $91
- note $b1
- dutycycle $03
- intensity $b0
- endchannel ; end
-; 0xec92e
-
-_Music_KantoGymLeaderBattle_Ch3: ; 0xec92e
- notetype $0c, $19
- octave2
- note $50
- note $00
- note $c2
- note $00
- loopchannel $06, $4934
- note $c1
- note $91
- note $c1
- note $40
- note $00
- note $40
- note $00
- note $73
- note $40
- note $00
- note $40
- note $00
- note $b3
- note $40
- note $00
- note $40
- note $00
- note $c3
- note $30
- note $00
- note $61
- note $40
- note $00
- note $40
- note $00
- note $73
- note $40
- note $00
- note $40
- note $00
- note $b3
- note $40
- note $00
- note $40
- note $00
- note $c3
- note $40
- note $00
- note $51
- loopchannel $02, $493d
- octave2
- note $41
- note $b1
- loopchannel $08, $4965
- note $51
- note $c1
- loopchannel $04, $496c
- octave1
- note $c1
- octave2
- note $51
- octave1
- note $c1
- octave2
- note $53
- note $c1
- octave3
- note $51
- octave2
- note $c1
- octave2
- note $71
- octave3
- note $21
- loopchannel $08, $497f
- octave2
- note $51
- note $c1
- loopchannel $07, $4987
- octave3
- note $51
- octave2
- note $c1
- note $40
- note $00
- note $40
- note $00
- note $b3
- note $40
- note $00
- note $40
- note $00
- note $c3
- note $40
- note $00
- note $40
- note $00
- note $b3
- note $40
- note $00
- note $51
- loopchannel $02, $4992
- note $41
- note $b1
- loopchannel $07, $49a8
- octave3
- note $21
- octave2
- note $b1
- note $51
- note $c1
- octave3
- note $51
- octave2
- note $51
- note $c1
- octave3
- note $51
- octave2
- note $51
- note $c1
- loopchannel $05, $49bb
- octave2
- note $71
- octave3
- note $21
- loopchannel $07, $49c2
- octave2
- note $b1
- octave3
- note $21
- octave2
- note $51
- note $b1
- octave3
- note $51
- note $71
- note $91
- note $71
- note $51
- note $21
- octave2
- note $41
- note $b1
- loopchannel $04, $49d8
- note $21
- note $91
- loopchannel $08, $49df
- note $41
- note $b1
- loopchannel $04, $49e5
- octave3
- note $41
- octave2
- note $b1
- note $41
- note $31
- note $31
- note $b1
- octave3
- note $41
- note $61
- loopchannel $00, $4965 ; end
-; 0xec9fa
--- /dev/null
+++ b/audio/music/kantowildbattle.asm
@@ -1,0 +1,1229 @@
+_Music_KantoWildPokemonBattle: ; 0xed06d
+ db $80
+ dw _Music_KantoWildPokemonBattle_Ch1
+ db $01
+ dw _Music_KantoWildPokemonBattle_Ch2
+ db $02
+ dw _Music_KantoWildPokemonBattle_Ch3
+; 0xed076
+
+; 0xed076
+ db $03
+; 0xed077
+
+_Music_KantoWildPokemonBattle_Ch1: ; 0xed077
+ tempo $7000
+ volume $77
+ vibrato $12, $23
+ dutycycle $02
+ notetype $0c, $b7
+ note $0f
+ octave4
+ note $b5
+ note $a0
+ note $90
+ note $a0
+ note $90
+ note $80
+ note $70
+ note $90
+ note $80
+ note $70
+ note $60
+ notetype $0c, $b7
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed18a
+ octave4
+ note $63
+ note $23
+ octave3
+ note $c7
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed18a
+ note $07
+ note $80
+ note $c0
+ octave4
+ note $20
+ octave3
+ note $c0
+ note $80
+ note $c0
+ octave4
+ note $30
+ note $40
+ intensity $b1
+ note $55
+ note $15
+ octave3
+ note $83
+ octave4
+ note $55
+ note $15
+ note $53
+ intensity $b7
+ note $60
+ note $20
+ octave3
+ note $90
+ octave4
+ note $10
+ note $20
+ octave3
+ note $90
+ note $60
+ note $80
+ note $93
+ note $70
+ note $80
+ note $90
+ octave4
+ note $10
+ note $23
+ octave3
+ note $60
+ note $90
+ octave4
+ note $20
+ note $50
+ note $62
+ note $80
+ note $93
+ intensity $b1
+ octave3
+ note $85
+ note $65
+ note $53
+ note $95
+ note $85
+ note $63
+ octave4
+ note $15
+ octave3
+ note $b5
+ note $83
+ notetype $08, $b7
+ octave2
+ note $81
+ octave3
+ note $11
+ note $51
+ note $11
+ note $51
+ note $81
+ note $51
+ note $81
+ octave4
+ note $11
+ octave3
+ note $81
+ octave4
+ note $11
+ note $51
+ note $61
+ note $21
+ octave3
+ note $91
+ octave4
+ note $21
+ octave3
+ note $91
+ note $61
+ note $91
+ note $61
+ note $21
+ note $61
+ note $21
+ octave2
+ note $91
+ notetype $0c, $b7
+ octave3
+ note $93
+ octave4
+ note $23
+ intensity $71
+ note $60
+ note $60
+ intensity $91
+ note $60
+ note $60
+ intensity $b1
+ note $90
+ note $90
+ intensity $d1
+ note $90
+ note $90
+ intensity $c7
+ note $50
+ note $30
+ note $20
+ note $30
+ note $5b
+ note $57
+ intensity $b1
+ note $50
+ note $30
+ note $10
+ octave3
+ note $b0
+ note $a0
+ note $80
+ note $60
+ note $50
+ intensity $b7
+ note $37
+ note $67
+ note $b7
+ octave4
+ note $37
+ octave3
+ note $87
+ octave4
+ note $17
+ note $57
+ note $87
+ note $07
+ octave3
+ note $47
+ note $97
+ octave4
+ note $17
+ octave3
+ note $b7
+ note $07
+ octave4
+ note $37
+ octave3
+ note $91
+ note $61
+ note $31
+ note $61
+ octave4
+ note $13
+ note $05
+ note $10
+ note $04
+ note $21
+ note $10
+ note $0c
+ note $23
+ note $05
+ note $20
+ note $04
+ note $61
+ note $40
+ note $04
+ note $27
+ intensity $b1
+ octave3
+ note $10
+ note $40
+ note $30
+ note $20
+ loopchannel $08, $515b
+ note $20
+ note $60
+ note $50
+ note $40
+ loopchannel $08, $5166
+ note $10
+ note $40
+ note $30
+ note $20
+ loopchannel $10, $516e
+ note $20
+ note $50
+ note $40
+ note $30
+ loopchannel $08, $5176
+ note $10
+ note $40
+ note $30
+ note $20
+ loopchannel $08, $517e
+ loopchannel $00, $5091 ; end
+; 0xed18a
+
+_Music_KantoWildPokemonBattle_sub_0xed18a: ; 0xed18a
+; subroutine
+ octave4
+ note $10
+ note $04
+ octave3
+ note $c0
+ note $04
+ note $b0
+ note $02
+ note $09
+ octave4
+ note $11
+ note $01
+ note $41
+ note $20
+ note $04
+ note $10
+ note $04
+ octave3
+ note $c0
+ note $02
+ endchannel ; end
+; 0xed19f
+
+_Music_KantoWildPokemonBattle_Ch2: ; 0xed19f
+ dutycycle $01
+ vibrato $12, $23
+ notetype $0c, $b1
+ octave4
+ note $80
+ note $70
+ note $60
+ note $50
+ note $80
+ note $70
+ note $60
+ note $50
+ note $80
+ note $70
+ note $60
+ note $50
+ note $80
+ note $70
+ note $60
+ note $50
+ note $80
+ note $70
+ note $60
+ note $50
+ note $70
+ note $60
+ note $50
+ note $40
+ note $60
+ note $50
+ note $40
+ note $30
+ note $50
+ note $40
+ note $30
+ note $20
+ notetype $0c, $b7
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed2c6
+ octave2
+ note $61
+ octave1
+ note $c0
+ note $00
+ octave2
+ note $81
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed2c6
+ octave2
+ note $80
+ note $00
+ octave1
+ note $c0
+ note $00
+ octave2
+ note $60
+ note $70
+ notetype $06, $b7
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ forceoctave $01
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ forceoctave $00
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ forceoctave $01
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ forceoctave $00
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed307
+ note $0f
+ octave3
+ note $bf
+ octave4
+ note $3f
+ note $6f
+ notetype $0c, $b7
+ note $5f
+ note $87
+ octave5
+ note $17
+ note $07
+ octave3
+ note $97
+ octave4
+ note $17
+ note $47
+ note $67
+ note $60
+ octave3
+ note $b0
+ note $90
+ note $b0
+ octave4
+ note $60
+ octave3
+ note $b0
+ note $90
+ note $b0
+ octave4
+ note $97
+ note $90
+ note $60
+ note $30
+ octave3
+ note $c0
+ octave4
+ note $60
+ note $30
+ octave3
+ note $c0
+ note $90
+ notetype $06, $b7
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed31b
+ forceoctave $01
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed31b
+ forceoctave $00
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed340
+ octave2
+ note $11
+ note $01
+ octave3
+ note $83
+ octave2
+ note $11
+ note $01
+ note $11
+ note $01
+ octave4
+ note $13
+ octave2
+ note $11
+ note $01
+ octave4
+ note $43
+ octave2
+ note $11
+ note $01
+ octave4
+ note $23
+ octave2
+ note $21
+ note $01
+ note $21
+ note $01
+ octave4
+ note $23
+ octave2
+ note $21
+ note $01
+ note $21
+ note $01
+ octave4
+ note $23
+ octave2
+ note $21
+ note $01
+ note $21
+ note $01
+ octave4
+ note $23
+ octave2
+ note $21
+ note $01
+ note $21
+ note $01
+ octave4
+ note $23
+ octave2
+ note $21
+ note $01
+ octave4
+ note $63
+ octave2
+ note $21
+ note $01
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed340
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed354
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed340
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed354
+ forceoctave $01
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed340
+ forceoctave $00
+ note $21
+ note $01
+ octave3
+ note $93
+ octave2
+ note $21
+ note $01
+ note $21
+ note $01
+ octave4
+ note $23
+ octave2
+ note $21
+ note $01
+ octave3
+ note $b3
+ octave2
+ note $21
+ note $01
+ callchannel _Music_KantoWildPokemonBattle_sub_0xed340
+ note $11
+ note $01
+ octave3
+ note $83
+ octave2
+ note $11
+ note $01
+ note $11
+ note $01
+ octave4
+ note $13
+ octave2
+ note $11
+ note $01
+ octave3
+ note $b3
+ octave2
+ note $11
+ note $01
+ loopchannel $00, $51c8 ; end
+; 0xed2c6
+
+_Music_KantoWildPokemonBattle_sub_0xed2c6: ; 0xed2c6
+; subroutine
+ octave2
+ note $10
+ note $01
+ note $10
+ octave1
+ note $80
+ note $00
+ octave2
+ note $10
+ note $00
+ octave3
+ note $11
+ octave2
+ note $10
+ note $00
+ octave1
+ note $80
+ note $01
+ note $80
+ octave2
+ note $12
+ note $10
+ octave1
+ note $81
+ octave2
+ note $11
+ octave1
+ note $81
+ octave2
+ note $71
+ octave1
+ note $81
+ octave2
+ note $81
+ note $20
+ note $01
+ note $20
+ octave1
+ note $90
+ note $00
+ octave2
+ note $20
+ note $00
+ octave3
+ note $20
+ note $00
+ octave2
+ note $21
+ octave1
+ note $90
+ note $01
+ note $90
+ octave2
+ note $20
+ note $01
+ note $20
+ octave1
+ note $90
+ note $00
+ octave2
+ note $20
+ note $00
+ octave1
+ note $81
+ endchannel ; end
+; 0xed307
+
+_Music_KantoWildPokemonBattle_sub_0xed307: ; 0xed307
+; subroutine
+ octave2
+ note $11
+ note $03
+ note $10
+ note $00
+ note $11
+ octave3
+ note $11
+ octave2
+ note $13
+ note $01
+ note $11
+ note $01
+ note $11
+ octave3
+ note $11
+ note $01
+ octave2
+ note $13
+ endchannel ; end
+; 0xed31b
+
+_Music_KantoWildPokemonBattle_sub_0xed31b: ; 0xed31b
+; subroutine
+ octave2
+ note $11
+ note $03
+ note $11
+ note $03
+ octave1
+ note $80
+ note $00
+ note $80
+ note $00
+ octave2
+ note $51
+ note $01
+ note $51
+ note $01
+ note $51
+ note $15
+ note $11
+ note $03
+ note $11
+ octave1
+ note $81
+ octave2
+ note $51
+ note $11
+ octave1
+ note $81
+ octave2
+ note $11
+ note $03
+ note $11
+ note $51
+ note $81
+ note $c1
+ octave3
+ note $11
+ endchannel ; end
+; 0xed340
+
+_Music_KantoWildPokemonBattle_sub_0xed340: ; 0xed340
+; subroutine
+ octave3
+ note $83
+ octave2
+ note $11
+ note $01
+ note $11
+ note $01
+ octave3
+ note $83
+ octave2
+ note $11
+ note $01
+ note $11
+ note $01
+ octave3
+ note $83
+ octave2
+ note $11
+ note $01
+ endchannel ; end
+; 0xed354
+
+_Music_KantoWildPokemonBattle_sub_0xed354: ; 0xed354
+; subroutine
+ note $11
+ note $01
+ octave3
+ note $83
+ octave2
+ note $11
+ note $01
+ note $11
+ note $01
+ octave3
+ note $83
+ octave2
+ note $11
+ note $01
+ octave3
+ note $83
+ octave2
+ note $11
+ note $01
+ endchannel ; end
+; 0xed368
+
+_Music_KantoWildPokemonBattle_Ch3: ; 0xed368
+ vibrato $14, $23
+ notetype $0c, $14
+ octave3
+ note $10
+ note $00
+ note $10
+ octave4
+ note $10
+ octave3
+ note $20
+ note $00
+ note $20
+ octave4
+ note $20
+ octave3
+ note $30
+ note $00
+ note $30
+ octave4
+ note $30
+ octave3
+ note $40
+ note $00
+ note $40
+ octave4
+ note $40
+ octave3
+ note $50
+ note $00
+ note $50
+ octave4
+ note $50
+ octave3
+ note $60
+ note $00
+ note $60
+ octave4
+ note $60
+ octave3
+ note $70
+ note $00
+ note $70
+ octave4
+ note $70
+ octave3
+ note $80
+ note $00
+ note $80
+ octave4
+ note $80
+ notetype $0c, $14
+ octave5
+ note $80
+ note $01
+ octave4
+ note $80
+ note $01
+ octave5
+ note $80
+ note $02
+ octave4
+ note $80
+ note $00
+ octave5
+ note $80
+ note $01
+ octave4
+ note $80
+ octave3
+ note $80
+ note $c0
+ octave4
+ note $10
+ note $30
+ note $45
+ octave5
+ note $41
+ note $01
+ note $81
+ note $90
+ note $01
+ octave4
+ note $90
+ note $01
+ octave5
+ note $90
+ note $02
+ octave4
+ note $90
+ note $00
+ octave5
+ note $90
+ note $01
+ octave4
+ note $90
+ octave6
+ note $25
+ octave5
+ note $90
+ note $60
+ note $c0
+ note $80
+ note $60
+ note $30
+ note $80
+ note $60
+ note $30
+ octave4
+ note $c0
+ octave5
+ note $80
+ note $01
+ octave4
+ note $80
+ note $01
+ octave5
+ note $80
+ note $02
+ octave4
+ note $80
+ note $00
+ octave5
+ note $80
+ note $01
+ octave4
+ note $80
+ note $10
+ note $30
+ note $40
+ note $60
+ note $85
+ octave5
+ note $41
+ note $01
+ note $81
+ note $90
+ note $01
+ octave4
+ note $80
+ note $01
+ octave5
+ note $90
+ note $02
+ octave4
+ note $80
+ note $00
+ octave5
+ note $90
+ note $01
+ octave4
+ note $80
+ note $23
+ note $93
+ octave5
+ note $66
+ note $70
+ note $81
+ intensity $24
+ note $10
+ octave4
+ note $80
+ octave5
+ note $10
+ octave4
+ note $80
+ intensity $14
+ octave5
+ note $71
+ intensity $24
+ note $10
+ octave4
+ note $80
+ octave5
+ note $10
+ octave4
+ note $80
+ intensity $14
+ octave5
+ note $51
+ intensity $24
+ note $10
+ octave4
+ note $80
+ intensity $14
+ octave5
+ note $81
+ intensity $24
+ note $10
+ octave4
+ note $80
+ octave5
+ note $10
+ octave4
+ note $80
+ intensity $14
+ octave5
+ note $a1
+ intensity $24
+ note $10
+ octave4
+ note $80
+ octave5
+ note $10
+ octave4
+ note $80
+ intensity $14
+ octave5
+ note $81
+ intensity $24
+ note $10
+ octave4
+ note $90
+ intensity $14
+ octave5
+ note $9b
+ note $81
+ note $61
+ note $91
+ note $81
+ note $20
+ note $60
+ note $90
+ octave6
+ note $10
+ note $27
+ octave5
+ note $11
+ intensity $24
+ octave4
+ note $50
+ note $80
+ note $50
+ note $80
+ intensity $14
+ note $b1
+ intensity $24
+ note $50
+ note $80
+ note $50
+ note $80
+ intensity $14
+ note $91
+ intensity $24
+ note $50
+ note $80
+ intensity $14
+ octave5
+ note $21
+ intensity $24
+ octave4
+ note $50
+ note $80
+ note $50
+ note $80
+ intensity $14
+ octave5
+ note $11
+ intensity $24
+ octave4
+ note $50
+ note $80
+ note $50
+ note $80
+ intensity $14
+ note $b1
+ intensity $24
+ note $50
+ note $80
+ intensity $14
+ octave5
+ note $61
+ intensity $24
+ octave4
+ note $80
+ octave5
+ note $10
+ octave4
+ note $80
+ octave5
+ note $10
+ intensity $14
+ note $51
+ intensity $24
+ octave4
+ note $80
+ octave5
+ note $10
+ octave4
+ note $80
+ octave5
+ note $10
+ intensity $14
+ note $31
+ intensity $24
+ octave4
+ note $80
+ octave5
+ note $10
+ intensity $14
+ octave4
+ note $b3
+ octave5
+ note $13
+ note $33
+ note $63
+ note $9f
+ notetype $06, $14
+ note $90
+ note $00
+ intensity $24
+ note $90
+ note $00
+ intensity $34
+ note $90
+ note $00
+ note $90
+ note $00
+ note $90
+ note $00
+ note $90
+ note $00
+ intensity $24
+ note $90
+ note $00
+ note $90
+ note $00
+ note $90
+ note $00
+ note $90
+ note $00
+ intensity $14
+ note $90
+ note $00
+ note $90
+ note $00
+ octave6
+ note $20
+ note $00
+ note $20
+ note $00
+ note $20
+ note $00
+ note $20
+ note $00
+ octave5
+ note $81
+ note $61
+ note $51
+ note $61
+ notetype $0c, $15
+ note $8b
+ note $87
+ notetype $06, $15
+ note $80
+ note $00
+ note $80
+ note $00
+ note $80
+ note $00
+ note $80
+ note $00
+ intensity $24
+ note $80
+ note $00
+ note $80
+ note $00
+ intensity $14
+ note $80
+ note $00
+ note $80
+ note $00
+ notetype $0c, $14
+ octave2
+ note $bf
+ note $b0
+ note $01
+ note $b0
+ note $01
+ note $b0
+ note $00
+ octave3
+ note $b0
+ note $01
+ note $b0
+ note $01
+ note $b0
+ note $00
+ note $10
+ note $01
+ notetype $06, $15
+ note $10
+ note $00
+ note $11
+ octave4
+ note $11
+ octave3
+ note $13
+ note $01
+ note $11
+ note $01
+ note $11
+ octave4
+ note $11
+ note $01
+ octave3
+ note $13
+ note $11
+ note $03
+ note $10
+ note $00
+ note $11
+ octave4
+ note $11
+ octave3
+ note $13
+ note $01
+ note $11
+ note $01
+ note $11
+ octave2
+ note $b1
+ note $01
+ note $b1
+ note $01
+ notetype $0c, $14
+ note $9f
+ note $9f
+ note $b1
+ note $01
+ note $b0
+ note $02
+ note $b0
+ note $00
+ octave3
+ note $b0
+ note $00
+ octave2
+ note $b0
+ note $00
+ octave3
+ note $b0
+ note $00
+ note $31
+ note $01
+ note $30
+ note $02
+ note $30
+ note $00
+ octave4
+ note $30
+ note $00
+ octave2
+ note $c0
+ note $00
+ octave3
+ note $c0
+ note $00
+ octave5
+ note $53
+ octave4
+ note $10
+ note $50
+ note $80
+ note $c0
+ octave5
+ note $10
+ note $00
+ note $50
+ note $04
+ note $61
+ note $50
+ note $00
+ octave4
+ note $10
+ octave3
+ note $80
+ octave4
+ note $10
+ note $50
+ note $80
+ note $50
+ note $10
+ note $50
+ note $80
+ octave5
+ note $10
+ note $50
+ note $80
+ note $63
+ octave4
+ note $20
+ note $60
+ note $90
+ octave5
+ note $10
+ note $20
+ note $00
+ note $60
+ note $04
+ note $91
+ note $80
+ note $04
+ note $67
+ intensity $13
+ note $85
+ note $75
+ note $51
+ note $01
+ note $85
+ note $a5
+ note $81
+ note $01
+ note $9b
+ note $81
+ note $61
+ note $91
+ note $81
+ note $03
+ octave6
+ note $27
+ octave5
+ note $15
+ octave4
+ note $b5
+ note $91
+ note $01
+ octave5
+ note $25
+ note $15
+ octave4
+ note $b1
+ note $01
+ octave5
+ note $65
+ note $55
+ note $31
+ note $01
+ octave4
+ note $b3
+ octave5
+ note $13
+ note $33
+ note $63
+ note $9f
+ note $9f
+ note $8f
+ note $8f
+ loopchannel $00, $539e ; end
+; 0xed5c6
--- a/audio/music/kantowildpokemonbattle.asm
+++ /dev/null
@@ -1,1229 +1,0 @@
-_Music_KantoWildPokemonBattle: ; 0xed06d
- db $80
- dw _Music_KantoWildPokemonBattle_Ch1
- db $01
- dw _Music_KantoWildPokemonBattle_Ch2
- db $02
- dw _Music_KantoWildPokemonBattle_Ch3
-; 0xed076
-
-; 0xed076
- db $03
-; 0xed077
-
-_Music_KantoWildPokemonBattle_Ch1: ; 0xed077
- tempo $7000
- volume $77
- vibrato $12, $23
- dutycycle $02
- notetype $0c, $b7
- note $0f
- octave4
- note $b5
- note $a0
- note $90
- note $a0
- note $90
- note $80
- note $70
- note $90
- note $80
- note $70
- note $60
- notetype $0c, $b7
- callchannel _Music_KantoWildPokemonBattle_sub_0xed18a
- octave4
- note $63
- note $23
- octave3
- note $c7
- callchannel _Music_KantoWildPokemonBattle_sub_0xed18a
- note $07
- note $80
- note $c0
- octave4
- note $20
- octave3
- note $c0
- note $80
- note $c0
- octave4
- note $30
- note $40
- intensity $b1
- note $55
- note $15
- octave3
- note $83
- octave4
- note $55
- note $15
- note $53
- intensity $b7
- note $60
- note $20
- octave3
- note $90
- octave4
- note $10
- note $20
- octave3
- note $90
- note $60
- note $80
- note $93
- note $70
- note $80
- note $90
- octave4
- note $10
- note $23
- octave3
- note $60
- note $90
- octave4
- note $20
- note $50
- note $62
- note $80
- note $93
- intensity $b1
- octave3
- note $85
- note $65
- note $53
- note $95
- note $85
- note $63
- octave4
- note $15
- octave3
- note $b5
- note $83
- notetype $08, $b7
- octave2
- note $81
- octave3
- note $11
- note $51
- note $11
- note $51
- note $81
- note $51
- note $81
- octave4
- note $11
- octave3
- note $81
- octave4
- note $11
- note $51
- note $61
- note $21
- octave3
- note $91
- octave4
- note $21
- octave3
- note $91
- note $61
- note $91
- note $61
- note $21
- note $61
- note $21
- octave2
- note $91
- notetype $0c, $b7
- octave3
- note $93
- octave4
- note $23
- intensity $71
- note $60
- note $60
- intensity $91
- note $60
- note $60
- intensity $b1
- note $90
- note $90
- intensity $d1
- note $90
- note $90
- intensity $c7
- note $50
- note $30
- note $20
- note $30
- note $5b
- note $57
- intensity $b1
- note $50
- note $30
- note $10
- octave3
- note $b0
- note $a0
- note $80
- note $60
- note $50
- intensity $b7
- note $37
- note $67
- note $b7
- octave4
- note $37
- octave3
- note $87
- octave4
- note $17
- note $57
- note $87
- note $07
- octave3
- note $47
- note $97
- octave4
- note $17
- octave3
- note $b7
- note $07
- octave4
- note $37
- octave3
- note $91
- note $61
- note $31
- note $61
- octave4
- note $13
- note $05
- note $10
- note $04
- note $21
- note $10
- note $0c
- note $23
- note $05
- note $20
- note $04
- note $61
- note $40
- note $04
- note $27
- intensity $b1
- octave3
- note $10
- note $40
- note $30
- note $20
- loopchannel $08, $515b
- note $20
- note $60
- note $50
- note $40
- loopchannel $08, $5166
- note $10
- note $40
- note $30
- note $20
- loopchannel $10, $516e
- note $20
- note $50
- note $40
- note $30
- loopchannel $08, $5176
- note $10
- note $40
- note $30
- note $20
- loopchannel $08, $517e
- loopchannel $00, $5091 ; end
-; 0xed18a
-
-_Music_KantoWildPokemonBattle_sub_0xed18a: ; 0xed18a
-; subroutine
- octave4
- note $10
- note $04
- octave3
- note $c0
- note $04
- note $b0
- note $02
- note $09
- octave4
- note $11
- note $01
- note $41
- note $20
- note $04
- note $10
- note $04
- octave3
- note $c0
- note $02
- endchannel ; end
-; 0xed19f
-
-_Music_KantoWildPokemonBattle_Ch2: ; 0xed19f
- dutycycle $01
- vibrato $12, $23
- notetype $0c, $b1
- octave4
- note $80
- note $70
- note $60
- note $50
- note $80
- note $70
- note $60
- note $50
- note $80
- note $70
- note $60
- note $50
- note $80
- note $70
- note $60
- note $50
- note $80
- note $70
- note $60
- note $50
- note $70
- note $60
- note $50
- note $40
- note $60
- note $50
- note $40
- note $30
- note $50
- note $40
- note $30
- note $20
- notetype $0c, $b7
- callchannel _Music_KantoWildPokemonBattle_sub_0xed2c6
- octave2
- note $61
- octave1
- note $c0
- note $00
- octave2
- note $81
- callchannel _Music_KantoWildPokemonBattle_sub_0xed2c6
- octave2
- note $80
- note $00
- octave1
- note $c0
- note $00
- octave2
- note $60
- note $70
- notetype $06, $b7
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- forceoctave $01
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- forceoctave $00
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- forceoctave $01
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- forceoctave $00
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- callchannel _Music_KantoWildPokemonBattle_sub_0xed307
- note $0f
- octave3
- note $bf
- octave4
- note $3f
- note $6f
- notetype $0c, $b7
- note $5f
- note $87
- octave5
- note $17
- note $07
- octave3
- note $97
- octave4
- note $17
- note $47
- note $67
- note $60
- octave3
- note $b0
- note $90
- note $b0
- octave4
- note $60
- octave3
- note $b0
- note $90
- note $b0
- octave4
- note $97
- note $90
- note $60
- note $30
- octave3
- note $c0
- octave4
- note $60
- note $30
- octave3
- note $c0
- note $90
- notetype $06, $b7
- callchannel _Music_KantoWildPokemonBattle_sub_0xed31b
- forceoctave $01
- callchannel _Music_KantoWildPokemonBattle_sub_0xed31b
- forceoctave $00
- callchannel _Music_KantoWildPokemonBattle_sub_0xed340
- octave2
- note $11
- note $01
- octave3
- note $83
- octave2
- note $11
- note $01
- note $11
- note $01
- octave4
- note $13
- octave2
- note $11
- note $01
- octave4
- note $43
- octave2
- note $11
- note $01
- octave4
- note $23
- octave2
- note $21
- note $01
- note $21
- note $01
- octave4
- note $23
- octave2
- note $21
- note $01
- note $21
- note $01
- octave4
- note $23
- octave2
- note $21
- note $01
- note $21
- note $01
- octave4
- note $23
- octave2
- note $21
- note $01
- note $21
- note $01
- octave4
- note $23
- octave2
- note $21
- note $01
- octave4
- note $63
- octave2
- note $21
- note $01
- callchannel _Music_KantoWildPokemonBattle_sub_0xed340
- callchannel _Music_KantoWildPokemonBattle_sub_0xed354
- callchannel _Music_KantoWildPokemonBattle_sub_0xed340
- callchannel _Music_KantoWildPokemonBattle_sub_0xed354
- forceoctave $01
- callchannel _Music_KantoWildPokemonBattle_sub_0xed340
- forceoctave $00
- note $21
- note $01
- octave3
- note $93
- octave2
- note $21
- note $01
- note $21
- note $01
- octave4
- note $23
- octave2
- note $21
- note $01
- octave3
- note $b3
- octave2
- note $21
- note $01
- callchannel _Music_KantoWildPokemonBattle_sub_0xed340
- note $11
- note $01
- octave3
- note $83
- octave2
- note $11
- note $01
- note $11
- note $01
- octave4
- note $13
- octave2
- note $11
- note $01
- octave3
- note $b3
- octave2
- note $11
- note $01
- loopchannel $00, $51c8 ; end
-; 0xed2c6
-
-_Music_KantoWildPokemonBattle_sub_0xed2c6: ; 0xed2c6
-; subroutine
- octave2
- note $10
- note $01
- note $10
- octave1
- note $80
- note $00
- octave2
- note $10
- note $00
- octave3
- note $11
- octave2
- note $10
- note $00
- octave1
- note $80
- note $01
- note $80
- octave2
- note $12
- note $10
- octave1
- note $81
- octave2
- note $11
- octave1
- note $81
- octave2
- note $71
- octave1
- note $81
- octave2
- note $81
- note $20
- note $01
- note $20
- octave1
- note $90
- note $00
- octave2
- note $20
- note $00
- octave3
- note $20
- note $00
- octave2
- note $21
- octave1
- note $90
- note $01
- note $90
- octave2
- note $20
- note $01
- note $20
- octave1
- note $90
- note $00
- octave2
- note $20
- note $00
- octave1
- note $81
- endchannel ; end
-; 0xed307
-
-_Music_KantoWildPokemonBattle_sub_0xed307: ; 0xed307
-; subroutine
- octave2
- note $11
- note $03
- note $10
- note $00
- note $11
- octave3
- note $11
- octave2
- note $13
- note $01
- note $11
- note $01
- note $11
- octave3
- note $11
- note $01
- octave2
- note $13
- endchannel ; end
-; 0xed31b
-
-_Music_KantoWildPokemonBattle_sub_0xed31b: ; 0xed31b
-; subroutine
- octave2
- note $11
- note $03
- note $11
- note $03
- octave1
- note $80
- note $00
- note $80
- note $00
- octave2
- note $51
- note $01
- note $51
- note $01
- note $51
- note $15
- note $11
- note $03
- note $11
- octave1
- note $81
- octave2
- note $51
- note $11
- octave1
- note $81
- octave2
- note $11
- note $03
- note $11
- note $51
- note $81
- note $c1
- octave3
- note $11
- endchannel ; end
-; 0xed340
-
-_Music_KantoWildPokemonBattle_sub_0xed340: ; 0xed340
-; subroutine
- octave3
- note $83
- octave2
- note $11
- note $01
- note $11
- note $01
- octave3
- note $83
- octave2
- note $11
- note $01
- note $11
- note $01
- octave3
- note $83
- octave2
- note $11
- note $01
- endchannel ; end
-; 0xed354
-
-_Music_KantoWildPokemonBattle_sub_0xed354: ; 0xed354
-; subroutine
- note $11
- note $01
- octave3
- note $83
- octave2
- note $11
- note $01
- note $11
- note $01
- octave3
- note $83
- octave2
- note $11
- note $01
- octave3
- note $83
- octave2
- note $11
- note $01
- endchannel ; end
-; 0xed368
-
-_Music_KantoWildPokemonBattle_Ch3: ; 0xed368
- vibrato $14, $23
- notetype $0c, $14
- octave3
- note $10
- note $00
- note $10
- octave4
- note $10
- octave3
- note $20
- note $00
- note $20
- octave4
- note $20
- octave3
- note $30
- note $00
- note $30
- octave4
- note $30
- octave3
- note $40
- note $00
- note $40
- octave4
- note $40
- octave3
- note $50
- note $00
- note $50
- octave4
- note $50
- octave3
- note $60
- note $00
- note $60
- octave4
- note $60
- octave3
- note $70
- note $00
- note $70
- octave4
- note $70
- octave3
- note $80
- note $00
- note $80
- octave4
- note $80
- notetype $0c, $14
- octave5
- note $80
- note $01
- octave4
- note $80
- note $01
- octave5
- note $80
- note $02
- octave4
- note $80
- note $00
- octave5
- note $80
- note $01
- octave4
- note $80
- octave3
- note $80
- note $c0
- octave4
- note $10
- note $30
- note $45
- octave5
- note $41
- note $01
- note $81
- note $90
- note $01
- octave4
- note $90
- note $01
- octave5
- note $90
- note $02
- octave4
- note $90
- note $00
- octave5
- note $90
- note $01
- octave4
- note $90
- octave6
- note $25
- octave5
- note $90
- note $60
- note $c0
- note $80
- note $60
- note $30
- note $80
- note $60
- note $30
- octave4
- note $c0
- octave5
- note $80
- note $01
- octave4
- note $80
- note $01
- octave5
- note $80
- note $02
- octave4
- note $80
- note $00
- octave5
- note $80
- note $01
- octave4
- note $80
- note $10
- note $30
- note $40
- note $60
- note $85
- octave5
- note $41
- note $01
- note $81
- note $90
- note $01
- octave4
- note $80
- note $01
- octave5
- note $90
- note $02
- octave4
- note $80
- note $00
- octave5
- note $90
- note $01
- octave4
- note $80
- note $23
- note $93
- octave5
- note $66
- note $70
- note $81
- intensity $24
- note $10
- octave4
- note $80
- octave5
- note $10
- octave4
- note $80
- intensity $14
- octave5
- note $71
- intensity $24
- note $10
- octave4
- note $80
- octave5
- note $10
- octave4
- note $80
- intensity $14
- octave5
- note $51
- intensity $24
- note $10
- octave4
- note $80
- intensity $14
- octave5
- note $81
- intensity $24
- note $10
- octave4
- note $80
- octave5
- note $10
- octave4
- note $80
- intensity $14
- octave5
- note $a1
- intensity $24
- note $10
- octave4
- note $80
- octave5
- note $10
- octave4
- note $80
- intensity $14
- octave5
- note $81
- intensity $24
- note $10
- octave4
- note $90
- intensity $14
- octave5
- note $9b
- note $81
- note $61
- note $91
- note $81
- note $20
- note $60
- note $90
- octave6
- note $10
- note $27
- octave5
- note $11
- intensity $24
- octave4
- note $50
- note $80
- note $50
- note $80
- intensity $14
- note $b1
- intensity $24
- note $50
- note $80
- note $50
- note $80
- intensity $14
- note $91
- intensity $24
- note $50
- note $80
- intensity $14
- octave5
- note $21
- intensity $24
- octave4
- note $50
- note $80
- note $50
- note $80
- intensity $14
- octave5
- note $11
- intensity $24
- octave4
- note $50
- note $80
- note $50
- note $80
- intensity $14
- note $b1
- intensity $24
- note $50
- note $80
- intensity $14
- octave5
- note $61
- intensity $24
- octave4
- note $80
- octave5
- note $10
- octave4
- note $80
- octave5
- note $10
- intensity $14
- note $51
- intensity $24
- octave4
- note $80
- octave5
- note $10
- octave4
- note $80
- octave5
- note $10
- intensity $14
- note $31
- intensity $24
- octave4
- note $80
- octave5
- note $10
- intensity $14
- octave4
- note $b3
- octave5
- note $13
- note $33
- note $63
- note $9f
- notetype $06, $14
- note $90
- note $00
- intensity $24
- note $90
- note $00
- intensity $34
- note $90
- note $00
- note $90
- note $00
- note $90
- note $00
- note $90
- note $00
- intensity $24
- note $90
- note $00
- note $90
- note $00
- note $90
- note $00
- note $90
- note $00
- intensity $14
- note $90
- note $00
- note $90
- note $00
- octave6
- note $20
- note $00
- note $20
- note $00
- note $20
- note $00
- note $20
- note $00
- octave5
- note $81
- note $61
- note $51
- note $61
- notetype $0c, $15
- note $8b
- note $87
- notetype $06, $15
- note $80
- note $00
- note $80
- note $00
- note $80
- note $00
- note $80
- note $00
- intensity $24
- note $80
- note $00
- note $80
- note $00
- intensity $14
- note $80
- note $00
- note $80
- note $00
- notetype $0c, $14
- octave2
- note $bf
- note $b0
- note $01
- note $b0
- note $01
- note $b0
- note $00
- octave3
- note $b0
- note $01
- note $b0
- note $01
- note $b0
- note $00
- note $10
- note $01
- notetype $06, $15
- note $10
- note $00
- note $11
- octave4
- note $11
- octave3
- note $13
- note $01
- note $11
- note $01
- note $11
- octave4
- note $11
- note $01
- octave3
- note $13
- note $11
- note $03
- note $10
- note $00
- note $11
- octave4
- note $11
- octave3
- note $13
- note $01
- note $11
- note $01
- note $11
- octave2
- note $b1
- note $01
- note $b1
- note $01
- notetype $0c, $14
- note $9f
- note $9f
- note $b1
- note $01
- note $b0
- note $02
- note $b0
- note $00
- octave3
- note $b0
- note $00
- octave2
- note $b0
- note $00
- octave3
- note $b0
- note $00
- note $31
- note $01
- note $30
- note $02
- note $30
- note $00
- octave4
- note $30
- note $00
- octave2
- note $c0
- note $00
- octave3
- note $c0
- note $00
- octave5
- note $53
- octave4
- note $10
- note $50
- note $80
- note $c0
- octave5
- note $10
- note $00
- note $50
- note $04
- note $61
- note $50
- note $00
- octave4
- note $10
- octave3
- note $80
- octave4
- note $10
- note $50
- note $80
- note $50
- note $10
- note $50
- note $80
- octave5
- note $10
- note $50
- note $80
- note $63
- octave4
- note $20
- note $60
- note $90
- octave5
- note $10
- note $20
- note $00
- note $60
- note $04
- note $91
- note $80
- note $04
- note $67
- intensity $13
- note $85
- note $75
- note $51
- note $01
- note $85
- note $a5
- note $81
- note $01
- note $9b
- note $81
- note $61
- note $91
- note $81
- note $03
- octave6
- note $27
- octave5
- note $15
- octave4
- note $b5
- note $91
- note $01
- octave5
- note $25
- note $15
- octave4
- note $b1
- note $01
- octave5
- note $65
- note $55
- note $31
- note $01
- octave4
- note $b3
- octave5
- note $13
- note $33
- note $63
- note $9f
- note $9f
- note $8f
- note $8f
- loopchannel $00, $539e ; end
-; 0xed5c6
--- /dev/null
+++ b/audio/music/lakeofragerocketradio.asm
@@ -1,0 +1,41 @@
+_Music_LakeOfRageRocketsRadioSignal: ; 0xef5b1
+ db $80
+ dw _Music_LakeOfRageRocketsRadioSignal_Ch1
+ db $01
+ dw _Music_LakeOfRageRocketsRadioSignal_Ch2
+ db $02
+ dw _Music_LakeOfRageRocketsRadioSignal_Ch3
+; 0xef5ba
+
+_Music_LakeOfRageRocketsRadioSignal_Ch1: ; 0xef5ba
+ tempo $a000
+ volume $77
+ dutycycle $01
+ tone $1811
+ vibrato $00, $f0
+ stereopanning $f0
+ notetype $0c, $a7
+ octave7
+ note $83
+ note $73
+ note $83
+ note $73
+ note $0f
+ loopchannel $00, $75c9 ; end
+; 0xef5d6
+
+_Music_LakeOfRageRocketsRadioSignal_Ch2: ; 0xef5d6
+ dutycycle $01
+ vibrato $13, $e8
+ notetype $0c, $a7
+ note $01
+ stereopanning $0f
+ loopchannel $00, $75c9 ; end
+; 0xef5e5
+
+_Music_LakeOfRageRocketsRadioSignal_Ch3: ; 0xef5e5
+ notetype $0c, $26
+ vibrato $10, $44
+ note $03
+ loopchannel $00, $75c9 ; end
+; 0xef5f0
--- a/audio/music/lakeofragerocketsradiosignal.asm
+++ /dev/null
@@ -1,41 +1,0 @@
-_Music_LakeOfRageRocketsRadioSignal: ; 0xef5b1
- db $80
- dw _Music_LakeOfRageRocketsRadioSignal_Ch1
- db $01
- dw _Music_LakeOfRageRocketsRadioSignal_Ch2
- db $02
- dw _Music_LakeOfRageRocketsRadioSignal_Ch3
-; 0xef5ba
-
-_Music_LakeOfRageRocketsRadioSignal_Ch1: ; 0xef5ba
- tempo $a000
- volume $77
- dutycycle $01
- tone $1811
- vibrato $00, $f0
- stereopanning $f0
- notetype $0c, $a7
- octave7
- note $83
- note $73
- note $83
- note $73
- note $0f
- loopchannel $00, $75c9 ; end
-; 0xef5d6
-
-_Music_LakeOfRageRocketsRadioSignal_Ch2: ; 0xef5d6
- dutycycle $01
- vibrato $13, $e8
- notetype $0c, $a7
- note $01
- stereopanning $0f
- loopchannel $00, $75c9 ; end
-; 0xef5e5
-
-_Music_LakeOfRageRocketsRadioSignal_Ch3: ; 0xef5e5
- notetype $0c, $26
- vibrato $10, $44
- note $03
- loopchannel $00, $75c9 ; end
-; 0xef5f0
--- /dev/null
+++ b/audio/music/ruinsofalphradio.asm
@@ -1,0 +1,81 @@
+_Music_RuinsOfAlphRadioSignal: ; 0xeedcb
+ db $80
+ dw _Music_RuinsOfAlphRadioSignal_Ch1
+ db $01
+ dw _Music_RuinsOfAlphRadioSignal_Ch2
+ db $02
+ dw _Music_RuinsOfAlphRadioSignal_Ch3
+; 0xeedd4
+
+_Music_RuinsOfAlphRadioSignal_Ch1: ; 0xeedd4
+ tempo $a000
+ volume $77
+ dutycycle $00
+ tone $1801
+ vibrato $00, $f0
+ stereopanning $f0
+ notetype $06, $71
+ callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee01
+ notetype $0c, $a1
+ note $0f
+ note $0f
+ callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee08
+ notetype $0c, $a1
+ note $0f
+ note $0f
+ callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee01
+ notetype $0c, $a1
+ note $0f
+ loopchannel $00, $6de3 ; end
+; 0xeee01
+
+_Music_RuinsOfAlphRadioSignal_sub_0xeee01: ; 0xeee01
+; subroutine
+ octave4
+ note $80
+ note $70
+ note $80
+ note $70
+ note $17
+ endchannel ; end
+; 0xeee08
+
+_Music_RuinsOfAlphRadioSignal_sub_0xeee08: ; 0xeee08
+; subroutine
+ octave4
+ note $80
+ note $70
+ note $80
+ note $70
+ note $13
+ note $80
+ octave5
+ note $17
+ endchannel ; end
+; 0xeee12
+
+_Music_RuinsOfAlphRadioSignal_Ch2: ; 0xeee12
+ dutycycle $01
+ vibrato $01, $e0
+ stereopanning $0f
+ notetype $06, $81
+ callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee01
+ notetype $0c, $a1
+ note $0f
+ note $0f
+ notetype $06, $81
+ callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee08
+ notetype $0c, $a1
+ note $0f
+ loopchannel $00, $6e17 ; end
+; 0xeee32
+
+_Music_RuinsOfAlphRadioSignal_Ch3: ; 0xeee32
+ notetype $06, $26
+ octave2
+ note $10
+ note $20
+ note $10
+ note $0f
+ loopchannel $00, $6e35 ; end
+; 0xeee3e
--- a/audio/music/ruinsofalphradiosignal.asm
+++ /dev/null
@@ -1,81 +1,0 @@
-_Music_RuinsOfAlphRadioSignal: ; 0xeedcb
- db $80
- dw _Music_RuinsOfAlphRadioSignal_Ch1
- db $01
- dw _Music_RuinsOfAlphRadioSignal_Ch2
- db $02
- dw _Music_RuinsOfAlphRadioSignal_Ch3
-; 0xeedd4
-
-_Music_RuinsOfAlphRadioSignal_Ch1: ; 0xeedd4
- tempo $a000
- volume $77
- dutycycle $00
- tone $1801
- vibrato $00, $f0
- stereopanning $f0
- notetype $06, $71
- callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee01
- notetype $0c, $a1
- note $0f
- note $0f
- callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee08
- notetype $0c, $a1
- note $0f
- note $0f
- callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee01
- notetype $0c, $a1
- note $0f
- loopchannel $00, $6de3 ; end
-; 0xeee01
-
-_Music_RuinsOfAlphRadioSignal_sub_0xeee01: ; 0xeee01
-; subroutine
- octave4
- note $80
- note $70
- note $80
- note $70
- note $17
- endchannel ; end
-; 0xeee08
-
-_Music_RuinsOfAlphRadioSignal_sub_0xeee08: ; 0xeee08
-; subroutine
- octave4
- note $80
- note $70
- note $80
- note $70
- note $13
- note $80
- octave5
- note $17
- endchannel ; end
-; 0xeee12
-
-_Music_RuinsOfAlphRadioSignal_Ch2: ; 0xeee12
- dutycycle $01
- vibrato $01, $e0
- stereopanning $0f
- notetype $06, $81
- callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee01
- notetype $0c, $a1
- note $0f
- note $0f
- notetype $06, $81
- callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee08
- notetype $0c, $a1
- note $0f
- loopchannel $00, $6e17 ; end
-; 0xeee32
-
-_Music_RuinsOfAlphRadioSignal_Ch3: ; 0xeee32
- notetype $06, $26
- octave2
- note $10
- note $20
- note $10
- note $0f
- loopchannel $00, $6e35 ; end
-; 0xeee3e
--- a/main.asm
+++ b/main.asm
@@ -64875,7 +64875,7 @@
Music_RocketBattle: INCLUDE "audio/music/rocketbattle.asm"
Music_ElmsLab: INCLUDE "audio/music/elmslab.asm"
Music_DarkCave: INCLUDE "audio/music/darkcave.asm"
-Music_JohtoGymBattle: INCLUDE "audio/music/johtogymleaderbattle.asm"
+Music_JohtoGymBattle: INCLUDE "audio/music/johtogymbattle.asm"
Music_ChampionBattle: INCLUDE "audio/music/championbattle.asm"
Music_SSAqua: INCLUDE "audio/music/ssaqua.asm"
Music_NewBarkTown: INCLUDE "audio/music/newbarktown.asm"
@@ -64894,9 +64894,9 @@
Music_Route1: INCLUDE "audio/music/route1.asm"
Music_Route3: INCLUDE "audio/music/route3.asm"
Music_Route12: INCLUDE "audio/music/route12.asm"
-Music_KantoGymBattle: INCLUDE "audio/music/kantogymleaderbattle.asm"
+Music_KantoGymBattle: INCLUDE "audio/music/kantogymbattle.asm"
Music_KantoTrainerBattle: INCLUDE "audio/music/kantotrainerbattle.asm"
-Music_KantoWildBattle: INCLUDE "audio/music/kantowildpokemonbattle.asm"
+Music_KantoWildBattle: INCLUDE "audio/music/kantowildbattle.asm"
Music_PokemonCenter: INCLUDE "audio/music/pokemoncenter.asm"
Music_LookLass: INCLUDE "audio/music/looklass.asm"
Music_LookOfficer: INCLUDE "audio/music/lookofficer.asm"
@@ -64913,15 +64913,15 @@
Music_Route37: INCLUDE "audio/music/route37.asm"
Music_RocketHideout: INCLUDE "audio/music/rockethideout.asm"
Music_DragonsDen: INCLUDE "audio/music/dragonsden.asm"
-Music_RuinsOfAlphRadio: INCLUDE "audio/music/ruinsofalphradiosignal.asm"
+Music_RuinsOfAlphRadio: INCLUDE "audio/music/ruinsofalphradio.asm"
Music_LookBeauty: INCLUDE "audio/music/lookbeauty.asm"
Music_Route26: INCLUDE "audio/music/route26.asm"
Music_EcruteakCity: INCLUDE "audio/music/ecruteakcity.asm"
-Music_LakeOfRageRocketRadio:INCLUDE "audio/music/lakeofragerocketsradiosignal.asm"
+Music_LakeOfRageRocketRadio:INCLUDE "audio/music/lakeofragerocketradio.asm"
Music_MagnetTrain: INCLUDE "audio/music/magnettrain.asm"
Music_LavenderTown: INCLUDE "audio/music/lavendertown.asm"
Music_DancingHall: INCLUDE "audio/music/dancinghall.asm"
-Music_ContestResults: INCLUDE "audio/music/bugcatchingcontestresults.asm"
+Music_ContestResults: INCLUDE "audio/music/contestresults.asm"
Music_Route30: INCLUDE "audio/music/route30.asm"
SECTION "bank3C",ROMX,BANK[$3C]
@@ -64964,8 +64964,8 @@
Music_AzaleaTown: INCLUDE "audio/music/azaleatown.asm"
Music_CherrygroveCity: INCLUDE "audio/music/cherrygrovecity.asm"
Music_UnionCave: INCLUDE "audio/music/unioncave.asm"
-Music_JohtoWildBattle: INCLUDE "audio/music/johtowildpokemonbattle.asm"
-Music_JohtoWildBattleNight: INCLUDE "audio/music/johtowildpokemonbattlenight.asm"
+Music_JohtoWildBattle: INCLUDE "audio/music/johtowildbattle.asm"
+Music_JohtoWildBattleNight: INCLUDE "audio/music/johtowildbattlenight.asm"
Music_JohtoTrainerBattle: INCLUDE "audio/music/johtotrainerbattle.asm"
Music_LookYoungster: INCLUDE "audio/music/lookyoungster.asm"
Music_TinTower: INCLUDE "audio/music/tintower.asm"