Remove address comments

Regex patterns used:
 ; [0-9a-f]{1,5} \([0-9a-f]{1,2}:[0-9a-f]{1,4}\)
 ; [0-9a-f]{1,2}:[0-9a-f]{4}
 ; [0-9a-f]{4,5}

 ;[0-9a-f]{4,5}
 ;[0-9a-f]{1,2}:[0-9a-f]{1,4}

14 files changed, 82 insertions, 82 deletions

diff --git a/audio/engine.asm b/audio/engine.asm
index 3fb4337..157734c 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/engine.asm@Audio", ROMX
 
-_DisableAudio:: ; 3a:4000
+_DisableAudio::
 	push hl
 	push de
 	push bc
@@ -47,7 +47,7 @@ _DisableAudio:: ; 3a:4000
 	pop hl
 	ret
 
-_UpdateSound:: ; 3a:4037
+_UpdateSound::
 ; Called once per frame
 	xor a
 	ld [wCurChannel], a
@@ -77,7 +77,7 @@ _UpdateSound:: ; 3a:4037
 	call Functione82f0
 	ret
 
-UpdateChannel: ; 3a:4061
+UpdateChannel:
 	; Get the note's duration
 	ld hl, CHANNEL_NOTE_DURATION
 	add hl, bc
@@ -100,13 +100,13 @@ UpdateChannel: ; 3a:4061
 	call Functione80b6
 	ret
 
-DisablePitchWheel: ; 3a:4061
+DisablePitchWheel:
 	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	res SOUND_PITCH_WHEEL, [hl]
 	ret
 
-Unreferenced_Functione8081: ; 3a:4081
+Unreferenced_Functione8081:
 	ld a, [wMapMusic]
 	bit 0, a
 	jr nz, .disable_music
@@ -140,7 +140,7 @@ Unreferenced_Functione8081: ; 3a:4081
 	scf
 	ret
 
-GetChannelRegisters: ; 3a:40a4
+GetChannelRegisters:
 	ld a, [wCurChannel]
 	ld e, a
 	ld d, $00
@@ -153,7 +153,7 @@ GetChannelRegisters: ; 3a:40a4
 .registers
 	db LOW(rNR10), LOW(rNR20), LOW(rNR30), LOW(rNR40)
 
-Functione80b6: ; 3a:40b6
+Functione80b6:
 	ld hl, CHANNEL_DUTY_CYCLE
 	add hl, bc
 	ld a, [hl]
@@ -192,7 +192,7 @@ Functione80b6: ; 3a:40b6
 	ld [hl], a
 	ret
 
-Functione80fa: ; 3a:40fa
+Functione80fa:
 	ld hl, .jumptable
 	ld a, [wCurChannel]
 	maskbits NUM_CHANNELS
@@ -209,7 +209,7 @@ Functione80fa: ; 3a:40fa
 	; TODO
 
 SECTION "audio/engine.asm@IsChannelSFXOn", ROMX
-IsChannelSFXOn: ; 3a:42bd
+IsChannelSFXOn:
 	; If it's not a valid channel, return
 	ld a, [wCurChannel]
 	cp NUM_MUSIC_CHANS
@@ -228,7 +228,7 @@ IsChannelSFXOn: ; 3a:42bd
 	scf
 	ret
 
-IsAnySFXOn: ; 3a:42d0
+IsAnySFXOn:
 	ld hl, wChannel5Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr nz, .on
@@ -250,7 +250,7 @@ IsAnySFXOn: ; 3a:42d0
 	ret
 
 SECTION "audio/engine.asm@Functione82f0", ROMX
-Functione82f0: ; 3a:42f0
+Functione82f0:
 	call IncrementTempo
 	call PlayDanger
 	call FadeMusic
@@ -261,7 +261,7 @@ Functione82f0: ; 3a:42f0
 	ld [rNR51], a
 	ret
 
-PlayDanger: ; 3a:4307
+PlayDanger:
 	ld a, [wLowHealthAlarm]
 	bit DANGER_ON_F, a
 	ret z
@@ -318,19 +318,19 @@ PlayDanger: ; 3a:4307
 	ld [wSoundOutput], a
 	ret
 
-DangerSoundHigh: ; 3a:434a
+DangerSoundHigh:
 	db $80 ; duty 50%
 	db $e2 ; volume 14, envelope decrease sweep 2
 	db $50 ; frequency: $750
 	db $87 ; restart sound
 
-DangerSoundLow: ; 3a:434e
+DangerSoundLow:
 	db $80 ; duty 50%
 	db $e2 ; volume 14, envelope decrease sweep 2
 	db $ee ; frequency: $6ee
 	db $86 ; restart sound
 
-IncrementTempo: ; 3a:4352
+IncrementTempo:
 	call IsAnyChannelOn
 	ret c
 
@@ -371,7 +371,7 @@ IncrementTempo: ; 3a:4352
 	pop de
 	ret
 
-IsAnyChannelOn: ; 3a:438e
+IsAnyChannelOn:
 ; Check if any music channel is on and isn't on the last frame
 
 	ld hl, wChannel1Flags1
@@ -421,7 +421,7 @@ IsAnyChannelOn: ; 3a:438e
 	scf
 	ret
 
-FadeMusic: ; 3a:43ce
+FadeMusic:
 ; Fade music if applicable
 ; usage:
 ;	write to wMusicFade
@@ -504,7 +504,7 @@ FadeMusic: ; 3a:43ce
 
 SECTION "audio/engine.asm@Audio engine, part 2", ROMX
 
-SetGlobalTempo: ; 3a:4cee
+SetGlobalTempo:
 	push bc
 	ld a, [wCurChannel]
 	cp CHAN5
@@ -533,7 +533,7 @@ SetGlobalTempo: ; 3a:4cee
 	pop bc
 	ret
 
-Tempo: ; 3a:4d2a
+Tempo:
 	ld hl, CHANNEL_TEMPO
 	add hl, bc
 	ld [hl], e
@@ -546,7 +546,7 @@ Tempo: ; 3a:4d2a
 	ret
 
 
-StartChannel: ; 3a:4d38
+StartChannel:
 	call SetLRTracks
 	ld hl, CHANNEL_FLAGS1
 	add hl, bc
@@ -554,7 +554,7 @@ StartChannel: ; 3a:4d38
 	ret
 
 
-StopChannel: ; 3a:4d42
+StopChannel:
 	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	res SOUND_CHANNEL_ON, [hl]
@@ -567,7 +567,7 @@ StopChannel: ; 3a:4d42
 	ret
 
 
-SetLRTracks: ; 3a:4d51
+SetLRTracks:
 	push de
 	ld a, [wCurChannel]
 	maskbits NUM_MUSIC_CHANS
@@ -583,7 +583,7 @@ SetLRTracks: ; 3a:4d51
 	ret
 
 
-_PlayMusic:: ; 3a:4d66
+_PlayMusic::
 	ld hl, wMusicID
 	ld [hl], e
 	inc hl
diff --git a/audio/songs/bicycle.asm b/audio/songs/bicycle.asm
index 4f459e3..65c0f0b 100755
--- a/audio/songs/bicycle.asm
+++ b/audio/songs/bicycle.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/bicycle.asm", ROMX
 
-Song_Bicycle:: ; ed63e (3b:563e)
+Song_Bicycle::
 	db 3 << 6 | 0
 	dw Song_Bicycle_Ch0
 	db 1
@@ -12,7 +12,7 @@ Song_Bicycle:: ; ed63e (3b:563e)
 	db 3
 	dw Song_Bicycle_Ch3
 
-Song_Bicycle_Ch0:: ; ed64a (3b:564a)
+Song_Bicycle_Ch0::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -171,7 +171,7 @@ Song_Bicycle_branch_ed659::
 	loopchannel 0, Song_Bicycle_branch_ed659
 
 
-Song_Bicycle_Ch1:: ; ed70d (3b:570d)
+Song_Bicycle_Ch1::
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 3
@@ -320,7 +320,7 @@ Song_Bicycle_branch_ed717::
 	loopchannel 0, Song_Bicycle_branch_ed717
 
 
-Song_Bicycle_Ch2:: ; ed7c5 (3b:57c5)
+Song_Bicycle_Ch2::
 	notetype 12, 1, 3
 	rest 2
 
@@ -661,7 +661,7 @@ Song_Bicycle_branch_ed7c9::
 	loopchannel 0, Song_Bicycle_branch_ed7c9
 
 
-Song_Bicycle_Ch3:: ; ed91a (3b:591a)
+Song_Bicycle_Ch3::
 	drumset 1
 	dspeed 12
 	rest 2
diff --git a/audio/songs/evolution.asm b/audio/songs/evolution.asm
index 0822a83..76faa57 100755
--- a/audio/songs/evolution.asm
+++ b/audio/songs/evolution.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/evolution.asm", ROMX
 
-Song_Evolution:: ; edb1c (3b:5b1c)
+Song_Evolution::
 	db 2 << 6 | 0
 	dw Song_Evolution_Ch0
 	db 1
@@ -10,7 +10,7 @@ Song_Evolution:: ; edb1c (3b:5b1c)
 	db 2
 	dw Song_Evolution_Ch2
 
-Song_Evolution_Ch0:: ; edb25 (3b:5b25)
+Song_Evolution_Ch0::
 	tempo 132
 	volume 7, 7
 	vibrato 6, 3, 4
@@ -53,7 +53,7 @@ Song_Evolution_branch_edb5b::
 	endchannel
 
 
-Song_Evolution_Ch1:: ; edb67 (3b:5b67)
+Song_Evolution_Ch1::
 	duty 2
 	vibrato 8, 2, 5
 	notetype 12, 10, 2
@@ -87,7 +87,7 @@ Song_Evolution_branch_edb89::
 	endchannel
 
 
-Song_Evolution_Ch2:: ; edb95 (3b:5b95)
+Song_Evolution_Ch2::
 	notetype 12, 1, 0
 	rest 8
 
diff --git a/audio/songs/heal.asm b/audio/songs/heal.asm
index cd8b255..a290171 100755
--- a/audio/songs/heal.asm
+++ b/audio/songs/heal.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/heal.asm", ROMX
 
-Song_Heal:: ; ed5f4 (3b:55f4)
+Song_Heal::
 	db 2 << 6 | 0
 	dw Song_Heal_Ch0
 	db 1
@@ -10,7 +10,7 @@ Song_Heal:: ; ed5f4 (3b:55f4)
 	db 2
 	dw Song_Heal_Ch2
 
-Song_Heal_Ch0:: ; ed5fd (3b:55fd)
+Song_Heal_Ch0::
 	tempo 144
 	volume 7, 7
 	duty 2
@@ -33,7 +33,7 @@ Song_Heal_Ch0:: ; ed5fd (3b:55fd)
 	endchannel
 
 
-Song_Heal_Ch1:: ; ed621 (3b:5621)
+Song_Heal_Ch1::
 	duty 2
 	notetype 12, 12, 3
 	octave 4
@@ -47,7 +47,7 @@ Song_Heal_Ch1:: ; ed621 (3b:5621)
 	endchannel
 
 
-Song_Heal_Ch2:: ; ed631 (3b:5631)
+Song_Heal_Ch2::
 	notetype 12, 1, 0
 	octave 4
 	E_ 2
diff --git a/audio/songs/leaderbattle.asm b/audio/songs/leaderbattle.asm
index f1e74aa..76e662b 100755
--- a/audio/songs/leaderbattle.asm
+++ b/audio/songs/leaderbattle.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/leaderbattle.asm", ROMX
 
-Song_LeaderBattle:: ; ec858 (3b:4858)
+Song_LeaderBattle::
 	db 2 << 6 | 0
 	dw Song_LeaderBattle_Ch0
 	db 1
@@ -10,7 +10,7 @@ Song_LeaderBattle:: ; ec858 (3b:4858)
 	db 2
 	dw Song_LeaderBattle_Ch2
 
-Song_LeaderBattle_Ch0:: ; ec861 (3b:4861)
+Song_LeaderBattle_Ch0::
 	tempo 104
 	volume 7, 7
 	duty 3
@@ -561,7 +561,7 @@ Song_LeaderBattle_branch_ec8a4::
 	loopchannel 0, Song_LeaderBattle_branch_ec8a4
 
 
-Song_LeaderBattle_Ch1:: ; eca9c (3b:4a9c)
+Song_LeaderBattle_Ch1::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
@@ -862,7 +862,7 @@ Song_LeaderBattle_branch_ecadc::
 	loopchannel 0, Song_LeaderBattle_branch_ecadc
 
 
-Song_LeaderBattle_Ch2:: ; ecc05 (3b:4c05)
+Song_LeaderBattle_Ch2::
 	vibrato 0, 2, 0
 	notetype 12, 1, 3
 	rest 12
diff --git a/audio/songs/nidorinointro.asm b/audio/songs/nidorinointro.asm
index da26be5..54ff648 100755
--- a/audio/songs/nidorinointro.asm
+++ b/audio/songs/nidorinointro.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/nidorinointro.asm", ROMX
 
-Song_NidorinoIntro:: ; ec000 (3b:4000)
+Song_NidorinoIntro::
 	db 3 << 6 | 0
 	dw Song_NidorinoIntro_Ch0
 	db 1
@@ -12,7 +12,7 @@ Song_NidorinoIntro:: ; ec000 (3b:4000)
 	db 3
 	dw Song_NidorinoIntro_Ch3
 
-Song_NidorinoIntro_Ch0:: ; ec00c (3b:400c)
+Song_NidorinoIntro_Ch0::
 	tempo 102
 	volume 7, 7
 	duty 3
@@ -106,7 +106,7 @@ Song_NidorinoIntro_Ch0:: ; ec00c (3b:400c)
 	endchannel
 
 
-Song_NidorinoIntro_Ch1:: ; ec09f (3b:409f)
+Song_NidorinoIntro_Ch1::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -181,7 +181,7 @@ Song_NidorinoIntro_Ch1:: ; ec09f (3b:409f)
 	endchannel
 
 
-Song_NidorinoIntro_Ch2:: ; ec116 (3b:4116)
+Song_NidorinoIntro_Ch2::
 	notetype 12, 1, 0
 	rest 8
 	octave 4
@@ -245,7 +245,7 @@ Song_NidorinoIntro_Ch2:: ; ec116 (3b:4116)
 	endchannel
 
 
-Song_NidorinoIntro_Ch3:: ; ec155 (3b:4155)
+Song_NidorinoIntro_Ch3::
 	drumset 2
 	dspeed 6
 	snare4 1
diff --git a/audio/songs/none.asm b/audio/songs/none.asm
index ad12ef5..f45e12f 100755
--- a/audio/songs/none.asm
+++ b/audio/songs/none.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/none.asm", ROMX
 
-Song_None:: ; e92ee (3a:52ee)
+Song_None::
 	db 3 << 6 | 0
 	dw Song_None_Ch0
 	db 1
@@ -12,9 +12,9 @@ Song_None:: ; e92ee (3a:52ee)
 	db 3
 	dw Song_None_Ch3
 
-Song_None_Ch0:: ; e92fa (3a:52fa)
-Song_None_Ch1:: ; e92fa (3a:52fa)
-Song_None_Ch2:: ; e92fa (3a:52fa)
-Song_None_Ch3:: ; e92fa (3a:52fa)
+Song_None_Ch0::
+Song_None_Ch1::
+Song_None_Ch2::
+Song_None_Ch3::
 	endchannel
 ; 0xe92fb
diff --git a/audio/songs/oakintro.asm b/audio/songs/oakintro.asm
index 4827edf..88bfefe 100755
--- a/audio/songs/oakintro.asm
+++ b/audio/songs/oakintro.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/oakintro.asm", ROMX
 
-Song_OakIntro:: ; ec685 (3b:4685)
+Song_OakIntro::
 	db 3 << 6 | 0
 	dw Song_OakIntro_Ch0
 	db 1
@@ -12,7 +12,7 @@ Song_OakIntro:: ; ec685 (3b:4685)
 	db 3
 	dw Song_OakIntro_Ch3
 
-Song_OakIntro_Ch0:: ; ec691 (3b:4691)
+Song_OakIntro_Ch0::
 	tempo 152
 	volume 7, 7
 	vibrato 9, 2, 5
@@ -156,7 +156,7 @@ Song_OakIntro_branch_ec69b::
 	endchannel
 
 
-Song_OakIntro_Ch1:: ; ec729 (3b:4729)
+Song_OakIntro_Ch1::
 	vibrato 8, 2, 6
 	duty 3
 
@@ -232,7 +232,7 @@ Song_OakIntro_branch_ec72e::
 	endchannel
 
 
-Song_OakIntro_Ch2:: ; ec779 (3b:4779)
+Song_OakIntro_Ch2::
 	vibrato 9, 2, 8
 
 Song_OakIntro_branch_ec77c::
@@ -340,7 +340,7 @@ Song_OakIntro_branch_ec77c::
 	endchannel
 
 
-Song_OakIntro_Ch3:: ; ec7e7 (3b:47e7)
+Song_OakIntro_Ch3::
 	drumset 0
 
 Song_OakIntro_branch_ec7e9::
diff --git a/audio/songs/route1.asm b/audio/songs/route1.asm
index 896bdd6..c1a4c2a 100755
--- a/audio/songs/route1.asm
+++ b/audio/songs/route1.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/route1.asm", ROMX
 
-Song_Route1:: ; ec4c2 (3b:44c2)
+Song_Route1::
 	db 3 << 6 | 0
 	dw Song_Route1_Ch0
 	db 1
@@ -12,7 +12,7 @@ Song_Route1:: ; ec4c2 (3b:44c2)
 	db 3
 	dw Song_Route1_Ch3
 
-Song_Route1_Ch0:: ; ec4ce (3b:44ce)
+Song_Route1_Ch0::
 	tempo 152
 	volume 7, 7
 	vibrato 4, 2, 3
@@ -122,7 +122,7 @@ Song_Route1_branch_ec4db::
 	endchannel
 
 
-Song_Route1_Ch1:: ; ec546 (3b:4546)
+Song_Route1_Ch1::
 	duty 2
 
 Song_Route1_branch_ec548::
@@ -252,7 +252,7 @@ Song_Route1_branch_ec586::
 	endchannel
 
 
-Song_Route1_Ch2:: ; ec5d6 (3b:45d6)
+Song_Route1_Ch2::
 	vibrato 8, 2, 5
 	notetype 12, 1, 3
 
@@ -327,7 +327,7 @@ Song_Route1_branch_ec5dc::
 	endchannel
 
 
-Song_Route1_Ch3:: ; ec623 (3b:4623)
+Song_Route1_Ch3::
 	drumset 2
 
 Song_Route1_branch_ec625::
diff --git a/audio/songs/spottedrocket.asm b/audio/songs/spottedrocket.asm
index d0d040e..514af6a 100755
--- a/audio/songs/spottedrocket.asm
+++ b/audio/songs/spottedrocket.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/spottedrocket.asm", ROMX
 
-Song_SpottedRocket:: ; ed978 (3b:5978)
+Song_SpottedRocket::
 	db 2 << 6 | 0
 	dw Song_SpottedRocket_Ch0
 	db 1
@@ -10,7 +10,7 @@ Song_SpottedRocket:: ; ed978 (3b:5978)
 	db 2
 	dw Song_SpottedRocket_Ch2
 
-Song_SpottedRocket_Ch0:: ; ed981 (3b:5981)
+Song_SpottedRocket_Ch0::
 	tempo 124
 	volume 7, 7
 	duty 2
@@ -35,7 +35,7 @@ Song_SpottedRocket_branch_ed996::
 	loopchannel 0, Song_SpottedRocket_branch_ed996
 
 
-Song_SpottedRocket_Ch1:: ; ed9a4 (3b:59a4)
+Song_SpottedRocket_Ch1::
 	duty 1
 	notetype 12, 11, 6
 	octave 3
@@ -74,7 +74,7 @@ Song_SpottedRocket_branch_ed9ad::
 	loopchannel 0, Song_SpottedRocket_branch_ed9ad
 
 
-Song_SpottedRocket_Ch2:: ; ed9d6 (3b:59d6)
+Song_SpottedRocket_Ch2::
 	notetype 12, 1, 0
 	rest 8
 	octave 4
diff --git a/audio/songs/title.asm b/audio/songs/title.asm
index e734a23..2c0932c 100755
--- a/audio/songs/title.asm
+++ b/audio/songs/title.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/title.asm", ROMX
 
-Song_Title:: ; f22fe (3c:62fe)
+Song_Title::
 	db 3 << 6 | 0
 	dw Song_Title_Ch0
 	db 1
@@ -12,7 +12,7 @@ Song_Title:: ; f22fe (3c:62fe)
 	db 3
 	dw Song_Title_Ch3
 
-Song_Title_Ch0:: ; f230a (3c:630a)
+Song_Title_Ch0::
 	tempo 144
 	volume 7, 7
 	vibrato 9, 3, 4
@@ -168,7 +168,7 @@ Song_Title_branch_f23b3::
 	endchannel
 
 
-Song_Title_Ch1:: ; f23d0 (3c:63d0)
+Song_Title_Ch1::
 	vibrato 16, 4, 6
 	duty 1
 	notetype 12, 14, 1
@@ -337,7 +337,7 @@ Song_Title_branch_f24a2::
 	endchannel
 
 
-Song_Title_Ch2:: ; f24b0 (3c:64b0)
+Song_Title_Ch2::
 	notetype 12, 1, 0
 	octave 3
 	G_ 1
@@ -475,7 +475,7 @@ Song_Title_branch_f2556::
 	endchannel
 
 
-Song_Title_Ch3:: ; f255d (3c:655d)
+Song_Title_Ch3::
 	drumset 0
 	dspeed 6
 	rest 4
diff --git a/audio/songs/trainerbattle.asm b/audio/songs/trainerbattle.asm
index 35c6a2f..fc5a37c 100755
--- a/audio/songs/trainerbattle.asm
+++ b/audio/songs/trainerbattle.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/trainerbattle.asm", ROMX
 
-Song_TrainerBattle:: ; ece31 (3b:4e31)
+Song_TrainerBattle::
 	db 2 << 6 | 0
 	dw Song_TrainerBattle_Ch0
 	db 1
@@ -10,7 +10,7 @@ Song_TrainerBattle:: ; ece31 (3b:4e31)
 	db 2
 	dw Song_TrainerBattle_Ch2
 
-Song_TrainerBattle_Ch0:: ; ece3a (3b:4e3a)
+Song_TrainerBattle_Ch0::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -663,7 +663,7 @@ Song_TrainerBattle_branch_ece86::
 	loopchannel 0, Song_TrainerBattle_branch_ece86
 
 
-Song_TrainerBattle_Ch1:: ; ed0d7 (3b:50d7)
+Song_TrainerBattle_Ch1::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 2
@@ -967,7 +967,7 @@ Song_TrainerBattle_branch_ed129::
 	loopchannel 0, Song_TrainerBattle_branch_ed129
 
 
-Song_TrainerBattle_Ch2:: ; ed26a (3b:526a)
+Song_TrainerBattle_Ch2::
 	vibrato 0, 2, 0
 	notetype 12, 1, 4
 	octave 3
diff --git a/audio/songs/victorytrainer.asm b/audio/songs/victorytrainer.asm
index 11c91ae..87d3e0c 100755
--- a/audio/songs/victorytrainer.asm
+++ b/audio/songs/victorytrainer.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/victorytrainer.asm", ROMX
 
-Song_VictoryTrainer:: ; ed9ea (3b:59ea)
+Song_VictoryTrainer::
 	db 2 << 6 | 0
 	dw Song_VictoryTrainer_Ch0
 	db 1
@@ -10,7 +10,7 @@ Song_VictoryTrainer:: ; ed9ea (3b:59ea)
 	db 2
 	dw Song_VictoryTrainer_Ch2
 
-Song_VictoryTrainer_Ch0:: ; ed9f3 (3b:59f3)
+Song_VictoryTrainer_Ch0::
 	tempo 224
 	volume 7, 7
 	duty 2
@@ -108,7 +108,7 @@ Song_VictoryTrainer_branch_eda18::
 	loopchannel 0, Song_VictoryTrainer_branch_eda18
 
 
-Song_VictoryTrainer_Ch1:: ; eda64 (3b:5a64)
+Song_VictoryTrainer_Ch1::
 	duty 2
 	notetype 4, 12, 3
 	octave 4
@@ -184,7 +184,7 @@ Song_VictoryTrainer_branch_eda75::
 	loopchannel 0, Song_VictoryTrainer_branch_eda75
 
 
-Song_VictoryTrainer_Ch2:: ; edabd (3b:5abd)
+Song_VictoryTrainer_Ch2::
 	notetype 4, 1, 0
 	octave 5
 	D_ 2
diff --git a/audio/songs/viridiancity.asm b/audio/songs/viridiancity.asm
index ce75278..1c1ccb7 100755
--- a/audio/songs/viridiancity.asm
+++ b/audio/songs/viridiancity.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "audio/songs/viridiancity.asm", ROMX
 
-Song_ViridianCity:: ; ec1b9 (3b:41b9)
+Song_ViridianCity::
 	db 3 << 6 | 0
 	dw Song_ViridianCity_Ch0
 	db 1
@@ -16,7 +16,7 @@ Song_ViridianCity_branch_ec1c5::
 	tempo 232
 	loopchannel 0, Song_ViridianCity_branch_ec1cf
 
-Song_ViridianCity_Ch0:: ; ec1cc (3b:41cc)
+Song_ViridianCity_Ch0::
 	tempo 144
 
 Song_ViridianCity_branch_ec1cf::
@@ -282,7 +282,7 @@ Song_ViridianCity_branch_ec2eb::
 	endchannel
 
 
-Song_ViridianCity_Ch1:: ; ec2f3 (3b:42f3)
+Song_ViridianCity_Ch1::
 	vibrato 5, 1, 5
 	callchannel Song_ViridianCity_branch_ec368
 	octave 4
@@ -415,7 +415,7 @@ Song_ViridianCity_branch_ec368::
 	endchannel
 
 
-Song_ViridianCity_Ch2:: ; ec3a2 (3b:43a2)
+Song_ViridianCity_Ch2::
 	notetype 12, 1, 1
 	toggleperfectpitch
 	rest 1
@@ -595,7 +595,7 @@ Song_ViridianCity_branch_ec441::
 	endchannel
 
 
-Song_ViridianCity_Ch3:: ; ec462 (3b:4462)
+Song_ViridianCity_Ch3::
 	drumset 0
 
 Song_ViridianCity_branch_ec464::