ref: cf18b9458ada7772df7ea4f3f6c2887570b48aa7
parent: 94ebdab6d350fd6ebfd43c5a84710ed14dade8ca
author: Rangi <[email protected]>
date: Sat Jan 4 18:17:21 EST 2020
Replace "branch" labels in music files with local names
--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@@ -21,7 +21,7 @@
note G#, 2
note G#, 2
note G#, 2
- loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1
+ loopchannel 0, Music_LookRival_Ch1.mainloop
Music_AfterTheRivalFight_Ch2:
dutycycle $1
@@ -36,7 +36,7 @@
note G#, 2
note G#, 2
note G#, 2
- loopchannel 0, Music_AfterTheRivalFight_branch_f502e
+ loopchannel 0, Music_LookRival_Ch2.mainloop
Music_AfterTheRivalFight_Ch3:
notetype $c, $28
@@ -49,7 +49,7 @@
note F#, 2
note F_, 2
note D#, 2
- loopchannel 0, Music_AfterTheRivalFight_branch_f509d
+ loopchannel 0, Music_LookRival_Ch3.mainloop
Music_AfterTheRivalFight_Ch4:
togglenoise $3
@@ -61,4 +61,4 @@
note D_, 2
note D_, 2
note D_, 2
- loopchannel 0, Music_AfterTheRivalFight_branch_f5118
+ loopchannel 0, Music_LookRival_Ch4.mainloop
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -11,7 +11,7 @@
stereopanning $f
notetype $c, $a1
note __, 2
-Music_AzaleaTown_branch_f5801:
+.introloop:
intensity $a1
octave 3
note F_, 2
@@ -25,9 +25,9 @@
note F_, 2
note F_, 2
note F_, 2
- loopchannel 2, Music_AzaleaTown_branch_f5801
-Music_AzaleaTown_branch_f5816:
- callchannel Music_AzaleaTown_branch_f588c
+ loopchannel 2, .introloop
+.mainloop:
+ callchannel .sub1
stereopanning $f0
intensity $a4
note G#, 2
@@ -42,7 +42,7 @@
note D#, 2
note __, 2
stereopanning $f
- callchannel Music_AzaleaTown_branch_f588c
+ callchannel .sub1
stereopanning $f0
notetype $6, $a4
note D#, 4
@@ -55,7 +55,7 @@
note A#, 4
note F#, 4
stereopanning $f
- callchannel Music_AzaleaTown_branch_f5912
+ callchannel .sub2
intensity $a3
note A#, 4
octave 4
@@ -68,7 +68,7 @@
note C#, 4
note A_, 2
note __, 14
- callchannel Music_AzaleaTown_branch_f5912
+ callchannel .sub2
intensity $a3
octave 4
note C_, 1
@@ -117,9 +117,9 @@
octave 3
note G#, 14
note __, 2
- loopchannel 0, Music_AzaleaTown_branch_f5816
+ loopchannel 0, .mainloop
-Music_AzaleaTown_branch_f588c:
+.sub1:
notetype $c, $a1
octave 4
note F_, 2
@@ -218,7 +218,7 @@
note C#, 2
endchannel
-Music_AzaleaTown_branch_f5912:
+.sub2:
intensity $61
note G#, 8
note G#, 8
@@ -264,8 +264,8 @@
dutycycle $1
octave 5
note C_, 1
-Music_AzaleaTown_branch_f5952:
- callchannel Music_AzaleaTown_branch_f59c7
+.mainloop:
+ callchannel .sub1
note C#, 4
note C_, 2
note C#, 1
@@ -276,7 +276,7 @@
dutycycle $1
octave 5
note C_, 1
- callchannel Music_AzaleaTown_branch_f59c7
+ callchannel .sub1
note __, 2
note C#, 2
note C_, 2
@@ -361,9 +361,9 @@
note G#, 2
octave 5
note C_, 2
- loopchannel 0, Music_AzaleaTown_branch_f5952
+ loopchannel 0, .mainloop
-Music_AzaleaTown_branch_f59c7:
+.sub1:
note C#, 4
octave 4
note G#, 2
@@ -440,15 +440,15 @@
note C#, 1
note __, 1
note G#, 4
-Music_AzaleaTown_branch_f5a24:
- callchannel Music_AzaleaTown_branch_f5a86
+.mainloop:
+ callchannel .sub1
note G#, 4
note D#, 2
- callchannel Music_AzaleaTown_branch_f5a86
+ callchannel .sub1
note G#, 2
note __, 2
note F#, 2
- callchannel Music_AzaleaTown_branch_f5acf
+ callchannel .sub2
note A#, 1
note __, 1
octave 4
@@ -462,7 +462,7 @@
note __, 3
note F_, 1
note __, 1
- callchannel Music_AzaleaTown_branch_f5acf
+ callchannel .sub2
octave 2
note A#, 2
octave 3
@@ -527,9 +527,9 @@
note B_, 1
octave 3
note C_, 1
- loopchannel 0, Music_AzaleaTown_branch_f5a24
+ loopchannel 0, .mainloop
-Music_AzaleaTown_branch_f5a86:
+.sub1:
note C#, 1
note __, 5
note C#, 1
@@ -602,7 +602,7 @@
note __, 1
endchannel
-Music_AzaleaTown_branch_f5acf:
+.sub2:
intensity $35
octave 3
note F_, 1
@@ -628,7 +628,7 @@
togglenoise $3
notetype $c
note F_, 2
-Music_AzaleaTown_branch_f5aea:
+.mainloop:
note D#, 2
note F#, 2
note D_, 2
@@ -650,4 +650,4 @@
note D#, 2
note D_, 2
note F#, 2
- loopchannel 0, Music_AzaleaTown_branch_f5aea
+ loopchannel 0, .mainloop
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@@ -12,7 +12,7 @@
vibrato $8, $22
stereopanning $f0
notetype $c, $72
-Music_BattleTowerLobby_branch_1794a9:
+.mainloop:
notetype $c, $72
octave 3
note G#, 2
@@ -114,7 +114,7 @@
notetype $c, $75
octave 2
note B_, 4
- loopchannel 0, Music_BattleTowerLobby_branch_1794a9
+ loopchannel 0, .mainloop
Music_BattleTowerLobby_Ch2:
dutycycle $2
@@ -121,7 +121,7 @@
vibrato $10, $34
stereopanning $f
notetype $c, $82
-Music_BattleTowerLobby_branch_179544:
+.mainloop:
notetype $c, $82
octave 4
note E_, 2
@@ -198,11 +198,11 @@
note B_, 1
octave 4
note D#, 1
- loopchannel 0, Music_BattleTowerLobby_branch_179544
+ loopchannel 0, .mainloop
Music_BattleTowerLobby_Ch3:
notetype $c, $11
-Music_BattleTowerLobby_branch_1795b1:
+.mainloop:
octave 2
note B_, 2
octave 3
@@ -294,11 +294,11 @@
note E_, 2
note D#, 2
note F#, 2
- loopchannel 0, Music_BattleTowerLobby_branch_1795b1
+ loopchannel 0, .mainloop
Music_BattleTowerLobby_Ch4:
togglenoise $0
-Music_BattleTowerLobby_branch_179612:
+.mainloop:
notetype $c
note __, 2
note F_, 4
@@ -305,4 +305,4 @@
note F_, 4
note F_, 2
note F_, 4
- loopchannel 0, Music_BattleTowerLobby_branch_179612
+ loopchannel 0, .mainloop
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -11,7 +11,7 @@
vibrato $12, $34
stereopanning $f
notetype $6, $94
-Music_BattleTowerTheme_branch_1788a5:
+.mainloop:
note __, 16
note __, 16
note __, 12
@@ -21,7 +21,7 @@
note C_, 2
note E_, 2
note G_, 4
- callchannel Music_BattleTowerTheme_branch_17895e
+ callchannel .sub1
note G_, 2
note __, 2
note C_, 4
@@ -39,7 +39,7 @@
octave 3
note G_, 2
note E_, 2
- callchannel Music_BattleTowerTheme_branch_17895e
+ callchannel .sub1
note G_, 2
note __, 2
octave 2
@@ -183,9 +183,9 @@
note __, 1
note E_, 4
note __, 12
- loopchannel 0, Music_BattleTowerTheme_branch_1788a5
+ loopchannel 0, .mainloop
-Music_BattleTowerTheme_branch_17895e:
+.sub1:
intensity $94
note A_, 2
note __, 2
@@ -203,7 +203,7 @@
Music_BattleTowerTheme_Ch2:
vibrato $12, $34
-Music_BattleTowerTheme_branch_178970:
+.mainloop:
dutycycle $3
notetype $6, $b8
octave 3
@@ -245,7 +245,7 @@
octave 4
note C_, 2
note E_, 4
- callchannel Music_BattleTowerTheme_branch_178a15
+ callchannel .sub1
note A#, 4
note __, 2
note F_, 2
@@ -252,7 +252,7 @@
notetype $c, $b7
note C_, 12
notetype $6, $b7
- callchannel Music_BattleTowerTheme_branch_178a15
+ callchannel .sub1
notetype $c, $b7
note A#, 2
note __, 1
@@ -341,9 +341,9 @@
note C_, 2
note D_, 2
note E_, 4
- loopchannel 0, Music_BattleTowerTheme_branch_178970
+ loopchannel 0, .mainloop
-Music_BattleTowerTheme_branch_178a15:
+.sub1:
note F_, 2
note __, 2
note F_, 8
@@ -359,9 +359,9 @@
Music_BattleTowerTheme_Ch3:
vibrato $12, $34
notetype $6, $16
-Music_BattleTowerTheme_branch_178a26:
+.mainloop:
stereopanning $ff
- callchannel Music_BattleTowerTheme_branch_178afe
+ callchannel .sub1
note C_, 2
note __, 2
note F_, 4
@@ -376,7 +376,7 @@
note __, 4
stereopanning $f0
note C_, 8
- callchannel Music_BattleTowerTheme_branch_178afe
+ callchannel .sub1
note C_, 2
note __, 2
note F_, 4
@@ -390,7 +390,7 @@
note __, 4
note C_, 2
note __, 2
- callchannel Music_BattleTowerTheme_branch_178afe
+ callchannel .sub1
octave 2
note A#, 2
note __, 2
@@ -563,9 +563,9 @@
note __, 1
note G_, 4
note __, 12
- loopchannel 0, Music_BattleTowerTheme_branch_178a26
+ loopchannel 0, .mainloop
-Music_BattleTowerTheme_branch_178afe:
+.sub1:
octave 3
note C_, 2
note __, 2
@@ -585,8 +585,8 @@
Music_BattleTowerTheme_Ch4:
togglenoise $3
notetype $c
-Music_BattleTowerTheme_branch_178b11:
- callchannel Music_BattleTowerTheme_branch_178b58
+.mainloop:
+ callchannel .sub1
note D_, 2
note D_, 4
note D_, 1
@@ -596,20 +596,20 @@
note C#, 1
note D_, 1
note C#, 1
-Music_BattleTowerTheme_branch_178b1d:
- callchannel Music_BattleTowerTheme_branch_178b58
- callchannel Music_BattleTowerTheme_branch_178b61
- loopchannel 2, Music_BattleTowerTheme_branch_178b1d
- callchannel Music_BattleTowerTheme_branch_178b6c
- callchannel Music_BattleTowerTheme_branch_178b61
- callchannel Music_BattleTowerTheme_branch_178b6c
+.loop1:
+ callchannel .sub1
+ callchannel .sub2
+ loopchannel 2, .loop1
+ callchannel .sub3
+ callchannel .sub2
+ callchannel .sub3
note D_, 2
note D_, 4
note D_, 1
note D_, 1
note D_, 8
-Music_BattleTowerTheme_branch_178b35:
- callchannel Music_BattleTowerTheme_branch_178b76
+.loop2:
+ callchannel .sub4
note D_, 2
note D_, 2
note D_, 2
@@ -621,8 +621,8 @@
note C#, 1
note D_, 1
note C#, 1
- loopchannel 3, Music_BattleTowerTheme_branch_178b35
- callchannel Music_BattleTowerTheme_branch_178b76
+ loopchannel 3, .loop2
+ callchannel .sub4
note D_, 2
note D_, 2
note D_, 2
@@ -633,9 +633,9 @@
note C#, 1
note D_, 1
note C#, 1
- loopchannel 0, Music_BattleTowerTheme_branch_178b11
+ loopchannel 0, .mainloop
-Music_BattleTowerTheme_branch_178b58:
+.sub1:
note D_, 2
note D_, 4
note D_, 1
@@ -646,7 +646,7 @@
note D_, 1
endchannel
-Music_BattleTowerTheme_branch_178b61:
+.sub2:
note D_, 2
note D_, 4
note D_, 1
@@ -659,7 +659,7 @@
note C#, 1
endchannel
-Music_BattleTowerTheme_branch_178b6c:
+.sub3:
note D_, 2
note D_, 4
note D_, 1
@@ -671,7 +671,7 @@
note D_, 1
endchannel
-Music_BattleTowerTheme_branch_178b76:
+.sub4:
note D_, 2
note C#, 2
note D_, 2
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@@ -22,7 +22,7 @@
note A_, 8
intensity $b2
note F#, 2
-Music_Bicycle_branch_ee144:
+.mainloop:
stereopanning $f
intensity $b2
note G_, 2
@@ -167,7 +167,7 @@
note G_, 2
note G#, 2
note A_, 2
- loopchannel 0, Music_Bicycle_branch_ee144
+ loopchannel 0, .mainloop
Music_Bicycle_Ch2:
dutycycle $2
@@ -193,7 +193,7 @@
octave 3
note B_, 2
note A_, 2
-Music_Bicycle_branch_ee1fd:
+.mainloop:
stereopanning $ff
dutycycle $2
intensity $c3
@@ -253,7 +253,7 @@
intensity $c7
note F#, 8
stereopanning $f
- callchannel Music_Bicycle_branch_ee263
+ callchannel .sub1
note F#, 4
intensity $c3
note A_, 2
@@ -262,7 +262,7 @@
note F_, 2
note F#, 4
intensity $c7
- callchannel Music_Bicycle_branch_ee263
+ callchannel .sub1
note F#, 4
intensity $c3
note A_, 2
@@ -270,9 +270,9 @@
note A_, 2
note G_, 2
note F#, 4
- loopchannel 0, Music_Bicycle_branch_ee1fd
+ loopchannel 0, .mainloop
-Music_Bicycle_branch_ee263:
+.sub1:
note G_, 6
note B_, 6
note G_, 4
@@ -301,8 +301,8 @@
octave 3
note A_, 1
note __, 1
-Music_Bicycle_branch_ee27f:
- callchannel Music_Bicycle_branch_ee333
+.mainloop:
+ callchannel .sub1
note E_, 1
note __, 1
note G_, 1
@@ -353,7 +353,7 @@
note __, 1
note F#, 1
note __, 1
- callchannel Music_Bicycle_branch_ee333
+ callchannel .sub1
note E_, 1
note __, 1
note G_, 1
@@ -404,7 +404,7 @@
note __, 1
note A_, 1
note __, 1
-Music_Bicycle_branch_ee2e9:
+.loop1:
note G_, 1
note __, 1
note B_, 1
@@ -471,10 +471,10 @@
note __, 1
note A_, 1
note __, 1
- loopchannel 2, Music_Bicycle_branch_ee2e9
- loopchannel 0, Music_Bicycle_branch_ee27f
+ loopchannel 2, .loop1
+ loopchannel 0, .mainloop
-Music_Bicycle_branch_ee333:
+.sub1:
octave 3
note G_, 1
note __, 1
@@ -499,12 +499,12 @@
notetype $c
note __, 16
note __, 16
-Music_Bicycle_branch_ee34b:
+.mainloop:
note __, 2
-Music_Bicycle_branch_ee34c:
+.loop1:
stereopanning $f0
note F_, 4
- loopchannel 12, Music_Bicycle_branch_ee34c
+ loopchannel 12, .loop1
note F_, 4
note F_, 4
stereopanning $ff
@@ -511,4 +511,4 @@
note F_, 2
note F_, 2
note F_, 2
- loopchannel 0, Music_Bicycle_branch_ee34b
+ loopchannel 0, .mainloop
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@@ -10,7 +10,7 @@
tone $0001
notetype $c, $b3
note __, 8
-Music_BuenasPassword_branch_17816b:
+.mainloop:
stereopanning $ff
note __, 16
note __, 16
@@ -37,15 +37,15 @@
note G#, 2
note __, 12
dutycycle $2
- callchannel Music_BuenasPassword_branch_178204
+ callchannel .sub1
stereopanning $ff
- callchannel Music_BuenasPassword_branch_1782df
- callchannel Music_BuenasPassword_branch_178222
- callchannel Music_BuenasPassword_branch_178204
+ callchannel Music_BuenasPassword_Ch2.sub3
+ callchannel .sub2
+ callchannel .sub1
stereopanning $ff
- callchannel Music_BuenasPassword_branch_1782df
- callchannel Music_BuenasPassword_branch_178222
- callchannel Music_BuenasPassword_branch_178204
+ callchannel Music_BuenasPassword_Ch2.sub3
+ callchannel .sub2
+ callchannel .sub1
dutycycle $1
note C#, 2
note __, 2
@@ -136,9 +136,9 @@
note __, 1
note G_, 1
note __, 1
- loopchannel 0, Music_BuenasPassword_branch_17816b
+ loopchannel 0, .mainloop
-Music_BuenasPassword_branch_178204:
+.sub1:
stereopanning $f
notetype $6, $84
octave 4
@@ -161,7 +161,7 @@
notetype $c, $84
endchannel
-Music_BuenasPassword_branch_178222:
+.sub2:
octave 3
note D#, 1
note __, 1
@@ -185,25 +185,25 @@
note __, 7
octave 3
note F#, 1
-Music_BuenasPassword_branch_17823c:
+.mainloop:
stereopanning $ff
- callchannel Music_BuenasPassword_branch_1782df
- callchannel Music_BuenasPassword_branch_1782a4
+ callchannel .sub3
+ callchannel .sub1
stereopanning $ff
- callchannel Music_BuenasPassword_branch_1782cc
+ callchannel .sub2
octave 3
note B_, 2
note A#, 2
note B_, 2
note G#, 16
- callchannel Music_BuenasPassword_branch_1782a4
+ callchannel .sub1
stereopanning $ff
- callchannel Music_BuenasPassword_branch_1782cc
+ callchannel .sub2
note B_, 2
note A#, 2
note B_, 2
note G#, 16
- callchannel Music_BuenasPassword_branch_1782a4
+ callchannel .sub1
note F#, 2
note __, 2
note G#, 2
@@ -269,9 +269,9 @@
note G_, 1
note __, 1
intensity $a5
- loopchannel 0, Music_BuenasPassword_branch_17823c
+ loopchannel 0, .mainloop
-Music_BuenasPassword_branch_1782a4:
+.sub1:
octave 3
note G#, 1
note __, 1
@@ -304,7 +304,7 @@
notetype $c, $a5
endchannel
-Music_BuenasPassword_branch_1782cc:
+.sub2:
octave 4
note G#, 2
note __, 2
@@ -325,7 +325,7 @@
note __, 2
endchannel
-Music_BuenasPassword_branch_1782df:
+.sub3:
octave 3
note G#, 1
note __, 1
@@ -380,10 +380,11 @@
Music_BuenasPassword_Ch3:
notetype $c, $14
note __, 8
-Music_BuenasPassword_branch_178315:
- callchannel Music_BuenasPassword_branch_1783a7
- callchannel Music_BuenasPassword_branch_1783a7
- callchannel Music_BuenasPassword_branch_1783a7
+.mainloop:
+.loop1:
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
octave 2
note G#, 1
note __, 1
@@ -400,7 +401,7 @@
note B_, 1
note __, 1
note G#, 4
- loopchannel 3, Music_BuenasPassword_branch_178315
+ loopchannel 3, .loop1
note F#, 1
note __, 1
note A#, 1
@@ -472,7 +473,7 @@
note D#, 1
note __, 1
note G_, 2
- callchannel Music_BuenasPassword_branch_1783bc
+ callchannel .sub2
octave 3
note C#, 1
note __, 1
@@ -492,7 +493,7 @@
note __, 1
octave 3
note C#, 2
- callchannel Music_BuenasPassword_branch_1783bc
+ callchannel .sub2
note G#, 1
note __, 1
note G#, 1
@@ -510,9 +511,9 @@
note __, 1
note G_, 1
note __, 1
- loopchannel 0, Music_BuenasPassword_branch_178315
+ loopchannel 0, .mainloop
-Music_BuenasPassword_branch_1783a7:
+.sub1:
octave 2
note G#, 1
note __, 1
@@ -535,7 +536,7 @@
note C#, 1
endchannel
-Music_BuenasPassword_branch_1783bc:
+.sub2:
octave 2
note G#, 1
note __, 1
@@ -565,15 +566,16 @@
note D_, 2
note D_, 1
note D_, 1
-Music_BuenasPassword_branch_1783d9:
- callchannel Music_BuenasPassword_branch_17840c
- callchannel Music_BuenasPassword_branch_17840c
- callchannel Music_BuenasPassword_branch_17840c
- callchannel Music_BuenasPassword_branch_178424
- loopchannel 4, Music_BuenasPassword_branch_1783d9
- callchannel Music_BuenasPassword_branch_17840c
- callchannel Music_BuenasPassword_branch_17840c
- callchannel Music_BuenasPassword_branch_17840c
+.mainloop:
+.loop1:
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ loopchannel 4, .loop1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
stereopanning $ff
note D#, 2
stereopanning $f0
@@ -590,9 +592,9 @@
note D_, 2
note D_, 1
note D_, 1
- loopchannel 0, Music_BuenasPassword_branch_1783d9
+ loopchannel 0, .mainloop
-Music_BuenasPassword_branch_17840c:
+.sub1:
stereopanning $ff
note D#, 2
stereopanning $f0
@@ -611,7 +613,7 @@
note G_, 2
endchannel
-Music_BuenasPassword_branch_178424:
+.sub2:
stereopanning $ff
note D#, 2
stereopanning $f0
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@@ -37,17 +37,17 @@
note __, 1
note E_, 1
note E_, 1
-Music_BugCatchingContest_branch_f7c4b:
+.mainloop:
notetype $c, $b1
-Music_BugCatchingContest_branch_f7c4e:
+.loop1:
note __, 2
octave 2
note A_, 2
- loopchannel 4, Music_BugCatchingContest_branch_f7c4e
-Music_BugCatchingContest_branch_f7c55:
+ loopchannel 4, .loop1
+.loop2:
note __, 2
note B_, 2
- loopchannel 8, Music_BugCatchingContest_branch_f7c55
+ loopchannel 8, .loop2
intensity $b4
dutycycle $1
octave 3
@@ -60,11 +60,11 @@
note E_, 1
intensity $b1
dutycycle $2
-Music_BugCatchingContest_branch_f7c6b:
+.loop3:
note __, 2
octave 2
note A_, 2
- loopchannel 4, Music_BugCatchingContest_branch_f7c6b
+ loopchannel 4, .loop3
note __, 2
note B_, 2
note __, 2
@@ -90,11 +90,11 @@
note E_, 4
note __, 4
note E_, 4
-Music_BugCatchingContest_branch_f7c8e:
+.loop4:
note __, 4
octave 2
note A_, 4
- loopchannel 3, Music_BugCatchingContest_branch_f7c8e
+ loopchannel 3, .loop4
intensity $a7
octave 4
note F#, 4
@@ -185,7 +185,7 @@
note __, 2
note E_, 2
note E_, 2
- loopchannel 0, Music_BugCatchingContest_branch_f7c4b
+ loopchannel 0, .mainloop
Music_BugCatchingContest_Ch2:
stereopanning $f0
@@ -193,7 +193,7 @@
dutycycle $1
notetype $c, $c7
note __, 8
-Music_BugCatchingContest_branch_f7cff:
+.loop5:
octave 4
note A_, 1
note __, 1
@@ -201,10 +201,10 @@
note __, 1
note A_, 1
note A_, 1
- loopchannel 4, Music_BugCatchingContest_branch_f7cff
-Music_BugCatchingContest_branch_f7d0a:
+ loopchannel 4, .loop5
+.mainloop:
dutycycle $0
- callchannel Music_BugCatchingContest_branch_f7d8e
+ callchannel .sub1
octave 2
note E_, 2
octave 3
@@ -245,7 +245,7 @@
octave 3
note E_, 1
note __, 1
- callchannel Music_BugCatchingContest_branch_f7d8e
+ callchannel .sub1
octave 2
note E_, 2
octave 3
@@ -325,9 +325,9 @@
note A_, 1
note __, 3
note A_, 10
- loopchannel 0, Music_BugCatchingContest_branch_f7d0a
+ loopchannel 0, .mainloop
-Music_BugCatchingContest_branch_f7d8e:
+.sub1:
octave 2
note D_, 2
octave 3
@@ -401,7 +401,7 @@
note __, 1
note C#, 1
note C#, 1
-Music_BugCatchingContest_branch_f7dda:
+.mainloop:
notetype $c, $14
note F#, 5
note __, 1
@@ -582,7 +582,7 @@
note __, 2
note C#, 2
note C#, 2
- loopchannel 0, Music_BugCatchingContest_branch_f7dda
+ loopchannel 0, .mainloop
Music_BugCatchingContest_Ch4:
togglenoise $4
@@ -601,8 +601,9 @@
note C#, 1
note E_, 2
note E_, 2
- callchannel Music_BugCatchingContest_branch_f7ee2
-Music_BugCatchingContest_branch_f7eaf:
+ callchannel Music_BugCatchingContest_Ch4.sub1
+.mainloop:
+.loop1:
note D_, 4
note D_, 4
note D_, 2
@@ -631,7 +632,7 @@
note C#, 1
note C#, 1
note C#, 1
- loopchannel 5, Music_BugCatchingContest_branch_f7eaf
+ loopchannel 5, .loop1
note D_, 4
note D_, 4
note D_, 2
@@ -644,10 +645,10 @@
note D_, 2
note D_, 2
note D_, 2
- callchannel Music_BugCatchingContest_branch_f7ee2
- loopchannel 0, Music_BugCatchingContest_branch_f7eaf
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_BugCatchingContest_branch_f7ee2:
+.sub1:
note D_, 4
note B_, 8
note D_, 2
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -26,7 +26,7 @@
note D_, 2
intensity $80
note C#, 6
-Music_BurnedTower_branch_f6ac8:
+.loop1:
intensity $91
octave 2
note A_, 4
@@ -34,9 +34,9 @@
note A_, 2
intensity $80
note A#, 6
- loopchannel 2, Music_BurnedTower_branch_f6ac8
+ loopchannel 2, .loop1
tempo 150
-Music_BurnedTower_branch_f6ad8:
+.mainloop:
intensity $b1
octave 2
note A_, 4
@@ -86,7 +86,7 @@
note E_, 2
intensity $a0
note D#, 6
-Music_BurnedTower_branch_f6b17:
+.loop2:
intensity $b1
octave 2
note B_, 4
@@ -95,8 +95,8 @@
intensity $a0
octave 3
note C_, 6
- loopchannel 2, Music_BurnedTower_branch_f6b17
- loopchannel 0, Music_BurnedTower_branch_f6ad8
+ loopchannel 2, .loop2
+ loopchannel 0, .mainloop
Music_BurnedTower_Ch2:
dutycycle $2
@@ -103,10 +103,10 @@
vibrato $20, $82
tone $0002
notetype $c, $70
- callchannel Music_BurnedTower_branch_f6b8e
+ callchannel .sub1
intensity $c5
-Music_BurnedTower_branch_f6b39:
- callchannel Music_BurnedTower_branch_f6b8e
+.mainloop:
+ callchannel .sub1
intensity $c1
dutycycle $3
note __, 2
@@ -167,9 +167,9 @@
note E_, 4
intensity $b7
note F#, 16
- loopchannel 0, Music_BurnedTower_branch_f6b39
+ loopchannel 0, .mainloop
-Music_BurnedTower_branch_f6b8e:
+.sub1:
octave 3
note E_, 4
note D_, 2
@@ -200,7 +200,8 @@
note __, 12
octave 3
note D#, 4
-Music_BurnedTower_branch_f6bad:
+.mainloop:
+.loop1:
octave 2
note A_, 2
octave 3
@@ -219,8 +220,8 @@
note __, 2
note E_, 2
note D#, 4
- loopchannel 4, Music_BurnedTower_branch_f6bad
-Music_BurnedTower_branch_f6bc3:
+ loopchannel 4, .loop1
+.loop2:
octave 2
note B_, 2
octave 3
@@ -239,17 +240,17 @@
note __, 2
note F#, 2
note F_, 4
- loopchannel 2, Music_BurnedTower_branch_f6bc3
- loopchannel 0, Music_BurnedTower_branch_f6bad
+ loopchannel 2, .loop2
+ loopchannel 0, .mainloop
Music_BurnedTower_Ch4:
togglenoise $0
notetype $c
-Music_BurnedTower_branch_f6be1:
+.loop1:
note __, 16
- loopchannel 4, Music_BurnedTower_branch_f6be1
+ loopchannel 4, .loop1
note __, 2
-Music_BurnedTower_branch_f6be7:
+.mainloop:
stereopanning $f0
note G_, 2
note G#, 2
@@ -256,4 +257,4 @@
note G_, 4
note G#, 2
note G_, 4
- loopchannel 0, Music_BurnedTower_branch_f6be7
+ loopchannel 0, .mainloop
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
@@ -7,7 +7,7 @@
tempo 146
volume $77
tone $0001
-Music_CeladonCity_branch_f436c:
+.mainloop:
stereopanning $f
notetype $c, $a6
octave 3
@@ -18,8 +18,8 @@
note D_, 3
note E_, 2
note F#, 2
- callchannel Music_CeladonCity_branch_f43cc
-Music_CeladonCity_branch_f437d:
+ callchannel .sub1
+.loop1:
note D_, 2
note F#, 1
note A_, 1
@@ -27,7 +27,7 @@
note F#, 1
note A_, 1
note F#, 1
- loopchannel 3, Music_CeladonCity_branch_f437d
+ loopchannel 3, .loop1
note D_, 2
note G_, 1
note B_, 1
@@ -37,7 +37,7 @@
octave 3
note B_, 1
note G_, 1
- callchannel Music_CeladonCity_branch_f43cc
+ callchannel .sub1
note D_, 1
note C#, 1
note D_, 1
@@ -51,8 +51,8 @@
note F#, 2
note E_, 2
note F#, 16
- callchannel Music_CeladonCity_branch_f43e1
- callchannel Music_CeladonCity_branch_f43fe
+ callchannel .sub2
+ callchannel .sub3
octave 2
note B_, 2
note A#, 1
@@ -72,8 +72,8 @@
octave 3
note B_, 1
note A_, 1
- callchannel Music_CeladonCity_branch_f43e1
- callchannel Music_CeladonCity_branch_f43fe
+ callchannel .sub2
+ callchannel .sub3
note D_, 2
note C#, 1
note D_, 1
@@ -82,9 +82,10 @@
note A_, 1
note G_, 1
note A_, 8
- loopchannel 0, Music_CeladonCity_branch_f436c
+ loopchannel 0, .mainloop
-Music_CeladonCity_branch_f43cc:
+.sub1:
+.sub1loop1:
note D_, 2
note G_, 1
note B_, 1
@@ -92,7 +93,7 @@
note G_, 1
note B_, 1
note G_, 1
- loopchannel 3, Music_CeladonCity_branch_f43cc
+ loopchannel 3, .sub1loop1
note D_, 2
note F#, 1
note A_, 1
@@ -104,13 +105,14 @@
note A_, 1
endchannel
-Music_CeladonCity_branch_f43e1:
+.sub2:
+.sub2loop1
octave 2
note G_, 2
note B_, 1
octave 3
note D_, 1
- loopchannel 4, Music_CeladonCity_branch_f43e1
+ loopchannel 4, .sub2loop1
note C_, 2
octave 2
note B_, 1
@@ -132,11 +134,12 @@
note B_, 1
endchannel
-Music_CeladonCity_branch_f43fe:
+.sub3:
+.sub3loop1:
note D_, 2
note F#, 1
note A_, 1
- loopchannel 4, Music_CeladonCity_branch_f43fe
+ loopchannel 4, .sub3loop1
endchannel
Music_CeladonCity_Ch2:
@@ -154,8 +157,8 @@
note F#, 1
note G_, 1
note A_, 8
-Music_CeladonCity_branch_f441a:
- callchannel Music_CeladonCity_branch_f4463
+.mainloop:
+ callchannel .sub1
note A_, 4
note F#, 4
note A_, 2
@@ -168,7 +171,7 @@
note B_, 2
note G_, 4
note B_, 4
- callchannel Music_CeladonCity_branch_f4463
+ callchannel .sub1
intensity $c1
note A_, 2
note G_, 2
@@ -189,7 +192,7 @@
intensity $a2
octave 1
note F#, 2
- callchannel Music_CeladonCity_branch_f4474
+ callchannel .sub2
octave 1
note G_, 3
note B_, 1
@@ -199,7 +202,7 @@
octave 1
note A_, 6
note F#, 2
- callchannel Music_CeladonCity_branch_f4474
+ callchannel .sub2
octave 1
note A_, 3
octave 2
@@ -212,9 +215,9 @@
note A_, 1
octave 5
note D_, 16
- loopchannel 0, Music_CeladonCity_branch_f441a
+ loopchannel 0, .mainloop
-Music_CeladonCity_branch_f4463:
+.sub1:
intensity $b2
octave 4
note B_, 4
@@ -232,7 +235,7 @@
note A_, 8
endchannel
-Music_CeladonCity_branch_f4474:
+.sub2:
note G_, 3
note B_, 1
octave 2
@@ -266,7 +269,7 @@
Music_CeladonCity_Ch3:
vibrato $12, $24
-Music_CeladonCity_branch_f4495:
+.mainloop:
notetype $c, $25
octave 3
note A_, 2
@@ -274,14 +277,14 @@
note F#, 2
note __, 2
note D_, 8
- callchannel Music_CeladonCity_branch_f44fd
-Music_CeladonCity_branch_f44a1:
+ callchannel .sub1
+.loop1:
octave 2
note A_, 2
note __, 2
octave 3
note D_, 4
- loopchannel 3, Music_CeladonCity_branch_f44a1
+ loopchannel 3, .loop1
octave 2
note G_, 1
note __, 1
@@ -291,7 +294,7 @@
note D_, 3
octave 2
note F#, 1
- callchannel Music_CeladonCity_branch_f44fd
+ callchannel .sub1
note A_, 1
note __, 1
octave 3
@@ -314,7 +317,7 @@
note A_, 2
note __, 6
intensity $10
- callchannel Music_CeladonCity_branch_f4510
+ callchannel .sub2
octave 5
note E_, 2
note __, 2
@@ -335,7 +338,7 @@
note E_, 2
note D_, 4
note __, 4
- callchannel Music_CeladonCity_branch_f4510
+ callchannel .sub2
octave 5
note E_, 2
note __, 2
@@ -354,15 +357,16 @@
note E_, 2
note D_, 2
note __, 6
- loopchannel 0, Music_CeladonCity_branch_f4495
+ loopchannel 0, .mainloop
-Music_CeladonCity_branch_f44fd:
+.sub1:
+.sub1loop1:
octave 2
note G_, 2
note __, 2
octave 3
note D_, 4
- loopchannel 3, Music_CeladonCity_branch_f44fd
+ loopchannel 3, .sub1loop1
octave 2
note A_, 1
note __, 1
@@ -374,7 +378,7 @@
note G#, 1
endchannel
-Music_CeladonCity_branch_f4510:
+.sub2:
octave 5
note D_, 8
note C_, 2
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
@@ -17,22 +17,22 @@
note A#, 4
intensity $b7
note B_, 4
-Music_ChampionBattle_branch_ea9e2:
- callchannel Music_ChampionBattle_branch_eaaee
+.loop1:
+ callchannel .sub1
octave 3
note D#, 4
- loopchannel 2, Music_ChampionBattle_branch_ea9e2
- callchannel Music_ChampionBattle_branch_eaaee
+ loopchannel 2, .loop1
+ callchannel .sub1
octave 3
note E_, 4
-Music_ChampionBattle_branch_ea9f0:
- callchannel Music_ChampionBattle_branch_eaafc
- loopchannel 3, Music_ChampionBattle_branch_ea9f0
- callchannel Music_ChampionBattle_branch_eab06
-Music_ChampionBattle_branch_ea9fa:
- callchannel Music_ChampionBattle_branch_eaafc
- loopchannel 7, Music_ChampionBattle_branch_ea9fa
- callchannel Music_ChampionBattle_branch_eab06
+.loop2:
+ callchannel .sub2
+ loopchannel 3, .loop2
+ callchannel .sub3
+.loop3:
+ callchannel .sub2
+ loopchannel 7, .loop3
+ callchannel .sub3
intensity $b2
note A#, 2
note A#, 2
@@ -72,25 +72,25 @@
octave 4
note C_, 1
note C#, 1
-Music_ChampionBattle_branch_eaa35:
- callchannel Music_ChampionBattle_branch_eab0f
+.mainloop:
+ callchannel .sub4
note E_, 2
note E_, 2
intensity $b7
note F#, 4
-Music_ChampionBattle_branch_eaa3d:
+.loop4:
intensity $b2
note E_, 2
note E_, 2
intensity $b7
note G#, 4
- loopchannel 2, Music_ChampionBattle_branch_eaa3d
+ loopchannel 2, .loop4
intensity $b2
note E_, 2
note E_, 2
intensity $b7
note B_, 4
- callchannel Music_ChampionBattle_branch_eab0f
+ callchannel .sub4
note E_, 2
note E_, 2
intensity $b7
@@ -111,10 +111,10 @@
intensity $b7
octave 4
note E_, 4
- callchannel Music_ChampionBattle_branch_eab24
+ callchannel .sub5
note B_, 4
note G#, 4
- callchannel Music_ChampionBattle_branch_eab24
+ callchannel .sub5
octave 4
note D_, 4
note D_, 4
@@ -166,7 +166,7 @@
intensity $90
note D#, 16
note C#, 16
-Music_ChampionBattle_branch_eaab1:
+.loop5:
intensity $b2
octave 2
note A#, 2
@@ -174,14 +174,14 @@
intensity $b7
octave 3
note D#, 4
- loopchannel 4, Music_ChampionBattle_branch_eaab1
-Music_ChampionBattle_branch_eaabe:
+ loopchannel 4, .loop5
+.loop6:
intensity $b2
note C_, 2
note C_, 2
intensity $b7
note D#, 4
- loopchannel 2, Music_ChampionBattle_branch_eaabe
+ loopchannel 2, .loop6
intensity $b2
note C_, 2
note C_, 2
@@ -192,13 +192,13 @@
note C_, 2
intensity $b7
note G#, 4
- callchannel Music_ChampionBattle_branch_eab31
+ callchannel .sub6
octave 3
note D#, 2
note D#, 2
intensity $b7
note B_, 4
- callchannel Music_ChampionBattle_branch_eab31
+ callchannel .sub6
octave 3
note D#, 2
note D#, 2
@@ -205,9 +205,9 @@
intensity $b7
octave 4
note D_, 4
- loopchannel 0, Music_ChampionBattle_branch_eaa35
+ loopchannel 0, .mainloop
-Music_ChampionBattle_branch_eaaee:
+.sub1:
intensity $b2
octave 2
note A#, 2
@@ -221,7 +221,7 @@
intensity $b7
endchannel
-Music_ChampionBattle_branch_eaafc:
+.sub2:
intensity $b2
octave 2
note A#, 2
@@ -231,7 +231,7 @@
note D#, 4
endchannel
-Music_ChampionBattle_branch_eab06:
+.sub3:
intensity $b2
octave 2
note A#, 2
@@ -240,7 +240,7 @@
note B_, 4
endchannel
-Music_ChampionBattle_branch_eab0f:
+.sub4:
intensity $b5
octave 3
note D#, 2
@@ -261,7 +261,7 @@
intensity $b2
endchannel
-Music_ChampionBattle_branch_eab24:
+.sub5:
intensity $b2
octave 3
note A#, 2
@@ -274,7 +274,7 @@
intensity $b7
endchannel
-Music_ChampionBattle_branch_eab31:
+.sub6:
intensity $b2
note D#, 2
note D#, 2
@@ -306,18 +306,18 @@
note D#, 4
intensity $c7
note D_, 4
- callchannel Music_ChampionBattle_branch_eac4f
+ callchannel .sub1
note A#, 4
- callchannel Music_ChampionBattle_branch_eac4f
+ callchannel .sub1
note B_, 4
- callchannel Music_ChampionBattle_branch_eac4f
+ callchannel .sub1
octave 4
note C#, 4
- callchannel Music_ChampionBattle_branch_eac5c
+ callchannel .sub2
note D_, 4
- callchannel Music_ChampionBattle_branch_eac5c
+ callchannel .sub2
note F_, 4
- callchannel Music_ChampionBattle_branch_eac5c
+ callchannel .sub2
note D_, 4
intensity $c2
note D#, 2
@@ -349,7 +349,7 @@
note E_, 8
intensity $3c
note E_, 8
-Music_ChampionBattle_branch_eab9d:
+.mainloop:
intensity $c5
note D#, 6
octave 3
@@ -397,10 +397,10 @@
note G#, 8
note E_, 8
note B_, 8
- callchannel Music_ChampionBattle_branch_eac79
+ callchannel .sub3
note E_, 4
note E_, 4
- callchannel Music_ChampionBattle_branch_eac79
+ callchannel .sub3
note F#, 4
note F#, 4
intensity $c7
@@ -417,7 +417,7 @@
note F_, 16
note F#, 16
intensity $c4
-Music_ChampionBattle_branch_eabef:
+.loop1:
octave 5
note D#, 4
note D_, 4
@@ -430,7 +430,7 @@
octave 4
note B_, 4
note B_, 4
- loopchannel 2, Music_ChampionBattle_branch_eabef
+ loopchannel 2, .loop1
intensity $b0
octave 3
note D#, 16
@@ -489,9 +489,9 @@
note E_, 8
note F#, 8
note G#, 8
- loopchannel 0, Music_ChampionBattle_branch_eab9d
+ loopchannel 0, .mainloop
-Music_ChampionBattle_branch_eac4f:
+.sub1:
intensity $c2
note D#, 2
note D#, 6
@@ -504,7 +504,7 @@
intensity $c7
endchannel
-Music_ChampionBattle_branch_eac5c:
+.sub2:
intensity $c2
octave 3
note D#, 2
@@ -527,7 +527,7 @@
intensity $c7
endchannel
-Music_ChampionBattle_branch_eac79:
+.sub3:
intensity $c1
note D#, 2
note D#, 4
@@ -541,22 +541,22 @@
Music_ChampionBattle_Ch3:
notetype $c, $14
-Music_ChampionBattle_branch_eac88:
+.loop1:
octave 3
note D#, 1
note __, 7
- loopchannel 3, Music_ChampionBattle_branch_eac88
+ loopchannel 3, .loop1
note D#, 1
note __, 3
note E_, 4
- callchannel Music_ChampionBattle_branch_ead61
- callchannel Music_ChampionBattle_branch_ead61
- callchannel Music_ChampionBattle_branch_ead61
- callchannel Music_ChampionBattle_branch_ead6f
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
note D_, 4
- callchannel Music_ChampionBattle_branch_ead6f
+ callchannel .sub2
note A_, 4
- callchannel Music_ChampionBattle_branch_ead6f
+ callchannel .sub2
note D_, 4
note D#, 1
note __, 1
@@ -589,14 +589,15 @@
note A#, 2
note F_, 2
note A_, 2
-Music_ChampionBattle_branch_eacc6:
+.mainloop:
+.loop2:
note D#, 2
note A#, 2
- loopchannel 8, Music_ChampionBattle_branch_eacc6
-Music_ChampionBattle_branch_eaccc:
+ loopchannel 8, .loop2
+.loop3:
note E_, 2
note B_, 2
- loopchannel 5, Music_ChampionBattle_branch_eaccc
+ loopchannel 5, .loop3
note E_, 2
octave 4
note C_, 2
@@ -605,15 +606,15 @@
note B_, 2
note G_, 2
note A_, 2
-Music_ChampionBattle_branch_eacda:
+.loop4:
note D#, 2
note A#, 2
- loopchannel 8, Music_ChampionBattle_branch_eacda
-Music_ChampionBattle_branch_eace0:
+ loopchannel 8, .loop4
+.loop5:
note E_, 2
note B_, 2
- loopchannel 8, Music_ChampionBattle_branch_eace0
- callchannel Music_ChampionBattle_branch_ead83
+ loopchannel 8, .loop5
+ callchannel .sub3
octave 3
note D#, 2
note E_, 2
@@ -624,7 +625,7 @@
note D_, 2
note C#, 2
note C_, 2
- callchannel Music_ChampionBattle_branch_ead83
+ callchannel .sub3
octave 3
note D#, 2
note A#, 2
@@ -640,11 +641,11 @@
note D#, 8
note B_, 8
note D#, 8
-Music_ChampionBattle_branch_ead05:
+.loop6:
note D#, 2
note F#, 2
- loopchannel 16, Music_ChampionBattle_branch_ead05
- callchannel Music_ChampionBattle_branch_ead8e
+ loopchannel 16, .loop6
+ callchannel .sub4
octave 3
note E_, 2
note B_, 2
@@ -657,16 +658,16 @@
octave 4
note D#, 2
note E_, 2
- callchannel Music_ChampionBattle_branch_ead8e
-Music_ChampionBattle_branch_ead1d:
+ callchannel .sub4
+.loop7:
octave 3
note E_, 2
note B_, 2
- loopchannel 4, Music_ChampionBattle_branch_ead1d
-Music_ChampionBattle_branch_ead24:
+ loopchannel 4, .loop7
+.loop8:
note D#, 2
note A#, 2
- loopchannel 5, Music_ChampionBattle_branch_ead24
+ loopchannel 5, .loop8
note B_, 2
octave 4
note D#, 2
@@ -675,10 +676,10 @@
note __, 2
note D#, 2
note __, 2
-Music_ChampionBattle_branch_ead32:
+.loop9:
note E_, 2
note B_, 2
- loopchannel 5, Music_ChampionBattle_branch_ead32
+ loopchannel 5, .loop9
octave 4
note C#, 2
note E_, 2
@@ -687,17 +688,17 @@
note __, 2
note E_, 2
note __, 2
-Music_ChampionBattle_branch_ead40:
+.loop10:
note D#, 2
note G#, 2
- loopchannel 8, Music_ChampionBattle_branch_ead40
-Music_ChampionBattle_branch_ead46:
+ loopchannel 8, .loop10
+.loop11:
note D#, 2
note A#, 2
- loopchannel 7, Music_ChampionBattle_branch_ead46
+ loopchannel 7, .loop11
note B_, 2
note A#, 2
-Music_ChampionBattle_branch_ead4e:
+.loop12:
octave 3
note D#, 2
note A#, 2
@@ -704,20 +705,21 @@
octave 4
note D_, 2
note D#, 2
- loopchannel 7, Music_ChampionBattle_branch_ead4e
+ loopchannel 7, .loop12
note C#, 2
octave 3
note B_, 2
note A#, 2
note G#, 2
- loopchannel 0, Music_ChampionBattle_branch_eacc6
+ loopchannel 0, .mainloop
-Music_ChampionBattle_branch_ead61:
+.sub1:
+.sub1loop1:
note D#, 1
note __, 1
note D#, 1
note __, 5
- loopchannel 3, Music_ChampionBattle_branch_ead61
+ loopchannel 3, .sub1loop1
note D#, 1
note __, 1
note D#, 1
@@ -725,7 +727,7 @@
note B_, 4
endchannel
-Music_ChampionBattle_branch_ead6f:
+.sub2:
note D#, 1
note __, 1
note D#, 1
@@ -747,7 +749,7 @@
note __, 1
endchannel
-Music_ChampionBattle_branch_ead83:
+.sub3:
octave 3
note D#, 2
note F#, 2
@@ -760,7 +762,7 @@
note C_, 2
endchannel
-Music_ChampionBattle_branch_ead8e:
+.sub4:
octave 3
note E_, 2
note B_, 2
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@@ -17,7 +17,7 @@
note C_, 2
note D_, 2
note E_, 2
-Music_CherrygroveCity_branch_f5b26:
+.mainloop:
note A_, 4
note G#, 2
note A_, 2
@@ -90,7 +90,7 @@
note A_, 4
octave 3
note C_, 4
- loopchannel 0, Music_CherrygroveCity_branch_f5b26
+ loopchannel 0, .mainloop
Music_CherrygroveCity_Ch2:
dutycycle $3
@@ -106,7 +106,7 @@
note G_, 2
note A_, 2
note A#, 2
-Music_CherrygroveCity_branch_f5b87:
+.mainloop:
intensity $c6
octave 4
note C_, 6
@@ -170,7 +170,7 @@
note F_, 8
intensity $a7
note F_, 8
- loopchannel 0, Music_CherrygroveCity_branch_f5b87
+ loopchannel 0, .mainloop
Music_CherrygroveCity_Ch3:
notetype $c, $16
@@ -183,7 +183,7 @@
note G_, 2
note F_, 2
note E_, 2
-Music_CherrygroveCity_branch_f5be4:
+.mainloop:
note A_, 2
note F_, 2
note A_, 2
@@ -280,13 +280,13 @@
note A_, 2
note F_, 2
note A_, 2
- loopchannel 0, Music_CherrygroveCity_branch_f5be4
+ loopchannel 0, .mainloop
Music_CherrygroveCity_Ch4:
togglenoise $3
notetype $c
note __, 16
-Music_CherrygroveCity_branch_f5c4d:
+.mainloop:
note C#, 2
note __, 2
note G_, 2
@@ -302,4 +302,4 @@
note F#, 4
note C#, 2
note G_, 2
- loopchannel 0, Music_CherrygroveCity_branch_f5c4d
+ loopchannel 0, .mainloop
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@@ -12,7 +12,7 @@
stereopanning $f
notetype $c, $93
dutycycle $3
-Music_Clair_branch_1faab:
+.loop1:
octave 4
note F_, 1
note F#, 1
@@ -20,7 +20,7 @@
note __, 1
note C#, 1
note __, 1
- loopchannel 2, Music_Clair_branch_1faab
+ loopchannel 2, .loop1
octave 3
note B_, 1
note __, 1
@@ -36,9 +36,9 @@
note D#, 4
note F_, 4
note G_, 4
-Music_Clair_branch_1fac9:
+.mainloop:
intensity $93
- callchannel Music_Clair_branch_1fb12
+ callchannel .sub1
octave 2
note B_, 1
octave 3
@@ -52,7 +52,7 @@
octave 2
note A#, 1
note G_, 1
- callchannel Music_Clair_branch_1fb12
+ callchannel .sub1
note D#, 1
note C#, 1
note D#, 2
@@ -64,7 +64,7 @@
note A#, 1
octave 5
note D#, 1
- callchannel Music_Clair_branch_1fb2e
+ callchannel .sub2
dutycycle $3
note G#, 3
note F_, 2
@@ -78,7 +78,7 @@
note A#, 1
octave 5
note D#, 1
- callchannel Music_Clair_branch_1fb2e
+ callchannel .sub2
dutycycle $3
note D#, 3
note C#, 2
@@ -93,9 +93,9 @@
note B_, 1
octave 4
note D#, 1
- loopchannel 0, Music_Clair_branch_1fac9
+ loopchannel 0, .mainloop
-Music_Clair_branch_1fb12:
+.sub1:
dutycycle $3
stereopanning $ff
octave 3
@@ -121,7 +121,7 @@
note __, 1
endchannel
-Music_Clair_branch_1fb2e:
+.sub2:
octave 4
note F#, 1
note D#, 1
@@ -146,7 +146,7 @@
dutycycle $3
vibrato $12, $34
notetype $6, $b7
-Music_Clair_branch_1fb49:
+.loop1:
octave 3
note A#, 2
note B_, 2
@@ -154,7 +154,7 @@
note __, 2
note G#, 2
note __, 2
- loopchannel 2, Music_Clair_branch_1fb49
+ loopchannel 2, .loop1
note F_, 2
note __, 2
note C#, 2
@@ -185,8 +185,8 @@
note G_, 2
note A#, 2
intensity $b7
-Music_Clair_branch_1fb77:
- callchannel Music_Clair_branch_1fba6
+.mainloop:
+ callchannel .sub1
note F#, 2
note __, 4
note D#, 12
@@ -204,7 +204,7 @@
note A#, 16
note __, 4
pitchoffset 0, CC
- callchannel Music_Clair_branch_1fba6
+ callchannel .sub1
pitchoffset 0, C_
octave 5
note F#, 2
@@ -223,9 +223,9 @@
note __, 2
note G#, 16
note __, 4
- loopchannel 0, Music_Clair_branch_1fb77
+ loopchannel 0, .mainloop
-Music_Clair_branch_1fba6:
+.sub1:
octave 4
note F#, 2
note __, 4
@@ -268,8 +268,8 @@
note A#, 4
note G#, 4
note G_, 4
-Music_Clair_branch_1fbd1:
- callchannel Music_Clair_branch_1fc3c
+.mainloop:
+ callchannel .sub1
octave 2
note C#, 2
note __, 1
@@ -280,7 +280,7 @@
note D#, 2
note A#, 2
note D#, 2
- callchannel Music_Clair_branch_1fc3c
+ callchannel .sub1
octave 2
note G#, 2
note __, 1
@@ -368,9 +368,9 @@
note G#, 1
octave 1
note G#, 1
- loopchannel 0, Music_Clair_branch_1fbd1
+ loopchannel 0, .mainloop
-Music_Clair_branch_1fc3c:
+.sub1:
octave 1
note G#, 2
note __, 1
@@ -403,16 +403,16 @@
note D_, 2
note D_, 1
note D_, 1
-Music_Clair_branch_1fc5e:
+.mainloop:
stereopanning $ff
- callchannel Music_Clair_branch_1fc6e
+ callchannel .sub1
note G_, 1
stereopanning $ff
- callchannel Music_Clair_branch_1fc6e
+ callchannel .sub1
note F#, 1
- loopchannel 0, Music_Clair_branch_1fc5e
+ loopchannel 0, .mainloop
-Music_Clair_branch_1fc6e:
+.sub1:
note D#, 2
stereopanning $f0
note G_, 2
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@@ -8,7 +8,7 @@
tempo 144
volume $77
notetype $c, $51
-Music_ContestResults_branch_efb52:
+.mainloop:
note __, 2
octave 2
note G_, 1
@@ -46,11 +46,11 @@
note __, 3
note G_, 1
note __, 1
- loopchannel 0, Music_ContestResults_branch_efb52
+ loopchannel 0, .mainloop
Music_ContestResults_Ch2:
notetype $c, $61
-Music_ContestResults_branch_efb7e:
+.mainloop:
octave 2
note C_, 2
octave 3
@@ -91,7 +91,7 @@
octave 3
note F_, 1
note __, 1
-Music_ContestResults_branch_efba6:
+.loop1:
octave 2
note D_, 2
octave 3
@@ -102,7 +102,7 @@
octave 3
note F_, 1
note __, 1
- loopchannel 2, Music_ContestResults_branch_efba6
+ loopchannel 2, .loop1
octave 2
note G_, 2
octave 3
@@ -123,12 +123,12 @@
octave 3
note D_, 1
note __, 1
- loopchannel 0, Music_ContestResults_branch_efb7e
+ loopchannel 0, .mainloop
Music_ContestResults_Ch3:
vibrato $8, $24
notetype $c, $23
-Music_ContestResults_branch_efbd2:
+.mainloop:
octave 4
note E_, 5
note __, 1
@@ -148,12 +148,12 @@
note B_, 4
note A_, 8
note G_, 8
- loopchannel 0, Music_ContestResults_branch_efbd2
+ loopchannel 0, .mainloop
Music_ContestResults_Ch4:
togglenoise $4
notetype $6
-Music_ContestResults_branch_efbed:
+.mainloop:
note C#, 4
note C#, 4
note C#, 2
@@ -170,4 +170,4 @@
note G_, 1
note G_, 1
note G_, 1
- loopchannel 0, Music_ContestResults_branch_efbed
+ loopchannel 0, .mainloop
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -21,7 +21,7 @@
octave 4
note C_, 7
note D_, 8
- callchannel Music_Credits_branch_1f483
+ callchannel .sub1
note __, 4
octave 3
note B_, 2
@@ -52,10 +52,10 @@
octave 3
note __, 1
intensity $a7
- callchannel Music_Credits_branch_1f483
- callchannel Music_Credits_branch_1f4ed
+ callchannel .sub1
+ callchannel .sub2
intensity $97
- callchannel Music_Credits_branch_1f4f8
+ callchannel .sub3
octave 3
note B_, 2
octave 4
@@ -117,8 +117,8 @@
note C_, 2
octave 3
note B_, 2
- callchannel Music_Credits_branch_1f4f8
- callchannel Music_Credits_branch_1f559
+ callchannel .sub3
+ callchannel .sub4
note B_, 1
octave 4
note C_, 7
@@ -142,10 +142,10 @@
octave 3
note __, 1
pitchoffset 0, D_
- callchannel Music_Credits_branch_1f483
- callchannel Music_Credits_branch_1f4ed
- callchannel Music_Credits_branch_1f4f8
- callchannel Music_Credits_branch_1f559
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub3
+ callchannel .sub4
pitchoffset 0, C_
octave 3
note A_, 12
@@ -153,7 +153,7 @@
note D_, 1
note D_, 1
note D_, 1
- callchannel Music_Credits_branch_1f582
+ callchannel .sub5
octave 3
note B_, 6
note A_, 6
@@ -164,7 +164,7 @@
note A_, 6
octave 4
note C#, 6
- callchannel Music_Credits_branch_1f582
+ callchannel .sub5
tempo 143
octave 4
note D_, 6
@@ -180,12 +180,12 @@
octave 5
note C#, 6
notetype $c, $a7
-Music_Credits_branch_1f407:
+.loop1:
octave 3
note A_, 1
octave 4
note D_, 1
- loopchannel 6, Music_Credits_branch_1f407
+ loopchannel 6, .loop1
notetype $8, $a7
note G_, 1
note __, 1
@@ -280,7 +280,7 @@
note __, 16
endchannel
-Music_Credits_branch_1f483:
+.sub1:
note C_, 16
note F#, 1
note G_, 3
@@ -388,7 +388,7 @@
note __, 1
endchannel
-Music_Credits_branch_1f4ed:
+.sub2:
octave 4
note C_, 4
octave 3
@@ -401,7 +401,7 @@
note D#, 4
endchannel
-Music_Credits_branch_1f4f8:
+.sub3:
octave 3
note A_, 2
octave 4
@@ -500,7 +500,7 @@
note F_, 2
endchannel
-Music_Credits_branch_1f559:
+.sub4:
octave 3
note A_, 2
octave 4
@@ -543,7 +543,7 @@
note A_, 2
endchannel
-Music_Credits_branch_1f582:
+.sub5:
note __, 6
octave 3
note D_, 6
@@ -570,7 +570,7 @@
note G_, 4
note F_, 4
notetype $6, $c7
- callchannel Music_Credits_branch_1f6cb
+ callchannel .sub1
octave 1
note G_, 2
note __, 2
@@ -596,9 +596,9 @@
note D_, 1
note C#, 1
intensity $c7
- callchannel Music_Credits_branch_1f6cb
- callchannel Music_Credits_branch_1f73f
- callchannel Music_Credits_branch_1f748
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub3
octave 4
note B_, 1
octave 5
@@ -626,7 +626,7 @@
octave 4
note A_, 2
note E_, 2
- callchannel Music_Credits_branch_1f748
+ callchannel .sub3
octave 4
note B_, 1
octave 5
@@ -658,9 +658,9 @@
note G_, 4
notetype $6, $c7
pitchoffset 0, D_
- callchannel Music_Credits_branch_1f6cb
- callchannel Music_Credits_branch_1f73f
- callchannel Music_Credits_branch_1f748
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub3
pitchoffset 0, C_
octave 5
note C#, 1
@@ -716,13 +716,13 @@
octave 2
note F#, 1
note __, 1
-Music_Credits_branch_1f657:
+.loop1:
octave 1
note G_, 2
octave 2
note G_, 1
note __, 1
- loopchannel 4, Music_Credits_branch_1f657
+ loopchannel 4, .loop1
octave 1
note A_, 1
octave 2
@@ -812,7 +812,7 @@
note __, 16
endchannel
-Music_Credits_branch_1f6cb:
+.sub1:
octave 2
note C_, 4
intensity $b1
@@ -924,7 +924,7 @@
note C_, 2
endchannel
-Music_Credits_branch_1f73f:
+.sub2:
octave 1
note G_, 4
note __, 4
@@ -935,7 +935,7 @@
note F#, 8
endchannel
-Music_Credits_branch_1f748:
+.sub3:
octave 4
note A_, 8
note B_, 8
@@ -1017,7 +1017,7 @@
note D#, 1
note E_, 7
note F_, 8
- callchannel Music_Credits_branch_1f8aa
+ callchannel .sub1
octave 4
note G_, 1
note __, 1
@@ -1037,10 +1037,10 @@
note E_, 4
note __, 4
note F_, 4
- callchannel Music_Credits_branch_1f8aa
- callchannel Music_Credits_branch_1f8db
- callchannel Music_Credits_branch_1f8e7
- callchannel Music_Credits_branch_1f934
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub3
+ callchannel .sub4
octave 2
note G_, 4
note __, 2
@@ -1106,9 +1106,9 @@
note F#, 4
octave 3
note E_, 4
- callchannel Music_Credits_branch_1f8e7
- callchannel Music_Credits_branch_1f934
- callchannel Music_Credits_branch_1f94b
+ callchannel .sub3
+ callchannel .sub4
+ callchannel .sub5
octave 5
note D#, 1
note E_, 7
@@ -1129,13 +1129,13 @@
note F#, 7
note G_, 8
pitchoffset 0, D_
- callchannel Music_Credits_branch_1f8aa
- callchannel Music_Credits_branch_1f8db
+ callchannel .sub1
+ callchannel .sub2
pitchoffset 1, D_
- callchannel Music_Credits_branch_1f8e7
+ callchannel .sub3
pitchoffset 0, D_
- callchannel Music_Credits_branch_1f934
- callchannel Music_Credits_branch_1f94b
+ callchannel .sub4
+ callchannel .sub5
pitchoffset 0, C_
octave 6
note C#, 2
@@ -1228,7 +1228,7 @@
note __, 16
endchannel
-Music_Credits_branch_1f8aa:
+.sub1:
note G_, 16
octave 6
note C#, 1
@@ -1269,7 +1269,7 @@
note D_, 16
endchannel
-Music_Credits_branch_1f8db:
+.sub2:
notetype $6, $14
note F#, 1
note G_, 3
@@ -1281,7 +1281,7 @@
note G#, 8
endchannel
-Music_Credits_branch_1f8e7:
+.sub3:
octave 3
note F_, 4
note __, 2
@@ -1360,7 +1360,7 @@
note G#, 2
endchannel
-Music_Credits_branch_1f934:
+.sub4:
octave 2
note F_, 4
note __, 2
@@ -1385,7 +1385,7 @@
note F_, 2
endchannel
-Music_Credits_branch_1f94b:
+.sub5:
octave 2
note F#, 4
note __, 2
@@ -1455,15 +1455,15 @@
note G_, 1
note A#, 4
note A#, 4
- callchannel Music_Credits_branch_1fa4d
- callchannel Music_Credits_branch_1fa4d
- callchannel Music_Credits_branch_1fa4d
- callchannel Music_Credits_branch_1fa6d
- callchannel Music_Credits_branch_1fa4d
- callchannel Music_Credits_branch_1fa4d
- callchannel Music_Credits_branch_1fa4d
- callchannel Music_Credits_branch_1fa6d
-Music_Credits_branch_1f9a8:
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+.loop1:
note A#, 2
note G_, 1
note G_, 1
@@ -1475,7 +1475,7 @@
note G_, 1
note D_, 2
note F#, 2
- loopchannel 7, Music_Credits_branch_1f9a8
+ loopchannel 7, .loop1
note G#, 1
note G_, 1
note D_, 1
@@ -1491,7 +1491,7 @@
note C#, 1
note D_, 1
note D_, 1
-Music_Credits_branch_1f9c6:
+.loop2:
note A#, 2
note G_, 1
note G_, 1
@@ -1503,7 +1503,7 @@
note G_, 1
note D_, 2
note F#, 2
- loopchannel 7, Music_Credits_branch_1f9c6
+ loopchannel 7, .loop2
note G#, 1
note G_, 1
note F#, 2
@@ -1521,11 +1521,11 @@
note B_, 2
note A#, 4
note A#, 4
- callchannel Music_Credits_branch_1fa4d
- callchannel Music_Credits_branch_1fa4d
- callchannel Music_Credits_branch_1fa4d
- callchannel Music_Credits_branch_1fa6d
-Music_Credits_branch_1f9f2:
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+.loop3:
note A#, 2
note G_, 1
note G_, 1
@@ -1537,7 +1537,7 @@
note G_, 1
note D_, 2
note F#, 2
- loopchannel 7, Music_Credits_branch_1f9f2
+ loopchannel 7, .loop3
note G#, 1
note G_, 1
note F#, 2
@@ -1605,7 +1605,7 @@
note __, 16
endchannel
-Music_Credits_branch_1fa4d:
+.sub1:
note G#, 1
note G_, 1
note G_, 1
@@ -1639,7 +1639,7 @@
note F#, 2
endchannel
-Music_Credits_branch_1fa6d:
+.sub2:
note G#, 1
note G_, 1
note G_, 1
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -3,7 +3,7 @@
musicheader 1, 2, Music_DancingHall_Ch2
musicheader 1, 3, Music_DancingHall_Ch3
- db $3
+ db $3 ; unused
Music_DancingHall_Ch1:
tempo 208
@@ -12,11 +12,11 @@
notetype $6, $b7
note __, 3
dutycycle $0
-Music_DancingHall_branch_ef9d3:
+.mainloop:
notetype $c, $b7
- callchannel Music_DancingHall_branch_efa17
+ callchannel .sub1
note __, 16
- callchannel Music_DancingHall_branch_efa17
+ callchannel .sub1
note __, 16
note __, 16
note __, 16
@@ -62,9 +62,9 @@
note A_, 1
note __, 1
note F_, 2
- loopchannel 0, Music_DancingHall_branch_ef9d3
+ loopchannel 0, .mainloop
-Music_DancingHall_branch_efa17:
+.sub1:
octave 3
note B_, 1
note __, 1
@@ -93,10 +93,10 @@
dutycycle $0
vibrato $10, $24
note __, 3
-Music_DancingHall_branch_efa37:
+.mainloop:
notetype $6, $a2
- callchannel Music_DancingHall_branch_efa7a
- callchannel Music_DancingHall_branch_efa7a
+ callchannel .sub1
+ callchannel .sub1
intensity $a7
octave 2
note D_, 16
@@ -140,9 +140,9 @@
note E_, 1
note __, 1
note D_, 2
- loopchannel 0, Music_DancingHall_branch_efa37
+ loopchannel 0, .mainloop
-Music_DancingHall_branch_efa7a:
+.sub1:
intensity $a1
octave 4
note E_, 4
@@ -228,7 +228,7 @@
note B_, 1
octave 6
note D_, 1
-Music_DancingHall_branch_efae3:
+.mainloop:
note E_, 13
note D_, 1
note E_, 1
@@ -302,4 +302,4 @@
note B_, 1
octave 6
note D_, 1
- loopchannel 0, Music_DancingHall_branch_efae3
+ loopchannel 0, .mainloop
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@@ -12,9 +12,9 @@
vibrato $11, $15
stereopanning $f0
notetype $c, $a7
-Music_DarkCave_branch_ea2dc:
+loop1:
note __, 16
- loopchannel 4, Music_DarkCave_branch_ea2dc
+ loopchannel 4, loop1
octave 3
note D#, 16
note D_, 16
@@ -21,9 +21,10 @@
note C#, 16
note C_, 16
intensity $a3
-Music_DarkCave_branch_ea2e8:
- callchannel Music_DarkCave_branch_ea333
- loopchannel 3, Music_DarkCave_branch_ea2e8
+.mainloop:
+.loop2:
+ callchannel .sub1
+ loopchannel 3, .loop2
intensity $b7
note G#, 8
note D#, 8
@@ -42,9 +43,9 @@
note D#, 8
note C_, 8
intensity $a3
-Music_DarkCave_branch_ea303:
- callchannel Music_DarkCave_branch_ea333
- loopchannel 2, Music_DarkCave_branch_ea303
+.loop3:
+ callchannel .sub1
+ loopchannel 2, .loop3
note __, 16
note __, 8
intensity $b7
@@ -73,12 +74,12 @@
note G_, 2
note G#, 4
intensity $a3
-Music_DarkCave_branch_ea328:
- callchannel Music_DarkCave_branch_ea333
- loopchannel 2, Music_DarkCave_branch_ea328
- loopchannel 0, Music_DarkCave_branch_ea2e8
+.loop4:
+ callchannel .sub1
+ loopchannel 2, .loop4
+ loopchannel 0, .mainloop
-Music_DarkCave_branch_ea333:
+.sub1:
octave 4
note D#, 2
octave 3
@@ -140,17 +141,18 @@
vibrato $12, $36
stereopanning $f
notetype $c, $a7
-Music_DarkCave_branch_ea374:
+.loop1:
note __, 16
- loopchannel 4, Music_DarkCave_branch_ea374
+ loopchannel 4, .loop1
octave 3
note G_, 16
note A#, 16
note F_, 16
note G_, 16
-Music_DarkCave_branch_ea37e:
+.mainloop:
+.loop2:
note __, 16
- loopchannel 4, Music_DarkCave_branch_ea37e
+ loopchannel 4, .loop2
note __, 8
stereopanning $ff
intensity $c7
@@ -343,17 +345,18 @@
note D_, 16
note F_, 16
note D#, 16
- loopchannel 0, Music_DarkCave_branch_ea37e
+ loopchannel 0, .mainloop
Music_DarkCave_Ch3:
notetype $c, $27
-Music_DarkCave_branch_ea471:
- callchannel Music_DarkCave_branch_ea4ce
- loopchannel 2, Music_DarkCave_branch_ea471
-Music_DarkCave_branch_ea478:
- callchannel Music_DarkCave_branch_ea4ce
- loopchannel 7, Music_DarkCave_branch_ea478
- callchannel Music_DarkCave_branch_ea4c3
+.loop1:
+ callchannel .sub3
+ loopchannel 2, .loop1
+.mainloop:
+.loop2:
+ callchannel .sub3
+ loopchannel 7, .loop2
+ callchannel .sub2
octave 3
note C_, 4
note G_, 2
@@ -364,7 +367,7 @@
note __, 2
octave 2
note A#, 12
- callchannel Music_DarkCave_branch_ea4c3
+ callchannel .sub2
octave 3
note C_, 4
note G_, 2
@@ -379,11 +382,11 @@
note C#, 2
note C_, 2
note C#, 4
- callchannel Music_DarkCave_branch_ea4a7
- callchannel Music_DarkCave_branch_ea4a7
- loopchannel 0, Music_DarkCave_branch_ea478
+ callchannel .sub1
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_DarkCave_branch_ea4a7:
+.sub1:
octave 3
note C_, 4
note G_, 2
@@ -413,7 +416,7 @@
note C#, 4
endchannel
-Music_DarkCave_branch_ea4c3:
+.sub2:
octave 3
note C_, 4
note G_, 2
@@ -426,7 +429,7 @@
note A#, 12
endchannel
-Music_DarkCave_branch_ea4ce:
+.sub3:
octave 2
note C_, 4
note G_, 2
@@ -459,7 +462,7 @@
Music_DarkCave_Ch4:
togglenoise $3
notetype $c
-Music_DarkCave_branch_ea4ee:
+.mainloop:
stereopanning $ff
note D#, 8
note D#, 8
@@ -480,4 +483,4 @@
stereopanning $f0
note C#, 2
note C#, 2
- loopchannel 0, Music_DarkCave_branch_ea4ee
+ loopchannel 0, .mainloop
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -11,21 +11,21 @@
tone $0004
stereopanning $f0
notetype $c, $80
-Music_DragonsDen_branch_eed03:
- callchannel Music_DragonsDen_branch_eed1e
+.mainloop:
+ callchannel .sub1
note __, 16
- callchannel Music_DragonsDen_branch_eed2d
+ callchannel .sub2
note __, 2
- callchannel Music_DragonsDen_branch_eed2d
+ callchannel .sub2
note __, 2
- callchannel Music_DragonsDen_branch_eed2d
+ callchannel .sub2
note __, 2
- callchannel Music_DragonsDen_branch_eed2d
+ callchannel .sub2
note __, 10
notetype $c, $b7
- loopchannel 0, Music_DragonsDen_branch_eed03
+ loopchannel 0, .mainloop
-Music_DragonsDen_branch_eed1e:
+.sub1:
octave 3
note A#, 12
note A_, 4
@@ -42,7 +42,7 @@
note G#, 16
endchannel
-Music_DragonsDen_branch_eed2d:
+.sub2:
intensity $b1
note __, 2
octave 4
@@ -63,18 +63,18 @@
tone $0004
stereopanning $f
notetype $c, $90
-Music_DragonsDen_branch_eed46:
- callchannel Music_DragonsDen_branch_eed5e
+.mainloop:
+ callchannel .sub1
note __, 16
- callchannel Music_DragonsDen_branch_eed6b
- callchannel Music_DragonsDen_branch_eed6b
- callchannel Music_DragonsDen_branch_eed6b
- callchannel Music_DragonsDen_branch_eed6b
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
note __, 16
notetype $c, $c7
- loopchannel 0, Music_DragonsDen_branch_eed46
+ loopchannel 0, .mainloop
-Music_DragonsDen_branch_eed5e:
+.sub1:
octave 4
note D#, 12
note D_, 4
@@ -89,9 +89,9 @@
note C#, 16
endchannel
-Music_DragonsDen_branch_eed6b:
+.sub2:
intensity $c1
-Music_DragonsDen_branch_eed6d:
+.sub2loop1:
octave 5
note C#, 4
octave 4
@@ -98,11 +98,12 @@
note G#, 4
note G#, 4
note G#, 4
- loopchannel 2, Music_DragonsDen_branch_eed6d
+ loopchannel 2, .sub2loop1
endchannel
Music_DragonsDen_Ch3:
-Music_DragonsDen_branch_eed78:
+.mainloop:
+.loop1:
notetype $c, $14
octave 4
note C#, 2
@@ -126,10 +127,10 @@
note G#, 1
octave 4
note C#, 1
- loopchannel 15, Music_DragonsDen_branch_eed78
+ loopchannel 15, .loop1
note __, 16
notetype $6, $27
-Music_DragonsDen_branch_eed99:
+.loop2:
octave 3
note C#, 4
octave 2
@@ -152,8 +153,8 @@
note G#, 2
octave 3
note C#, 2
- loopchannel 16, Music_DragonsDen_branch_eed99
- loopchannel 0, Music_DragonsDen_branch_eed78
+ loopchannel 16, .loop2
+ loopchannel 0, .mainloop
Music_DragonsDen_Ch4:
togglenoise $0
@@ -160,7 +161,7 @@
notetype $c
note __, 16
note __, 16
-Music_DragonsDen_branch_eedbd:
+.mainloop:
stereopanning $f0
note F_, 4
stereopanning $f
@@ -168,4 +169,4 @@
note F#, 4
stereopanning $f0
note F#, 4
- loopchannel 0, Music_DragonsDen_branch_eedbd
+ loopchannel 0, .mainloop
--- a/audio/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
@@ -9,7 +9,7 @@
stereopanning $f
vibrato $12, $25
dutycycle $2
-Music_EcruteakCity_branch_ef2e5:
+.mainloop:
notetype $c, $57
note __, 10
octave 4
@@ -72,7 +72,7 @@
note G_, 4
note __, 8
intensity $52
- callchannel Music_EcruteakCity_branch_ef37f
+ callchannel .sub1
note D_, 2
octave 4
note B_, 2
@@ -94,7 +94,7 @@
note B_, 2
note A_, 2
note B_, 2
- callchannel Music_EcruteakCity_branch_ef391
+ callchannel .sub2
intensity $52
note A#, 2
note G_, 2
@@ -115,7 +115,7 @@
note G_, 2
note E_, 2
note C#, 2
- callchannel Music_EcruteakCity_branch_ef37f
+ callchannel .sub1
note D_, 2
note C_, 2
octave 4
@@ -142,10 +142,10 @@
note G#, 2
octave 5
note C_, 2
- callchannel Music_EcruteakCity_branch_ef391
- loopchannel 0, Music_EcruteakCity_branch_ef2e5
+ callchannel .sub2
+ loopchannel 0, .mainloop
-Music_EcruteakCity_branch_ef37f:
+.sub1:
octave 5
note E_, 2
note C_, 2
@@ -159,10 +159,10 @@
note C_, 2
note E_, 2
note C_, 2
- loopchannel 2, Music_EcruteakCity_branch_ef37f
+ loopchannel 2, .sub1
endchannel
-Music_EcruteakCity_branch_ef391:
+.sub2:
octave 5
note D_, 2
octave 4
@@ -208,7 +208,7 @@
note C_, 2
octave 3
note A_, 2
-Music_EcruteakCity_branch_ef3be:
+.sub2loop1:
octave 4
note F_, 2
note A_, 2
@@ -223,8 +223,8 @@
octave 5
note C_, 2
note F_, 2
- loopchannel 2, Music_EcruteakCity_branch_ef3be
-Music_EcruteakCity_branch_ef3d0:
+ loopchannel 2, .sub2loop1
+.sub2loop2:
octave 4
note G_, 2
note B_, 2
@@ -239,7 +239,7 @@
octave 5
note D_, 2
note G_, 2
- loopchannel 2, Music_EcruteakCity_branch_ef3d0
+ loopchannel 2, .sub2loop2
intensity $50
dutycycle $0
note E_, 16
@@ -251,7 +251,7 @@
vibrato $12, $25
dutycycle $3
stereopanning $f0
-Music_EcruteakCity_branch_ef3f2:
+.mainloop:
notetype $6, $67
note __, 16
note __, 5
@@ -467,11 +467,11 @@
note C_, 2
note D_, 2
note E_, 16
- loopchannel 0, Music_EcruteakCity_branch_ef3f2
+ loopchannel 0, .mainloop
Music_EcruteakCity_Ch3:
stereopanning $ff
-Music_EcruteakCity_branch_ef4e3:
+.mainloop:
vibrato $12, $25
notetype $c, $25
octave 3
@@ -574,7 +574,7 @@
note B_, 2
octave 4
note D_, 2
- callchannel Music_EcruteakCity_branch_ef569
+ callchannel .sub1
octave 4
note C_, 8
note E_, 8
@@ -585,7 +585,7 @@
note E_, 8
note C#, 8
notetype $c, $25
- callchannel Music_EcruteakCity_branch_ef569
+ callchannel .sub1
octave 4
note C_, 8
octave 3
@@ -592,9 +592,9 @@
note G_, 8
note E_, 8
note D_, 8
- loopchannel 0, Music_EcruteakCity_branch_ef4e3
+ loopchannel 0, .mainloop
-Music_EcruteakCity_branch_ef569:
+.sub1:
octave 3
note F_, 4
note __, 2
--- a/audio/music/elmslab.asm
+++ b/audio/music/elmslab.asm
@@ -33,7 +33,7 @@
note A_, 4
note A_, 4
note A_, 2
-Music_ElmsLab_branch_ea075:
+.mainloop:
note __, 2
note A_, 2
note G#, 2
@@ -180,7 +180,7 @@
intensity $b2
note F_, 2
note F_, 4
- loopchannel 0, Music_ElmsLab_branch_ea075
+ loopchannel 0, .mainloop
Music_ElmsLab_Ch2:
dutycycle $3
@@ -212,7 +212,7 @@
note C_, 4
note C_, 2
stereopanning $ff
-Music_ElmsLab_branch_ea14f:
+.mainloop:
intensity $c6
octave 4
note F_, 6
@@ -347,7 +347,7 @@
intensity $c4
octave 3
note E_, 2
- loopchannel 0, Music_ElmsLab_branch_ea14f
+ loopchannel 0, .mainloop
Music_ElmsLab_Ch3:
stereopanning $f
@@ -372,7 +372,7 @@
note C_, 2
note D_, 2
note E_, 2
-Music_ElmsLab_branch_ea216:
+.mainloop:
note F_, 2
note A_, 2
note C_, 2
@@ -524,7 +524,7 @@
note C_, 2
note F_, 2
note A_, 2
- loopchannel 0, Music_ElmsLab_branch_ea216
+ loopchannel 0, .mainloop
Music_ElmsLab_Ch4:
stereopanning $f0
@@ -532,6 +532,6 @@
notetype $c
note __, 16
note __, 2
-Music_ElmsLab_branch_ea2b9:
+.mainloop:
note G_, 4
- loopchannel 0, Music_ElmsLab_branch_ea2b9
+ loopchannel 0, .mainloop
--- a/audio/music/evolution.asm
+++ b/audio/music/evolution.asm
@@ -23,23 +23,24 @@
note __, 4
dutycycle $3
stereopanning $f
-Music_Evolution_branch_f0713:
- callchannel Music_Evolution_branch_f0737
+.mainloop:
+.loop1:
+ callchannel .sub1
notetype $c, $a4
note F#, 4
- callchannel Music_Evolution_branch_f0737
+ callchannel .sub1
notetype $c, $a4
note F#, 4
- loopchannel 2, Music_Evolution_branch_f0713
- callchannel Music_Evolution_branch_f0743
+ loopchannel 2, .loop1
+ callchannel .sub2
notetype $c, $a4
note G#, 4
- callchannel Music_Evolution_branch_f0743
+ callchannel .sub2
notetype $c, $a4
note G#, 4
- loopchannel 0, Music_Evolution_branch_f0713
+ loopchannel 0, .mainloop
-Music_Evolution_branch_f0737:
+.sub1:
notetype $c, $a2
octave 3
note C_, 4
@@ -51,7 +52,7 @@
note C_, 4
endchannel
-Music_Evolution_branch_f0743:
+.sub2:
notetype $c, $a2
octave 3
note D_, 4
@@ -75,25 +76,26 @@
note __, 4
dutycycle $3
stereopanning $f0
-Music_Evolution_branch_f0761:
- callchannel Music_Evolution_branch_f0787
+.mainloop:
+.loop1:
+ callchannel .sub1
notetype $c, $b5
note A_, 4
- callchannel Music_Evolution_branch_f0787
+ callchannel .sub1
notetype $c, $b5
note B_, 4
- loopchannel 2, Music_Evolution_branch_f0761
- callchannel Music_Evolution_branch_f0793
+ loopchannel 2, .loop1
+ callchannel .sub2
notetype $c, $b5
note B_, 4
- callchannel Music_Evolution_branch_f0793
+ callchannel .sub2
notetype $c, $b5
octave 4
note C#, 4
octave 3
- loopchannel 0, Music_Evolution_branch_f0761
+ loopchannel 0, .mainloop
-Music_Evolution_branch_f0787:
+.sub1:
notetype $c, $b2
octave 3
note G_, 4
@@ -105,7 +107,7 @@
note G_, 4
endchannel
-Music_Evolution_branch_f0793:
+.sub2:
notetype $c, $b2
octave 3
note A_, 4
@@ -120,23 +122,24 @@
Music_Evolution_Ch3:
notetype $c, $16
note __, 8
-Music_Evolution_branch_f07a3:
- callchannel Music_Evolution_branch_f07bf
+.mainloop:
+.loop1:
+ callchannel .sub1
octave 3
note A_, 4
- callchannel Music_Evolution_branch_f07bf
+ callchannel .sub1
octave 3
note B_, 4
- loopchannel 2, Music_Evolution_branch_f07a3
- callchannel Music_Evolution_branch_f07d5
+ loopchannel 2, .loop1
+ callchannel .sub2
octave 3
note B_, 4
- callchannel Music_Evolution_branch_f07d5
+ callchannel .sub2
octave 4
note C#, 4
- loopchannel 0, Music_Evolution_branch_f07a3
+ loopchannel 0, .mainloop
-Music_Evolution_branch_f07bf:
+.sub1:
octave 2
note A_, 2
note __, 2
@@ -160,7 +163,7 @@
note __, 2
endchannel
-Music_Evolution_branch_f07d5:
+.sub2:
octave 2
note B_, 2
note __, 2
@@ -188,7 +191,7 @@
togglenoise $5
notetype $c
note __, 8
-Music_Evolution_branch_f07f0:
+.mainloop:
stereopanning $f0
note A#, 6
note A#, 4
@@ -196,4 +199,4 @@
note E_, 2
note E_, 2
note E_, 2
- loopchannel 0, Music_Evolution_branch_f07f0
+ loopchannel 0, .mainloop
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -10,25 +10,25 @@
stereopanning $f
notetype $c, $91
note __, 8
-Music_GameCorner_branch_edd84:
+.mainloop:
intensity $91
note __, 16
note __, 16
note __, 16
note __, 16
- callchannel Music_GameCorner_branch_ede03
- callchannel Music_GameCorner_branch_ede03
- callchannel Music_GameCorner_branch_ede03
- callchannel Music_GameCorner_branch_ede13
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
- callchannel Music_GameCorner_branch_ede03
- callchannel Music_GameCorner_branch_ede03
- callchannel Music_GameCorner_branch_ede03
- callchannel Music_GameCorner_branch_ede13
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
octave 3
note __, 2
note G#, 3
@@ -38,7 +38,7 @@
note G#, 2
note G_, 2
intensity $71
-Music_GameCorner_branch_eddb1:
+.loop1:
octave 4
note G#, 1
octave 5
@@ -45,8 +45,8 @@
note C_, 1
note F_, 1
note C_, 1
- loopchannel 4, Music_GameCorner_branch_eddb1
-Music_GameCorner_branch_eddbb:
+ loopchannel 4, .loop1
+.loop2:
octave 4
note A#, 1
octave 5
@@ -53,8 +53,8 @@
note D_, 1
note G_, 1
note D_, 1
- loopchannel 4, Music_GameCorner_branch_eddbb
-Music_GameCorner_branch_eddc5:
+ loopchannel 4, .loop2
+.loop3:
octave 4
note D#, 1
note G_, 1
@@ -62,8 +62,8 @@
note C_, 1
octave 4
note G_, 1
- loopchannel 4, Music_GameCorner_branch_eddc5
-Music_GameCorner_branch_eddd0:
+ loopchannel 4, .loop3
+.loop4:
octave 4
note F_, 1
note A_, 1
@@ -71,8 +71,8 @@
note C_, 1
octave 4
note A_, 1
- loopchannel 4, Music_GameCorner_branch_eddd0
-Music_GameCorner_branch_edddb:
+ loopchannel 4, .loop4
+.loop5:
octave 4
note G#, 1
octave 5
@@ -79,8 +79,8 @@
note C_, 1
note F_, 1
note C_, 1
- loopchannel 4, Music_GameCorner_branch_edddb
-Music_GameCorner_branch_edde5:
+ loopchannel 4, .loop5
+.loop6:
octave 4
note A#, 1
octave 5
@@ -87,8 +87,8 @@
note D_, 1
note G_, 1
note D_, 1
- loopchannel 4, Music_GameCorner_branch_edde5
-Music_GameCorner_branch_eddef:
+ loopchannel 4, .loop6
+.loop7:
octave 4
note B_, 1
octave 5
@@ -95,7 +95,7 @@
note D_, 1
note G_, 1
note D_, 1
- loopchannel 4, Music_GameCorner_branch_eddef
+ loopchannel 4, .loop7
octave 3
note D_, 1
note D_, 1
@@ -102,9 +102,9 @@
note D_, 3
note F_, 2
note F_, 9
- loopchannel 0, Music_GameCorner_branch_edd84
+ loopchannel 0, .mainloop
-Music_GameCorner_branch_ede03:
+.sub1:
note __, 2
octave 4
note A#, 3
@@ -122,7 +122,7 @@
note A#, 3
endchannel
-Music_GameCorner_branch_ede13:
+.sub2:
note __, 2
octave 4
note A#, 3
@@ -138,10 +138,10 @@
vibrato $8, $24
notetype $c, $a1
note __, 8
-Music_GameCorner_branch_ede25:
+.mainloop:
intensity $92
dutycycle $1
- callchannel Music_GameCorner_branch_ede75
+ callchannel .sub1
octave 1
note F_, 2
octave 3
@@ -157,7 +157,7 @@
note A#, 1
octave 4
note C_, 3
- callchannel Music_GameCorner_branch_ede75
+ callchannel .sub1
octave 4
note F_, 2
note D#, 2
@@ -202,9 +202,9 @@
note A#, 2
note A#, 9
intensity $a4
- loopchannel 0, Music_GameCorner_branch_ede25
+ loopchannel 0, .mainloop
-Music_GameCorner_branch_ede75:
+.sub1:
octave 1
note C_, 2
octave 3
@@ -319,28 +319,28 @@
vibrato $8, $22
notetype $c, $14
note __, 8
-Music_GameCorner_branch_edeef:
+.mainloop:
stereopanning $ff
notetype $c, $14
- callchannel Music_GameCorner_branch_edfdd
- callchannel Music_GameCorner_branch_edff8
+ callchannel .sub1
+ callchannel .sub2
octave 4
note G_, 1
note A_, 3
- callchannel Music_GameCorner_branch_edfdd
- callchannel Music_GameCorner_branch_edff8
+ callchannel .sub1
+ callchannel .sub2
octave 4
note A#, 1
octave 5
note C_, 3
stereopanning $f0
- callchannel Music_GameCorner_branch_edfdd
- callchannel Music_GameCorner_branch_ee00c
- callchannel Music_GameCorner_branch_edfdd
- callchannel Music_GameCorner_branch_ee024
- callchannel Music_GameCorner_branch_edfdd
- callchannel Music_GameCorner_branch_ee00c
- callchannel Music_GameCorner_branch_edfdd
+ callchannel .sub1
+ callchannel .sub3
+ callchannel .sub1
+ callchannel .sub4
+ callchannel .sub1
+ callchannel .sub3
+ callchannel .sub1
stereopanning $ff
octave 2
note F_, 1
@@ -363,25 +363,25 @@
note D#, 1
note F_, 1
note __, 2
- callchannel Music_GameCorner_branch_edfdd
- callchannel Music_GameCorner_branch_edff8
+ callchannel .sub1
+ callchannel .sub2
octave 4
note G_, 1
note A_, 3
- callchannel Music_GameCorner_branch_edfdd
- callchannel Music_GameCorner_branch_edff8
+ callchannel .sub1
+ callchannel .sub2
octave 4
note A#, 1
octave 5
note C_, 3
stereopanning $f0
- callchannel Music_GameCorner_branch_edfdd
- callchannel Music_GameCorner_branch_ee00c
- callchannel Music_GameCorner_branch_edfdd
- callchannel Music_GameCorner_branch_ee024
- callchannel Music_GameCorner_branch_edfdd
- callchannel Music_GameCorner_branch_ee00c
- callchannel Music_GameCorner_branch_edfdd
+ callchannel .sub1
+ callchannel .sub3
+ callchannel .sub1
+ callchannel .sub4
+ callchannel .sub1
+ callchannel .sub3
+ callchannel .sub1
octave 2
note F_, 1
octave 3
@@ -409,7 +409,7 @@
note A#, 1
note __, 1
intensity $15
- callchannel Music_GameCorner_branch_ee03f
+ callchannel .sub5
octave 2
note C_, 2
note __, 1
@@ -454,7 +454,7 @@
note __, 1
octave 3
note F_, 1
- callchannel Music_GameCorner_branch_ee03f
+ callchannel .sub5
octave 2
note G_, 2
note __, 1
@@ -497,9 +497,9 @@
note F_, 1
note E_, 1
note D_, 1
- loopchannel 0, Music_GameCorner_branch_edeef
+ loopchannel 0, .mainloop
-Music_GameCorner_branch_edfdd:
+.sub1:
octave 2
note C_, 1
octave 3
@@ -528,7 +528,7 @@
note A_, 2
endchannel
-Music_GameCorner_branch_edff8:
+.sub2:
octave 2
note C_, 1
octave 3
@@ -550,7 +550,7 @@
note __, 1
endchannel
-Music_GameCorner_branch_ee00c:
+.sub3:
octave 2
note F_, 1
octave 3
@@ -576,7 +576,7 @@
note D_, 3
endchannel
-Music_GameCorner_branch_ee024:
+.sub4:
octave 2
note F_, 1
octave 3
@@ -605,7 +605,7 @@
note __, 1
endchannel
-Music_GameCorner_branch_ee03f:
+.sub5:
octave 2
note F_, 2
note __, 1
@@ -668,9 +668,9 @@
note D_, 2
note D_, 1
note D_, 1
-Music_GameCorner_branch_ee07f:
- callchannel Music_GameCorner_branch_ee106
-Music_GameCorner_branch_ee082:
+.mainloop:
+ callchannel .sub1
+.loop1:
note A#, 2
note F#, 2
note D_, 2
@@ -679,9 +679,9 @@
note F#, 2
note D_, 2
note F#, 2
- loopchannel 6, Music_GameCorner_branch_ee082
- callchannel Music_GameCorner_branch_ee10f
-Music_GameCorner_branch_ee091:
+ loopchannel 6, .loop1
+ callchannel .sub2
+.loop2:
note A#, 2
note F#, 2
note D_, 2
@@ -690,13 +690,13 @@
note F#, 2
note D_, 2
note F#, 2
- loopchannel 3, Music_GameCorner_branch_ee091
+ loopchannel 3, .loop2
note __, 12
note D_, 1
note D_, 1
note F#, 2
- callchannel Music_GameCorner_branch_ee106
-Music_GameCorner_branch_ee0a4:
+ callchannel .sub1
+.loop3:
note A#, 2
note F#, 2
note D_, 2
@@ -705,9 +705,9 @@
note F#, 2
note D_, 2
note F#, 2
- loopchannel 6, Music_GameCorner_branch_ee0a4
- callchannel Music_GameCorner_branch_ee10f
-Music_GameCorner_branch_ee0b3:
+ loopchannel 6, .loop3
+ callchannel .sub2
+.loop4:
note A#, 2
note F#, 2
note D_, 2
@@ -716,7 +716,7 @@
note F#, 2
note D_, 2
note F#, 2
- loopchannel 3, Music_GameCorner_branch_ee0b3
+ loopchannel 3, .loop4
note A#, 2
note F#, 2
note D_, 2
@@ -727,7 +727,7 @@
note D_, 1
note D_, 1
note D_, 1
-Music_GameCorner_branch_ee0c9:
+.loop5:
note A#, 2
note F#, 1
note D#, 1
@@ -741,7 +741,7 @@
note D#, 1
note D_, 2
note F#, 2
- loopchannel 3, Music_GameCorner_branch_ee0c9
+ loopchannel 3, .loop5
note A#, 2
note F#, 1
note D#, 1
@@ -756,7 +756,7 @@
note D_, 2
note D_, 1
note D_, 1
-Music_GameCorner_branch_ee0e8:
+.loop6:
note A#, 2
note F#, 1
note D#, 1
@@ -770,7 +770,7 @@
note D#, 1
note D_, 2
note F#, 2
- loopchannel 3, Music_GameCorner_branch_ee0e8
+ loopchannel 3, .loop6
note D_, 1
note D_, 1
note D_, 2
@@ -780,9 +780,9 @@
note D_, 1
note D_, 1
note D#, 2
- loopchannel 0, Music_GameCorner_branch_ee07f
+ loopchannel 0, .mainloop
-Music_GameCorner_branch_ee106:
+.sub1:
note C_, 2
note F#, 2
note D_, 2
@@ -793,7 +793,7 @@
note F#, 2
endchannel
-Music_GameCorner_branch_ee10f:
+.sub2:
note A#, 2
note F#, 2
note D_, 2
--- a/audio/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
@@ -13,9 +13,9 @@
note __, 16
note __, 16
note __, 16
-Music_GoldenrodCity_branch_eb46d:
+.mainloop:
dutycycle $0
- callchannel Music_GoldenrodCity_branch_eb4a9
+ callchannel .sub1
octave 3
note G#, 1
octave 4
@@ -29,7 +29,7 @@
note C_, 1
intensity $71
dutycycle $0
- callchannel Music_GoldenrodCity_branch_eb4d1
+ callchannel .sub2
intensity $77
note D#, 2
note F_, 2
@@ -36,7 +36,7 @@
note F#, 2
note G#, 4
intensity $71
- callchannel Music_GoldenrodCity_branch_eb4d1
+ callchannel .sub2
note D#, 1
note F#, 1
intensity $77
@@ -48,15 +48,15 @@
note D#, 2
dutycycle $2
intensity $97
- callchannel Music_GoldenrodCity_branch_eb4a9
+ callchannel .sub1
note C_, 4
octave 3
note G#, 2
octave 4
note C_, 2
- loopchannel 0, Music_GoldenrodCity_branch_eb46d
+ loopchannel 0, .mainloop
-Music_GoldenrodCity_branch_eb4a9:
+.sub1:
octave 4
note C#, 2
octave 3
@@ -98,7 +98,7 @@
note C#, 2
endchannel
-Music_GoldenrodCity_branch_eb4d1:
+.sub2:
octave 4
note F_, 1
note C#, 1
@@ -177,9 +177,9 @@
vibrato $12, $23
dutycycle $2
notetype $c, $97
-Music_GoldenrodCity_branch_eb523:
+.mainloop:
intensity $97
- callchannel Music_GoldenrodCity_branch_eb555
+ callchannel .sub1
octave 4
note F_, 2
note F#, 2
@@ -186,7 +186,7 @@
note G#, 2
note F_, 2
note D#, 8
- callchannel Music_GoldenrodCity_branch_eb555
+ callchannel .sub1
note G#, 2
note A#, 2
octave 5
@@ -195,7 +195,7 @@
note D#, 8
dutycycle $2
intensity $77
- callchannel Music_GoldenrodCity_branch_eb572
+ callchannel .sub2
octave 4
note G#, 2
note A#, 2
@@ -204,7 +204,7 @@
note C_, 4
dutycycle $3
intensity $77
- callchannel Music_GoldenrodCity_branch_eb572
+ callchannel .sub2
note F_, 2
note D#, 2
note C#, 2
@@ -211,9 +211,9 @@
note C_, 2
octave 4
note G#, 2
- loopchannel 0, Music_GoldenrodCity_branch_eb523
+ loopchannel 0, .mainloop
-Music_GoldenrodCity_branch_eb555:
+.sub1:
octave 4
note F_, 4
note C#, 4
@@ -243,7 +243,7 @@
dutycycle $1
endchannel
-Music_GoldenrodCity_branch_eb572:
+.sub2:
note C#, 6
note F_, 6
note C#, 4
@@ -267,10 +267,10 @@
stereopanning $ff
vibrato $8, $23
notetype $c, $25
-Music_GoldenrodCity_branch_eb58c:
- callchannel Music_GoldenrodCity_branch_eb5aa
- callchannel Music_GoldenrodCity_branch_eb5aa
- callchannel Music_GoldenrodCity_branch_eb5d2
+.mainloop:
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
note __, 3
octave 3
note C_, 1
@@ -278,7 +278,7 @@
note G_, 1
note G#, 1
note D#, 2
- callchannel Music_GoldenrodCity_branch_eb5d2
+ callchannel .sub2
note __, 1
octave 3
note G#, 2
@@ -286,9 +286,9 @@
note D#, 2
octave 2
note G#, 2
- loopchannel 0, Music_GoldenrodCity_branch_eb58c
+ loopchannel 0, .mainloop
-Music_GoldenrodCity_branch_eb5aa:
+.sub1:
octave 3
note C#, 4
note __, 2
@@ -330,7 +330,7 @@
note __, 1
endchannel
-Music_GoldenrodCity_branch_eb5d2:
+.sub2:
note C#, 1
note __, 1
octave 4
@@ -396,7 +396,8 @@
note D_, 1
note D_, 1
note F#, 2
-Music_GoldenrodCity_branch_eb613:
+.mainloop:
+.loop1:
note D#, 2
note F#, 2
note D_, 2
@@ -405,39 +406,39 @@
note F#, 2
note D_, 2
note F#, 2
- loopchannel 3, Music_GoldenrodCity_branch_eb613
- callchannel Music_GoldenrodCity_branch_eb663
- callchannel Music_GoldenrodCity_branch_eb66d
+ loopchannel 3, .loop1
+ callchannel .sub1
+ callchannel .sub2
note G_, 1
note G_, 1
note F#, 2
- callchannel Music_GoldenrodCity_branch_eb66d
+ callchannel .sub2
note D_, 2
note F#, 2
- callchannel Music_GoldenrodCity_branch_eb66d
+ callchannel .sub2
note D_, 1
note D_, 1
note F#, 2
- callchannel Music_GoldenrodCity_branch_eb66d
+ callchannel .sub2
note D_, 2
note D_, 1
note D_, 1
- callchannel Music_GoldenrodCity_branch_eb66d
+ callchannel .sub2
note G_, 1
note G_, 1
note F#, 2
- callchannel Music_GoldenrodCity_branch_eb66d
+ callchannel .sub2
note D_, 2
note F#, 2
- callchannel Music_GoldenrodCity_branch_eb66d
+ callchannel .sub2
note D_, 1
note D_, 1
note F#, 2
- callchannel Music_GoldenrodCity_branch_eb66d
+ callchannel .sub2
note D_, 2
note D_, 1
note D_, 1
-Music_GoldenrodCity_branch_eb650:
+.loop2:
note D#, 2
note F#, 2
note D_, 2
@@ -446,11 +447,11 @@
note F#, 2
note D_, 2
note F#, 2
- loopchannel 3, Music_GoldenrodCity_branch_eb650
- callchannel Music_GoldenrodCity_branch_eb663
- loopchannel 0, Music_GoldenrodCity_branch_eb613
+ loopchannel 3, .loop2
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_GoldenrodCity_branch_eb663:
+.sub1:
note D#, 2
note F#, 2
note D_, 2
@@ -462,7 +463,7 @@
note F#, 2
endchannel
-Music_GoldenrodCity_branch_eb66d:
+.sub2:
note D#, 2
note D_, 1
note D#, 3
--- a/audio/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
@@ -13,7 +13,7 @@
notetype $c, $3d
octave 3
note D#, 8
-Music_GoldSilverOpening2_branch_f7325:
+.loop1:
notetype $c, $c1
octave 3
note D_, 2
@@ -29,7 +29,7 @@
note F_, 4
note D#, 4
note C_, 2
- loopchannel 2, Music_GoldSilverOpening2_branch_f7325
+ loopchannel 2, .loop1
intensity $c1
note D_, 2
note D_, 2
@@ -194,7 +194,7 @@
note D_, 2
note D_, 2
notetype $c
-Music_GoldSilverOpening2_branch_f73f8:
+.loop1:
note D_, 2
note D_, 2
note D_, 2
@@ -212,6 +212,6 @@
note D#, 2
note D#, 2
notetype $c
- loopchannel 4, Music_GoldSilverOpening2_branch_f73f8
+ loopchannel 4, .loop1
note C_, 16
endchannel
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -11,7 +11,7 @@
vibrato $12, $24
dutycycle $1
notetype $c, $b7
-Music_Gym_branch_f48c9:
+.mainloop:
octave 4
note F#, 2
octave 2
@@ -187,12 +187,12 @@
note G_, 1
note F#, 1
note E_, 1
- loopchannel 0, Music_Gym_branch_f48c9
+ loopchannel 0, .mainloop
Music_Gym_Ch2:
dutycycle $1
stereopanning $f0
-Music_Gym_branch_f4980:
+.mainloop:
notetype $c, $c3
octave 2
note D_, 2
@@ -226,12 +226,12 @@
octave 3
note C_, 1
note C#, 1
- callchannel Music_Gym_branch_f49e9
+ callchannel .sub1
octave 3
note E_, 2
note C_, 1
note C#, 1
- callchannel Music_Gym_branch_f49e9
+ callchannel .sub1
octave 3
note C_, 1
note E_, 1
@@ -239,7 +239,7 @@
octave 4
note C_, 1
intensity $d2
- callchannel Music_Gym_branch_f4a15
+ callchannel .sub2
octave 1
note F#, 1
note B_, 1
@@ -260,7 +260,7 @@
octave 2
note G_, 2
note E_, 2
- callchannel Music_Gym_branch_f4a15
+ callchannel .sub2
octave 1
note G_, 1
octave 2
@@ -283,9 +283,9 @@
octave 2
note F#, 2
note D_, 2
- loopchannel 0, Music_Gym_branch_f4980
+ loopchannel 0, .mainloop
-Music_Gym_branch_f49e9:
+.sub1:
octave 3
note D_, 3
octave 2
@@ -331,7 +331,7 @@
note C_, 2
endchannel
-Music_Gym_branch_f4a15:
+.sub2:
octave 2
note D_, 4
note D_, 2
@@ -370,7 +370,7 @@
Music_Gym_Ch3:
vibrato $14, $23
stereopanning $ff
-Music_Gym_branch_f4a3c:
+.mainloop:
notetype $c, $14
octave 6
note D_, 2
@@ -453,7 +453,7 @@
octave 5
note B_, 4
intensity $13
- callchannel Music_Gym_branch_f4ab3
+ callchannel .sub1
note __, 2
note A_, 2
octave 6
@@ -466,7 +466,7 @@
note A#, 4
note A_, 4
note G_, 4
- callchannel Music_Gym_branch_f4ab3
+ callchannel .sub1
note A_, 1
note __, 1
note A_, 1
@@ -479,9 +479,9 @@
note E_, 1
note F#, 8
note E_, 4
- loopchannel 0, Music_Gym_branch_f4a3c
+ loopchannel 0, .mainloop
-Music_Gym_branch_f4ab3:
+.sub1:
octave 5
note A_, 6
octave 6
@@ -503,7 +503,7 @@
Music_Gym_Ch4:
togglenoise $4
-Music_Gym_branch_f4ac7:
+.mainloop:
notetype $c
note D_, 2
note C#, 1
@@ -528,7 +528,7 @@
note D_, 1
note D_, 1
notetype $6
-Music_Gym_branch_f4ae1:
+.loop1:
note D_, 6
note D_, 6
note D_, 4
@@ -550,8 +550,8 @@
note D_, 2
note D_, 4
note B_, 8
- loopchannel 4, Music_Gym_branch_f4ae1
-Music_Gym_branch_f4afa:
+ loopchannel 4, .loop1
+.loop2:
note D#, 4
note F#, 4
note D_, 4
@@ -562,5 +562,5 @@
note D#, 4
note D_, 4
note F#, 4
- loopchannel 8, Music_Gym_branch_f4afa
- loopchannel 0, Music_Gym_branch_f4ac7
+ loopchannel 8, .loop2
+ loopchannel 0, .mainloop
--- a/audio/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
@@ -26,17 +26,18 @@
octave 5
note D_, 8
stereopanning $f
-Music_GymLeaderVictory_branch_f4658:
+.mainloop:
+.loop1:
dutycycle $1
- callchannel Music_GymLeaderVictory_branch_f4689
+ callchannel .sub1
octave 4
note C#, 4
note E_, 4
- callchannel Music_GymLeaderVictory_branch_f4689
+ callchannel .sub1
note F#, 8
- loopchannel 2, Music_GymLeaderVictory_branch_f4658
+ loopchannel 2, .loop1
dutycycle $2
- callchannel Music_GymLeaderVictory_branch_f46a0
+ callchannel .sub2
note A_, 4
note G_, 4
note F#, 6
@@ -47,7 +48,7 @@
note D_, 8
note C#, 8
dutycycle $3
- callchannel Music_GymLeaderVictory_branch_f46a0
+ callchannel .sub2
note C#, 4
note E_, 4
note G_, 6
@@ -57,9 +58,9 @@
note G_, 2
intensity $87
note F#, 16
- loopchannel 0, Music_GymLeaderVictory_branch_f4658
+ loopchannel 0, .mainloop
-Music_GymLeaderVictory_branch_f4689:
+.sub1:
intensity $91
octave 3
note F#, 2
@@ -83,7 +84,7 @@
note D_, 1
endchannel
-Music_GymLeaderVictory_branch_f46a0:
+.sub2:
intensity $87
octave 3
note F#, 14
@@ -128,25 +129,25 @@
octave 5
note D_, 1
note F#, 16
-Music_GymLeaderVictory_branch_f46d0:
+.mainloop:
dutycycle $3
intensity $a1
- callchannel Music_GymLeaderVictory_branch_f4711
+ callchannel .sub1
note A_, 4
note A_, 4
- callchannel Music_GymLeaderVictory_branch_f4711
+ callchannel .sub1
note D_, 6
dutycycle $2
note B_, 1
octave 5
note C#, 1
- callchannel Music_GymLeaderVictory_branch_f4711
+ callchannel .sub1
note A_, 4
note A_, 4
- callchannel Music_GymLeaderVictory_branch_f4711
+ callchannel .sub1
note D_, 8
dutycycle $3
- callchannel Music_GymLeaderVictory_branch_f4720
+ callchannel .sub2
note F#, 4
note E_, 4
note D_, 14
@@ -155,7 +156,7 @@
intensity $a7
note A_, 16
dutycycle $2
- callchannel Music_GymLeaderVictory_branch_f4720
+ callchannel .sub2
octave 4
note A_, 4
octave 5
@@ -170,9 +171,9 @@
note B_, 1
octave 5
note C#, 1
- loopchannel 0, Music_GymLeaderVictory_branch_f46d0
+ loopchannel 0, .mainloop
-Music_GymLeaderVictory_branch_f4711:
+.sub1:
octave 5
note D_, 2
note C#, 2
@@ -189,7 +190,7 @@
note F#, 2
endchannel
-Music_GymLeaderVictory_branch_f4720:
+.sub2:
intensity $98
note A_, 6
note F#, 1
@@ -224,7 +225,8 @@
octave 3
note C#, 2
stereopanning $f0
-Music_GymLeaderVictory_branch_f4744:
+.mainloop:
+.loop1:
note D_, 2
note __, 4
octave 2
@@ -256,8 +258,8 @@
octave 3
note D_, 2
note __, 6
- loopchannel 2, Music_GymLeaderVictory_branch_f4744
- callchannel Music_GymLeaderVictory_branch_f479e
+ loopchannel 2, .loop1
+ callchannel .sub1
octave 3
note D_, 2
note __, 2
@@ -282,7 +284,7 @@
note C#, 2
octave 2
note A_, 2
- callchannel Music_GymLeaderVictory_branch_f479e
+ callchannel .sub1
octave 3
note D_, 2
note __, 2
@@ -304,9 +306,9 @@
note B_, 2
octave 3
note C#, 2
- loopchannel 0, Music_GymLeaderVictory_branch_f4744
+ loopchannel 0, .mainloop
-Music_GymLeaderVictory_branch_f479e:
+.sub1:
octave 3
note D_, 2
note __, 2
@@ -384,12 +386,12 @@
notetype $c
note B_, 16
note B_, 16
-Music_GymLeaderVictory_branch_f47eb:
- callchannel Music_GymLeaderVictory_branch_f480b
+.mainloop:
+ callchannel .sub1
note D#, 6
note D#, 2
note D#, 8
- callchannel Music_GymLeaderVictory_branch_f480b
+ callchannel .sub1
note D#, 6
note D#, 2
note D#, 4
@@ -397,7 +399,7 @@
note C#, 1
note C#, 1
note C#, 1
-Music_GymLeaderVictory_branch_f47fb:
+.loop1:
note D#, 2
note G_, 2
note D_, 2
@@ -406,14 +408,15 @@
note D#, 2
note D_, 2
note G_, 2
- loopchannel 16, Music_GymLeaderVictory_branch_f47fb
- loopchannel 0, Music_GymLeaderVictory_branch_f47eb
+ loopchannel 16, .loop1
+ loopchannel 0, .mainloop
-Music_GymLeaderVictory_branch_f480b:
+.sub1:
+.sub1loop1:
note D#, 6
note D#, 2
note D#, 4
note D_, 2
note D#, 2
- loopchannel 3, Music_GymLeaderVictory_branch_f480b
+ loopchannel 3, .sub1loop1
endchannel
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -21,7 +21,8 @@
note E_, 1
note F_, 1
note F#, 1
-Music_HallOfFame_branch_f05e6:
+.mainloop:
+.loop1:
intensity $97
octave 4
note C_, 8
@@ -39,17 +40,17 @@
note F_, 8
intensity $57
note F_, 8
- loopchannel 3, Music_HallOfFame_branch_f05e6
+ loopchannel 3, .loop1
note __, 16
note __, 16
note __, 16
note __, 16
- loopchannel 0, Music_HallOfFame_branch_f05e6
+ loopchannel 0, .mainloop
Music_HallOfFame_Ch2:
vibrato $8, $25
dutycycle $3
-Music_HallOfFame_branch_f0610:
+.mainloop:
notetype $c, $c4
octave 3
note G_, 2
@@ -74,12 +75,12 @@
note A#, 4
note A_, 4
note F_, 2
- loopchannel 0, Music_HallOfFame_branch_f0610
+ loopchannel 0, .mainloop
Music_HallOfFame_Ch3:
-Music_HallOfFame_branch_f062e:
+.mainloop:
notetype $c, $28
-Music_HallOfFame_branch_f0631:
+.loop1:
octave 3
note D_, 2
note G_, 2
@@ -116,7 +117,7 @@
note F_, 2
note C_, 2
note F_, 2
- loopchannel 3, Music_HallOfFame_branch_f0631
+ loopchannel 3, .loop1
note D_, 4
note G_, 4
note D_, 4
@@ -133,7 +134,7 @@
note G_, 4
note E_, 4
note G_, 4
- loopchannel 0, Music_HallOfFame_branch_f062e
+ loopchannel 0, .mainloop
Music_HallOfFame_Ch4:
togglenoise $5
@@ -143,7 +144,7 @@
note __, 16
note __, 16
notetype $6
-Music_HallOfFame_branch_f0677:
+.mainloop:
stereopanning $f
note A#, 4
note A#, 8
@@ -169,4 +170,4 @@
note A#, 1
note A#, 1
note A#, 1
- loopchannel 0, Music_HallOfFame_branch_f0677
+ loopchannel 0, .mainloop
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -10,21 +10,21 @@
dutycycle $3
tone $0002
stereopanning $f
-Music_IndigoPlateau_branch_ee86a:
- callchannel Music_IndigoPlateau_branch_ee881
+.mainloop:
+ callchannel .sub1
octave 3
note D_, 4
- callchannel Music_IndigoPlateau_branch_ee881
+ callchannel .sub1
octave 3
note D#, 4
- callchannel Music_IndigoPlateau_branch_ee881
+ callchannel .sub1
octave 3
note D#, 4
- callchannel Music_IndigoPlateau_branch_ee881
+ callchannel .sub1
note A#, 4
- loopchannel 0, Music_IndigoPlateau_branch_ee86a
+ loopchannel 0, .mainloop
-Music_IndigoPlateau_branch_ee881:
+.sub1:
notetype $c, $b6
octave 2
note A_, 4
@@ -43,14 +43,14 @@
dutycycle $3
vibrato $10, $22
stereopanning $f0
-Music_IndigoPlateau_branch_ee899:
- callchannel Music_IndigoPlateau_branch_ee8e9
+.mainloop:
+ callchannel .sub1
note A_, 4
- callchannel Music_IndigoPlateau_branch_ee8e9
+ callchannel .sub1
note A#, 4
- callchannel Music_IndigoPlateau_branch_ee8e9
+ callchannel .sub1
note A_, 4
- callchannel Music_IndigoPlateau_branch_ee8e9
+ callchannel .sub1
note C#, 4
intensity $c7
note A_, 6
@@ -60,7 +60,7 @@
note A_, 8
intensity $b0
note A_, 4
- callchannel Music_IndigoPlateau_branch_ee8e9
+ callchannel .sub1
note A#, 4
intensity $c7
octave 4
@@ -71,7 +71,7 @@
intensity $b0
octave 3
note A_, 4
- callchannel Music_IndigoPlateau_branch_ee8e9
+ callchannel .sub1
note C#, 4
intensity $c7
octave 4
@@ -83,7 +83,7 @@
note F#, 8
intensity $b0
note A_, 4
- callchannel Music_IndigoPlateau_branch_ee8e9
+ callchannel .sub1
note A#, 4
intensity $c7
octave 4
@@ -94,11 +94,11 @@
intensity $b0
octave 3
note A_, 4
- callchannel Music_IndigoPlateau_branch_ee8e9
+ callchannel .sub1
note C#, 4
- loopchannel 0, Music_IndigoPlateau_branch_ee899
+ loopchannel 0, .mainloop
-Music_IndigoPlateau_branch_ee8e9:
+.sub1:
notetype $c, $c6
octave 3
note D_, 4
@@ -115,22 +115,22 @@
Music_IndigoPlateau_Ch3:
notetype $c, $19
-Music_IndigoPlateau_branch_ee8fd:
- callchannel Music_IndigoPlateau_branch_ee915
+.mainloop:
+ callchannel .sub1
octave 3
note A_, 4
- callchannel Music_IndigoPlateau_branch_ee915
+ callchannel .sub1
octave 3
note A_, 4
- callchannel Music_IndigoPlateau_branch_ee915
+ callchannel .sub1
octave 3
note A_, 4
- callchannel Music_IndigoPlateau_branch_ee915
+ callchannel .sub1
octave 3
note F#, 4
- loopchannel 0, Music_IndigoPlateau_branch_ee8fd
+ loopchannel 0, .mainloop
-Music_IndigoPlateau_branch_ee915:
+.sub1:
octave 3
note D_, 1
note __, 3
@@ -151,7 +151,7 @@
stereopanning $f0
togglenoise $0
notetype $c
-Music_IndigoPlateau_branch_ee92a:
+.mainloop:
note D#, 4
note D_, 2
note D#, 2
@@ -179,4 +179,4 @@
note D_, 2
note D_, 2
note C#, 4
- loopchannel 0, Music_IndigoPlateau_branch_ee92a
+ loopchannel 0, .mainloop
--- a/audio/music/johtogymbattle.asm
+++ b/audio/music/johtogymbattle.asm
@@ -10,14 +10,14 @@
tone $0002
vibrato $12, $15
notetype $c, $b2
-Music_JohtoGymBattle_branch_ea526:
+.loop1:
octave 3
note A#, 1
note A_, 1
note G#, 1
note A_, 1
- loopchannel 4, Music_JohtoGymBattle_branch_ea526
-Music_JohtoGymBattle_branch_ea52f:
+ loopchannel 4, .loop1
+.loop2:
note C#, 1
note C_, 1
octave 2
@@ -24,7 +24,7 @@
note A#, 1
octave 3
note C_, 1
- loopchannel 3, Music_JohtoGymBattle_branch_ea52f
+ loopchannel 3, .loop2
intensity $4b
note C#, 4
intensity $b2
@@ -57,7 +57,7 @@
octave 3
note G#, 2
note F_, 2
-Music_JohtoGymBattle_branch_ea55d:
+.mainloop:
intensity $b5
note D_, 6
note G_, 6
@@ -284,7 +284,7 @@
octave 3
note D#, 2
note F#, 2
- loopchannel 0, Music_JohtoGymBattle_branch_ea55d
+ loopchannel 0, .mainloop
Music_JohtoGymBattle_Ch2:
dutycycle $3
@@ -291,19 +291,19 @@
vibrato $8, $36
tone $0001
notetype $c, $c2
-Music_JohtoGymBattle_branch_ea66a:
+.loop1:
octave 4
note F#, 1
note F_, 1
note E_, 1
note A#, 1
- loopchannel 4, Music_JohtoGymBattle_branch_ea66a
-Music_JohtoGymBattle_branch_ea673:
+ loopchannel 4, .loop1
+.loop2:
note F#, 1
note F_, 1
note F#, 1
note A#, 1
- loopchannel 4, Music_JohtoGymBattle_branch_ea673
+ loopchannel 4, .loop2
note A_, 6
octave 3
note A#, 6
@@ -395,7 +395,7 @@
octave 3
note G#, 1
note A_, 1
-Music_JohtoGymBattle_branch_ea6ee:
+.mainloop:
intensity $c7
note A#, 8
intensity $c4
@@ -610,7 +610,7 @@
octave 3
note B_, 16
note G_, 16
- loopchannel 0, Music_JohtoGymBattle_branch_ea6ee
+ loopchannel 0, .mainloop
Music_JohtoGymBattle_Ch3:
notetype $c, $19
@@ -647,7 +647,7 @@
note F_, 2
note G_, 2
note G#, 4
- callchannel Music_JohtoGymBattle_branch_ea952
+ callchannel .sub1
note G_, 2
note D_, 2
note F_, 2
@@ -663,7 +663,7 @@
note G#, 2
note D#, 2
note F#, 4
- callchannel Music_JohtoGymBattle_branch_ea952
+ callchannel .sub1
note G_, 2
note D_, 2
note F_, 2
@@ -682,10 +682,10 @@
octave 3
note A#, 2
note G#, 2
-Music_JohtoGymBattle_branch_ea83f:
- callchannel Music_JohtoGymBattle_branch_ea963
- callchannel Music_JohtoGymBattle_branch_ea963
- callchannel Music_JohtoGymBattle_branch_ea96a
+.mainloop:
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub3
note C#, 2
note G#, 2
note C#, 2
@@ -694,7 +694,7 @@
note A#, 2
note A_, 2
note G#, 2
- callchannel Music_JohtoGymBattle_branch_ea963
+ callchannel .sub2
note D_, 2
note G_, 2
note D_, 2
@@ -703,8 +703,8 @@
note G_, 2
note G#, 2
note G_, 2
- callchannel Music_JohtoGymBattle_branch_ea96a
- callchannel Music_JohtoGymBattle_branch_ea96a
+ callchannel .sub3
+ callchannel .sub3
note C_, 2
note G_, 2
note A#, 2
@@ -713,14 +713,14 @@
note F_, 2
note G_, 2
note A#, 2
- callchannel Music_JohtoGymBattle_branch_ea971
- callchannel Music_JohtoGymBattle_branch_ea96a
- callchannel Music_JohtoGymBattle_branch_ea978
+ callchannel .sub4
+ callchannel .sub3
+ callchannel .sub5
octave 3
note G_, 2
note G#, 2
note F_, 2
- callchannel Music_JohtoGymBattle_branch_ea971
+ callchannel .sub4
note C_, 2
note G_, 2
note C_, 2
@@ -729,13 +729,13 @@
note E_, 2
note F_, 2
note G_, 2
- callchannel Music_JohtoGymBattle_branch_ea96a
- callchannel Music_JohtoGymBattle_branch_ea978
+ callchannel .sub3
+ callchannel .sub5
octave 3
note C_, 2
note C#, 2
note G#, 2
- callchannel Music_JohtoGymBattle_branch_ea971
+ callchannel .sub4
note C_, 2
note G_, 2
note C_, 2
@@ -744,8 +744,8 @@
note E_, 2
note F_, 2
note G_, 2
- callchannel Music_JohtoGymBattle_branch_ea96a
- callchannel Music_JohtoGymBattle_branch_ea978
+ callchannel .sub3
+ callchannel .sub5
octave 3
note F_, 2
octave 2
@@ -752,7 +752,7 @@
note A#, 2
octave 3
note G#, 2
- callchannel Music_JohtoGymBattle_branch_ea971
+ callchannel .sub4
note C_, 2
note G_, 2
note C_, 2
@@ -763,12 +763,12 @@
note G_, 2
note F_, 2
note G_, 2
- callchannel Music_JohtoGymBattle_branch_ea983
+ callchannel .sub6
note __, 2
- callchannel Music_JohtoGymBattle_branch_ea990
+ callchannel .sub7
octave 4
note C#, 2
- callchannel Music_JohtoGymBattle_branch_ea99c
+ callchannel .sub8
note __, 2
note D#, 2
note A#, 2
@@ -783,11 +783,11 @@
note D#, 2
octave 4
note D#, 2
- callchannel Music_JohtoGymBattle_branch_ea983
+ callchannel .sub6
note G_, 2
- callchannel Music_JohtoGymBattle_branch_ea990
+ callchannel .sub7
note G#, 2
- callchannel Music_JohtoGymBattle_branch_ea99c
+ callchannel .sub8
note A_, 2
octave 4
note D#, 2
@@ -801,7 +801,7 @@
octave 4
note D#, 2
note D_, 4
- callchannel Music_JohtoGymBattle_branch_ea9a9
+ callchannel .sub9
note D#, 2
note G#, 2
note D#, 2
@@ -812,7 +812,7 @@
note A_, 2
note D#, 2
note G#, 2
- callchannel Music_JohtoGymBattle_branch_ea9a9
+ callchannel .sub9
note D#, 2
note G#, 2
note D#, 2
@@ -821,7 +821,7 @@
note A_, 2
note G#, 2
note F#, 2
- callchannel Music_JohtoGymBattle_branch_ea9b1
+ callchannel .sub10
note C#, 2
note F#, 2
note C#, 2
@@ -832,7 +832,7 @@
note A_, 2
note C#, 2
note G_, 2
- callchannel Music_JohtoGymBattle_branch_ea9b1
+ callchannel .sub10
note C#, 2
note F#, 2
note C#, 2
@@ -841,7 +841,7 @@
note D#, 2
note E_, 2
note A_, 2
- callchannel Music_JohtoGymBattle_branch_ea9a9
+ callchannel .sub9
note D#, 2
note G#, 2
note D#, 2
@@ -878,7 +878,7 @@
note F#, 2
note E_, 2
note F#, 2
- callchannel Music_JohtoGymBattle_branch_ea9b8
+ callchannel .sub11
note F_, 2
note C_, 2
note D#, 2
@@ -887,7 +887,7 @@
note D#, 2
note C#, 2
note D#, 2
- callchannel Music_JohtoGymBattle_branch_ea9b8
+ callchannel .sub11
note F_, 2
note C_, 2
note D#, 2
@@ -896,9 +896,9 @@
note F#, 2
note F_, 2
note D#, 2
- loopchannel 0, Music_JohtoGymBattle_branch_ea83f
+ loopchannel 0, .mainloop
-Music_JohtoGymBattle_branch_ea952:
+.sub1:
note G_, 2
note D_, 2
note F_, 2
@@ -917,25 +917,28 @@
note F_, 2
endchannel
-Music_JohtoGymBattle_branch_ea963:
+.sub2:
+.sub2loop1:
note D_, 2
note G_, 2
- loopchannel 4, Music_JohtoGymBattle_branch_ea963
+ loopchannel 4, .sub2loop1
endchannel
-Music_JohtoGymBattle_branch_ea96a:
+.sub3:
+.sub3loop1:
note C#, 2
note G#, 2
- loopchannel 4, Music_JohtoGymBattle_branch_ea96a
+ loopchannel 4, .sub3loop1
endchannel
-Music_JohtoGymBattle_branch_ea971:
+.sub4:
+.sub4loop1:
note C_, 2
note G_, 2
- loopchannel 4, Music_JohtoGymBattle_branch_ea971
+ loopchannel 4, .sub4loop1
endchannel
-Music_JohtoGymBattle_branch_ea978:
+.sub5:
octave 2
note A#, 2
octave 3
@@ -948,7 +951,7 @@
note A#, 2
endchannel
-Music_JohtoGymBattle_branch_ea983:
+.sub6:
octave 3
note C_, 2
note G_, 2
@@ -963,7 +966,7 @@
note C_, 2
endchannel
-Music_JohtoGymBattle_branch_ea990:
+.sub7:
note C#, 2
note G#, 2
octave 4
@@ -977,7 +980,7 @@
note C#, 2
endchannel
-Music_JohtoGymBattle_branch_ea99c:
+.sub8:
octave 3
note D_, 2
note A_, 2
@@ -992,20 +995,22 @@
note D_, 2
endchannel
-Music_JohtoGymBattle_branch_ea9a9:
+.sub9:
+.sub9loop1:
octave 3
note D#, 2
note G#, 2
- loopchannel 4, Music_JohtoGymBattle_branch_ea9a9
+ loopchannel 4, .sub9loop1
endchannel
-Music_JohtoGymBattle_branch_ea9b1:
+.sub10:
+.sub10loop1:
note C#, 2
note F#, 2
- loopchannel 4, Music_JohtoGymBattle_branch_ea9b1
+ loopchannel 4, .sub10loop1
endchannel
-Music_JohtoGymBattle_branch_ea9b8:
+.sub11:
note F_, 2
note C_, 2
note D#, 2
--- a/audio/music/johtotrainerbattle.asm
+++ b/audio/music/johtotrainerbattle.asm
@@ -85,9 +85,9 @@
note F_, 6
intensity $b7
note G_, 4
-Music_JohtoTrainerBattle_branch_f6102:
+.mainloop:
intensity $b4
- callchannel Music_JohtoTrainerBattle_branch_f629f
+ callchannel .sub1
intensity $b7
note A#, 4
intensity $b3
@@ -119,7 +119,7 @@
note E_, 2
note D_, 2
note C_, 2
- callchannel Music_JohtoTrainerBattle_branch_f629f
+ callchannel .sub1
intensity $b7
note F_, 4
note E_, 2
@@ -242,7 +242,7 @@
intensity $a7
note D#, 12
note __, 16
-Music_JohtoTrainerBattle_branch_f61bd:
+.loop1:
intensity $b7
note F_, 8
intensity $b4
@@ -265,7 +265,7 @@
note D#, 2
note F_, 4
note F_, 4
- loopchannel 2, Music_JohtoTrainerBattle_branch_f61bd
+ loopchannel 2, .loop1
intensity $b7
note F_, 8
intensity $b4
@@ -411,7 +411,7 @@
intensity $a7
note F_, 8
intensity $b3
- callchannel Music_JohtoTrainerBattle_branch_f629f
+ callchannel .sub1
note F_, 4
note E_, 2
note F_, 2
@@ -426,9 +426,9 @@
note F_, 10
intensity $a7
note F_, 6
- loopchannel 0, Music_JohtoTrainerBattle_branch_f6102
+ loopchannel 0, .mainloop
-Music_JohtoTrainerBattle_branch_f629f:
+.sub1:
octave 3
note E_, 2
note D_, 2
@@ -496,10 +496,10 @@
intensity $c2
octave 4
note A_, 6
- callchannel Music_JohtoTrainerBattle_branch_f649a
+ callchannel .sub1
intensity $c2
note A_, 6
- callchannel Music_JohtoTrainerBattle_branch_f649a
+ callchannel .sub1
intensity $c2
octave 5
note C_, 6
@@ -544,13 +544,13 @@
note E_, 2
intensity $c7
note B_, 4
-Music_JohtoTrainerBattle_branch_f632a:
- callchannel Music_JohtoTrainerBattle_branch_f64a3
+.mainloop:
+ callchannel .sub2
intensity $3e
note A#, 8
intensity $c7
note A#, 8
- callchannel Music_JohtoTrainerBattle_branch_f64a3
+ callchannel .sub2
intensity $c4
note D_, 4
octave 3
@@ -581,7 +581,7 @@
note A_, 16
intensity $b7
note A_, 16
-Music_JohtoTrainerBattle_branch_f635a:
+.loop1:
intensity $c3
octave 3
note A_, 2
@@ -593,7 +593,7 @@
note A_, 2
note G_, 2
note A#, 2
- loopchannel 3, Music_JohtoTrainerBattle_branch_f635a
+ loopchannel 3, .loop1
note A_, 2
octave 4
note D_, 2
@@ -604,7 +604,7 @@
note G_, 2
note A_, 2
note A#, 2
-Music_JohtoTrainerBattle_branch_f6376:
+.loop2:
note G_, 2
note F_, 2
note G_, 2
@@ -614,7 +614,7 @@
note G_, 2
note F_, 2
note G#, 2
- loopchannel 3, Music_JohtoTrainerBattle_branch_f6376
+ loopchannel 3, .loop2
note F_, 2
octave 4
note C_, 2
@@ -675,14 +675,14 @@
intensity $b7
note D#, 8
intensity $62
- callchannel Music_JohtoTrainerBattle_branch_f64b6
+ callchannel .sub3
intensity $82
- callchannel Music_JohtoTrainerBattle_branch_f64b6
+ callchannel .sub3
intensity $92
- callchannel Music_JohtoTrainerBattle_branch_f64b6
+ callchannel .sub3
intensity $a2
- callchannel Music_JohtoTrainerBattle_branch_f64b6
-Music_JohtoTrainerBattle_branch_f63dd:
+ callchannel .sub3
+.loop3:
octave 4
note D#, 2
octave 3
@@ -699,18 +699,18 @@
note G_, 2
octave 3
note A#, 2
- loopchannel 8, Music_JohtoTrainerBattle_branch_f63dd
- callchannel Music_JohtoTrainerBattle_branch_f64be
+ loopchannel 8, .loop3
+ callchannel .sub4
octave 3
note A#, 2
intensity $c7
octave 4
note C_, 8
- callchannel Music_JohtoTrainerBattle_branch_f64be
+ callchannel .sub4
note G_, 2
intensity $c7
note F_, 8
- callchannel Music_JohtoTrainerBattle_branch_f64be
+ callchannel .sub4
octave 3
note A#, 2
intensity $b0
@@ -743,7 +743,7 @@
note G_, 6
intensity $4c
note G#, 4
- callchannel Music_JohtoTrainerBattle_branch_f64d2
+ callchannel .sub5
intensity $b0
note F_, 8
intensity $b7
@@ -752,7 +752,7 @@
note G#, 8
intensity $b7
note G#, 8
- callchannel Music_JohtoTrainerBattle_branch_f64d2
+ callchannel .sub5
intensity $b0
note C#, 8
intensity $b7
@@ -814,7 +814,7 @@
note A#, 8
intensity $b7
note A#, 8
- callchannel Music_JohtoTrainerBattle_branch_f64a3
+ callchannel .sub2
intensity $c7
note D_, 4
octave 3
@@ -825,9 +825,9 @@
note E_, 2
note D_, 2
note F_, 2
- loopchannel 0, Music_JohtoTrainerBattle_branch_f632a
+ loopchannel 0, .mainloop
-Music_JohtoTrainerBattle_branch_f649a:
+.sub1:
octave 3
note A_, 6
note A_, 4
@@ -837,7 +837,7 @@
note A#, 4
endchannel
-Music_JohtoTrainerBattle_branch_f64a3:
+.sub2:
intensity $c7
octave 3
note A_, 6
@@ -855,7 +855,7 @@
note F_, 8
endchannel
-Music_JohtoTrainerBattle_branch_f64b6:
+.sub3:
octave 3
note A#, 2
note D#, 2
@@ -865,7 +865,7 @@
note D#, 2
endchannel
-Music_JohtoTrainerBattle_branch_f64be:
+.sub4:
intensity $c7
octave 4
note F_, 4
@@ -885,7 +885,7 @@
note F_, 2
endchannel
-Music_JohtoTrainerBattle_branch_f64d2:
+.sub5:
intensity $c7
octave 4
note D#, 6
@@ -932,7 +932,7 @@
note A#, 2
note A_, 2
note G#, 2
-Music_JohtoTrainerBattle_branch_f6501:
+.loop1:
note A_, 2
note E_, 2
note F#, 2
@@ -941,7 +941,7 @@
note F#, 2
note G_, 2
note E_, 2
- loopchannel 3, Music_JohtoTrainerBattle_branch_f6501
+ loopchannel 3, .loop1
note A_, 2
note E_, 2
note F#, 2
@@ -950,7 +950,7 @@
note F#, 2
note G_, 2
note G#, 2
- callchannel Music_JohtoTrainerBattle_branch_f6676
+ callchannel .sub1
octave 4
note C_, 2
octave 3
@@ -963,7 +963,7 @@
note C_, 2
octave 3
note A#, 2
- callchannel Music_JohtoTrainerBattle_branch_f6676
+ callchannel .sub1
octave 4
note C_, 2
octave 3
@@ -974,16 +974,16 @@
note A_, 2
note A#, 2
note G_, 2
-Music_JohtoTrainerBattle_branch_f6531:
- callchannel Music_JohtoTrainerBattle_branch_f6681
+.mainloop:
+ callchannel .sub2
note E_, 2
- callchannel Music_JohtoTrainerBattle_branch_f6692
- callchannel Music_JohtoTrainerBattle_branch_f6692
- callchannel Music_JohtoTrainerBattle_branch_f6681
+ callchannel .sub3
+ callchannel .sub3
+ callchannel .sub2
note A_, 2
- callchannel Music_JohtoTrainerBattle_branch_f6692
- callchannel Music_JohtoTrainerBattle_branch_f6692
- callchannel Music_JohtoTrainerBattle_branch_f669d
+ callchannel .sub3
+ callchannel .sub3
+ callchannel .sub4
note E_, 2
note A_, 2
note E_, 2
@@ -992,7 +992,7 @@
note D_, 2
note E_, 2
note F_, 2
- callchannel Music_JohtoTrainerBattle_branch_f669d
+ callchannel .sub4
note E_, 2
octave 4
note F_, 2
@@ -1003,7 +1003,7 @@
note G#, 2
note A_, 2
note A#, 2
- callchannel Music_JohtoTrainerBattle_branch_f66a5
+ callchannel .sub5
note D_, 2
note A_, 2
note D_, 2
@@ -1012,7 +1012,7 @@
note A_, 2
note G_, 2
note A_, 2
- callchannel Music_JohtoTrainerBattle_branch_f66a5
+ callchannel .sub5
note D_, 2
octave 4
note D_, 2
@@ -1023,7 +1023,7 @@
note G_, 2
note A_, 2
note A#, 2
- callchannel Music_JohtoTrainerBattle_branch_f66ac
+ callchannel .sub6
note C_, 2
note G_, 2
note C_, 2
@@ -1032,7 +1032,7 @@
note G_, 2
note F_, 2
note G_, 2
- callchannel Music_JohtoTrainerBattle_branch_f66ac
+ callchannel .sub6
note C_, 2
octave 4
note C_, 2
@@ -1047,7 +1047,7 @@
note F_, 8
note E_, 8
note D#, 8
-Music_JohtoTrainerBattle_branch_f6591:
+.loop2:
octave 3
note D#, 2
note A#, 2
@@ -1058,8 +1058,8 @@
note A_, 2
octave 4
note C_, 2
- loopchannel 2, Music_JohtoTrainerBattle_branch_f6591
- callchannel Music_JohtoTrainerBattle_branch_f66ac
+ loopchannel 2, .loop2
+ callchannel .sub6
note C_, 2
octave 4
note C_, 2
@@ -1070,16 +1070,16 @@
note F_, 2
note D#, 2
note G_, 2
-Music_JohtoTrainerBattle_branch_f65ac:
+.loop3:
note C#, 2
note G#, 2
- loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac
+ loopchannel 7, .loop3
note B_, 2
note A_, 2
-Music_JohtoTrainerBattle_branch_f65b4:
+.loop4:
note D_, 2
note A_, 2
- loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4
+ loopchannel 5, .loop4
note B_, 2
note A_, 2
note G#, 2
@@ -1086,26 +1086,26 @@
note F#, 2
note G#, 2
note A_, 2
-Music_JohtoTrainerBattle_branch_f65c0:
+.loop5:
note A#, 4
note D#, 4
- loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0
-Music_JohtoTrainerBattle_branch_f65c6:
+ loopchannel 4, .loop5
+.loop6:
octave 4
note G_, 4
octave 3
note A#, 4
- loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6
-Music_JohtoTrainerBattle_branch_f65ce:
- callchannel Music_JohtoTrainerBattle_branch_f66b4
+ loopchannel 4, .loop6
+.loop7:
+ callchannel .sub7
note D#, 2
note F_, 8
- callchannel Music_JohtoTrainerBattle_branch_f66b4
+ callchannel .sub7
octave 4
note C_, 2
octave 3
note A#, 8
- loopchannel 2, Music_JohtoTrainerBattle_branch_f65ce
+ loopchannel 2, .loop7
octave 4
note C#, 8
note C_, 8
@@ -1170,14 +1170,14 @@
note C_, 2
octave 3
note A#, 2
-Music_JohtoTrainerBattle_branch_f661e:
+.loop8:
note D#, 2
note A#, 2
- loopchannel 8, Music_JohtoTrainerBattle_branch_f661e
-Music_JohtoTrainerBattle_branch_f6624:
+ loopchannel 8, .loop8
+.loop9:
note C#, 2
note G#, 2
- loopchannel 6, Music_JohtoTrainerBattle_branch_f6624
+ loopchannel 6, .loop9
note C#, 2
octave 4
note C_, 2
@@ -1184,14 +1184,14 @@
octave 3
note A#, 2
note G#, 2
-Music_JohtoTrainerBattle_branch_f6630:
+.loop10:
note D#, 2
note A#, 2
- loopchannel 8, Music_JohtoTrainerBattle_branch_f6630
-Music_JohtoTrainerBattle_branch_f6636:
+ loopchannel 8, .loop10
+.loop11:
note C#, 2
note G#, 2
- loopchannel 4, Music_JohtoTrainerBattle_branch_f6636
+ loopchannel 4, .loop11
note C#, 2
octave 4
note C#, 2
@@ -1246,9 +1246,9 @@
note A#, 2
octave 4
note D_, 2
- loopchannel 0, Music_JohtoTrainerBattle_branch_f6531
+ loopchannel 0, .mainloop
-Music_JohtoTrainerBattle_branch_f6676:
+.sub1:
octave 4
note C_, 2
octave 3
@@ -1261,7 +1261,7 @@
note G_, 2
endchannel
-Music_JohtoTrainerBattle_branch_f6681:
+.sub2:
octave 3
note E_, 2
note A_, 2
@@ -1280,7 +1280,7 @@
note G_, 2
endchannel
-Music_JohtoTrainerBattle_branch_f6692:
+.sub3:
octave 3
note F_, 2
note A#, 2
@@ -1293,27 +1293,30 @@
note D_, 2
endchannel
-Music_JohtoTrainerBattle_branch_f669d:
+.sub4:
+.sub4loop1:
octave 3
note E_, 2
note A_, 2
- loopchannel 4, Music_JohtoTrainerBattle_branch_f669d
+ loopchannel 4, .sub4loop1
endchannel
-Music_JohtoTrainerBattle_branch_f66a5:
+.sub5:
+.sub5loop1:
note D_, 2
note A_, 2
- loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5
+ loopchannel 4, .sub5loop1
endchannel
-Music_JohtoTrainerBattle_branch_f66ac:
+.sub6:
+.sub6loop1:
octave 3
note C_, 2
note G_, 2
- loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac
+ loopchannel 4, .sub6loop1
endchannel
-Music_JohtoTrainerBattle_branch_f66b4:
+.sub7:
note A#, 4
note D#, 2
note A#, 2
--- a/audio/music/johtowildbattle.asm
+++ b/audio/music/johtowildbattle.asm
@@ -9,7 +9,7 @@
dutycycle $3
tone $0002
vibrato $12, $15
-Music_JohtoWildBattleNight_branch_f5ddb:
+.body:
notetype $c, $b2
octave 4
note C_, 1
@@ -86,7 +86,7 @@
note D_, 4
intensity $6f
note D#, 8
-Music_JohtoWildBattle_branch_f5e2d:
+.mainloop:
intensity $b6
octave 3
note D_, 6
@@ -198,17 +198,17 @@
note D_, 4
note F#, 4
note G_, 16
- loopchannel 0, Music_JohtoWildBattle_branch_f5e2d
+ loopchannel 0, .mainloop
Music_JohtoWildBattle_Ch2:
dutycycle $3
vibrato $8, $36
tone $0001
- callchannel Music_JohtoWildBattle_branch_f5f5d
+ callchannel .sub1
notetype $c, $c2
octave 4
note G_, 6
-Music_JohtoWildBattleNight_branch_f5eb2:
+.body:
octave 3
note D_, 6
note G_, 4
@@ -237,7 +237,7 @@
note G_, 4
intensity $6f
note G#, 8
-Music_JohtoWildBattle_branch_f5ed1:
+.mainloop:
intensity $c4
octave 3
note G_, 6
@@ -360,10 +360,9 @@
note G_, 4
note A#, 4
note B_, 16
- loopchannel 0, Music_JohtoWildBattle_branch_f5ed1
+ loopchannel 0, .mainloop
-Music_JohtoWildBattleNight_branch_f5f5d:
-Music_JohtoWildBattle_branch_f5f5d:
+.sub1:
notetype $c, $c2
octave 4
note F_, 1
@@ -417,7 +416,7 @@
Music_JohtoWildBattle_Ch3:
notetype $c, $14
-Music_JohtoWildBattleNight_branch_f5f94:
+.body:
octave 4
note G_, 2
octave 5
@@ -457,7 +456,7 @@
note E_, 2
note F_, 2
note G_, 2
- callchannel Music_JohtoWildBattle_branch_f6055
+ callchannel .sub1
note D#, 2
note G#, 2
note D#, 2
@@ -466,15 +465,15 @@
note D#, 2
note G_, 2
note F_, 2
-Music_JohtoWildBattle_branch_f5fc6:
+.loop1:
note D_, 2
note G_, 2
- loopchannel 6, Music_JohtoWildBattle_branch_f5fc6
+ loopchannel 6, .loop1
note D_, 2
note E_, 2
note F_, 2
note G_, 2
- callchannel Music_JohtoWildBattle_branch_f6055
+ callchannel .sub1
note F_, 2
note F_, 2
note G_, 2
@@ -483,23 +482,24 @@
note G_, 2
note F_, 2
note D#, 2
-Music_JohtoWildBattle_branch_f5fdb:
+.mainloop:
+.loop2:
note D_, 2
note G_, 2
- loopchannel 7, Music_JohtoWildBattle_branch_f5fdb
+ loopchannel 7, .loop2
note F#, 4
- callchannel Music_JohtoWildBattle_branch_f6055
- callchannel Music_JohtoWildBattle_branch_f6055
-Music_JohtoWildBattle_branch_f5fe8:
+ callchannel .sub1
+ callchannel .sub1
+.loop3:
note D_, 2
note G_, 2
- loopchannel 7, Music_JohtoWildBattle_branch_f5fe8
+ loopchannel 7, .loop3
note D_, 2
note A_, 2
-Music_JohtoWildBattle_branch_f5ff0:
+.loop4:
note C_, 2
note F_, 2
- loopchannel 5, Music_JohtoWildBattle_branch_f5ff0
+ loopchannel 5, .loop4
note E_, 2
note D_, 2
note C_, 2
@@ -506,7 +506,7 @@
note D_, 2
note E_, 2
note F_, 2
- callchannel Music_JohtoWildBattle_branch_f6055
+ callchannel .sub1
note D#, 2
note G#, 2
note D#, 2
@@ -514,11 +514,11 @@
note D#, 2
note G#, 2
note G_, 4
-Music_JohtoWildBattle_branch_f6006:
+.loop5:
note E_, 2
note A_, 2
- loopchannel 8, Music_JohtoWildBattle_branch_f6006
- callchannel Music_JohtoWildBattle_branch_f6055
+ loopchannel 8, .loop5
+ callchannel .sub1
note D#, 2
note G#, 2
note D#, 2
@@ -543,14 +543,14 @@
note F#, 2
note F_, 2
note D#, 2
-Music_JohtoWildBattle_branch_f6027:
+.loop6:
note D_, 2
note G_, 2
- loopchannel 8, Music_JohtoWildBattle_branch_f6027
-Music_JohtoWildBattle_branch_f602d:
+ loopchannel 8, .loop6
+.loop7:
note C_, 2
note F_, 2
- loopchannel 7, Music_JohtoWildBattle_branch_f602d
+ loopchannel 7, .loop7
note E_, 2
note C_, 2
note D_, 4
@@ -557,28 +557,29 @@
note G_, 4
note D_, 4
note G_, 4
-Music_JohtoWildBattle_branch_f6039:
+.loop8:
note D_, 2
note G_, 2
- loopchannel 12, Music_JohtoWildBattle_branch_f6039
-Music_JohtoWildBattle_branch_f603f:
+ loopchannel 12, .loop8
+.loop9:
note C_, 2
note E_, 2
- loopchannel 7, Music_JohtoWildBattle_branch_f603f
+ loopchannel 7, .loop9
note F_, 2
note F#, 2
-Music_JohtoWildBattle_branch_f6047:
+.loop10:
note D_, 2
note G_, 2
- loopchannel 6, Music_JohtoWildBattle_branch_f6047
+ loopchannel 6, .loop10
note A_, 2
note G_, 2
note F#, 2
note E_, 2
- loopchannel 0, Music_JohtoWildBattle_branch_f5fdb
+ loopchannel 0, .mainloop
-Music_JohtoWildBattle_branch_f6055:
+.sub1:
+.sub1loop1:
note D#, 2
note G#, 2
- loopchannel 4, Music_JohtoWildBattle_branch_f6055
+ loopchannel 4, .sub1loop1
endchannel
--- a/audio/music/johtowildbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
@@ -9,20 +9,20 @@
dutycycle $3
tone $0002
vibrato $10, $25
- loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb
+ loopchannel 0, Music_JohtoWildBattle_Ch1.body
Music_JohtoWildBattleNight_Ch2:
dutycycle $3
vibrato $20, $36
tone $0001
- callchannel Music_JohtoWildBattleNight_branch_f5f5d
+ callchannel Music_JohtoWildBattle_Ch2.sub1
notetype $c, $c2
octave 4
note G_, 6
tone $0001
dutycycle $2
- loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2
+ loopchannel 0, Music_JohtoWildBattle_Ch2.body
Music_JohtoWildBattleNight_Ch3:
notetype $c, $11
- loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94
+ loopchannel 0, Music_JohtoWildBattle_Ch3.body
--- a/audio/music/kantogymbattle.asm
+++ b/audio/music/kantogymbattle.asm
@@ -85,8 +85,8 @@
note E_, 4
note E_, 4
note E_, 2
-Music_KantoGymBattle_branch_ec78b:
- callchannel Music_KantoGymBattle_branch_ec832
+.mainloop:
+ callchannel .sub1
octave 2
note A#, 2
intensity $b7
@@ -95,7 +95,7 @@
octave 3
note D#, 10
note E_, 6
- callchannel Music_KantoGymBattle_branch_ec832
+ callchannel .sub1
note D#, 2
intensity $b7
note C#, 8
@@ -227,9 +227,9 @@
intensity $4c
octave 3
note D_, 4
- loopchannel 0, Music_KantoGymBattle_branch_ec78b
+ loopchannel 0, .mainloop
-Music_KantoGymBattle_branch_ec832:
+.sub1:
intensity $b5
note D#, 2
octave 2
@@ -256,7 +256,7 @@
vibrato $8, $36
tone $0001
notetype $c, $c2
-Music_KantoGymBattle_branch_ec852:
+.loop1:
octave 4
note A#, 1
note G#, 1
@@ -263,9 +263,9 @@
note A#, 1
octave 5
note D#, 1
- loopchannel 8, Music_KantoGymBattle_branch_ec852
+ loopchannel 8, .loop1
octave 3
-Music_KantoGymBattle_branch_ec85d:
+.loop2:
intensity $c2
note D#, 2
note D#, 2
@@ -312,14 +312,14 @@
note B_, 2
intensity $c2
octave 4
- loopchannel 2, Music_KantoGymBattle_branch_ec85d
-Music_KantoGymBattle_branch_ec894:
- callchannel Music_KantoGymBattle_branch_ec907
+ loopchannel 2, .loop2
+.mainloop:
+ callchannel .sub1
note E_, 8
note G#, 8
note B_, 10
note G#, 6
- callchannel Music_KantoGymBattle_branch_ec907
+ callchannel .sub1
note E_, 8
note G#, 8
note B_, 10
@@ -401,9 +401,9 @@
note A#, 6
octave 3
note A_, 4
- loopchannel 0, Music_KantoGymBattle_branch_ec894
+ loopchannel 0, .mainloop
-Music_KantoGymBattle_branch_ec907:
+.sub1:
dutycycle $2
intensity $d1
octave 3
@@ -439,14 +439,14 @@
octave 2
note E_, 1
note __, 1
-Music_KantoGymBattle_branch_ec934:
+.loop1:
note B_, 3
note __, 1
- loopchannel 6, Music_KantoGymBattle_branch_ec934
+ loopchannel 6, .loop1
note B_, 2
note G#, 2
note B_, 2
-Music_KantoGymBattle_branch_ec93d:
+.loop2:
note D#, 1
note __, 1
note D#, 1
@@ -483,16 +483,17 @@
note D#, 1
note __, 1
note E_, 2
- loopchannel 2, Music_KantoGymBattle_branch_ec93d
-Music_KantoGymBattle_branch_ec965:
+ loopchannel 2, .loop2
+.mainloop:
+.loop3:
octave 2
note D#, 2
note A#, 2
- loopchannel 8, Music_KantoGymBattle_branch_ec965
-Music_KantoGymBattle_branch_ec96c:
+ loopchannel 8, .loop3
+.loop4:
note E_, 2
note B_, 2
- loopchannel 4, Music_KantoGymBattle_branch_ec96c
+ loopchannel 4, .loop4
octave 1
note B_, 2
octave 2
@@ -506,22 +507,22 @@
note E_, 2
octave 2
note B_, 2
-Music_KantoGymBattle_branch_ec97f:
+.loop5:
octave 2
note F#, 2
octave 3
note C#, 2
- loopchannel 8, Music_KantoGymBattle_branch_ec97f
-Music_KantoGymBattle_branch_ec987:
+ loopchannel 8, .loop5
+.loop6:
octave 2
note E_, 2
note B_, 2
- loopchannel 7, Music_KantoGymBattle_branch_ec987
+ loopchannel 7, .loop6
octave 3
note E_, 2
octave 2
note B_, 2
-Music_KantoGymBattle_branch_ec992:
+.loop7:
note D#, 1
note __, 1
note D#, 1
@@ -540,11 +541,11 @@
note D#, 1
note __, 1
note E_, 2
- loopchannel 2, Music_KantoGymBattle_branch_ec992
-Music_KantoGymBattle_branch_ec9a8:
+ loopchannel 2, .loop7
+.loop8:
note D#, 2
note A#, 2
- loopchannel 7, Music_KantoGymBattle_branch_ec9a8
+ loopchannel 7, .loop8
octave 3
note C#, 2
octave 2
@@ -558,17 +559,17 @@
note B_, 2
octave 3
note E_, 2
-Music_KantoGymBattle_branch_ec9bb:
+.loop9:
octave 2
note E_, 2
note B_, 2
- loopchannel 5, Music_KantoGymBattle_branch_ec9bb
-Music_KantoGymBattle_branch_ec9c2:
+ loopchannel 5, .loop9
+.loop10:
octave 2
note F#, 2
octave 3
note C#, 2
- loopchannel 7, Music_KantoGymBattle_branch_ec9c2
+ loopchannel 7, .loop10
octave 2
note A#, 2
octave 3
@@ -583,19 +584,19 @@
note F#, 2
note E_, 2
note C#, 2
-Music_KantoGymBattle_branch_ec9d8:
+.loop11:
octave 2
note D#, 2
note A#, 2
- loopchannel 4, Music_KantoGymBattle_branch_ec9d8
-Music_KantoGymBattle_branch_ec9df:
+ loopchannel 4, .loop11
+.loop12:
note C#, 2
note G#, 2
- loopchannel 8, Music_KantoGymBattle_branch_ec9df
-Music_KantoGymBattle_branch_ec9e5:
+ loopchannel 8, .loop12
+.loop13:
note D#, 2
note A#, 2
- loopchannel 4, Music_KantoGymBattle_branch_ec9e5
+ loopchannel 4, .loop13
octave 3
note D#, 2
octave 2
@@ -607,4 +608,4 @@
octave 3
note D#, 2
note F_, 2
- loopchannel 0, Music_KantoGymBattle_branch_ec965
+ loopchannel 0, .mainloop
--- a/audio/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
@@ -3,7 +3,7 @@
musicheader 1, 2, Music_KantoTrainerBattle_Ch2
musicheader 1, 3, Music_KantoTrainerBattle_Ch3
- db $3
+ db $3 ; unused
Music_KantoTrainerBattle_Ch1:
tempo 114
@@ -126,7 +126,7 @@
note D#, 2
note F_, 2
note F#, 2
-Music_KantoTrainerBattle_branch_eca88:
+.mainloop:
notetype $c, $b7
note D#, 4
note __, 2
@@ -462,7 +462,7 @@
intensity $b7
octave 4
note D_, 4
- loopchannel 0, Music_KantoTrainerBattle_branch_eca88
+ loopchannel 0, .mainloop
Music_KantoTrainerBattle_Ch2:
pitchoffset 1, B_
@@ -483,13 +483,13 @@
note F#, 1
dutycycle $3
intensity $62
-Music_KantoTrainerBattle_branch_ecc04:
+.loop1:
octave 3
note G_, 1
note G#, 1
note G_, 1
note F#, 1
- loopchannel 14, Music_KantoTrainerBattle_branch_ecc04
+ loopchannel 14, .loop1
note G_, 1
note G#, 1
note G_, 1
@@ -540,7 +540,7 @@
octave 3
note D_, 1
note F_, 1
-Music_KantoTrainerBattle_branch_ecc41:
+.mainloop:
notetype $c, $d7
octave 2
note C_, 1
@@ -914,7 +914,7 @@
intensity $d7
octave 3
note B_, 4
- loopchannel 0, Music_KantoTrainerBattle_branch_ecc41
+ loopchannel 0, .mainloop
Music_KantoTrainerBattle_Ch3:
pitchoffset 1, B_
@@ -1047,7 +1047,7 @@
note G_, 2
note A#, 2
note B_, 2
-Music_KantoTrainerBattle_branch_ece5a:
+.mainloop:
notetype $c, $14
octave 6
note C_, 4
@@ -1533,4 +1533,4 @@
intensity $14
octave 5
note G_, 4
- loopchannel 0, Music_KantoTrainerBattle_branch_ece5a
+ loopchannel 0, .mainloop
--- a/audio/music/kantowildbattle.asm
+++ b/audio/music/kantowildbattle.asm
@@ -3,7 +3,7 @@
musicheader 1, 2, Music_KantoWildBattle_Ch2
musicheader 1, 3, Music_KantoWildBattle_Ch3
- db $3
+ db $3 ; unused
Music_KantoWildBattle_Ch1:
tempo 112
@@ -24,15 +24,15 @@
note G_, 1
note F#, 1
note F_, 1
-Music_KantoWildBattle_branch_ed091:
+.mainloop:
notetype $c, $b7
- callchannel Music_KantoWildBattle_branch_ed18a
+ callchannel .sub1
octave 4
note F_, 4
note C#, 4
octave 3
note B_, 8
- callchannel Music_KantoWildBattle_branch_ed18a
+ callchannel .sub1
note __, 8
note G_, 1
note B_, 1
@@ -207,7 +207,7 @@
note D#, 1
note __, 5
note C#, 8
-Music_KantoWildBattle_branch_ed15b:
+.loop1:
intensity $b1
octave 3
note C_, 1
@@ -214,34 +214,34 @@
note D#, 1
note D_, 1
note C#, 1
- loopchannel 8, Music_KantoWildBattle_branch_ed15b
-Music_KantoWildBattle_branch_ed166:
+ loopchannel 8, .loop1
+.loop2:
note C#, 1
note F_, 1
note E_, 1
note D#, 1
- loopchannel 8, Music_KantoWildBattle_branch_ed166
-Music_KantoWildBattle_branch_ed16e:
+ loopchannel 8, .loop2
+.loop3:
note C_, 1
note D#, 1
note D_, 1
note C#, 1
- loopchannel 16, Music_KantoWildBattle_branch_ed16e
-Music_KantoWildBattle_branch_ed176:
+ loopchannel 16, .loop3
+.loop4:
note C#, 1
note E_, 1
note D#, 1
note D_, 1
- loopchannel 8, Music_KantoWildBattle_branch_ed176
-Music_KantoWildBattle_branch_ed17e:
+ loopchannel 8, .loop4
+.loop5:
note C_, 1
note D#, 1
note D_, 1
note C#, 1
- loopchannel 8, Music_KantoWildBattle_branch_ed17e
- loopchannel 0, Music_KantoWildBattle_branch_ed091
+ loopchannel 8, .loop5
+ loopchannel 0, .mainloop
-Music_KantoWildBattle_branch_ed18a:
+.sub1:
octave 4
note C_, 1
note __, 5
@@ -301,9 +301,9 @@
note D#, 1
note D_, 1
note C#, 1
-Music_KantoWildBattle_branch_ed1c8:
+.mainloop:
notetype $c, $b7
- callchannel Music_KantoWildBattle_branch_ed2c6
+ callchannel .sub1
octave 2
note F_, 2
octave 1
@@ -311,7 +311,7 @@
note __, 1
octave 2
note G_, 2
- callchannel Music_KantoWildBattle_branch_ed2c6
+ callchannel .sub1
octave 2
note G_, 1
note __, 1
@@ -322,21 +322,21 @@
note F_, 1
note F#, 1
notetype $6, $b7
- callchannel Music_KantoWildBattle_branch_ed307
- callchannel Music_KantoWildBattle_branch_ed307
+ callchannel .sub2
+ callchannel .sub2
pitchoffset 0, C#
- callchannel Music_KantoWildBattle_branch_ed307
- callchannel Music_KantoWildBattle_branch_ed307
+ callchannel .sub2
+ callchannel .sub2
pitchoffset 0, C_
rept 4
- callchannel Music_KantoWildBattle_branch_ed307
+ callchannel .sub2
endr
pitchoffset 0, C#
- callchannel Music_KantoWildBattle_branch_ed307
- callchannel Music_KantoWildBattle_branch_ed307
+ callchannel .sub2
+ callchannel .sub2
pitchoffset 0, C_
- callchannel Music_KantoWildBattle_branch_ed307
- callchannel Music_KantoWildBattle_branch_ed307
+ callchannel .sub2
+ callchannel .sub2
note __, 16
octave 3
note A#, 16
@@ -380,11 +380,11 @@
note B_, 1
note G#, 1
notetype $6, $b7
- callchannel Music_KantoWildBattle_branch_ed31b
+ callchannel .sub3
pitchoffset 0, C#
- callchannel Music_KantoWildBattle_branch_ed31b
+ callchannel .sub3
pitchoffset 0, C_
- callchannel Music_KantoWildBattle_branch_ed340
+ callchannel .sub4
octave 2
note C_, 2
note __, 2
@@ -443,12 +443,12 @@
octave 2
note C#, 2
note __, 2
- callchannel Music_KantoWildBattle_branch_ed340
- callchannel Music_KantoWildBattle_branch_ed354
- callchannel Music_KantoWildBattle_branch_ed340
- callchannel Music_KantoWildBattle_branch_ed354
+ callchannel .sub4
+ callchannel .sub5
+ callchannel .sub4
+ callchannel .sub5
pitchoffset 0, C#
- callchannel Music_KantoWildBattle_branch_ed340
+ callchannel .sub4
pitchoffset 0, C_
note C#, 2
note __, 2
@@ -469,7 +469,7 @@
octave 2
note C#, 2
note __, 2
- callchannel Music_KantoWildBattle_branch_ed340
+ callchannel .sub4
note C_, 2
note __, 2
octave 3
@@ -489,9 +489,9 @@
octave 2
note C_, 2
note __, 2
- loopchannel 0, Music_KantoWildBattle_branch_ed1c8
+ loopchannel 0, .mainloop
-Music_KantoWildBattle_branch_ed2c6:
+.sub1:
octave 2
note C_, 1
note __, 2
@@ -558,7 +558,7 @@
note G_, 2
endchannel
-Music_KantoWildBattle_branch_ed307:
+.sub2:
octave 2
note C_, 2
note __, 4
@@ -580,7 +580,7 @@
note C_, 4
endchannel
-Music_KantoWildBattle_branch_ed31b:
+.sub3:
octave 2
note C_, 2
note __, 4
@@ -619,7 +619,7 @@
note C_, 2
endchannel
-Music_KantoWildBattle_branch_ed340:
+.sub4:
octave 3
note G_, 4
octave 2
@@ -641,7 +641,7 @@
note __, 2
endchannel
-Music_KantoWildBattle_branch_ed354:
+.sub5:
note C_, 2
note __, 2
octave 3
@@ -714,7 +714,7 @@
note G_, 1
octave 4
note G_, 1
-Music_KantoWildBattle_branch_ed39e:
+.mainloop:
notetype $c, $14
octave 5
note G_, 1
@@ -1212,4 +1212,4 @@
note G#, 16
note G_, 16
note G_, 16
- loopchannel 0, Music_KantoWildBattle_branch_ed39e
+ loopchannel 0, .mainloop
--- a/audio/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
@@ -18,7 +18,7 @@
note D_, 6
note D_, 6
note E_, 4
-Music_LakeOfRage_branch_ee6e9:
+.mainloop:
intensity $b5
note F#, 6
note E_, 6
@@ -91,7 +91,7 @@
note D_, 6
intensity $a7
note D_, 6
- loopchannel 0, Music_LakeOfRage_branch_ee6e9
+ loopchannel 0, .mainloop
Music_LakeOfRage_Ch2:
dutycycle $3
@@ -106,7 +106,7 @@
note A_, 8
intensity $a7
note A_, 8
-Music_LakeOfRage_branch_ee75e:
+.mainloop:
notetype $8, $c7
octave 4
note D_, 16
@@ -180,7 +180,7 @@
note F#, 4
notetype $c, $c7
note A_, 16
- loopchannel 0, Music_LakeOfRage_branch_ee75e
+ loopchannel 0, .mainloop
Music_LakeOfRage_Ch3:
stereopanning $f
@@ -195,7 +195,7 @@
note F#, 4
note __, 2
note E_, 4
-Music_LakeOfRage_branch_ee7d0:
+.mainloop:
octave 3
note D_, 4
octave 2
@@ -293,13 +293,13 @@
note D_, 2
octave 2
note A_, 2
- loopchannel 0, Music_LakeOfRage_branch_ee7d0
+ loopchannel 0, .mainloop
Music_LakeOfRage_Ch4:
stereopanning $f0
togglenoise $3
notetype $c
-Music_LakeOfRage_branch_ee83b:
+.mainloop:
note D_, 2
note D_, 1
note D_, 1
@@ -319,4 +319,4 @@
note D_, 1
note D_, 1
note D_, 1
- loopchannel 0, Music_LakeOfRage_branch_ee83b
+ loopchannel 0, .mainloop
--- a/audio/music/lakeofragerocketradio.asm
+++ b/audio/music/lakeofragerocketradio.asm
@@ -10,7 +10,7 @@
tone $1118
vibrato $0, $f0
stereopanning $f0
-Music_LakeOfRageRocketRadio_branch_ef5c9:
+.mainloop:
notetype $c, $a7
octave 7
note G_, 4
@@ -18,7 +18,7 @@
note G_, 4
note F#, 4
note __, 16
- loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
+ loopchannel 0, .mainloop
Music_LakeOfRageRocketRadio_Ch2:
dutycycle $1
@@ -26,10 +26,10 @@
notetype $c, $a7
note __, 2
stereopanning $f
- loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
+ loopchannel 0, Music_LakeOfRageRocketRadio_Ch1.mainloop
Music_LakeOfRageRocketRadio_Ch3:
notetype $c, $26
vibrato $10, $44
note __, 4
- loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
+ loopchannel 0, Music_LakeOfRageRocketRadio_Ch1.mainloop
--- a/audio/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
@@ -3,7 +3,7 @@
musicheader 1, 2, Music_LavenderTown_Ch2
musicheader 1, 3, Music_LavenderTown_Ch3
- db $3
+ db $3 ; unused
Music_LavenderTown_Ch1:
tempo 160
@@ -16,8 +16,8 @@
note __, 16
note __, 16
note __, 16
-Music_LavenderTown_branch_ef74c:
- callchannel Music_LavenderTown_branch_ef7fd
+.mainloop:
+ callchannel .sub1
intensity $93
octave 5
note D_, 2
@@ -35,7 +35,7 @@
note A_, 2
intensity $43
note A_, 2
- callchannel Music_LavenderTown_branch_ef87f
+ callchannel .sub2
intensity $93
intensity $93
note F_, 2
@@ -54,7 +54,7 @@
note G_, 2
intensity $43
note G_, 2
- callchannel Music_LavenderTown_branch_ef7fd
+ callchannel .sub1
intensity $93
octave 5
note D_, 2
@@ -72,7 +72,7 @@
note G_, 2
intensity $43
note G_, 2
- callchannel Music_LavenderTown_branch_ef87f
+ callchannel .sub2
intensity $93
octave 6
note C_, 2
@@ -102,7 +102,7 @@
octave 3
note A_, 2
note F_, 2
-Music_LavenderTown_branch_ef7ca:
+.loop1:
octave 3
note C_, 2
note E_, 2
@@ -124,7 +124,7 @@
octave 3
note A_, 2
note F_, 2
- loopchannel 2, Music_LavenderTown_branch_ef7ca
+ loopchannel 2, .loop1
note F#, 2
note A_, 2
octave 4
@@ -147,9 +147,9 @@
octave 3
note B_, 8
note B_, 8
- loopchannel 0, Music_LavenderTown_branch_ef74c
+ loopchannel 0, .mainloop
-Music_LavenderTown_branch_ef7fd:
+.sub1:
intensity $83
octave 5
note C_, 2
@@ -241,7 +241,7 @@
note F_, 2
endchannel
-Music_LavenderTown_branch_ef87f:
+.sub2:
intensity $93
octave 5
note G_, 2
@@ -265,7 +265,7 @@
dutycycle $1
vibrato $8, $24
stereopanning $ff
-Music_LavenderTown_branch_ef8a0:
+.loop1:
notetype $c, $a3
octave 5
note C_, 2
@@ -283,7 +283,7 @@
note F#, 2
intensity $63
note F#, 2
- loopchannel 3, Music_LavenderTown_branch_ef8a0
+ loopchannel 3, .loop1
intensity $a3
note C_, 2
intensity $63
@@ -301,9 +301,9 @@
note D_, 2
intensity $63
note D_, 2
-Music_LavenderTown_branch_ef8d7:
+.mainloop:
intensity $b5
- callchannel Music_LavenderTown_branch_ef915
+ callchannel .sub1
octave 2
note F#, 4
octave 3
@@ -321,7 +321,7 @@
octave 2
note B_, 4
note G_, 4
- callchannel Music_LavenderTown_branch_ef915
+ callchannel .sub1
octave 2
note G_, 4
octave 3
@@ -353,9 +353,9 @@
note D_, 1
note F_, 1
note G_, 6
- loopchannel 0, Music_LavenderTown_branch_ef8d7
+ loopchannel 0, .mainloop
-Music_LavenderTown_branch_ef915:
+.sub1:
octave 2
note C_, 4
note G_, 4
@@ -397,7 +397,7 @@
octave 5
note E_, 4
note F_, 4
-Music_LavenderTown_branch_ef941:
+.mainloop:
intensity $12
octave 5
note G_, 4
@@ -511,4 +511,4 @@
note B_, 12
note E_, 2
note F_, 2
- loopchannel 0, Music_LavenderTown_branch_ef941
+ loopchannel 0, .mainloop
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@@ -11,7 +11,7 @@
tone $0004
vibrato $8, $45
stereopanning $f
-Music_Lighthouse_branch_ee584:
+.mainloop:
notetype $c, $b3
octave 3
note C#, 8
@@ -126,13 +126,13 @@
note B_, 2
note A_, 2
note G#, 8
- loopchannel 0, Music_Lighthouse_branch_ee584
+ loopchannel 0, .mainloop
Music_Lighthouse_Ch2:
dutycycle $3
tone $0002
vibrato $10, $45
-Music_Lighthouse_branch_ee604:
+.mainloop:
notetype $c, $c5
octave 3
note G#, 12
@@ -208,12 +208,12 @@
note D#, 2
note C#, 2
note C_, 8
- loopchannel 0, Music_Lighthouse_branch_ee604
+ loopchannel 0, .mainloop
Music_Lighthouse_Ch3:
notetype $c, $19
stereopanning $f0
-Music_Lighthouse_branch_ee65b:
+.mainloop:
octave 2
note G#, 2
note __, 2
@@ -223,7 +223,7 @@
note __, 2
note G_, 2
note __, 2
-Music_Lighthouse_branch_ee664:
+.loop1:
note G#, 2
note __, 2
note D#, 2
@@ -232,7 +232,7 @@
note __, 2
note A_, 2
note __, 2
- loopchannel 2, Music_Lighthouse_branch_ee664
+ loopchannel 2, .loop1
note G#, 2
note __, 2
note D#, 2
@@ -252,7 +252,7 @@
octave 3
note C_, 2
note __, 2
-Music_Lighthouse_branch_ee683:
+.loop2:
note C#, 2
note __, 2
octave 2
@@ -263,7 +263,7 @@
octave 3
note D_, 2
note __, 2
- loopchannel 2, Music_Lighthouse_branch_ee683
+ loopchannel 2, .loop2
note C#, 2
note __, 2
octave 2
@@ -274,7 +274,7 @@
octave 3
note D#, 2
note F#, 2
-Music_Lighthouse_branch_ee69b:
+.loop3:
note E_, 2
note __, 2
octave 2
@@ -285,13 +285,13 @@
note __, 2
note F_, 2
note __, 2
- loopchannel 8, Music_Lighthouse_branch_ee69b
- loopchannel 0, Music_Lighthouse_branch_ee65b
+ loopchannel 8, .loop3
+ loopchannel 0, .mainloop
Music_Lighthouse_Ch4:
togglenoise $0
notetype $c
-Music_Lighthouse_branch_ee6b1:
+.mainloop:
stereopanning $f
note G#, 4
note F_, 2
@@ -306,4 +306,4 @@
note F_, 4
note G#, 2
note A_, 2
- loopchannel 0, Music_Lighthouse_branch_ee6b1
+ loopchannel 0, .mainloop
--- a/audio/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
@@ -16,7 +16,7 @@
octave 4
note C_, 8
dutycycle $3
-Music_LookBeauty_branch_eee5f:
+.mainloop:
note __, 4
octave 3
note D_, 1
@@ -74,7 +74,7 @@
note A_, 1
octave 4
note C_, 1
- loopchannel 0, Music_LookBeauty_branch_eee5f
+ loopchannel 0, .mainloop
Music_LookBeauty_Ch2:
stereopanning $f0
@@ -111,7 +111,7 @@
note F#, 1
note __, 1
dutycycle $3
-Music_LookBeauty_branch_eeec5:
+.mainloop:
notetype $c, $c7
note G_, 16
note A_, 8
@@ -151,7 +151,7 @@
note __, 14
note F#, 8
note A_, 8
- loopchannel 0, Music_LookBeauty_branch_eeec5
+ loopchannel 0, .mainloop
Music_LookBeauty_Ch3:
stereopanning $ff
@@ -170,7 +170,7 @@
octave 3
note D_, 7
note F#, 1
-Music_LookBeauty_branch_eef0f:
+.mainloop:
note G_, 4
octave 4
note B_, 1
@@ -291,7 +291,7 @@
note __, 7
octave 3
note D_, 8
- loopchannel 0, Music_LookBeauty_branch_eef0f
+ loopchannel 0, .mainloop
Music_LookBeauty_Ch4:
togglenoise $3
@@ -298,14 +298,14 @@
notetype $c
note __, 16
note __, 16
-Music_LookBeauty_branch_eef91:
- callchannel Music_LookBeauty_branch_eefa1
- callchannel Music_LookBeauty_branch_eefa1
- callchannel Music_LookBeauty_branch_eefa1
- callchannel Music_LookBeauty_branch_eefa1
- loopchannel 0, Music_LookBeauty_branch_eef91
+.mainloop:
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_LookBeauty_branch_eefa1:
+.sub1:
note F#, 2
note G_, 2
note D_, 2
--- a/audio/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
@@ -16,7 +16,7 @@
note F#, 2
note F_, 2
note F#, 8
-Music_LookHiker_branch_f7433:
+.mainloop:
note D_, 2
note D#, 2
note E_, 2
@@ -29,7 +29,7 @@
note __, 2
note F#, 2
note __, 6
- loopchannel 0, Music_LookHiker_branch_f7433
+ loopchannel 0, .mainloop
Music_LookHiker_Ch2:
dutycycle $0
@@ -48,7 +48,7 @@
note F#, 1
note D_, 1
intensity $a1
-Music_LookHiker_branch_f7457:
+.mainloop:
octave 1
note B_, 1
note B_, 2
@@ -65,7 +65,7 @@
note D_, 1
note F#, 1
note D_, 1
- loopchannel 0, Music_LookHiker_branch_f7457
+ loopchannel 0, .mainloop
Music_LookHiker_Ch3:
vibrato $12, $24
@@ -75,21 +75,21 @@
note B_, 2
note A#, 2
note B_, 8
-Music_LookHiker_branch_f7477:
+.mainloop:
octave 5
note D#, 2
note D_, 2
note C#, 2
note C_, 2
- callchannel Music_LookHiker_branch_f748a
+ callchannel .sub1
note G_, 2
note G#, 2
note A_, 2
note A#, 2
- callchannel Music_LookHiker_branch_f748a
- loopchannel 0, Music_LookHiker_branch_f7477
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_LookHiker_branch_f748a:
+.sub1:
octave 4
note B_, 2
note __, 4
@@ -106,9 +106,9 @@
notetype $c
note F_, 4
note __, 16
-Music_LookHiker_branch_f749a:
+.mainloop:
note D#, 2
note G_, 2
note D_, 2
note G_, 2
- loopchannel 0, Music_LookHiker_branch_f749a
+ loopchannel 0, .mainloop
--- a/audio/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
@@ -3,7 +3,7 @@
musicheader 1, 2, Music_LookKimonoGirl_Ch2
musicheader 1, 3, Music_LookKimonoGirl_Ch3
- db $3
+ db $3 ; unused
Music_LookKimonoGirl_Ch1:
tempo 160
@@ -12,17 +12,17 @@
dutycycle $1
notetype $6, $87
tone $0001
- callchannel Music_LookKimonoGirl_branch_f7aa8
+ callchannel Music_LookKimonoGirl_Ch2.sub2
tone 0
-Music_LookKimonoGirl_branch_f79d7:
+.mainloop:
notetype $c, $b2
- callchannel Music_LookKimonoGirl_branch_f7a13
- callchannel Music_LookKimonoGirl_branch_f7a13
- callchannel Music_LookKimonoGirl_branch_f7a34
- callchannel Music_LookKimonoGirl_branch_f7a34
- callchannel Music_LookKimonoGirl_branch_f7a13
- callchannel Music_LookKimonoGirl_branch_f7a13
- callchannel Music_LookKimonoGirl_branch_f7a34
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
intensity $b4
octave 3
note E_, 1
@@ -47,9 +47,9 @@
intensity $54
octave 3
note A_, 1
- loopchannel 0, Music_LookKimonoGirl_branch_f79d7
+ loopchannel 0, .mainloop
-Music_LookKimonoGirl_branch_f7a13:
+.sub1:
intensity $b4
octave 2
note F_, 1
@@ -76,7 +76,7 @@
note D_, 1
endchannel
-Music_LookKimonoGirl_branch_f7a34:
+.sub2:
intensity $b4
octave 2
note E_, 1
@@ -107,8 +107,8 @@
dutycycle $0
notetype $6, $a7
stereopanning $f0
- callchannel Music_LookKimonoGirl_branch_f7aa8
-Music_LookKimonoGirl_branch_f7a5f:
+ callchannel .sub2
+.mainloop:
dutycycle $3
notetype $c, $91
octave 5
@@ -130,7 +130,7 @@
note A_, 1
note E_, 1
note D_, 1
- callchannel Music_LookKimonoGirl_branch_f7a94
+ callchannel .sub1
octave 5
note F_, 1
note D_, 1
@@ -150,10 +150,10 @@
note A_, 1
note E_, 1
note D_, 1
- callchannel Music_LookKimonoGirl_branch_f7a94
- loopchannel 0, Music_LookKimonoGirl_branch_f7a5f
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_LookKimonoGirl_branch_f7a94:
+.sub1:
octave 5
note B_, 1
note A_, 1
@@ -175,7 +175,7 @@
note E_, 1
endchannel
-Music_LookKimonoGirl_branch_f7aa8:
+.sub2:
octave 4
note E_, 1
octave 5
@@ -226,7 +226,7 @@
octave 5
note D_, 2
note E_, 2
-Music_LookKimonoGirl_branch_f7aec:
+.mainloop:
octave 5
note D_, 4
note E_, 4
@@ -262,4 +262,4 @@
note E_, 2
note D_, 8
note E_, 8
- loopchannel 0, Music_LookKimonoGirl_branch_f7aec
+ loopchannel 0, .mainloop
--- a/audio/music/looklass.asm
+++ b/audio/music/looklass.asm
@@ -17,7 +17,7 @@
note B_, 14
stereopanning $f
dutycycle $0
-Music_LookLass_branch_ed7bd:
+.mainloop:
intensity $a2
octave 3
note E_, 4
@@ -27,7 +27,7 @@
note E_, 2
intensity $a3
note B_, 2
- loopchannel 0, Music_LookLass_branch_ed7bd
+ loopchannel 0, .mainloop
Music_LookLass_Ch2:
stereopanning $f0
@@ -34,7 +34,7 @@
dutycycle $0
notetype $c, $83
note __, 16
-Music_LookLass_branch_ed7d5:
+.mainloop:
intensity $92
octave 2
note B_, 4
@@ -45,7 +45,7 @@
intensity $93
octave 3
note G#, 2
- loopchannel 0, Music_LookLass_branch_ed7d5
+ loopchannel 0, .mainloop
Music_LookLass_Ch3:
notetype $c, $10
@@ -55,7 +55,7 @@
note D#, 2
note C#, 2
note C_, 2
-Music_LookLass_branch_ed7ef:
+.mainloop:
octave 5
note B_, 2
note __, 2
@@ -95,13 +95,13 @@
note F#, 2
note G#, 2
note A_, 2
- loopchannel 0, Music_LookLass_branch_ed7ef
+ loopchannel 0, .mainloop
Music_LookLass_Ch4:
togglenoise $4
notetype $c
note C_, 16
-Music_LookLass_branch_ed81f:
+.mainloop:
notetype $6
note D_, 8
note C#, 8
@@ -111,4 +111,4 @@
note C#, 1
note C#, 1
note C#, 1
- loopchannel 0, Music_LookLass_branch_ed81f
+ loopchannel 0, .mainloop
--- a/audio/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
@@ -12,7 +12,7 @@
stereopanning $f
notetype $c, $b3
note __, 8
-Music_LookMysticalMan_branch_178458:
+.mainloop:
dutycycle $3
notetype $6, $96
octave 3
@@ -60,7 +60,7 @@
note __, 4
note C#, 4
dutycycle $2
- callchannel Music_LookMysticalMan_branch_1784f9
+ callchannel .sub1
octave 4
note C#, 2
note __, 2
@@ -75,7 +75,7 @@
note F#, 4
note __, 4
note E_, 4
- callchannel Music_LookMysticalMan_branch_1784f9
+ callchannel .sub1
octave 4
note C#, 2
note __, 2
@@ -93,7 +93,7 @@
note A#, 6
dutycycle $2
intensity $72
-Music_LookMysticalMan_branch_1784b4:
+.loop1:
octave 5
note D_, 2
octave 4
@@ -100,7 +100,7 @@
note B_, 2
note F#, 2
note D_, 2
- loopchannel 4, Music_LookMysticalMan_branch_1784b4
+ loopchannel 4, .loop1
octave 5
note D_, 2
octave 4
@@ -123,7 +123,7 @@
note D_, 2
note F#, 2
note B_, 2
-Music_LookMysticalMan_branch_1784d4:
+.loop2:
octave 5
note D_, 2
octave 4
@@ -131,7 +131,7 @@
note E_, 2
octave 3
note B_, 2
- loopchannel 4, Music_LookMysticalMan_branch_1784d4
+ loopchannel 4, .loop2
octave 5
note C#, 2
octave 4
@@ -154,9 +154,9 @@
note E_, 2
note F#, 2
note A#, 2
- loopchannel 0, Music_LookMysticalMan_branch_178458
+ loopchannel 0, .mainloop
-Music_LookMysticalMan_branch_1784f9:
+.sub1:
note D_, 16
octave 4
note D_, 2
@@ -196,7 +196,7 @@
vibrato $a, $34
notetype $c, $b3
note __, 8
-Music_LookMysticalMan_branch_178523:
+.mainloop:
stereopanning $f0
notetype $6, $b8
octave 3
@@ -252,7 +252,7 @@
note F#, 4
note __, 4
note E_, 4
- callchannel Music_LookMysticalMan_branch_17859a
+ callchannel .sub1
note F#, 2
note __, 2
note E_, 2
@@ -259,8 +259,8 @@
note __, 2
note D_, 2
note E_, 6
- callchannel Music_LookMysticalMan_branch_1785c8
- callchannel Music_LookMysticalMan_branch_17859a
+ callchannel .sub2
+ callchannel .sub1
note F#, 2
note __, 2
note F#, 2
@@ -267,7 +267,7 @@
note __, 2
note E_, 2
note D_, 6
- callchannel Music_LookMysticalMan_branch_1785c8
+ callchannel .sub2
notetype $c, $b7
note B_, 2
note __, 2
@@ -293,9 +293,9 @@
note __, 1
note A#, 16
note __, 2
- loopchannel 0, Music_LookMysticalMan_branch_178523
+ loopchannel 0, .mainloop
-Music_LookMysticalMan_branch_17859a:
+.sub1:
note B_, 2
note __, 2
octave 4
@@ -340,7 +340,7 @@
note E_, 6
endchannel
-Music_LookMysticalMan_branch_1785c8:
+.sub2:
note C#, 8
intensity $88
note C_, 1
@@ -360,7 +360,7 @@
Music_LookMysticalMan_Ch3:
notetype $6, $16
note __, 16
-Music_LookMysticalMan_branch_1785df:
+.mainloop:
octave 2
note B_, 4
octave 3
@@ -415,7 +415,7 @@
note A_, 2
octave 3
note E_, 2
-Music_LookMysticalMan_branch_178615:
+.loop1:
octave 2
note F#, 4
note A#, 2
@@ -469,7 +469,7 @@
note C#, 2
octave 2
note E_, 6
- loopchannel 2, Music_LookMysticalMan_branch_178615
+ loopchannel 2, .loop1
note F#, 4
note A#, 2
note __, 2
@@ -530,7 +530,7 @@
octave 2
note B_, 8
note A#, 4
- loopchannel 0, Music_LookMysticalMan_branch_1785df
+ loopchannel 0, .mainloop
Music_LookMysticalMan_Ch4:
togglenoise $3
@@ -540,15 +540,16 @@
note D_, 2
note D_, 1
note D_, 1
-Music_LookMysticalMan_branch_178697:
- callchannel Music_LookMysticalMan_branch_1786d3
- callchannel Music_LookMysticalMan_branch_1786d9
- callchannel Music_LookMysticalMan_branch_1786d3
- callchannel Music_LookMysticalMan_branch_1786df
- loopchannel 2, Music_LookMysticalMan_branch_178697
- callchannel Music_LookMysticalMan_branch_1786d3
- callchannel Music_LookMysticalMan_branch_1786d9
- callchannel Music_LookMysticalMan_branch_1786d3
+.mainloop:
+.loop1:
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub3
+ loopchannel 2, .loop1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
note D_, 2
note D#, 2
note D_, 2
@@ -559,7 +560,7 @@
note D_, 2
note D_, 1
note D_, 1
-Music_LookMysticalMan_branch_1786ba:
+.loop2:
note D_, 2
note D#, 2
note D_, 3
@@ -577,10 +578,10 @@
note D_, 2
note D_, 1
note D_, 1
- loopchannel 2, Music_LookMysticalMan_branch_1786ba
- loopchannel 0, Music_LookMysticalMan_branch_178697
+ loopchannel 2, .loop2
+ loopchannel 0, .mainloop
-Music_LookMysticalMan_branch_1786d3:
+.sub1:
note D#, 4
note D_, 3
note D#, 3
@@ -588,7 +589,7 @@
note D_, 4
endchannel
-Music_LookMysticalMan_branch_1786d9:
+.sub2:
note D#, 4
note D_, 3
note D_, 3
@@ -596,7 +597,7 @@
note D_, 4
endchannel
-Music_LookMysticalMan_branch_1786df:
+.sub3:
note D#, 4
note D_, 2
note D#, 1
--- a/audio/music/lookofficer.asm
+++ b/audio/music/lookofficer.asm
@@ -20,7 +20,7 @@
intensity $2f
octave 3
note B_, 16
-Music_LookOfficer_branch_ed852:
+.mainloop:
intensity $82
note __, 4
note B_, 6
@@ -32,7 +32,7 @@
intensity $2f
note A#, 16
note A_, 16
- loopchannel 0, Music_LookOfficer_branch_ed852
+ loopchannel 0, .mainloop
Music_LookOfficer_Ch2:
vibrato $12, $34
@@ -59,7 +59,8 @@
note B_, 2
octave 2
note D#, 2
-Music_LookOfficer_branch_ed882:
+.mainloop:
+.loop1:
note E_, 2
note G#, 2
octave 3
@@ -70,14 +71,14 @@
note B_, 2
note E_, 2
note G#, 2
- loopchannel 2, Music_LookOfficer_branch_ed882
+ loopchannel 2, .loop1
pitchoffset 0, C#
- callchannel Music_LookOfficer_branch_ed89e
+ callchannel .sub1
pitchoffset 0, C_
- callchannel Music_LookOfficer_branch_ed89e
- loopchannel 0, Music_LookOfficer_branch_ed882
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_LookOfficer_branch_ed89e:
+.sub1:
octave 1
note A_, 2
octave 2
@@ -116,7 +117,7 @@
note C#, 2
note __, 1
note D#, 2
-Music_LookOfficer_branch_ed8c8:
+.mainloop:
note E_, 6
note D#, 6
note C#, 4
@@ -134,4 +135,4 @@
note D_, 8
note E_, 8
note C#, 8
- loopchannel 0, Music_LookOfficer_branch_ed8c8
+ loopchannel 0, .mainloop
--- a/audio/music/lookpokemaniac.asm
+++ b/audio/music/lookpokemaniac.asm
@@ -11,7 +11,8 @@
tone $0002
notetype $c, $b3
note __, 8
-Music_LookPokemaniac_branch_ebdfb:
+.mainloop:
+.loop1:
note __, 4
octave 3
note A#, 1
@@ -18,14 +19,14 @@
note __, 3
note A#, 1
note __, 3
- loopchannel 4, Music_LookPokemaniac_branch_ebdfb
+ loopchannel 4, .loop1
note __, 4
note G_, 1
note __, 3
note G_, 1
note __, 3
- loopchannel 4, Music_LookPokemaniac_branch_ebdfb
- loopchannel 0, Music_LookPokemaniac_branch_ebdfb
+ loopchannel 4, .loop1
+ loopchannel 0, .mainloop
Music_LookPokemaniac_Ch2:
stereopanning $ff
@@ -39,7 +40,8 @@
note C_, 1
octave 1
note A_, 4
-Music_LookPokemaniac_branch_ebe24:
+.mainloop:
+.loop1:
octave 2
note C_, 2
note __, 2
@@ -56,8 +58,8 @@
note __, 3
note D#, 1
note __, 3
- loopchannel 2, Music_LookPokemaniac_branch_ebe24
-Music_LookPokemaniac_branch_ebe38:
+ loopchannel 2, .loop1
+.loop2:
octave 1
note A_, 2
note __, 2
@@ -75,8 +77,8 @@
octave 3
note C_, 1
note __, 3
- loopchannel 2, Music_LookPokemaniac_branch_ebe38
- loopchannel 0, Music_LookPokemaniac_branch_ebe24
+ loopchannel 2, .loop2
+ loopchannel 0, .mainloop
Music_LookPokemaniac_Ch3:
stereopanning $f0
@@ -90,14 +92,14 @@
octave 5
note C_, 4
intensity $10
-Music_LookPokemaniac_branch_ebe62:
- callchannel Music_LookPokemaniac_branch_ebe70
+.mainloop:
+ callchannel .sub1
intensity $14
- callchannel Music_LookPokemaniac_branch_ebe70
+ callchannel .sub1
intensity $10
- loopchannel 0, Music_LookPokemaniac_branch_ebe62
+ loopchannel 0, .mainloop
-Music_LookPokemaniac_branch_ebe70:
+.sub1:
note A#, 6
note A_, 2
note G#, 2
--- a/audio/music/lookrival.asm
+++ b/audio/music/lookrival.asm
@@ -33,8 +33,7 @@
note G#, 8
intensity $a6
note F#, 8
-Music_AfterTheRivalFight_branch_f4fb1:
-Music_LookRival_branch_f4fb1:
+.mainloop:
intensity $b5
note F_, 4
note D#, 2
@@ -98,7 +97,7 @@
note G#, 8
note F_, 6
note C_, 2
-Music_LookRival_branch_f4ff7:
+.loop1:
intensity $b2
note F_, 6
intensity $b7
@@ -106,7 +105,7 @@
note F#, 2
note F_, 2
note D#, 2
- loopchannel 3, Music_LookRival_branch_f4ff7
+ loopchannel 3, .loop1
intensity $b2
note F_, 2
note G#, 4
@@ -113,7 +112,7 @@
intensity $b7
note G#, 6
note F#, 4
- loopchannel 0, Music_LookRival_branch_f4fb1
+ loopchannel 0, .mainloop
Music_LookRival_Ch2:
dutycycle $3
@@ -136,8 +135,7 @@
note D#, 10
intensity $b7
note D#, 16
-Music_AfterTheRivalFight_branch_f502e:
-Music_LookRival_branch_f502e:
+.mainloop:
intensity $c7
note C_, 12
intensity $c4
@@ -190,7 +188,7 @@
note D#, 1
note D_, 1
note D#, 2
-Music_LookRival_branch_f5070:
+.loop1:
intensity $c2
note C_, 6
intensity $c7
@@ -197,12 +195,12 @@
note D#, 6
intensity $c2
note F_, 4
- loopchannel 3, Music_LookRival_branch_f5070
+ loopchannel 3, .loop1
note C_, 2
note D#, 4
intensity $c7
note D#, 10
- loopchannel 0, Music_LookRival_branch_f502e
+ loopchannel 0, .mainloop
Music_LookRival_Ch3:
notetype $c, $28
@@ -226,10 +224,10 @@
note C_, 2
note D#, 2
note F#, 2
-Music_AfterTheRivalFight_branch_f509d:
-Music_LookRival_branch_f509d:
- callchannel Music_LookRival_branch_f50ef
- loopchannel 3, Music_LookRival_branch_f509d
+.mainloop:
+.loop1:
+ callchannel .sub1
+ loopchannel 3, .loop1
note F_, 4
note C_, 2
note D#, 4
@@ -236,7 +234,7 @@
note G#, 2
note G_, 2
note F#, 2
- callchannel Music_LookRival_branch_f50f7
+ callchannel .sub2
note A#, 2
note F_, 2
note G_, 2
@@ -245,7 +243,7 @@
note G_, 2
note G#, 1
note A_, 1
- callchannel Music_LookRival_branch_f50ff
+ callchannel .sub3
note A#, 2
note F_, 2
note G_, 2
@@ -270,10 +268,10 @@
note A_, 2
note A#, 1
note A_, 1
- callchannel Music_LookRival_branch_f50f7
- callchannel Music_LookRival_branch_f50ff
- callchannel Music_LookRival_branch_f50ef
- callchannel Music_LookRival_branch_f50ef
+ callchannel .sub2
+ callchannel .sub3
+ callchannel .sub1
+ callchannel .sub1
note F_, 2
note C_, 2
note D_, 2
@@ -289,9 +287,9 @@
note C_, 2
note F#, 2
note E_, 2
- loopchannel 0, Music_LookRival_branch_f509d
+ loopchannel 0, .mainloop
-Music_LookRival_branch_f50ef:
+.sub1:
note F_, 2
note C_, 2
note D_, 2
@@ -301,7 +299,7 @@
note D#, 2
endchannel
-Music_LookRival_branch_f50f7:
+.sub2:
note A#, 2
note F_, 2
note G_, 2
@@ -311,7 +309,7 @@
note G#, 2
endchannel
-Music_LookRival_branch_f50ff:
+.sub3:
note A#, 4
note F_, 2
note G#, 4
@@ -336,8 +334,7 @@
note D_, 2
note D_, 2
note D_, 2
-Music_AfterTheRivalFight_branch_f5118:
-Music_LookRival_branch_f5118:
+.mainloop:
note D#, 4
note D_, 2
note D#, 4
@@ -349,4 +346,4 @@
note D#, 2
note D_, 2
note D_, 2
- loopchannel 0, Music_LookRival_branch_f5118
+ loopchannel 0, .mainloop
--- a/audio/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
@@ -15,26 +15,25 @@
octave 4
note C_, 1
note D_, 1
- callchannel Music_LookRocket_branch_f74e6
+ callchannel .sub1
dutycycle $1
-Music_LookRocket_branch_f74c7:
+.mainloop:
intensity $a8
- callchannel Music_LookRocket_branch_f74f7
- callchannel Music_LookRocket_branch_f758a
+ callchannel .sub2
+ callchannel Music_LookRocket_Ch2.sub5
octave 4
note F#, 1
note __, 1
intensity $53
- callchannel Music_LookRocket_branch_f750c
+ callchannel .sub3
intensity $c3
- callchannel Music_LookRocket_branch_f750c
+ callchannel .sub3
intensity $e3
- callchannel Music_LookRocket_branch_f750c
+ callchannel .sub3
note __, 16
- loopchannel 0, Music_LookRocket_branch_f74c7
+ loopchannel 0, .mainloop
-Music_LookRocket_branch_f74e6:
-Music_RocketTheme_branch_f74e6:
+.sub1:
note D#, 1
note __, 1
note D_, 1
@@ -53,8 +52,7 @@
note G#, 1
endchannel
-Music_LookRocket_branch_f74f7:
-Music_RocketTheme_branch_f74f7:
+.sub2:
note __, 2
octave 3
note D#, 1
@@ -77,8 +75,7 @@
note __, 1
endchannel
-Music_LookRocket_branch_f750c:
-Music_RocketTheme_branch_f750c:
+.sub3:
note __, 2
octave 2
note B_, 1
@@ -97,25 +94,24 @@
octave 5
note C_, 1
note D_, 1
- callchannel Music_LookRocket_branch_f7547
-Music_LookRocket_branch_f7526:
+ callchannel .sub1
+.mainloop:
intensity $b7
- callchannel Music_LookRocket_branch_f758a
+ callchannel .sub5
octave 5
note C_, 1
note __, 1
- callchannel Music_LookRocket_branch_f7554
+ callchannel .sub2
intensity $53
- callchannel Music_LookRocket_branch_f7568
+ callchannel .sub3
intensity $c3
- callchannel Music_LookRocket_branch_f7568
+ callchannel .sub3
intensity $e3
- callchannel Music_LookRocket_branch_f7568
- callchannel Music_LookRocket_branch_f756f
- loopchannel 0, Music_LookRocket_branch_f7526
+ callchannel .sub3
+ callchannel .sub4
+ loopchannel 0, .mainloop
-Music_LookRocket_branch_f7547:
-Music_RocketTheme_branch_f7547:
+.sub1:
note D#, 1
note __, 1
note D_, 1
@@ -129,8 +125,7 @@
dutycycle $0
endchannel
-Music_LookRocket_branch_f7554:
-Music_RocketTheme_branch_f7554:
+.sub2:
note __, 2
octave 4
note D#, 1
@@ -152,8 +147,7 @@
note __, 1
endchannel
-Music_LookRocket_branch_f7568:
-Music_RocketTheme_branch_f7568:
+.sub3:
note __, 2
octave 3
note F_, 1
@@ -162,8 +156,7 @@
note __, 5
endchannel
-Music_LookRocket_branch_f756f:
-Music_RocketTheme_branch_f756f:
+.sub4:
intensity $63
note G#, 1
note F_, 1
@@ -188,8 +181,7 @@
note D_, 1
endchannel
-Music_LookRocket_branch_f758a:
-Music_RocketTheme_branch_f758a:
+.sub5:
octave 3
note __, 2
note G_, 1
@@ -210,20 +202,19 @@
notetype $c, $14
stereopanning $f0
note __, 2
- callchannel Music_LookRocket_branch_f75bf
-Music_LookRocket_branch_f75a5:
- callchannel Music_LookRocket_branch_f75fe
- callchannel Music_LookRocket_branch_f75fe
+ callchannel .sub1
+.mainloop:
+ callchannel .sub4
+ callchannel .sub4
intensity $24
- callchannel Music_LookRocket_branch_f7623
+ callchannel .sub5
intensity $14
- callchannel Music_LookRocket_branch_f75cc
- callchannel Music_LookRocket_branch_f7623
- callchannel Music_LookRocket_branch_f75e1
- loopchannel 0, Music_LookRocket_branch_f75a5
+ callchannel .sub2
+ callchannel .sub5
+ callchannel .sub3
+ loopchannel 0, .mainloop
-Music_LookRocket_branch_f75bf:
-Music_RocketTheme_branch_f75bf:
+.sub1:
octave 3
note F_, 1
note __, 1
@@ -238,8 +229,7 @@
note D_, 6
endchannel
-Music_LookRocket_branch_f75cc:
-Music_RocketTheme_branch_f75cc:
+.sub2:
octave 2
note G#, 1
note __, 1
@@ -262,8 +252,7 @@
note __, 1
endchannel
-Music_LookRocket_branch_f75e1:
-Music_RocketTheme_branch_f75e1:
+.sub3:
intensity $24
octave 2
note G#, 1
@@ -292,8 +281,7 @@
note __, 1
endchannel
-Music_LookRocket_branch_f75fe:
-Music_RocketTheme_branch_f75fe:
+.sub4:
note C_, 1
note __, 1
octave 4
@@ -332,8 +320,7 @@
note __, 1
endchannel
-Music_LookRocket_branch_f7623:
-Music_RocketTheme_branch_f7623:
+.sub5:
octave 2
note G#, 1
note __, 1
@@ -360,20 +347,19 @@
togglenoise $3
notetype $c
note __, 2
- callchannel Music_LookRocket_branch_f765c
-Music_LookRocket_branch_f7640:
- callchannel Music_LookRocket_branch_f7664
- callchannel Music_LookRocket_branch_f7664
- callchannel Music_LookRocket_branch_f7664
- callchannel Music_LookRocket_branch_f7664
- callchannel Music_LookRocket_branch_f7664
- callchannel Music_LookRocket_branch_f7664
- callchannel Music_LookRocket_branch_f7664
- callchannel Music_LookRocket_branch_f765c
- loopchannel 0, Music_LookRocket_branch_f7640
+ callchannel .sub1
+.mainloop:
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_LookRocket_branch_f765c:
-Music_RocketTheme_branch_f765c:
+.sub1:
note C_, 8
note D_, 2
note D#, 2
@@ -383,8 +369,7 @@
note D_, 1
endchannel
-Music_LookRocket_branch_f7664:
-Music_RocketTheme_branch_f7664:
+.sub2:
note D#, 2
note F#, 2
note D_, 2
--- a/audio/music/looksage.asm
+++ b/audio/music/looksage.asm
@@ -10,7 +10,7 @@
notetype $c, $b3
note __, 2
note __, 16
- callchannel Music_LookSage_branch_ee3fa
+ callchannel .sub1
intensity $b3
octave 3
note D_, 2
@@ -28,7 +28,7 @@
note F_, 2
intensity $93
note F_, 2
-Music_LookSage_branch_ee38e:
+.mainloop:
intensity $b3
note D_, 2
intensity $93
@@ -98,10 +98,10 @@
note B_, 2
intensity $93
note B_, 2
- callchannel Music_LookSage_branch_ee3fa
- loopchannel 0, Music_LookSage_branch_ee38e
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_LookSage_branch_ee3fa:
+.sub1:
intensity $b3
octave 2
note E_, 2
@@ -141,7 +141,7 @@
note E_, 14
note G_, 1
note G#, 1
-Music_LookSage_branch_ee430:
+.mainloop:
note A_, 12
note B_, 4
note D_, 9
@@ -175,4 +175,4 @@
note E_, 14
note G_, 1
note G#, 1
- loopchannel 0, Music_LookSage_branch_ee430
+ loopchannel 0, .mainloop
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@@ -24,7 +24,7 @@
note __, 2
note C_, 6
intensity $b3
-Music_LookYoungster_branch_f66ea:
+.mainloop:
note __, 2
octave 3
note G_, 1
@@ -57,9 +57,9 @@
note C_, 1
note __, 1
note __, 16
- loopchannel 0, Music_LookYoungster_branch_f66ea
+ loopchannel 0, .mainloop
- db $ff
+ endchannel ; unused
Music_LookYoungster_Ch2:
stereopanning $f0
@@ -82,7 +82,7 @@
note F_, 4
note __, 2
note F#, 6
-Music_LookYoungster_branch_f672f:
+.mainloop:
dutycycle $3
intensity $b3
note __, 2
@@ -155,9 +155,9 @@
octave 4
note C_, 1
note __, 1
- loopchannel 0, Music_LookYoungster_branch_f672f
+ loopchannel 0, .mainloop
- db $ff
+ endchannel ; unused
Music_LookYoungster_Ch3:
stereopanning $ff
@@ -195,7 +195,7 @@
note __, 2
note G#, 6
intensity $25
-Music_LookYoungster_branch_f67ae:
+.mainloop:
octave 2
note G_, 1
note __, 1
@@ -290,6 +290,6 @@
note __, 1
note G#, 1
note __, 1
- loopchannel 0, Music_LookYoungster_branch_f67ae
+ loopchannel 0, .mainloop
- db $ff
+ endchannel ; unused
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@@ -239,14 +239,13 @@
note A#, 4
note D_, 2
note D_, 2
- callchannel Music_MagnetTrain_branch_ef71e
- callchannel Music_MagnetTrain_branch_ef71e
+ callchannel .sub2
+ callchannel .sub2
notetype $c
note B_, 16
endchannel
-; unused
-Music_MagnetTrain_branch_ef711:
+.sub1: ; unused
note G#, 1
note G_, 1
note G_, 1
@@ -261,7 +260,7 @@
note G_, 1
endchannel
-Music_MagnetTrain_branch_ef71e:
+.sub2:
note G#, 2
note G_, 2
note G_, 2
--- a/audio/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
@@ -14,7 +14,8 @@
notetype $c, $f
octave 3
note D_, 8
-Music_MainMenu_branch_f791d:
+.mainloop:
+.loop1:
notetype $c, $92
octave 3
note C#, 6
@@ -23,7 +24,7 @@
note C#, 2
note C#, 2
note C#, 4
- loopchannel 2, Music_MainMenu_branch_f791d
+ loopchannel 2, .loop1
note D#, 6
note D#, 1
note D#, 1
@@ -39,7 +40,7 @@
notetype $c, $94
octave 3
note C_, 4
- loopchannel 0, Music_MainMenu_branch_f791d
+ loopchannel 0, .mainloop
Music_MainMenu_Ch2:
dutycycle $3
@@ -47,7 +48,8 @@
notetype $c, $f
octave 3
note G_, 8
-Music_MainMenu_branch_f7949:
+.mainloop:
+.loop1:
notetype $c, $a2
note F#, 6
note F#, 1
@@ -55,7 +57,7 @@
note F#, 2
note F#, 2
note F#, 4
- loopchannel 2, Music_MainMenu_branch_f7949
+ loopchannel 2, .loop1
note G#, 6
note G#, 1
note G#, 1
@@ -69,13 +71,14 @@
note E_, 2
notetype $c, $a4
note F_, 4
- loopchannel 0, Music_MainMenu_branch_f7949
+ loopchannel 0, .mainloop
Music_MainMenu_Ch3:
stereopanning $f0
notetype $c, $25
note __, 8
-Music_MainMenu_branch_f796f:
+.mainloop:
+.loop1:
octave 2
note F#, 1
note __, 5
@@ -87,7 +90,7 @@
note __, 1
note F#, 1
note __, 3
- loopchannel 2, Music_MainMenu_branch_f796f
+ loopchannel 2, .loop1
note G#, 1
note __, 5
note G#, 1
@@ -108,7 +111,7 @@
note __, 1
note F_, 1
note __, 3
- loopchannel 0, Music_MainMenu_branch_f796f
+ loopchannel 0, .mainloop
Music_MainMenu_Ch4:
stereopanning $f
@@ -123,7 +126,7 @@
note D_, 1
note D_, 1
note D_, 1
-Music_MainMenu_branch_f79a5:
+.mainloop:
note D_, 6
note D_, 1
note D_, 1
@@ -139,4 +142,4 @@
note D#, 1
note D_, 1
note D_, 1
- loopchannel 0, Music_MainMenu_branch_f79a5
+ loopchannel 0, .mainloop
--- a/audio/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
@@ -22,8 +22,8 @@
note D_, 1
note __, 1
note C#, 4
-Music_MobileAdapter_branch_1fcad:
- callchannel Music_MobileAdapter_branch_1fd39
+.mainloop:
+ callchannel .sub1
note D_, 1
note C#, 1
note D_, 2
@@ -37,7 +37,7 @@
note D_, 1
note C#, 1
note D_, 2
- callchannel Music_MobileAdapter_branch_1fd39
+ callchannel .sub1
note D_, 1
note C#, 1
octave 3
@@ -144,10 +144,10 @@
octave 3
note D_, 4
intensity $77
- callchannel Music_MobileAdapter_branch_1ff09
- loopchannel 0, Music_MobileAdapter_branch_1fcad
+ callchannel Music_MobileAdapter_Ch3.sub5
+ loopchannel 0, .mainloop
-Music_MobileAdapter_branch_1fd39:
+.sub1:
intensity $94
octave 4
note F#, 1
@@ -213,8 +213,8 @@
octave 4
note D_, 1
note F#, 1
-Music_MobileAdapter_branch_1fd80:
- callchannel Music_MobileAdapter_branch_1fdfe
+.mainloop:
+ callchannel .sub1
note A_, 4
note G_, 4
note A_, 4
@@ -223,7 +223,7 @@
note __, 2
note D_, 1
note F#, 1
- callchannel Music_MobileAdapter_branch_1fdfe
+ callchannel .sub1
octave 5
note C#, 4
octave 4
@@ -306,7 +306,7 @@
note D_, 16
dutycycle $1
intensity $71
- callchannel Music_MobileAdapter_branch_1fe16
+ callchannel .sub2
octave 4
note E_, 1
note A_, 1
@@ -313,7 +313,7 @@
octave 5
note C#, 1
note E_, 1
- callchannel Music_MobileAdapter_branch_1fe16
+ callchannel .sub2
note __, 2
dutycycle $2
intensity $b4
@@ -320,9 +320,9 @@
octave 4
note D_, 1
note F#, 1
- loopchannel 0, Music_MobileAdapter_branch_1fd80
+ loopchannel 0, .mainloop
-Music_MobileAdapter_branch_1fdfe:
+.sub1:
note A_, 1
note __, 1
note A_, 1
@@ -348,7 +348,7 @@
note B_, 2
endchannel
-Music_MobileAdapter_branch_1fe16:
+.sub2:
octave 5
note F#, 1
note D_, 1
@@ -406,10 +406,10 @@
note E_, 1
note __, 1
note A_, 4
-Music_MobileAdapter_branch_1fe4f:
- callchannel Music_MobileAdapter_branch_1fecf
- callchannel Music_MobileAdapter_branch_1fee3
- callchannel Music_MobileAdapter_branch_1feee
+.mainloop:
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub3
note D_, 1
note __, 1
octave 2
@@ -420,16 +420,16 @@
octave 3
note C#, 1
note __, 1
- callchannel Music_MobileAdapter_branch_1fecf
- callchannel Music_MobileAdapter_branch_1fee3
- callchannel Music_MobileAdapter_branch_1feee
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub3
note D_, 2
octave 2
note A_, 2
octave 3
note D_, 4
- callchannel Music_MobileAdapter_branch_1fee3
- callchannel Music_MobileAdapter_branch_1fef7
+ callchannel .sub2
+ callchannel .sub4
note B_, 1
note __, 1
octave 3
@@ -452,7 +452,7 @@
note __, 1
note B_, 1
note __, 1
- callchannel Music_MobileAdapter_branch_1fef7
+ callchannel .sub4
octave 3
note D_, 1
note __, 1
@@ -494,7 +494,7 @@
octave 3
note G_, 1
note __, 1
- callchannel Music_MobileAdapter_branch_1fee3
+ callchannel .sub2
note D_, 1
note __, 1
note A_, 1
@@ -508,17 +508,18 @@
note A_, 2
octave 3
note D_, 4
- callchannel Music_MobileAdapter_branch_1ff09
- loopchannel 0, Music_MobileAdapter_branch_1fe4f
+ callchannel .sub5
+ loopchannel 0, .mainloop
-Music_MobileAdapter_branch_1fecf:
+.sub1:
+.sub1loop1:
octave 3
note D_, 1
note __, 1
note A_, 1
note __, 1
- loopchannel 4, Music_MobileAdapter_branch_1fecf
-Music_MobileAdapter_branch_1fed8:
+ loopchannel 4, .sub1loop1
+.sub1loop2:
octave 2
note G_, 1
note __, 1
@@ -525,10 +526,11 @@
octave 3
note D_, 1
note __, 1
- loopchannel 4, Music_MobileAdapter_branch_1fed8
+ loopchannel 4, .sub1loop2
endchannel
-Music_MobileAdapter_branch_1fee3:
+.sub2:
+.sub2loop1:
octave 2
note A_, 1
note __, 1
@@ -535,10 +537,10 @@
octave 3
note E_, 1
note __, 1
- loopchannel 4, Music_MobileAdapter_branch_1fee3
+ loopchannel 4, .sub2loop1
endchannel
-Music_MobileAdapter_branch_1feee:
+.sub3:
note D_, 1
note __, 1
note A_, 1
@@ -549,7 +551,7 @@
note __, 1
endchannel
-Music_MobileAdapter_branch_1fef7:
+.sub4:
octave 2
note A_, 1
note __, 1
@@ -569,7 +571,8 @@
note A_, 4
endchannel
-Music_MobileAdapter_branch_1ff09:
+.sub5:
+.sub5loop1:
octave 2
note A_, 1
note __, 1
@@ -600,7 +603,7 @@
octave 2
note A_, 2
note __, 6
- loopchannel 2, Music_MobileAdapter_branch_1ff09
+ loopchannel 2, .sub5loop1
endchannel
Music_MobileAdapter_Ch4:
@@ -613,10 +616,10 @@
note D_, 2
note D_, 1
note D_, 1
-Music_MobileAdapter_branch_1ff38:
- callchannel Music_MobileAdapter_branch_1ff60
- callchannel Music_MobileAdapter_branch_1ff60
-Music_MobileAdapter_branch_1ff3e:
+.mainloop:
+ callchannel .sub1
+ callchannel .sub1
+.loop1:
note __, 4
note D_, 8
note D_, 8
@@ -624,11 +627,11 @@
note D_, 1
note D_, 3
note D_, 4
- loopchannel 2, Music_MobileAdapter_branch_1ff3e
-Music_MobileAdapter_branch_1ff49:
+ loopchannel 2, .loop1
+.loop2:
note __, 4
note D_, 4
- loopchannel 11, Music_MobileAdapter_branch_1ff49
+ loopchannel 11, .loop2
note __, 2
note D_, 2
note D_, 2
@@ -642,12 +645,13 @@
note D_, 2
note D_, 1
note D_, 1
- loopchannel 0, Music_MobileAdapter_branch_1ff38
+ loopchannel 0, .mainloop
-Music_MobileAdapter_branch_1ff60:
+.sub1:
+.sub1loop1:
note __, 4
note D_, 4
- loopchannel 7, Music_MobileAdapter_branch_1ff60
+ loopchannel 7, .sub1loop1
note __, 2
note D_, 2
note D_, 2
--- a/audio/music/mobileadaptermenu.asm
+++ b/audio/music/mobileadaptermenu.asm
@@ -11,9 +11,9 @@
dutycycle $2
notetype $c, $66
note __, 2
-Music_MobileAdapterMenu_branch_178038:
- callchannel Music_MobileAdapterMenu_branch_178057
- callchannel Music_MobileAdapterMenu_branch_178076
+.mainloop:
+ callchannel .sub1
+ callchannel .sub2
octave 3
note F#, 4
note B_, 4
@@ -21,7 +21,7 @@
note B_, 1
note __, 1
note D#, 4
- callchannel Music_MobileAdapterMenu_branch_178076
+ callchannel .sub2
octave 3
note F#, 2
octave 2
@@ -30,10 +30,10 @@
note D#, 3
note E_, 1
note D#, 8
- callchannel Music_MobileAdapterMenu_branch_178057
- loopchannel 0, Music_MobileAdapterMenu_branch_178038
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_MobileAdapterMenu_branch_178057:
+.sub1:
octave 3
note G#, 7
octave 4
@@ -66,7 +66,7 @@
note G#, 8
endchannel
-Music_MobileAdapterMenu_branch_178076:
+.sub2:
note E_, 1
note __, 1
note A_, 1
@@ -89,16 +89,16 @@
octave 4
note E_, 1
note G#, 1
-Music_MobileAdapterMenu_branch_17808e:
- callchannel Music_MobileAdapterMenu_branch_1780ae
+.mainloop:
+ callchannel .sub1
note E_, 8
- callchannel Music_MobileAdapterMenu_branch_1780d7
+ callchannel .sub2
note D#, 2
note C#, 2
note D#, 3
note E_, 1
note F#, 8
- callchannel Music_MobileAdapterMenu_branch_1780d7
+ callchannel .sub2
note D#, 2
note E_, 2
note F#, 3
@@ -106,13 +106,13 @@
note F#, 6
note E_, 1
note G#, 1
- callchannel Music_MobileAdapterMenu_branch_1780ae
+ callchannel .sub1
note E_, 6
note E_, 1
note G#, 1
- loopchannel 0, Music_MobileAdapterMenu_branch_17808e
+ loopchannel 0, .mainloop
-Music_MobileAdapterMenu_branch_1780ae:
+.sub1:
octave 4
note B_, 1
note __, 1
@@ -155,7 +155,7 @@
note D#, 1
endchannel
-Music_MobileAdapterMenu_branch_1780d7:
+.sub2:
note A_, 1
note __, 1
note A_, 1
@@ -172,12 +172,12 @@
vibrato $8, $34
notetype $c, $25
note __, 2
-Music_MobileAdapterMenu_branch_1780e9:
- callchannel Music_MobileAdapterMenu_branch_178119
+.mainloop:
+ callchannel .sub1
octave 2
note B_, 1
note G#, 1
- callchannel Music_MobileAdapterMenu_branch_178146
+ callchannel .sub2
octave 2
note B_, 2
note __, 2
@@ -192,7 +192,7 @@
note B_, 2
note F#, 1
note G#, 1
- callchannel Music_MobileAdapterMenu_branch_178146
+ callchannel .sub2
octave 2
note B_, 2
note __, 2
@@ -207,11 +207,11 @@
note D#, 1
note __, 1
note F#, 4
- callchannel Music_MobileAdapterMenu_branch_178119
+ callchannel .sub1
note __, 2
- loopchannel 0, Music_MobileAdapterMenu_branch_1780e9
+ loopchannel 0, .mainloop
-Music_MobileAdapterMenu_branch_178119:
+.sub1:
octave 3
note E_, 2
note __, 2
@@ -256,7 +256,7 @@
intensity $25
endchannel
-Music_MobileAdapterMenu_branch_178146:
+.sub2:
note A_, 2
note __, 2
octave 3
--- a/audio/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
@@ -19,7 +19,7 @@
note G_, 2
note A_, 2
note B_, 4
-Music_MobileCenter_branch_179642:
+.mainloop:
octave 3
note E_, 2
note C_, 2
@@ -154,7 +154,7 @@
note D_, 2
note E_, 2
note F_, 2
- loopchannel 0, Music_MobileCenter_branch_179642
+ loopchannel 0, .mainloop
Music_MobileCenter_Ch2:
notetype $c, $c2
@@ -164,7 +164,7 @@
note G_, 2
note A_, 2
note B_, 2
-Music_MobileCenter_branch_1796d6:
+.mainloop:
octave 2
note C_, 2
note E_, 2
@@ -322,7 +322,7 @@
note F_, 2
note E_, 2
note D_, 2
- loopchannel 0, Music_MobileCenter_branch_1796d6
+ loopchannel 0, .mainloop
Music_MobileCenter_Ch3:
notetype $c, $24
@@ -336,7 +336,7 @@
note C_, 2
note D_, 4
notetype $c, $25
-Music_MobileCenter_branch_179788:
+.mainloop:
note C_, 2
octave 4
note G_, 2
@@ -448,7 +448,7 @@
note D_, 2
note C_, 8
vibrato $10, $34
- loopchannel 0, Music_MobileCenter_branch_179788
+ loopchannel 0, .mainloop
Music_MobileCenter_Ch4:
togglenoise $3
@@ -460,7 +460,8 @@
note C#, 1
note C#, 1
note C#, 1
-Music_MobileCenter_branch_179813:
+.mainloop:
+.loop1:
note A_, 2
note C#, 2
note C#, 2
@@ -469,7 +470,7 @@
note C#, 2
note D_, 2
note C#, 2
- loopchannel 3, Music_MobileCenter_branch_179813
+ loopchannel 3, .loop1
note A_, 2
note C#, 2
note C#, 2
@@ -480,4 +481,4 @@
note C#, 1
note C#, 1
note C#, 1
- loopchannel 0, Music_MobileCenter_branch_179813
+ loopchannel 0, .mainloop
--- a/audio/music/mom.asm
+++ b/audio/music/mom.asm
@@ -16,7 +16,7 @@
note G#, 1
note A_, 1
note B_, 8
-Music_Mom_branch_f6c0e:
+.mainloop:
notetype $c, $b1
note __, 4
octave 3
@@ -29,7 +29,7 @@
note E_, 4
note A#, 2
note B_, 2
- loopchannel 0, Music_Mom_branch_f6c0e
+ loopchannel 0, .mainloop
Music_Mom_Ch3:
stereopanning $f0
@@ -42,7 +42,7 @@
note G#, 1
note E_, 8
intensity $23
-Music_Mom_branch_f6c2e:
+.mainloop:
octave 2
note A_, 2
note __, 6
@@ -74,13 +74,13 @@
note C#, 4
note D_, 2
note __, 2
- loopchannel 0, Music_Mom_branch_f6c2e
+ loopchannel 0, .mainloop
Music_Mom_Ch4:
togglenoise $3
notetype $c
note __, 6
-Music_Mom_branch_f6c56:
+.mainloop:
note D#, 1
note __, 1
note F#, 2
@@ -105,4 +105,4 @@
note D_, 2
note D#, 1
note __, 1
- loopchannel 0, Music_Mom_branch_f6c56
+ loopchannel 0, .mainloop
--- a/audio/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
@@ -13,7 +13,7 @@
stereopanning $f0
notetype $c, $45
note __, 2
- loopchannel 0, Music_MtMoon_branch_edb56
+ loopchannel 0, Music_MtMoon_Ch2.mainloop
Music_MtMoon_Ch2:
vibrato $b, $15
@@ -20,7 +20,7 @@
dutycycle $2
notetype $c, $84
stereopanning $f
-Music_MtMoon_branch_edb56:
+.mainloop:
octave 4
note D#, 6
note C#, 6
@@ -69,12 +69,12 @@
note E_, 6
note F#, 6
note E_, 4
- loopchannel 0, Music_MtMoon_branch_edb56
+ loopchannel 0, .mainloop
Music_MtMoon_Ch3:
-Music_MtMoon_branch_edb8a:
+.mainloop:
notetype $c, $28
-Music_MtMoon_branch_edb8d:
+.loop1:
octave 2
note B_, 2
octave 3
@@ -89,7 +89,7 @@
note B_, 2
octave 3
note D#, 2
- loopchannel 3, Music_MtMoon_branch_edb8d
+ loopchannel 3, .loop1
octave 2
note B_, 2
octave 3
@@ -102,7 +102,7 @@
note G_, 2
note D#, 2
note E_, 2
-Music_MtMoon_branch_edbab:
+.loop2:
note E_, 2
note G#, 2
octave 4
@@ -115,13 +115,13 @@
octave 3
note E_, 2
note G#, 2
- loopchannel 4, Music_MtMoon_branch_edbab
- loopchannel 0, Music_MtMoon_branch_edb8a
+ loopchannel 4, .loop2
+ loopchannel 0, .mainloop
Music_MtMoon_Ch4:
togglenoise $5
notetype $c
-Music_MtMoon_branch_edbc3:
+.mainloop:
stereopanning $f
note A#, 4
note A#, 8
@@ -135,4 +135,4 @@
note A#, 4
stereopanning $f0
note A#, 8
- loopchannel 0, Music_MtMoon_branch_edbc3
+ loopchannel 0, .mainloop
--- a/audio/music/mtmoonsquare.asm
+++ b/audio/music/mtmoonsquare.asm
@@ -8,9 +8,9 @@
dutycycle $2
tone $0001
note __, 1
-Music_MtMoonSquare_branch_f4826:
+.mainloop:
notetype $c, $44
-Music_MtMoonSquare_branch_f4829:
+.loop1:
octave 4
note D_, 2
note E_, 2
@@ -19,8 +19,8 @@
note A_, 2
octave 5
note D_, 4
- loopchannel 2, Music_MtMoonSquare_branch_f4829
-Music_MtMoonSquare_branch_f4835:
+ loopchannel 2, .loop1
+.loop2:
octave 4
note E_, 2
note F#, 2
@@ -29,8 +29,8 @@
note B_, 2
octave 5
note E_, 4
- loopchannel 2, Music_MtMoonSquare_branch_f4835
-Music_MtMoonSquare_branch_f4841:
+ loopchannel 2, .loop2
+.loop3:
octave 4
note C#, 2
note D_, 2
@@ -39,8 +39,8 @@
note G_, 2
octave 5
note C#, 4
- loopchannel 2, Music_MtMoonSquare_branch_f4841
-Music_MtMoonSquare_branch_f484d:
+ loopchannel 2, .loop3
+.loop4:
octave 4
note D_, 2
note E_, 2
@@ -49,15 +49,15 @@
note A_, 2
octave 5
note D_, 4
- loopchannel 2, Music_MtMoonSquare_branch_f484d
- loopchannel 0, Music_MtMoonSquare_branch_f4826
+ loopchannel 2, .loop4
+ loopchannel 0, .mainloop
Music_MtMoonSquare_Ch2:
dutycycle $2
vibrato $18, $24
-Music_MtMoonSquare_branch_f4862:
+.mainloop:
notetype $c, $82
-Music_MtMoonSquare_branch_f4865:
+.loop1:
octave 4
note D_, 2
note E_, 2
@@ -67,9 +67,9 @@
octave 5
note D_, 4
notetype $c, $62
- loopchannel 2, Music_MtMoonSquare_branch_f4865
+ loopchannel 2, .loop1
notetype $c, $82
-Music_MtMoonSquare_branch_f4877:
+.loop2:
octave 4
note E_, 2
note F#, 2
@@ -79,9 +79,9 @@
octave 5
note E_, 4
notetype $c, $62
- loopchannel 2, Music_MtMoonSquare_branch_f4877
+ loopchannel 2, .loop2
notetype $c, $82
-Music_MtMoonSquare_branch_f4889:
+.loop3:
octave 4
note C#, 2
note D_, 2
@@ -91,9 +91,9 @@
octave 5
note C#, 4
notetype $c, $62
- loopchannel 2, Music_MtMoonSquare_branch_f4889
+ loopchannel 2, .loop3
notetype $c, $82
-Music_MtMoonSquare_branch_f489b:
+.loop4:
octave 4
note D_, 2
note E_, 2
@@ -103,5 +103,5 @@
octave 5
note D_, 4
notetype $c, $62
- loopchannel 2, Music_MtMoonSquare_branch_f489b
- loopchannel 0, Music_MtMoonSquare_branch_f4862
+ loopchannel 2, .loop4
+ loopchannel 0, .mainloop
--- a/audio/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
@@ -12,11 +12,11 @@
dutycycle $1
notetype $c, $77
note __, 2
-Music_NationalPark_branch_f5504:
- callchannel Music_NationalPark_branch_f554a
- callchannel Music_NationalPark_branch_f554a
+.mainloop:
+ callchannel .sub1
+ callchannel .sub1
notetype $6, $67
- callchannel Music_NationalPark_branch_f563a
+ callchannel .sub2
notetype $c, $77
note __, 16
octave 2
@@ -44,7 +44,7 @@
note __, 3
note D_, 1
note __, 1
- callchannel Music_NationalPark_branch_f563a
+ callchannel .sub2
intensity $77
octave 3
note E_, 1
@@ -60,9 +60,9 @@
note D_, 7
notetype $c, $77
note __, 4
- loopchannel 0, Music_NationalPark_branch_f5504
+ loopchannel 0, .mainloop
-Music_NationalPark_branch_f554a:
+.sub1:
octave 2
note G#, 6
octave 3
@@ -269,7 +269,7 @@
note A#, 2
endchannel
-Music_NationalPark_branch_f563a:
+.sub2:
note __, 16
note __, 3
octave 4
@@ -301,12 +301,12 @@
notetype $c, $a7
note __, 2
stereopanning $f0
-Music_NationalPark_branch_f565d:
+.mainloop:
notetype $c, $a7
- callchannel Music_NationalPark_branch_f56b8
+ callchannel .sub1
octave 3
note D_, 8
- callchannel Music_NationalPark_branch_f56b8
+ callchannel .sub1
note __, 2
intensity $a7
octave 4
@@ -314,7 +314,7 @@
note F#, 2
note F_, 2
notetype $6, $a7
- callchannel Music_NationalPark_branch_f56f5
+ callchannel .sub2
octave 3
note B_, 1
octave 4
@@ -346,7 +346,7 @@
note G#, 1
note __, 1
intensity $a7
- callchannel Music_NationalPark_branch_f56f5
+ callchannel .sub2
octave 3
note B_, 1
octave 4
@@ -368,9 +368,9 @@
octave 2
note D#, 2
note D_, 2
- loopchannel 0, Music_NationalPark_branch_f565d
+ loopchannel 0, .mainloop
-Music_NationalPark_branch_f56b8:
+.sub1:
octave 2
note C#, 6
note G#, 2
@@ -433,7 +433,7 @@
note F_, 2
endchannel
-Music_NationalPark_branch_f56f5:
+.sub2:
octave 4
note E_, 1
note F_, 5
@@ -484,25 +484,25 @@
note G#, 1
note A#, 1
stereopanning $ff
-Music_NationalPark_branch_f572e:
- callchannel Music_NationalPark_branch_f5756
+.mainloop:
+ callchannel .sub1
octave 5
note A#, 14
octave 4
note G#, 1
note A#, 1
- callchannel Music_NationalPark_branch_f5756
+ callchannel .sub1
octave 5
note A#, 8
octave 4
note D_, 8
intensity $15
- callchannel Music_NationalPark_branch_f578f
+ callchannel .sub2
octave 4
note D_, 1
octave 3
note F_, 3
- callchannel Music_NationalPark_branch_f578f
+ callchannel .sub2
octave 4
note D_, 1
octave 3
@@ -511,9 +511,9 @@
octave 4
note G#, 1
note A#, 1
- loopchannel 0, Music_NationalPark_branch_f572e
+ loopchannel 0, .mainloop
-Music_NationalPark_branch_f5756:
+.sub1:
octave 5
note C_, 16
note C#, 14
@@ -572,7 +572,7 @@
note C_, 2
endchannel
-Music_NationalPark_branch_f578f:
+.sub2:
octave 2
note F#, 3
octave 3
@@ -619,9 +619,10 @@
togglenoise $3
notetype $c
note __, 2
-Music_NationalPark_branch_f57bd:
+.mainloop:
+.loop1:
note __, 16
- loopchannel 23, Music_NationalPark_branch_f57bd
+ loopchannel 23, .loop1
note __, 8
note A#, 2
note D_, 2
@@ -628,7 +629,7 @@
note A#, 1
note D_, 1
note B_, 2
-Music_NationalPark_branch_f57c8:
+.loop2:
note A#, 2
note G_, 1
note G_, 1
@@ -640,7 +641,7 @@
note G_, 1
note D_, 2
note B_, 2
- loopchannel 7, Music_NationalPark_branch_f57c8
+ loopchannel 7, .loop2
note A#, 2
note G_, 1
note G_, 1
@@ -654,4 +655,4 @@
note D_, 1
note A#, 1
note D#, 1
- loopchannel 0, Music_NationalPark_branch_f57bd
+ loopchannel 0, .mainloop
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@@ -3,7 +3,7 @@
musicheader 1, 2, Music_NewBarkTown_Ch2
musicheader 1, 3, Music_NewBarkTown_Ch3
- db $3
+ db $3 ; unused
Music_NewBarkTown_Ch1:
tempo 187
@@ -12,9 +12,9 @@
vibrato $12, $23
notetype $c, $87
note __, 4
-Music_NewBarkTown_branch_eb2eb:
+.mainloop:
dutycycle $0
- callchannel Music_NewBarkTown_branch_eb349
+ callchannel .sub1
octave 3
note C#, 1
note __, 1
@@ -37,7 +37,7 @@
note G_, 1
dutycycle $0
intensity $87
- callchannel Music_NewBarkTown_branch_eb349
+ callchannel .sub1
octave 3
note C#, 1
note __, 1
@@ -63,9 +63,9 @@
note A_, 1
dutycycle $1
intensity $5e
- callchannel Music_NewBarkTown_branch_eb37c
- callchannel Music_NewBarkTown_branch_eb37c
- callchannel Music_NewBarkTown_branch_eb37c
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
octave 2
note G_, 2
note B_, 2
@@ -83,9 +83,9 @@
note A_, 4
note B_, 2
intensity $87
- loopchannel 0, Music_NewBarkTown_branch_eb2eb
+ loopchannel 0, .mainloop
-Music_NewBarkTown_branch_eb349:
+.sub1:
octave 3
note F#, 1
note __, 1
@@ -138,7 +138,7 @@
note __, 1
endchannel
-Music_NewBarkTown_branch_eb37c:
+.sub2:
octave 2
note G_, 2
note B_, 2
@@ -162,12 +162,12 @@
vibrato $12, $23
notetype $6, $a7
note __, 8
-Music_NewBarkTown_branch_eb396:
+.mainloop:
dutycycle $2
notetype $6, $a7
- callchannel Music_NewBarkTown_branch_eb3bf
- callchannel Music_NewBarkTown_branch_eb3bf
- callchannel Music_NewBarkTown_branch_eb3f2
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
intensity $87
octave 5
note B_, 6
@@ -176,7 +176,7 @@
octave 6
note D_, 4
note C#, 16
- callchannel Music_NewBarkTown_branch_eb3f2
+ callchannel .sub2
intensity $87
octave 5
note B_, 6
@@ -185,9 +185,9 @@
octave 6
note D_, 4
note E_, 16
- loopchannel 0, Music_NewBarkTown_branch_eb396
+ loopchannel 0, .mainloop
-Music_NewBarkTown_branch_eb3bf:
+.sub1:
octave 2
note D_, 4
note __, 8
@@ -240,7 +240,7 @@
note C#, 4
endchannel
-Music_NewBarkTown_branch_eb3f2:
+.sub2:
notetype $6, $97
dutycycle $2
octave 4
@@ -257,7 +257,7 @@
octave 5
note D_, 2
note E_, 2
-Music_NewBarkTown_branch_eb408:
+.mainloop:
vibrato $16, $23
note F#, 4
note A_, 4
@@ -321,4 +321,4 @@
octave 5
note D_, 1
note E_, 1
- loopchannel 0, Music_NewBarkTown_branch_eb408
+ loopchannel 0, .mainloop
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -9,7 +9,7 @@
vibrato $12, $24
tone $0001
stereopanning $f
-Music_PalletTown_branch_f4b22:
+.mainloop:
dutycycle $2
notetype $c, $78
octave 3
@@ -59,7 +59,7 @@
note B_, 8
intensity $77
note B_, 8
-Music_PalletTown_branch_f4b59:
+.loop1:
dutycycle $3
intensity $92
note G_, 2
@@ -82,7 +82,7 @@
note C_, 2
octave 3
note B_, 2
- loopchannel 2, Music_PalletTown_branch_f4b59
+ loopchannel 2, .loop1
intensity $3f
octave 4
note C_, 4
@@ -116,13 +116,13 @@
note G_, 1
intensity $1f
note F#, 8
- loopchannel 0, Music_PalletTown_branch_f4b22
+ loopchannel 0, .mainloop
Music_PalletTown_Ch2:
vibrato $12, $44
dutycycle $2
stereopanning $f0
-Music_PalletTown_branch_f4ba8:
+.mainloop:
notetype $c, $88
octave 1
note G_, 2
@@ -182,7 +182,7 @@
octave 3
note C_, 2
note D_, 2
-Music_PalletTown_branch_f4be5:
+.loop1:
intensity $a2
octave 3
note E_, 2
@@ -206,7 +206,7 @@
note G_, 3
note D_, 2
note G_, 4
- loopchannel 2, Music_PalletTown_branch_f4be5
+ loopchannel 2, .loop1
note C_, 2
octave 3
note E_, 4
@@ -241,11 +241,11 @@
octave 1
note B_, 2
note A_, 2
- loopchannel 0, Music_PalletTown_branch_f4ba8
+ loopchannel 0, .mainloop
Music_PalletTown_Ch3:
vibrato $14, $24
-Music_PalletTown_branch_f4c2d:
+.mainloop:
notetype $c, $10
octave 6
note D_, 2
@@ -354,4 +354,4 @@
note __, 1
note B_, 8
note A_, 8
- loopchannel 0, Music_PalletTown_branch_f4c2d
+ loopchannel 0, .mainloop
--- a/audio/music/pokeflutechannel.asm
+++ b/audio/music/pokeflutechannel.asm
@@ -29,7 +29,7 @@
octave 2
note G_, 4
note A_, 8
-Music_PokeFluteChannel_branch_f7b40:
+.mainloop:
octave 3
note E_, 2
note G_, 2
@@ -66,7 +66,7 @@
octave 2
note G_, 4
note A_, 8
- loopchannel 0, Music_PokeFluteChannel_branch_f7b40
+ loopchannel 0, .mainloop
Music_PokeFluteChannel_Ch2:
stereopanning $f
@@ -105,7 +105,7 @@
octave 2
note E_, 2
note G_, 2
-Music_PokeFluteChannel_branch_f7b94:
+.mainloop:
octave 3
note C_, 2
note E_, 2
@@ -167,14 +167,14 @@
octave 2
note E_, 2
note G_, 2
- loopchannel 0, Music_PokeFluteChannel_branch_f7b94
+ loopchannel 0, .mainloop
Music_PokeFluteChannel_Ch3:
vibrato $10, $14
notetype $c, $10
- callchannel Music_PokeFluteChannel_branch_f7c05
- callchannel Music_PokeFluteChannel_branch_f7c05
-Music_PokeFluteChannel_branch_f7be1:
+ callchannel .sub1
+ callchannel .sub1
+.mainloop:
note __, 4
octave 4
note C_, 2
@@ -204,10 +204,10 @@
note F#, 2
note G_, 8
note __, 4
- callchannel Music_PokeFluteChannel_branch_f7c05
- loopchannel 0, Music_PokeFluteChannel_branch_f7be1
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_PokeFluteChannel_branch_f7c05:
+.sub1:
octave 5
note E_, 2
note F_, 2
--- a/audio/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
@@ -10,7 +10,7 @@
dutycycle $2
vibrato $a, $14
tone $0001
-Music_PokemonCenter_branch_ed5df:
+.mainloop:
stereopanning $f
notetype $c, $83
octave 3
@@ -147,13 +147,13 @@
note E_, 2
note F#, 2
note G_, 2
- loopchannel 0, Music_PokemonCenter_branch_ed5df
+ loopchannel 0, .mainloop
Music_PokemonCenter_Ch2:
vibrato $10, $25
-Music_PokemonCenter_branch_ed674:
+.mainloop:
stereopanning $ff
- callchannel Music_PokemonCenter_branch_ed6d1
+ callchannel .sub1
stereopanning $f
notetype $c, $a5
octave 3
@@ -160,7 +160,7 @@
note A_, 4
note E_, 4
stereopanning $ff
- callchannel Music_PokemonCenter_branch_ed6e4
+ callchannel .sub2
note D_, 2
note F#, 6
stereopanning $f
@@ -169,7 +169,7 @@
note A_, 4
note E_, 4
stereopanning $ff
- callchannel Music_PokemonCenter_branch_ed6d1
+ callchannel .sub1
stereopanning $f
notetype $c, $a5
octave 3
@@ -176,7 +176,7 @@
note A_, 4
note E_, 4
stereopanning $ff
- callchannel Music_PokemonCenter_branch_ed6e4
+ callchannel .sub2
note D_, 8
stereopanning $f
notetype $c, $a5
@@ -215,9 +215,9 @@
note F#, 2
note E_, 2
note D_, 8
- loopchannel 0, Music_PokemonCenter_branch_ed674
+ loopchannel 0, .mainloop
-Music_PokemonCenter_branch_ed6d1:
+.sub1:
dutycycle $2
notetype $c, $c2
octave 4
@@ -234,7 +234,7 @@
note C#, 6
endchannel
-Music_PokemonCenter_branch_ed6e4:
+.sub2:
notetype $c, $c2
octave 4
note C#, 2
@@ -250,7 +250,7 @@
Music_PokemonCenter_Ch3:
notetype $c, $28
-Music_PokemonCenter_branch_ed6f6:
+.mainloop:
stereopanning $f0
octave 3
note D_, 1
@@ -263,8 +263,8 @@
note __, 1
note F#, 1
note __, 1
- callchannel Music_PokemonCenter_branch_ed76f
- callchannel Music_PokemonCenter_branch_ed778
+ callchannel .sub1
+ callchannel .sub2
note F#, 1
note __, 5
note A_, 1
@@ -285,8 +285,8 @@
note __, 1
note F#, 1
note __, 1
- callchannel Music_PokemonCenter_branch_ed76f
- callchannel Music_PokemonCenter_branch_ed778
+ callchannel .sub1
+ callchannel .sub2
note D_, 1
note __, 5
note F#, 1
@@ -298,7 +298,7 @@
note G_, 1
note __, 1
stereopanning $ff
- callchannel Music_PokemonCenter_branch_ed783
+ callchannel .sub3
note G_, 1
note __, 5
note B_, 1
@@ -327,7 +327,7 @@
note __, 1
note A_, 1
note __, 1
- callchannel Music_PokemonCenter_branch_ed783
+ callchannel .sub3
note G_, 1
note __, 5
note B_, 1
@@ -354,9 +354,9 @@
note __, 1
note E_, 1
note __, 1
- loopchannel 0, Music_PokemonCenter_branch_ed6f6
+ loopchannel 0, .mainloop
-Music_PokemonCenter_branch_ed76f:
+.sub1:
note E_, 1
note __, 5
note A_, 1
@@ -367,7 +367,7 @@
note __, 1
endchannel
-Music_PokemonCenter_branch_ed778:
+.sub2:
note E_, 1
note __, 5
note A_, 1
@@ -380,7 +380,7 @@
note __, 1
endchannel
-Music_PokemonCenter_branch_ed783:
+.sub3:
note F#, 1
note __, 5
note A_, 1
@@ -395,10 +395,10 @@
togglenoise $3
notetype $c
stereopanning $ff
-Music_PokemonCenter_branch_ed792:
+.mainloop:
note G_, 6
note G_, 4
note G_, 2
note G_, 2
note G_, 2
- loopchannel 0, Music_PokemonCenter_branch_ed792
+ loopchannel 0, .mainloop
--- a/audio/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
@@ -203,7 +203,7 @@
Music_PokemonChannel_Ch4:
togglenoise $3
notetype $c
-Music_PokemonChannel_branch_ee54d:
+.loop1:
note A#, 3
note A#, 1
note D_, 2
@@ -212,7 +212,7 @@
note D_, 2
note A#, 1
note D_, 1
- loopchannel 2, Music_PokemonChannel_branch_ee54d
+ loopchannel 2, .loop1
note G#, 2
note A#, 2
note G#, 1
--- a/audio/music/pokemonlullaby.asm
+++ b/audio/music/pokemonlullaby.asm
@@ -8,7 +8,7 @@
volume $77
dutycycle $3
tone $0001
-Music_PokemonLullaby_branch_f6d8c:
+.mainloop:
notetype $c, $a7
octave 3
note G_, 16
@@ -51,13 +51,13 @@
note C_, 8
octave 3
note B_, 8
- loopchannel 0, Music_PokemonLullaby_branch_f6d8c
+ loopchannel 0, .mainloop
Music_PokemonLullaby_Ch2:
vibrato $10, $14
dutycycle $0
notetype $c, $b4
-Music_PokemonLullaby_branch_f6dcc:
+.mainloop:
note __, 16
note __, 10
octave 4
@@ -101,11 +101,11 @@
note D#, 2
note E_, 16
note __, 14
- loopchannel 0, Music_PokemonLullaby_branch_f6dcc
+ loopchannel 0, .mainloop
Music_PokemonLullaby_Ch3:
notetype $c, $11
-Music_PokemonLullaby_branch_f6e06:
+.mainloop:
stereopanning $f0
octave 4
note C_, 2
@@ -129,4 +129,4 @@
octave 4
note B_, 2
note A_, 2
- loopchannel 0, Music_PokemonLullaby_branch_f6e06
+ loopchannel 0, .mainloop
--- a/audio/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
@@ -20,53 +20,53 @@
intensity $a2
note D_, 4
notetype $8, $a2
-Music_PokemonMarch_branch_f6e4c:
- callchannel Music_PokemonMarch_branch_f6eae
+.mainloop:
+ callchannel .sub1
note D#, 2
note C_, 2
note D#, 2
note C_, 2
- callchannel Music_PokemonMarch_branch_f6eae
+ callchannel .sub1
note D#, 2
note C_, 2
note D#, 2
note G_, 2
- callchannel Music_PokemonMarch_branch_f6eae
+ callchannel .sub1
note C_, 2
note C_, 2
note D#, 2
note C_, 2
- callchannel Music_PokemonMarch_branch_f6eae
+ callchannel .sub1
note D#, 2
note C_, 2
note C#, 2
note D#, 2
- callchannel Music_PokemonMarch_branch_f6eb8
+ callchannel .sub2
note F_, 2
note D_, 2
note F_, 2
note D_, 2
- callchannel Music_PokemonMarch_branch_f6eb8
+ callchannel .sub2
note F_, 2
note D_, 2
note F_, 2
note A_, 2
- callchannel Music_PokemonMarch_branch_f6eb8
+ callchannel .sub2
note D_, 2
note D_, 2
note F_, 2
note D_, 2
- callchannel Music_PokemonMarch_branch_f6eb8
+ callchannel .sub2
note F_, 2
note D_, 2
note F_, 2
note G_, 2
- callchannel Music_PokemonMarch_branch_f6eb8
+ callchannel .sub2
note F_, 2
note D_, 2
note F_, 2
note D_, 2
- callchannel Music_PokemonMarch_branch_f6eae
+ callchannel .sub1
note D#, 2
note C_, 2
note D#, 2
@@ -95,9 +95,9 @@
note F_, 2
note G_, 4
note A#, 2
- loopchannel 0, Music_PokemonMarch_branch_f6e4c
+ loopchannel 0, .mainloop
-Music_PokemonMarch_branch_f6eae:
+.sub1:
note __, 4
octave 3
note D#, 1
@@ -109,7 +109,7 @@
note __, 2
endchannel
-Music_PokemonMarch_branch_f6eb8:
+.sub2:
note __, 4
note F_, 1
note E_, 1
@@ -129,7 +129,7 @@
note G_, 4
note G_, 4
note G_, 4
-Music_PokemonMarch_branch_f6ece:
+.mainloop:
notetype $c, $b7
octave 3
note G#, 12
@@ -229,7 +229,7 @@
note F#, 1
note G_, 1
note __, 5
- loopchannel 0, Music_PokemonMarch_branch_f6ece
+ loopchannel 0, .mainloop
Music_PokemonMarch_Ch3:
stereopanning $f
@@ -236,16 +236,16 @@
notetype $c, $16
note __, 16
notetype $8, $16
-Music_PokemonMarch_branch_f6f56:
- callchannel Music_PokemonMarch_branch_f6fe8
+.mainloop:
+ callchannel .sub1
note __, 2
octave 4
note D#, 2
- callchannel Music_PokemonMarch_branch_f6fe8
+ callchannel .sub1
octave 4
note G#, 2
note D#, 2
- callchannel Music_PokemonMarch_branch_f6fe8
+ callchannel .sub1
note __, 2
octave 4
note D#, 2
@@ -268,7 +268,7 @@
note D#, 2
note G_, 2
note G#, 2
-Music_PokemonMarch_branch_f6f7b:
+.loop1:
octave 3
note A#, 2
note __, 2
@@ -290,7 +290,7 @@
octave 4
note F_, 2
note __, 1
- loopchannel 3, Music_PokemonMarch_branch_f6f7b
+ loopchannel 3, .loop1
octave 3
note A#, 2
note __, 2
@@ -371,9 +371,9 @@
note F_, 2
note __, 2
note G#, 2
- loopchannel 0, Music_PokemonMarch_branch_f6f56
+ loopchannel 0, .mainloop
-Music_PokemonMarch_branch_f6fe8:
+.sub1:
octave 3
note G#, 2
note __, 2
@@ -397,9 +397,9 @@
stereopanning $f0
togglenoise $5
notetype $8
- callchannel Music_PokemonMarch_branch_f704c
-Music_PokemonMarch_branch_f7003:
- callchannel Music_PokemonMarch_branch_f7042
+ callchannel .sub2
+.mainloop:
+ callchannel .sub1
note C_, 4
note C_, 2
note C_, 4
@@ -412,14 +412,14 @@
note C#, 1
note C#, 1
notetype $8
- callchannel Music_PokemonMarch_branch_f7042
- callchannel Music_PokemonMarch_branch_f704c
- callchannel Music_PokemonMarch_branch_f7042
- callchannel Music_PokemonMarch_branch_f704c
- callchannel Music_PokemonMarch_branch_f7042
- callchannel Music_PokemonMarch_branch_f704c
- callchannel Music_PokemonMarch_branch_f7042
- callchannel Music_PokemonMarch_branch_f704c
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub2
note C#, 4
note C#, 2
note C#, 4
@@ -432,10 +432,10 @@
note D_, 1
note D_, 1
notetype $8
- callchannel Music_PokemonMarch_branch_f704c
- loopchannel 0, Music_PokemonMarch_branch_f7003
+ callchannel .sub2
+ loopchannel 0, .mainloop
-Music_PokemonMarch_branch_f7042:
+.sub1:
note C_, 4
note C_, 2
note C_, 4
@@ -447,7 +447,7 @@
note C#, 2
endchannel
-Music_PokemonMarch_branch_f704c:
+.sub2:
note C_, 4
note C_, 2
note C_, 4
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@@ -2,7 +2,7 @@
musicheader 2, 1, Music_PostCredits_Ch1
musicheader 1, 2, Music_PostCredits_Ch2
- db $2
+ db $2 ; unused
Music_PostCredits_Ch1:
tempo 271
@@ -11,7 +11,7 @@
dutycycle $2
notetype $c, $93
note __, 8
-Music_PostCredits_branch_cfdb2:
+.mainloop:
octave 3
note C_, 2
note E_, 2
@@ -128,7 +128,7 @@
note D_, 2
octave 2
note G_, 2
- loopchannel 0, Music_PostCredits_branch_cfdb2
+ loopchannel 0, .mainloop
Music_PostCredits_Ch2:
pitchoffset 0, D#
@@ -142,7 +142,7 @@
note F_, 2
intensity $73
note F_, 2
-Music_PostCredits_branch_cfe5a:
+.mainloop:
intensity $a3
note G_, 2
intensity $73
@@ -261,4 +261,4 @@
intensity $a3
note E_, 2
note F_, 2
- loopchannel 0, Music_PostCredits_branch_cfe5a
+ loopchannel 0, .mainloop
--- a/audio/music/printer.asm
+++ b/audio/music/printer.asm
@@ -33,7 +33,7 @@
note __, 1
note F#, 1
note __, 1
-Music_Printer_branch_f0823:
+.mainloop:
note E_, 1
note __, 1
note B_, 1
@@ -316,4 +316,4 @@
note __, 1
note D#, 1
note __, 1
- loopchannel 0, Music_Printer_branch_f0823
+ loopchannel 0, .mainloop
--- a/audio/music/profoak.asm
+++ b/audio/music/profoak.asm
@@ -21,27 +21,27 @@
note G#, 8
intensity $97
note G#, 8
-Music_ProfOak_branch_f4e10:
+.loop1:
intensity $91
- callchannel Music_ProfOak_branch_f4e42
- callchannel Music_ProfOak_branch_f4e42
- callchannel Music_ProfOak_branch_f4e4d
- callchannel Music_ProfOak_branch_f4e4d
- loopchannel 2, Music_ProfOak_branch_f4e10
-Music_ProfOak_branch_f4e22:
- callchannel Music_ProfOak_branch_f4e58
- callchannel Music_ProfOak_branch_f4e58
- callchannel Music_ProfOak_branch_f4e6c
- callchannel Music_ProfOak_branch_f4e6c
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub2
+ loopchannel 2, .loop1
+.mainloop:
+ callchannel .sub3
+ callchannel .sub3
+ callchannel .sub4
+ callchannel .sub4
pitchoffset 0, D_
- callchannel Music_ProfOak_branch_f4e58
- callchannel Music_ProfOak_branch_f4e58
+ callchannel .sub3
+ callchannel .sub3
pitchoffset 0, C_
- callchannel Music_ProfOak_branch_f4e6c
- callchannel Music_ProfOak_branch_f4e6c
- loopchannel 0, Music_ProfOak_branch_f4e22
+ callchannel .sub4
+ callchannel .sub4
+ loopchannel 0, .mainloop
-Music_ProfOak_branch_f4e42:
+.sub1:
octave 2
note B_, 2
octave 3
@@ -54,7 +54,7 @@
note E_, 2
endchannel
-Music_ProfOak_branch_f4e4d:
+.sub2:
octave 2
note B_, 2
octave 3
@@ -67,7 +67,7 @@
note D#, 2
endchannel
-Music_ProfOak_branch_f4e58:
+.sub3:
octave 2
note A_, 2
octave 3
@@ -85,7 +85,7 @@
intensity $91
endchannel
-Music_ProfOak_branch_f4e6c:
+.sub4:
octave 2
note B_, 1
octave 3
@@ -115,7 +115,7 @@
intensity $a7
note B_, 10
dutycycle $2
-Music_ProfOak_branch_f4e92:
+.loop1:
intensity $b2
octave 3
note B_, 2
@@ -150,10 +150,10 @@
note A_, 4
note B_, 2
note B_, 4
- loopchannel 2, Music_ProfOak_branch_f4e92
+ loopchannel 2, .loop1
note __, 6
intensity $b4
-Music_ProfOak_branch_f4ebf:
+.mainloop:
note C#, 6
octave 3
note A_, 1
@@ -201,7 +201,7 @@
octave 4
note E_, 1
note G#, 16
- loopchannel 0, Music_ProfOak_branch_f4ebf
+ loopchannel 0, .mainloop
Music_ProfOak_Ch3:
stereopanning $f
@@ -222,27 +222,27 @@
note B_, 1
note __, 1
note E_, 2
- callchannel Music_ProfOak_branch_f4f3d
-Music_ProfOak_branch_f4f0d:
- callchannel Music_ProfOak_branch_f4f3d
- callchannel Music_ProfOak_branch_f4f3d
- callchannel Music_ProfOak_branch_f4f4c
- callchannel Music_ProfOak_branch_f4f4c
- loopchannel 2, Music_ProfOak_branch_f4f0d
-Music_ProfOak_branch_f4f1d:
- callchannel Music_ProfOak_branch_f4f5a
- callchannel Music_ProfOak_branch_f4f5a
- callchannel Music_ProfOak_branch_f4f69
- callchannel Music_ProfOak_branch_f4f69
+ callchannel .sub1
+.loop1:
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub2
+ loopchannel 2, .loop1
+.mainloop:
+ callchannel .sub3
+ callchannel .sub3
+ callchannel .sub4
+ callchannel .sub4
pitchoffset 0, D_
- callchannel Music_ProfOak_branch_f4f5a
- callchannel Music_ProfOak_branch_f4f5a
+ callchannel .sub3
+ callchannel .sub3
pitchoffset 0, C_
- callchannel Music_ProfOak_branch_f4f69
- callchannel Music_ProfOak_branch_f4f69
- loopchannel 0, Music_ProfOak_branch_f4f1d
+ callchannel .sub4
+ callchannel .sub4
+ loopchannel 0, .mainloop
-Music_ProfOak_branch_f4f3d:
+.sub1:
note E_, 2
note __, 2
octave 4
@@ -259,7 +259,7 @@
note E_, 2
endchannel
-Music_ProfOak_branch_f4f4c:
+.sub2:
octave 2
note B_, 2
note __, 2
@@ -275,7 +275,7 @@
note D#, 2
endchannel
-Music_ProfOak_branch_f4f5a:
+.sub3:
octave 2
note A_, 2
note __, 2
@@ -292,7 +292,7 @@
note C#, 2
endchannel
-Music_ProfOak_branch_f4f69:
+.sub4:
octave 2
note G#, 2
note __, 2
--- a/audio/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
@@ -3,7 +3,7 @@
musicheader 1, 2, Music_ProfOaksPokemonTalk_Ch2
musicheader 1, 3, Music_ProfOaksPokemonTalk_Ch3
- db $3
+ db $3 ; unused
Music_ProfOaksPokemonTalk_Ch1:
tempo 164
@@ -23,7 +23,7 @@
note D#, 1
note E_, 1
note F#, 1
-Music_ProfOaksPokemonTalk_branch_f4cc3:
+.mainloop:
note D#, 6
note C#, 1
octave 3
@@ -130,7 +130,7 @@
note __, 1
note F#, 1
note __, 1
- loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3
+ loopchannel 0, .mainloop
Music_ProfOaksPokemonTalk_Ch2:
vibrato $8, $24
@@ -155,7 +155,7 @@
note F#, 1
note G#, 1
note A#, 1
-Music_ProfOaksPokemonTalk_branch_f4d4d:
+.mainloop:
note B_, 6
note A#, 1
note G#, 1
@@ -205,7 +205,7 @@
note __, 1
note A#, 1
note __, 1
- loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d
+ loopchannel 0, .mainloop
Music_ProfOaksPokemonTalk_Ch3:
vibrato $6, $38
@@ -222,7 +222,7 @@
note C#, 1
octave 2
note A#, 1
-Music_ProfOaksPokemonTalk_branch_f4d95:
+.mainloop:
note B_, 6
octave 3
note D#, 1
@@ -304,4 +304,4 @@
octave 2
note A#, 1
note __, 1
- loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95
+ loopchannel 0, .mainloop
--- a/audio/music/rivalbattle.asm
+++ b/audio/music/rivalbattle.asm
@@ -22,7 +22,7 @@
intensity $b7
note C#, 6
note E_, 4
-Music_RivalBattle_branch_e9777:
+.loop1:
intensity $b2
octave 2
note A#, 6
@@ -31,7 +31,7 @@
note C#, 6
intensity $b2
note D#, 4
- loopchannel 3, Music_RivalBattle_branch_e9777
+ loopchannel 3, .loop1
intensity $b2
octave 2
note A#, 2
@@ -39,7 +39,7 @@
note C#, 4
intensity $b7
note C#, 10
-Music_RivalBattle_branch_e978f:
+.loop2:
intensity $b2
octave 3
note G#, 6
@@ -48,7 +48,7 @@
intensity $b2
octave 4
note C#, 4
- loopchannel 3, Music_RivalBattle_branch_e978f
+ loopchannel 3, .loop2
intensity $b2
octave 3
note G#, 2
@@ -55,7 +55,7 @@
note B_, 4
intensity $4d
note B_, 10
-Music_RivalBattle_branch_e97a6:
+.mainloop:
intensity $b7
note A#, 6
note F#, 6
@@ -178,7 +178,7 @@
note E_, 2
note D#, 2
note C#, 2
-Music_RivalBattle_branch_e9837:
+.loop3:
octave 3
note A#, 2
note E_, 2
@@ -203,7 +203,7 @@
note A#, 2
octave 4
note D#, 2
- loopchannel 2, Music_RivalBattle_branch_e9837
+ loopchannel 2, .loop3
intensity $94
octave 3
note D#, 8
@@ -283,7 +283,7 @@
note B_, 6
octave 3
note C#, 10
- loopchannel 0, Music_RivalBattle_branch_e97a6
+ loopchannel 0, .mainloop
Music_RivalBattle_Ch2:
dutycycle $3
@@ -335,7 +335,7 @@
note F#, 6
intensity $c2
note G#, 4
-Music_RivalBattle_branch_e98ea:
+.loop1:
intensity $c2
note D#, 6
intensity $c7
@@ -342,7 +342,7 @@
note F#, 6
intensity $c2
note G#, 4
- loopchannel 2, Music_RivalBattle_branch_e98ea
+ loopchannel 2, .loop1
intensity $c2
note D#, 2
note F#, 4
@@ -352,7 +352,7 @@
note B_, 1
octave 4
note C_, 1
-Music_RivalBattle_branch_e9903:
+.loop2:
intensity $c2
note C#, 6
intensity $c7
@@ -359,7 +359,7 @@
note E_, 6
intensity $c2
note F#, 4
- loopchannel 3, Music_RivalBattle_branch_e9903
+ loopchannel 3, .loop2
intensity $c2
note C#, 2
note E_, 4
@@ -367,13 +367,13 @@
note E_, 4
intensity $b7
note E_, 6
-Music_RivalBattle_branch_e991a:
- callchannel Music_RivalBattle_branch_e99e0
+.mainloop:
+ callchannel .sub1
intensity $b0
note G#, 8
intensity $b7
note G#, 8
- callchannel Music_RivalBattle_branch_e99e0
+ callchannel .sub1
intensity $4e
note G#, 8
intensity $b7
@@ -472,7 +472,7 @@
note G#, 8
intensity $c7
note F_, 8
-Music_RivalBattle_branch_e99a6:
+.loop3:
intensity $c2
octave 3
note A#, 6
@@ -481,7 +481,7 @@
note C#, 6
intensity $c2
note D#, 4
- loopchannel 3, Music_RivalBattle_branch_e99a6
+ loopchannel 3, .loop3
intensity $c2
octave 3
note A#, 2
@@ -491,7 +491,7 @@
note C#, 6
intensity $9a
note C#, 4
-Music_RivalBattle_branch_e99c1:
+.loop4:
intensity $c2
octave 3
note G#, 6
@@ -500,7 +500,7 @@
intensity $c2
octave 4
note C#, 4
- loopchannel 3, Music_RivalBattle_branch_e99c1
+ loopchannel 3, .loop4
intensity $c2
octave 3
note G#, 2
@@ -510,9 +510,9 @@
intensity $6a
octave 4
note D_, 4
- loopchannel 0, Music_RivalBattle_branch_e991a
+ loopchannel 0, .mainloop
-Music_RivalBattle_branch_e99e0:
+.sub1:
intensity $c7
note D#, 10
intensity $c4
@@ -550,7 +550,7 @@
octave 3
note C#, 2
note D_, 2
-Music_RivalBattle_branch_e9a0c:
+.loop1:
note D#, 2
note C#, 2
note D#, 2
@@ -558,8 +558,8 @@
note E_, 2
note D#, 2
note C#, 2
- loopchannel 4, Music_RivalBattle_branch_e9a0c
-Music_RivalBattle_branch_e9a17:
+ loopchannel 4, .loop1
+.loop2:
octave 3
note C#, 2
octave 2
@@ -571,7 +571,7 @@
note C#, 2
octave 2
note B_, 2
- loopchannel 3, Music_RivalBattle_branch_e9a17
+ loopchannel 3, .loop2
octave 3
note C#, 2
note E_, 2
@@ -582,8 +582,8 @@
note C_, 2
note C#, 2
note D_, 2
-Music_RivalBattle_branch_e9a30:
- callchannel Music_RivalBattle_branch_e9b47
+.mainloop:
+ callchannel .sub1
octave 2
note A#, 2
octave 4
@@ -600,7 +600,7 @@
note A#, 2
octave 3
note G#, 2
- callchannel Music_RivalBattle_branch_e9b50
+ callchannel .sub2
note C#, 2
note G#, 2
octave 4
@@ -611,7 +611,7 @@
note C_, 2
octave 2
note B_, 2
- callchannel Music_RivalBattle_branch_e9b47
+ callchannel .sub1
octave 2
note A#, 2
octave 3
@@ -628,20 +628,20 @@
note A#, 2
octave 3
note F_, 2
- callchannel Music_RivalBattle_branch_e9b50
-Music_RivalBattle_branch_e9a66:
+ callchannel .sub2
+.loop3:
note C#, 2
note G#, 2
- loopchannel 4, Music_RivalBattle_branch_e9a66
- callchannel Music_RivalBattle_branch_e9b5c
+ loopchannel 4, .loop3
+ callchannel .sub3
note G#, 2
note F#, 2
-Music_RivalBattle_branch_e9a71:
+.loop4:
octave 2
note A#, 2
octave 3
note F_, 2
- loopchannel 4, Music_RivalBattle_branch_e9a71
+ loopchannel 4, .loop4
octave 2
note A#, 2
octave 3
@@ -656,17 +656,17 @@
note F#, 2
note F_, 2
note D#, 2
- callchannel Music_RivalBattle_branch_e9b5c
+ callchannel .sub3
octave 2
note B_, 2
octave 3
note D_, 2
- callchannel Music_RivalBattle_branch_e9b65
+ callchannel .sub4
octave 3
note D#, 2
octave 4
note D#, 2
- callchannel Music_RivalBattle_branch_e9b65
+ callchannel .sub4
octave 3
note D#, 2
note A#, 2
@@ -694,34 +694,34 @@
note F#, 2
note G_, 2
note G#, 2
-Music_RivalBattle_branch_e9ab3:
+.loop5:
note D#, 2
note A#, 2
- loopchannel 4, Music_RivalBattle_branch_e9ab3
-Music_RivalBattle_branch_e9ab9:
+ loopchannel 4, .loop5
+.loop6:
note D#, 2
note A_, 2
- loopchannel 4, Music_RivalBattle_branch_e9ab9
-Music_RivalBattle_branch_e9abf:
+ loopchannel 4, .loop6
+.loop7:
note D#, 2
note G#, 2
- loopchannel 4, Music_RivalBattle_branch_e9abf
-Music_RivalBattle_branch_e9ac5:
+ loopchannel 4, .loop7
+.loop8:
note D#, 2
note G_, 2
- loopchannel 12, Music_RivalBattle_branch_e9ac5
-Music_RivalBattle_branch_e9acb:
+ loopchannel 12, .loop8
+.loop9:
octave 2
note B_, 2
octave 3
note D#, 2
- loopchannel 4, Music_RivalBattle_branch_e9acb
-Music_RivalBattle_branch_e9ad3:
+ loopchannel 4, .loop9
+.loop10:
octave 2
note B_, 2
octave 3
note F#, 2
- loopchannel 4, Music_RivalBattle_branch_e9ad3
+ loopchannel 4, .loop10
note D#, 2
note G_, 2
note A#, 2
@@ -775,20 +775,20 @@
note C#, 8
note D#, 8
note F_, 8
-Music_RivalBattle_branch_e9b10:
+.loop11:
octave 2
note A#, 2
octave 3
note D#, 2
- loopchannel 7, Music_RivalBattle_branch_e9b10
+ loopchannel 7, .loop11
note E_, 2
note D#, 2
-Music_RivalBattle_branch_e9b1a:
+.loop12:
octave 2
note A#, 2
octave 3
note D#, 2
- loopchannel 6, Music_RivalBattle_branch_e9b1a
+ loopchannel 6, .loop12
octave 2
note A#, 2
octave 3
@@ -795,20 +795,20 @@
note F#, 2
note F_, 2
note E_, 2
-Music_RivalBattle_branch_e9b28:
+.loop13:
octave 2
note G#, 2
octave 3
note C#, 2
- loopchannel 7, Music_RivalBattle_branch_e9b28
+ loopchannel 7, .loop13
note D_, 2
note C#, 2
-Music_RivalBattle_branch_e9b32:
+.loop14:
octave 2
note G#, 2
octave 3
note C#, 2
- loopchannel 4, Music_RivalBattle_branch_e9b32
+ loopchannel 4, .loop14
octave 2
note B_, 2
note G#, 2
@@ -818,17 +818,18 @@
note E_, 2
note D#, 2
note D_, 2
- loopchannel 0, Music_RivalBattle_branch_e9a30
+ loopchannel 0, .mainloop
-Music_RivalBattle_branch_e9b47:
+.sub1:
+.sub1loop1:
octave 2
note A#, 2
octave 3
note D#, 2
- loopchannel 4, Music_RivalBattle_branch_e9b47
+ loopchannel 4, .sub1loop1
endchannel
-Music_RivalBattle_branch_e9b50:
+.sub2:
note C#, 2
note G#, 2
octave 4
@@ -842,19 +843,21 @@
note G#, 2
endchannel
-Music_RivalBattle_branch_e9b5c:
+.sub3:
+.sub3loop1:
octave 2
note B_, 2
octave 3
note F#, 2
- loopchannel 7, Music_RivalBattle_branch_e9b5c
+ loopchannel 7, .sub3loop1
endchannel
-Music_RivalBattle_branch_e9b65:
+.sub4:
+.sub4loop1:
octave 3
note D#, 2
note A#, 2
octave 4
note D#, 2
- loopchannel 2, Music_RivalBattle_branch_e9b65
+ loopchannel 2, .sub4loop1
endchannel
--- a/audio/music/rocketbattle.asm
+++ b/audio/music/rocketbattle.asm
@@ -47,7 +47,7 @@
note C_, 1
octave 2
note B_, 1
-Music_RocketBattle_branch_e9bad:
+.loop1:
intensity $b2
octave 3
note C_, 6
@@ -55,13 +55,13 @@
note E_, 2
intensity $b7
note D_, 4
- loopchannel 3, Music_RocketBattle_branch_e9bad
+ loopchannel 3, .loop1
intensity $b2
note C_, 6
note C_, 6
intensity $b7
note D_, 4
-Music_RocketBattle_branch_e9bc1:
+.loop2:
intensity $b2
octave 4
note E_, 6
@@ -69,7 +69,7 @@
note G_, 2
intensity $b7
note F_, 4
- loopchannel 3, Music_RocketBattle_branch_e9bc1
+ loopchannel 3, .loop2
intensity $b2
note E_, 6
note E_, 4
@@ -115,7 +115,7 @@
note D#, 2
note D_, 2
note F_, 2
-Music_RocketBattle_branch_e9c02:
+.mainloop:
octave 4
note E_, 2
octave 3
@@ -290,7 +290,7 @@
intensity $b7
note A#, 2
note G_, 4
-Music_RocketBattle_branch_e9cc5:
+.loop3:
intensity $b2
note F_, 6
note F_, 4
@@ -297,7 +297,7 @@
intensity $b7
note A_, 2
note G_, 4
- loopchannel 2, Music_RocketBattle_branch_e9cc5
+ loopchannel 2, .loop3
intensity $b2
note F_, 6
octave 4
@@ -387,8 +387,8 @@
note D#, 2
note D_, 2
note F_, 2
- loopchannel 0, Music_RocketBattle_branch_e9c02
-
+ loopchannel 0, .mainloop
+
Music_RocketBattle_Ch2:
dutycycle $3
vibrato $8, $36
@@ -436,7 +436,7 @@
note G#, 1
note A_, 1
note G#, 1
-Music_RocketBattle_branch_e9d7b:
+.loop1:
intensity $c2
octave 3
note A_, 6
@@ -446,13 +446,13 @@
intensity $c7
octave 3
note A#, 4
- loopchannel 3, Music_RocketBattle_branch_e9d7b
+ loopchannel 3, .loop1
intensity $c2
note A_, 6
note A_, 6
intensity $4a
note G#, 4
-Music_RocketBattle_branch_e9d91:
+.loop2:
intensity $c2
octave 4
note A_, 6
@@ -462,7 +462,7 @@
intensity $c7
octave 4
note A#, 4
- loopchannel 3, Music_RocketBattle_branch_e9d91
+ loopchannel 3, .loop2
intensity $c2
note A_, 6
note A_, 4
@@ -469,13 +469,13 @@
intensity $c7
note G_, 2
note G#, 4
- callchannel Music_RocketBattle_branch_e9ea0
+ callchannel .sub1
intensity $b0
note F_, 16
intensity $b7
note F_, 16
-Music_RocketBattle_branch_e9db1:
- callchannel Music_RocketBattle_branch_e9ea0
+.mainloop:
+ callchannel .sub1
intensity $b0
note F_, 8
intensity $b7
@@ -603,7 +603,7 @@
note G_, 1
note G#, 1
note A_, 8
-Music_RocketBattle_branch_e9e5a:
+.loop3:
intensity $c2
octave 3
note A#, 6
@@ -612,7 +612,7 @@
octave 4
note D_, 2
note C_, 4
- loopchannel 3, Music_RocketBattle_branch_e9e5a
+ loopchannel 3, .loop3
intensity $c2
octave 3
note A#, 6
@@ -654,9 +654,9 @@
note A#, 8
intensity $c7
note A#, 8
- loopchannel 0, Music_RocketBattle_branch_e9db1
+ loopchannel 0, .mainloop
-Music_RocketBattle_branch_e9ea0:
+.sub1:
intensity $c6
octave 4
note A_, 6
@@ -700,9 +700,9 @@
octave 2
note B_, 2
note A#, 2
-Music_RocketBattle_branch_e9ecc:
- callchannel Music_RocketBattle_branch_e9fe6
- loopchannel 3, Music_RocketBattle_branch_e9ecc
+.loop1:
+ callchannel .sub1
+ loopchannel 3, .loop1
octave 2
note A_, 2
octave 3
@@ -715,9 +715,9 @@
note F_, 2
note E_, 2
note D_, 2
-Music_RocketBattle_branch_e9edf:
- callchannel Music_RocketBattle_branch_e9fe6
- loopchannel 3, Music_RocketBattle_branch_e9edf
+.loop2:
+ callchannel .sub1
+ loopchannel 3, .loop2
octave 2
note A_, 2
octave 3
@@ -731,14 +731,14 @@
note G_, 2
note A_, 2
note A#, 2
- callchannel Music_RocketBattle_branch_e9ff3
- callchannel Music_RocketBattle_branch_ea010
+ callchannel .sub2
+ callchannel .sub3
octave 3
note F_, 2
- callchannel Music_RocketBattle_branch_ea01d
-Music_RocketBattle_branch_e9efe:
- callchannel Music_RocketBattle_branch_e9ff3
- callchannel Music_RocketBattle_branch_ea010
+ callchannel .sub4
+.mainloop:
+ callchannel .sub2
+ callchannel .sub3
octave 3
note A#, 2
octave 2
@@ -755,7 +755,7 @@
note F_, 2
note E_, 2
note D_, 2
- callchannel Music_RocketBattle_branch_ea02a
+ callchannel .sub5
octave 2
note A_, 2
octave 3
@@ -770,12 +770,12 @@
note A_, 2
octave 3
note E_, 2
-Music_RocketBattle_branch_e9f25:
+.loop3:
octave 2
note A#, 2
octave 3
note F_, 2
- loopchannel 5, Music_RocketBattle_branch_e9f25
+ loopchannel 5, .loop3
note A#, 2
octave 2
note A#, 2
@@ -786,7 +786,7 @@
note A#, 2
octave 3
note A#, 2
- callchannel Music_RocketBattle_branch_ea02a
+ callchannel .sub5
octave 2
note A_, 2
octave 3
@@ -801,9 +801,9 @@
note F_, 2
note E_, 2
note D_, 2
- callchannel Music_RocketBattle_branch_ea02a
- callchannel Music_RocketBattle_branch_ea02a
-Music_RocketBattle_branch_e9f4e:
+ callchannel .sub5
+ callchannel .sub5
+.loop4:
octave 2
note A_, 2
octave 3
@@ -816,7 +816,7 @@
note D_, 2
note G_, 2
note F_, 2
- loopchannel 7, Music_RocketBattle_branch_e9f4e
+ loopchannel 7, .loop4
octave 2
note A_, 2
octave 3
@@ -829,12 +829,12 @@
note A_, 2
note G_, 2
note F_, 2
-Music_RocketBattle_branch_e9f6a:
+.loop5:
octave 2
note A#, 2
octave 3
note F_, 2
- loopchannel 4, Music_RocketBattle_branch_e9f6a
+ loopchannel 4, .loop5
octave 2
note A#, 2
octave 3
@@ -845,12 +845,12 @@
note D_, 2
note C#, 2
note D_, 2
-Music_RocketBattle_branch_e9f7c:
+.loop6:
octave 2
note A_, 2
octave 3
note E_, 2
- loopchannel 13, Music_RocketBattle_branch_e9f7c
+ loopchannel 13, .loop6
octave 2
note A_, 2
octave 3
@@ -859,12 +859,12 @@
note C_, 2
octave 2
note A#, 2
-Music_RocketBattle_branch_e9f8c:
+.loop7:
octave 2
note A_, 2
octave 3
note E_, 2
- loopchannel 4, Music_RocketBattle_branch_e9f8c
+ loopchannel 4, .loop7
octave 2
note A_, 2
octave 4
@@ -875,20 +875,20 @@
note A_, 2
note G_, 2
note A#, 2
-Music_RocketBattle_branch_e9f9e:
+.loop8:
octave 2
note A#, 2
octave 3
note F_, 2
- loopchannel 7, Music_RocketBattle_branch_e9f9e
+ loopchannel 7, .loop8
note E_, 2
note F_, 2
-Music_RocketBattle_branch_e9fa8:
+.loop9:
octave 2
note A#, 2
octave 3
note F_, 2
- loopchannel 5, Music_RocketBattle_branch_e9fa8
+ loopchannel 5, .loop9
octave 3
note A#, 2
octave 4
@@ -897,13 +897,13 @@
octave 3
note A#, 2
note G_, 2
- callchannel Music_RocketBattle_branch_ea033
+ callchannel .sub6
octave 3
note E_, 2
- callchannel Music_RocketBattle_branch_ea010
+ callchannel .sub3
octave 3
note F_, 2
- callchannel Music_RocketBattle_branch_ea033
+ callchannel .sub6
octave 3
note A_, 2
octave 2
@@ -922,14 +922,14 @@
note A_, 2
octave 3
note E_, 2
- callchannel Music_RocketBattle_branch_e9ff3
- callchannel Music_RocketBattle_branch_ea010
+ callchannel .sub2
+ callchannel .sub3
octave 3
note F_, 2
- callchannel Music_RocketBattle_branch_ea01d
- loopchannel 0, Music_RocketBattle_branch_e9efe
+ callchannel .sub4
+ loopchannel 0, .mainloop
-Music_RocketBattle_branch_e9fe6:
+.sub1:
octave 2
note A_, 2
octave 3
@@ -944,7 +944,7 @@
note F_, 2
endchannel
-Music_RocketBattle_branch_e9ff3:
+.sub2:
octave 2
note A_, 2
octave 3
@@ -975,7 +975,7 @@
note D_, 2
endchannel
-Music_RocketBattle_branch_ea010:
+.sub3:
octave 2
note A#, 2
octave 3
@@ -990,7 +990,7 @@
note A#, 2
endchannel
-Music_RocketBattle_branch_ea01d:
+.sub4:
octave 2
note A#, 2
octave 3
@@ -1005,15 +1005,16 @@
note F_, 2
endchannel
-Music_RocketBattle_branch_ea02a:
+.sub5:
+.sub5loop1:
octave 2
note A_, 2
octave 3
note E_, 2
- loopchannel 4, Music_RocketBattle_branch_ea02a
+ loopchannel 4, .sub5loop1
endchannel
-Music_RocketBattle_branch_ea033:
+.sub6:
octave 2
note A_, 2
octave 3
--- a/audio/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
@@ -12,10 +12,11 @@
vibrato $10, $44
notetype $c, $b3
stereopanning $f0
-Music_RocketHideout_branch_eeb93:
+.mainloop:
+.loop1:
note __, 16
- loopchannel 4, Music_RocketHideout_branch_eeb93
-Music_RocketHideout_branch_eeb98:
+ loopchannel 4, .loop1
+.loop2:
octave 2
note D#, 2
note __, 2
@@ -26,7 +27,7 @@
note A#, 4
note A_, 2
note __, 8
- loopchannel 2, Music_RocketHideout_branch_eeb98
+ loopchannel 2, .loop2
octave 3
note A#, 2
note A_, 2
@@ -113,10 +114,10 @@
note __, 16
note A_, 16
intensity $b3
-Music_RocketHideout_branch_eebfe:
+.loop3:
note __, 16
- loopchannel 4, Music_RocketHideout_branch_eebfe
- loopchannel 0, Music_RocketHideout_branch_eeb93
+ loopchannel 4, .loop3
+ loopchannel 0, .mainloop
Music_RocketHideout_Ch2:
dutycycle $3
@@ -124,7 +125,7 @@
vibrato $0, $f0
notetype $c, $c4
stereopanning $f
-Music_RocketHideout_branch_eec14:
+.mainloop:
octave 2
note D#, 2
note __, 2
@@ -218,11 +219,12 @@
note G#, 4
note G_, 2
note __, 8
- loopchannel 0, Music_RocketHideout_branch_eec14
+ loopchannel 0, .mainloop
Music_RocketHideout_Ch3:
notetype $c, $19
-Music_RocketHideout_branch_eec7c:
+.mainloop:
+.loop1:
octave 2
note D#, 2
note __, 2
@@ -233,8 +235,8 @@
note A#, 4
note A_, 2
note __, 8
- loopchannel 6, Music_RocketHideout_branch_eec7c
-Music_RocketHideout_branch_eec8a:
+ loopchannel 6, .loop1
+.loop2:
note F_, 2
note __, 2
octave 3
@@ -248,8 +250,8 @@
octave 2
note B_, 2
note __, 8
- loopchannel 2, Music_RocketHideout_branch_eec8a
-Music_RocketHideout_branch_eec9b:
+ loopchannel 2, .loop2
+.loop3:
note C#, 2
note __, 2
note G#, 4
@@ -257,8 +259,8 @@
note __, 6
octave 3
note C#, 16
- loopchannel 2, Music_RocketHideout_branch_eec9b
-Music_RocketHideout_branch_eeca6:
+ loopchannel 2, .loop3
+.loop4:
octave 2
note C#, 2
note __, 2
@@ -269,8 +271,8 @@
note G#, 4
note G_, 2
note __, 8
- loopchannel 2, Music_RocketHideout_branch_eeca6
- loopchannel 0, Music_RocketHideout_branch_eec7c
+ loopchannel 2, .loop4
+ loopchannel 0, .mainloop
Music_RocketHideout_Ch4:
togglenoise $0
@@ -282,19 +284,19 @@
note D_, 1
note D#, 1
note D#, 1
- callchannel Music_RocketHideout_branch_eecdb
-Music_RocketHideout_branch_eecc7:
- callchannel Music_RocketHideout_branch_eecdb
+ callchannel .sub1
+.mainloop:
+ callchannel .sub1
note E_, 4
- callchannel Music_RocketHideout_branch_eecdb
+ callchannel .sub1
note F_, 4
- callchannel Music_RocketHideout_branch_eecdb
+ callchannel .sub1
note A#, 4
- callchannel Music_RocketHideout_branch_eecdb
+ callchannel .sub1
note F#, 4
- loopchannel 0, Music_RocketHideout_branch_eecc7
+ loopchannel 0, .mainloop
-Music_RocketHideout_branch_eecdb:
+.sub1:
stereopanning $f0
note D#, 1
note D#, 1
--- a/audio/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
@@ -14,28 +14,28 @@
octave 4
note C_, 1
note D_, 1
-Music_RocketTheme_branch_f768b:
+.mainloop:
dutycycle $3
notetype $c, $a8
- callchannel Music_RocketTheme_branch_f74e6
+ callchannel Music_LookRocket_Ch1.sub1
dutycycle $1
intensity $a8
- callchannel Music_RocketTheme_branch_f74f7
- callchannel Music_RocketTheme_branch_f758a
+ callchannel Music_LookRocket_Ch1.sub2
+ callchannel Music_LookRocket_Ch2.sub5
octave 4
note F#, 1
note __, 1
intensity $53
- callchannel Music_RocketTheme_branch_f750c
+ callchannel Music_LookRocket_Ch1.sub3
intensity $c3
- callchannel Music_RocketTheme_branch_f750c
+ callchannel Music_LookRocket_Ch1.sub3
intensity $e3
- callchannel Music_RocketTheme_branch_f750c
+ callchannel Music_LookRocket_Ch1.sub3
note __, 16
dutycycle $0
notetype $6, $b3
vibrato $6, $64
- callchannel Music_RocketTheme_branch_f7727
+ callchannel .sub1
octave 4
note F_, 1
note F#, 3
@@ -60,7 +60,7 @@
note __, 4
note D#, 2
note F#, 2
- callchannel Music_RocketTheme_branch_f7727
+ callchannel .sub1
octave 3
note F#, 1
note G_, 3
@@ -86,13 +86,13 @@
note E_, 2
note D#, 2
note D_, 2
-Music_RocketTheme_branch_f76ef:
+.loop1:
note __, 4
note F_, 2
note __, 14
note F#, 2
note __, 10
- loopchannel 3, Music_RocketTheme_branch_f76ef
+ loopchannel 3, .loop1
note __, 4
note F_, 2
note __, 14
@@ -102,24 +102,24 @@
note __, 2
note D#, 2
note C_, 2
-Music_RocketTheme_branch_f7701:
+.loop2:
note F#, 2
note A_, 2
- loopchannel 4, Music_RocketTheme_branch_f7701
-Music_RocketTheme_branch_f7707:
+ loopchannel 4, .loop2
+.loop3:
note G_, 2
note A#, 2
- loopchannel 4, Music_RocketTheme_branch_f7707
-Music_RocketTheme_branch_f770d:
+ loopchannel 4, .loop3
+.loop4:
note G#, 2
note B_, 2
- loopchannel 4, Music_RocketTheme_branch_f770d
-Music_RocketTheme_branch_f7713:
+ loopchannel 4, .loop4
+.loop5:
octave 3
note A_, 2
octave 4
note C_, 2
- loopchannel 4, Music_RocketTheme_branch_f7713
+ loopchannel 4, .loop5
notetype $c, $b3
note __, 16
note __, 12
@@ -126,9 +126,9 @@
note F_, 2
note C_, 1
note D_, 1
- loopchannel 0, Music_RocketTheme_branch_f768b
+ loopchannel 0, .mainloop
-Music_RocketTheme_branch_f7727:
+.sub1:
note __, 7
note B_, 1
octave 4
@@ -161,24 +161,24 @@
octave 5
note C_, 1
note D_, 1
-Music_RocketTheme_branch_f774b:
+.mainloop:
notetype $c, $b7
- callchannel Music_RocketTheme_branch_f7547
+ callchannel Music_LookRocket_Ch2.sub1
intensity $b7
- callchannel Music_RocketTheme_branch_f758a
+ callchannel Music_LookRocket_Ch2.sub5
octave 5
note C_, 1
note __, 1
- callchannel Music_RocketTheme_branch_f7554
+ callchannel Music_LookRocket_Ch2.sub2
intensity $53
- callchannel Music_RocketTheme_branch_f7568
+ callchannel Music_LookRocket_Ch2.sub3
intensity $c3
- callchannel Music_RocketTheme_branch_f7568
+ callchannel Music_LookRocket_Ch2.sub3
intensity $e3
- callchannel Music_RocketTheme_branch_f7568
- callchannel Music_RocketTheme_branch_f756f
+ callchannel Music_LookRocket_Ch2.sub3
+ callchannel Music_LookRocket_Ch2.sub4
vibrato $6, $64
- callchannel Music_RocketTheme_branch_f7800
+ callchannel .sub1
octave 4
note A_, 1
vibrato $0, $0
@@ -194,7 +194,7 @@
octave 5
note C_, 1
note D_, 1
- callchannel Music_RocketTheme_branch_f7800
+ callchannel .sub1
note B_, 1
vibrato $0, $0
intensity $b8
@@ -212,7 +212,7 @@
note G#, 1
note G_, 1
notetype $6, $b7
- callchannel Music_RocketTheme_branch_f781c
+ callchannel .sub2
octave 4
note D_, 1
note D#, 9
@@ -223,7 +223,7 @@
note __, 2
note F#, 2
note __, 2
- callchannel Music_RocketTheme_branch_f781c
+ callchannel .sub2
octave 3
note B_, 2
note __, 2
@@ -287,9 +287,9 @@
octave 5
note C_, 2
note D_, 2
- loopchannel 0, Music_RocketTheme_branch_f774b
+ loopchannel 0, .mainloop
-Music_RocketTheme_branch_f7800:
+.sub1:
notetype $6, $b7
note __, 7
octave 4
@@ -317,7 +317,7 @@
note __, 2
endchannel
-Music_RocketTheme_branch_f781c:
+.sub2:
octave 3
note B_, 1
octave 4
@@ -334,25 +334,25 @@
vibrato $4, $22
notetype $c, $14
note __, 2
-Music_RocketTheme_branch_f782f:
+.mainloop:
notetype $c, $14
- callchannel Music_RocketTheme_branch_f75bf
- callchannel Music_RocketTheme_branch_f75fe
- callchannel Music_RocketTheme_branch_f75fe
+ callchannel Music_LookRocket_Ch3.sub1
+ callchannel Music_LookRocket_Ch3.sub4
+ callchannel Music_LookRocket_Ch3.sub4
intensity $24
- callchannel Music_RocketTheme_branch_f7623
+ callchannel Music_LookRocket_Ch3.sub5
intensity $14
- callchannel Music_RocketTheme_branch_f75cc
- callchannel Music_RocketTheme_branch_f7623
- callchannel Music_RocketTheme_branch_f75e1
- callchannel Music_RocketTheme_branch_f75fe
- callchannel Music_RocketTheme_branch_f75fe
- callchannel Music_RocketTheme_branch_f75fe
- callchannel Music_RocketTheme_branch_f75fe
- callchannel Music_RocketTheme_branch_f7623
- callchannel Music_RocketTheme_branch_f75cc
- callchannel Music_RocketTheme_branch_f7623
- callchannel Music_RocketTheme_branch_f75cc
+ callchannel Music_LookRocket_Ch3.sub2
+ callchannel Music_LookRocket_Ch3.sub5
+ callchannel Music_LookRocket_Ch3.sub3
+ callchannel Music_LookRocket_Ch3.sub4
+ callchannel Music_LookRocket_Ch3.sub4
+ callchannel Music_LookRocket_Ch3.sub4
+ callchannel Music_LookRocket_Ch3.sub4
+ callchannel Music_LookRocket_Ch3.sub5
+ callchannel Music_LookRocket_Ch3.sub2
+ callchannel Music_LookRocket_Ch3.sub5
+ callchannel Music_LookRocket_Ch3.sub2
octave 3
note C_, 1
note __, 1
@@ -440,23 +440,23 @@
octave 4
note G#, 1
note __, 1
- loopchannel 0, Music_RocketTheme_branch_f782f
+ loopchannel 0, .mainloop
Music_RocketTheme_Ch4:
togglenoise $3
notetype $c
note __, 2
-Music_RocketTheme_branch_f78c3:
- callchannel Music_RocketTheme_branch_f765c
- callchannel Music_RocketTheme_branch_f7664
- callchannel Music_RocketTheme_branch_f7664
- callchannel Music_RocketTheme_branch_f7664
- callchannel Music_RocketTheme_branch_f7664
- callchannel Music_RocketTheme_branch_f7664
- callchannel Music_RocketTheme_branch_f7664
- callchannel Music_RocketTheme_branch_f7664
- callchannel Music_RocketTheme_branch_f765c
-Music_RocketTheme_branch_f78de:
+.mainloop:
+ callchannel Music_LookRocket_Ch4.sub1
+ callchannel Music_LookRocket_Ch4.sub2
+ callchannel Music_LookRocket_Ch4.sub2
+ callchannel Music_LookRocket_Ch4.sub2
+ callchannel Music_LookRocket_Ch4.sub2
+ callchannel Music_LookRocket_Ch4.sub2
+ callchannel Music_LookRocket_Ch4.sub2
+ callchannel Music_LookRocket_Ch4.sub2
+ callchannel Music_LookRocket_Ch4.sub1
+.loop1:
note A#, 2
note F#, 2
note D_, 2
@@ -465,10 +465,10 @@
note F#, 2
note D_, 2
note F#, 2
- loopchannel 11, Music_RocketTheme_branch_f78de
- callchannel Music_RocketTheme_branch_f7664
- callchannel Music_RocketTheme_branch_f7664
- callchannel Music_RocketTheme_branch_f7664
- callchannel Music_RocketTheme_branch_f765c
- callchannel Music_RocketTheme_branch_f765c
- loopchannel 0, Music_RocketTheme_branch_f78c3
+ loopchannel 11, .loop1
+ callchannel Music_LookRocket_Ch4.sub2
+ callchannel Music_LookRocket_Ch4.sub2
+ callchannel Music_LookRocket_Ch4.sub2
+ callchannel Music_LookRocket_Ch4.sub1
+ callchannel Music_LookRocket_Ch4.sub1
+ loopchannel 0, .mainloop
--- a/audio/music/route1.asm
+++ b/audio/music/route1.asm
@@ -3,7 +3,7 @@
musicheader 1, 2, Music_Route1_Ch2
musicheader 1, 3, Music_Route1_Ch3
- db $3
+ db $3 ; unused
Music_Route1_Ch1:
stereopanning $f
@@ -59,7 +59,7 @@
note D_, 2
intensity $83
note __, 2
-Music_Route1_branch_ec04a:
+.mainloop:
intensity $83
note __, 2
octave 4
@@ -201,7 +201,7 @@
note D_, 2
note D_, 2
note __, 2
- loopchannel 0, Music_Route1_branch_ec04a
+ loopchannel 0, .mainloop
Music_Route1_Ch2:
stereopanning $f0
@@ -211,7 +211,7 @@
octave 4
note F#, 1
note G_, 1
- callchannel Music_Route1_branch_ec198
+ callchannel .sub2
octave 3
note A_, 2
note A_, 2
@@ -218,7 +218,7 @@
octave 4
note F#, 1
note G_, 1
- callchannel Music_Route1_branch_ec1aa
+ callchannel .sub3
note C#, 2
note E_, 2
note D_, 2
@@ -230,9 +230,9 @@
note D_, 1
note E_, 1
dutycycle $2
-Music_Route1_branch_ec112:
+.mainloop:
intensity $82
- callchannel Music_Route1_branch_ec188
+ callchannel .sub1
intensity $81
octave 3
note A_, 2
@@ -262,7 +262,7 @@
note F#, 2
note D_, 1
note E_, 1
- callchannel Music_Route1_branch_ec188
+ callchannel .sub1
intensity $81
note A_, 2
note A_, 2
@@ -298,11 +298,11 @@
octave 4
note F#, 1
note G_, 1
- callchannel Music_Route1_branch_ec198
+ callchannel .sub2
note __, 4
note F#, 1
note G_, 1
- callchannel Music_Route1_branch_ec1aa
+ callchannel .sub3
notetype $8, $92
note C#, 1
note D_, 1
@@ -320,9 +320,9 @@
octave 4
note D_, 1
note E_, 1
- loopchannel 0, Music_Route1_branch_ec112
+ loopchannel 0, .mainloop
-Music_Route1_branch_ec188:
+.sub1:
note F#, 2
note F#, 2
note F#, 2
@@ -340,7 +340,7 @@
note E_, 2
endchannel
-Music_Route1_branch_ec198:
+.sub2:
note A_, 2
note A_, 2
note F#, 2
@@ -360,7 +360,7 @@
note E_, 2
endchannel
-Music_Route1_branch_ec1aa:
+.sub3:
note A_, 2
note A_, 2
note F#, 2
@@ -456,7 +456,7 @@
note __, 1
note A_, 1
note __, 3
-Music_Route1_branch_ec20c:
+.mainloop:
octave 3
note D_, 1
note __, 1
@@ -643,4 +643,4 @@
note __, 1
note A_, 1
note __, 3
- loopchannel 0, Music_Route1_branch_ec20c
+ loopchannel 0, .mainloop
--- a/audio/music/route12.asm
+++ b/audio/music/route12.asm
@@ -28,12 +28,12 @@
note E_, 1
intensity $97
note D#, 12
-Music_Route12_branch_ec535:
+.mainloop:
dutycycle $2
intensity $96
- callchannel Music_Route12_branch_ec5b1
- callchannel Music_Route12_branch_ec5bf
- callchannel Music_Route12_branch_ec5b1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
note E_, 1
note __, 2
note F#, 1
@@ -41,9 +41,9 @@
note B_, 4
octave 4
note D#, 4
- callchannel Music_Route12_branch_ec5b1
- callchannel Music_Route12_branch_ec5bf
- callchannel Music_Route12_branch_ec5b1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
intensity $92
octave 4
note E_, 1
@@ -114,7 +114,7 @@
note F#, 8
note D#, 4
note F#, 4
-Music_Route12_branch_ec59b:
+.loop1:
intensity $97
note G#, 1
note A_, 1
@@ -128,10 +128,10 @@
note E_, 1
note F#, 1
note G#, 4
- loopchannel 2, Music_Route12_branch_ec59b
- loopchannel 0, Music_Route12_branch_ec535
+ loopchannel 2, .loop1
+ loopchannel 0, .mainloop
-Music_Route12_branch_ec5b1:
+.sub1:
octave 3
note G#, 1
note __, 1
@@ -147,7 +147,7 @@
note G#, 4
endchannel
-Music_Route12_branch_ec5bf:
+.sub2:
note A_, 1
note __, 1
note F#, 1
@@ -182,10 +182,10 @@
note B_, 1
octave 4
note D#, 1
-Music_Route12_branch_ec5e5:
+.mainloop:
dutycycle $3
intensity $b7
- callchannel Music_Route12_branch_ec647
+ callchannel .sub1
note F#, 1
note A_, 1
note G#, 1
@@ -207,7 +207,7 @@
note D#, 4
note F#, 4
dutycycle $3
- callchannel Music_Route12_branch_ec647
+ callchannel .sub1
note A_, 1
octave 5
note C#, 1
@@ -259,9 +259,9 @@
note E_, 10
intensity $a4
note E_, 6
- loopchannel 0, Music_Route12_branch_ec5e5
+ loopchannel 0, .mainloop
-Music_Route12_branch_ec647:
+.sub1:
octave 4
note E_, 6
intensity $b1
@@ -295,8 +295,8 @@
note F#, 2
note __, 2
note D#, 4
-Music_Route12_branch_ec66c:
- callchannel Music_Route12_branch_ec6b4
+.mainloop:
+ callchannel .sub1
note F#, 1
note __, 1
note E_, 1
@@ -306,7 +306,7 @@
note F#, 4
octave 2
note B_, 4
- callchannel Music_Route12_branch_ec6b4
+ callchannel .sub1
note E_, 1
note __, 1
note B_, 1
@@ -347,7 +347,7 @@
note E_, 8
note F#, 4
note D#, 4
-Music_Route12_branch_ec6a3:
+.loop1:
note E_, 1
note __, 1
note E_, 1
@@ -357,10 +357,10 @@
note G#, 4
note E_, 3
note __, 1
- loopchannel 2, Music_Route12_branch_ec6a3
- loopchannel 0, Music_Route12_branch_ec66c
+ loopchannel 2, .loop1
+ loopchannel 0, .mainloop
-Music_Route12_branch_ec6b4:
+.sub1:
octave 3
note E_, 1
note __, 1
@@ -401,16 +401,17 @@
note C#, 1
note D_, 4
notetype $6
- callchannel Music_Route12_branch_ec717
-Music_Route12_branch_ec6e1:
+ callchannel .sub1
+.mainloop:
+.loop1:
note D_, 4
note D_, 8
note C#, 2
note C#, 2
note D_, 8
- callchannel Music_Route12_branch_ec717
- loopchannel 8, Music_Route12_branch_ec6e1
-Music_Route12_branch_ec6ed:
+ callchannel .sub1
+ loopchannel 8, .loop1
+.loop2:
notetype $c
note B_, 10
note D_, 1
@@ -422,23 +423,23 @@
note C#, 1
note C#, 1
note D_, 4
- loopchannel 2, Music_Route12_branch_ec6ed
+ loopchannel 2, .loop2
note B_, 16
notetype $6
- callchannel Music_Route12_branch_ec717
- callchannel Music_Route12_branch_ec717
+ callchannel .sub1
+ callchannel .sub1
note B_, 16
-Music_Route12_branch_ec707:
+.loop3:
note D_, 4
note D_, 8
note C#, 2
note C#, 2
note D_, 8
- callchannel Music_Route12_branch_ec717
- loopchannel 2, Music_Route12_branch_ec707
- loopchannel 0, Music_Route12_branch_ec6e1
+ callchannel .sub1
+ loopchannel 2, .loop3
+ loopchannel 0, .mainloop
-Music_Route12_branch_ec717:
+.sub1:
note C#, 1
note C#, 1
note C#, 1
--- a/audio/music/route2.asm
+++ b/audio/music/route2.asm
@@ -12,8 +12,8 @@
notetype $c, $b1
note __, 16
note __, 16
- callchannel Music_Route2_branch_ed931
-Music_Route2_branch_ed8fb:
+ callchannel .sub1
+.mainloop:
intensity $b1
octave 3
note B_, 4
@@ -25,10 +25,10 @@
note E_, 4
note E_, 4
note E_, 4
- callchannel Music_Route2_branch_ed931
- callchannel Music_Route2_branch_ed940
- callchannel Music_Route2_branch_ed940
- callchannel Music_Route2_branch_ed971
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub3
octave 3
note G_, 2
octave 4
@@ -42,7 +42,7 @@
octave 3
note B_, 2
note G_, 2
- callchannel Music_Route2_branch_ed971
+ callchannel .sub3
note G_, 2
octave 4
note C_, 2
@@ -53,9 +53,9 @@
octave 3
note B_, 2
note G_, 2
- loopchannel 0, Music_Route2_branch_ed8fb
+ loopchannel 0, .mainloop
-Music_Route2_branch_ed931:
+.sub1:
octave 4
note C_, 4
note C_, 4
@@ -70,7 +70,7 @@
intensity $b1
endchannel
-Music_Route2_branch_ed940:
+.sub2:
octave 2
note B_, 2
octave 3
@@ -119,7 +119,7 @@
intensity $b1
endchannel
-Music_Route2_branch_ed971:
+.sub3:
note B_, 2
note G_, 2
note B_, 2
@@ -162,19 +162,19 @@
stereopanning $ff
vibrato $8, $24
notetype $c, $b2
- callchannel Music_Route2_branch_ed9ba
-Music_Route2_branch_ed9a1:
+ callchannel .sub1
+.mainloop:
intensity $b2
- callchannel Music_Route2_branch_ed9ba
+ callchannel .sub1
dutycycle $2
intensity $b5
- callchannel Music_Route2_branch_ed9dc
- callchannel Music_Route2_branch_ed9dc
- callchannel Music_Route2_branch_eda02
- callchannel Music_Route2_branch_eda02
- loopchannel 0, Music_Route2_branch_ed9a1
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub3
+ callchannel .sub3
+ loopchannel 0, .mainloop
-Music_Route2_branch_ed9ba:
+.sub1:
octave 4
note E_, 4
note E_, 4
@@ -208,7 +208,7 @@
intensity $b2
endchannel
-Music_Route2_branch_ed9dc:
+.sub2:
octave 2
note C_, 4
note __, 2
@@ -248,7 +248,7 @@
note D_, 4
endchannel
-Music_Route2_branch_eda02:
+.sub3:
octave 2
note E_, 4
note __, 2
@@ -314,10 +314,10 @@
note __, 3
note E_, 1
note __, 3
- callchannel Music_Route2_branch_eda9e
+ callchannel .sub1
octave 3
note D_, 4
-Music_Route2_branch_eda4b:
+.mainloop:
notetype $c, $15
octave 3
note C_, 4
@@ -340,7 +340,7 @@
note __, 2
note G_, 1
note __, 1
- callchannel Music_Route2_branch_eda9e
+ callchannel .sub1
octave 3
note D_, 2
intensity $10
@@ -347,16 +347,16 @@
octave 6
note C_, 1
note D_, 1
- callchannel Music_Route2_branch_edaaf
+ callchannel .sub2
note __, 4
note G_, 8
note F_, 2
note G_, 2
notetype $c, $10
- callchannel Music_Route2_branch_edaaf
+ callchannel .sub2
note __, 16
intensity $25
- callchannel Music_Route2_branch_edacb
+ callchannel .sub3
note __, 4
note D#, 1
note E_, 7
@@ -373,7 +373,7 @@
octave 6
note A_, 4
note G_, 4
- callchannel Music_Route2_branch_edacb
+ callchannel .sub3
note __, 4
note G#, 1
note A_, 7
@@ -381,9 +381,9 @@
note F#, 1
note G_, 16
note G_, 15
- loopchannel 0, Music_Route2_branch_eda4b
+ loopchannel 0, .mainloop
-Music_Route2_branch_eda9e:
+.sub1:
octave 3
note F_, 4
note __, 2
@@ -402,7 +402,7 @@
note F_, 4
endchannel
-Music_Route2_branch_edaaf:
+.sub2:
octave 6
note E_, 10
note D_, 2
@@ -430,7 +430,7 @@
note D_, 4
endchannel
-Music_Route2_branch_edacb:
+.sub3:
octave 5
note B_, 16
note __, 4
@@ -452,7 +452,7 @@
Music_Route2_Ch4:
togglenoise $5
notetype $c
-Music_Route2_branch_edae0:
+.loop1:
note A_, 4
note A_, 4
note A_, 2
@@ -459,13 +459,14 @@
note B_, 2
note A_, 2
note B_, 2
- loopchannel 3, Music_Route2_branch_edae0
+ loopchannel 3, .loop1
note A_, 4
note A_, 4
note A_, 2
note A_, 2
note D#, 4
-Music_Route2_branch_edaef:
+.mainloop:
+.loop2:
note A_, 4
note A_, 4
note A_, 2
@@ -472,8 +473,8 @@
note A_, 2
note B_, 2
note A_, 2
- loopchannel 4, Music_Route2_branch_edaef
-Music_Route2_branch_edaf9:
+ loopchannel 4, .loop2
+.loop3:
note B_, 4
note A_, 2
note B_, 2
@@ -481,34 +482,34 @@
note B_, 2
note A_, 2
note B_, 2
- loopchannel 7, Music_Route2_branch_edaf9
+ loopchannel 7, .loop3
note B_, 4
note A_, 4
note A_, 2
note A_, 2
note D#, 4
-Music_Route2_branch_edb09:
+.loop4:
note B_, 4
note C_, 4
note B_, 2
note B_, 2
note C_, 4
- loopchannel 3, Music_Route2_branch_edb09
+ loopchannel 3, .loop4
note B_, 4
note C_, 4
note C#, 2
note C_, 2
note C#, 4
-Music_Route2_branch_edb17:
+.loop5:
note B_, 4
note C_, 4
note B_, 2
note B_, 2
note C_, 4
- loopchannel 3, Music_Route2_branch_edb17
+ loopchannel 3, .loop5
note B_, 4
note C_, 4
note D_, 2
note D_, 2
note D#, 4
- loopchannel 0, Music_Route2_branch_edaef
+ loopchannel 0, .mainloop
--- a/audio/music/route26.asm
+++ b/audio/music/route26.asm
@@ -26,7 +26,7 @@
octave 3
note G#, 2
note F#, 2
-Music_Route26_branch_eefe0:
+.mainloop:
dutycycle $0
notetype $c, $a7
octave 3
@@ -192,7 +192,7 @@
octave 2
note B_, 4
note __, 4
- loopchannel 0, Music_Route26_branch_eefe0
+ loopchannel 0, .mainloop
Music_Route26_Ch2:
stereopanning $f0
@@ -232,7 +232,7 @@
octave 2
note C_, 2
note D#, 2
-Music_Route26_branch_ef0ce:
+.mainloop:
dutycycle $2
notetype $c, $c2
octave 2
@@ -253,7 +253,7 @@
note B_, 2
note B_, 2
note B_, 2
- callchannel Music_Route26_branch_ef14e
+ callchannel .sub1
note A_, 6
note A_, 1
octave 2
@@ -268,7 +268,7 @@
note B_, 2
note B_, 2
notetype $c, $c2
- callchannel Music_Route26_branch_ef14e
+ callchannel .sub1
intensity $c7
octave 2
note F#, 4
@@ -281,7 +281,7 @@
note D#, 4
note D#, 4
notetype $8, $c2
-Music_Route26_branch_ef10e:
+.loop1:
octave 2
note G#, 2
note G#, 2
@@ -288,7 +288,7 @@
note G#, 2
octave 1
note G#, 6
- loopchannel 3, Music_Route26_branch_ef10e
+ loopchannel 3, .loop1
octave 2
note G#, 2
note G#, 2
@@ -336,9 +336,9 @@
note C#, 1
note C_, 1
note D#, 1
- loopchannel 0, Music_Route26_branch_ef0ce
+ loopchannel 0, .mainloop
-Music_Route26_branch_ef14e:
+.sub1:
note A#, 6
note A#, 1
octave 2
@@ -388,7 +388,7 @@
note F#, 2
note F_, 2
note D#, 2
-Music_Route26_branch_ef18a:
+.mainloop:
vibrato $18, $23
notetype $c, $14
octave 5
@@ -396,7 +396,7 @@
note __, 2
octave 4
note G#, 1
- callchannel Music_Route26_branch_ef22f
+ callchannel .sub1
vibrato $25, $13
note C#, 1
note __, 1
@@ -404,7 +404,7 @@
note G#, 1
octave 5
note C#, 1
- callchannel Music_Route26_branch_ef22f
+ callchannel .sub1
note F_, 1
note __, 1
note C#, 1
@@ -533,9 +533,9 @@
note G#, 1
octave 3
note C_, 1
- loopchannel 0, Music_Route26_branch_ef18a
+ loopchannel 0, .mainloop
-Music_Route26_branch_ef22f:
+.sub1:
octave 5
note F_, 8
note C#, 2
@@ -549,17 +549,17 @@
Music_Route26_Ch4:
togglenoise $4
notetype $c
-Music_Route26_branch_ef23c:
+.loop1:
note B_, 6
note D_, 1
note D_, 1
- loopchannel 3, Music_Route26_branch_ef23c
- callchannel Music_Route26_branch_ef2b0
-Music_Route26_branch_ef246:
+ loopchannel 3, .loop1
+ callchannel .sub3
+.mainloop:
notetype $6
- callchannel Music_Route26_branch_ef29a
- callchannel Music_Route26_branch_ef29a
- callchannel Music_Route26_branch_ef2a8
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
note D_, 12
note D_, 2
note D_, 2
@@ -571,21 +571,21 @@
note D_, 2
note E_, 2
notetype $6
- callchannel Music_Route26_branch_ef29a
- callchannel Music_Route26_branch_ef29a
+ callchannel .sub1
+ callchannel .sub1
notetype $8
-Music_Route26_branch_ef266:
+.loop2:
note D_, 2
note D_, 2
note D_, 2
note B_, 6
- loopchannel 4, Music_Route26_branch_ef266
+ loopchannel 4, .loop2
notetype $6
- callchannel Music_Route26_branch_ef2a8
- callchannel Music_Route26_branch_ef2a8
- callchannel Music_Route26_branch_ef29a
- callchannel Music_Route26_branch_ef2a8
-Music_Route26_branch_ef27c:
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub2
+.loop3:
notetype $6
note D_, 1
note D_, 1
@@ -600,13 +600,13 @@
note D_, 2
note D_, 2
note B_, 12
- loopchannel 2, Music_Route26_branch_ef27c
+ loopchannel 2, .loop3
notetype $c
note B_, 16
- callchannel Music_Route26_branch_ef2b0
- loopchannel 0, Music_Route26_branch_ef246
+ callchannel .sub3
+ loopchannel 0, .mainloop
-Music_Route26_branch_ef29a:
+.sub1:
note E_, 12
note D_, 2
note D_, 2
@@ -622,7 +622,7 @@
note C#, 1
endchannel
-Music_Route26_branch_ef2a8:
+.sub2:
note E_, 12
note D_, 2
note D_, 2
@@ -632,7 +632,7 @@
note D_, 4
endchannel
-Music_Route26_branch_ef2b0:
+.sub3:
notetype $6
note C#, 1
note C#, 1
--- a/audio/music/route29.asm
+++ b/audio/music/route29.asm
@@ -13,7 +13,7 @@
stereopanning $f
notetype $c, $b2
note __, 2
-Music_Route29_branch_f03a5:
+.mainloop:
note __, 2
octave 4
note C_, 2
@@ -166,7 +166,7 @@
note C_, 2
note G_, 2
note G_, 4
- loopchannel 0, Music_Route29_branch_f03a5
+ loopchannel 0, .mainloop
Music_Route29_Ch2:
dutycycle $3
@@ -175,8 +175,8 @@
octave 4
note C_, 1
note D_, 1
-Music_Route29_branch_f0458:
- callchannel Music_Route29_branch_f04de
+.mainloop:
+ callchannel .sub1
note F_, 1
note E_, 1
note D_, 2
@@ -191,7 +191,7 @@
octave 4
note C_, 1
note D_, 1
- callchannel Music_Route29_branch_f04de
+ callchannel .sub1
note F_, 1
note E_, 1
note D_, 2
@@ -298,9 +298,9 @@
octave 4
note C_, 1
note D_, 1
- loopchannel 0, Music_Route29_branch_f0458
+ loopchannel 0, .mainloop
-Music_Route29_branch_f04de:
+.sub1:
note E_, 2
note E_, 2
note G_, 2
@@ -336,7 +336,7 @@
notetype $c, $25
vibrato $9, $27
note __, 2
-Music_Route29_branch_f0504:
+.mainloop:
note __, 2
octave 3
note G_, 1
@@ -498,7 +498,7 @@
note __, 1
note C_, 1
note __, 3
- loopchannel 0, Music_Route29_branch_f0504
+ loopchannel 0, .mainloop
Music_Route29_Ch4:
stereopanning $f
@@ -505,7 +505,7 @@
togglenoise $0
notetype $c
note __, 2
-Music_Route29_branch_f05b0:
+.mainloop:
note __, 2
note F_, 2
note F_, 6
@@ -517,4 +517,4 @@
note F_, 4
note F_, 2
note F_, 4
- loopchannel 0, Music_Route29_branch_f05b0
+ loopchannel 0, .mainloop
--- a/audio/music/route3.asm
+++ b/audio/music/route3.asm
@@ -45,8 +45,8 @@
note E_, 1
note F#, 1
note G#, 1
-Music_Route3_branch_ec307:
- callchannel Music_Route3_branch_ec3a4
+.mainloop:
+ callchannel .sub1
note G_, 1
note D_, 1
octave 2
@@ -193,30 +193,31 @@
note B_, 1
octave 4
note D_, 1
- loopchannel 0, Music_Route3_branch_ec307
+ loopchannel 0, .mainloop
-Music_Route3_branch_ec3a4:
+.sub1:
+.sub1loop1:
octave 3
note A_, 1
note E_, 1
note C#, 1
note E_, 1
- loopchannel 3, Music_Route3_branch_ec3a4
+ loopchannel 3, .sub1loop1
note C#, 1
note E_, 1
note C#, 1
note E_, 1
-Music_Route3_branch_ec3b1:
+.sub1loop2:
note A_, 1
note E_, 1
note C#, 1
note E_, 1
- loopchannel 3, Music_Route3_branch_ec3b1
+ loopchannel 3, .sub1loop2
note C#, 1
note E_, 1
note C#, 1
note E_, 1
-Music_Route3_branch_ec3bd:
+.sub1loop3:
note G_, 1
note D_, 1
octave 2
@@ -223,7 +224,7 @@
note B_, 1
octave 3
note D_, 1
- loopchannel 3, Music_Route3_branch_ec3bd
+ loopchannel 3, .sub1loop3
octave 2
note B_, 1
octave 3
@@ -263,9 +264,9 @@
note C#, 1
note E_, 1
note G#, 1
-Music_Route3_branch_ec3f5:
+.mainloop:
intensity $7d
- callchannel Music_Route3_branch_ec443
+ callchannel .sub1
note G_, 1
note B_, 10
intensity $b7
@@ -274,7 +275,7 @@
note __, 4
dutycycle $3
note G#, 4
- callchannel Music_Route3_branch_ec443
+ callchannel .sub1
note B_, 1
intensity $7d
octave 5
@@ -324,9 +325,9 @@
note G#, 6
note F#, 1
note G#, 1
- loopchannel 0, Music_Route3_branch_ec3f5
+ loopchannel 0, .mainloop
-Music_Route3_branch_ec443:
+.sub1:
note A_, 6
note E_, 1
note A_, 1
@@ -378,15 +379,15 @@
note A_, 1
note __, 1
note G#, 2
- callchannel Music_Route3_branch_ec4bd
-Music_Route3_branch_ec47f:
+ callchannel .sub1
+.mainloop:
intensity $14
- callchannel Music_Route3_branch_ec4bd
- callchannel Music_Route3_branch_ec4bd
- callchannel Music_Route3_branch_ec4ce
- callchannel Music_Route3_branch_ec4bd
- callchannel Music_Route3_branch_ec4bd
- callchannel Music_Route3_branch_ec4ce
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
note A_, 2
octave 3
note C#, 2
@@ -425,9 +426,9 @@
note __, 2
note F#, 1
note G#, 1
- loopchannel 0, Music_Route3_branch_ec47f
+ loopchannel 0, .mainloop
-Music_Route3_branch_ec4bd:
+.sub1:
octave 3
note A_, 1
note __, 1
@@ -446,7 +447,7 @@
note G#, 2
endchannel
-Music_Route3_branch_ec4ce:
+.sub2:
octave 3
note G_, 1
note __, 1
@@ -481,7 +482,7 @@
togglenoise $4
notetype $c
note __, 10
-Music_Route3_branch_ec4f0:
+.mainloop:
notetype $c
note D_, 2
note D_, 4
@@ -498,4 +499,4 @@
note C#, 1
note C#, 1
note C#, 1
- loopchannel 0, Music_Route3_branch_ec4f0
+ loopchannel 0, .mainloop
--- a/audio/music/route30.asm
+++ b/audio/music/route30.asm
@@ -26,7 +26,7 @@
note D_, 2
intensity $4e
note C_, 4
-Music_Route30_branch_efc2e:
+.mainloop:
intensity $b6
note D_, 6
intensity $b4
@@ -181,7 +181,7 @@
note B_, 2
octave 4
note D_, 2
- loopchannel 0, Music_Route30_branch_efc2e
+ loopchannel 0, .mainloop
Music_Route30_Ch2:
dutycycle $3
@@ -205,7 +205,7 @@
note E_, 1
note F_, 1
note F#, 1
-Music_Route30_branch_efcf6:
+.mainloop:
intensity $c7
note G_, 10
octave 4
@@ -292,7 +292,7 @@
intensity $a7
octave 3
note F#, 2
- loopchannel 0, Music_Route30_branch_efcf6
+ loopchannel 0, .mainloop
Music_Route30_Ch3:
notetype $c, $27
@@ -319,7 +319,7 @@
note __, 1
note G_, 1
note __, 1
-Music_Route30_branch_efd79:
+.mainloop:
note G_, 1
note __, 1
note B_, 2
@@ -573,33 +573,33 @@
note __, 1
note G_, 1
note __, 1
- loopchannel 0, Music_Route30_branch_efd79
+ loopchannel 0, .mainloop
Music_Route30_Ch4:
togglenoise $3
notetype $c
- callchannel Music_Route30_branch_efeb8
- callchannel Music_Route30_branch_efec1
-Music_Route30_branch_efe84:
- callchannel Music_Route30_branch_efecd
- callchannel Music_Route30_branch_efed7
- callchannel Music_Route30_branch_efed7
- callchannel Music_Route30_branch_efee1
- callchannel Music_Route30_branch_efed7
- callchannel Music_Route30_branch_efecd
- callchannel Music_Route30_branch_efed7
- callchannel Music_Route30_branch_efee1
- callchannel Music_Route30_branch_efed7
- callchannel Music_Route30_branch_efed7
- callchannel Music_Route30_branch_efecd
- callchannel Music_Route30_branch_efed7
- callchannel Music_Route30_branch_efed7
- callchannel Music_Route30_branch_efed7
- callchannel Music_Route30_branch_efecd
- callchannel Music_Route30_branch_efee1
- loopchannel 0, Music_Route30_branch_efe84
+ callchannel .sub1
+ callchannel .sub2
+.mainloop:
+ callchannel .sub3
+ callchannel .sub4
+ callchannel .sub4
+ callchannel .sub5
+ callchannel .sub4
+ callchannel .sub3
+ callchannel .sub4
+ callchannel .sub5
+ callchannel .sub4
+ callchannel .sub4
+ callchannel .sub3
+ callchannel .sub4
+ callchannel .sub4
+ callchannel .sub4
+ callchannel .sub3
+ callchannel .sub5
+ loopchannel 0, .mainloop
-Music_Route30_branch_efeb8:
+.sub1:
note D_, 2
note F#, 2
note F#, 2
@@ -610,7 +610,7 @@
note D_, 4
endchannel
-Music_Route30_branch_efec1:
+.sub2:
note D_, 2
note F#, 2
note F#, 2
@@ -624,7 +624,7 @@
note D_, 1
endchannel
-Music_Route30_branch_efecd:
+.sub3:
note D_, 2
note F#, 2
note F#, 2
@@ -636,7 +636,7 @@
note D_, 2
endchannel
-Music_Route30_branch_efed7:
+.sub4:
note D_, 2
note F#, 2
note F#, 2
@@ -648,7 +648,7 @@
note D_, 2
endchannel
-Music_Route30_branch_efee1:
+.sub5:
note D_, 2
note F#, 2
note F#, 2
--- a/audio/music/route36.asm
+++ b/audio/music/route36.asm
@@ -25,7 +25,7 @@
note A_, 1
intensity $5d
note A#, 4
-Music_Route36_branch_e9517:
+.mainloop:
intensity $b5
note F_, 4
note A_, 2
@@ -161,7 +161,7 @@
intensity $b5
note D#, 2
note E_, 2
- loopchannel 0, Music_Route36_branch_e9517
+ loopchannel 0, .mainloop
Music_Route36_Ch2:
dutycycle $3
@@ -186,7 +186,7 @@
note F_, 8
octave 3
note G_, 4
-Music_Route36_branch_e95ce:
+.mainloop:
intensity $c7
octave 4
note C_, 10
@@ -308,7 +308,7 @@
note G_, 1
note A_, 1
note B_, 1
- loopchannel 0, Music_Route36_branch_e95ce
+ loopchannel 0, .mainloop
Music_Route36_Ch3:
notetype $c, $25
@@ -334,7 +334,7 @@
octave 3
note D#, 2
note E_, 2
-Music_Route36_branch_e9684:
+.mainloop:
note F_, 4
note C_, 2
note F_, 4
@@ -464,20 +464,21 @@
note D_, 2
note D#, 2
note E_, 2
- loopchannel 0, Music_Route36_branch_e9684
+ loopchannel 0, .mainloop
Music_Route36_Ch4:
togglenoise $1
notetype $c
- callchannel Music_Route36_branch_e9734
- callchannel Music_Route36_branch_e9741
-Music_Route36_branch_e9713:
- callchannel Music_Route36_branch_e9734
- callchannel Music_Route36_branch_e973b
- callchannel Music_Route36_branch_e9734
- callchannel Music_Route36_branch_e9741
- loopchannel 2, Music_Route36_branch_e9713
-Music_Route36_branch_e9723:
+ callchannel .sub1
+ callchannel .sub3
+.mainloop:
+.loop1:
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub3
+ loopchannel 2, .loop1
+.loop2:
note A#, 4
note A_, 2
note F_, 4
@@ -484,11 +485,11 @@
note B_, 1
note B_, 1
note A_, 4
- loopchannel 11, Music_Route36_branch_e9723
- callchannel Music_Route36_branch_e9741
- loopchannel 0, Music_Route36_branch_e9713
+ loopchannel 11, .loop2
+ callchannel .sub3
+ loopchannel 0, .mainloop
-Music_Route36_branch_e9734:
+.sub1:
note A_, 4
note A_, 6
note A#, 1
@@ -497,7 +498,7 @@
note A#, 2
endchannel
-Music_Route36_branch_e973b:
+.sub2:
note A_, 4
note A_, 6
note B_, 1
@@ -505,7 +506,7 @@
note A_, 4
endchannel
-Music_Route36_branch_e9741:
+.sub3:
note A_, 4
note A_, 6
note A#, 1
--- a/audio/music/route37.asm
+++ b/audio/music/route37.asm
@@ -13,7 +13,7 @@
notetype $c, $b3
note __, 16
note __, 16
-Music_Route37_branch_ee969:
+.mainloop:
intensity $b3
note __, 2
octave 2
@@ -67,37 +67,37 @@
note E_, 2
note D#, 4
stereopanning $f
-Music_Route37_branch_ee9a5:
- callchannel Music_Route37_branch_ee9da
+.loop1:
+ callchannel .sub1
octave 3
note C#, 4
- loopchannel 2, Music_Route37_branch_ee9a5
- callchannel Music_Route37_branch_ee9e9
+ loopchannel 2, .loop1
+ callchannel .sub2
octave 3
note F#, 4
- callchannel Music_Route37_branch_ee9e9
+ callchannel .sub2
octave 3
note F#, 4
- callchannel Music_Route37_branch_ee9da
+ callchannel .sub1
octave 3
note E_, 4
- callchannel Music_Route37_branch_ee9da
+ callchannel .sub1
octave 3
note G#, 4
- callchannel Music_Route37_branch_ee9e9
+ callchannel .sub2
octave 4
note D#, 4
- callchannel Music_Route37_branch_ee9e9
+ callchannel .sub2
octave 3
note F_, 4
stereopanning $ff
- callchannel Music_Route37_branch_ee9e9
+ callchannel .sub2
note __, 4
- callchannel Music_Route37_branch_ee9e9
+ callchannel .sub2
note __, 4
- loopchannel 0, Music_Route37_branch_ee969
+ loopchannel 0, .mainloop
-Music_Route37_branch_ee9da:
+.sub1:
intensity $c2
octave 2
note A_, 2
@@ -112,7 +112,7 @@
intensity $b7
endchannel
-Music_Route37_branch_ee9e9:
+.sub2:
intensity $c2
octave 2
note B_, 2
@@ -158,8 +158,8 @@
note B_, 1
intensity $c2
note B_, 2
-Music_Route37_branch_eea24:
- callchannel Music_Route37_branch_eeab7
+.mainloop:
+ callchannel .sub1
intensity $c6
octave 4
note C#, 4
@@ -173,7 +173,7 @@
note F#, 8
intensity $c7
note D#, 12
- callchannel Music_Route37_branch_eeab7
+ callchannel .sub1
intensity $c7
octave 4
note C#, 4
@@ -269,9 +269,9 @@
note F#, 1
intensity $c2
note F#, 2
- loopchannel 0, Music_Route37_branch_eea24
+ loopchannel 0, .mainloop
-Music_Route37_branch_eeab7:
+.sub1:
intensity $c7
octave 3
note F#, 4
@@ -288,13 +288,13 @@
Music_Route37_Ch3:
stereopanning $f0
notetype $c, $14
-Music_Route37_branch_eeacc:
+.loop1:
octave 2
note F#, 2
note __, 6
- loopchannel 4, Music_Route37_branch_eeacc
-Music_Route37_branch_eead3:
- callchannel Music_Route37_branch_eeb32
+ loopchannel 4, .loop1
+.mainloop:
+ callchannel .sub1
note A_, 2
octave 3
note C#, 2
@@ -305,12 +305,12 @@
note A_, 2
note F#, 2
note E_, 2
-Music_Route37_branch_eeae0:
+.loop2:
note D#, 2
note F#, 2
- loopchannel 4, Music_Route37_branch_eeae0
- callchannel Music_Route37_branch_eeb32
- callchannel Music_Route37_branch_eeb32
+ loopchannel 4, .loop2
+ callchannel .sub1
+ callchannel .sub1
note A_, 2
octave 3
note C#, 2
@@ -323,45 +323,45 @@
note C#, 2
octave 2
note A_, 2
- callchannel Music_Route37_branch_eeb32
-Music_Route37_branch_eeafb:
+ callchannel .sub1
+.loop3:
octave 2
note B_, 2
octave 3
note D#, 2
- loopchannel 4, Music_Route37_branch_eeafb
-Music_Route37_branch_eeb03:
+ loopchannel 4, .loop3
+.loop4:
octave 2
note A_, 2
octave 3
note C#, 2
- loopchannel 7, Music_Route37_branch_eeb03
+ loopchannel 7, .loop4
note E_, 2
note C#, 2
- callchannel Music_Route37_branch_eeb3c
-Music_Route37_branch_eeb10:
+ callchannel .sub2
+.loop5:
octave 2
note B_, 2
octave 3
note F#, 2
- loopchannel 4, Music_Route37_branch_eeb10
-Music_Route37_branch_eeb18:
+ loopchannel 4, .loop5
+.loop6:
octave 2
note A_, 2
octave 3
note C#, 2
- loopchannel 7, Music_Route37_branch_eeb18
+ loopchannel 7, .loop6
note E_, 2
note C#, 2
- callchannel Music_Route37_branch_eeb3c
- callchannel Music_Route37_branch_eeb32
-Music_Route37_branch_eeb28:
+ callchannel .sub2
+ callchannel .sub1
+.loop7:
note F#, 2
note __, 6
- loopchannel 4, Music_Route37_branch_eeb28
- loopchannel 0, Music_Route37_branch_eead3
+ loopchannel 4, .loop7
+ loopchannel 0, .mainloop
-Music_Route37_branch_eeb32:
+.sub1:
octave 2
note F#, 2
note B_, 2
@@ -373,7 +373,7 @@
note B_, 2
endchannel
-Music_Route37_branch_eeb3c:
+.sub2:
octave 2
note B_, 2
octave 3
@@ -395,14 +395,14 @@
Music_Route37_Ch4:
stereopanning $f
togglenoise $0
-Music_Route37_branch_eeb51:
+.mainloop:
notetype $c
- callchannel Music_Route37_branch_eeb6b
+ callchannel .sub1
note D_, 1
note D#, 1
note D#, 1
note D_, 1
- callchannel Music_Route37_branch_eeb6b
+ callchannel .sub1
notetype $6
note D#, 1
note D#, 1
@@ -412,9 +412,9 @@
note D_, 1
note D_, 1
note D_, 1
- loopchannel 0, Music_Route37_branch_eeb51
+ loopchannel 0, .mainloop
-Music_Route37_branch_eeb6b:
+.sub1:
note D_, 2
note D#, 1
note D#, 1
--- a/audio/music/ruinsofalphinterior.asm
+++ b/audio/music/ruinsofalphinterior.asm
@@ -10,7 +10,7 @@
stereopanning $f0
notetype $c, $44
note __, 1
- loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
+ loopchannel 0, Music_RuinsOfAlphInterior_Ch2.mainloop
Music_RuinsOfAlphInterior_Ch2:
tone $0002
@@ -17,7 +17,7 @@
dutycycle $0
stereopanning $f
notetype $c, $a4
-Music_RuinsOfAlphInterior_branch_ebdc2:
+.mainloop:
octave 4
note C_, 4
octave 3
@@ -32,11 +32,11 @@
note C_, 4
octave 3
note A#, 4
- loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
+ loopchannel 0, .mainloop
Music_RuinsOfAlphInterior_Ch3:
notetype $c, $10
-Music_RuinsOfAlphInterior_branch_ebdd7:
+.mainloop:
octave 2
note G#, 2
octave 3
@@ -43,4 +43,4 @@
note C#, 2
note E_, 2
note __, 10
- loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7
+ loopchannel 0, .mainloop
--- a/audio/music/ruinsofalphradio.asm
+++ b/audio/music/ruinsofalphradio.asm
@@ -10,22 +10,22 @@
tone $0118
vibrato $0, $f0
stereopanning $f0
-Music_RuinsOfAlphRadio_branch_eede3:
+.mainloop:
notetype $6, $71
- callchannel Music_RuinsOfAlphRadio_branch_eee01
+ callchannel .sub1
notetype $c, $a1
note __, 16
note __, 16
- callchannel Music_RuinsOfAlphRadio_branch_eee08
+ callchannel .sub2
notetype $c, $a1
note __, 16
note __, 16
- callchannel Music_RuinsOfAlphRadio_branch_eee01
+ callchannel .sub1
notetype $c, $a1
note __, 16
- loopchannel 0, Music_RuinsOfAlphRadio_branch_eede3
+ loopchannel 0, .mainloop
-Music_RuinsOfAlphRadio_branch_eee01:
+.sub1:
octave 4
note G_, 1
note F#, 1
@@ -34,7 +34,7 @@
note C_, 8
endchannel
-Music_RuinsOfAlphRadio_branch_eee08:
+.sub2:
octave 4
note G_, 1
note F#, 1
@@ -49,25 +49,25 @@
Music_RuinsOfAlphRadio_Ch2:
dutycycle $1
vibrato $1, $e0
-Music_RuinsOfAlphRadio_branch_eee17:
+.mainloop:
stereopanning $f
notetype $6, $81
- callchannel Music_RuinsOfAlphRadio_branch_eee01
+ callchannel Music_RuinsOfAlphRadio_Ch1.sub1
notetype $c, $a1
note __, 16
note __, 16
notetype $6, $81
- callchannel Music_RuinsOfAlphRadio_branch_eee08
+ callchannel Music_RuinsOfAlphRadio_Ch1.sub2
notetype $c, $a1
note __, 16
- loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17
+ loopchannel 0, .mainloop
Music_RuinsOfAlphRadio_Ch3:
notetype $6, $26
-Music_RuinsOfAlphRadio_branch_eee35:
+.mainloop:
octave 2
note C_, 1
note C#, 1
note C_, 1
note __, 16
- loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35
+ loopchannel 0, .mainloop
--- a/audio/music/showmearound.asm
+++ b/audio/music/showmearound.asm
@@ -27,18 +27,18 @@
note D_, 1
note E_, 1
note G#, 8
-Music_ShowMeAround_branch_edc01:
+.mainloop:
note __, 16
note __, 16
note __, 16
note __, 16
- callchannel Music_ShowMeAround_branch_edc98
- callchannel Music_ShowMeAround_branch_edc15
- callchannel Music_ShowMeAround_branch_edc98
- callchannel Music_ShowMeAround_branch_edc15
- loopchannel 0, Music_ShowMeAround_branch_edc01
+ callchannel Music_ShowMeAround_Ch2.sub3
+ callchannel .sub1
+ callchannel Music_ShowMeAround_Ch2.sub3
+ callchannel .sub1
+ loopchannel 0, .mainloop
-Music_ShowMeAround_branch_edc15:
+.sub1:
note __, 4
octave 3
note C#, 1
@@ -83,10 +83,10 @@
note D_, 1
note E_, 8
dutycycle $1
-Music_ShowMeAround_branch_edc44:
- callchannel Music_ShowMeAround_branch_edc98
- callchannel Music_ShowMeAround_branch_edc98
- callchannel Music_ShowMeAround_branch_edc86
+.mainloop:
+ callchannel .sub3
+ callchannel .sub3
+ callchannel .sub1
note A_, 4
octave 3
note A_, 2
@@ -97,7 +97,7 @@
note C#, 2
octave 3
note B_, 4
- callchannel Music_ShowMeAround_branch_edc86
+ callchannel .sub1
note A_, 2
note A_, 2
note G#, 2
@@ -107,7 +107,7 @@
note A_, 2
note A_, 2
note A_, 4
- callchannel Music_ShowMeAround_branch_edc8e
+ callchannel .sub2
note A_, 4
octave 5
note C#, 2
@@ -122,7 +122,7 @@
note __, 1
note D#, 1
note E_, 1
- callchannel Music_ShowMeAround_branch_edc8e
+ callchannel .sub2
note A_, 2
octave 5
note E_, 2
@@ -134,9 +134,9 @@
note A_, 2
note A_, 2
note A_, 4
- loopchannel 0, Music_ShowMeAround_branch_edc44
+ loopchannel 0, .mainloop
-Music_ShowMeAround_branch_edc86:
+.sub1:
octave 3
note A_, 2
octave 4
@@ -146,7 +146,7 @@
note F#, 2
endchannel
-Music_ShowMeAround_branch_edc8e:
+.sub2:
octave 5
note C#, 2
octave 4
@@ -158,7 +158,7 @@
note A_, 2
endchannel
-Music_ShowMeAround_branch_edc98:
+.sub3:
note __, 4
octave 3
note C#, 1
@@ -219,16 +219,16 @@
note F_, 1
note E_, 2
intensity $14
-Music_ShowMeAround_branch_edcd9:
- callchannel Music_ShowMeAround_branch_edcef
- callchannel Music_ShowMeAround_branch_edcef
- callchannel Music_ShowMeAround_branch_edcef
- callchannel Music_ShowMeAround_branch_edd0f
- callchannel Music_ShowMeAround_branch_edcef
- callchannel Music_ShowMeAround_branch_edd0f
- loopchannel 0, Music_ShowMeAround_branch_edcd9
+.mainloop:
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub2
+ loopchannel 0, .mainloop
-Music_ShowMeAround_branch_edcef:
+.sub1:
octave 2
note A_, 2
note __, 6
@@ -262,7 +262,7 @@
note __, 2
endchannel
-Music_ShowMeAround_branch_edd0f:
+.sub2:
octave 2
note A_, 2
note __, 6
@@ -305,16 +305,16 @@
note D_, 2
note D#, 2
note F#, 4
-Music_ShowMeAround_branch_edd39:
- callchannel Music_ShowMeAround_branch_edd4f
- callchannel Music_ShowMeAround_branch_edd4f
- callchannel Music_ShowMeAround_branch_edd4f
- callchannel Music_ShowMeAround_branch_edd5e
- callchannel Music_ShowMeAround_branch_edd4f
- callchannel Music_ShowMeAround_branch_edd5e
- loopchannel 0, Music_ShowMeAround_branch_edd39
+.mainloop:
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub2
+ loopchannel 0, .mainloop
-Music_ShowMeAround_branch_edd4f:
+.sub1:
note D#, 2
note F#, 2
note D_, 2
@@ -331,7 +331,7 @@
note D#, 2
endchannel
-Music_ShowMeAround_branch_edd5e:
+.sub2:
note D#, 2
note F#, 2
note D_, 2
--- a/audio/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
@@ -14,7 +14,7 @@
notetype $c, $a3
note __, 16
note __, 16
-Music_SproutTower_branch_f6994:
+.mainloop:
note __, 6
octave 3
note F_, 2
@@ -59,7 +59,7 @@
note F_, 4
note D#, 4
note D#, 4
- loopchannel 0, Music_SproutTower_branch_f6994
+ loopchannel 0, .mainloop
Music_SproutTower_Ch2:
dutycycle $3
@@ -75,7 +75,7 @@
note F_, 4
note D#, 4
note D#, 4
-Music_SproutTower_branch_f69dc:
+.mainloop:
intensity $b5
octave 4
note C_, 4
@@ -136,7 +136,7 @@
octave 4
note C_, 16
note __, 16
- loopchannel 0, Music_SproutTower_branch_f69dc
+ loopchannel 0, .mainloop
Music_SproutTower_Ch3:
vibrato $14, $e8
@@ -159,7 +159,7 @@
note __, 2
note F#, 2
stereopanning $f0
-Music_SproutTower_branch_f6a3e:
+.mainloop:
note __, 4
note C_, 2
note F_, 2
@@ -216,13 +216,13 @@
note D#, 2
note __, 2
note F_, 2
- loopchannel 0, Music_SproutTower_branch_f6a3e
+ loopchannel 0, .mainloop
Music_SproutTower_Ch4:
togglenoise $0
notetype $c
note __, 4
-Music_SproutTower_branch_f6a7f:
+.mainloop:
note F#, 4
stereopanning $f0
note D#, 4
@@ -239,4 +239,4 @@
note D#, 2
stereopanning $ff
note F#, 4
- loopchannel 0, Music_SproutTower_branch_f6a7f
+ loopchannel 0, .mainloop
--- a/audio/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
@@ -17,7 +17,7 @@
note __, 1
note G_, 1
note __, 1
-Music_SSAqua_branch_eadbc:
+.mainloop:
octave 2
note G_, 16
note __, 8
@@ -42,7 +42,7 @@
note __, 8
dutycycle $1
intensity $61
- callchannel Music_SSAqua_branch_eaff5
+ callchannel Music_SSAqua_Ch2.sub4
octave 5
note G_, 1
octave 4
@@ -67,8 +67,8 @@
note B_, 1
note A_, 1
note G_, 1
- callchannel Music_SSAqua_branch_eaff5
- callchannel Music_SSAqua_branch_eb03e
+ callchannel Music_SSAqua_Ch2.sub4
+ callchannel Music_SSAqua_Ch2.sub5
note __, 16
note __, 16
note __, 16
@@ -246,7 +246,7 @@
note D_, 2
note F#, 2
note A_, 2
- loopchannel 0, Music_SSAqua_branch_eadbc
+ loopchannel 0, .mainloop
Music_SSAqua_Ch2:
stereopanning $f0
@@ -254,15 +254,15 @@
vibrato $8, $33
notetype $c, $b7
note __, 2
-Music_SSAqua_branch_eaed5:
+.mainloop:
notetype $c, $b7
dutycycle $1
intensity $61
- callchannel Music_SSAqua_branch_eaff5
- callchannel Music_SSAqua_branch_eb03e
+ callchannel .sub4
+ callchannel .sub5
dutycycle $2
intensity $d7
- callchannel Music_SSAqua_branch_eafe0
+ callchannel .sub3
note B_, 1
note __, 1
note G_, 1
@@ -275,7 +275,7 @@
note C#, 1
note E_, 1
pitchoffset 0, CC
- callchannel Music_SSAqua_branch_eafe0
+ callchannel .sub3
pitchoffset 0, C_
octave 3
note B_, 1
@@ -291,7 +291,7 @@
note B_, 1
octave 4
note C_, 1
- callchannel Music_SSAqua_branch_eaf88
+ callchannel .sub1
note G_, 4
note __, 4
note G_, 8
@@ -311,7 +311,7 @@
note B_, 1
octave 4
note C_, 1
- callchannel Music_SSAqua_branch_eaf88
+ callchannel .sub1
note G_, 4
note __, 4
note G_, 8
@@ -336,7 +336,7 @@
dutycycle $0
note B_, 2
note A_, 2
- callchannel Music_SSAqua_branch_eafd5
+ callchannel .sub2
notetype $6, $b7
note G#, 1
note A_, 11
@@ -363,7 +363,7 @@
note A#, 12
note B_, 2
note A_, 2
- callchannel Music_SSAqua_branch_eafd5
+ callchannel .sub2
notetype $6, $b7
note G#, 1
note A_, 11
@@ -389,9 +389,9 @@
note G_, 8
note A_, 8
note __, 8
- loopchannel 0, Music_SSAqua_branch_eaed5
+ loopchannel 0, .mainloop
-Music_SSAqua_branch_eaf88:
+.sub1:
note D_, 6
octave 3
note B_, 1
@@ -466,7 +466,7 @@
note F#, 2
endchannel
-Music_SSAqua_branch_eafd5:
+.sub2:
notetype $c, $b7
note B_, 10
note F#, 1
@@ -477,7 +477,7 @@
note __, 1
endchannel
-Music_SSAqua_branch_eafe0:
+.sub3:
octave 3
note D_, 10
note E_, 1
@@ -500,7 +500,7 @@
note __, 1
endchannel
-Music_SSAqua_branch_eaff5:
+.sub4:
octave 5
note G_, 1
note D_, 1
@@ -575,7 +575,7 @@
note G_, 1
endchannel
-Music_SSAqua_branch_eb03e:
+.sub5:
octave 5
note G_, 1
octave 4
@@ -610,7 +610,7 @@
note __, 1
note G_, 1
note __, 1
-Music_SSAqua_branch_eb063:
+.mainloop:
note G_, 16
note __, 8
note G_, 2
@@ -641,9 +641,9 @@
note B_, 1
octave 4
note E_, 1
- callchannel Music_SSAqua_branch_eb14d
- callchannel Music_SSAqua_branch_eb14d
-Music_SSAqua_branch_eb08d:
+ callchannel .sub1
+ callchannel .sub1
+.loop1:
note G_, 2
note __, 2
octave 3
@@ -670,10 +670,10 @@
octave 2
note G_, 1
note __, 1
- loopchannel 4, Music_SSAqua_branch_eb08d
- callchannel Music_SSAqua_branch_eb172
- callchannel Music_SSAqua_branch_eb172
- callchannel Music_SSAqua_branch_eb230
+ loopchannel 4, .loop1
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub3
octave 3
note E_, 2
note __, 2
@@ -746,7 +746,7 @@
octave 4
note F#, 1
note __, 3
- callchannel Music_SSAqua_branch_eb230
+ callchannel .sub3
octave 3
note E_, 2
note __, 2
@@ -821,9 +821,9 @@
note __, 1
note G_, 1
note __, 1
- loopchannel 0, Music_SSAqua_branch_eb063
+ loopchannel 0, .mainloop
-Music_SSAqua_branch_eb14d:
+.sub1:
notetype $6, $15
octave 2
note G_, 2
@@ -860,7 +860,7 @@
note __, 1
endchannel
-Music_SSAqua_branch_eb172:
+.sub2:
octave 2
note G_, 2
note __, 2
@@ -1052,7 +1052,7 @@
note __, 3
endchannel
-Music_SSAqua_branch_eb230:
+.sub3:
octave 2
note B_, 2
note __, 2
@@ -1083,7 +1083,8 @@
togglenoise $3
notetype $c
note __, 2
-Music_SSAqua_branch_eb24e:
+.mainloop:
+.loop1:
note G#, 1
note G_, 1
note G_, 1
@@ -1100,34 +1101,34 @@
note G_, 1
note G#, 1
note G_, 1
- loopchannel 12, Music_SSAqua_branch_eb24e
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2bb
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2bb
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2bb
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2c7
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2bb
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2ae
- callchannel Music_SSAqua_branch_eb2c7
- loopchannel 0, Music_SSAqua_branch_eb24e
+ loopchannel 12, .loop1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub3
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub3
+ loopchannel 0, .mainloop
-Music_SSAqua_branch_eb2ae:
+.sub1:
note A#, 2
note G_, 1
note G_, 1
@@ -1142,7 +1143,7 @@
note G_, 1
endchannel
-Music_SSAqua_branch_eb2bb:
+.sub2:
note A#, 2
note G_, 1
note G_, 1
@@ -1156,7 +1157,7 @@
note F#, 2
endchannel
-Music_SSAqua_branch_eb2c7:
+.sub3:
note A#, 2
note G_, 1
note G_, 1
--- a/audio/music/successfulcapture.asm
+++ b/audio/music/successfulcapture.asm
@@ -9,14 +9,14 @@
dutycycle $3
tone $0001
notetype $c, $a1
- jumpchannel Music_SuccessfulCapture_branch_f4536
+ jumpchannel Music_WildPokemonVictory_Ch1.body
Music_SuccessfulCapture_Ch2:
vibrato $12, $24
notetype $c, $c1
dutycycle $2
- jumpchannel Music_SuccessfulCapture_branch_f4585
+ jumpchannel Music_WildPokemonVictory_Ch2.body
Music_SuccessfulCapture_Ch3:
notetype $c, $25
- jumpchannel Music_SuccessfulCapture_branch_f45cf
+ jumpchannel Music_WildPokemonVictory_Ch3.body
--- a/audio/music/suicunebattle.asm
+++ b/audio/music/suicunebattle.asm
@@ -94,7 +94,7 @@
octave 3
note E_, 1
note G#, 1
-Music_SuicuneBattle_branch_178bfc:
+.mainloop:
notetype $c, $b4
octave 2
note A_, 2
@@ -509,7 +509,7 @@
note A_, 16
vibrato $12, $15
dutycycle $3
- loopchannel 0, Music_SuicuneBattle_branch_178bfc
+ loopchannel 0, .mainloop
Music_SuicuneBattle_Ch2:
dutycycle $3
@@ -589,7 +589,7 @@
note E_, 8
note E_, 8
note E_, 4
-Music_SuicuneBattle_branch_178e4e:
+.mainloop:
notetype $c, $c7
octave 3
note A_, 8
@@ -1184,7 +1184,7 @@
note E_, 2
note A_, 2
note B_, 2
- loopchannel 0, Music_SuicuneBattle_branch_178e4e
+ loopchannel 0, .mainloop
Music_SuicuneBattle_Ch3:
notetype $c, $18
@@ -1279,7 +1279,7 @@
note D_, 2
note E_, 2
notetype $c, $16
-Music_SuicuneBattle_branch_179182:
+.mainloop:
octave 1
note A_, 2
octave 2
@@ -2053,4 +2053,4 @@
note E_, 2
note D_, 2
note E_, 2
- loopchannel 0, Music_SuicuneBattle_branch_179182
+ loopchannel 0, .mainloop
--- a/audio/music/surf.asm
+++ b/audio/music/surf.asm
@@ -3,7 +3,7 @@
musicheader 1, 2, Music_Surf_Ch2
musicheader 1, 3, Music_Surf_Ch3
- db $3
+ db $3 ; unused
Music_Surf_Ch1:
tempo 108
@@ -10,7 +10,7 @@
volume $77
notetype $c, $a7
stereopanning $f
-Music_Surf_branch_f519e:
+.mainloop:
dutycycle $2
vibrato $10, $24
intensity $73
@@ -68,11 +68,11 @@
octave 4
note D_, 2
dutycycle $0
- callchannel Music_Surf_branch_f5233
+ callchannel .sub1
dutycycle $1
notetype $8, $a7
- callchannel Music_Surf_branch_f5233
- callchannel Music_Surf_branch_f5293
+ callchannel .sub1
+ callchannel .sub2
octave 4
note C_, 2
octave 3
@@ -87,7 +87,7 @@
note G_, 2
dutycycle $1
notetype $6, $97
- callchannel Music_Surf_branch_f5293
+ callchannel .sub2
intensity $a8
note G#, 6
note A_, 6
@@ -96,7 +96,7 @@
note D_, 3
intensity $a8
dutycycle $1
- callchannel Music_Surf_branch_f52d9
+ callchannel .sub3
octave 3
note D#, 8
note G#, 8
@@ -103,7 +103,7 @@
note D#, 8
dutycycle $3
notetype $8, $98
- callchannel Music_Surf_branch_f52d9
+ callchannel .sub3
notetype $c, $a7
octave 3
note D#, 12
@@ -117,9 +117,9 @@
note B_, 2
octave 3
note D#, 2
- loopchannel 0, Music_Surf_branch_f519e
+ loopchannel 0, .mainloop
-Music_Surf_branch_f5233:
+.sub1:
notetype $c, $a7
octave 3
note D#, 4
@@ -213,7 +213,7 @@
note D_, 4
endchannel
-Music_Surf_branch_f5293:
+.sub2:
octave 4
note G#, 16
note D#, 4
@@ -279,7 +279,7 @@
note G_, 2
endchannel
-Music_Surf_branch_f52d9:
+.sub3:
octave 3
note A#, 3
note G_, 3
@@ -339,12 +339,12 @@
endchannel
Music_Surf_Ch2:
-Music_Surf_branch_f5317:
+.mainloop:
notetype $c, $c2
stereopanning $f0
dutycycle $2
vibrato $14, $23
-Music_Surf_branch_f5321:
+.loop1:
octave 1
note A#, 4
octave 2
@@ -352,7 +352,7 @@
note __, 3
note A#, 1
note __, 3
- loopchannel 3, Music_Surf_branch_f5321
+ loopchannel 3, .loop1
octave 1
note A#, 4
octave 2
@@ -360,7 +360,7 @@
note __, 3
note A#, 1
note __, 3
-Music_Surf_branch_f5333:
+.loop2:
note D#, 4
note G_, 2
note G#, 2
@@ -395,27 +395,27 @@
note B_, 4
note A#, 4
note G#, 4
- loopchannel 2, Music_Surf_branch_f5333
+ loopchannel 2, .loop2
intensity $c7
- callchannel Music_Surf_branch_f53b2
+ callchannel .sub1
note D#, 4
note D_, 4
note C#, 4
- callchannel Music_Surf_branch_f53b2
+ callchannel .sub1
note D_, 4
note D#, 4
octave 1
note A#, 4
notetype $6, $b8
- callchannel Music_Surf_branch_f53d6
+ callchannel .sub2
dutycycle $1
intensity $b8
- callchannel Music_Surf_branch_f53e8
+ callchannel .sub3
dutycycle $2
- callchannel Music_Surf_branch_f53f3
+ callchannel .sub4
dutycycle $1
intensity $b8
- callchannel Music_Surf_branch_f5404
+ callchannel .sub5
octave 3
note B_, 16
octave 4
@@ -422,15 +422,15 @@
note C#, 8
pitchoffset 0, CC
dutycycle $3
- callchannel Music_Surf_branch_f53d6
+ callchannel .sub2
intensity $b8
dutycycle $1
- callchannel Music_Surf_branch_f53e8
+ callchannel .sub3
dutycycle $3
- callchannel Music_Surf_branch_f53f3
+ callchannel .sub4
intensity $b8
dutycycle $1
- callchannel Music_Surf_branch_f5404
+ callchannel .sub5
pitchoffset 0, C_
notetype $c, $b8
octave 4
@@ -442,9 +442,9 @@
note G#, 4
note A#, 4
note B_, 4
- loopchannel 0, Music_Surf_branch_f5317
+ loopchannel 0, .mainloop
-Music_Surf_branch_f53b2:
+.sub1:
octave 1
note G#, 4
octave 3
@@ -482,7 +482,7 @@
note G_, 4
endchannel
-Music_Surf_branch_f53d6:
+.sub2:
octave 4
note F_, 4
note D#, 4
@@ -501,7 +501,7 @@
note A_, 1
endchannel
-Music_Surf_branch_f53e8:
+.sub3:
note A#, 7
octave 4
note C_, 8
@@ -514,7 +514,7 @@
note G_, 8
endchannel
-Music_Surf_branch_f53f3:
+.sub4:
note F#, 1
note G_, 3
note F_, 4
@@ -532,7 +532,7 @@
note B_, 1
endchannel
-Music_Surf_branch_f5404:
+.sub5:
octave 4
note C_, 8
note G_, 4
@@ -543,7 +543,7 @@
endchannel
Music_Surf_Ch3:
-Music_Surf_branch_f540c:
+.mainloop:
stereopanning $ff
notetype $c, $15
vibrato $16, $23
@@ -663,7 +663,7 @@
octave 5
note A#, 4
intensity $15
- callchannel Music_Surf_branch_f54c8
+ callchannel .sub1
octave 2
note B_, 4
octave 3
@@ -672,7 +672,7 @@
note G#, 4
note A#, 4
note B_, 4
- callchannel Music_Surf_branch_f54c8
+ callchannel .sub1
octave 2
note B_, 4
octave 3
@@ -685,9 +685,9 @@
note D#, 8
octave 2
note B_, 4
- loopchannel 0, Music_Surf_branch_f540c
+ loopchannel 0, .mainloop
-Music_Surf_branch_f54c8:
+.sub1:
octave 3
note D#, 4
note G_, 1
--- a/audio/music/tintower.asm
+++ b/audio/music/tintower.asm
@@ -10,7 +10,7 @@
dutycycle $3
tone $0004
vibrato $8, $45
-Music_TinTower_branch_f682a:
+.mainloop:
stereopanning $f0
notetype $c, $a5
octave 3
@@ -93,15 +93,15 @@
intensity $a5
octave 3
note A#, 4
- loopchannel 0, Music_TinTower_branch_f682a
+ loopchannel 0, .mainloop
Music_TinTower_Ch2:
dutycycle $3
tone $0002
vibrato $18, $44
-Music_TinTower_branch_f6893:
+.mainloop:
stereopanning $ff
-Music_TinTower_branch_f6895:
+.loop1:
notetype $c, $b5
octave 4
note C_, 4
@@ -132,7 +132,7 @@
octave 4
note C_, 8
stereopanning $f
- loopchannel 2, Music_TinTower_branch_f6895
+ loopchannel 2, .loop1
intensity $b2
octave 3
note C_, 4
@@ -182,11 +182,11 @@
note C_, 6
intensity $95
note C#, 2
- loopchannel 0, Music_TinTower_branch_f6893
+ loopchannel 0, .mainloop
Music_TinTower_Ch3:
notetype $c, $14
-Music_TinTower_branch_f68fb:
+.mainloop:
note __, 16
note __, 16
note __, 16
@@ -256,12 +256,12 @@
note C_, 1
note __, 11
stereopanning $ff
- loopchannel 0, Music_TinTower_branch_f68fb
+ loopchannel 0, .mainloop
Music_TinTower_Ch4:
togglenoise $0
notetype $c
-Music_TinTower_branch_f694c:
+.mainloop:
stereopanning $f
note G_, 2
stereopanning $f0
@@ -288,4 +288,4 @@
note G_, 2
note G_, 2
note F_, 2
- loopchannel 0, Music_TinTower_branch_f694c
+ loopchannel 0, .mainloop
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -194,17 +194,17 @@
tempo 136
note C#, 6
tempo 134
- callchannel Music_TitleScreen_branch_eb96d
+ callchannel .sub1
octave 4
note C_, 4
note C_, 4
note C#, 4
- callchannel Music_TitleScreen_branch_eb96d
+ callchannel .sub1
octave 4
note C_, 4
note C_, 4
note C#, 4
- callchannel Music_TitleScreen_branch_eb96d
+ callchannel .sub1
octave 3
note E_, 4
note E_, 4
@@ -272,10 +272,10 @@
note __, 11
endchannel
-Music_TitleScreen_branch_eb96d:
+.sub1:
notetype $c, $c3
note D_, 1
-Music_TitleScreen_branch_eb971:
+.sub1loop1:
note __, 1
octave 2
note D_, 1
@@ -283,7 +283,7 @@
note A_, 1
octave 2
note D_, 1
- loopchannel 5, Music_TitleScreen_branch_eb971
+ loopchannel 5, .sub1loop1
note __, 1
note D_, 1
octave 1
@@ -479,11 +479,11 @@
note C#, 4
tone $0001
stereopanning $f
- callchannel Music_TitleScreen_branch_ebae7
+ callchannel .sub1
note C#, 4
- callchannel Music_TitleScreen_branch_ebae7
+ callchannel .sub1
note C#, 4
- callchannel Music_TitleScreen_branch_ebae7
+ callchannel .sub1
octave 4
note A_, 4
stereopanning $ff
@@ -554,10 +554,10 @@
note __, 11
endchannel
-Music_TitleScreen_branch_ebae7:
+.sub1:
notetype $c, $b2
note D_, 1
-Music_TitleScreen_branch_ebaeb:
+.sub1loop1:
octave 3
note A_, 1
octave 4
@@ -564,7 +564,7 @@
note D_, 1
note A_, 1
note D_, 1
- loopchannel 5, Music_TitleScreen_branch_ebaeb
+ loopchannel 5, .sub1loop1
octave 3
note A_, 1
octave 4
@@ -947,9 +947,9 @@
note C_, 1
note C_, 1
notetype $c
- callchannel Music_TitleScreen_branch_ebd77
- callchannel Music_TitleScreen_branch_ebd81
- callchannel Music_TitleScreen_branch_ebd81
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub2
note C_, 2
note D#, 2
note C_, 2
@@ -964,7 +964,7 @@
note C_, 1
note C_, 1
notetype $c
- callchannel Music_TitleScreen_branch_ebd77
+ callchannel .sub1
note C_, 2
note D#, 2
note C_, 2
@@ -974,7 +974,7 @@
note C_, 1
note C_, 2
note C_, 2
- callchannel Music_TitleScreen_branch_ebd81
+ callchannel .sub2
note C_, 2
note D#, 2
note C_, 2
@@ -985,9 +985,9 @@
note C_, 2
note C_, 1
note C_, 1
- callchannel Music_TitleScreen_branch_ebd77
- callchannel Music_TitleScreen_branch_ebd81
- callchannel Music_TitleScreen_branch_ebd81
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub2
note C_, 2
note D#, 2
note C_, 2
@@ -1002,8 +1002,8 @@
note D_, 1
note C#, 1
notetype $c
- callchannel Music_TitleScreen_branch_ebd77
- callchannel Music_TitleScreen_branch_ebd81
+ callchannel .sub1
+ callchannel .sub2
note C_, 2
note D#, 2
note C_, 2
@@ -1053,22 +1053,22 @@
note C#, 1
note C_, 1
note C_, 1
- callchannel Music_TitleScreen_branch_ebd8b
- callchannel Music_TitleScreen_branch_ebd93
+ callchannel .sub3
+ callchannel .sub4
note C#, 1
note D_, 1
note D_, 1
note C#, 1
notetype $c
- callchannel Music_TitleScreen_branch_ebd8b
- callchannel Music_TitleScreen_branch_ebd93
+ callchannel .sub3
+ callchannel .sub4
note D_, 1
note D_, 1
note C#, 1
note C#, 1
notetype $c
- callchannel Music_TitleScreen_branch_ebd8b
- callchannel Music_TitleScreen_branch_ebd93
+ callchannel .sub3
+ callchannel .sub4
note C#, 1
note C#, 1
note C#, 1
@@ -1075,9 +1075,9 @@
note C#, 1
notetype $c
note G#, 16
-Music_TitleScreen_branch_ebd40:
+.loop1:
note __, 16
- loopchannel 6, Music_TitleScreen_branch_ebd40
+ loopchannel 6, .loop1
note __, 12
notetype $6
note D_, 1
@@ -1124,7 +1124,7 @@
note B_, 4
endchannel
-Music_TitleScreen_branch_ebd77:
+.sub1:
note C_, 2
note D#, 2
note C_, 2
@@ -1136,7 +1136,7 @@
note D#, 2
endchannel
-Music_TitleScreen_branch_ebd81:
+.sub2:
note C_, 2
note D#, 2
note C_, 2
@@ -1148,14 +1148,15 @@
note D#, 2
endchannel
-Music_TitleScreen_branch_ebd8b:
+.sub3:
+.sub3loop1:
note C_, 2
note C_, 1
note C_, 1
- loopchannel 4, Music_TitleScreen_branch_ebd8b
+ loopchannel 4, .sub3loop1
endchannel
-Music_TitleScreen_branch_ebd93:
+.sub4:
note C_, 2
note C_, 1
note C_, 1
--- a/audio/music/trainervictory.asm
+++ b/audio/music/trainervictory.asm
@@ -19,9 +19,10 @@
intensity $b6
note A_, 12
stereopanning $f
-Music_TrainerVictory_branch_ebecd:
+.mainloop:
+.loop1:
intensity $72
- callchannel Music_TrainerVictory_branch_ebf11
+ callchannel .sub1
intensity $51
note C#, 2
note E_, 2
@@ -37,8 +38,8 @@
octave 4
note C#, 2
note E_, 6
- loopchannel 2, Music_TrainerVictory_branch_ebecd
- callchannel Music_TrainerVictory_branch_ebf11
+ loopchannel 2, .loop1
+ callchannel .sub1
note A_, 2
note __, 2
note F_, 2
@@ -47,7 +48,7 @@
note __, 2
note G_, 2
note A#, 6
-Music_TrainerVictory_branch_ebef2:
+.loop2:
intensity $72
octave 4
note D_, 2
@@ -54,24 +55,24 @@
note C#, 2
octave 3
note A_, 2
- loopchannel 3, Music_TrainerVictory_branch_ebef2
+ loopchannel 3, .loop2
note F#, 2
note A_, 2
octave 4
note D_, 2
-Music_TrainerVictory_branch_ebf01:
+.loop3:
octave 4
note C#, 2
octave 3
note B_, 2
note A_, 2
- loopchannel 3, Music_TrainerVictory_branch_ebf01
+ loopchannel 3, .loop3
note E_, 2
note F#, 2
note G_, 2
- loopchannel 0, Music_TrainerVictory_branch_ebecd
+ loopchannel 0, .mainloop
-Music_TrainerVictory_branch_ebf11:
+.sub1:
octave 3
note F#, 2
note __, 2
@@ -98,9 +99,10 @@
intensity $d6
note D_, 12
stereopanning $f0
-Music_TrainerVictory_branch_ebf30:
+.mainloop:
+.loop1:
notetype $8, $82
- callchannel Music_TrainerVictory_branch_ebf56
+ callchannel .sub1
note F#, 2
note __, 2
note G_, 2
@@ -109,8 +111,8 @@
note __, 2
note F#, 2
note G_, 6
- loopchannel 2, Music_TrainerVictory_branch_ebf30
- callchannel Music_TrainerVictory_branch_ebf56
+ loopchannel 2, .loop1
+ callchannel .sub1
note F_, 2
note __, 2
note C_, 2
@@ -122,9 +124,9 @@
notetype $c, $88
note F#, 16
note E_, 16
- loopchannel 0, Music_TrainerVictory_branch_ebf30
+ loopchannel 0, .mainloop
-Music_TrainerVictory_branch_ebf56:
+.sub1:
octave 4
note D_, 2
note __, 2
@@ -155,8 +157,9 @@
note C#, 2
octave 2
note B_, 2
-Music_TrainerVictory_branch_ebf74:
- callchannel Music_TrainerVictory_branch_ebfb1
+.mainloop:
+.loop1:
+ callchannel .sub1
octave 3
note C#, 2
note __, 2
@@ -171,8 +174,8 @@
note A_, 1
note __, 1
note A_, 6
- loopchannel 2, Music_TrainerVictory_branch_ebf74
- callchannel Music_TrainerVictory_branch_ebfb1
+ loopchannel 2, .loop1
+ callchannel .sub1
octave 3
note C_, 2
note __, 2
@@ -206,9 +209,9 @@
note G_, 2
note E_, 2
note C#, 2
- loopchannel 0, Music_TrainerVictory_branch_ebf74
+ loopchannel 0, .mainloop
-Music_TrainerVictory_branch_ebfb1:
+.sub1:
octave 2
note A_, 2
note __, 2
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -11,12 +11,12 @@
tone $0002
vibrato $18, $34
stereopanning $f
-Music_UnionCave_branch_f5c7b:
+.mainloop:
notetype $c, $b3
-Music_UnionCave_branch_f5c7e:
- callchannel Music_UnionCave_branch_f5ccf
- loopchannel 4, Music_UnionCave_branch_f5c7e
-Music_UnionCave_branch_f5c85:
+.loop1:
+ callchannel .sub1
+ loopchannel 4, .loop1
+.loop2:
octave 2
note G#, 2
octave 3
@@ -25,8 +25,8 @@
note C#, 2
note E_, 2
note F_, 4
- loopchannel 8, Music_UnionCave_branch_f5c85
-Music_UnionCave_branch_f5c91:
+ loopchannel 8, .loop2
+.loop3:
octave 2
note A_, 2
octave 3
@@ -35,7 +35,7 @@
note D_, 2
note F_, 2
note F#, 4
- loopchannel 4, Music_UnionCave_branch_f5c91
+ loopchannel 4, .loop3
note __, 4
intensity $80
note F_, 16
@@ -54,17 +54,17 @@
note A_, 8
intensity $95
tone $0004
- callchannel Music_UnionCave_branch_f5ccf
+ callchannel .sub1
tone $0008
- callchannel Music_UnionCave_branch_f5ccf
+ callchannel .sub1
tone $000c
- callchannel Music_UnionCave_branch_f5ccf
+ callchannel .sub1
tone $0010
- callchannel Music_UnionCave_branch_f5ccf
+ callchannel .sub1
tone $0002
- loopchannel 0, Music_UnionCave_branch_f5c7b
+ loopchannel 0, .mainloop
-Music_UnionCave_branch_f5ccf:
+.sub1:
octave 2
note G#, 2
octave 3
@@ -75,13 +75,13 @@
Music_UnionCave_Ch2:
dutycycle $3
vibrato $8, $24
-Music_UnionCave_branch_f5cda:
+.mainloop:
notetype $c, $c4
- callchannel Music_UnionCave_branch_f5d34
+ callchannel .sub1
intensity $c5
- callchannel Music_UnionCave_branch_f5d34
+ callchannel .sub1
intensity $c7
- callchannel Music_UnionCave_branch_f5d34
+ callchannel .sub1
intensity $c4
note C#, 4
octave 3
@@ -123,17 +123,17 @@
note A_, 16
intensity $a5
vibrato $6, $44
- callchannel Music_UnionCave_branch_f5d52
+ callchannel .sub2
vibrato $4, $33
- callchannel Music_UnionCave_branch_f5d52
+ callchannel .sub2
vibrato $2, $22
- callchannel Music_UnionCave_branch_f5d52
+ callchannel .sub2
vibrato $1, $41
- callchannel Music_UnionCave_branch_f5d52
+ callchannel .sub2
vibrato $8, $24
- loopchannel 0, Music_UnionCave_branch_f5cda
+ loopchannel 0, .mainloop
-Music_UnionCave_branch_f5d34:
+.sub1:
octave 4
note C_, 4
octave 3
@@ -165,7 +165,7 @@
note C_, 4
endchannel
-Music_UnionCave_branch_f5d52:
+.sub2:
octave 2
note G#, 2
octave 3
@@ -176,13 +176,14 @@
Music_UnionCave_Ch3:
notetype $c, $16
stereopanning $f0
-Music_UnionCave_branch_f5d5d:
+.mainloop:
+.loop1:
note __, 16
- loopchannel 7, Music_UnionCave_branch_f5d5d
+ loopchannel 7, .loop1
note __, 14
octave 4
note C_, 2
-Music_UnionCave_branch_f5d65:
+.loop2:
note __, 2
octave 3
note E_, 2
@@ -193,8 +194,8 @@
note __, 2
octave 4
note C_, 2
- loopchannel 4, Music_UnionCave_branch_f5d65
-Music_UnionCave_branch_f5d73:
+ loopchannel 4, .loop2
+.loop3:
note __, 2
octave 3
note F_, 2
@@ -205,7 +206,7 @@
note __, 2
octave 4
note C#, 2
- loopchannel 4, Music_UnionCave_branch_f5d73
+ loopchannel 4, .loop3
note __, 4
note C_, 8
octave 3
@@ -218,7 +219,7 @@
octave 3
note B_, 8
note A#, 8
-Music_UnionCave_branch_f5d8d:
+.loop4:
note A_, 4
note G_, 4
note A#, 2
@@ -227,19 +228,19 @@
octave 3
note A_, 2
note G_, 2
- loopchannel 3, Music_UnionCave_branch_f5d8d
+ loopchannel 3, .loop4
note A_, 4
note G_, 4
note A#, 8
-Music_UnionCave_branch_f5d9c:
+.loop5:
note __, 16
- loopchannel 4, Music_UnionCave_branch_f5d9c
- loopchannel 0, Music_UnionCave_branch_f5d5d
+ loopchannel 4, .loop5
+ loopchannel 0, .mainloop
Music_UnionCave_Ch4:
togglenoise $1
notetype $c
-Music_UnionCave_branch_f5da9:
+.mainloop:
stereopanning $f0
note E_, 4
stereopanning $ff
@@ -254,5 +255,6 @@
stereopanning $f0
note G#, 4
note __, 8
- loopchannel 0, Music_UnionCave_branch_f5da9
- loopchannel 0, Music_UnionCave_branch_f5da9 ; unused
+ loopchannel 0, .mainloop
+
+ loopchannel 0, .mainloop ; unused
--- a/audio/music/vermilioncity.asm
+++ b/audio/music/vermilioncity.asm
@@ -3,7 +3,7 @@
musicheader 1, 2, Music_VermilionCity_Ch2
musicheader 1, 3, Music_VermilionCity_Ch3
- db $3
+ db $3 ; unused
Music_VermilionCity_Ch1:
stereopanning $f
@@ -29,20 +29,20 @@
octave 5
note D_, 1
vibrato $10, $23
-Music_VermilionCity_branch_eb6a0:
+.mainloop:
dutycycle $1
notetype $c, $85
- callchannel Music_VermilionCity_branch_eb6f9
+ callchannel .sub1
note F_, 4
octave 4
note D_, 4
note C#, 4
note E_, 4
- callchannel Music_VermilionCity_branch_eb6f9
- callchannel Music_VermilionCity_branch_eb701
+ callchannel .sub1
+ callchannel .sub2
dutycycle $2
notetype $c, $85
- callchannel Music_VermilionCity_branch_eb6f9
+ callchannel .sub1
note F_, 4
octave 4
note D_, 4
@@ -57,8 +57,8 @@
note A_, 1
note E_, 1
note C_, 1
- callchannel Music_VermilionCity_branch_eb6f9
- callchannel Music_VermilionCity_branch_eb701
+ callchannel .sub1
+ callchannel .sub2
intensity $93
dutycycle $0
note __, 2
@@ -69,8 +69,8 @@
note F#, 2
note __, 2
note F#, 2
- callchannel Music_VermilionCity_branch_eb70c
- callchannel Music_VermilionCity_branch_eb70c
+ callchannel .sub3
+ callchannel .sub3
intensity $87
dutycycle $2
octave 4
@@ -89,9 +89,9 @@
note B_, 4
octave 3
note D_, 4
- loopchannel 0, Music_VermilionCity_branch_eb6a0
+ loopchannel 0, .mainloop
-Music_VermilionCity_branch_eb6f9:
+.sub1:
octave 3
note C#, 4
note E_, 4
@@ -101,7 +101,7 @@
note G#, 2
endchannel
-Music_VermilionCity_branch_eb701:
+.sub2:
note D_, 2
note F_, 2
note A_, 2
@@ -114,7 +114,7 @@
note E_, 2
endchannel
-Music_VermilionCity_branch_eb70c:
+.sub3:
note __, 2
note F#, 2
note A_, 2
@@ -152,11 +152,11 @@
note E_, 4
note F#, 4
note G#, 4
-Music_VermilionCity_branch_eb735:
+.mainloop:
notetype $c, $97
- callchannel Music_VermilionCity_branch_eb768
+ callchannel .sub1
note G#, 2
- callchannel Music_VermilionCity_branch_eb768
+ callchannel .sub1
note E_, 2
intensity $b7
octave 3
@@ -165,8 +165,8 @@
note C#, 4
note D_, 4
note E_, 4
- callchannel Music_VermilionCity_branch_eb77e
- callchannel Music_VermilionCity_branch_eb77e
+ callchannel .sub2
+ callchannel .sub2
note F#, 6
note E_, 1
note F#, 1
@@ -185,9 +185,9 @@
notetype $c, $87
octave 5
note E_, 16
- loopchannel 0, Music_VermilionCity_branch_eb735
+ loopchannel 0, .mainloop
-Music_VermilionCity_branch_eb768:
+.sub1:
octave 1
note A_, 8
octave 2
@@ -211,7 +211,7 @@
note A_, 2
endchannel
-Music_VermilionCity_branch_eb77e:
+.sub2:
note F#, 8
note B_, 8
note A_, 4
@@ -241,15 +241,15 @@
note D_, 1
octave 2
note B_, 1
-Music_VermilionCity_branch_eb79e:
+.mainloop:
notetype $c, $22
- callchannel Music_VermilionCity_branch_eb7de
+ callchannel .sub1
octave 5
note A_, 6
intensity $24
note E_, 1
note G#, 1
- callchannel Music_VermilionCity_branch_eb7de
+ callchannel .sub1
note A_, 8
intensity $14
octave 3
@@ -263,7 +263,7 @@
note __, 4
note D_, 1
note D_, 1
- callchannel Music_VermilionCity_branch_eb7f5
+ callchannel .sub2
octave 4
note D_, 2
octave 3
@@ -270,7 +270,7 @@
note D_, 2
note __, 2
note D_, 2
- callchannel Music_VermilionCity_branch_eb7f5
+ callchannel .sub2
intensity $25
octave 3
note E_, 8
@@ -288,9 +288,9 @@
octave 5
note E_, 1
note G#, 1
- loopchannel 0, Music_VermilionCity_branch_eb79e
+ loopchannel 0, .mainloop
-Music_VermilionCity_branch_eb7de:
+.sub1:
octave 5
note A_, 8
octave 6
@@ -315,7 +315,7 @@
note B_, 1
endchannel
-Music_VermilionCity_branch_eb7f5:
+.sub2:
note A_, 1
note __, 1
note A_, 2
--- a/audio/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
@@ -11,10 +11,11 @@
dutycycle $3
tone $0002
notetype $c, $b3
-Music_VictoryRoad_branch_f6c8d:
- callchannel Music_VictoryRoad_branch_f6cb9
- loopchannel 6, Music_VictoryRoad_branch_f6c8d
-Music_VictoryRoad_branch_f6c94:
+.mainloop:
+.loop1:
+ callchannel .sub1
+ loopchannel 6, .loop1
+.loop2:
intensity $b2
octave 2
note A_, 1
@@ -35,13 +36,13 @@
note A_, 1
octave 3
note G#, 3
- loopchannel 2, Music_VictoryRoad_branch_f6c94
-Music_VictoryRoad_branch_f6cae:
- callchannel Music_VictoryRoad_branch_f6cb9
- loopchannel 2, Music_VictoryRoad_branch_f6cae
- loopchannel 0, Music_VictoryRoad_branch_f6c8d
+ loopchannel 2, .loop2
+.loop3:
+ callchannel .sub1
+ loopchannel 2, .loop3
+ loopchannel 0, .mainloop
-Music_VictoryRoad_branch_f6cb9:
+.sub1:
intensity $b2
octave 2
note G_, 1
@@ -65,11 +66,11 @@
Music_VictoryRoad_Ch2:
dutycycle $3
vibrato $10, $24
-Music_VictoryRoad_branch_f6cd3:
+.mainloop:
notetype $c, $c2
- callchannel Music_VictoryRoad_branch_f6d1e
+ callchannel .sub1
note __, 2
- callchannel Music_VictoryRoad_branch_f6d1e
+ callchannel .sub1
note __, 1
octave 4
note C_, 1
@@ -115,9 +116,9 @@
octave 5
note C#, 1
note D_, 16
- loopchannel 0, Music_VictoryRoad_branch_f6cd3
+ loopchannel 0, .mainloop
-Music_VictoryRoad_branch_f6d1e:
+.sub1:
octave 3
note E_, 1
note __, 1
@@ -136,10 +137,11 @@
Music_VictoryRoad_Ch3:
stereopanning $f0
notetype $c, $28
-Music_VictoryRoad_branch_f6d31:
- callchannel Music_VictoryRoad_branch_f6d52
- loopchannel 6, Music_VictoryRoad_branch_f6d31
-Music_VictoryRoad_branch_f6d38:
+.mainloop:
+.loop1:
+ callchannel .sub1
+ loopchannel 6, .loop1
+.loop2:
note D_, 1
note __, 1
note B_, 1
@@ -151,13 +153,13 @@
note __, 2
note D_, 1
note B_, 3
- loopchannel 2, Music_VictoryRoad_branch_f6d38
-Music_VictoryRoad_branch_f6d47:
- callchannel Music_VictoryRoad_branch_f6d52
- loopchannel 2, Music_VictoryRoad_branch_f6d47
- loopchannel 0, Music_VictoryRoad_branch_f6d31
+ loopchannel 2, .loop2
+.loop3:
+ callchannel .sub1
+ loopchannel 2, .loop3
+ loopchannel 0, .mainloop
-Music_VictoryRoad_branch_f6d52:
+.sub1:
octave 3
note C_, 1
note __, 1
@@ -175,7 +177,7 @@
Music_VictoryRoad_Ch4:
togglenoise $0
notetype $c
-Music_VictoryRoad_branch_f6d63:
+.mainloop:
note D_, 2
note D_, 2
note D#, 1
@@ -194,4 +196,4 @@
note D#, 1
note D_, 2
note D#, 1
- loopchannel 0, Music_VictoryRoad_branch_f6d63
+ loopchannel 0, .mainloop
--- a/audio/music/violetcity.asm
+++ b/audio/music/violetcity.asm
@@ -64,7 +64,7 @@
octave 3
note C#, 12
note __, 8
-Music_VioletCity_branch_f0056:
+.mainloop:
notetype $6, $95
note __, 4
octave 2
@@ -294,7 +294,7 @@
octave 4
note C#, 4
note __, 4
- loopchannel 0, Music_VioletCity_branch_f0056
+ loopchannel 0, .mainloop
Music_VioletCity_Ch2:
vibrato $12, $24
@@ -347,7 +347,7 @@
note __, 2
note D#, 1
note E_, 1
-Music_VioletCity_branch_f0199:
+.mainloop:
intensity $b7
note F#, 4
note __, 2
@@ -500,7 +500,7 @@
note __, 2
note D#, 1
note E_, 1
- loopchannel 0, Music_VioletCity_branch_f0199
+ loopchannel 0, .mainloop
Music_VioletCity_Ch3:
notetype $c, $25
@@ -527,7 +527,7 @@
note F#, 2
octave 2
note A#, 2
-Music_VioletCity_branch_f0261:
+.mainloop:
notetype $c, $25
note B_, 1
note __, 5
@@ -623,7 +623,7 @@
note B_, 2
note __, 2
note A_, 8
- callchannel Music_VioletCity_branch_f0311
+ callchannel .sub1
note F#, 2
note __, 10
note B_, 2
@@ -633,7 +633,7 @@
note A#, 8
note A_, 2
note __, 2
- callchannel Music_VioletCity_branch_f0311
+ callchannel .sub1
note F#, 2
note __, 10
note B_, 2
@@ -688,9 +688,9 @@
note __, 4
octave 2
note A#, 4
- loopchannel 0, Music_VioletCity_branch_f0261
+ loopchannel 0, .mainloop
-Music_VioletCity_branch_f0311:
+.sub1:
note G_, 2
note __, 10
note G_, 2
@@ -715,9 +715,9 @@
note D_, 2
note D_, 4
note F#, 4
- callchannel Music_VioletCity_branch_f036c
- callchannel Music_VioletCity_branch_f036c
- callchannel Music_VioletCity_branch_f036c
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
note D_, 2
note D#, 1
note D#, 1
@@ -724,26 +724,26 @@
note D_, 2
note C_, 8
note D#, 2
-Music_VioletCity_branch_f0338:
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- callchannel Music_VioletCity_branch_f037a
- loopchannel 0, Music_VioletCity_branch_f0338
+.mainloop:
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ callchannel .sub2
+ loopchannel 0, .mainloop
-Music_VioletCity_branch_f036c:
+.sub1:
note D_, 1
note D_, 1
note D#, 1
@@ -759,7 +759,7 @@
note G_, 1
endchannel
-Music_VioletCity_branch_f037a:
+.sub2:
note D#, 2
note G_, 1
note G_, 1
--- a/audio/music/viridiancity.asm
+++ b/audio/music/viridiancity.asm
@@ -41,13 +41,13 @@
note __, 4
note G_, 8
note __, 4
-Music_ViridianCity_branch_f4039:
- callchannel Music_ViridianCity_branch_f40c5
+.mainloop:
+ callchannel .sub1
note __, 4
- callchannel Music_ViridianCity_branch_f40c5
+ callchannel .sub1
octave 4
note C_, 4
- callchannel Music_ViridianCity_branch_f410f
+ callchannel .sub2
octave 4
note B_, 2
note G_, 2
@@ -117,7 +117,7 @@
octave 3
note B_, 2
note A_, 2
- callchannel Music_ViridianCity_branch_f410f
+ callchannel .sub2
octave 4
note A_, 2
note G_, 2
@@ -168,9 +168,9 @@
note __, 3
note G_, 8
note A#, 4
- loopchannel 0, Music_ViridianCity_branch_f4039
+ loopchannel 0, .mainloop
-Music_ViridianCity_branch_f40c5:
+.sub1:
octave 3
note A_, 1
note __, 3
@@ -246,7 +246,7 @@
note G_, 8
endchannel
-Music_ViridianCity_branch_f410f:
+.sub2:
octave 3
note B_, 2
note D_, 2
@@ -304,13 +304,13 @@
note __, 4
note E_, 8
note __, 4
-Music_ViridianCity_branch_f414c:
- callchannel Music_ViridianCity_branch_f41c0
+.mainloop:
+ callchannel .sub1
note __, 4
- callchannel Music_ViridianCity_branch_f41c0
+ callchannel .sub1
octave 2
note F#, 4
- callchannel Music_ViridianCity_branch_f4201
+ callchannel .sub2
note G_, 4
note __, 2
octave 3
@@ -323,7 +323,7 @@
note D_, 4
octave 2
note B_, 2
- callchannel Music_ViridianCity_branch_f420b
+ callchannel .sub3
note __, 2
note F#, 2
note __, 2
@@ -332,7 +332,7 @@
note __, 1
note C#, 4
note C_, 4
- callchannel Music_ViridianCity_branch_f4215
+ callchannel .sub4
note E_, 4
note __, 2
note B_, 1
@@ -359,7 +359,7 @@
octave 2
note A_, 2
note F#, 2
- callchannel Music_ViridianCity_branch_f4201
+ callchannel .sub2
note G_, 4
note __, 2
note B_, 1
@@ -368,7 +368,7 @@
note __, 1
note B_, 4
note G_, 2
- callchannel Music_ViridianCity_branch_f420b
+ callchannel .sub3
note __, 2
note F#, 2
note __, 2
@@ -379,7 +379,7 @@
note __, 2
octave 2
note D#, 2
- callchannel Music_ViridianCity_branch_f4215
+ callchannel .sub4
note E_, 4
note __, 2
note A#, 1
@@ -401,9 +401,9 @@
note E_, 8
octave 1
note A_, 4
- loopchannel 0, Music_ViridianCity_branch_f414c
+ loopchannel 0, .mainloop
-Music_ViridianCity_branch_f41c0:
+.sub1:
octave 2
note D_, 4
note __, 2
@@ -470,7 +470,7 @@
note E_, 8
endchannel
-Music_ViridianCity_branch_f4201:
+.sub2:
note G_, 4
note __, 2
octave 3
@@ -482,7 +482,7 @@
note F#, 2
endchannel
-Music_ViridianCity_branch_f420b:
+.sub3:
note F#, 4
note __, 2
octave 3
@@ -494,7 +494,7 @@
note F_, 2
endchannel
-Music_ViridianCity_branch_f4215:
+.sub4:
octave 2
note E_, 4
note __, 2
@@ -541,13 +541,13 @@
note D_, 8
note F#, 2
note G_, 2
-Music_ViridianCity_branch_f4246:
+.mainloop:
intensity $13
- callchannel Music_ViridianCity_branch_f42a2
+ callchannel .sub1
octave 5
note F#, 2
note G_, 2
- callchannel Music_ViridianCity_branch_f42a2
+ callchannel .sub1
note E_, 4
vibrato $18, $25
intensity $25
@@ -622,9 +622,9 @@
note __, 3
note D_, 8
note E_, 4
- loopchannel 0, Music_ViridianCity_branch_f4246
+ loopchannel 0, .mainloop
-Music_ViridianCity_branch_f42a2:
+.sub1:
octave 5
note A_, 2
note __, 2
@@ -690,28 +690,28 @@
Music_ViridianCity_Ch4:
togglenoise $3
notetype $c
- callchannel Music_ViridianCity_branch_f431d
- callchannel Music_ViridianCity_branch_f432c
-Music_ViridianCity_branch_f42e9:
- callchannel Music_ViridianCity_branch_f431d
- callchannel Music_ViridianCity_branch_f431d
- callchannel Music_ViridianCity_branch_f431d
- callchannel Music_ViridianCity_branch_f432c
- callchannel Music_ViridianCity_branch_f431d
- callchannel Music_ViridianCity_branch_f431d
- callchannel Music_ViridianCity_branch_f431d
- callchannel Music_ViridianCity_branch_f432c
- callchannel Music_ViridianCity_branch_f433b
- callchannel Music_ViridianCity_branch_f434b
- callchannel Music_ViridianCity_branch_f433b
- callchannel Music_ViridianCity_branch_f433b
- callchannel Music_ViridianCity_branch_f433b
- callchannel Music_ViridianCity_branch_f434b
- callchannel Music_ViridianCity_branch_f433b
- callchannel Music_ViridianCity_branch_f433b
- loopchannel 0, Music_ViridianCity_branch_f42e9
+ callchannel .sub1
+ callchannel .sub2
+.mainloop:
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub1
+ callchannel .sub2
+ callchannel .sub3
+ callchannel .sub4
+ callchannel .sub3
+ callchannel .sub3
+ callchannel .sub3
+ callchannel .sub4
+ callchannel .sub3
+ callchannel .sub3
+ loopchannel 0, .mainloop
-Music_ViridianCity_branch_f431d:
+.sub1:
note E_, 2
note E_, 2
note D_, 2
@@ -728,7 +728,7 @@
note F#, 2
endchannel
-Music_ViridianCity_branch_f432c:
+.sub2:
note E_, 2
note E_, 2
note D_, 2
@@ -745,7 +745,7 @@
note A#, 2
endchannel
-Music_ViridianCity_branch_f433b:
+.sub3:
note D#, 2
note F#, 2
note D_, 2
@@ -763,7 +763,7 @@
note D#, 2
endchannel
-Music_ViridianCity_branch_f434b:
+.sub4:
note D#, 2
note F#, 2
note D_, 2
--- a/audio/music/wildpokemonvictory.asm
+++ b/audio/music/wildpokemonvictory.asm
@@ -16,32 +16,32 @@
note F#, 1
intensity $b6
note E_, 12
-Music_SuccessfulCapture_branch_f4536:
+.body:
stereopanning $f
-Music_WildPokemonVictory_branch_f4538:
- callchannel Music_WildPokemonVictory_branch_f455c
+.mainloop:
+ callchannel .sub1
note F#, 2
note F#, 2
note F#, 4
- callchannel Music_WildPokemonVictory_branch_f455c
+ callchannel .sub1
note G#, 4
intensity $78
octave 3
note G_, 4
pitchoffset 0, C#
- callchannel Music_WildPokemonVictory_branch_f455c
+ callchannel .sub1
note F#, 2
note F#, 2
note F#, 4
- callchannel Music_WildPokemonVictory_branch_f455c
+ callchannel .sub1
note G#, 4
pitchoffset 0, C_
intensity $78
octave 3
note F#, 4
- loopchannel 0, Music_WildPokemonVictory_branch_f4538
+ loopchannel 0, .mainloop
-Music_WildPokemonVictory_branch_f455c:
+.sub1:
intensity $71
octave 3
note G#, 1
@@ -78,15 +78,15 @@
note A_, 1
intensity $d6
note B_, 12
-Music_SuccessfulCapture_branch_f4585:
+.body:
stereopanning $f0
-Music_WildPokemonVictory_branch_f4587:
- callchannel Music_WildPokemonVictory_branch_f45b5
+.mainloop:
+ callchannel .sub1
octave 4
note B_, 2
note B_, 2
note B_, 4
- callchannel Music_WildPokemonVictory_branch_f45b5
+ callchannel .sub1
octave 4
note B_, 4
intensity $81
@@ -95,12 +95,12 @@
note G_, 1
note A#, 1
pitchoffset 0, C#
- callchannel Music_WildPokemonVictory_branch_f45b5
+ callchannel .sub1
octave 4
note B_, 2
note B_, 2
note B_, 4
- callchannel Music_WildPokemonVictory_branch_f45b5
+ callchannel .sub1
octave 4
note B_, 4
pitchoffset 0, C_
@@ -111,9 +111,9 @@
note D#, 1
note F#, 1
note A_, 1
- loopchannel 0, Music_WildPokemonVictory_branch_f4587
+ loopchannel 0, .mainloop
-Music_WildPokemonVictory_branch_f45b5:
+.sub1:
intensity $81
octave 4
note B_, 2
@@ -139,34 +139,34 @@
note __, 3
note E_, 1
note __, 3
-Music_SuccessfulCapture_branch_f45cf:
-Music_WildPokemonVictory_branch_f45cf:
- callchannel Music_WildPokemonVictory_branch_f45f4
+.body:
+.mainloop:
+ callchannel .sub1
note D#, 2
note C#, 2
octave 2
note B_, 2
note __, 2
- callchannel Music_WildPokemonVictory_branch_f45f4
+ callchannel .sub1
note E_, 2
note __, 2
note C_, 4
pitchoffset 0, C#
- callchannel Music_WildPokemonVictory_branch_f45f4
+ callchannel .sub1
note D#, 2
note C#, 2
octave 2
note B_, 2
note __, 2
- callchannel Music_WildPokemonVictory_branch_f45f4
+ callchannel .sub1
note E_, 2
note __, 2
pitchoffset 0, C_
octave 2
note B_, 4
- loopchannel 0, Music_WildPokemonVictory_branch_f45cf
+ loopchannel 0, .mainloop
-Music_WildPokemonVictory_branch_f45f4:
+.sub1:
intensity $25
octave 3
note E_, 2