shithub: pokecrystal

Download patch

ref: cfa8cb7b15f10fdf1499e14878b587a41f6d4776
parent: 30fd84d4529393e212e86b8f804d70ac69b0077d
author: yenatch <[email protected]>
date: Thu Feb 6 15:50:51 EST 2014 

Redump music for whitespace formatting changes

to avoid a bigger diff later


--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_AfterTheRivalFight_Ch4
 ; f5133
 
-
 Music_AfterTheRivalFight_Ch1: ; f5133
 	tempo 112
 	volume $77
@@ -24,6 +23,7 @@
 	note G#, 2
 	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1
+; f5153
 
 Music_AfterTheRivalFight_Ch2: ; f5153
 	dutycycle $1
@@ -39,6 +39,7 @@
 	note G#, 2
 	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f502e
+; f516a
 
 Music_AfterTheRivalFight_Ch3: ; f516a
 	notetype $c, $28
@@ -52,6 +53,7 @@
 	note F_, 2
 	note D#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f509d
+; f517a
 
 Music_AfterTheRivalFight_Ch4: ; f517a
 	togglenoise $3
@@ -65,3 +67,5 @@
 	note D_, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f5118
 ; f518a
+
+
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_AzaleaTown_Ch4
 ; f57f4
 
-
 Music_AzaleaTown_Ch1: ; f57f4
 	tempo 160
 	volume $77
@@ -13,7 +12,6 @@
 	stereopanning $f
 	notetype $c, $a1
 	note __, 2
-
 Music_AzaleaTown_branch_f5801: ; f5801
 	intensity $a1
 	octave 3
@@ -29,7 +27,6 @@
 	note F_, 2
 	note F_, 2
 	loopchannel 2, Music_AzaleaTown_branch_f5801
-
 Music_AzaleaTown_branch_f5816: ; f5816
 	callchannel Music_AzaleaTown_branch_f588c
 	stereopanning $f0
@@ -233,6 +230,7 @@
 	intensity $a1
 	note A_, 8
 	endchannel
+; f591d
 
 Music_AzaleaTown_Ch2: ; f591d
 	vibrato $12, $23
@@ -270,7 +268,6 @@
 	dutycycle $1
 	octave 5
 	note C_, 1
-
 Music_AzaleaTown_branch_f5952: ; f5952
 	callchannel Music_AzaleaTown_branch_f59c7
 	note C#, 4
@@ -423,6 +420,7 @@
 	note D#, 12
 	intensity $b4
 	endchannel
+; f5a08
 
 Music_AzaleaTown_Ch3: ; f5a08
 	stereopanning $ff
@@ -448,7 +446,6 @@
 	note C#, 1
 	note __, 1
 	note G#, 4
-
 Music_AzaleaTown_branch_f5a24: ; f5a24
 	callchannel Music_AzaleaTown_branch_f5a86
 	note G#, 4
@@ -634,12 +631,12 @@
 	note F_, 1
 	note __, 1
 	endchannel
+; f5ae5
 
 Music_AzaleaTown_Ch4: ; f5ae5
 	togglenoise $3
 	notetype $c
 	note F_, 2
-
 Music_AzaleaTown_branch_f5aea: ; f5aea
 	note D#, 2
 	note F#, 2
@@ -664,3 +661,5 @@
 	note F#, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5aea
 ; f5b03
+
+
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_BattleTowerLobby_Ch4
 ; 179497
 
-
 Music_BattleTowerLobby_Ch1: ; 179497
 	tempo 152
 	volume $77
@@ -14,7 +13,6 @@
 	vibrato $8, $22
 	stereopanning $f0
 	notetype $c, $72
-
 Music_BattleTowerLobby_branch_1794a9: ; 1794a9
 	notetype $c, $72
 	octave 3
@@ -118,6 +116,7 @@
 	octave 2
 	note B_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_1794a9
+; 17953a
 
 Music_BattleTowerLobby_Ch2: ; 17953a
 	dutycycle $2
@@ -124,7 +123,6 @@
 	vibrato $10, $34
 	stereopanning $f
 	notetype $c, $82
-
 Music_BattleTowerLobby_branch_179544: ; 179544
 	notetype $c, $82
 	octave 4
@@ -203,10 +201,10 @@
 	octave 4
 	note D#, 1
 	loopchannel 0, Music_BattleTowerLobby_branch_179544
+; 1795ae
 
 Music_BattleTowerLobby_Ch3: ; 1795ae
 	notetype $c, $11
-
 Music_BattleTowerLobby_branch_1795b1: ; 1795b1
 	octave 2
 	note B_, 2
@@ -300,10 +298,10 @@
 	note D#, 2
 	note F#, 2
 	loopchannel 0, Music_BattleTowerLobby_branch_1795b1
+; 179610
 
 Music_BattleTowerLobby_Ch4: ; 179610
 	togglenoise $0
-
 Music_BattleTowerLobby_branch_179612: ; 179612
 	notetype $c
 	note __, 2
@@ -313,3 +311,5 @@
 	note F_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_179612
 ; 17961d
+
+
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_BattleTowerTheme_Ch4
 ; 178895
 
-
 Music_BattleTowerTheme_Ch1: ; 178895
 	tempo 141
 	volume $77
@@ -13,7 +12,6 @@
 	vibrato $12, $34
 	stereopanning $f
 	notetype $6, $94
-
 Music_BattleTowerTheme_branch_1788a5: ; 1788a5
 	note __, 16
 	note __, 16
@@ -204,10 +202,10 @@
 	note __, 4
 	note A_, 4
 	endchannel
+; 17896d
 
 Music_BattleTowerTheme_Ch2: ; 17896d
 	vibrato $12, $34
-
 Music_BattleTowerTheme_branch_178970: ; 178970
 	dutycycle $3
 	notetype $6, $b8
@@ -361,11 +359,11 @@
 	note A#, 4
 	note A_, 4
 	endchannel
+; 178a20
 
 Music_BattleTowerTheme_Ch3: ; 178a20
 	vibrato $12, $34
 	notetype $6, $16
-
 Music_BattleTowerTheme_branch_178a26: ; 178a26
 	stereopanning $ff
 	callchannel Music_BattleTowerTheme_branch_178afe
@@ -589,11 +587,11 @@
 	note C_, 2
 	note __, 2
 	endchannel
+; 178b0d
 
 Music_BattleTowerTheme_Ch4: ; 178b0d
 	togglenoise $3
 	notetype $c
-
 Music_BattleTowerTheme_branch_178b11: ; 178b11
 	callchannel Music_BattleTowerTheme_branch_178b58
 	note D_, 2
@@ -605,7 +603,6 @@
 	note C#, 1
 	note D_, 1
 	note C#, 1
-
 Music_BattleTowerTheme_branch_178b1d: ; 178b1d
 	callchannel Music_BattleTowerTheme_branch_178b58
 	callchannel Music_BattleTowerTheme_branch_178b61
@@ -618,7 +615,6 @@
 	note D_, 1
 	note D_, 1
 	note D_, 8
-
 Music_BattleTowerTheme_branch_178b35: ; 178b35
 	callchannel Music_BattleTowerTheme_branch_178b76
 	note D_, 2
@@ -699,3 +695,5 @@
 	note C#, 1
 	endchannel
 ; 178b81
+
+
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Bicycle_Ch4
 ; ee125
 
-
 Music_Bicycle_Ch1: ; ee125
 	tempo 140
 	volume $77
@@ -24,7 +23,6 @@
 	note A_, 8
 	intensity $b2
 	note F#, 2
-
 Music_Bicycle_branch_ee144: ; ee144
 	stereopanning $f
 	intensity $b2
@@ -171,6 +169,7 @@
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_Bicycle_branch_ee144
+; ee1de
 
 Music_Bicycle_Ch2: ; ee1de
 	dutycycle $2
@@ -196,7 +195,6 @@
 	octave 3
 	note B_, 2
 	note A_, 2
-
 Music_Bicycle_branch_ee1fd: ; ee1fd
 	stereopanning $ff
 	dutycycle $2
@@ -288,6 +286,7 @@
 	note G_, 6
 	note E_, 4
 	endchannel
+; ee26d
 
 Music_Bicycle_Ch3: ; ee26d
 	notetype $c, $14
@@ -306,7 +305,6 @@
 	octave 3
 	note A_, 1
 	note __, 1
-
 Music_Bicycle_branch_ee27f: ; ee27f
 	callchannel Music_Bicycle_branch_ee333
 	note E_, 1
@@ -410,7 +408,6 @@
 	note __, 1
 	note A_, 1
 	note __, 1
-
 Music_Bicycle_branch_ee2e9: ; ee2e9
 	note G_, 1
 	note __, 1
@@ -501,6 +498,7 @@
 	note B_, 1
 	note __, 1
 	endchannel
+; ee345
 
 Music_Bicycle_Ch4: ; ee345
 	togglenoise $0
@@ -507,10 +505,8 @@
 	notetype $c
 	note __, 16
 	note __, 16
-
 Music_Bicycle_branch_ee34b: ; ee34b
 	note __, 2
-
 Music_Bicycle_branch_ee34c: ; ee34c
 	stereopanning $f0
 	note F_, 4
@@ -523,3 +519,5 @@
 	note F_, 2
 	loopchannel 0, Music_Bicycle_branch_ee34b
 ; ee35e
+
+
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_BuenasPassword_Ch4
 ; 17815f
 
-
 Music_BuenasPassword_Ch1: ; 17815f
 	tempo 136
 	volume $77
@@ -12,7 +11,6 @@
 	tone $0001
 	notetype $c, $b3
 	note __, 8
-
 Music_BuenasPassword_branch_17816b: ; 17816b
 	stereopanning $ff
 	note __, 16
@@ -191,7 +189,6 @@
 	note __, 7
 	octave 3
 	note F#, 1
-
 Music_BuenasPassword_branch_17823c: ; 17823c
 	stereopanning $ff
 	callchannel Music_BuenasPassword_branch_1782df
@@ -386,11 +383,11 @@
 	note B_, 1
 	note G#, 3
 	endchannel
+; 178311
 
 Music_BuenasPassword_Ch3: ; 178311
 	notetype $c, $14
 	note __, 8
-
 Music_BuenasPassword_branch_178315: ; 178315
 	callchannel Music_BuenasPassword_branch_1783a7
 	callchannel Music_BuenasPassword_branch_1783a7
@@ -569,6 +566,7 @@
 	octave 2
 	note G#, 2
 	endchannel
+; 1783d0
 
 Music_BuenasPassword_Ch4: ; 1783d0
 	togglenoise $3
@@ -578,7 +576,6 @@
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_BuenasPassword_branch_1783d9: ; 1783d9
 	callchannel Music_BuenasPassword_branch_17840c
 	callchannel Music_BuenasPassword_branch_17840c
@@ -646,3 +643,5 @@
 	note D_, 1
 	endchannel
 ; 17843b
+
+
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_BugCatchingContest_Ch4
 ; f7c22
 
-
 Music_BugCatchingContest_Ch1: ; f7c22
 	tempo 144
 	volume $77
@@ -39,16 +38,13 @@
 	note __, 1
 	note E_, 1
 	note E_, 1
-
 Music_BugCatchingContest_branch_f7c4b: ; f7c4b
 	notetype $c, $b1
-
 Music_BugCatchingContest_branch_f7c4e: ; f7c4e
 	note __, 2
 	octave 2
 	note A_, 2
 	loopchannel 4, Music_BugCatchingContest_branch_f7c4e
-
 Music_BugCatchingContest_branch_f7c55: ; f7c55
 	note __, 2
 	note B_, 2
@@ -65,7 +61,6 @@
 	note E_, 1
 	intensity $b1
 	dutycycle $2
-
 Music_BugCatchingContest_branch_f7c6b: ; f7c6b
 	note __, 2
 	octave 2
@@ -96,7 +91,6 @@
 	note E_, 4
 	note __, 4
 	note E_, 4
-
 Music_BugCatchingContest_branch_f7c8e: ; f7c8e
 	note __, 4
 	octave 2
@@ -193,6 +187,7 @@
 	note E_, 2
 	note E_, 2
 	loopchannel 0, Music_BugCatchingContest_branch_f7c4b
+; f7cf4
 
 Music_BugCatchingContest_Ch2: ; f7cf4
 	stereopanning $f0
@@ -200,7 +195,6 @@
 	dutycycle $1
 	notetype $c, $c7
 	note __, 8
-
 Music_BugCatchingContest_branch_f7cff: ; f7cff
 	octave 4
 	note A_, 1
@@ -210,7 +204,6 @@
 	note A_, 1
 	note A_, 1
 	loopchannel 4, Music_BugCatchingContest_branch_f7cff
-
 Music_BugCatchingContest_branch_f7d0a: ; f7d0a
 	dutycycle $0
 	callchannel Music_BugCatchingContest_branch_f7d8e
@@ -379,6 +372,7 @@
 	note G_, 1
 	note __, 1
 	endchannel
+; f7db7
 
 Music_BugCatchingContest_Ch3: ; f7db7
 	stereopanning $ff
@@ -411,7 +405,6 @@
 	note __, 1
 	note C#, 1
 	note C#, 1
-
 Music_BugCatchingContest_branch_f7dda: ; f7dda
 	notetype $c, $14
 	note F#, 5
@@ -594,6 +587,7 @@
 	note C#, 2
 	note C#, 2
 	loopchannel 0, Music_BugCatchingContest_branch_f7dda
+; f7e9a
 
 Music_BugCatchingContest_Ch4: ; f7e9a
 	togglenoise $4
@@ -613,7 +607,6 @@
 	note E_, 2
 	note E_, 2
 	callchannel Music_BugCatchingContest_branch_f7ee2
-
 Music_BugCatchingContest_branch_f7eaf: ; f7eaf
 	note D_, 4
 	note D_, 4
@@ -679,3 +672,4 @@
 	note D_, 2
 	endchannel
 ; f7ef3
+
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_BurnedTower_Ch4
 ; f6aa5
 
-
 Music_BurnedTower_Ch1: ; f6aa5
 	tempo 168
 	volume $77
@@ -28,7 +27,6 @@
 	note D_, 2
 	intensity $80
 	note C#, 6
-
 Music_BurnedTower_branch_f6ac8: ; f6ac8
 	intensity $91
 	octave 2
@@ -39,7 +37,6 @@
 	note A#, 6
 	loopchannel 2, Music_BurnedTower_branch_f6ac8
 	tempo 150
-
 Music_BurnedTower_branch_f6ad8: ; f6ad8
 	intensity $b1
 	octave 2
@@ -90,7 +87,6 @@
 	note E_, 2
 	intensity $a0
 	note D#, 6
-
 Music_BurnedTower_branch_f6b17: ; f6b17
 	intensity $b1
 	octave 2
@@ -102,6 +98,7 @@
 	note C_, 6
 	loopchannel 2, Music_BurnedTower_branch_f6b17
 	loopchannel 0, Music_BurnedTower_branch_f6ad8
+; f6b29
 
 Music_BurnedTower_Ch2: ; f6b29
 	dutycycle $2
@@ -110,7 +107,6 @@
 	notetype $c, $70
 	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c5
-
 Music_BurnedTower_branch_f6b39: ; f6b39
 	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c1
@@ -197,6 +193,7 @@
 	note D_, 4
 	note E_, 16
 	endchannel
+; f6ba2
 
 Music_BurnedTower_Ch3: ; f6ba2
 	stereopanning $f
@@ -207,7 +204,6 @@
 	note __, 12
 	octave 3
 	note D#, 4
-
 Music_BurnedTower_branch_f6bad: ; f6bad
 	octave 2
 	note A_, 2
@@ -228,7 +224,6 @@
 	note E_, 2
 	note D#, 4
 	loopchannel 4, Music_BurnedTower_branch_f6bad
-
 Music_BurnedTower_branch_f6bc3: ; f6bc3
 	octave 2
 	note B_, 2
@@ -250,16 +245,15 @@
 	note F_, 4
 	loopchannel 2, Music_BurnedTower_branch_f6bc3
 	loopchannel 0, Music_BurnedTower_branch_f6bad
+; f6bdd
 
 Music_BurnedTower_Ch4: ; f6bdd
 	togglenoise $0
 	notetype $c
-
 Music_BurnedTower_branch_f6be1: ; f6be1
 	note __, 16
 	loopchannel 4, Music_BurnedTower_branch_f6be1
 	note __, 2
-
 Music_BurnedTower_branch_f6be7: ; f6be7
 	stereopanning $f0
 	note G_, 2
@@ -269,3 +263,5 @@
 	note G_, 4
 	loopchannel 0, Music_BurnedTower_branch_f6be7
 ; f6bf2
+
+
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
@@ -4,12 +4,10 @@
 	dbw $02, Music_CeladonCity_Ch3
 ; f4364
 
-
 Music_CeladonCity_Ch1: ; f4364
 	tempo 146
 	volume $77
 	tone $0001
-
 Music_CeladonCity_branch_f436c: ; f436c
 	stereopanning $f
 	notetype $c, $a6
@@ -22,7 +20,6 @@
 	note E_, 2
 	note F#, 2
 	callchannel Music_CeladonCity_branch_f43cc
-
 Music_CeladonCity_branch_f437d: ; f437d
 	note D_, 2
 	note F#, 1
@@ -145,6 +142,7 @@
 	note A_, 1
 	loopchannel 4, Music_CeladonCity_branch_f43fe
 	endchannel
+; f4406
 
 Music_CeladonCity_Ch2: ; f4406
 	vibrato $12, $34
@@ -161,7 +159,6 @@
 	note F#, 1
 	note G_, 1
 	note A_, 8
-
 Music_CeladonCity_branch_f441a: ; f441a
 	callchannel Music_CeladonCity_branch_f4463
 	note A_, 4
@@ -273,10 +270,10 @@
 	note D_, 2
 	note F#, 4
 	endchannel
+; f4492
 
 Music_CeladonCity_Ch3: ; f4492
 	vibrato $12, $24
-
 Music_CeladonCity_branch_f4495: ; f4495
 	notetype $c, $25
 	octave 3
@@ -286,7 +283,6 @@
 	note __, 2
 	note D_, 8
 	callchannel Music_CeladonCity_branch_f44fd
-
 Music_CeladonCity_branch_f44a1: ; f44a1
 	octave 2
 	note A_, 2
@@ -398,3 +394,5 @@
 	note B_, 2
 	endchannel
 ; f4518
+
+
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_ChampionBattle_Ch3
 ; ea9ca
 
-
 Music_ChampionBattle_Ch1: ; ea9ca
 	tempo 98
 	volume $77
@@ -19,7 +18,6 @@
 	note A#, 4
 	intensity $b7
 	note B_, 4
-
 Music_ChampionBattle_branch_ea9e2: ; ea9e2
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
@@ -28,12 +26,10 @@
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
 	note E_, 4
-
 Music_ChampionBattle_branch_ea9f0: ; ea9f0
 	callchannel Music_ChampionBattle_branch_eaafc
 	loopchannel 3, Music_ChampionBattle_branch_ea9f0
 	callchannel Music_ChampionBattle_branch_eab06
-
 Music_ChampionBattle_branch_ea9fa: ; ea9fa
 	callchannel Music_ChampionBattle_branch_eaafc
 	loopchannel 7, Music_ChampionBattle_branch_ea9fa
@@ -77,7 +73,6 @@
 	octave 4
 	note C_, 1
 	note C#, 1
-
 Music_ChampionBattle_branch_eaa35: ; eaa35
 	callchannel Music_ChampionBattle_branch_eab0f
 	note E_, 2
@@ -84,7 +79,6 @@
 	note E_, 2
 	intensity $b7
 	note F#, 4
-
 Music_ChampionBattle_branch_eaa3d: ; eaa3d
 	intensity $b2
 	note E_, 2
@@ -173,7 +167,6 @@
 	intensity $90
 	note D#, 16
 	note C#, 16
-
 Music_ChampionBattle_branch_eaab1: ; eaab1
 	intensity $b2
 	octave 2
@@ -183,7 +176,6 @@
 	octave 3
 	note D#, 4
 	loopchannel 4, Music_ChampionBattle_branch_eaab1
-
 Music_ChampionBattle_branch_eaabe: ; eaabe
 	intensity $b2
 	note C_, 2
@@ -308,6 +300,7 @@
 	note C#, 4
 	intensity $b2
 	endchannel
+; eab4a
 
 Music_ChampionBattle_Ch2: ; eab4a
 	dutycycle $3
@@ -364,7 +357,6 @@
 	note E_, 8
 	intensity $3c
 	note E_, 8
-
 Music_ChampionBattle_branch_eab9d: ; eab9d
 	intensity $c5
 	note D#, 6
@@ -433,7 +425,6 @@
 	note F_, 16
 	note F#, 16
 	intensity $c4
-
 Music_ChampionBattle_branch_eabef: ; eabef
 	octave 5
 	note D#, 4
@@ -558,10 +549,10 @@
 	note D#, 2
 	intensity $c5
 	endchannel
+; eac85
 
 Music_ChampionBattle_Ch3: ; eac85
 	notetype $c, $14
-
 Music_ChampionBattle_branch_eac88: ; eac88
 	octave 3
 	note D#, 1
@@ -610,12 +601,10 @@
 	note A#, 2
 	note F_, 2
 	note A_, 2
-
 Music_ChampionBattle_branch_eacc6: ; eacc6
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacc6
-
 Music_ChampionBattle_branch_eaccc: ; eaccc
 	note E_, 2
 	note B_, 2
@@ -628,12 +617,10 @@
 	note B_, 2
 	note G_, 2
 	note A_, 2
-
 Music_ChampionBattle_branch_eacda: ; eacda
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacda
-
 Music_ChampionBattle_branch_eace0: ; eace0
 	note E_, 2
 	note B_, 2
@@ -665,7 +652,6 @@
 	note D#, 8
 	note B_, 8
 	note D#, 8
-
 Music_ChampionBattle_branch_ead05: ; ead05
 	note D#, 2
 	note F#, 2
@@ -684,13 +670,11 @@
 	note D#, 2
 	note E_, 2
 	callchannel Music_ChampionBattle_branch_ead8e
-
 Music_ChampionBattle_branch_ead1d: ; ead1d
 	octave 3
 	note E_, 2
 	note B_, 2
 	loopchannel 4, Music_ChampionBattle_branch_ead1d
-
 Music_ChampionBattle_branch_ead24: ; ead24
 	note D#, 2
 	note A#, 2
@@ -703,7 +687,6 @@
 	note __, 2
 	note D#, 2
 	note __, 2
-
 Music_ChampionBattle_branch_ead32: ; ead32
 	note E_, 2
 	note B_, 2
@@ -716,12 +699,10 @@
 	note __, 2
 	note E_, 2
 	note __, 2
-
 Music_ChampionBattle_branch_ead40: ; ead40
 	note D#, 2
 	note G#, 2
 	loopchannel 8, Music_ChampionBattle_branch_ead40
-
 Music_ChampionBattle_branch_ead46: ; ead46
 	note D#, 2
 	note A#, 2
@@ -728,7 +709,6 @@
 	loopchannel 7, Music_ChampionBattle_branch_ead46
 	note B_, 2
 	note A#, 2
-
 Music_ChampionBattle_branch_ead4e: ; ead4e
 	octave 3
 	note D#, 2
@@ -809,3 +789,5 @@
 	note E_, 2
 	endchannel
 ; ead99
+
+
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_CherrygroveCity_Ch4
 ; f5b0f
 
-
 Music_CherrygroveCity_Ch1: ; f5b0f
 	tempo 152
 	volume $77
@@ -19,7 +18,6 @@
 	note C_, 2
 	note D_, 2
 	note E_, 2
-
 Music_CherrygroveCity_branch_f5b26: ; f5b26
 	note A_, 4
 	note G#, 2
@@ -94,6 +92,7 @@
 	octave 3
 	note C_, 4
 	loopchannel 0, Music_CherrygroveCity_branch_f5b26
+; f5b74
 
 Music_CherrygroveCity_Ch2: ; f5b74
 	dutycycle $3
@@ -109,7 +108,6 @@
 	note G_, 2
 	note A_, 2
 	note A#, 2
-
 Music_CherrygroveCity_branch_f5b87: ; f5b87
 	intensity $c6
 	octave 4
@@ -175,6 +173,7 @@
 	intensity $a7
 	note F_, 8
 	loopchannel 0, Music_CherrygroveCity_branch_f5b87
+; f5bd8
 
 Music_CherrygroveCity_Ch3: ; f5bd8
 	notetype $c, $16
@@ -187,7 +186,6 @@
 	note G_, 2
 	note F_, 2
 	note E_, 2
-
 Music_CherrygroveCity_branch_f5be4: ; f5be4
 	note A_, 2
 	note F_, 2
@@ -286,12 +284,12 @@
 	note F_, 2
 	note A_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5be4
+; f5c48
 
 Music_CherrygroveCity_Ch4: ; f5c48
 	togglenoise $3
 	notetype $c
 	note __, 16
-
 Music_CherrygroveCity_branch_f5c4d: ; f5c4d
 	note C#, 2
 	note __, 2
@@ -310,3 +308,5 @@
 	note G_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5c4d
 ; f5c60
+
+
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Clair_Ch4
 ; 1fa99
 
-
 Music_Clair_Ch1: ; 1fa99
 	tempo 136
 	volume $77
@@ -14,7 +13,6 @@
 	stereopanning $f
 	notetype $c, $93
 	dutycycle $3
-
 Music_Clair_branch_1faab: ; 1faab
 	octave 4
 	note F_, 1
@@ -39,7 +37,6 @@
 	note D#, 4
 	note F_, 4
 	note G_, 4
-
 Music_Clair_branch_1fac9: ; 1fac9
 	intensity $93
 	callchannel Music_Clair_branch_1fb12
@@ -147,12 +144,12 @@
 	note D#, 1
 	note F#, 1
 	endchannel
+; 1fb41
 
 Music_Clair_Ch2: ; 1fb41
 	dutycycle $3
 	vibrato $12, $34
 	notetype $6, $b7
-
 Music_Clair_branch_1fb49: ; 1fb49
 	octave 3
 	note A#, 2
@@ -192,7 +189,6 @@
 	note G_, 2
 	note A#, 2
 	intensity $b7
-
 Music_Clair_branch_1fb77: ; 1fb77
 	callchannel Music_Clair_branch_1fba6
 	note F#, 2
@@ -254,6 +250,7 @@
 	note D#, 16
 	note __, 4
 	endchannel
+; 1fbb9
 
 Music_Clair_Ch3: ; 1fbb9
 	notetype $c, $14
@@ -277,7 +274,6 @@
 	note A#, 4
 	note G#, 4
 	note G_, 4
-
 Music_Clair_branch_1fbd1: ; 1fbd1
 	callchannel Music_Clair_branch_1fc3c
 	octave 2
@@ -397,6 +393,7 @@
 	octave 1
 	note G#, 2
 	endchannel
+; 1fc4b
 
 Music_Clair_Ch4: ; 1fc4b
 	togglenoise $3
@@ -414,7 +411,6 @@
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_Clair_branch_1fc5e: ; 1fc5e
 	stereopanning $ff
 	callchannel Music_Clair_branch_1fc6e
@@ -445,3 +441,5 @@
 	note G_, 1
 	endchannel
 ; 1fc87
+
+
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@@ -5,12 +5,10 @@
 	dbw $03, Music_ContestResults_Ch4
 ; efb4a
 
-
 Music_ContestResults_Ch1: ; efb4a
 	tempo 144
 	volume $77
 	notetype $c, $51
-
 Music_ContestResults_branch_efb52: ; efb52
 	note __, 2
 	octave 2
@@ -50,10 +48,10 @@
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb52
+; efb7b
 
 Music_ContestResults_Ch2: ; efb7b
 	notetype $c, $61
-
 Music_ContestResults_branch_efb7e: ; efb7e
 	octave 2
 	note C_, 2
@@ -95,7 +93,6 @@
 	octave 3
 	note F_, 1
 	note __, 1
-
 Music_ContestResults_branch_efba6: ; efba6
 	octave 2
 	note D_, 2
@@ -129,11 +126,11 @@
 	note D_, 1
 	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb7e
+; efbcc
 
 Music_ContestResults_Ch3: ; efbcc
 	vibrato $8, $24
 	notetype $c, $23
-
 Music_ContestResults_branch_efbd2: ; efbd2
 	octave 4
 	note E_, 5
@@ -155,11 +152,11 @@
 	note A_, 8
 	note G_, 8
 	loopchannel 0, Music_ContestResults_branch_efbd2
+; efbe9
 
 Music_ContestResults_Ch4: ; efbe9
 	togglenoise $4
 	notetype $6
-
 Music_ContestResults_branch_efbed: ; efbed
 	note C#, 4
 	note C#, 4
@@ -179,3 +176,5 @@
 	note G_, 1
 	loopchannel 0, Music_ContestResults_branch_efbed
 ; efc01
+
+
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Credits_Ch4
 ; 1f328
 
-
 Music_Credits_Ch1: ; 1f328
 	tempo 139
 	volume $77
@@ -182,7 +181,6 @@
 	octave 5
 	note C#, 6
 	notetype $c, $a7
-
 Music_Credits_branch_1f407: ; 1f407
 	octave 3
 	note A_, 1
@@ -563,6 +561,7 @@
 	note F#, 6
 	note C#, 6
 	endchannel
+; 1f58d
 
 Music_Credits_Ch2: ; 1f58d
 	dutycycle $1
@@ -724,7 +723,6 @@
 	octave 2
 	note F#, 1
 	note __, 1
-
 Music_Credits_branch_1f657: ; 1f657
 	octave 1
 	note G_, 2
@@ -982,6 +980,7 @@
 	octave 5
 	note C_, 4
 	endchannel
+; 1f772
 
 Music_Credits_Ch3: ; 1f772
 	vibrato $16, $23
@@ -1443,6 +1442,7 @@
 	note G_, 2
 	note D_, 2
 	endchannel
+; 1f973
 
 Music_Credits_Ch4: ; 1f973
 	togglenoise $3
@@ -1480,7 +1480,6 @@
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa6d
-
 Music_Credits_branch_1f9a8: ; 1f9a8
 	note A#, 2
 	note G_, 1
@@ -1509,7 +1508,6 @@
 	note C#, 1
 	note D_, 1
 	note D_, 1
-
 Music_Credits_branch_1f9c6: ; 1f9c6
 	note A#, 2
 	note G_, 1
@@ -1544,7 +1542,6 @@
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa6d
-
 Music_Credits_branch_1f9f2: ; 1f9f2
 	note A#, 2
 	note G_, 1
@@ -1695,3 +1692,5 @@
 	note D_, 1
 	endchannel
 ; 1fa8d
+
+
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_CrystalOpening_Ch4
 ; 1786f4
 
-
 Music_CrystalOpening_Ch1: ; 1786f4
 	tempo 136
 	volume $77
@@ -122,6 +121,7 @@
 	octave 2
 	note D_, 16
 	endchannel
+; 17877a
 
 Music_CrystalOpening_Ch2: ; 17877a
 	notetype $c, $a2
@@ -177,6 +177,7 @@
 	octave 3
 	note D_, 16
 	endchannel
+; 1787c8
 
 Music_CrystalOpening_Ch3: ; 1787c8
 	notetype $c, $16
@@ -241,6 +242,7 @@
 	note D_, 1
 	note __, 15
 	endchannel
+; 178810
 
 Music_CrystalOpening_Ch4: ; 178810
 	stereopanning $f
@@ -360,3 +362,5 @@
 	note __, 16
 	endchannel
 ; 178889
+
+
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -4,8 +4,10 @@
 	dbw $02, Music_DancingHall_Ch3
 ; ef9c5
 
+
 INCBIN "baserom.gbc", $ef9c5, $ef9c6 - $ef9c5
 
+
 Music_DancingHall_Ch1: ; ef9c6
 	tempo 208
 	volume $77
@@ -13,7 +15,6 @@
 	notetype $6, $b7
 	note __, 3
 	dutycycle $0
-
 Music_DancingHall_branch_ef9d3: ; ef9d3
 	notetype $c, $b7
 	callchannel Music_DancingHall_branch_efa17
@@ -89,6 +90,7 @@
 	note D_, 1
 	note __, 1
 	endchannel
+; efa2c
 
 Music_DancingHall_Ch2: ; efa2c
 	stereopanning $f0
@@ -96,7 +98,6 @@
 	dutycycle $0
 	vibrato $10, $24
 	note __, 3
-
 Music_DancingHall_branch_efa37: ; efa37
 	notetype $6, $a2
 	callchannel Music_DancingHall_branch_efa7a
@@ -223,6 +224,7 @@
 	octave 4
 	note D_, 1
 	endchannel
+; efad6
 
 Music_DancingHall_Ch3: ; efad6
 	stereopanning $ff
@@ -233,7 +235,6 @@
 	note B_, 1
 	octave 6
 	note D_, 1
-
 Music_DancingHall_branch_efae3: ; efae3
 	note E_, 13
 	note D_, 1
@@ -310,3 +311,5 @@
 	note D_, 1
 	loopchannel 0, Music_DancingHall_branch_efae3
 ; efb3e
+
+
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_DarkCave_Ch4
 ; ea2ca
 
-
 Music_DarkCave_Ch1: ; ea2ca
 	tempo 128
 	volume $77
@@ -14,7 +13,6 @@
 	vibrato $11, $15
 	stereopanning $f0
 	notetype $c, $a7
-
 Music_DarkCave_branch_ea2dc: ; ea2dc
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea2dc
@@ -24,7 +22,6 @@
 	note C#, 16
 	note C_, 16
 	intensity $a3
-
 Music_DarkCave_branch_ea2e8: ; ea2e8
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 3, Music_DarkCave_branch_ea2e8
@@ -46,7 +43,6 @@
 	note D#, 8
 	note C_, 8
 	intensity $a3
-
 Music_DarkCave_branch_ea303: ; ea303
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea303
@@ -78,7 +74,6 @@
 	note G_, 2
 	note G#, 4
 	intensity $a3
-
 Music_DarkCave_branch_ea328: ; ea328
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea328
@@ -141,6 +136,7 @@
 	octave 3
 	note A#, 2
 	endchannel
+; ea36a
 
 Music_DarkCave_Ch2: ; ea36a
 	dutycycle $1
@@ -147,7 +143,6 @@
 	vibrato $12, $36
 	stereopanning $f
 	notetype $c, $a7
-
 Music_DarkCave_branch_ea374: ; ea374
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea374
@@ -156,7 +151,6 @@
 	note A#, 16
 	note F_, 16
 	note G_, 16
-
 Music_DarkCave_branch_ea37e: ; ea37e
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea37e
@@ -353,14 +347,13 @@
 	note F_, 16
 	note D#, 16
 	loopchannel 0, Music_DarkCave_branch_ea37e
+; ea46e
 
 Music_DarkCave_Ch3: ; ea46e
 	notetype $c, $27
-
 Music_DarkCave_branch_ea471: ; ea471
 	callchannel Music_DarkCave_branch_ea4ce
 	loopchannel 2, Music_DarkCave_branch_ea471
-
 Music_DarkCave_branch_ea478: ; ea478
 	callchannel Music_DarkCave_branch_ea4ce
 	loopchannel 7, Music_DarkCave_branch_ea478
@@ -469,11 +462,11 @@
 	note C_, 2
 	note C#, 4
 	endchannel
+; ea4ea
 
 Music_DarkCave_Ch4: ; ea4ea
 	togglenoise $3
 	notetype $c
-
 Music_DarkCave_branch_ea4ee: ; ea4ee
 	stereopanning $ff
 	note D#, 8
@@ -497,3 +490,5 @@
 	note C#, 2
 	loopchannel 0, Music_DarkCave_branch_ea4ee
 ; ea50d
+
+
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_DragonsDen_Ch4
 ; eecf4
 
-
 Music_DragonsDen_Ch1: ; eecf4
 	tempo 144
 	volume $77
@@ -13,7 +12,6 @@
 	tone $0004
 	stereopanning $f0
 	notetype $c, $80
-
 Music_DragonsDen_branch_eed03: ; eed03
 	callchannel Music_DragonsDen_branch_eed1e
 	note __, 16
@@ -62,6 +60,7 @@
 	note C#, 2
 	note C#, 2
 	endchannel
+; eed3c
 
 Music_DragonsDen_Ch2: ; eed3c
 	dutycycle $0
@@ -68,7 +67,6 @@
 	tone $0004
 	stereopanning $f
 	notetype $c, $90
-
 Music_DragonsDen_branch_eed46: ; eed46
 	callchannel Music_DragonsDen_branch_eed5e
 	note __, 16
@@ -99,7 +97,6 @@
 
 Music_DragonsDen_branch_eed6b: ; eed6b
 	intensity $c1
-
 Music_DragonsDen_branch_eed6d: ; eed6d
 	octave 5
 	note C#, 4
@@ -109,9 +106,9 @@
 	note G#, 4
 	loopchannel 2, Music_DragonsDen_branch_eed6d
 	endchannel
+; eed78
 
 Music_DragonsDen_Ch3: ; eed78
-
 Music_DragonsDen_branch_eed78: ; eed78
 	notetype $c, $14
 	octave 4
@@ -139,7 +136,6 @@
 	loopchannel 15, Music_DragonsDen_branch_eed78
 	note __, 16
 	notetype $6, $27
-
 Music_DragonsDen_branch_eed99: ; eed99
 	octave 3
 	note C#, 4
@@ -165,6 +161,7 @@
 	note C#, 2
 	loopchannel 16, Music_DragonsDen_branch_eed99
 	loopchannel 0, Music_DragonsDen_branch_eed78
+; eedb7
 
 Music_DragonsDen_Ch4: ; eedb7
 	togglenoise $0
@@ -171,7 +168,6 @@
 	notetype $c
 	note __, 16
 	note __, 16
-
 Music_DragonsDen_branch_eedbd: ; eedbd
 	stereopanning $f0
 	note F_, 4
@@ -182,3 +178,5 @@
 	note F#, 4
 	loopchannel 0, Music_DragonsDen_branch_eedbd
 ; eedcb
+
+
--- a/audio/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_EcruteakCity_Ch3
 ; ef2d9
 
-
 Music_EcruteakCity_Ch1: ; ef2d9
 	tempo 197
 	volume $77
@@ -11,7 +10,6 @@
 	stereopanning $f
 	vibrato $12, $25
 	dutycycle $2
-
 Music_EcruteakCity_branch_ef2e5: ; ef2e5
 	notetype $c, $57
 	note __, 10
@@ -213,7 +211,6 @@
 	note C_, 2
 	octave 3
 	note A_, 2
-
 Music_EcruteakCity_branch_ef3be: ; ef3be
 	octave 4
 	note F_, 2
@@ -230,7 +227,6 @@
 	note C_, 2
 	note F_, 2
 	loopchannel 2, Music_EcruteakCity_branch_ef3be
-
 Music_EcruteakCity_branch_ef3d0: ; ef3d0
 	octave 4
 	note G_, 2
@@ -253,12 +249,12 @@
 	note G_, 16
 	dutycycle $2
 	endchannel
+; ef3eb
 
 Music_EcruteakCity_Ch2: ; ef3eb
 	vibrato $12, $25
 	dutycycle $3
 	stereopanning $f0
-
 Music_EcruteakCity_branch_ef3f2: ; ef3f2
 	notetype $6, $67
 	note __, 16
@@ -476,10 +472,10 @@
 	note D_, 2
 	note E_, 16
 	loopchannel 0, Music_EcruteakCity_branch_ef3f2
+; ef4e1
 
 Music_EcruteakCity_Ch3: ; ef4e1
 	stereopanning $ff
-
 Music_EcruteakCity_branch_ef4e3: ; ef4e3
 	vibrato $12, $25
 	notetype $c, $25
@@ -676,3 +672,5 @@
 	note B_, 1
 	endchannel
 ; ef5b1
+
+
--- a/audio/music/elmslab.asm
+++ b/audio/music/elmslab.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_ElmsLab_Ch4
 ; ea04c
 
-
 Music_ElmsLab_Ch1: ; ea04c
 	tempo 144
 	volume $77
@@ -35,7 +34,6 @@
 	note A_, 4
 	note A_, 4
 	note A_, 2
-
 Music_ElmsLab_branch_ea075: ; ea075
 	note __, 2
 	note A_, 2
@@ -184,6 +182,7 @@
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea075
+; ea128
 
 Music_ElmsLab_Ch2: ; ea128
 	dutycycle $3
@@ -215,7 +214,6 @@
 	note C_, 4
 	note C_, 2
 	stereopanning $ff
-
 Music_ElmsLab_branch_ea14f: ; ea14f
 	intensity $c6
 	octave 4
@@ -352,6 +350,7 @@
 	octave 3
 	note E_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea14f
+; ea1fd
 
 Music_ElmsLab_Ch3: ; ea1fd
 	stereopanning $f
@@ -376,7 +375,6 @@
 	note C_, 2
 	note D_, 2
 	note E_, 2
-
 Music_ElmsLab_branch_ea216: ; ea216
 	note F_, 2
 	note A_, 2
@@ -530,6 +528,7 @@
 	note F_, 2
 	note A_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea216
+; ea2b1
 
 Music_ElmsLab_Ch4: ; ea2b1
 	stereopanning $f0
@@ -537,8 +536,9 @@
 	notetype $c
 	note __, 16
 	note __, 2
-
 Music_ElmsLab_branch_ea2b9: ; ea2b9
 	note G_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea2b9
 ; ea2be
+
+
--- a/audio/music/evolution.asm
+++ b/audio/music/evolution.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Evolution_Ch4
 ; f06ed
 
-
 Music_Evolution_Ch1: ; f06ed
 	tempo 132
 	volume $77
@@ -25,7 +24,6 @@
 	note __, 4
 	dutycycle $3
 	stereopanning $f
-
 Music_Evolution_branch_f0713: ; f0713
 	callchannel Music_Evolution_branch_f0737
 	notetype $c, $a4
@@ -67,6 +65,7 @@
 	note A_, 4
 	note D_, 4
 	endchannel
+; f074f
 
 Music_Evolution_Ch2: ; f074f
 	dutycycle $2
@@ -80,7 +79,6 @@
 	note __, 4
 	dutycycle $3
 	stereopanning $f0
-
 Music_Evolution_branch_f0761: ; f0761
 	callchannel Music_Evolution_branch_f0787
 	notetype $c, $b5
@@ -124,11 +122,11 @@
 	note E_, 4
 	note A_, 4
 	endchannel
+; f079f
 
 Music_Evolution_Ch3: ; f079f
 	notetype $c, $16
 	note __, 8
-
 Music_Evolution_branch_f07a3: ; f07a3
 	callchannel Music_Evolution_branch_f07bf
 	octave 3
@@ -194,12 +192,12 @@
 	note A_, 2
 	note __, 2
 	endchannel
+; f07eb
 
 Music_Evolution_Ch4: ; f07eb
 	togglenoise $5
 	notetype $c
 	note __, 8
-
 Music_Evolution_branch_f07f0: ; f07f0
 	stereopanning $f0
 	note A#, 6
@@ -210,3 +208,5 @@
 	note E_, 2
 	loopchannel 0, Music_Evolution_branch_f07f0
 ; f07fd
+
+
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_GameCorner_Ch4
 ; edd79
 
-
 Music_GameCorner_Ch1: ; edd79
 	tempo 147
 	volume $77
@@ -12,7 +11,6 @@
 	stereopanning $f
 	notetype $c, $91
 	note __, 8
-
 Music_GameCorner_branch_edd84: ; edd84
 	intensity $91
 	note __, 16
@@ -41,7 +39,6 @@
 	note G#, 2
 	note G_, 2
 	intensity $71
-
 Music_GameCorner_branch_eddb1: ; eddb1
 	octave 4
 	note G#, 1
@@ -50,7 +47,6 @@
 	note F_, 1
 	note C_, 1
 	loopchannel 4, Music_GameCorner_branch_eddb1
-
 Music_GameCorner_branch_eddbb: ; eddbb
 	octave 4
 	note A#, 1
@@ -59,7 +55,6 @@
 	note G_, 1
 	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_eddbb
-
 Music_GameCorner_branch_eddc5: ; eddc5
 	octave 4
 	note D#, 1
@@ -69,7 +64,6 @@
 	octave 4
 	note G_, 1
 	loopchannel 4, Music_GameCorner_branch_eddc5
-
 Music_GameCorner_branch_eddd0: ; eddd0
 	octave 4
 	note F_, 1
@@ -79,7 +73,6 @@
 	octave 4
 	note A_, 1
 	loopchannel 4, Music_GameCorner_branch_eddd0
-
 Music_GameCorner_branch_edddb: ; edddb
 	octave 4
 	note G#, 1
@@ -88,7 +81,6 @@
 	note F_, 1
 	note C_, 1
 	loopchannel 4, Music_GameCorner_branch_edddb
-
 Music_GameCorner_branch_edde5: ; edde5
 	octave 4
 	note A#, 1
@@ -97,7 +89,6 @@
 	note G_, 1
 	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_edde5
-
 Music_GameCorner_branch_eddef: ; eddef
 	octave 4
 	note B_, 1
@@ -144,6 +135,7 @@
 	note F_, 3
 	note F_, 2
 	endchannel
+; ede1c
 
 Music_GameCorner_Ch2: ; ede1c
 	stereopanning $ff
@@ -150,7 +142,6 @@
 	vibrato $8, $24
 	notetype $c, $a1
 	note __, 8
-
 Music_GameCorner_branch_ede25: ; ede25
 	intensity $92
 	dutycycle $1
@@ -328,12 +319,12 @@
 	note D_, 2
 	note D#, 2
 	endchannel
+; edee8
 
 Music_GameCorner_Ch3: ; edee8
 	vibrato $8, $22
 	notetype $c, $14
 	note __, 8
-
 Music_GameCorner_branch_edeef: ; edeef
 	stereopanning $ff
 	notetype $c, $14
@@ -674,6 +665,7 @@
 	octave 3
 	note D_, 1
 	endchannel
+; ee06f
 
 Music_GameCorner_Ch4: ; ee06f
 	togglenoise $3
@@ -688,10 +680,8 @@
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_GameCorner_branch_ee07f: ; ee07f
 	callchannel Music_GameCorner_branch_ee106
-
 Music_GameCorner_branch_ee082: ; ee082
 	note A#, 2
 	note F#, 2
@@ -703,7 +693,6 @@
 	note F#, 2
 	loopchannel 6, Music_GameCorner_branch_ee082
 	callchannel Music_GameCorner_branch_ee10f
-
 Music_GameCorner_branch_ee091: ; ee091
 	note A#, 2
 	note F#, 2
@@ -719,7 +708,6 @@
 	note D_, 1
 	note F#, 2
 	callchannel Music_GameCorner_branch_ee106
-
 Music_GameCorner_branch_ee0a4: ; ee0a4
 	note A#, 2
 	note F#, 2
@@ -731,7 +719,6 @@
 	note F#, 2
 	loopchannel 6, Music_GameCorner_branch_ee0a4
 	callchannel Music_GameCorner_branch_ee10f
-
 Music_GameCorner_branch_ee0b3: ; ee0b3
 	note A#, 2
 	note F#, 2
@@ -752,7 +739,6 @@
 	note D_, 1
 	note D_, 1
 	note D_, 1
-
 Music_GameCorner_branch_ee0c9: ; ee0c9
 	note A#, 2
 	note F#, 1
@@ -782,7 +768,6 @@
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_GameCorner_branch_ee0e8: ; ee0e8
 	note A#, 2
 	note F#, 1
@@ -834,3 +819,5 @@
 	note F#, 2
 	endchannel
 ; ee119
+
+
--- a/audio/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_GoldenrodCity_Ch4
 ; eb45f
 
-
 Music_GoldenrodCity_Ch1: ; eb45f
 	stereopanning $f
 	tempo 176
@@ -15,7 +14,6 @@
 	note __, 16
 	note __, 16
 	note __, 16
-
 Music_GoldenrodCity_branch_eb46d: ; eb46d
 	dutycycle $0
 	callchannel Music_GoldenrodCity_branch_eb4a9
@@ -176,6 +174,7 @@
 	note D#, 1
 	note F#, 1
 	endchannel
+; eb519
 
 Music_GoldenrodCity_Ch2: ; eb519
 	stereopanning $f0
@@ -182,7 +181,6 @@
 	vibrato $12, $23
 	dutycycle $2
 	notetype $c, $97
-
 Music_GoldenrodCity_branch_eb523: ; eb523
 	intensity $97
 	callchannel Music_GoldenrodCity_branch_eb555
@@ -270,12 +268,12 @@
 	note C_, 4
 	note D#, 2
 	endchannel
+; eb584
 
 Music_GoldenrodCity_Ch3: ; eb584
 	stereopanning $ff
 	vibrato $8, $23
 	notetype $c, $25
-
 Music_GoldenrodCity_branch_eb58c: ; eb58c
 	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5aa
@@ -394,6 +392,7 @@
 	note __, 2
 	note G#, 1
 	endchannel
+; eb606
 
 Music_GoldenrodCity_Ch4: ; eb606
 	togglenoise $3
@@ -407,7 +406,6 @@
 	note D_, 1
 	note D_, 1
 	note F#, 2
-
 Music_GoldenrodCity_branch_eb613: ; eb613
 	note D#, 2
 	note F#, 2
@@ -449,7 +447,6 @@
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_GoldenrodCity_branch_eb650: ; eb650
 	note D#, 2
 	note F#, 2
@@ -488,3 +485,5 @@
 	note G_, 1
 	endchannel
 ; eb676
+
+
--- a/audio/music/goldsilveropening.asm
+++ b/audio/music/goldsilveropening.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_GoldSilverOpening_Ch3
 ; f705e
 
-
 Music_GoldSilverOpening_Ch1: ; f705e
 	tempo 256
 	volume $77
@@ -129,6 +128,7 @@
 	note G_, 2
 	note A_, 16
 	endchannel
+; f70f8
 
 Music_GoldSilverOpening_Ch2: ; f70f8
 	tone $0001
@@ -309,6 +309,7 @@
 	note C_, 4
 	note D#, 16
 	endchannel
+; f71c8
 
 Music_GoldSilverOpening_Ch3: ; f71c8
 	notetype $6, $10
@@ -616,3 +617,5 @@
 	note __, 13
 	endchannel
 ; f7308
+
+
--- a/audio/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_GoldSilverOpening2_Ch4
 ; f7314
 
-
 Music_GoldSilverOpening2_Ch1: ; f7314
 	tempo 92
 	volume $77
@@ -15,7 +14,6 @@
 	notetype $c, $3d
 	octave 3
 	note D#, 8
-
 Music_GoldSilverOpening2_branch_f7325: ; f7325
 	notetype $c, $c1
 	octave 3
@@ -54,6 +52,7 @@
 	octave 4
 	note D_, 16
 	endchannel
+; f7358
 
 Music_GoldSilverOpening2_Ch2: ; f7358
 	dutycycle $3
@@ -106,6 +105,7 @@
 	intensity $c2
 	note D_, 16
 	endchannel
+; f739c
 
 Music_GoldSilverOpening2_Ch3: ; f739c
 	notetype $c, $17
@@ -184,6 +184,7 @@
 	note D_, 2
 	note __, 14
 	endchannel
+; f73ea
 
 Music_GoldSilverOpening2_Ch4: ; f73ea
 	togglenoise $0
@@ -197,7 +198,6 @@
 	note D_, 2
 	note D_, 2
 	notetype $c
-
 Music_GoldSilverOpening2_branch_f73f8: ; f73f8
 	note D_, 2
 	note D_, 2
@@ -220,3 +220,5 @@
 	note C_, 16
 	endchannel
 ; f7411
+
+
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Gym_Ch4
 ; f48ba
 
-
 Music_Gym_Ch1: ; f48ba
 	tempo 156
 	volume $77
@@ -13,7 +12,6 @@
 	vibrato $12, $24
 	dutycycle $1
 	notetype $c, $b7
-
 Music_Gym_branch_f48c9: ; f48c9
 	octave 4
 	note F#, 2
@@ -191,11 +189,11 @@
 	note F#, 1
 	note E_, 1
 	loopchannel 0, Music_Gym_branch_f48c9
+; f497c
 
 Music_Gym_Ch2: ; f497c
 	dutycycle $1
 	stereopanning $f0
-
 Music_Gym_branch_f4980: ; f4980
 	notetype $c, $c3
 	octave 2
@@ -372,11 +370,11 @@
 	note F#, 1
 	note F#, 1
 	endchannel
+; f4a37
 
 Music_Gym_Ch3: ; f4a37
 	vibrato $14, $23
 	stereopanning $ff
-
 Music_Gym_branch_f4a3c: ; f4a3c
 	notetype $c, $14
 	octave 6
@@ -508,10 +506,10 @@
 	note G_, 1
 	note A_, 4
 	endchannel
+; f4ac5
 
 Music_Gym_Ch4: ; f4ac5
 	togglenoise $4
-
 Music_Gym_branch_f4ac7: ; f4ac7
 	notetype $c
 	note D_, 2
@@ -537,7 +535,6 @@
 	note D_, 1
 	note D_, 1
 	notetype $6
-
 Music_Gym_branch_f4ae1: ; f4ae1
 	note D_, 6
 	note D_, 6
@@ -561,7 +558,6 @@
 	note D_, 4
 	note B_, 8
 	loopchannel 4, Music_Gym_branch_f4ae1
-
 Music_Gym_branch_f4afa: ; f4afa
 	note D#, 4
 	note F#, 4
@@ -576,3 +572,5 @@
 	loopchannel 8, Music_Gym_branch_f4afa
 	loopchannel 0, Music_Gym_branch_f4ac7
 ; f4b0c
+
+
--- a/audio/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_GymLeaderVictory_Ch4
 ; f4638
 
-
 Music_GymLeaderVictory_Ch1: ; f4638
 	tempo 116
 	volume $77
@@ -28,7 +27,6 @@
 	octave 5
 	note D_, 8
 	stereopanning $f
-
 Music_GymLeaderVictory_branch_f4658: ; f4658
 	dutycycle $1
 	callchannel Music_GymLeaderVictory_branch_f4689
@@ -117,6 +115,7 @@
 	note C#, 1
 	note E_, 8
 	endchannel
+; f46bd
 
 Music_GymLeaderVictory_Ch2: ; f46bd
 	vibrato $12, $34
@@ -133,7 +132,6 @@
 	octave 5
 	note D_, 1
 	note F#, 16
-
 Music_GymLeaderVictory_branch_f46d0: ; f46d0
 	dutycycle $3
 	intensity $a1
@@ -220,6 +218,7 @@
 	note C#, 8
 	note C#, 8
 	endchannel
+; f4737
 
 Music_GymLeaderVictory_Ch3: ; f4737
 	notetype $c, $25
@@ -232,7 +231,6 @@
 	octave 3
 	note C#, 2
 	stereopanning $f0
-
 Music_GymLeaderVictory_branch_f4744: ; f4744
 	note D_, 2
 	note __, 4
@@ -388,6 +386,7 @@
 	octave 2
 	note A_, 2
 	endchannel
+; f47e5
 
 Music_GymLeaderVictory_Ch4: ; f47e5
 	togglenoise $4
@@ -394,7 +393,6 @@
 	notetype $c
 	note B_, 16
 	note B_, 16
-
 Music_GymLeaderVictory_branch_f47eb: ; f47eb
 	callchannel Music_GymLeaderVictory_branch_f480b
 	note D#, 6
@@ -408,7 +406,6 @@
 	note C#, 1
 	note C#, 1
 	note C#, 1
-
 Music_GymLeaderVictory_branch_f47fb: ; f47fb
 	note D#, 2
 	note G_, 2
@@ -431,3 +428,5 @@
 	loopchannel 3, Music_GymLeaderVictory_branch_f480b
 	endchannel
 ; f4815
+
+
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_HallOfFame_Ch4
 ; f05cb
 
-
 Music_HallOfFame_Ch1: ; f05cb
 	tempo 112
 	volume $77
@@ -23,7 +22,6 @@
 	note E_, 1
 	note F_, 1
 	note F#, 1
-
 Music_HallOfFame_branch_f05e6: ; f05e6
 	intensity $97
 	octave 4
@@ -48,11 +46,11 @@
 	note __, 16
 	note __, 16
 	loopchannel 0, Music_HallOfFame_branch_f05e6
+; f060b
 
 Music_HallOfFame_Ch2: ; f060b
 	vibrato $8, $25
 	dutycycle $3
-
 Music_HallOfFame_branch_f0610: ; f0610
 	notetype $c, $c4
 	octave 3
@@ -79,12 +77,11 @@
 	note A_, 4
 	note F_, 2
 	loopchannel 0, Music_HallOfFame_branch_f0610
+; f062e
 
 Music_HallOfFame_Ch3: ; f062e
-
 Music_HallOfFame_branch_f062e: ; f062e
 	notetype $c, $28
-
 Music_HallOfFame_branch_f0631: ; f0631
 	octave 3
 	note D_, 2
@@ -140,6 +137,7 @@
 	note E_, 4
 	note G_, 4
 	loopchannel 0, Music_HallOfFame_branch_f062e
+; f066d
 
 Music_HallOfFame_Ch4: ; f066d
 	togglenoise $5
@@ -149,7 +147,6 @@
 	note __, 16
 	note __, 16
 	notetype $6
-
 Music_HallOfFame_branch_f0677: ; f0677
 	stereopanning $f
 	note A#, 4
@@ -178,3 +175,5 @@
 	note A#, 1
 	loopchannel 0, Music_HallOfFame_branch_f0677
 ; f0697
+
+
--- a/audio/music/healpokemon.asm
+++ b/audio/music/healpokemon.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_HealPokemon_Ch3
 ; f06a0
 
-
 Music_HealPokemon_Ch1: ; f06a0
 	tempo 144
 	volume $77
@@ -24,6 +23,7 @@
 	unknownmusic0xe0 $0, $40
 	note B_, 4
 	endchannel
+; f06c4
 
 Music_HealPokemon_Ch2: ; f06c4
 	dutycycle $2
@@ -37,6 +37,7 @@
 	octave 5
 	note E_, 8
 	endchannel
+; f06d4
 
 Music_HealPokemon_Ch3: ; f06d4
 	notetype $c, $10
@@ -51,3 +52,5 @@
 	note __, 2
 	endchannel
 ; f06e1
+
+
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_IndigoPlateau_Ch4
 ; ee85e
 
-
 Music_IndigoPlateau_Ch1: ; ee85e
 	tempo 128
 	volume $77
@@ -12,7 +11,6 @@
 	dutycycle $3
 	tone $0002
 	stereopanning $f
-
 Music_IndigoPlateau_branch_ee86a: ; ee86a
 	callchannel Music_IndigoPlateau_branch_ee881
 	octave 3
@@ -42,12 +40,12 @@
 	note A_, 2
 	intensity $a0
 	endchannel
+; ee892
 
 Music_IndigoPlateau_Ch2: ; ee892
 	dutycycle $3
 	vibrato $10, $22
 	stereopanning $f0
-
 Music_IndigoPlateau_branch_ee899: ; ee899
 	callchannel Music_IndigoPlateau_branch_ee8e9
 	note A_, 4
@@ -118,10 +116,10 @@
 	note D_, 2
 	intensity $b0
 	endchannel
+; ee8fa
 
 Music_IndigoPlateau_Ch3: ; ee8fa
 	notetype $c, $19
-
 Music_IndigoPlateau_branch_ee8fd: ; ee8fd
 	callchannel Music_IndigoPlateau_branch_ee915
 	octave 3
@@ -154,12 +152,12 @@
 	note A_, 1
 	note __, 3
 	endchannel
+; ee924
 
 Music_IndigoPlateau_Ch4: ; ee924
 	stereopanning $f0
 	togglenoise $0
 	notetype $c
-
 Music_IndigoPlateau_branch_ee92a: ; ee92a
 	note D#, 4
 	note D_, 2
@@ -190,3 +188,5 @@
 	note C#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee92a
 ; ee94b
+
+
--- a/audio/music/johtogymbattle.asm
+++ b/audio/music/johtogymbattle.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_JohtoGymBattle_Ch3
 ; ea516
 
-
 Music_JohtoGymBattle_Ch1: ; ea516
 	tempo 101
 	volume $77
@@ -12,7 +11,6 @@
 	tone $0002
 	vibrato $12, $15
 	notetype $c, $b2
-
 Music_JohtoGymBattle_branch_ea526: ; ea526
 	octave 3
 	note A#, 1
@@ -20,7 +18,6 @@
 	note G#, 1
 	note A_, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea526
-
 Music_JohtoGymBattle_branch_ea52f: ; ea52f
 	note C#, 1
 	note C_, 1
@@ -61,7 +58,6 @@
 	octave 3
 	note G#, 2
 	note F_, 2
-
 Music_JohtoGymBattle_branch_ea55d: ; ea55d
 	intensity $b5
 	note D_, 6
@@ -290,6 +286,7 @@
 	note D#, 2
 	note F#, 2
 	loopchannel 0, Music_JohtoGymBattle_branch_ea55d
+; ea65f
 
 Music_JohtoGymBattle_Ch2: ; ea65f
 	dutycycle $3
@@ -296,7 +293,6 @@
 	vibrato $8, $36
 	tone $0001
 	notetype $c, $c2
-
 Music_JohtoGymBattle_branch_ea66a: ; ea66a
 	octave 4
 	note F#, 1
@@ -304,7 +300,6 @@
 	note E_, 1
 	note A#, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea66a
-
 Music_JohtoGymBattle_branch_ea673: ; ea673
 	note F#, 1
 	note F_, 1
@@ -402,7 +397,6 @@
 	octave 3
 	note G#, 1
 	note A_, 1
-
 Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
 	intensity $c7
 	note A#, 8
@@ -619,6 +613,7 @@
 	note B_, 16
 	note G_, 16
 	loopchannel 0, Music_JohtoGymBattle_branch_ea6ee
+; ea7f4
 
 Music_JohtoGymBattle_Ch3: ; ea7f4
 	notetype $c, $19
@@ -690,7 +685,6 @@
 	octave 3
 	note A#, 2
 	note G#, 2
-
 Music_JohtoGymBattle_branch_ea83f: ; ea83f
 	callchannel Music_JohtoGymBattle_branch_ea963
 	callchannel Music_JohtoGymBattle_branch_ea963
@@ -1036,3 +1030,5 @@
 	note D#, 2
 	endchannel
 ; ea9c1
+
+
--- a/audio/music/johtotrainerbattle.asm
+++ b/audio/music/johtotrainerbattle.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_JohtoTrainerBattle_Ch3
 ; f609f
 
-
 Music_JohtoTrainerBattle_Ch1: ; f609f
 	tempo 102
 	volume $77
@@ -87,7 +86,6 @@
 	note F_, 6
 	intensity $b7
 	note G_, 4
-
 Music_JohtoTrainerBattle_branch_f6102: ; f6102
 	intensity $b4
 	callchannel Music_JohtoTrainerBattle_branch_f629f
@@ -245,7 +243,6 @@
 	intensity $a7
 	note D#, 12
 	note __, 16
-
 Music_JohtoTrainerBattle_branch_f61bd: ; f61bd
 	intensity $b7
 	note F_, 8
@@ -454,6 +451,7 @@
 	note F_, 2
 	note D_, 2
 	endchannel
+; f62b3
 
 Music_JohtoTrainerBattle_Ch2: ; f62b3
 	dutycycle $3
@@ -549,7 +547,6 @@
 	note E_, 2
 	intensity $c7
 	note B_, 4
-
 Music_JohtoTrainerBattle_branch_f632a: ; f632a
 	callchannel Music_JohtoTrainerBattle_branch_f64a3
 	intensity $3e
@@ -587,7 +584,6 @@
 	note A_, 16
 	intensity $b7
 	note A_, 16
-
 Music_JohtoTrainerBattle_branch_f635a: ; f635a
 	intensity $c3
 	octave 3
@@ -611,7 +607,6 @@
 	note G_, 2
 	note A_, 2
 	note A#, 2
-
 Music_JohtoTrainerBattle_branch_f6376: ; f6376
 	note G_, 2
 	note F_, 2
@@ -690,7 +685,6 @@
 	callchannel Music_JohtoTrainerBattle_branch_f64b6
 	intensity $a2
 	callchannel Music_JohtoTrainerBattle_branch_f64b6
-
 Music_JohtoTrainerBattle_branch_f63dd: ; f63dd
 	octave 4
 	note D#, 2
@@ -911,6 +905,7 @@
 	note F_, 4
 	note D#, 4
 	endchannel
+; f64de
 
 Music_JohtoTrainerBattle_Ch3: ; f64de
 	notetype $c, $19
@@ -946,7 +941,6 @@
 	note A#, 2
 	note A_, 2
 	note G#, 2
-
 Music_JohtoTrainerBattle_branch_f6501: ; f6501
 	note A_, 2
 	note E_, 2
@@ -989,7 +983,6 @@
 	note A_, 2
 	note A#, 2
 	note G_, 2
-
 Music_JohtoTrainerBattle_branch_f6531: ; f6531
 	callchannel Music_JohtoTrainerBattle_branch_f6681
 	note E_, 2
@@ -1063,7 +1056,6 @@
 	note F_, 8
 	note E_, 8
 	note D#, 8
-
 Music_JohtoTrainerBattle_branch_f6591: ; f6591
 	octave 3
 	note D#, 2
@@ -1087,7 +1079,6 @@
 	note F_, 2
 	note D#, 2
 	note G_, 2
-
 Music_JohtoTrainerBattle_branch_f65ac: ; f65ac
 	note C#, 2
 	note G#, 2
@@ -1094,7 +1085,6 @@
 	loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac
 	note B_, 2
 	note A_, 2
-
 Music_JohtoTrainerBattle_branch_f65b4: ; f65b4
 	note D_, 2
 	note A_, 2
@@ -1105,12 +1095,10 @@
 	note F#, 2
 	note G#, 2
 	note A_, 2
-
 Music_JohtoTrainerBattle_branch_f65c0: ; f65c0
 	note A#, 4
 	note D#, 4
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0
-
 Music_JohtoTrainerBattle_branch_f65c6: ; f65c6
 	octave 4
 	note G_, 4
@@ -1117,7 +1105,6 @@
 	octave 3
 	note A#, 4
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6
-
 Music_JohtoTrainerBattle_branch_f65ce: ; f65ce
 	callchannel Music_JohtoTrainerBattle_branch_f66b4
 	note D#, 2
@@ -1192,12 +1179,10 @@
 	note C_, 2
 	octave 3
 	note A#, 2
-
 Music_JohtoTrainerBattle_branch_f661e: ; f661e
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f661e
-
 Music_JohtoTrainerBattle_branch_f6624: ; f6624
 	note C#, 2
 	note G#, 2
@@ -1208,12 +1193,10 @@
 	octave 3
 	note A#, 2
 	note G#, 2
-
 Music_JohtoTrainerBattle_branch_f6630: ; f6630
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f6630
-
 Music_JohtoTrainerBattle_branch_f6636: ; f6636
 	note C#, 2
 	note G#, 2
@@ -1363,3 +1346,5 @@
 	note A#, 2
 	endchannel
 ; f66c3
+
+
--- a/audio/music/johtowildbattle.asm
+++ b/audio/music/johtowildbattle.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_JohtoWildBattle_Ch3
 ; f5dce
 
-
 Music_JohtoWildBattle_Ch1: ; f5dce
 	tempo 104
 	volume $77
@@ -11,7 +10,6 @@
 	dutycycle $3
 	tone $0002
 	vibrato $12, $15
-
 Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
 	notetype $c, $b2
 	octave 4
@@ -89,7 +87,6 @@
 	note D_, 4
 	intensity $6f
 	note D#, 8
-
 Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
 	intensity $b6
 	octave 3
@@ -203,6 +200,7 @@
 	note F#, 4
 	note G_, 16
 	loopchannel 0, Music_JohtoWildBattle_branch_f5e2d
+; f5ea2
 
 Music_JohtoWildBattle_Ch2: ; f5ea2
 	dutycycle $3
@@ -212,7 +210,6 @@
 	notetype $c, $c2
 	octave 4
 	note G_, 6
-
 Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
 	octave 3
 	note D_, 6
@@ -242,7 +239,6 @@
 	note G_, 4
 	intensity $6f
 	note G#, 8
-
 Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
 	intensity $c4
 	octave 3
@@ -370,7 +366,6 @@
 ; f5f5d
 
 Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d
-
 Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
 	notetype $c, $c2
 	octave 4
@@ -422,10 +417,10 @@
 	octave 5
 	note G_, 1
 	endchannel
+; f5f91
 
 Music_JohtoWildBattle_Ch3: ; f5f91
 	notetype $c, $14
-
 Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
 	octave 4
 	note G_, 2
@@ -475,7 +470,6 @@
 	note D#, 2
 	note G_, 2
 	note F_, 2
-
 Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
 	note D_, 2
 	note G_, 2
@@ -493,7 +487,6 @@
 	note G_, 2
 	note F_, 2
 	note D#, 2
-
 Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
 	note D_, 2
 	note G_, 2
@@ -501,7 +494,6 @@
 	note F#, 4
 	callchannel Music_JohtoWildBattle_branch_f6055
 	callchannel Music_JohtoWildBattle_branch_f6055
-
 Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
 	note D_, 2
 	note G_, 2
@@ -508,7 +500,6 @@
 	loopchannel 7, Music_JohtoWildBattle_branch_f5fe8
 	note D_, 2
 	note A_, 2
-
 Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
 	note C_, 2
 	note F_, 2
@@ -527,7 +518,6 @@
 	note D#, 2
 	note G#, 2
 	note G_, 4
-
 Music_JohtoWildBattle_branch_f6006: ; f6006
 	note E_, 2
 	note A_, 2
@@ -557,12 +547,10 @@
 	note F#, 2
 	note F_, 2
 	note D#, 2
-
 Music_JohtoWildBattle_branch_f6027: ; f6027
 	note D_, 2
 	note G_, 2
 	loopchannel 8, Music_JohtoWildBattle_branch_f6027
-
 Music_JohtoWildBattle_branch_f602d: ; f602d
 	note C_, 2
 	note F_, 2
@@ -573,12 +561,10 @@
 	note G_, 4
 	note D_, 4
 	note G_, 4
-
 Music_JohtoWildBattle_branch_f6039: ; f6039
 	note D_, 2
 	note G_, 2
 	loopchannel 12, Music_JohtoWildBattle_branch_f6039
-
 Music_JohtoWildBattle_branch_f603f: ; f603f
 	note C_, 2
 	note E_, 2
@@ -585,7 +571,6 @@
 	loopchannel 7, Music_JohtoWildBattle_branch_f603f
 	note F_, 2
 	note F#, 2
-
 Music_JohtoWildBattle_branch_f6047: ; f6047
 	note D_, 2
 	note G_, 2
@@ -603,3 +588,5 @@
 	loopchannel 4, Music_JohtoWildBattle_branch_f6055
 	endchannel
 ; f605c
+
+
--- a/audio/music/johtowildbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_JohtoWildBattleNight_Ch3
 ; f6065
 
-
 Music_JohtoWildBattleNight_Ch1: ; f6065
 	tempo 107
 	volume $77
@@ -12,6 +11,7 @@
 	tone $0002
 	vibrato $10, $25
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb
+; f6076
 
 Music_JohtoWildBattleNight_Ch2: ; f6076
 	dutycycle $3
@@ -24,8 +24,11 @@
 	tone $0001
 	dutycycle $2
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2
+; f608f
 
 Music_JohtoWildBattleNight_Ch3: ; f608f
 	notetype $c, $11
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94
 ; f6096
+
+
--- a/audio/music/kantogymbattle.asm
+++ b/audio/music/kantogymbattle.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_KantoGymBattle_Ch3
 ; ec729
 
-
 Music_KantoGymBattle_Ch1: ; ec729
 	tempo 101
 	volume $77
@@ -87,7 +86,6 @@
 	note E_, 4
 	note E_, 4
 	note E_, 2
-
 Music_KantoGymBattle_branch_ec78b: ; ec78b
 	callchannel Music_KantoGymBattle_branch_ec832
 	octave 2
@@ -254,6 +252,7 @@
 	note D#, 2
 	note C#, 2
 	endchannel
+; ec847
 
 Music_KantoGymBattle_Ch2: ; ec847
 	dutycycle $3
@@ -260,7 +259,6 @@
 	vibrato $8, $36
 	tone $0001
 	notetype $c, $c2
-
 Music_KantoGymBattle_branch_ec852: ; ec852
 	octave 4
 	note A#, 1
@@ -270,7 +268,6 @@
 	note D#, 1
 	loopchannel 8, Music_KantoGymBattle_branch_ec852
 	octave 3
-
 Music_KantoGymBattle_branch_ec85d: ; ec85d
 	intensity $c2
 	note D#, 2
@@ -319,7 +316,6 @@
 	intensity $c2
 	octave 4
 	loopchannel 2, Music_KantoGymBattle_branch_ec85d
-
 Music_KantoGymBattle_branch_ec894: ; ec894
 	callchannel Music_KantoGymBattle_branch_ec907
 	note E_, 8
@@ -441,6 +437,7 @@
 	dutycycle $3
 	intensity $b0
 	endchannel
+; ec92e
 
 Music_KantoGymBattle_Ch3: ; ec92e
 	notetype $c, $19
@@ -447,7 +444,6 @@
 	octave 2
 	note E_, 1
 	note __, 1
-
 Music_KantoGymBattle_branch_ec934: ; ec934
 	note B_, 3
 	note __, 1
@@ -455,7 +451,6 @@
 	note B_, 2
 	note G#, 2
 	note B_, 2
-
 Music_KantoGymBattle_branch_ec93d: ; ec93d
 	note D#, 1
 	note __, 1
@@ -494,13 +489,11 @@
 	note __, 1
 	note E_, 2
 	loopchannel 2, Music_KantoGymBattle_branch_ec93d
-
 Music_KantoGymBattle_branch_ec965: ; ec965
 	octave 2
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec965
-
 Music_KantoGymBattle_branch_ec96c: ; ec96c
 	note E_, 2
 	note B_, 2
@@ -518,7 +511,6 @@
 	note E_, 2
 	octave 2
 	note B_, 2
-
 Music_KantoGymBattle_branch_ec97f: ; ec97f
 	octave 2
 	note F#, 2
@@ -525,7 +517,6 @@
 	octave 3
 	note C#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec97f
-
 Music_KantoGymBattle_branch_ec987: ; ec987
 	octave 2
 	note E_, 2
@@ -535,7 +526,6 @@
 	note E_, 2
 	octave 2
 	note B_, 2
-
 Music_KantoGymBattle_branch_ec992: ; ec992
 	note D#, 1
 	note __, 1
@@ -556,7 +546,6 @@
 	note __, 1
 	note E_, 2
 	loopchannel 2, Music_KantoGymBattle_branch_ec992
-
 Music_KantoGymBattle_branch_ec9a8: ; ec9a8
 	note D#, 2
 	note A#, 2
@@ -574,13 +563,11 @@
 	note B_, 2
 	octave 3
 	note E_, 2
-
 Music_KantoGymBattle_branch_ec9bb: ; ec9bb
 	octave 2
 	note E_, 2
 	note B_, 2
 	loopchannel 5, Music_KantoGymBattle_branch_ec9bb
-
 Music_KantoGymBattle_branch_ec9c2: ; ec9c2
 	octave 2
 	note F#, 2
@@ -601,18 +588,15 @@
 	note F#, 2
 	note E_, 2
 	note C#, 2
-
 Music_KantoGymBattle_branch_ec9d8: ; ec9d8
 	octave 2
 	note D#, 2
 	note A#, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec9d8
-
 Music_KantoGymBattle_branch_ec9df: ; ec9df
 	note C#, 2
 	note G#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec9df
-
 Music_KantoGymBattle_branch_ec9e5: ; ec9e5
 	note D#, 2
 	note A#, 2
@@ -630,3 +614,5 @@
 	note F_, 2
 	loopchannel 0, Music_KantoGymBattle_branch_ec965
 ; ec9fa
+
+
--- a/audio/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
@@ -4,8 +4,10 @@
 	dbw $02, Music_KantoTrainerBattle_Ch3
 ; eca03
 
+
 INCBIN "baserom.gbc", $eca03, $eca04 - $eca03
 
+
 Music_KantoTrainerBattle_Ch1: ; eca04
 	tempo 114
 	volume $77
@@ -127,7 +129,6 @@
 	note D#, 2
 	note F_, 2
 	note F#, 2
-
 Music_KantoTrainerBattle_branch_eca88: ; eca88
 	notetype $c, $b7
 	note D#, 4
@@ -465,6 +466,7 @@
 	octave 4
 	note D_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_eca88
+; ecbea
 
 Music_KantoTrainerBattle_Ch2: ; ecbea
 	forceoctave $1b
@@ -485,7 +487,6 @@
 	note F#, 1
 	dutycycle $3
 	intensity $62
-
 Music_KantoTrainerBattle_branch_ecc04: ; ecc04
 	octave 3
 	note G_, 1
@@ -543,7 +544,6 @@
 	octave 3
 	note D_, 1
 	note F_, 1
-
 Music_KantoTrainerBattle_branch_ecc41: ; ecc41
 	notetype $c, $d7
 	octave 2
@@ -919,6 +919,7 @@
 	octave 3
 	note B_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ecc41
+; ecdd2
 
 Music_KantoTrainerBattle_Ch3: ; ecdd2
 	forceoctave $1b
@@ -1051,7 +1052,6 @@
 	note G_, 2
 	note A#, 2
 	note B_, 2
-
 Music_KantoTrainerBattle_branch_ece5a: ; ece5a
 	notetype $c, $14
 	octave 6
@@ -1540,3 +1540,5 @@
 	note G_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ece5a
 ; ed06d
+
+
--- a/audio/music/kantowildbattle.asm
+++ b/audio/music/kantowildbattle.asm
@@ -4,8 +4,10 @@
 	dbw $02, Music_KantoWildBattle_Ch3
 ; ed076
 
+
 INCBIN "baserom.gbc", $ed076, $ed077 - $ed076
 
+
 Music_KantoWildBattle_Ch1: ; ed077
 	tempo 112
 	volume $77
@@ -25,7 +27,6 @@
 	note G_, 1
 	note F#, 1
 	note F_, 1
-
 Music_KantoWildBattle_branch_ed091: ; ed091
 	notetype $c, $b7
 	callchannel Music_KantoWildBattle_branch_ed18a
@@ -209,7 +210,6 @@
 	note D#, 1
 	note __, 5
 	note C#, 8
-
 Music_KantoWildBattle_branch_ed15b: ; ed15b
 	intensity $b1
 	octave 3
@@ -218,7 +218,6 @@
 	note D_, 1
 	note C#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed15b
-
 Music_KantoWildBattle_branch_ed166: ; ed166
 	note C#, 1
 	note F_, 1
@@ -225,7 +224,6 @@
 	note E_, 1
 	note D#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed166
-
 Music_KantoWildBattle_branch_ed16e: ; ed16e
 	note C_, 1
 	note D#, 1
@@ -232,7 +230,6 @@
 	note D_, 1
 	note C#, 1
 	loopchannel 16, Music_KantoWildBattle_branch_ed16e
-
 Music_KantoWildBattle_branch_ed176: ; ed176
 	note C#, 1
 	note E_, 1
@@ -239,7 +236,6 @@
 	note D#, 1
 	note D_, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed176
-
 Music_KantoWildBattle_branch_ed17e: ; ed17e
 	note C_, 1
 	note D#, 1
@@ -271,6 +267,7 @@
 	note B_, 1
 	note __, 3
 	endchannel
+; ed19f
 
 Music_KantoWildBattle_Ch2: ; ed19f
 	dutycycle $1
@@ -309,7 +306,6 @@
 	note D#, 1
 	note D_, 1
 	note C#, 1
-
 Music_KantoWildBattle_branch_ed1c8: ; ed1c8
 	notetype $c, $b7
 	callchannel Music_KantoWildBattle_branch_ed2c6
@@ -677,6 +673,7 @@
 	note C_, 2
 	note __, 2
 	endchannel
+; ed368
 
 Music_KantoWildBattle_Ch3: ; ed368
 	vibrato $14, $23
@@ -729,7 +726,6 @@
 	note G_, 1
 	octave 4
 	note G_, 1
-
 Music_KantoWildBattle_branch_ed39e: ; ed39e
 	notetype $c, $14
 	octave 5
@@ -1230,3 +1226,5 @@
 	note G_, 16
 	loopchannel 0, Music_KantoWildBattle_branch_ed39e
 ; ed5c6
+
+
--- a/audio/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_LakeOfRage_Ch4
 ; ee6d1
 
-
 Music_LakeOfRage_Ch1: ; ee6d1
 	tempo 144
 	volume $77
@@ -20,7 +19,6 @@
 	note D_, 6
 	note D_, 6
 	note E_, 4
-
 Music_LakeOfRage_branch_ee6e9: ; ee6e9
 	intensity $b5
 	note F#, 6
@@ -95,6 +93,7 @@
 	intensity $a7
 	note D_, 6
 	loopchannel 0, Music_LakeOfRage_branch_ee6e9
+; ee749
 
 Music_LakeOfRage_Ch2: ; ee749
 	dutycycle $3
@@ -109,7 +108,6 @@
 	note A_, 8
 	intensity $a7
 	note A_, 8
-
 Music_LakeOfRage_branch_ee75e: ; ee75e
 	notetype $8, $c7
 	octave 4
@@ -185,6 +183,7 @@
 	notetype $c, $c7
 	note A_, 16
 	loopchannel 0, Music_LakeOfRage_branch_ee75e
+; ee7c1
 
 Music_LakeOfRage_Ch3: ; ee7c1
 	stereopanning $f
@@ -199,7 +198,6 @@
 	note F#, 4
 	note __, 2
 	note E_, 4
-
 Music_LakeOfRage_branch_ee7d0: ; ee7d0
 	octave 3
 	note D_, 4
@@ -299,12 +297,12 @@
 	octave 2
 	note A_, 2
 	loopchannel 0, Music_LakeOfRage_branch_ee7d0
+; ee835
 
 Music_LakeOfRage_Ch4: ; ee835
 	stereopanning $f0
 	togglenoise $3
 	notetype $c
-
 Music_LakeOfRage_branch_ee83b: ; ee83b
 	note D_, 2
 	note D_, 1
@@ -327,3 +325,5 @@
 	note D_, 1
 	loopchannel 0, Music_LakeOfRage_branch_ee83b
 ; ee852
+
+
--- a/audio/music/lakeofragerocketradio.asm
+++ b/audio/music/lakeofragerocketradio.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_LakeOfRageRocketRadio_Ch3
 ; ef5ba
 
-
 Music_LakeOfRageRocketRadio_Ch1: ; ef5ba
 	tempo 160
 	volume $77
@@ -12,7 +11,6 @@
 	tone $1118
 	vibrato $0, $f0
 	stereopanning $f0
-
 Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9
 	notetype $c, $a7
 	octave 7
@@ -22,6 +20,7 @@
 	note F#, 4
 	note __, 16
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
+; ef5d6
 
 Music_LakeOfRageRocketRadio_Ch2: ; ef5d6
 	dutycycle $1
@@ -30,6 +29,7 @@
 	note __, 2
 	stereopanning $f
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
+; ef5e5
 
 Music_LakeOfRageRocketRadio_Ch3: ; ef5e5
 	notetype $c, $26
@@ -37,3 +37,5 @@
 	note __, 4
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
 ; ef5f0
+
+
--- a/audio/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
@@ -4,8 +4,10 @@
 	dbw $02, Music_LavenderTown_Ch3
 ; ef738
 
+
 INCBIN "baserom.gbc", $ef738, $ef739 - $ef738
 
+
 Music_LavenderTown_Ch1: ; ef739
 	tempo 160
 	volume $77
@@ -17,7 +19,6 @@
 	note __, 16
 	note __, 16
 	note __, 16
-
 Music_LavenderTown_branch_ef74c: ; ef74c
 	callchannel Music_LavenderTown_branch_ef7fd
 	intensity $93
@@ -104,7 +105,6 @@
 	octave 3
 	note A_, 2
 	note F_, 2
-
 Music_LavenderTown_branch_ef7ca: ; ef7ca
 	octave 3
 	note C_, 2
@@ -265,12 +265,12 @@
 	intensity $43
 	note G_, 2
 	endchannel
+; ef899
 
 Music_LavenderTown_Ch2: ; ef899
 	dutycycle $1
 	vibrato $8, $24
 	stereopanning $ff
-
 Music_LavenderTown_branch_ef8a0: ; ef8a0
 	notetype $c, $a3
 	octave 5
@@ -307,7 +307,6 @@
 	note D_, 2
 	intensity $63
 	note D_, 2
-
 Music_LavenderTown_branch_ef8d7: ; ef8d7
 	intensity $b5
 	callchannel Music_LavenderTown_branch_ef915
@@ -393,6 +392,7 @@
 	note A_, 4
 	note C_, 4
 	endchannel
+; ef932
 
 Music_LavenderTown_Ch3: ; ef932
 	vibrato $12, $24
@@ -405,7 +405,6 @@
 	octave 5
 	note E_, 4
 	note F_, 4
-
 Music_LavenderTown_branch_ef941: ; ef941
 	intensity $12
 	octave 5
@@ -522,3 +521,5 @@
 	note F_, 2
 	loopchannel 0, Music_LavenderTown_branch_ef941
 ; ef9bc
+
+
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Lighthouse_Ch4
 ; ee575
 
-
 Music_Lighthouse_Ch1: ; ee575
 	tempo 144
 	volume $77
@@ -13,7 +12,6 @@
 	tone $0004
 	vibrato $8, $45
 	stereopanning $f
-
 Music_Lighthouse_branch_ee584: ; ee584
 	notetype $c, $b3
 	octave 3
@@ -130,12 +128,12 @@
 	note A_, 2
 	note G#, 8
 	loopchannel 0, Music_Lighthouse_branch_ee584
+; ee5fc
 
 Music_Lighthouse_Ch2: ; ee5fc
 	dutycycle $3
 	tone $0002
 	vibrato $10, $45
-
 Music_Lighthouse_branch_ee604: ; ee604
 	notetype $c, $c5
 	octave 3
@@ -213,11 +211,11 @@
 	note C#, 2
 	note C_, 8
 	loopchannel 0, Music_Lighthouse_branch_ee604
+; ee656
 
 Music_Lighthouse_Ch3: ; ee656
 	notetype $c, $19
 	stereopanning $f0
-
 Music_Lighthouse_branch_ee65b: ; ee65b
 	octave 2
 	note G#, 2
@@ -228,7 +226,6 @@
 	note __, 2
 	note G_, 2
 	note __, 2
-
 Music_Lighthouse_branch_ee664: ; ee664
 	note G#, 2
 	note __, 2
@@ -258,7 +255,6 @@
 	octave 3
 	note C_, 2
 	note __, 2
-
 Music_Lighthouse_branch_ee683: ; ee683
 	note C#, 2
 	note __, 2
@@ -281,7 +277,6 @@
 	octave 3
 	note D#, 2
 	note F#, 2
-
 Music_Lighthouse_branch_ee69b: ; ee69b
 	note E_, 2
 	note __, 2
@@ -295,11 +290,11 @@
 	note __, 2
 	loopchannel 8, Music_Lighthouse_branch_ee69b
 	loopchannel 0, Music_Lighthouse_branch_ee65b
+; ee6ad
 
 Music_Lighthouse_Ch4: ; ee6ad
 	togglenoise $0
 	notetype $c
-
 Music_Lighthouse_branch_ee6b1: ; ee6b1
 	stereopanning $f
 	note G#, 4
@@ -317,3 +312,5 @@
 	note A_, 2
 	loopchannel 0, Music_Lighthouse_branch_ee6b1
 ; ee6c5
+
+
--- a/audio/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_LookBeauty_Ch4
 ; eee4a
 
-
 Music_LookBeauty_Ch1: ; eee4a
 	stereopanning $f
 	vibrato $12, $25
@@ -18,7 +17,6 @@
 	octave 4
 	note C_, 8
 	dutycycle $3
-
 Music_LookBeauty_branch_eee5f: ; eee5f
 	note __, 4
 	octave 3
@@ -78,6 +76,7 @@
 	octave 4
 	note C_, 1
 	loopchannel 0, Music_LookBeauty_branch_eee5f
+; eee9c
 
 Music_LookBeauty_Ch2: ; eee9c
 	stereopanning $f0
@@ -114,7 +113,6 @@
 	note F#, 1
 	note __, 1
 	dutycycle $3
-
 Music_LookBeauty_branch_eeec5: ; eeec5
 	notetype $c, $c7
 	note G_, 16
@@ -156,6 +154,7 @@
 	note F#, 8
 	note A_, 8
 	loopchannel 0, Music_LookBeauty_branch_eeec5
+; eeefa
 
 Music_LookBeauty_Ch3: ; eeefa
 	stereopanning $ff
@@ -174,7 +173,6 @@
 	octave 3
 	note D_, 7
 	note F#, 1
-
 Music_LookBeauty_branch_eef0f: ; eef0f
 	note G_, 4
 	octave 4
@@ -297,6 +295,7 @@
 	octave 3
 	note D_, 8
 	loopchannel 0, Music_LookBeauty_branch_eef0f
+; eef8b
 
 Music_LookBeauty_Ch4: ; eef8b
 	togglenoise $3
@@ -303,7 +302,6 @@
 	notetype $c
 	note __, 16
 	note __, 16
-
 Music_LookBeauty_branch_eef91: ; eef91
 	callchannel Music_LookBeauty_branch_eefa1
 	callchannel Music_LookBeauty_branch_eefa1
@@ -331,3 +329,5 @@
 	note G_, 2
 	endchannel
 ; eefb2
+
+
--- a/audio/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_LookHiker_Ch4
 ; f741d
 
-
 Music_LookHiker_Ch1: ; f741d
 	tempo 132
 	volume $77
@@ -18,7 +17,6 @@
 	note F#, 2
 	note F_, 2
 	note F#, 8
-
 Music_LookHiker_branch_f7433: ; f7433
 	note D_, 2
 	note D#, 2
@@ -33,6 +31,7 @@
 	note F#, 2
 	note __, 6
 	loopchannel 0, Music_LookHiker_branch_f7433
+; f7443
 
 Music_LookHiker_Ch2: ; f7443
 	dutycycle $0
@@ -51,7 +50,6 @@
 	note F#, 1
 	note D_, 1
 	intensity $a1
-
 Music_LookHiker_branch_f7457: ; f7457
 	octave 1
 	note B_, 1
@@ -70,6 +68,7 @@
 	note F#, 1
 	note D_, 1
 	loopchannel 0, Music_LookHiker_branch_f7457
+; f746b
 
 Music_LookHiker_Ch3: ; f746b
 	vibrato $12, $24
@@ -79,7 +78,6 @@
 	note B_, 2
 	note A#, 2
 	note B_, 8
-
 Music_LookHiker_branch_f7477: ; f7477
 	octave 5
 	note D#, 2
@@ -106,6 +104,7 @@
 	note B_, 2
 	note __, 6
 	endchannel
+; f7494
 
 Music_LookHiker_Ch4: ; f7494
 	togglenoise $3
@@ -112,7 +111,6 @@
 	notetype $c
 	note F_, 4
 	note __, 16
-
 Music_LookHiker_branch_f749a: ; f749a
 	note D#, 2
 	note G_, 2
@@ -120,3 +118,5 @@
 	note G_, 2
 	loopchannel 0, Music_LookHiker_branch_f749a
 ; f74a2
+
+
--- a/audio/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
@@ -4,8 +4,10 @@
 	dbw $02, Music_LookKimonoGirl_Ch3
 ; f79c1
 
+
 INCBIN "baserom.gbc", $f79c1, $f79c2 - $f79c1
 
+
 Music_LookKimonoGirl_Ch1: ; f79c2
 	tempo 160
 	volume $77
@@ -15,7 +17,6 @@
 	tone $0001
 	callchannel Music_LookKimonoGirl_branch_f7aa8
 	tone $0000
-
 Music_LookKimonoGirl_branch_f79d7: ; f79d7
 	notetype $c, $b2
 	callchannel Music_LookKimonoGirl_branch_f7a13
@@ -113,7 +114,6 @@
 	notetype $6, $a7
 	stereopanning $f0
 	callchannel Music_LookKimonoGirl_branch_f7aa8
-
 Music_LookKimonoGirl_branch_f7a5f: ; f7a5f
 	dutycycle $3
 	notetype $c, $91
@@ -217,6 +217,7 @@
 	note E_, 1
 	note E_, 1
 	endchannel
+; f7ad4
 
 Music_LookKimonoGirl_Ch3: ; f7ad4
 	stereopanning $ff
@@ -234,7 +235,6 @@
 	octave 5
 	note D_, 2
 	note E_, 2
-
 Music_LookKimonoGirl_branch_f7aec: ; f7aec
 	octave 5
 	note D_, 4
@@ -273,3 +273,5 @@
 	note E_, 8
 	loopchannel 0, Music_LookKimonoGirl_branch_f7aec
 ; f7b13
+
+
--- a/audio/music/looklass.asm
+++ b/audio/music/looklass.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_LookLass_Ch4
 ; ed7a7
 
-
 Music_LookLass_Ch1: ; ed7a7
 	tempo 132
 	volume $77
@@ -19,7 +18,6 @@
 	note B_, 14
 	stereopanning $f
 	dutycycle $0
-
 Music_LookLass_branch_ed7bd: ; ed7bd
 	intensity $a2
 	octave 3
@@ -31,6 +29,7 @@
 	intensity $a3
 	note B_, 2
 	loopchannel 0, Music_LookLass_branch_ed7bd
+; ed7cd
 
 Music_LookLass_Ch2: ; ed7cd
 	stereopanning $f0
@@ -37,7 +36,6 @@
 	dutycycle $0
 	notetype $c, $83
 	note __, 16
-
 Music_LookLass_branch_ed7d5: ; ed7d5
 	intensity $92
 	octave 2
@@ -50,6 +48,7 @@
 	octave 3
 	note G#, 2
 	loopchannel 0, Music_LookLass_branch_ed7d5
+; ed7e6
 
 Music_LookLass_Ch3: ; ed7e6
 	notetype $c, $10
@@ -59,7 +58,6 @@
 	note D#, 2
 	note C#, 2
 	note C_, 2
-
 Music_LookLass_branch_ed7ef: ; ed7ef
 	octave 5
 	note B_, 2
@@ -101,12 +99,12 @@
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_LookLass_branch_ed7ef
+; ed81a
 
 Music_LookLass_Ch4: ; ed81a
 	togglenoise $4
 	notetype $c
 	note C_, 16
-
 Music_LookLass_branch_ed81f: ; ed81f
 	notetype $6
 	note D_, 8
@@ -119,3 +117,5 @@
 	note C#, 1
 	loopchannel 0, Music_LookLass_branch_ed81f
 ; ed82d
+
+
--- a/audio/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_LookMysticalMan_Ch4
 ; 178447
 
-
 Music_LookMysticalMan_Ch1: ; 178447
 	tempo 136
 	volume $77
@@ -14,7 +13,6 @@
 	stereopanning $f
 	notetype $c, $b3
 	note __, 8
-
 Music_LookMysticalMan_branch_178458: ; 178458
 	dutycycle $3
 	notetype $6, $96
@@ -96,7 +94,6 @@
 	note A#, 6
 	dutycycle $2
 	intensity $72
-
 Music_LookMysticalMan_branch_1784b4: ; 1784b4
 	octave 5
 	note D_, 2
@@ -127,7 +124,6 @@
 	note D_, 2
 	note F#, 2
 	note B_, 2
-
 Music_LookMysticalMan_branch_1784d4: ; 1784d4
 	octave 5
 	note D_, 2
@@ -196,6 +192,7 @@
 	note B_, 2
 	note A_, 6
 	endchannel
+; 17851a
 
 Music_LookMysticalMan_Ch2: ; 17851a
 	dutycycle $3
@@ -202,7 +199,6 @@
 	vibrato $a, $34
 	notetype $c, $b3
 	note __, 8
-
 Music_LookMysticalMan_branch_178523: ; 178523
 	stereopanning $f0
 	notetype $6, $b8
@@ -365,11 +361,11 @@
 	note __, 1
 	intensity $b8
 	endchannel
+; 1785db
 
 Music_LookMysticalMan_Ch3: ; 1785db
 	notetype $6, $16
 	note __, 16
-
 Music_LookMysticalMan_branch_1785df: ; 1785df
 	octave 2
 	note B_, 4
@@ -425,7 +421,6 @@
 	note A_, 2
 	octave 3
 	note E_, 2
-
 Music_LookMysticalMan_branch_178615: ; 178615
 	octave 2
 	note F#, 4
@@ -542,6 +537,7 @@
 	note B_, 8
 	note A#, 4
 	loopchannel 0, Music_LookMysticalMan_branch_1785df
+; 17868e
 
 Music_LookMysticalMan_Ch4: ; 17868e
 	togglenoise $3
@@ -551,7 +547,6 @@
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_LookMysticalMan_branch_178697: ; 178697
 	callchannel Music_LookMysticalMan_branch_1786d3
 	callchannel Music_LookMysticalMan_branch_1786d9
@@ -571,7 +566,6 @@
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_LookMysticalMan_branch_1786ba: ; 1786ba
 	note D_, 2
 	note D#, 2
@@ -623,3 +617,5 @@
 	note D_, 1
 	endchannel
 ; 1786e8
+
+
--- a/audio/music/lookofficer.asm
+++ b/audio/music/lookofficer.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_LookOfficer_Ch3
 ; ed836
 
-
 Music_LookOfficer_Ch1: ; ed836
 	tempo 116
 	volume $77
@@ -22,7 +21,6 @@
 	intensity $2f
 	octave 3
 	note B_, 16
-
 Music_LookOfficer_branch_ed852: ; ed852
 	intensity $82
 	note __, 4
@@ -36,6 +34,7 @@
 	note A#, 16
 	note A_, 16
 	loopchannel 0, Music_LookOfficer_branch_ed852
+; ed863
 
 Music_LookOfficer_Ch2: ; ed863
 	vibrato $12, $34
@@ -62,7 +61,6 @@
 	note B_, 2
 	octave 2
 	note D#, 2
-
 Music_LookOfficer_branch_ed882: ; ed882
 	note E_, 2
 	note G#, 2
@@ -98,6 +96,7 @@
 	octave 2
 	note C#, 2
 	endchannel
+; ed8ad
 
 Music_LookOfficer_Ch3: ; ed8ad
 	vibrato $14, $14
@@ -121,7 +120,6 @@
 	note C#, 2
 	note __, 1
 	note D#, 2
-
 Music_LookOfficer_branch_ed8c8: ; ed8c8
 	note E_, 6
 	note D#, 6
@@ -142,3 +140,5 @@
 	note C#, 8
 	loopchannel 0, Music_LookOfficer_branch_ed8c8
 ; ed8dd
+
+
--- a/audio/music/lookpokemaniac.asm
+++ b/audio/music/lookpokemaniac.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_LookPokemaniac_Ch3
 ; ebdea
 
-
 Music_LookPokemaniac_Ch1: ; ebdea
 	stereopanning $f
 	tempo 144
@@ -13,7 +12,6 @@
 	tone $0002
 	notetype $c, $b3
 	note __, 8
-
 Music_LookPokemaniac_branch_ebdfb: ; ebdfb
 	note __, 4
 	octave 3
@@ -29,6 +27,7 @@
 	note __, 3
 	loopchannel 4, Music_LookPokemaniac_branch_ebdfb
 	loopchannel 0, Music_LookPokemaniac_branch_ebdfb
+; ebe12
 
 Music_LookPokemaniac_Ch2: ; ebe12
 	stereopanning $ff
@@ -42,7 +41,6 @@
 	note C_, 1
 	octave 1
 	note A_, 4
-
 Music_LookPokemaniac_branch_ebe24: ; ebe24
 	octave 2
 	note C_, 2
@@ -61,7 +59,6 @@
 	note D#, 1
 	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe24
-
 Music_LookPokemaniac_branch_ebe38: ; ebe38
 	octave 1
 	note A_, 2
@@ -82,6 +79,7 @@
 	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe38
 	loopchannel 0, Music_LookPokemaniac_branch_ebe24
+; ebe51
 
 Music_LookPokemaniac_Ch3: ; ebe51
 	stereopanning $f0
@@ -95,7 +93,6 @@
 	octave 5
 	note C_, 4
 	intensity $10
-
 Music_LookPokemaniac_branch_ebe62: ; ebe62
 	callchannel Music_LookPokemaniac_branch_ebe70
 	intensity $14
@@ -165,3 +162,5 @@
 	note __, 1
 	endchannel
 ; ebeab
+
+
--- a/audio/music/lookrival.asm
+++ b/audio/music/lookrival.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_LookRival_Ch4
 ; f4f85
 
-
 Music_LookRival_Ch1: ; f4f85
 	tempo 112
 	volume $77
@@ -35,9 +34,7 @@
 	note G#, 8
 	intensity $a6
 	note F#, 8
-
 Music_AfterTheRivalFight_branch_f4fb1: ; f4fb1
-
 Music_LookRival_branch_f4fb1: ; f4fb1
 	intensity $b5
 	note F_, 4
@@ -102,7 +99,6 @@
 	note G#, 8
 	note F_, 6
 	note C_, 2
-
 Music_LookRival_branch_f4ff7: ; f4ff7
 	intensity $b2
 	note F_, 6
@@ -119,6 +115,7 @@
 	note G#, 6
 	note F#, 4
 	loopchannel 0, Music_LookRival_branch_f4fb1
+; f5010
 
 Music_LookRival_Ch2: ; f5010
 	dutycycle $3
@@ -141,9 +138,7 @@
 	note D#, 10
 	intensity $b7
 	note D#, 16
-
 Music_AfterTheRivalFight_branch_f502e: ; f502e
-
 Music_LookRival_branch_f502e: ; f502e
 	intensity $c7
 	note C_, 12
@@ -197,7 +192,6 @@
 	note D#, 1
 	note D_, 1
 	note D#, 2
-
 Music_LookRival_branch_f5070: ; f5070
 	intensity $c2
 	note C_, 6
@@ -211,6 +205,7 @@
 	intensity $c7
 	note D#, 10
 	loopchannel 0, Music_LookRival_branch_f502e
+; f5086
 
 Music_LookRival_Ch3: ; f5086
 	notetype $c, $28
@@ -234,9 +229,7 @@
 	note C_, 2
 	note D#, 2
 	note F#, 2
-
 Music_AfterTheRivalFight_branch_f509d: ; f509d
-
 Music_LookRival_branch_f509d: ; f509d
 	callchannel Music_LookRival_branch_f50ef
 	loopchannel 3, Music_LookRival_branch_f509d
@@ -332,6 +325,7 @@
 	note G_, 2
 	note G#, 2
 	endchannel
+; f5106
 
 Music_LookRival_Ch4: ; f5106
 	stereopanning $f0
@@ -349,9 +343,7 @@
 	note D_, 2
 	note D_, 2
 	note D_, 2
-
 Music_AfterTheRivalFight_branch_f5118: ; f5118
-
 Music_LookRival_branch_f5118: ; f5118
 	note D#, 4
 	note D_, 2
@@ -366,3 +358,5 @@
 	note D_, 2
 	loopchannel 0, Music_LookRival_branch_f5118
 ; f5127
+
+
--- a/audio/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_LookRocket_Ch4
 ; f74ae
 
-
 Music_LookRocket_Ch1: ; f74ae
 	tempo 123
 	volume $77
@@ -19,7 +18,6 @@
 	note D_, 1
 	callchannel Music_LookRocket_branch_f74e6
 	dutycycle $1
-
 Music_LookRocket_branch_f74c7: ; f74c7
 	intensity $a8
 	callchannel Music_LookRocket_branch_f74f7
@@ -38,7 +36,6 @@
 ; f74e6
 
 Music_LookRocket_branch_f74e6: ; f74e6
-
 Music_RocketTheme_branch_f74e6: ; f74e6
 	note D#, 1
 	note __, 1
@@ -60,7 +57,6 @@
 ; f74f7
 
 Music_LookRocket_branch_f74f7: ; f74f7
-
 Music_RocketTheme_branch_f74f7: ; f74f7
 	note __, 2
 	octave 3
@@ -86,7 +82,6 @@
 ; f750c
 
 Music_LookRocket_branch_f750c: ; f750c
-
 Music_RocketTheme_branch_f750c: ; f750c
 	note __, 2
 	octave 2
@@ -108,7 +103,6 @@
 	note C_, 1
 	note D_, 1
 	callchannel Music_LookRocket_branch_f7547
-
 Music_LookRocket_branch_f7526: ; f7526
 	intensity $b7
 	callchannel Music_LookRocket_branch_f758a
@@ -127,7 +121,6 @@
 ; f7547
 
 Music_LookRocket_branch_f7547: ; f7547
-
 Music_RocketTheme_branch_f7547: ; f7547
 	note D#, 1
 	note __, 1
@@ -144,7 +137,6 @@
 ; f7554
 
 Music_LookRocket_branch_f7554: ; f7554
-
 Music_RocketTheme_branch_f7554: ; f7554
 	note __, 2
 	octave 4
@@ -169,7 +161,6 @@
 ; f7568
 
 Music_LookRocket_branch_f7568: ; f7568
-
 Music_RocketTheme_branch_f7568: ; f7568
 	note __, 2
 	octave 3
@@ -181,7 +172,6 @@
 ; f756f
 
 Music_LookRocket_branch_f756f: ; f756f
-
 Music_RocketTheme_branch_f756f: ; f756f
 	intensity $63
 	note G#, 1
@@ -209,7 +199,6 @@
 ; f758a
 
 Music_LookRocket_branch_f758a: ; f758a
-
 Music_RocketTheme_branch_f758a: ; f758a
 	octave 3
 	note __, 2
@@ -224,6 +213,7 @@
 	note A_, 1
 	note __, 1
 	endchannel
+; f7597
 
 Music_LookRocket_Ch3: ; f7597
 	forceoctave $2
@@ -232,7 +222,6 @@
 	stereopanning $f0
 	note __, 2
 	callchannel Music_LookRocket_branch_f75bf
-
 Music_LookRocket_branch_f75a5: ; f75a5
 	callchannel Music_LookRocket_branch_f75fe
 	callchannel Music_LookRocket_branch_f75fe
@@ -246,7 +235,6 @@
 ; f75bf
 
 Music_LookRocket_branch_f75bf: ; f75bf
-
 Music_RocketTheme_branch_f75bf: ; f75bf
 	octave 3
 	note F_, 1
@@ -264,7 +252,6 @@
 ; f75cc
 
 Music_LookRocket_branch_f75cc: ; f75cc
-
 Music_RocketTheme_branch_f75cc: ; f75cc
 	octave 2
 	note G#, 1
@@ -290,7 +277,6 @@
 ; f75e1
 
 Music_LookRocket_branch_f75e1: ; f75e1
-
 Music_RocketTheme_branch_f75e1: ; f75e1
 	intensity $24
 	octave 2
@@ -322,7 +308,6 @@
 ; f75fe
 
 Music_LookRocket_branch_f75fe: ; f75fe
-
 Music_RocketTheme_branch_f75fe: ; f75fe
 	note C_, 1
 	note __, 1
@@ -364,7 +349,6 @@
 ; f7623
 
 Music_LookRocket_branch_f7623: ; f7623
-
 Music_RocketTheme_branch_f7623: ; f7623
 	octave 2
 	note G#, 1
@@ -387,6 +371,7 @@
 	note D#, 1
 	note C_, 1
 	endchannel
+; f7638
 
 Music_LookRocket_Ch4: ; f7638
 	togglenoise $3
@@ -393,7 +378,6 @@
 	notetype $c
 	note __, 2
 	callchannel Music_LookRocket_branch_f765c
-
 Music_LookRocket_branch_f7640: ; f7640
 	callchannel Music_LookRocket_branch_f7664
 	callchannel Music_LookRocket_branch_f7664
@@ -407,7 +391,6 @@
 ; f765c
 
 Music_LookRocket_branch_f765c: ; f765c
-
 Music_RocketTheme_branch_f765c: ; f765c
 	note C_, 8
 	note D_, 2
@@ -420,7 +403,6 @@
 ; f7664
 
 Music_LookRocket_branch_f7664: ; f7664
-
 Music_RocketTheme_branch_f7664: ; f7664
 	note D#, 2
 	note F#, 2
@@ -432,3 +414,5 @@
 	note F#, 2
 	endchannel
 ; f766d
+
+
--- a/audio/music/looksage.asm
+++ b/audio/music/looksage.asm
@@ -3,7 +3,6 @@
 	dbw $02, Music_LookSage_Ch3
 ; ee364
 
-
 Music_LookSage_Ch1: ; ee364
 	tempo 144
 	stereopanning $f
@@ -30,7 +29,6 @@
 	note F_, 2
 	intensity $93
 	note F_, 2
-
 Music_LookSage_branch_ee38e: ; ee38e
 	intensity $b3
 	note D_, 2
@@ -124,6 +122,7 @@
 	intensity $93
 	note A_, 2
 	endchannel
+; ee414
 
 Music_LookSage_Ch3: ; ee414
 	stereopanning $f0
@@ -145,7 +144,6 @@
 	note E_, 14
 	note G_, 1
 	note G#, 1
-
 Music_LookSage_branch_ee430: ; ee430
 	note A_, 12
 	note B_, 4
@@ -182,3 +180,5 @@
 	note G#, 1
 	loopchannel 0, Music_LookSage_branch_ee430
 ; ee45f
+
+
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_LookYoungster_Ch3
 ; f66cc
 
-
 Music_LookYoungster_Ch1: ; f66cc
 	tempo 118
 	volume $77
@@ -26,7 +25,6 @@
 	note __, 2
 	note C_, 6
 	intensity $b3
-
 Music_LookYoungster_branch_f66ea: ; f66ea
 	note __, 2
 	octave 3
@@ -61,8 +59,12 @@
 	note __, 1
 	note __, 16
 	loopchannel 0, Music_LookYoungster_branch_f66ea
+; f670e
+
+
 INCBIN "baserom.gbc", $f670e, $f670f - $f670e
 
+
 Music_LookYoungster_Ch2: ; f670f
 	stereopanning $f0
 	vibrato $12, $26
@@ -84,7 +86,6 @@
 	note F_, 4
 	note __, 2
 	note F#, 6
-
 Music_LookYoungster_branch_f672f: ; f672f
 	dutycycle $3
 	intensity $b3
@@ -159,8 +160,12 @@
 	note C_, 1
 	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f672f
+; f6783
+
+
 INCBIN "baserom.gbc", $f6783, $f6784 - $f6783
 
+
 Music_LookYoungster_Ch3: ; f6784
 	stereopanning $ff
 	vibrato $2, $24
@@ -197,7 +202,6 @@
 	note __, 2
 	note G#, 6
 	intensity $25
-
 Music_LookYoungster_branch_f67ae: ; f67ae
 	octave 2
 	note G_, 1
@@ -296,4 +300,8 @@
 	loopchannel 0, Music_LookYoungster_branch_f67ae
 ; f6810
 
+
 INCBIN "baserom.gbc", $f6810, $f6811 - $f6810
+
+
+
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_MagnetTrain_Ch4
 ; ef5fc
 
-
 Music_MagnetTrain_Ch1: ; ef5fc
 	tempo 110
 	volume $77
@@ -69,6 +68,7 @@
 	notetype $c, $b7
 	note D_, 16
 	endchannel
+; ef648
 
 Music_MagnetTrain_Ch2: ; ef648
 	vibrato $14, $23
@@ -107,6 +107,7 @@
 	notetype $c, $d7
 	note A_, 16
 	endchannel
+; ef67d
 
 Music_MagnetTrain_Ch3: ; ef67d
 	stereopanning $ff
@@ -223,6 +224,7 @@
 	octave 2
 	note D_, 16
 	endchannel
+; ef6f4
 
 Music_MagnetTrain_Ch4: ; ef6f4
 	togglenoise $3
@@ -247,21 +249,11 @@
 	note B_, 16
 	endchannel
 ; ef711
-	note G#, 1
-	note G_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G_, 1
-	endchannel
-; ef71e
 
+
+INCBIN "baserom.gbc", $ef711, $ef71e - $ef711
+
+
 Music_MagnetTrain_branch_ef71e: ; ef71e
 	note G#, 2
 	note G_, 2
@@ -281,3 +273,5 @@
 	note G_, 2
 	endchannel
 ; ef72f
+
+
--- a/audio/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_MainMenu_Ch4
 ; f7909
 
-
 Music_MainMenu_Ch1: ; f7909
 	tempo 160
 	volume $77
@@ -16,7 +15,6 @@
 	notetype $c, $f
 	octave 3
 	note D_, 8
-
 Music_MainMenu_branch_f791d: ; f791d
 	notetype $c, $92
 	octave 3
@@ -43,6 +41,7 @@
 	octave 3
 	note C_, 4
 	loopchannel 0, Music_MainMenu_branch_f791d
+; f7940
 
 Music_MainMenu_Ch2: ; f7940
 	dutycycle $3
@@ -50,7 +49,6 @@
 	notetype $c, $f
 	octave 3
 	note G_, 8
-
 Music_MainMenu_branch_f7949: ; f7949
 	notetype $c, $a2
 	note F#, 6
@@ -74,12 +72,12 @@
 	notetype $c, $a4
 	note F_, 4
 	loopchannel 0, Music_MainMenu_branch_f7949
+; f7969
 
 Music_MainMenu_Ch3: ; f7969
 	stereopanning $f0
 	notetype $c, $25
 	note __, 8
-
 Music_MainMenu_branch_f796f: ; f796f
 	octave 2
 	note F#, 1
@@ -114,6 +112,7 @@
 	note F_, 1
 	note __, 3
 	loopchannel 0, Music_MainMenu_branch_f796f
+; f7996
 
 Music_MainMenu_Ch4: ; f7996
 	stereopanning $f
@@ -128,7 +127,6 @@
 	note D_, 1
 	note D_, 1
 	note D_, 1
-
 Music_MainMenu_branch_f79a5: ; f79a5
 	note D_, 6
 	note D_, 1
@@ -147,3 +145,5 @@
 	note D_, 1
 	loopchannel 0, Music_MainMenu_branch_f79a5
 ; f79b8
+
+
--- a/audio/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_MobileAdapter_Ch4
 ; 1fc93
 
-
 Music_MobileAdapter_Ch1: ; 1fc93
 	tempo 132
 	volume $77
@@ -24,7 +23,6 @@
 	note D_, 1
 	note __, 1
 	note C#, 4
-
 Music_MobileAdapter_branch_1fcad: ; 1fcad
 	callchannel Music_MobileAdapter_branch_1fd39
 	note D_, 1
@@ -218,7 +216,6 @@
 	octave 4
 	note D_, 1
 	note F#, 1
-
 Music_MobileAdapter_branch_1fd80: ; 1fd80
 	callchannel Music_MobileAdapter_branch_1fdfe
 	note A_, 4
@@ -415,7 +412,6 @@
 	note E_, 1
 	note __, 1
 	note A_, 4
-
 Music_MobileAdapter_branch_1fe4f: ; 1fe4f
 	callchannel Music_MobileAdapter_branch_1fecf
 	callchannel Music_MobileAdapter_branch_1fee3
@@ -529,7 +525,6 @@
 	note A_, 1
 	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fecf
-
 Music_MobileAdapter_branch_1fed8: ; 1fed8
 	octave 2
 	note G_, 1
@@ -618,6 +613,7 @@
 	note __, 6
 	loopchannel 2, Music_MobileAdapter_branch_1ff09
 	endchannel
+; 1ff2c
 
 Music_MobileAdapter_Ch4: ; 1ff2c
 	togglenoise $3
@@ -629,11 +625,9 @@
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_MobileAdapter_branch_1ff38: ; 1ff38
 	callchannel Music_MobileAdapter_branch_1ff60
 	callchannel Music_MobileAdapter_branch_1ff60
-
 Music_MobileAdapter_branch_1ff3e: ; 1ff3e
 	note __, 4
 	note D_, 8
@@ -643,7 +637,6 @@
 	note D_, 3
 	note D_, 4
 	loopchannel 2, Music_MobileAdapter_branch_1ff3e
-
 Music_MobileAdapter_branch_1ff49: ; 1ff49
 	note __, 4
 	note D_, 4
@@ -675,3 +668,4 @@
 	note D_, 1
 	endchannel
 ; 1ff6c
+
--- a/audio/music/mobileadaptermenu.asm
+++ b/audio/music/mobileadaptermenu.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_MobileAdapterMenu_Ch3
 ; 178028
 
-
 Music_MobileAdapterMenu_Ch1: ; 178028
 	tempo 168
 	volume $77
@@ -13,7 +12,6 @@
 	dutycycle $2
 	notetype $c, $66
 	note __, 2
-
 Music_MobileAdapterMenu_branch_178038: ; 178038
 	callchannel Music_MobileAdapterMenu_branch_178057
 	callchannel Music_MobileAdapterMenu_branch_178076
@@ -86,6 +84,7 @@
 	note __, 1
 	note C#, 4
 	endchannel
+; 178084
 
 Music_MobileAdapterMenu_Ch2: ; 178084
 	stereopanning $f0
@@ -94,7 +93,6 @@
 	octave 4
 	note E_, 1
 	note G#, 1
-
 Music_MobileAdapterMenu_branch_17808e: ; 17808e
 	callchannel Music_MobileAdapterMenu_branch_1780ae
 	note E_, 8
@@ -175,12 +173,12 @@
 	note __, 1
 	note E_, 4
 	endchannel
+; 1780e2
 
 Music_MobileAdapterMenu_Ch3: ; 1780e2
 	vibrato $8, $34
 	notetype $c, $25
 	note __, 2
-
 Music_MobileAdapterMenu_branch_1780e9: ; 1780e9
 	callchannel Music_MobileAdapterMenu_branch_178119
 	octave 2
@@ -282,3 +280,5 @@
 	note A_, 4
 	endchannel
 ; 178153
+
+
--- a/audio/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_MobileCenter_Ch4
 ; 179629
 
-
 Music_MobileCenter_Ch1: ; 179629
 	tempo 160
 	volume $77
@@ -21,7 +20,6 @@
 	note G_, 2
 	note A_, 2
 	note B_, 4
-
 Music_MobileCenter_branch_179642: ; 179642
 	octave 3
 	note E_, 2
@@ -158,6 +156,7 @@
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_MobileCenter_branch_179642
+; 1796cc
 
 Music_MobileCenter_Ch2: ; 1796cc
 	notetype $c, $c2
@@ -167,7 +166,6 @@
 	note G_, 2
 	note A_, 2
 	note B_, 2
-
 Music_MobileCenter_branch_1796d6: ; 1796d6
 	octave 2
 	note C_, 2
@@ -327,6 +325,7 @@
 	note E_, 2
 	note D_, 2
 	loopchannel 0, Music_MobileCenter_branch_1796d6
+; 179777
 
 Music_MobileCenter_Ch3: ; 179777
 	notetype $c, $24
@@ -340,7 +339,6 @@
 	note C_, 2
 	note D_, 4
 	notetype $c, $25
-
 Music_MobileCenter_branch_179788: ; 179788
 	note C_, 2
 	octave 4
@@ -454,6 +452,7 @@
 	note C_, 8
 	vibrato $10, $34
 	loopchannel 0, Music_MobileCenter_branch_179788
+; 179807
 
 Music_MobileCenter_Ch4: ; 179807
 	togglenoise $3
@@ -465,7 +464,6 @@
 	note C#, 1
 	note C#, 1
 	note C#, 1
-
 Music_MobileCenter_branch_179813: ; 179813
 	note A_, 2
 	note C#, 2
@@ -488,3 +486,4 @@
 	note C#, 1
 	loopchannel 0, Music_MobileCenter_branch_179813
 ; 17982d
+
--- a/audio/music/mom.asm
+++ b/audio/music/mom.asm
@@ -4,7 +4,6 @@
 	dbw $03, Music_Mom_Ch4
 ; f6bfb
 
-
 Music_Mom_Ch2: ; f6bfb
 	tempo 144
 	volume $77
@@ -18,7 +17,6 @@
 	note G#, 1
 	note A_, 1
 	note B_, 8
-
 Music_Mom_branch_f6c0e: ; f6c0e
 	notetype $c, $b1
 	note __, 4
@@ -33,6 +31,7 @@
 	note A#, 2
 	note B_, 2
 	loopchannel 0, Music_Mom_branch_f6c0e
+; f6c20
 
 Music_Mom_Ch3: ; f6c20
 	stereopanning $f0
@@ -45,7 +44,6 @@
 	note G#, 1
 	note E_, 8
 	intensity $23
-
 Music_Mom_branch_f6c2e: ; f6c2e
 	octave 2
 	note A_, 2
@@ -79,12 +77,12 @@
 	note D_, 2
 	note __, 2
 	loopchannel 0, Music_Mom_branch_f6c2e
+; f6c51
 
 Music_Mom_Ch4: ; f6c51
 	togglenoise $3
 	notetype $c
 	note __, 6
-
 Music_Mom_branch_f6c56: ; f6c56
 	note D#, 1
 	note __, 1
@@ -112,3 +110,5 @@
 	note __, 1
 	loopchannel 0, Music_Mom_branch_f6c56
 ; f6c72
+
+
--- a/audio/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_MtMoon_Ch4
 ; edb35
 
-
 Music_MtMoon_Ch1: ; edb35
 	tempo 208
 	volume $77
@@ -23,7 +22,6 @@
 	dutycycle $2
 	notetype $c, $84
 	stereopanning $f
-
 Music_MtMoon_branch_edb56: ; edb56
 	octave 4
 	note D#, 6
@@ -74,12 +72,11 @@
 	note F#, 6
 	note E_, 4
 	loopchannel 0, Music_MtMoon_branch_edb56
+; edb8a
 
 Music_MtMoon_Ch3: ; edb8a
-
 Music_MtMoon_branch_edb8a: ; edb8a
 	notetype $c, $28
-
 Music_MtMoon_branch_edb8d: ; edb8d
 	octave 2
 	note B_, 2
@@ -108,7 +105,6 @@
 	note G_, 2
 	note D#, 2
 	note E_, 2
-
 Music_MtMoon_branch_edbab: ; edbab
 	note E_, 2
 	note G#, 2
@@ -124,11 +120,11 @@
 	note G#, 2
 	loopchannel 4, Music_MtMoon_branch_edbab
 	loopchannel 0, Music_MtMoon_branch_edb8a
+; edbbf
 
 Music_MtMoon_Ch4: ; edbbf
 	togglenoise $5
 	notetype $c
-
 Music_MtMoon_branch_edbc3: ; edbc3
 	stereopanning $f
 	note A#, 4
@@ -145,3 +141,5 @@
 	note A#, 8
 	loopchannel 0, Music_MtMoon_branch_edbc3
 ; edbd8
+
+
--- a/audio/music/mtmoonsquare.asm
+++ b/audio/music/mtmoonsquare.asm
@@ -3,7 +3,6 @@
 	dbw $01, Music_MtMoonSquare_Ch2
 ; f481b
 
-
 Music_MtMoonSquare_Ch1: ; f481b
 	tempo 112
 	volume $77
@@ -10,10 +9,8 @@
 	dutycycle $2
 	tone $0001
 	note __, 1
-
 Music_MtMoonSquare_branch_f4826: ; f4826
 	notetype $c, $44
-
 Music_MtMoonSquare_branch_f4829: ; f4829
 	octave 4
 	note D_, 2
@@ -24,7 +21,6 @@
 	octave 5
 	note D_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4829
-
 Music_MtMoonSquare_branch_f4835: ; f4835
 	octave 4
 	note E_, 2
@@ -35,7 +31,6 @@
 	octave 5
 	note E_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4835
-
 Music_MtMoonSquare_branch_f4841: ; f4841
 	octave 4
 	note C#, 2
@@ -46,7 +41,6 @@
 	octave 5
 	note C#, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4841
-
 Music_MtMoonSquare_branch_f484d: ; f484d
 	octave 4
 	note D_, 2
@@ -58,14 +52,13 @@
 	note D_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f484d
 	loopchannel 0, Music_MtMoonSquare_branch_f4826
+; f485d
 
 Music_MtMoonSquare_Ch2: ; f485d
 	dutycycle $2
 	vibrato $18, $24
-
 Music_MtMoonSquare_branch_f4862: ; f4862
 	notetype $c, $82
-
 Music_MtMoonSquare_branch_f4865: ; f4865
 	octave 4
 	note D_, 2
@@ -78,7 +71,6 @@
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4865
 	notetype $c, $82
-
 Music_MtMoonSquare_branch_f4877: ; f4877
 	octave 4
 	note E_, 2
@@ -91,7 +83,6 @@
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4877
 	notetype $c, $82
-
 Music_MtMoonSquare_branch_f4889: ; f4889
 	octave 4
 	note C#, 2
@@ -104,7 +95,6 @@
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4889
 	notetype $c, $82
-
 Music_MtMoonSquare_branch_f489b: ; f489b
 	octave 4
 	note D_, 2
@@ -118,3 +108,5 @@
 	loopchannel 2, Music_MtMoonSquare_branch_f489b
 	loopchannel 0, Music_MtMoonSquare_branch_f4862
 ; f48ae
+
+
--- a/audio/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_NationalPark_Ch4
 ; f54f4
 
-
 Music_NationalPark_Ch1: ; f54f4
 	tempo 192
 	volume $77
@@ -14,7 +13,6 @@
 	dutycycle $1
 	notetype $c, $77
 	note __, 2
-
 Music_NationalPark_branch_f5504: ; f5504
 	callchannel Music_NationalPark_branch_f554a
 	callchannel Music_NationalPark_branch_f554a
@@ -299,6 +297,7 @@
 	note A_, 2
 	note __, 4
 	endchannel
+; f5652
 
 Music_NationalPark_Ch2: ; f5652
 	vibrato $14, $24
@@ -306,7 +305,6 @@
 	notetype $c, $a7
 	note __, 2
 	stereopanning $f0
-
 Music_NationalPark_branch_f565d: ; f565d
 	notetype $c, $a7
 	callchannel Music_NationalPark_branch_f56b8
@@ -484,6 +482,7 @@
 	note D_, 2
 	note C#, 2
 	endchannel
+; f5723
 
 Music_NationalPark_Ch3: ; f5723
 	vibrato $16, $24
@@ -492,7 +491,6 @@
 	note G#, 1
 	note A#, 1
 	stereopanning $ff
-
 Music_NationalPark_branch_f572e: ; f572e
 	callchannel Music_NationalPark_branch_f5756
 	octave 5
@@ -625,12 +623,12 @@
 	note F_, 1
 	note __, 1
 	endchannel
+; f57b8
 
 Music_NationalPark_Ch4: ; f57b8
 	togglenoise $3
 	notetype $c
 	note __, 2
-
 Music_NationalPark_branch_f57bd: ; f57bd
 	note __, 16
 	loopchannel 23, Music_NationalPark_branch_f57bd
@@ -640,7 +638,6 @@
 	note A#, 1
 	note D_, 1
 	note B_, 2
-
 Music_NationalPark_branch_f57c8: ; f57c8
 	note A#, 2
 	note G_, 1
@@ -669,3 +666,5 @@
 	note D#, 1
 	loopchannel 0, Music_NationalPark_branch_f57bd
 ; f57e8
+
+
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@@ -4,8 +4,10 @@
 	dbw $02, Music_NewBarkTown_Ch3
 ; eb2dc
 
+
 INCBIN "baserom.gbc", $eb2dc, $eb2dd - $eb2dc
 
+
 Music_NewBarkTown_Ch1: ; eb2dd
 	tempo 187
 	volume $77
@@ -13,7 +15,6 @@
 	vibrato $12, $23
 	notetype $c, $87
 	note __, 4
-
 Music_NewBarkTown_branch_eb2eb: ; eb2eb
 	dutycycle $0
 	callchannel Music_NewBarkTown_branch_eb349
@@ -160,6 +161,7 @@
 	note A_, 4
 	note E_, 2
 	endchannel
+; eb38d
 
 Music_NewBarkTown_Ch2: ; eb38d
 	stereopanning $ff
@@ -166,7 +168,6 @@
 	vibrato $12, $23
 	notetype $6, $a7
 	note __, 8
-
 Music_NewBarkTown_branch_eb396: ; eb396
 	dutycycle $2
 	notetype $6, $a7
@@ -257,6 +258,7 @@
 	notetype $c, $97
 	note E_, 16
 	endchannel
+; eb400
 
 Music_NewBarkTown_Ch3: ; eb400
 	stereopanning $f0
@@ -264,7 +266,6 @@
 	octave 5
 	note D_, 2
 	note E_, 2
-
 Music_NewBarkTown_branch_eb408: ; eb408
 	vibrato $16, $23
 	note F#, 4
@@ -331,3 +332,5 @@
 	note E_, 1
 	loopchannel 0, Music_NewBarkTown_branch_eb408
 ; eb453
+
+
--- a/audio/music/nothing.asm
+++ b/audio/music/nothing.asm
@@ -5,13 +5,10 @@
 	dbw $03, Music_Nothing_Ch4
 ; e91af
 
-
 Music_Nothing_Ch1: ; e91af
-
 Music_Nothing_Ch2: ; e91af
-
 Music_Nothing_Ch3: ; e91af
-
 Music_Nothing_Ch4: ; e91af
 	endchannel
 ; e91b0
+
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_PalletTown_Ch3
 ; f4b15
 
-
 Music_PalletTown_Ch1: ; f4b15
 	tempo 188
 	volume $77
@@ -11,7 +10,6 @@
 	vibrato $12, $24
 	tone $0001
 	stereopanning $f
-
 Music_PalletTown_branch_f4b22: ; f4b22
 	dutycycle $2
 	notetype $c, $78
@@ -62,7 +60,6 @@
 	note B_, 8
 	intensity $77
 	note B_, 8
-
 Music_PalletTown_branch_f4b59: ; f4b59
 	dutycycle $3
 	intensity $92
@@ -121,12 +118,12 @@
 	intensity $1f
 	note F#, 8
 	loopchannel 0, Music_PalletTown_branch_f4b22
+; f4ba1
 
 Music_PalletTown_Ch2: ; f4ba1
 	vibrato $12, $44
 	dutycycle $2
 	stereopanning $f0
-
 Music_PalletTown_branch_f4ba8: ; f4ba8
 	notetype $c, $88
 	octave 1
@@ -187,7 +184,6 @@
 	octave 3
 	note C_, 2
 	note D_, 2
-
 Music_PalletTown_branch_f4be5: ; f4be5
 	intensity $a2
 	octave 3
@@ -248,10 +244,10 @@
 	note B_, 2
 	note A_, 2
 	loopchannel 0, Music_PalletTown_branch_f4ba8
+; f4c2a
 
 Music_PalletTown_Ch3: ; f4c2a
 	vibrato $14, $24
-
 Music_PalletTown_branch_f4c2d: ; f4c2d
 	notetype $c, $10
 	octave 6
@@ -363,3 +359,5 @@
 	note A_, 8
 	loopchannel 0, Music_PalletTown_branch_f4c2d
 ; f4c9f
+
+
--- a/audio/music/pokeflutechannel.asm
+++ b/audio/music/pokeflutechannel.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_PokeFluteChannel_Ch3
 ; f7b1c
 
-
 Music_PokeFluteChannel_Ch1: ; f7b1c
 	tempo 240
 	volume $77
@@ -31,7 +30,6 @@
 	octave 2
 	note G_, 4
 	note A_, 8
-
 Music_PokeFluteChannel_branch_f7b40: ; f7b40
 	octave 3
 	note E_, 2
@@ -70,6 +68,7 @@
 	note G_, 4
 	note A_, 8
 	loopchannel 0, Music_PokeFluteChannel_branch_f7b40
+; f7b68
 
 Music_PokeFluteChannel_Ch2: ; f7b68
 	stereopanning $f
@@ -108,7 +107,6 @@
 	octave 2
 	note E_, 2
 	note G_, 2
-
 Music_PokeFluteChannel_branch_f7b94: ; f7b94
 	octave 3
 	note C_, 2
@@ -172,6 +170,7 @@
 	note E_, 2
 	note G_, 2
 	loopchannel 0, Music_PokeFluteChannel_branch_f7b94
+; f7bd5
 
 Music_PokeFluteChannel_Ch3: ; f7bd5
 	vibrato $10, $14
@@ -178,7 +177,6 @@
 	notetype $c, $10
 	callchannel Music_PokeFluteChannel_branch_f7c05
 	callchannel Music_PokeFluteChannel_branch_f7c05
-
 Music_PokeFluteChannel_branch_f7be1: ; f7be1
 	note __, 4
 	octave 4
@@ -232,3 +230,5 @@
 	note G_, 4
 	endchannel
 ; f7c16
+
+
--- a/audio/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_PokemonCenter_Ch4
 ; ed5d2
 
-
 Music_PokemonCenter_Ch1: ; ed5d2
 	tempo 152
 	volume $77
@@ -12,7 +11,6 @@
 	dutycycle $2
 	vibrato $a, $14
 	tone $0001
-
 Music_PokemonCenter_branch_ed5df: ; ed5df
 	stereopanning $f
 	notetype $c, $83
@@ -151,10 +149,10 @@
 	note F#, 2
 	note G_, 2
 	loopchannel 0, Music_PokemonCenter_branch_ed5df
+; ed671
 
 Music_PokemonCenter_Ch2: ; ed671
 	vibrato $10, $25
-
 Music_PokemonCenter_branch_ed674: ; ed674
 	stereopanning $ff
 	callchannel Music_PokemonCenter_branch_ed6d1
@@ -253,10 +251,10 @@
 	note E_, 4
 	note C#, 2
 	endchannel
+; ed6f3
 
 Music_PokemonCenter_Ch3: ; ed6f3
 	notetype $c, $28
-
 Music_PokemonCenter_branch_ed6f6: ; ed6f6
 	stereopanning $f0
 	octave 3
@@ -400,12 +398,12 @@
 	note A_, 1
 	note __, 1
 	endchannel
+; ed78c
 
 Music_PokemonCenter_Ch4: ; ed78c
 	togglenoise $3
 	notetype $c
 	stereopanning $ff
-
 Music_PokemonCenter_branch_ed792: ; ed792
 	note G_, 6
 	note G_, 4
@@ -414,3 +412,5 @@
 	note G_, 2
 	loopchannel 0, Music_PokemonCenter_branch_ed792
 ; ed79b
+
+
--- a/audio/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_PokemonChannel_Ch4
 ; ee46b
 
-
 Music_PokemonChannel_Ch1: ; ee46b
 	tempo 128
 	volume $77
@@ -75,6 +74,7 @@
 	note D_, 2
 	note __, 6
 	endchannel
+; ee4be
 
 Music_PokemonChannel_Ch2: ; ee4be
 	dutycycle $1
@@ -145,6 +145,7 @@
 	note G_, 2
 	note __, 6
 	endchannel
+; ee50e
 
 Music_PokemonChannel_Ch3: ; ee50e
 	vibrato $8, $38
@@ -201,11 +202,11 @@
 	note G_, 1
 	note __, 3
 	endchannel
+; ee549
 
 Music_PokemonChannel_Ch4: ; ee549
 	togglenoise $3
 	notetype $c
-
 Music_PokemonChannel_branch_ee54d: ; ee54d
 	note A#, 3
 	note A#, 1
@@ -233,3 +234,5 @@
 	note A#, 4
 	endchannel
 ; ee569
+
+
--- a/audio/music/pokemonlullaby.asm
+++ b/audio/music/pokemonlullaby.asm
@@ -4,13 +4,11 @@
 	dbw $02, Music_PokemonLullaby_Ch3
 ; f6d82
 
-
 Music_PokemonLullaby_Ch1: ; f6d82
 	tempo 224
 	volume $77
 	dutycycle $3
 	tone $0001
-
 Music_PokemonLullaby_branch_f6d8c: ; f6d8c
 	notetype $c, $a7
 	octave 3
@@ -55,12 +53,12 @@
 	octave 3
 	note B_, 8
 	loopchannel 0, Music_PokemonLullaby_branch_f6d8c
+; f6dc4
 
 Music_PokemonLullaby_Ch2: ; f6dc4
 	vibrato $10, $14
 	dutycycle $0
 	notetype $c, $b4
-
 Music_PokemonLullaby_branch_f6dcc: ; f6dcc
 	note __, 16
 	note __, 10
@@ -106,10 +104,10 @@
 	note E_, 16
 	note __, 14
 	loopchannel 0, Music_PokemonLullaby_branch_f6dcc
+; f6e03
 
 Music_PokemonLullaby_Ch3: ; f6e03
 	notetype $c, $11
-
 Music_PokemonLullaby_branch_f6e06: ; f6e06
 	stereopanning $f0
 	octave 4
@@ -136,3 +134,5 @@
 	note A_, 2
 	loopchannel 0, Music_PokemonLullaby_branch_f6e06
 ; f6e23
+
+
--- a/audio/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_PokemonMarch_Ch4
 ; f6e2f
 
-
 Music_PokemonMarch_Ch1: ; f6e2f
 	tempo 144
 	volume $77
@@ -22,7 +21,6 @@
 	intensity $a2
 	note D_, 4
 	notetype $8, $a2
-
 Music_PokemonMarch_branch_f6e4c: ; f6e4c
 	callchannel Music_PokemonMarch_branch_f6eae
 	note D#, 2
@@ -124,6 +122,7 @@
 	note F_, 2
 	note __, 2
 	endchannel
+; f6ec1
 
 Music_PokemonMarch_Ch2: ; f6ec1
 	dutycycle $2
@@ -134,7 +133,6 @@
 	note G_, 4
 	note G_, 4
 	note G_, 4
-
 Music_PokemonMarch_branch_f6ece: ; f6ece
 	notetype $c, $b7
 	octave 3
@@ -236,6 +234,7 @@
 	note G_, 1
 	note __, 5
 	loopchannel 0, Music_PokemonMarch_branch_f6ece
+; f6f4d
 
 Music_PokemonMarch_Ch3: ; f6f4d
 	stereopanning $f
@@ -242,7 +241,6 @@
 	notetype $c, $16
 	note __, 16
 	notetype $8, $16
-
 Music_PokemonMarch_branch_f6f56: ; f6f56
 	callchannel Music_PokemonMarch_branch_f6fe8
 	note __, 2
@@ -275,7 +273,6 @@
 	note D#, 2
 	note G_, 2
 	note G#, 2
-
 Music_PokemonMarch_branch_f6f7b: ; f6f7b
 	octave 3
 	note A#, 2
@@ -401,6 +398,7 @@
 	octave 3
 	note G_, 2
 	endchannel
+; f6ffa
 
 Music_PokemonMarch_Ch4: ; f6ffa
 	stereopanning $f0
@@ -407,7 +405,6 @@
 	togglenoise $5
 	notetype $8
 	callchannel Music_PokemonMarch_branch_f704c
-
 Music_PokemonMarch_branch_f7003: ; f7003
 	callchannel Music_PokemonMarch_branch_f7042
 	note C_, 4
@@ -470,3 +467,5 @@
 	note C#, 2
 	endchannel
 ; f7055
+
+
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@@ -3,8 +3,10 @@
 	dbw $01, Music_PostCredits_Ch2
 ; cfda4
 
+
 INCBIN "baserom.gbc", $cfda4, $cfda5 - $cfda4
 
+
 Music_PostCredits_Ch1: ; cfda5
 	tempo 271
 	volume $77
@@ -12,7 +14,6 @@
 	dutycycle $2
 	notetype $c, $93
 	note __, 8
-
 Music_PostCredits_branch_cfdb2: ; cfdb2
 	octave 3
 	note C_, 2
@@ -131,6 +132,7 @@
 	octave 2
 	note G_, 2
 	loopchannel 0, Music_PostCredits_branch_cfdb2
+; cfe48
 
 Music_PostCredits_Ch2: ; cfe48
 	forceoctave $3
@@ -144,7 +146,6 @@
 	note F_, 2
 	intensity $73
 	note F_, 2
-
 Music_PostCredits_branch_cfe5a: ; cfe5a
 	intensity $a3
 	note G_, 2
@@ -266,3 +267,4 @@
 	note F_, 2
 	loopchannel 0, Music_PostCredits_branch_cfe5a
 ; cff04
+
--- a/audio/music/printer.asm
+++ b/audio/music/printer.asm
@@ -2,7 +2,6 @@
 	dbw $02, Music_Printer_Ch3
 ; f0800
 
-
 Music_Printer_Ch3: ; f0800
 	tempo 256
 	notetype $c, $20
@@ -35,7 +34,6 @@
 	note __, 1
 	note F#, 1
 	note __, 1
-
 Music_Printer_branch_f0823: ; f0823
 	note E_, 1
 	note __, 1
@@ -321,3 +319,4 @@
 	note __, 1
 	loopchannel 0, Music_Printer_branch_f0823
 ; f0941
+
--- a/audio/music/profoak.asm
+++ b/audio/music/profoak.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_ProfOak_Ch3
 ; f4df3
 
-
 Music_ProfOak_Ch1: ; f4df3
 	tempo 118
 	volume $77
@@ -23,7 +22,6 @@
 	note G#, 8
 	intensity $97
 	note G#, 8
-
 Music_ProfOak_branch_f4e10: ; f4e10
 	intensity $91
 	callchannel Music_ProfOak_branch_f4e42
@@ -31,7 +29,6 @@
 	callchannel Music_ProfOak_branch_f4e4d
 	callchannel Music_ProfOak_branch_f4e4d
 	loopchannel 2, Music_ProfOak_branch_f4e10
-
 Music_ProfOak_branch_f4e22: ; f4e22
 	callchannel Music_ProfOak_branch_f4e58
 	callchannel Music_ProfOak_branch_f4e58
@@ -108,6 +105,7 @@
 	note B_, 4
 	intensity $91
 	endchannel
+; f4e7e
 
 Music_ProfOak_Ch2: ; f4e7e
 	vibrato $12, $34
@@ -123,7 +121,6 @@
 	intensity $a7
 	note B_, 10
 	dutycycle $2
-
 Music_ProfOak_branch_f4e92: ; f4e92
 	intensity $b2
 	octave 3
@@ -162,7 +159,6 @@
 	loopchannel 2, Music_ProfOak_branch_f4e92
 	note __, 6
 	intensity $b4
-
 Music_ProfOak_branch_f4ebf: ; f4ebf
 	note C#, 6
 	octave 3
@@ -212,6 +208,7 @@
 	note E_, 1
 	note G#, 16
 	loopchannel 0, Music_ProfOak_branch_f4ebf
+; f4ef5
 
 Music_ProfOak_Ch3: ; f4ef5
 	stereopanning $f
@@ -233,7 +230,6 @@
 	note __, 1
 	note E_, 2
 	callchannel Music_ProfOak_branch_f4f3d
-
 Music_ProfOak_branch_f4f0d: ; f4f0d
 	callchannel Music_ProfOak_branch_f4f3d
 	callchannel Music_ProfOak_branch_f4f3d
@@ -240,7 +236,6 @@
 	callchannel Music_ProfOak_branch_f4f4c
 	callchannel Music_ProfOak_branch_f4f4c
 	loopchannel 2, Music_ProfOak_branch_f4f0d
-
 Music_ProfOak_branch_f4f1d: ; f4f1d
 	callchannel Music_ProfOak_branch_f4f5a
 	callchannel Music_ProfOak_branch_f4f5a
@@ -326,3 +321,5 @@
 	note B_, 2
 	endchannel
 ; f4f79
+
+
--- a/audio/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
@@ -4,8 +4,10 @@
 	dbw $02, Music_ProfOaksPokemonTalk_Ch3
 ; f4ca8
 
+
 INCBIN "baserom.gbc", $f4ca8, $f4ca9 - $f4ca8
 
+
 Music_ProfOaksPokemonTalk_Ch1: ; f4ca9
 	tempo 164
 	volume $77
@@ -24,7 +26,6 @@
 	note D#, 1
 	note E_, 1
 	note F#, 1
-
 Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3
 	note D#, 6
 	note C#, 1
@@ -133,6 +134,7 @@
 	note F#, 1
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3
+; f4d31
 
 Music_ProfOaksPokemonTalk_Ch2: ; f4d31
 	vibrato $8, $24
@@ -157,7 +159,6 @@
 	note F#, 1
 	note G#, 1
 	note A#, 1
-
 Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d
 	note B_, 6
 	note A#, 1
@@ -209,6 +210,7 @@
 	note A#, 1
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d
+; f4d82
 
 Music_ProfOaksPokemonTalk_Ch3: ; f4d82
 	vibrato $6, $38
@@ -225,7 +227,6 @@
 	note C#, 1
 	octave 2
 	note A#, 1
-
 Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95
 	note B_, 6
 	octave 3
@@ -310,3 +311,5 @@
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95
 ; f4dea
+
+
--- a/audio/music/rivalbattle.asm
+++ b/audio/music/rivalbattle.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_RivalBattle_Ch3
 ; e9758
 
-
 Music_RivalBattle_Ch1: ; e9758
 	tempo 102
 	volume $77
@@ -24,7 +23,6 @@
 	intensity $b7
 	note C#, 6
 	note E_, 4
-
 Music_RivalBattle_branch_e9777: ; e9777
 	intensity $b2
 	octave 2
@@ -42,7 +40,6 @@
 	note C#, 4
 	intensity $b7
 	note C#, 10
-
 Music_RivalBattle_branch_e978f: ; e978f
 	intensity $b2
 	octave 3
@@ -59,7 +56,6 @@
 	note B_, 4
 	intensity $4d
 	note B_, 10
-
 Music_RivalBattle_branch_e97a6: ; e97a6
 	intensity $b7
 	note A#, 6
@@ -183,7 +179,6 @@
 	note E_, 2
 	note D#, 2
 	note C#, 2
-
 Music_RivalBattle_branch_e9837: ; e9837
 	octave 3
 	note A#, 2
@@ -290,6 +285,7 @@
 	octave 3
 	note C#, 10
 	loopchannel 0, Music_RivalBattle_branch_e97a6
+; e98af
 
 Music_RivalBattle_Ch2: ; e98af
 	dutycycle $3
@@ -341,7 +337,6 @@
 	note F#, 6
 	intensity $c2
 	note G#, 4
-
 Music_RivalBattle_branch_e98ea: ; e98ea
 	intensity $c2
 	note D#, 6
@@ -359,7 +354,6 @@
 	note B_, 1
 	octave 4
 	note C_, 1
-
 Music_RivalBattle_branch_e9903: ; e9903
 	intensity $c2
 	note C#, 6
@@ -375,7 +369,6 @@
 	note E_, 4
 	intensity $b7
 	note E_, 6
-
 Music_RivalBattle_branch_e991a: ; e991a
 	callchannel Music_RivalBattle_branch_e99e0
 	intensity $b0
@@ -481,7 +474,6 @@
 	note G#, 8
 	intensity $c7
 	note F_, 8
-
 Music_RivalBattle_branch_e99a6: ; e99a6
 	intensity $c2
 	octave 3
@@ -501,7 +493,6 @@
 	note C#, 6
 	intensity $9a
 	note C#, 4
-
 Music_RivalBattle_branch_e99c1: ; e99c1
 	intensity $c2
 	octave 3
@@ -545,6 +536,7 @@
 	intensity $b7
 	note F_, 8
 	endchannel
+; e99fb
 
 Music_RivalBattle_Ch3: ; e99fb
 	notetype $c, $19
@@ -562,7 +554,6 @@
 	octave 3
 	note C#, 2
 	note D_, 2
-
 Music_RivalBattle_branch_e9a0c: ; e9a0c
 	note D#, 2
 	note C#, 2
@@ -572,7 +563,6 @@
 	note D#, 2
 	note C#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9a0c
-
 Music_RivalBattle_branch_e9a17: ; e9a17
 	octave 3
 	note C#, 2
@@ -596,7 +586,6 @@
 	note C_, 2
 	note C#, 2
 	note D_, 2
-
 Music_RivalBattle_branch_e9a30: ; e9a30
 	callchannel Music_RivalBattle_branch_e9b47
 	octave 2
@@ -644,7 +633,6 @@
 	octave 3
 	note F_, 2
 	callchannel Music_RivalBattle_branch_e9b50
-
 Music_RivalBattle_branch_e9a66: ; e9a66
 	note C#, 2
 	note G#, 2
@@ -652,7 +640,6 @@
 	callchannel Music_RivalBattle_branch_e9b5c
 	note G#, 2
 	note F#, 2
-
 Music_RivalBattle_branch_e9a71: ; e9a71
 	octave 2
 	note A#, 2
@@ -711,27 +698,22 @@
 	note F#, 2
 	note G_, 2
 	note G#, 2
-
 Music_RivalBattle_branch_e9ab3: ; e9ab3
 	note D#, 2
 	note A#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ab3
-
 Music_RivalBattle_branch_e9ab9: ; e9ab9
 	note D#, 2
 	note A_, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ab9
-
 Music_RivalBattle_branch_e9abf: ; e9abf
 	note D#, 2
 	note G#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9abf
-
 Music_RivalBattle_branch_e9ac5: ; e9ac5
 	note D#, 2
 	note G_, 2
 	loopchannel 12, Music_RivalBattle_branch_e9ac5
-
 Music_RivalBattle_branch_e9acb: ; e9acb
 	octave 2
 	note B_, 2
@@ -738,7 +720,6 @@
 	octave 3
 	note D#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9acb
-
 Music_RivalBattle_branch_e9ad3: ; e9ad3
 	octave 2
 	note B_, 2
@@ -798,7 +779,6 @@
 	note C#, 8
 	note D#, 8
 	note F_, 8
-
 Music_RivalBattle_branch_e9b10: ; e9b10
 	octave 2
 	note A#, 2
@@ -807,7 +787,6 @@
 	loopchannel 7, Music_RivalBattle_branch_e9b10
 	note E_, 2
 	note D#, 2
-
 Music_RivalBattle_branch_e9b1a: ; e9b1a
 	octave 2
 	note A#, 2
@@ -820,7 +799,6 @@
 	note F#, 2
 	note F_, 2
 	note E_, 2
-
 Music_RivalBattle_branch_e9b28: ; e9b28
 	octave 2
 	note G#, 2
@@ -829,7 +807,6 @@
 	loopchannel 7, Music_RivalBattle_branch_e9b28
 	note D_, 2
 	note C#, 2
-
 Music_RivalBattle_branch_e9b32: ; e9b32
 	octave 2
 	note G#, 2
@@ -890,3 +867,5 @@
 	loopchannel 2, Music_RivalBattle_branch_e9b65
 	endchannel
 ; e9b6f
+
+
--- a/audio/music/rocketbattle.asm
+++ b/audio/music/rocketbattle.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_RocketBattle_Ch3
 ; e9b78
 
-
 Music_RocketBattle_Ch1: ; e9b78
 	tempo 101
 	volume $77
@@ -49,7 +48,6 @@
 	note C_, 1
 	octave 2
 	note B_, 1
-
 Music_RocketBattle_branch_e9bad: ; e9bad
 	intensity $b2
 	octave 3
@@ -64,7 +62,6 @@
 	note C_, 6
 	intensity $b7
 	note D_, 4
-
 Music_RocketBattle_branch_e9bc1: ; e9bc1
 	intensity $b2
 	octave 4
@@ -119,7 +116,6 @@
 	note D#, 2
 	note D_, 2
 	note F_, 2
-
 Music_RocketBattle_branch_e9c02: ; e9c02
 	octave 4
 	note E_, 2
@@ -295,7 +291,6 @@
 	intensity $b7
 	note A#, 2
 	note G_, 4
-
 Music_RocketBattle_branch_e9cc5: ; e9cc5
 	intensity $b2
 	note F_, 6
@@ -394,6 +389,7 @@
 	note D_, 2
 	note F_, 2
 	loopchannel 0, Music_RocketBattle_branch_e9c02
+; e9d3e
 
 Music_RocketBattle_Ch2: ; e9d3e
 	dutycycle $3
@@ -442,7 +438,6 @@
 	note G#, 1
 	note A_, 1
 	note G#, 1
-
 Music_RocketBattle_branch_e9d7b: ; e9d7b
 	intensity $c2
 	octave 3
@@ -459,7 +454,6 @@
 	note A_, 6
 	intensity $4a
 	note G#, 4
-
 Music_RocketBattle_branch_e9d91: ; e9d91
 	intensity $c2
 	octave 4
@@ -482,7 +476,6 @@
 	note F_, 16
 	intensity $b7
 	note F_, 16
-
 Music_RocketBattle_branch_e9db1: ; e9db1
 	callchannel Music_RocketBattle_branch_e9ea0
 	intensity $b0
@@ -612,7 +605,6 @@
 	note G_, 1
 	note G#, 1
 	note A_, 8
-
 Music_RocketBattle_branch_e9e5a: ; e9e5a
 	intensity $c2
 	octave 3
@@ -677,6 +669,7 @@
 	note G#, 6
 	note E_, 4
 	endchannel
+; e9eaa
 
 Music_RocketBattle_Ch3: ; e9eaa
 	notetype $c, $19
@@ -711,7 +704,6 @@
 	octave 2
 	note B_, 2
 	note A#, 2
-
 Music_RocketBattle_branch_e9ecc: ; e9ecc
 	callchannel Music_RocketBattle_branch_e9fe6
 	loopchannel 3, Music_RocketBattle_branch_e9ecc
@@ -727,7 +719,6 @@
 	note F_, 2
 	note E_, 2
 	note D_, 2
-
 Music_RocketBattle_branch_e9edf: ; e9edf
 	callchannel Music_RocketBattle_branch_e9fe6
 	loopchannel 3, Music_RocketBattle_branch_e9edf
@@ -749,7 +740,6 @@
 	octave 3
 	note F_, 2
 	callchannel Music_RocketBattle_branch_ea01d
-
 Music_RocketBattle_branch_e9efe: ; e9efe
 	callchannel Music_RocketBattle_branch_e9ff3
 	callchannel Music_RocketBattle_branch_ea010
@@ -784,7 +774,6 @@
 	note A_, 2
 	octave 3
 	note E_, 2
-
 Music_RocketBattle_branch_e9f25: ; e9f25
 	octave 2
 	note A#, 2
@@ -818,7 +807,6 @@
 	note D_, 2
 	callchannel Music_RocketBattle_branch_ea02a
 	callchannel Music_RocketBattle_branch_ea02a
-
 Music_RocketBattle_branch_e9f4e: ; e9f4e
 	octave 2
 	note A_, 2
@@ -845,7 +833,6 @@
 	note A_, 2
 	note G_, 2
 	note F_, 2
-
 Music_RocketBattle_branch_e9f6a: ; e9f6a
 	octave 2
 	note A#, 2
@@ -862,7 +849,6 @@
 	note D_, 2
 	note C#, 2
 	note D_, 2
-
 Music_RocketBattle_branch_e9f7c: ; e9f7c
 	octave 2
 	note A_, 2
@@ -877,7 +863,6 @@
 	note C_, 2
 	octave 2
 	note A#, 2
-
 Music_RocketBattle_branch_e9f8c: ; e9f8c
 	octave 2
 	note A_, 2
@@ -894,7 +879,6 @@
 	note A_, 2
 	note G_, 2
 	note A#, 2
-
 Music_RocketBattle_branch_e9f9e: ; e9f9e
 	octave 2
 	note A#, 2
@@ -903,7 +887,6 @@
 	loopchannel 7, Music_RocketBattle_branch_e9f9e
 	note E_, 2
 	note F_, 2
-
 Music_RocketBattle_branch_e9fa8: ; e9fa8
 	octave 2
 	note A#, 2
@@ -1055,3 +1038,5 @@
 	note A_, 2
 	endchannel
 ; ea040
+
+
--- a/audio/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_RocketHideout_Ch4
 ; eeb81
 
-
 Music_RocketHideout_Ch1: ; eeb81
 	tempo 144
 	volume $77
@@ -14,11 +13,9 @@
 	vibrato $10, $44
 	notetype $c, $b3
 	stereopanning $f0
-
 Music_RocketHideout_branch_eeb93: ; eeb93
 	note __, 16
 	loopchannel 4, Music_RocketHideout_branch_eeb93
-
 Music_RocketHideout_branch_eeb98: ; eeb98
 	octave 2
 	note D#, 2
@@ -117,11 +114,11 @@
 	note __, 16
 	note A_, 16
 	intensity $b3
-
 Music_RocketHideout_branch_eebfe: ; eebfe
 	note __, 16
 	loopchannel 4, Music_RocketHideout_branch_eebfe
 	loopchannel 0, Music_RocketHideout_branch_eeb93
+; eec07
 
 Music_RocketHideout_Ch2: ; eec07
 	dutycycle $3
@@ -129,7 +126,6 @@
 	vibrato $0, $f0
 	notetype $c, $c4
 	stereopanning $f
-
 Music_RocketHideout_branch_eec14: ; eec14
 	octave 2
 	note D#, 2
@@ -225,10 +221,10 @@
 	note G_, 2
 	note __, 8
 	loopchannel 0, Music_RocketHideout_branch_eec14
+; eec79
 
 Music_RocketHideout_Ch3: ; eec79
 	notetype $c, $19
-
 Music_RocketHideout_branch_eec7c: ; eec7c
 	octave 2
 	note D#, 2
@@ -241,7 +237,6 @@
 	note A_, 2
 	note __, 8
 	loopchannel 6, Music_RocketHideout_branch_eec7c
-
 Music_RocketHideout_branch_eec8a: ; eec8a
 	note F_, 2
 	note __, 2
@@ -257,7 +252,6 @@
 	note B_, 2
 	note __, 8
 	loopchannel 2, Music_RocketHideout_branch_eec8a
-
 Music_RocketHideout_branch_eec9b: ; eec9b
 	note C#, 2
 	note __, 2
@@ -267,7 +261,6 @@
 	octave 3
 	note C#, 16
 	loopchannel 2, Music_RocketHideout_branch_eec9b
-
 Music_RocketHideout_branch_eeca6: ; eeca6
 	octave 2
 	note C#, 2
@@ -281,6 +274,7 @@
 	note __, 8
 	loopchannel 2, Music_RocketHideout_branch_eeca6
 	loopchannel 0, Music_RocketHideout_branch_eec7c
+; eecb8
 
 Music_RocketHideout_Ch4: ; eecb8
 	togglenoise $0
@@ -293,7 +287,6 @@
 	note D#, 1
 	note D#, 1
 	callchannel Music_RocketHideout_branch_eecdb
-
 Music_RocketHideout_branch_eecc7: ; eecc7
 	callchannel Music_RocketHideout_branch_eecdb
 	note E_, 4
@@ -318,3 +311,5 @@
 	note A_, 4
 	endchannel
 ; eece8
+
+
--- a/audio/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_RocketTheme_Ch4
 ; f7679
 
-
 Music_RocketTheme_Ch1: ; f7679
 	tempo 128
 	volume $77
@@ -16,7 +15,6 @@
 	octave 4
 	note C_, 1
 	note D_, 1
-
 Music_RocketTheme_branch_f768b: ; f768b
 	dutycycle $3
 	notetype $c, $a8
@@ -89,7 +87,6 @@
 	note E_, 2
 	note D#, 2
 	note D_, 2
-
 Music_RocketTheme_branch_f76ef: ; f76ef
 	note __, 4
 	note F_, 2
@@ -106,22 +103,18 @@
 	note __, 2
 	note D#, 2
 	note C_, 2
-
 Music_RocketTheme_branch_f7701: ; f7701
 	note F#, 2
 	note A_, 2
 	loopchannel 4, Music_RocketTheme_branch_f7701
-
 Music_RocketTheme_branch_f7707: ; f7707
 	note G_, 2
 	note A#, 2
 	loopchannel 4, Music_RocketTheme_branch_f7707
-
 Music_RocketTheme_branch_f770d: ; f770d
 	note G#, 2
 	note B_, 2
 	loopchannel 4, Music_RocketTheme_branch_f770d
-
 Music_RocketTheme_branch_f7713: ; f7713
 	octave 3
 	note A_, 2
@@ -161,6 +154,7 @@
 	note A#, 2
 	note __, 10
 	endchannel
+; f773e
 
 Music_RocketTheme_Ch2: ; f773e
 	stereopanning $ff
@@ -170,7 +164,6 @@
 	octave 5
 	note C_, 1
 	note D_, 1
-
 Music_RocketTheme_branch_f774b: ; f774b
 	notetype $c, $b7
 	callchannel Music_RocketTheme_branch_f7547
@@ -340,6 +333,7 @@
 	note F_, 8
 	note C_, 4
 	endchannel
+; f7826
 
 Music_RocketTheme_Ch3: ; f7826
 	stereopanning $f0
@@ -346,7 +340,6 @@
 	vibrato $4, $22
 	notetype $c, $14
 	note __, 2
-
 Music_RocketTheme_branch_f782f: ; f782f
 	notetype $c, $14
 	callchannel Music_RocketTheme_branch_f75bf
@@ -454,12 +447,12 @@
 	note G#, 1
 	note __, 1
 	loopchannel 0, Music_RocketTheme_branch_f782f
+; f78be
 
 Music_RocketTheme_Ch4: ; f78be
 	togglenoise $3
 	notetype $c
 	note __, 2
-
 Music_RocketTheme_branch_f78c3: ; f78c3
 	callchannel Music_RocketTheme_branch_f765c
 	callchannel Music_RocketTheme_branch_f7664
@@ -470,7 +463,6 @@
 	callchannel Music_RocketTheme_branch_f7664
 	callchannel Music_RocketTheme_branch_f7664
 	callchannel Music_RocketTheme_branch_f765c
-
 Music_RocketTheme_branch_f78de: ; f78de
 	note A#, 2
 	note F#, 2
@@ -488,3 +480,5 @@
 	callchannel Music_RocketTheme_branch_f765c
 	loopchannel 0, Music_RocketTheme_branch_f78c3
 ; f78fd
+
+
--- a/audio/music/route1.asm
+++ b/audio/music/route1.asm
@@ -4,8 +4,10 @@
 	dbw $02, Music_Route1_Ch3
 ; ec009
 
+
 INCBIN "baserom.gbc", $ec009, $ec00a - $ec009
 
+
 Music_Route1_Ch1: ; ec00a
 	stereopanning $f
 	tempo 184
@@ -60,7 +62,6 @@
 	note D_, 2
 	intensity $83
 	note __, 2
-
 Music_Route1_branch_ec04a: ; ec04a
 	intensity $83
 	note __, 2
@@ -204,6 +205,7 @@
 	note D_, 2
 	note __, 2
 	loopchannel 0, Music_Route1_branch_ec04a
+; ec0eb
 
 Music_Route1_Ch2: ; ec0eb
 	stereopanning $f0
@@ -232,7 +234,6 @@
 	note D_, 1
 	note E_, 1
 	dutycycle $2
-
 Music_Route1_branch_ec112: ; ec112
 	intensity $82
 	callchannel Music_Route1_branch_ec188
@@ -381,6 +382,7 @@
 	octave 5
 	note D_, 2
 	endchannel
+; ec1b8
 
 Music_Route1_Ch3: ; ec1b8
 	stereopanning $ff
@@ -462,7 +464,6 @@
 	note __, 1
 	note A_, 1
 	note __, 3
-
 Music_Route1_branch_ec20c: ; ec20c
 	octave 3
 	note D_, 1
@@ -652,3 +653,5 @@
 	note __, 3
 	loopchannel 0, Music_Route1_branch_ec20c
 ; ec2ca
+
+
--- a/audio/music/route12.asm
+++ b/audio/music/route12.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Route12_Ch4
 ; ec512
 
-
 Music_Route12_Ch1: ; ec512
 	tempo 148
 	volume $77
@@ -30,7 +29,6 @@
 	note E_, 1
 	intensity $97
 	note D#, 12
-
 Music_Route12_branch_ec535: ; ec535
 	dutycycle $2
 	intensity $96
@@ -117,7 +115,6 @@
 	note F#, 8
 	note D#, 4
 	note F#, 4
-
 Music_Route12_branch_ec59b: ; ec59b
 	intensity $97
 	note G#, 1
@@ -165,6 +162,7 @@
 	note A_, 4
 	note F#, 4
 	endchannel
+; ec5ca
 
 Music_Route12_Ch2: ; ec5ca
 	dutycycle $3
@@ -188,7 +186,6 @@
 	note B_, 1
 	octave 4
 	note D#, 1
-
 Music_Route12_branch_ec5e5: ; ec5e5
 	dutycycle $3
 	intensity $b7
@@ -284,6 +281,7 @@
 	note G#, 4
 	note F#, 4
 	endchannel
+; ec657
 
 Music_Route12_Ch3: ; ec657
 	vibrato $12, $54
@@ -303,7 +301,6 @@
 	note F#, 2
 	note __, 2
 	note D#, 4
-
 Music_Route12_branch_ec66c: ; ec66c
 	callchannel Music_Route12_branch_ec6b4
 	note F#, 1
@@ -356,7 +353,6 @@
 	note E_, 8
 	note F#, 4
 	note D#, 4
-
 Music_Route12_branch_ec6a3: ; ec6a3
 	note E_, 1
 	note __, 1
@@ -398,6 +394,7 @@
 	note G#, 4
 	note E_, 4
 	endchannel
+; ec6ce
 
 Music_Route12_Ch4: ; ec6ce
 	togglenoise $4
@@ -413,7 +410,6 @@
 	note D_, 4
 	notetype $6
 	callchannel Music_Route12_branch_ec717
-
 Music_Route12_branch_ec6e1: ; ec6e1
 	note D_, 4
 	note D_, 8
@@ -422,7 +418,6 @@
 	note D_, 8
 	callchannel Music_Route12_branch_ec717
 	loopchannel 8, Music_Route12_branch_ec6e1
-
 Music_Route12_branch_ec6ed: ; ec6ed
 	notetype $c
 	note B_, 10
@@ -441,7 +436,6 @@
 	callchannel Music_Route12_branch_ec717
 	callchannel Music_Route12_branch_ec717
 	note B_, 16
-
 Music_Route12_branch_ec707: ; ec707
 	note D_, 4
 	note D_, 8
@@ -464,3 +458,5 @@
 	note C#, 1
 	endchannel
 ; ec720
+
+
--- a/audio/music/route2.asm
+++ b/audio/music/route2.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Route2_Ch4
 ; ed8e9
 
-
 Music_Route2_Ch1: ; ed8e9
 	tempo 151
 	volume $77
@@ -15,7 +14,6 @@
 	note __, 16
 	note __, 16
 	callchannel Music_Route2_branch_ed931
-
 Music_Route2_branch_ed8fb: ; ed8fb
 	intensity $b1
 	octave 3
@@ -163,6 +161,7 @@
 	octave 3
 	note A_, 2
 	endchannel
+; ed996
 
 Music_Route2_Ch2: ; ed996
 	stereopanning $ff
@@ -169,7 +168,6 @@
 	vibrato $8, $24
 	notetype $c, $b2
 	callchannel Music_Route2_branch_ed9ba
-
 Music_Route2_branch_ed9a1: ; ed9a1
 	intensity $b2
 	callchannel Music_Route2_branch_ed9ba
@@ -301,6 +299,7 @@
 	note G_, 1
 	note __, 1
 	endchannel
+; eda2c
 
 Music_Route2_Ch3: ; eda2c
 	stereopanning $f0
@@ -327,7 +326,6 @@
 	callchannel Music_Route2_branch_eda9e
 	octave 3
 	note D_, 4
-
 Music_Route2_branch_eda4b: ; eda4b
 	notetype $c, $15
 	octave 3
@@ -462,11 +460,11 @@
 	note E_, 4
 	note F_, 16
 	endchannel
+; edadc
 
 Music_Route2_Ch4: ; edadc
 	togglenoise $5
 	notetype $c
-
 Music_Route2_branch_edae0: ; edae0
 	note A_, 4
 	note A_, 4
@@ -480,7 +478,6 @@
 	note A_, 2
 	note A_, 2
 	note D#, 4
-
 Music_Route2_branch_edaef: ; edaef
 	note A_, 4
 	note A_, 4
@@ -489,7 +486,6 @@
 	note B_, 2
 	note A_, 2
 	loopchannel 4, Music_Route2_branch_edaef
-
 Music_Route2_branch_edaf9: ; edaf9
 	note B_, 4
 	note A_, 2
@@ -504,7 +500,6 @@
 	note A_, 2
 	note A_, 2
 	note D#, 4
-
 Music_Route2_branch_edb09: ; edb09
 	note B_, 4
 	note C_, 4
@@ -517,7 +512,6 @@
 	note C#, 2
 	note C_, 2
 	note C#, 4
-
 Music_Route2_branch_edb17: ; edb17
 	note B_, 4
 	note C_, 4
@@ -532,3 +526,5 @@
 	note D#, 4
 	loopchannel 0, Music_Route2_branch_edaef
 ; edb29
+
+
--- a/audio/music/route26.asm
+++ b/audio/music/route26.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Route26_Ch4
 ; eefbe
 
-
 Music_Route26_Ch1: ; eefbe
 	stereopanning $f
 	vibrato $12, $23
@@ -28,7 +27,6 @@
 	octave 3
 	note G#, 2
 	note F#, 2
-
 Music_Route26_branch_eefe0: ; eefe0
 	dutycycle $0
 	notetype $c, $a7
@@ -196,6 +194,7 @@
 	note B_, 4
 	note __, 4
 	loopchannel 0, Music_Route26_branch_eefe0
+; ef09d
 
 Music_Route26_Ch2: ; ef09d
 	stereopanning $f0
@@ -235,7 +234,6 @@
 	octave 2
 	note C_, 2
 	note D#, 2
-
 Music_Route26_branch_ef0ce: ; ef0ce
 	dutycycle $2
 	notetype $c, $c2
@@ -285,7 +283,6 @@
 	note D#, 4
 	note D#, 4
 	notetype $8, $c2
-
 Music_Route26_branch_ef10e: ; ef10e
 	octave 2
 	note G#, 2
@@ -357,6 +354,7 @@
 	octave 1
 	note A#, 2
 	endchannel
+; ef15a
 
 Music_Route26_Ch3: ; ef15a
 	stereopanning $ff
@@ -394,7 +392,6 @@
 	note F#, 2
 	note F_, 2
 	note D#, 2
-
 Music_Route26_branch_ef18a: ; ef18a
 	vibrato $18, $23
 	notetype $c, $14
@@ -553,11 +550,11 @@
 	note C#, 4
 	note D#, 4
 	endchannel
+; ef238
 
 Music_Route26_Ch4: ; ef238
 	togglenoise $4
 	notetype $c
-
 Music_Route26_branch_ef23c: ; ef23c
 	note B_, 6
 	note D_, 1
@@ -564,7 +561,6 @@
 	note D_, 1
 	loopchannel 3, Music_Route26_branch_ef23c
 	callchannel Music_Route26_branch_ef2b0
-
 Music_Route26_branch_ef246: ; ef246
 	notetype $6
 	callchannel Music_Route26_branch_ef29a
@@ -584,7 +580,6 @@
 	callchannel Music_Route26_branch_ef29a
 	callchannel Music_Route26_branch_ef29a
 	notetype $8
-
 Music_Route26_branch_ef266: ; ef266
 	note D_, 2
 	note D_, 2
@@ -596,7 +591,6 @@
 	callchannel Music_Route26_branch_ef2a8
 	callchannel Music_Route26_branch_ef29a
 	callchannel Music_Route26_branch_ef2a8
-
 Music_Route26_branch_ef27c: ; ef27c
 	notetype $6
 	note D_, 1
@@ -679,3 +673,5 @@
 	note E_, 2
 	endchannel
 ; ef2d0
+
+
--- a/audio/music/route29.asm
+++ b/audio/music/route29.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Route29_Ch4
 ; f0392
 
-
 Music_Route29_Ch1: ; f0392
 	tempo 146
 	volume $77
@@ -15,7 +14,6 @@
 	stereopanning $f
 	notetype $c, $b2
 	note __, 2
-
 Music_Route29_branch_f03a5: ; f03a5
 	note __, 2
 	octave 4
@@ -170,6 +168,7 @@
 	note G_, 2
 	note G_, 4
 	loopchannel 0, Music_Route29_branch_f03a5
+; f044d
 
 Music_Route29_Ch2: ; f044d
 	dutycycle $3
@@ -178,7 +177,6 @@
 	octave 4
 	note C_, 1
 	note D_, 1
-
 Music_Route29_branch_f0458: ; f0458
 	callchannel Music_Route29_branch_f04de
 	note F_, 1
@@ -335,6 +333,7 @@
 	note E_, 2
 	note C_, 2
 	endchannel
+; f04fb
 
 Music_Route29_Ch3: ; f04fb
 	stereopanning $f0
@@ -341,7 +340,6 @@
 	notetype $c, $25
 	vibrato $9, $27
 	note __, 2
-
 Music_Route29_branch_f0504: ; f0504
 	note __, 2
 	octave 3
@@ -505,6 +503,7 @@
 	note C_, 1
 	note __, 3
 	loopchannel 0, Music_Route29_branch_f0504
+; f05a9
 
 Music_Route29_Ch4: ; f05a9
 	stereopanning $f
@@ -511,7 +510,6 @@
 	togglenoise $0
 	notetype $c
 	note __, 2
-
 Music_Route29_branch_f05b0: ; f05b0
 	note __, 2
 	note F_, 2
@@ -526,3 +524,5 @@
 	note F_, 4
 	loopchannel 0, Music_Route29_branch_f05b0
 ; f05bf
+
+
--- a/audio/music/route3.asm
+++ b/audio/music/route3.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Route3_Ch4
 ; ec2d6
 
-
 Music_Route3_Ch1: ; ec2d6
 	stereopanning $f
 	tempo 160
@@ -47,7 +46,6 @@
 	note E_, 1
 	note F#, 1
 	note G#, 1
-
 Music_Route3_branch_ec307: ; ec307
 	callchannel Music_Route3_branch_ec3a4
 	note G_, 1
@@ -210,7 +208,6 @@
 	note E_, 1
 	note C#, 1
 	note E_, 1
-
 Music_Route3_branch_ec3b1: ; ec3b1
 	note A_, 1
 	note E_, 1
@@ -221,7 +218,6 @@
 	note E_, 1
 	note C#, 1
 	note E_, 1
-
 Music_Route3_branch_ec3bd: ; ec3bd
 	note G_, 1
 	note D_, 1
@@ -239,6 +235,7 @@
 	octave 3
 	note D_, 1
 	endchannel
+; ec3d0
 
 Music_Route3_Ch2: ; ec3d0
 	stereopanning $f0
@@ -269,7 +266,6 @@
 	note C#, 1
 	note E_, 1
 	note G#, 1
-
 Music_Route3_branch_ec3f5: ; ec3f5
 	intensity $7d
 	callchannel Music_Route3_branch_ec443
@@ -357,6 +353,7 @@
 	note G_, 6
 	note D_, 1
 	endchannel
+; ec45b
 
 Music_Route3_Ch3: ; ec45b
 	stereopanning $ff
@@ -387,7 +384,6 @@
 	note __, 1
 	note G#, 2
 	callchannel Music_Route3_branch_ec4bd
-
 Music_Route3_branch_ec47f: ; ec47f
 	intensity $14
 	callchannel Music_Route3_branch_ec4bd
@@ -487,12 +483,12 @@
 	note G#, 2
 	note B_, 2
 	endchannel
+; ec4eb
 
 Music_Route3_Ch4: ; ec4eb
 	togglenoise $4
 	notetype $c
 	note __, 10
-
 Music_Route3_branch_ec4f0: ; ec4f0
 	notetype $c
 	note D_, 2
@@ -512,3 +508,5 @@
 	note C#, 1
 	loopchannel 0, Music_Route3_branch_ec4f0
 ; ec506
+
+
--- a/audio/music/route30.asm
+++ b/audio/music/route30.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Route30_Ch4
 ; efc0d
 
-
 Music_Route30_Ch1: ; efc0d
 	tempo 144
 	volume $77
@@ -28,7 +27,6 @@
 	note D_, 2
 	intensity $4e
 	note C_, 4
-
 Music_Route30_branch_efc2e: ; efc2e
 	intensity $b6
 	note D_, 6
@@ -185,6 +183,7 @@
 	octave 4
 	note D_, 2
 	loopchannel 0, Music_Route30_branch_efc2e
+; efcda
 
 Music_Route30_Ch2: ; efcda
 	dutycycle $3
@@ -208,7 +207,6 @@
 	note E_, 1
 	note F_, 1
 	note F#, 1
-
 Music_Route30_branch_efcf6: ; efcf6
 	intensity $c7
 	note G_, 10
@@ -297,6 +295,7 @@
 	octave 3
 	note F#, 2
 	loopchannel 0, Music_Route30_branch_efcf6
+; efd5f
 
 Music_Route30_Ch3: ; efd5f
 	notetype $c, $27
@@ -323,7 +322,6 @@
 	note __, 1
 	note G_, 1
 	note __, 1
-
 Music_Route30_branch_efd79: ; efd79
 	note G_, 1
 	note __, 1
@@ -579,6 +577,7 @@
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_Route30_branch_efd79
+; efe7a
 
 Music_Route30_Ch4: ; efe7a
 	togglenoise $3
@@ -585,7 +584,6 @@
 	notetype $c
 	callchannel Music_Route30_branch_efeb8
 	callchannel Music_Route30_branch_efec1
-
 Music_Route30_branch_efe84: ; efe84
 	callchannel Music_Route30_branch_efecd
 	callchannel Music_Route30_branch_efed7
@@ -679,3 +677,4 @@
 	notetype $c
 	endchannel
 ; efef5
+
--- a/audio/music/route36.asm
+++ b/audio/music/route36.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Route36_Ch4
 ; e94f5
 
-
 Music_Route36_Ch1: ; e94f5
 	tempo 144
 	volume $77
@@ -27,7 +26,6 @@
 	note A_, 1
 	intensity $5d
 	note A#, 4
-
 Music_Route36_branch_e9517: ; e9517
 	intensity $b5
 	note F_, 4
@@ -165,6 +163,7 @@
 	note D#, 2
 	note E_, 2
 	loopchannel 0, Music_Route36_branch_e9517
+; e95af
 
 Music_Route36_Ch2: ; e95af
 	dutycycle $3
@@ -189,7 +188,6 @@
 	note F_, 8
 	octave 3
 	note G_, 4
-
 Music_Route36_branch_e95ce: ; e95ce
 	intensity $c7
 	octave 4
@@ -313,6 +311,7 @@
 	note A_, 1
 	note B_, 1
 	loopchannel 0, Music_Route36_branch_e95ce
+; e966b
 
 Music_Route36_Ch3: ; e966b
 	notetype $c, $25
@@ -338,7 +337,6 @@
 	octave 3
 	note D#, 2
 	note E_, 2
-
 Music_Route36_branch_e9684: ; e9684
 	note F_, 4
 	note C_, 2
@@ -470,6 +468,7 @@
 	note D#, 2
 	note E_, 2
 	loopchannel 0, Music_Route36_branch_e9684
+; e9709
 
 Music_Route36_Ch4: ; e9709
 	togglenoise $1
@@ -476,7 +475,6 @@
 	notetype $c
 	callchannel Music_Route36_branch_e9734
 	callchannel Music_Route36_branch_e9741
-
 Music_Route36_branch_e9713: ; e9713
 	callchannel Music_Route36_branch_e9734
 	callchannel Music_Route36_branch_e973b
@@ -483,7 +481,6 @@
 	callchannel Music_Route36_branch_e9734
 	callchannel Music_Route36_branch_e9741
 	loopchannel 2, Music_Route36_branch_e9713
-
 Music_Route36_branch_e9723: ; e9723
 	note A#, 4
 	note A_, 2
@@ -529,3 +526,5 @@
 	notetype $c
 	endchannel
 ; e974f
+
+
--- a/audio/music/route37.asm
+++ b/audio/music/route37.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_Route37_Ch4
 ; ee957
 
-
 Music_Route37_Ch1: ; ee957
 	tempo 144
 	volume $77
@@ -15,7 +14,6 @@
 	notetype $c, $b3
 	note __, 16
 	note __, 16
-
 Music_Route37_branch_ee969: ; ee969
 	intensity $b3
 	note __, 2
@@ -70,7 +68,6 @@
 	note E_, 2
 	note D#, 4
 	stereopanning $f
-
 Music_Route37_branch_ee9a5: ; ee9a5
 	callchannel Music_Route37_branch_ee9da
 	octave 3
@@ -132,6 +129,7 @@
 	note B_, 2
 	intensity $b7
 	endchannel
+; ee9f8
 
 Music_Route37_Ch2: ; ee9f8
 	dutycycle $3
@@ -164,7 +162,6 @@
 	note B_, 1
 	intensity $c2
 	note B_, 2
-
 Music_Route37_branch_eea24: ; eea24
 	callchannel Music_Route37_branch_eeab7
 	intensity $c6
@@ -292,17 +289,16 @@
 	note F#, 2
 	note B_, 2
 	endchannel
+; eeac7
 
 Music_Route37_Ch3: ; eeac7
 	stereopanning $f0
 	notetype $c, $14
-
 Music_Route37_branch_eeacc: ; eeacc
 	octave 2
 	note F#, 2
 	note __, 6
 	loopchannel 4, Music_Route37_branch_eeacc
-
 Music_Route37_branch_eead3: ; eead3
 	callchannel Music_Route37_branch_eeb32
 	note A_, 2
@@ -315,7 +311,6 @@
 	note A_, 2
 	note F#, 2
 	note E_, 2
-
 Music_Route37_branch_eeae0: ; eeae0
 	note D#, 2
 	note F#, 2
@@ -335,7 +330,6 @@
 	octave 2
 	note A_, 2
 	callchannel Music_Route37_branch_eeb32
-
 Music_Route37_branch_eeafb: ; eeafb
 	octave 2
 	note B_, 2
@@ -342,7 +336,6 @@
 	octave 3
 	note D#, 2
 	loopchannel 4, Music_Route37_branch_eeafb
-
 Music_Route37_branch_eeb03: ; eeb03
 	octave 2
 	note A_, 2
@@ -352,7 +345,6 @@
 	note E_, 2
 	note C#, 2
 	callchannel Music_Route37_branch_eeb3c
-
 Music_Route37_branch_eeb10: ; eeb10
 	octave 2
 	note B_, 2
@@ -359,7 +351,6 @@
 	octave 3
 	note F#, 2
 	loopchannel 4, Music_Route37_branch_eeb10
-
 Music_Route37_branch_eeb18: ; eeb18
 	octave 2
 	note A_, 2
@@ -370,7 +361,6 @@
 	note C#, 2
 	callchannel Music_Route37_branch_eeb3c
 	callchannel Music_Route37_branch_eeb32
-
 Music_Route37_branch_eeb28: ; eeb28
 	note F#, 2
 	note __, 6
@@ -409,11 +399,11 @@
 	octave 3
 	note D#, 2
 	endchannel
+; eeb4d
 
 Music_Route37_Ch4: ; eeb4d
 	stereopanning $f
 	togglenoise $0
-
 Music_Route37_branch_eeb51: ; eeb51
 	notetype $c
 	callchannel Music_Route37_branch_eeb6b
@@ -446,3 +436,5 @@
 	note D#, 1
 	endchannel
 ; eeb75
+
+
--- a/audio/music/ruinsofalphinterior.asm
+++ b/audio/music/ruinsofalphinterior.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_RuinsOfAlphInterior_Ch3
 ; ebda7
 
-
 Music_RuinsOfAlphInterior_Ch1: ; ebda7
 	tempo 224
 	volume $77
@@ -20,7 +19,6 @@
 	dutycycle $0
 	stereopanning $f
 	notetype $c, $a4
-
 Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2
 	octave 4
 	note C_, 4
@@ -37,10 +35,10 @@
 	octave 3
 	note A#, 4
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
+; ebdd4
 
 Music_RuinsOfAlphInterior_Ch3: ; ebdd4
 	notetype $c, $10
-
 Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7
 	octave 2
 	note G#, 2
@@ -50,3 +48,5 @@
 	note __, 10
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7
 ; ebde1
+
+
--- a/audio/music/ruinsofalphradio.asm
+++ b/audio/music/ruinsofalphradio.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_RuinsOfAlphRadio_Ch3
 ; eedd4
 
-
 Music_RuinsOfAlphRadio_Ch1: ; eedd4
 	tempo 160
 	volume $77
@@ -12,7 +11,6 @@
 	tone $0118
 	vibrato $0, $f0
 	stereopanning $f0
-
 Music_RuinsOfAlphRadio_branch_eede3: ; eede3
 	notetype $6, $71
 	callchannel Music_RuinsOfAlphRadio_branch_eee01
@@ -50,11 +48,11 @@
 	octave 5
 	note C_, 8
 	endchannel
+; eee12
 
 Music_RuinsOfAlphRadio_Ch2: ; eee12
 	dutycycle $1
 	vibrato $1, $e0
-
 Music_RuinsOfAlphRadio_branch_eee17: ; eee17
 	stereopanning $f
 	notetype $6, $81
@@ -67,10 +65,10 @@
 	notetype $c, $a1
 	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17
+; eee32
 
 Music_RuinsOfAlphRadio_Ch3: ; eee32
 	notetype $6, $26
-
 Music_RuinsOfAlphRadio_branch_eee35: ; eee35
 	octave 2
 	note C_, 1
@@ -79,3 +77,5 @@
 	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35
 ; eee3e
+
+
--- a/audio/music/showmearound.asm
+++ b/audio/music/showmearound.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_ShowMeAround_Ch4
 ; edbe4
 
-
 Music_ShowMeAround_Ch1: ; edbe4
 	tempo 144
 	volume $77
@@ -29,7 +28,6 @@
 	note D_, 1
 	note E_, 1
 	note G#, 8
-
 Music_ShowMeAround_branch_edc01: ; edc01
 	note __, 16
 	note __, 16
@@ -88,7 +86,6 @@
 	note D_, 1
 	note E_, 8
 	dutycycle $1
-
 Music_ShowMeAround_branch_edc44: ; edc44
 	callchannel Music_ShowMeAround_branch_edc98
 	callchannel Music_ShowMeAround_branch_edc98
@@ -185,6 +182,7 @@
 	note B_, 1
 	note __, 1
 	endchannel
+; edca9
 
 Music_ShowMeAround_Ch3: ; edca9
 	stereopanning $f0
@@ -228,7 +226,6 @@
 	note F_, 1
 	note E_, 2
 	intensity $14
-
 Music_ShowMeAround_branch_edcd9: ; edcd9
 	callchannel Music_ShowMeAround_branch_edcef
 	callchannel Music_ShowMeAround_branch_edcef
@@ -308,6 +305,7 @@
 	note A_, 2
 	note __, 6
 	endchannel
+; edd30
 
 Music_ShowMeAround_Ch4: ; edd30
 	togglenoise $3
@@ -317,7 +315,6 @@
 	note D_, 2
 	note D#, 2
 	note F#, 4
-
 Music_ShowMeAround_branch_edd39: ; edd39
 	callchannel Music_ShowMeAround_branch_edd4f
 	callchannel Music_ShowMeAround_branch_edd4f
@@ -363,3 +360,5 @@
 	note F#, 2
 	endchannel
 ; edd6d
+
+
--- a/audio/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_SproutTower_Ch4
 ; f6980
 
-
 Music_SproutTower_Ch1: ; f6980
 	tempo 176
 	volume $77
@@ -16,7 +15,6 @@
 	notetype $c, $a3
 	note __, 16
 	note __, 16
-
 Music_SproutTower_branch_f6994: ; f6994
 	note __, 6
 	octave 3
@@ -63,6 +61,7 @@
 	note D#, 4
 	note D#, 4
 	loopchannel 0, Music_SproutTower_branch_f6994
+; f69c8
 
 Music_SproutTower_Ch2: ; f69c8
 	dutycycle $3
@@ -78,7 +77,6 @@
 	note F_, 4
 	note D#, 4
 	note D#, 4
-
 Music_SproutTower_branch_f69dc: ; f69dc
 	intensity $b5
 	octave 4
@@ -141,6 +139,7 @@
 	note C_, 16
 	note __, 16
 	loopchannel 0, Music_SproutTower_branch_f69dc
+; f6a25
 
 Music_SproutTower_Ch3: ; f6a25
 	vibrato $14, $e8
@@ -163,7 +162,6 @@
 	note __, 2
 	note F#, 2
 	stereopanning $f0
-
 Music_SproutTower_branch_f6a3e: ; f6a3e
 	note __, 4
 	note C_, 2
@@ -222,12 +220,12 @@
 	note __, 2
 	note F_, 2
 	loopchannel 0, Music_SproutTower_branch_f6a3e
+; f6a7a
 
 Music_SproutTower_Ch4: ; f6a7a
 	togglenoise $0
 	notetype $c
 	note __, 4
-
 Music_SproutTower_branch_f6a7f: ; f6a7f
 	note F#, 4
 	stereopanning $f0
@@ -247,3 +245,5 @@
 	note F#, 4
 	loopchannel 0, Music_SproutTower_branch_f6a7f
 ; f6a99
+
+
--- a/audio/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_SSAqua_Ch4
 ; eada5
 
-
 Music_SSAqua_Ch1: ; eada5
 	tempo 117
 	volume $77
@@ -19,7 +18,6 @@
 	note __, 1
 	note G_, 1
 	note __, 1
-
 Music_SSAqua_branch_eadbc: ; eadbc
 	octave 2
 	note G_, 16
@@ -258,7 +256,6 @@
 	vibrato $8, $33
 	notetype $c, $b7
 	note __, 2
-
 Music_SSAqua_branch_eaed5: ; eaed5
 	notetype $c, $b7
 	dutycycle $1
@@ -610,6 +607,7 @@
 	octave 3
 	note G_, 1
 	endchannel
+; eb056
 
 Music_SSAqua_Ch3: ; eb056
 	stereopanning $ff
@@ -620,7 +618,6 @@
 	note __, 1
 	note G_, 1
 	note __, 1
-
 Music_SSAqua_branch_eb063: ; eb063
 	note G_, 16
 	note __, 8
@@ -654,7 +651,6 @@
 	note E_, 1
 	callchannel Music_SSAqua_branch_eb14d
 	callchannel Music_SSAqua_branch_eb14d
-
 Music_SSAqua_branch_eb08d: ; eb08d
 	note G_, 2
 	note __, 2
@@ -1093,12 +1089,12 @@
 	note D#, 1
 	note __, 3
 	endchannel
+; eb249
 
 Music_SSAqua_Ch4: ; eb249
 	togglenoise $3
 	notetype $c
 	note __, 2
-
 Music_SSAqua_branch_eb24e: ; eb24e
 	note G#, 1
 	note G_, 1
@@ -1189,3 +1185,5 @@
 	note C_, 2
 	endchannel
 ; eb2d3
+
+
--- a/audio/music/successfulcapture.asm
+++ b/audio/music/successfulcapture.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_SuccessfulCapture_Ch3
 ; f460b
 
-
 Music_SuccessfulCapture_Ch1: ; f460b
 	tempo 126
 	volume $77
@@ -12,6 +11,7 @@
 	tone $0001
 	notetype $c, $a1
 	jumpchannel Music_SuccessfulCapture_branch_f4536
+; f461b
 
 Music_SuccessfulCapture_Ch2: ; f461b
 	vibrato $12, $24
@@ -18,8 +18,11 @@
 	notetype $c, $c1
 	dutycycle $2
 	jumpchannel Music_SuccessfulCapture_branch_f4585
+; f4626
 
 Music_SuccessfulCapture_Ch3: ; f4626
 	notetype $c, $25
 	jumpchannel Music_SuccessfulCapture_branch_f45cf
 ; f462c
+
+
--- a/audio/music/suicunebattle.asm
+++ b/audio/music/suicunebattle.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_SuicuneBattle_Ch3
 ; 178b8a
 
-
 Music_SuicuneBattle_Ch1: ; 178b8a
 	tempo 101
 	volume $77
@@ -96,7 +95,6 @@
 	octave 3
 	note E_, 1
 	note G#, 1
-
 Music_SuicuneBattle_branch_178bfc: ; 178bfc
 	notetype $c, $b4
 	octave 2
@@ -513,6 +511,7 @@
 	vibrato $12, $15
 	dutycycle $3
 	loopchannel 0, Music_SuicuneBattle_branch_178bfc
+; 178dec
 
 Music_SuicuneBattle_Ch2: ; 178dec
 	dutycycle $3
@@ -592,7 +591,6 @@
 	note E_, 8
 	note E_, 8
 	note E_, 4
-
 Music_SuicuneBattle_branch_178e4e: ; 178e4e
 	notetype $c, $c7
 	octave 3
@@ -1189,6 +1187,7 @@
 	note A_, 2
 	note B_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_178e4e
+; 179122
 
 Music_SuicuneBattle_Ch3: ; 179122
 	notetype $c, $18
@@ -1283,7 +1282,6 @@
 	note D_, 2
 	note E_, 2
 	notetype $c, $16
-
 Music_SuicuneBattle_branch_179182: ; 179182
 	octave 1
 	note A_, 2
@@ -2060,3 +2058,5 @@
 	note E_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_179182
 ; 17948b
+
+
--- a/audio/music/surf.asm
+++ b/audio/music/surf.asm
@@ -4,14 +4,15 @@
 	dbw $02, Music_Surf_Ch3
 ; f5193
 
+
 INCBIN "baserom.gbc", $f5193, $f5194 - $f5193
 
+
 Music_Surf_Ch1: ; f5194
 	tempo 108
 	volume $77
 	notetype $c, $a7
 	stereopanning $f
-
 Music_Surf_branch_f519e: ; f519e
 	dutycycle $2
 	vibrato $10, $24
@@ -342,15 +343,14 @@
 	octave 2
 	note B_, 8
 	endchannel
+; f5317
 
 Music_Surf_Ch2: ; f5317
-
 Music_Surf_branch_f5317: ; f5317
 	notetype $c, $c2
 	stereopanning $f0
 	dutycycle $2
 	vibrato $14, $23
-
 Music_Surf_branch_f5321: ; f5321
 	octave 1
 	note A#, 4
@@ -367,7 +367,6 @@
 	note __, 3
 	note A#, 1
 	note __, 3
-
 Music_Surf_branch_f5333: ; f5333
 	note D#, 4
 	note G_, 2
@@ -554,9 +553,9 @@
 	note G#, 8
 	note D#, 8
 	endchannel
+; f540c
 
 Music_Surf_Ch3: ; f540c
-
 Music_Surf_branch_f540c: ; f540c
 	stereopanning $ff
 	notetype $c, $15
@@ -736,3 +735,5 @@
 	note __, 3
 	endchannel
 ; f54e8
+
+
--- a/audio/music/tintower.asm
+++ b/audio/music/tintower.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_TinTower_Ch4
 ; f681d
 
-
 Music_TinTower_Ch1: ; f681d
 	tempo 208
 	volume $77
@@ -12,7 +11,6 @@
 	dutycycle $3
 	tone $0004
 	vibrato $8, $45
-
 Music_TinTower_branch_f682a: ; f682a
 	stereopanning $f0
 	notetype $c, $a5
@@ -97,15 +95,14 @@
 	octave 3
 	note A#, 4
 	loopchannel 0, Music_TinTower_branch_f682a
+; f688b
 
 Music_TinTower_Ch2: ; f688b
 	dutycycle $3
 	tone $0002
 	vibrato $18, $44
-
 Music_TinTower_branch_f6893: ; f6893
 	stereopanning $ff
-
 Music_TinTower_branch_f6895: ; f6895
 	notetype $c, $b5
 	octave 4
@@ -188,10 +185,10 @@
 	intensity $95
 	note C#, 2
 	loopchannel 0, Music_TinTower_branch_f6893
+; f68f8
 
 Music_TinTower_Ch3: ; f68f8
 	notetype $c, $14
-
 Music_TinTower_branch_f68fb: ; f68fb
 	note __, 16
 	note __, 16
@@ -263,11 +260,11 @@
 	note __, 11
 	stereopanning $ff
 	loopchannel 0, Music_TinTower_branch_f68fb
+; f6948
 
 Music_TinTower_Ch4: ; f6948
 	togglenoise $0
 	notetype $c
-
 Music_TinTower_branch_f694c: ; f694c
 	stereopanning $f
 	note G_, 2
@@ -297,3 +294,5 @@
 	note F_, 2
 	loopchannel 0, Music_TinTower_branch_f694c
 ; f6974
+
+
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_TitleScreen_Ch4
 ; eb814
 
-
 Music_TitleScreen_Ch1: ; eb814
 	tempo 134
 	volume $77
@@ -278,7 +277,6 @@
 Music_TitleScreen_branch_eb96d: ; eb96d
 	notetype $c, $c3
 	note D_, 1
-
 Music_TitleScreen_branch_eb971: ; eb971
 	note __, 1
 	octave 2
@@ -294,6 +292,7 @@
 	note A_, 1
 	notetype $8, $b7
 	endchannel
+; eb984
 
 Music_TitleScreen_Ch2: ; eb984
 	dutycycle $3
@@ -562,7 +561,6 @@
 Music_TitleScreen_branch_ebae7: ; ebae7
 	notetype $c, $b2
 	note D_, 1
-
 Music_TitleScreen_branch_ebaeb: ; ebaeb
 	octave 3
 	note A_, 1
@@ -581,6 +579,7 @@
 	note C_, 4
 	note C_, 4
 	endchannel
+; ebb01
 
 Music_TitleScreen_Ch3: ; ebb01
 	stereopanning $f
@@ -897,6 +896,7 @@
 	note G_, 1
 	note __, 11
 	endchannel
+; ebc5c
 
 Music_TitleScreen_Ch4: ; ebc5c
 	togglenoise $5
@@ -1081,7 +1081,6 @@
 	note C#, 1
 	notetype $c
 	note G#, 16
-
 Music_TitleScreen_branch_ebd40: ; ebd40
 	note __, 16
 	loopchannel 6, Music_TitleScreen_branch_ebd40
@@ -1178,3 +1177,5 @@
 	note C_, 4
 	endchannel
 ; ebd9e
+
+
--- a/audio/music/trainervictory.asm
+++ b/audio/music/trainervictory.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_TrainerVictory_Ch3
 ; ebeb4
 
-
 Music_TrainerVictory_Ch1: ; ebeb4
 	tempo 120
 	volume $77
@@ -21,7 +20,6 @@
 	intensity $b6
 	note A_, 12
 	stereopanning $f
-
 Music_TrainerVictory_branch_ebecd: ; ebecd
 	intensity $72
 	callchannel Music_TrainerVictory_branch_ebf11
@@ -50,7 +48,6 @@
 	note __, 2
 	note G_, 2
 	note A#, 6
-
 Music_TrainerVictory_branch_ebef2: ; ebef2
 	intensity $72
 	octave 4
@@ -63,7 +60,6 @@
 	note A_, 2
 	octave 4
 	note D_, 2
-
 Music_TrainerVictory_branch_ebf01: ; ebf01
 	octave 4
 	note C#, 2
@@ -88,6 +84,7 @@
 	note E_, 2
 	note G_, 6
 	endchannel
+; ebf1b
 
 Music_TrainerVictory_Ch2: ; ebf1b
 	vibrato $12, $34
@@ -104,7 +101,6 @@
 	intensity $d6
 	note D_, 12
 	stereopanning $f0
-
 Music_TrainerVictory_branch_ebf30: ; ebf30
 	notetype $8, $82
 	callchannel Music_TrainerVictory_branch_ebf56
@@ -147,6 +143,7 @@
 	octave 4
 	note E_, 6
 	endchannel
+; ebf64
 
 Music_TrainerVictory_Ch3: ; ebf64
 	notetype $8, $25
@@ -163,7 +160,6 @@
 	note C#, 2
 	octave 2
 	note B_, 2
-
 Music_TrainerVictory_branch_ebf74: ; ebf74
 	callchannel Music_TrainerVictory_branch_ebfb1
 	octave 3
@@ -238,3 +234,4 @@
 	note B_, 2
 	endchannel
 ; ebfc3
+
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_UnionCave_Ch4
 ; f5c6c
 
-
 Music_UnionCave_Ch1: ; f5c6c
 	tempo 160
 	volume $77
@@ -13,14 +12,11 @@
 	tone $0002
 	vibrato $18, $34
 	stereopanning $f
-
 Music_UnionCave_branch_f5c7b: ; f5c7b
 	notetype $c, $b3
-
 Music_UnionCave_branch_f5c7e: ; f5c7e
 	callchannel Music_UnionCave_branch_f5ccf
 	loopchannel 4, Music_UnionCave_branch_f5c7e
-
 Music_UnionCave_branch_f5c85: ; f5c85
 	octave 2
 	note G#, 2
@@ -31,7 +27,6 @@
 	note E_, 2
 	note F_, 4
 	loopchannel 8, Music_UnionCave_branch_f5c85
-
 Music_UnionCave_branch_f5c91: ; f5c91
 	octave 2
 	note A_, 2
@@ -78,11 +73,11 @@
 	note C#, 2
 	note E_, 12
 	endchannel
+; f5cd5
 
 Music_UnionCave_Ch2: ; f5cd5
 	dutycycle $3
 	vibrato $8, $24
-
 Music_UnionCave_branch_f5cda: ; f5cda
 	notetype $c, $c4
 	callchannel Music_UnionCave_branch_f5d34
@@ -182,11 +177,11 @@
 	note C#, 2
 	note E_, 12
 	endchannel
+; f5d58
 
 Music_UnionCave_Ch3: ; f5d58
 	notetype $c, $16
 	stereopanning $f0
-
 Music_UnionCave_branch_f5d5d: ; f5d5d
 	note __, 16
 	loopchannel 7, Music_UnionCave_branch_f5d5d
@@ -193,7 +188,6 @@
 	note __, 14
 	octave 4
 	note C_, 2
-
 Music_UnionCave_branch_f5d65: ; f5d65
 	note __, 2
 	octave 3
@@ -206,7 +200,6 @@
 	octave 4
 	note C_, 2
 	loopchannel 4, Music_UnionCave_branch_f5d65
-
 Music_UnionCave_branch_f5d73: ; f5d73
 	note __, 2
 	octave 3
@@ -231,7 +224,6 @@
 	octave 3
 	note B_, 8
 	note A#, 8
-
 Music_UnionCave_branch_f5d8d: ; f5d8d
 	note A_, 4
 	note G_, 4
@@ -245,16 +237,15 @@
 	note A_, 4
 	note G_, 4
 	note A#, 8
-
 Music_UnionCave_branch_f5d9c: ; f5d9c
 	note __, 16
 	loopchannel 4, Music_UnionCave_branch_f5d9c
 	loopchannel 0, Music_UnionCave_branch_f5d5d
+; f5da5
 
 Music_UnionCave_Ch4: ; f5da5
 	togglenoise $1
 	notetype $c
-
 Music_UnionCave_branch_f5da9: ; f5da9
 	stereopanning $f0
 	note E_, 4
@@ -273,4 +264,8 @@
 	loopchannel 0, Music_UnionCave_branch_f5da9
 ; f5dc1
 
+
 INCBIN "baserom.gbc", $f5dc1, $f5dc5 - $f5dc1
+
+
+
--- a/audio/music/vermilioncity.asm
+++ b/audio/music/vermilioncity.asm
@@ -4,8 +4,10 @@
 	dbw $02, Music_VermilionCity_Ch3
 ; eb67f
 
+
 INCBIN "baserom.gbc", $eb67f, $eb680 - $eb67f
 
+
 Music_VermilionCity_Ch1: ; eb680
 	stereopanning $f
 	tempo 176
@@ -30,7 +32,6 @@
 	octave 5
 	note D_, 1
 	vibrato $10, $23
-
 Music_VermilionCity_branch_eb6a0: ; eb6a0
 	dutycycle $1
 	notetype $c, $85
@@ -141,6 +142,7 @@
 	note B_, 2
 	note G#, 2
 	endchannel
+; eb721
 
 Music_VermilionCity_Ch2: ; eb721
 	stereopanning $ff
@@ -157,7 +159,6 @@
 	note E_, 4
 	note F#, 4
 	note G#, 4
-
 Music_VermilionCity_branch_eb735: ; eb735
 	notetype $c, $97
 	callchannel Music_VermilionCity_branch_eb768
@@ -227,6 +228,7 @@
 	note F#, 4
 	note E_, 4
 	endchannel
+; eb785
 
 Music_VermilionCity_Ch3: ; eb785
 	stereopanning $f0
@@ -249,7 +251,6 @@
 	note D_, 1
 	octave 2
 	note B_, 1
-
 Music_VermilionCity_branch_eb79e: ; eb79e
 	notetype $c, $22
 	callchannel Music_VermilionCity_branch_eb7de
@@ -347,3 +348,5 @@
 	note C#, 1
 	endchannel
 ; eb808
+
+
--- a/audio/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_VictoryRoad_Ch4
 ; f6c7e
 
-
 Music_VictoryRoad_Ch1: ; f6c7e
 	tempo 144
 	volume $77
@@ -13,11 +12,9 @@
 	dutycycle $3
 	tone $0002
 	notetype $c, $b3
-
 Music_VictoryRoad_branch_f6c8d: ; f6c8d
 	callchannel Music_VictoryRoad_branch_f6cb9
 	loopchannel 6, Music_VictoryRoad_branch_f6c8d
-
 Music_VictoryRoad_branch_f6c94: ; f6c94
 	intensity $b2
 	octave 2
@@ -40,7 +37,6 @@
 	octave 3
 	note G#, 3
 	loopchannel 2, Music_VictoryRoad_branch_f6c94
-
 Music_VictoryRoad_branch_f6cae: ; f6cae
 	callchannel Music_VictoryRoad_branch_f6cb9
 	loopchannel 2, Music_VictoryRoad_branch_f6cae
@@ -67,11 +63,11 @@
 	octave 3
 	note F#, 3
 	endchannel
+; f6cce
 
 Music_VictoryRoad_Ch2: ; f6cce
 	dutycycle $3
 	vibrato $10, $24
-
 Music_VictoryRoad_branch_f6cd3: ; f6cd3
 	notetype $c, $c2
 	callchannel Music_VictoryRoad_branch_f6d1e
@@ -140,15 +136,14 @@
 	note A_, 1
 	note A_, 1
 	endchannel
+; f6d2c
 
 Music_VictoryRoad_Ch3: ; f6d2c
 	stereopanning $f0
 	notetype $c, $28
-
 Music_VictoryRoad_branch_f6d31: ; f6d31
 	callchannel Music_VictoryRoad_branch_f6d52
 	loopchannel 6, Music_VictoryRoad_branch_f6d31
-
 Music_VictoryRoad_branch_f6d38: ; f6d38
 	note D_, 1
 	note __, 1
@@ -162,7 +157,6 @@
 	note D_, 1
 	note B_, 3
 	loopchannel 2, Music_VictoryRoad_branch_f6d38
-
 Music_VictoryRoad_branch_f6d47: ; f6d47
 	callchannel Music_VictoryRoad_branch_f6d52
 	loopchannel 2, Music_VictoryRoad_branch_f6d47
@@ -183,11 +177,11 @@
 	note C_, 1
 	note A_, 3
 	endchannel
+; f6d5f
 
 Music_VictoryRoad_Ch4: ; f6d5f
 	togglenoise $0
 	notetype $c
-
 Music_VictoryRoad_branch_f6d63: ; f6d63
 	note D_, 2
 	note D_, 2
@@ -209,3 +203,5 @@
 	note D#, 1
 	loopchannel 0, Music_VictoryRoad_branch_f6d63
 ; f6d79
+
+
--- a/audio/music/violetcity.asm
+++ b/audio/music/violetcity.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_VioletCity_Ch4
 ; f000c
 
-
 Music_VioletCity_Ch1: ; f000c
 	tempo 164
 	volume $77
@@ -66,7 +65,6 @@
 	octave 3
 	note C#, 12
 	note __, 8
-
 Music_VioletCity_branch_f0056: ; f0056
 	notetype $6, $95
 	note __, 4
@@ -298,6 +296,7 @@
 	note C#, 4
 	note __, 4
 	loopchannel 0, Music_VioletCity_branch_f0056
+; f0162
 
 Music_VioletCity_Ch2: ; f0162
 	vibrato $12, $24
@@ -350,7 +349,6 @@
 	note __, 2
 	note D#, 1
 	note E_, 1
-
 Music_VioletCity_branch_f0199: ; f0199
 	intensity $b7
 	note F#, 4
@@ -505,6 +503,7 @@
 	note D#, 1
 	note E_, 1
 	loopchannel 0, Music_VioletCity_branch_f0199
+; f0247
 
 Music_VioletCity_Ch3: ; f0247
 	notetype $c, $25
@@ -531,7 +530,6 @@
 	note F#, 2
 	octave 2
 	note A#, 2
-
 Music_VioletCity_branch_f0261: ; f0261
 	notetype $c, $25
 	note B_, 1
@@ -710,6 +708,7 @@
 	octave 2
 	note A_, 4
 	endchannel
+; f031e
 
 Music_VioletCity_Ch4: ; f031e
 	togglenoise $3
@@ -730,7 +729,6 @@
 	note D_, 2
 	note C_, 8
 	note D#, 2
-
 Music_VioletCity_branch_f0338: ; f0338
 	callchannel Music_VioletCity_branch_f037a
 	callchannel Music_VioletCity_branch_f037a
@@ -782,3 +780,5 @@
 	note D#, 2
 	endchannel
 ; f0386
+
+
--- a/audio/music/viridiancity.asm
+++ b/audio/music/viridiancity.asm
@@ -5,7 +5,6 @@
 	dbw $03, Music_ViridianCity_Ch4
 ; f400c
 
-
 Music_ViridianCity_Ch1: ; f400c
 	tempo 157
 	volume $77
@@ -43,7 +42,6 @@
 	note __, 4
 	note G_, 8
 	note __, 4
-
 Music_ViridianCity_branch_f4039: ; f4039
 	callchannel Music_ViridianCity_branch_f40c5
 	note __, 4
@@ -274,6 +272,7 @@
 	note G_, 1
 	note __, 1
 	endchannel
+; f4125
 
 Music_ViridianCity_Ch2: ; f4125
 	vibrato $10, $46
@@ -309,7 +308,6 @@
 	note __, 4
 	note E_, 8
 	note __, 4
-
 Music_ViridianCity_branch_f414c: ; f414c
 	callchannel Music_ViridianCity_branch_f41c0
 	note __, 4
@@ -514,6 +512,7 @@
 	note D_, 2
 	note D#, 2
 	endchannel
+; f421e
 
 Music_ViridianCity_Ch3: ; f421e
 	vibrato $12, $24
@@ -551,7 +550,6 @@
 	note D_, 8
 	note F#, 2
 	note G_, 2
-
 Music_ViridianCity_branch_f4246: ; f4246
 	intensity $13
 	callchannel Music_ViridianCity_branch_f42a2
@@ -698,6 +696,7 @@
 	note __, 4
 	note D_, 8
 	endchannel
+; f42df
 
 Music_ViridianCity_Ch4: ; f42df
 	togglenoise $3
@@ -704,7 +703,6 @@
 	notetype $c
 	callchannel Music_ViridianCity_branch_f431d
 	callchannel Music_ViridianCity_branch_f432c
-
 Music_ViridianCity_branch_f42e9: ; f42e9
 	callchannel Music_ViridianCity_branch_f431d
 	callchannel Music_ViridianCity_branch_f431d
@@ -798,3 +796,5 @@
 	note F#, 2
 	endchannel
 ; f435b
+
+
--- a/audio/music/wildpokemonvictory.asm
+++ b/audio/music/wildpokemonvictory.asm
@@ -4,7 +4,6 @@
 	dbw $02, Music_WildPokemonVictory_Ch3
 ; f4521
 
-
 Music_WildPokemonVictory_Ch1: ; f4521
 	tempo 126
 	volume $77
@@ -18,10 +17,8 @@
 	note F#, 1
 	intensity $b6
 	note E_, 12
-
 Music_SuccessfulCapture_branch_f4536: ; f4536
 	stereopanning $f
-
 Music_WildPokemonVictory_branch_f4538: ; f4538
 	callchannel Music_WildPokemonVictory_branch_f455c
 	note F#, 2
@@ -71,6 +68,7 @@
 	note E_, 2
 	note A_, 2
 	endchannel
+; f4575
 
 Music_WildPokemonVictory_Ch2: ; f4575
 	vibrato $12, $24
@@ -83,10 +81,8 @@
 	note A_, 1
 	intensity $d6
 	note B_, 12
-
 Music_SuccessfulCapture_branch_f4585: ; f4585
 	stereopanning $f0
-
 Music_WildPokemonVictory_branch_f4587: ; f4587
 	callchannel Music_WildPokemonVictory_branch_f45b5
 	octave 4
@@ -136,6 +132,7 @@
 	note C#, 2
 	note C#, 4
 	endchannel
+; f45c4
 
 Music_WildPokemonVictory_Ch3: ; f45c4
 	notetype $c, $20
@@ -147,9 +144,7 @@
 	note __, 3
 	note E_, 1
 	note __, 3
-
 Music_SuccessfulCapture_branch_f45cf: ; f45cf
-
 Music_WildPokemonVictory_branch_f45cf: ; f45cf
 	callchannel Music_WildPokemonVictory_branch_f45f4
 	note D#, 2
@@ -192,3 +187,5 @@
 	note C#, 2
 	endchannel
 ; f4602
+
+