shithub: pokered

Download patch

ref: 7f34e28f242ee4d0caba0bd96b040811dcb86c50
parent: cee4d559f999312837da7d69e2c6704e85c159d4
author: YamaArashi <shadow962@live.com>
date: Sat Jun 11 13:24:04 EDT 2016 

remove address comments


--- a/audio.asm
+++ b/audio.asm
@@ -455,7 +455,7 @@
 
 SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
 
-Music_DoLowHealthAlarm:: ; 2136e (8:536e)
+Music_DoLowHealthAlarm::
 	ld a, [wLowHealthAlarm]
 	cp $ff
 	jr z, .disableAlarm
@@ -537,7 +537,7 @@
 INCLUDE "audio/engine_2.asm"
 
 
-Music_PokeFluteInBattle:: ; 22306 (8:6306)
+Music_PokeFluteInBattle::
 	; begin playing the "caught mon" sound effect
 	ld a, SFX_CAUGHT_MON
 	call PlaySoundWaitForCurrent
@@ -549,7 +549,7 @@
 	call Audio2_OverwriteChannelPointer
 	ld de, SFX_08_PokeFlute_Ch3
 
-Audio2_OverwriteChannelPointer: ; 2231d (8:631d)
+Audio2_OverwriteChannelPointer:
 	ld a, e
 	ld [hli], a
 	ld a, d
@@ -559,7 +559,7 @@
 
 SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3]
 
-PlayPokedexRatingSfx:: ; 7d13b (1f:513b)
+PlayPokedexRatingSfx::
 	ld a, [$ffdc]
 	ld c, $0
 	ld hl, OwnedMonValues
@@ -584,7 +584,7 @@
 	call PlayMusic
 	jp PlayDefaultMusic
 
-PokedexRatingSfxPointers: ; 7d162 (1f:5162)
+PokedexRatingSfxPointers:
 	db SFX_DENIED,         BANK(SFX_Denied_3)
 	db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1)
 	db SFX_GET_ITEM_1,     BANK(SFX_Get_Item1_1)
@@ -593,7 +593,7 @@
 	db SFX_GET_KEY_ITEM,   BANK(SFX_Get_Key_Item_1)
 	db SFX_GET_ITEM_2,     BANK(SFX_Get_Item2_1)
 
-OwnedMonValues: ; 7d170 (1f:5170)
+OwnedMonValues:
 	db 10, 40, 60, 90, 120, 150, $ff
 
 
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1,6 +1,6 @@
 ; The second of three duplicated sound engines.
 
-Audio2_UpdateMusic:: ; 21879 (8:5879)
+Audio2_UpdateMusic::
 	ld c, CH0
 .loop
 	ld b, $0
@@ -42,7 +42,7 @@
 ;	3: a toggle used only by this routine for vibrato
 ;	4: pitchbend flag
 ;	6: dutycycle flag
-Audio2_ApplyMusicAffects: ; 218ae (8:58ae)
+Audio2_ApplyMusicAffects:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters ; delay until next note
 	add hl, bc
@@ -148,7 +148,7 @@
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Audio2_PlayNextNote: ; 21946 (8:5946)
+Audio2_PlayNextNote:
 	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, bc
 	ld a, [hl]
@@ -169,7 +169,7 @@
 	call Audio2_endchannel
 	ret
 
-Audio2_endchannel: ; 21967 (8:5967)
+Audio2_endchannel:
 	call Audio2_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
@@ -258,7 +258,7 @@
 	ld [hl], b
 	ret
 
-Audio2_callchannel: ; 219f5 (8:59f5)
+Audio2_callchannel:
 	cp $fd ; is this command a callchannel?
 	jp nz, Audio2_loopchannel ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -295,7 +295,7 @@
 	set 1, [hl] ; set the call flag
 	jp Audio2_endchannel
 
-Audio2_loopchannel: ; 21a2a (8:5a2a)
+Audio2_loopchannel:
 	cp $fe ; is this command a loopchannel?
 	jp nz, Audio2_notetype ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -333,7 +333,7 @@
 	ld [hl], b
 	jp Audio2_endchannel
 
-Audio2_notetype: ; 21a65 (8:5a65)
+Audio2_notetype:
 	and $f0
 	cp $d0 ; is this command a notetype?
 	jp nz, Audio2_toggleperfectpitch ; no
@@ -377,7 +377,7 @@
 .noiseChannel
 	jp Audio2_endchannel
 
-Audio2_toggleperfectpitch: ; 21aa4 (8:5aa4)
+Audio2_toggleperfectpitch:
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
 	jr nz, Audio2_vibrato ; no
@@ -389,7 +389,7 @@
 	ld [hl], a ; flip bit 0 of wChannelFlags1
 	jp Audio2_endchannel
 
-Audio2_vibrato: ; 21ab6 (8:5ab6)
+Audio2_vibrato:
 	cp $ea ; is this command a vibrato?
 	jr nz, Audio2_pitchbend ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -423,7 +423,7 @@
 	ld [hl], a ; store depth as both high and low nibbles
 	jp Audio2_endchannel
 
-Audio2_pitchbend: ; 21aee (8:5aee)
+Audio2_pitchbend:
 	cp $eb ; is this command a pitchbend?
 	jr nz, Audio2_duty ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -454,7 +454,7 @@
 	ld d, a
 	jp Audio2_notelength
 
-Audio2_duty: ; 21b26 (8:5b26)
+Audio2_duty:
 	cp $ec ; is this command a duty?
 	jr nz, Audio2_tempo ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -467,7 +467,7 @@
 	ld [hl], a ; store duty
 	jp Audio2_endchannel
 
-Audio2_tempo: ; 21b3b (8:5b3b)
+Audio2_tempo:
 	cp $ed ; is this command a tempo?
 	jr nz, Audio2_stereopanning ; no
 	ld a, c ; yes
@@ -496,7 +496,7 @@
 .musicChannelDone
 	jp Audio2_endchannel
 
-Audio2_stereopanning: ; 21b7b (8:5b7b)
+Audio2_stereopanning:
 	cp $ee ; is this command a stereopanning?
 	jr nz, Audio2_unknownmusic0xef ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -504,7 +504,7 @@
 	jp Audio2_endchannel
 
 ; this appears to never be used
-Audio2_unknownmusic0xef: ; 21b88 (8:5b88)
+Audio2_unknownmusic0xef:
 	cp $ef ; is this command an unknownmusic0xef?
 	jr nz, Audio2_dutycycle ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -521,7 +521,7 @@
 .skip
 	jp Audio2_endchannel
 
-Audio2_dutycycle: ; 21ba7 (8:5ba7)
+Audio2_dutycycle:
 	cp $fc ; is this command a dutycycle?
 	jr nz, Audio2_volume ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -538,7 +538,7 @@
 	set 6, [hl] ; set dutycycle flag
 	jp Audio2_endchannel
 
-Audio2_volume: ; 21bc5 (8:5bc5)
+Audio2_volume:
 	cp $f0 ; is this command a volume?
 	jr nz, Audio2_executemusic ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -545,7 +545,7 @@
 	ld [rNR50], a ; store volume
 	jp Audio2_endchannel
 
-Audio2_executemusic: ; 21bd1 (8:5bd1)
+Audio2_executemusic:
 	cp $f8 ; is this command an executemusic?
 	jr nz, Audio2_octave ; no
 	ld b, $0 ; yes
@@ -554,7 +554,7 @@
 	set 0, [hl]
 	jp Audio2_endchannel
 
-Audio2_octave: ; 21be0 (8:5be0)
+Audio2_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
 	jr nz, Audio2_unknownsfx0x20 ; no
@@ -611,7 +611,7 @@
 	call Audio2_21dcc
 	ret
 
-Audio2_unknownsfx0x10: ; 21c40 (8:5c40)
+Audio2_unknownsfx0x10:
 	ld a, c
 	cp CH4
 	jr c, Audio2_note ; if not a sfx
@@ -627,7 +627,7 @@
 	ld [rNR10], a
 	jp Audio2_endchannel
 
-Audio2_note: ; 21c5c (8:5c5c)
+Audio2_note:
 	ld a, c
 	cp CH3
 	jr nz, Audio2_notelength ; if not noise channel
@@ -646,7 +646,7 @@
 	push bc
 	jr asm_21c7e
 
-Audio2_dnote: ; 21c76 (8:5c76)
+Audio2_dnote:
 	ld a, d
 	and $f
 	push af
@@ -663,7 +663,7 @@
 	pop bc
 	pop de
 
-Audio2_notelength: ; 21c8b (8:5c8b)
+Audio2_notelength:
 	ld a, d
 	push af
 	and $f
@@ -721,7 +721,7 @@
 	pop hl
 	ret
 
-Audio2_notepitch: ; 21ce9 (8:5ce9)
+Audio2_notepitch:
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -814,7 +814,7 @@
 	call Audio2_21dcc
 	ret
 
-Audio2_21d79: ; 21d79 (8:5d79)
+Audio2_21d79:
 	ld b, $0
 	ld hl, Unknown_222e6
 	add hl, bc
@@ -848,7 +848,7 @@
 	ld [rNR51], a
 	ret
 
-Audio2_21daa: ; 21daa (8:5daa)
+Audio2_21daa:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters
 	add hl, bc
@@ -872,7 +872,7 @@
 	ld [hl], d
 	ret
 
-Audio2_21dcc: ; 21dcc (8:5dcc)
+Audio2_21dcc:
 	ld a, c
 	cp CH2
 	jr z, .channel3
@@ -927,7 +927,7 @@
 .musicChannel
 	ret
 
-Audio2_21e19: ; 21e19 (8:5e19)
+Audio2_21e19:
 	ld a, c
 	cp CH4
 	jr nz, .asm_21e2e
@@ -941,7 +941,7 @@
 .asm_21e2e
 	ret
 
-Audio2_21e2f: ; 21e2f (8:5e2f)
+Audio2_21e2f:
 	call Audio2_21e8b
 	jr c, .asm_21e39
 	call Audio2_21e9f
@@ -965,7 +965,7 @@
 .asm_21e55
 	ret
 
-Audio2_21e56: ; 21e56 (8:5e56)
+Audio2_21e56:
 	call Audio2_21e8b
 	jr c, .asm_21e60
 	call Audio2_21e9f
@@ -984,7 +984,7 @@
 .asm_21e6c
 	ret
 
-Audio2_21e6d: ; 21e6d (8:5e6d)
+Audio2_21e6d:
 	call Audio2_21e8b
 	jr nc, .asm_21e88
 	ld hl, wChannelCommandPointers
@@ -1007,7 +1007,7 @@
 	ccf
 	ret
 
-Audio2_21e8b: ; 21e8b (8:5e8b)
+Audio2_21e8b:
 	ld a, [wChannelSoundIDs + CH4]
 	cp $14
 	jr nc, .asm_21e94
@@ -1024,7 +1024,7 @@
 	scf
 	ret
 
-Audio2_21e9f: ; 21e9f (8:5e9f)
+Audio2_21e9f:
 	ld a, [wChannelSoundIDs + CH7]
 	ld b, a
 	ld a, [wChannelSoundIDs + CH4]
@@ -1044,7 +1044,7 @@
 	scf
 	ret
 
-Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8)
+Audio2_ApplyPitchBend:
 	ld hl, wChannelFlags1
 	add hl, bc
 	bit 5, [hl]
@@ -1146,7 +1146,7 @@
 	res 5, [hl]
 	ret
 
-Audio2_21f4e: ; 21f4e (8:5f4e)
+Audio2_21f4e:
 	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
@@ -1235,7 +1235,7 @@
 	ld [hl], a
 	ret
 
-Audio2_ApplyDutyCycle: ; 21fcc (8:5fcc)
+Audio2_ApplyDutyCycle:
 	ld b, $0
 	ld hl, wChannelDutyCycles
 	add hl, bc
@@ -1253,7 +1253,7 @@
 	ld [hl], a
 	ret
 
-Audio2_GetNextMusicByte: ; 21fe4 (8:5fe4)
+Audio2_GetNextMusicByte:
 	ld d, $0
 	ld a, c
 	add a
@@ -1271,7 +1271,7 @@
 	ld [hl], d
 	ret
 
-Audio2_21ff7: ; 21ff7 (8:5ff7)
+Audio2_21ff7:
 	ld a, c
 	ld hl, Unknown_222d6
 	add l
@@ -1285,7 +1285,7 @@
 	ld h, $ff
 	ret
 
-Audio2_22006: ; 22006 (8:6006)
+Audio2_22006:
 	ld h, $0
 .loop
 	srl a
@@ -1300,7 +1300,7 @@
 .done
 	ret
 
-Audio2_22017: ; 22017 (8:6017)
+Audio2_22017:
 	ld h, $0
 	ld l, a
 	add hl, hl
@@ -1325,7 +1325,7 @@
 	ld d, a
 	ret
 
-Audio2_PlaySound:: ; 22035 (8:6035)
+Audio2_PlaySound::
 	ld [wSoundID], a
 	cp $ff
 	jp z, Audio2_221f3
@@ -1408,7 +1408,7 @@
 	ld [rNR50], a
 	jp Audio2_2224e
 
-Audio2_2210d: ; 2210d (8:610d)
+Audio2_2210d:
 	ld l, a
 	ld e, a
 	ld h, $0
@@ -1559,7 +1559,7 @@
 	dec c
 	jp .asm_22126
 
-Audio2_221f3: ; 221f3 (8:61f3)
+Audio2_221f3:
 	ld a, $80
 	ld [rNR52], a
 	ld [rNR30], a
@@ -1599,7 +1599,7 @@
 	ret
 
 ; fills d bytes at hl with a
-FillAudioRAM2: ; 22248 (8:6248)
+FillAudioRAM2:
 	ld b, d
 .loop
 	ld [hli], a
@@ -1607,7 +1607,7 @@
 	jr nz, .loop
 	ret
 
-Audio2_2224e: ; 2224e (8:624e)
+Audio2_2224e:
 	ld a, [wSoundID]
 	ld l, a
 	ld e, a
@@ -1702,22 +1702,22 @@
 .asm_222d4
 	ret
 
-Noise2_endchannel: ; 222d5 (8:62d5)
+Noise2_endchannel:
 	endchannel
 
-Unknown_222d6: ; 222d6 (8:62d6)
+Unknown_222d6:
 	db $10, $15, $1A, $1F ; channels 0-3
 	db $10, $15, $1A, $1F ; channels 4-7
 
-Unknown_222de: ; 222de (8:62de)
+Unknown_222de:
 	db $EE, $DD, $BB, $77 ; channels 0-3
 	db $EE, $DD, $BB, $77 ; channels 4-7
 
-Unknown_222e6: ; 222e6 (8:62e6)
+Unknown_222e6:
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Audio2_Pitches: ; 222ee (8:62ee)
+Audio2_Pitches:
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -1,6 +1,6 @@
 ; The third of three duplicated sound engines.
 
-Audio3_UpdateMusic:: ; 7d177 (1f:5177)
+Audio3_UpdateMusic::
 	ld c, CH0
 .loop
 	ld b, $0
@@ -42,7 +42,7 @@
 ;	3: a toggle used only by this routine for vibrato
 ;	4: pitchbend flag
 ;	6: dutycycle flag
-Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac)
+Audio3_ApplyMusicAffects:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters ; delay until next note
 	add hl, bc
@@ -148,7 +148,7 @@
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Audio3_PlayNextNote: ; 7d244 (1f:5244)
+Audio3_PlayNextNote:
 	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, bc
 	ld a, [hl]
@@ -162,7 +162,7 @@
 	call Audio3_endchannel
 	ret
 
-Audio3_endchannel: ; 7d25a (1f:525a)
+Audio3_endchannel:
 	call Audio3_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
@@ -251,7 +251,7 @@
 	ld [hl], b
 	ret
 
-Audio3_callchannel: ; 7d2e8 (1f:52e8)
+Audio3_callchannel:
 	cp $fd ; is this command a callchannel?
 	jp nz, Audio3_loopchannel ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -288,7 +288,7 @@
 	set 1, [hl] ; set the call flag
 	jp Audio3_endchannel
 
-Audio3_loopchannel: ; 7d31d (1f:531d)
+Audio3_loopchannel:
 	cp $fe ; is this command a loopchannel?
 	jp nz, Audio3_notetype ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -326,7 +326,7 @@
 	ld [hl], b
 	jp Audio3_endchannel
 
-Audio3_notetype: ; 7d358 (1f:5358)
+Audio3_notetype:
 	and $f0
 	cp $d0 ; is this command a notetype?
 	jp nz, Audio3_toggleperfectpitch ; no
@@ -370,7 +370,7 @@
 .noiseChannel
 	jp Audio3_endchannel
 
-Audio3_toggleperfectpitch: ; 7d397 (1f:5397)
+Audio3_toggleperfectpitch:
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
 	jr nz, Audio3_vibrato ; no
@@ -382,7 +382,7 @@
 	ld [hl], a ; flip bit 0 of wChannelFlags1
 	jp Audio3_endchannel
 
-Audio3_vibrato: ; 7d3a9 (1f:53a9)
+Audio3_vibrato:
 	cp $ea ; is this command a vibrato?
 	jr nz, Audio3_pitchbend ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -416,7 +416,7 @@
 	ld [hl], a ; store depth as both high and low nibbles
 	jp Audio3_endchannel
 
-Audio3_pitchbend: ; 7d3e1 (1f:53e1)
+Audio3_pitchbend:
 	cp $eb ; is this command a pitchbend?
 	jr nz, Audio3_duty ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -447,7 +447,7 @@
 	ld d, a
 	jp Audio3_notelength
 
-Audio3_duty: ; 7d419 (1f:5419)
+Audio3_duty:
 	cp $ec ; is this command a duty?
 	jr nz, Audio3_tempo ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -460,7 +460,7 @@
 	ld [hl], a ; store duty
 	jp Audio3_endchannel
 
-Audio3_tempo: ; 7d42e (1f:542e)
+Audio3_tempo:
 	cp $ed ; is this command a tempo?
 	jr nz, Audio3_stereopanning ; no
 	ld a, c ; yes
@@ -489,7 +489,7 @@
 .musicChannelDone
 	jp Audio3_endchannel
 
-Audio3_stereopanning: ; 7d46e (1f:546e)
+Audio3_stereopanning:
 	cp $ee ; is this command a stereopanning?
 	jr nz, Audio3_unknownmusic0xef ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -497,7 +497,7 @@
 	jp Audio3_endchannel
 
 ; this appears to never be used
-Audio3_unknownmusic0xef: ; 7d47b (1f:547b)
+Audio3_unknownmusic0xef:
 	cp $ef ; is this command an unknownmusic0xef?
 	jr nz, Audio3_dutycycle ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -514,7 +514,7 @@
 .skip
 	jp Audio3_endchannel
 
-Audio3_dutycycle: ; 7d49a (1f:549a)
+Audio3_dutycycle:
 	cp $fc ; is this command a dutycycle?
 	jr nz, Audio3_volume ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -531,7 +531,7 @@
 	set 6, [hl] ; set duty flag
 	jp Audio3_endchannel
 
-Audio3_volume: ; 7d4b8 (1f:54b8)
+Audio3_volume:
 	cp $f0 ; is this command a volume?
 	jr nz, Audio3_executemusic ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -538,7 +538,7 @@
 	ld [rNR50], a ; store volume
 	jp Audio3_endchannel
 
-Audio3_executemusic: ; 7d4c4 (1f:54c4)
+Audio3_executemusic:
 	cp $f8 ; is this command an executemusic?
 	jr nz, Audio3_octave ; no
 	ld b, $0 ; yes
@@ -547,7 +547,7 @@
 	set 0, [hl]
 	jp Audio3_endchannel
 
-Audio3_octave: ; 7d4d3 (1f:54d3)
+Audio3_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
 	jr nz, Audio3_unknownsfx0x20 ; no
@@ -559,7 +559,7 @@
 	ld [hl], a ; store low nibble as octave
 	jp Audio3_endchannel
 
-Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6)
+Audio3_unknownsfx0x20:
 	cp $20 ; is this command an unknownsfx0x20?
 	jr nz, Audio3_unknownsfx0x10 ; no
 	ld a, c
@@ -604,7 +604,7 @@
 	call Audio3_7d6bf
 	ret
 
-Audio3_unknownsfx0x10: ; 7d533 (1f:5533)
+Audio3_unknownsfx0x10:
 	ld a, c
 	cp CH4
 	jr c, Audio3_note ; if not a sfx
@@ -620,7 +620,7 @@
 	ld [rNR10], a
 	jp Audio3_endchannel
 
-Audio3_note: ; 7d54f (1f:554f)
+Audio3_note:
 	ld a, c
 	cp CH3
 	jr nz, Audio3_notelength ; if not noise channel
@@ -639,7 +639,7 @@
 	push bc
 	jr asm_7d571
 
-Audio3_dnote: ; 7d569 (1f:5569)
+Audio3_dnote:
 	ld a, d
 	and $f
 	push af
@@ -656,7 +656,7 @@
 	pop bc
 	pop de
 
-Audio3_notelength: ; 7d57e (1f:557e)
+Audio3_notelength:
 	ld a, d
 	push af
 	and $f
@@ -714,7 +714,7 @@
 	pop hl
 	ret
 
-Audio3_notepitch: ; 7d5dc (1f:55dc)
+Audio3_notepitch:
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -807,7 +807,7 @@
 	call Audio3_7d6bf
 	ret
 
-Audio3_7d66c: ; 7d66c (1f:566c)
+Audio3_7d66c:
 	ld b, $0
 	ld hl, Unknown_7db9b
 	add hl, bc
@@ -841,7 +841,7 @@
 	ld [rNR51], a
 	ret
 
-Audio3_7d69d: ; 7d69d (1f:569d)
+Audio3_7d69d:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters
 	add hl, bc
@@ -865,7 +865,7 @@
 	ld [hl], d
 	ret
 
-Audio3_7d6bf: ; 7d6bf (1f:56bf)
+Audio3_7d6bf:
 	ld a, c
 	cp CH2
 	jr z, .channel3
@@ -916,7 +916,7 @@
 	call Audio3_7d729
 	ret
 
-Audio3_7d707: ; 7d707 (1f:5707)
+Audio3_7d707:
 	call Audio3_7d759
 	jr nc, .asm_7d71f
 	ld d, $0
@@ -937,7 +937,7 @@
 .asm_7d728
 	ret
 
-Audio3_7d729: ; 7d729 (1f:5729)
+Audio3_7d729:
 	call Audio3_7d759
 	jr nc, .asm_7d73a
 	ld a, [wFrequencyModifier]
@@ -953,7 +953,7 @@
 .asm_7d73a
 	ret
 
-Audio3_7d73b: ; 7d73b (1f:573b)
+Audio3_7d73b:
 	call Audio3_7d759
 	jr nc, .asm_7d756
 	ld hl, wChannelCommandPointers
@@ -976,7 +976,7 @@
 	ccf
 	ret
 
-Audio3_7d759: ; 7d759 (1f:5759)
+Audio3_7d759:
 	ld a, [wChannelSoundIDs + CH4]
 	cp $14
 	jr nc, .asm_7d762
@@ -993,7 +993,7 @@
 	scf
 	ret
 
-Audio3_ApplyPitchBend: ; 7d76d (1f:576d)
+Audio3_ApplyPitchBend:
 	ld hl, wChannelFlags1
 	add hl, bc
 	bit 5, [hl]
@@ -1095,7 +1095,7 @@
 	res 5, [hl]
 	ret
 
-Audio3_7d803: ; 7d803 (1f:5803)
+Audio3_7d803:
 	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
@@ -1184,7 +1184,7 @@
 	ld [hl], a
 	ret
 
-Audio3_ApplyDutyCycle: ; 7d881 (1f:5881)
+Audio3_ApplyDutyCycle:
 	ld b, $0
 	ld hl, wChannelDutyCycles
 	add hl, bc
@@ -1202,7 +1202,7 @@
 	ld [hl], a
 	ret
 
-Audio3_GetNextMusicByte: ; 7d899 (1f:5899)
+Audio3_GetNextMusicByte:
 	ld d, $0
 	ld a, c
 	add a
@@ -1220,7 +1220,7 @@
 	ld [hl], d
 	ret
 
-Audio3_7d8ac: ; 7d8ac (1f:58ac)
+Audio3_7d8ac:
 	ld a, c
 	ld hl, Unknown_7db8b
 	add l
@@ -1234,7 +1234,7 @@
 	ld h, $ff
 	ret
 
-Audio3_7d8bb: ; 7d8bb (1f:58bb)
+Audio3_7d8bb:
 	ld h, $0
 .loop
 	srl a
@@ -1249,7 +1249,7 @@
 .done
 	ret
 
-Audio3_7d8cc: ; 7d8cc (1f:58cc)
+Audio3_7d8cc:
 	ld h, $0
 	ld l, a
 	add hl, hl
@@ -1274,7 +1274,7 @@
 	ld d, a
 	ret
 
-Audio3_PlaySound:: ; 7d8ea (1f:58ea)
+Audio3_PlaySound::
 	ld [wSoundID], a
 	cp $ff
 	jp z, Audio3_7daa8
@@ -1357,7 +1357,7 @@
 	ld [rNR50], a
 	jp Audio3_7db03
 
-Audio3_7d9c2: ; 7d9c2 (1f:59c2)
+Audio3_7d9c2:
 	ld l, a
 	ld e, a
 	ld h, $0
@@ -1508,7 +1508,7 @@
 	dec c
 	jp .asm_7d9db
 
-Audio3_7daa8: ; 7daa8 (1f:5aa8)
+Audio3_7daa8:
 	ld a, $80
 	ld [rNR52], a
 	ld [rNR30], a
@@ -1548,7 +1548,7 @@
 	ret
 
 ; fills d bytes at hl with a
-FillAudioRAM3: ; 7dafd (1f:5afd)
+FillAudioRAM3:
 	ld b, d
 .loop
 	ld [hli], a
@@ -1556,7 +1556,7 @@
 	jr nz, .loop
 	ret
 
-Audio3_7db03: ; 7db03 (1f:5b03)
+Audio3_7db03:
 	ld a, [wSoundID]
 	ld l, a
 	ld e, a
@@ -1651,22 +1651,22 @@
 .asm_7db89
 	ret
 
-Noise3_endchannel: ; 7db8a (1f:5b8a)
+Noise3_endchannel:
 	endchannel
 
-Unknown_7db8b: ; 7db8b (1f:5b8b)
+Unknown_7db8b:
 	db $10, $15, $1A, $1F ; channels 0-3
 	db $10, $15, $1A, $1F ; channels 4-7
 
-Unknown_7db93: ; 7db93 (1f:5b93)
+Unknown_7db93:
 	db $EE, $DD, $BB, $77 ; channels 0-3
 	db $EE, $DD, $BB, $77 ; channels 4-7
 
-Unknown_7db9b: ; 7db9b (1f:5b9b)
+Unknown_7db9b:
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Audio3_Pitches: ; 7dba3 (1f:5ba3)
+Audio3_Pitches:
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_
--- a/audio/headers/musicheaders1.asm
+++ b/audio/headers/musicheaders1.asm
@@ -1,4 +1,4 @@
-Music_PalletTown:: ; 822e (2:422e)
+Music_PalletTown::
 	db ( $80 | CH0 )
 	dw Music_PalletTown_Ch1
 	db CH1
@@ -6,7 +6,7 @@
 	db CH2
 	dw Music_PalletTown_Ch3
 
-Music_Pokecenter:: ; 8237 (2:4237)
+Music_Pokecenter::
 	db ( $80 | CH0 )
 	dw Music_Pokecenter_Ch1
 	db CH1
@@ -14,7 +14,7 @@
 	db CH2
 	dw Music_Pokecenter_Ch3
 
-Music_Gym:: ; 8240 (2:4240)
+Music_Gym::
 	db ( $80 | CH0 )
 	dw Music_Gym_Ch1
 	db CH1
@@ -23,7 +23,7 @@
 	dw Music_Gym_Ch3
 
 ; Viridian City, Pewter City, Saffron City
-Music_Cities1:: ; 8249 (2:4249)
+Music_Cities1::
 	db ( $C0 | CH0 )
 	dw Music_Cities1_Ch1
 	db CH1
@@ -34,7 +34,7 @@
 	dw Music_Cities1_Ch4
 
 ; Cerulean City, Fuchsia City
-Music_Cities2:: ; 8255 (2:4255)
+Music_Cities2::
 	db ( $80 | CH0 )
 	dw Music_Cities2_Ch1
 	db CH1
@@ -42,7 +42,7 @@
 	db CH2
 	dw Music_Cities2_Ch3
 
-Music_Celadon:: ; 825e (2:425e)
+Music_Celadon::
 	db ( $80 | CH0 )
 	dw Music_Celadon_Ch1
 	db CH1
@@ -50,7 +50,7 @@
 	db CH2
 	dw Music_Celadon_Ch3
 
-Music_Cinnabar:: ; 8267 (2:4267)
+Music_Cinnabar::
 	db ( $80 | CH0 )
 	dw Music_Cinnabar_Ch1
 	db CH1
@@ -58,7 +58,7 @@
 	db CH2
 	dw Music_Cinnabar_Ch3
 
-Music_Vermilion:: ; 8270 (2:4270)
+Music_Vermilion::
 	db ( $C0 | CH0 )
 	dw Music_Vermilion_Ch1
 	db CH1
@@ -68,7 +68,7 @@
 	db CH3
 	dw Music_Vermilion_Ch4
 
-Music_Lavender:: ; 827c (2:427c)
+Music_Lavender::
 	db ( $C0 | CH0 )
 	dw Music_Lavender_Ch1
 	db CH1
@@ -78,7 +78,7 @@
 	db CH3
 	dw Music_Lavender_Ch4
 
-Music_SSAnne:: ; 8288 (2:4288)
+Music_SSAnne::
 	db ( $80 | CH0 )
 	dw Music_SSAnne_Ch1
 	db CH1
@@ -86,7 +86,7 @@
 	db CH2
 	dw Music_SSAnne_Ch3
 
-Music_MeetProfOak:: ; 8291 (2:4291)
+Music_MeetProfOak::
 	db ( $80 | CH0 )
 	dw Music_MeetProfOak_Ch1
 	db CH1
@@ -94,7 +94,7 @@
 	db CH2
 	dw Music_MeetProfOak_Ch3
 
-Music_MeetRival:: ; 829a (2:429a)
+Music_MeetRival::
 	db ( $80 | CH0 )
 	dw Music_MeetRival_Ch1
 	db CH1
@@ -102,7 +102,7 @@
 	db CH2
 	dw Music_MeetRival_Ch3
 
-Music_MuseumGuy:: ; 82a3 (2:42a3)
+Music_MuseumGuy::
 	db ( $C0 | CH0 )
 	dw Music_MuseumGuy_Ch1
 	db CH1
@@ -112,7 +112,7 @@
 	db CH3
 	dw Music_MuseumGuy_Ch4
 
-Music_SafariZone:: ; 82af (2:42af)
+Music_SafariZone::
 	db ( $80 | CH0 )
 	dw Music_SafariZone_Ch1
 	db CH1
@@ -120,7 +120,7 @@
 	db CH2
 	dw Music_SafariZone_Ch3
 
-Music_PkmnHealed:: ; 82b8 (2:42b8)
+Music_PkmnHealed::
 	db ( $80 | CH0 )
 	dw Music_PkmnHealed_Ch1
 	db CH1
@@ -129,7 +129,7 @@
 	dw Music_PkmnHealed_Ch3
 
 ; Routes 1 and 2
-Music_Routes1:: ; 82c1 (2:42c1)
+Music_Routes1::
 	db ( $C0 | CH0 )
 	dw Music_Routes1_Ch1
 	db CH1
@@ -140,7 +140,7 @@
 	dw Music_Routes1_Ch4
 
 ; Routes 24 and 25
-Music_Routes2:: ; 82cd (2:42cd)
+Music_Routes2::
 	db ( $C0 | CH0 )
 	dw Music_Routes2_Ch1
 	db CH1
@@ -151,7 +151,7 @@
 	dw Music_Routes2_Ch4
 
 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
-Music_Routes3:: ; 82d9 (2:42d9)
+Music_Routes3::
 	db ( $C0 | CH0 )
 	dw Music_Routes3_Ch1
 	db CH1
@@ -162,7 +162,7 @@
 	dw Music_Routes3_Ch4
 
 ; Routes 11, 12, 13, 14, 15
-Music_Routes4:: ; 82d5 (2:42d5)
+Music_Routes4::
 	db ( $C0 | CH0 )
 	dw Music_Routes4_Ch1
 	db CH1
@@ -173,7 +173,7 @@
 	dw Music_Routes4_Ch4
 
 ; Route 23, Indigo Plateau
-Music_IndigoPlateau:: ; 82f1 (2:42f1)
+Music_IndigoPlateau::
 	db ( $C0 | CH0 )
 	dw Music_IndigoPlateau_Ch1
 	db CH1
--- a/audio/headers/musicheaders2.asm
+++ b/audio/headers/musicheaders2.asm
@@ -1,4 +1,4 @@
-Music_GymLeaderBattle:: ; 202be (8:42be)
+Music_GymLeaderBattle::
 	db ( $80 | CH0 )
 	dw Music_GymLeaderBattle_Ch1
 	db CH1
@@ -6,7 +6,7 @@
 	db CH2
 	dw Music_GymLeaderBattle_Ch3
 
-Music_TrainerBattle:: ; 202c7 (8:42c7)
+Music_TrainerBattle::
 	db ( $80 | CH0 )
 	dw Music_TrainerBattle_Ch1
 	db CH1
@@ -14,7 +14,7 @@
 	db CH2
 	dw Music_TrainerBattle_Ch3
 
-Music_WildBattle:: ; 202d0 (8:42d0)
+Music_WildBattle::
 	db ( $80 | CH0 )
 	dw Music_WildBattle_Ch1
 	db CH1
@@ -22,7 +22,7 @@
 	db CH2
 	dw Music_WildBattle_Ch3
 
-Music_FinalBattle:: ; 202d9 (8:42d9)
+Music_FinalBattle::
 	db ( $80 | CH0 )
 	dw Music_FinalBattle_Ch1
 	db CH1
@@ -30,7 +30,7 @@
 	db CH2
 	dw Music_FinalBattle_Ch3
 
-Music_DefeatedTrainer:: ; 202e2 (8:42e2)
+Music_DefeatedTrainer::
 	db ( $80 | CH0 )
 	dw Music_DefeatedTrainer_Ch1
 	db CH1
@@ -38,7 +38,7 @@
 	db CH2
 	dw Music_DefeatedTrainer_Ch3
 
-Music_DefeatedWildMon:: ; 202eb (8:42eb)
+Music_DefeatedWildMon::
 	db ( $80 | CH0 )
 	dw Music_DefeatedWildMon_Ch1
 	db CH1
@@ -46,7 +46,7 @@
 	db CH2
 	dw Music_DefeatedWildMon_Ch3
 
-Music_DefeatedGymLeader:: ; 202f4 (8:42f4)
+Music_DefeatedGymLeader::
 	db ( $80 | CH0 )
 	dw Music_DefeatedGymLeader_Ch1
 	db CH1
--- a/audio/headers/musicheaders3.asm
+++ b/audio/headers/musicheaders3.asm
@@ -1,4 +1,4 @@
-Music_TitleScreen:: ; 7c249 (1f:4249)
+Music_TitleScreen::
 	db ( $C0 | CH0 )
 	dw Music_TitleScreen_Ch1
 	db CH1
@@ -8,7 +8,7 @@
 	db CH3
 	dw Music_TitleScreen_Ch4
 
-Music_Credits:: ; 7c255 (1f:4255)
+Music_Credits::
 	db ( $80 | CH0 )
 	dw Music_Credits_Ch1
 	db CH1
@@ -16,7 +16,7 @@
 	db CH2
 	dw Music_Credits_Ch3
 
-Music_HallOfFame:: ; 7c25e (1f:425e)
+Music_HallOfFame::
 	db ( $80 | CH0 )
 	dw Music_HallOfFame_Ch1
 	db CH1
@@ -24,7 +24,7 @@
 	db CH2
 	dw Music_HallOfFame_Ch3
 
-Music_OaksLab:: ; 7c267 (1f:4267)
+Music_OaksLab::
 	db ( $80 | CH0 )
 	dw Music_OaksLab_Ch1
 	db CH1
@@ -32,13 +32,13 @@
 	db CH2
 	dw Music_OaksLab_Ch3
 
-Music_JigglypuffSong:: ; 7c270 (1f:4270)
+Music_JigglypuffSong::
 	db $40
 	dw Music_JigglypuffSong_Ch1
 	db CH1
 	dw Music_JigglypuffSong_Ch2
 
-Music_BikeRiding:: ; 7c276 (1f:4276)
+Music_BikeRiding::
 	db ( $C0 | CH0 )
 	dw Music_BikeRiding_Ch1
 	db CH1
@@ -48,7 +48,7 @@
 	db CH3
 	dw Music_BikeRiding_Ch4
 
-Music_Surfing:: ; 7c282 (1f:4282)
+Music_Surfing::
 	db ( $80 | CH0 )
 	dw Music_Surfing_Ch1
 	db CH1
@@ -56,7 +56,7 @@
 	db CH2
 	dw Music_Surfing_Ch3
 
-Music_GameCorner:: ; 7c28b (1f:428b)
+Music_GameCorner::
 	db ( $80 | CH0 )
 	dw Music_GameCorner_Ch1
 	db CH1
@@ -64,7 +64,7 @@
 	db CH2
 	dw Music_GameCorner_Ch3
 
-Music_IntroBattle:: ; 7c294 (1f:4294)
+Music_IntroBattle::
 	db ( $C0 | CH0 )
 	dw Music_IntroBattle_Ch1
 	db CH1
@@ -75,7 +75,7 @@
 	dw Music_IntroBattle_Ch4
 
 ; Power Plant, Unknown Dungeon, Rocket HQ
-Music_Dungeon1:: ; 7c2a0 (1f:42a0)
+Music_Dungeon1::
 	db ( $C0 | CH0 )
 	dw Music_Dungeon1_Ch1
 	db CH1
@@ -86,7 +86,7 @@
 	dw Music_Dungeon1_Ch4
 
 ; Viridian Forest, Seafoam Islands
-Music_Dungeon2:: ; 7c2ac (1f:42ac)
+Music_Dungeon2::
 	db ( $C0 | CH0 )
 	dw Music_Dungeon2_Ch1
 	db CH1
@@ -97,7 +97,7 @@
 	dw Music_Dungeon2_Ch4
 
 ; Mt. Moon, Rock Tunnel, Victory Road
-Music_Dungeon3:: ; 7c2b8 (1f:42b8)
+Music_Dungeon3::
 	db ( $C0 | CH0 )
 	dw Music_Dungeon3_Ch1
 	db CH1
@@ -107,7 +107,7 @@
 	db CH3
 	dw Music_Dungeon3_Ch4
 
-Music_CinnabarMansion:: ; 7c2c4 (1f:42c4)
+Music_CinnabarMansion::
 	db ( $C0 | CH0 )
 	dw Music_CinnabarMansion_Ch1
 	db CH1
@@ -117,7 +117,7 @@
 	db CH3
 	dw Music_CinnabarMansion_Ch4
 
-Music_PokemonTower:: ; 7c2d0 (1f:42d0)
+Music_PokemonTower::
 	db ( $80 | CH0 )
 	dw Music_PokemonTower_Ch1
 	db CH1
@@ -125,7 +125,7 @@
 	db CH2
 	dw Music_PokemonTower_Ch3
 
-Music_SilphCo:: ; 7c2d9 (1f:42d9)
+Music_SilphCo::
 	db ( $80 | CH0 )
 	dw Music_SilphCo_Ch1
 	db CH1
@@ -133,7 +133,7 @@
 	db CH2
 	dw Music_SilphCo_Ch3
 
-Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2)
+Music_MeetEvilTrainer::
 	db ( $80 | CH0 )
 	dw Music_MeetEvilTrainer_Ch1
 	db CH1
@@ -141,7 +141,7 @@
 	db CH2
 	dw Music_MeetEvilTrainer_Ch3
 
-Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb)
+Music_MeetFemaleTrainer::
 	db ( $80 | CH0 )
 	dw Music_MeetFemaleTrainer_Ch1
 	db CH1
@@ -149,7 +149,7 @@
 	db CH2
 	dw Music_MeetFemaleTrainer_Ch3
 
-Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4)
+Music_MeetMaleTrainer::
 	db ( $80 | CH0 )
 	dw Music_MeetMaleTrainer_Ch1
 	db CH1
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -1,83 +1,83 @@
 SFX_Headers_1::
 	db $ff, $ff, $ff ; padding
 
-SFX_Snare1_1:: ; 8003 (2:4003)
+SFX_Snare1_1::
 	db CH7
 	dw SFX_Snare1_1_Ch1
 
-SFX_Snare2_1:: ; 8006 (2:4006)
+SFX_Snare2_1::
 	db CH7
 	dw SFX_Snare2_1_Ch1
 
-SFX_Snare3_1:: ; 8009 (2:4009)
+SFX_Snare3_1::
 	db CH7
 	dw SFX_Snare3_1_Ch1
 
-SFX_Snare4_1:: ; 800c (2:400c)
+SFX_Snare4_1::
 	db CH7
 	dw SFX_Snare4_1_Ch1
 
-SFX_Snare5_1:: ; 800f (2:400f)
+SFX_Snare5_1::
 	db CH7
 	dw SFX_Snare5_1_Ch1
 
-SFX_Triangle1_1:: ; 8012 (2:4012)
+SFX_Triangle1_1::
 	db CH7
 	dw SFX_Triangle1_1_Ch1
 
-SFX_Triangle2_1:: ; 8015 (2:4015)
+SFX_Triangle2_1::
 	db CH7
 	dw SFX_Triangle2_1_Ch1
 
-SFX_Snare6_1:: ; 8018 (2:4018)
+SFX_Snare6_1::
 	db CH7
 	dw SFX_Snare6_1_Ch1
 
-SFX_Snare7_1:: ; 801b (2:401b)
+SFX_Snare7_1::
 	db CH7
 	dw SFX_Snare7_1_Ch1
 
-SFX_Snare8_1:: ; 801e (2:401e)
+SFX_Snare8_1::
 	db CH7
 	dw SFX_Snare8_1_Ch1
 
-SFX_Snare9_1:: ; 8021 (2:4021)
+SFX_Snare9_1::
 	db CH7
 	dw SFX_Snare9_1_Ch1
 
-SFX_Cymbal1_1:: ; 8024 (2:4024)
+SFX_Cymbal1_1::
 	db CH7
 	dw SFX_Cymbal1_1_Ch1
 
-SFX_Cymbal2_1:: ; 8027 (2:4027)
+SFX_Cymbal2_1::
 	db CH7
 	dw SFX_Cymbal2_1_Ch1
 
-SFX_Cymbal3_1:: ; 802a (2:402a)
+SFX_Cymbal3_1::
 	db CH7
 	dw SFX_Cymbal3_1_Ch1
 
-SFX_Muted_Snare1_1:: ; 802d (2:402d)
+SFX_Muted_Snare1_1::
 	db CH7
 	dw SFX_Muted_Snare1_1_Ch1
 
-SFX_Triangle3_1:: ; 8030 (2:4030)
+SFX_Triangle3_1::
 	db CH7
 	dw SFX_Triangle3_1_Ch1
 
-SFX_Muted_Snare2_1:: ; 8033 (2:4033)
+SFX_Muted_Snare2_1::
 	db CH7
 	dw SFX_Muted_Snare2_1_Ch1
 
-SFX_Muted_Snare3_1:: ; 8036 (2:4036)
+SFX_Muted_Snare3_1::
 	db CH7
 	dw SFX_Muted_Snare3_1_Ch1
 
-SFX_Muted_Snare4_1:: ; 8039 (2:4039)
+SFX_Muted_Snare4_1::
 	db CH7
 	dw SFX_Muted_Snare4_1_Ch1
 
-SFX_Cry00_1:: ; 803c (2:403c)
+SFX_Cry00_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry00_1_Ch1
 	db CH5
@@ -85,7 +85,7 @@
 	db CH7
 	dw SFX_Cry00_1_Ch3
 
-SFX_Cry01_1:: ; 8045 (2:4045)
+SFX_Cry01_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry01_1_Ch1
 	db CH5
@@ -93,7 +93,7 @@
 	db CH7
 	dw SFX_Cry01_1_Ch3
 
-SFX_Cry02_1:: ; 804e (2:404e)
+SFX_Cry02_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry02_1_Ch1
 	db CH5
@@ -101,7 +101,7 @@
 	db CH7
 	dw SFX_Cry02_1_Ch3
 
-SFX_Cry03_1:: ; 8057 (2:4057)
+SFX_Cry03_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry03_1_Ch1
 	db CH5
@@ -109,7 +109,7 @@
 	db CH7
 	dw SFX_Cry03_1_Ch3
 
-SFX_Cry04_1:: ; 8060 (2:4060)
+SFX_Cry04_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry04_1_Ch1
 	db CH5
@@ -117,7 +117,7 @@
 	db CH7
 	dw SFX_Cry04_1_Ch3
 
-SFX_Cry05_1:: ; 8069 (2:4069)
+SFX_Cry05_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry05_1_Ch1
 	db CH5
@@ -125,7 +125,7 @@
 	db CH7
 	dw SFX_Cry05_1_Ch3
 
-SFX_Cry06_1:: ; 8072 (2:4072)
+SFX_Cry06_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry06_1_Ch1
 	db CH5
@@ -133,7 +133,7 @@
 	db CH7
 	dw SFX_Cry06_1_Ch3
 
-SFX_Cry07_1:: ; 807b (2:407b)
+SFX_Cry07_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry07_1_Ch1
 	db CH5
@@ -141,7 +141,7 @@
 	db CH7
 	dw SFX_Cry07_1_Ch3
 
-SFX_Cry08_1:: ; 8084 (2:4084)
+SFX_Cry08_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry08_1_Ch1
 	db CH5
@@ -149,7 +149,7 @@
 	db CH7
 	dw SFX_Cry08_1_Ch3
 
-SFX_Cry09_1:: ; 808d (2:408d)
+SFX_Cry09_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry09_1_Ch1
 	db CH5
@@ -157,7 +157,7 @@
 	db CH7
 	dw SFX_Cry09_1_Ch3
 
-SFX_Cry0A_1:: ; 8096 (2:4096)
+SFX_Cry0A_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0A_1_Ch1
 	db CH5
@@ -165,7 +165,7 @@
 	db CH7
 	dw SFX_Cry0A_1_Ch3
 
-SFX_Cry0B_1:: ; 809f (2:409f)
+SFX_Cry0B_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0B_1_Ch1
 	db CH5
@@ -173,7 +173,7 @@
 	db CH7
 	dw SFX_Cry0B_1_Ch3
 
-SFX_Cry0C_1:: ; 80a8 (2:40a8)
+SFX_Cry0C_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0C_1_Ch1
 	db CH5
@@ -181,7 +181,7 @@
 	db CH7
 	dw SFX_Cry0C_1_Ch3
 
-SFX_Cry0D_1:: ; 80b1 (2:40b1)
+SFX_Cry0D_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0D_1_Ch1
 	db CH5
@@ -189,7 +189,7 @@
 	db CH7
 	dw SFX_Cry0D_1_Ch3
 
-SFX_Cry0E_1:: ; 80ba (2:40ba)
+SFX_Cry0E_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0E_1_Ch1
 	db CH5
@@ -197,7 +197,7 @@
 	db CH7
 	dw SFX_Cry0E_1_Ch3
 
-SFX_Cry0F_1:: ; 80c3 (2:40c3)
+SFX_Cry0F_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0F_1_Ch1
 	db CH5
@@ -205,7 +205,7 @@
 	db CH7
 	dw SFX_Cry0F_1_Ch3
 
-SFX_Cry10_1:: ; 80cc (2:40cc)
+SFX_Cry10_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry10_1_Ch1
 	db CH5
@@ -213,7 +213,7 @@
 	db CH7
 	dw SFX_Cry10_1_Ch3
 
-SFX_Cry11_1:: ; 80d5 (2:40d5)
+SFX_Cry11_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry11_1_Ch1
 	db CH5
@@ -221,7 +221,7 @@
 	db CH7
 	dw SFX_Cry11_1_Ch3
 
-SFX_Cry12_1:: ; 80de (2:40de)
+SFX_Cry12_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry12_1_Ch1
 	db CH5
@@ -229,7 +229,7 @@
 	db CH7
 	dw SFX_Cry12_1_Ch3
 
-SFX_Cry13_1:: ; 80e7 (2:40e7)
+SFX_Cry13_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry13_1_Ch1
 	db CH5
@@ -237,7 +237,7 @@
 	db CH7
 	dw SFX_Cry13_1_Ch3
 
-SFX_Cry14_1:: ; 80f0 (2:40f0)
+SFX_Cry14_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry14_1_Ch1
 	db CH5
@@ -245,7 +245,7 @@
 	db CH7
 	dw SFX_Cry14_1_Ch3
 
-SFX_Cry15_1:: ; 80f9 (2:40f9)
+SFX_Cry15_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry15_1_Ch1
 	db CH5
@@ -253,7 +253,7 @@
 	db CH7
 	dw SFX_Cry15_1_Ch3
 
-SFX_Cry16_1:: ; 8102 (2:4102)
+SFX_Cry16_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry16_1_Ch1
 	db CH5
@@ -261,7 +261,7 @@
 	db CH7
 	dw SFX_Cry16_1_Ch3
 
-SFX_Cry17_1:: ; 810b (2:410b)
+SFX_Cry17_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry17_1_Ch1
 	db CH5
@@ -269,7 +269,7 @@
 	db CH7
 	dw SFX_Cry17_1_Ch3
 
-SFX_Cry18_1:: ; 8114 (2:4114)
+SFX_Cry18_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry18_1_Ch1
 	db CH5
@@ -277,7 +277,7 @@
 	db CH7
 	dw SFX_Cry18_1_Ch3
 
-SFX_Cry19_1:: ; 811d (2:411d)
+SFX_Cry19_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry19_1_Ch1
 	db CH5
@@ -285,7 +285,7 @@
 	db CH7
 	dw SFX_Cry19_1_Ch3
 
-SFX_Cry1A_1:: ; 8126 (2:4126)
+SFX_Cry1A_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1A_1_Ch1
 	db CH5
@@ -293,7 +293,7 @@
 	db CH7
 	dw SFX_Cry1A_1_Ch3
 
-SFX_Cry1B_1:: ; 812f (2:412f)
+SFX_Cry1B_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1B_1_Ch1
 	db CH5
@@ -301,7 +301,7 @@
 	db CH7
 	dw SFX_Cry1B_1_Ch3
 
-SFX_Cry1C_1:: ; 8138 (2:4138)
+SFX_Cry1C_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1C_1_Ch1
 	db CH5
@@ -309,7 +309,7 @@
 	db CH7
 	dw SFX_Cry1C_1_Ch3
 
-SFX_Cry1D_1:: ; 8141 (2:4141)
+SFX_Cry1D_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1D_1_Ch1
 	db CH5
@@ -317,7 +317,7 @@
 	db CH7
 	dw SFX_Cry1D_1_Ch3
 
-SFX_Cry1E_1:: ; 814a (2:414a)
+SFX_Cry1E_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1E_1_Ch1
 	db CH5
@@ -325,7 +325,7 @@
 	db CH7
 	dw SFX_Cry1E_1_Ch3
 
-SFX_Cry1F_1:: ; 8153 (2:4153)
+SFX_Cry1F_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1F_1_Ch1
 	db CH5
@@ -333,7 +333,7 @@
 	db CH7
 	dw SFX_Cry1F_1_Ch3
 
-SFX_Cry20_1:: ; 815c (2:415c)
+SFX_Cry20_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry20_1_Ch1
 	db CH5
@@ -341,7 +341,7 @@
 	db CH7
 	dw SFX_Cry20_1_Ch3
 
-SFX_Cry21_1:: ; 8165 (2:4165)
+SFX_Cry21_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry21_1_Ch1
 	db CH5
@@ -349,7 +349,7 @@
 	db CH7
 	dw SFX_Cry21_1_Ch3
 
-SFX_Cry22_1:: ; 816e (2:416e)
+SFX_Cry22_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry22_1_Ch1
 	db CH5
@@ -357,7 +357,7 @@
 	db CH7
 	dw SFX_Cry22_1_Ch3
 
-SFX_Cry23_1:: ; 8177 (2:4177)
+SFX_Cry23_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry23_1_Ch1
 	db CH5
@@ -365,7 +365,7 @@
 	db CH7
 	dw SFX_Cry23_1_Ch3
 
-SFX_Cry24_1:: ; 8180 (2:4180)
+SFX_Cry24_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry24_1_Ch1
 	db CH5
@@ -373,7 +373,7 @@
 	db CH7
 	dw SFX_Cry24_1_Ch3
 
-SFX_Cry25_1:: ; 8189 (2:4189)
+SFX_Cry25_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry25_1_Ch1
 	db CH5
@@ -381,7 +381,7 @@
 	db CH7
 	dw SFX_Cry25_1_Ch3
 
-SFX_Get_Item1_1:: ; 8192 (2:4192)
+SFX_Get_Item1_1::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item1_1_Ch1
 	db CH5
@@ -389,7 +389,7 @@
 	db CH6
 	dw SFX_Get_Item1_1_Ch3
 
-SFX_Get_Item2_1:: ; 819b (2:419b)
+SFX_Get_Item2_1::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item2_1_Ch1
 	db CH5
@@ -397,27 +397,27 @@
 	db CH6
 	dw SFX_Get_Item2_1_Ch3
 
-SFX_Tink_1:: ; 81a4 (2:41a4)
+SFX_Tink_1::
 	db CH4
 	dw SFX_Tink_1_Ch1
 
-SFX_Heal_HP_1:: ; 81a7 (2:41a7)
+SFX_Heal_HP_1::
 	db CH4
 	dw SFX_Heal_HP_1_Ch1
 
-SFX_Heal_Ailment_1:: ; 81aa (2:41aa)
+SFX_Heal_Ailment_1::
 	db CH4
 	dw SFX_Heal_Ailment_1_Ch1
 
-SFX_Start_Menu_1:: ; 81ad (2:41ad)
+SFX_Start_Menu_1::
 	db CH7
 	dw SFX_Start_Menu_1_Ch1
 
-SFX_Press_AB_1:: ; 81b0 (2:41b0)
+SFX_Press_AB_1::
 	db CH4
 	dw SFX_Press_AB_1_Ch1
 
-SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3)
+SFX_Pokedex_Rating_1::
 	db ( $80 | CH4 )
 	dw SFX_Pokedex_Rating_1_Ch1
 	db CH5
@@ -425,7 +425,7 @@
 	db CH6
 	dw SFX_Pokedex_Rating_1_Ch3
 
-SFX_Get_Key_Item_1:: ; 81bc (2:41bc)
+SFX_Get_Key_Item_1::
 	db ( $80 | CH4 )
 	dw SFX_Get_Key_Item_1_Ch1
 	db CH5
@@ -433,130 +433,130 @@
 	db CH6
 	dw SFX_Get_Key_Item_1_Ch3
 
-SFX_Poisoned_1:: ; 81c5 (2:41c5)
+SFX_Poisoned_1::
 	db CH4
 	dw SFX_Poisoned_1_Ch1
 
-SFX_Trade_Machine_1:: ; 81c8 (2:41c8)
+SFX_Trade_Machine_1::
 	db CH4
 	dw SFX_Trade_Machine_1_Ch1
 
-SFX_Turn_On_PC_1:: ; 81cb (2:41cb)
+SFX_Turn_On_PC_1::
 	db CH4
 	dw SFX_Turn_On_PC_1_Ch1
 
-SFX_Turn_Off_PC_1:: ; 81ce (2:41ce)
+SFX_Turn_Off_PC_1::
 	db CH4
 	dw SFX_Turn_Off_PC_1_Ch1
 
-SFX_Enter_PC_1:: ; 81d1 (2:41d1)
+SFX_Enter_PC_1::
 	db CH4
 	dw SFX_Enter_PC_1_Ch1
 
-SFX_Shrink_1:: ; 81d4 (2:41d4)
+SFX_Shrink_1::
 	db CH4
 	dw SFX_Shrink_1_Ch1
 
-SFX_Switch_1:: ; 81d7 (2:41d7)
+SFX_Switch_1::
 	db CH4
 	dw SFX_Switch_1_Ch1
 
-SFX_Healing_Machine_1:: ; 81da (2:41da)
+SFX_Healing_Machine_1::
 	db CH4
 	dw SFX_Healing_Machine_1_Ch1
 
-SFX_Teleport_Exit1_1:: ; 81dd (2:41dd)
+SFX_Teleport_Exit1_1::
 	db CH4
 	dw SFX_Teleport_Exit1_1_Ch1
 
-SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0)
+SFX_Teleport_Enter1_1::
 	db CH4
 	dw SFX_Teleport_Enter1_1_Ch1
 
-SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3)
+SFX_Teleport_Exit2_1::
 	db CH4
 	dw SFX_Teleport_Exit2_1_Ch1
 
-SFX_Ledge_1:: ; 81e6 (2:41e6)
+SFX_Ledge_1::
 	db CH4
 	dw SFX_Ledge_1_Ch1
 
-SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9)
+SFX_Teleport_Enter2_1::
 	db CH7
 	dw SFX_Teleport_Enter2_1_Ch1
 
-SFX_Fly_1:: ; 81ec (2:41ec)
+SFX_Fly_1::
 	db CH7
 	dw SFX_Fly_1_Ch1
 
-SFX_Denied_1:: ; 81ef (2:41ef)
+SFX_Denied_1::
 	db ( $40 | CH4 )
 	dw SFX_Denied_1_Ch1
 	db CH5
 	dw SFX_Denied_1_Ch2
 
-SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5)
+SFX_Arrow_Tiles_1::
 	db CH4
 	dw SFX_Arrow_Tiles_1_Ch1
 
-SFX_Push_Boulder_1:: ; 81f8 (2:41f8)
+SFX_Push_Boulder_1::
 	db CH7
 	dw SFX_Push_Boulder_1_Ch1
 
-SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb)
+SFX_SS_Anne_Horn_1::
 	db ( $40 | CH4 )
 	dw SFX_SS_Anne_Horn_1_Ch1
 	db CH5
 	dw SFX_SS_Anne_Horn_1_Ch2
 
-SFX_Withdraw_Deposit_1:: ; 8201 (2:4201)
+SFX_Withdraw_Deposit_1::
 	db CH4
 	dw SFX_Withdraw_Deposit_1_Ch1
 
-SFX_Cut_1:: ; 8204 (2:4204)
+SFX_Cut_1::
 	db CH7
 	dw SFX_Cut_1_Ch1
 
-SFX_Go_Inside_1:: ; 8207 (2:4207)
+SFX_Go_Inside_1::
 	db CH7
 	dw SFX_Go_Inside_1_Ch1
 
-SFX_Swap_1:: ; 820a (2:420a)
+SFX_Swap_1::
 	db ( $40 | CH4 )
 	dw SFX_Swap_1_Ch1
 	db CH5
 	dw SFX_Swap_1_Ch2
 
-SFX_59_1:: ; 8210 (2:4210)
+SFX_59_1::
 	db ( $40 | CH4 )
 	dw SFX_59_1_Ch1
 	db CH5
 	dw SFX_59_1_Ch2
 
-SFX_Purchase_1:: ; 8216 (2:4216)
+SFX_Purchase_1::
 	db ( $40 | CH4 )
 	dw SFX_Purchase_1_Ch1
 	db CH5
 	dw SFX_Purchase_1_Ch2
 
-SFX_Collision_1:: ; 821c (2:421c)
+SFX_Collision_1::
 	db CH4
 	dw SFX_Collision_1_Ch1
 
-SFX_Go_Outside_1:: ; 821f (2:421f)
+SFX_Go_Outside_1::
 	db CH7
 	dw SFX_Go_Outside_1_Ch1
 
-SFX_Save_1:: ; 8222 (2:4222)
+SFX_Save_1::
 	db ( $40 | CH4 )
 	dw SFX_Save_1_Ch1
 	db CH5
 	dw SFX_Save_1_Ch2
 
-SFX_Pokeflute:: ; 8228 (2:4228)
+SFX_Pokeflute::
 	db CH2
 	dw SFX_Pokeflute_Ch1
 
-SFX_Safari_Zone_PA:: ; 822b (2:422b)
+SFX_Safari_Zone_PA::
 	db CH4
 	dw SFX_Safari_Zone_PA_Ch1
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -1,83 +1,83 @@
 SFX_Headers_2::
 	db $ff, $ff, $ff ; padding
 
-SFX_Snare1_2:: ; 20003 (8:4003)
+SFX_Snare1_2::
 	db CH7
 	dw SFX_Snare1_2_Ch1
 
-SFX_Snare2_2:: ; 20006 (8:4006)
+SFX_Snare2_2::
 	db CH7
 	dw SFX_Snare2_2_Ch1
 
-SFX_Snare3_2:: ; 20009 (8:4009)
+SFX_Snare3_2::
 	db CH7
 	dw SFX_Snare3_2_Ch1
 
-SFX_Snare4_2:: ; 2000c (8:400c)
+SFX_Snare4_2::
 	db CH7
 	dw SFX_Snare4_2_Ch1
 
-SFX_Snare5_2:: ; 2000f (8:400f)
+SFX_Snare5_2::
 	db CH7
 	dw SFX_Snare5_2_Ch1
 
-SFX_Triangle1_2:: ; 20012 (8:4012)
+SFX_Triangle1_2::
 	db CH7
 	dw SFX_Triangle1_2_Ch1
 
-SFX_Triangle2_2:: ; 20015 (8:4015)
+SFX_Triangle2_2::
 	db CH7
 	dw SFX_Triangle2_2_Ch1
 
-SFX_Snare6_2:: ; 20018 (8:4018)
+SFX_Snare6_2::
 	db CH7
 	dw SFX_Snare6_2_Ch1
 
-SFX_Snare7_2:: ; 2001b (8:401b)
+SFX_Snare7_2::
 	db CH7
 	dw SFX_Snare7_2_Ch1
 
-SFX_Snare8_2:: ; 2001e (8:401e)
+SFX_Snare8_2::
 	db CH7
 	dw SFX_Snare8_2_Ch1
 
-SFX_Snare9_2:: ; 20021 (8:4021)
+SFX_Snare9_2::
 	db CH7
 	dw SFX_Snare9_2_Ch1
 
-SFX_Cymbal1_2:: ; 20024 (8:4024)
+SFX_Cymbal1_2::
 	db CH7
 	dw SFX_Cymbal1_2_Ch1
 
-SFX_Cymbal2_2:: ; 20027 (8:4027)
+SFX_Cymbal2_2::
 	db CH7
 	dw SFX_Cymbal2_2_Ch1
 
-SFX_Cymbal3_2:: ; 2002a (8:402a)
+SFX_Cymbal3_2::
 	db CH7
 	dw SFX_Cymbal3_2_Ch1
 
-SFX_Muted_Snare1_2:: ; 2002d (8:402d)
+SFX_Muted_Snare1_2::
 	db CH7
 	dw SFX_Muted_Snare1_2_Ch1
 
-SFX_Triangle3_2:: ; 20030 (8:4030)
+SFX_Triangle3_2::
 	db CH7
 	dw SFX_Triangle3_2_Ch1
 
-SFX_Muted_Snare2_2:: ; 20033 (8:4033)
+SFX_Muted_Snare2_2::
 	db CH7
 	dw SFX_Muted_Snare2_2_Ch1
 
-SFX_Muted_Snare3_2:: ; 20036 (8:4036)
+SFX_Muted_Snare3_2::
 	db CH7
 	dw SFX_Muted_Snare3_2_Ch1
 
-SFX_Muted_Snare4_2:: ; 20039 (8:4039)
+SFX_Muted_Snare4_2::
 	db CH7
 	dw SFX_Muted_Snare4_2_Ch1
 
-SFX_Cry00_2:: ; 2003c (8:403c)
+SFX_Cry00_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry00_2_Ch1
 	db CH5
@@ -85,7 +85,7 @@
 	db CH7
 	dw SFX_Cry00_2_Ch3
 
-SFX_Cry01_2:: ; 20045 (8:4045)
+SFX_Cry01_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry01_2_Ch1
 	db CH5
@@ -93,7 +93,7 @@
 	db CH7
 	dw SFX_Cry01_2_Ch3
 
-SFX_Cry02_2:: ; 2004e (8:404e)
+SFX_Cry02_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry02_2_Ch1
 	db CH5
@@ -101,7 +101,7 @@
 	db CH7
 	dw SFX_Cry02_2_Ch3
 
-SFX_Cry03_2:: ; 20057 (8:4057)
+SFX_Cry03_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry03_2_Ch1
 	db CH5
@@ -109,7 +109,7 @@
 	db CH7
 	dw SFX_Cry03_2_Ch3
 
-SFX_Cry04_2:: ; 20060 (8:4060)
+SFX_Cry04_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry04_2_Ch1
 	db CH5
@@ -117,7 +117,7 @@
 	db CH7
 	dw SFX_Cry04_2_Ch3
 
-SFX_Cry05_2:: ; 20069 (8:4069)
+SFX_Cry05_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry05_2_Ch1
 	db CH5
@@ -125,7 +125,7 @@
 	db CH7
 	dw SFX_Cry05_2_Ch3
 
-SFX_Cry06_2:: ; 20072 (8:4072)
+SFX_Cry06_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry06_2_Ch1
 	db CH5
@@ -133,7 +133,7 @@
 	db CH7
 	dw SFX_Cry06_2_Ch3
 
-SFX_Cry07_2:: ; 2007b (8:407b)
+SFX_Cry07_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry07_2_Ch1
 	db CH5
@@ -141,7 +141,7 @@
 	db CH7
 	dw SFX_Cry07_2_Ch3
 
-SFX_Cry08_2:: ; 20084 (8:4084)
+SFX_Cry08_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry08_2_Ch1
 	db CH5
@@ -149,7 +149,7 @@
 	db CH7
 	dw SFX_Cry08_2_Ch3
 
-SFX_Cry09_2:: ; 2008d (8:408d)
+SFX_Cry09_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry09_2_Ch1
 	db CH5
@@ -157,7 +157,7 @@
 	db CH7
 	dw SFX_Cry09_2_Ch3
 
-SFX_Cry0A_2:: ; 20096 (8:4096)
+SFX_Cry0A_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0A_2_Ch1
 	db CH5
@@ -165,7 +165,7 @@
 	db CH7
 	dw SFX_Cry0A_2_Ch3
 
-SFX_Cry0B_2:: ; 2009f (8:409f)
+SFX_Cry0B_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0B_2_Ch1
 	db CH5
@@ -173,7 +173,7 @@
 	db CH7
 	dw SFX_Cry0B_2_Ch3
 
-SFX_Cry0C_2:: ; 200a8 (8:40a8)
+SFX_Cry0C_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0C_2_Ch1
 	db CH5
@@ -181,7 +181,7 @@
 	db CH7
 	dw SFX_Cry0C_2_Ch3
 
-SFX_Cry0D_2:: ; 200b1 (8:40b1)
+SFX_Cry0D_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0D_2_Ch1
 	db CH5
@@ -189,7 +189,7 @@
 	db CH7
 	dw SFX_Cry0D_2_Ch3
 
-SFX_Cry0E_2:: ; 200ba (8:40ba)
+SFX_Cry0E_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0E_2_Ch1
 	db CH5
@@ -197,7 +197,7 @@
 	db CH7
 	dw SFX_Cry0E_2_Ch3
 
-SFX_Cry0F_2:: ; 200c3 (8:40c3)
+SFX_Cry0F_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0F_2_Ch1
 	db CH5
@@ -205,7 +205,7 @@
 	db CH7
 	dw SFX_Cry0F_2_Ch3
 
-SFX_Cry10_2:: ; 200cc (8:40cc)
+SFX_Cry10_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry10_2_Ch1
 	db CH5
@@ -213,7 +213,7 @@
 	db CH7
 	dw SFX_Cry10_2_Ch3
 
-SFX_Cry11_2:: ; 200d5 (8:40d5)
+SFX_Cry11_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry11_2_Ch1
 	db CH5
@@ -221,7 +221,7 @@
 	db CH7
 	dw SFX_Cry11_2_Ch3
 
-SFX_Cry12_2:: ; 200de (8:40de)
+SFX_Cry12_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry12_2_Ch1
 	db CH5
@@ -229,7 +229,7 @@
 	db CH7
 	dw SFX_Cry12_2_Ch3
 
-SFX_Cry13_2:: ; 200e7 (8:40e7)
+SFX_Cry13_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry13_2_Ch1
 	db CH5
@@ -237,7 +237,7 @@
 	db CH7
 	dw SFX_Cry13_2_Ch3
 
-SFX_Cry14_2:: ; 200f0 (8:40f0)
+SFX_Cry14_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry14_2_Ch1
 	db CH5
@@ -245,7 +245,7 @@
 	db CH7
 	dw SFX_Cry14_2_Ch3
 
-SFX_Cry15_2:: ; 200f9 (8:40f9)
+SFX_Cry15_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry15_2_Ch1
 	db CH5
@@ -253,7 +253,7 @@
 	db CH7
 	dw SFX_Cry15_2_Ch3
 
-SFX_Cry16_2:: ; 20102 (8:4102)
+SFX_Cry16_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry16_2_Ch1
 	db CH5
@@ -261,7 +261,7 @@
 	db CH7
 	dw SFX_Cry16_2_Ch3
 
-SFX_Cry17_2:: ; 2010b (8:410b)
+SFX_Cry17_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry17_2_Ch1
 	db CH5
@@ -269,7 +269,7 @@
 	db CH7
 	dw SFX_Cry17_2_Ch3
 
-SFX_Cry18_2:: ; 20114 (8:4114)
+SFX_Cry18_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry18_2_Ch1
 	db CH5
@@ -277,7 +277,7 @@
 	db CH7
 	dw SFX_Cry18_2_Ch3
 
-SFX_Cry19_2:: ; 2011d (8:411d)
+SFX_Cry19_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry19_2_Ch1
 	db CH5
@@ -285,7 +285,7 @@
 	db CH7
 	dw SFX_Cry19_2_Ch3
 
-SFX_Cry1A_2:: ; 20126 (8:4126)
+SFX_Cry1A_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1A_2_Ch1
 	db CH5
@@ -293,7 +293,7 @@
 	db CH7
 	dw SFX_Cry1A_2_Ch3
 
-SFX_Cry1B_2:: ; 2012f (8:412f)
+SFX_Cry1B_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1B_2_Ch1
 	db CH5
@@ -301,7 +301,7 @@
 	db CH7
 	dw SFX_Cry1B_2_Ch3
 
-SFX_Cry1C_2:: ; 20138 (8:4138)
+SFX_Cry1C_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1C_2_Ch1
 	db CH5
@@ -309,7 +309,7 @@
 	db CH7
 	dw SFX_Cry1C_2_Ch3
 
-SFX_Cry1D_2:: ; 20141 (8:4141)
+SFX_Cry1D_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1D_2_Ch1
 	db CH5
@@ -317,7 +317,7 @@
 	db CH7
 	dw SFX_Cry1D_2_Ch3
 
-SFX_Cry1E_2:: ; 2014a (8:414a)
+SFX_Cry1E_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1E_2_Ch1
 	db CH5
@@ -325,7 +325,7 @@
 	db CH7
 	dw SFX_Cry1E_2_Ch3
 
-SFX_Cry1F_2:: ; 20153 (8:4153)
+SFX_Cry1F_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1F_2_Ch1
 	db CH5
@@ -333,7 +333,7 @@
 	db CH7
 	dw SFX_Cry1F_2_Ch3
 
-SFX_Cry20_2:: ; 2015c (8:415c)
+SFX_Cry20_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry20_2_Ch1
 	db CH5
@@ -341,7 +341,7 @@
 	db CH7
 	dw SFX_Cry20_2_Ch3
 
-SFX_Cry21_2:: ; 20165 (8:4165)
+SFX_Cry21_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry21_2_Ch1
 	db CH5
@@ -349,7 +349,7 @@
 	db CH7
 	dw SFX_Cry21_2_Ch3
 
-SFX_Cry22_2:: ; 2016e (8:416e)
+SFX_Cry22_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry22_2_Ch1
 	db CH5
@@ -357,7 +357,7 @@
 	db CH7
 	dw SFX_Cry22_2_Ch3
 
-SFX_Cry23_2:: ; 20177 (8:4177)
+SFX_Cry23_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry23_2_Ch1
 	db CH5
@@ -365,7 +365,7 @@
 	db CH7
 	dw SFX_Cry23_2_Ch3
 
-SFX_Cry24_2:: ; 20180 (8:4180)
+SFX_Cry24_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry24_2_Ch1
 	db CH5
@@ -373,7 +373,7 @@
 	db CH7
 	dw SFX_Cry24_2_Ch3
 
-SFX_Cry25_2:: ; 20189 (8:4189)
+SFX_Cry25_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry25_2_Ch1
 	db CH5
@@ -381,7 +381,7 @@
 	db CH7
 	dw SFX_Cry25_2_Ch3
 
-SFX_Level_Up:: ; 20192 (8:4192)
+SFX_Level_Up::
 	db ( $80 | CH4 )
 	dw SFX_Level_Up_Ch1
 	db CH5
@@ -389,7 +389,7 @@
 	db CH6
 	dw SFX_Level_Up_Ch3
 
-SFX_Get_Item2_2:: ; 2019b (8:419b)
+SFX_Get_Item2_2::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item2_2_Ch1
 	db CH5
@@ -397,55 +397,55 @@
 	db CH6
 	dw SFX_Get_Item2_2_Ch3
 
-SFX_Tink_2:: ; 201a4 (8:41a4)
+SFX_Tink_2::
 	db CH4
 	dw SFX_Tink_2_Ch1
 
-SFX_Heal_HP_2:: ; 201a7 (8:41a7)
+SFX_Heal_HP_2::
 	db CH4
 	dw SFX_Heal_HP_2_Ch1
 
-SFX_Heal_Ailment_2:: ; 201aa (8:41aa)
+SFX_Heal_Ailment_2::
 	db CH4
 	dw SFX_Heal_Ailment_2_Ch1
 
-SFX_Start_Menu_2:: ; 201ad (8:41ad)
+SFX_Start_Menu_2::
 	db CH7
 	dw SFX_Start_Menu_2_Ch1
 
-SFX_Press_AB_2:: ; 201b0 (8:41b0)
+SFX_Press_AB_2::
 	db CH4
 	dw SFX_Press_AB_2_Ch1
 
-SFX_Ball_Toss:: ; 201b3 (8:41b3)
+SFX_Ball_Toss::
 	db ( $40 | CH4 )
 	dw SFX_Ball_Toss_Ch1
 	db CH5
 	dw SFX_Ball_Toss_Ch2
 
-SFX_Ball_Poof:: ; 201b9 (8:41b9)
+SFX_Ball_Poof::
 	db ( $40 | CH4 )
 	dw SFX_Ball_Poof_Ch1
 	db CH7
 	dw SFX_Ball_Poof_Ch2
 
-SFX_Faint_Thud:: ; 201bf (8:41bf)
+SFX_Faint_Thud::
 	db ( $40 | CH4 )
 	dw SFX_Faint_Thud_Ch1
 	db CH7
 	dw SFX_Faint_Thud_Ch2
 
-SFX_Run:: ; 201c5 (8:41c5)
+SFX_Run::
 	db CH7
 	dw SFX_Run_Ch1
 
-SFX_Dex_Page_Added:: ; 201c8 (8:41c8)
+SFX_Dex_Page_Added::
 	db ( $40 | CH4 )
 	dw SFX_Dex_Page_Added_Ch1
 	db CH5
 	dw SFX_Dex_Page_Added_Ch2
 
-SFX_Caught_Mon:: ; 201ce (8:41ce)
+SFX_Caught_Mon::
 	db ( $80 | CH4 )
 	dw SFX_Caught_Mon_Ch1
 	db CH5
@@ -453,139 +453,139 @@
 	db CH6
 	dw SFX_Caught_Mon_Ch3
 
-SFX_Peck:: ; 201d7 (8:41d7)
+SFX_Peck::
 	db CH7
 	dw SFX_Peck_Ch1
 
-SFX_Faint_Fall:: ; 201da (8:41da)
+SFX_Faint_Fall::
 	db CH4
 	dw SFX_Faint_Fall_Ch1
 
-SFX_Battle_09:: ; 201dd (8:41dd)
+SFX_Battle_09::
 	db CH4
 	dw SFX_Battle_09_Ch1
 
-SFX_Pound:: ; 201e0 (8:41e0)
+SFX_Pound::
 	db CH7
 	dw SFX_Pound_Ch1
 
-SFX_Battle_0B:: ; 201e3 (8:41e3)
+SFX_Battle_0B::
 	db CH7
 	dw SFX_Battle_0B_Ch1
 
-SFX_Battle_0C:: ; 201e6 (8:41e6)
+SFX_Battle_0C::
 	db CH7
 	dw SFX_Battle_0C_Ch1
 
-SFX_Battle_0D:: ; 201e9 (8:41e9)
+SFX_Battle_0D::
 	db CH7
 	dw SFX_Battle_0D_Ch1
 
-SFX_Battle_0E:: ; 201ec (8:41ec)
+SFX_Battle_0E::
 	db CH7
 	dw SFX_Battle_0E_Ch1
 
-SFX_Battle_0F:: ; 201ef (8:41ef)
+SFX_Battle_0F::
 	db CH7
 	dw SFX_Battle_0F_Ch1
 
-SFX_Damage:: ; 201f2 (8:41f2)
+SFX_Damage::
 	db CH7
 	dw SFX_Damage_Ch1
 
-SFX_Not_Very_Effective:: ; 201f5 (8:41f5)
+SFX_Not_Very_Effective::
 	db CH7
 	dw SFX_Not_Very_Effective_Ch1
 
-SFX_Battle_12:: ; 201f8 (8:41f8)
+SFX_Battle_12::
 	db CH7
 	dw SFX_Battle_12_Ch1
 
-SFX_Battle_13:: ; 201fb (8:41fb)
+SFX_Battle_13::
 	db CH7
 	dw SFX_Battle_13_Ch1
 
-SFX_Battle_14:: ; 201fe (8:41fe)
+SFX_Battle_14::
 	db CH7
 	dw SFX_Battle_14_Ch1
 
-SFX_Vine_Whip:: ; 20201 (8:4201)
+SFX_Vine_Whip::
 	db CH7
 	dw SFX_Vine_Whip_Ch1
 
-SFX_Battle_16:: ; 20204 (8:4204)
+SFX_Battle_16::
 	db CH7
 	dw SFX_Battle_16_Ch1
 
-SFX_Battle_17:: ; 20207 (8:4207)
+SFX_Battle_17::
 	db CH7
 	dw SFX_Battle_17_Ch1
 
-SFX_Battle_18:: ; 2020a (8:420a)
+SFX_Battle_18::
 	db CH7
 	dw SFX_Battle_18_Ch1
 
-SFX_Battle_19:: ; 2020d (8:420d)
+SFX_Battle_19::
 	db CH7
 	dw SFX_Battle_19_Ch1
 
-SFX_Super_Effective:: ; 20210 (8:4210)
+SFX_Super_Effective::
 	db CH7
 	dw SFX_Super_Effective_Ch1
 
-SFX_Battle_1B:: ; 20213 (8:4213)
+SFX_Battle_1B::
 	db CH7
 	dw SFX_Battle_1B_Ch1
 
-SFX_Battle_1C:: ; 20216 (8:4216)
+SFX_Battle_1C::
 	db CH7
 	dw SFX_Battle_1C_Ch1
 
-SFX_Doubleslap:: ; 20219 (8:4219)
+SFX_Doubleslap::
 	db CH7
 	dw SFX_Doubleslap_Ch1
 
-SFX_Battle_1E:: ; 2021c (8:421c)
+SFX_Battle_1E::
 	db ( $40 | CH4 )
 	dw SFX_Battle_1E_Ch1
 	db CH7
 	dw SFX_Battle_1E_Ch2
 
-SFX_Horn_Drill:: ; 20222 (8:4222)
+SFX_Horn_Drill::
 	db CH7
 	dw SFX_Horn_Drill_Ch1
 
-SFX_Battle_20:: ; 20225 (8:4225)
+SFX_Battle_20::
 	db CH7
 	dw SFX_Battle_20_Ch1
 
-SFX_Battle_21:: ; 20228 (8:4228)
+SFX_Battle_21::
 	db CH7
 	dw SFX_Battle_21_Ch1
 
-SFX_Battle_22:: ; 2022b (8:422b)
+SFX_Battle_22::
 	db CH7
 	dw SFX_Battle_22_Ch1
 
-SFX_Battle_23:: ; 2022e (8:422e)
+SFX_Battle_23::
 	db CH7
 	dw SFX_Battle_23_Ch1
 
-SFX_Battle_24:: ; 20231 (8:4231)
+SFX_Battle_24::
 	db ( $40 | CH4 )
 	dw SFX_Battle_24_Ch1
 	db CH7
 	dw SFX_Battle_24_Ch2
 
-SFX_Battle_25:: ; 20237 (8:4237)
+SFX_Battle_25::
 	db CH7
 	dw SFX_Battle_25_Ch1
 
-SFX_Battle_26:: ; 2023a (8:423a)
+SFX_Battle_26::
 	db CH7
 	dw SFX_Battle_26_Ch1
 
-SFX_Battle_27:: ; 2023d (8:423d)
+SFX_Battle_27::
 	db ( $80 | CH4 )
 	dw SFX_Battle_27_Ch1
 	db CH5
@@ -593,7 +593,7 @@
 	db CH7
 	dw SFX_Battle_27_Ch3
 
-SFX_Battle_28:: ; 20246 (8:4246)
+SFX_Battle_28::
 	db ( $80 | CH4 )
 	dw SFX_Battle_28_Ch1
 	db CH5
@@ -601,13 +601,13 @@
 	db CH7
 	dw SFX_Battle_28_Ch3
 
-SFX_Battle_29:: ; 2024f (8:424f)
+SFX_Battle_29::
 	db ( $40 | CH4 )
 	dw SFX_Battle_29_Ch1
 	db CH7
 	dw SFX_Battle_29_Ch2
 
-SFX_Battle_2A:: ; 20255 (8:4255)
+SFX_Battle_2A::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2A_Ch1
 	db CH5
@@ -615,13 +615,13 @@
 	db CH7
 	dw SFX_Battle_2A_Ch3
 
-SFX_Battle_2B:: ; 2025e (8:425e)
+SFX_Battle_2B::
 	db ( $40 | CH4 )
 	dw SFX_Battle_2B_Ch1
 	db CH7
 	dw SFX_Battle_2B_Ch2
 
-SFX_Battle_2C:: ; 20264 (8:4264)
+SFX_Battle_2C::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2C_Ch1
 	db CH5
@@ -629,7 +629,7 @@
 	db CH7
 	dw SFX_Battle_2C_Ch3
 
-SFX_Psybeam:: ; 2026d (8:426d)
+SFX_Psybeam::
 	db ( $80 | CH4 )
 	dw SFX_Psybeam_Ch1
 	db CH5
@@ -637,7 +637,7 @@
 	db CH7
 	dw SFX_Psybeam_Ch3
 
-SFX_Battle_2E:: ; 20276 (8:4276)
+SFX_Battle_2E::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2E_Ch1
 	db CH5
@@ -645,7 +645,7 @@
 	db CH7
 	dw SFX_Battle_2E_Ch3
 
-SFX_Battle_2F:: ; 2027f (8:427f)
+SFX_Battle_2F::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2F_Ch1
 	db CH5
@@ -653,7 +653,7 @@
 	db CH7
 	dw SFX_Battle_2F_Ch3
 
-SFX_Psychic_M:: ; 20288 (8:4288)
+SFX_Psychic_M::
 	db ( $80 | CH4 )
 	dw SFX_Psychic_M_Ch1
 	db CH5
@@ -661,25 +661,25 @@
 	db CH7
 	dw SFX_Psychic_M_Ch3
 
-SFX_Battle_31:: ; 20291 (8:4291)
+SFX_Battle_31::
 	db ( $40 | CH4 )
 	dw SFX_Battle_31_Ch1
 	db CH5
 	dw SFX_Battle_31_Ch2
 
-SFX_Battle_32:: ; 20297 (8:4297)
+SFX_Battle_32::
 	db ( $40 | CH4 )
 	dw SFX_Battle_32_Ch1
 	db CH5
 	dw SFX_Battle_32_Ch2
 
-SFX_Battle_33:: ; 2029d (8:429d)
+SFX_Battle_33::
 	db ( $40 | CH4 )
 	dw SFX_Battle_33_Ch1
 	db CH5
 	dw SFX_Battle_33_Ch2
 
-SFX_Battle_34:: ; 202a3 (8:42a3)
+SFX_Battle_34::
 	db ( $80 | CH4 )
 	dw SFX_Battle_34_Ch1
 	db CH5
@@ -687,13 +687,13 @@
 	db CH7
 	dw SFX_Battle_34_Ch3
 
-SFX_Battle_35:: ; 202ac (8:42ac)
+SFX_Battle_35::
 	db ( $40 | CH4 )
 	dw SFX_Battle_35_Ch1
 	db CH5
 	dw SFX_Battle_35_Ch2
 
-SFX_Battle_36:: ; 202b2 (8:42b2)
+SFX_Battle_36::
 	db ( $80 | CH4 )
 	dw SFX_Battle_36_Ch1
 	db CH5
@@ -701,6 +701,6 @@
 	db CH7
 	dw SFX_Battle_36_Ch3
 
-SFX_Silph_Scope:: ; 202bb (8:42bb)
+SFX_Silph_Scope::
 	db CH4
 	dw SFX_Silph_Scope_Ch1
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -1,83 +1,83 @@
 SFX_Headers_3::
 	db $ff, $ff, $ff ; padding
 
-SFX_Snare1_3:: ; 7c003 (1f:4003)
+SFX_Snare1_3::
 	db CH7
 	dw SFX_Snare1_3_Ch1
 
-SFX_Snare2_3:: ; 7c006 (1f:4006)
+SFX_Snare2_3::
 	db CH7
 	dw SFX_Snare2_3_Ch1
 
-SFX_Snare3_3:: ; 7c009 (1f:4009)
+SFX_Snare3_3::
 	db CH7
 	dw SFX_Snare3_3_Ch1
 
-SFX_Snare4_3:: ; 7c00c (1f:400c)
+SFX_Snare4_3::
 	db CH7
 	dw SFX_Snare4_3_Ch1
 
-SFX_Snare5_3:: ; 7c00f (1f:400f)
+SFX_Snare5_3::
 	db CH7
 	dw SFX_Snare5_3_Ch1
 
-SFX_Triangle1_3:: ; 7c012 (1f:4012)
+SFX_Triangle1_3::
 	db CH7
 	dw SFX_Triangle1_3_Ch1
 
-SFX_Triangle2_3:: ; 7c015 (1f:4015)
+SFX_Triangle2_3::
 	db CH7
 	dw SFX_Triangle2_3_Ch1
 
-SFX_Snare6_3:: ; 7c018 (1f:4018)
+SFX_Snare6_3::
 	db CH7
 	dw SFX_Snare6_3_Ch1
 
-SFX_Snare7_3:: ; 7c01b (1f:401b)
+SFX_Snare7_3::
 	db CH7
 	dw SFX_Snare7_3_Ch1
 
-SFX_Snare8_3:: ; 7c01e (1f:401e)
+SFX_Snare8_3::
 	db CH7
 	dw SFX_Snare8_3_Ch1
 
-SFX_Snare9_3:: ; 7c021 (1f:4021)
+SFX_Snare9_3::
 	db CH7
 	dw SFX_Snare9_3_Ch1
 
-SFX_Cymbal1_3:: ; 7c024 (1f:4024)
+SFX_Cymbal1_3::
 	db CH7
 	dw SFX_Cymbal1_3_Ch1
 
-SFX_Cymbal2_3:: ; 7c027 (1f:4027)
+SFX_Cymbal2_3::
 	db CH7
 	dw SFX_Cymbal2_3_Ch1
 
-SFX_Cymbal3_3:: ; 7c02a (1f:402a)
+SFX_Cymbal3_3::
 	db CH7
 	dw SFX_Cymbal3_3_Ch1
 
-SFX_Muted_Snare1_3:: ; 7c02d (1f:402d)
+SFX_Muted_Snare1_3::
 	db CH7
 	dw SFX_Muted_Snare1_3_Ch1
 
-SFX_Triangle3_3:: ; 7c030 (1f:4030)
+SFX_Triangle3_3::
 	db CH7
 	dw SFX_Triangle3_3_Ch1
 
-SFX_Muted_Snare2_3:: ; 7c033 (1f:4033)
+SFX_Muted_Snare2_3::
 	db CH7
 	dw SFX_Muted_Snare2_3_Ch1
 
-SFX_Muted_Snare3_3:: ; 7c036 (1f:4036)
+SFX_Muted_Snare3_3::
 	db CH7
 	dw SFX_Muted_Snare3_3_Ch1
 
-SFX_Muted_Snare4_3:: ; 7c039 (1f:4039)
+SFX_Muted_Snare4_3::
 	db CH7
 	dw SFX_Muted_Snare4_3_Ch1
 
-SFX_Cry00_3:: ; 7c03c (1f:403c)
+SFX_Cry00_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry00_3_Ch1
 	db CH5
@@ -85,7 +85,7 @@
 	db CH7
 	dw SFX_Cry00_3_Ch3
 
-SFX_Cry01_3:: ; 7c045 (1f:4045)
+SFX_Cry01_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry01_3_Ch1
 	db CH5
@@ -93,7 +93,7 @@
 	db CH7
 	dw SFX_Cry01_3_Ch3
 
-SFX_Cry02_3:: ; 7c04e (1f:404e)
+SFX_Cry02_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry02_3_Ch1
 	db CH5
@@ -101,7 +101,7 @@
 	db CH7
 	dw SFX_Cry02_3_Ch3
 
-SFX_Cry03_3:: ; 7c057 (1f:4057)
+SFX_Cry03_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry03_3_Ch1
 	db CH5
@@ -109,7 +109,7 @@
 	db CH7
 	dw SFX_Cry03_3_Ch3
 
-SFX_Cry04_3:: ; 7c060 (1f:4060)
+SFX_Cry04_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry04_3_Ch1
 	db CH5
@@ -117,7 +117,7 @@
 	db CH7
 	dw SFX_Cry04_3_Ch3
 
-SFX_Cry05_3:: ; 7c069 (1f:4069)
+SFX_Cry05_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry05_3_Ch1
 	db CH5
@@ -125,7 +125,7 @@
 	db CH7
 	dw SFX_Cry05_3_Ch3
 
-SFX_Cry06_3:: ; 7c072 (1f:4072)
+SFX_Cry06_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry06_3_Ch1
 	db CH5
@@ -133,7 +133,7 @@
 	db CH7
 	dw SFX_Cry06_3_Ch3
 
-SFX_Cry07_3:: ; 7c07b (1f:407b)
+SFX_Cry07_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry07_3_Ch1
 	db CH5
@@ -141,7 +141,7 @@
 	db CH7
 	dw SFX_Cry07_3_Ch3
 
-SFX_Cry08_3:: ; 7c084 (1f:4084)
+SFX_Cry08_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry08_3_Ch1
 	db CH5
@@ -149,7 +149,7 @@
 	db CH7
 	dw SFX_Cry08_3_Ch3
 
-SFX_Cry09_3:: ; 7c08d (1f:408d)
+SFX_Cry09_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry09_3_Ch1
 	db CH5
@@ -157,7 +157,7 @@
 	db CH7
 	dw SFX_Cry09_3_Ch3
 
-SFX_Cry0A_3:: ; 7c096 (1f:4096)
+SFX_Cry0A_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0A_3_Ch1
 	db CH5
@@ -165,7 +165,7 @@
 	db CH7
 	dw SFX_Cry0A_3_Ch3
 
-SFX_Cry0B_3:: ; 7c09f (1f:409f)
+SFX_Cry0B_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0B_3_Ch1
 	db CH5
@@ -173,7 +173,7 @@
 	db CH7
 	dw SFX_Cry0B_3_Ch3
 
-SFX_Cry0C_3:: ; 7c0a8 (1f:40a8)
+SFX_Cry0C_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0C_3_Ch1
 	db CH5
@@ -181,7 +181,7 @@
 	db CH7
 	dw SFX_Cry0C_3_Ch3
 
-SFX_Cry0D_3:: ; 7c0b1 (1f:40b1)
+SFX_Cry0D_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0D_3_Ch1
 	db CH5
@@ -189,7 +189,7 @@
 	db CH7
 	dw SFX_Cry0D_3_Ch3
 
-SFX_Cry0E_3:: ; 7c0ba (1f:40ba)
+SFX_Cry0E_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0E_3_Ch1
 	db CH5
@@ -197,7 +197,7 @@
 	db CH7
 	dw SFX_Cry0E_3_Ch3
 
-SFX_Cry0F_3:: ; 7c0c3 (1f:40c3)
+SFX_Cry0F_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0F_3_Ch1
 	db CH5
@@ -205,7 +205,7 @@
 	db CH7
 	dw SFX_Cry0F_3_Ch3
 
-SFX_Cry10_3:: ; 7c0cc (1f:40cc)
+SFX_Cry10_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry10_3_Ch1
 	db CH5
@@ -213,7 +213,7 @@
 	db CH7
 	dw SFX_Cry10_3_Ch3
 
-SFX_Cry11_3:: ; 7c0d5 (1f:40d5)
+SFX_Cry11_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry11_3_Ch1
 	db CH5
@@ -221,7 +221,7 @@
 	db CH7
 	dw SFX_Cry11_3_Ch3
 
-SFX_Cry12_3:: ; 7c0de (1f:40de)
+SFX_Cry12_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry12_3_Ch1
 	db CH5
@@ -229,7 +229,7 @@
 	db CH7
 	dw SFX_Cry12_3_Ch3
 
-SFX_Cry13_3:: ; 7c0e7 (1f:40e7)
+SFX_Cry13_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry13_3_Ch1
 	db CH5
@@ -237,7 +237,7 @@
 	db CH7
 	dw SFX_Cry13_3_Ch3
 
-SFX_Cry14_3:: ; 7c0f0 (1f:40f0)
+SFX_Cry14_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry14_3_Ch1
 	db CH5
@@ -245,7 +245,7 @@
 	db CH7
 	dw SFX_Cry14_3_Ch3
 
-SFX_Cry15_3:: ; 7c0f9 (1f:40f9)
+SFX_Cry15_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry15_3_Ch1
 	db CH5
@@ -253,7 +253,7 @@
 	db CH7
 	dw SFX_Cry15_3_Ch3
 
-SFX_Cry16_3:: ; 7c102 (1f:4102)
+SFX_Cry16_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry16_3_Ch1
 	db CH5
@@ -261,7 +261,7 @@
 	db CH7
 	dw SFX_Cry16_3_Ch3
 
-SFX_Cry17_3:: ; 7c10b (1f:410b)
+SFX_Cry17_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry17_3_Ch1
 	db CH5
@@ -269,7 +269,7 @@
 	db CH7
 	dw SFX_Cry17_3_Ch3
 
-SFX_Cry18_3:: ; 7c114 (1f:4114)
+SFX_Cry18_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry18_3_Ch1
 	db CH5
@@ -277,7 +277,7 @@
 	db CH7
 	dw SFX_Cry18_3_Ch3
 
-SFX_Cry19_3:: ; 7c11d (1f:411d)
+SFX_Cry19_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry19_3_Ch1
 	db CH5
@@ -285,7 +285,7 @@
 	db CH7
 	dw SFX_Cry19_3_Ch3
 
-SFX_Cry1A_3:: ; 7c126 (1f:4126)
+SFX_Cry1A_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1A_3_Ch1
 	db CH5
@@ -293,7 +293,7 @@
 	db CH7
 	dw SFX_Cry1A_3_Ch3
 
-SFX_Cry1B_3:: ; 7c12f (1f:412f)
+SFX_Cry1B_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1B_3_Ch1
 	db CH5
@@ -301,7 +301,7 @@
 	db CH7
 	dw SFX_Cry1B_3_Ch3
 
-SFX_Cry1C_3:: ; 7c138 (1f:4138)
+SFX_Cry1C_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1C_3_Ch1
 	db CH5
@@ -309,7 +309,7 @@
 	db CH7
 	dw SFX_Cry1C_3_Ch3
 
-SFX_Cry1D_3:: ; 7c141 (1f:4141)
+SFX_Cry1D_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1D_3_Ch1
 	db CH5
@@ -317,7 +317,7 @@
 	db CH7
 	dw SFX_Cry1D_3_Ch3
 
-SFX_Cry1E_3:: ; 7c14a (1f:414a)
+SFX_Cry1E_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1E_3_Ch1
 	db CH5
@@ -325,7 +325,7 @@
 	db CH7
 	dw SFX_Cry1E_3_Ch3
 
-SFX_Cry1F_3:: ; 7c153 (1f:4153)
+SFX_Cry1F_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1F_3_Ch1
 	db CH5
@@ -333,7 +333,7 @@
 	db CH7
 	dw SFX_Cry1F_3_Ch3
 
-SFX_Cry20_3:: ; 7c15c (1f:415c)
+SFX_Cry20_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry20_3_Ch1
 	db CH5
@@ -341,7 +341,7 @@
 	db CH7
 	dw SFX_Cry20_3_Ch3
 
-SFX_Cry21_3:: ; 7c165 (1f:4165)
+SFX_Cry21_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry21_3_Ch1
 	db CH5
@@ -349,7 +349,7 @@
 	db CH7
 	dw SFX_Cry21_3_Ch3
 
-SFX_Cry22_3:: ; 7c16e (1f:416e)
+SFX_Cry22_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry22_3_Ch1
 	db CH5
@@ -357,7 +357,7 @@
 	db CH7
 	dw SFX_Cry22_3_Ch3
 
-SFX_Cry23_3:: ; 7c177 (1f:4177)
+SFX_Cry23_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry23_3_Ch1
 	db CH5
@@ -365,7 +365,7 @@
 	db CH7
 	dw SFX_Cry23_3_Ch3
 
-SFX_Cry24_3:: ; 7c180 (1f:4180)
+SFX_Cry24_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry24_3_Ch1
 	db CH5
@@ -373,7 +373,7 @@
 	db CH7
 	dw SFX_Cry24_3_Ch3
 
-SFX_Cry25_3:: ; 7c189 (1f:4189)
+SFX_Cry25_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry25_3_Ch1
 	db CH5
@@ -381,7 +381,7 @@
 	db CH7
 	dw SFX_Cry25_3_Ch3
 
-SFX_Get_Item1_3:: ; 7c192 (1f:4192)
+SFX_Get_Item1_3::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item1_3_Ch1
 	db CH5
@@ -389,7 +389,7 @@
 	db CH6
 	dw SFX_Get_Item1_3_Ch3
 
-SFX_Get_Item2_3:: ; 7c19b (1f:419b)
+SFX_Get_Item2_3::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item2_3_Ch1
 	db CH5
@@ -397,27 +397,27 @@
 	db CH6
 	dw SFX_Get_Item2_3_Ch3
 
-SFX_Tink_3:: ; 7c1a4 (1f:41a4)
+SFX_Tink_3::
 	db CH4
 	dw SFX_Tink_3_Ch1
 
-SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7)
+SFX_Heal_HP_3::
 	db CH4
 	dw SFX_Heal_HP_3_Ch1
 
-SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa)
+SFX_Heal_Ailment_3::
 	db CH4
 	dw SFX_Heal_Ailment_3_Ch1
 
-SFX_Start_Menu_3:: ; 7c1ad (1f:41ad)
+SFX_Start_Menu_3::
 	db CH7
 	dw SFX_Start_Menu_3_Ch1
 
-SFX_Press_AB_3:: ; 7c1b0 (1f:41b0)
+SFX_Press_AB_3::
 	db CH4
 	dw SFX_Press_AB_3_Ch1
 
-SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3)
+SFX_Pokedex_Rating_3::
 	db ( $80 | CH4 )
 	dw SFX_Pokedex_Rating_3_Ch1
 	db CH5
@@ -425,7 +425,7 @@
 	db CH6
 	dw SFX_Pokedex_Rating_3_Ch3
 
-SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc)
+SFX_Get_Key_Item_3::
 	db ( $80 | CH4 )
 	dw SFX_Get_Key_Item_3_Ch1
 	db CH5
@@ -433,164 +433,164 @@
 	db CH6
 	dw SFX_Get_Key_Item_3_Ch3
 
-SFX_Poisoned_3:: ; 7c1c5 (1f:41c5)
+SFX_Poisoned_3::
 	db CH4
 	dw SFX_Poisoned_3_Ch1
 
-SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8)
+SFX_Trade_Machine_3::
 	db CH4
 	dw SFX_Trade_Machine_3_Ch1
 
-SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb)
+SFX_Turn_On_PC_3::
 	db CH4
 	dw SFX_Turn_On_PC_3_Ch1
 
-SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce)
+SFX_Turn_Off_PC_3::
 	db CH4
 	dw SFX_Turn_Off_PC_3_Ch1
 
-SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1)
+SFX_Enter_PC_3::
 	db CH4
 	dw SFX_Enter_PC_3_Ch1
 
-SFX_Shrink_3:: ; 7c1d4 (1f:41d4)
+SFX_Shrink_3::
 	db CH4
 	dw SFX_Shrink_3_Ch1
 
-SFX_Switch_3:: ; 7c1d7 (1f:41d7)
+SFX_Switch_3::
 	db CH4
 	dw SFX_Switch_3_Ch1
 
-SFX_Healing_Machine_3:: ; 7c1da (1f:41da)
+SFX_Healing_Machine_3::
 	db CH4
 	dw SFX_Healing_Machine_3_Ch1
 
-SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd)
+SFX_Teleport_Exit1_3::
 	db CH4
 	dw SFX_Teleport_Exit1_3_Ch1
 
-SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0)
+SFX_Teleport_Enter1_3::
 	db CH4
 	dw SFX_Teleport_Enter1_3_Ch1
 
-SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3)
+SFX_Teleport_Exit2_3::
 	db CH4
 	dw SFX_Teleport_Exit2_3_Ch1
 
-SFX_Ledge_3:: ; 7c1e6 (1f:41e6)
+SFX_Ledge_3::
 	db CH4
 	dw SFX_Ledge_3_Ch1
 
-SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9)
+SFX_Teleport_Enter2_3::
 	db CH7
 	dw SFX_Teleport_Enter2_3_Ch1
 
-SFX_Fly_3:: ; 7c1ec (1f:41ec)
+SFX_Fly_3::
 	db CH7
 	dw SFX_Fly_3_Ch1
 
-SFX_Denied_3:: ; 7c1ef (1f:41ef)
+SFX_Denied_3::
 	db ( $40 | CH4 )
 	dw SFX_Denied_3_Ch1
 	db CH5
 	dw SFX_Denied_3_Ch2
 
-SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5)
+SFX_Arrow_Tiles_3::
 	db CH4
 	dw SFX_Arrow_Tiles_3_Ch1
 
-SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8)
+SFX_Push_Boulder_3::
 	db CH7
 	dw SFX_Push_Boulder_3_Ch1
 
-SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb)
+SFX_SS_Anne_Horn_3::
 	db ( $40 | CH4 )
 	dw SFX_SS_Anne_Horn_3_Ch1
 	db CH5
 	dw SFX_SS_Anne_Horn_3_Ch2
 
-SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201)
+SFX_Withdraw_Deposit_3::
 	db CH4
 	dw SFX_Withdraw_Deposit_3_Ch1
 
-SFX_Cut_3:: ; 7c204 (1f:4204)
+SFX_Cut_3::
 	db CH7
 	dw SFX_Cut_3_Ch1
 
-SFX_Go_Inside_3:: ; 7c207 (1f:4207)
+SFX_Go_Inside_3::
 	db CH7
 	dw SFX_Go_Inside_3_Ch1
 
-SFX_Swap_3:: ; 7c20a (1f:420a)
+SFX_Swap_3::
 	db ( $40 | CH4 )
 	dw SFX_Swap_3_Ch1
 	db CH5
 	dw SFX_Swap_3_Ch2
 
-SFX_59_3:: ; 7c210 (1f:4210)
+SFX_59_3::
 	db ( $40 | CH4 )
 	dw SFX_59_3_Ch1
 	db CH5
 	dw SFX_59_3_Ch2
 
-SFX_Purchase_3:: ; 7c216 (1f:4216)
+SFX_Purchase_3::
 	db ( $40 | CH4 )
 	dw SFX_Purchase_3_Ch1
 	db CH5
 	dw SFX_Purchase_3_Ch2
 
-SFX_Collision_3:: ; 7c21c (1f:421c)
+SFX_Collision_3::
 	db CH4
 	dw SFX_Collision_3_Ch1
 
-SFX_Go_Outside_3:: ; 7c21f (1f:421f)
+SFX_Go_Outside_3::
 	db CH7
 	dw SFX_Go_Outside_3_Ch1
 
-SFX_Save_3:: ; 7c222 (1f:4222)
+SFX_Save_3::
 	db ( $40 | CH4 )
 	dw SFX_Save_3_Ch1
 	db CH5
 	dw SFX_Save_3_Ch2
 
-SFX_Intro_Lunge:: ; 7c228 (1f:4228)
+SFX_Intro_Lunge::
 	db CH7
 	dw SFX_Intro_Lunge_Ch1
 
-SFX_Intro_Hip:: ; 7c22b (1f:422b)
+SFX_Intro_Hip::
 	db CH4
 	dw SFX_Intro_Hip_Ch1
 
-SFX_Intro_Hop:: ; 7c22e (1f:422e)
+SFX_Intro_Hop::
 	db CH4
 	dw SFX_Intro_Hop_Ch1
 
-SFX_Intro_Raise:: ; 7c231 (1f:4231)
+SFX_Intro_Raise::
 	db CH7
 	dw SFX_Intro_Raise_Ch1
 
-SFX_Intro_Crash:: ; 7c234 (1f:4234)
+SFX_Intro_Crash::
 	db CH7
 	dw SFX_Intro_Crash_Ch1
 
-SFX_Intro_Whoosh:: ; 7c237 (1f:4237)
+SFX_Intro_Whoosh::
 	db CH7
 	dw SFX_Intro_Whoosh_Ch1
 
-SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a)
+SFX_Slots_Stop_Wheel::
 	db CH4
 	dw SFX_Slots_Stop_Wheel_Ch1
 
-SFX_Slots_Reward:: ; 7c23d (1f:423d)
+SFX_Slots_Reward::
 	db CH4
 	dw SFX_Slots_Reward_Ch1
 
-SFX_Slots_New_Spin:: ; 7c240 (1f:4240)
+SFX_Slots_New_Spin::
 	db ( $40 | CH4 )
 	dw SFX_Slots_New_Spin_Ch1
 	db CH5
 	dw SFX_Slots_New_Spin_Ch2
 
-SFX_Shooting_Star:: ; 7c246 (1f:4246)
+SFX_Shooting_Star::
 	db CH4
 	dw SFX_Shooting_Star_Ch1
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -1,4 +1,4 @@
-Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb)
+Music_BikeRiding_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -153,7 +153,7 @@
 	loopchannel 0, Music_BikeRiding_branch_7dbc9
 
 
-Music_BikeRiding_Ch2:: ; 7dc6c (1f:5c6c)
+Music_BikeRiding_Ch2::
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 3
@@ -302,7 +302,7 @@
 	loopchannel 0, Music_BikeRiding_branch_7dc75
 
 
-Music_BikeRiding_Ch3:: ; 7dd14 (1f:5d14)
+Music_BikeRiding_Ch3::
 	notetype 12, 1, 3
 	rest 2
 
@@ -643,7 +643,7 @@
 	loopchannel 0, Music_BikeRiding_branch_7dd17
 
 
-Music_BikeRiding_Ch4:: ; 7de68 (1f:5e68)
+Music_BikeRiding_Ch4::
 	dspeed 12
 	rest 2
 
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@@ -1,4 +1,4 @@
-Music_Celadon_Ch1:: ; b6c7 (2:76c7)
+Music_Celadon_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -107,7 +107,7 @@
 	loopchannel 0, Music_Celadon_branch_b6d4
 
 
-Music_Celadon_Ch2:: ; b73a (2:773a)
+Music_Celadon_Ch2::
 	duty 3
 	notetype 12, 12, 2
 	octave 4
@@ -226,7 +226,7 @@
 	loopchannel 0, Music_Celadon_branch_b74a
 
 
-Music_Celadon_Ch3:: ; b7b5 (2:77b5)
+Music_Celadon_Ch3::
 	notetype 12, 1, 3
 	rest 8
 	octave 5
--- a/audio/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
@@ -1,4 +1,4 @@
-Music_Cinnabar_Ch1:: ; b86d (2:786d)
+Music_Cinnabar_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -85,7 +85,7 @@
 	loopchannel 0, Music_Cinnabar_branch_b878
 
 
-Music_Cinnabar_Ch2:: ; b8d4 (2:78d4)
+Music_Cinnabar_Ch2::
 	duty 3
 	vibrato 10, 2, 3
 
@@ -179,7 +179,7 @@
 	loopchannel 0, Music_Cinnabar_branch_b8d9
 
 
-Music_Cinnabar_Ch3:: ; b93d (2:793d)
+Music_Cinnabar_Ch3::
 	notetype 12, 1, 0
 
 Music_Cinnabar_branch_b93f::
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@@ -1,4 +1,4 @@
-Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f)
+Music_CinnabarMansion_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 11, 2, 5
@@ -38,7 +38,7 @@
 	loopchannel 0, Music_CinnabarMansion_branch_7ed19
 
 
-Music_CinnabarMansion_Ch2:: ; 7ed40 (1f:6d40)
+Music_CinnabarMansion_Ch2::
 	duty 2
 	toggleperfectpitch
 	vibrato 10, 2, 4
@@ -95,7 +95,7 @@
 	endchannel
 
 
-Music_CinnabarMansion_Ch3:: ; 7ed7e (1f:6d7e)
+Music_CinnabarMansion_Ch3::
 	notetype 12, 1, 1
 
 Music_CinnabarMansion_branch_7ed80::
@@ -143,7 +143,7 @@
 	loopchannel 0, Music_CinnabarMansion_branch_7ed80
 
 
-Music_CinnabarMansion_Ch4:: ; 7edb0 (1f:6db0)
+Music_CinnabarMansion_Ch4::
 	dspeed 6
 	rest 16
 	rest 16
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@@ -2,7 +2,7 @@
 	tempo 232
 	loopchannel 0, Music_Cities1_branch_aa79
 
-Music_Cities1_Ch1:: ; aa76 (2:6a76)
+Music_Cities1_Ch1::
 	tempo 144
 
 Music_Cities1_branch_aa79::
@@ -268,7 +268,7 @@
 	endchannel
 
 
-Music_Cities1_Ch2:: ; ab92 (2:6b92)
+Music_Cities1_Ch2::
 	vibrato 5, 1, 5
 	callchannel Music_Cities1_branch_ac00
 	octave 4
@@ -401,7 +401,7 @@
 	endchannel
 
 
-Music_Cities1_Ch3:: ; ac32 (2:6c32)
+Music_Cities1_Ch3::
 	notetype 12, 1, 1
 	toggleperfectpitch
 
@@ -579,7 +579,7 @@
 	endchannel
 
 
-Music_Cities1_Ch4:: ; acef (2:6cef)
+Music_Cities1_Ch4::
 	dspeed 12
 	callchannel Music_Cities1_branch_ad36
 
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@@ -1,4 +1,4 @@
-Music_Cities2_Ch1:: ; b504 (2:7504)
+Music_Cities2_Ch1::
 	tempo 148
 	volume 7, 7
 	duty 3
@@ -94,7 +94,7 @@
 	loopchannel 0, Music_Cities2_branch_b51a
 
 
-Music_Cities2_Ch2:: ; b569 (2:7569)
+Music_Cities2_Ch2::
 	duty 3
 	vibrato 8, 2, 3
 	notetype 12, 12, 2
@@ -280,7 +280,7 @@
 	loopchannel 0, Music_Cities2_branch_b58b
 
 
-Music_Cities2_Ch3:: ; b640 (2:7640)
+Music_Cities2_Ch3::
 	notetype 12, 1, 1
 	rest 16
 	octave 4
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1,4 +1,4 @@
-Music_Credits_Ch1:: ; 7fc1f (1f:7c1f)
+Music_Credits_Ch1::
 	tempo 140
 	volume 7, 7
 	duty 3
@@ -284,7 +284,7 @@
 	endchannel
 
 
-Music_Credits_Ch2:: ; 7fd5f (1f:7d5f)
+Music_Credits_Ch2::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 5
@@ -574,7 +574,7 @@
 	endchannel
 
 
-Music_Credits_Ch3:: ; 7fec2 (1f:7ec2)
+Music_Credits_Ch3::
 	notetype 12, 1, 0
 	octave 5
 	C# 6
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@@ -1,4 +1,4 @@
-Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad)
+Music_DefeatedGymLeader_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -162,7 +162,7 @@
 	loopchannel 0, Music_DefeatedGymLeader_branch_23ccc
 
 
-Music_DefeatedGymLeader_Ch2:: ; 23d6d (8:7d6d)
+Music_DefeatedGymLeader_Ch2::
 	duty 2
 	vibrato 24, 2, 4
 	notetype 12, 12, 4
@@ -352,7 +352,7 @@
 	loopchannel 0, Music_DefeatedGymLeader_branch_23d84
 
 
-Music_DefeatedGymLeader_Ch3:: ; 23e52 (8:7e52)
+Music_DefeatedGymLeader_Ch3::
 	notetype 12, 1, 0
 	vibrato 16, 1, 2
 	octave 4
--- a/audio/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
@@ -1,4 +1,4 @@
-Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53)
+Music_DefeatedTrainer_Ch1::
 	tempo 224
 	volume 7, 7
 	duty 2
@@ -95,7 +95,7 @@
 	loopchannel 0, Music_DefeatedTrainer_branch_23a76
 
 
-Music_DefeatedTrainer_Ch2:: ; 23ac1 (8:7ac1)
+Music_DefeatedTrainer_Ch2::
 	duty 2
 	notetype 4, 12, 3
 	octave 4
@@ -172,7 +172,7 @@
 	loopchannel 0, Music_DefeatedTrainer_branch_23ad2
 
 
-Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15)
+Music_DefeatedTrainer_Ch3::
 	notetype 4, 1, 0
 	octave 5
 	D_ 2
--- a/audio/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
@@ -1,4 +1,4 @@
-Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74)
+Music_DefeatedWildMon_Ch1::
 	tempo 112
 	volume 7, 7
 	executemusic
@@ -67,7 +67,7 @@
 	loopchannel 0, Music_DefeatedWildMon_branch_23b8b
 
 
-Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1)
+Music_DefeatedWildMon_Ch2::
 	executemusic
 	duty 2
 	notetype 12, 12, 3
@@ -142,7 +142,7 @@
 	loopchannel 0, Music_DefeatedWildMon_branch_23bce
 
 
-Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e)
+Music_DefeatedWildMon_Ch3::
 	executemusic
 	notetype 12, 2, 0
 	octave 5
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -1,4 +1,4 @@
-Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1)
+Music_Dungeon1_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -226,7 +226,7 @@
 	endchannel
 
 
-Music_Dungeon1_Ch2:: ; 7dfde (1f:5fde)
+Music_Dungeon1_Ch2::
 	vibrato 11, 1, 5
 	duty 3
 	notetype 12, 0, 15
@@ -441,7 +441,7 @@
 	endchannel
 
 
-Music_Dungeon1_Ch3:: ; 7e0dc (1f:60dc)
+Music_Dungeon1_Ch3::
 	notetype 12, 1, 1
 	vibrato 8, 2, 6
 	rest 14
@@ -596,7 +596,7 @@
 	endchannel
 
 
-Music_Dungeon1_Ch4:: ; 7e18a (1f:618a)
+Music_Dungeon1_Ch4::
 	dspeed 12
 	rest 14
 	cymbal1 1
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -1,4 +1,4 @@
-Music_Dungeon2_Ch1:: ; 7e887 (1f:6887)
+Music_Dungeon2_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -70,7 +70,7 @@
 	loopchannel 0, Music_Dungeon2_branch_7e892
 
 
-Music_Dungeon2_Ch2:: ; 7e8d8 (1f:68d8)
+Music_Dungeon2_Ch2::
 	vibrato 11, 1, 5
 
 Music_Dungeon2_branch_7e8db::
@@ -162,7 +162,7 @@
 	loopchannel 0, Music_Dungeon2_branch_7e8db
 
 
-Music_Dungeon2_Ch3:: ; 7e93b (1f:693b)
+Music_Dungeon2_Ch3::
 	notetype 12, 1, 3
 	vibrato 8, 2, 6
 
@@ -302,7 +302,7 @@
 	endchannel
 
 
-Music_Dungeon2_Ch4:: ; 7e9dc (1f:69dc)
+Music_Dungeon2_Ch4::
 	dspeed 12
 
 Music_Dungeon2_branch_7e9dd::
--- a/audio/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
@@ -1,4 +1,4 @@
-Music_Dungeon3_Ch1:: ; 7e9f1 (1f:69f1)
+Music_Dungeon3_Ch1::
 	tempo 160
 	volume 7, 7
 	duty 3
@@ -335,7 +335,7 @@
 	endchannel
 
 
-Music_Dungeon3_Ch2:: ; 7eb68 (1f:6b68)
+Music_Dungeon3_Ch2::
 	vibrato 11, 1, 5
 	duty 3
 
@@ -607,7 +607,7 @@
 	loopchannel 0, Music_Dungeon3_branch_7eb6d
 
 
-Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a)
+Music_Dungeon3_Ch3::
 	notetype 12, 1, 2
 	rest 16
 	rest 16
@@ -710,7 +710,7 @@
 	loopchannel 0, Music_Dungeon3_Ch3
 
 
-Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4)
+Music_Dungeon3_Ch4::
 	dspeed 12
 	rest 16
 	rest 16
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@@ -1,4 +1,4 @@
-Music_FinalBattle_Ch1:: ; 233a6 (8:73a6)
+Music_FinalBattle_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -381,7 +381,7 @@
 	loopchannel 0, Music_FinalBattle_branch_23429
 
 
-Music_FinalBattle_Ch2:: ; 2356a (8:756a)
+Music_FinalBattle_Ch2::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -738,7 +738,7 @@
 	endchannel
 
 
-Music_FinalBattle_Ch3:: ; 2371c (8:771c)
+Music_FinalBattle_Ch3::
 	notetype 12, 1, 1
 	octave 4
 	E_ 4
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -1,4 +1,4 @@
-Music_GameCorner_Ch1:: ; 7e20b (1f:620b)
+Music_GameCorner_Ch1::
 	tempo 120
 	volume 7, 7
 	duty 3
@@ -183,7 +183,7 @@
 	loopchannel 0, Music_GameCorner_branch_7e222
 
 
-Music_GameCorner_Ch2:: ; 7e2df (1f:62df)
+Music_GameCorner_Ch2::
 	duty 2
 	vibrato 10, 2, 3
 	notetype 12, 12, 6
@@ -343,7 +343,7 @@
 	loopchannel 0, Music_GameCorner_branch_7e2fa
 
 
-Music_GameCorner_Ch3:: ; 7e38b (1f:638b)
+Music_GameCorner_Ch3::
 	notetype 12, 1, 3
 	octave 5
 	C# 1
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -1,4 +1,4 @@
-Music_Gym_Ch1:: ; bcbb (2:7cbb)
+Music_Gym_Ch1::
 	tempo 138
 	volume 7, 7
 	duty 3
@@ -165,7 +165,7 @@
 	loopchannel 0, Music_Gym_branch_bcd8
 
 
-Music_Gym_Ch2:: ; bd6b (2:7d6b)
+Music_Gym_Ch2::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 7
@@ -288,7 +288,7 @@
 	loopchannel 0, Music_Gym_branch_bd82
 
 
-Music_Gym_Ch3:: ; bdfa (2:7dfa)
+Music_Gym_Ch3::
 	notetype 12, 1, 1
 	rest 16
 	rest 10
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -1,4 +1,4 @@
-Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370)
+Music_GymLeaderBattle_Ch1::
 	tempo 104
 	volume 7, 7
 	duty 3
@@ -547,7 +547,7 @@
 	loopchannel 0, Music_GymLeaderBattle_branch_223b0
 
 
-Music_GymLeaderBattle_Ch2:: ; 225a1 (8:65a1)
+Music_GymLeaderBattle_Ch2::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
@@ -848,7 +848,7 @@
 	loopchannel 0, Music_GymLeaderBattle_branch_225e0
 
 
-Music_GymLeaderBattle_Ch3:: ; 226ef (8:66ef)
+Music_GymLeaderBattle_Ch3::
 	vibrato 0, 2, 0
 	notetype 12, 1, 3
 	rest 12
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -1,4 +1,4 @@
-Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf)
+Music_HallOfFame_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -31,7 +31,7 @@
 	loopchannel 0, Music_HallOfFame_branch_7fbc5
 
 
-Music_HallOfFame_Ch2:: ; 7fbda (1f:7bda)
+Music_HallOfFame_Ch2::
 	vibrato 8, 2, 5
 	duty 3
 
@@ -63,7 +63,7 @@
 	loopchannel 0, Music_HallOfFame_branch_7fbdf
 
 
-Music_HallOfFame_Ch3:: ; 7fbfc (1f:7bfc)
+Music_HallOfFame_Ch3::
 	notetype 12, 1, 2
 
 Music_HallOfFame_branch_7fbfe::
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -1,4 +1,4 @@
-Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0)
+Music_IndigoPlateau_Ch1::
 	tempo 132
 	volume 7, 7
 	duty 3
@@ -86,7 +86,7 @@
 	endchannel
 
 
-Music_IndigoPlateau_Ch2:: ; a664 (2:6664)
+Music_IndigoPlateau_Ch2::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -147,7 +147,7 @@
 	endchannel
 
 
-Music_IndigoPlateau_Ch3:: ; a6ba (2:66ba)
+Music_IndigoPlateau_Ch3::
 	notetype 12, 1, 0
 	octave 4
 	D_ 2
@@ -225,7 +225,7 @@
 	endchannel
 
 
-Music_IndigoPlateau_Ch4:: ; a70f (2:670f)
+Music_IndigoPlateau_Ch4::
 	dspeed 6
 	mutedsnare2 16
 	mutedsnare2 16
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -1,4 +1,4 @@
-Music_IntroBattle_Ch1:: ; 7f844 (1f:7844)
+Music_IntroBattle_Ch1::
 	tempo 98
 	volume 7, 7
 	duty 3
@@ -90,7 +90,7 @@
 	endchannel
 
 
-Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc)
+Music_IntroBattle_Ch2::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -165,7 +165,7 @@
 	endchannel
 
 
-Music_IntroBattle_Ch3:: ; 7f91d (1f:791d)
+Music_IntroBattle_Ch3::
 	notetype 12, 1, 0
 	rest 8
 	octave 4
@@ -229,7 +229,7 @@
 	endchannel
 
 
-Music_IntroBattle_Ch4:: ; 7f95b (1f:795b)
+Music_IntroBattle_Ch4::
 	dspeed 6
 	mutedsnare4 1
 	mutedsnare4 1
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@@ -1,4 +1,4 @@
-Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d)
+Music_JigglypuffSong_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 8, 2, 4
@@ -21,7 +21,7 @@
 	endchannel
 
 
-Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a)
+Music_JigglypuffSong_Ch2::
 	vibrato 5, 1, 5
 	duty 2
 	dutycycle 10
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@@ -1,4 +1,4 @@
-Music_Lavender_Ch1:: ; bb58 (2:7b58)
+Music_Lavender_Ch1::
 	tempo 152
 	volume 7, 7
 	duty 1
@@ -62,7 +62,7 @@
 	loopchannel 0, Music_Lavender_branch_bb6b
 
 
-Music_Lavender_Ch2:: ; bb9e (2:7b9e)
+Music_Lavender_Ch2::
 	vibrato 0, 3, 4
 	duty 3
 	notetype 12, 9, 1
@@ -76,7 +76,7 @@
 	loopchannel 0, Music_Lavender_branch_bba5
 
 
-Music_Lavender_Ch3:: ; bbae (2:7bae)
+Music_Lavender_Ch3::
 	vibrato 4, 1, 1
 	notetype 12, 3, 5
 	rest 16
@@ -186,7 +186,7 @@
 	loopchannel 0, Music_Lavender_branch_bbb9
 
 
-Music_Lavender_Ch4:: ; bc21 (2:7c21)
+Music_Lavender_Ch4::
 	dspeed 12
 	rest 16
 	rest 16
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@@ -1,4 +1,4 @@
-Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d)
+Music_MeetEvilTrainer_Ch1::
 	tempo 124
 	volume 7, 7
 	duty 2
@@ -21,7 +21,7 @@
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae
 
 
-Music_MeetEvilTrainer_Ch2:: ; 7f6ba (1f:76ba)
+Music_MeetEvilTrainer_Ch2::
 	duty 1
 	notetype 12, 11, 6
 	octave 3
@@ -60,7 +60,7 @@
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2
 
 
-Music_MeetEvilTrainer_Ch3:: ; 7f6e6 (1f:76e6)
+Music_MeetEvilTrainer_Ch3::
 	notetype 12, 1, 0
 	rest 8
 	octave 4
--- a/audio/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
@@ -1,4 +1,4 @@
-Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9)
+Music_MeetFemaleTrainer_Ch1::
 	tempo 124
 	volume 7, 7
 	duty 1
@@ -26,7 +26,7 @@
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c
 
 
-Music_MeetFemaleTrainer_Ch2:: ; 7f71c (1f:771c)
+Music_MeetFemaleTrainer_Ch2::
 	duty 2
 	notetype 12, 12, 2
 	octave 3
@@ -71,7 +71,7 @@
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f726
 
 
-Music_MeetFemaleTrainer_Ch3:: ; 7f74b (1f:774b)
+Music_MeetFemaleTrainer_Ch3::
 	notetype 12, 1, 0
 	rest 8
 	octave 5
--- a/audio/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
@@ -1,4 +1,4 @@
-Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b)
+Music_MeetMaleTrainer_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -32,7 +32,7 @@
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f78f
 
 
-Music_MeetMaleTrainer_Ch2:: ; 7f7a2 (1f:77a2)
+Music_MeetMaleTrainer_Ch2::
 	duty 3
 	vibrato 24, 2, 2
 	notetype 12, 12, 4
@@ -75,7 +75,7 @@
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5
 
 
-Music_MeetMaleTrainer_Ch3:: ; 7f7d2 (1f:77d2)
+Music_MeetMaleTrainer_Ch3::
 	notetype 12, 1, 0
 	rest 6
 	octave 4
--- a/audio/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
@@ -1,4 +1,4 @@
-Music_MeetProfOak_Ch1:: ; af59 (2:6f59)
+Music_MeetProfOak_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -74,7 +74,7 @@
 	loopchannel 0, Music_MeetProfOak_branch_af85
 
 
-Music_MeetProfOak_Ch2:: ; afa9 (2:6fa9)
+Music_MeetProfOak_Ch2::
 	vibrato 8, 1, 1
 	duty 2
 	notetype 12, 12, 4
@@ -208,7 +208,7 @@
 	loopchannel 0, Music_MeetProfOak_branch_b005
 
 
-Music_MeetProfOak_Ch3:: ; b03d (2:703d)
+Music_MeetProfOak_Ch3::
 	notetype 12, 1, 2
 	rest 10
 	octave 4
--- a/audio/music/meetrival.asm
+++ b/audio/music/meetrival.asm
@@ -2,7 +2,7 @@
 	tempo 100
 	loopchannel 0, Music_MeetRival_branch_b123
 
-Music_MeetRival_Ch1:: ; b120 (2:7120)
+Music_MeetRival_Ch1::
 	tempo 112
 
 Music_MeetRival_branch_b123::
@@ -143,7 +143,7 @@
 	loopchannel 0, Music_MeetRival_branch_b140
 
 
-Music_MeetRival_Ch2:: ; b1bb (2:71bb)
+Music_MeetRival_Ch2::
 	duty 3
 	vibrato 10, 2, 6
 	notetype 12, 12, 7
@@ -248,7 +248,7 @@
 	loopchannel 0, Music_MeetRival_branch_b1d8
 
 
-Music_MeetRival_Ch3:: ; b233 (2:7233)
+Music_MeetRival_Ch3::
 	notetype 12, 1, 4
 	octave 5
 	D_ 2
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@@ -1,4 +1,4 @@
-Music_MuseumGuy_Ch1:: ; adae (2:6dae)
+Music_MuseumGuy_Ch1::
 	tempo 128
 	volume 7, 7
 	duty 2
@@ -54,7 +54,7 @@
 	endchannel
 
 
-Music_MuseumGuy_Ch2:: ; adf1 (2:6df1)
+Music_MuseumGuy_Ch2::
 	duty 2
 	notetype 12, 12, 1
 	octave 4
@@ -165,7 +165,7 @@
 	loopchannel 0, Music_MuseumGuy_branch_ae26
 
 
-Music_MuseumGuy_Ch3:: ; ae6e (2:6e6e)
+Music_MuseumGuy_Ch3::
 	notetype 12, 1, 0
 	rest 16
 	octave 4
@@ -261,7 +261,7 @@
 	endchannel
 
 
-Music_MuseumGuy_Ch4:: ; aed1 (2:6ed1)
+Music_MuseumGuy_Ch4::
 	dspeed 12
 	rest 16
 	rest 16
--- a/audio/music/oakslab.asm
+++ b/audio/music/oakslab.asm
@@ -1,4 +1,4 @@
-Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9)
+Music_OaksLab_Ch1::
 	tempo 140
 	volume 7, 7
 	duty 3
@@ -69,7 +69,7 @@
 	loopchannel 0, Music_OaksLab_branch_7eed0
 
 
-Music_OaksLab_Ch2:: ; 7ef05 (1f:6f05)
+Music_OaksLab_Ch2::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 4
@@ -144,7 +144,7 @@
 	loopchannel 0, Music_OaksLab_branch_7ef16
 
 
-Music_OaksLab_Ch3:: ; 7ef52 (1f:6f52)
+Music_OaksLab_Ch3::
 	notetype 12, 1, 1
 	rest 2
 	octave 4
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -1,4 +1,4 @@
-Music_PalletTown_Ch1:: ; a7c5 (2:67c5)
+Music_PalletTown_Ch1::
 	tempo 160
 	volume 7, 7
 	duty 2
@@ -148,7 +148,7 @@
 	endchannel
 
 
-Music_PalletTown_Ch2:: ; a85f (2:685f)
+Music_PalletTown_Ch2::
 	duty 2
 
 Music_PalletTown_branch_a861::
@@ -262,7 +262,7 @@
 	endchannel
 
 
-Music_PalletTown_Ch3:: ; a8de (2:68de)
+Music_PalletTown_Ch3::
 	vibrato 24, 2, 8
 	notetype 12, 1, 2
 
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@@ -1,4 +1,4 @@
-Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3)
+Music_PkmnHealed_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 2
@@ -19,7 +19,7 @@
 	endchannel
 
 
-Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4)
+Music_PkmnHealed_Ch2::
 	duty 2
 	notetype 12, 12, 3
 	octave 4
@@ -33,7 +33,7 @@
 	endchannel
 
 
-Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2)
+Music_PkmnHealed_Ch3::
 	notetype 12, 1, 0
 	octave 4
 	E_ 2
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@@ -1,4 +1,4 @@
-Music_Pokecenter_Ch1:: ; be56 (2:7e56)
+Music_Pokecenter_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -149,7 +149,7 @@
 	loopchannel 0, Music_Pokecenter_branch_be61
 
 
-Music_Pokecenter_Ch2:: ; bef9 (2:7ef9)
+Music_Pokecenter_Ch2::
 	vibrato 8, 2, 5
 
 Music_Pokecenter_branch_befc::
@@ -248,7 +248,7 @@
 	endchannel
 
 
-Music_Pokecenter_Ch3:: ; bf70 (2:7f70)
+Music_Pokecenter_Ch3::
 	notetype 12, 1, 0
 
 Music_Pokecenter_branch_bf72::
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@@ -1,4 +1,4 @@
-Music_PokemonTower_Ch1:: ; 7f04a (1f:704a)
+Music_PokemonTower_Ch1::
 	tempo 152
 	volume 7, 7
 	duty 3
@@ -140,7 +140,7 @@
 	loopchannel 0, Music_PokemonTower_branch_7f05a
 
 
-Music_PokemonTower_Ch2:: ; 7f0e3 (1f:70e3)
+Music_PokemonTower_Ch2::
 	vibrato 20, 3, 4
 	duty 3
 	notetype 12, 10, 0
@@ -292,7 +292,7 @@
 	loopchannel 0, Music_PokemonTower_branch_7f0ee
 
 
-Music_PokemonTower_Ch3:: ; 7f19a (1f:719a)
+Music_PokemonTower_Ch3::
 	vibrato 4, 1, 1
 	notetype 12, 1, 3
 	rest 8
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@@ -1,4 +1,4 @@
-Music_Routes1_Ch1:: ; 9bde (2:5bde)
+Music_Routes1_Ch1::
 	tempo 152
 	volume 7, 7
 	vibrato 4, 2, 3
@@ -106,7 +106,7 @@
 	endchannel
 
 
-Music_Routes1_Ch2:: ; 9c51 (2:5c51)
+Music_Routes1_Ch2::
 	duty 2
 
 Music_Routes1_branch_9c53::
@@ -234,7 +234,7 @@
 	endchannel
 
 
-Music_Routes1_Ch3:: ; 9cd8 (2:5cd8)
+Music_Routes1_Ch3::
 	vibrato 8, 2, 5
 	notetype 12, 1, 3
 
@@ -309,7 +309,7 @@
 	endchannel
 
 
-Music_Routes1_Ch4:: ; 9d24 (2:5d24)
+Music_Routes1_Ch4::
 	dspeed 12
 	rest 4
 	mutedsnare1 2
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@@ -1,4 +1,4 @@
-Music_Routes2_Ch1:: ; 9db9 (2:5db9)
+Music_Routes2_Ch1::
 	tempo 152
 	volume 7, 7
 	vibrato 9, 2, 5
@@ -142,7 +142,7 @@
 	endchannel
 
 
-Music_Routes2_Ch2:: ; 9e4f (2:5e4f)
+Music_Routes2_Ch2::
 	vibrato 8, 2, 6
 	duty 3
 
@@ -216,7 +216,7 @@
 	endchannel
 
 
-Music_Routes2_Ch3:: ; 9e9b (2:5e9b)
+Music_Routes2_Ch3::
 	vibrato 9, 2, 8
 
 Music_Routes2_branch_9e9e::
@@ -324,7 +324,7 @@
 	endchannel
 
 
-Music_Routes2_Ch4:: ; 9f08 (2:5f08)
+Music_Routes2_Ch4::
 	dspeed 12
 	snare3 2
 	rest 2
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -1,4 +1,4 @@
-Music_Routes3_Ch1:: ; 9fad (2:5fad)
+Music_Routes3_Ch1::
 	tempo 148
 	volume 7, 7
 	duty 3
@@ -77,7 +77,7 @@
 	loopchannel 0, Music_Routes3_branch_9fc3
 
 
-Music_Routes3_Ch2:: ; a009 (2:6009)
+Music_Routes3_Ch2::
 	vibrato 8, 2, 3
 	duty 2
 	notetype 12, 12, 7
@@ -178,7 +178,7 @@
 	loopchannel 0, Music_Routes3_branch_a01a
 
 
-Music_Routes3_Ch3:: ; a07f (2:607f)
+Music_Routes3_Ch3::
 	vibrato 4, 1, 0
 	notetype 6, 1, 2
 	octave 4
@@ -354,7 +354,7 @@
 	loopchannel 0, Music_Routes3_branch_a0a3
 
 
-Music_Routes3_Ch4:: ; a131 (2:6131)
+Music_Routes3_Ch4::
 	dspeed 6
 	mutedsnare4 1
 	mutedsnare4 1
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -1,4 +1,4 @@
-Music_Routes4_Ch1:: ; a26a (2:626a)
+Music_Routes4_Ch1::
 	tempo 148
 	volume 7, 7
 	duty 3
@@ -138,7 +138,7 @@
 	loopchannel 0, Music_Routes4_branch_a28a
 
 
-Music_Routes4_Ch2:: ; a304 (2:6304)
+Music_Routes4_Ch2::
 	vibrato 12, 2, 4
 	duty 1
 	notetype 12, 9, 2
@@ -288,7 +288,7 @@
 	loopchannel 0, Music_Routes4_branch_a325
 
 
-Music_Routes4_Ch3:: ; a3c4 (2:63c4)
+Music_Routes4_Ch3::
 	notetype 12, 1, 0
 	octave 4
 	E_ 1
@@ -506,7 +506,7 @@
 	loopchannel 0, Music_Routes4_branch_a3d7
 
 
-Music_Routes4_Ch4:: ; a49d (2:649d)
+Music_Routes4_Ch4::
 	dspeed 12
 	rest 16
 	rest 12
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@@ -1,4 +1,4 @@
-Music_SafariZone_Ch1:: ; bc2e (2:7c2e)
+Music_SafariZone_Ch1::
 	tempo 132
 	volume 7, 7
 	vibrato 6, 3, 4
@@ -39,7 +39,7 @@
 	endchannel
 
 
-Music_SafariZone_Ch2:: ; bc6a (2:7c6a)
+Music_SafariZone_Ch2::
 	duty 2
 	vibrato 8, 2, 5
 	notetype 12, 10, 2
@@ -73,7 +73,7 @@
 	endchannel
 
 
-Music_SafariZone_Ch3:: ; bc94 (2:7c94)
+Music_SafariZone_Ch3::
 	notetype 12, 1, 0
 	rest 8
 
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@@ -1,4 +1,4 @@
-Music_SilphCo_Ch1:: ; 7f243 (1f:7243)
+Music_SilphCo_Ch1::
 	tempo 160
 	volume 7, 7
 	duty 3
@@ -395,7 +395,7 @@
 	endchannel
 
 
-Music_SilphCo_Ch2:: ; 7f409 (1f:7409)
+Music_SilphCo_Ch2::
 	vibrato 10, 3, 2
 	duty 3
 	notetype 6, 12, 3
@@ -780,7 +780,7 @@
 	loopchannel 0, Music_SilphCo_branch_7f42e
 
 
-Music_SilphCo_Ch3:: ; 7f5be (1f:75be)
+Music_SilphCo_Ch3::
 	vibrato 8, 1, 1
 	notetype 12, 1, 1
 	rest 12
--- a/audio/music/ssanne.asm
+++ b/audio/music/ssanne.asm
@@ -1,4 +1,4 @@
-Music_SSAnne_Ch1:: ; b3a7 (2:73a7)
+Music_SSAnne_Ch1::
 	tempo 128
 	volume 7, 7
 	duty 1
@@ -107,7 +107,7 @@
 	loopchannel 0, Music_SSAnne_branch_b3b2
 
 
-Music_SSAnne_Ch2:: ; b419 (2:7419)
+Music_SSAnne_Ch2::
 	duty 0
 	vibrato 12, 2, 4
 
@@ -282,7 +282,7 @@
 	loopchannel 0, Music_SSAnne_branch_b41e
 
 
-Music_SSAnne_Ch3:: ; b4cb (2:74cb)
+Music_SSAnne_Ch3::
 	notetype 12, 1, 3
 	rest 16
 	rest 12
--- a/audio/music/surfing.asm
+++ b/audio/music/surfing.asm
@@ -1,4 +1,4 @@
-Music_Surfing_Ch1:: ; 7fa19 (1f:7a19)
+Music_Surfing_Ch1::
 	tempo 160
 	volume 7, 7
 	duty 3
@@ -116,7 +116,7 @@
 	loopchannel 0, Music_Surfing_branch_7fa30
 
 
-Music_Surfing_Ch2:: ; 7fa9c (1f:7a9c)
+Music_Surfing_Ch2::
 	duty 3
 	vibrato 16, 2, 5
 	notetype 12, 12, 6
@@ -203,7 +203,7 @@
 	loopchannel 0, Music_Surfing_branch_7faae
 
 
-Music_Surfing_Ch3:: ; 7fafa (1f:7afa)
+Music_Surfing_Ch3::
 	notetype 12, 1, 0
 	rest 12
 	octave 5
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -1,4 +1,4 @@
-Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0)
+Music_TitleScreen_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 9, 3, 4
@@ -154,7 +154,7 @@
 	endchannel
 
 
-Music_TitleScreen_Ch2:: ; 7e578 (1f:6578)
+Music_TitleScreen_Ch2::
 	vibrato 16, 4, 6
 	duty 1
 	notetype 12, 14, 1
@@ -321,7 +321,7 @@
 	endchannel
 
 
-Music_TitleScreen_Ch3:: ; 7e643 (1f:6643)
+Music_TitleScreen_Ch3::
 	notetype 12, 1, 0
 	octave 3
 	G_ 1
@@ -459,7 +459,7 @@
 	endchannel
 
 
-Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb)
+Music_TitleScreen_Ch4::
 	dspeed 6
 	rest 4
 	snare3 1
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@@ -1,4 +1,4 @@
-Music_TrainerBattle_Ch1:: ; 22919 (8:6919)
+Music_TrainerBattle_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -649,7 +649,7 @@
 	loopchannel 0, Music_TrainerBattle_branch_22962
 
 
-Music_TrainerBattle_Ch2:: ; 22bae (8:6bae)
+Music_TrainerBattle_Ch2::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 2
@@ -953,7 +953,7 @@
 	loopchannel 0, Music_TrainerBattle_branch_22bfc
 
 
-Music_TrainerBattle_Ch3:: ; 22d10 (8:6d10)
+Music_TrainerBattle_Ch3::
 	vibrato 0, 2, 0
 	notetype 12, 1, 4
 	octave 3
--- a/audio/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
@@ -1,4 +1,4 @@
-Music_UnusedSong_Ch1:: ; a913 (2:6913)
+Music_UnusedSong_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 5, 1, 6
@@ -182,7 +182,7 @@
 	endchannel
 
 
-Music_UnusedSong_Ch2:: ; a9cf (2:69cf)
+Music_UnusedSong_Ch2::
 	tempo 144
 	volume 7, 7
 	toggleperfectpitch
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@@ -1,4 +1,4 @@
-Music_Vermilion_Ch1:: ; b9eb (2:79eb)
+Music_Vermilion_Ch1::
 	tempo 156
 	volume 7, 7
 	duty 3
@@ -111,7 +111,7 @@
 	loopchannel 0, Music_Vermilion_branch_b9f6
 
 
-Music_Vermilion_Ch2:: ; ba61 (2:7a61)
+Music_Vermilion_Ch2::
 	duty 3
 	vibrato 10, 2, 3
 
@@ -178,7 +178,7 @@
 	loopchannel 0, Music_Vermilion_branch_ba66
 
 
-Music_Vermilion_Ch3:: ; baa6 (2:7aa6)
+Music_Vermilion_Ch3::
 	notetype 12, 1, 0
 
 Music_Vermilion_branch_baa8::
@@ -282,7 +282,7 @@
 	loopchannel 0, Music_Vermilion_branch_baa8
 
 
-Music_Vermilion_Ch4:: ; bb0d (2:7b0d)
+Music_Vermilion_Ch4::
 	dspeed 12
 
 Music_Vermilion_branch_bb0e::
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@@ -1,4 +1,4 @@
-Music_WildBattle_Ch1:: ; 23099 (8:7099)
+Music_WildBattle_Ch1::
 	tempo 104
 	volume 7, 7
 	duty 3
@@ -300,7 +300,7 @@
 	loopchannel 0, Music_WildBattle_branch_230e0
 
 
-Music_WildBattle_Ch2:: ; 231d8 (8:71d8)
+Music_WildBattle_Ch2::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
@@ -462,7 +462,7 @@
 	loopchannel 0, Music_WildBattle_branch_23225
 
 
-Music_WildBattle_Ch3:: ; 23290 (8:7290)
+Music_WildBattle_Ch3::
 	vibrato 0, 2, 0
 	notetype 12, 1, 1
 	octave 4
--- a/audio/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
@@ -1,4 +1,4 @@
-Music_MeetJessieJames_Ch1:: ; 8316d (20:716d)
+Music_MeetJessieJames_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -77,7 +77,7 @@
 	loopchannel 0, Music_MeetJessieJames_branch_83187
 
 
-Music_MeetJessieJames_Ch2:: ; 831c8 (20:71c8)
+Music_MeetJessieJames_Ch2::
 	duty 3
 	vibrato 6, 1, 5
 	notetype 12, 12, 2
@@ -164,7 +164,7 @@
 	loopchannel 0, Music_MeetJessieJames_branch_831df
 
 
-Music_MeetJessieJames_Ch3:: ; 8322a (20:722a)
+Music_MeetJessieJames_Ch3::
 	notetype 12, 1, 0
 	rest 16
 	rest 8
--- a/audio/music/yellow/surfingpikachu.asm
+++ b/audio/music/yellow/surfingpikachu.asm
@@ -1,4 +1,4 @@
-Music_SurfingPikachu_Ch1:: ; 82ce8 (20:6ce8)
+Music_SurfingPikachu_Ch1::
 	tempo 117
 	volume 7, 7
 	duty 3
@@ -162,7 +162,7 @@
 	loopchannel 0, Music_SurfingPikachu_branch_82d1a
 
 
-Music_SurfingPikachu_Ch2:: ; 82d9d (20:6d9d)
+Music_SurfingPikachu_Ch2::
 	duty 3
 	vibrato 6, 1, 5
 	notetype 12, 12, 4
@@ -312,7 +312,7 @@
 	loopchannel 0, Music_SurfingPikachu_branch_82de0
 
 
-Music_SurfingPikachu_Ch3:: ; 82e45 (20:6e45)
+Music_SurfingPikachu_Ch3::
 	notetype 12, 1, 0
 	octave 4
 	B_ 6
--- a/audio/music/yellow/yellowintro.asm
+++ b/audio/music/yellow/yellowintro.asm
@@ -1,4 +1,4 @@
-Music_YellowIntro_Ch1:: ; 7f65c (1f:765c)
+Music_YellowIntro_Ch1::
 	tempo 116
 	volume 7, 7
 	duty 3
@@ -100,7 +100,7 @@
 	endchannel
 
 
-Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3)
+Music_YellowIntro_Ch2::
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 2
@@ -203,7 +203,7 @@
 	endchannel
 
 
-Music_YellowIntro_Ch3:: ; 7f749 (1f:7749)
+Music_YellowIntro_Ch3::
 	notetype 12, 1, 0
 	octave 4
 	E_ 1
--- a/audio/music/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
@@ -1,4 +1,4 @@
-Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe)
+Music_YellowUnusedSong_Ch1::
 	tempo 140
 	volume 7, 7
 	duty 3
@@ -75,7 +75,7 @@
 	loopchannel 0, Music_YellowUnusedSong_branch_82fde
 
 
-Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010)
+Music_YellowUnusedSong_Ch2::
 	duty 2
 	notetype 8, 12, 2
 	octave 4
@@ -161,7 +161,7 @@
 	loopchannel 0, Music_YellowUnusedSong_branch_8302a
 
 
-Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068)
+Music_YellowUnusedSong_Ch3::
 	notetype 12, 1, 0
 	vibrato 2, 1, 5
 	rest 16
@@ -202,7 +202,7 @@
 	loopchannel 0, Music_YellowUnusedSong_branch_83075
 
 
-Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092)
+Music_YellowUnusedSong_Ch4::
 	dspeed 12
 	snare3 4
 	dspeed 8
--- a/audio/sfx/59_1.asm
+++ b/audio/sfx/59_1.asm
@@ -1,10 +1,10 @@
-SFX_59_1_Ch1: ; 841b (2:441b)
+SFX_59_1_Ch1:
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_59_1_Ch2: ; 8422 (2:4422)
+SFX_59_1_Ch2:
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
--- a/audio/sfx/59_3.asm
+++ b/audio/sfx/59_3.asm
@@ -1,10 +1,10 @@
-SFX_59_3_Ch1: ; 7c404 (1f:4404)
+SFX_59_3_Ch1:
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_59_3_Ch2: ; 7c40b (1f:440b)
+SFX_59_3_Ch2:
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
--- a/audio/sfx/arrow_tiles_1.asm
+++ b/audio/sfx/arrow_tiles_1.asm
@@ -1,4 +1,4 @@
-SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649)
+SFX_Arrow_Tiles_1_Ch1:
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7
--- a/audio/sfx/arrow_tiles_3.asm
+++ b/audio/sfx/arrow_tiles_3.asm
@@ -1,4 +1,4 @@
-SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626)
+SFX_Arrow_Tiles_3_Ch1:
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7
--- a/audio/sfx/ball_poof.asm
+++ b/audio/sfx/ball_poof.asm
@@ -1,4 +1,4 @@
-SFX_Ball_Poof_Ch1: ; 2043d (8:443d)
+SFX_Ball_Poof_Ch1:
 	duty 2
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 242, 0, 4
@@ -6,6 +6,6 @@
 	endchannel
 
 
-SFX_Ball_Poof_Ch2: ; 20448 (8:4448)
+SFX_Ball_Poof_Ch2:
 	unknownnoise0x20 15, 162, 34
 	endchannel
--- a/audio/sfx/ball_toss.asm
+++ b/audio/sfx/ball_toss.asm
@@ -1,4 +1,4 @@
-SFX_Ball_Toss_Ch1: ; 2042d (8:442d)
+SFX_Ball_Toss_Ch1:
 	duty 2
 	unknownsfx0x10 47
 	unknownsfx0x20 15, 242, 128, 7
@@ -5,7 +5,7 @@
 	endchannel
 
 
-SFX_Ball_Toss_Ch2: ; 20436 (8:4436)
+SFX_Ball_Toss_Ch2:
 	duty 2
 	unknownsfx0x20 15, 194, 130, 7
 	endchannel
--- a/audio/sfx/battle_09.asm
+++ b/audio/sfx/battle_09.asm
@@ -1,4 +1,4 @@
-SFX_Battle_09_Ch1: ; 204b9 (8:44b9)
+SFX_Battle_09_Ch1:
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 5
--- a/audio/sfx/battle_0b.asm
+++ b/audio/sfx/battle_0b.asm
@@ -1,3 +1,3 @@
-SFX_Battle_0B_Ch1: ; 204c8 (8:44c8)
+SFX_Battle_0B_Ch1:
 	unknownnoise0x20 8, 241, 84
 	endchannel
--- a/audio/sfx/battle_0c.asm
+++ b/audio/sfx/battle_0c.asm
@@ -1,4 +1,4 @@
-SFX_Battle_0C_Ch1: ; 204cc (8:44cc)
+SFX_Battle_0C_Ch1:
 	unknownnoise0x20 15, 143, 17
 	unknownnoise0x20 4, 255, 18
 	unknownnoise0x20 10, 241, 85
--- a/audio/sfx/battle_0d.asm
+++ b/audio/sfx/battle_0d.asm
@@ -1,4 +1,4 @@
-SFX_Battle_0D_Ch1: ; 204d6 (8:44d6)
+SFX_Battle_0D_Ch1:
 	unknownnoise0x20 15, 143, 52
 	unknownnoise0x20 8, 242, 53
 	unknownnoise0x20 10, 241, 85
--- a/audio/sfx/battle_0e.asm
+++ b/audio/sfx/battle_0e.asm
@@ -1,4 +1,4 @@
-SFX_Battle_0E_Ch1: ; 204e0 (8:44e0)
+SFX_Battle_0E_Ch1:
 	unknownnoise0x20 15, 159, 35
 	unknownnoise0x20 8, 241, 33
 	endchannel
--- a/audio/sfx/battle_0f.asm
+++ b/audio/sfx/battle_0f.asm
@@ -1,4 +1,4 @@
-SFX_Battle_0F_Ch1: ; 204e7 (8:44e7)
+SFX_Battle_0F_Ch1:
 	unknownnoise0x20 2, 225, 75
 	unknownnoise0x20 10, 241, 68
 	unknownnoise0x20 2, 225, 58
--- a/audio/sfx/battle_12.asm
+++ b/audio/sfx/battle_12.asm
@@ -1,4 +1,4 @@
-SFX_Battle_12_Ch1: ; 2050b (8:450b)
+SFX_Battle_12_Ch1:
 	unknownnoise0x20 8, 79, 35
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35
--- a/audio/sfx/battle_13.asm
+++ b/audio/sfx/battle_13.asm
@@ -1,4 +1,4 @@
-SFX_Battle_13_Ch1: ; 20519 (8:4519)
+SFX_Battle_13_Ch1:
 	unknownnoise0x20 8, 79, 51
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35
--- a/audio/sfx/battle_14.asm
+++ b/audio/sfx/battle_14.asm
@@ -1,4 +1,4 @@
-SFX_Battle_14_Ch1: ; 20526 (8:4526)
+SFX_Battle_14_Ch1:
 	unknownnoise0x20 8, 255, 50
 	unknownnoise0x20 8, 244, 67
 	unknownnoise0x20 8, 242, 84
--- a/audio/sfx/battle_16.asm
+++ b/audio/sfx/battle_16.asm
@@ -1,4 +1,4 @@
-SFX_Battle_16_Ch1: ; 2054c (8:454c)
+SFX_Battle_16_Ch1:
 	unknownnoise0x20 1, 148, 35
 	unknownnoise0x20 1, 180, 34
 	unknownnoise0x20 8, 241, 68
--- a/audio/sfx/battle_17.asm
+++ b/audio/sfx/battle_17.asm
@@ -1,4 +1,4 @@
-SFX_Battle_17_Ch1: ; 20556 (8:4556)
+SFX_Battle_17_Ch1:
 	unknownnoise0x20 2, 148, 51
 	unknownnoise0x20 4, 180, 34
 	unknownnoise0x20 4, 241, 68
--- a/audio/sfx/battle_18.asm
+++ b/audio/sfx/battle_18.asm
@@ -1,4 +1,4 @@
-SFX_Battle_18_Ch1: ; 20563 (8:4563)
+SFX_Battle_18_Ch1:
 	unknownnoise0x20 4, 255, 85
 	unknownnoise0x20 8, 241, 101
 	endchannel
--- a/audio/sfx/battle_19.asm
+++ b/audio/sfx/battle_19.asm
@@ -1,4 +1,4 @@
-SFX_Battle_19_Ch1: ; 2056a (8:456a)
+SFX_Battle_19_Ch1:
 	unknownnoise0x20 2, 132, 67
 	unknownnoise0x20 2, 196, 34
 	unknownnoise0x20 8, 242, 52
--- a/audio/sfx/battle_1b.asm
+++ b/audio/sfx/battle_1b.asm
@@ -1,4 +1,4 @@
-SFX_Battle_1B_Ch1: ; 2057b (8:457b)
+SFX_Battle_1B_Ch1:
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 15, 242, 18
 	endchannel
--- a/audio/sfx/battle_1c.asm
+++ b/audio/sfx/battle_1c.asm
@@ -1,4 +1,4 @@
-SFX_Battle_1C_Ch1: ; 20582 (8:4582)
+SFX_Battle_1C_Ch1:
 	unknownnoise0x20 2, 194, 1
 	unknownnoise0x20 15, 244, 1
 	unknownnoise0x20 15, 242, 1
--- a/audio/sfx/battle_1e.asm
+++ b/audio/sfx/battle_1e.asm
@@ -1,4 +1,4 @@
-SFX_Battle_1E_Ch1: ; 20593 (8:4593)
+SFX_Battle_1E_Ch1:
 	duty 0
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Battle_1E_Ch2: ; 205a4 (8:45a4)
+SFX_Battle_1E_Ch2:
 	unknownnoise0x20 0, 209, 66
 	unknownnoise0x20 4, 161, 50
 	unknownnoise0x20 0, 209, 34
--- a/audio/sfx/battle_20.asm
+++ b/audio/sfx/battle_20.asm
@@ -1,4 +1,4 @@
-SFX_Battle_20_Ch1: ; 205be (8:45be)
+SFX_Battle_20_Ch1:
 	unknownnoise0x20 12, 241, 84
 	unknownnoise0x20 8, 241, 100
 	endchannel
--- a/audio/sfx/battle_21.asm
+++ b/audio/sfx/battle_21.asm
@@ -1,4 +1,4 @@
-SFX_Battle_21_Ch1: ; 205c5 (8:45c5)
+SFX_Battle_21_Ch1:
 	unknownnoise0x20 2, 241, 51
 	unknownnoise0x20 2, 193, 50
 	unknownnoise0x20 2, 161, 49
--- a/audio/sfx/battle_22.asm
+++ b/audio/sfx/battle_22.asm
@@ -1,4 +1,4 @@
-SFX_Battle_22_Ch1: ; 205d5 (8:45d5)
+SFX_Battle_22_Ch1:
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
--- a/audio/sfx/battle_23.asm
+++ b/audio/sfx/battle_23.asm
@@ -1,4 +1,4 @@
-SFX_Battle_23_Ch1: ; 205dc (8:45dc)
+SFX_Battle_23_Ch1:
 	unknownnoise0x20 2, 242, 67
 	unknownnoise0x20 4, 181, 50
 	unknownnoise0x20 9, 134, 49
--- a/audio/sfx/battle_24.asm
+++ b/audio/sfx/battle_24.asm
@@ -1,4 +1,4 @@
-SFX_Battle_24_Ch1: ; 205ec (8:45ec)
+SFX_Battle_24_Ch1:
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Battle_24_Ch2: ; 205f7 (8:45f7)
+SFX_Battle_24_Ch2:
 	unknownnoise0x20 15, 63, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
--- a/audio/sfx/battle_25.asm
+++ b/audio/sfx/battle_25.asm
@@ -1,4 +1,4 @@
-SFX_Battle_25_Ch1: ; 205fe (8:45fe)
+SFX_Battle_25_Ch1:
 	unknownnoise0x20 15, 79, 65
 	unknownnoise0x20 8, 143, 65
 	unknownnoise0x20 8, 207, 65
--- a/audio/sfx/battle_26.asm
+++ b/audio/sfx/battle_26.asm
@@ -1,4 +1,4 @@
-SFX_Battle_26_Ch1: ; 2060e (8:460e)
+SFX_Battle_26_Ch1:
 	unknownnoise0x20 10, 255, 80
 	unknownnoise0x20 15, 255, 81
 	unknownnoise0x20 8, 242, 81
--- a/audio/sfx/battle_27.asm
+++ b/audio/sfx/battle_27.asm
@@ -1,4 +1,4 @@
-SFX_Battle_27_Ch1: ; 20624 (8:4624)
+SFX_Battle_27_Ch1:
 	duty 2
 	unknownsfx0x20 15, 63, 192, 7
 
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Battle_27_Ch2: ; 20637 (8:4637)
+SFX_Battle_27_Ch2:
 	dutycycle 179
 	unknownsfx0x20 15, 47, 200, 7
 
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Battle_27_Ch3: ; 2064a (8:464a)
+SFX_Battle_27_Ch3:
 	unknownnoise0x20 3, 151, 18
 	unknownnoise0x20 3, 161, 17
 	loopchannel 10, SFX_Battle_27_Ch3
--- a/audio/sfx/battle_28.asm
+++ b/audio/sfx/battle_28.asm
@@ -1,4 +1,4 @@
-SFX_Battle_28_Ch1: ; 20655 (8:4655)
+SFX_Battle_28_Ch1:
 	duty 0
 	unknownsfx0x20 0, 241, 192, 7
 	unknownsfx0x20 0, 241, 0, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Battle_28_Ch2: ; 20664 (8:4664)
+SFX_Battle_28_Ch2:
 	dutycycle 179
 	unknownsfx0x20 0, 225, 193, 7
 	unknownsfx0x20 0, 225, 1, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Battle_28_Ch3: ; 20673 (8:4673)
+SFX_Battle_28_Ch3:
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
 	loopchannel 6, SFX_Battle_28_Ch3
--- a/audio/sfx/battle_29.asm
+++ b/audio/sfx/battle_29.asm
@@ -1,4 +1,4 @@
-SFX_Battle_29_Ch1: ; 2067e (8:467e)
+SFX_Battle_29_Ch1:
 	dutycycle 201
 	unknownsfx0x20 11, 243, 32, 1
 	unknownsfx0x20 9, 211, 80, 1
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Battle_29_Ch2: ; 20695 (8:4695)
+SFX_Battle_29_Ch2:
 	unknownnoise0x20 10, 243, 53
 	unknownnoise0x20 14, 246, 69
 	loopchannel 4, SFX_Battle_29_Ch2
--- a/audio/sfx/battle_2a.asm
+++ b/audio/sfx/battle_2a.asm
@@ -1,4 +1,4 @@
-SFX_Battle_2A_Ch1: ; 206a9 (8:46a9)
+SFX_Battle_2A_Ch1:
 	dutycycle 57
 	unknownsfx0x20 4, 244, 0, 6
 	unknownsfx0x20 3, 196, 0, 5
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Battle_2A_Ch2: ; 206c4 (8:46c4)
+SFX_Battle_2A_Ch2:
 	dutycycle 141
 	unknownsfx0x20 5, 228, 224, 5
 	unknownsfx0x20 4, 180, 224, 4
@@ -19,7 +19,7 @@
 	endchannel
 
 
-SFX_Battle_2A_Ch3: ; 206db (8:46db)
+SFX_Battle_2A_Ch3:
 	unknownnoise0x20 5, 195, 51
 	unknownnoise0x20 3, 146, 67
 	unknownnoise0x20 10, 181, 51
--- a/audio/sfx/battle_2b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -1,4 +1,4 @@
-SFX_Battle_2B_Ch1: ; 206ec (8:46ec)
+SFX_Battle_2B_Ch1:
 	dutycycle 210
 	unknownsfx0x20 3, 129, 0, 3
 	unknownsfx0x20 3, 193, 0, 4
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Battle_2B_Ch2: ; 2070b (8:470b)
+SFX_Battle_2B_Ch2:
 	unknownnoise0x20 3, 98, 34
 	unknownnoise0x20 3, 162, 50
 	unknownnoise0x20 3, 210, 51
--- a/audio/sfx/battle_2c.asm
+++ b/audio/sfx/battle_2c.asm
@@ -1,4 +1,4 @@
-SFX_Battle_2C_Ch1: ; 20722 (8:4722)
+SFX_Battle_2C_Ch1:
 	dutycycle 57
 	unknownsfx0x20 15, 244, 0, 5
 	unknownsfx0x20 15, 196, 0, 4
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Battle_2C_Ch2: ; 20735 (8:4735)
+SFX_Battle_2C_Ch2:
 	dutycycle 141
 	unknownsfx0x20 7, 228, 48, 4
 	unknownsfx0x20 15, 180, 48, 3
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Battle_2C_Ch3: ; 20748 (8:4748)
+SFX_Battle_2C_Ch3:
 	unknownnoise0x20 9, 244, 68
 	unknownnoise0x20 9, 242, 67
 	unknownnoise0x20 15, 244, 66
--- a/audio/sfx/battle_2e.asm
+++ b/audio/sfx/battle_2e.asm
@@ -1,4 +1,4 @@
-SFX_Battle_2E_Ch1: ; 20792 (8:4792)
+SFX_Battle_2E_Ch1:
 	duty 0
 	unknownsfx0x20 2, 241, 0, 2
 	unknownsfx0x20 3, 241, 0, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Battle_2E_Ch2: ; 207a9 (8:47a9)
+SFX_Battle_2E_Ch2:
 	dutycycle 179
 	unknownsfx0x20 2, 225, 2, 3
 	unknownsfx0x20 3, 225, 242, 7
@@ -18,7 +18,7 @@
 	endchannel
 
 
-SFX_Battle_2E_Ch3: ; 207c0 (8:47c0)
+SFX_Battle_2E_Ch3:
 	unknownnoise0x20 2, 211, 16
 	unknownnoise0x20 3, 211, 17
 	unknownnoise0x20 2, 210, 16
--- a/audio/sfx/battle_2f.asm
+++ b/audio/sfx/battle_2f.asm
@@ -1,4 +1,4 @@
-SFX_Battle_2F_Ch1: ; 207d1 (8:47d1)
+SFX_Battle_2F_Ch1:
 	dutycycle 43
 	unknownsfx0x20 3, 241, 240, 7
 	unknownsfx0x20 4, 242, 0, 2
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Battle_2F_Ch2: ; 207e0 (8:47e0)
+SFX_Battle_2F_Ch2:
 	dutycycle 179
 	unknownsfx0x20 4, 226, 2, 2
 	unknownsfx0x20 4, 225, 226, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Battle_2F_Ch3: ; 207ef (8:47ef)
+SFX_Battle_2F_Ch3:
 	unknownnoise0x20 4, 255, 67
 	unknownnoise0x20 4, 242, 68
 	loopchannel 9, SFX_Battle_2F_Ch3
--- a/audio/sfx/battle_31.asm
+++ b/audio/sfx/battle_31.asm
@@ -1,4 +1,4 @@
-SFX_Battle_31_Ch1: ; 20847 (8:4847)
+SFX_Battle_31_Ch1:
 	duty 2
 	unknownsfx0x20 15, 255, 224, 7
 	unknownsfx0x20 15, 255, 224, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Battle_31_Ch2: ; 2085e (8:485e)
+SFX_Battle_31_Ch2:
 	duty 3
 	unknownsfx0x20 15, 255, 226, 7
 	unknownsfx0x20 15, 255, 225, 7
--- a/audio/sfx/battle_32.asm
+++ b/audio/sfx/battle_32.asm
@@ -1,4 +1,4 @@
-SFX_Battle_32_Ch1: ; 20875 (8:4875)
+SFX_Battle_32_Ch1:
 	duty 2
 	unknownsfx0x10 175
 	unknownsfx0x20 8, 241, 0, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Battle_32_Ch2: ; 20880 (8:4880)
+SFX_Battle_32_Ch2:
 	duty 3
 	unknownsfx0x20 8, 241, 1, 7
 	endchannel
--- a/audio/sfx/battle_33.asm
+++ b/audio/sfx/battle_33.asm
@@ -1,4 +1,4 @@
-SFX_Battle_33_Ch1: ; 20887 (8:4887)
+SFX_Battle_33_Ch1:
 	duty 2
 	unknownsfx0x20 6, 241, 0, 5
 	unknownsfx0x20 6, 241, 128, 5
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Battle_33_Ch2: ; 2089e (8:489e)
+SFX_Battle_33_Ch2:
 	duty 3
 	unknownsfx0x20 6, 225, 16, 5
 	unknownsfx0x20 6, 225, 144, 5
--- a/audio/sfx/battle_34.asm
+++ b/audio/sfx/battle_34.asm
@@ -1,4 +1,4 @@
-SFX_Battle_34_Ch1: ; 208b5 (8:48b5)
+SFX_Battle_34_Ch1:
 	dutycycle 237
 	unknownsfx0x20 8, 255, 248, 3
 	unknownsfx0x20 15, 255, 0, 4
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Battle_34_Ch2: ; 208c4 (8:48c4)
+SFX_Battle_34_Ch2:
 	dutycycle 180
 	unknownsfx0x20 8, 239, 192, 3
 	unknownsfx0x20 15, 239, 192, 3
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Battle_34_Ch3: ; 208d3 (8:48d3)
+SFX_Battle_34_Ch3:
 	unknownnoise0x20 4, 255, 81
 	unknownnoise0x20 8, 255, 84
 	unknownnoise0x20 15, 255, 85
--- a/audio/sfx/battle_35.asm
+++ b/audio/sfx/battle_35.asm
@@ -1,4 +1,4 @@
-SFX_Battle_35_Ch1: ; 208e0 (8:48e0)
+SFX_Battle_35_Ch1:
 	executemusic
 	vibrato 10, 2, 4
 	duty 2
@@ -13,7 +13,7 @@
 	endchannel
 
 
-SFX_Battle_35_Ch2: ; 208f0 (8:48f0)
+SFX_Battle_35_Ch2:
 	executemusic
 	vibrato 10, 2, 3
 	duty 2
--- a/audio/sfx/battle_36.asm
+++ b/audio/sfx/battle_36.asm
@@ -1,4 +1,4 @@
-SFX_Battle_36_Ch1: ; 20902 (8:4902)
+SFX_Battle_36_Ch1:
 	duty 0
 	unknownsfx0x20 2, 241, 128, 7
 	unknownsfx0x20 2, 241, 0, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Battle_36_Ch2: ; 20941 (8:4941)
+SFX_Battle_36_Ch2:
 	dutycycle 179
 	unknownsfx0x20 2, 241, 129, 7
 	unknownsfx0x20 2, 241, 1, 7
@@ -40,7 +40,7 @@
 	endchannel
 
 
-SFX_Battle_36_Ch3: ; 20980 (8:4980)
+SFX_Battle_36_Ch3:
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
 	loopchannel 26, SFX_Battle_36_Ch3
--- a/audio/sfx/caught_mon.asm
+++ b/audio/sfx/caught_mon.asm
@@ -1,4 +1,4 @@
-SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13)
+SFX_Caught_Mon_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e)
+SFX_Caught_Mon_Ch2:
 	executemusic
 	duty 2
 	notetype 6, 12, 2
@@ -44,7 +44,7 @@
 	endchannel
 
 
-SFX_Caught_Mon_Ch3: ; 23a44 (8:7a44)
+SFX_Caught_Mon_Ch3:
 	executemusic
 	notetype 6, 1, 0
 	octave 4
--- a/audio/sfx/collision_1.asm
+++ b/audio/sfx/collision_1.asm
@@ -1,4 +1,4 @@
-SFX_Collision_1_Ch1: ; 8447 (2:4447)
+SFX_Collision_1_Ch1:
 	duty 2
 	unknownsfx0x10 90
 	unknownsfx0x20 15, 241, 0, 3
--- a/audio/sfx/collision_3.asm
+++ b/audio/sfx/collision_3.asm
@@ -1,4 +1,4 @@
-SFX_Collision_3_Ch1: ; 7c430 (1f:4430)
+SFX_Collision_3_Ch1:
 	duty 2
 	unknownsfx0x10 90
 	unknownsfx0x20 15, 241, 0, 3
--- a/audio/sfx/cry00_1.asm
+++ b/audio/sfx/cry00_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry00_1_Ch1: ; 8987 (2:4987)
+SFX_Cry00_1_Ch1:
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry00_1_Ch2: ; 8996 (2:4996)
+SFX_Cry00_1_Ch2:
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry00_1_Ch3: ; 89a5 (2:49a5)
+SFX_Cry00_1_Ch3:
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
--- a/audio/sfx/cry00_2.asm
+++ b/audio/sfx/cry00_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f)
+SFX_Cry00_2_Ch1:
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e)
+SFX_Cry00_2_Ch2:
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry00_2_Ch3: ; 20c4d (8:4c4d)
+SFX_Cry00_2_Ch3:
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
--- a/audio/sfx/cry00_3.asm
+++ b/audio/sfx/cry00_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc)
+SFX_Cry00_3_Ch1:
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b)
+SFX_Cry00_3_Ch2:
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry00_3_Ch3: ; 7ca1a (1f:4a1a)
+SFX_Cry00_3_Ch3:
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
--- a/audio/sfx/cry01_1.asm
+++ b/audio/sfx/cry01_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry01_1_Ch1: ; 8b97 (2:4b97)
+SFX_Cry01_1_Ch1:
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry01_1_Ch2: ; 8baa (2:4baa)
+SFX_Cry01_1_Ch2:
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry01_1_Ch3: ; 8bbd (2:4bbd)
+SFX_Cry01_1_Ch3:
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
--- a/audio/sfx/cry01_2.asm
+++ b/audio/sfx/cry01_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f)
+SFX_Cry01_2_Ch1:
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry01_2_Ch2: ; 20e52 (8:4e52)
+SFX_Cry01_2_Ch2:
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry01_2_Ch3: ; 20e65 (8:4e65)
+SFX_Cry01_2_Ch3:
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
--- a/audio/sfx/cry01_3.asm
+++ b/audio/sfx/cry01_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c)
+SFX_Cry01_3_Ch1:
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f)
+SFX_Cry01_3_Ch2:
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry01_3_Ch3: ; 7cc32 (1f:4c32)
+SFX_Cry01_3_Ch3:
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
--- a/audio/sfx/cry02_1.asm
+++ b/audio/sfx/cry02_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c)
+SFX_Cry02_1_Ch1:
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry02_1_Ch2: ; 8b1b (2:4b1b)
+SFX_Cry02_1_Ch2:
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
@@ -13,5 +13,5 @@
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_Cry02_1_Ch3: ; 8b29 (2:4b29)
+SFX_Cry02_1_Ch3:
 	endchannel
--- a/audio/sfx/cry02_2.asm
+++ b/audio/sfx/cry02_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry02_2_Ch1: ; 20db4 (8:4db4)
+SFX_Cry02_2_Ch1:
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry02_2_Ch2: ; 20dc3 (8:4dc3)
+SFX_Cry02_2_Ch2:
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
@@ -13,5 +13,5 @@
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_Cry02_2_Ch3: ; 20dd1 (8:4dd1)
+SFX_Cry02_2_Ch3:
 	endchannel
--- a/audio/sfx/cry02_3.asm
+++ b/audio/sfx/cry02_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81)
+SFX_Cry02_3_Ch1:
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry02_3_Ch2: ; 7cb90 (1f:4b90)
+SFX_Cry02_3_Ch2:
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
@@ -13,5 +13,5 @@
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_Cry02_3_Ch3: ; 7cb9e (1f:4b9e)
+SFX_Cry02_3_Ch3:
 	endchannel
--- a/audio/sfx/cry03_1.asm
+++ b/audio/sfx/cry03_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry03_1_Ch1: ; 88a6 (2:48a6)
+SFX_Cry03_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry03_1_Ch2: ; 88c5 (2:48c5)
+SFX_Cry03_1_Ch2:
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Cry03_1_Ch3: ; 88e4 (2:48e4)
+SFX_Cry03_1_Ch3:
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
--- a/audio/sfx/cry03_2.asm
+++ b/audio/sfx/cry03_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e)
+SFX_Cry03_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d)
+SFX_Cry03_2_Ch2:
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Cry03_2_Ch3: ; 20b8c (8:4b8c)
+SFX_Cry03_2_Ch3:
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
--- a/audio/sfx/cry03_3.asm
+++ b/audio/sfx/cry03_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry03_3_Ch1: ; 7c91b (1f:491b)
+SFX_Cry03_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry03_3_Ch2: ; 7c93a (1f:493a)
+SFX_Cry03_3_Ch2:
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Cry03_3_Ch3: ; 7c959 (1f:4959)
+SFX_Cry03_3_Ch3:
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
--- a/audio/sfx/cry04_1.asm
+++ b/audio/sfx/cry04_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry04_1_Ch1: ; 8c55 (2:4c55)
+SFX_Cry04_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry04_1_Ch2: ; 8c74 (2:4c74)
+SFX_Cry04_1_Ch2:
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Cry04_1_Ch3: ; 8c93 (2:4c93)
+SFX_Cry04_1_Ch3:
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
--- a/audio/sfx/cry04_2.asm
+++ b/audio/sfx/cry04_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry04_2_Ch1: ; 20efd (8:4efd)
+SFX_Cry04_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c)
+SFX_Cry04_2_Ch2:
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Cry04_2_Ch3: ; 20f3b (8:4f3b)
+SFX_Cry04_2_Ch3:
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
--- a/audio/sfx/cry04_3.asm
+++ b/audio/sfx/cry04_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca)
+SFX_Cry04_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9)
+SFX_Cry04_3_Ch2:
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Cry04_3_Ch3: ; 7cd08 (1f:4d08)
+SFX_Cry04_3_Ch3:
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
--- a/audio/sfx/cry05_1.asm
+++ b/audio/sfx/cry05_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry05_1_Ch1: ; 8a35 (2:4a35)
+SFX_Cry05_1_Ch1:
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry05_1_Ch2: ; 8a48 (2:4a48)
+SFX_Cry05_1_Ch2:
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,5 +15,5 @@
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_Cry05_1_Ch3: ; 8a5a (2:4a5a)
+SFX_Cry05_1_Ch3:
 	endchannel
--- a/audio/sfx/cry05_2.asm
+++ b/audio/sfx/cry05_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd)
+SFX_Cry05_2_Ch1:
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0)
+SFX_Cry05_2_Ch2:
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,5 +15,5 @@
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_Cry05_2_Ch3: ; 20d02 (8:4d02)
+SFX_Cry05_2_Ch3:
 	endchannel
--- a/audio/sfx/cry05_3.asm
+++ b/audio/sfx/cry05_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa)
+SFX_Cry05_3_Ch1:
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd)
+SFX_Cry05_3_Ch2:
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,5 +15,5 @@
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_Cry05_3_Ch3: ; 7cacf (1f:4acf)
+SFX_Cry05_3_Ch3:
 	endchannel
--- a/audio/sfx/cry06_1.asm
+++ b/audio/sfx/cry06_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry06_1_Ch1: ; 89df (2:49df)
+SFX_Cry06_1_Ch1:
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_Cry06_1_Ch2: ; 89f9 (2:49f9)
+SFX_Cry06_1_Ch2:
 	endchannel
 
 
-SFX_Cry06_1_Ch3: ; 89fa (2:49fa)
+SFX_Cry06_1_Ch3:
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
--- a/audio/sfx/cry06_2.asm
+++ b/audio/sfx/cry06_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry06_2_Ch1: ; 20c87 (8:4c87)
+SFX_Cry06_2_Ch1:
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_Cry06_2_Ch2: ; 20ca1 (8:4ca1)
+SFX_Cry06_2_Ch2:
 	endchannel
 
 
-SFX_Cry06_2_Ch3: ; 20ca2 (8:4ca2)
+SFX_Cry06_2_Ch3:
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
--- a/audio/sfx/cry06_3.asm
+++ b/audio/sfx/cry06_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54)
+SFX_Cry06_3_Ch1:
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_Cry06_3_Ch2: ; 7ca6e (1f:4a6e)
+SFX_Cry06_3_Ch2:
 	endchannel
 
 
-SFX_Cry06_3_Ch3: ; 7ca6f (1f:4a6f)
+SFX_Cry06_3_Ch3:
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
--- a/audio/sfx/cry07_1.asm
+++ b/audio/sfx/cry07_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d)
+SFX_Cry07_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c)
+SFX_Cry07_1_Ch2:
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry07_1_Ch3: ; 8a2b (2:4a2b)
+SFX_Cry07_1_Ch3:
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
--- a/audio/sfx/cry07_2.asm
+++ b/audio/sfx/cry07_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5)
+SFX_Cry07_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4)
+SFX_Cry07_2_Ch2:
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry07_2_Ch3: ; 20cd3 (8:4cd3)
+SFX_Cry07_2_Ch3:
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
--- a/audio/sfx/cry07_3.asm
+++ b/audio/sfx/cry07_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82)
+SFX_Cry07_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91)
+SFX_Cry07_3_Ch2:
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry07_3_Ch3: ; 7caa0 (1f:4aa0)
+SFX_Cry07_3_Ch3:
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
--- a/audio/sfx/cry08_1.asm
+++ b/audio/sfx/cry08_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry08_1_Ch1: ; 8c25 (2:4c25)
+SFX_Cry08_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry08_1_Ch2: ; 8c38 (2:4c38)
+SFX_Cry08_1_Ch2:
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry08_1_Ch3: ; 8c4b (2:4c4b)
+SFX_Cry08_1_Ch3:
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
--- a/audio/sfx/cry08_2.asm
+++ b/audio/sfx/cry08_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd)
+SFX_Cry08_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0)
+SFX_Cry08_2_Ch2:
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry08_2_Ch3: ; 20ef3 (8:4ef3)
+SFX_Cry08_2_Ch3:
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
--- a/audio/sfx/cry08_3.asm
+++ b/audio/sfx/cry08_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a)
+SFX_Cry08_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad)
+SFX_Cry08_3_Ch2:
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry08_3_Ch3: ; 7ccc0 (1f:4cc0)
+SFX_Cry08_3_Ch3:
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
--- a/audio/sfx/cry09_1.asm
+++ b/audio/sfx/cry09_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry09_1_Ch1: ; 872f (2:472f)
+SFX_Cry09_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry09_1_Ch2: ; 874c (2:474c)
+SFX_Cry09_1_Ch2:
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Cry09_1_Ch3: ; 876d (2:476d)
+SFX_Cry09_1_Ch3:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
--- a/audio/sfx/cry09_2.asm
+++ b/audio/sfx/cry09_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry09_2_Ch1: ; 209d7 (8:49d7)
+SFX_Cry09_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry09_2_Ch2: ; 209f4 (8:49f4)
+SFX_Cry09_2_Ch2:
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Cry09_2_Ch3: ; 20a15 (8:4a15)
+SFX_Cry09_2_Ch3:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
--- a/audio/sfx/cry09_3.asm
+++ b/audio/sfx/cry09_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4)
+SFX_Cry09_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1)
+SFX_Cry09_3_Ch2:
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Cry09_3_Ch3: ; 7c7e2 (1f:47e2)
+SFX_Cry09_3_Ch3:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
--- a/audio/sfx/cry0a_1.asm
+++ b/audio/sfx/cry0a_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0A_1_Ch1: ; 8bca (2:4bca)
+SFX_Cry0A_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9)
+SFX_Cry0A_1_Ch2:
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Cry0A_1_Ch3: ; 8c0c (2:4c0c)
+SFX_Cry0A_1_Ch3:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
--- a/audio/sfx/cry0a_2.asm
+++ b/audio/sfx/cry0a_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72)
+SFX_Cry0A_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91)
+SFX_Cry0A_2_Ch2:
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Cry0A_2_Ch3: ; 20eb4 (8:4eb4)
+SFX_Cry0A_2_Ch3:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
--- a/audio/sfx/cry0a_3.asm
+++ b/audio/sfx/cry0a_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f)
+SFX_Cry0A_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e)
+SFX_Cry0A_3_Ch2:
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Cry0A_3_Ch3: ; 7cc81 (1f:4c81)
+SFX_Cry0A_3_Ch3:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
--- a/audio/sfx/cry0b_1.asm
+++ b/audio/sfx/cry0b_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b)
+SFX_Cry0B_1_Ch1:
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@
 	endchannel
 
 
-SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86)
+SFX_Cry0B_1_Ch2:
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@
 	endchannel
 
 
-SFX_Cry0B_1_Ch3: ; 8aa5 (2:4aa5)
+SFX_Cry0B_1_Ch3:
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
--- a/audio/sfx/cry0b_2.asm
+++ b/audio/sfx/cry0b_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03)
+SFX_Cry0B_2_Ch1:
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@
 	endchannel
 
 
-SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e)
+SFX_Cry0B_2_Ch2:
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@
 	endchannel
 
 
-SFX_Cry0B_2_Ch3: ; 20d4d (8:4d4d)
+SFX_Cry0B_2_Ch3:
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
--- a/audio/sfx/cry0b_3.asm
+++ b/audio/sfx/cry0b_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0)
+SFX_Cry0B_3_Ch1:
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@
 	endchannel
 
 
-SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb)
+SFX_Cry0B_3_Ch2:
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@
 	endchannel
 
 
-SFX_Cry0B_3_Ch3: ; 7cb1a (1f:4b1a)
+SFX_Cry0B_3_Ch3:
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
--- a/audio/sfx/cry0c_1.asm
+++ b/audio/sfx/cry0c_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0C_1_Ch1: ; 8abe (2:4abe)
+SFX_Cry0C_1_Ch1:
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@
 	endchannel
 
 
-SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5)
+SFX_Cry0C_1_Ch2:
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,5 +25,5 @@
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_Cry0C_1_Ch3: ; 8b0b (2:4b0b)
+SFX_Cry0C_1_Ch3:
 	endchannel
--- a/audio/sfx/cry0c_2.asm
+++ b/audio/sfx/cry0c_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66)
+SFX_Cry0C_2_Ch1:
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@
 	endchannel
 
 
-SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d)
+SFX_Cry0C_2_Ch2:
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,5 +25,5 @@
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_Cry0C_2_Ch3: ; 20db3 (8:4db3)
+SFX_Cry0C_2_Ch3:
 	endchannel
--- a/audio/sfx/cry0c_3.asm
+++ b/audio/sfx/cry0c_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33)
+SFX_Cry0C_3_Ch1:
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@
 	endchannel
 
 
-SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a)
+SFX_Cry0C_3_Ch2:
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,5 +25,5 @@
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_Cry0C_3_Ch3: ; 7cb80 (1f:4b80)
+SFX_Cry0C_3_Ch3:
 	endchannel
--- a/audio/sfx/cry0d_1.asm
+++ b/audio/sfx/cry0d_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a)
+SFX_Cry0D_1_Ch1:
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49)
+SFX_Cry0D_1_Ch2:
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@
 	endchannel
 
 
-SFX_Cry0D_1_Ch3: ; 8b78 (2:4b78)
+SFX_Cry0D_1_Ch3:
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
--- a/audio/sfx/cry0d_2.asm
+++ b/audio/sfx/cry0d_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2)
+SFX_Cry0D_2_Ch1:
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1)
+SFX_Cry0D_2_Ch2:
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@
 	endchannel
 
 
-SFX_Cry0D_2_Ch3: ; 20e20 (8:4e20)
+SFX_Cry0D_2_Ch3:
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
--- a/audio/sfx/cry0d_3.asm
+++ b/audio/sfx/cry0d_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f)
+SFX_Cry0D_3_Ch1:
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe)
+SFX_Cry0D_3_Ch2:
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@
 	endchannel
 
 
-SFX_Cry0D_3_Ch3: ; 7cbed (1f:4bed)
+SFX_Cry0D_3_Ch3:
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
--- a/audio/sfx/cry0e_1.asm
+++ b/audio/sfx/cry0e_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0E_1_Ch1: ; 89af (2:49af)
+SFX_Cry0E_1_Ch1:
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2)
+SFX_Cry0E_1_Ch2:
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry0E_1_Ch3: ; 89d5 (2:49d5)
+SFX_Cry0E_1_Ch3:
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
--- a/audio/sfx/cry0e_2.asm
+++ b/audio/sfx/cry0e_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57)
+SFX_Cry0E_2_Ch1:
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a)
+SFX_Cry0E_2_Ch2:
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry0E_2_Ch3: ; 20c7d (8:4c7d)
+SFX_Cry0E_2_Ch3:
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
--- a/audio/sfx/cry0e_3.asm
+++ b/audio/sfx/cry0e_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24)
+SFX_Cry0E_3_Ch1:
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37)
+SFX_Cry0E_3_Ch2:
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry0E_3_Ch3: ; 7ca4a (1f:4a4a)
+SFX_Cry0E_3_Ch3:
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
--- a/audio/sfx/cry0f_1.asm
+++ b/audio/sfx/cry0f_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1)
+SFX_Cry0F_1_Ch1:
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry0F_1_Ch2: ; 890c (2:490c)
+SFX_Cry0F_1_Ch2:
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry0F_1_Ch3: ; 8927 (2:4927)
+SFX_Cry0F_1_Ch3:
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
--- a/audio/sfx/cry0f_2.asm
+++ b/audio/sfx/cry0f_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99)
+SFX_Cry0F_2_Ch1:
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4)
+SFX_Cry0F_2_Ch2:
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry0F_2_Ch3: ; 20bcf (8:4bcf)
+SFX_Cry0F_2_Ch3:
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
--- a/audio/sfx/cry0f_3.asm
+++ b/audio/sfx/cry0f_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966)
+SFX_Cry0F_3_Ch1:
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981)
+SFX_Cry0F_3_Ch2:
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry0F_3_Ch3: ; 7c99c (1f:499c)
+SFX_Cry0F_3_Ch3:
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
--- a/audio/sfx/cry10_1.asm
+++ b/audio/sfx/cry10_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry10_1_Ch1: ; 8937 (2:4937)
+SFX_Cry10_1_Ch1:
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry10_1_Ch2: ; 895a (2:495a)
+SFX_Cry10_1_Ch2:
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,7 +24,7 @@
 	endchannel
 
 
-SFX_Cry10_1_Ch3: ; 897d (2:497d)
+SFX_Cry10_1_Ch3:
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
--- a/audio/sfx/cry10_2.asm
+++ b/audio/sfx/cry10_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf)
+SFX_Cry10_2_Ch1:
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry10_2_Ch2: ; 20c02 (8:4c02)
+SFX_Cry10_2_Ch2:
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,7 +24,7 @@
 	endchannel
 
 
-SFX_Cry10_2_Ch3: ; 20c25 (8:4c25)
+SFX_Cry10_2_Ch3:
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
--- a/audio/sfx/cry10_3.asm
+++ b/audio/sfx/cry10_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac)
+SFX_Cry10_3_Ch1:
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf)
+SFX_Cry10_3_Ch2:
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,7 +24,7 @@
 	endchannel
 
 
-SFX_Cry10_3_Ch3: ; 7c9f2 (1f:49f2)
+SFX_Cry10_3_Ch3:
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
--- a/audio/sfx/cry11_1.asm
+++ b/audio/sfx/cry11_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry11_1_Ch1: ; 8813 (2:4813)
+SFX_Cry11_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry11_1_Ch2: ; 8832 (2:4832)
+SFX_Cry11_1_Ch2:
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Cry11_1_Ch3: ; 8855 (2:4855)
+SFX_Cry11_1_Ch3:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
--- a/audio/sfx/cry11_2.asm
+++ b/audio/sfx/cry11_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry11_2_Ch1: ; 20abb (8:4abb)
+SFX_Cry11_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry11_2_Ch2: ; 20ada (8:4ada)
+SFX_Cry11_2_Ch2:
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Cry11_2_Ch3: ; 20afd (8:4afd)
+SFX_Cry11_2_Ch3:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
--- a/audio/sfx/cry11_3.asm
+++ b/audio/sfx/cry11_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry11_3_Ch1: ; 7c888 (1f:4888)
+SFX_Cry11_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7)
+SFX_Cry11_3_Ch2:
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Cry11_3_Ch3: ; 7c8ca (1f:48ca)
+SFX_Cry11_3_Ch3:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
--- a/audio/sfx/cry12_1.asm
+++ b/audio/sfx/cry12_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b)
+SFX_Cry12_1_Ch1:
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e)
+SFX_Cry12_1_Ch2:
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry12_1_Ch3: ; 8d51 (2:4d51)
+SFX_Cry12_1_Ch3:
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
--- a/audio/sfx/cry12_2.asm
+++ b/audio/sfx/cry12_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3)
+SFX_Cry12_2_Ch1:
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6)
+SFX_Cry12_2_Ch2:
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry12_2_Ch3: ; 20ff9 (8:4ff9)
+SFX_Cry12_2_Ch3:
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
--- a/audio/sfx/cry12_3.asm
+++ b/audio/sfx/cry12_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0)
+SFX_Cry12_3_Ch1:
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3)
+SFX_Cry12_3_Ch2:
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry12_3_Ch3: ; 7cdc6 (1f:4dc6)
+SFX_Cry12_3_Ch3:
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
--- a/audio/sfx/cry13_1.asm
+++ b/audio/sfx/cry13_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e)
+SFX_Cry13_1_Ch1:
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry13_1_Ch2: ; 8d79 (2:4d79)
+SFX_Cry13_1_Ch2:
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry13_1_Ch3: ; 8d94 (2:4d94)
+SFX_Cry13_1_Ch3:
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
--- a/audio/sfx/cry13_2.asm
+++ b/audio/sfx/cry13_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry13_2_Ch1: ; 21006 (8:5006)
+SFX_Cry13_2_Ch1:
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry13_2_Ch2: ; 21021 (8:5021)
+SFX_Cry13_2_Ch2:
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry13_2_Ch3: ; 2103c (8:503c)
+SFX_Cry13_2_Ch3:
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
--- a/audio/sfx/cry13_3.asm
+++ b/audio/sfx/cry13_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3)
+SFX_Cry13_3_Ch1:
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee)
+SFX_Cry13_3_Ch2:
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry13_3_Ch3: ; 7ce09 (1f:4e09)
+SFX_Cry13_3_Ch3:
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
--- a/audio/sfx/cry14_1.asm
+++ b/audio/sfx/cry14_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry14_1_Ch1: ; 8da7 (2:4da7)
+SFX_Cry14_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry14_1_Ch2: ; 8db6 (2:4db6)
+SFX_Cry14_1_Ch2:
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry14_1_Ch3: ; 8dc5 (2:4dc5)
+SFX_Cry14_1_Ch3:
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
--- a/audio/sfx/cry14_2.asm
+++ b/audio/sfx/cry14_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry14_2_Ch1: ; 2104f (8:504f)
+SFX_Cry14_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry14_2_Ch2: ; 2105e (8:505e)
+SFX_Cry14_2_Ch2:
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry14_2_Ch3: ; 2106d (8:506d)
+SFX_Cry14_2_Ch3:
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
--- a/audio/sfx/cry14_3.asm
+++ b/audio/sfx/cry14_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c)
+SFX_Cry14_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b)
+SFX_Cry14_3_Ch2:
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry14_3_Ch3: ; 7ce3a (1f:4e3a)
+SFX_Cry14_3_Ch3:
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
--- a/audio/sfx/cry15_1.asm
+++ b/audio/sfx/cry15_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry15_1_Ch1: ; 8e35 (2:4e35)
+SFX_Cry15_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry15_1_Ch2: ; 8e50 (2:4e50)
+SFX_Cry15_1_Ch2:
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry15_1_Ch3: ; 8e6b (2:4e6b)
+SFX_Cry15_1_Ch3:
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
--- a/audio/sfx/cry15_2.asm
+++ b/audio/sfx/cry15_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry15_2_Ch1: ; 210dd (8:50dd)
+SFX_Cry15_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry15_2_Ch2: ; 210f8 (8:50f8)
+SFX_Cry15_2_Ch2:
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry15_2_Ch3: ; 21113 (8:5113)
+SFX_Cry15_2_Ch3:
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
--- a/audio/sfx/cry15_3.asm
+++ b/audio/sfx/cry15_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa)
+SFX_Cry15_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5)
+SFX_Cry15_3_Ch2:
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry15_3_Ch3: ; 7cee0 (1f:4ee0)
+SFX_Cry15_3_Ch3:
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
--- a/audio/sfx/cry16_1.asm
+++ b/audio/sfx/cry16_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8)
+SFX_Cry16_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7)
+SFX_Cry16_1_Ch2:
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry16_1_Ch3: ; 8ce6 (2:4ce6)
+SFX_Cry16_1_Ch3:
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
--- a/audio/sfx/cry16_2.asm
+++ b/audio/sfx/cry16_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry16_2_Ch1: ; 20f70 (8:4f70)
+SFX_Cry16_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f)
+SFX_Cry16_2_Ch2:
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry16_2_Ch3: ; 20f8e (8:4f8e)
+SFX_Cry16_2_Ch3:
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
--- a/audio/sfx/cry16_3.asm
+++ b/audio/sfx/cry16_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d)
+SFX_Cry16_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c)
+SFX_Cry16_3_Ch2:
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,7 +14,7 @@
 	endchannel
 
 
-SFX_Cry16_3_Ch3: ; 7cd5b (1f:4d5b)
+SFX_Cry16_3_Ch3:
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
--- a/audio/sfx/cry17_1.asm
+++ b/audio/sfx/cry17_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e)
+SFX_Cry17_1_Ch1:
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry17_1_Ch2: ; 8e91 (2:4e91)
+SFX_Cry17_1_Ch2:
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry17_1_Ch3: ; 8ea4 (2:4ea4)
+SFX_Cry17_1_Ch3:
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
--- a/audio/sfx/cry17_2.asm
+++ b/audio/sfx/cry17_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry17_2_Ch1: ; 21126 (8:5126)
+SFX_Cry17_2_Ch1:
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry17_2_Ch2: ; 21139 (8:5139)
+SFX_Cry17_2_Ch2:
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry17_2_Ch3: ; 2114c (8:514c)
+SFX_Cry17_2_Ch3:
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
--- a/audio/sfx/cry17_3.asm
+++ b/audio/sfx/cry17_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3)
+SFX_Cry17_3_Ch1:
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06)
+SFX_Cry17_3_Ch2:
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry17_3_Ch3: ; 7cf19 (1f:4f19)
+SFX_Cry17_3_Ch3:
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
--- a/audio/sfx/cry18_1.asm
+++ b/audio/sfx/cry18_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e)
+SFX_Cry18_1_Ch1:
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1)
+SFX_Cry18_1_Ch2:
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@
 	endchannel
 
 
-SFX_Cry18_1_Ch3: ; 8fd4 (2:4fd4)
+SFX_Cry18_1_Ch3:
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
--- a/audio/sfx/cry18_2.asm
+++ b/audio/sfx/cry18_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry18_2_Ch1: ; 21236 (8:5236)
+SFX_Cry18_2_Ch1:
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry18_2_Ch2: ; 21259 (8:5259)
+SFX_Cry18_2_Ch2:
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@
 	endchannel
 
 
-SFX_Cry18_2_Ch3: ; 2127c (8:527c)
+SFX_Cry18_2_Ch3:
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
--- a/audio/sfx/cry18_3.asm
+++ b/audio/sfx/cry18_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry18_3_Ch1: ; 7d003 (1f:5003)
+SFX_Cry18_3_Ch1:
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry18_3_Ch2: ; 7d026 (1f:5026)
+SFX_Cry18_3_Ch2:
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@
 	endchannel
 
 
-SFX_Cry18_3_Ch3: ; 7d049 (1f:5049)
+SFX_Cry18_3_Ch3:
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
--- a/audio/sfx/cry19_1.asm
+++ b/audio/sfx/cry19_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6)
+SFX_Cry19_1_Ch1:
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5)
+SFX_Cry19_1_Ch2:
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,5 +14,5 @@
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_Cry19_1_Ch3: ; 8cc7 (2:4cc7)
+SFX_Cry19_1_Ch3:
 	endchannel
--- a/audio/sfx/cry19_2.asm
+++ b/audio/sfx/cry19_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e)
+SFX_Cry19_2_Ch1:
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d)
+SFX_Cry19_2_Ch2:
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,5 +14,5 @@
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_Cry19_2_Ch3: ; 20f6f (8:4f6f)
+SFX_Cry19_2_Ch3:
 	endchannel
--- a/audio/sfx/cry19_3.asm
+++ b/audio/sfx/cry19_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b)
+SFX_Cry19_3_Ch1:
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a)
+SFX_Cry19_3_Ch2:
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,5 +14,5 @@
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_Cry19_3_Ch3: ; 7cd3c (1f:4d3c)
+SFX_Cry19_3_Ch3:
 	endchannel
--- a/audio/sfx/cry1a_1.asm
+++ b/audio/sfx/cry1a_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1A_1_Ch1: ; 8eff (2:4eff)
+SFX_Cry1A_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a)
+SFX_Cry1A_1_Ch2:
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry1A_1_Ch3: ; 8f35 (2:4f35)
+SFX_Cry1A_1_Ch3:
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
--- a/audio/sfx/cry1a_2.asm
+++ b/audio/sfx/cry1a_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7)
+SFX_Cry1A_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2)
+SFX_Cry1A_2_Ch2:
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry1A_2_Ch3: ; 211dd (8:51dd)
+SFX_Cry1A_2_Ch3:
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
--- a/audio/sfx/cry1a_3.asm
+++ b/audio/sfx/cry1a_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74)
+SFX_Cry1A_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f)
+SFX_Cry1A_3_Ch2:
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry1A_3_Ch3: ; 7cfaa (1f:4faa)
+SFX_Cry1A_3_Ch3:
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
--- a/audio/sfx/cry1b_1.asm
+++ b/audio/sfx/cry1b_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0)
+SFX_Cry1B_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07)
+SFX_Cry1B_1_Ch2:
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,7 +18,7 @@
 	endchannel
 
 
-SFX_Cry1B_1_Ch3: ; 8d1e (2:4d1e)
+SFX_Cry1B_1_Ch3:
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
--- a/audio/sfx/cry1b_2.asm
+++ b/audio/sfx/cry1b_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98)
+SFX_Cry1B_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Cry1B_2_Ch2: ; 20faf (8:4faf)
+SFX_Cry1B_2_Ch2:
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,7 +18,7 @@
 	endchannel
 
 
-SFX_Cry1B_2_Ch3: ; 20fc6 (8:4fc6)
+SFX_Cry1B_2_Ch3:
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
--- a/audio/sfx/cry1b_3.asm
+++ b/audio/sfx/cry1b_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65)
+SFX_Cry1B_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c)
+SFX_Cry1B_3_Ch2:
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,7 +18,7 @@
 	endchannel
 
 
-SFX_Cry1B_3_Ch3: ; 7cd93 (1f:4d93)
+SFX_Cry1B_3_Ch3:
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
--- a/audio/sfx/cry1c_1.asm
+++ b/audio/sfx/cry1c_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1)
+SFX_Cry1C_1_Ch1:
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4)
+SFX_Cry1C_1_Ch2:
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Cry1C_1_Ch3: ; 8eef (2:4eef)
+SFX_Cry1C_1_Ch3:
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
--- a/audio/sfx/cry1c_2.asm
+++ b/audio/sfx/cry1c_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1C_2_Ch1: ; 21159 (8:5159)
+SFX_Cry1C_2_Ch1:
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry1C_2_Ch2: ; 2117c (8:517c)
+SFX_Cry1C_2_Ch2:
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Cry1C_2_Ch3: ; 21197 (8:5197)
+SFX_Cry1C_2_Ch3:
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
--- a/audio/sfx/cry1c_3.asm
+++ b/audio/sfx/cry1c_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26)
+SFX_Cry1C_3_Ch1:
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49)
+SFX_Cry1C_3_Ch2:
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Cry1C_3_Ch3: ; 7cf64 (1f:4f64)
+SFX_Cry1C_3_Ch3:
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
--- a/audio/sfx/cry1d_1.asm
+++ b/audio/sfx/cry1d_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48)
+SFX_Cry1D_1_Ch1:
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63)
+SFX_Cry1D_1_Ch2:
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry1D_1_Ch3: ; 8f7e (2:4f7e)
+SFX_Cry1D_1_Ch3:
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
--- a/audio/sfx/cry1d_2.asm
+++ b/audio/sfx/cry1d_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0)
+SFX_Cry1D_2_Ch1:
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry1D_2_Ch2: ; 2120b (8:520b)
+SFX_Cry1D_2_Ch2:
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry1D_2_Ch3: ; 21226 (8:5226)
+SFX_Cry1D_2_Ch3:
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
--- a/audio/sfx/cry1d_3.asm
+++ b/audio/sfx/cry1d_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd)
+SFX_Cry1D_3_Ch1:
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8)
+SFX_Cry1D_3_Ch2:
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Cry1D_3_Ch3: ; 7cff3 (1f:4ff3)
+SFX_Cry1D_3_Ch3:
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
--- a/audio/sfx/cry1e_1.asm
+++ b/audio/sfx/cry1e_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf)
+SFX_Cry1E_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2)
+SFX_Cry1E_1_Ch2:
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@
 	endchannel
 
 
-SFX_Cry1E_1_Ch3: ; 8e19 (2:4e19)
+SFX_Cry1E_1_Ch3:
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
--- a/audio/sfx/cry1e_2.asm
+++ b/audio/sfx/cry1e_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1E_2_Ch1: ; 21077 (8:5077)
+SFX_Cry1E_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry1E_2_Ch2: ; 2109a (8:509a)
+SFX_Cry1E_2_Ch2:
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@
 	endchannel
 
 
-SFX_Cry1E_2_Ch3: ; 210c1 (8:50c1)
+SFX_Cry1E_2_Ch3:
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
--- a/audio/sfx/cry1e_3.asm
+++ b/audio/sfx/cry1e_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44)
+SFX_Cry1E_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67)
+SFX_Cry1E_3_Ch2:
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@
 	endchannel
 
 
-SFX_Cry1E_3_Ch3: ; 7ce8e (1f:4e8e)
+SFX_Cry1E_3_Ch3:
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
--- a/audio/sfx/cry1f_1.asm
+++ b/audio/sfx/cry1f_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7)
+SFX_Cry1F_1_Ch1:
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa)
+SFX_Cry1F_1_Ch2:
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry1F_1_Ch3: ; 900d (2:500d)
+SFX_Cry1F_1_Ch3:
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
--- a/audio/sfx/cry1f_2.asm
+++ b/audio/sfx/cry1f_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1F_2_Ch1: ; 2128f (8:528f)
+SFX_Cry1F_2_Ch1:
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2)
+SFX_Cry1F_2_Ch2:
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry1F_2_Ch3: ; 212b5 (8:52b5)
+SFX_Cry1F_2_Ch3:
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
--- a/audio/sfx/cry1f_3.asm
+++ b/audio/sfx/cry1f_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c)
+SFX_Cry1F_3_Ch1:
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f)
+SFX_Cry1F_3_Ch2:
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry1F_3_Ch3: ; 7d082 (1f:5082)
+SFX_Cry1F_3_Ch3:
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
--- a/audio/sfx/cry20_1.asm
+++ b/audio/sfx/cry20_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry20_1_Ch1: ; 901a (2:501a)
+SFX_Cry20_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry20_1_Ch2: ; 902d (2:502d)
+SFX_Cry20_1_Ch2:
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry20_1_Ch3: ; 9040 (2:5040)
+SFX_Cry20_1_Ch3:
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
--- a/audio/sfx/cry20_2.asm
+++ b/audio/sfx/cry20_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry20_2_Ch1: ; 212c2 (8:52c2)
+SFX_Cry20_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry20_2_Ch2: ; 212d5 (8:52d5)
+SFX_Cry20_2_Ch2:
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry20_2_Ch3: ; 212e8 (8:52e8)
+SFX_Cry20_2_Ch3:
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
--- a/audio/sfx/cry20_3.asm
+++ b/audio/sfx/cry20_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry20_3_Ch1: ; 7d08f (1f:508f)
+SFX_Cry20_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2)
+SFX_Cry20_3_Ch2:
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry20_3_Ch3: ; 7d0b5 (1f:50b5)
+SFX_Cry20_3_Ch3:
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
--- a/audio/sfx/cry21_1.asm
+++ b/audio/sfx/cry21_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry21_1_Ch1: ; 904d (2:504d)
+SFX_Cry21_1_Ch1:
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry21_1_Ch2: ; 9070 (2:5070)
+SFX_Cry21_1_Ch2:
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,5 +23,5 @@
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_Cry21_1_Ch3: ; 9092 (2:5092)
+SFX_Cry21_1_Ch3:
 	endchannel
--- a/audio/sfx/cry21_2.asm
+++ b/audio/sfx/cry21_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry21_2_Ch1: ; 212f5 (8:52f5)
+SFX_Cry21_2_Ch1:
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry21_2_Ch2: ; 21318 (8:5318)
+SFX_Cry21_2_Ch2:
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,5 +23,5 @@
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_Cry21_2_Ch3: ; 2133a (8:533a)
+SFX_Cry21_2_Ch3:
 	endchannel
--- a/audio/sfx/cry21_3.asm
+++ b/audio/sfx/cry21_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2)
+SFX_Cry21_3_Ch1:
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5)
+SFX_Cry21_3_Ch2:
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,5 +23,5 @@
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_Cry21_3_Ch3: ; 7d107 (1f:5107)
+SFX_Cry21_3_Ch3:
 	endchannel
--- a/audio/sfx/cry22_1.asm
+++ b/audio/sfx/cry22_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry22_1_Ch1: ; 9093 (2:5093)
+SFX_Cry22_1_Ch1:
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry22_1_Ch2: ; 90a6 (2:50a6)
+SFX_Cry22_1_Ch2:
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry22_1_Ch3: ; 90b9 (2:50b9)
+SFX_Cry22_1_Ch3:
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
--- a/audio/sfx/cry22_2.asm
+++ b/audio/sfx/cry22_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry22_2_Ch1: ; 2133b (8:533b)
+SFX_Cry22_2_Ch1:
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry22_2_Ch2: ; 2134e (8:534e)
+SFX_Cry22_2_Ch2:
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry22_2_Ch3: ; 21361 (8:5361)
+SFX_Cry22_2_Ch3:
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
--- a/audio/sfx/cry22_3.asm
+++ b/audio/sfx/cry22_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry22_3_Ch1: ; 7d108 (1f:5108)
+SFX_Cry22_3_Ch1:
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@
 	endchannel
 
 
-SFX_Cry22_3_Ch2: ; 7d11b (1f:511b)
+SFX_Cry22_3_Ch2:
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Cry22_3_Ch3: ; 7d12e (1f:512e)
+SFX_Cry22_3_Ch3:
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
--- a/audio/sfx/cry23_1.asm
+++ b/audio/sfx/cry23_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry23_1_Ch1: ; 8786 (2:4786)
+SFX_Cry23_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Cry23_1_Ch2: ; 879d (2:479d)
+SFX_Cry23_1_Ch2:
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,7 +17,7 @@
 	endchannel
 
 
-SFX_Cry23_1_Ch3: ; 87b0 (2:47b0)
+SFX_Cry23_1_Ch3:
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
--- a/audio/sfx/cry23_2.asm
+++ b/audio/sfx/cry23_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e)
+SFX_Cry23_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Cry23_2_Ch2: ; 20a45 (8:4a45)
+SFX_Cry23_2_Ch2:
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,7 +17,7 @@
 	endchannel
 
 
-SFX_Cry23_2_Ch3: ; 20a58 (8:4a58)
+SFX_Cry23_2_Ch3:
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
--- a/audio/sfx/cry23_3.asm
+++ b/audio/sfx/cry23_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb)
+SFX_Cry23_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Cry23_3_Ch2: ; 7c812 (1f:4812)
+SFX_Cry23_3_Ch2:
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,7 +17,7 @@
 	endchannel
 
 
-SFX_Cry23_3_Ch3: ; 7c825 (1f:4825)
+SFX_Cry23_3_Ch3:
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
--- a/audio/sfx/cry24_1.asm
+++ b/audio/sfx/cry24_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry24_1_Ch1: ; 87bd (2:47bd)
+SFX_Cry24_1_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry24_1_Ch2: ; 87e0 (2:47e0)
+SFX_Cry24_1_Ch2:
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,7 +24,7 @@
 	endchannel
 
 
-SFX_Cry24_1_Ch3: ; 8803 (2:4803)
+SFX_Cry24_1_Ch3:
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
--- a/audio/sfx/cry24_2.asm
+++ b/audio/sfx/cry24_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry24_2_Ch1: ; 20a65 (8:4a65)
+SFX_Cry24_2_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry24_2_Ch2: ; 20a88 (8:4a88)
+SFX_Cry24_2_Ch2:
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,7 +24,7 @@
 	endchannel
 
 
-SFX_Cry24_2_Ch3: ; 20aab (8:4aab)
+SFX_Cry24_2_Ch3:
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
--- a/audio/sfx/cry24_3.asm
+++ b/audio/sfx/cry24_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry24_3_Ch1: ; 7c832 (1f:4832)
+SFX_Cry24_3_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Cry24_3_Ch2: ; 7c855 (1f:4855)
+SFX_Cry24_3_Ch2:
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,7 +24,7 @@
 	endchannel
 
 
-SFX_Cry24_3_Ch3: ; 7c878 (1f:4878)
+SFX_Cry24_3_Ch3:
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
--- a/audio/sfx/cry25_1.asm
+++ b/audio/sfx/cry25_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry25_1_Ch1: ; 886b (2:486b)
+SFX_Cry25_1_Ch1:
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Cry25_1_Ch2: ; 8882 (2:4882)
+SFX_Cry25_1_Ch2:
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,7 +18,7 @@
 	endchannel
 
 
-SFX_Cry25_1_Ch3: ; 8899 (2:4899)
+SFX_Cry25_1_Ch3:
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
--- a/audio/sfx/cry25_2.asm
+++ b/audio/sfx/cry25_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry25_2_Ch1: ; 20b13 (8:4b13)
+SFX_Cry25_2_Ch1:
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a)
+SFX_Cry25_2_Ch2:
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,7 +18,7 @@
 	endchannel
 
 
-SFX_Cry25_2_Ch3: ; 20b41 (8:4b41)
+SFX_Cry25_2_Ch3:
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
--- a/audio/sfx/cry25_3.asm
+++ b/audio/sfx/cry25_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0)
+SFX_Cry25_3_Ch1:
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7)
+SFX_Cry25_3_Ch2:
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,7 +18,7 @@
 	endchannel
 
 
-SFX_Cry25_3_Ch3: ; 7c90e (1f:490e)
+SFX_Cry25_3_Ch3:
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
--- a/audio/sfx/cut_1.asm
+++ b/audio/sfx/cut_1.asm
@@ -1,4 +1,4 @@
-SFX_Cut_1_Ch1: ; 83e1 (2:43e1)
+SFX_Cut_1_Ch1:
 	unknownnoise0x20 2, 247, 36
 	unknownnoise0x20 2, 247, 52
 	unknownnoise0x20 4, 247, 68
--- a/audio/sfx/cut_3.asm
+++ b/audio/sfx/cut_3.asm
@@ -1,4 +1,4 @@
-SFX_Cut_3_Ch1: ; 7c3ca (1f:43ca)
+SFX_Cut_3_Ch1:
 	unknownnoise0x20 2, 247, 36
 	unknownnoise0x20 2, 247, 52
 	unknownnoise0x20 4, 247, 68
--- a/audio/sfx/cymbal1_1.asm
+++ b/audio/sfx/cymbal1_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_1_Ch1: ; 833b (2:433b)
+SFX_Cymbal1_1_Ch1:
 	unknownnoise0x20 0, 161, 16
 	endchannel
--- a/audio/sfx/cymbal1_2.asm
+++ b/audio/sfx/cymbal1_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_2_Ch1: ; 2033b (8:433b)
+SFX_Cymbal1_2_Ch1:
 	unknownnoise0x20 0, 161, 16
 	endchannel
--- a/audio/sfx/cymbal1_3.asm
+++ b/audio/sfx/cymbal1_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_3_Ch1: ; 7c33b (1f:433b)
+SFX_Cymbal1_3_Ch1:
 	unknownnoise0x20 0, 161, 16
 	endchannel
--- a/audio/sfx/cymbal2_1.asm
+++ b/audio/sfx/cymbal2_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_1_Ch1: ; 833f (2:433f)
+SFX_Cymbal2_1_Ch1:
 	unknownnoise0x20 0, 162, 17
 	endchannel
--- a/audio/sfx/cymbal2_2.asm
+++ b/audio/sfx/cymbal2_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_2_Ch1: ; 2033f (8:433f)
+SFX_Cymbal2_2_Ch1:
 	unknownnoise0x20 0, 162, 17
 	endchannel
--- a/audio/sfx/cymbal2_3.asm
+++ b/audio/sfx/cymbal2_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_3_Ch1: ; 7c33f (1f:433f)
+SFX_Cymbal2_3_Ch1:
 	unknownnoise0x20 0, 162, 17
 	endchannel
--- a/audio/sfx/cymbal3_1.asm
+++ b/audio/sfx/cymbal3_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_1_Ch1: ; 8343 (2:4343)
+SFX_Cymbal3_1_Ch1:
 	unknownnoise0x20 0, 162, 80
 	endchannel
--- a/audio/sfx/cymbal3_2.asm
+++ b/audio/sfx/cymbal3_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_2_Ch1: ; 20343 (8:4343)
+SFX_Cymbal3_2_Ch1:
 	unknownnoise0x20 0, 162, 80
 	endchannel
--- a/audio/sfx/cymbal3_3.asm
+++ b/audio/sfx/cymbal3_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_3_Ch1: ; 7c343 (1f:4343)
+SFX_Cymbal3_3_Ch1:
 	unknownnoise0x20 0, 162, 80
 	endchannel
--- a/audio/sfx/damage.asm
+++ b/audio/sfx/damage.asm
@@ -1,4 +1,4 @@
-SFX_Damage_Ch1: ; 204f4 (8:44f4)
+SFX_Damage_Ch1:
 	unknownnoise0x20 2, 244, 68
 	unknownnoise0x20 2, 244, 20
 	unknownnoise0x20 15, 241, 50
--- a/audio/sfx/denied_1.asm
+++ b/audio/sfx/denied_1.asm
@@ -1,4 +1,4 @@
-SFX_Denied_1_Ch1: ; 861f (2:461f)
+SFX_Denied_1_Ch1:
 	duty 3
 	unknownsfx0x10 90
 	unknownsfx0x20 4, 240, 0, 5
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Denied_1_Ch2: ; 8636 (2:4636)
+SFX_Denied_1_Ch2:
 	duty 3
 	unknownsfx0x20 4, 240, 1, 4
 	unknownsfx0x20 4, 0, 0, 0
--- a/audio/sfx/denied_3.asm
+++ b/audio/sfx/denied_3.asm
@@ -1,4 +1,4 @@
-SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc)
+SFX_Denied_3_Ch1:
 	duty 3
 	unknownsfx0x10 90
 	unknownsfx0x20 4, 240, 0, 5
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_Denied_3_Ch2: ; 7c613 (1f:4613)
+SFX_Denied_3_Ch2:
 	duty 3
 	unknownsfx0x20 4, 240, 1, 4
 	unknownsfx0x20 4, 0, 0, 0
--- a/audio/sfx/dex_page_added.asm
+++ b/audio/sfx/dex_page_added.asm
@@ -1,4 +1,4 @@
-SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f)
+SFX_Dex_Page_Added_Ch1:
 	duty 2
 	unknownsfx0x10 68
 	unknownsfx0x20 15, 240, 240, 4
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Dex_Page_Added_Ch2: ; 20490 (8:4490)
+SFX_Dex_Page_Added_Ch2:
 	duty 2
 	unknownsfx0x20 15, 146, 0, 6
 	unknownsfx0x20 15, 146, 130, 7
--- a/audio/sfx/doubleslap.asm
+++ b/audio/sfx/doubleslap.asm
@@ -1,4 +1,4 @@
-SFX_Doubleslap_Ch1: ; 2058c (8:458c)
+SFX_Doubleslap_Ch1:
 	unknownnoise0x20 8, 241, 50
 	unknownnoise0x20 8, 241, 51
 	endchannel
--- a/audio/sfx/enter_pc_1.asm
+++ b/audio/sfx/enter_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_Enter_PC_1_Ch1: ; 853b (2:453b)
+SFX_Enter_PC_1_Ch1:
 	duty 2
 	unknownsfx0x20 6, 240, 0, 7
 	unknownsfx0x20 4, 0, 0, 0
--- a/audio/sfx/enter_pc_3.asm
+++ b/audio/sfx/enter_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_Enter_PC_3_Ch1: ; 7c518 (1f:4518)
+SFX_Enter_PC_3_Ch1:
 	duty 2
 	unknownsfx0x20 4, 240, 0, 7
 	unknownsfx0x20 4, 0, 0, 0
--- a/audio/sfx/faint_fall.asm
+++ b/audio/sfx/faint_fall.asm
@@ -1,4 +1,4 @@
-SFX_Faint_Fall_Ch1: ; 204ae (8:44ae)
+SFX_Faint_Fall_Ch1:
 	duty 1
 	unknownsfx0x10 175
 	unknownsfx0x20 15, 242, 128, 7
--- a/audio/sfx/faint_thud.asm
+++ b/audio/sfx/faint_thud.asm
@@ -1,10 +1,10 @@
-SFX_Faint_Thud_Ch1: ; 2044c (8:444c)
+SFX_Faint_Thud_Ch1:
 	unknownsfx0x20 15, 209, 0, 2
 	unknownsfx0x10 8
 	endchannel
 
 
-SFX_Faint_Thud_Ch2: ; 20453 (8:4453)
+SFX_Faint_Thud_Ch2:
 	unknownnoise0x20 4, 245, 51
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
--- a/audio/sfx/fly_1.asm
+++ b/audio/sfx/fly_1.asm
@@ -1,4 +1,4 @@
-SFX_Fly_1_Ch1: ; 85ee (2:45ee)
+SFX_Fly_1_Ch1:
 	unknownnoise0x20 2, 241, 18
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 161, 18
--- a/audio/sfx/fly_3.asm
+++ b/audio/sfx/fly_3.asm
@@ -1,4 +1,4 @@
-SFX_Fly_3_Ch1: ; 7c5cb (1f:45cb)
+SFX_Fly_3_Ch1:
 	unknownnoise0x20 2, 241, 18
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 161, 18
--- a/audio/sfx/get_item1_1.asm
+++ b/audio/sfx/get_item1_1.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77)
+SFX_Get_Item1_1_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e)
+SFX_Get_Item1_1_Ch2:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -30,7 +30,7 @@
 	endchannel
 
 
-SFX_Get_Item1_1_Ch3: ; ad9e (2:6d9e)
+SFX_Get_Item1_1_Ch3:
 	executemusic
 	notetype 4, 1, 0
 	octave 4
--- a/audio/sfx/get_item1_3.asm
+++ b/audio/sfx/get_item1_3.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850)
+SFX_Get_Item1_3_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867)
+SFX_Get_Item1_3_Ch2:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -30,7 +30,7 @@
 	endchannel
 
 
-SFX_Get_Item1_3_Ch3: ; 7e877 (1f:6877)
+SFX_Get_Item1_3_Ch3:
 	executemusic
 	notetype 4, 1, 0
 	octave 4
--- a/audio/sfx/get_item2_1.asm
+++ b/audio/sfx/get_item2_1.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item2_1_Ch1: ; b316 (2:7316)
+SFX_Get_Item2_1_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@
 	endchannel
 
 
-SFX_Get_Item2_1_Ch2: ; b335 (2:7335)
+SFX_Get_Item2_1_Ch2:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@
 	endchannel
 
 
-SFX_Get_Item2_1_Ch3: ; b34d (2:734d)
+SFX_Get_Item2_1_Ch3:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
--- a/audio/sfx/get_item2_2.asm
+++ b/audio/sfx/get_item2_2.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7)
+SFX_Get_Item2_2_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@
 	endchannel
 
 
-SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6)
+SFX_Get_Item2_2_Ch2:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@
 	endchannel
 
 
-SFX_Get_Item2_2_Ch3: ; 239fe (8:79fe)
+SFX_Get_Item2_2_Ch3:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
--- a/audio/sfx/get_item2_3.asm
+++ b/audio/sfx/get_item2_3.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28)
+SFX_Get_Item2_3_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@
 	endchannel
 
 
-SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47)
+SFX_Get_Item2_3_Ch2:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@
 	endchannel
 
 
-SFX_Get_Item2_3_Ch3: ; 7ee5f (1f:6e5f)
+SFX_Get_Item2_3_Ch3:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
--- a/audio/sfx/get_key_item_1.asm
+++ b/audio/sfx/get_key_item_1.asm
@@ -1,4 +1,4 @@
-SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362)
+SFX_Get_Key_Item_1_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381)
+SFX_Get_Key_Item_1_Ch2:
 	executemusic
 	vibrato 4, 2, 3
 	duty 2
@@ -47,7 +47,7 @@
 	endchannel
 
 
-SFX_Get_Key_Item_1_Ch3: ; b39d (2:739d)
+SFX_Get_Key_Item_1_Ch3:
 	executemusic
 	notetype 5, 1, 0
 	octave 4
--- a/audio/sfx/get_key_item_3.asm
+++ b/audio/sfx/get_key_item_3.asm
@@ -1,4 +1,4 @@
-SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74)
+SFX_Get_Key_Item_3_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -23,7 +23,7 @@
 	endchannel
 
 
-SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93)
+SFX_Get_Key_Item_3_Ch2:
 	executemusic
 	vibrato 4, 2, 3
 	duty 2
@@ -47,7 +47,7 @@
 	endchannel
 
 
-SFX_Get_Key_Item_3_Ch3: ; 7eeaf (1f:6eaf)
+SFX_Get_Key_Item_3_Ch3:
 	executemusic
 	notetype 5, 1, 0
 	octave 4
--- a/audio/sfx/go_inside_1.asm
+++ b/audio/sfx/go_inside_1.asm
@@ -1,4 +1,4 @@
-SFX_Go_Inside_1_Ch1: ; 83f1 (2:43f1)
+SFX_Go_Inside_1_Ch1:
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
--- a/audio/sfx/go_inside_3.asm
+++ b/audio/sfx/go_inside_3.asm
@@ -1,4 +1,4 @@
-SFX_Go_Inside_3_Ch1: ; 7c3da (1f:43da)
+SFX_Go_Inside_3_Ch1:
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
--- a/audio/sfx/go_outside_1.asm
+++ b/audio/sfx/go_outside_1.asm
@@ -1,4 +1,4 @@
-SFX_Go_Outside_1_Ch1: ; 8452 (2:4452)
+SFX_Go_Outside_1_Ch1:
 	unknownnoise0x20 2, 241, 84
 	unknownnoise0x20 12, 113, 35
 	unknownnoise0x20 2, 177, 84
--- a/audio/sfx/go_outside_3.asm
+++ b/audio/sfx/go_outside_3.asm
@@ -1,4 +1,4 @@
-SFX_Go_Outside_3_Ch1: ; 7c43b (1f:443b)
+SFX_Go_Outside_3_Ch1:
 	unknownnoise0x20 2, 241, 84
 	unknownnoise0x20 12, 113, 35
 	unknownnoise0x20 2, 177, 84
--- a/audio/sfx/heal_ailment_1.asm
+++ b/audio/sfx/heal_ailment_1.asm
@@ -1,4 +1,4 @@
-SFX_Heal_Ailment_1_Ch1: ; 84d9 (2:44d9)
+SFX_Heal_Ailment_1_Ch1:
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
--- a/audio/sfx/heal_ailment_2.asm
+++ b/audio/sfx/heal_ailment_2.asm
@@ -1,4 +1,4 @@
-SFX_Heal_Ailment_2_Ch1: ; 203fd (8:43fd)
+SFX_Heal_Ailment_2_Ch1:
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
--- a/audio/sfx/heal_ailment_3.asm
+++ b/audio/sfx/heal_ailment_3.asm
@@ -1,4 +1,4 @@
-SFX_Heal_Ailment_3_Ch1: ; 7c4b2 (1f:44b2)
+SFX_Heal_Ailment_3_Ch1:
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
--- a/audio/sfx/heal_hp_1.asm
+++ b/audio/sfx/heal_hp_1.asm
@@ -1,4 +1,4 @@
-SFX_Heal_HP_1_Ch1: ; 84b7 (2:44b7)
+SFX_Heal_HP_1_Ch1:
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
--- a/audio/sfx/heal_hp_2.asm
+++ b/audio/sfx/heal_hp_2.asm
@@ -1,4 +1,4 @@
-SFX_Heal_HP_2_Ch1: ; 203ee (8:43ee)
+SFX_Heal_HP_2_Ch1:
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
--- a/audio/sfx/heal_hp_3.asm
+++ b/audio/sfx/heal_hp_3.asm
@@ -1,4 +1,4 @@
-SFX_Heal_HP_3_Ch1: ; 7c490 (1f:4490)
+SFX_Heal_HP_3_Ch1:
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
--- a/audio/sfx/healing_machine_1.asm
+++ b/audio/sfx/healing_machine_1.asm
@@ -1,4 +1,4 @@
-SFX_Healing_Machine_1_Ch1: ; 8580 (2:4580)
+SFX_Healing_Machine_1_Ch1:
 	duty 2
 	unknownsfx0x10 44
 	unknownsfx0x20 4, 242, 0, 5
--- a/audio/sfx/healing_machine_3.asm
+++ b/audio/sfx/healing_machine_3.asm
@@ -1,4 +1,4 @@
-SFX_Healing_Machine_3_Ch1: ; 7c55d (1f:455d)
+SFX_Healing_Machine_3_Ch1:
 	duty 2
 	unknownsfx0x10 44
 	unknownsfx0x20 4, 242, 0, 5
--- a/audio/sfx/horn_drill.asm
+++ b/audio/sfx/horn_drill.asm
@@ -1,4 +1,4 @@
-SFX_Horn_Drill_Ch1: ; 205b1 (8:45b1)
+SFX_Horn_Drill_Ch1:
 	unknownnoise0x20 3, 146, 49
 	unknownnoise0x20 3, 178, 50
 	unknownnoise0x20 3, 194, 51
--- a/audio/sfx/intro_crash.asm
+++ b/audio/sfx/intro_crash.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Crash_Ch1: ; 7c6de (1f:46de)
+SFX_Intro_Crash_Ch1:
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
--- a/audio/sfx/intro_hip.asm
+++ b/audio/sfx/intro_hip.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Hip_Ch1: ; 7c6be (1f:46be)
+SFX_Intro_Hip_Ch1:
 	duty 2
 	unknownsfx0x10 38
 	unknownsfx0x20 12, 194, 64, 7
--- a/audio/sfx/intro_hop.asm
+++ b/audio/sfx/intro_hop.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Hop_Ch1: ; 7c6c9 (1f:46c9)
+SFX_Intro_Hop_Ch1:
 	duty 2
 	unknownsfx0x10 38
 	unknownsfx0x20 12, 194, 128, 6
--- a/audio/sfx/intro_lunge.asm
+++ b/audio/sfx/intro_lunge.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Lunge_Ch1: ; 7c6a5 (1f:46a5)
+SFX_Intro_Lunge_Ch1:
 	unknownnoise0x20 6, 32, 16
 	unknownnoise0x20 6, 47, 64
 	unknownnoise0x20 6, 79, 65
--- a/audio/sfx/intro_raise.asm
+++ b/audio/sfx/intro_raise.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Raise_Ch1: ; 7c6d4 (1f:46d4)
+SFX_Intro_Raise_Ch1:
 	unknownnoise0x20 2, 111, 33
 	unknownnoise0x20 2, 175, 49
 	unknownnoise0x20 15, 242, 65
--- a/audio/sfx/intro_whoosh.asm
+++ b/audio/sfx/intro_whoosh.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Whoosh_Ch1: ; 7c6e5 (1f:46e5)
+SFX_Intro_Whoosh_Ch1:
 	unknownnoise0x20 4, 44, 32
 	unknownnoise0x20 3, 160, 32
 	unknownnoise0x20 3, 176, 33
--- a/audio/sfx/ledge_1.asm
+++ b/audio/sfx/ledge_1.asm
@@ -1,4 +1,4 @@
-SFX_Ledge_1_Ch1: ; 85d6 (2:45d6)
+SFX_Ledge_1_Ch1:
 	duty 2
 	unknownsfx0x10 149
 	unknownsfx0x20 15, 242, 0, 4
--- a/audio/sfx/ledge_3.asm
+++ b/audio/sfx/ledge_3.asm
@@ -1,4 +1,4 @@
-SFX_Ledge_3_Ch1: ; 7c5b3 (1f:45b3)
+SFX_Ledge_3_Ch1:
 	duty 2
 	unknownsfx0x10 149
 	unknownsfx0x20 15, 242, 0, 4
--- a/audio/sfx/level_up.asm
+++ b/audio/sfx/level_up.asm
@@ -1,4 +1,4 @@
-SFX_Level_Up_Ch1: ; 2397d (8:797d)
+SFX_Level_Up_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_Level_Up_Ch2: ; 23998 (8:7998)
+SFX_Level_Up_Ch2:
 	executemusic
 	vibrato 4, 2, 2
 	duty 2
@@ -40,7 +40,7 @@
 	endchannel
 
 
-SFX_Level_Up_Ch3: ; 239b0 (8:79b0)
+SFX_Level_Up_Ch3:
 	executemusic
 	notetype 6, 1, 0
 	octave 5
--- a/audio/sfx/muted_snare1_1.asm
+++ b/audio/sfx/muted_snare1_1.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_1_Ch1: ; 8347 (2:4347)
+SFX_Muted_Snare1_1_Ch1:
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
--- a/audio/sfx/muted_snare1_2.asm
+++ b/audio/sfx/muted_snare1_2.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_2_Ch1: ; 20347 (8:4347)
+SFX_Muted_Snare1_2_Ch1:
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
--- a/audio/sfx/muted_snare1_3.asm
+++ b/audio/sfx/muted_snare1_3.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_3_Ch1: ; 7c347 (1f:4347)
+SFX_Muted_Snare1_3_Ch1:
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
--- a/audio/sfx/muted_snare2_1.asm
+++ b/audio/sfx/muted_snare2_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_1_Ch1: ; 8355 (2:4355)
+SFX_Muted_Snare2_1_Ch1:
 	unknownnoise0x20 0, 145, 34
 	endchannel
--- a/audio/sfx/muted_snare2_2.asm
+++ b/audio/sfx/muted_snare2_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_2_Ch1: ; 20355 (8:4355)
+SFX_Muted_Snare2_2_Ch1:
 	unknownnoise0x20 0, 145, 34
 	endchannel
--- a/audio/sfx/muted_snare2_3.asm
+++ b/audio/sfx/muted_snare2_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_3_Ch1: ; 7c355 (1f:4355)
+SFX_Muted_Snare2_3_Ch1:
 	unknownnoise0x20 0, 145, 34
 	endchannel
--- a/audio/sfx/muted_snare3_1.asm
+++ b/audio/sfx/muted_snare3_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_1_Ch1: ; 8359 (2:4359)
+SFX_Muted_Snare3_1_Ch1:
 	unknownnoise0x20 0, 113, 34
 	endchannel
--- a/audio/sfx/muted_snare3_2.asm
+++ b/audio/sfx/muted_snare3_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_2_Ch1: ; 20359 (8:4359)
+SFX_Muted_Snare3_2_Ch1:
 	unknownnoise0x20 0, 113, 34
 	endchannel
--- a/audio/sfx/muted_snare3_3.asm
+++ b/audio/sfx/muted_snare3_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_3_Ch1: ; 7c359 (1f:4359)
+SFX_Muted_Snare3_3_Ch1:
 	unknownnoise0x20 0, 113, 34
 	endchannel
--- a/audio/sfx/muted_snare4_1.asm
+++ b/audio/sfx/muted_snare4_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_1_Ch1: ; 835d (2:435d)
+SFX_Muted_Snare4_1_Ch1:
 	unknownnoise0x20 0, 97, 34
 	endchannel
--- a/audio/sfx/muted_snare4_2.asm
+++ b/audio/sfx/muted_snare4_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_2_Ch1: ; 2035d (8:435d)
+SFX_Muted_Snare4_2_Ch1:
 	unknownnoise0x20 0, 97, 34
 	endchannel
--- a/audio/sfx/muted_snare4_3.asm
+++ b/audio/sfx/muted_snare4_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_3_Ch1: ; 7c35d (1f:435d)
+SFX_Muted_Snare4_3_Ch1:
 	unknownnoise0x20 0, 97, 34
 	endchannel
--- a/audio/sfx/not_very_effective.asm
+++ b/audio/sfx/not_very_effective.asm
@@ -1,4 +1,4 @@
-SFX_Not_Very_Effective_Ch1: ; 204fe (8:44fe)
+SFX_Not_Very_Effective_Ch1:
 	unknownnoise0x20 4, 143, 85
 	unknownnoise0x20 2, 244, 68
 	unknownnoise0x20 8, 244, 34
--- a/audio/sfx/peck.asm
+++ b/audio/sfx/peck.asm
@@ -1,3 +1,3 @@
-SFX_Peck_Ch1: ; 204aa (8:44aa)
+SFX_Peck_Ch1:
 	unknownnoise0x20 2, 161, 18
 	endchannel
--- a/audio/sfx/poisoned_1.asm
+++ b/audio/sfx/poisoned_1.asm
@@ -1,4 +1,4 @@
-SFX_Poisoned_1_Ch1: ; 84c6 (2:44c6)
+SFX_Poisoned_1_Ch1:
 	duty 0
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
--- a/audio/sfx/poisoned_3.asm
+++ b/audio/sfx/poisoned_3.asm
@@ -1,4 +1,4 @@
-SFX_Poisoned_3_Ch1: ; 7c49f (1f:449f)
+SFX_Poisoned_3_Ch1:
 	duty 0
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
--- a/audio/sfx/pokedex_rating_1.asm
+++ b/audio/sfx/pokedex_rating_1.asm
@@ -1,4 +1,4 @@
-SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8)
+SFX_Pokedex_Rating_1_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -21,7 +21,7 @@
 	endchannel
 
 
-SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1)
+SFX_Pokedex_Rating_1_Ch2:
 	executemusic
 	duty 2
 	notetype 5, 12, 2
@@ -44,7 +44,7 @@
 	endchannel
 
 
-SFX_Pokedex_Rating_1_Ch3: ; b2f7 (2:72f7)
+SFX_Pokedex_Rating_1_Ch3:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
--- a/audio/sfx/pokedex_rating_3.asm
+++ b/audio/sfx/pokedex_rating_3.asm
@@ -1,4 +1,4 @@
-SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda)
+SFX_Pokedex_Rating_3_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -21,7 +21,7 @@
 	endchannel
 
 
-SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3)
+SFX_Pokedex_Rating_3_Ch2:
 	executemusic
 	duty 2
 	notetype 5, 12, 2
@@ -44,7 +44,7 @@
 	endchannel
 
 
-SFX_Pokedex_Rating_3_Ch3: ; 7ee09 (1f:6e09)
+SFX_Pokedex_Rating_3_Ch3:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
--- a/audio/sfx/pokeflute.asm
+++ b/audio/sfx/pokeflute.asm
@@ -1,4 +1,4 @@
-SFX_Pokeflute_Ch1: ; 83ca (2:43ca)
+SFX_Pokeflute_Ch1:
 	vibrato 16, 1, 4
 	notetype 12, 1, 0
 	octave 5
--- a/audio/sfx/pokeflute_ch1_ch2.asm
+++ b/audio/sfx/pokeflute_ch1_ch2.asm
@@ -1,8 +1,8 @@
-SFX_08_PokeFlute_Ch1: ; 22322 (8:6322)
+SFX_08_PokeFlute_Ch1:
 	tempo 256
 
 
-SFX_08_PokeFlute_Ch2: ; 22325 (8:6325)
+SFX_08_PokeFlute_Ch2:
 	executemusic
 	notetype 8, 0, 0
 	rest 5
--- a/audio/sfx/pokeflute_ch3.asm
+++ b/audio/sfx/pokeflute_ch3.asm
@@ -1,4 +1,4 @@
-SFX_08_PokeFlute_Ch3: ; 2049b (8:449b)
+SFX_08_PokeFlute_Ch3:
 	executemusic
 	vibrato 16, 1, 4
 	notetype 8, 1, 0
--- a/audio/sfx/pound.asm
+++ b/audio/sfx/pound.asm
@@ -1,3 +1,3 @@
-SFX_Pound_Ch1: ; 204c4 (8:44c4)
+SFX_Pound_Ch1:
 	unknownnoise0x20 2, 161, 34
 	endchannel
--- a/audio/sfx/press_ab_1.asm
+++ b/audio/sfx/press_ab_1.asm
@@ -1,4 +1,4 @@
-SFX_Press_AB_1_Ch1: ; 8462 (2:4462)
+SFX_Press_AB_1_Ch1:
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
--- a/audio/sfx/press_ab_2.asm
+++ b/audio/sfx/press_ab_2.asm
@@ -1,4 +1,4 @@
-SFX_Press_AB_2_Ch1: ; 203c3 (8:43c3)
+SFX_Press_AB_2_Ch1:
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
--- a/audio/sfx/press_ab_3.asm
+++ b/audio/sfx/press_ab_3.asm
@@ -1,4 +1,4 @@
-SFX_Press_AB_3_Ch1: ; 7c44b (1f:444b)
+SFX_Press_AB_3_Ch1:
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
--- a/audio/sfx/psybeam.asm
+++ b/audio/sfx/psybeam.asm
@@ -1,4 +1,4 @@
-SFX_Psybeam_Ch1: ; 20759 (8:4759)
+SFX_Psybeam_Ch1:
 	dutycycle 161
 	unknownsfx0x20 10, 241, 64, 6
 	unknownsfx0x20 10, 243, 128, 6
@@ -8,7 +8,7 @@
 	endchannel
 
 
-SFX_Psybeam_Ch2: ; 20770 (8:4770)
+SFX_Psybeam_Ch2:
 	dutycycle 179
 	unknownsfx0x20 10, 243, 113, 5
 	unknownsfx0x20 7, 227, 49, 5
@@ -18,7 +18,7 @@
 	endchannel
 
 
-SFX_Psybeam_Ch3: ; 20787 (8:4787)
+SFX_Psybeam_Ch3:
 	unknownnoise0x20 2, 209, 74
 	unknownnoise0x20 2, 210, 42
 	loopchannel 21, SFX_Psybeam_Ch3
--- a/audio/sfx/psychic_m.asm
+++ b/audio/sfx/psychic_m.asm
@@ -1,4 +1,4 @@
-SFX_Psychic_M_Ch1: ; 207fa (8:47fa)
+SFX_Psychic_M_Ch1:
 	duty 2
 	unknownsfx0x10 247
 	unknownsfx0x20 8, 196, 189, 7
@@ -11,7 +11,7 @@
 	endchannel
 
 
-SFX_Psychic_M_Ch2: ; 20819 (8:4819)
+SFX_Psychic_M_Ch2:
 	duty 2
 	unknownsfx0x20 8, 196, 112, 7
 	unknownsfx0x20 8, 196, 97, 7
@@ -22,7 +22,7 @@
 	endchannel
 
 
-SFX_Psychic_M_Ch3: ; 20834 (8:4834)
+SFX_Psychic_M_Ch3:
 	unknownnoise0x20 15, 63, 20
 	unknownnoise0x20 15, 207, 19
 	unknownnoise0x20 15, 207, 18
--- a/audio/sfx/purchase_1.asm
+++ b/audio/sfx/purchase_1.asm
@@ -1,4 +1,4 @@
-SFX_Purchase_1_Ch1: ; 842d (2:442d)
+SFX_Purchase_1_Ch1:
 	duty 2
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 8, 242, 224, 7
@@ -5,7 +5,7 @@
 	endchannel
 
 
-SFX_Purchase_1_Ch2: ; 8438 (2:4438)
+SFX_Purchase_1_Ch2:
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 145, 193, 6
--- a/audio/sfx/purchase_3.asm
+++ b/audio/sfx/purchase_3.asm
@@ -1,4 +1,4 @@
-SFX_Purchase_3_Ch1: ; 7c416 (1f:4416)
+SFX_Purchase_3_Ch1:
 	duty 2
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 8, 242, 224, 7
@@ -5,7 +5,7 @@
 	endchannel
 
 
-SFX_Purchase_3_Ch2: ; 7c421 (1f:4421)
+SFX_Purchase_3_Ch2:
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 145, 193, 6
--- a/audio/sfx/push_boulder_1.asm
+++ b/audio/sfx/push_boulder_1.asm
@@ -1,4 +1,4 @@
-SFX_Push_Boulder_1_Ch1: ; 8654 (2:4654)
+SFX_Push_Boulder_1_Ch1:
 	unknownnoise0x20 4, 162, 35
 	unknownnoise0x20 8, 241, 52
 	unknownnoise0x20 15, 0, 0
--- a/audio/sfx/push_boulder_3.asm
+++ b/audio/sfx/push_boulder_3.asm
@@ -1,4 +1,4 @@
-SFX_Push_Boulder_3_Ch1: ; 7c631 (1f:4631)
+SFX_Push_Boulder_3_Ch1:
 	unknownnoise0x20 4, 162, 35
 	unknownnoise0x20 8, 241, 52
 	unknownnoise0x20 15, 0, 0
--- a/audio/sfx/run.asm
+++ b/audio/sfx/run.asm
@@ -1,4 +1,4 @@
-SFX_Run_Ch1: ; 2045d (8:445d)
+SFX_Run_Ch1:
 	unknownnoise0x20 2, 97, 35
 	unknownnoise0x20 2, 161, 51
 	unknownnoise0x20 2, 193, 51
--- a/audio/sfx/safari_zone_pa.asm
+++ b/audio/sfx/safari_zone_pa.asm
@@ -1,4 +1,4 @@
-SFX_Safari_Zone_PA_Ch1: ; 86c8 (2:46c8)
+SFX_Safari_Zone_PA_Ch1:
 	duty 2
 	unknownsfx0x20 15, 243, 48, 7
 	unknownsfx0x20 8, 101, 48, 7
--- a/audio/sfx/save_1.asm
+++ b/audio/sfx/save_1.asm
@@ -1,4 +1,4 @@
-SFX_Save_1_Ch1: ; 8475 (2:4475)
+SFX_Save_1_Ch1:
 	duty 2
 	unknownsfx0x20 4, 244, 0, 7
 	unknownsfx0x20 2, 228, 0, 6
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_Save_1_Ch2: ; 8494 (2:4494)
+SFX_Save_1_Ch2:
 	duty 2
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 2, 212, 1, 7
--- a/audio/sfx/save_3.asm
+++ b/audio/sfx/save_3.asm
@@ -1,4 +1,4 @@
-SFX_Save_3_Ch1: ; 7c45e (1f:445e)
+SFX_Save_3_Ch1:
 	duty 2
 IF DEF(_RED)
 	unknownsfx0x20 4, 244, 0, 7
@@ -16,7 +16,7 @@
 	endchannel
 
 
-SFX_Save_3_Ch2: ; 7c475 (1f:4475)
+SFX_Save_3_Ch2:
 	duty 2
 IF DEF(_RED)
 	unknownsfx0x20 4, 8, 0, 0
--- a/audio/sfx/shooting_star.asm
+++ b/audio/sfx/shooting_star.asm
@@ -1,4 +1,4 @@
-SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d)
+SFX_Shooting_Star_Ch1:
 	dutycycle 228
 	unknownsfx0x10 47
 	unknownsfx0x20 4, 64, 224, 7
--- a/audio/sfx/shrink_1.asm
+++ b/audio/sfx/shrink_1.asm
@@ -1,4 +1,4 @@
-SFX_Shrink_1_Ch1: ; 854e (2:454e)
+SFX_Shrink_1_Ch1:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 6
--- a/audio/sfx/shrink_3.asm
+++ b/audio/sfx/shrink_3.asm
@@ -1,4 +1,4 @@
-SFX_Shrink_3_Ch1: ; 7c52b (1f:452b)
+SFX_Shrink_3_Ch1:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 6
--- a/audio/sfx/silph_scope.asm
+++ b/audio/sfx/silph_scope.asm
@@ -1,4 +1,4 @@
-SFX_Silph_Scope_Ch1: ; 20412 (8:4412)
+SFX_Silph_Scope_Ch1:
 	duty 0
 	unknownsfx0x20 0, 210, 0, 7
 	unknownsfx0x20 0, 210, 64, 7
--- a/audio/sfx/slots_new_spin.asm
+++ b/audio/sfx/slots_new_spin.asm
@@ -1,4 +1,4 @@
-SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f)
+SFX_Slots_New_Spin_Ch1:
 	duty 3
 	unknownsfx0x20 5, 225, 0, 7
 	unknownsfx0x20 2, 225, 128, 7
@@ -6,7 +6,7 @@
 	endchannel
 
 
-SFX_Slots_New_Spin_Ch2: ; 7c71e (1f:471e)
+SFX_Slots_New_Spin_Ch2:
 	duty 2
 	unknownsfx0x20 4, 193, 193, 6
 	unknownsfx0x20 2, 193, 65, 7
--- a/audio/sfx/slots_reward.asm
+++ b/audio/sfx/slots_reward.asm
@@ -1,4 +1,4 @@
-SFX_Slots_Reward_Ch1: ; 7c704 (1f:4704)
+SFX_Slots_Reward_Ch1:
 	duty 2
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 8, 129, 224, 7
--- a/audio/sfx/slots_stop_wheel.asm
+++ b/audio/sfx/slots_stop_wheel.asm
@@ -1,4 +1,4 @@
-SFX_Slots_Stop_Wheel_Ch1: ; 7c6f5 (1f:46f5)
+SFX_Slots_Stop_Wheel_Ch1:
 	duty 2
 	unknownsfx0x20 1, 242, 160, 6
 	unknownsfx0x20 1, 242, 224, 6
--- a/audio/sfx/snare1_1.asm
+++ b/audio/sfx/snare1_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_1_Ch1: ; 82fd (2:42fd)
+SFX_Snare1_1_Ch1:
 	unknownnoise0x20 0, 193, 51
 	endchannel
--- a/audio/sfx/snare1_2.asm
+++ b/audio/sfx/snare1_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_2_Ch1: ; 202fd (8:42fd)
+SFX_Snare1_2_Ch1:
 	unknownnoise0x20 0, 193, 51
 	endchannel
--- a/audio/sfx/snare1_3.asm
+++ b/audio/sfx/snare1_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_3_Ch1: ; 7c2fd (1f:42fd)
+SFX_Snare1_3_Ch1:
 	unknownnoise0x20 0, 193, 51
 	endchannel
--- a/audio/sfx/snare2_1.asm
+++ b/audio/sfx/snare2_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_1_Ch1: ; 8301 (2:4301)
+SFX_Snare2_1_Ch1:
 	unknownnoise0x20 0, 177, 51
 	endchannel
--- a/audio/sfx/snare2_2.asm
+++ b/audio/sfx/snare2_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_2_Ch1: ; 20301 (8:4301)
+SFX_Snare2_2_Ch1:
 	unknownnoise0x20 0, 177, 51
 	endchannel
--- a/audio/sfx/snare2_3.asm
+++ b/audio/sfx/snare2_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_3_Ch1: ; 7c301 (1f:4301)
+SFX_Snare2_3_Ch1:
 	unknownnoise0x20 0, 177, 51
 	endchannel
--- a/audio/sfx/snare3_1.asm
+++ b/audio/sfx/snare3_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_1_Ch1: ; 8305 (2:4305)
+SFX_Snare3_1_Ch1:
 	unknownnoise0x20 0, 161, 51
 	endchannel
--- a/audio/sfx/snare3_2.asm
+++ b/audio/sfx/snare3_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_2_Ch1: ; 20305 (8:4305)
+SFX_Snare3_2_Ch1:
 	unknownnoise0x20 0, 161, 51
 	endchannel
--- a/audio/sfx/snare3_3.asm
+++ b/audio/sfx/snare3_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_3_Ch1: ; 7c305 (1f:4305)
+SFX_Snare3_3_Ch1:
 	unknownnoise0x20 0, 161, 51
 	endchannel
--- a/audio/sfx/snare4_1.asm
+++ b/audio/sfx/snare4_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_1_Ch1: ; 8309 (2:4309)
+SFX_Snare4_1_Ch1:
 	unknownnoise0x20 0, 129, 51
 	endchannel
--- a/audio/sfx/snare4_2.asm
+++ b/audio/sfx/snare4_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_2_Ch1: ; 20309 (8:4309)
+SFX_Snare4_2_Ch1:
 	unknownnoise0x20 0, 129, 51
 	endchannel
--- a/audio/sfx/snare4_3.asm
+++ b/audio/sfx/snare4_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_3_Ch1: ; 7c309 (1f:4309)
+SFX_Snare4_3_Ch1:
 	unknownnoise0x20 0, 129, 51
 	endchannel
--- a/audio/sfx/snare5_1.asm
+++ b/audio/sfx/snare5_1.asm
@@ -1,4 +1,4 @@
-SFX_Snare5_1_Ch1: ; 830d (2:430d)
+SFX_Snare5_1_Ch1:
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
--- a/audio/sfx/snare5_2.asm
+++ b/audio/sfx/snare5_2.asm
@@ -1,4 +1,4 @@
-SFX_Snare5_2_Ch1: ; 2030d (8:430d)
+SFX_Snare5_2_Ch1:
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
--- a/audio/sfx/snare5_3.asm
+++ b/audio/sfx/snare5_3.asm
@@ -1,4 +1,4 @@
-SFX_Snare5_3_Ch1: ; 7c30d (1f:430d)
+SFX_Snare5_3_Ch1:
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
--- a/audio/sfx/snare6_1.asm
+++ b/audio/sfx/snare6_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_1_Ch1: ; 832b (2:432b)
+SFX_Snare6_1_Ch1:
 	unknownnoise0x20 0, 129, 16
 	endchannel
--- a/audio/sfx/snare6_2.asm
+++ b/audio/sfx/snare6_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_2_Ch1: ; 2032b (8:432b)
+SFX_Snare6_2_Ch1:
 	unknownnoise0x20 0, 129, 16
 	endchannel
--- a/audio/sfx/snare6_3.asm
+++ b/audio/sfx/snare6_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_3_Ch1: ; 7c32b (1f:432b)
+SFX_Snare6_3_Ch1:
 	unknownnoise0x20 0, 129, 16
 	endchannel
--- a/audio/sfx/snare7_1.asm
+++ b/audio/sfx/snare7_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_1_Ch1: ; 832f (2:432f)
+SFX_Snare7_1_Ch1:
 	unknownnoise0x20 0, 130, 35
 	endchannel
--- a/audio/sfx/snare7_2.asm
+++ b/audio/sfx/snare7_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_2_Ch1: ; 2032f (8:432f)
+SFX_Snare7_2_Ch1:
 	unknownnoise0x20 0, 130, 35
 	endchannel
--- a/audio/sfx/snare7_3.asm
+++ b/audio/sfx/snare7_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_3_Ch1: ; 7c32f (1f:432f)
+SFX_Snare7_3_Ch1:
 	unknownnoise0x20 0, 130, 35
 	endchannel
--- a/audio/sfx/snare8_1.asm
+++ b/audio/sfx/snare8_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_1_Ch1: ; 8333 (2:4333)
+SFX_Snare8_1_Ch1:
 	unknownnoise0x20 0, 130, 37
 	endchannel
--- a/audio/sfx/snare8_2.asm
+++ b/audio/sfx/snare8_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_2_Ch1: ; 20333 (8:4333)
+SFX_Snare8_2_Ch1:
 	unknownnoise0x20 0, 130, 37
 	endchannel
--- a/audio/sfx/snare8_3.asm
+++ b/audio/sfx/snare8_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_3_Ch1: ; 7c333 (1f:4333)
+SFX_Snare8_3_Ch1:
 	unknownnoise0x20 0, 130, 37
 	endchannel
--- a/audio/sfx/snare9_1.asm
+++ b/audio/sfx/snare9_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_1_Ch1: ; 8337 (2:4337)
+SFX_Snare9_1_Ch1:
 	unknownnoise0x20 0, 130, 38
 	endchannel
--- a/audio/sfx/snare9_2.asm
+++ b/audio/sfx/snare9_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_2_Ch1: ; 20337 (8:4337)
+SFX_Snare9_2_Ch1:
 	unknownnoise0x20 0, 130, 38
 	endchannel
--- a/audio/sfx/snare9_3.asm
+++ b/audio/sfx/snare9_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_3_Ch1: ; 7c337 (1f:4337)
+SFX_Snare9_3_Ch1:
 	unknownnoise0x20 0, 130, 38
 	endchannel
--- a/audio/sfx/ss_anne_horn_1.asm
+++ b/audio/sfx/ss_anne_horn_1.asm
@@ -1,4 +1,4 @@
-SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d)
+SFX_SS_Anne_Horn_1_Ch1:
 	duty 2
 	unknownsfx0x20 15, 240, 0, 5
 	unknownsfx0x20 4, 0, 0, 0
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_SS_Anne_Horn_1_Ch2: ; 868c (2:468c)
+SFX_SS_Anne_Horn_1_Ch2:
 	duty 3
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 4, 0, 0, 0
--- a/audio/sfx/ss_anne_horn_3.asm
+++ b/audio/sfx/ss_anne_horn_3.asm
@@ -1,4 +1,4 @@
-SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a)
+SFX_SS_Anne_Horn_3_Ch1:
 	duty 2
 	unknownsfx0x20 15, 240, 0, 5
 	unknownsfx0x20 4, 0, 0, 0
@@ -10,7 +10,7 @@
 	endchannel
 
 
-SFX_SS_Anne_Horn_3_Ch2: ; 7c669 (1f:4669)
+SFX_SS_Anne_Horn_3_Ch2:
 	duty 3
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 4, 0, 0, 0
--- a/audio/sfx/start_menu_1.asm
+++ b/audio/sfx/start_menu_1.asm
@@ -1,4 +1,4 @@
-SFX_Start_Menu_1_Ch1: ; 83c3 (2:43c3)
+SFX_Start_Menu_1_Ch1:
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
--- a/audio/sfx/start_menu_2.asm
+++ b/audio/sfx/start_menu_2.asm
@@ -1,4 +1,4 @@
-SFX_Start_Menu_2_Ch1: ; 203d6 (8:43d6)
+SFX_Start_Menu_2_Ch1:
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
--- a/audio/sfx/start_menu_3.asm
+++ b/audio/sfx/start_menu_3.asm
@@ -1,4 +1,4 @@
-SFX_Start_Menu_3_Ch1: ; 7c3c3 (1f:43c3)
+SFX_Start_Menu_3_Ch1:
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
--- a/audio/sfx/super_effective.asm
+++ b/audio/sfx/super_effective.asm
@@ -1,4 +1,4 @@
-SFX_Super_Effective_Ch1: ; 20574 (8:4574)
+SFX_Super_Effective_Ch1:
 	unknownnoise0x20 4, 241, 52
 	unknownnoise0x20 15, 242, 100
 	endchannel
--- a/audio/sfx/swap_1.asm
+++ b/audio/sfx/swap_1.asm
@@ -1,10 +1,10 @@
-SFX_Swap_1_Ch1: ; 83f8 (2:43f8)
+SFX_Swap_1_Ch1:
 	duty 2
 	unknownsfx0x20 8, 225, 64, 7
 	endchannel
 
 
-SFX_Swap_1_Ch2: ; 83ff (2:43ff)
+SFX_Swap_1_Ch2:
 	duty 2
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
--- a/audio/sfx/swap_3.asm
+++ b/audio/sfx/swap_3.asm
@@ -1,10 +1,10 @@
-SFX_Swap_3_Ch1: ; 7c3e1 (1f:43e1)
+SFX_Swap_3_Ch1:
 	duty 2
 	unknownsfx0x20 8, 225, 64, 7
 	endchannel
 
 
-SFX_Swap_3_Ch2: ; 7c3e8 (1f:43e8)
+SFX_Swap_3_Ch2:
 	duty 2
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
--- a/audio/sfx/switch_1.asm
+++ b/audio/sfx/switch_1.asm
@@ -1,4 +1,4 @@
-SFX_Switch_1_Ch1: ; 8569 (2:4569)
+SFX_Switch_1_Ch1:
 	duty 2
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 2, 241, 128, 6
--- a/audio/sfx/switch_3.asm
+++ b/audio/sfx/switch_3.asm
@@ -1,4 +1,4 @@
-SFX_Switch_3_Ch1: ; 7c546 (1f:4546)
+SFX_Switch_3_Ch1:
 	duty 2
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 2, 241, 128, 6
--- a/audio/sfx/teleport_enter1_1.asm
+++ b/audio/sfx/teleport_enter1_1.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Enter1_1_Ch1: ; 85b0 (2:45b0)
+SFX_Teleport_Enter1_1_Ch1:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 7
--- a/audio/sfx/teleport_enter1_3.asm
+++ b/audio/sfx/teleport_enter1_3.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Enter1_3_Ch1: ; 7c58d (1f:458d)
+SFX_Teleport_Enter1_3_Ch1:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 7
--- a/audio/sfx/teleport_enter2_1.asm
+++ b/audio/sfx/teleport_enter2_1.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Enter2_1_Ch1: ; 85e1 (2:45e1)
+SFX_Teleport_Enter2_1_Ch1:
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 241, 34
--- a/audio/sfx/teleport_enter2_3.asm
+++ b/audio/sfx/teleport_enter2_3.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Enter2_3_Ch1: ; 7c5be (1f:45be)
+SFX_Teleport_Enter2_3_Ch1:
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 241, 34
--- a/audio/sfx/teleport_exit1_1.asm
+++ b/audio/sfx/teleport_exit1_1.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Exit1_1_Ch1: ; 8595 (2:4595)
+SFX_Teleport_Exit1_1_Ch1:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 5
--- a/audio/sfx/teleport_exit1_3.asm
+++ b/audio/sfx/teleport_exit1_3.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Exit1_3_Ch1: ; 7c572 (1f:4572)
+SFX_Teleport_Exit1_3_Ch1:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 5
--- a/audio/sfx/teleport_exit2_1.asm
+++ b/audio/sfx/teleport_exit2_1.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Exit2_1_Ch1: ; 85cb (2:45cb)
+SFX_Teleport_Exit2_1_Ch1:
 	duty 1
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 210, 0, 5
--- a/audio/sfx/teleport_exit2_3.asm
+++ b/audio/sfx/teleport_exit2_3.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Exit2_3_Ch1: ; 7c5a8 (1f:45a8)
+SFX_Teleport_Exit2_3_Ch1:
 	duty 1
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 210, 0, 5
--- a/audio/sfx/tink_1.asm
+++ b/audio/sfx/tink_1.asm
@@ -1,4 +1,4 @@
-SFX_Tink_1_Ch1: ; 840a (2:440a)
+SFX_Tink_1_Ch1:
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
--- a/audio/sfx/tink_2.asm
+++ b/audio/sfx/tink_2.asm
@@ -1,4 +1,4 @@
-SFX_Tink_2_Ch1: ; 203dd (8:43dd)
+SFX_Tink_2_Ch1:
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
--- a/audio/sfx/tink_3.asm
+++ b/audio/sfx/tink_3.asm
@@ -1,4 +1,4 @@
-SFX_Tink_3_Ch1: ; 7c3f3 (1f:43f3)
+SFX_Tink_3_Ch1:
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
--- a/audio/sfx/trade_machine_1.asm
+++ b/audio/sfx/trade_machine_1.asm
@@ -1,4 +1,4 @@
-SFX_Trade_Machine_1_Ch1: ; 84ee (2:44ee)
+SFX_Trade_Machine_1_Ch1:
 	duty 2
 	unknownsfx0x10 21
 	unknownsfx0x20 15, 240, 240, 4
--- a/audio/sfx/trade_machine_3.asm
+++ b/audio/sfx/trade_machine_3.asm
@@ -1,4 +1,4 @@
-SFX_Trade_Machine_3_Ch1: ; 7c4c7 (1f:44c7)
+SFX_Trade_Machine_3_Ch1:
 	duty 2
 	unknownsfx0x10 21
 	unknownsfx0x20 15, 240, 240, 4
--- a/audio/sfx/triangle1_1.asm
+++ b/audio/sfx/triangle1_1.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_1_Ch1: ; 8320 (2:4320)
+SFX_Triangle1_1_Ch1:
 	unknownnoise0x20 0, 81, 42
 	endchannel
--- a/audio/sfx/triangle1_2.asm
+++ b/audio/sfx/triangle1_2.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_2_Ch1: ; 20320 (8:4320)
+SFX_Triangle1_2_Ch1:
 	unknownnoise0x20 0, 81, 42
 	endchannel
--- a/audio/sfx/triangle1_3.asm
+++ b/audio/sfx/triangle1_3.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_3_Ch1: ; 7c320 (1f:4320)
+SFX_Triangle1_3_Ch1:
 	unknownnoise0x20 0, 81, 42
 	endchannel
--- a/audio/sfx/triangle2_1.asm
+++ b/audio/sfx/triangle2_1.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_1_Ch1: ; 8324 (2:4324)
+SFX_Triangle2_1_Ch1:
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
--- a/audio/sfx/triangle2_2.asm
+++ b/audio/sfx/triangle2_2.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_2_Ch1: ; 20324 (8:4324)
+SFX_Triangle2_2_Ch1:
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
--- a/audio/sfx/triangle2_3.asm
+++ b/audio/sfx/triangle2_3.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_3_Ch1: ; 7c324 (1f:4324)
+SFX_Triangle2_3_Ch1:
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
--- a/audio/sfx/triangle3_1.asm
+++ b/audio/sfx/triangle3_1.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_1_Ch1: ; 834e (2:434e)
+SFX_Triangle3_1_Ch1:
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
--- a/audio/sfx/triangle3_2.asm
+++ b/audio/sfx/triangle3_2.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_2_Ch1: ; 2034e (8:434e)
+SFX_Triangle3_2_Ch1:
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
--- a/audio/sfx/triangle3_3.asm
+++ b/audio/sfx/triangle3_3.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_3_Ch1: ; 7c34e (1f:434e)
+SFX_Triangle3_3_Ch1:
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
--- a/audio/sfx/turn_off_pc_1.asm
+++ b/audio/sfx/turn_off_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_Turn_Off_PC_1_Ch1: ; 8528 (2:4528)
+SFX_Turn_Off_PC_1_Ch1:
 	duty 2
 	unknownsfx0x20 4, 240, 0, 6
 	unknownsfx0x20 4, 240, 0, 4
--- a/audio/sfx/turn_off_pc_3.asm
+++ b/audio/sfx/turn_off_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_Turn_Off_PC_3_Ch1: ; 7c505 (1f:4505)
+SFX_Turn_Off_PC_3_Ch1:
 	duty 2
 	unknownsfx0x20 4, 240, 0, 6
 	unknownsfx0x20 4, 240, 0, 4
--- a/audio/sfx/turn_on_pc_1.asm
+++ b/audio/sfx/turn_on_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_Turn_On_PC_1_Ch1: ; 84fd (2:44fd)
+SFX_Turn_On_PC_1_Ch1:
 	duty 2
 	unknownsfx0x20 15, 242, 192, 7
 	unknownsfx0x20 15, 0, 0, 0
--- a/audio/sfx/turn_on_pc_3.asm
+++ b/audio/sfx/turn_on_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_Turn_On_PC_3_Ch1: ; 7c4d6 (1f:44d6)
+SFX_Turn_On_PC_3_Ch1:
 	duty 2
 	unknownsfx0x20 15, 242, 192, 7
 	unknownsfx0x20 15, 0, 0, 0
--- a/audio/sfx/unused2_2.asm
+++ b/audio/sfx/unused2_2.asm
@@ -1,4 +1,4 @@
-SFX_08_unused2_Ch1: ; 2232f (8:632f)
+SFX_08_unused2_Ch1:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -17,7 +17,7 @@
 	endchannel
 
 
-SFX_08_unused2_Ch2: ; 22347 (8:6347)
+SFX_08_unused2_Ch2:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -33,7 +33,7 @@
 	endchannel
 
 
-SFX_08_unused2_Ch3: ; 22359 (8:6359)
+SFX_08_unused2_Ch3:
 	executemusic
 	notetype 6, 1, 0
 	octave 4
--- a/audio/sfx/unused_1.asm
+++ b/audio/sfx/unused_1.asm
@@ -1,4 +1,4 @@
-SFX_02_unused_Ch1: ; 86e3 (2:46e3)
+SFX_02_unused_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 224, 128, 7
 	unknownsfx0x20 15, 240, 132, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_02_unused_Ch2: ; 86fe (2:46fe)
+SFX_02_unused_Ch2:
 	dutycycle 5
 	unknownsfx0x20 15, 160, 65, 7
 	unknownsfx0x20 15, 176, 67, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_02_unused_Ch3: ; 8719 (2:4719)
+SFX_02_unused_Ch3:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 224, 58
 	unknownnoise0x20 15, 208, 58
--- a/audio/sfx/unused_2.asm
+++ b/audio/sfx/unused_2.asm
@@ -1,4 +1,4 @@
-SFX_08_unused_Ch1: ; 2098b (8:498b)
+SFX_08_unused_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 224, 128, 7
 	unknownsfx0x20 15, 240, 132, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_08_unused_Ch2: ; 209a6 (8:49a6)
+SFX_08_unused_Ch2:
 	dutycycle 5
 	unknownsfx0x20 15, 160, 65, 7
 	unknownsfx0x20 15, 176, 67, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_08_unused_Ch3: ; 209c1 (8:49c1)
+SFX_08_unused_Ch3:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 224, 58
 	unknownnoise0x20 15, 208, 58
--- a/audio/sfx/unused_3.asm
+++ b/audio/sfx/unused_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_unused_Ch1: ; 7c758 (1f:4758)
+SFX_1f_unused_Ch1:
 	dutycycle 240
 	unknownsfx0x20 15, 224, 128, 7
 	unknownsfx0x20 15, 240, 132, 7
@@ -9,7 +9,7 @@
 	endchannel
 
 
-SFX_1f_unused_Ch2: ; 7c773 (1f:4773)
+SFX_1f_unused_Ch2:
 	dutycycle 5
 	unknownsfx0x20 15, 160, 65, 7
 	unknownsfx0x20 15, 176, 67, 7
@@ -20,7 +20,7 @@
 	endchannel
 
 
-SFX_1f_unused_Ch3: ; 7c78e (1f:478e)
+SFX_1f_unused_Ch3:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 224, 58
 	unknownnoise0x20 15, 208, 58
--- a/audio/sfx/vine_whip.asm
+++ b/audio/sfx/vine_whip.asm
@@ -1,4 +1,4 @@
-SFX_Vine_Whip_Ch1: ; 20533 (8:4533)
+SFX_Vine_Whip_Ch1:
 	unknownnoise0x20 1, 194, 51
 	unknownnoise0x20 2, 242, 33
 	unknownnoise0x20 1, 226, 51
--- a/audio/sfx/withdraw_deposit_1.asm
+++ b/audio/sfx/withdraw_deposit_1.asm
@@ -1,4 +1,4 @@
-SFX_Withdraw_Deposit_1_Ch1: ; 86ab (2:46ab)
+SFX_Withdraw_Deposit_1_Ch1:
 	duty 1
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 5
--- a/audio/sfx/withdraw_deposit_3.asm
+++ b/audio/sfx/withdraw_deposit_3.asm
@@ -1,4 +1,4 @@
-SFX_Withdraw_Deposit_3_Ch1: ; 7c688 (1f:4688)
+SFX_Withdraw_Deposit_3_Ch1:
 	duty 1
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 5
--- a/data/animations.asm
+++ b/data/animations.asm
@@ -1,4 +1,4 @@
-AttackAnimationPointers: ; 7a07d (1e:607d)
+AttackAnimationPointers:
 	dw PoundAnim
 	dw KarateChopAnim
 	dw DoubleSlapAnim
@@ -209,49 +209,49 @@
 ; if first byte >= $D8
 ;	db special_effect_id, sound_id
 ; $FF terminated
-ZigZagScreenAnim: ; 7a213 (1e:6213)
+ZigZagScreenAnim:
 	db SE_WAVY_SCREEN, $FF
 	db $FF
 
-PoundAnim: ; 7a216 (1e:6216)
-StruggleAnim: ; 7a216 (1e:6216)
+PoundAnim:
+StruggleAnim:
 	db $08,$00,$01
 	db $FF
 
-KarateChopAnim: ; 7a21a (1e:621a)
+KarateChopAnim:
 	db $08,$01,$03
 	db $FF
 
-DoubleSlapAnim: ; 7a21e (1e:621e)
+DoubleSlapAnim:
 	db $05,$02,$01
 	db $05,$02,$01
 	db $FF
 
-CometPunchAnim: ; 7a225 (1e:6225)
+CometPunchAnim:
 	db $04,$03,$02
 	db $04,$03,$02
 	db $FF
 
-MegaPunchAnim: ; 7a22c (1e:622c)
+MegaPunchAnim:
 	db $46,$04,$04
 	db $FF
 
-PayDayAnim: ; 7a230 (1e:6230)
+PayDayAnim:
 	db $08,$00,$01
 	db $04,$05,$52
 	db $FF
 
-FirePunchAnim: ; 7a237 (1e:6237)
+FirePunchAnim:
 	db $06,$06,$02
 	db $46,$FF,$11
 	db $FF
 
-IcePunchAnim: ; 7a23e (1e:623e)
+IcePunchAnim:
 	db $06,$07,$02
 	db $10,$FF,$2F
 	db $FF
 
-ThunderPunchAnim: ; 7a245 (1e:6245)
+ThunderPunchAnim:
 	db $06,$08,$02
 	db SE_DARK_SCREEN_PALETTE, $FF
 	db $46,$FF,$2B
@@ -258,107 +258,107 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-ScratchAnim: ; 7a250 (1e:6250)
+ScratchAnim:
 	db $06,$09,$0F
 	db $FF
 
-VicegripAnim: ; 7a254 (1e:6254)
+VicegripAnim:
 	db $08,$0A,$2A
 	db $FF
 
-GuillotineAnim: ; 7a258 (1e:6258)
+GuillotineAnim:
 	db $06,$0B,$2A
 	db $FF
 
-RazorWindAnim: ; 7a25c (1e:625c)
+RazorWindAnim:
 	db $04,$0C,$16
 	db $FF
 
-SwordsDanceAnim: ; 7a260 (1e:6260)
+SwordsDanceAnim:
 	db $46,$0D,$18
 	db $46,$0D,$18
 	db $46,$0D,$18
 	db $FF
 
-CutAnim: ; 7a26a (1e:626a)
+CutAnim:
 	db SE_DARK_SCREEN_FLASH, $0E
 	db $04,$FF,$16
 	db $FF
 
-GustAnim: ; 7a270 (1e:6270)
+GustAnim:
 	db $46,$0F,$10
 	db $06,$FF,$02
 	db $FF
 
-WingAttackAnim: ; 7a277 (1e:6277)
+WingAttackAnim:
 	db $46,$10,$04
 	db $FF
 
-WhirlwindAnim: ; 7a27b (1e:627b)
+WhirlwindAnim:
 	db $46,$11,$10
 	db SE_SLIDE_ENEMY_MON_OFF, $FF
 	db $FF
 
-FlyAnim: ; 7a281 (1e:6281)
+FlyAnim:
 	db $46,$12,$04
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
-BindAnim: ; 7a287 (1e:6287)
+BindAnim:
 	db $04,$13,$23
 	db $04,$13,$23
 	db $FF
 
-SlamAnim: ; 7a28e (1e:628e)
+SlamAnim:
 	db $06,$14,$02
 	db $FF
 
-VineWhipAnim: ; 7a292 (1e:6292)
+VineWhipAnim:
 	db $01,$15,$16
 	db $08,$FF,$01
 	db $FF
 
-StompAnim: ; 7a299 (1e:6299)
+StompAnim:
 	db $48,$16,$05
 	db $FF
 
-DoubleKickAnim: ; 7a29d (1e:629d)
+DoubleKickAnim:
 	db $08,$17,$01
 	db $08,$17,$01
 	db $FF
 
-MegaKickAnim: ; 7a2a4 (1e:62a4)
+MegaKickAnim:
 	db $46,$18,$04
 	db $FF
 
-JumpKickAnim: ; 7a2a8 (1e:62a8)
+JumpKickAnim:
 	db $46,$19,$04
 	db $FF
 
-RollingKickAnim: ; 7a2ac (1e:62ac)
+RollingKickAnim:
 	db SE_DARK_SCREEN_FLASH, $1A
 	db $46,$FF,$04
 	db $FF
 
-SandAttackAnim: ; 7a2b2 (1e:62b2)
+SandAttackAnim:
 	db $46,$1B,$28
 	db $FF
 
-HeatButtAnim: ; 7a2b6 (1e:62b6)
+HeatButtAnim:
 	db $46,$1C,$05
 	db $FF
 
-HornAttackAnim: ; 7a2ba (1e:62ba)
+HornAttackAnim:
 	db $06,$1D,$45
 	db $46,$FF,$05
 	db $FF
 
-FuryAttackAnim: ; 7a2c1 (1e:62c1)
+FuryAttackAnim:
 	db $02,$1E,$46
 	db $02,$FF,$46
 	db $FF
 
-HornDrillAnim: ; 7a2c8 (1e:62c8)
+HornDrillAnim:
 	db $42,$1F,$05
 	db $42,$FF,$05
 	db $42,$FF,$05
@@ -366,12 +366,12 @@
 	db $42,$FF,$05
 	db $FF
 
-TackleAnim: ; 7a2d8 (1e:62d8)
+TackleAnim:
 	db SE_MOVE_MON_HORIZONTALLY, $48
 	db SE_RESET_MON_POSITION, $FF
 	db $FF
 
-BodySlamAnim: ; 7a2dd (1e:62dd)
+BodySlamAnim:
 	db SE_MOVE_MON_HORIZONTALLY, $48
 	db SE_DARK_SCREEN_FLASH, $FF
 	db SE_DARK_SCREEN_FLASH, $FF
@@ -378,23 +378,23 @@
 	db SE_RESET_MON_POSITION, $FF
 	db $FF
 
-WrapAnim: ; 7a2e6 (1e:62e6)
+WrapAnim:
 	db $04,$22,$23
 	db $04,$22,$23
 	db $04,$22,$23
 	db $FF
 
-TakeDownAnim: ; 7a2f0 (1e:62f0)
+TakeDownAnim:
 	db SE_MOVE_MON_HORIZONTALLY, $48
 	db SE_DARK_SCREEN_FLASH, $23
 	db SE_RESET_MON_POSITION, $FF
 	db $FF
 
-ThrashAnim: ; 7a2f7 (1e:62f7)
+ThrashAnim:
 	db $46,$24,$04
 	db $FF
 
-DoubleEdgeAnim: ; 7a2fb (1e:62fb)
+DoubleEdgeAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $48
 	db $06,$FF,$2D
 	db SE_RESET_SCREEN_PALETTE, $FF
@@ -403,7 +403,7 @@
 	db SE_RESET_MON_POSITION, $FF
 	db $FF
 
-TailWhipAnim: ; 7a309 (1e:6309)
+TailWhipAnim:
 	db SE_MOVE_MON_HORIZONTALLY, $84
 	db SE_DELAY_ANIMATION_10, $FF
 	db SE_RESET_MON_POSITION, $84
@@ -413,20 +413,20 @@
 	db SE_RESET_MON_POSITION, $84
 	db $FF
 
-PoisonStingAnim: ; 7a318 (1e:6318)
+PoisonStingAnim:
 	db $06,$27,$00
 	db $FF
 
-TwineedleAnim: ; 7a31c (1e:631c)
+TwineedleAnim:
 	db $05,$28,$01
 	db $05,$28,$01
 	db $FF
 
-PinMissileAnim: ; 7a323 (1e:6323)
+PinMissileAnim:
 	db $03,$29,$01
 	db $FF
 
-LeerAnim: ; 7a327 (1e:6327)
+LeerAnim:
 	db SE_DARK_SCREEN_PALETTE, $48
 	db SE_DARK_SCREEN_FLASH, $2A
 	db SE_DARK_SCREEN_FLASH, $2A
@@ -433,31 +433,31 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-BiteAnim: ; 7a330 (1e:6330)
+BiteAnim:
 	db $08,$2B,$02
 	db $FF
 
-GrowlAnim: ; 7a334 (1e:6334)
+GrowlAnim:
 	db $46,$2C,$12
 	db $FF
 
-RoarAnim: ; 7a338 (1e:6338)
+RoarAnim:
 	db $46,$2D,$15
 	db $46,$2D,$15
 	db $46,$2D,$15
 	db $FF
 
-SingAnim: ; 7a342 (1e:6342)
+SingAnim:
 	db $46,$2E,$12
 	db $50,$FF,$40
 	db $50,$FF,$40
 	db $FF
 
-SupersonicAnim: ; 7a34c (1e:634c)
+SupersonicAnim:
 	db $06,$2F,$31
 	db $FF
 
-SonicBoomAnim: ; 7a350 (1e:6350)
+SonicBoomAnim:
 	db $46,$2D,$15
 	db $46,$2D,$15
 	db $46,$0F,$10
@@ -464,7 +464,7 @@
 	db $46,$FF,$05
 	db $FF
 
-DisableAnim: ; 7a35d (1e:635d)
+DisableAnim:
 	db SE_DARK_SCREEN_PALETTE, $48
 	db SE_DARK_SCREEN_FLASH, $2A
 	db SE_DARK_SCREEN_FLASH, $2A
@@ -471,67 +471,67 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-AcidAnim: ; 7a366 (1e:6366)
+AcidAnim:
 	db $46,$32,$13
 	db $46,$32,$14
 	db $FF
 
-EmberAnim: ; 7a36d (1e:636d)
+EmberAnim:
 	db $46,$33,$11
 	db $FF
 
-FlamethrowerAnim: ; 7a371 (1e:6371)
+FlamethrowerAnim:
 	db $46,$34,$1F
 	db $46,$34,$0C
 	db $46,$34,$0D
 	db $FF
 
-MistAnim: ; 7a37b (1e:637b)
+MistAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $FF
 	db SE_WATER_DROPLETS_EVERYWHERE, $38
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-WaterGunAnim: ; 7a382 (1e:6382)
+WaterGunAnim:
 	db $06,$36,$2C
 	db $FF
 
-HydroPumpAnim: ; 7a386 (1e:6386)
+HydroPumpAnim:
 	db $06,$37,$1A
 	db $06,$37,$1A
 	db $FF
 
-SurfAnim: ; 7a38d (1e:638d)
+SurfAnim:
 	db SE_WATER_DROPLETS_EVERYWHERE, $38
 	db $06,$37,$1A
 	db $FF
 
-IceBeamAnim: ; 7a393 (1e:6393)
+IceBeamAnim:
 	db $03,$39,$2E
 	db $10,$FF,$2F
 	db $FF
 
-BlizzardAnim: ; 7a39a (1e:639a)
+BlizzardAnim:
 	db $04,$3A,$38
 	db $04,$37,$38
 	db $FF
 
-PsyBeamAnim: ; 7a3a1 (1e:63a1)
+PsyBeamAnim:
 	db $03,$3B,$2E
 	db SE_FLASH_SCREEN_LONG, $FF
 	db $FF
 
-BubbleBeamAnim: ; 7a3a7 (1e:63a7)
+BubbleBeamAnim:
 	db $12,$3C,$35
 	db $FF
 
-AuroraBeamAnim: ; 7a3ab (1e:63ab)
+AuroraBeamAnim:
 	db $03,$3D,$2E
 	db SE_DELAY_ANIMATION_10, $FF
 	db SE_DELAY_ANIMATION_10, $FF
 	db $FF
 
-HyperBeamAnim: ; 7a3b3 (1e:63b3)
+HyperBeamAnim:
 	db SE_DARK_SCREEN_PALETTE, $48
 	db SE_SPIRAL_BALLS_INWARD, $FF
 	db $02,$3E,$2E
@@ -541,33 +541,33 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-PeckAnim: ; 7a3c4 (1e:63c4)
+PeckAnim:
 	db $08,$3F,$01
 	db $FF
 
-DrillPeckAnim: ; 7a3c8 (1e:63c8)
+DrillPeckAnim:
 	db $46,$40,$04
 	db $FF
 
-SubmissionAnim: ; 7a3cc (1e:63cc)
+SubmissionAnim:
 	db SE_SLIDE_MON_OFF, $41
 	db $06,$FF,$01
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
-LowKickAnim: ; 7a3d4 (1e:63d4)
+LowKickAnim:
 	db SE_SLIDE_MON_OFF, $42
 	db $46,$FF,$04
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
-CounterAnim: ; 7a3dc (1e:63dc)
+CounterAnim:
 	db SE_SLIDE_MON_OFF, $43
 	db $46,$FF,$04
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
-SeismicTossAnim: ; 7a3e4 (1e:63e4)
+SeismicTossAnim:
 	db SE_BLINK_ENEMY_MON, $FF
 	db $41,$8B,$4E
 	db SE_HIDE_ENEMY_MON_PIC, $FF
@@ -581,13 +581,13 @@
 	db SE_SHAKE_SCREEN, $FF
 	db $FF
 
-StrengthAnim: ; 7a3fe (1e:63fe)
+StrengthAnim:
 	db SE_MOVE_MON_HORIZONTALLY, $48
 	db SE_RESET_MON_POSITION, $FF
 	db $46,$06,$04
 	db $FF
 
-AbsorbAnim: ; 7a406 (1e:6406)
+AbsorbAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $46
 	db $06,$FF,$21
 	db $06,$FF,$22
@@ -594,7 +594,7 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-MegaDrainAnim: ; 7a411 (1e:6411)
+MegaDrainAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $47
 	db SE_DARK_SCREEN_FLASH, $FF
 	db $06,$FF,$21
@@ -603,51 +603,51 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-LeechSeedAnim: ; 7a420 (1e:6420)
+LeechSeedAnim:
 	db $46,$48,$1B
 	db $55,$4D,$1C
 	db $FF
 
-GrowthAnim: ; 7a427 (1e:6427)
+GrowthAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $49
 	db SE_SPIRAL_BALLS_INWARD, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-RazorLeafAnim: ; 7a42e (1e:642e)
+RazorLeafAnim:
 	db SE_LEAVES_FALLING, $4A
 	db $41,$80,$44
 	db $01,$0C,$16
 	db $FF
 
-SolarBeamAnim: ; 7a437 (1e:6437)
+SolarBeamAnim:
 	db $06,$4B,$2E
 	db $06,$FF,$01
 	db $FF
 
-PoisonPowderAnim: ; 7a43e (1e:643e)
+PoisonPowderAnim:
 	db $06,$4C,$36
 	db $FF
 
-StunSporeAnim: ; 7a442 (1e:6442)
+StunSporeAnim:
 	db $06,$4D,$36
 	db $FF
 
-SleepPowderAnim: ; 7a446 (1e:6446)
+SleepPowderAnim:
 	db $06,$4E,$36
 	db $FF
 
-PedalDanceAnim: ; 7a44a (1e:644a)
+PedalDanceAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $4F
 	db SE_PETALS_FALLING, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-StringShotAnim: ; 7a451 (1e:6451)
+StringShotAnim:
 	db $08,$50,$37
 	db $FF
 
-DragonRageAnim: ; 7a455 (1e:6455)
+DragonRageAnim:
 	db $46,$51,$1F
 	db $46,$FF,$0C
 	db $46,$FF,$0D
@@ -654,28 +654,28 @@
 	db $46,$FF,$0E
 	db $FF
 
-FireSpinAnim: ; 7a462 (1e:6462)
+FireSpinAnim:
 	db $46,$52,$0C
 	db $46,$FF,$0D
 	db $46,$FF,$0E
 	db $FF
 
-ThunderShockAnim: ; 7a46c (1e:646c)
+ThunderShockAnim:
 	db $42,$53,$29
 	db $FF
 
-ThunderBoltAnim: ; 7a470 (1e:6470)
+ThunderBoltAnim:
 	db $41,$54,$29
 	db $41,$54,$29
 	db $FF
 
-ThunderWaveAnim: ; 7a477 (1e:6477)
+ThunderWaveAnim:
 	db $42,$55,$29
 	db $02,$FF,$23
 	db $04,$FF,$23
 	db $FF
 
-ThunderAnim: ; 7a481 (1e:6481)
+ThunderAnim:
 	db SE_DARK_SCREEN_PALETTE, $56
 	db SE_DARK_SCREEN_FLASH, $FF
 	db $46,$FF,$2B
@@ -684,16 +684,16 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-RockThrowAnim: ; 7a490 (1e:6490)
+RockThrowAnim:
 	db $04,$57,$30
 	db $FF
 
-EarthquakeAnim: ; 7a494 (1e:6494)
+EarthquakeAnim:
 	db SE_SHAKE_SCREEN, $58
 	db SE_SHAKE_SCREEN, $58
 	db $FF
 
-FissureAnim: ; 7a499 (1e:6499)
+FissureAnim:
 	db SE_DARK_SCREEN_FLASH, $59
 	db SE_SHAKE_SCREEN, $FF
 	db SE_DARK_SCREEN_FLASH, $59
@@ -700,30 +700,30 @@
 	db SE_SHAKE_SCREEN, $FF
 	db $FF
 
-DigAnim: ; 7a4a2 (1e:64a2)
+DigAnim:
 	db $46,$5A,$04
 	db SE_SLIDE_MON_UP, $FF
 	db $FF
 
-ToxicAnim: ; 7a4a8 (1e:64a8)
+ToxicAnim:
 	db SE_WATER_DROPLETS_EVERYWHERE, $38
 	db $46,$5B,$14
 	db $FF
 
-ConfusionAnim: ; 7a4ae (1e:64ae)
+ConfusionAnim:
 	db SE_FLASH_SCREEN_LONG, $5C
 	db $FF
 
-PsychicAnim: ; 7a4b1 (1e:64b1)
+PsychicAnim:
 	db SE_FLASH_SCREEN_LONG, $5D
 	db SE_WAVY_SCREEN, $FF
 	db $FF
 
-HypnosisAnim: ; 7a4b6 (1e:64b6)
+HypnosisAnim:
 	db SE_FLASH_SCREEN_LONG, $5E
 	db $FF
 
-MeditateAnim: ; 7a4b9 (1e:64b9)
+MeditateAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $5F
 	db $46,$FF,$43
 	db SE_DARK_SCREEN_FLASH, $FF
@@ -730,41 +730,41 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-AgilityAnim: ; 7a4c3 (1e:64c3)
+AgilityAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $60
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-QuickAttackAnim: ; 7a4c8 (1e:64c8)
+QuickAttackAnim:
 	db SE_SLIDE_MON_OFF, $61
 	db $46,$FF,$04
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
-RageAnim: ; 7a4d0 (1e:64d0)
+RageAnim:
 	db $06,$62,$01
 	db $FF
 
-TeleportAnim: ; 7a4d4 (1e:64d4)
+TeleportAnim:
 	db SE_SQUISH_MON_PIC, $63
 	db SE_SHOOT_BALLS_UPWARD, $FF
 	db $FF
 
-NightShadeAnim: ; 7a4d9 (1e:64d9)
+NightShadeAnim:
 	db SE_FLASH_SCREEN_LONG, $5C
 	db SE_WAVY_SCREEN, $FF
 	db $FF
 
-MimicAnim: ; 7a4de (1e:64de)
+MimicAnim:
 	db $46,$65,$21
 	db $46,$65,$22
 	db $FF
 
-ScreechAnim: ; 7a4e5 (1e:64e5)
+ScreechAnim:
 	db $46,$66,$12
 	db $FF
 
-DoubleTeamAnim: ; 7a4e9 (1e:64e9)
+DoubleTeamAnim:
 	db SE_DARK_SCREEN_PALETTE, $FF
 	db SE_DELAY_ANIMATION_10, $FF
 	db SE_DELAY_ANIMATION_10, $FF
@@ -776,7 +776,7 @@
 	db $46,$6F,$33
 	db $FF
 
-RecoverAnim: ; 7a4fd (1e:64fd)
+RecoverAnim:
 	db SE_BLINK_MON, $68
 	db SE_LIGHT_SCREEN_PALETTE, $FF
 	db SE_SPIRAL_BALLS_INWARD, $FF
@@ -783,7 +783,7 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-HardenAnim: ; 7a506 (1e:6506)
+HardenAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $69
 	db $46,$FF,$43
 	db SE_DARK_SCREEN_FLASH, $FF
@@ -790,7 +790,7 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-MinimizeAnim: ; 7a510 (1e:6510)
+MinimizeAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $6A
 	db SE_SPIRAL_BALLS_INWARD, $FF
 	db SE_MINIMIZE_MON, $FF
@@ -797,7 +797,7 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-SmokeScreenAnim: ; 7a519 (1e:6519)
+SmokeScreenAnim:
 	db $46,$6B,$28
 	db $04,$FF,$0A
 	db SE_DARKEN_MON_PALETTE, $FF
@@ -815,13 +815,13 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-ConfuseRayAnim: ; 7a53a (1e:653a)
+ConfuseRayAnim:
 	db SE_DARK_SCREEN_PALETTE, $6C
 	db $46,$FF,$3E
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-WithdrawAnim: ; 7a542 (1e:6542)
+WithdrawAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $6E
 	db SE_SLIDE_MON_DOWN, $FF
 	db $06,$FF,$51
@@ -829,7 +829,7 @@
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
-DefenseCurlAnim: ; 7a54e (1e:654e)
+DefenseCurlAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $6E
 	db $06,$FF,$43
 	db SE_DARK_SCREEN_FLASH, $FF
@@ -836,12 +836,12 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-BarrierAnim: ; 7a558 (1e:6558)
+BarrierAnim:
 	db $46,$6F,$33
 	db $46,$6F,$33
 	db $FF
 
-LightScreenAnim: ; 7a55f (1e:655f)
+LightScreenAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $FF
 	db $46,$70,$33
 	db $46,$70,$33
@@ -848,13 +848,13 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-HazeAnim: ; 7a56a (1e:656a)
+HazeAnim:
 	db SE_DARKEN_MON_PALETTE, $FF
 	db SE_WATER_DROPLETS_EVERYWHERE, $38
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-ReflectAnim: ; 7a571 (1e:6571)
+ReflectAnim:
 	db SE_DARK_SCREEN_PALETTE, $FF
 	db $46,$72,$33
 	db $46,$72,$33
@@ -861,15 +861,15 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-FocusEnergyAnim: ; 7a57c (1e:657c)
+FocusEnergyAnim:
 	db SE_SPIRAL_BALLS_INWARD, $73
 	db $FF
 
-BideAnim: ; 7a57f (1e:657f)
+BideAnim:
 	db $46,$74,$04
 	db $FF
 
-MetronomeAnim: ; 7a583 (1e:6583)
+MetronomeAnim:
 	db SE_MOVE_MON_HORIZONTALLY, $84
 	db SE_DELAY_ANIMATION_10, $FF
 	db SE_RESET_MON_POSITION, $84
@@ -879,39 +879,39 @@
 	db SE_RESET_MON_POSITION, $84
 	db $FF
 
-MirrorMoveAnim: ; 7a592 (1e:6592)
+MirrorMoveAnim:
 	db $08,$76,$01
 	db $FF
 
-SelfdestructAnim: ; 7a596 (1e:6596)
+SelfdestructAnim:
 	db $43,$77,$34
 	db $FF
 
-EggBombAnim: ; 7a59a (1e:659a)
+EggBombAnim:
 	db $44,$78,$41
 	db $44,$78,$42
 	db $FF
 
-LickAnim: ; 7a5a1 (1e:65a1)
+LickAnim:
 	db $46,$7B,$14
 	db $FF
 
-SmogAnim: ; 7a5a5 (1e:65a5)
+SmogAnim:
 	db SE_DARKEN_MON_PALETTE, $48
 	db $46,$7A,$19
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-SludgeAnim: ; 7a5ad (1e:65ad)
+SludgeAnim:
 	db $46,$7B,$13
 	db $46,$7B,$14
 	db $FF
 
-BoneClubAnim: ; 7a5b4 (1e:65b4)
+BoneClubAnim:
 	db $08,$7C,$02
 	db $FF
 
-FireBlastAnim: ; 7a5b8 (1e:65b8)
+FireBlastAnim:
 	db $46,$7D,$1F
 	db $46,$FF,$20
 	db $46,$FF,$20
@@ -919,7 +919,7 @@
 	db $46,$FF,$0D
 	db $FF
 
-WaterfallAnim: ; 7a5c8 (1e:65c8)
+WaterfallAnim:
 	db SE_SLIDE_MON_DOWN, $48
 	db $06,$37,$1A
 	db $08,$FF,$02
@@ -926,40 +926,40 @@
 	db SE_SLIDE_MON_UP, $FF
 	db $FF
 
-ClampAnim: ; 7a5d3 (1e:65d3)
+ClampAnim:
 	db $08,$7F,$2A
 	db $06,$83,$23
 	db $06,$83,$23
 	db $FF
 
-SwiftAnim: ; 7a5dd (1e:65dd)
+SwiftAnim:
 	db $43,$80,$3F
 	db $FF
 
-SkullBashAnim: ; 7a5e1 (1e:65e1)
+SkullBashAnim:
 	db $46,$81,$05
 	db $FF
 
-SpikeCannonAnim: ; 7a5e5 (1e:65e5)
+SpikeCannonAnim:
 	db $44,$82,$04
 	db $FF
 
-ConstrictAnim: ; 7a5e9 (1e:65e9)
+ConstrictAnim:
 	db $06,$83,$23
 	db $06,$83,$23
 	db $06,$83,$23
 	db $FF
 
-AmnesiaAnim: ; 7a5f3 (1e:65f3)
+AmnesiaAnim:
 	db $08,$84,$25
 	db $08,$84,$25
 	db $FF
 
-KinesisAnim: ; 7a5fa (1e:65fa)
+KinesisAnim:
 	db $08,$85,$01
 	db $FF
 
-SoftboiledAnim: ; 7a5fe (1e:65fe)
+SoftboiledAnim:
 	db SE_SLIDE_MON_HALF_OFF, $48
 	db $08,$86,$4C
 	db SE_LIGHT_SCREEN_PALETTE, $FF
@@ -968,11 +968,11 @@
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
-HiJumpKickAnim: ; 7a6 (1e:660c)
+HiJumpKickAnim:
 	db $46,$87,$04
 	db $FF
 
-GlareAnim: ; 7a610 (1e:6610)
+GlareAnim:
 	db SE_DARK_SCREEN_PALETTE, $48
 	db SE_DARK_SCREEN_FLASH, $88
 	db SE_DARK_SCREEN_FLASH, $FF
@@ -979,7 +979,7 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-DreamEaterAnim: ; 7a619 (1e:6619)
+DreamEaterAnim:
 	db SE_FLASH_SCREEN_LONG, $89
 	db SE_DARK_SCREEN_PALETTE, $89
 	db $08,$89,$02
@@ -986,16 +986,16 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-PoisonGasAnim: ; 7a623 (1e:6623)
+PoisonGasAnim:
 	db $46,$8A,$19
 	db $FF
 
-BarrageAnim: ; 7a627 (1e:6627)
+BarrageAnim:
 	db $43,$8B,$41
 	db $05,$FF,$55
 	db $FF
 
-LeechLifeAnim: ; 7a62e (1e:662e)
+LeechLifeAnim:
 	db $08,$8C,$02
 	db SE_DARK_SCREEN_FLASH, $FF
 	db $06,$FF,$21
@@ -1003,11 +1003,11 @@
 	db SE_DARK_SCREEN_FLASH, $FF
 	db $FF
 
-LovelyKissAnim: ; 7a63c (1e:663c)
+LovelyKissAnim:
 	db $06,$8D,$12
 	db $FF
 
-SkyAttackAnim: ; 7a640 (1e:6640)
+SkyAttackAnim:
 	db SE_SQUISH_MON_PIC, $8E
 	db SE_SHOOT_BALLS_UPWARD, $FF
 	db $46,$87,$04
@@ -1014,7 +1014,7 @@
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
-TransformAnim: ; 7a64a (1e:664a)
+TransformAnim:
 	db $46,$8F,$21
 	db $44,$8F,$22
 	db $08,$FF,$47
@@ -1021,11 +1021,11 @@
 	db SE_TRANSFORM_MON, $FF
 	db $FF
 
-BubbleAnim: ; 7a656 (1e:6656)
+BubbleAnim:
 	db $16,$90,$35
 	db $FF
 
-DizzyPunchAnim: ; 7a65a (1e:665a)
+DizzyPunchAnim:
 	db $06,$91,$17
 	db $06,$91,$17
 	db $06,$91,$17
@@ -1032,11 +1032,11 @@
 	db $06,$02,$02
 	db $FF
 
-SporeAnim: ; 7a667 (1e:6667)
+SporeAnim:
 	db $06,$92,$36
 	db $FF
 
-FlashAnim: ; 7a66b (1e:666b)
+FlashAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $48
 	db SE_DARK_SCREEN_FLASH, $88
 	db SE_DARK_SCREEN_FLASH, $FF
@@ -1043,52 +1043,52 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-PsywaveAnim: ; 7a674 (1e:6674)
+PsywaveAnim:
 	db $06,$2F,$31
 	db SE_WAVY_SCREEN, $5C
 	db $FF
 
-SplashAnim: ; 7a67a (1e:667a)
+SplashAnim:
 	db SE_BOUNCE_UP_AND_DOWN, $95
 	db $FF
 
-AcidArmorAnim: ; 7a67d (1e:667d)
+AcidArmorAnim:
 	db SE_SLIDE_MON_DOWN_AND_HIDE, $96
 	db $FF
 
-CrabHammerAnim: ; 7a680 (1e:6680)
+CrabHammerAnim:
 	db $46,$97,$05
 	db $06,$FF,$2A
 	db $FF
 
-ExplosionAnim: ; 7a687 (1e:6687)
+ExplosionAnim:
 	db $43,$98,$34
 	db $FF
 
-FurySwipesAnim: ; 7a68b (1e:668b)
+FurySwipesAnim:
 	db $04,$99,$0F
 	db $FF
 
-BonemerangAnim: ; 7a68f (1e:668f)
+BonemerangAnim:
 	db $06,$9A,$02
 	db $FF
 
-RestAnim: ; 7a693 (1e:6693)
+RestAnim:
 	db $10,$9B,$3A
 	db $10,$9B,$3A
 	db $FF
 
-RockSlideAnim: ; 7a69a (1e:669a)
+RockSlideAnim:
 	db $04,$9C,$1D
 	db $03,$9C,$1E
 	db $46,$9D,$04
 	db $FF
 
-HyperFangAnim: ; 7a6a4 (1e:66a4)
+HyperFangAnim:
 	db $06,$9D,$02
 	db $FF
 
-SharpenAnim: ; 7a6a8 (1e:66a8)
+SharpenAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $9E
 	db $46,$FF,$43
 	db SE_DARK_SCREEN_FLASH, $FF
@@ -1095,7 +1095,7 @@
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-ConversionAnim: ; 7a6b2 (1e:66b2)
+ConversionAnim:
 	db SE_DARK_SCREEN_FLASH, $9F
 	db $46,$FF,$21
 	db $46,$FF,$22
@@ -1102,165 +1102,165 @@
 	db SE_DARK_SCREEN_FLASH, $FF
 	db $FF
 
-TriAttackAnim: ; 7a6bd (1e:66bd)
+TriAttackAnim:
 	db SE_DARK_SCREEN_FLASH, $A0
 	db $46,$FF,$4D
 	db SE_DARK_SCREEN_FLASH, $FF
 	db $FF
 
-SuperFangAnim: ; 7a6c5 (1e:66c5)
+SuperFangAnim:
 	db SE_DARK_SCREEN_PALETTE, $48
 	db $46,$A1,$04
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-SlashAnim: ; 7a6cd (1e:66cd)
+SlashAnim:
 	db $06,$A2,$0F
 	db $FF
 
-SubstituteAnim: ; 7a6d1 (1e:66d1)
+SubstituteAnim:
 	db SE_SLIDE_MON_OFF, $A3
 	db $08,$FF,$47
 	db SE_SUBSTITUTE_MON, $FF
 	db $FF
 
-BallTossAnim: ; 7a6d9 (1e:66d9)
+BallTossAnim:
 	db $03,$FF,$06
 	db $FF
 
-GreatTossAnim: ; 7a6dd (1e:66dd)
+GreatTossAnim:
 	db $03,$FF,$07
 	db $FF
 
-UltraTossAnim: ; 7a6e1 (1e:66e1)
+UltraTossAnim:
 	db $02,$FF,$08
 	db $FF
 
-BallShakeAnim: ; 7a6e5 (1e:66e5)
+BallShakeAnim:
 	db $04,$FF,$09
 	db $FF
 
-BallPoofAnim: ; 7a6e9 (1e:66e9)
+BallPoofAnim:
 	db $04,$FF,$0A
 	db $FF
 
-ShowPicAnim: ; 7a6ed (1e:66ed)
+ShowPicAnim:
 	db SE_SHOW_ENEMY_MON_PIC, $FF
 	db $FF
 
-HidePicAnim: ; 7a6f0 (1e:66f0)
+HidePicAnim:
 	db SE_HIDE_ENEMY_MON_PIC, $FF
 	db $FF
 
-EnemyFlashAnim: ; 7a6f3 (1e:66f3)
+EnemyFlashAnim:
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
-PlayerFlashAnim: ; 7a6f6 (1e:66f6)
+PlayerFlashAnim:
 	db SE_FLASH_MON_PIC, $FF
 	db $FF
 
-EnemyHUDShakeAnim: ; 7a6f9 (1e:66f9)
+EnemyHUDShakeAnim:
 	db SE_SHAKE_ENEMY_HUD, $FF
 	db $FF
 
-TradeBallDropAnim: ; 7a6fc (1e:66fc)
+TradeBallDropAnim:
 	db $86,$FF,$48
 	db $FF
 
-TradeBallAppear1Anim: ; 7a700 (1e:6700)
+TradeBallAppear1Anim:
 	db $84,$FF,$49
 	db $FF
 
-TradeBallAppear2Anim: ; 7a704 (1e:6704)
+TradeBallAppear2Anim:
 	db $86,$FF,$4A
 	db $FF
 
-TradeBallPoofAnim: ; 7a708 (1e:6708)
+TradeBallPoofAnim:
 	db $86,$FF,$4B
 	db $FF
 
-XStatItemAnim: ; 7a7c0 (1e:670c)
+XStatItemAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $FF
 	db SE_SPIRAL_BALLS_INWARD, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-ShrinkingSquareAnim: ; 7a713 (1e:6713)
+ShrinkingSquareAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $FF
 	db $46,$FF,$43
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-XStatItemBlackAnim: ; 7a71b (1e:671b)
+XStatItemBlackAnim:
 	db SE_DARKEN_MON_PALETTE, $FF
 	db SE_SPIRAL_BALLS_INWARD, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-ShrinkingSquareBlackAnim: ; 7a722 (1e:6722)
+ShrinkingSquareBlackAnim:
 	db SE_DARKEN_MON_PALETTE, $FF
 	db $46,$FF,$43
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-UnusedAnim: ; 7a72a (1e:672a)
+UnusedAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $FF
 	db SE_SHOOT_MANY_BALLS_UPWARD, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
-ParalyzeAnim: ; 7a731 (1e:6731)
+ParalyzeAnim:
 	db $04,$13,$24
 	db $04,$13,$24
 	db $FF
 
-PoisonAnim: ; 7a738 (1e:6738)
+PoisonAnim:
 	db $08,$13,$27
 	db $08,$13,$27
 	db $FF
 
-SleepPlayerAnim: ; 7a73f (1e:673f)
+SleepPlayerAnim:
 	db $10,$9B,$3A
 	db $10,$9B,$3A
 	db $FF
 
-SleepEnemyAnim: ; 7a746 (1e:6746)
+SleepEnemyAnim:
 	db $10,$9B,$3B
 	db $10,$9B,$3B
 	db $FF
 
-ConfusedPlayerAnim: ; 7a74d (1e:674d)
+ConfusedPlayerAnim:
 	db $08,$84,$25
 	db $08,$84,$25
 	db $FF
 
-ConfusedEnemyAnim: ; 7a754 (1e:6754)
+ConfusedEnemyAnim:
 	db $08,$84,$26
 	db $08,$84,$26
 	db $FF
 
-BallBlockAnim: ; 7a75b (1e:675b)
+BallBlockAnim:
 	db $03,$FF,$0B
 	db $FF
 
-FaintAnim: ; 7a75f (1e:675f)
+FaintAnim:
 	db SE_SLIDE_MON_DOWN, $5A
 	db $FF
 
-ShakeScreenAnim: ; 7a762 (1e:6762)
+ShakeScreenAnim:
 	db SE_SHAKE_SCREEN, $FF
 	db $FF
 
-ThrowRockAnim: ; 7a765 (1e:6765)
+ThrowRockAnim:
 	db $03,$8B,$53
 	db $FF
 
-ThrowBaitAnim: ; 7a769 (1e:6769)
+ThrowBaitAnim:
 	db $03,$8B,$54
 	db $FF
 
-SubanimationPointers: ; 7a76d (1e:676d)
+SubanimationPointers:
 	dw Subanimation00
 	dw Subanimation01
 	dw Subanimation02
@@ -1348,17 +1348,17 @@
 	dw Subanimation54
 	dw Subanimation55
 
-Subanimation04: ; 7a819 (1e:6819)
+Subanimation04:
 	db $43
 	db $02,$1a,$00
 	db $02,$10,$00
 	db $02,$03,$00
 
-Subanimation05: ; 7a823 (1e:6823)
+Subanimation05:
 	db $41
 	db $02,$10,$00
 
-Subanimation08: ; 7a827 (1e:6827)
+Subanimation08:
 	db $0b
 	db $03,$30,$00
 	db $03,$44,$00
@@ -1372,7 +1372,7 @@
 	db $03,$a1,$00
 	db $03,$34,$00
 
-Subanimation07: ; 7a849 (1e:6849)
+Subanimation07:
 	db $0b
 	db $03,$30,$00
 	db $03,$a2,$00
@@ -1386,7 +1386,7 @@
 	db $03,$a6,$00
 	db $03,$34,$00
 
-Subanimation06: ; 7a86b (1e:686b)
+Subanimation06:
 	db $0b
 	db $03,$30,$00
 	db $03,$a2,$00
@@ -1400,7 +1400,7 @@
 	db $03,$a9,$00
 	db $03,$34,$00
 
-Subanimation09: ; 7a88d (1e:688d)
+Subanimation09:
 	db $04
 	db $03,$21,$04
 	db $04,$21,$04
@@ -1407,7 +1407,7 @@
 	db $03,$21,$04
 	db $05,$21,$04
 
-Subanimation0a: ; 7a89a (1e:689a)
+Subanimation0a:
 	db $46
 	db $06,$1b,$00
 	db $07,$1b,$00
@@ -1416,7 +1416,7 @@
 	db $0a,$15,$00
 	db $0a,$15,$00
 
-Subanimation0b: ; 7a8ad (1e:68ad)
+Subanimation0b:
 	db $04
 	db $01,$2d,$00
 	db $03,$2f,$00
@@ -1423,11 +1423,11 @@
 	db $03,$35,$00
 	db $03,$4d,$00
 
-Subanimation55: ; 7a8ba (1e:68ba)
+Subanimation55:
 	db $41
 	db $01,$9d,$00
 
-Subanimation11: ; 7a8be (1e:68be)
+Subanimation11:
 	db $4c
 	db $0b,$26,$00
 	db $0c,$26,$00
@@ -1442,7 +1442,7 @@
 	db $0b,$27,$00
 	db $0c,$27,$00
 
-Subanimation2b: ; 7a8e3 (1e:68e3)
+Subanimation2b:
 	db $4b
 	db $0d,$03,$03
 	db $0e,$03,$03
@@ -1456,7 +1456,7 @@
 	db $11,$1b,$00
 	db $11,$1b,$00
 
-Subanimation2c: ; 7a905 (1e:6905)
+Subanimation2c:
 	db $4c
 	db $12,$01,$00
 	db $12,$0f,$00
@@ -1471,7 +1471,7 @@
 	db $16,$38,$00
 	db $16,$38,$00
 
-Subanimation12: ; 7a92a (1e:692a)
+Subanimation12:
 	db $69
 	db $17,$30,$00
 	db $17,$39,$00
@@ -1483,22 +1483,22 @@
 	db $17,$3f,$00
 	db $17,$1f,$00
 
-Subanimation00: ; 7a946 (1e:6946)
+Subanimation00:
 	db $41
 	db $01,$17,$00
 
-Subanimation01: ; 7a94a (1e:694a)
+Subanimation01:
 	db $42
 	db $01,$0f,$00
 	db $01,$1d,$00
 
-Subanimation02: ; 7a951 (1e:6951)
+Subanimation02:
 	db $43
 	db $01,$12,$00
 	db $01,$15,$00
 	db $01,$1c,$00
 
-Subanimation03: ; 7a95b (1e:695b)
+Subanimation03:
 	db $44
 	db $01,$0b,$00
 	db $01,$11,$00
@@ -1505,13 +1505,13 @@
 	db $01,$18,$00
 	db $01,$1d,$00
 
-Subanimation0c: ; 7a968 (1e:6968)
+Subanimation0c:
 	db $43
 	db $0c,$20,$00
 	db $0c,$21,$00
 	db $0c,$23,$00
 
-Subanimation0d: ; 7a972 (1e:6972)
+Subanimation0d:
 	db $46
 	db $0c,$20,$02
 	db $0c,$15,$00
@@ -1520,7 +1520,7 @@
 	db $0c,$23,$02
 	db $0c,$19,$00
 
-Subanimation0e: ; 7a985 (1e:6985)
+Subanimation0e:
 	db $49
 	db $0c,$20,$02
 	db $0c,$15,$02
@@ -1532,7 +1532,7 @@
 	db $0c,$19,$02
 	db $0c,$0c,$00
 
-Subanimation1f: ; 7a9a1 (1e:69a1)
+Subanimation1f:
 	db $85
 	db $0c,$30,$03
 	db $0c,$40,$03
@@ -1540,7 +1540,7 @@
 	db $0c,$42,$03
 	db $0c,$21,$00
 
-Subanimation2e: ; 7a9b1 (1e:69b1)
+Subanimation2e:
 	db $2e
 	db $18,$43,$02
 	db $75,$52,$04
@@ -1557,7 +1557,7 @@
 	db $1e,$43,$02
 	db $75,$1b,$00
 
-Subanimation2f: ; 7a9dc (1e:69dc)
+Subanimation2f:
 	db $44
 	db $1f,$24,$00
 	db $20,$20,$00
@@ -1564,7 +1564,7 @@
 	db $21,$1a,$00
 	db $22,$15,$00
 
-Subanimation30: ; 7a9e9 (1e:69e9)
+Subanimation30:
 	db $52
 	db $23,$00,$02
 	db $23,$02,$02
@@ -1585,7 +1585,7 @@
 	db $24,$28,$00
 	db $24,$28,$00
 
-Subanimation0f: ; 7aa20 (1e:6a20)
+Subanimation0f:
 	db $4c
 	db $26,$0e,$02
 	db $26,$16,$02
@@ -1600,7 +1600,7 @@
 	db $29,$16,$02
 	db $29,$1c,$00
 
-Subanimation16: ; 7aa45 (1e:6a45)
+Subanimation16:
 	db $4c
 	db $2a,$05,$00
 	db $2b,$05,$02
@@ -1615,7 +1615,7 @@
 	db $2c,$00,$02
 	db $2c,$00,$00
 
-Subanimation10: ; 7aa6a (1e:6a6a)
+Subanimation10:
 	db $88
 	db $2d,$44,$00
 	db $2e,$45,$00
@@ -1626,7 +1626,7 @@
 	db $2d,$2f,$00
 	db $2e,$1a,$00
 
-Subanimation31: ; 7aa83 (1e:6a83)
+Subanimation31:
 	db $2a
 	db $2f,$46,$00
 	db $2f,$4a,$00
@@ -1639,7 +1639,7 @@
 	db $2f,$2e,$00
 	db $2f,$51,$00
 
-Subanimation13: ; 7aaa2 (1e:6aa2)
+Subanimation13:
 	db $86
 	db $30,$31,$00
 	db $30,$32,$00
@@ -1648,7 +1648,7 @@
 	db $30,$0f,$00
 	db $30,$10,$00
 
-Subanimation14: ; 7aab5 (1e:6ab5)
+Subanimation14:
 	db $49
 	db $30,$10,$00
 	db $30,$10,$03
@@ -1660,7 +1660,7 @@
 	db $31,$22,$04
 	db $31,$27,$00
 
-Subanimation41: ; 7aad1 (1e:6ad1)
+Subanimation41:
 	db $85
 	db $03,$31,$00
 	db $03,$32,$00
@@ -1668,18 +1668,18 @@
 	db $03,$0e,$00
 	db $03,$10,$00
 
-Subanimation42: ; 7aae1 (1e:6ae1)
+Subanimation42:
 	db $43
 	db $48,$08,$00
 	db $49,$08,$00
 	db $5a,$08,$00
 
-Subanimation15: ; 7aaeb (1e:6aeb)
+Subanimation15:
 	db $22
 	db $35,$52,$00
 	db $35,$53,$00
 
-Subanimation17: ; 7aaf2 (1e:6af2)
+Subanimation17:
 	db $44
 	db $36,$54,$00
 	db $36,$55,$00
@@ -1686,7 +1686,7 @@
 	db $37,$56,$00
 	db $37,$57,$00
 
-Subanimation18: ; 7aaff (1e:6aff)
+Subanimation18:
 	db $a4
 	db $36,$54,$00
 	db $36,$55,$00
@@ -1693,7 +1693,7 @@
 	db $37,$56,$00
 	db $37,$57,$00
 
-Subanimation40: ; 7ab0c (1e:6b0c)
+Subanimation40:
 	db $46
 	db $17,$54,$00
 	db $17,$55,$00
@@ -1702,7 +1702,7 @@
 	db $17,$57,$00
 	db $17,$13,$00
 
-Subanimation19: ; 7ab1f (1e:6b1f)
+Subanimation19:
 	db $8c
 	db $38,$31,$00
 	db $39,$31,$00
@@ -1717,7 +1717,7 @@
 	db $38,$10,$00
 	db $39,$10,$00
 
-Subanimation1a: ; 7ab44 (1e:6b44)
+Subanimation1a:
 	db $50
 	db $3a,$08,$00
 	db $3b,$08,$00
@@ -1736,7 +1736,7 @@
 	db $3e,$0b,$00
 	db $3f,$0b,$00
 
-Subanimation1b: ; 7ab75 (1e:6b75)
+Subanimation1b:
 	db $84
 	db $40,$31,$00
 	db $40,$32,$00
@@ -1743,13 +1743,13 @@
 	db $40,$92,$00
 	db $40,$15,$00
 
-Subanimation1c: ; 7ab82 (1e:6b82)
+Subanimation1c:
 	db $43
 	db $41,$58,$00
 	db $41,$59,$00
 	db $41,$21,$00
 
-Subanimation1d: ; 7ab8c (1e:6b8c)
+Subanimation1d:
 	db $af
 	db $24,$9a,$00
 	db $23,$1b,$02
@@ -1767,22 +1767,22 @@
 	db $25,$62,$04
 	db $25,$99,$03
 
-Subanimation1e: ; 7abba (1e:6bba)
+Subanimation1e:
 	db $01
 	db $25,$75,$00
 
-Subanimation20: ; 7abbe (1e:6bbe)
+Subanimation20:
 	db $42
 	db $42,$07,$00
 	db $43,$07,$00
 
-Subanimation21: ; 7abc5 (1e:6bc5)
+Subanimation21:
 	db $43
 	db $44,$00,$00
 	db $45,$08,$00
 	db $46,$10,$02
 
-Subanimation22: ; 7abcf (1e:6bcf)
+Subanimation22:
 	db $8b
 	db $47,$10,$00
 	db $47,$56,$00
@@ -1796,7 +1796,7 @@
 	db $47,$89,$00
 	db $47,$b0,$00
 
-Subanimation2d: ; 7abf1 (1e:6bf1)
+Subanimation2d:
 	db $66
 	db $44,$64,$00
 	db $45,$65,$00
@@ -1805,15 +1805,15 @@
 	db $47,$66,$00
 	db $47,$66,$00
 
-Subanimation39: ; 7ac04 (1e:6c04)
+Subanimation39:
 	db $61
 	db $47,$67,$00
 
-Subanimation4e: ; 7ac08 (1e:6c08)
+Subanimation4e:
 	db $41
 	db $71,$0f,$03
 
-Subanimation4f: ; 7ac0c (1e:6c0c)
+Subanimation4f:
 	db $47
 	db $71,$0f,$00
 	db $71,$08,$00
@@ -1823,7 +1823,7 @@
 	db $73,$95,$00
 	db $74,$95,$00
 
-Subanimation50: ; 7ac22 (1e:6c22)
+Subanimation50:
 	db $48
 	db $74,$95,$00
 	db $73,$95,$00
@@ -1834,7 +1834,7 @@
 	db $71,$0f,$00
 	db $71,$16,$00
 
-Subanimation29: ; 7ac3b (1e:6c3b)
+Subanimation29:
 	db $5d
 	db $48,$0f,$00
 	db $4a,$68,$03
@@ -1866,7 +1866,7 @@
 	db $4d,$2a,$03
 	db $49,$6b,$00
 
-Subanimation2a: ; 7ac93 (1e:6c93)
+Subanimation2a:
 	db $44
 	db $4e,$2b,$00
 	db $4f,$2b,$00
@@ -1873,56 +1873,56 @@
 	db $50,$2b,$00
 	db $50,$2b,$00
 
-Subanimation23: ; 7aca0 (1e:6ca0)
+Subanimation23:
 	db $42
 	db $51,$2d,$00
 	db $51,$6e,$00
 
-Subanimation24: ; 7aca7 (1e:6ca7)
+Subanimation24:
 	db $a2
 	db $51,$2d,$00
 	db $51,$6e,$00
 
-Subanimation25: ; 7acae (1e:6cae)
+Subanimation25:
 	db $62
 	db $52,$71,$00
 	db $52,$72,$00
 
-Subanimation26: ; 7acb5 (1e:6cb5)
+Subanimation26:
 	db $02
 	db $52,$01,$00
 	db $52,$2c,$00
 
-Subanimation3a: ; 7acbc (1e:6cbc)
+Subanimation3a:
 	db $63
 	db $53,$71,$00
 	db $53,$7f,$00
 	db $53,$81,$00
 
-Subanimation3b: ; 7acc6 (1e:6cc6)
+Subanimation3b:
 	db $03
 	db $53,$01,$00
 	db $53,$15,$00
 	db $53,$2c,$00
 
-Subanimation27: ; 7acd0 (1e:6cd0)
+Subanimation27:
 	db $a2
 	db $54,$01,$00
 	db $54,$2c,$00
 
-Subanimation28: ; 7acd7 (1e:6cd7)
+Subanimation28:
 	db $23
 	db $55,$73,$03
 	db $56,$73,$03
 	db $57,$73,$00
 
-Subanimation32: ; 7ace1 (1e:6ce1)
+Subanimation32:
 	db $63
 	db $47,$74,$00
 	db $47,$43,$00
 	db $47,$75,$00
 
-Subanimation33: ; 7aceb (1e:6ceb)
+Subanimation33:
 	db $26
 	db $58,$76,$00
 	db $34,$76,$00
@@ -1931,7 +1931,7 @@
 	db $58,$76,$00
 	db $34,$76,$00
 
-Subanimation3c: ; 7acfe (1e:6cfe)
+Subanimation3c:
 	db $67
 	db $59,$79,$03
 	db $59,$7b,$03
@@ -1941,7 +1941,7 @@
 	db $59,$7c,$03
 	db $59,$76,$00
 
-Subanimation3d: ; 7ad14 (1e:6d14)
+Subanimation3d:
 	db $08
 	db $3a,$4d,$00
 	db $3b,$4d,$00
@@ -1952,7 +1952,7 @@
 	db $3e,$4d,$00
 	db $3f,$4d,$00
 
-Subanimation34: ; 7ad2d (1e:6d2d)
+Subanimation34:
 	db $35
 	db $48,$7d,$00
 	db $49,$7d,$00
@@ -1976,7 +1976,7 @@
 	db $49,$82,$00
 	db $5a,$82,$00
 
-Subanimation35: ; 7ad6d (1e:6d6d)
+Subanimation35:
 	db $24
 	db $5b,$83,$03
 	db $5c,$84,$03
@@ -1983,7 +1983,7 @@
 	db $5d,$85,$03
 	db $5e,$09,$00
 
-Subanimation36: ; 7ad7a (1e:6d7a)
+Subanimation36:
 	db $48
 	db $5f,$2a,$00
 	db $5f,$00,$00
@@ -1994,7 +1994,7 @@
 	db $62,$2a,$00
 	db $62,$00,$00
 
-Subanimation37: ; 7ad93 (1e:6d93)
+Subanimation37:
 	db $2a
 	db $63,$89,$00
 	db $64,$75,$00
@@ -2007,7 +2007,7 @@
 	db $65,$88,$00
 	db $65,$1a,$00
 
-Subanimation38: ; 7adb2 (1e:6db2)
+Subanimation38:
 	db $50
 	db $66,$8a,$00
 	db $66,$33,$00
@@ -2026,7 +2026,7 @@
 	db $66,$1e,$04
 	db $67,$29,$00
 
-Subanimation3e: ; 7ade3 (1e:6de3)
+Subanimation3e:
 	db $92
 	db $02,$31,$00
 	db $34,$31,$00
@@ -2047,7 +2047,7 @@
 	db $34,$10,$00
 	db $02,$10,$00
 
-Subanimation3f: ; 7ae1a (1e:6e1a)
+Subanimation3f:
 	db $72
 	db $68,$4b,$00
 	db $68,$8c,$00
@@ -2068,7 +2068,7 @@
 	db $68,$23,$00
 	db $68,$1f,$00
 
-Subanimation44: ; 7ae51 (1e:6e51)
+Subanimation44:
 	db $2c
 	db $69,$4b,$00
 	db $69,$8c,$00
@@ -2083,13 +2083,13 @@
 	db $69,$0c,$00
 	db $69,$06,$00
 
-Subanimation43: ; 7ae76 (1e:6e76)
+Subanimation43:
 	db $a3
 	db $6a,$07,$00
 	db $6b,$0f,$00
 	db $6c,$17,$00
 
-Subanimation45: ; 7ae80 (1e:6e80)
+Subanimation45:
 	db $24
 	db $6d,$8b,$00
 	db $6d,$84,$00
@@ -2096,7 +2096,7 @@
 	db $6d,$63,$00
 	db $6d,$8c,$00
 
-Subanimation46: ; 7ae8d (1e:6e8d)
+Subanimation46:
 	db $26
 	db $6d,$8b,$00
 	db $6d,$84,$00
@@ -2105,13 +2105,13 @@
 	db $6d,$0a,$00
 	db $6d,$89,$00
 
-Subanimation47: ; 7aea0 (1e:6ea0)
+Subanimation47:
 	db $23
 	db $06,$82,$00
 	db $07,$82,$00
 	db $08,$96,$00
 
-Subanimation48: ; 7aeaa (1e:6eaa)
+Subanimation48:
 	db $06
 	db $03,$41,$04
 	db $03,$48,$04
@@ -2120,7 +2120,7 @@
 	db $05,$48,$04
 	db $03,$48,$03
 
-Subanimation49: ; 7aebd (1e:6ebd)
+Subanimation49:
 	db $04
 	db $04,$48,$04
 	db $03,$48,$04
@@ -2127,17 +2127,17 @@
 	db $05,$48,$04
 	db $03,$48,$03
 
-Subanimation4a: ; 7aeca (1e:6eca)
+Subanimation4a:
 	db $01
 	db $04,$84,$03
 
-Subanimation4b: ; 7aece (1e:6ece)
+Subanimation4b:
 	db $03
 	db $06,$72,$00
 	db $07,$72,$00
 	db $08,$72,$00
 
-Subanimation4c: ; 7aed8 (1e:6ed8)
+Subanimation4c:
 	db $68
 	db $6f,$30,$00
 	db $6e,$30,$00
@@ -2148,7 +2148,7 @@
 	db $70,$30,$00
 	db $6e,$30,$00
 
-Subanimation4d: ; 7aef1 (1e:6ef1)
+Subanimation4d:
 	db $26
 	db $32,$4b,$00
 	db $33,$4f,$00
@@ -2157,7 +2157,7 @@
 	db $32,$19,$00
 	db $33,$0d,$00
 
-Subanimation51: ; 7af04 (1e:6f04)
+Subanimation51:
 	db $a6
 	db $76,$1b,$00
 	db $34,$1b,$00
@@ -2166,7 +2166,7 @@
 	db $76,$1b,$00
 	db $34,$1b,$00
 
-Subanimation52: ; 7af17 (1e:6f17)
+Subanimation52:
 	db $47
 	db $77,$25,$00
 	db $77,$9b,$00
@@ -2176,7 +2176,7 @@
 	db $77,$50,$00
 	db $77,$8c,$00
 
-Subanimation53: ; 7af2d (1e:6f2d)
+Subanimation53:
 	db $0c
 	db $78,$30,$00
 	db $78,$a2,$00
@@ -2191,7 +2191,7 @@
 	db $78,$34,$00
 	db $01,$9e,$00
 
-Subanimation54: ; 7af52 (1e:6f52)
+Subanimation54:
 	db $0b
 	db $79,$30,$00
 	db $79,$a2,$00
@@ -2205,7 +2205,7 @@
 	db $79,$a9,$00
 	db $79,$34,$00
 
-FrameBlockPointers: ; 7af74 (1e:6f74)
+FrameBlockPointers:
 	dw FrameBlock00
 	dw FrameBlock01
 	dw FrameBlock02
@@ -2337,7 +2337,7 @@
 ; second byte = x offset
 ; third byte = tile id (it's actually tile id - $31)
 ; fourth byte = tile properties (xflip/yflip/etc.)
-FrameBlock01: ; 7b068 (1e:7068)
+FrameBlock01:
 	db $09
 	db $00,$00,$2c,$00
 	db $00,$08,$2d,$00
@@ -2349,7 +2349,7 @@
 	db $10,$08,$2d,$40
 	db $10,$10,$2c,$60
 
-FrameBlock02: ; 7b08d (1e:708d)
+FrameBlock02:
 	db $10
 	db $00,$00,$20,$00
 	db $00,$08,$21,$00
@@ -2368,7 +2368,7 @@
 	db $18,$10,$21,$60
 	db $18,$18,$20,$60
 
-FrameBlock03: ; 7b0ce (1e:70ce)
+FrameBlock03:
 	db $04
 	db $00,$00,$02,$00
 	db $00,$08,$02,$20
@@ -2375,7 +2375,7 @@
 	db $08,$00,$12,$00
 	db $08,$08,$12,$20
 
-FrameBlock04: ; 7b0df (1e:70df)
+FrameBlock04:
 	db $04
 	db $00,$00,$06,$00
 	db $00,$08,$07,$00
@@ -2382,7 +2382,7 @@
 	db $08,$00,$16,$00
 	db $08,$08,$17,$00
 
-FrameBlock05: ; 7b0f0 (1e:70f0)
+FrameBlock05:
 	db $04
 	db $00,$00,$07,$20
 	db $00,$08,$06,$20
@@ -2389,7 +2389,7 @@
 	db $08,$00,$17,$20
 	db $08,$08,$16,$20
 
-FrameBlock06: ; 7b101 (1e:7101)
+FrameBlock06:
 	db $0c
 	db $00,$08,$23,$00
 	db $08,$00,$32,$00
@@ -2404,7 +2404,7 @@
 	db $10,$18,$32,$60
 	db $18,$10,$23,$60
 
-FrameBlock07: ; 7b132 (1e:7132)
+FrameBlock07:
 	db $10
 	db $00,$00,$20,$00
 	db $00,$08,$21,$00
@@ -2423,7 +2423,7 @@
 	db $18,$10,$21,$60
 	db $18,$18,$20,$60
 
-FrameBlock08: ; 7b173 (1e:7173)
+FrameBlock08:
 	db $10
 	db $00,$00,$20,$00
 	db $00,$08,$21,$00
@@ -2442,7 +2442,7 @@
 	db $20,$18,$21,$60
 	db $20,$20,$20,$60
 
-FrameBlock09: ; 7b1b4 (1e:71b4)
+FrameBlock09:
 	db $0c
 	db $00,$00,$24,$00
 	db $00,$08,$25,$00
@@ -2457,7 +2457,7 @@
 	db $20,$18,$25,$60
 	db $20,$20,$24,$60
 
-FrameBlock0a: ; 7b1e5 (1e:71e5)
+FrameBlock0a:
 	db $0c
 	db $00,$00,$24,$00
 	db $00,$08,$25,$00
@@ -2472,7 +2472,7 @@
 	db $28,$20,$25,$60
 	db $28,$28,$24,$60
 
-FrameBlock0b: ; 7b216 (1e:7216)
+FrameBlock0b:
 	db $04
 	db $00,$00,$05,$00
 	db $00,$08,$05,$20
@@ -2479,7 +2479,7 @@
 	db $08,$00,$15,$00
 	db $08,$08,$15,$20
 
-FrameBlock0c: ; 7b227 (1e:7227)
+FrameBlock0c:
 	db $04
 	db $00,$00,$04,$00
 	db $00,$08,$04,$20
@@ -2486,7 +2486,7 @@
 	db $08,$00,$14,$00
 	db $08,$08,$14,$20
 
-FrameBlock0d: ; 7b238 (1e:7238)
+FrameBlock0d:
 	db $08
 	db $00,$00,$0c,$00
 	db $00,$08,$0d,$00
@@ -2497,7 +2497,7 @@
 	db $18,$00,$0d,$60
 	db $18,$08,$0c,$60
 
-FrameBlock0e: ; 7b259 (1e:7259)
+FrameBlock0e:
 	db $04
 	db $20,$00,$0c,$00
 	db $20,$08,$0d,$00
@@ -2504,7 +2504,7 @@
 	db $28,$00,$1c,$00
 	db $28,$08,$1d,$00
 
-FrameBlock0f: ; 7b26a (1e:726a)
+FrameBlock0f:
 	db $04
 	db $30,$00,$1d,$60
 	db $30,$08,$1c,$60
@@ -2511,7 +2511,7 @@
 	db $38,$00,$0d,$60
 	db $38,$08,$0c,$60
 
-FrameBlock10: ; 7b27b (1e:727b)
+FrameBlock10:
 	db $08
 	db $00,$00,$0e,$00
 	db $00,$08,$0f,$00
@@ -2522,7 +2522,7 @@
 	db $08,$10,$1f,$20
 	db $08,$18,$1e,$20
 
-FrameBlock11: ; 7b29c (1e:729c)
+FrameBlock11:
 	db $08
 	db $00,$00,$0e,$00
 	db $00,$08,$0f,$00
@@ -2533,13 +2533,13 @@
 	db $08,$20,$1f,$20
 	db $08,$28,$1e,$20
 
-FrameBlock12: ; 7b2bd (1e:72bd)
+FrameBlock12:
 	db $03
 	db $00,$00,$37,$00
 	db $08,$10,$37,$00
 	db $00,$20,$37,$00
 
-FrameBlock13: ; 7b2ca (1e:72ca)
+FrameBlock13:
 	db $04
 	db $00,$00,$36,$00
 	db $00,$08,$36,$20
@@ -2546,7 +2546,7 @@
 	db $08,$00,$36,$40
 	db $08,$08,$36,$60
 
-FrameBlock14: ; 7b2db (1e:72db)
+FrameBlock14:
 	db $08
 	db $00,$10,$28,$00
 	db $00,$18,$28,$20
@@ -2557,7 +2557,7 @@
 	db $08,$20,$36,$40
 	db $08,$28,$36,$60
 
-FrameBlock15: ; 7b2fc (1e:72fc)
+FrameBlock15:
 	db $0c
 	db $00,$00,$28,$00
 	db $00,$08,$28,$20
@@ -2572,7 +2572,7 @@
 	db $08,$20,$38,$00
 	db $08,$28,$38,$20
 
-FrameBlock16: ; 7b32d (1e:732d)
+FrameBlock16:
 	db $08
 	db $00,$00,$29,$00
 	db $00,$08,$29,$20
@@ -2583,7 +2583,7 @@
 	db $08,$20,$39,$00
 	db $08,$28,$39,$20
 
-FrameBlock17: ; 7b34e (1e:734e)
+FrameBlock17:
 	db $04
 	db $00,$00,$08,$00
 	db $00,$08,$09,$00
@@ -2590,41 +2590,41 @@
 	db $08,$00,$18,$00
 	db $08,$08,$19,$00
 
-FrameBlock18: ; 7b35f (1e:735f)
+FrameBlock18:
 	db $01
 	db $18,$00,$45,$60
 
-FrameBlock19: ; 7b364 (1e:7364)
+FrameBlock19:
 	db $02
 	db $18,$08,$45,$00
 	db $10,$08,$46,$60
 
-FrameBlock1a: ; 7b36d (1e:736d)
+FrameBlock1a:
 	db $02
 	db $10,$10,$45,$60
 	db $18,$10,$46,$00
 
-FrameBlock1b: ; 7b376 (1e:7376)
+FrameBlock1b:
 	db $02
 	db $10,$18,$45,$00
 	db $08,$18,$46,$60
 
-FrameBlock1c: ; 7b37f (1e:737f)
+FrameBlock1c:
 	db $02
 	db $08,$20,$45,$60
 	db $10,$20,$46,$00
 
-FrameBlock1d: ; 7b388 (1e:7388)
+FrameBlock1d:
 	db $02
 	db $08,$28,$45,$00
 	db $00,$28,$46,$60
 
-FrameBlock1e: ; 7b391 (1e:7391)
+FrameBlock1e:
 	db $02
 	db $00,$30,$45,$60
 	db $08,$30,$46,$00
 
-FrameBlock75: ; 7b39a (1e:739a)
+FrameBlock75:
 	db $04
 	db $00,$00,$43,$00
 	db $00,$08,$43,$20
@@ -2631,12 +2631,12 @@
 	db $08,$00,$22,$00
 	db $08,$08,$43,$60
 
-FrameBlock1f: ; 7b3ab (1e:73ab)
+FrameBlock1f:
 	db $02
 	db $00,$00,$03,$00
 	db $00,$30,$03,$20
 
-FrameBlock20: ; 7b3b4 (1e:73b4)
+FrameBlock20:
 	db $06
 	db $00,$00,$03,$00
 	db $00,$30,$03,$20
@@ -2645,7 +2645,7 @@
 	db $08,$00,$13,$00
 	db $08,$30,$13,$20
 
-FrameBlock21: ; 7b3cd (1e:73cd)
+FrameBlock21:
 	db $0c
 	db $00,$00,$03,$00
 	db $00,$30,$03,$20
@@ -2660,7 +2660,7 @@
 	db $10,$00,$03,$00
 	db $10,$30,$03,$20
 
-FrameBlock22: ; 7b3fe (1e:73fe)
+FrameBlock22:
 	db $13
 	db $00,$00,$03,$00
 	db $08,$00,$13,$00
@@ -2682,7 +2682,7 @@
 	db $10,$30,$03,$20
 	db $18,$30,$13,$20
 
-FrameBlock23: ; 7b44b (1e:744b)
+FrameBlock23:
 	db $04
 	db $00,$00,$0a,$00
 	db $00,$08,$0b,$00
@@ -2689,12 +2689,12 @@
 	db $08,$00,$1a,$00
 	db $08,$08,$1b,$00
 
-FrameBlock24: ; 7b45c (1e:745c)
+FrameBlock24:
 	db $02
 	db $08,$00,$0a,$00
 	db $08,$08,$0b,$00
 
-FrameBlock25: ; 7b465 (1e:7465)
+FrameBlock25:
 	db $0c
 	db $10,$00,$0a,$00
 	db $10,$08,$0b,$00
@@ -2709,7 +2709,7 @@
 	db $10,$20,$1a,$00
 	db $10,$28,$1b,$00
 
-FrameBlock26: ; 7b496 (1e:7496)
+FrameBlock26:
 	db $04
 	db $00,$10,$44,$00
 	db $00,$18,$44,$20
@@ -2716,7 +2716,7 @@
 	db $08,$10,$44,$40
 	db $08,$18,$44,$60
 
-FrameBlock27: ; 7b4a7 (1e:74a7)
+FrameBlock27:
 	db $05
 	db $08,$08,$44,$00
 	db $08,$10,$44,$20
@@ -2724,7 +2724,7 @@
 	db $10,$10,$44,$60
 	db $00,$18,$47,$00
 
-FrameBlock28: ; 7b4bc (1e:74bc)
+FrameBlock28:
 	db $06
 	db $10,$00,$44,$00
 	db $10,$08,$44,$20
@@ -2733,7 +2733,7 @@
 	db $08,$10,$47,$00
 	db $02,$16,$47,$00
 
-FrameBlock29: ; 7b4d5 (1e:74d5)
+FrameBlock29:
 	db $04
 	db $18,$00,$47,$00
 	db $12,$06,$47,$00
@@ -2740,7 +2740,7 @@
 	db $0c,$0c,$47,$00
 	db $06,$12,$47,$00
 
-FrameBlock2a: ; 7b4e6 (1e:74e6)
+FrameBlock2a:
 	db $04
 	db $00,$00,$44,$00
 	db $00,$08,$44,$20
@@ -2747,16 +2747,16 @@
 	db $08,$00,$44,$40
 	db $08,$08,$44,$60
 
-FrameBlock2b: ; 7b4f7 (1e:74f7)
+FrameBlock2b:
 	db $02
 	db $06,$02,$47,$00
 	db $00,$08,$47,$00
 
-FrameBlock2c: ; 7b500 (1e:7500)
+FrameBlock2c:
 	db $01
 	db $a0,$00,$4d,$00
 
-FrameBlock2d: ; 7b505 (1e:7505)
+FrameBlock2d:
 	db $08
 	db $00,$00,$26,$00
 	db $00,$08,$27,$00
@@ -2767,7 +2767,7 @@
 	db $18,$00,$38,$00
 	db $18,$08,$39,$00
 
-FrameBlock2e: ; 7b526 (1e:7526)
+FrameBlock2e:
 	db $08
 	db $00,$00,$27,$20
 	db $00,$08,$26,$20
@@ -2778,7 +2778,7 @@
 	db $18,$00,$39,$20
 	db $18,$08,$38,$20
 
-FrameBlock2f: ; 7b547 (1e:7547)
+FrameBlock2f:
 	db $04
 	db $00,$00,$0c,$00
 	db $00,$08,$0d,$00
@@ -2785,7 +2785,7 @@
 	db $08,$00,$0c,$40
 	db $08,$08,$0d,$40
 
-FrameBlock30: ; 7b558 (1e:7558)
+FrameBlock30:
 	db $04
 	db $00,$00,$44,$00
 	db $00,$08,$44,$20
@@ -2792,11 +2792,11 @@
 	db $08,$00,$44,$40
 	db $08,$08,$44,$60
 
-FrameBlock31: ; 7b569 (1e:7569)
+FrameBlock31:
 	db $01
 	db $00,$00,$45,$00
 
-FrameBlock32: ; 7b56e (1e:756e)
+FrameBlock32:
 	db $07
 	db $00,$00,$4d,$00
 	db $00,$08,$2f,$00
@@ -2806,7 +2806,7 @@
 	db $08,$10,$4e,$20
 	db $10,$08,$3f,$00
 
-FrameBlock33: ; 7b58b (1e:758b)
+FrameBlock33:
 	db $07
 	db $00,$08,$3f,$40
 	db $08,$00,$4e,$40
@@ -2816,11 +2816,11 @@
 	db $10,$08,$2f,$40
 	db $10,$10,$4d,$60
 
-FrameBlock34: ; 7b5a8 (1e:75a8)
+FrameBlock34:
 	db $01
 	db $a0,$00,$00,$10
 
-FrameBlock35: ; 7b5ad (1e:75ad)
+FrameBlock35:
 	db $06
 	db $00,$00,$2a,$00
 	db $00,$08,$2b,$00
@@ -2829,7 +2829,7 @@
 	db $18,$00,$2a,$40
 	db $18,$08,$2b,$40
 
-FrameBlock36: ; 7b5c6 (1e:75c6)
+FrameBlock36:
 	db $04
 	db $00,$00,$00,$00
 	db $00,$08,$01,$00
@@ -2836,7 +2836,7 @@
 	db $08,$00,$10,$00
 	db $08,$08,$11,$00
 
-FrameBlock37: ; 7b5d7 (1e:75d7)
+FrameBlock37:
 	db $04
 	db $00,$00,$01,$a0
 	db $00,$08,$00,$a0
@@ -2843,7 +2843,7 @@
 	db $08,$00,$11,$a0
 	db $08,$08,$10,$a0
 
-FrameBlock38: ; 7b5e8 (1e:75e8)
+FrameBlock38:
 	db $04
 	db $00,$00,$0a,$00
 	db $00,$08,$0b,$00
@@ -2850,7 +2850,7 @@
 	db $08,$00,$1a,$00
 	db $08,$08,$1b,$00
 
-FrameBlock39: ; 7b5f9 (1e:75f9)
+FrameBlock39:
 	db $04
 	db $00,$00,$0b,$20
 	db $00,$08,$0a,$20
@@ -2857,7 +2857,7 @@
 	db $08,$00,$1b,$20
 	db $08,$08,$1a,$20
 
-FrameBlock3a: ; 7b60a (1e:760a)
+FrameBlock3a:
 	db $04
 	db $20,$00,$05,$00
 	db $20,$08,$05,$20
@@ -2864,7 +2864,7 @@
 	db $28,$00,$15,$00
 	db $28,$08,$15,$20
 
-FrameBlock3b: ; 7b61b (1e:761b)
+FrameBlock3b:
 	db $05
 	db $18,$00,$04,$00
 	db $18,$08,$04,$20
@@ -2872,7 +2872,7 @@
 	db $20,$08,$14,$20
 	db $28,$04,$41,$00
 
-FrameBlock3c: ; 7b630 (1e:7630)
+FrameBlock3c:
 	db $06
 	db $10,$00,$05,$00
 	db $10,$08,$05,$20
@@ -2881,7 +2881,7 @@
 	db $20,$04,$42,$00
 	db $28,$04,$42,$00
 
-FrameBlock3d: ; 7b649 (1e:7649)
+FrameBlock3d:
 	db $07
 	db $08,$00,$04,$00
 	db $08,$08,$04,$20
@@ -2891,7 +2891,7 @@
 	db $20,$04,$41,$00
 	db $28,$04,$41,$00
 
-FrameBlock3e: ; 7b666 (1e:7666)
+FrameBlock3e:
 	db $08
 	db $00,$00,$05,$00
 	db $00,$08,$05,$20
@@ -2902,7 +2902,7 @@
 	db $20,$04,$42,$00
 	db $28,$04,$42,$00
 
-FrameBlock3f: ; 7b687 (1e:7687)
+FrameBlock3f:
 	db $08
 	db $00,$00,$04,$00
 	db $00,$08,$04,$20
@@ -2913,13 +2913,13 @@
 	db $20,$04,$41,$00
 	db $28,$04,$41,$00
 
-FrameBlock40: ; 7b6a8 (1e:76a8)
+FrameBlock40:
 	db $03
 	db $00,$00,$3d,$00
 	db $00,$08,$3d,$00
 	db $08,$08,$3d,$00
 
-FrameBlock41: ; 7b6b5 (1e:76b5)
+FrameBlock41:
 	db $04
 	db $00,$00,$06,$00
 	db $00,$08,$06,$20
@@ -2926,7 +2926,7 @@
 	db $08,$00,$16,$00
 	db $08,$08,$17,$00
 
-FrameBlock42: ; 7b6c6 (1e:76c6)
+FrameBlock42:
 	db $0b
 	db $00,$10,$42,$00
 	db $08,$00,$42,$00
@@ -2940,7 +2940,7 @@
 	db $20,$00,$42,$00
 	db $20,$20,$42,$00
 
-FrameBlock43: ; 7b6f3 (1e:76f3)
+FrameBlock43:
 	db $0b
 	db $00,$10,$41,$00
 	db $08,$00,$41,$00
@@ -2954,7 +2954,7 @@
 	db $20,$00,$41,$00
 	db $20,$20,$41,$00
 
-FrameBlock44: ; 7b720 (1e:7720)
+FrameBlock44:
 	db $04
 	db $00,$00,$49,$00
 	db $00,$28,$49,$00
@@ -2961,7 +2961,7 @@
 	db $28,$00,$49,$00
 	db $28,$28,$49,$00
 
-FrameBlock45: ; 7b731 (1e:7731)
+FrameBlock45:
 	db $04
 	db $00,$00,$49,$00
 	db $00,$18,$49,$00
@@ -2968,7 +2968,7 @@
 	db $18,$00,$49,$00
 	db $18,$18,$49,$00
 
-FrameBlock46: ; 7b742 (1e:7742)
+FrameBlock46:
 	db $04
 	db $00,$00,$49,$00
 	db $00,$08,$49,$00
@@ -2975,7 +2975,7 @@
 	db $08,$00,$49,$00
 	db $08,$08,$49,$00
 
-FrameBlock47: ; 7b753 (1e:7753)
+FrameBlock47:
 	db $04
 	db $00,$00,$43,$00
 	db $00,$08,$43,$20
@@ -2982,7 +2982,7 @@
 	db $08,$00,$43,$40
 	db $08,$08,$43,$60
 
-SmallBlackCircleFrameBlock: ; 7b764 (1e:7764)
+SmallBlackCircleFrameBlock:
 	db $04
 	db $08,$08,$33,$00
 	db $08,$10,$33,$20
@@ -2989,7 +2989,7 @@
 	db $10,$08,$33,$40
 	db $10,$10,$33,$60
 
-LargeBlockCircleFrameBlock: ; 7b775 (1e:7775)
+LargeBlockCircleFrameBlock:
 	db $10
 	db $00,$00,$22,$00
 	db $00,$08,$23,$00
@@ -3008,7 +3008,7 @@
 	db $18,$10,$23,$60
 	db $18,$18,$22,$60
 
-FrameBlock71: ; 7b7b6 (1e:77b6)
+FrameBlock71:
 	db $10
 	db $00,$00,$22,$00
 	db $00,$08,$3b,$00
@@ -3027,7 +3027,7 @@
 	db $18,$10,$23,$60
 	db $18,$18,$22,$60
 
-FrameBlock72: ; 7b7f7 (1e:77f7)
+FrameBlock72:
 	db $0c
 	db $00,$00,$32,$00
 	db $00,$08,$43,$00
@@ -3042,7 +3042,7 @@
 	db $10,$10,$23,$60
 	db $10,$18,$22,$60
 
-FrameBlock73: ; 7b828 (1e:7828)
+FrameBlock73:
 	db $08
 	db $00,$00,$32,$40
 	db $00,$08,$43,$40
@@ -3053,7 +3053,7 @@
 	db $08,$10,$23,$60
 	db $08,$18,$22,$60
 
-FrameBlock74: ; 7b849 (1e:7849)
+FrameBlock74:
 	db $04
 	db $00,$00,$22,$40
 	db $00,$08,$23,$40
@@ -3060,7 +3060,7 @@
 	db $00,$10,$23,$60
 	db $00,$18,$22,$60
 
-FrameBlock4a: ; 7b85a (1e:785a)
+FrameBlock4a:
 	db $04
 	db $08,$18,$4c,$20
 	db $20,$08,$4b,$00
@@ -3067,7 +3067,7 @@
 	db $30,$20,$4c,$00
 	db $18,$30,$4b,$40
 
-FrameBlock4b: ; 7b86b (1e:786b)
+FrameBlock4b:
 	db $04
 	db $00,$18,$4c,$00
 	db $20,$00,$4b,$40
@@ -3074,7 +3074,7 @@
 	db $38,$20,$4c,$20
 	db $18,$38,$4b,$00
 
-FrameBlock4c: ; 7b87c (1e:787c)
+FrameBlock4c:
 	db $04
 	db $10,$08,$4a,$40
 	db $30,$10,$4a,$00
@@ -3081,7 +3081,7 @@
 	db $28,$30,$4a,$20
 	db $08,$28,$4a,$60
 
-FrameBlock4d: ; 7b88d (1e:788d)
+FrameBlock4d:
 	db $04
 	db $08,$00,$4a,$20
 	db $38,$08,$4a,$60
@@ -3088,7 +3088,7 @@
 	db $30,$38,$4a,$40
 	db $00,$30,$4a,$00
 
-FrameBlock4e: ; 7b89e (1e:789e)
+FrameBlock4e:
 	db $08
 	db $00,$30,$44,$00
 	db $00,$38,$44,$20
@@ -3099,7 +3099,7 @@
 	db $2e,$0a,$44,$40
 	db $2e,$12,$44,$60
 
-FrameBlock4f: ; 7b8bf (1e:78bf)
+FrameBlock4f:
 	db $0c
 	db $0e,$22,$44,$00
 	db $0e,$2a,$44,$20
@@ -3114,7 +3114,7 @@
 	db $30,$08,$47,$00
 	db $2a,$0e,$47,$00
 
-FrameBlock50: ; 7b8f0 (1e:78f0)
+FrameBlock50:
 	db $08
 	db $06,$32,$47,$00
 	db $00,$38,$47,$00
@@ -3125,7 +3125,7 @@
 	db $2a,$0e,$47,$00
 	db $24,$14,$47,$00
 
-FrameBlock51: ; 7b911 (1e:7911)
+FrameBlock51:
 	db $08
 	db $00,$00,$35,$20
 	db $08,$00,$35,$40
@@ -3136,7 +3136,7 @@
 	db $10,$40,$35,$20
 	db $18,$40,$35,$40
 
-FrameBlock52: ; 7b932 (1e:7932)
+FrameBlock52:
 	db $04
 	db $00,$00,$2a,$00
 	db $00,$08,$2b,$00
@@ -3143,13 +3143,13 @@
 	db $08,$00,$3a,$00
 	db $08,$08,$3b,$00
 
-FrameBlock53: ; 7b943 (1e:7943)
+FrameBlock53:
 	db $03
 	db $00,$00,$3f,$00
 	db $00,$08,$3f,$00
 	db $08,$06,$3f,$00
 
-FrameBlock54: ; 7b950 (1e:7950)
+FrameBlock54:
 	db $04
 	db $00,$00,$0e,$00
 	db $00,$08,$0e,$20
@@ -3156,13 +3156,13 @@
 	db $08,$00,$0f,$00
 	db $08,$08,$0f,$20
 
-FrameBlock55: ; 7b961 (1e:7961)
+FrameBlock55:
 	db $03
 	db $10,$00,$2c,$00
 	db $10,$08,$3c,$00
 	db $10,$10,$2d,$00
 
-FrameBlock56: ; 7b96e (1e:796e)
+FrameBlock56:
 	db $06
 	db $10,$10,$31,$00
 	db $10,$18,$31,$00
@@ -3171,7 +3171,7 @@
 	db $08,$20,$2d,$00
 	db $10,$20,$2d,$00
 
-FrameBlock57: ; 7b987 (1e:7987)
+FrameBlock57:
 	db $09
 	db $08,$20,$31,$00
 	db $10,$20,$31,$00
@@ -3183,7 +3183,7 @@
 	db $08,$30,$2d,$00
 	db $10,$30,$2d,$00
 
-FrameBlock58: ; 7b9ac (1e:79ac)
+FrameBlock58:
 	db $07
 	db $00,$00,$46,$00
 	db $08,$02,$47,$00
@@ -3193,11 +3193,11 @@
 	db $28,$05,$48,$00
 	db $30,$05,$48,$00
 
-FrameBlock59: ; 7b9c9 (1e:79c9)
+FrameBlock59:
 	db $01
 	db $00,$00,$42,$00
 
-FrameBlock5a: ; 7b9ce (1e:79ce)
+FrameBlock5a:
 	db $0c
 	db $00,$00,$24,$00
 	db $00,$08,$25,$00
@@ -3212,7 +3212,7 @@
 	db $18,$10,$25,$60
 	db $18,$18,$24,$60
 
-FrameBlock5b: ; 7b9ff (1e:79ff)
+FrameBlock5b:
 	db $04
 	db $00,$00,$43,$00
 	db $00,$08,$43,$20
@@ -3219,7 +3219,7 @@
 	db $08,$00,$43,$40
 	db $08,$08,$43,$60
 
-FrameBlock5c: ; 7ba10 (1e:7a10)
+FrameBlock5c:
 	db $08
 	db $00,$00,$49,$00
 	db $02,$08,$49,$00
@@ -3230,7 +3230,7 @@
 	db $10,$00,$43,$40
 	db $10,$08,$43,$60
 
-FrameBlock5d: ; 7ba31 (1e:7a31)
+FrameBlock5d:
 	db $0b
 	db $00,$00,$49,$00
 	db $18,$02,$49,$00
@@ -3244,7 +3244,7 @@
 	db $0c,$08,$43,$40
 	db $0c,$10,$43,$60
 
-FrameBlock5e: ; 7ba5e (1e:7a5e)
+FrameBlock5e:
 	db $0f
 	db $00,$08,$49,$00
 	db $08,$10,$49,$00
@@ -3262,7 +3262,7 @@
 	db $28,$08,$43,$40
 	db $28,$10,$43,$60
 
-FrameBlock5f: ; 7ba9b (1e:7a9b)
+FrameBlock5f:
 	db $04
 	db $00,$00,$49,$00
 	db $00,$10,$49,$00
@@ -3269,7 +3269,7 @@
 	db $00,$20,$49,$00
 	db $00,$30,$49,$00
 
-FrameBlock60: ; 7baac (1e:7aac)
+FrameBlock60:
 	db $08
 	db $00,$00,$49,$00
 	db $00,$10,$49,$00
@@ -3280,7 +3280,7 @@
 	db $08,$28,$49,$00
 	db $08,$38,$49,$00
 
-FrameBlock61: ; 7bacd (1e:7acd)
+FrameBlock61:
 	db $0c
 	db $00,$00,$49,$00
 	db $00,$10,$49,$00
@@ -3295,7 +3295,7 @@
 	db $10,$20,$49,$00
 	db $10,$30,$49,$00
 
-FrameBlock62: ; 7bafe (1e:7afe)
+FrameBlock62:
 	db $0f
 	db $00,$00,$49,$00
 	db $00,$10,$49,$00
@@ -3314,7 +3314,7 @@
 	db $18,$28,$49,$00
 	db $18,$38,$49,$00 ; unused
 
-FrameBlock63: ; 7bb3f (1e:7b3f)
+FrameBlock63:
 	db $06
 	db $10,$00,$26,$00
 	db $10,$08,$27,$00
@@ -3323,7 +3323,7 @@
 	db $00,$20,$26,$00
 	db $00,$28,$27,$00
 
-FrameBlock64: ; 7bb58 (1e:7b58)
+FrameBlock64:
 	db $06
 	db $18,$00,$27,$00
 	db $10,$08,$26,$00
@@ -3332,7 +3332,7 @@
 	db $08,$20,$27,$00
 	db $00,$28,$26,$00
 
-FrameBlock65: ; 7bb71 (1e:7b71)
+FrameBlock65:
 	db $06
 	db $00,$00,$1c,$00
 	db $00,$08,$1d,$00
@@ -3341,16 +3341,16 @@
 	db $20,$00,$1c,$00
 	db $20,$08,$1d,$00
 
-FrameBlock66: ; 7bb8a (1e:7b8a)
+FrameBlock66:
 	db $02
 	db $00,$00,$03,$00
 	db $08,$00,$13,$00
 
-FrameBlock67: ; 7bb93 (1e:7b93)
+FrameBlock67:
 	db $01
 	db $00,$00,$03,$00
 
-FrameBlock68: ; 7bb98 (1e:7b98)
+FrameBlock68:
 	db $04
 	db $00,$00,$03,$00
 	db $00,$08,$03,$20
@@ -3357,11 +3357,11 @@
 	db $08,$00,$13,$00
 	db $08,$08,$13,$20
 
-FrameBlock69: ; 7bba9 (1e:7ba9)
+FrameBlock69:
 	db $01
 	db $00,$00,$06,$00
 
-FrameBlock6a: ; 7bbae (1e:7bae)
+FrameBlock6a:
 	db $08
 	db $00,$00,$2e,$00
 	db $00,$30,$2e,$20
@@ -3372,7 +3372,7 @@
 	db $18,$00,$3e,$00
 	db $18,$30,$3e,$20
 
-FrameBlock6b: ; 7bbcf (1e:7bcf)
+FrameBlock6b:
 	db $08
 	db $00,$00,$2e,$00
 	db $00,$20,$2e,$20
@@ -3383,7 +3383,7 @@
 	db $10,$00,$3e,$00
 	db $10,$20,$3e,$20
 
-FrameBlock6c: ; 7bbf0 (1e:7bf0)
+FrameBlock6c:
 	db $08
 	db $00,$00,$2e,$00
 	db $00,$10,$2e,$20
@@ -3394,12 +3394,12 @@
 	db $08,$00,$3e,$00
 	db $08,$10,$3e,$20
 
-FrameBlock6d: ; 7bc11 (1e:7c11)
+FrameBlock6d:
 	db $02
 	db $00,$00,$1e,$00
 	db $00,$08,$1f,$00
 
-FrameBlock6e: ; 7bc1a (1e:7c1a)
+FrameBlock6e:
 	db $04
 	db $00,$00,$48,$00
 	db $00,$08,$48,$20
@@ -3406,7 +3406,7 @@
 	db $08,$00,$12,$00
 	db $08,$08,$12,$20
 
-FrameBlock6f: ; 7bc2b (1e:7c2b)
+FrameBlock6f:
 	db $04
 	db $00,$00,$4a,$00
 	db $00,$08,$07,$00
@@ -3413,7 +3413,7 @@
 	db $08,$00,$16,$00
 	db $08,$08,$17,$00
 
-FrameBlock70: ; 7bc3c (1e:7c3c)
+FrameBlock70:
 	db $04
 	db $00,$00,$07,$20
 	db $00,$08,$4a,$20
@@ -3420,7 +3420,7 @@
 	db $08,$00,$17,$20
 	db $08,$08,$16,$20
 
-FrameBlock76: ; 7bc4d (1e:7c4d)
+FrameBlock76:
 	db $07
 	db $00,$10,$2f,$00
 	db $01,$08,$2f,$00
@@ -3430,7 +3430,7 @@
 	db $0a,$00,$3e,$00
 	db $0a,$20,$3e,$20
 
-FrameBlock77: ; 7bc6a (1e:7c6a)
+FrameBlock77:
 	db $04
 	db $00,$02,$4b,$00
 	db $00,$0a,$4c,$00
@@ -3437,15 +3437,15 @@
 	db $08,$00,$4c,$60
 	db $08,$08,$4b,$60
 
-FrameBlock78: ; 7bc7b (1e:7c7b)
+FrameBlock78:
 	db $01
 	db $00,$00,$4d,$00
 
-FrameBlock79: ; 7bc80 (1e:7c80)
+FrameBlock79:
 	db $01
 	db $00,$00,$4e,$00
 
-FrameBlockBaseCoords: ; 7bc85 (1e:7c85)
+FrameBlockBaseCoords:
 	db $10,$68
 	db $10,$70
 	db $10,$78
@@ -3624,5 +3624,5 @@
 	db $1C,$48
 	db $48,$28
 
-FrameBlock00: ; 7bde7 (1e:7de7)
+FrameBlock00:
 	db $00,$00
--- a/data/bike_riding_tilesets.asm
+++ b/data/bike_riding_tilesets.asm
@@ -1,2 +1,2 @@
-BikeRidingTilesets:: ; 09e2 (0:09e2)
+BikeRidingTilesets::
 	db OVERWORLD, FOREST, UNDERGROUND, SHIP_PORT, CAVERN, $FF
--- a/data/credit_mons.asm
+++ b/data/credit_mons.asm
@@ -1,4 +1,4 @@
-CreditsMons: ; 74131 (1d:4131)
+CreditsMons:
 	db VENUSAUR
 	db ARBOK
 	db RHYHORN
--- a/data/credits_order.asm
+++ b/data/credits_order.asm
@@ -1,4 +1,4 @@
-CreditsOrder: ; 74243 (1d:4243)
+CreditsOrder:
 ; subsequent credits elements will be displayed on separate lines.
 ; $FF, $FE, $FD, $FC, $FB, and $FA are commands that are used
 ; to go to the next set of credits texts.
--- a/data/cries.asm
+++ b/data/cries.asm
@@ -1,4 +1,4 @@
-CryData: ; 39446 (e:5446)
+CryData:
 	;$BaseCry, $Pitch, $Length
 	db $11, $00, $80; Rhydon
 	db $03, $00, $80; Kangaskhan
--- a/data/dungeon_tilesets.asm
+++ b/data/dungeon_tilesets.asm
@@ -1,2 +1,2 @@
-DungeonTilesets: ; c7b2 (3:47b2)
+DungeonTilesets:
 	db FOREST, MUSEUM, SHIP, CAVERN, LOBBY, MANSION, GATE, LAB, FACILITY, CEMETERY, GYM, $FF
--- a/data/evos_moves.asm
+++ b/data/evos_moves.asm
@@ -1,4 +1,4 @@
-EvosMovesPointerTable: ; 3b05c (e:705c)
+EvosMovesPointerTable:
 	dw Mon112_EvosMoves
 	dw Mon115_EvosMoves
 	dw Mon032_EvosMoves
@@ -190,7 +190,7 @@
 	dw Mon070_EvosMoves
 	dw Mon071_EvosMoves
 
-Mon112_EvosMoves: ; 3b1d8 (e:71d8)
+Mon112_EvosMoves:
 ;RHYDON
 ;Evolutions
 	db 0
@@ -203,7 +203,7 @@
 	db 64,TAKE_DOWN
 	db 0
 
-Mon115_EvosMoves: ; 3b1e6 (e:71e6)
+Mon115_EvosMoves:
 ;KANGASKHAN
 ;Evolutions
 	db 0
@@ -215,7 +215,7 @@
 	db 46,DIZZY_PUNCH
 	db 0
 
-Mon032_EvosMoves: ; 3b1f2 (e:71f2)
+Mon032_EvosMoves:
 ;NIDORAN_M
 ;Evolutions
 	db EV_LEVEL,16,NIDORINO
@@ -229,7 +229,7 @@
 	db 43,DOUBLE_KICK
 	db 0
 
-Mon035_EvosMoves: ; 3b203 (e:7203)
+Mon035_EvosMoves:
 ;CLEFAIRY
 ;Evolutions
 	db EV_ITEM,MOON_STONE,1,CLEFABLE
@@ -243,7 +243,7 @@
 	db 48,LIGHT_SCREEN
 	db 0
 
-Mon021_EvosMoves: ; 3b215 (e:7215)
+Mon021_EvosMoves:
 ;SPEAROW
 ;Evolutions
 	db EV_LEVEL,20,FEAROW
@@ -256,7 +256,7 @@
 	db 36,AGILITY
 	db 0
 
-Mon100_EvosMoves: ; 3b224 (e:7224)
+Mon100_EvosMoves:
 ;VOLTORB
 ;Evolutions
 	db EV_LEVEL,30,ELECTRODE
@@ -269,7 +269,7 @@
 	db 43,EXPLOSION
 	db 0
 
-Mon034_EvosMoves: ; 3b233 (e:7233)
+Mon034_EvosMoves:
 ;NIDOKING
 ;Evolutions
 	db 0
@@ -279,7 +279,7 @@
 	db 23,THRASH
 	db 0
 
-Mon080_EvosMoves: ; 3b23b (e:723b)
+Mon080_EvosMoves:
 ;SLOWBRO
 ;Evolutions
 	db 0
@@ -293,7 +293,7 @@
 	db 55,PSYCHIC_M
 	db 0
 
-Mon002_EvosMoves: ; 3b24b (e:724b)
+Mon002_EvosMoves:
 ;IVYSAUR
 ;Evolutions
 	db EV_LEVEL,32,VENUSAUR
@@ -308,7 +308,7 @@
 	db 54,SOLARBEAM
 	db 0
 
-Mon103_EvosMoves: ; 3b25e (e:725e)
+Mon103_EvosMoves:
 ;EXEGGUTOR
 ;Evolutions
 	db 0
@@ -316,7 +316,7 @@
 	db 28,STOMP
 	db 0
 
-Mon108_EvosMoves: ; 3b262 (e:7262)
+Mon108_EvosMoves:
 ;LICKITUNG
 ;Evolutions
 	db 0
@@ -328,7 +328,7 @@
 	db 39,SCREECH
 	db 0
 
-Mon102_EvosMoves: ; 3b26e (e:726e)
+Mon102_EvosMoves:
 ;EXEGGCUTE
 ;Evolutions
 	db EV_ITEM,LEAF_STONE,1,EXEGGUTOR
@@ -342,7 +342,7 @@
 	db 48,SLEEP_POWDER
 	db 0
 
-Mon088_EvosMoves: ; 3b280 (e:7280)
+Mon088_EvosMoves:
 ;GRIMER
 ;Evolutions
 	db EV_LEVEL,38,MUK
@@ -356,7 +356,7 @@
 	db 55,ACID_ARMOR
 	db 0
 
-Mon094_EvosMoves: ; 3b291 (e:7291)
+Mon094_EvosMoves:
 ;GENGAR
 ;Evolutions
 	db 0
@@ -365,7 +365,7 @@
 	db 38,DREAM_EATER
 	db 0
 
-Mon029_EvosMoves: ; 3b297 (e:7297)
+Mon029_EvosMoves:
 ;NIDORAN_F
 ;Evolutions
 	db EV_LEVEL,16,NIDORINA
@@ -379,7 +379,7 @@
 	db 43,DOUBLE_KICK
 	db 0
 
-Mon031_EvosMoves: ; 3b2a8 (e:72a8)
+Mon031_EvosMoves:
 ;NIDOQUEEN
 ;Evolutions
 	db 0
@@ -389,7 +389,7 @@
 	db 23,BODY_SLAM
 	db 0
 
-Mon104_EvosMoves: ; 3b2b0 (e:72b0)
+Mon104_EvosMoves:
 ;CUBONE
 ;Evolutions
 	db EV_LEVEL,28,MAROWAK
@@ -402,7 +402,7 @@
 	db 46,RAGE
 	db 0
 
-Mon111_EvosMoves: ; 3b2bf (e:72bf)
+Mon111_EvosMoves:
 ;RHYHORN
 ;Evolutions
 	db EV_LEVEL,42,RHYDON
@@ -416,7 +416,7 @@
 	db 55,TAKE_DOWN
 	db 0
 
-Mon131_EvosMoves: ; 3b2d0 (e:72d0)
+Mon131_EvosMoves:
 ;LAPRAS
 ;Evolutions
 	db 0
@@ -429,7 +429,7 @@
 	db 46,HYDRO_PUMP
 	db 0
 
-Mon059_EvosMoves: ; 3b2de (e:72de)
+Mon059_EvosMoves:
 ;ARCANINE
 ;Evolutions
 	db 0
@@ -436,7 +436,7 @@
 ;Learnset
 	db 0
 
-Mon151_EvosMoves: ; 3b2e0 (e:72e0)
+Mon151_EvosMoves:
 ;MEW
 ;Evolutions
 	db 0
@@ -447,7 +447,7 @@
 	db 40,PSYCHIC_M
 	db 0
 
-Mon130_EvosMoves: ; 3b2ea (e:72ea)
+Mon130_EvosMoves:
 ;GYARADOS
 ;Evolutions
 	db 0
@@ -459,7 +459,7 @@
 	db 52,HYPER_BEAM
 	db 0
 
-Mon090_EvosMoves: ; 3b2f6 (e:72f6)
+Mon090_EvosMoves:
 ;SHELLDER
 ;Evolutions
 	db EV_ITEM,WATER_STONE,1,CLOYSTER
@@ -472,7 +472,7 @@
 	db 50,ICE_BEAM
 	db 0
 
-Mon072_EvosMoves: ; 3b306 (e:7306)
+Mon072_EvosMoves:
 ;TENTACOOL
 ;Evolutions
 	db EV_LEVEL,30,TENTACRUEL
@@ -488,7 +488,7 @@
 	db 48,HYDRO_PUMP
 	db 0
 
-Mon092_EvosMoves: ; 3b31b (e:731b)
+Mon092_EvosMoves:
 ;GASTLY
 ;Evolutions
 	db EV_LEVEL,25,HAUNTER
@@ -498,7 +498,7 @@
 	db 35,DREAM_EATER
 	db 0
 
-Mon123_EvosMoves: ; 3b324 (e:7324)
+Mon123_EvosMoves:
 ;SCYTHER
 ;Evolutions
 	db 0
@@ -511,7 +511,7 @@
 	db 42,AGILITY
 	db 0
 
-Mon120_EvosMoves: ; 3b332 (e:7332)
+Mon120_EvosMoves:
 ;STARYU
 ;Evolutions
 	db EV_ITEM,WATER_STONE,1,STARMIE
@@ -526,7 +526,7 @@
 	db 47,HYDRO_PUMP
 	db 0
 
-Mon009_EvosMoves: ; 3b346 (e:7346)
+Mon009_EvosMoves:
 ;BLASTOISE
 ;Evolutions
 	db 0
@@ -539,7 +539,7 @@
 	db 52,HYDRO_PUMP
 	db 0
 
-Mon127_EvosMoves: ; 3b354 (e:7354)
+Mon127_EvosMoves:
 ;PINSIR
 ;Evolutions
 	db 0
@@ -552,7 +552,7 @@
 	db 54,SWORDS_DANCE
 	db 0
 
-Mon114_EvosMoves: ; 3b362 (e:7362)
+Mon114_EvosMoves:
 ;TANGELA
 ;Evolutions
 	db 0
@@ -565,7 +565,7 @@
 	db 49,GROWTH
 	db 0
 
-Mon152_EvosMoves: ; 3b370 (e:7370)
+Mon152_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -572,7 +572,7 @@
 ;Learnset
 	db 0
 
-Mon153_EvosMoves: ; 3b372 (e:7372)
+Mon153_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -579,7 +579,7 @@
 ;Learnset
 	db 0
 
-Mon058_EvosMoves: ; 3b374 (e:7374)
+Mon058_EvosMoves:
 ;GROWLITHE
 ;Evolutions
 	db EV_ITEM,FIRE_STONE,1,ARCANINE
@@ -592,7 +592,7 @@
 	db 50,FLAMETHROWER
 	db 0
 
-Mon095_EvosMoves: ; 3b384 (e:7384)
+Mon095_EvosMoves:
 ;ONIX
 ;Evolutions
 	db 0
@@ -604,7 +604,7 @@
 	db 43,HARDEN
 	db 0
 
-Mon022_EvosMoves: ; 3b390 (e:7390)
+Mon022_EvosMoves:
 ;FEAROW
 ;Evolutions
 	db 0
@@ -616,7 +616,7 @@
 	db 43,AGILITY
 	db 0
 
-Mon016_EvosMoves: ; 3b39c (e:739c)
+Mon016_EvosMoves:
 ;PIDGEY
 ;Evolutions
 	db EV_LEVEL,18,PIDGEOTTO
@@ -630,7 +630,7 @@
 	db 44,MIRROR_MOVE
 	db 0
 
-Mon079_EvosMoves: ; 3b3ad (e:73ad)
+Mon079_EvosMoves:
 ;SLOWPOKE
 ;Evolutions
 	db EV_LEVEL,37,SLOWBRO
@@ -644,7 +644,7 @@
 	db 48,PSYCHIC_M
 	db 0
 
-Mon064_EvosMoves: ; 3b3be (e:73be)
+Mon064_EvosMoves:
 ;KADABRA
 ;Evolutions
 	db EV_TRADE,1,ALAKAZAM
@@ -658,7 +658,7 @@
 	db 42,REFLECT
 	db 0
 
-Mon075_EvosMoves: ; 3b3cf (e:73cf)
+Mon075_EvosMoves:
 ;GRAVELER
 ;Evolutions
 	db EV_TRADE,1,GOLEM
@@ -672,7 +672,7 @@
 	db 43,EXPLOSION
 	db 0
 
-Mon113_EvosMoves: ; 3b3e0 (e:73e0)
+Mon113_EvosMoves:
 ;CHANSEY
 ;Evolutions
 	db 0
@@ -685,7 +685,7 @@
 	db 54,DOUBLE_EDGE
 	db 0
 
-Mon067_EvosMoves: ; 3b3ee (e:73ee)
+Mon067_EvosMoves:
 ;MACHOKE
 ;Evolutions
 	db EV_TRADE,1,MACHAMP
@@ -698,7 +698,7 @@
 	db 52,SUBMISSION
 	db 0
 
-Mon122_EvosMoves: ; 3b3fd (e:73fd)
+Mon122_EvosMoves:
 ;MR_MIME
 ;Evolutions
 	db 0
@@ -710,7 +710,7 @@
 	db 47,SUBSTITUTE
 	db 0
 
-Mon106_EvosMoves: ; 3b409 (e:7409)
+Mon106_EvosMoves:
 ;HITMONLEE
 ;Evolutions
 	db 0
@@ -722,7 +722,7 @@
 	db 53,MEGA_KICK
 	db 0
 
-Mon107_EvosMoves: ; 3b415 (e:7415)
+Mon107_EvosMoves:
 ;HITMONCHAN
 ;Evolutions
 	db 0
@@ -734,7 +734,7 @@
 	db 53,COUNTER
 	db 0
 
-Mon024_EvosMoves: ; 3b421 (e:7421)
+Mon024_EvosMoves:
 ;ARBOK
 ;Evolutions
 	db 0
@@ -746,7 +746,7 @@
 	db 47,ACID
 	db 0
 
-Mon047_EvosMoves: ; 3b42d (e:742d)
+Mon047_EvosMoves:
 ;PARASECT
 ;Evolutions
 	db 0
@@ -758,7 +758,7 @@
 	db 48,GROWTH
 	db 0
 
-Mon054_EvosMoves: ; 3b439 (e:7439)
+Mon054_EvosMoves:
 ;PSYDUCK
 ;Evolutions
 	db EV_LEVEL,33,GOLDUCK
@@ -771,7 +771,7 @@
 	db 52,HYDRO_PUMP
 	db 0
 
-Mon096_EvosMoves: ; 3b448 (e:7448)
+Mon096_EvosMoves:
 ;DROWZEE
 ;Evolutions
 	db EV_LEVEL,26,HYPNO
@@ -785,7 +785,7 @@
 	db 37,MEDITATE
 	db 0
 
-Mon076_EvosMoves: ; 3b459 (e:7459)
+Mon076_EvosMoves:
 ;GOLEM
 ;Evolutions
 	db 0
@@ -798,7 +798,7 @@
 	db 43,EXPLOSION
 	db 0
 
-Mon154_EvosMoves: ; 3b467 (e:7467)
+Mon154_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -805,7 +805,7 @@
 ;Learnset
 	db 0
 
-Mon126_EvosMoves: ; 3b469 (e:7469)
+Mon126_EvosMoves:
 ;MAGMAR
 ;Evolutions
 	db 0
@@ -818,7 +818,7 @@
 	db 55,FLAMETHROWER
 	db 0
 
-Mon155_EvosMoves: ; 3b477 (e:7477)
+Mon155_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -825,7 +825,7 @@
 ;Learnset
 	db 0
 
-Mon125_EvosMoves: ; 3b479 (e:7479)
+Mon125_EvosMoves:
 ;ELECTABUZZ
 ;Evolutions
 	db 0
@@ -837,7 +837,7 @@
 	db 54,THUNDER
 	db 0
 
-Mon082_EvosMoves: ; 3b485 (e:7485)
+Mon082_EvosMoves:
 ;MAGNETON
 ;Evolutions
 	db 0
@@ -850,7 +850,7 @@
 	db 54,SCREECH
 	db 0
 
-Mon109_EvosMoves: ; 3b493 (e:7493)
+Mon109_EvosMoves:
 ;KOFFING
 ;Evolutions
 	db EV_LEVEL,35,WEEZING
@@ -863,7 +863,7 @@
 	db 48,EXPLOSION
 	db 0
 
-Mon156_EvosMoves: ; 3b4a2 (e:74a2)
+Mon156_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -870,7 +870,7 @@
 ;Learnset
 	db 0
 
-Mon056_EvosMoves: ; 3b4a4 (e:74a4)
+Mon056_EvosMoves:
 ;MANKEY
 ;Evolutions
 	db EV_LEVEL,28,PRIMEAPE
@@ -883,7 +883,7 @@
 	db 39,THRASH
 	db 0
 
-Mon086_EvosMoves: ; 3b4b3 (e:74b3)
+Mon086_EvosMoves:
 ;SEEL
 ;Evolutions
 	db EV_LEVEL,34,DEWGONG
@@ -896,7 +896,7 @@
 	db 50,ICE_BEAM
 	db 0
 
-Mon050_EvosMoves: ; 3b4c2 (e:74c2)
+Mon050_EvosMoves:
 ;DIGLETT
 ;Evolutions
 	db EV_LEVEL,26,DUGTRIO
@@ -909,7 +909,7 @@
 	db 40,EARTHQUAKE
 	db 0
 
-Mon128_EvosMoves: ; 3b4d1 (e:74d1)
+Mon128_EvosMoves:
 ;TAUROS
 ;Evolutions
 	db 0
@@ -921,7 +921,7 @@
 	db 51,TAKE_DOWN
 	db 0
 
-Mon157_EvosMoves: ; 3b4dd (e:74dd)
+Mon157_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -928,7 +928,7 @@
 ;Learnset
 	db 0
 
-Mon158_EvosMoves: ; 3b4df (e:74df)
+Mon158_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -935,7 +935,7 @@
 ;Learnset
 	db 0
 
-Mon159_EvosMoves: ; 3b4e1 (e:74e1)
+Mon159_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -942,7 +942,7 @@
 ;Learnset
 	db 0
 
-Mon083_EvosMoves: ; 3b4e3 (e:74e3)
+Mon083_EvosMoves:
 ;FARFETCHD
 ;Evolutions
 	db 0
@@ -954,7 +954,7 @@
 	db 39,SLASH
 	db 0
 
-Mon048_EvosMoves: ; 3b4ef (e:74ef)
+Mon048_EvosMoves:
 ;VENONAT
 ;Evolutions
 	db EV_LEVEL,31,VENOMOTH
@@ -968,7 +968,7 @@
 	db 43,PSYCHIC_M
 	db 0
 
-Mon149_EvosMoves: ; 3b500 (e:7500)
+Mon149_EvosMoves:
 ;DRAGONITE
 ;Evolutions
 	db 0
@@ -980,7 +980,7 @@
 	db 60,HYPER_BEAM
 	db 0
 
-Mon160_EvosMoves: ; 3b50c (e:750c)
+Mon160_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -987,7 +987,7 @@
 ;Learnset
 	db 0
 
-Mon161_EvosMoves: ; 3b50e (e:750e)
+Mon161_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -994,7 +994,7 @@
 ;Learnset
 	db 0
 
-Mon162_EvosMoves: ; 3b510 (e:7510)
+Mon162_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1001,7 +1001,7 @@
 ;Learnset
 	db 0
 
-Mon084_EvosMoves: ; 3b512 (e:7512)
+Mon084_EvosMoves:
 ;DODUO
 ;Evolutions
 	db EV_LEVEL,31,DODRIO
@@ -1015,7 +1015,7 @@
 	db 44,AGILITY
 	db 0
 
-Mon060_EvosMoves: ; 3b523 (e:7523)
+Mon060_EvosMoves:
 ;POLIWAG
 ;Evolutions
 	db EV_LEVEL,25,POLIWHIRL
@@ -1029,7 +1029,7 @@
 	db 45,HYDRO_PUMP
 	db 0
 
-Mon124_EvosMoves: ; 3b534 (e:7534)
+Mon124_EvosMoves:
 ;JYNX
 ;Evolutions
 	db 0
@@ -1042,7 +1042,7 @@
 	db 58,BLIZZARD
 	db 0
 
-Mon146_EvosMoves: ; 3b542 (e:7542)
+Mon146_EvosMoves:
 ;MOLTRES
 ;Evolutions
 	db 0
@@ -1052,7 +1052,7 @@
 	db 60,SKY_ATTACK
 	db 0
 
-Mon144_EvosMoves: ; 3b54a (e:754a)
+Mon144_EvosMoves:
 ;ARTICUNO
 ;Evolutions
 	db 0
@@ -1062,7 +1062,7 @@
 	db 60,MIST
 	db 0
 
-Mon145_EvosMoves: ; 3b552 (e:7552)
+Mon145_EvosMoves:
 ;ZAPDOS
 ;Evolutions
 	db 0
@@ -1072,7 +1072,7 @@
 	db 60,LIGHT_SCREEN
 	db 0
 
-Mon132_EvosMoves: ; 3b55a (e:755a)
+Mon132_EvosMoves:
 ;DITTO
 ;Evolutions
 	db 0
@@ -1079,7 +1079,7 @@
 ;Learnset
 	db 0
 
-Mon052_EvosMoves: ; 3b55c (e:755c)
+Mon052_EvosMoves:
 ;MEOWTH
 ;Evolutions
 	db EV_LEVEL,28,PERSIAN
@@ -1092,7 +1092,7 @@
 	db 44,SLASH
 	db 0
 
-Mon098_EvosMoves: ; 3b56b (e:756b)
+Mon098_EvosMoves:
 ;KRABBY
 ;Evolutions
 	db EV_LEVEL,28,KINGLER
@@ -1105,7 +1105,7 @@
 	db 40,HARDEN
 	db 0
 
-Mon163_EvosMoves: ; 3b57a (e:757a)
+Mon163_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1112,7 +1112,7 @@
 ;Learnset
 	db 0
 
-Mon164_EvosMoves: ; 3b57c (e:757c)
+Mon164_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1119,7 +1119,7 @@
 ;Learnset
 	db 0
 
-Mon165_EvosMoves: ; 3b57e (e:757e)
+Mon165_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1126,7 +1126,7 @@
 ;Learnset
 	db 0
 
-Mon037_EvosMoves: ; 3b580 (e:7580)
+Mon037_EvosMoves:
 ;VULPIX
 ;Evolutions
 	db EV_ITEM,FIRE_STONE,1,NINETALES
@@ -1139,7 +1139,7 @@
 	db 42,FIRE_SPIN
 	db 0
 
-Mon038_EvosMoves: ; 3b590 (e:7590)
+Mon038_EvosMoves:
 ;NINETALES
 ;Evolutions
 	db 0
@@ -1146,7 +1146,7 @@
 ;Learnset
 	db 0
 
-Mon025_EvosMoves: ; 3b592 (e:7592)
+Mon025_EvosMoves:
 ;PIKACHU
 ;Evolutions
 	db EV_ITEM,THUNDER_STONE,1,RAICHU
@@ -1159,7 +1159,7 @@
 	db 43,THUNDER
 	db 0
 
-Mon026_EvosMoves: ; 3b5a2 (e:75a2)
+Mon026_EvosMoves:
 ;RAICHU
 ;Evolutions
 	db 0
@@ -1166,7 +1166,7 @@
 ;Learnset
 	db 0
 
-Mon166_EvosMoves: ; 3b5a4 (e:75a4)
+Mon166_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1173,7 +1173,7 @@
 ;Learnset
 	db 0
 
-Mon167_EvosMoves: ; 3b5a6 (e:75a6)
+Mon167_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1180,7 +1180,7 @@
 ;Learnset
 	db 0
 
-Mon147_EvosMoves: ; 3b5a8 (e:75a8)
+Mon147_EvosMoves:
 ;DRATINI
 ;Evolutions
 	db EV_LEVEL,30,DRAGONAIR
@@ -1193,7 +1193,7 @@
 	db 50,HYPER_BEAM
 	db 0
 
-Mon148_EvosMoves: ; 3b5b7 (e:75b7)
+Mon148_EvosMoves:
 ;DRAGONAIR
 ;Evolutions
 	db EV_LEVEL,55,DRAGONITE
@@ -1206,7 +1206,7 @@
 	db 55,HYPER_BEAM
 	db 0
 
-Mon140_EvosMoves: ; 3b5c6 (e:75c6)
+Mon140_EvosMoves:
 ;KABUTO
 ;Evolutions
 	db EV_LEVEL,40,KABUTOPS
@@ -1218,7 +1218,7 @@
 	db 49,HYDRO_PUMP
 	db 0
 
-Mon141_EvosMoves: ; 3b5d3 (e:75d3)
+Mon141_EvosMoves:
 ;KABUTOPS
 ;Evolutions
 	db 0
@@ -1229,7 +1229,7 @@
 	db 53,HYDRO_PUMP
 	db 0
 
-Mon116_EvosMoves: ; 3b5dd (e:75dd)
+Mon116_EvosMoves:
 ;HORSEA
 ;Evolutions
 	db EV_LEVEL,32,SEADRA
@@ -1242,7 +1242,7 @@
 	db 45,HYDRO_PUMP
 	db 0
 
-Mon117_EvosMoves: ; 3b5ec (e:75ec)
+Mon117_EvosMoves:
 ;SEADRA
 ;Evolutions
 	db 0
@@ -1254,7 +1254,7 @@
 	db 52,HYDRO_PUMP
 	db 0
 
-Mon168_EvosMoves: ; 3b5f8 (e:75f8)
+Mon168_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1261,7 +1261,7 @@
 ;Learnset
 	db 0
 
-Mon169_EvosMoves: ; 3b5fa (e:75fa)
+Mon169_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1268,7 +1268,7 @@
 ;Learnset
 	db 0
 
-Mon027_EvosMoves: ; 3b5fc (e:75fc)
+Mon027_EvosMoves:
 ;SANDSHREW
 ;Evolutions
 	db EV_LEVEL,22,SANDSLASH
@@ -1281,7 +1281,7 @@
 	db 38,FURY_SWIPES
 	db 0
 
-Mon028_EvosMoves: ; 3b60b (e:760b)
+Mon028_EvosMoves:
 ;SANDSLASH
 ;Evolutions
 	db 0
@@ -1293,7 +1293,7 @@
 	db 47,FURY_SWIPES
 	db 0
 
-Mon138_EvosMoves: ; 3b617 (e:7617)
+Mon138_EvosMoves:
 ;OMANYTE
 ;Evolutions
 	db EV_LEVEL,40,OMASTAR
@@ -1305,7 +1305,7 @@
 	db 53,HYDRO_PUMP
 	db 0
 
-Mon139_EvosMoves: ; 3b624 (e:7624)
+Mon139_EvosMoves:
 ;OMASTAR
 ;Evolutions
 	db 0
@@ -1316,7 +1316,7 @@
 	db 49,HYDRO_PUMP
 	db 0
 
-Mon039_EvosMoves: ; 3b62e (e:762e)
+Mon039_EvosMoves:
 ;JIGGLYPUFF
 ;Evolutions
 	db EV_ITEM,MOON_STONE,1,WIGGLYTUFF
@@ -1331,7 +1331,7 @@
 	db 39,DOUBLE_EDGE
 	db 0
 
-Mon040_EvosMoves: ; 3b642 (e:7642)
+Mon040_EvosMoves:
 ;WIGGLYTUFF
 ;Evolutions
 	db 0
@@ -1338,7 +1338,7 @@
 ;Learnset
 	db 0
 
-Mon133_EvosMoves: ; 3b644 (e:7644)
+Mon133_EvosMoves:
 ;EEVEE
 ;Evolutions
 	db EV_ITEM,FIRE_STONE,1,FLAREON
@@ -1353,7 +1353,7 @@
 	db 45,TAKE_DOWN
 	db 0
 
-Mon136_EvosMoves: ; 3b65a (e:765a)
+Mon136_EvosMoves:
 ;FLAREON
 ;Evolutions
 	db 0
@@ -1368,7 +1368,7 @@
 	db 54,FLAMETHROWER
 	db 0
 
-Mon135_EvosMoves: ; 3b66c (e:766c)
+Mon135_EvosMoves:
 ;JOLTEON
 ;Evolutions
 	db 0
@@ -1383,7 +1383,7 @@
 	db 54,THUNDER
 	db 0
 
-Mon134_EvosMoves: ; 3b67e (e:767e)
+Mon134_EvosMoves:
 ;VAPOREON
 ;Evolutions
 	db 0
@@ -1398,7 +1398,7 @@
 	db 54,HYDRO_PUMP
 	db 0
 
-Mon066_EvosMoves: ; 3b690 (e:7690)
+Mon066_EvosMoves:
 ;MACHOP
 ;Evolutions
 	db EV_LEVEL,28,MACHOKE
@@ -1411,7 +1411,7 @@
 	db 46,SUBMISSION
 	db 0
 
-Mon041_EvosMoves: ; 3b69f (e:769f)
+Mon041_EvosMoves:
 ;ZUBAT
 ;Evolutions
 	db EV_LEVEL,22,GOLBAT
@@ -1424,7 +1424,7 @@
 	db 36,HAZE
 	db 0
 
-Mon023_EvosMoves: ; 3b6ae (e:76ae)
+Mon023_EvosMoves:
 ;EKANS
 ;Evolutions
 	db EV_LEVEL,22,ARBOK
@@ -1437,7 +1437,7 @@
 	db 38,ACID
 	db 0
 
-Mon046_EvosMoves: ; 3b6bd (e:76bd)
+Mon046_EvosMoves:
 ;PARAS
 ;Evolutions
 	db EV_LEVEL,24,PARASECT
@@ -1450,7 +1450,7 @@
 	db 41,GROWTH
 	db 0
 
-Mon061_EvosMoves: ; 3b6cc (e:76cc)
+Mon061_EvosMoves:
 ;POLIWHIRL
 ;Evolutions
 	db EV_ITEM,WATER_STONE,1,POLIWRATH
@@ -1464,7 +1464,7 @@
 	db 49,HYDRO_PUMP
 	db 0
 
-Mon062_EvosMoves: ; 3b6de (e:76de)
+Mon062_EvosMoves:
 ;POLIWRATH
 ;Evolutions
 	db 0
@@ -1473,7 +1473,7 @@
 	db 19,WATER_GUN
 	db 0
 
-Mon013_EvosMoves: ; 3b6e4 (e:76e4)
+Mon013_EvosMoves:
 ;WEEDLE
 ;Evolutions
 	db EV_LEVEL,7,KAKUNA
@@ -1481,7 +1481,7 @@
 ;Learnset
 	db 0
 
-Mon014_EvosMoves: ; 3b6e9 (e:76e9)
+Mon014_EvosMoves:
 ;KAKUNA
 ;Evolutions
 	db EV_LEVEL,10,BEEDRILL
@@ -1489,7 +1489,7 @@
 ;Learnset
 	db 0
 
-Mon015_EvosMoves: ; 3b6ee (e:76ee)
+Mon015_EvosMoves:
 ;BEEDRILL
 ;Evolutions
 	db 0
@@ -1502,7 +1502,7 @@
 	db 35,AGILITY
 	db 0
 
-Mon170_EvosMoves: ; 3b6fc (e:76fc)
+Mon170_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1509,7 +1509,7 @@
 ;Learnset
 	db 0
 
-Mon085_EvosMoves: ; 3b6fe (e:76fe)
+Mon085_EvosMoves:
 ;DODRIO
 ;Evolutions
 	db 0
@@ -1522,7 +1522,7 @@
 	db 51,AGILITY
 	db 0
 
-Mon057_EvosMoves: ; 3b70c (e:770c)
+Mon057_EvosMoves:
 ;PRIMEAPE
 ;Evolutions
 	db 0
@@ -1534,7 +1534,7 @@
 	db 46,THRASH
 	db 0
 
-Mon051_EvosMoves: ; 3b718 (e:7718)
+Mon051_EvosMoves:
 ;DUGTRIO
 ;Evolutions
 	db 0
@@ -1546,7 +1546,7 @@
 	db 47,EARTHQUAKE
 	db 0
 
-Mon049_EvosMoves: ; 3b724 (e:7724)
+Mon049_EvosMoves:
 ;VENOMOTH
 ;Evolutions
 	db 0
@@ -1559,7 +1559,7 @@
 	db 50,PSYCHIC_M
 	db 0
 
-Mon087_EvosMoves: ; 3b732 (e:7732)
+Mon087_EvosMoves:
 ;DEWGONG
 ;Evolutions
 	db 0
@@ -1571,7 +1571,7 @@
 	db 56,ICE_BEAM
 	db 0
 
-Mon171_EvosMoves: ; 3b73e (e:773e)
+Mon171_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1578,7 +1578,7 @@
 ;Learnset
 	db 0
 
-Mon172_EvosMoves: ; 3b740 (e:7740)
+Mon172_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1585,7 +1585,7 @@
 ;Learnset
 	db 0
 
-Mon010_EvosMoves: ; 3b742 (e:7742)
+Mon010_EvosMoves:
 ;CATERPIE
 ;Evolutions
 	db EV_LEVEL,7,METAPOD
@@ -1593,7 +1593,7 @@
 ;Learnset
 	db 0
 
-Mon011_EvosMoves: ; 3b747 (e:7747)
+Mon011_EvosMoves:
 ;METAPOD
 ;Evolutions
 	db EV_LEVEL,10,BUTTERFREE
@@ -1601,7 +1601,7 @@
 ;Learnset
 	db 0
 
-Mon012_EvosMoves: ; 3b74c (e:774c)
+Mon012_EvosMoves:
 ;BUTTERFREE
 ;Evolutions
 	db 0
@@ -1615,7 +1615,7 @@
 	db 32,PSYBEAM
 	db 0
 
-Mon068_EvosMoves: ; 3b75c (e:775c)
+Mon068_EvosMoves:
 ;MACHAMP
 ;Evolutions
 	db 0
@@ -1627,7 +1627,7 @@
 	db 52,SUBMISSION
 	db 0
 
-Mon173_EvosMoves: ; 3b768 (e:7768)
+Mon173_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1634,7 +1634,7 @@
 ;Learnset
 	db 0
 
-Mon055_EvosMoves: ; 3b76a (e:776a)
+Mon055_EvosMoves:
 ;GOLDUCK
 ;Evolutions
 	db 0
@@ -1646,7 +1646,7 @@
 	db 59,HYDRO_PUMP
 	db 0
 
-Mon097_EvosMoves: ; 3b776 (e:7776)
+Mon097_EvosMoves:
 ;HYPNO
 ;Evolutions
 	db 0
@@ -1659,7 +1659,7 @@
 	db 43,MEDITATE
 	db 0
 
-Mon042_EvosMoves: ; 3b784 (e:7784)
+Mon042_EvosMoves:
 ;GOLBAT
 ;Evolutions
 	db 0
@@ -1671,7 +1671,7 @@
 	db 43,HAZE
 	db 0
 
-Mon150_EvosMoves: ; 3b790 (e:7790)
+Mon150_EvosMoves:
 ;MEWTWO
 ;Evolutions
 	db 0
@@ -1683,7 +1683,7 @@
 	db 81,AMNESIA
 	db 0
 
-Mon143_EvosMoves: ; 3b79c (e:779c)
+Mon143_EvosMoves:
 ;SNORLAX
 ;Evolutions
 	db 0
@@ -1694,7 +1694,7 @@
 	db 56,HYPER_BEAM
 	db 0
 
-Mon129_EvosMoves: ; 3b7a6 (e:77a6)
+Mon129_EvosMoves:
 ;MAGIKARP
 ;Evolutions
 	db EV_LEVEL,20,GYARADOS
@@ -1703,7 +1703,7 @@
 	db 15,TACKLE
 	db 0
 
-Mon174_EvosMoves: ; 3b7ad (e:77ad)
+Mon174_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1710,7 +1710,7 @@
 ;Learnset
 	db 0
 
-Mon175_EvosMoves: ; 3b7af (e:77af)
+Mon175_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1717,7 +1717,7 @@
 ;Learnset
 	db 0
 
-Mon089_EvosMoves: ; 3b7b1 (e:77b1)
+Mon089_EvosMoves:
 ;MUK
 ;Evolutions
 	db 0
@@ -1730,7 +1730,7 @@
 	db 60,ACID_ARMOR
 	db 0
 
-Mon176_EvosMoves: ; 3b7bf (e:77bf)
+Mon176_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1737,7 +1737,7 @@
 ;Learnset
 	db 0
 
-Mon099_EvosMoves: ; 3b7c1 (e:77c1)
+Mon099_EvosMoves:
 ;KINGLER
 ;Evolutions
 	db 0
@@ -1749,7 +1749,7 @@
 	db 49,HARDEN
 	db 0
 
-Mon091_EvosMoves: ; 3b7cd (e:77cd)
+Mon091_EvosMoves:
 ;CLOYSTER
 ;Evolutions
 	db 0
@@ -1757,7 +1757,7 @@
 	db 50,SPIKE_CANNON
 	db 0
 
-Mon177_EvosMoves: ; 3b7d1 (e:77d1)
+Mon177_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1764,7 +1764,7 @@
 ;Learnset
 	db 0
 
-Mon101_EvosMoves: ; 3b7d3 (e:77d3)
+Mon101_EvosMoves:
 ;ELECTRODE
 ;Evolutions
 	db 0
@@ -1776,7 +1776,7 @@
 	db 50,EXPLOSION
 	db 0
 
-Mon036_EvosMoves: ; 3b7df (e:77df)
+Mon036_EvosMoves:
 ;CLEFABLE
 ;Evolutions
 	db 0
@@ -1783,7 +1783,7 @@
 ;Learnset
 	db 0
 
-Mon110_EvosMoves: ; 3b7e1 (e:77e1)
+Mon110_EvosMoves:
 ;WEEZING
 ;Evolutions
 	db 0
@@ -1795,7 +1795,7 @@
 	db 53,EXPLOSION
 	db 0
 
-Mon053_EvosMoves: ; 3b7ed (e:77ed)
+Mon053_EvosMoves:
 ;PERSIAN
 ;Evolutions
 	db 0
@@ -1807,7 +1807,7 @@
 	db 51,SLASH
 	db 0
 
-Mon105_EvosMoves: ; 3b7f9 (e:77f9)
+Mon105_EvosMoves:
 ;MAROWAK
 ;Evolutions
 	db 0
@@ -1819,7 +1819,7 @@
 	db 55,RAGE
 	db 0
 
-Mon178_EvosMoves: ; 3b805 (e:7805)
+Mon178_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1826,7 +1826,7 @@
 ;Learnset
 	db 0
 
-Mon093_EvosMoves: ; 3b807 (e:7807)
+Mon093_EvosMoves:
 ;HAUNTER
 ;Evolutions
 	db EV_TRADE,1,GENGAR
@@ -1836,7 +1836,7 @@
 	db 38,DREAM_EATER
 	db 0
 
-Mon063_EvosMoves: ; 3b810 (e:7810)
+Mon063_EvosMoves:
 ;ABRA
 ;Evolutions
 	db EV_LEVEL,16,KADABRA
@@ -1844,7 +1844,7 @@
 ;Learnset
 	db 0
 
-Mon065_EvosMoves: ; 3b815 (e:7815)
+Mon065_EvosMoves:
 ;ALAKAZAM
 ;Evolutions
 	db 0
@@ -1857,7 +1857,7 @@
 	db 42,REFLECT
 	db 0
 
-Mon017_EvosMoves: ; 3b823 (e:7823)
+Mon017_EvosMoves:
 ;PIDGEOTTO
 ;Evolutions
 	db EV_LEVEL,36,PIDGEOT
@@ -1871,7 +1871,7 @@
 	db 49,MIRROR_MOVE
 	db 0
 
-Mon018_EvosMoves: ; 3b834 (e:7834)
+Mon018_EvosMoves:
 ;PIDGEOT
 ;Evolutions
 	db 0
@@ -1884,7 +1884,7 @@
 	db 54,MIRROR_MOVE
 	db 0
 
-Mon121_EvosMoves: ; 3b842 (e:7842)
+Mon121_EvosMoves:
 ;STARMIE
 ;Evolutions
 	db 0
@@ -1891,7 +1891,7 @@
 ;Learnset
 	db 0
 
-Mon001_EvosMoves: ; 3b844 (e:7844)
+Mon001_EvosMoves:
 ;BULBASAUR
 ;Evolutions
 	db EV_LEVEL,16,IVYSAUR
@@ -1906,7 +1906,7 @@
 	db 48,SOLARBEAM
 	db 0
 
-Mon003_EvosMoves: ; 3b857 (e:7857)
+Mon003_EvosMoves:
 ;VENUSAUR
 ;Evolutions
 	db 0
@@ -1920,7 +1920,7 @@
 	db 65,SOLARBEAM
 	db 0
 
-Mon073_EvosMoves: ; 3b867 (e:7867)
+Mon073_EvosMoves:
 ;TENTACRUEL
 ;Evolutions
 	db 0
@@ -1935,7 +1935,7 @@
 	db 50,HYDRO_PUMP
 	db 0
 
-Mon179_EvosMoves: ; 3b879 (e:7879)
+Mon179_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1942,7 +1942,7 @@
 ;Learnset
 	db 0
 
-Mon118_EvosMoves: ; 3b87b (e:787b)
+Mon118_EvosMoves:
 ;GOLDEEN
 ;Evolutions
 	db EV_LEVEL,33,SEAKING
@@ -1956,7 +1956,7 @@
 	db 54,AGILITY
 	db 0
 
-Mon119_EvosMoves: ; 3b88c (e:788c)
+Mon119_EvosMoves:
 ;SEAKING
 ;Evolutions
 	db 0
@@ -1969,7 +1969,7 @@
 	db 54,AGILITY
 	db 0
 
-Mon180_EvosMoves: ; 3b89a (e:789a)
+Mon180_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1976,7 +1976,7 @@
 ;Learnset
 	db 0
 
-Mon181_EvosMoves: ; 3b89c (e:789c)
+Mon181_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1983,7 +1983,7 @@
 ;Learnset
 	db 0
 
-Mon182_EvosMoves: ; 3b89e (e:789e)
+Mon182_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1990,7 +1990,7 @@
 ;Learnset
 	db 0
 
-Mon183_EvosMoves: ; 3b8a0 (e:78a0)
+Mon183_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -1997,7 +1997,7 @@
 ;Learnset
 	db 0
 
-Mon077_EvosMoves: ; 3b8a2 (e:78a2)
+Mon077_EvosMoves:
 ;PONYTA
 ;Evolutions
 	db EV_LEVEL,40,RAPIDASH
@@ -2011,7 +2011,7 @@
 	db 48,AGILITY
 	db 0
 
-Mon078_EvosMoves: ; 3b8b3 (e:78b3)
+Mon078_EvosMoves:
 ;RAPIDASH
 ;Evolutions
 	db 0
@@ -2024,7 +2024,7 @@
 	db 55,AGILITY
 	db 0
 
-Mon019_EvosMoves: ; 3b8c1 (e:78c1)
+Mon019_EvosMoves:
 ;RATTATA
 ;Evolutions
 	db EV_LEVEL,20,RATICATE
@@ -2036,7 +2036,7 @@
 	db 34,SUPER_FANG
 	db 0
 
-Mon020_EvosMoves: ; 3b8ce (e:78ce)
+Mon020_EvosMoves:
 ;RATICATE
 ;Evolutions
 	db 0
@@ -2047,7 +2047,7 @@
 	db 41,SUPER_FANG
 	db 0
 
-Mon033_EvosMoves: ; 3b8d8 (e:78d8)
+Mon033_EvosMoves:
 ;NIDORINO
 ;Evolutions
 	db EV_ITEM,MOON_STONE,1,NIDOKING
@@ -2061,7 +2061,7 @@
 	db 50,DOUBLE_KICK
 	db 0
 
-Mon030_EvosMoves: ; 3b8ea (e:78ea)
+Mon030_EvosMoves:
 ;NIDORINA
 ;Evolutions
 	db EV_ITEM,MOON_STONE,1,NIDOQUEEN
@@ -2075,7 +2075,7 @@
 	db 50,DOUBLE_KICK
 	db 0
 
-Mon074_EvosMoves: ; 3b8fc (e:78fc)
+Mon074_EvosMoves:
 ;GEODUDE
 ;Evolutions
 	db EV_LEVEL,25,GRAVELER
@@ -2089,7 +2089,7 @@
 	db 36,EXPLOSION
 	db 0
 
-Mon137_EvosMoves: ; 3b90d (e:790d)
+Mon137_EvosMoves:
 ;PORYGON
 ;Evolutions
 	db 0
@@ -2100,7 +2100,7 @@
 	db 42,TRI_ATTACK
 	db 0
 
-Mon142_EvosMoves: ; 3b917 (e:7917)
+Mon142_EvosMoves:
 ;AERODACTYL
 ;Evolutions
 	db 0
@@ -2111,7 +2111,7 @@
 	db 54,HYPER_BEAM
 	db 0
 
-Mon184_EvosMoves: ; 3b921 (e:7921)
+Mon184_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -2118,7 +2118,7 @@
 ;Learnset
 	db 0
 
-Mon081_EvosMoves: ; 3b923 (e:7923)
+Mon081_EvosMoves:
 ;MAGNEMITE
 ;Evolutions
 	db EV_LEVEL,30,MAGNETON
@@ -2132,7 +2132,7 @@
 	db 47,SCREECH
 	db 0
 
-Mon185_EvosMoves: ; 3b934 (e:7934)
+Mon185_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -2139,7 +2139,7 @@
 ;Learnset
 	db 0
 
-Mon186_EvosMoves: ; 3b936 (e:7936)
+Mon186_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -2146,7 +2146,7 @@
 ;Learnset
 	db 0
 
-Mon004_EvosMoves: ; 3b938 (e:7938)
+Mon004_EvosMoves:
 ;CHARMANDER
 ;Evolutions
 	db EV_LEVEL,16,CHARMELEON
@@ -2160,7 +2160,7 @@
 	db 46,FIRE_SPIN
 	db 0
 
-Mon007_EvosMoves: ; 3b949 (e:7949)
+Mon007_EvosMoves:
 ;SQUIRTLE
 ;Evolutions
 	db EV_LEVEL,16,WARTORTLE
@@ -2174,7 +2174,7 @@
 	db 42,HYDRO_PUMP
 	db 0
 
-Mon005_EvosMoves: ; 3b95a (e:795a)
+Mon005_EvosMoves:
 ;CHARMELEON
 ;Evolutions
 	db EV_LEVEL,36,CHARIZARD
@@ -2188,7 +2188,7 @@
 	db 56,FIRE_SPIN
 	db 0
 
-Mon008_EvosMoves: ; 3b96b (e:796b)
+Mon008_EvosMoves:
 ;WARTORTLE
 ;Evolutions
 	db EV_LEVEL,36,BLASTOISE
@@ -2202,7 +2202,7 @@
 	db 47,HYDRO_PUMP
 	db 0
 
-Mon006_EvosMoves: ; 3b97c (e:797c)
+Mon006_EvosMoves:
 ;CHARIZARD
 ;Evolutions
 	db 0
@@ -2215,7 +2215,7 @@
 	db 55,FIRE_SPIN
 	db 0
 
-Mon187_EvosMoves: ; 3b98a (e:798a)
+Mon187_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -2222,7 +2222,7 @@
 ;Learnset
 	db 0
 
-Mon188_EvosMoves: ; 3b98c (e:798c)
+Mon188_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -2229,7 +2229,7 @@
 ;Learnset
 	db 0
 
-Mon189_EvosMoves: ; 3b98e (e:798e)
+Mon189_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -2236,7 +2236,7 @@
 ;Learnset
 	db 0
 
-Mon190_EvosMoves: ; 3b990 (e:7990)
+Mon190_EvosMoves:
 ;MISSINGNO
 ;Evolutions
 	db 0
@@ -2243,7 +2243,7 @@
 ;Learnset
 	db 0
 
-Mon043_EvosMoves: ; 3b992 (e:7992)
+Mon043_EvosMoves:
 ;ODDISH
 ;Evolutions
 	db EV_LEVEL,21,GLOOM
@@ -2257,7 +2257,7 @@
 	db 46,SOLARBEAM
 	db 0
 
-Mon044_EvosMoves: ; 3b9a3 (e:79a3)
+Mon044_EvosMoves:
 ;GLOOM
 ;Evolutions
 	db EV_ITEM,LEAF_STONE,1,VILEPLUME
@@ -2271,7 +2271,7 @@
 	db 52,SOLARBEAM
 	db 0
 
-Mon045_EvosMoves: ; 3b9b5 (e:79b5)
+Mon045_EvosMoves:
 ;VILEPLUME
 ;Evolutions
 	db 0
@@ -2281,7 +2281,7 @@
 	db 19,SLEEP_POWDER
 	db 0
 
-Mon069_EvosMoves: ; 3b9bd (e:79bd)
+Mon069_EvosMoves:
 ;BELLSPROUT
 ;Evolutions
 	db EV_LEVEL,21,WEEPINBELL
@@ -2296,7 +2296,7 @@
 	db 42,SLAM
 	db 0
 
-Mon070_EvosMoves: ; 3b9d0 (e:79d0)
+Mon070_EvosMoves:
 ;WEEPINBELL
 ;Evolutions
 	db EV_ITEM,LEAF_STONE,1,VICTREEBEL
@@ -2311,7 +2311,7 @@
 	db 49,SLAM
 	db 0
 
-Mon071_EvosMoves: ; 3b9e4 (e:79e4)
+Mon071_EvosMoves:
 ;VICTREEBEL
 ;Evolutions
 	db 0
--- a/data/facing.asm
+++ b/data/facing.asm
@@ -1,4 +1,4 @@
-SpriteFacingAndAnimationTable: ; 4000 (1:4000)
+SpriteFacingAndAnimationTable:
 	dw SpriteFacingDownAndStanding, SpriteOAMParameters        ; facing down, walk animation frame 0
 	dw SpriteFacingDownAndWalking, SpriteOAMParameters         ; facing down, walk animation frame 1
 	dw SpriteFacingDownAndStanding, SpriteOAMParameters        ; facing down, walk animation frame 2
@@ -32,25 +32,25 @@
 	dw SpriteFacingDownAndStanding, SpriteOAMParameters
 	dw SpriteFacingDownAndStanding, SpriteOAMParameters
 
-SpriteFacingDownAndStanding: ; 4080 (1:4080)
+SpriteFacingDownAndStanding:
 	db $00,$01,$02,$03
-SpriteFacingDownAndWalking: ; 4084 (1:4084)
+SpriteFacingDownAndWalking:
 	db $80,$81,$82,$83
-SpriteFacingUpAndStanding: ; 4088 (1:4088)
+SpriteFacingUpAndStanding:
 	db $04,$05,$06,$07
-SpriteFacingUpAndWalking: ; 408c (1:408c)
+SpriteFacingUpAndWalking:
 	db $84,$85,$86,$87
-SpriteFacingLeftAndStanding: ; 4090 (1:4090)
+SpriteFacingLeftAndStanding:
 	db $08,$09,$0a,$0b
-SpriteFacingLeftAndWalking: ; 4094 (1:4094)
+SpriteFacingLeftAndWalking:
 	db $88,$89,$8a,$8b
 
-SpriteOAMParameters: ; 4098 (1:4098)
+SpriteOAMParameters:
 	db $00,$00, $00                                      ; top left
 	db $00,$08, $00                                      ; top right
 	db $08,$00, OAMFLAG_CANBEMASKED                      ; bottom left
 	db $08,$08, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA  ; bottom right
-SpriteOAMParametersFlipped: ; 40a4 (1:40a4)
+SpriteOAMParametersFlipped:
 	db $00,$08, OAMFLAG_VFLIPPED
 	db $00,$00, OAMFLAG_VFLIPPED
 	db $08,$08, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED
--- a/data/force_bike_surf.asm
+++ b/data/force_bike_surf.asm
@@ -1,4 +1,4 @@
-ForcedBikeOrSurfMaps: ; c3e6 (3:43e6)
+ForcedBikeOrSurfMaps:
 ; map id, y, x
 	db ROUTE_16,$0A,$11
 	db ROUTE_16,$0B,$11
--- a/data/good_rod.asm
+++ b/data/good_rod.asm
@@ -1,3 +1,3 @@
-GoodRodMons: ; e27f (3:627f)
+GoodRodMons:
 	db 10,GOLDEEN
 	db 10,POLIWAG
--- a/data/hidden_coins.asm
+++ b/data/hidden_coins.asm
@@ -1,4 +1,4 @@
-HiddenCoinCoords: ; 76822 (1d:6822)
+HiddenCoinCoords:
 	db GAME_CORNER,$08,$00
 	db GAME_CORNER,$10,$01
 	db GAME_CORNER,$0b,$03
--- a/data/hidden_item_coords.asm
+++ b/data/hidden_item_coords.asm
@@ -1,4 +1,4 @@
-HiddenItemCoords: ; 766b8 (1d:66b8)
+HiddenItemCoords:
 ; map ID, then coords
 	db VIRIDIAN_FOREST,$12,$01
 	db VIRIDIAN_FOREST,$2a,$10
--- a/data/hidden_objects.asm
+++ b/data/hidden_objects.asm
@@ -1,4 +1,4 @@
-HiddenObjectMaps: ; 46a40 (11:6a40)
+HiddenObjectMaps:
 	db REDS_HOUSE_2F
 	db BLUES_HOUSE
 	db OAKS_LAB
@@ -86,7 +86,7 @@
 	db ROUTE_4
 	db $FF
 
-HiddenObjectPointers: ; 46a96 (11:6a96)
+HiddenObjectPointers:
 ; each of these pointers is for the corresponding map in HiddenObjectMaps
 	dw RedsHouse2FHiddenObjects
 	dw BluesHouseHiddenObjects
@@ -175,7 +175,7 @@
 	dw Route4HiddenObjects
 
 ; format: y-coord, x-coord, text id/item id, object routine
-TradeCenterHiddenObjects: ; 46b40 (11:6b40)
+TradeCenterHiddenObjects:
 	db $04,$05,$d0
 	db BANK(CableClubRightGameboy)
 	dw CableClubRightGameboy
@@ -183,7 +183,7 @@
 	db BANK(CableClubLeftGameboy)
 	dw CableClubLeftGameboy
 	db $FF
-ColosseumHiddenObjects: ; 46b4d (11:6b4d)
+ColosseumHiddenObjects:
 	db $04,$05,$d0
 	db BANK(CableClubRightGameboy)
 	dw CableClubRightGameboy
@@ -191,13 +191,13 @@
 	db BANK(CableClubLeftGameboy)
 	dw CableClubLeftGameboy
 	db $FF
-RedsHouse2FHiddenObjects: ; 46b5a (11:6b5a)
+RedsHouse2FHiddenObjects:
 	db $01,$00,$04
 	dbw BANK(OpenRedsPC), OpenRedsPC
 	db $05,$03,$d0
 	dbw BANK(PrintRedSNESText), PrintRedSNESText
 	db $FF
-BluesHouseHiddenObjects: ; 46b67 (11:6b67)
+BluesHouseHiddenObjects:
 	db $01,$00,$04
 	db BANK(PrintBookcaseText)
 	dw PrintBookcaseText
@@ -208,7 +208,7 @@
 	db BANK(PrintBookcaseText)
 	dw PrintBookcaseText
 	db $FF
-OaksLabHiddenObjects: ; 46b7a (11:6b7a)
+OaksLabHiddenObjects:
 	db $00,$04,$04
 	db BANK(DisplayOakLabLeftPoster)
 	dw DisplayOakLabLeftPoster
@@ -222,7 +222,7 @@
 	db BANK(DisplayOakLabEmailText)
 	dw DisplayOakLabEmailText
 	db $FF
-ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93)
+ViridianPokecenterHiddenObjects:
 	db $04,$00,$08
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -230,9 +230,9 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-ViridianMartHiddenObjects: ; 46ba0 (11:6ba0)
+ViridianMartHiddenObjects:
 	db $FF
-ViridianSchoolHiddenObjects: ; 46ba1 (11:6ba1)
+ViridianSchoolHiddenObjects:
 	db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1
 	db Bank(PrintNotebookText)
 	dw PrintNotebookText
@@ -240,27 +240,27 @@
 	db BANK(PrintBlackboardLinkCableText)
 	dw PrintBlackboardLinkCableText
 	db $FF
-ViridianGymHiddenObjects: ; 46bae (11:6bae)
+ViridianGymHiddenObjects:
 	db $0f,$0f,$04
 	dbw BANK(GymStatues),GymStatues
 	db $0f,$12,$04
 	dbw BANK(GymStatues),GymStatues
 	db $FF
-Museum1FHiddenObjects: ; 46bbb (11:6bbb)
+Museum1FHiddenObjects:
 	db $03,$02,$04
 	dbw BANK(AerodactylFossil), AerodactylFossil
 	db $06,$02,$04
 	dbw BANK(KabutopsFossil), KabutopsFossil
 	db $FF
-PewterGymHiddenObjects: ; 46bc8 (11:6bc8)
+PewterGymHiddenObjects:
 	db $0a,$03,$04
 	dbw BANK(GymStatues),GymStatues
 	db $0a,$06,$04
 	dbw BANK(GymStatues),GymStatues
 	db $FF
-PewterMartHiddenObjects: ; 46bd5 (11:6bd5)
+PewterMartHiddenObjects:
 	db $FF
-PewterPokecenterHiddenObjects: ; 46bd6 (11:6bd6)
+PewterPokecenterHiddenObjects:
 	db $04,$00,$08
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -268,7 +268,7 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-CeruleanPokecenterHiddenObjects: ; 46be3 (11:6be3)
+CeruleanPokecenterHiddenObjects:
 	db $04,$00,$08
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -276,15 +276,15 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-CeruleanGymHiddenObjects: ; 46bf0 (11:6bf0)
+CeruleanGymHiddenObjects:
 	db $0b,$03,$04
 	dbw BANK(GymStatues),GymStatues
 	db $0b,$06,$04
 	dbw BANK(GymStatues),GymStatues
 	db $FF
-CeruleanMartHiddenObjects: ; 46bfd (11:6bfd)
+CeruleanMartHiddenObjects:
 	db $FF
-LavenderPokecenterHiddenObjects: ; 46bfe (11:6bfe)
+LavenderPokecenterHiddenObjects:
 	db $04,$00,$08
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -292,7 +292,7 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-VermilionPokecenterHiddenObjects: ; 46c0b (11:6c0b)
+VermilionPokecenterHiddenObjects:
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
@@ -300,7 +300,7 @@
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $FF
-VermilionGymHiddenObjects: ; 46c18 (11:6c18)
+VermilionGymHiddenObjects:
 	db $0e,$03,$04
 	dbw BANK(GymStatues), GymStatues
 	db $0e,$06,$04
@@ -338,12 +338,12 @@
 	db $0b,$09,$0e
 	dbw BANK(GymTrashScript), GymTrashScript
 	db $FF
-CeladonMansion2HiddenObjects: ; 46c85 (11:6c85)
+CeladonMansion2HiddenObjects:
 	db $05,$00,$04
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-CeladonPokecenterHiddenObjects: ; 46c8c (11:6c8c)
+CeladonPokecenterHiddenObjects:
 	db $04,$00,$08
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -351,13 +351,13 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-CeladonGymHiddenObjects: ; 46c99 (11:6c99)
+CeladonGymHiddenObjects:
 	db $0f,$03,$04
 	dbw BANK(GymStatues),GymStatues
 	db $0f,$06,$04
 	dbw BANK(GymStatues),GymStatues
 	db $FF
-GameCornerHiddenObjects: ; 46ca6 (11:6ca6)
+GameCornerHiddenObjects:
 	db $0f,$12,$d0
 	dbw BANK(StartSlotMachine), StartSlotMachine
 	db $0e,$12,$d0
@@ -455,7 +455,7 @@
 	db $0f,$0c,COIN+10
 	dbw BANK(HiddenCoins),HiddenCoins
 	db $FF
-CeladonHotelHiddenObjects: ; 46dc7 (11:6dc7)
+CeladonHotelHiddenObjects:
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
@@ -463,7 +463,7 @@
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $FF
-FuchsiaPokecenterHiddenObjects: ; 46dd4 (11:6dd4)
+FuchsiaPokecenterHiddenObjects:
 	db $03,$0d,$04
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
@@ -471,13 +471,13 @@
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
 	db $FF
-FuchsiaGymHiddenObjects: ; 46de1 (11:6de1)
+FuchsiaGymHiddenObjects:
 	db $0f,$03,$04
 	dbw BANK(GymStatues),GymStatues
 	db $0f,$06,$04
 	dbw BANK(GymStatues),GymStatues
 	db $FF
-CinnabarGymHiddenObjects: ; 46dee (11:6dee)
+CinnabarGymHiddenObjects:
 	db $0d,$11,$04
 	dbw BANK(GymStatues),GymStatues
 	db $07,$0f,$01
@@ -499,7 +499,7 @@
 	db Bank(PrintCinnabarQuiz)
 	dw PrintCinnabarQuiz
 	db $FF
-CinnabarPokecenterHiddenObjects: ; 46e19 (11:6e19)
+CinnabarPokecenterHiddenObjects:
 	db $04,$00,$04
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -507,11 +507,11 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-SaffronGymHiddenObjects: ; 46e26 (11:6e26)
+SaffronGymHiddenObjects:
 	db $0f,$09,$04
 	dbw BANK(GymStatues),GymStatues
 	db $FF
-MtMoonPokecenterHiddenObjects: ; 46e2d (11:6e2d)
+MtMoonPokecenterHiddenObjects:
 	db $04,$00,$08
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -519,7 +519,7 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-RockTunnelPokecenterHiddenObjects: ; 46e3a (11:6e3a)
+RockTunnelPokecenterHiddenObjects:
 	db $04,$00,$08
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -527,19 +527,19 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-ViridianForestHiddenObjects: ; 46e47 (11:6e47)
+ViridianForestHiddenObjects:
 	db $12,$01,POTION
 	dbw BANK(HiddenItems),HiddenItems
 	db $2a,$10,ANTIDOTE
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-MtMoon3HiddenObjects: ; 46e54 (11:6e54)
+MtMoon3HiddenObjects:
 	db $0c,$12,MOON_STONE
 	dbw BANK(HiddenItems),HiddenItems
 	db $09,$21,ETHER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-IndigoPlateauHiddenObjects: ; 46e61 (11:6e61)
+IndigoPlateauHiddenObjects:
 	db $0d,$08,$ff
 	db BANK(PrintIndigoPlateauHQText)
 	dw PrintIndigoPlateauHQText
@@ -547,17 +547,17 @@
 	db BANK(PrintIndigoPlateauHQText)
 	dw PrintIndigoPlateauHQText
 	db $FF
-Route25HiddenObjects: ; 46e6e (11:6e6e)
+Route25HiddenObjects:
 	db $03,$26,ETHER
 	dbw BANK(HiddenItems),HiddenItems
 	db $01,$0a,ELIXER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-Route9HiddenObjects: ; 46e7b (11:6e7b)
+Route9HiddenObjects:
 	db $07,$0e,ETHER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SSAnne6HiddenObjects: ; 46e82 (11:6e82)
+SSAnne6HiddenObjects:
 	db $05,$0d,$00
 	dbw BANK(PrintTrashText), PrintTrashText
 	db $07,$0d,$00
@@ -565,29 +565,29 @@
 	db $09,$0d,GREAT_BALL
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SSAnne10HiddenObjects: ; 46e95 (11:6e95)
+SSAnne10HiddenObjects:
 	db $01,$03,HYPER_POTION
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-Route10HiddenObjects: ; 46e9c (11:6e9c)
+Route10HiddenObjects:
 	db $11,$09,SUPER_POTION
 	dbw BANK(HiddenItems),HiddenItems
 	db $35,$10,MAX_ETHER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-RocketHideout1HiddenObjects: ; 46ea9 (11:6ea9)
+RocketHideout1HiddenObjects:
 	db $0f,$15,PP_UP
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-RocketHideout3HiddenObjects: ; 46eb0 (11:6eb0)
+RocketHideout3HiddenObjects:
 	db $11,$1b,NUGGET
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-RocketHideout4HiddenObjects: ; 46eb7 (11:6eb7)
+RocketHideout4HiddenObjects:
 	db $01,$19,SUPER_POTION
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SaffronPokecenterHiddenObjects: ; 46ebe (11:6ebe)
+SaffronPokecenterHiddenObjects:
 	db $04,$00,$04
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -595,59 +595,59 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-PokemonTower5HiddenObjects: ; 46ecb (11:6ecb)
+PokemonTower5HiddenObjects:
 	db $0c,$04,ELIXER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-Route13HiddenObjects: ; 46ed2 (11:6ed2)
+Route13HiddenObjects:
 	db $0e,$01,PP_UP
 	dbw BANK(HiddenItems),HiddenItems
 	db $0d,$10,CALCIUM
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SafariZoneEntranceHiddenObjects: ; 46edf (11:6edf)
+SafariZoneEntranceHiddenObjects:
 	db $01,$0a,NUGGET
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SafariZoneWestHiddenObjects: ; 46ee6 (11:6ee6)
+SafariZoneWestHiddenObjects:
 	db $05,$06,REVIVE
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SilphCo5FHiddenObjects: ; 46eed (11:6eed)
+SilphCo5FHiddenObjects:
 	db $03,$0c,ELIXER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SilphCo9FHiddenObjects: ; 46ef4 (11:6ef4)
+SilphCo9FHiddenObjects:
 	db $0f,$02,MAX_POTION
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-CopycatsHouse2FHiddenObjects: ; 46efb (11:6efb)
+CopycatsHouse2FHiddenObjects:
 	db $01,$01,NUGGET
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-UnknownDungeon1HiddenObjects: ; 46f02 (11:6f02)
+UnknownDungeon1HiddenObjects:
 	db $0b,$0e,RARE_CANDY
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-UnknownDungeon3HiddenObjects: ; 46f09 (11:6f09)
+UnknownDungeon3HiddenObjects:
 	db $03,$1b,ULTRA_BALL
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-PowerPlantHiddenObjects: ; 46f10 (11:6f10)
+PowerPlantHiddenObjects:
 	db $10,$11,MAX_ELIXER
 	dbw BANK(HiddenItems),HiddenItems
 	db $01,$0c,PP_UP
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SeafoamIslands3HiddenObjects: ; 46f1d (11:6f1d)
+SeafoamIslands3HiddenObjects:
 	db $0f,$0f,NUGGET
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SeafoamIslands5HiddenObjects: ; 46f24 (11:6f24)
+SeafoamIslands5HiddenObjects:
 	db $11,$19,ULTRA_BALL
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-Mansion1HiddenObjects: ; 46f2b (11:6f2b)
+Mansion1HiddenObjects:
 	db $10,$08,MOON_STONE
 	dbw BANK(HiddenItems),HiddenItems
 	db $05,$02,$04
@@ -654,12 +654,12 @@
 	db BANK(Mansion1Script_Switches)
 	dw Mansion1Script_Switches
 	db $FF
-Mansion2HiddenObjects: ; 46f38 (11:6f38)
+Mansion2HiddenObjects:
 	db $0b,$02,$04
 	db BANK(Mansion2Script_Switches)
 	dw Mansion2Script_Switches
 	db $FF
-Mansion3HiddenObjects: ; 46f3f (11:6f3f)
+Mansion3HiddenObjects:
 	db $09,$01,MAX_REVIVE
 	dbw BANK(HiddenItems),HiddenItems
 	db $05,$0a,$04
@@ -666,7 +666,7 @@
 	db BANK(Mansion3Script_Switches)
 	dw Mansion3Script_Switches
 	db $FF
-Mansion4HiddenObjects: ; 46f4c (11:6f4c)
+Mansion4HiddenObjects:
 	db $09,$01,RARE_CANDY
 	dbw BANK(HiddenItems),HiddenItems
 	db $03,$14,$04
@@ -676,7 +676,7 @@
 	db BANK(Mansion4Script_Switches)
 	dw Mansion4Script_Switches
 	db $FF
-Route23HiddenObjects: ; 46f5f (11:6f5f)
+Route23HiddenObjects:
 	db $2c,$09,FULL_RESTORE
 	dbw BANK(HiddenItems),HiddenItems
 	db $46,$13,ULTRA_BALL
@@ -684,25 +684,25 @@
 	db $5a,$08,MAX_ETHER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-VictoryRoad2HiddenObjects: ; 46f72 (11:6f72)
+VictoryRoad2HiddenObjects:
 	db $02,$05,ULTRA_BALL
 	dbw BANK(HiddenItems),HiddenItems
 	db $07,$1a,FULL_RESTORE
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-Unused6FHiddenObjects: ; 46f7f (11:6f7f)
+Unused6FHiddenObjects:
 	db $0b,$0e,MAX_ELIXER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-BillsHouseHiddenObjects: ; 46f86 (11:6f86)
+BillsHouseHiddenObjects:
 	db $04,$01,$04
 	dbw BANK(BillsHousePC), BillsHousePC
 	db $FF
-ViridianCityHiddenObjects: ; 46f8d (11:6f8d)
+ViridianCityHiddenObjects:
 	db $04,$0e,POTION
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SafariZoneRestHouse2HiddenObjects: ; 46f94 (11:6f94)
+SafariZoneRestHouse2HiddenObjects:
 	db $04,$00,$08
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -710,7 +710,7 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-SafariZoneRestHouse3HiddenObjects: ; 46fa1 (11:6fa1)
+SafariZoneRestHouse3HiddenObjects:
 	db $04,$00,$08
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -718,7 +718,7 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-SafariZoneRestHouse4HiddenObjects: ; 46fae (11:6fae)
+SafariZoneRestHouse4HiddenObjects:
 	db $04,$00,$08
 	db Bank(PrintBenchGuyText)
 	dw PrintBenchGuyText
@@ -726,12 +726,12 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-Route15GateUpstairsHiddenObjects: ; 46fbb (11:6fbb)
+Route15GateUpstairsHiddenObjects:
 	db $02,$01,$04
 	db BANK(Route15GateLeftBinoculars)
 	dw Route15GateLeftBinoculars
 	db $FF
-LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2)
+LavenderHouse1HiddenObjects:
 	db $01,$00,$00
 	db BANK(PrintMagazinesText)
 	dw PrintMagazinesText
@@ -742,7 +742,7 @@
 	db BANK(PrintMagazinesText)
 	dw PrintMagazinesText
 	db $FF
-CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5)
+CeladonMansion5HiddenObjects:
 	db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1
 	db BANK(PrintBlackboardLinkCableText)
 	dw PrintBlackboardLinkCableText
@@ -753,7 +753,7 @@
 	db Bank(PrintNotebookText)
 	dw PrintNotebookText
 	db $FF
-FightingDojoHiddenObjects: ; 46fe8 (11:6fe8)
+FightingDojoHiddenObjects:
 	db $09,$03,$04
 	db BANK(PrintFightingDojoText)
 	dw PrintFightingDojoText
@@ -767,12 +767,12 @@
 	db BANK(PrintFightingDojoText3)
 	dw PrintFightingDojoText3
 	db $FF
-IndigoPlateauLobbyHiddenObjects: ; 47001 (11:7001)
+IndigoPlateauLobbyHiddenObjects:
 	db $07,$0f,$04
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-CinnabarLab4HiddenObjects: ; 47008 (11:7008)
+CinnabarLab4HiddenObjects:
 	db $04,$00,$04
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
@@ -780,7 +780,7 @@
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-BikeShopHiddenObjects: ; 47015 (11:7015)
+BikeShopHiddenObjects:
 	db $00,$01,$d0
 	dbw BANK(PrintNewBikeText), PrintNewBikeText
 	db $01,$02,$d0
@@ -794,20 +794,20 @@
 	db $05,$01,$d0
 	dbw BANK(PrintNewBikeText), PrintNewBikeText
 	db $FF
-Route11HiddenObjects: ; 4703a (11:703a)
+Route11HiddenObjects:
 	db $05,$30,ESCAPE_ROPE
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-Route12HiddenObjects: ; 47041 (11:7041)
+Route12HiddenObjects:
 	db $3f,$02,HYPER_POTION
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SilphCo11FHiddenObjects: ; 47048 (11:7048)
+SilphCo11FHiddenObjects:
 	db $0c,$0a,$04
 	db BANK(OpenPokemonCenterPC)
 	dw OpenPokemonCenterPC
 	db $FF
-Route17HiddenObjects: ; 4704f (11:704f)
+Route17HiddenObjects:
 	db $0e,$0f,RARE_CANDY
 	dbw BANK(HiddenItems),HiddenItems
 	db $2d,$08,FULL_RESTORE
@@ -819,35 +819,35 @@
 	db $79,$08,MAX_ELIXER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-UndergroundPathNsHiddenObjects: ; 4706e (11:706e)
+UndergroundPathNsHiddenObjects:
 	db $04,$03,FULL_RESTORE
 	dbw BANK(HiddenItems),HiddenItems
 	db $22,$04,X_SPECIAL
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-UndergroundPathWeHiddenObjects: ; 4707b (11:707b)
+UndergroundPathWeHiddenObjects:
 	db $02,$0c,NUGGET
 	dbw BANK(HiddenItems),HiddenItems
 	db $05,$15,ELIXER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-CeladonCityHiddenObjects: ; 47088 (11:7088)
+CeladonCityHiddenObjects:
 	db $0f,$30,PP_UP
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-SeafoamIslands4HiddenObjects: ; 4708f (11:708f)
+SeafoamIslands4HiddenObjects:
 	db $10,$09,MAX_ELIXER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-VermilionCityHiddenObjects: ; 47096 (11:7096)
+VermilionCityHiddenObjects:
 	db $0b,$0e,MAX_ETHER
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-CeruleanCityHiddenObjects: ; 4709d (11:709d)
+CeruleanCityHiddenObjects:
 	db $08,$0f,RARE_CANDY
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
-Route4HiddenObjects: ; 470a4 (11:70a4)
+Route4HiddenObjects:
 	db $03,$28,GREAT_BALL
 	dbw BANK(HiddenItems),HiddenItems
 	db $FF
--- a/data/hide_show_data.asm
+++ b/data/hide_show_data.asm
@@ -4,7 +4,7 @@
 ; Table of 2-Byte pointers, one pointer per map,
 ; goes up to Map_F7, ends with $FFFF.
 ; points to table listing all missable object in the area
-MapHSPointers: ; c8f5 (3:48f5)
+MapHSPointers:
 	dw MapHS00
 	dw MapHS01
 	dw MapHS02
@@ -269,23 +269,23 @@
 Hide	equ $11
 Show	equ $15
 
-MapHSXX: ; cae7 (3:4ae7)
+MapHSXX:
 	db $FF,$FF,$FF
-MapHS00: ; caea (3:4aea)
+MapHS00:
 	db PALLET_TOWN,$01,Hide
-MapHS01: ; caed (3:4aed)
+MapHS01:
 	db VIRIDIAN_CITY,$05,Show
 	db VIRIDIAN_CITY,$07,Hide
-MapHS02: ; caf3 (3:4af3)
+MapHS02:
 	db PEWTER_CITY,$03,Show
 	db PEWTER_CITY,$05,Show
-MapHS03: ; caf9 (3:4af9)
+MapHS03:
 	db CERULEAN_CITY,$01,Hide
 	db CERULEAN_CITY,$02,Show
 	db CERULEAN_CITY,$06,Hide
 	db CERULEAN_CITY,$0A,Show
 	db CERULEAN_CITY,$0B,Show
-MapHS0A: ; cb08 (3:4b08)
+MapHS0A:
 	db SAFFRON_CITY,$01,Show
 	db SAFFRON_CITY,$02,Show
 	db SAFFRON_CITY,$03,Show
@@ -301,34 +301,34 @@
 	db SAFFRON_CITY,$0D,Hide
 	db SAFFRON_CITY,$0E,Show
 	db SAFFRON_CITY,$0F,Hide
-MapHS0D: ; cb35 (3:4b35)
+MapHS0D:
 	db ROUTE_2,$01,Show
 	db ROUTE_2,$02,Show
-MapHS0F: ; cb3b (3:4b3b)
+MapHS0F:
 	db ROUTE_4,$03,Show
-MapHS14: ; cb3e (3:4b3e)
+MapHS14:
 	db ROUTE_9,$0A,Show
-MapHS17: ; cb41 (3:4b41)
+MapHS17:
 	db ROUTE_12,$01,Show
 	db ROUTE_12,$09,Show
 	db ROUTE_12,$0A,Show
-MapHS1A: ; cb4a (3:4b4a)
+MapHS1A:
 	db ROUTE_15,$0B,Show
-MapHS1B: ; cb4d (3:4b4d)
+MapHS1B:
 	db ROUTE_16,$07,Show
-MapHS21: ; cb50 (3:4b50)
+MapHS21:
 	db ROUTE_22,$01,Hide
 	db ROUTE_22,$02,Hide
-MapHS23: ; cb56 (3:4b56)
+MapHS23:
 	db ROUTE_24,$01,Show
 	db ROUTE_24,$08,Show
-MapHS24: ; cb5c (3:4b5c)
+MapHS24:
 	db ROUTE_25,$0A,Show
-MapHS27: ; cb5f (3:4b5f)
+MapHS27:
 	db BLUES_HOUSE,$01,Show
 	db BLUES_HOUSE,$02,Hide
 	db BLUES_HOUSE,$03,Show
-MapHS28: ; cb68 (3:4b68)
+MapHS28:
 	db OAKS_LAB,$01,Show
 	db OAKS_LAB,$02,Show
 	db OAKS_LAB,$03,Show
@@ -337,50 +337,50 @@
 	db OAKS_LAB,$06,Show
 	db OAKS_LAB,$07,Show
 	db OAKS_LAB,$08,Hide
-MapHS2D: ; cb80 (3:4b80)
+MapHS2D:
 	db VIRIDIAN_GYM,$01,Show
 	db VIRIDIAN_GYM,$0B,Show
-MapHS34: ; cb86 (3:4b86)
+MapHS34:
 	db MUSEUM_1F,$05,Show
-MapHSE4: ; cb89 (3:4b89)
+MapHSE4:
 	db UNKNOWN_DUNGEON_1,$01,Show
 	db UNKNOWN_DUNGEON_1,$02,Show
 	db UNKNOWN_DUNGEON_1,$03,Show
-MapHS8F: ; cb92 (3:4b92)
+MapHS8F:
 	db POKEMONTOWER_2,$01,Show
-MapHS90: ; cb95 (3:4b95)
+MapHS90:
 	db POKEMONTOWER_3,$04,Show
-MapHS91: ; cb98 (3:4b98)
+MapHS91:
 	db POKEMONTOWER_4,$04,Show
 	db POKEMONTOWER_4,$05,Show
 	db POKEMONTOWER_4,$06,Show
-MapHS92: ; cba1 (3:4ba1)
+MapHS92:
 	db POKEMONTOWER_5,$06,Show
-MapHS93: ; cba4 (3:4ba4)
+MapHS93:
 	db POKEMONTOWER_6,$04,Show
 	db POKEMONTOWER_6,$05,Show
-MapHS94: ; cbaa (3:4baa)
+MapHS94:
 	db POKEMONTOWER_7,$01,Show
 	db POKEMONTOWER_7,$02,Show
 	db POKEMONTOWER_7,$03,Show
 	db POKEMONTOWER_7,$04,Show
-MapHS95: ; cbb6 (3:4bb6)
+MapHS95:
 	db LAVENDER_HOUSE_1,$05,Hide
-MapHS84: ; cbb9 (3:4bb9)
+MapHS84:
 	db CELADON_MANSION_5,$02,Show
-MapHS87: ; cbbc (3:4bbc)
+MapHS87:
 	db GAME_CORNER,$0B,Show
-MapHS9B: ; cbbf (3:4bbf)
+MapHS9B:
 	db FUCHSIA_HOUSE_2,$02,Show
-MapHSA5: ; cbc2 (3:4bc2)
+MapHSA5:
 	db MANSION_1,$02,Show
 	db MANSION_1,$03,Show
-MapHSB1: ; cbc8 (3:4bc8)
+MapHSB1:
 	db FIGHTING_DOJO,$06,Show
 	db FIGHTING_DOJO,$07,Show
-MapHSB5: ; cbce (3:4bce)
+MapHSB5:
 	db SILPH_CO_1F,$01,Hide
-MapHS53: ; cbd1 (3:4bd1)
+MapHS53:
 	db POWER_PLANT,$01,Show
 	db POWER_PLANT,$02,Show
 	db POWER_PLANT,$03,Show
@@ -395,7 +395,7 @@
 	db POWER_PLANT,$0C,Show
 	db POWER_PLANT,$0D,Show
 	db POWER_PLANT,$0E,Show
-MapHSC2: ; cbfb (3:4bfb)
+MapHSC2:
 	db VICTORY_ROAD_2,$06,Show
 	db VICTORY_ROAD_2,$07,Show
 	db VICTORY_ROAD_2,$08,Show
@@ -402,15 +402,15 @@
 	db VICTORY_ROAD_2,$09,Show
 	db VICTORY_ROAD_2,$0A,Show
 	db VICTORY_ROAD_2,$0D,Show
-MapHS58: ; cc0d (3:4c0d)
+MapHS58:
 	db BILLS_HOUSE,$01,Show
 	db BILLS_HOUSE,$02,Hide
 	db BILLS_HOUSE,$03,Hide
-MapHS33: ; cc16 (3:4c16)
+MapHS33:
 	db VIRIDIAN_FOREST,$05,Show
 	db VIRIDIAN_FOREST,$06,Show
 	db VIRIDIAN_FOREST,$07,Show
-MapHS3B: ; cc1f (3:4c1f)
+MapHS3B:
 	db MT_MOON_1,$08,Show
 	db MT_MOON_1,$09,Show
 	db MT_MOON_1,$0A,Show
@@ -417,38 +417,38 @@
 	db MT_MOON_1,$0B,Show
 	db MT_MOON_1,$0C,Show
 	db MT_MOON_1,$0D,Show
-MapHS3D: ; cc31 (3:4c31)
+MapHS3D:
 	db MT_MOON_3,$06,Show
 	db MT_MOON_3,$07,Show
 	db MT_MOON_3,$08,Show
 	db MT_MOON_3,$09,Show
-MapHS60: ; cc3d (3:4c3d)
+MapHS60:
 	db SS_ANNE_2,$02,Hide
-MapHS66: ; cc40 (3:4c40)
+MapHS66:
 	db SS_ANNE_8,$0A,Show
-MapHS67: ; cc43 (3:4c43)
+MapHS67:
 	db SS_ANNE_9,$06,Show
 	db SS_ANNE_9,$09,Show
-MapHS68: ; cc49 (3:4c49)
+MapHS68:
 	db SS_ANNE_10,$09,Show
 	db SS_ANNE_10,$0A,Show
 	db SS_ANNE_10,$0B,Show
-MapHSC6: ; cc52 (3:4c52)
+MapHSC6:
 	db VICTORY_ROAD_3,$05,Show
 	db VICTORY_ROAD_3,$06,Show
 	db VICTORY_ROAD_3,$0A,Show
-MapHSC7: ; cc5b (3:4c5b)
+MapHSC7:
 	db ROCKET_HIDEOUT_1,$06,Show
 	db ROCKET_HIDEOUT_1,$07,Show
-MapHSC8: ; cc61 (3:4c61)
+MapHSC8:
 	db ROCKET_HIDEOUT_2,$02,Show
 	db ROCKET_HIDEOUT_2,$03,Show
 	db ROCKET_HIDEOUT_2,$04,Show
 	db ROCKET_HIDEOUT_2,$05,Show
-MapHSC9: ; cc6d (3:4c6d)
+MapHSC9:
 	db ROCKET_HIDEOUT_3,$03,Show
 	db ROCKET_HIDEOUT_3,$04,Show
-MapHSCA: ; cc73 (3:4c73)
+MapHSCA:
 	db ROCKET_HIDEOUT_4,$01,Show
 	db ROCKET_HIDEOUT_4,$05,Show
 	db ROCKET_HIDEOUT_4,$06,Show
@@ -455,17 +455,17 @@
 	db ROCKET_HIDEOUT_4,$07,Show
 	db ROCKET_HIDEOUT_4,$08,Hide
 	db ROCKET_HIDEOUT_4,$09,Hide
-MapHSCF: ; cc85 (3:4c85)
+MapHSCF:
 	db SILPH_CO_2F,$01,Show
 	db SILPH_CO_2F,$02,Show
 	db SILPH_CO_2F,$03,Show
 	db SILPH_CO_2F,$04,Show
 	db SILPH_CO_2F,$05,Show
-MapHSD0: ; cc94 (3:4c94)
+MapHSD0:
 	db SILPH_CO_3F,$02,Show
 	db SILPH_CO_3F,$03,Show
 	db SILPH_CO_3F,$04,Show
-MapHSD1: ; cc9d (3:4c9d)
+MapHSD1:
 	db SILPH_CO_4F,$02,Show
 	db SILPH_CO_4F,$03,Show
 	db SILPH_CO_4F,$04,Show
@@ -472,7 +472,7 @@
 	db SILPH_CO_4F,$05,Show
 	db SILPH_CO_4F,$06,Show
 	db SILPH_CO_4F,$07,Show
-MapHSD2: ; ccaf (3:4caf)
+MapHSD2:
 	db SILPH_CO_5F,$02,Show
 	db SILPH_CO_5F,$03,Show
 	db SILPH_CO_5F,$04,Show
@@ -480,13 +480,13 @@
 	db SILPH_CO_5F,$06,Show
 	db SILPH_CO_5F,$07,Show
 	db SILPH_CO_5F,$08,Show
-MapHSD3: ; ccc4 (3:4cc4)
+MapHSD3:
 	db SILPH_CO_6F,$06,Show
 	db SILPH_CO_6F,$07,Show
 	db SILPH_CO_6F,$08,Show
 	db SILPH_CO_6F,$09,Show
 	db SILPH_CO_6F,$0A,Show
-MapHSD4: ; ccd3 (3:4cd3)
+MapHSD4:
 	db SILPH_CO_7F,$05,Show
 	db SILPH_CO_7F,$06,Show
 	db SILPH_CO_7F,$07,Show
@@ -495,15 +495,15 @@
 	db SILPH_CO_7F,$0A,Show
 	db SILPH_CO_7F,$0B,Show
 	db SILPH_CO_7F,$0C,Show
-MapHSD5: ; cceb (3:4ceb)
+MapHSD5:
 	db SILPH_CO_8F,$02,Show
 	db SILPH_CO_8F,$03,Show
 	db SILPH_CO_8F,$04,Show
-MapHSE9: ; ccf4 (3:4cf4)
+MapHSE9:
 	db SILPH_CO_9F,$02,Show
 	db SILPH_CO_9F,$03,Show
 	db SILPH_CO_9F,$04,Show
-MapHSEA: ; ccfd (3:4cfd)
+MapHSEA:
 	db SILPH_CO_10F,$01,Show
 	db SILPH_CO_10F,$02,Show
 	db SILPH_CO_10F,$03,Show
@@ -510,66 +510,66 @@
 	db SILPH_CO_10F,$04,Show
 	db SILPH_CO_10F,$05,Show
 	db SILPH_CO_10F,$06,Show
-MapHSEB: ; cd0f (3:4d0f)
+MapHSEB:
 	db SILPH_CO_11F,$03,Show
 	db SILPH_CO_11F,$04,Show
 	db SILPH_CO_11F,$05,Show
-MapHSF4: ; cd18 (3:4d18)
+MapHSF4:
 	db $F4,$02,Show
-MapHSD6: ; cd1b (3:4d1b)
+MapHSD6:
 	db MANSION_2,$02,Show
-MapHSD7: ; cd1e (3:4d1e)
+MapHSD7:
 	db MANSION_3,$03,Show
 	db MANSION_3,$04,Show
-MapHSD8: ; cd24 (3:4d24)
+MapHSD8:
 	db MANSION_4,$03,Show
 	db MANSION_4,$04,Show
 	db MANSION_4,$05,Show
 	db MANSION_4,$06,Show
 	db MANSION_4,$08,Show
-MapHSD9: ; cd33 (3:4d33)
+MapHSD9:
 	db SAFARI_ZONE_EAST,$01,Show
 	db SAFARI_ZONE_EAST,$02,Show
 	db SAFARI_ZONE_EAST,$03,Show
 	db SAFARI_ZONE_EAST,$04,Show
-MapHSDA: ; cd3f (3:4d3f)
+MapHSDA:
 	db SAFARI_ZONE_NORTH,$01,Show
 	db SAFARI_ZONE_NORTH,$02,Show
-MapHSDB: ; cd45 (3:4d45)
+MapHSDB:
 	db SAFARI_ZONE_WEST,$01,Show
 	db SAFARI_ZONE_WEST,$02,Show
 	db SAFARI_ZONE_WEST,$03,Show
 	db SAFARI_ZONE_WEST,$04,Show
-MapHSDC: ; cd51 (3:4d51)
+MapHSDC:
 	db SAFARI_ZONE_CENTER,$01,Show
-MapHSE2: ; cd54 (3:4d54)
+MapHSE2:
 	db UNKNOWN_DUNGEON_2,$01,Show
 	db UNKNOWN_DUNGEON_2,$02,Show
 	db UNKNOWN_DUNGEON_2,$03,Show
-MapHSE3: ; cd5d (3:4d5d)
+MapHSE3:
 	db UNKNOWN_DUNGEON_3,$01,Show
 	db UNKNOWN_DUNGEON_3,$02,Show
 	db UNKNOWN_DUNGEON_3,$03,Show
-MapHS6C: ; cd66 (3:4d66)
+MapHS6C:
 	db VICTORY_ROAD_1,$03,Show
 	db VICTORY_ROAD_1,$04,Show
-MapHS78: ; cd6c (3:4d6c)
+MapHS78:
 	db CHAMPIONS_ROOM,$02,Hide
-MapHSC0: ; cd6f (3:4d6f)
+MapHSC0:
 	db SEAFOAM_ISLANDS_1,$01,Show
 	db SEAFOAM_ISLANDS_1,$02,Show
-MapHS9F: ; cd75 (3:4d75)
+MapHS9F:
 	db SEAFOAM_ISLANDS_2,$01,Hide
 	db SEAFOAM_ISLANDS_2,$02,Hide
-MapHSA0: ; cd7b (3:4d7b)
+MapHSA0:
 	db SEAFOAM_ISLANDS_3,$01,Hide
 	db SEAFOAM_ISLANDS_3,$02,Hide
-MapHSA1: ; cd81 (3:4d81)
+MapHSA1:
 	db SEAFOAM_ISLANDS_4,$02,Show
 	db SEAFOAM_ISLANDS_4,$03,Show
 	db SEAFOAM_ISLANDS_4,$05,Hide
 	db SEAFOAM_ISLANDS_4,$06,Hide
-MapHSA2: ; cd8d (3:4d8d)
+MapHSA2:
 	db SEAFOAM_ISLANDS_5,$01,Hide
 	db SEAFOAM_ISLANDS_5,$02,Hide
 	db SEAFOAM_ISLANDS_5,$03,Show
--- a/data/item_prices.asm
+++ b/data/item_prices.asm
@@ -1,4 +1,4 @@
-ItemPrices: ; 4608 (1:4608)
+ItemPrices:
 	money 0     ; MASTER_BALL
 	money 1200  ; ULTRA_BALL
 	money 600   ; GREAT_BALL
--- a/data/key_items.asm
+++ b/data/key_items.asm
@@ -1,4 +1,4 @@
-KeyItemBitfield: ; e799 (3:6799)
+KeyItemBitfield:
 	db %11110000
 	db %00000001
 	db %11110000
--- a/data/mapHeaders/celadoncity.asm
+++ b/data/mapHeaders/celadoncity.asm
@@ -1,4 +1,4 @@
-CeladonCity_h: ; 18000 (6:4000)
+CeladonCity_h:
 	db OVERWORLD ; tileset
 	db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x)
 	dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts
--- a/data/mapHeaders/gary.asm
+++ b/data/mapHeaders/gary.asm
@@ -1,4 +1,4 @@
-Gary_h: ; 75f11 (1d:5f11)
+Gary_h:
 	db GYM ;tileset
 	db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; Height, Width
 	dw GaryBlocks, GaryTextPointers, GaryScript
--- a/data/mapHeaders/pallettown.asm
+++ b/data/mapHeaders/pallettown.asm
@@ -1,4 +1,4 @@
-PalletTown_h: ; 182a1 (6:42a1)
+PalletTown_h:
 	db OVERWORLD ; tileset
 	db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions
 	dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript
--- a/data/mapHeaders/redshouse1f.asm
+++ b/data/mapHeaders/redshouse1f.asm
@@ -1,4 +1,4 @@
-RedsHouse1F_h: ; 4815c (12:415c)
+RedsHouse1F_h:
 	db REDS_HOUSE_1 ; tileset
 	db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions
 	dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript
--- a/data/mapHeaders/redshouse2f.asm
+++ b/data/mapHeaders/redshouse2f.asm
@@ -1,4 +1,4 @@
-RedsHouse2F_h: ; 5c0a4 (17:40a4)
+RedsHouse2F_h:
 	db REDS_HOUSE_2 ; tileset
 	db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions
 	dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript
--- a/data/mapHeaders/route15gateupstairs.asm
+++ b/data/mapHeaders/route15gateupstairs.asm
@@ -1,4 +1,4 @@
-Route15GateUpstairs_h: ; 4963e (12:563e)
+Route15GateUpstairs_h:
 	db GATE ; tileset
 	db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts
--- a/data/mapHeaders/route2.asm
+++ b/data/mapHeaders/route2.asm
@@ -1,4 +1,4 @@
-Route2_h: ; 54000 (15:4000)
+Route2_h:
 	db 00 ; Tileset
 	db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles)
 	dw Route2Blocks, Route2TextPointers, Route2Script
--- a/data/mapHeaders/undergroundpathentranceroute7copy.asm
+++ b/data/mapHeaders/undergroundpathentranceroute7copy.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute7Copy_h: ; 5d75d (17:575d)
+UndergroundPathEntranceRoute7Copy_h:
 	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts
--- a/data/mapObjects/blueshouse.asm
+++ b/data/mapObjects/blueshouse.asm
@@ -1,4 +1,4 @@
-BluesHouseObject: ; 19bce (6:5bce)
+BluesHouseObject:
 	db $0A ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/redshouse1f.asm
+++ b/data/mapObjects/redshouse1f.asm
@@ -1,4 +1,4 @@
-RedsHouse1FObject: ; 481e4 (12:41e4)
+RedsHouse1FObject:
 	db $0A ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/route15gateupstairs.asm
+++ b/data/mapObjects/route15gateupstairs.asm
@@ -1,4 +1,4 @@
-Route15GateUpstairsObject: ; 4969d (12:569d)
+Route15GateUpstairsObject:
 	db $a ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/undergroundpathentranceroute7copy.asm
+++ b/data/mapObjects/undergroundpathentranceroute7copy.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787)
+UndergroundPathEntranceRoute7CopyObject:
 	db $a ; border block
 
 	db $3 ; warps
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -1,5 +1,5 @@
 ; see also MapHeaderPointers
-MapHeaderBanks: ; c23d (3:423d)
+MapHeaderBanks:
 	db BANK(PalletTown_h) ;PALLET_TOWN
 	db BANK(ViridianCity_h) ; VIRIDIAN_CITY
 	db BANK(PewterCity_h) ; PEWTER_CITY
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -1,5 +1,5 @@
 ; see also MapHeaderBanks
-MapHeaderPointers:: ; 01ae (0:01ae)
+MapHeaderPointers::
 	dw PalletTown_h
 	dw ViridianCity_h
 	dw PewterCity_h
--- a/data/map_songs.asm
+++ b/data/map_songs.asm
@@ -1,4 +1,4 @@
-MapSongBanks: ; c04d (3:404d)
+MapSongBanks:
 	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY
--- a/data/mon_palettes.asm
+++ b/data/mon_palettes.asm
@@ -1,4 +1,4 @@
-MonsterPalettes: ; 725c8 (1c:65c8)
+MonsterPalettes:
 	db PAL_MEWMON    ; MISSINGNO
 	db PAL_GREENMON  ; BULBASAUR
 	db PAL_GREENMON  ; IVYSAUR
--- a/data/mon_party_sprites.asm
+++ b/data/mon_party_sprites.asm
@@ -1,4 +1,4 @@
-MonPartyData: ; 7190d (1c:590d)
+MonPartyData:
 	dn SPRITE_GRASS, SPRITE_GRASS			;Bulbasaur/Ivysaur
 	dn SPRITE_GRASS, SPRITE_MON				;Venusaur/Charmander
 	dn SPRITE_MON, SPRITE_MON				;Charmeleon/Charizard
--- a/data/pokedex_entries.asm
+++ b/data/pokedex_entries.asm
@@ -1,4 +1,4 @@
-PokedexEntryPointers: ; 4047e (10:447e)
+PokedexEntryPointers:
 	dw RhydonDexEntry
 	dw KangaskhanDexEntry
 	dw NidoranMDexEntry
@@ -195,7 +195,7 @@
 ; weight in pounds
 ; text entry
 
-RhydonDexEntry: ; 405fa (10:45fa)
+RhydonDexEntry:
 	db "DRILL@"
 	db 6,3
 	dw 2650
@@ -202,7 +202,7 @@
 	TX_FAR _RhydonDexEntry
 	db "@"
 
-KangaskhanDexEntry: ; 40609 (10:4609)
+KangaskhanDexEntry:
 	db "PARENT@"
 	db 7,3
 	dw 1760
@@ -209,7 +209,7 @@
 	TX_FAR _KangaskhanDexEntry
 	db "@"
 
-NidoranMDexEntry: ; 40619 (10:4619)
+NidoranMDexEntry:
 	db "POISON PIN@"
 	db 1,8
 	dw 200
@@ -216,7 +216,7 @@
 	TX_FAR _NidoranMDexEntry
 	db "@"
 
-ClefairyDexEntry: ; 4062d (10:462d)
+ClefairyDexEntry:
 	db "FAIRY@"
 	db 2,0
 	dw 170
@@ -223,7 +223,7 @@
 	TX_FAR _ClefairyDexEntry
 	db "@"
 
-SpearowDexEntry: ; 4063c (10:463c)
+SpearowDexEntry:
 	db "TINY BIRD@"
 	db 1,0
 	dw 40
@@ -230,7 +230,7 @@
 	TX_FAR _SpearowDexEntry
 	db "@"
 
-VoltorbDexEntry: ; 4064f (10:464f)
+VoltorbDexEntry:
 	db "BALL@"
 	db 1,8
 	dw 230
@@ -237,7 +237,7 @@
 	TX_FAR _VoltorbDexEntry
 	db "@"
 
-NidokingDexEntry: ; 4065d (10:465d)
+NidokingDexEntry:
 	db "DRILL@"
 	db 4,7
 	dw 1370
@@ -244,7 +244,7 @@
 	TX_FAR _NidokingDexEntry
 	db "@"
 
-SlowbroDexEntry: ; 4066c (10:466c)
+SlowbroDexEntry:
 	db "HERMITCRAB@"
 	db 5,3
 	dw 1730
@@ -251,7 +251,7 @@
 	TX_FAR _SlowbroDexEntry
 	db "@"
 
-IvysaurDexEntry: ; 40680 (10:4680)
+IvysaurDexEntry:
 	db "SEED@"
 	db 3,3
 	dw 290
@@ -258,7 +258,7 @@
 	TX_FAR _IvysaurDexEntry
 	db "@"
 
-ExeggutorDexEntry: ; 4068e (10:468e)
+ExeggutorDexEntry:
 	db "COCONUT@"
 	db 6,7
 	dw 2650
@@ -265,7 +265,7 @@
 	TX_FAR _ExeggutorDexEntry
 	db "@"
 
-LickitungDexEntry: ; 4069f (10:469f)
+LickitungDexEntry:
 	db "LICKING@"
 	db 3,11
 	dw 1440
@@ -272,7 +272,7 @@
 	TX_FAR _LickitungDexEntry
 	db "@"
 
-ExeggcuteDexEntry: ; 406b0 (10:46b0)
+ExeggcuteDexEntry:
 	db "EGG@"
 	db 1,4
 	dw 60
@@ -279,7 +279,7 @@
 	TX_FAR _ExeggcuteDexEntry
 	db "@"
 
-GrimerDexEntry: ; 406bd (10:46bd)
+GrimerDexEntry:
 	db "SLUDGE@"
 	db 2,11
 	dw 660
@@ -286,7 +286,7 @@
 	TX_FAR _GrimerDexEntry
 	db "@"
 
-GengarDexEntry: ; 406cd (10:46cd)
+GengarDexEntry:
 	db "SHADOW@"
 	db 4,11
 	dw 890
@@ -293,7 +293,7 @@
 	TX_FAR _GengarDexEntry
 	db "@"
 
-NidoranFDexEntry: ; 406dd (10:46dd)
+NidoranFDexEntry:
 	db "POISON PIN@"
 	db 1,4
 	dw 150
@@ -300,7 +300,7 @@
 	TX_FAR _NidoranFDexEntry
 	db "@"
 
-NidoqueenDexEntry: ; 406f1 (10:46f1)
+NidoqueenDexEntry:
 	db "DRILL@"
 	db 4,3
 	dw 1320
@@ -307,7 +307,7 @@
 	TX_FAR _NidoqueenDexEntry
 	db "@"
 
-CuboneDexEntry: ; 40700 (10:4700)
+CuboneDexEntry:
 	db "LONELY@"
 	db 1,4
 	dw 140
@@ -314,7 +314,7 @@
 	TX_FAR _CuboneDexEntry
 	db "@"
 
-RhyhornDexEntry: ; 40710 (10:4710)
+RhyhornDexEntry:
 	db "SPIKES@"
 	db 3,3
 	dw 2540
@@ -321,7 +321,7 @@
 	TX_FAR _RhyhornDexEntry
 	db "@"
 
-LaprasDexEntry: ; 40720 (10:4720)
+LaprasDexEntry:
 	db "TRANSPORT@"
 	db 8,2
 	dw 4850
@@ -328,7 +328,7 @@
 	TX_FAR _LaprasDexEntry
 	db "@"
 
-ArcanineDexEntry: ; 40733 (10:4733)
+ArcanineDexEntry:
 	db "LEGENDARY@"
 	db 6,3
 	dw 3420
@@ -335,7 +335,7 @@
 	TX_FAR _ArcanineDexEntry
 	db "@"
 
-MewDexEntry: ; 40746 (10:4746)
+MewDexEntry:
 	db "NEW SPECIE@"
 	db 1,4
 	dw 90
@@ -342,7 +342,7 @@
 	TX_FAR _MewDexEntry
 	db "@"
 
-GyaradosDexEntry: ; 4075a (10:475a)
+GyaradosDexEntry:
 	db "ATROCIOUS@"
 	db 21,4
 	dw 5180
@@ -349,7 +349,7 @@
 	TX_FAR _GyaradosDexEntry
 	db "@"
 
-ShellderDexEntry: ; 4076d (10:476d)
+ShellderDexEntry:
 	db "BIVALVE@"
 	db 1,0
 	dw 90
@@ -356,7 +356,7 @@
 	TX_FAR _ShellderDexEntry
 	db "@"
 
-TentacoolDexEntry: ; 4077e (10:477e)
+TentacoolDexEntry:
 	db "JELLYFISH@"
 	db 2,11
 	dw 1000
@@ -363,7 +363,7 @@
 	TX_FAR _TentacoolDexEntry
 	db "@"
 
-GastlyDexEntry: ; 40791 (10:4791)
+GastlyDexEntry:
 	db "GAS@"
 	db 4,3
 	dw 2
@@ -370,7 +370,7 @@
 	TX_FAR _GastlyDexEntry
 	db "@"
 
-ScytherDexEntry: ; 4079e (10:479e)
+ScytherDexEntry:
 	db "MANTIS@"
 	db 4,11
 	dw 1230
@@ -377,7 +377,7 @@
 	TX_FAR _ScytherDexEntry
 	db "@"
 
-StaryuDexEntry: ; 407ae (10:47ae)
+StaryuDexEntry:
 	db "STARSHAPE@"
 	db 2,7
 	dw 760
@@ -384,7 +384,7 @@
 	TX_FAR _StaryuDexEntry
 	db "@"
 
-BlastoiseDexEntry: ; 407c1 (10:47c1)
+BlastoiseDexEntry:
 	db "SHELLFISH@"
 	db 5,3
 	dw 1890
@@ -391,7 +391,7 @@
 	TX_FAR _BlastoiseDexEntry
 	db "@"
 
-PinsirDexEntry: ; 407d4 (10:47d4)
+PinsirDexEntry:
 	db "STAGBEETLE@"
 	db 4,11
 	dw 1210
@@ -398,7 +398,7 @@
 	TX_FAR _PinsirDexEntry
 	db "@"
 
-TangelaDexEntry: ; 407e8 (10:47e8)
+TangelaDexEntry:
 	db "VINE@"
 	db 3,3
 	dw 770
@@ -405,7 +405,7 @@
 	TX_FAR _TangelaDexEntry
 	db "@"
 
-GrowlitheDexEntry: ; 407f6 (10:47f6)
+GrowlitheDexEntry:
 	db "PUPPY@"
 	db 2,4
 	dw 420
@@ -412,7 +412,7 @@
 	TX_FAR _GrowlitheDexEntry
 	db "@"
 
-OnixDexEntry: ; 40805 (10:4805)
+OnixDexEntry:
 	db "ROCK SNAKE@"
 	db 28,10
 	dw 4630
@@ -419,7 +419,7 @@
 	TX_FAR _OnixDexEntry
 	db "@"
 
-FearowDexEntry: ; 40819 (10:4819)
+FearowDexEntry:
 	db "BEAK@"
 	db 3,11
 	dw 840
@@ -426,7 +426,7 @@
 	TX_FAR _FearowDexEntry
 	db "@"
 
-PidgeyDexEntry: ; 40827 (10:4827)
+PidgeyDexEntry:
 	db "TINY BIRD@"
 	db 1,0
 	dw 40
@@ -433,7 +433,7 @@
 	TX_FAR _PidgeyDexEntry
 	db "@"
 
-SlowpokeDexEntry: ; 4083a (10:483a)
+SlowpokeDexEntry:
 	db "DOPEY@"
 	db 3,11
 	dw 790
@@ -440,7 +440,7 @@
 	TX_FAR _SlowpokeDexEntry
 	db "@"
 
-KadabraDexEntry: ; 40849 (10:4849)
+KadabraDexEntry:
 	db "PSI@"
 	db 4,3
 	dw 1250
@@ -447,7 +447,7 @@
 	TX_FAR _KadabraDexEntry
 	db "@"
 
-GravelerDexEntry: ; 40856 (10:4856)
+GravelerDexEntry:
 	db "ROCK@"
 	db 3,3
 	dw 2320
@@ -454,7 +454,7 @@
 	TX_FAR _GravelerDexEntry
 	db "@"
 
-ChanseyDexEntry: ; 40864 (10:4864)
+ChanseyDexEntry:
 	db "EGG@"
 	db 3,7
 	dw 760
@@ -461,7 +461,7 @@
 	TX_FAR _ChanseyDexEntry
 	db "@"
 
-MachokeDexEntry: ; 40871 (10:4871)
+MachokeDexEntry:
 	db "SUPERPOWER@"
 	db 4,11
 	dw 1550
@@ -468,7 +468,7 @@
 	TX_FAR _MachokeDexEntry
 	db "@"
 
-MrMimeDexEntry: ; 40885 (10:4885)
+MrMimeDexEntry:
 	db "BARRIER@"
 	db 4,3
 	dw 1200
@@ -475,7 +475,7 @@
 	TX_FAR _MrMimeDexEntry
 	db "@"
 
-HitmonleeDexEntry: ; 40896 (10:4896)
+HitmonleeDexEntry:
 	db "KICKING@"
 	db 4,11
 	dw 1100
@@ -482,7 +482,7 @@
 	TX_FAR _HitmonleeDexEntry
 	db "@"
 
-HitmonchanDexEntry: ; 408a7 (10:48a7)
+HitmonchanDexEntry:
 	db "PUNCHING@"
 	db 4,7
 	dw 1110
@@ -489,7 +489,7 @@
 	TX_FAR _HitmonchanDexEntry
 	db "@"
 
-ArbokDexEntry: ; 408b9 (10:48b9)
+ArbokDexEntry:
 	db "COBRA@"
 	db 11,6
 	dw 1430
@@ -496,7 +496,7 @@
 	TX_FAR _ArbokDexEntry
 	db "@"
 
-ParasectDexEntry: ; 408c8 (10:48c8)
+ParasectDexEntry:
 	db "MUSHROOM@"
 	db 3,3
 	dw 650
@@ -503,7 +503,7 @@
 	TX_FAR _ParasectDexEntry
 	db "@"
 
-PsyduckDexEntry: ; 408da (10:48da)
+PsyduckDexEntry:
 	db "DUCK@"
 	db 2,7
 	dw 430
@@ -510,7 +510,7 @@
 	TX_FAR _PsyduckDexEntry
 	db "@"
 
-DrowzeeDexEntry: ; 408e8 (10:48e8)
+DrowzeeDexEntry:
 	db "HYPNOSIS@"
 	db 3,3
 	dw 710
@@ -517,7 +517,7 @@
 	TX_FAR _DrowzeeDexEntry
 	db "@"
 
-GolemDexEntry: ; 408fa (10:48fa)
+GolemDexEntry:
 	db "MEGATON@"
 	db 4,7
 	dw 6620
@@ -524,7 +524,7 @@
 	TX_FAR _GolemDexEntry
 	db "@"
 
-MagmarDexEntry: ; 4090b (10:490b)
+MagmarDexEntry:
 	db "SPITFIRE@"
 	db 4,3
 	dw 980
@@ -531,7 +531,7 @@
 	TX_FAR _MagmarDexEntry
 	db "@"
 
-ElectabuzzDexEntry: ; 4091d (10:491d)
+ElectabuzzDexEntry:
 	db "ELECTRIC@"
 	db 3,7
 	dw 660
@@ -538,7 +538,7 @@
 	TX_FAR _ElectabuzzDexEntry
 	db "@"
 
-MagnetonDexEntry: ; 4092f (10:492f)
+MagnetonDexEntry:
 	db "MAGNET@"
 	db 3,3
 	dw 1320
@@ -545,7 +545,7 @@
 	TX_FAR _MagnetonDexEntry
 	db "@"
 
-KoffingDexEntry: ; 4093f (10:493f)
+KoffingDexEntry:
 	db "POISON GAS@"
 	db 2,0
 	dw 20
@@ -552,7 +552,7 @@
 	TX_FAR _KoffingDexEntry
 	db "@"
 
-MankeyDexEntry: ; 40953 (10:4953)
+MankeyDexEntry:
 	db "PIG MONKEY@"
 	db 1,8
 	dw 620
@@ -559,7 +559,7 @@
 	TX_FAR _MankeyDexEntry
 	db "@"
 
-SeelDexEntry: ; 40967 (10:4967)
+SeelDexEntry:
 	db "SEA LION@"
 	db 3,7
 	dw 1980
@@ -566,7 +566,7 @@
 	TX_FAR _SeelDexEntry
 	db "@"
 
-DiglettDexEntry: ; 40979 (10:4979)
+DiglettDexEntry:
 	db "MOLE@"
 	db 0,8
 	dw 20
@@ -573,7 +573,7 @@
 	TX_FAR _DiglettDexEntry
 	db "@"
 
-TaurosDexEntry: ; 40987 (10:4987)
+TaurosDexEntry:
 	db "WILD BULL@"
 	db 4,7
 	dw 1950
@@ -580,7 +580,7 @@
 	TX_FAR _TaurosDexEntry
 	db "@"
 
-FarfetchdDexEntry: ; 4099a (10:499a)
+FarfetchdDexEntry:
 	db "WILD DUCK@"
 	db 2,7
 	dw 330
@@ -587,7 +587,7 @@
 	TX_FAR _FarfetchdDexEntry
 	db "@"
 
-VenonatDexEntry: ; 409ad (10:49ad)
+VenonatDexEntry:
 	db "INSECT@"
 	db 3,3
 	dw 660
@@ -594,7 +594,7 @@
 	TX_FAR _VenonatDexEntry
 	db "@"
 
-DragoniteDexEntry: ; 409bd (10:49bd)
+DragoniteDexEntry:
 	db "DRAGON@"
 	db 7,3
 	dw 4630
@@ -601,7 +601,7 @@
 	TX_FAR _DragoniteDexEntry
 	db "@"
 
-DoduoDexEntry: ; 409cd (10:49cd)
+DoduoDexEntry:
 	db "TWIN BIRD@"
 	db 4,7
 	dw 860
@@ -608,7 +608,7 @@
 	TX_FAR _DoduoDexEntry
 	db "@"
 
-PoliwagDexEntry: ; 409e0 (10:49e0)
+PoliwagDexEntry:
 	db "TADPOLE@"
 	db 2,0
 	dw 270
@@ -615,7 +615,7 @@
 	TX_FAR _PoliwagDexEntry
 	db "@"
 
-JynxDexEntry: ; 409f1 (10:49f1)
+JynxDexEntry:
 	db "HUMANSHAPE@"
 	db 4,7
 	dw 900
@@ -622,7 +622,7 @@
 	TX_FAR _JynxDexEntry
 	db "@"
 
-MoltresDexEntry: ; 40a05 (10:4a05)
+MoltresDexEntry:
 	db "FLAME@"
 	db 6,7
 	dw 1320
@@ -629,7 +629,7 @@
 	TX_FAR _MoltresDexEntry
 	db "@"
 
-ArticunoDexEntry: ; 40a14 (10:4a14)
+ArticunoDexEntry:
 	db "FREEZE@"
 	db 5,7
 	dw 1220
@@ -636,7 +636,7 @@
 	TX_FAR _ArticunoDexEntry
 	db "@"
 
-ZapdosDexEntry: ; 40a24 (10:4a24)
+ZapdosDexEntry:
 	db "ELECTRIC@"
 	db 5,3
 	dw 1160
@@ -643,7 +643,7 @@
 	TX_FAR _ZapdosDexEntry
 	db "@"
 
-DittoDexEntry: ; 40a36 (10:4a36)
+DittoDexEntry:
 	db "TRANSFORM@"
 	db 1,0
 	dw 90
@@ -650,7 +650,7 @@
 	TX_FAR _DittoDexEntry
 	db "@"
 
-MeowthDexEntry: ; 40a49 (10:4a49)
+MeowthDexEntry:
 	db "SCRATCHCAT@"
 	db 1,4
 	dw 90
@@ -657,7 +657,7 @@
 	TX_FAR _MeowthDexEntry
 	db "@"
 
-KrabbyDexEntry: ; 40a5d (10:4a5d)
+KrabbyDexEntry:
 	db "RIVER CRAB@"
 	db 1,4
 	dw 140
@@ -664,7 +664,7 @@
 	TX_FAR _KrabbyDexEntry
 	db "@"
 
-VulpixDexEntry: ; 40a71 (10:4a71)
+VulpixDexEntry:
 	db "FOX@"
 	db 2,0
 	dw 220
@@ -671,7 +671,7 @@
 	TX_FAR _VulpixDexEntry
 	db "@"
 
-NinetalesDexEntry: ; 40a7e (10:4a7e)
+NinetalesDexEntry:
 	db "FOX@"
 	db 3,7
 	dw 440
@@ -678,7 +678,7 @@
 	TX_FAR _NinetalesDexEntry
 	db "@"
 
-PikachuDexEntry: ; 40a8b (10:4a8b)
+PikachuDexEntry:
 	db "MOUSE@"
 	db 1,4
 	dw 130
@@ -685,7 +685,7 @@
 	TX_FAR _PikachuDexEntry
 	db "@"
 
-RaichuDexEntry: ; 40a9a (10:4a9a)
+RaichuDexEntry:
 	db "MOUSE@"
 	db 2,7
 	dw 660
@@ -692,7 +692,7 @@
 	TX_FAR _RaichuDexEntry
 	db "@"
 
-DratiniDexEntry: ; 40aa9 (10:4aa9)
+DratiniDexEntry:
 	db "DRAGON@"
 	db 5,11
 	dw 70
@@ -699,7 +699,7 @@
 	TX_FAR _DratiniDexEntry
 	db "@"
 
-DragonairDexEntry: ; 40ab9 (10:4ab9)
+DragonairDexEntry:
 	db "DRAGON@"
 	db 13,1
 	dw 360
@@ -706,7 +706,7 @@
 	TX_FAR _DragonairDexEntry
 	db "@"
 
-KabutoDexEntry: ; 40ac9 (10:4ac9)
+KabutoDexEntry:
 	db "SHELLFISH@"
 	db 1,8
 	dw 250
@@ -713,7 +713,7 @@
 	TX_FAR _KabutoDexEntry
 	db "@"
 
-KabutopsDexEntry: ; 40adc (10:4adc)
+KabutopsDexEntry:
 	db "SHELLFISH@"
 	db 4,3
 	dw 890
@@ -720,7 +720,7 @@
 	TX_FAR _KabutopsDexEntry
 	db "@"
 
-HorseaDexEntry: ; 40aef (10:4aef)
+HorseaDexEntry:
 	db "DRAGON@"
 	db 1,4
 	dw 180
@@ -727,7 +727,7 @@
 	TX_FAR _HorseaDexEntry
 	db "@"
 
-SeadraDexEntry: ; 40aff (10:4aff)
+SeadraDexEntry:
 	db "DRAGON@"
 	db 3,11
 	dw 550
@@ -734,7 +734,7 @@
 	TX_FAR _SeadraDexEntry
 	db "@"
 
-SandshrewDexEntry: ; 40b0f (10:4b0f)
+SandshrewDexEntry:
 	db "MOUSE@"
 	db 2,0
 	dw 260
@@ -741,7 +741,7 @@
 	TX_FAR _SandshrewDexEntry
 	db "@"
 
-SandslashDexEntry: ; 40b1e (10:4b1e)
+SandslashDexEntry:
 	db "MOUSE@"
 	db 3,3
 	dw 650
@@ -748,7 +748,7 @@
 	TX_FAR _SandslashDexEntry
 	db "@"
 
-OmanyteDexEntry: ; 40b2d (10:4b2d)
+OmanyteDexEntry:
 	db "SPIRAL@"
 	db 1,4
 	dw 170
@@ -755,7 +755,7 @@
 	TX_FAR _OmanyteDexEntry
 	db "@"
 
-OmastarDexEntry: ; 40b3d (10:4b3d)
+OmastarDexEntry:
 	db "SPIRAL@"
 	db 3,3
 	dw 770
@@ -762,7 +762,7 @@
 	TX_FAR _OmastarDexEntry
 	db "@"
 
-JigglypuffDexEntry: ; 40b4d (10:4b4d)
+JigglypuffDexEntry:
 	db "BALLOON@"
 	db 1,8
 	dw 120
@@ -769,7 +769,7 @@
 	TX_FAR _JigglypuffDexEntry
 	db "@"
 
-WigglytuffDexEntry: ; 40b5e (10:4b5e)
+WigglytuffDexEntry:
 	db "BALLOON@"
 	db 3,3
 	dw 260
@@ -776,7 +776,7 @@
 	TX_FAR _WigglytuffDexEntry
 	db "@"
 
-EeveeDexEntry: ; 40b6f (10:4b6f)
+EeveeDexEntry:
 	db "EVOLUTION@"
 	db 1,0
 	dw 140
@@ -783,7 +783,7 @@
 	TX_FAR _EeveeDexEntry
 	db "@"
 
-FlareonDexEntry: ; 40b82 (10:4b82)
+FlareonDexEntry:
 	db "FLAME@"
 	db 2,11
 	dw 550
@@ -790,7 +790,7 @@
 	TX_FAR _FlareonDexEntry
 	db "@"
 
-JolteonDexEntry: ; 40b91 (10:4b91)
+JolteonDexEntry:
 	db "LIGHTNING@"
 	db 2,7
 	dw 540
@@ -797,7 +797,7 @@
 	TX_FAR _JolteonDexEntry
 	db "@"
 
-VaporeonDexEntry: ; 40ba4 (10:4ba4)
+VaporeonDexEntry:
 	db "BUBBLE JET@"
 	db 3,3
 	dw 640
@@ -804,7 +804,7 @@
 	TX_FAR _VaporeonDexEntry
 	db "@"
 
-MachopDexEntry: ; 40bb8 (10:4bb8)
+MachopDexEntry:
 	db "SUPERPOWER@"
 	db 2,7
 	dw 430
@@ -811,7 +811,7 @@
 	TX_FAR _MachopDexEntry
 	db "@"
 
-ZubatDexEntry: ; 40bcc (10:4bcc)
+ZubatDexEntry:
 	db "BAT@"
 	db 2,7
 	dw 170
@@ -818,7 +818,7 @@
 	TX_FAR _ZubatDexEntry
 	db "@"
 
-EkansDexEntry: ; 40bd9 (10:4bd9)
+EkansDexEntry:
 	db "SNAKE@"
 	db 6,7
 	dw 150
@@ -825,7 +825,7 @@
 	TX_FAR _EkansDexEntry
 	db "@"
 
-ParasDexEntry: ; 40be8 (10:4be8)
+ParasDexEntry:
 	db "MUSHROOM@"
 	db 1,0
 	dw 120
@@ -832,7 +832,7 @@
 	TX_FAR _ParasDexEntry
 	db "@"
 
-PoliwhirlDexEntry: ; 40bfa (10:4bfa)
+PoliwhirlDexEntry:
 	db "TADPOLE@"
 	db 3,3
 	dw 440
@@ -839,7 +839,7 @@
 	TX_FAR _PoliwhirlDexEntry
 	db "@"
 
-PoliwrathDexEntry: ; 40c0b (10:4c0b)
+PoliwrathDexEntry:
 	db "TADPOLE@"
 	db 4,3
 	dw 1190
@@ -846,7 +846,7 @@
 	TX_FAR _PoliwrathDexEntry
 	db "@"
 
-WeedleDexEntry: ; 40c1c (10:4c1c)
+WeedleDexEntry:
 	db "HAIRY BUG@"
 	db 1,0
 	dw 70
@@ -853,7 +853,7 @@
 	TX_FAR _WeedleDexEntry
 	db "@"
 
-KakunaDexEntry: ; 40c2f (10:4c2f)
+KakunaDexEntry:
 	db "COCOON@"
 	db 2,0
 	dw 220
@@ -860,7 +860,7 @@
 	TX_FAR _KakunaDexEntry
 	db "@"
 
-BeedrillDexEntry: ; 40c3f (10:4c3f)
+BeedrillDexEntry:
 	db "POISON BEE@"
 	db 3,3
 	dw 650
@@ -867,7 +867,7 @@
 	TX_FAR _BeedrillDexEntry
 	db "@"
 
-DodrioDexEntry: ; 40c53 (10:4c53)
+DodrioDexEntry:
 	db "TRIPLEBIRD@"
 	db 5,11
 	dw 1880
@@ -874,7 +874,7 @@
 	TX_FAR _DodrioDexEntry
 	db "@"
 
-PrimeapeDexEntry: ; 40c67 (10:4c67)
+PrimeapeDexEntry:
 	db "PIG MONKEY@"
 	db 3,3
 	dw 710
@@ -881,7 +881,7 @@
 	TX_FAR _PrimeapeDexEntry
 	db "@"
 
-DugtrioDexEntry: ; 40c7b (10:4c7b)
+DugtrioDexEntry:
 	db "MOLE@"
 	db 2,4
 	dw 730
@@ -888,7 +888,7 @@
 	TX_FAR _DugtrioDexEntry
 	db "@"
 
-VenomothDexEntry: ; 40c89 (10:4c89)
+VenomothDexEntry:
 	db "POISONMOTH@"
 	db 4,11
 	dw 280
@@ -895,7 +895,7 @@
 	TX_FAR _VenomothDexEntry
 	db "@"
 
-DewgongDexEntry: ; 40c9d (10:4c9d)
+DewgongDexEntry:
 	db "SEA LION@"
 	db 5,7
 	dw 2650
@@ -902,7 +902,7 @@
 	TX_FAR _DewgongDexEntry
 	db "@"
 
-CaterpieDexEntry: ; 40caf (10:4caf)
+CaterpieDexEntry:
 	db "WORM@"
 	db 1,0
 	dw 60
@@ -909,7 +909,7 @@
 	TX_FAR _CaterpieDexEntry
 	db "@"
 
-MetapodDexEntry: ; 40cbd (10:4cbd)
+MetapodDexEntry:
 	db "COCOON@"
 	db 2,4
 	dw 220
@@ -916,7 +916,7 @@
 	TX_FAR _MetapodDexEntry
 	db "@"
 
-ButterfreeDexEntry: ; 40ccd (10:4ccd)
+ButterfreeDexEntry:
 	db "BUTTERFLY@"
 	db 3,7
 	dw 710
@@ -923,7 +923,7 @@
 	TX_FAR _ButterfreeDexEntry
 	db "@"
 
-MachampDexEntry: ; 40ce0 (10:4ce0)
+MachampDexEntry:
 	db "SUPERPOWER@"
 	db 5,3
 	dw 2870
@@ -930,7 +930,7 @@
 	TX_FAR _MachampDexEntry
 	db "@"
 
-GolduckDexEntry: ; 40cf4 (10:4cf4)
+GolduckDexEntry:
 	db "DUCK@"
 	db 5,7
 	dw 1690
@@ -937,7 +937,7 @@
 	TX_FAR _GolduckDexEntry
 	db "@"
 
-HypnoDexEntry: ; 40d02 (10:4d02)
+HypnoDexEntry:
 	db "HYPNOSIS@"
 	db 5,3
 	dw 1670
@@ -944,7 +944,7 @@
 	TX_FAR _HypnoDexEntry
 	db "@"
 
-GolbatDexEntry: ; 40d14 (10:4d14)
+GolbatDexEntry:
 	db "BAT@"
 	db 5,3
 	dw 1210
@@ -951,7 +951,7 @@
 	TX_FAR _GolbatDexEntry
 	db "@"
 
-MewtwoDexEntry: ; 40d21 (10:4d21)
+MewtwoDexEntry:
 	db "GENETIC@"
 	db 6,7
 	dw 2690
@@ -958,7 +958,7 @@
 	TX_FAR _MewtwoDexEntry
 	db "@"
 
-SnorlaxDexEntry: ; 40d32 (10:4d32)
+SnorlaxDexEntry:
 	db "SLEEPING@"
 	db 6,11
 	dw 10140
@@ -965,7 +965,7 @@
 	TX_FAR _SnorlaxDexEntry
 	db "@"
 
-MagikarpDexEntry: ; 40d44 (10:4d44)
+MagikarpDexEntry:
 	db "FISH@"
 	db 2,11
 	dw 220
@@ -972,7 +972,7 @@
 	TX_FAR _MagikarpDexEntry
 	db "@"
 
-MukDexEntry: ; 40d52 (10:4d52)
+MukDexEntry:
 	db "SLUDGE@"
 	db 3,11
 	dw 660
@@ -979,7 +979,7 @@
 	TX_FAR _MukDexEntry
 	db "@"
 
-KinglerDexEntry: ; 40d62 (10:4d62)
+KinglerDexEntry:
 	db "PINCER@"
 	db 4,3
 	dw 1320
@@ -986,7 +986,7 @@
 	TX_FAR _KinglerDexEntry
 	db "@"
 
-CloysterDexEntry: ; 40d72 (10:4d72)
+CloysterDexEntry:
 	db "BIVALVE@"
 	db 4,11
 	dw 2920
@@ -993,7 +993,7 @@
 	TX_FAR _CloysterDexEntry
 	db "@"
 
-ElectrodeDexEntry: ; 40d83 (10:4d83)
+ElectrodeDexEntry:
 	db "BALL@"
 	db 3,11
 	dw 1470
@@ -1000,7 +1000,7 @@
 	TX_FAR _ElectrodeDexEntry
 	db "@"
 
-ClefableDexEntry: ; 40d91 (10:4d91)
+ClefableDexEntry:
 	db "FAIRY@"
 	db 4,3
 	dw 880
@@ -1007,7 +1007,7 @@
 	TX_FAR _ClefableDexEntry
 	db "@"
 
-WeezingDexEntry: ; 40da0 (10:4da0)
+WeezingDexEntry:
 	db "POISON GAS@"
 	db 3,11
 	dw 210
@@ -1014,7 +1014,7 @@
 	TX_FAR _WeezingDexEntry
 	db "@"
 
-PersianDexEntry: ; 40db4 (10:4db4)
+PersianDexEntry:
 	db "CLASSY CAT@"
 	db 3,3
 	dw 710
@@ -1021,7 +1021,7 @@
 	TX_FAR _PersianDexEntry
 	db "@"
 
-MarowakDexEntry: ; 40dc8 (10:4dc8)
+MarowakDexEntry:
 	db "BONEKEEPER@"
 	db 3,3
 	dw 990
@@ -1028,7 +1028,7 @@
 	TX_FAR _MarowakDexEntry
 	db "@"
 
-HaunterDexEntry: ; 40ddc (10:4ddc)
+HaunterDexEntry:
 	db "GAS@"
 	db 5,3
 	dw 2
@@ -1035,7 +1035,7 @@
 	TX_FAR _HaunterDexEntry
 	db "@"
 
-AbraDexEntry: ; 40de9 (10:4de9)
+AbraDexEntry:
 	db "PSI@"
 	db 2,11
 	dw 430
@@ -1042,7 +1042,7 @@
 	TX_FAR _AbraDexEntry
 	db "@"
 
-AlakazamDexEntry: ; 40df6 (10:4df6)
+AlakazamDexEntry:
 	db "PSI@"
 	db 4,11
 	dw 1060
@@ -1049,7 +1049,7 @@
 	TX_FAR _AlakazamDexEntry
 	db "@"
 
-PidgeottoDexEntry: ; 40e03 (10:4e03)
+PidgeottoDexEntry:
 	db "BIRD@"
 	db 3,7
 	dw 660
@@ -1056,7 +1056,7 @@
 	TX_FAR _PidgeottoDexEntry
 	db "@"
 
-PidgeotDexEntry: ; 40e11 (10:4e11)
+PidgeotDexEntry:
 	db "BIRD@"
 	db 4,11
 	dw 870
@@ -1063,7 +1063,7 @@
 	TX_FAR _PidgeotDexEntry
 	db "@"
 
-StarmieDexEntry: ; 40e1f (10:4e1f)
+StarmieDexEntry:
 	db "MYSTERIOUS@"
 	db 3,7
 	dw 1760
@@ -1070,7 +1070,7 @@
 	TX_FAR _StarmieDexEntry
 	db "@"
 
-BulbasaurDexEntry: ; 40e33 (10:4e33)
+BulbasaurDexEntry:
 	db "SEED@"
 	db 2,4
 	dw 150
@@ -1077,7 +1077,7 @@
 	TX_FAR _BulbasaurDexEntry
 	db "@"
 
-VenusaurDexEntry: ; 40e41 (10:4e41)
+VenusaurDexEntry:
 	db "SEED@"
 	db 6,7
 	dw 2210
@@ -1084,7 +1084,7 @@
 	TX_FAR _VenusaurDexEntry
 	db "@"
 
-TentacruelDexEntry: ; 40e4f (10:4e4f)
+TentacruelDexEntry:
 	db "JELLYFISH@"
 	db 5,3
 	dw 1210
@@ -1091,7 +1091,7 @@
 	TX_FAR _TentacruelDexEntry
 	db "@"
 
-GoldeenDexEntry: ; 40e62 (10:4e62)
+GoldeenDexEntry:
 	db "GOLDFISH@"
 	db 2,0
 	dw 330
@@ -1098,7 +1098,7 @@
 	TX_FAR _GoldeenDexEntry
 	db "@"
 
-SeakingDexEntry: ; 40e74 (10:4e74)
+SeakingDexEntry:
 	db "GOLDFISH@"
 	db 4,3
 	dw 860
@@ -1105,7 +1105,7 @@
 	TX_FAR _SeakingDexEntry
 	db "@"
 
-PonytaDexEntry: ; 40e86 (10:4e86)
+PonytaDexEntry:
 	db "FIRE HORSE@"
 	db 3,3
 	dw 660
@@ -1112,7 +1112,7 @@
 	TX_FAR _PonytaDexEntry
 	db "@"
 
-RapidashDexEntry: ; 40e9a (10:4e9a)
+RapidashDexEntry:
 	db "FIRE HORSE@"
 	db 5,7
 	dw 2090
@@ -1119,7 +1119,7 @@
 	TX_FAR _RapidashDexEntry
 	db "@"
 
-RattataDexEntry: ; 40eae (10:4eae)
+RattataDexEntry:
 	db "RAT@"
 	db 1,0
 	dw 80
@@ -1126,7 +1126,7 @@
 	TX_FAR _RattataDexEntry
 	db "@"
 
-RaticateDexEntry: ; 40ebb (10:4ebb)
+RaticateDexEntry:
 	db "RAT@"
 	db 2,4
 	dw 410
@@ -1133,7 +1133,7 @@
 	TX_FAR _RaticateDexEntry
 	db "@"
 
-NidorinoDexEntry: ; 40ec8 (10:4ec8)
+NidorinoDexEntry:
 	db "POISON PIN@"
 	db 2,11
 	dw 430
@@ -1140,7 +1140,7 @@
 	TX_FAR _NidorinoDexEntry
 	db "@"
 
-NidorinaDexEntry: ; 40edc (10:4edc)
+NidorinaDexEntry:
 	db "POISON PIN@"
 	db 2,7
 	dw 440
@@ -1147,7 +1147,7 @@
 	TX_FAR _NidorinaDexEntry
 	db "@"
 
-GeodudeDexEntry: ; 40ef0 (10:4ef0)
+GeodudeDexEntry:
 	db "ROCK@"
 	db 1,4
 	dw 440
@@ -1154,7 +1154,7 @@
 	TX_FAR _GeodudeDexEntry
 	db "@"
 
-PorygonDexEntry: ; 40efe (10:4efe)
+PorygonDexEntry:
 	db "VIRTUAL@"
 	db 2,7
 	dw 800
@@ -1161,7 +1161,7 @@
 	TX_FAR _PorygonDexEntry
 	db "@"
 
-AerodactylDexEntry: ; 40f0f (10:4f0f)
+AerodactylDexEntry:
 	db "FOSSIL@"
 	db 5,11
 	dw 1300
@@ -1168,7 +1168,7 @@
 	TX_FAR _AerodactylDexEntry
 	db "@"
 
-MagnemiteDexEntry: ; 40f1f (10:4f1f)
+MagnemiteDexEntry:
 	db "MAGNET@"
 	db 1,0
 	dw 130
@@ -1175,7 +1175,7 @@
 	TX_FAR _MagnemiteDexEntry
 	db "@"
 
-CharmanderDexEntry: ; 40f2f (10:4f2f)
+CharmanderDexEntry:
 	db "LIZARD@"
 	db 2,0
 	dw 190
@@ -1182,7 +1182,7 @@
 	TX_FAR _CharmanderDexEntry
 	db "@"
 
-SquirtleDexEntry: ; 40f3f (10:4f3f)
+SquirtleDexEntry:
 	db "TINYTURTLE@"
 	db 1,8
 	dw 200
@@ -1189,7 +1189,7 @@
 	TX_FAR _SquirtleDexEntry
 	db "@"
 
-CharmeleonDexEntry: ; 40f53 (10:4f53)
+CharmeleonDexEntry:
 	db "FLAME@"
 	db 3,7
 	dw 420
@@ -1196,7 +1196,7 @@
 	TX_FAR _CharmeleonDexEntry
 	db "@"
 
-WartortleDexEntry: ; 40f62 (10:4f62)
+WartortleDexEntry:
 	db "TURTLE@"
 	db 3,3
 	dw 500
@@ -1203,7 +1203,7 @@
 	TX_FAR _WartortleDexEntry
 	db "@"
 
-CharizardDexEntry: ; 40f72 (10:4f72)
+CharizardDexEntry:
 	db "FLAME@"
 	db 5,7
 	dw 2000
@@ -1210,7 +1210,7 @@
 	TX_FAR _CharizardDexEntry
 	db "@"
 
-OddishDexEntry: ; 40f81 (10:4f81)
+OddishDexEntry:
 	db "WEED@"
 	db 1,8
 	dw 120
@@ -1217,7 +1217,7 @@
 	TX_FAR _OddishDexEntry
 	db "@"
 
-GloomDexEntry: ; 40f8f (10:4f8f)
+GloomDexEntry:
 	db "WEED@"
 	db 2,7
 	dw 190
@@ -1224,7 +1224,7 @@
 	TX_FAR _GloomDexEntry
 	db "@"
 
-VileplumeDexEntry: ; 40f9d (10:4f9d)
+VileplumeDexEntry:
 	db "FLOWER@"
 	db 3,11
 	dw 410
@@ -1231,7 +1231,7 @@
 	TX_FAR _VileplumeDexEntry
 	db "@"
 
-BellsproutDexEntry: ; 40fad (10:4fad)
+BellsproutDexEntry:
 	db "FLOWER@"
 	db 2,4
 	dw 90
@@ -1238,7 +1238,7 @@
 	TX_FAR _BellsproutDexEntry
 	db "@"
 
-WeepinbellDexEntry: ; 40fbd (10:4fbd)
+WeepinbellDexEntry:
 	db "FLYCATCHER@"
 	db 3,3
 	dw 140
@@ -1245,7 +1245,7 @@
 	TX_FAR _WeepinbellDexEntry
 	db "@"
 
-VictreebelDexEntry: ; 40fd1 (10:4fd1)
+VictreebelDexEntry:
 	db "FLYCATCHER@"
 	db 5,7
 	dw 340
@@ -1252,7 +1252,7 @@
 	TX_FAR _VictreebelDexEntry
 	db "@"
 
-MissingNoDexEntry: ; 40fe5 (10:4fe5)
+MissingNoDexEntry:
 	db "???@"
 	db 10 ; 1.0 m
 	db 100 ; 10.0 kg
--- a/data/pokedex_order.asm
+++ b/data/pokedex_order.asm
@@ -1,4 +1,4 @@
-PokedexOrder: ; 41024 (10:5024)
+PokedexOrder:
 	db DEX_RHYDON
 	db DEX_KANGASKHAN
 	db DEX_NIDORAN_M
--- a/data/prize_mon_levels.asm
+++ b/data/prize_mon_levels.asm
@@ -1,4 +1,4 @@
-PrizeMonLevelDictionary: ; 5298a (14:698a)
+PrizeMonLevelDictionary:
 IF DEF(_RED)
 	db ABRA,9
 	db CLEFAIRY,8
--- a/data/prizes.asm
+++ b/data/prizes.asm
@@ -1,4 +1,4 @@
-PrizeDifferentMenuPtrs: ; 52843 (14:6843)
+PrizeDifferentMenuPtrs:
 	dw PrizeMenuMon1Entries
 	dw PrizeMenuMon1Cost
 
@@ -8,10 +8,10 @@
 	dw PrizeMenuTMsEntries
 	dw PrizeMenuTMsCost
 
-NoThanksText: ; 5284f (14:684f)
+NoThanksText:
 	db "NO THANKS@"
 
-PrizeMenuMon1Entries: ; 52859 (14:6859)
+PrizeMenuMon1Entries:
 	db ABRA
 	db CLEFAIRY
 IF DEF(_RED)
@@ -22,7 +22,7 @@
 ENDC
 	db "@"
 
-PrizeMenuMon1Cost: ; 5285d (14:685d)
+PrizeMenuMon1Cost:
 IF DEF(_RED)
 	coins 180
 	coins 500
@@ -34,7 +34,7 @@
 	coins 1200
 	db "@"
 
-PrizeMenuMon2Entries: ; 52864 (14:6864)
+PrizeMenuMon2Entries:
 IF DEF(_RED)
 	db DRATINI
 	db SCYTHER
@@ -46,7 +46,7 @@
 	db PORYGON
 	db "@"
 
-PrizeMenuMon2Cost: ; 52868 (14:6868)
+PrizeMenuMon2Cost:
 IF DEF(_RED)
 	coins 2800
 	coins 5500
@@ -59,13 +59,13 @@
 ENDC
 	db "@"
 
-PrizeMenuTMsEntries: ; 5286f (14:686f)
+PrizeMenuTMsEntries:
 	db TM_23
 	db TM_15
 	db TM_50
 	db "@"
 
-PrizeMenuTMsCost: ; 52873 (14:6873)
+PrizeMenuTMsCost:
 	coins 3300
 	coins 5500
 	coins 7700
--- a/data/sgb_border.asm
+++ b/data/sgb_border.asm
@@ -1,4 +1,4 @@
-BorderPalettes: ; 72788 (1c:6788)
+BorderPalettes:
 IF DEF(_RED)
 	INCBIN "gfx/red/sgbborder.map"
 ENDC
@@ -53,7 +53,7 @@
 
 	ds $18
 
-SGBBorderGraphics: ; 72fe8 (1c:6fe8)
+SGBBorderGraphics:
 IF DEF(_RED)
 	INCBIN "gfx/red/sgbborder.2bpp"
 ENDC
--- a/data/sgb_packets.asm
+++ b/data/sgb_packets.asm
@@ -51,7 +51,7 @@
 	db \3 ; length (1-11)
 ENDM
 
-BlkPacket_WholeScreen: ; 7219e (1c:619e)
+BlkPacket_WholeScreen:
 	ATTR_BLK 1
 	ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17
 	ds 8
@@ -58,7 +58,7 @@
 
 	db $03,$00,$00,$13,$11,$00,$00
 
-BlkPacket_Battle: ; 721b5 (1c:61b5)
+BlkPacket_Battle:
 	ATTR_BLK 5
 	ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 ; message box: pal 2
 	ATTR_BLK_DATA %011, 1,1,0, 01,00, 10,03 ; enemy HP bar: pal 1
@@ -74,7 +74,7 @@
 	db $03,$0b,$00,$13,$07,$03
 	db $00
 
-BlkPacket_StatusScreen: ; 721fa (1c:61fa)
+BlkPacket_StatusScreen:
 	ATTR_BLK 1
 	ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06 ; mon: pal 1, HP bar: pal 0
 	ds 8
@@ -84,7 +84,7 @@
 	db $01,$07,$13,$11,$00,$03
 	db $08,$00,$13,$06,$00,$00
 
-BlkPacket_Pokedex: ; 72222 (1c:6222)
+BlkPacket_Pokedex:
 	ATTR_BLK 1
 	ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08 ; mon: pal 1, everything else: pal 0
 	ds 8
@@ -95,7 +95,7 @@
 	db $09,$08,$11,$00,$03,$09
 	db $01,$13,$11,$00,$00
 
-BlkPacket_Slots: ; 7224f (1c:624f)
+BlkPacket_Slots:
 	ATTR_BLK 5
 	ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 ; "3" rows and top of screen: pal 1
 	ATTR_BLK_DATA %011, 2,2,0, 00,04, 19,09 ; "2" rows: pal 2
@@ -110,7 +110,7 @@
 	db $03,$00,$0c,$13,$11,$00
 	db $00
 
-BlkPacket_Titlescreen: ; 7228e (1c:628e)
+BlkPacket_Titlescreen:
 	ATTR_BLK 3
 	ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 ; pokemon logo: pal 0
 	ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09 ; version text: pal 1
@@ -122,7 +122,7 @@
 	db $03,$00,$0a,$13,$11,$02
 	db $00
 
-BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1)
+BlkPacket_NidorinoIntro:
 	ATTR_BLK 3
 	ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1
 	ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 ; letterbox: pal 0
@@ -134,7 +134,7 @@
 	db $03,$00,$0e,$13,$11,$01
 	db $00
 
-BlkPacket_PartyMenu: ; 722f4 (1c:62f4)
+BlkPacket_PartyMenu:
 	ATTR_BLK 7
 	ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 ; mon sprites: pal 0, everything else: pal 1
 	ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01 ; HP bar 0: pal set dynamically
@@ -156,7 +156,7 @@
 	db $0c,$08,$12,$09,$00,$03
 	db $0c,$0a,$12,$0b,$00,$00
 
-BlkPacket_TrainerCard: ; 72360 (1c:6360)
+BlkPacket_TrainerCard:
 	ATTR_BLK 10
 	ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 ; Boulder Badge
 	ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 ; Cascade Badge
@@ -182,7 +182,7 @@
 	db $03,$0f,$0f,$10,$10,$01
 	db $00
 
-BlkPacket_GameFreakIntro: ; 723dd (1c:63dd)
+BlkPacket_GameFreakIntro:
 	ATTR_BLK 3
 	ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13 ; falling stars (left): pal 1, GameFreak logo: pal 0
 	ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 ; falling stars (middle): pal 2
--- a/data/slot_machine_wheels.asm
+++ b/data/slot_machine_wheels.asm
@@ -1,4 +1,4 @@
-SlotMachineWheel1: ; 379e5 (d:79e5)
+SlotMachineWheel1:
 	dw SLOTS7
 	dw SLOTSMOUSE
 	dw SLOTSFISH
@@ -18,7 +18,7 @@
 	dw SLOTSMOUSE
 	dw SLOTSFISH
 
-SlotMachineWheel2: ; 37a09 (d:7a09)
+SlotMachineWheel2:
 	dw SLOTS7
 	dw SLOTSFISH
 	dw SLOTSCHERRY
@@ -38,7 +38,7 @@
 	dw SLOTSFISH
 	dw SLOTSCHERRY
 
-SlotMachineWheel3: ; 37a2d (d:7a2d)
+SlotMachineWheel3:
 	dw SLOTS7
 	dw SLOTSBIRD
 	dw SLOTSFISH
--- a/data/special_warps.asm
+++ b/data/special_warps.asm
@@ -1,7 +1,7 @@
 ; Format: (size 2 bytes)
 ; 00: target map ID
 ; 01: which dungeon warp in the source map was used
-DungeonWarpList: ; 63bf (1:63bf)
+DungeonWarpList:
 	db SEAFOAM_ISLANDS_2,$01
 	db SEAFOAM_ISLANDS_2,$02
 	db SEAFOAM_ISLANDS_3,$01
@@ -16,7 +16,7 @@
 	db MANSION_2,$03
 	db $FF
 
-DungeonWarpData: ; 63d8 (1:63d8)
+DungeonWarpData:
 	FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,18
 	FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,23
 	FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,19
@@ -34,32 +34,32 @@
 ;	db Map_id
 ;	FLYWARP_DATA [Map Width][Y-pos][X-pos]
 ;	db Tileset_id
-FirstMapSpec: ; 6420 (1:6420)
+FirstMapSpec:
 	db REDS_HOUSE_2F
 	FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3
 	db REDS_HOUSE_2
 
-TradeCenterSpec1: ; 6428 (1:6428)
+TradeCenterSpec1:
 	db TRADE_CENTER
 	FLYWARP_DATA TRADE_CENTER_WIDTH,4,3
 	db CLUB
 
-TradeCenterSpec2: ; 6430 (1:6430)
+TradeCenterSpec2:
 	db TRADE_CENTER
 	FLYWARP_DATA TRADE_CENTER_WIDTH,4,6
 	db CLUB
 
-ColosseumSpec1: ; 6438 (1:6438)
+ColosseumSpec1:
 	db COLOSSEUM
 	FLYWARP_DATA COLOSSEUM_WIDTH,4,3
 	db CLUB
 
-ColosseumSpec2: ; 6440 (1:6440)
+ColosseumSpec2:
 	db COLOSSEUM
 	FLYWARP_DATA COLOSSEUM_WIDTH,4,6
 	db CLUB
 
-FlyWarpDataPtr: ; 6448 (1:6448)
+FlyWarpDataPtr:
 	db PALLET_TOWN, 0
 	dw PalletTownFlyWarp
 	db VIRIDIAN_CITY, 0
@@ -91,29 +91,29 @@
 ;   [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block]
 ; Macro Format:
 ;   FLYWARP_DATA [Map Width][Y-pos][X-pos]
-PalletTownFlyWarp: ; 647c (1:647c)
+PalletTownFlyWarp:
 	FLYWARP_DATA PALLET_TOWN_WIDTH,      6,  5
-ViridianCityFlyWarp: ; 6482 (1:6482)
+ViridianCityFlyWarp:
 	FLYWARP_DATA VIRIDIAN_CITY_WIDTH,   26, 23
-PewterCityFlyWarp: ; 6488 (1:6488)
+PewterCityFlyWarp:
 	FLYWARP_DATA PEWTER_CITY_WIDTH,     26, 13
-CeruleanCityFlyWarp: ; 648e (1:648e)
+CeruleanCityFlyWarp:
 	FLYWARP_DATA CERULEAN_CITY_WIDTH,   18, 19
-LavenderTownFlyWarp: ; 6494 (1:6494)
+LavenderTownFlyWarp:
 	FLYWARP_DATA LAVENDER_TOWN_WIDTH,    6,  3
-VermilionCityFlyWarp: ; 649a (1:649a)
+VermilionCityFlyWarp:
 	FLYWARP_DATA VERMILION_CITY_WIDTH,   4, 11
-CeladonCityFlyWarp: ; 64a0 (1:64a0)
+CeladonCityFlyWarp:
 	FLYWARP_DATA CELADON_CITY_WIDTH,    10, 41
-FuchsiaCityFlyWarp: ; 64a6 (1:64a6)
+FuchsiaCityFlyWarp:
 	FLYWARP_DATA FUCHSIA_CITY_WIDTH,    28, 19
-CinnabarIslandFlyWarp: ; 64ac (1:64ac)
+CinnabarIslandFlyWarp:
 	FLYWARP_DATA CINNABAR_ISLAND_WIDTH, 12, 11
-IndigoPlateauFlyWarp: ; 64b2 (1:64b2)
+IndigoPlateauFlyWarp:
 	FLYWARP_DATA INDIGO_PLATEAU_WIDTH,   6,  9
-SaffronCityFlyWarp: ; 64b8 (1:64b8)
+SaffronCityFlyWarp:
 	FLYWARP_DATA SAFFRON_CITY_WIDTH,    30,  9
-Route4FlyWarp: ; 64be (1:64be)
+Route4FlyWarp:
 	FLYWARP_DATA ROUTE_4_WIDTH,          6, 11
-Route10FlyWarp: ; 64c4 (1:64c4)
+Route10FlyWarp:
 	FLYWARP_DATA ROUTE_10_WIDTH,        20, 11
--- a/data/sprite_sets.asm
+++ b/data/sprite_sets.asm
@@ -1,4 +1,4 @@
-MapSpriteSets: ; 17a64 (5:7a64)
+MapSpriteSets:
 	db $01 ; PALLET_TOWN
 	db $01 ; VIRIDIAN_CITY
 	db $02 ; PEWTER_CITY
@@ -44,7 +44,7 @@
 ; 01: coordinate of dividing line
 ; 02: sprite set ID if in the West or North side
 ; 03: sprite set ID if in the East or South side
-SplitMapSpriteSets: ; 17a89 (5:7a89)
+SplitMapSpriteSets:
 	db $02,$25,$02,$01 ; $f1
 	db $02,$32,$02,$03 ; $f2
 	db $01,$39,$04,$08 ; $f3
@@ -58,7 +58,7 @@
 	db $01,$11,$05,$07 ; $fb
 	db $01,$03,$07,$03 ; $fc
 
-SpriteSets: ; 17ab9 (5:7ab9)
+SpriteSets:
 ; sprite set $01
 	db SPRITE_BLUE
 	db SPRITE_BUG_CATCHER
@@ -189,7 +189,7 @@
 	db SPRITE_BALL
 	db SPRITE_OMANYTE
 
-SpriteSheetPointerTable: ; 17b27 (5:7b27)
+SpriteSheetPointerTable:
 	; SPRITE_RED
 	dw RedSprite
 	db $c0 ; byte count
--- a/data/super_palettes.asm
+++ b/data/super_palettes.asm
@@ -1,5 +1,5 @@
 ; palettes for overworlds, title screen, monsters
-SuperPalettes: ; 72660 (1c:6660)
+SuperPalettes:
 	RGB 31,29,31 ; PAL_ROUTE
 	RGB 21,28,11
 	RGB 20,26,31
--- a/data/super_rod.asm
+++ b/data/super_rod.asm
@@ -1,6 +1,6 @@
 ; super rod data
 ; format: map, pointer to fishing group
-SuperRodData: ; e919 (3:6919)
+SuperRodData:
 	dbw PALLET_TOWN, FishingGroup1
 	dbw VIRIDIAN_CITY, FishingGroup1
 	dbw CERULEAN_CITY, FishingGroup3
@@ -38,33 +38,33 @@
 
 ; fishing groups
 ; number of monsters, followed by level/monster pairs
-FishingGroup1: ; e97d (3:697d)
+FishingGroup1:
 	db 2
 	db 15,TENTACOOL
 	db 15,POLIWAG
 
-FishingGroup2: ; e982 (3:6982)
+FishingGroup2:
 	db 2
 	db 15,GOLDEEN
 	db 15,POLIWAG
 
-FishingGroup3: ; e987 (3:6987)
+FishingGroup3:
 	db 3
 	db 15,PSYDUCK
 	db 15,GOLDEEN
 	db 15,KRABBY
 
-FishingGroup4: ; e98e (3:698e)
+FishingGroup4:
 	db 2
 	db 15,KRABBY
 	db 15,SHELLDER
 
-FishingGroup5: ; e993 (3:6993)
+FishingGroup5:
 	db 2
 	db 23,POLIWHIRL
 	db 15,SLOWPOKE
 
-FishingGroup6: ; e998 (3:6998)
+FishingGroup6:
 	db 4
 	db 15,DRATINI
 	db 15,KRABBY
@@ -71,7 +71,7 @@
 	db 15,PSYDUCK
 	db 15,SLOWPOKE
 
-FishingGroup7: ; e9a1 (3:69a1)
+FishingGroup7:
 	db 4
 	db 5,TENTACOOL
 	db 15,KRABBY
@@ -78,7 +78,7 @@
 	db 15,GOLDEEN
 	db 15,MAGIKARP
 
-FishingGroup8: ; e9aa (3:69aa)
+FishingGroup8:
 	db 4
 	db 15,STARYU
 	db 15,HORSEA
@@ -85,7 +85,7 @@
 	db 15,SHELLDER
 	db 15,GOLDEEN
 
-FishingGroup9: ; e9b3 (3:69b3)
+FishingGroup9:
 	db 4
 	db 23,SLOWBRO
 	db 23,SEAKING
@@ -92,7 +92,7 @@
 	db 23,KINGLER
 	db 23,SEADRA
 
-FishingGroup10: ; e9bc (3:69bc)
+FishingGroup10:
 	db 4
 	db 23,SEAKING
 	db 15,KRABBY
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -1,4 +1,4 @@
-Tilesets: ; c7be (3:47be)
+Tilesets:
 	tileset Overworld_Block,   Overworld_GFX,   Overworld_Coll,   $FF,$FF,$FF, $52, OUTDOOR
 	tileset RedsHouse1_Block,  RedsHouse1_GFX,  RedsHouse1_Coll,  $FF,$FF,$FF, $FF, INDOOR
 	tileset Mart_Block,        Mart_GFX,        Mart_Coll,        $18,$19,$1E, $FF, INDOOR
--- a/data/title_mons.asm
+++ b/data/title_mons.asm
@@ -1,4 +1,4 @@
-TitleMons: ; 4588 (1:4588)
+TitleMons:
 ; mons on the title screen are randomly chosen from here
 IF DEF(_RED)
 	db CHARMANDER
--- a/data/tm_prices.asm
+++ b/data/tm_prices.asm
@@ -1,4 +1,4 @@
-TechnicalMachinePrices: ; 7bfa7 (1e:7fa7)
+TechnicalMachinePrices:
 ; In thousands (nybbles).
 	dn 3, 2  ; TM_01, TM_02
 	dn 2, 1  ; TM_03, TM_04
--- a/data/tms.asm
+++ b/data/tms.asm
@@ -1,4 +1,4 @@
-TechnicalMachines: ; 13773 (4:7773)
+TechnicalMachines:
 	db MEGA_PUNCH
 	db RAZOR_WIND
 	db SWORDS_DANCE
--- a/data/town_map_entries.asm
+++ b/data/town_map_entries.asm
@@ -1,4 +1,4 @@
-ExternalMapEntries: ; 71313 (1c:5313)
+ExternalMapEntries:
 	EMAP $2,$B,PalletTownName
 	EMAP $2,$8,ViridianCityName
 	EMAP $2,$3,PewterCityName
@@ -37,7 +37,7 @@
 	EMAP $A,$1,Route24Name
 	EMAP $B,$0,Route25Name
 
-InternalMapEntries: ; 71382 (1c:5382)
+InternalMapEntries:
 	IMAP OAKS_LAB,                  $2,$B,PalletTownName
 	IMAP VIRIDIAN_GYM,              $2,$8,ViridianCityName
 	IMAP VIRIDIAN_FOREST_ENTRANCE,  $2,$6,Route2Name
--- a/data/town_map_order.asm
+++ b/data/town_map_order.asm
@@ -1,4 +1,4 @@
-TownMapOrder: ; 70f11 (1c:4f11)
+TownMapOrder:
 	db PALLET_TOWN
 	db ROUTE_1
 	db VIRIDIAN_CITY
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,4 +1,4 @@
-TradeMons: ; 71b7b (1c:5b7b)
+TradeMons:
 ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
 	db NIDORINO,  NIDORINA, 0,"TERRY@@@@@@"
 	db ABRA,      MR_MIME,  0,"MARCEL@@@@@"
--- a/data/trainer_moves.asm
+++ b/data/trainer_moves.asm
@@ -1,4 +1,4 @@
-LoneMoves: ; 39d22 (e:5d22)
+LoneMoves:
 ; these are used for gym leaders.
 ; this is not automatic! you have to write the number you want to wLoneAttackNo
 ; first. e.g., erika's script writes 4 to wLoneAttackNo to get mega drain,
@@ -16,7 +16,7 @@
 	db 3,FIRE_BLAST
 	db 4,FISSURE
 
-TeamMoves: ; 39d32 (e:5d32)
+TeamMoves:
 ; these are used for elite four.
 ; this is automatic, based on trainer class.
 ; don't be confused by LoneMoves above, the two data structures are
--- a/data/trainer_parties.asm
+++ b/data/trainer_parties.asm
@@ -1,4 +1,4 @@
-TrainerDataPointers: ; 39d3b (e:5d3b)
+TrainerDataPointers:
 	dw YoungsterData
 	dw BugCatcherData
 	dw LassData
--- a/data/trainer_types.asm
+++ b/data/trainer_types.asm
@@ -1,4 +1,4 @@
-FemaleTrainerList:: ; 3434 (0:3434)
+FemaleTrainerList::
 	db OPP_LASS
 	db OPP_JR_TRAINER_F
 	db OPP_BEAUTY
@@ -5,7 +5,7 @@
 	db OPP_COOLTRAINER_F
 	db $FF
 
-EvilTrainerList:: ; 3439 (0:3439)
+EvilTrainerList::
 	db OPP_JUGGLER_X
 	db OPP_GAMBLER
 	db OPP_ROCKER
--- a/data/type_effects.asm
+++ b/data/type_effects.asm
@@ -1,4 +1,4 @@
-TypeEffects: ; 3e474 (f:6474)
+TypeEffects:
 ; format: attacking type, defending type, damage multiplier
 ; the multiplier is a (decimal) fixed-point number:
 ;     20 is ×2.0
--- a/data/warp_tile_ids.asm
+++ b/data/warp_tile_ids.asm
@@ -1,4 +1,4 @@
-WarpTileIDPointers: ; c4cc (3:44cc)
+WarpTileIDPointers:
 	dw OverworldWarpTileIDs
 	dw RedsHouse1WarpTileIDs
 	dw MartWarpTileIDs
@@ -24,62 +24,62 @@
 	dw FacilityWarpTileIDs
 	dw PlateauWarpTileIDs
 
-OverworldWarpTileIDs: ; c4fc (3:44fc)
+OverworldWarpTileIDs:
 	db $1B,$58,$FF
 
-ForestGateWarpTileIDs: ; c4ff (3:44ff)
-MuseumWarpTileIDs: ; c4ff (3:44ff)
-GateWarpTileIDs: ; c4ff (3:44ff)
+ForestGateWarpTileIDs:
+MuseumWarpTileIDs:
+GateWarpTileIDs:
 	db $3B
 
-RedsHouse1WarpTileIDs: ; c500 (3:4500)
-RedsHouse2WarpTileIDs: ; c500 (3:4500)
+RedsHouse1WarpTileIDs:
+RedsHouse2WarpTileIDs:
 	db $1A,$1C,$FF
 
-MartWarpTileIDs: ; c503 (3:4503)
-PokecenterWarpTileIDs: ; c503 (3:4503)
+MartWarpTileIDs:
+PokecenterWarpTileIDs:
 	db $5E,$FF
 
-ForestWarpTileIDs: ; c505 (3:4505)
+ForestWarpTileIDs:
 	db $5A,$5C,$3A,$FF
 
-DojoWarpTileIDs: ; c509 (3:4509)
-GymWarpTileIDs: ; c509 (3:4509)
+DojoWarpTileIDs:
+GymWarpTileIDs:
 	db $4A,$FF
 
-HouseWarpTileIDs: ; c50b (3:450b)
+HouseWarpTileIDs:
 	db $54,$5C,$32,$FF
 
-ShipWarpTileIDs: ; c50f (3:450f)
+ShipWarpTileIDs:
 	db $37,$39,$1E,$4A,$FF
 
-InteriorWarpTileIDs: ; c514 (3:4514)
+InteriorWarpTileIDs:
 	db $15,$55,$04,$FF
 
-CavernWarpTileIDs: ; c518 (3:4518)
+CavernWarpTileIDs:
 	db $18,$1A,$22,$FF
 
-LobbyWarpTileIDs: ; c51c (3:451c)
+LobbyWarpTileIDs:
 	db $1A,$1C,$38,$FF
 
-MansionWarpTileIDs: ; c520 (3:4520)
+MansionWarpTileIDs:
 	db $1A,$1C,$53,$FF
 
-LabWarpTileIDs: ; c524 (3:4524)
+LabWarpTileIDs:
 	db $34,$FF
 
-FacilityWarpTileIDs: ; c526 (3:4526)
+FacilityWarpTileIDs:
 	db $43,$58,$20
 
-CemeteryWarpTileIDs: ; c529 (3:4529)
+CemeteryWarpTileIDs:
 	db $1B
 
-UndergroundWarpTileIDs: ; c52a (3:452a)
+UndergroundWarpTileIDs:
 	db $13,$FF
 
-PlateauWarpTileIDs: ; c52c (3:452c)
+PlateauWarpTileIDs:
 	db $1B,$3B
 
-ShipPortWarpTileIDs: ; c52e (3:452e)
-ClubWarpTileIDs: ; c52e (3:452e)
+ShipPortWarpTileIDs:
+ClubWarpTileIDs:
 	db $FF
--- a/data/wild_mons.asm
+++ b/data/wild_mons.asm
@@ -1,4 +1,4 @@
-WildDataPointers: ; ceeb (3:4eeb)
+WildDataPointers:
 	dw NoMons      ; PALLET_TOWN
 	dw NoMons      ; VIRIDIAN_CITY
 	dw NoMons      ; PEWTER_CITY
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -1,4 +1,4 @@
-HallOfFamePC: ; 7405c (1d:405c)
+HallOfFamePC:
 	callba AnimateHallOfFame
 	call ClearScreen
 	ld c, 100
@@ -33,7 +33,7 @@
 	ld [wNumCreditsMonsDisplayed], a
 	jp Credits
 
-FadeInCreditsText: ; 740ba (1d:40ba)
+FadeInCreditsText:
 	ld hl, HoFGBPalettes
 	ld b, 4
 .asm_740bf
@@ -45,7 +45,7 @@
 	jr nz, .asm_740bf
 	ret
 
-DisplayCreditsMon: ; 740cb (1d:40cb)
+DisplayCreditsMon:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a
 	call SaveScreenTilesToBuffer1
@@ -106,7 +106,7 @@
 
 INCLUDE "data/credit_mons.asm"
 
-ScrollCreditsMonLeft: ; 74140 (1d:4140)
+ScrollCreditsMonLeft:
 	ld h, b
 	ld l, $20
 	call ScrollCreditsMonLeft_SetSCX
@@ -118,7 +118,7 @@
 	ld b, a
 	ret
 
-ScrollCreditsMonLeft_SetSCX: ; 74152 (1d:4152)
+ScrollCreditsMonLeft_SetSCX:
 	ld a, [rLY]
 	cp l
 	jr nz, ScrollCreditsMonLeft_SetSCX
@@ -130,13 +130,13 @@
 	jr z, .loop
 	ret
 
-HoFGBPalettes: ; 74160 (1d:4160)
+HoFGBPalettes:
 	db %11000000
 	db %11010000
 	db %11100000
 	db %11110000
 
-CreditsCopyTileMapToVRAM: ; 74164 (1d:4164)
+CreditsCopyTileMapToVRAM:
 	ld a, l
 	ld [H_AUTOBGTRANSFERDEST], a
 	ld a, h
@@ -145,7 +145,7 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	jp Delay3
 
-ZeroMemory: ; 74171 (1d:4171)
+ZeroMemory:
 ; zero bc bytes at hl
 	ld [hl], 0
 	inc hl
@@ -156,18 +156,18 @@
 	jr nz, ZeroMemory
 	ret
 
-FillFourRowsWithBlack: ; 7417b (1d:417b)
+FillFourRowsWithBlack:
 	ld bc, SCREEN_WIDTH * 4
 	ld a, $7e
 	jp FillMemory
 
-FillMiddleOfScreenWithWhite: ; 74183 (1d:4183)
+FillMiddleOfScreenWithWhite:
 	coord hl, 0, 4
 	ld bc, SCREEN_WIDTH * 10
 	ld a, " "
 	jp FillMemory
 
-Credits: ; 7418e (1d:418e)
+Credits:
 	ld de, CreditsOrder
 	push de
 .nextCreditsScreen
@@ -256,7 +256,7 @@
 	call PlaceString
 	jp FadeInCreditsText
 
-TheEndTextString: ; 74229 (1d:4229)
+TheEndTextString:
 ; "T H E  E N D"
 	db $60," ",$62," ",$64,"  ",$64," ",$66," ",$68,"@"
 	db $61," ",$63," ",$65,"  ",$65," ",$67," ",$69,"@"
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -1,6 +1,6 @@
 ; Draws a "frame block". Frame blocks are blocks of tiles that are put
 ; together to form frames in battle animations.
-DrawFrameBlock: ; 78000 (1e:4000)
+DrawFrameBlock:
 	ld l,c
 	ld h,b
 	ld a,[hli]
@@ -161,7 +161,7 @@
 .done
 	ret
 
-PlayAnimation: ; 780f1 (1e:40f1)
+PlayAnimation:
 	xor a
 	ld [$FF8B],a ; it looks like nothing reads this
 	ld [wSubAnimTransform],a
@@ -256,7 +256,7 @@
 .AnimationOver ; 417B
 	ret
 
-LoadSubanimation: ; 7817c (1e:417c)
+LoadSubanimation:
 	ld a,[wSubAnimAddrPtr + 1]
 	ld h,a
 	ld a,[wSubAnimAddrPtr]
@@ -306,7 +306,7 @@
 ; called if the subanimation type is not 5
 ; sets the transform to 0 (i.e. no transform) if it's the player's turn
 ; sets the transform to the subanimation type if it's the enemy's turn
-GetSubanimationTransform1: ; 781c2 (1e:41c2)
+GetSubanimationTransform1:
 	ld b,a
 	ld a,[H_WHOSETURN]
 	and a
@@ -318,7 +318,7 @@
 ; called if the subanimation type is 5
 ; sets the transform to 2 (i.e. horizontal and vertical flip) if it's the player's turn
 ; sets the transform to 0 (i.e. no transform) if it's the enemy's turn
-GetSubanimationTransform2: ; 781ca (1e:41ca)
+GetSubanimationTransform2:
 	ld a,[H_WHOSETURN]
 	and a
 	ld a,2 << 5
@@ -327,7 +327,7 @@
 	ret
 
 ; loads tile patterns for battle animations
-LoadAnimationTileset: ; 781d2 (1e:41d2)
+LoadAnimationTileset:
 	ld a,[wWhichBattleAnimTileset]
 	add a
 	add a
@@ -347,7 +347,7 @@
 	ld c,a ; number of tiles
 	jp CopyVideoData ; load tileset
 
-AnimationTilesetPointers: ; 781f2 (1e:41f2)
+AnimationTilesetPointers:
 	db 79 ; number of tiles
 	dw AnimationTileset1
 	db $FF
@@ -360,13 +360,13 @@
 	dw AnimationTileset1
 	db $FF
 
-AnimationTileset1: ; 781fe (1e:41fe)
+AnimationTileset1:
 	INCBIN "gfx/attack_anim_1.2bpp"
 
-AnimationTileset2: ; 786ee (1e:46ee)
+AnimationTileset2:
 	INCBIN "gfx/attack_anim_2.2bpp"
 
-SlotMachineTiles2: ; 78bde (1e:4bde)
+SlotMachineTiles2:
 IF DEF(_RED)
 	INCBIN "gfx/red/slotmachine2.2bpp"
 ENDC
@@ -374,7 +374,7 @@
 	INCBIN "gfx/blue/slotmachine2.2bpp"
 ENDC
 
-MoveAnimation: ; 78d5e (1e:4d5e)
+MoveAnimation:
 	push hl
 	push de
 	push bc
@@ -419,7 +419,7 @@
 	pop hl
 	ret
 
-ShareMoveAnimations: ; 78da6 (1e:4da6)
+ShareMoveAnimations:
 ; some moves just reuse animations from status conditions
 	ld a,[H_WHOSETURN]
 	and a
@@ -442,7 +442,7 @@
 	ld [wAnimationID],a
 	ret
 
-PlayApplyingAttackAnimation: ; 78dbd (1e:4dbd)
+PlayApplyingAttackAnimation:
 ; Generic animation that shows after the move's individual animation
 ; Different animation depending on whether the move has an additional effect and on whose turn it is
 	ld a,[wAnimationType]
@@ -459,7 +459,7 @@
 	ld l,a
 	jp [hl]
 
-AnimationTypePointerTable: ; 78dcf (1e:4dcf)
+AnimationTypePointerTable:
 	dw ShakeScreenVertically ; enemy mon has used a damaging move without a side effect
 	dw ShakeScreenHorizontallyHeavy ; enemy mon has used a damaging move with a side effect
 	dw ShakeScreenHorizontallySlow ; enemy mon has used a non-damaging move
@@ -467,33 +467,33 @@
 	dw ShakeScreenHorizontallyLight ; player mon has used a damaging move with a side effect
 	dw ShakeScreenHorizontallySlow2 ; player mon has used a non-damaging move
 
-ShakeScreenVertically: ; 78ddb (1e:4ddb)
+ShakeScreenVertically:
 	call PlayApplyingAttackSound
 	ld b, 8
 	jp AnimationShakeScreenVertically
 
-ShakeScreenHorizontallyHeavy: ; 78de3 (1e:4de3)
+ShakeScreenHorizontallyHeavy:
 	call PlayApplyingAttackSound
 	ld b, 8
 	jp AnimationShakeScreenHorizontallyFast
 
-ShakeScreenHorizontallySlow: ; 78deb (1e:4deb)
+ShakeScreenHorizontallySlow:
 	lb bc, 6, 2
 	jr AnimationShakeScreenHorizontallySlow
 
-BlinkEnemyMonSprite: ; 78df0 (1e:4df0)
+BlinkEnemyMonSprite:
 	call PlayApplyingAttackSound
 	jp AnimationBlinkEnemyMon
 
-ShakeScreenHorizontallyLight: ; 78df6 (1e:4df6)
+ShakeScreenHorizontallyLight:
 	call PlayApplyingAttackSound
 	ld b, 2
 	jp AnimationShakeScreenHorizontallyFast
 
-ShakeScreenHorizontallySlow2: ; 78dfe (1e:4dfe)
+ShakeScreenHorizontallySlow2:
 	lb bc, 3, 2
 
-AnimationShakeScreenHorizontallySlow: ; 78e01 (1e:4e01)
+AnimationShakeScreenHorizontallySlow:
 	push bc
 	push bc
 .loop1
@@ -518,7 +518,7 @@
 	jr nz, AnimationShakeScreenHorizontallySlow
 	ret
 
-SetAnimationPalette: ; 78e23 (1e:4e23)
+SetAnimationPalette:
 	ld a, [wOnSGB]
 	and a
 	ld a, $e4
@@ -546,7 +546,7 @@
 	ld [rOBP1], a
 	ret
 
-PlaySubanimation: ; 78e53 (1e:4e53)
+PlaySubanimation:
 	ld a,[wAnimSoundID]
 	cp a,$FF
 	jr z,.skipPlayingSound
@@ -612,7 +612,7 @@
 	ld [wSubAnimSubEntryAddr],a
 	jp .loop
 
-AnimationCleanOAM: ; 78ec8 (1e:4ec8)
+AnimationCleanOAM:
 	push hl
 	push de
 	push bc
@@ -627,7 +627,7 @@
 
 ; this runs after each frame block is drawn in a subanimation
 ; it runs a particular special effect based on the animation ID
-DoSpecialEffectByAnimationId: ; 78ed7 (1e:4ed7)
+DoSpecialEffectByAnimationId:
 	push hl
 	push de
 	push bc
@@ -650,7 +650,7 @@
 	ret
 
 ; Format: Animation ID (1 byte), Address (2 bytes)
-AnimationIdSpecialEffects: ; 78ef5 (1e:4ef5)
+AnimationIdSpecialEffects:
 	db MEGA_PUNCH
 	dw AnimationFlashScreen
 
@@ -725,7 +725,7 @@
 
 	db $FF ; terminator
 
-DoBallTossSpecialEffects: ; 78f3e (1e:4f3e)
+DoBallTossSpecialEffects:
 	ld a,[wcf91]
 	cp a,3 ; is it a Master Ball or Ultra Ball?
 	jr nc,.skipFlashingEffect
@@ -779,7 +779,7 @@
 	ld [wSubAnimCounter],a
 	ret
 
-DoBallShakeSpecialEffects: ; 78f96 (1e:4f96)
+DoBallShakeSpecialEffects:
 	ld a,[wSubAnimCounter]
 	cp a,4 ; is it the beginning of a shake?
 	jr nz,.skipPlayingSound
@@ -813,7 +813,7 @@
 	ret
 
 ; plays a sound after the second frame of the poof animation
-DoPoofSpecialEffects: ; 78fce (1e:4fce)
+DoPoofSpecialEffects:
 	ld a,[wSubAnimCounter]
 	cp a,5
 	ret nz
@@ -820,7 +820,7 @@
 	ld a,SFX_BALL_POOF
 	jp PlaySound
 
-DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9)
+DoRockSlideSpecialEffects:
 	ld a,[wSubAnimCounter]
 	cp a,12
 	ret nc
@@ -836,7 +836,7 @@
 	ld b,1
 	predef_jump PredefShakeScreenVertically ; shake vertically
 
-FlashScreenEveryEightFrameBlocks: ; 78ff7 (1e:4ff7)
+FlashScreenEveryEightFrameBlocks:
 	ld a,[wSubAnimCounter]
 	and a,7 ; is the subanimation counter exactly 8?
 	call z,AnimationFlashScreen ; if so, flash the screen
@@ -843,7 +843,7 @@
 	ret
 
 ; flashes the screen if the subanimation counter is divisible by 4
-FlashScreenEveryFourFrameBlocks: ; 79000 (1e:5000)
+FlashScreenEveryFourFrameBlocks:
 	ld a,[wSubAnimCounter]
 	and a,3
 	call z,AnimationFlashScreen
@@ -850,7 +850,7 @@
 	ret
 
 ; used for Explosion and Selfdestruct
-DoExplodeSpecialEffects: ; 79009 (1e:5009)
+DoExplodeSpecialEffects:
 	ld a,[wSubAnimCounter]
 	cp a,1 ; is it the end of the subanimation?
 	jr nz,FlashScreenEveryFourFrameBlocks
@@ -859,7 +859,7 @@
 	jp AnimationHideMonPic ; make pokemon disappear
 
 ; flashes the screen when subanimation counter is 1 modulo 4
-DoBlizzardSpecialEffects: ; 79016 (1e:5016)
+DoBlizzardSpecialEffects:
 	ld a,[wSubAnimCounter]
 	cp a,13
 	jp z,AnimationFlashScreen
@@ -873,7 +873,7 @@
 
 ; flashes the screen at 3 points in the subanimation
 ; unused
-FlashScreenUnused: ; 7902e (1e:502e)
+FlashScreenUnused:
 	ld a,[wSubAnimCounter]
 	cp a,14
 	jp z,AnimationFlashScreen
@@ -884,7 +884,7 @@
 	ret
 
 ; function to make the pokemon disappear at the beginning of the animation
-TradeHidePokemon: ; 79041 (1e:5041)
+TradeHidePokemon:
 	ld a,[wSubAnimCounter]
 	cp a,6
 	ret nz
@@ -892,7 +892,7 @@
 	jp ClearMonPicFromTileMap ; make pokemon disappear
 
 ; function to make a shaking pokeball jump up at the end of the animation
-TradeShakePokeball: ; 7904c (1e:504c)
+TradeShakePokeball:
 	ld a,[wSubAnimCounter]
 	cp a,1
 	ret nz
@@ -921,7 +921,7 @@
 	ld a,SFX_TRADE_MACHINE
 	jp PlaySound
 
-BallMoveDistances1: ; 79078 (1e:5078)
+BallMoveDistances1:
 	db -12,-12,-8
 	db $ff ; terminator
 
@@ -962,13 +962,13 @@
 	pop de
 	jr .loop
 
-BallMoveDistances2: ; 790b3 (1e:50b3)
+BallMoveDistances2:
 	db 11,12,-12,-7,7,12,-8,8
 	db $ff ; terminator
 
 ; this function copies the current musical note graphic
 ; so that there are two musical notes flying towards the defending pokemon
-DoGrowlSpecialEffects: ; 790bc (1e:50bc)
+DoGrowlSpecialEffects:
 	ld hl,wOAMBuffer ; OAM buffer
 	ld de,wOAMBuffer + $10
 	ld bc,$10
@@ -979,7 +979,7 @@
 	ret
 
 ; this is associated with Tail Whip, but Tail Whip doesn't use any subanimations
-TailWhipAnimationUnused: ; 790d0 (1e:50d0)
+TailWhipAnimationUnused:
 	ld a,1
 	ld [wSubAnimCounter],a
 	ld c,20
@@ -986,7 +986,7 @@
 	jp DelayFrames
 
 ; Format: Special Effect ID (1 byte), Address (2 bytes)
-SpecialEffectPointers: ; 790da (1e:50da)
+SpecialEffectPointers:
 	db SE_DARK_SCREEN_FLASH ; $FE
 	dw AnimationFlashScreen
 	db SE_DARK_SCREEN_PALETTE ; $FD
@@ -1067,13 +1067,13 @@
 	dw AnimationWavyScreen
 	db $FF
 
-AnimationDelay10: ; 79150 (1e:5150)
+AnimationDelay10:
 	ld c,10
 	jp DelayFrames
 
 ; calls a function with the turn flipped from player to enemy or vice versa
 ; input - hl - address of function to call
-CallWithTurnFlipped: ; 79155 (1e:5155)
+CallWithTurnFlipped:
 	ld a,[H_WHOSETURN]
 	push af
 	xor a,1
@@ -1087,7 +1087,7 @@
 	ret
 
 ; flashes the screen for an extended period (48 frames)
-AnimationFlashScreenLong: ; 79165 (1e:5165)
+AnimationFlashScreenLong:
 	ld a,3 ; cycle through the palettes 3 times
 	ld [wFlashScreenLongCounter],a
 	ld a,[wOnSGB] ; running on SGB?
@@ -1113,7 +1113,7 @@
 	ret
 
 ; BG palettes
-FlashScreenLongMonochrome: ; 7918e (1e:518e)
+FlashScreenLongMonochrome:
 	db %11111001 ; 3, 3, 2, 1
 	db %11111110 ; 3, 3, 3, 2
 	db %11111111 ; 3, 3, 3, 3
@@ -1129,7 +1129,7 @@
 	db $01 ; terminator
 
 ; BG palettes
-FlashScreenLongSGB: ; 7919b (1e:519b)
+FlashScreenLongSGB:
 	db %11111000 ; 3, 3, 2, 0
 	db %11111100 ; 3, 3, 3, 0
 	db %11111111 ; 3, 3, 3, 3
@@ -1146,7 +1146,7 @@
 
 ; causes a delay of 2 frames for the first cycle
 ; causes a delay of 1 frame for the second and third cycles
-FlashScreenLongDelay: ; 791a8 (1e:51a8)
+FlashScreenLongDelay:
 	ld a,[wFlashScreenLongCounter]
 	cp a,4 ; never true since [wFlashScreenLongCounter] starts at 3
 	ld c,4
@@ -1159,7 +1159,7 @@
 .delayFrames
 	jp DelayFrames
 
-AnimationFlashScreen: ; 791be (1e:51be)
+AnimationFlashScreen:
 	ld a,[rBGP]
 	push af ; save initial palette
 	ld a,%00011011 ; 0, 1, 2, 3 (inverted colors)
@@ -1174,42 +1174,42 @@
 	ld [rBGP],a ; restore initial palette
 	ret
 
-AnimationDarkScreenPalette: ; 791d6 (1e:51d6)
+AnimationDarkScreenPalette:
 ; Changes the screen's palette to a dark palette.
 	lb bc, $6f, $6f
 	jr SetAnimationBGPalette
 
-AnimationDarkenMonPalette: ; 791db (1e:51db)
+AnimationDarkenMonPalette:
 ; Darkens the mon sprite's palette.
 	lb bc, $f9, $f4
 	jr SetAnimationBGPalette
 
-AnimationUnusedPalette1: ; 791e0 (1e:51e0)
+AnimationUnusedPalette1:
 	lb bc, $fe, $f8
 	jr SetAnimationBGPalette
 
-AnimationUnusedPalette2: ; 791e5 (1e:51e5)
+AnimationUnusedPalette2:
 	lb bc, $ff, $ff
 	jr SetAnimationBGPalette
 
-AnimationResetScreenPalette: ; 791ea (1e:51ea)
+AnimationResetScreenPalette:
 ; Restores the screen's palette to the normal palette.
 	lb bc, $e4, $e4
 	jr SetAnimationBGPalette
 
-AnimationUnusedPalette3: ; 791ef (1e:51ef)
+AnimationUnusedPalette3:
 	lb bc, $00, $00
 	jr SetAnimationBGPalette
 
-AnimationLightScreenPalette: ; 791f4 (1e:51f4)
+AnimationLightScreenPalette:
 ; Changes the screen to use a palette with light colors.
 	lb bc, $90, $90
 	jr SetAnimationBGPalette
 
-AnimationUnusedPalette4: ; 791f9 (1e:51f9)
+AnimationUnusedPalette4:
 	lb bc, $40, $40
 
-SetAnimationBGPalette: ; 791fc (1e:51fc)
+SetAnimationBGPalette:
 	ld a, [wOnSGB]
 	and a
 	ld a, b
@@ -1221,17 +1221,17 @@
 
 	ld b, $5
 
-AnimationShakeScreenVertically: ; 79209 (1e:5209)
+AnimationShakeScreenVertically:
 	predef_jump PredefShakeScreenVertically
 
-AnimationShakeScreen: ; 7920e (1e:520e)
+AnimationShakeScreen:
 ; Shakes the screen for a while. Used in Earthquake/Fissure/etc. animations.
 	ld b, $8
 
-AnimationShakeScreenHorizontallyFast: ; 79210 (1e:5210)
+AnimationShakeScreenHorizontallyFast:
 	predef_jump PredefShakeScreenHorizontally
 
-AnimationWaterDropletsEverywhere: ; 79215 (1e:5215)
+AnimationWaterDropletsEverywhere:
 ; Draws water droplets all over the screen and makes them
 ; scroll. It's hard to describe, but it's the main animation
 ; in Surf/Mist/Toxic.
@@ -1258,7 +1258,7 @@
 	jr nz, .loop
 	ret
 
-_AnimationWaterDroplets: ; 79246 (1e:5246)
+_AnimationWaterDroplets:
 	ld hl, wOAMBuffer
 .loop
 	ld a, [wBaseCoordY]
@@ -1284,7 +1284,7 @@
 	call AnimationCleanOAM
 	jp DelayFrame
 
-AnimationSlideMonUp: ; 7927a (1e:527a)
+AnimationSlideMonUp:
 ; Slides the mon's sprite upwards.
 	ld c, 7
 	ld a, [H_WHOSETURN]
@@ -1300,7 +1300,7 @@
 	ld [wSlideMonUpBottomRowLeftTile], a
 	jp _AnimationSlideMonUp
 
-AnimationSlideMonDown: ; 79297 (1e:5297)
+AnimationSlideMonDown:
 ; Slides the mon's sprite down out of the screen.
 	xor a
 	call GetTileIDList
@@ -1317,7 +1317,7 @@
 	jr nz, .loop
 	ret
 
-AnimationSlideMonOff: ; 792af (1e:52af)
+AnimationSlideMonOff:
 ; Slides the mon's sprite off the screen horizontally.
 	ld e, 8
 	ld a, 3
@@ -1324,12 +1324,12 @@
 	ld [wSlideMonDelay], a
 	jp _AnimationSlideMonOff
 
-AnimationSlideEnemyMonOff: ; 792b9 (1e:52b9)
+AnimationSlideEnemyMonOff:
 ; Slides the enemy mon off the screen horizontally.
 	ld hl, AnimationSlideMonOff
 	jp CallWithTurnFlipped
 
-_AnimationSlideMonUp: ; 792bf (1e:52bf)
+_AnimationSlideMonUp:
 	push de
 	push hl
 	push bc
@@ -1380,7 +1380,7 @@
 	jr nz, _AnimationSlideMonUp
 	ret
 
-ShakeEnemyHUD_WritePlayerMonPicOAM: ; 792fd (1e:52fd)
+ShakeEnemyHUD_WritePlayerMonPicOAM:
 ; Writes the OAM entries for a copy of the player mon's pic in OAM.
 ; The top 5 rows are reproduced in OAM, although only 2 are actually needed.
 	ld a, $10
@@ -1408,7 +1408,7 @@
 	ld [wBaseCoordX], a
 	jr .loop
 
-BattleAnimWriteOAMEntry: ; 79329 (1e:5329)
+BattleAnimWriteOAMEntry:
 ; Y coordinate = e (increased by 8 each call, before the write to OAM)
 ; X coordinate = [wBaseCoordX]
 ; tile = d
@@ -1425,11 +1425,11 @@
 	ld [hli], a
 	ret
 
-AdjustOAMBlockXPos: ; 79337 (1e:5337)
+AdjustOAMBlockXPos:
 	ld l, e
 	ld h, d
 
-AdjustOAMBlockXPos2: ; 79339 (1e:5339)
+AdjustOAMBlockXPos2:
 	ld de, 4
 .loop
 	ld a, [wCoordAdjustmentAmount]
@@ -1449,11 +1449,11 @@
 	jr nz, .loop
 	ret
 
-AdjustOAMBlockYPos: ; 79350 (1e:5350)
+AdjustOAMBlockYPos:
 	ld l, e
 	ld h, d
 
-AdjustOAMBlockYPos2: ; 79352 (1e:5352)
+AdjustOAMBlockYPos2:
 	ld de, 4
 .loop
 	ld a, [wCoordAdjustmentAmount]
@@ -1472,12 +1472,12 @@
 	jr nz, .loop
 	ret
 
-AnimationBlinkEnemyMon: ; 79369 (1e:5369)
+AnimationBlinkEnemyMon:
 ; Make the enemy mon's sprite blink on and off for a second or two
 	ld hl, AnimationBlinkMon
 	jp CallWithTurnFlipped
 
-AnimationBlinkMon: ; 7936f (1e:536f)
+AnimationBlinkMon:
 ; Make the mon's sprite blink on and off for a second or two.
 	push af
 	ld c, 6
@@ -1495,7 +1495,7 @@
 	pop af
 	ret
 
-AnimationFlashMonPic: ; 79389 (1e:5389)
+AnimationFlashMonPic:
 ; Flashes the mon's sprite on and off
 	ld a, [wBattleMonSpecies]
 	ld [wChangeMonPicPlayerTurnSpecies], a
@@ -1503,12 +1503,12 @@
 	ld [wChangeMonPicEnemyTurnSpecies], a
 	jp ChangeMonPic
 
-AnimationFlashEnemyMonPic: ; 79398 (1e:5398)
+AnimationFlashEnemyMonPic:
 ; Flashes the enemy mon's sprite on and off
 	ld hl, AnimationFlashMonPic
 	jp CallWithTurnFlipped
 
-AnimationShowMonPic: ; 7939e (1e:539e)
+AnimationShowMonPic:
 	xor a
 	call GetTileIDList
 	call GetMonSpriteTileMapPointerFromRowCount
@@ -1515,13 +1515,13 @@
 	call CopyPicTiles
 	jp Delay3
 
-AnimationShowEnemyMonPic: ; 793ab (1e:53ab)
+AnimationShowEnemyMonPic:
 ; Shows the emenmy mon's front sprite. Used in animations like Seismic Toss
 ; to make the mon's sprite reappear after disappears offscreen.
 	ld hl, AnimationShowMonPic
 	jp CallWithTurnFlipped
 
-AnimationShakeBackAndForth: ; 793b1 (1e:53b1)
+AnimationShakeBackAndForth:
 ; Shakes the mon's sprite back and forth rapidly. This is used in Double Team.
 ; The mon's sprite disappears after this animation.
 	ld a, [H_WHOSETURN]
@@ -1568,7 +1568,7 @@
 	jr nz, .loop
 	ret
 
-AnimationMoveMonHorizontally: ; 793f9 (1e:53f9)
+AnimationMoveMonHorizontally:
 ; Shifts the mon's sprite horizontally to a fixed location. Used by lots of
 ; animations like Tackle/Body Slam.
 	call AnimationHideMonPic
@@ -1586,7 +1586,7 @@
 	ld c, 3
 	jp DelayFrames
 
-AnimationResetMonPosition: ; 79415 (1e:5415)
+AnimationResetMonPosition:
 ; Resets the mon's sprites to be located at the normal coordinates.
 	ld a, [H_WHOSETURN]
 	and a
@@ -1597,7 +1597,7 @@
 	call ClearMonPicFromTileMap
 	jp AnimationShowMonPic
 
-AnimationSpiralBallsInward: ; 79424 (1e:5424)
+AnimationSpiralBallsInward:
 ; Creates an effect that looks like energy balls spiralling into the
 ; player mon's sprite.  Used in Focus Energy, for example.
 	ld a, [H_WHOSETURN]
@@ -1651,7 +1651,7 @@
 	call AnimationCleanOAM
 	jp AnimationFlashScreen
 
-SpiralBallAnimationCoordinates: ; 79476 (1e:5476)
+SpiralBallAnimationCoordinates:
 ; y, x pairs
 ; This is the sequence of screen coordinates that the spiralling
 ; balls are positioned at.
@@ -1678,7 +1678,7 @@
 	db $50, $28
 	db $FF ; list terminator
 
-AnimationSquishMonPic: ; 794a1 (1e:54a1)
+AnimationSquishMonPic:
 ; Squishes the mon's sprite horizontally making it
 ; disappear. Used by Teleport/Sky Attack animations.
 	ld c, 4
@@ -1709,7 +1709,7 @@
 	ld c, 2
 	jp DelayFrame
 
-_AnimationSquishMonPic: ; 794d4 (1e:54d4)
+_AnimationSquishMonPic:
 	ld c, 7
 .loop
 	push bc
@@ -1734,7 +1734,7 @@
 	jr nz, .loop
 	jp Delay3
 
-AnimationShootBallsUpward: ; 794f9 (1e:54f9)
+AnimationShootBallsUpward:
 ; Shoots one pillar of "energy" balls upwards. Used in Teleport/Sky Attack
 ; animations.
 	ld a, [H_WHOSETURN]
@@ -1753,7 +1753,7 @@
 	call _AnimationShootBallsUpward
 	jp AnimationCleanOAM
 
-_AnimationShootBallsUpward: ; 79517 (1e:5517)
+_AnimationShootBallsUpward:
 	push bc
 	xor a
 	ld [wWhichBattleAnimTileset], a
@@ -1803,7 +1803,7 @@
 	jr nz, .loop
 	ret
 
-AnimationShootManyBallsUpward: ; 79566 (1e:5566)
+AnimationShootManyBallsUpward:
 ; Shoots several pillars of "energy" balls upward.
 	ld a, [H_WHOSETURN]
 	and a
@@ -1827,19 +1827,19 @@
 	pop hl
 	jr .loop
 
-UpwardBallsAnimXCoordinatesPlayerTurn: ; 79591 (1e:5591)
+UpwardBallsAnimXCoordinatesPlayerTurn:
 ; List of x coordinates for each pillar of "energy" balls in the
 ; AnimationShootManyBallsUpward animation. It's unused in the game.
 	db $10, $40, $28, $18, $38, $30
 	db $FF ; list terminator
 
-UpwardBallsAnimXCoordinatesEnemyTurn: ; 79598 (1e:5598)
+UpwardBallsAnimXCoordinatesEnemyTurn:
 ; List of x coordinates for each pillar of "energy" balls in the
 ; AnimationShootManyBallsUpward animation. It's unused in the game.
 	db $60, $90, $78, $68, $88, $80
 	db $FF ; list terminator
 
-AnimationMinimizeMon: ; 7959f (1e:559f)
+AnimationMinimizeMon:
 ; Changes the mon's sprite to a mini black sprite. Used by the
 ; Minimize animation.
 	ld hl, wTempPic
@@ -1863,10 +1863,10 @@
 	call Delay3
 	jp AnimationShowMonPic
 
-MinimizedMonSprite: ; 795c4 (1e:55c4)
+MinimizedMonSprite:
 	INCBIN "gfx/minimized_mon_sprite.1bpp"
 
-AnimationSlideMonDownAndHide: ; 795c9 (1e:55c9)
+AnimationSlideMonDownAndHide:
 ; Slides the mon's sprite down and disappears. Used in Acid Armor.
 	ld a, $1
 	ld c, $2
@@ -1893,7 +1893,7 @@
 	call FillMemory
 	jp CopyTempPicToMonPic
 
-_AnimationSlideMonOff: ; 795f8 (1e:55f8)
+_AnimationSlideMonOff:
 ; Slides the mon's sprite off the screen horizontally by e tiles and waits
 ; [wSlideMonDelay] V-blanks each time the pic is slid by one tile.
 	ld a, [H_WHOSETURN]
@@ -1965,7 +1965,7 @@
 	ld a, " "
 	ret
 
-AnimationSlideMonHalfOff: ; 79645 (1e:5645)
+AnimationSlideMonHalfOff:
 ; Slides the mon's sprite halfway off the screen. It's used in Softboiled.
 	ld e, 4
 	ld a, 4
@@ -1973,7 +1973,7 @@
 	call _AnimationSlideMonOff
 	jp Delay3
 
-CopyTempPicToMonPic: ; 79652 (1e:5652)
+CopyTempPicToMonPic:
 	ld a, [H_WHOSETURN]
 	and a
 	ld hl, vBackPic ; player turn
@@ -1984,7 +1984,7 @@
 	ld bc, 7 * 7
 	jp CopyVideoData
 
-AnimationWavyScreen: ; 79666 (1e:5666)
+AnimationWavyScreen:
 ; used in Psywave/Psychic etc.
 	ld hl, vBGMap0
 	call BattleAnimCopyTileMapToVRAM
@@ -2025,7 +2025,7 @@
 	call BattleAnimCopyTileMapToVRAM
 	ret
 
-WavyScreen_SetSCX: ; 796ae (1e:56ae)
+WavyScreen_SetSCX:
 	ld a, [rSTAT]
 	and $3 ; is it H-blank?
 	jr nz, WavyScreen_SetSCX ; wait until it's H-blank
@@ -2038,7 +2038,7 @@
 	ld hl, WavyScreenLineOffsets ; go back to the beginning if so
 	ret
 
-WavyScreenLineOffsets: ; 796bf (1e:56bf)
+WavyScreenLineOffsets:
 ; Sequence of horizontal line pixel offsets for the wavy screen animation.
 ; This sequence vaguely resembles a sine wave.
 	db 0, 0, 0, 0, 0,  1,  1,  1,  2,  2,  2,  2,  2,  1,  1,  1
@@ -2045,7 +2045,7 @@
 	db 0, 0, 0, 0, 0, -1, -1, -1, -2, -2, -2, -2, -2, -1, -1, -1
 	db $80 ; terminator
 
-AnimationSubstitute: ; 796e0 (1e:56e0)
+AnimationSubstitute:
 ; Changes the pokemon's sprite to the mini sprite
 	ld hl, wTempPic
 	xor a
@@ -2084,12 +2084,12 @@
 	call CopyTempPicToMonPic
 	jp AnimationShowMonPic
 
-CopySlowbroSpriteData: ; 7973f (1e:573f)
+CopySlowbroSpriteData:
 	ld bc, $0010
 	ld a, BANK(SlowbroSprite)
 	jp FarCopyData2
 
-HideSubstituteShowMonAnim: ; 79747 (1e:5747)
+HideSubstituteShowMonAnim:
 	ld a, [H_WHOSETURN]
 	and a
 	ld hl, wPlayerMonMinimized
@@ -2114,12 +2114,12 @@
 	call AnimationFlashMonPic
 	jp AnimationShowMonPic
 
-ReshowSubstituteAnim: ; 79771 (1e:5771)
+ReshowSubstituteAnim:
 	call AnimationSlideMonOff
 	call AnimationSubstitute
 	jp AnimationShowMonPic
 
-AnimationBoundUpAndDown: ; 7977a (1e:577a)
+AnimationBoundUpAndDown:
 ; Bounces the mon's sprite up and down several times. It is used
 ; by Splash's animation.
 	ld c, 5
@@ -2131,7 +2131,7 @@
 	jr nz, .loop
 	jp AnimationShowMonPic
 
-AnimationTransformMon: ; 79787 (1e:5787)
+AnimationTransformMon:
 ; Redraws this mon's sprite as the back/front sprite of the opposing mon.
 ; Used in Transform.
 	ld a, [wEnemyMonSpecies]
@@ -2139,7 +2139,7 @@
 	ld a, [wBattleMonSpecies]
 	ld [wChangeMonPicEnemyTurnSpecies], a
 
-ChangeMonPic: ; 79793 (1e:5793)
+ChangeMonPic:
 	ld a, [H_WHOSETURN]
 	and a
 	jr z, .playerTurn
@@ -2170,7 +2170,7 @@
 	ld b, SET_PAL_BATTLE
 	jp RunPaletteCommand
 
-AnimationHideEnemyMonPic: ; 797d8 (1e:57d8)
+AnimationHideEnemyMonPic:
 ; Hides the enemy mon's sprite
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -2180,7 +2180,7 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	jp Delay3
 
-InitMultipleObjectsOAM: ; 797e8 (1e:57e8)
+InitMultipleObjectsOAM:
 ; Writes c OAM entries with tile d.
 ; Sets their Y coordinates to sequential multiples of 8, starting from 0.
 ; Sets their X coordinates to 0.
@@ -2201,7 +2201,7 @@
 	jr nz, .loop
 	ret
 
-AnimationHideMonPic: ; 79801 (1e:5801)
+AnimationHideMonPic:
 ; Hides the mon's sprite.
 	ld a, [H_WHOSETURN]
 	and a
@@ -2211,7 +2211,7 @@
 .playerTurn
 	ld a, 5 * SCREEN_WIDTH + 1
 
-ClearMonPicFromTileMap: ; 7980c (1e:580c)
+ClearMonPicFromTileMap:
 	push hl
 	push de
 	push bc
@@ -2229,7 +2229,7 @@
 ; puts the tile map destination address of a mon sprite in hl, given the row count in b
 ; The usual row count is 7, but it may be smaller when sliding a mon sprite in/out,
 ; in order to show only a portion of the mon sprite.
-GetMonSpriteTileMapPointerFromRowCount: ; 79820 (1e:5820)
+GetMonSpriteTileMapPointerFromRowCount:
 	push de
 	ld a, [H_WHOSETURN]
 	and a
@@ -2262,7 +2262,7 @@
 ; de = tile ID list pointer
 ; b = number of rows
 ; c = number of columns
-GetTileIDList: ; 79842 (1e:5842)
+GetTileIDList:
 	ld hl, TileIDListPointerTable
 	ld e, a
 	ld d, 0
@@ -2283,7 +2283,7 @@
 	ld b, a
 	ret
 
-AnimCopyRowLeft: ; 7985b (1e:585b)
+AnimCopyRowLeft:
 ; copy a row of c tiles 1 tile left
 	ld a, [hld]
 	ld [hli], a
@@ -2292,7 +2292,7 @@
 	jr nz, AnimCopyRowLeft
 	ret
 
-AnimCopyRowRight: ; 79862 (1e:5862)
+AnimCopyRowRight:
 ; copy a row of c tiles 1 tile right
 	ld a, [hli]
 	ld [hld], a
@@ -2302,7 +2302,7 @@
 	ret
 
 ; get the sound of the move id in b
-GetMoveSoundB: ; 79869 (1e:5869)
+GetMoveSoundB:
 	ld a, b
 	call GetMoveSound
 	ld b, a
@@ -2309,7 +2309,7 @@
 	ret
 
 ; get the sound of the (move id - 1) in a
-GetMoveSound: ; 7986f (1e:586f)
+GetMoveSound:
 	ld hl,MoveSoundTable
 	ld e,a
 	ld d,0
@@ -2349,7 +2349,7 @@
 	ld a,b
 	ret
 
-IsCryMove: ; 798ad (1e:58ad)
+IsCryMove:
 ; set carry if the move animation involves playing a monster cry
 	ld a,[wAnimationID]
 	cp a,GROWL
@@ -2362,7 +2362,7 @@
 	scf
 	ret
 
-MoveSoundTable: ; 798bc (1e:58bc)
+MoveSoundTable:
 	db SFX_POUND,             $00,$80 ; POUND
 	db SFX_BATTLE_0C,         $10,$80 ; KARATE_CHOP
 	db SFX_DOUBLESLAP,        $00,$80 ; DOUBLESLAP
@@ -2530,7 +2530,7 @@
 	db SFX_BATTLE_0B,         $00,$80 ; STRUGGLE
 	db SFX_BATTLE_0B,         $00,$80
 
-CopyPicTiles: ; 79aae (1e:5aae)
+CopyPicTiles:
 	ld a, [H_WHOSETURN]
 	and a
 	ld a, $31 ; base tile ID of player mon sprite
@@ -2542,7 +2542,7 @@
 	jr CopyTileIDs_NoBGTransfer
 
 ; copy the tiles used when a mon is being sent out of or into a pokeball
-CopyDownscaledMonTiles: ; 79aba (1e:5aba)
+CopyDownscaledMonTiles:
 	call GetPredefRegisters
 	ld a, [wDownscaledMonSize]
 	and a
@@ -2553,7 +2553,7 @@
 	ld de, DownscaledMonTiles_3x3
 ; fall through
 
-CopyTileIDs_NoBGTransfer: ; 79acb (1e:5acb)
+CopyTileIDs_NoBGTransfer:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 ; fall through
@@ -2560,7 +2560,7 @@
 
 ; b = number of rows
 ; c = number of columns
-CopyTileIDs: ; 79ace (1e:5ace)
+CopyTileIDs:
 	push hl
 .rowLoop
 	push bc
@@ -2585,7 +2585,7 @@
 	pop hl
 	ret
 
-TileIDListPointerTable: ; 79aea (1e:5aea)
+TileIDListPointerTable:
 	dw Unknown_79b24
 	db $77
 	dw Unknown_79b55
@@ -2603,7 +2603,7 @@
 	dw Unknown_79c50
 	db $3C
 
-DownscaledMonTiles_5x5: ; 79b02 (1e:5b02)
+DownscaledMonTiles_5x5:
 	db $31,$38,$46,$54,$5B
 	db $32,$39,$47,$55,$5C
 	db $34,$3B,$49,$57,$5E
@@ -2610,12 +2610,12 @@
 	db $36,$3D,$4B,$59,$60
 	db $37,$3E,$4C,$5A,$61
 
-DownscaledMonTiles_3x3: ; 79b1b (1e:5b1b)
+DownscaledMonTiles_3x3:
 	db $31,$46,$5B
 	db $34,$49,$5E
 	db $37,$4C,$61
 
-Unknown_79b24: ; 79b24 (1e:5b24)
+Unknown_79b24:
 	db $00,$07,$0E,$15,$1C,$23,$2A
 	db $01,$08,$0F,$16,$1D,$24,$2B
 	db $02,$09,$10,$17,$1E,$25,$2C
@@ -2624,7 +2624,7 @@
 	db $05,$0C,$13,$1A,$21,$28,$2F
 	db $06,$0D,$14,$1B,$22,$29,$30
 
-Unknown_79b55: ; 79b55 (1e:5b55)
+Unknown_79b55:
 	db $00,$07,$0E,$15,$1C,$23,$2A
 	db $01,$08,$0F,$16,$1D,$24,$2B
 	db $03,$0A,$11,$18,$1F,$26,$2D
@@ -2631,12 +2631,12 @@
 	db $04,$0B,$12,$19,$20,$27,$2E
 	db $05,$0C,$13,$1A,$21,$28,$2F
 
-Unknown_79b78: ; 79b78 (1e:5b78)
+Unknown_79b78:
 	db $00,$07,$0E,$15,$1C,$23,$2A
 	db $02,$09,$10,$17,$1E,$25,$2C
 	db $04,$0B,$12,$19,$20,$27,$2E
 
-Unknown_79b8d: ; 79b8d (1e:5b8d)
+Unknown_79b8d:
 	db $00,$00,$00,$00,$00,$00,$00
 	db $00,$00,$00,$00,$00,$19,$00
 	db $02,$06,$0B,$10,$14,$1A,$00
@@ -2645,7 +2645,7 @@
 	db $04,$09,$0E,$13,$17,$1D,$1F
 	db $05,$0A,$0F,$01,$18,$1E,$20
 
-Unknown_79bbe: ; 79bbe (1e:5bbe)
+Unknown_79bbe:
 	db $00,$00,$00,$30,$00,$37,$00
 	db $00,$00,$2B,$31,$34,$38,$3D
 	db $21,$26,$2C,$01,$35,$39,$3E
@@ -2654,7 +2654,7 @@
 	db $24,$29,$2F,$01,$01,$3B,$00
 	db $25,$2A,$01,$01,$01,$3C,$00
 
-Unknown_79bef: ; 79bef (1e:5bef)
+Unknown_79bef:
 	db $00,$00,$00,$00,$00,$00,$00
 	db $00,$00,$47,$4D,$00,$00,$00
 	db $00,$00,$48,$4E,$52,$56,$5B
@@ -2663,7 +2663,7 @@
 	db $41,$45,$4B,$51,$4C,$59,$5D
 	db $42,$46,$4C,$4C,$55,$5A,$5E
 
-Unknown_79c20: ; 79c20 (1e:5c20)
+Unknown_79c20:
 	db $31,$32,$32,$32,$32,$33
 	db $34,$35,$36,$36,$37,$38
 	db $34,$39,$3A,$3A,$3B,$38
@@ -2673,12 +2673,12 @@
 	db $41,$43,$4B,$4C,$4D,$4E
 	db $4F,$50,$50,$50,$51,$52
 
-Unknown_79c50: ; 79c50 (1e:5c50)
+Unknown_79c50:
 	db $43,$55,$56,$53,$53,$53,$53,$53,$53,$53,$53,$53
 	db $43,$57,$58,$54,$54,$54,$54,$54,$54,$54,$54,$54
 	db $43,$59,$5A,$43,$43,$43,$43,$43,$43,$43,$43,$43
 
-AnimationLeavesFalling: ; 79c74 (1e:5c74)
+AnimationLeavesFalling:
 ; Makes leaves float down from the top of the screen. This is used
 ; in Razor Leaf's animation.
 	ld a, [rOBP0]
@@ -2693,7 +2693,7 @@
 	ld [rOBP0], a
 	ret
 
-AnimationPetalsFalling: ; 79c8a (1e:5c8a)
+AnimationPetalsFalling:
 ; Makes lots of petals fall down from the top of the screen. It's used in
 ; the animation for Petal Dance.
 	ld d, $71 ; petal tile
@@ -2702,7 +2702,7 @@
 	call AnimationFallingObjects
 	jp ClearSprites
 
-AnimationFallingObjects: ; 79c97 (1e:5c97)
+AnimationFallingObjects:
 	ld c, a
 	ld a, 1
 	call InitMultipleObjectsOAM
@@ -2741,7 +2741,7 @@
 	jr nz, .loop ; keep moving the falling objects down until it does
 	ret
 
-FallingObjects_UpdateOAMEntry: ; 79cdb (1e:5cdb)
+FallingObjects_UpdateOAMEntry:
 ; Increases Y by 2 pixels and adjusts X and X flip based on the falling object's
 ; movement byte.
 	ld hl, wOAMBuffer
@@ -2785,10 +2785,10 @@
 	ld [hl], a ; attribute
 	ret
 
-FallingObjects_DeltaXs: ; 79d0d (1e:5d0d)
+FallingObjects_DeltaXs:
 	db 0, 1, 3, 5, 7, 9, 11, 13, 15
 
-FallingObjects_UpdateMovementByte: ; 79d16 (1e:5d16)
+FallingObjects_UpdateMovementByte:
 	ld a, [wFallingObjectMovementByte]
 	inc a
 	ld b, a
@@ -2804,7 +2804,7 @@
 	ld [wFallingObjectMovementByte], a
 	ret
 
-FallingObjects_InitXCoords: ; 79d2a (1e:5d2a)
+FallingObjects_InitXCoords:
 	ld hl, wOAMBuffer + $01
 	ld de, FallingObjects_InitialXCoords
 	ld a, [wNumFallingObjects]
@@ -2820,10 +2820,10 @@
 	jr nz, .loop
 	ret
 
-FallingObjects_InitialXCoords: ; 79d3e (1e:5d3e)
+FallingObjects_InitialXCoords:
 	db $38,$40,$50,$60,$70,$88,$90,$56,$67,$4A,$77,$84,$98,$32,$22,$5C,$6C,$7D,$8E,$99
 
-FallingObjects_InitMovementData: ; 79d52 (1e:5d52)
+FallingObjects_InitMovementData:
 	ld hl, wFallingObjectsMovementData
 	ld de, FallingObjects_InitialMovementData
 	ld a, [wNumFallingObjects]
@@ -2836,10 +2836,10 @@
 	jr nz, .loop
 	ret
 
-FallingObjects_InitialMovementData: ; 79d63 (1e:5d63)
+FallingObjects_InitialMovementData:
 	db $00,$84,$06,$81,$02,$88,$01,$83,$05,$89,$09,$80,$07,$87,$03,$82,$04,$85,$08,$86
 
-AnimationShakeEnemyHUD: ; 79d77 (1e:5d77)
+AnimationShakeEnemyHUD:
 ; Shakes the enemy HUD.
 
 ; Make a copy of the back pic's tile patterns in sprite tile pattern VRAM.
@@ -2912,7 +2912,7 @@
 
 ; b = tile ID list index
 ; c = base tile ID
-CopyTileIDsFromList: ; 79dda (1e:5dda)
+CopyTileIDsFromList:
 	call GetPredefRegisters
 	ld a, c
 	ld [hBaseTileID], a
@@ -2922,7 +2922,7 @@
 	pop hl
 	jp CopyTileIDs
 
-ShakeEnemyHUD_ShakeBG: ; 79de9 (1e:5de9)
+ShakeEnemyHUD_ShakeBG:
 	ld a, [hSCX]
 	ld [wTempSCX], a
 .loop
@@ -2942,7 +2942,7 @@
 	ld [hSCX], a
 	ret
 
-BattleAnimCopyTileMapToVRAM: ; 79e0d (1e:5e0d)
+BattleAnimCopyTileMapToVRAM:
 	ld a, h
 	ld [H_AUTOBGTRANSFERDEST + 1], a
 	ld a, l
@@ -2949,7 +2949,7 @@
 	ld [H_AUTOBGTRANSFERDEST], a
 	jp Delay3
 
-TossBallAnimation: ; 79e16 (1e:5e16)
+TossBallAnimation:
 	ld a,[wIsInBattle]
 	cp a,2
 	jr z,.BlockBall ; if in trainer battle, play different animation
@@ -2992,7 +2992,7 @@
 	jr nz,.PlayNextAnimation
 	ret
 
-.PokeBallAnimations: ; 79e50 (1e:5e50)
+.PokeBallAnimations:
 ; sequence of animations that make up the Poké Ball toss
 	db POOF_ANIM,HIDEPIC_ANIM,SHAKE_ANIM,POOF_ANIM,SHOWPIC_ANIM
 
@@ -3006,7 +3006,7 @@
 	ld [wAnimationID],a
 	jp PlayAnimation
 
-PlayApplyingAttackSound: ; 79e6a (1e:5e6a)
+PlayApplyingAttackSound:
 ; play a different sound depending if move is not very effective, neutral, or super-effective
 ; don't play any sound at all if move is ineffective
 	call WaitForSoundToFinish
--- a/engine/battle/bank_e_misc.asm
+++ b/engine/battle/bank_e_misc.asm
@@ -1,5 +1,5 @@
 ; formats a string at wMovesString that lists the moves at wMoves
-FormatMovesString: ; 39b87 (e:5b87)
+FormatMovesString:
 	ld hl, wMoves
 	ld de, wMovesString
 	ld b, $0
@@ -52,7 +52,7 @@
 	ret
 
 ; XXX this is called in a few places, but it doesn't appear to do anything useful
-InitList: ; 39bd5 (e:5bd5)
+InitList:
 	ld a, [wInitListType]
 	cp INIT_ENEMYOT_LIST
 	jr nz, .notEnemy
@@ -103,7 +103,7 @@
 	ret
 
 ; get species of mon e in list [wMonDataLocation] for LoadMonData
-GetMonSpecies: ; 39c37 (e:5c37)
+GetMonSpecies:
 	ld hl, wPartySpecies
 	ld a, [wMonDataLocation]
 	and a
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -1,4 +1,4 @@
-BattleTransition: ; 7096d (1c:496d)
+BattleTransition:
 	ld a, 1
 	ld [H_AUTOBGTRANSFERENABLED], a
 	call Delay3
@@ -70,7 +70,7 @@
 ; bit 0: set if trainer battle
 ; bit 1: set if enemy is at least 3 levels higher than player
 ; bit 2: set if dungeon map
-BattleTransitions: ; 709d2 (1c:49d2)
+BattleTransitions:
 	dw BattleTransition_DoubleCircle      ; %000
 	dw BattleTransition_Spiral            ; %001
 	dw BattleTransition_Circle            ; %010
@@ -80,7 +80,7 @@
 	dw BattleTransition_VerticalStripes   ; %110
 	dw BattleTransition_Split             ; %111
 
-GetBattleTransitionID_WildOrTrainer: ; 709e2 (1c:49e2)
+GetBattleTransitionID_WildOrTrainer:
 	ld a, [wCurOpponent]
 	cp 200
 	jr nc, .trainer
@@ -90,7 +90,7 @@
 	set 0, c
 	ret
 
-GetBattleTransitionID_CompareLevels: ; 709ef (1c:49ef)
+GetBattleTransitionID_CompareLevels:
 	ld hl, wPartyMon1HP
 .faintedLoop
 	ld a, [hli]
@@ -121,7 +121,7 @@
 ; fails to recognize VICTORY_ROAD_2, VICTORY_ROAD_3, all ROCKET_HIDEOUT maps,
 ; MANSION_1, SEAFOAM_ISLANDS_[2-5], POWER_PLANT, DIGLETTS_CAVE
 ; and SILPH_CO_[9-11]F as dungeon maps
-GetBattleTransitionID_IsDungeonMap: ; 70a19 (1c:4a19)
+GetBattleTransitionID_IsDungeonMap:
 	ld a, [wCurMap]
 	ld e, a
 	ld hl, DungeonMaps1
@@ -153,7 +153,7 @@
 
 ; GetBattleTransitionID_IsDungeonMap checks if wCurMap
 ; is equal to one of these maps
-DungeonMaps1: ; 70a3f (1c:4a3f)
+DungeonMaps1:
 	db VIRIDIAN_FOREST
 	db ROCK_TUNNEL_1
 	db SEAFOAM_ISLANDS_1
@@ -162,7 +162,7 @@
 
 ; GetBattleTransitionID_IsDungeonMap checks if wCurMap
 ; is in between or equal to each pair of maps
-DungeonMaps2: ; 70a44 (1c:4a44)
+DungeonMaps2:
 	; all MT_MOON maps
 	db MT_MOON_1
 	db MT_MOON_3
@@ -181,17 +181,17 @@
 	db UNKNOWN_DUNGEON_1
 	db $FF
 
-LoadBattleTransitionTile: ; 70a4d (1c:4a4d)
+LoadBattleTransitionTile:
 	ld hl, vChars1 + $7f0
 	ld de, BattleTransitionTile
 	lb bc, BANK(BattleTransitionTile), (BattleTransitionTileEnd - BattleTransitionTile) / $10
 	jp CopyVideoData
 
-BattleTransitionTile: ; 70a59 (1c:4a59)
+BattleTransitionTile:
 	INCBIN "gfx/battle_transition.2bpp"
 BattleTransitionTileEnd:
 
-BattleTransition_BlackScreen: ; 70a69 (1c:4a69)
+BattleTransition_BlackScreen:
 	ld a, $ff
 	ld [rBGP], a
 	ld [rOBP0], a
@@ -202,7 +202,7 @@
 ; called regardless of mon levels, but does an
 ; outward spiral if enemy is at least 3 levels
 ; higher than player and does an inward spiral otherwise
-BattleTransition_Spiral: ; 70a72 (1c:4a72)
+BattleTransition_Spiral:
 	ld a, [wBattleTransitionSpiralDirection]
 	and a
 	jr z, .outwardSpiral
@@ -235,7 +235,7 @@
 	ld [wOutwardSpiralTileMapPointer], a
 	ret
 
-BattleTransition_InwardSpiral: ; 70aaa (1c:4aaa)
+BattleTransition_InwardSpiral:
 	ld a, 7
 	ld [wInwardSpiralUpdateScreenCounter], a
 	coord hl, 0, 0
@@ -265,7 +265,7 @@
 	jr nz, .loop
 	ret
 
-BattleTransition_InwardSpiral_: ; 70ae0 (1c:4ae0)
+BattleTransition_InwardSpiral_:
 	push bc
 .loop
 	ld [hl], $ff
@@ -284,7 +284,7 @@
 	pop bc
 	ret
 
-BattleTransition_OutwardSpiral_: ; 70af9 (1c:4af9)
+BattleTransition_OutwardSpiral_:
 	ld bc, -SCREEN_WIDTH
 	ld de, SCREEN_WIDTH
 	ld a, [wOutwardSpiralTileMapPointer + 1]
@@ -352,7 +352,7 @@
 	jr .done
 
 FlashScreen:
-BattleTransition_FlashScreen_: ; 70b5d (1c:4b5d)
+BattleTransition_FlashScreen_:
 	ld hl, BattleTransition_FlashScreenPalettes
 .loop
 	ld a, [hli]
@@ -367,12 +367,12 @@
 	jr nz, BattleTransition_FlashScreen_
 	ret
 
-BattleTransition_FlashScreenPalettes: ; 70b72 (1c:4b72)
+BattleTransition_FlashScreenPalettes:
 	db $F9,$FE,$FF,$FE,$F9,$E4,$90,$40,$00,$40,$90,$E4
 	db $01 ; terminator
 
 ; used for low level trainer dungeon battles
-BattleTransition_Shrink: ; 70b7f (1c:4b7f)
+BattleTransition_Shrink:
 	ld c, SCREEN_HEIGHT / 2
 .loop
 	push bc
@@ -406,7 +406,7 @@
 	jp DelayFrames
 
 ; used for high level trainer dungeon battles
-BattleTransition_Split: ; 70bca (1c:4bca)
+BattleTransition_Split:
 	ld c, SCREEN_HEIGHT / 2
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -437,7 +437,7 @@
 	ld c, 10
 	jp DelayFrames
 
-BattleTransition_CopyTiles1: ; 70c12 (1c:4c12)
+BattleTransition_CopyTiles1:
 	ld a, c
 	ld [wBattleTransitionCopyTilesOffset], a
 	ld a, b
@@ -469,7 +469,7 @@
 	jr nz, .loop2
 	ret
 
-BattleTransition_CopyTiles2: ; 70c3f (1c:4c3f)
+BattleTransition_CopyTiles2:
 	ld a, c
 	ld [wBattleTransitionCopyTilesOffset], a
 	ld a, b
@@ -519,7 +519,7 @@
 	ret
 
 ; used for high level wild dungeon battles
-BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e)
+BattleTransition_VerticalStripes:
 	ld c, SCREEN_HEIGHT
 	coord hl, 0, 0
 	coord de, 1, 17
@@ -547,7 +547,7 @@
 	jr nz, .loop
 	jp BattleTransition_BlackScreen
 
-BattleTransition_VerticalStripes_: ; 70caa (1c:4caa)
+BattleTransition_VerticalStripes_:
 	ld c, SCREEN_WIDTH / 2
 .loop
 	ld [hl], $ff
@@ -558,7 +558,7 @@
 	ret
 
 ; used for low level wild dungeon battles
-BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4)
+BattleTransition_HorizontalStripes:
 	ld c, SCREEN_WIDTH
 	coord hl, 0, 0
 	coord de, 19, 1
@@ -582,7 +582,7 @@
 	jr nz, .loop
 	jp BattleTransition_BlackScreen
 
-BattleTransition_HorizontalStripes_: ; 70cd8 (1c:4cd8)
+BattleTransition_HorizontalStripes_:
 	ld c, SCREEN_HEIGHT / 2
 	ld de, SCREEN_WIDTH * 2
 .loop
@@ -595,7 +595,7 @@
 ; used for high level wild non-dungeon battles
 ; makes one full circle around the screen
 ; by animating each half circle one at a time
-BattleTransition_Circle: ; 70ce4 (1c:4ce4)
+BattleTransition_Circle:
 	call BattleTransition_FlashScreen
 	lb bc, 0, SCREEN_WIDTH / 2
 	ld hl, BattleTransition_HalfCircle1
@@ -606,7 +606,7 @@
 	call BattleTransition_Circle_Sub1
 	jp BattleTransition_BlackScreen
 
-BattleTransition_FlashScreen: ; 70cfd (1c:4cfd)
+BattleTransition_FlashScreen:
 	ld b, $3
 	call BattleTransition_FlashScreen_
 	xor a
@@ -613,7 +613,7 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ret
 
-BattleTransition_Circle_Sub1: ; 70d06 (1c:4d06)
+BattleTransition_Circle_Sub1:
 	push bc
 	push hl
 	ld a, b
@@ -627,7 +627,7 @@
 	jr nz, BattleTransition_Circle_Sub1
 	ret
 
-BattleTransition_TransferDelay3: ; 70d19 (1c:4d19)
+BattleTransition_TransferDelay3:
 	ld a, 1
 	ld [H_AUTOBGTRANSFERENABLED], a
 	call Delay3
@@ -638,7 +638,7 @@
 ; used for low level wild non-dungeon battles
 ; makes two half circles around the screen
 ; by animating both half circles at the same time
-BattleTransition_DoubleCircle: ; 70d24 (1c:4d24)
+BattleTransition_DoubleCircle:
 	call BattleTransition_FlashScreen
 	ld c, SCREEN_WIDTH / 2
 	ld hl, BattleTransition_HalfCircle1
@@ -666,7 +666,7 @@
 	jr nz, .loop
 	jp BattleTransition_BlackScreen
 
-BattleTransition_Circle_Sub2: ; 70d50 (1c:4d50)
+BattleTransition_Circle_Sub2:
 	ld [wBattleTransitionCircleScreenQuadrantY], a
 	ld a, [hli]
 	ld [wBattleTransitionCircleScreenQuadrantX], a
@@ -679,7 +679,7 @@
 	ld l, a
 	jp BattleTransition_Circle_Sub3
 
-BattleTransition_HalfCircle1: ; 70d61 (1c:4d61)
+BattleTransition_HalfCircle1:
 	db $01
 	dw BattleTransition_CircleData1
 	dwCoord 18, 6
@@ -720,7 +720,7 @@
 	dw BattleTransition_CircleData1
 	dwCoord 1, 6
 
-BattleTransition_HalfCircle2: ; 70d93 (1c:4d93)
+BattleTransition_HalfCircle2:
 	db $00
 	dw BattleTransition_CircleData1
 	dwCoord 1, 11
@@ -761,7 +761,7 @@
 	dw BattleTransition_CircleData1
 	dwCoord 18, 11
 
-BattleTransition_Circle_Sub3: ; 70dc5 (1c:4dc5)
+BattleTransition_Circle_Sub3:
 	push hl
 	ld a, [de]
 	ld c, a
@@ -806,17 +806,17 @@
 	jr nz, .loop2
 	jr BattleTransition_Circle_Sub3
 
-BattleTransition_CircleData1: ; 70dfe (1c:4dfe)
+BattleTransition_CircleData1:
 	db $02,$03,$05,$04,$09,$FF
 
-BattleTransition_CircleData2: ; 70e04 (1c:4e04)
+BattleTransition_CircleData2:
 	db $01,$01,$02,$02,$04,$02,$04,$02,$03,$FF
 
-BattleTransition_CircleData3: ; 70e0e (1c:4e0e)
+BattleTransition_CircleData3:
 	db $02,$01,$03,$01,$04,$01,$04,$01,$04,$01,$03,$01,$02,$01,$01,$01,$01,$FF
 
-BattleTransition_CircleData4: ; 70e20 (1c:4e20)
+BattleTransition_CircleData4:
 	db $04,$01,$04,$00,$03,$01,$03,$00,$02,$01,$02,$00,$01,$FF
 
-BattleTransition_CircleData5: ; 70e2e (1c:4e2e)
+BattleTransition_CircleData5:
 	db $04,$00,$03,$00,$03,$00,$02,$00,$02,$00,$01,$00,$01,$00,$01,$FF
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@@ -1,4 +1,4 @@
-PrintBeginningBattleText: ; 58d99 (16:4d99)
+PrintBeginningBattleText:
 	ld a, [wIsInBattle]
 	dec a
 	jr nz, .trainerBattle
@@ -70,31 +70,31 @@
 .done
 	ret
 
-WildMonAppearedText: ; 58e3b (16:4e3b)
+WildMonAppearedText:
 	TX_FAR _WildMonAppearedText
 	db "@"
 
-HookedMonAttackedText: ; 58e40 (16:4e40)
+HookedMonAttackedText:
 	TX_FAR _HookedMonAttackedText
 	db "@"
 
-EnemyAppearedText: ; 58e45 (16:4e45)
+EnemyAppearedText:
 	TX_FAR _EnemyAppearedText
 	db "@"
 
-TrainerWantsToFightText: ; 58e4a (16:4e4a)
+TrainerWantsToFightText:
 	TX_FAR _TrainerWantsToFightText
 	db "@"
 
-UnveiledGhostText: ; 58e4f (16:4e4f)
+UnveiledGhostText:
 	TX_FAR _UnveiledGhostText
 	db "@"
 
-GhostCantBeIDdText: ; 58e54 (16:4e54)
+GhostCantBeIDdText:
 	TX_FAR _GhostCantBeIDdText
 	db "@"
 
-PrintSendOutMonMessage: ; 58e59 (16:4e59)
+PrintSendOutMonMessage:
 	ld hl, wEnemyMonHP
 	ld a, [hli]
 	or [hl]
@@ -137,22 +137,22 @@
 .printText
 	jp PrintText
 
-GoText: ; 58eae (16:4eae)
+GoText:
 	TX_FAR _GoText
 	TX_ASM
 	jr PrintPlayerMon1Text
 
-DoItText: ; 58eb5 (16:4eb5)
+DoItText:
 	TX_FAR _DoItText
 	TX_ASM
 	jr PrintPlayerMon1Text
 
-GetmText: ; 58ebc (16:4ebc)
+GetmText:
 	TX_FAR _GetmText
 	TX_ASM
 	jr PrintPlayerMon1Text
 
-EnemysWeakText: ; 58ec3 (16:4ec3)
+EnemysWeakText:
 	TX_FAR _EnemysWeakText
 	TX_ASM
 
@@ -160,15 +160,15 @@
 	ld hl, PlayerMon1Text
 	ret
 
-PlayerMon1Text: ; 58ecc (16:4ecc)
+PlayerMon1Text:
 	TX_FAR _PlayerMon1Text
 	db "@"
 
-RetreatMon: ; 58ed1 (16:4ed1)
+RetreatMon:
 	ld hl, PlayerMon2Text
 	jp PrintText
 
-PlayerMon2Text: ; 58ed7 (16:4ed7)
+PlayerMon2Text:
 	TX_FAR _PlayerMon2Text
 	TX_ASM
 	push de
@@ -219,25 +219,25 @@
 	ld hl, GoodText ; HP went down 70% or more
 	ret
 
-EnoughText: ; 58f25 (16:4f25)
+EnoughText:
 	TX_FAR _EnoughText
 	TX_ASM
 	jr PrintComeBackText
 
-OKExclamationText: ; 58f2c (16:4f2c)
+OKExclamationText:
 	TX_FAR _OKExclamationText
 	TX_ASM
 	jr PrintComeBackText
 
-GoodText: ; 58f33 (16:4f33)
+GoodText:
 	TX_FAR _GoodText
 	TX_ASM
 	jr PrintComeBackText
 
-PrintComeBackText: ; 58f3a (16:4f3a)
+PrintComeBackText:
 	ld hl, ComeBackText
 	ret
 
-ComeBackText: ; 58f3e (16:4f3e)
+ComeBackText:
 	TX_FAR _ComeBackText
 	db "@"
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1,7 +1,7 @@
 BattleCore:
 
 ; These are move effects (second value from the Moves table in bank $E).
-ResidualEffects1: ; 3c000 (f:4000)
+ResidualEffects1:
 ; most non-side effects
 	db CONVERSION_EFFECT
 	db HAZE_EFFECT
@@ -20,13 +20,13 @@
 	db LEECH_SEED_EFFECT
 	db SPLASH_EFFECT
 	db -1
-SetDamageEffects: ; 3c011 (f:4011)
+SetDamageEffects:
 ; moves that do damage but not through normal calculations
 ; e.g., Super Fang, Psywave
 	db SUPER_FANG_EFFECT
 	db SPECIAL_DAMAGE_EFFECT
 	db -1
-ResidualEffects2: ; 3c014 (f:4014)
+ResidualEffects2:
 ; non-side effects not included in ResidualEffects1
 ; stat-affecting moves, sleep-inflicting moves, and Bide
 ; e.g., Meditate, Bide, Hypnosis
@@ -58,7 +58,7 @@
 	db ACCURACY_DOWN2_EFFECT
 	db EVASION_DOWN2_EFFECT
 	db -1
-AlwaysHappenSideEffects: ; 3c030 (f:4030)
+AlwaysHappenSideEffects:
 ; Attacks that aren't finished after they faint the opponent.
 	db DRAIN_HP_EFFECT
 	db EXPLODE_EFFECT
@@ -71,7 +71,7 @@
 	db TWINEEDLE_EFFECT
 	db RAGE_EFFECT
 	db -1
-SpecialEffects: ; 3c03b (f:403b)
+SpecialEffects:
 ; Effects from arrays 2, 4, and 5B, minus Twineedle and Rage.
 ; Includes all effects that do not need to be called at the end of
 ; ExecutePlayerMove (or ExecuteEnemyMove), because they have already been handled
@@ -90,13 +90,13 @@
 	db JUMP_KICK_EFFECT
 	db RECOIL_EFFECT
 	; fallthrough to Next EffectsArray
-SpecialEffectsCont: ; 3c049 (f:4049)
+SpecialEffectsCont:
 ; damaging moves whose effect is executed prior to damage calculation
 	db THRASH_PETAL_DANCE_EFFECT
 	db TRAPPING_EFFECT
 	db -1
 
-SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c)
+SlidePlayerAndEnemySilhouettesOnScreen:
 	call LoadPlayerBackPic
 	ld a, MESSAGE_BOX ; the usual text box at the bottom of the screen
 	ld [wTextBoxID], a
@@ -193,7 +193,7 @@
 ; the lower of the player's pic (his body) is part of the background, but his head is a sprite
 ; the reason for this is that it shares Y coordinates with the lower part of the enemy pic, so background scrolling wouldn't work for both pics
 ; instead, the enemy pic is part of the background and uses the scroll register, while the player's head is a sprite and is slid by changing its X coordinates in a loop
-SlidePlayerHeadLeft: ; 3c0ff (f:40ff)
+SlidePlayerHeadLeft:
 	push bc
 	ld hl, wOAMBuffer + $01
 	ld c, $15 ; number of OAM entries
@@ -207,7 +207,7 @@
 	pop bc
 	ret
 
-SetScrollXForSlidingPlayerBodyLeft: ; 3c110 (f:4110)
+SetScrollXForSlidingPlayerBodyLeft:
 	ld a, [rLY]
 	cp l
 	jr nz, SetScrollXForSlidingPlayerBodyLeft
@@ -219,7 +219,7 @@
 	jr z, .loop
 	ret
 
-StartBattle: ; 3c11e (f:411e)
+StartBattle:
 	xor a
 	ld [wPartyGainExpFlags], a
 	ld [wPartyFoughtCurrentEnemyFlags], a
@@ -341,7 +341,7 @@
 	jr MainInBattleLoop
 
 ; wild mon or link battle enemy ran from battle
-EnemyRan: ; 3c202 (f:4202)
+EnemyRan:
 	call LoadScreenTilesFromBuffer1
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
@@ -359,15 +359,15 @@
 	ld [H_WHOSETURN], a
 	jpab AnimationSlideEnemyMonOff
 
-WildRanText: ; 3c229 (f:4229)
+WildRanText:
 	TX_FAR _WildRanText
 	db "@"
 
-EnemyRanText: ; 3c22e (f:422e)
+EnemyRanText:
 	TX_FAR _EnemyRanText
 	db "@"
 
-MainInBattleLoop: ; 3c233 (f:4233)
+MainInBattleLoop:
 	call ReadPlayerMonCurHPAndStatus
 	ld hl, wBattleMonHP
 	ld a, [hli]
@@ -557,7 +557,7 @@
 	call CheckNumAttacksLeft
 	jp MainInBattleLoop
 
-HandlePoisonBurnLeechSeed: ; 3c3bd (f:43bd)
+HandlePoisonBurnLeechSeed:
 	ld hl, wBattleMonHP
 	ld de, wBattleMonStatus
 	ld a, [H_WHOSETURN]
@@ -621,15 +621,15 @@
 	xor a
 	ret
 
-HurtByPoisonText: ; 3c42e (f:442e)
+HurtByPoisonText:
 	TX_FAR _HurtByPoisonText
 	db "@"
 
-HurtByBurnText: ; 3c433 (f:4433)
+HurtByBurnText:
 	TX_FAR _HurtByBurnText
 	db "@"
 
-HurtByLeechSeedText: ; 3c438 (f:4438)
+HurtByLeechSeedText:
 	TX_FAR _HurtByLeechSeedText
 	db "@"
 
@@ -637,7 +637,7 @@
 ; note that the toxic ticks are considered even if the damage is not poison (hence the Leech Seed glitch)
 ; hl: HP pointer
 ; bc (out): total damage
-HandlePoisonBurnLeechSeed_DecreaseOwnHP: ; 3c43d (f:443d)
+HandlePoisonBurnLeechSeed_DecreaseOwnHP:
 	push hl
 	push hl
 	ld bc, $e      ; skip to max HP
@@ -705,7 +705,7 @@
 
 ; adds bc to enemy HP
 ; bc isn't updated if HP substracted was capped to prevent overkill
-HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3)
+HandlePoisonBurnLeechSeed_IncreaseEnemyHP:
 	push hl
 	ld hl, wEnemyMonMaxHP
 	ld a, [H_WHOSETURN]
@@ -755,7 +755,7 @@
 	pop hl
 	ret
 
-UpdateCurMonHPBar: ; 3c4f6 (f:44f6)
+UpdateCurMonHPBar:
 	coord hl, 10, 9    ; tile pointer to player HP bar
 	ld a, [H_WHOSETURN]
 	and a
@@ -770,7 +770,7 @@
 	pop bc
 	ret
 
-CheckNumAttacksLeft: ; 3c50f (f:450f)
+CheckNumAttacksLeft:
 	ld a, [wPlayerNumAttacksLeft]
 	and a
 	jr nz, .checkEnemy
@@ -786,7 +786,7 @@
 	res UsingTrappingMove, [hl] ; enemy not using multi-turn attack like wrap any more
 	ret
 
-HandleEnemyMonFainted: ; 3c525 (f:4525)
+HandleEnemyMonFainted:
 	xor a
 	ld [wInHandlePlayerMonFainted], a
 	call FaintEnemyPokemon
@@ -949,7 +949,7 @@
 	TX_FAR _EnemyMonFaintedText
 	db "@"
 
-EndLowHealthAlarm: ; 3c643 (f:4643)
+EndLowHealthAlarm:
 ; This function is called when the player has the won the battle. It turns off
 ; the low health alarm and prevents it from reactivating until the next battle.
 	xor a
@@ -959,7 +959,7 @@
 	ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating
 	ret
 
-AnyEnemyPokemonAliveCheck: ; 3c64f (f:464f)
+AnyEnemyPokemonAliveCheck:
 	ld a, [wEnemyPartyCount]
 	ld b, a
 	xor a
@@ -977,7 +977,7 @@
 	ret
 
 ; stores whether enemy ran in Z flag
-ReplaceFaintedEnemyMon: ; 3c664 (f:4664)
+ReplaceFaintedEnemyMon:
 	ld hl, wEnemyHPBarColor
 	ld e, $30
 	call GetBattleHealthBarColor
@@ -1000,7 +1000,7 @@
 	inc a ; reset Z flag
 	ret
 
-TrainerBattleVictory: ; 3c696 (f:4696)
+TrainerBattleVictory:
 	call EndLowHealthAlarm
 	ld b, MUSIC_DEFEATED_GYM_LEADER
 	ld a, [wGymLeaderNo]
@@ -1036,15 +1036,15 @@
 	ld c, $3
 	predef_jump AddBCDPredef
 
-MoneyForWinningText: ; 3c6e4 (f:46e4)
+MoneyForWinningText:
 	TX_FAR _MoneyForWinningText
 	db "@"
 
-TrainerDefeatedText: ; 3c6e9 (f:46e9)
+TrainerDefeatedText:
 	TX_FAR _TrainerDefeatedText
 	db "@"
 
-PlayBattleVictoryMusic: ; 3c6ee (f:46ee)
+PlayBattleVictoryMusic:
 	push af
 	ld a, $ff
 	ld [wNewSoundID], a
@@ -1054,7 +1054,7 @@
 	call PlayMusic
 	jp Delay3
 
-HandlePlayerMonFainted: ; 3c700 (f:4700)
+HandlePlayerMonFainted:
 	ld a, 1
 	ld [wInHandlePlayerMonFainted], a
 	call RemoveFaintedPlayerMon
@@ -1088,7 +1088,7 @@
 	jp MainInBattleLoop
 
 ; resets flags, slides mon's pic down, plays cry, and prints fainted message
-RemoveFaintedPlayerMon: ; 3c741 (f:4741)
+RemoveFaintedPlayerMon:
 	ld a, [wPlayerMonNumber]
 	ld c, a
 	ld hl, wPartyGainExpFlags
@@ -1131,13 +1131,13 @@
 	ld hl, PlayerMonFaintedText
 	jp PrintText
 
-PlayerMonFaintedText: ; 3c796 (f:4796)
+PlayerMonFaintedText:
 	TX_FAR _PlayerMonFaintedText
 	db "@"
 
 ; asks if you want to use next mon
 ; stores whether you ran in C flag
-DoUseNextMonDialogue: ; 3c79b (f:479b)
+DoUseNextMonDialogue:
 	call PrintEmptyString
 	call SaveScreenTilesToBuffer1
 	ld a, [wIsInBattle]
@@ -1165,13 +1165,13 @@
 	ld de, wEnemyMonSpeed
 	jp TryRunningFromBattle
 
-UseNextMonText: ; 3c7d3 (f:47d3)
+UseNextMonText:
 	TX_FAR _UseNextMonText
 	db "@"
 
 ; choose next player mon to send out
 ; stores whether enemy mon has no HP left in Z flag
-ChooseNextMon: ; 3c7d8 (f:47d8)
+ChooseNextMon:
 	ld a, BATTLE_PARTY_MENU
 	ld [wPartyMenuTypeOrMessageID], a
 	call DisplayPartyMenu
@@ -1217,7 +1217,7 @@
 
 ; called when player is out of usable mons.
 ; prints approriate lose message, sets carry flag if player blacked out (special case for initial rival fight)
-HandlePlayerBlackOut: ; 3c837 (f:4837)
+HandlePlayerBlackOut:
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
 	jr z, .notSony1Battle
@@ -1252,21 +1252,21 @@
 	scf
 	ret
 
-Sony1WinText: ; 3c884 (f:4884)
+Sony1WinText:
 	TX_FAR _Sony1WinText
 	db "@"
 
-PlayerBlackedOutText2: ; 3c889 (f:4889)
+PlayerBlackedOutText2:
 	TX_FAR _PlayerBlackedOutText2
 	db "@"
 
-LinkBattleLostText: ; 3c88e (f:488e)
+LinkBattleLostText:
 	TX_FAR _LinkBattleLostText
 	db "@"
 
 ; slides pic of fainted mon downwards until it disappears
 ; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing
-SlideDownFaintedMonPic: ; 3c893 (f:4893)
+SlideDownFaintedMonPic:
 	ld a, [wd730]
 	push af
 	set 6, a
@@ -1312,7 +1312,7 @@
 	ld [wd730], a
 	ret
 
-SevenSpacesText: ; 3c8d7 (f:48d7)
+SevenSpacesText:
 	db "       @"
 
 ; slides the player or enemy trainer off screen
@@ -1319,7 +1319,7 @@
 ; a is the number of tiles to slide it horizontally (always 9 for the player trainer or 8 for the enemy trainer)
 ; if a is 8, the slide is to the right, else it is to the left
 ; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing
-SlideTrainerPicOffScreen: ; 3c8df (f:48df)
+SlideTrainerPicOffScreen:
 	ld [hSlideAmount], a
 	ld c, a
 .slideStepLoop ; each iteration, the trainer pic is slid one tile left/right
@@ -1360,7 +1360,7 @@
 	ret
 
 ; send out a trainer's mon
-EnemySendOut: ; 3c90e (f:490e)
+EnemySendOut:
 	ld hl,wPartyGainExpFlags
 	xor a
 	ld [hl],a
@@ -1376,7 +1376,7 @@
 	predef FlagActionPredef
 
 ; don't change wPartyGainExpFlags or wPartyFoughtCurrentEnemyFlags
-EnemySendOutFirstMon: ; 3c92a (f:492a)
+EnemySendOutFirstMon:
 	xor a
 	ld hl,wEnemyStatsToDouble ; clear enemy statuses
 	ld [hli],a
@@ -1529,17 +1529,17 @@
 	call SaveScreenTilesToBuffer1
 	jp SwitchPlayerMon
 
-TrainerAboutToUseText: ; 3ca79 (f:4a79)
+TrainerAboutToUseText:
 	TX_FAR _TrainerAboutToUseText
 	db "@"
 
-TrainerSentOutText: ; 3ca7e (f:4a7e)
+TrainerSentOutText:
 	TX_FAR _TrainerSentOutText
 	db "@"
 
 ; tests if the player has any pokemon that are not fainted
 ; sets d = 0 if all fainted, d != 0 if some mons are still alive
-AnyPartyAlive: ; 3ca83 (f:4a83)
+AnyPartyAlive:
 	ld a, [wPartyCount]
 	ld e, a
 	xor a
@@ -1557,7 +1557,7 @@
 
 ; tests if player mon has fainted
 ; stores whether mon has fainted in Z flag
-HasMonFainted: ; 3ca97 (f:4a97)
+HasMonFainted:
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMon1HP
 	ld bc, wPartyMon2 - wPartyMon1
@@ -1574,13 +1574,13 @@
 	xor a
 	ret
 
-NoWillText: ; 3cab4 (f:4ab4)
+NoWillText:
 	TX_FAR _NoWillText
 	db "@"
 
 ; try to run from battle (hl = player speed, de = enemy speed)
 ; stores whether the attempt was successful in carry flag
-TryRunningFromBattle: ; 3cab9 (f:4ab9)
+TryRunningFromBattle:
 	call IsGhostBattle
 	jp z, .canEscape ; jump if it's a ghost battle
 	ld a, [wBattleType]
@@ -1697,20 +1697,20 @@
 	scf ; set carry
 	ret
 
-CantEscapeText: ; 3cb97 (f:4b97)
+CantEscapeText:
 	TX_FAR _CantEscapeText
 	db "@"
 
-NoRunningText: ; 3cb9c (f:4b9c)
+NoRunningText:
 	TX_FAR _NoRunningText
 	db "@"
 
-GotAwayText: ; 3cba1 (f:4ba1)
+GotAwayText:
 	TX_FAR _GotAwayText
 	db "@"
 
 ; copies from party data to battle mon data when sending out a new player mon
-LoadBattleMonFromParty: ; 3cba6 (f:4ba6)
+LoadBattleMonFromParty:
 	ld a, [wWhichPokemon]
 	ld bc, wPartyMon2 - wPartyMon1
 	ld hl, wPartyMon1Species
@@ -1754,7 +1754,7 @@
 	ret
 
 ; copies from enemy party data to current enemy mon data when sending out a new enemy mon
-LoadEnemyMonFromParty: ; 3cc13 (f:4c13)
+LoadEnemyMonFromParty:
 	ld a, [wWhichPokemon]
 	ld bc, wEnemyMon2 - wEnemyMon1
 	ld hl, wEnemyMons
@@ -1807,7 +1807,7 @@
 	ld [wEnemyMonPartyPos], a
 	ret
 
-SendOutMon: ; 3cc91 (f:4c91)
+SendOutMon:
 	callab PrintSendOutMonMessage
 	ld hl, wEnemyMonHP
 	ld a, [hli]
@@ -1853,7 +1853,7 @@
 	jp SaveScreenTilesToBuffer1
 
 ; show 2 stages of the player mon getting smaller before disappearing
-AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa)
+AnimateRetreatingPlayerMon:
 	coord hl, 1, 5
 	lb bc, 7, 7
 	call ClearScreenArea
@@ -1883,7 +1883,7 @@
 	jp ClearScreenArea
 
 ; reads player's current mon's HP into wBattleMonHP
-ReadPlayerMonCurHPAndStatus: ; 3cd43 (f:4d43)
+ReadPlayerMonCurHPAndStatus:
 	ld a, [wPlayerMonNumber]
 	ld hl, wPartyMon1HP
 	ld bc, wPartyMon2 - wPartyMon1
@@ -1894,11 +1894,11 @@
 	ld bc, $4               ; 2 bytes HP, 1 byte unknown (unused?), 1 byte status
 	jp CopyData
 
-DrawHUDsAndHPBars: ; 3cd5a (f:4d5a)
+DrawHUDsAndHPBars:
 	call DrawPlayerHUDAndHPBar
 	jp DrawEnemyHUDAndHPBar
 
-DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60)
+DrawPlayerHUDAndHPBar:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 	coord hl, 9, 7
@@ -1959,7 +1959,7 @@
 	set 7, [hl] ;enable low health alarm
 	ret
 
-DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec)
+DrawEnemyHUDAndHPBar:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 	coord hl, 0, 0
@@ -2049,7 +2049,7 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ld hl, wEnemyHPBarColor
 
-GetBattleHealthBarColor: ; 3ce90 (f:4e90)
+GetBattleHealthBarColor:
 	ld b, [hl]
 	call GetHealthBarColor
 	ld a, [hl]
@@ -2063,7 +2063,7 @@
 ; (i.e. for names longer than 4 letters)
 ; if the name is 3 or 4 letters long, it is printed 1 space more to the right than usual
 ; (i.e. for names longer than 4 letters)
-CenterMonName: ; 3ce9c (f:4e9c)
+CenterMonName:
 	push de
 	inc hl
 	inc hl
@@ -2084,7 +2084,7 @@
 	pop de
 	ret
 
-DisplayBattleMenu: ; 3ceb3 (f:4eb3)
+DisplayBattleMenu:
 	call LoadScreenTilesFromBuffer1 ; restore saved screen
 	ld a, [wBattleType]
 	and a
@@ -2498,7 +2498,7 @@
 	call GBPalNormal
 ; fall through to SwitchPlayerMon
 
-SwitchPlayerMon: ; 3d1ba (f:51ba)
+SwitchPlayerMon:
 	callab RetreatMon
 	ld c, 50
 	call DelayFrames
@@ -2521,11 +2521,11 @@
 	and a
 	ret
 
-AlreadyOutText: ; 3d1f5 (f:51f5)
+AlreadyOutText:
 	TX_FAR _AlreadyOutText
 	db "@"
 
-BattleMenu_RunWasSelected: ; 3d1fa (f:51fa)
+BattleMenu_RunWasSelected:
 	call LoadScreenTilesFromBuffer1
 	ld a, $3
 	ld [wCurrentMenuItem], a
@@ -2540,7 +2540,7 @@
 	ret nz ; return if the player couldn't escape
 	jp DisplayBattleMenu
 
-MoveSelectionMenu: ; 3d219 (f:5219)
+MoveSelectionMenu:
 	ld a, [wMoveMenuType]
 	dec a
 	jr z, .mimicmenu
@@ -2658,7 +2658,7 @@
 	ld [hl], a
 ; fallthrough
 
-SelectMenuItem: ; 3d2fe (f:52fe)
+SelectMenuItem:
 	ld a, [wMoveMenuType]
 	and a
 	jr z, .battleselect
@@ -2753,18 +2753,18 @@
 	call LoadScreenTilesFromBuffer1
 	jp MoveSelectionMenu
 
-MoveNoPPText: ; 3d3ae (f:53ae)
+MoveNoPPText:
 	TX_FAR _MoveNoPPText
 	db "@"
 
-MoveDisabledText: ; 3d3b3 (f:53b3)
+MoveDisabledText:
 	TX_FAR _MoveDisabledText
 	db "@"
 
-WhichTechniqueString: ; 3d3b8 (f:53b8)
+WhichTechniqueString:
 	db "WHICH TECHNIQUE?@"
 
-CursorUp: ; 3d3c9 (f:53c9)
+CursorUp:
 	ld a, [wCurrentMenuItem]
 	and a
 	jp nz, SelectMenuItem
@@ -2774,7 +2774,7 @@
 	ld [wCurrentMenuItem], a
 	jp SelectMenuItem
 
-CursorDown: ; 3d3dd (f:53dd)
+CursorDown:
 	ld a, [wCurrentMenuItem]
 	ld b, a
 	ld a, [wNumMovesMinusOne]
@@ -2787,7 +2787,7 @@
 	ld [wCurrentMenuItem], a
 	jp SelectMenuItem
 
-AnyMoveToSelect: ; 3d3f5 (f:53f5)
+AnyMoveToSelect:
 ; return z and Struggle as the selected move if all moves have 0 PP and/or are disabled
 	ld a, STRUGGLE
 	ld [wPlayerSelectedMove], a
@@ -2830,11 +2830,11 @@
 	xor a
 	ret
 
-NoMovesLeftText: ; 3d430 (f:5430)
+NoMovesLeftText:
 	TX_FAR _NoMovesLeftText
 	db "@"
 
-SwapMovesInMenu: ; 3d435 (f:5435)
+SwapMovesInMenu:
 	ld a, [wMenuItemToSwap]
 	and a
 	jr z, .noMenuItemSelected
@@ -2910,7 +2910,7 @@
 	ld [wMenuItemToSwap], a ; select the current menu item for swapping
 	jp MoveSelectionMenu
 
-PrintMenuItem: ; 3d4b6 (f:54b6)
+PrintMenuItem:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 	coord hl, 0, 8
@@ -2981,13 +2981,13 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	jp Delay3
 
-DisabledText: ; 3d555 (f:5555)
+DisabledText:
 	db "disabled!@"
 
-TypeText: ; 3d55f (f:555f)
+TypeText:
 	db "TYPE@"
 
-SelectEnemyMove: ; 3d564 (f:5564)
+SelectEnemyMove:
 	ld a, [wLinkState]
 	sub LINK_STATE_BATTLING
 	jr nz, .noLinkBattle
@@ -3080,7 +3080,7 @@
 	jr .done
 
 ; this appears to exchange data with the other gameboy during link battles
-LinkBattleExchangeData: ; 3d605 (f:5605)
+LinkBattleExchangeData:
 	ld a, $ff
 	ld [wSerialExchangeNybbleReceiveData], a
 	ld a, [wPlayerMoveListIndex]
@@ -3128,7 +3128,7 @@
 	jr nz, .syncLoop3
 	ret
 
-ExecutePlayerMove: ; 3d65e (f:565e)
+ExecutePlayerMove:
 	xor a
 	ld [H_WHOSETURN], a ; set player's turn
 	ld a, [wPlayerSelectedMove]
@@ -3156,7 +3156,7 @@
 	call CheckForDisobedience
 	jp z, ExecutePlayerMoveDone
 
-CheckIfPlayerNeedsToChargeUp: ; 3d69a (f:569a)
+CheckIfPlayerNeedsToChargeUp:
 	ld a, [wPlayerMoveEffect]
 	cp CHARGE_EFFECT
 	jp z, JumpMoveEffect
@@ -3165,13 +3165,13 @@
 	jr PlayerCanExecuteMove
 
 ; in-battle stuff
-PlayerCanExecuteChargingMove: ; 3d6a9 (f:56a9)
+PlayerCanExecuteChargingMove:
 	ld hl,wPlayerBattleStatus1
 	res ChargingUp,[hl] ; reset charging up and invulnerability statuses if mon was charging up for an attack
 	                    ; being fully paralyzed or hurting oneself in confusion removes charging up status
 	                    ; resulting in the Pokemon being invulnerable for the whole battle
 	res Invulnerable,[hl]
-PlayerCanExecuteMove: ; 3d6b0 (f:56b0)
+PlayerCanExecuteMove:
 	call PrintMonName1Text
 	ld hl,DecrementPP
 	ld de,wPlayerSelectedMove ; pointer to the move just used
@@ -3188,7 +3188,7 @@
 	ld de,1
 	call IsInArray
 	call c,JumpMoveEffect ; execute the effects of SpecialEffectsCont moves (e.g. Wrap, Thrash) but don't skip anything
-PlayerCalcMoveDamage: ; 3d6dc (f:56dc)
+PlayerCalcMoveDamage:
 	ld a,[wPlayerMoveEffect]
 	ld hl,SetDamageEffects
 	ld de,1
@@ -3325,17 +3325,17 @@
 	; Responsible for executing Twineedle's second side effect (poison).
 	jp ExecutePlayerMoveDone
 
-MultiHitText: ; 3d805 (f:5805)
+MultiHitText:
 	TX_FAR _MultiHitText
 	db "@"
 
-ExecutePlayerMoveDone: ; 3d80a (f:580a)
+ExecutePlayerMoveDone:
 	xor a
 	ld [wActionResultOrTookBattleTurn],a
 	ld b,1
 	ret
 
-PrintGhostText: ; 3d811 (f:5811)
+PrintGhostText:
 ; print the ghost battle messages
 	call IsGhostBattle
 	ret nz
@@ -3355,15 +3355,15 @@
 	xor a
 	ret
 
-ScaredText: ; 3d830 (f:5830)
+ScaredText:
 	TX_FAR _ScaredText
 	db "@"
 
-GetOutText: ; 3d835 (f:5835)
+GetOutText:
 	TX_FAR _GetOutText
 	db "@"
 
-IsGhostBattle: ; 3d83a (f:583a)
+IsGhostBattle:
 	ld a,[wIsInBattle]
 	dec a
 	ret nz
@@ -3382,7 +3382,7 @@
 
 ; checks for various status conditions affecting the player mon
 ; stores whether the mon cannot use a move this turn in Z flag
-CheckPlayerStatusConditions: ; 3d854 (f:5854)
+CheckPlayerStatusConditions:
 	ld hl,wBattleMonStatus
 	ld a,[hl]
 	and a,SLP ; sleep mask
@@ -3643,67 +3643,67 @@
 	and a
 	ret
 
-FastAsleepText: ; 3da3d (f:5a3d)
+FastAsleepText:
 	TX_FAR _FastAsleepText
 	db "@"
 
-WokeUpText: ; 3da42 (f:5a42)
+WokeUpText:
 	TX_FAR _WokeUpText
 	db "@"
 
-IsFrozenText: ; 3da47 (f:5a47)
+IsFrozenText:
 	TX_FAR _IsFrozenText
 	db "@"
 
-FullyParalyzedText: ; 3da4c (f:5a4c)
+FullyParalyzedText:
 	TX_FAR _FullyParalyzedText
 	db "@"
 
-FlinchedText: ; 3da51 (f:5a51)
+FlinchedText:
 	TX_FAR _FlinchedText
 	db "@"
 
-MustRechargeText: ; 3da56 (f:5a56)
+MustRechargeText:
 	TX_FAR _MustRechargeText
 	db "@"
 
-DisabledNoMoreText: ; 3da5b (f:5a5b)
+DisabledNoMoreText:
 	TX_FAR _DisabledNoMoreText
 	db "@"
 
-IsConfusedText: ; 3da60 (f:5a60)
+IsConfusedText:
 	TX_FAR _IsConfusedText
 	db "@"
 
-HurtItselfText: ; 3da65 (f:5a65)
+HurtItselfText:
 	TX_FAR _HurtItselfText
 	db "@"
 
-ConfusedNoMoreText: ; 3da6a (f:5a6a)
+ConfusedNoMoreText:
 	TX_FAR _ConfusedNoMoreText
 	db "@"
 
-SavingEnergyText: ; 3da6f (f:5a6f)
+SavingEnergyText:
 	TX_FAR _SavingEnergyText
 	db "@"
 
-UnleashedEnergyText: ; 3da74 (f:5a74)
+UnleashedEnergyText:
 	TX_FAR _UnleashedEnergyText
 	db "@"
 
-ThrashingAboutText: ; 3da79 (f:5a79)
+ThrashingAboutText:
 	TX_FAR _ThrashingAboutText
 	db "@"
 
-AttackContinuesText: ; 3da7e (f:5a7e)
+AttackContinuesText:
 	TX_FAR _AttackContinuesText
 	db "@"
 
-CantMoveText: ; 3da83 (f:5a83)
+CantMoveText:
 	TX_FAR _CantMoveText
 	db "@"
 
-PrintMoveIsDisabledText: ; 3da88 (f:5a88)
+PrintMoveIsDisabledText:
 	ld hl, wPlayerSelectedMove
 	ld de, wPlayerBattleStatus1
 	ld a, [H_WHOSETURN]
@@ -3721,11 +3721,11 @@
 	ld hl, MoveIsDisabledText
 	jp PrintText
 
-MoveIsDisabledText: ; 3daa8 (f:5aa8)
+MoveIsDisabledText:
 	TX_FAR _MoveIsDisabledText
 	db "@"
 
-HandleSelfConfusionDamage: ; 3daad (f:5aad)
+HandleSelfConfusionDamage:
 	ld hl, HurtItselfText
 	call PrintText
 	ld hl, wEnemyMonDefense
@@ -3769,7 +3769,7 @@
 	ld [H_WHOSETURN], a
 	jp ApplyDamageToPlayerPokemon
 
-PrintMonName1Text: ; 3daf5 (f:5af5)
+PrintMonName1Text:
 	ld hl, MonName1Text
 	jp PrintText
 
@@ -3778,7 +3778,7 @@
 ; those text strings are identical and both continue at PrintInsteadText
 ; this likely had to do with Japanese grammar that got translated,
 ; but the functionality didn't get removed
-MonName1Text: ; 3dafb (f:5afb)
+MonName1Text:
 	TX_FAR _MonName1Text
 	TX_ASM
 	ld a, [H_WHOSETURN]
@@ -3803,17 +3803,17 @@
 	ld hl, Used1Text
 	ret
 
-Used1Text: ; 3db2d (f:5b2d)
+Used1Text:
 	TX_FAR _Used1Text
 	TX_ASM
 	jr PrintInsteadText
 
-Used2Text: ; 3db34 (f:5b34)
+Used2Text:
 	TX_FAR _Used2Text
 	TX_ASM
 	; fall through
 
-PrintInsteadText: ; 3db39 (f:5b39)
+PrintInsteadText:
 	ld a, [wMonIsDisobedient]
 	and a
 	jr z, PrintMoveName
@@ -3820,16 +3820,16 @@
 	ld hl, InsteadText
 	ret
 
-InsteadText: ; 3db43 (f:5b43)
+InsteadText:
 	TX_FAR _InsteadText
 	TX_ASM
 	; fall through
 
-PrintMoveName: ; 3db48 (f:5b48)
+PrintMoveName:
 	ld hl, _PrintMoveName
 	ret
 
-_PrintMoveName: ; 3db4c (f:5b4c)
+_PrintMoveName:
 	TX_FAR _CF4BText
 	TX_ASM
 	ld hl, ExclamationPointPointerTable
@@ -3845,7 +3845,7 @@
 	ld l, a
 	ret
 
-ExclamationPointPointerTable: ; 3db62 (f:5b62)
+ExclamationPointPointerTable:
 	dw ExclamationPoint1Text
 	dw ExclamationPoint2Text
 	dw ExclamationPoint3Text
@@ -3852,23 +3852,23 @@
 	dw ExclamationPoint4Text
 	dw ExclamationPoint5Text
 
-ExclamationPoint1Text: ; 3db6c (f:5b6c)
+ExclamationPoint1Text:
 	TX_FAR _ExclamationPoint1Text
 	db "@"
 
-ExclamationPoint2Text: ; 3db71 (f:5b71)
+ExclamationPoint2Text:
 	TX_FAR _ExclamationPoint2Text
 	db "@"
 
-ExclamationPoint3Text: ; 3db76 (f:5b76)
+ExclamationPoint3Text:
 	TX_FAR _ExclamationPoint3Text
 	db "@"
 
-ExclamationPoint4Text: ; 3db7b (f:5b7b)
+ExclamationPoint4Text:
 	TX_FAR _ExclamationPoint4Text
 	db "@"
 
-ExclamationPoint5Text: ; 3db80 (f:5b80)
+ExclamationPoint5Text:
 	TX_FAR _ExclamationPoint5Text
 	db "@"
 
@@ -3879,7 +3879,7 @@
 ; but all five text strings are identical
 ; this likely had to do with Japanese grammar that got translated,
 ; but the functionality didn't get removed
-DetermineExclamationPointTextNum: ; 3db85 (f:5b85)
+DetermineExclamationPointTextNum:
 	push bc
 	ld a, [wd11e] ; move ID
 	ld c, a
@@ -3901,7 +3901,7 @@
 	pop bc
 	ret
 
-ExclamationPointMoveSets: ; 3dba3 (f:5ba3)
+ExclamationPointMoveSets:
 	db SWORDS_DANCE, GROWTH
 	db $00
 	db RECOVER, BIDE, SELFDESTRUCT, AMNESIA
@@ -3916,7 +3916,7 @@
 	db $00
 	db $FF ; terminator
 
-PrintMoveFailureText: ; 3dbe2 (f:5be2)
+PrintMoveFailureText:
 	ld de, wPlayerMoveEffect
 	ld a, [H_WHOSETURN]
 	and a
@@ -3973,28 +3973,28 @@
 .enemyTurn
 	jp ApplyDamageToEnemyPokemon
 
-AttackMissedText: ; 3dc42 (f:5c42)
+AttackMissedText:
 	TX_FAR _AttackMissedText
 	db "@"
 
-KeptGoingAndCrashedText: ; 3dc47 (f:5c47)
+KeptGoingAndCrashedText:
 	TX_FAR _KeptGoingAndCrashedText
 	db "@"
 
-UnaffectedText: ; 3dc4c (f:5c4c)
+UnaffectedText:
 	TX_FAR _UnaffectedText
 	db "@"
 
-PrintDoesntAffectText: ; 3dc51 (f:5c51)
+PrintDoesntAffectText:
 	ld hl, DoesntAffectMonText
 	jp PrintText
 
-DoesntAffectMonText: ; 3dc57 (f:5c57)
+DoesntAffectMonText:
 	TX_FAR _DoesntAffectMonText
 	db "@"
 
 ; if there was a critical hit or an OHKO was successful, print the corresponding text
-PrintCriticalOHKOText: ; 3dc5c (f:5c5c)
+PrintCriticalOHKOText:
 	ld a, [wCriticalHitOrOHKO]
 	and a
 	jr z, .done ; do nothing if there was no critical hit or successful OHKO
@@ -4014,21 +4014,21 @@
 	ld c, 20
 	jp DelayFrames
 
-CriticalOHKOTextPointers: ; 3dc7a (f:5c7a)
+CriticalOHKOTextPointers:
 	dw CriticalHitText
 	dw OHKOText
 
-CriticalHitText: ; 3dc7e (f:5c7e)
+CriticalHitText:
 	TX_FAR _CriticalHitText
 	db "@"
 
-OHKOText: ; 3dc83 (f:5c83)
+OHKOText:
 	TX_FAR _OHKOText
 	db "@"
 
 ; checks if a traded mon will disobey due to lack of badges
 ; stores whether the mon will use a move in Z flag
-CheckForDisobedience: ; 3dc88 (f:5c88)
+CheckForDisobedience:
 	xor a
 	ld [wMonIsDisobedient], a
 	ld a, [wLinkState]
@@ -4207,28 +4207,28 @@
 	xor a ; set Z flag
 	ret
 
-LoafingAroundText: ; 3ddb6 (f:5db6)
+LoafingAroundText:
 	TX_FAR _LoafingAroundText
 	db "@"
 
-BeganToNapText: ; 3ddbb (f:5dbb)
+BeganToNapText:
 	TX_FAR _BeganToNapText
 	db "@"
 
-WontObeyText: ; 3ddc0 (f:5dc0)
+WontObeyText:
 	TX_FAR _WontObeyText
 	db "@"
 
-TurnedAwayText: ; 3ddc5 (f:5dc5)
+TurnedAwayText:
 	TX_FAR _TurnedAwayText
 	db "@"
 
-IgnoredOrdersText: ; 3ddca (f:5dca)
+IgnoredOrdersText:
 	TX_FAR _IgnoredOrdersText
 	db "@"
 
 ; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the player mon
-GetDamageVarsForPlayerAttack: ; 3ddcf (f:5dcf)
+GetDamageVarsForPlayerAttack:
 	xor a
 	ld hl, wDamage ; damage to eventually inflict, initialise to zero
 	ldi [hl], a
@@ -4341,7 +4341,7 @@
 	ret
 
 ; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the enemy mon
-GetDamageVarsForEnemyAttack: ; 3de75 (f:5e75)
+GetDamageVarsForEnemyAttack:
 	ld hl, wDamage ; damage to eventually inflict, initialise to zero
 	xor a
 	ld [hli], a
@@ -4456,7 +4456,7 @@
 
 ; get stat c of enemy mon
 ; c: stat to get (HP=1,Attack=2,Defense=3,Speed=4,Special=5)
-GetEnemyMonStat: ; 3df1c (f:5f1c)
+GetEnemyMonStat:
 	push de
 	push bc
 	ld a, [wLinkState]
@@ -4497,7 +4497,7 @@
 	pop de
 	ret
 
-CalculateDamage: ; 3df65 (f:5f65)
+CalculateDamage:
 ; input:
 ;	b: attack
 ;	c: opponent defense
@@ -4659,7 +4659,7 @@
 	and a
 	ret
 
-JumpToOHKOMoveEffect: ; 3e016 (f:6016)
+JumpToOHKOMoveEffect:
 	call JumpMoveEffect
 	ld a, [wMoveMissed]
 	dec a
@@ -4666,7 +4666,7 @@
 	ret
 
 
-UnusedHighCriticalMoves: ; 3e01e (f:601e)
+UnusedHighCriticalMoves:
 	db KARATE_CHOP
 	db RAZOR_LEAF
 	db CRABHAMMER
@@ -4677,7 +4677,7 @@
 ; determines if attack is a critical hit
 ; azure heights claims "the fastest pokémon (who are,not coincidentally,
 ; among the most popular) tend to CH about 20 to 25% of the time."
-CriticalHitTest: ; 3e023 (f:6023)
+CriticalHitTest:
 	xor a
 	ld [wCriticalHitOrOHKO], a
 	ld a, [H_WHOSETURN]
@@ -4744,7 +4744,7 @@
 	ret
 
 ; high critical hit moves
-HighCriticalMoves: ; 3e08e (f:608e)
+HighCriticalMoves:
 	db KARATE_CHOP
 	db RAZOR_LEAF
 	db CRABHAMMER
@@ -4753,7 +4753,7 @@
 
 
 ; function to determine if Counter hits and if so, how much damage it does
-HandleCounterMove: ; 3e093 (f:6093)
+HandleCounterMove:
 ; The variables checked by Counter are updated whenever the cursor points to a new move in the battle selection menu.
 ; This is irrelevant for the opponent's side outside of link battles, since the move selection is controlled by the AI.
 ; However, in the scenario where the player switches out and the opponent uses Counter,
@@ -4818,7 +4818,7 @@
 	xor a
 	ret
 
-ApplyAttackToEnemyPokemon: ; 3e0df (f:60df)
+ApplyAttackToEnemyPokemon:
 	ld a,[wPlayerMoveEffect]
 	cp a,OHKO_EFFECT
 	jr z,ApplyDamageToEnemyPokemon
@@ -4884,7 +4884,7 @@
 	ld a,b
 	ld [hl],a
 
-ApplyDamageToEnemyPokemon: ; 3e142 (f:6142)
+ApplyDamageToEnemyPokemon:
 	ld hl,wDamage
 	ld a,[hli]
 	ld b,a
@@ -4934,10 +4934,10 @@
 	xor a
 	ld [wHPBarType],a
 	predef UpdateHPBar2 ; animate the HP bar shortening
-ApplyAttackToEnemyPokemonDone: ; 3e19d (f:619d)
+ApplyAttackToEnemyPokemonDone:
 	jp DrawHUDsAndHPBars
 
-ApplyAttackToPlayerPokemon: ; 3e1a0 (f:61a0)
+ApplyAttackToPlayerPokemon:
 	ld a,[wEnemyMoveEffect]
 	cp a,OHKO_EFFECT
 	jr z,ApplyDamageToPlayerPokemon
@@ -5003,7 +5003,7 @@
 	ld a,b
 	ld [hl],a
 
-ApplyDamageToPlayerPokemon: ; 3e200 (f:6200)
+ApplyDamageToPlayerPokemon:
 	ld hl,wDamage
 	ld a,[hli]
 	ld b,a
@@ -5055,7 +5055,7 @@
 ApplyAttackToPlayerPokemonDone
 	jp DrawHUDsAndHPBars
 
-AttackSubstitute: ; 3e25e (f:625e)
+AttackSubstitute:
 ; Unlike the two ApplyAttackToPokemon functions, Attack Substitute is shared by player and enemy.
 ; Self-confusion damage as well as Hi-Jump Kick and Jump Kick recoil cause a momentary turn swap before being applied.
 ; If the user has a Substitute up and would take damage because of that,
@@ -5110,16 +5110,16 @@
 	ld [hl],a ; zero the effect of the attacker's move
 	jp DrawHUDsAndHPBars
 
-SubstituteTookDamageText: ; 3e2ac (f:62ac)
+SubstituteTookDamageText:
 	TX_FAR _SubstituteTookDamageText
 	db "@"
 
-SubstituteBrokeText: ; 3e2b1 (f:62b1)
+SubstituteBrokeText:
 	TX_FAR _SubstituteBrokeText
 	db "@"
 
 ; this function raises the attack modifier of a pokemon using Rage when that pokemon is attacked
-HandleBuildingRage: ; 3e2b6 (f:62b6)
+HandleBuildingRage:
 ; values for the player turn
 	ld hl,wEnemyBattleStatus2
 	ld de,wEnemyMonStatMods
@@ -5161,13 +5161,13 @@
 	ld [H_WHOSETURN],a
 	ret
 
-BuildingRageText: ; 3e2f8 (f:62f8)
+BuildingRageText:
 	TX_FAR _BuildingRageText
 	db "@"
 
 ; copy last move for Mirror Move
 ; sets zero flag on failure and unsets zero flag on success
-MirrorMoveCopyMove: ; 3e2fd (f:62fd)
+MirrorMoveCopyMove:
 ; Mirror Move makes use of ccf1 (wPlayerUsedMove) and ccf2 (wEnemyUsedMove) addresses,
 ; which are mainly used to print the "[Pokemon] used [Move]" text.
 ; Both are set to 0 whenever a new Pokemon is sent out
@@ -5197,12 +5197,12 @@
 	xor a
 	ret
 
-MirrorMoveFailedText: ; 3e324 (f:6324)
+MirrorMoveFailedText:
 	TX_FAR _MirrorMoveFailedText
 	db "@"
 
 ; function used to reload move data for moves like Mirror Move and Metronome
-ReloadMoveData: ; 3e329 (f:6329)
+ReloadMoveData:
 	ld [wd11e],a
 	dec a
 	ld hl,Moves
@@ -5219,7 +5219,7 @@
 	ret
 
 ; function that picks a random move for metronome
-MetronomePickMove: ; 3e348 (f:6348)
+MetronomePickMove:
 	xor a
 	ld [wAnimationType],a
 	ld a,METRONOME
@@ -5248,7 +5248,7 @@
 ; this function increments the current move's PP
 ; it's used to prevent moves that run another move within the same turn
 ; (like Mirror Move and Metronome) from losing 2 PP
-IncrementMovePP: ; 3e373 (f:6373)
+IncrementMovePP:
 	ld a,[H_WHOSETURN]
 	and a
 ; values for player turn
@@ -5280,7 +5280,7 @@
 	ret
 
 ; function to adjust the base damage of an attack to account for type effectiveness
-AdjustDamageForMoveType: ; 3e3a5 (f:63a5)
+AdjustDamageForMoveType:
 ; values for player turn
 	ld hl,wBattleMonType
 	ld a,[hli]
@@ -5399,7 +5399,7 @@
 ; the result is stored in [wTypeEffectiveness]
 ; ($05 is not very effective, $10 is neutral, $14 is super effective)
 ; as far is can tell, this is only used once in some AI code to help decide which move to use
-AIGetTypeEffectiveness: ; 3e449 (f:6449)
+AIGetTypeEffectiveness:
 	ld a,[wEnemyMoveType]
 	ld d,a                    ; d = type of enemy move
 	ld hl,wBattleMonType
@@ -5434,7 +5434,7 @@
 INCLUDE "data/type_effects.asm"
 
 ; some tests that need to pass for a move to hit
-MoveHitTest: ; 3e56b (f:656b)
+MoveHitTest:
 ; player's turn
 	ld hl,wEnemyBattleStatus1
 	ld de,wPlayerMoveEffect
@@ -5554,7 +5554,7 @@
 	ret
 
 ; values for player turn
-CalcHitChance: ; 3e624 (f:6624)
+CalcHitChance:
 	ld hl,wPlayerMoveAccuracy
 	ld a,[H_WHOSETURN]
 	and a
@@ -5626,7 +5626,7 @@
 	ret
 
 ; multiplies damage by a random percentage from ~85% to 100%
-RandomizeDamage: ; 3e687 (f:6687)
+RandomizeDamage:
 	ld hl, wDamage
 	ld a, [hli]
 	and a
@@ -5663,7 +5663,7 @@
 	ret
 
 ; for more detailed commentary, see equivalent function for player side (ExecutePlayerMove)
-ExecuteEnemyMove: ; 3e6bc (f:66bc)
+ExecuteEnemyMove:
 	ld a, [wEnemySelectedMove]
 	inc a
 	jp z, ExecuteEnemyMoveDone
@@ -5695,7 +5695,7 @@
 	jr nz, EnemyCanExecuteChargingMove ; if so, jump
 	call GetCurrentMove
 
-CheckIfEnemyNeedsToChargeUp: ; 3e6fc (f:66fc)
+CheckIfEnemyNeedsToChargeUp:
 	ld a, [wEnemyMoveEffect]
 	cp CHARGE_EFFECT
 	jp z, JumpMoveEffect
@@ -5702,7 +5702,7 @@
 	cp FLY_EFFECT
 	jp z, JumpMoveEffect
 	jr EnemyCanExecuteMove
-EnemyCanExecuteChargingMove: ; 3e70b (f:670b)
+EnemyCanExecuteChargingMove:
 	ld hl, wEnemyBattleStatus1
 	res ChargingUp, [hl] ; no longer charging up for attack
 	res Invulnerable, [hl] ; no longer invulnerable to typical attacks
@@ -5715,7 +5715,7 @@
 	call GetName
 	ld de, wcd6d
 	call CopyStringToCF4B
-EnemyCanExecuteMove: ; 3e72b (f:672b)
+EnemyCanExecuteMove:
 	xor a
 	ld [wMonIsDisobedient], a
 	call PrintMonName1Text
@@ -5729,7 +5729,7 @@
 	ld de, $1
 	call IsInArray
 	call c, JumpMoveEffect
-EnemyCalcMoveDamage: ; 3e750 (f:6750)
+EnemyCalcMoveDamage:
 	call SwapPlayerAndEnemyLevels
 	ld a, [wEnemyMoveEffect]
 	ld hl, SetDamageEffects
@@ -5747,9 +5747,9 @@
 	call AdjustDamageForMoveType
 	call RandomizeDamage
 
-EnemyMoveHitTest: ; 3e77f (f:677f)
+EnemyMoveHitTest:
 	call MoveHitTest
-handleIfEnemyMoveMissed: ; 3e782 (f:6782)
+handleIfEnemyMoveMissed:
 	ld a, [wMoveMissed]
 	and a
 	jr z, .asm_3e791
@@ -5760,7 +5760,7 @@
 .asm_3e791
 	call SwapPlayerAndEnemyLevels
 
-GetEnemyAnimationType: ; 3e794 (f:6794)
+GetEnemyAnimationType:
 	ld a, [wEnemyMoveEffect]
 	and a
 	ld a, $1
@@ -5767,10 +5767,10 @@
 	jr z, playEnemyMoveAnimation
 	ld a, $2
 	jr playEnemyMoveAnimation
-asm_3e7a0: ; 3e7a0 (f:67a0)
+asm_3e7a0:
 	call SwapPlayerAndEnemyLevels
 	xor a
-playEnemyMoveAnimation: ; 3e7a4 (f:67a4)
+playEnemyMoveAnimation:
 	push af
 	ld a, [wEnemyBattleStatus2]
 	bit HasSubstituteUp, a ; does mon have a substitute?
@@ -5790,7 +5790,7 @@
 	call nz, Bankswitch ; slide the substitute's sprite out
 	jr EnemyCheckIfMirrorMoveEffect
 
-EnemyCheckIfFlyOrChargeEffect: ; 3e7d1 (f:67d1)
+EnemyCheckIfFlyOrChargeEffect:
 	call SwapPlayerAndEnemyLevels
 	ld c, 30
 	call DelayFrames
@@ -5805,7 +5805,7 @@
 	ld [wAnimationType], a
 	ld a,STATUS_AFFECTED_ANIM
 	call PlayMoveAnimation
-EnemyCheckIfMirrorMoveEffect: ; 3e7ef (f:67ef)
+EnemyCheckIfMirrorMoveEffect:
 	ld a, [wEnemyMoveEffect]
 	cp MIRROR_MOVE_EFFECT
 	jr nz, .notMirrorMoveEffect
@@ -5872,17 +5872,17 @@
 	call nc, JumpMoveEffect
 	jr ExecuteEnemyMoveDone
 
-HitXTimesText: ; 3e887 (f:6887)
+HitXTimesText:
 	TX_FAR _HitXTimesText
 	db "@"
 
-ExecuteEnemyMoveDone: ; 3e88c (f:688c)
+ExecuteEnemyMoveDone:
 	ld b, $1
 	ret
 
 ; checks for various status conditions affecting the enemy mon
 ; stores whether the mon cannot use a move this turn in Z flag
-CheckEnemyStatusConditions: ; 3e88f (f:688f)
+CheckEnemyStatusConditions:
 	ld hl, wEnemyMonStatus
 	ld a, [hl]
 	and SLP ; sleep mask
@@ -6164,7 +6164,7 @@
 	and a ; clear Z flag
 	ret
 
-GetCurrentMove: ; 3eabe (f:6abe)
+GetCurrentMove:
 	ld a, [H_WHOSETURN]
 	and a
 	jp z, .player
@@ -6195,7 +6195,7 @@
 	ld de, wcd6d
 	jp CopyStringToCF4B
 
-LoadEnemyMonData: ; 3eb01 (f:6b01)
+LoadEnemyMonData:
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
 	jp z, LoadEnemyMonFromParty
@@ -6355,7 +6355,7 @@
 	ret
 
 ; calls BattleTransition to show the battle transition animation and initializes some battle variables
-DoBattleTransitionAndInitBattleVariables: ; 3ec32 (f:6c32)
+DoBattleTransitionAndInitBattleVariables:
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
 	jr nz, .next
@@ -6391,7 +6391,7 @@
 	ret
 
 ; swaps the level values of the BattleMon and EnemyMon structs
-SwapPlayerAndEnemyLevels: ; 3ec81 (f:6c81)
+SwapPlayerAndEnemyLevels:
 	push bc
 	ld a, [wBattleMonLevel]
 	ld b, a
@@ -6405,7 +6405,7 @@
 ; loads either red back pic or old man back pic
 ; also writes OAM data and loads tile patterns for the Red or Old Man back sprite's head
 ; (for use when scrolling the player sprite and enemy's silhouettes on screen)
-LoadPlayerBackPic: ; 3ec92 (f:6c92)
+LoadPlayerBackPic:
 	ld a, [wBattleType]
 	dec a ; is it the old man tutorial?
 	ld de, RedPicBack
@@ -6466,26 +6466,26 @@
 	predef_jump CopyUncompressedPicToTilemap
 
 ; does nothing since no stats are ever selected (barring glitches)
-DoubleOrHalveSelectedStats: ; 3ed02 (f:6d02)
+DoubleOrHalveSelectedStats:
 	callab DoubleSelectedStats
 	jpab HalveSelectedStats
 
-ScrollTrainerPicAfterBattle: ; 3ed12 (f:6d12)
+ScrollTrainerPicAfterBattle:
 	jpab _ScrollTrainerPicAfterBattle
 
-ApplyBurnAndParalysisPenaltiesToPlayer: ; 3ed1a (f:6d1a)
+ApplyBurnAndParalysisPenaltiesToPlayer:
 	ld a, $1
 	jr ApplyBurnAndParalysisPenalties
 
-ApplyBurnAndParalysisPenaltiesToEnemy: ; 3ed1e (f:6d1e)
+ApplyBurnAndParalysisPenaltiesToEnemy:
 	xor a
 
-ApplyBurnAndParalysisPenalties: ; 3ed1f (f:6d1f)
+ApplyBurnAndParalysisPenalties:
 	ld [H_WHOSETURN], a
 	call QuarterSpeedDueToParalysis
 	jp HalveAttackDueToBurn
 
-QuarterSpeedDueToParalysis: ; 3ed27 (f:6d27)
+QuarterSpeedDueToParalysis:
 	ld a, [H_WHOSETURN]
 	and a
 	jr z, .playerTurn
@@ -6528,7 +6528,7 @@
 	ld [hl], b
 	ret
 
-HalveAttackDueToBurn: ; 3ed64 (f:6d64)
+HalveAttackDueToBurn:
 	ld a, [H_WHOSETURN]
 	and a
 	jr z, .playerTurn
@@ -6567,7 +6567,7 @@
 	ld [hl], b
 	ret
 
-CalculateModifiedStats: ; 3ed99 (f:6d99)
+CalculateModifiedStats:
 	ld c, 0
 .loop
 	call CalculateModifiedStat
@@ -6578,7 +6578,7 @@
 	ret
 
 ; calculate modified stat for stat c (0 = attack, 1 = defense, 2 = speed, 3 = special)
-CalculateModifiedStat: ; 3eda5 (f:6da5)
+CalculateModifiedStat:
 	push bc
 	push bc
 	ld a, [wCalculateWhoseStats]
@@ -6656,7 +6656,7 @@
 	pop bc
 	ret
 
-ApplyBadgeStatBoosts: ; 3ee19 (f:6e19)
+ApplyBadgeStatBoosts:
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
 	ret z ; return if link battle
@@ -6709,10 +6709,10 @@
 	ld [hld], a
 	ret
 
-LoadHudAndHpBarAndStatusTilePatterns: ; 3ee58 (f:6e58)
+LoadHudAndHpBarAndStatusTilePatterns:
 	call LoadHpBarAndStatusTilePatterns
 
-LoadHudTilePatterns: ; 3ee5b (f:6e5b)
+LoadHudTilePatterns:
 	ld a, [rLCDC]
 	add a ; is LCD disabled?
 	jr c, .lcdEnabled
@@ -6737,7 +6737,7 @@
 	lb bc, BANK(BattleHudTiles2), (BattleHudTiles3End - BattleHudTiles2) / $8
 	jp CopyVideoDataDouble
 
-PrintEmptyString: ; 3ee94 (f:6e94)
+PrintEmptyString:
 	ld hl, .emptyString
 	jp PrintText
 .emptyString
@@ -6796,7 +6796,7 @@
 	ret
 
 
-HandleExplodingAnimation: ; 3eed3 (f:6ed3)
+HandleExplodingAnimation:
 	ld a, [H_WHOSETURN]
 	and a
 	ld hl, wEnemyMonType1
@@ -6827,23 +6827,23 @@
 	ld a, 5
 	ld [wAnimationType], a
 
-PlayMoveAnimation: ; 3ef07 (f:6f07)
+PlayMoveAnimation:
 	ld [wAnimationID],a
 	call Delay3
 	predef_jump MoveAnimation
 
-InitBattle: ; 3ef12 (f:6f12)
+InitBattle:
 	ld a, [wCurOpponent]
 	and a
 	jr z, DetermineWildOpponent
 
-InitOpponent: ; 3ef18 (f:6f18)
+InitOpponent:
 	ld a, [wCurOpponent]
 	ld [wcf91], a
 	ld [wEnemyMonSpecies2], a
 	jr InitBattleCommon
 
-DetermineWildOpponent: ; 3ef23 (f:6f23)
+DetermineWildOpponent:
 	ld a, [wd732]
 	bit 1, a
 	jr z, .asm_3ef2f
@@ -6856,7 +6856,7 @@
 	ret nz
 	callab TryDoWildEncounter
 	ret nz
-InitBattleCommon: ; 3ef3d (f:6f3d)
+InitBattleCommon:
 	ld a, [wMapPalOffset]
 	push af
 	ld hl, wLetterPrintingDelayFlags
@@ -6885,7 +6885,7 @@
 	ld [wIsInBattle], a
 	jp _InitBattleCommon
 
-InitWildBattle: ; 3ef8b (f:6f8b)
+InitWildBattle:
 	ld a, $1
 	ld [wIsInBattle], a
 	call LoadEnemyMonData
@@ -6935,7 +6935,7 @@
 	predef CopyUncompressedPicToTilemap
 
 ; common code that executes after init battle code specific to trainer or wild battles
-_InitBattleCommon: ; 3efeb (f:6feb)
+_InitBattleCommon:
 	ld b, SET_PAL_BATTLE_BLACK
 	call RunPaletteCommand
 	call SlidePlayerAndEnemySilhouettesOnScreen
@@ -6976,7 +6976,7 @@
 .emptyString
 	db "@"
 
-_LoadTrainerPic: ; 3f04b (f:704b)
+_LoadTrainerPic:
 ; wd033-wd034 contain pointer to pic
 	ld a, [wTrainerPicPointer]
 	ld e, a
@@ -6995,7 +6995,7 @@
 	jp LoadUncompressedSpriteData
 
 ; unreferenced
-ResetCryModifiers: ; 3f069 (f:7069)
+ResetCryModifiers:
 	xor a
 	ld [wFrequencyModifier], a
 	ld [wTempoModifier], a
@@ -7002,7 +7002,7 @@
 	jp PlaySound
 
 ; animates the mon "growing" out of the pokeball
-AnimateSendingOutMon: ; 3f073 (f:7073)
+AnimateSendingOutMon:
 	ld a, [wPredefRegisters]
 	ld h, a
 	ld a, [wPredefRegisters + 1]
@@ -7042,13 +7042,13 @@
 	add $31
 	jr CopyUncompressedPicToHL
 
-CopyUncompressedPicToTilemap: ; 3f0c6 (f:70c6)
+CopyUncompressedPicToTilemap:
 	ld a, [wPredefRegisters]
 	ld h, a
 	ld a, [wPredefRegisters + 1]
 	ld l, a
 	ld a, [hStartTileID]
-CopyUncompressedPicToHL: ; 3f0d0 (f:70d0)
+CopyUncompressedPicToHL:
 	lb bc, 7, 7
 	ld de, SCREEN_WIDTH
 	push af
@@ -7095,7 +7095,7 @@
 	jr nz, .flippedLoop
 	ret
 
-LoadMonBackPic: ; 3f103 (f:7103)
+LoadMonBackPic:
 ; Assumes the monster's attributes have
 ; been loaded with GetMonHeader.
 	ld a, [wBattleMonSpecies2]
@@ -7116,12 +7116,12 @@
 	ld b, a
 	jp CopyVideoData
 
-JumpMoveEffect: ; 3f132 (f:7132)
+JumpMoveEffect:
 	call _JumpMoveEffect
 	ld b, $1
 	ret
 
-_JumpMoveEffect: ; 3f138 (f:7138)
+_JumpMoveEffect:
 	ld a, [H_WHOSETURN]
 	and a
 	ld a, [wPlayerMoveEffect]
@@ -7139,7 +7139,7 @@
 	ld l, a
 	jp [hl] ; jump to special effect handler
 
-MoveEffectPointerTable: ; 3f150 (f:7150)
+MoveEffectPointerTable:
 	 dw SleepEffect               ; unused effect
 	 dw PoisonEffect              ; POISON_SIDE_EFFECT1
 	 dw DrainHPEffect             ; DRAIN_HP_EFFECT
@@ -7227,7 +7227,7 @@
 	 dw SplashEffect              ; SPLASH_EFFECT
 	 dw DisableEffect             ; DISABLE_EFFECT
 
-SleepEffect: ; 3f1fc (f:71fc)
+SleepEffect:
 	ld de, wEnemyMonStatus
 	ld bc, wEnemyBattleStatus2
 	ld a, [H_WHOSETURN]
@@ -7271,15 +7271,15 @@
 .didntAffect
 	jp PrintDidntAffectText
 
-FellAsleepText: ; 3f245 (f:7245)
+FellAsleepText:
 	TX_FAR _FellAsleepText
 	db "@"
 
-AlreadyAsleepText: ; 3f24a (f:724a)
+AlreadyAsleepText:
 	TX_FAR _AlreadyAsleepText
 	db "@"
 
-PoisonEffect: ; 3f24f (f:724f)
+PoisonEffect:
 	ld hl, wEnemyMonStatus
 	ld de, wPlayerMoveEffect
 	ld a, [H_WHOSETURN]
@@ -7365,18 +7365,18 @@
 	call DelayFrames
 	jp PrintDidntAffectText
 
-PoisonedText: ; 3f2df (f:72df)
+PoisonedText:
 	TX_FAR _PoisonedText
 	db "@"
 
-BadlyPoisonedText: ; 3f2e4 (f:72e4)
+BadlyPoisonedText:
 	TX_FAR _BadlyPoisonedText
 	db "@"
 
-DrainHPEffect: ; 3f2e9 (f:72e9)
+DrainHPEffect:
 	jpab DrainHPEffect_
 
-ExplodeEffect: ; 3f2f1 (f:72f1)
+ExplodeEffect:
 	ld hl, wBattleMonHP
 	ld de, wPlayerBattleStatus2
 	ld a, [H_WHOSETURN]
@@ -7395,7 +7395,7 @@
 	ld [de], a
 	ret
 
-FreezeBurnParalyzeEffect: ; 3f30c (f:730c)
+FreezeBurnParalyzeEffect:
 	xor a
 	ld [wAnimationType], a
 	call CheckTargetSubstitute ; test bit 4 of d063/d068 flags [target has substitute flag]
@@ -7454,7 +7454,7 @@
 	call PlayBattleAnimation
 	ld hl, FrozenText
 	jp PrintText
-opponentAttacker: ; 3f382 (f:7382)
+opponentAttacker:
 	ld a, [wBattleMonStatus] ; mostly same as above with addresses swapped for opponent
 	and a
 	jp nz, CheckDefrost
@@ -7500,15 +7500,15 @@
 	ld hl, FrozenText
 	jp PrintText
 
-BurnedText: ; 3f3d8 (f:73d8)
+BurnedText:
 	TX_FAR _BurnedText
 	db "@"
 
-FrozenText: ; 3f3dd (f:73dd)
+FrozenText:
 	TX_FAR _FrozenText
 	db "@"
 
-CheckDefrost: ; 3f3e2 (f:73e2)
+CheckDefrost:
 ; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target
 	and a, 1 << FRZ	; are they frozen?
 	ret z ; return if so
@@ -7543,11 +7543,11 @@
 .common
 	jp PrintText
 
-FireDefrostedText: ; 3f423 (f:7423)
+FireDefrostedText:
 	TX_FAR _FireDefrostedText
 	db "@"
 
-StatModifierUpEffect: ; 3f428 (f:7428)
+StatModifierUpEffect:
 	ld hl, wPlayerMonStatMods
 	ld de, wPlayerMoveEffect
 	ld a, [H_WHOSETURN]
@@ -7646,13 +7646,13 @@
 	ld a, 999 % $100
 	ld [H_MULTIPLICAND + 2], a
 
-UpdateStat: ; 3f4c3 (f:74c3)
+UpdateStat:
 	ld a, [H_PRODUCT + 2]
 	ld [hli], a
 	ld a, [H_PRODUCT + 3]
 	ld [hl], a
 	pop hl
-UpdateStatDone: ; 3f4ca (f:74ca)
+UpdateStatDone:
 	ld b, c
 	inc b
 	call PrintStatText
@@ -7703,15 +7703,15 @@
 	call QuarterSpeedDueToParalysis ; apply speed penalty to the player whose turn is not, if it's paralyzed
 	jp HalveAttackDueToBurn ; apply attack penalty to the player whose turn is not, if it's burned
 
-RestoreOriginalStatModifier: ; 3f520 (f:7520)
+RestoreOriginalStatModifier:
 	pop hl
 	dec [hl]
 
-PrintNothingHappenedText: ; 3f522 (f:7522)
+PrintNothingHappenedText:
 	ld hl, NothingHappenedText
 	jp PrintText
 
-MonsStatsRoseText: ; 3f528 (f:7528)
+MonsStatsRoseText:
 	TX_FAR _MonsStatsRoseText
 	TX_ASM
 	ld hl, GreatlyRoseText
@@ -7726,15 +7726,15 @@
 	ld hl, RoseText
 	ret
 
-GreatlyRoseText: ; 3f542 (f:7542)
+GreatlyRoseText:
 	db $0a
 	TX_FAR _GreatlyRoseText
 
-RoseText: ; 3f547 (f:7547)
+RoseText:
 	TX_FAR _RoseText
 	db "@"
 
-StatModifierDownEffect: ; 3f54c (f:754c)
+StatModifierDownEffect:
 	ld hl, wEnemyMonStatMods
 	ld de, wPlayerMoveEffect
 	ld bc, wEnemyBattleStatus1
@@ -7864,7 +7864,7 @@
 	ld a, $1
 	ld [H_MULTIPLICAND + 2], a
 
-UpdateLoweredStat: ; 3f624 (f:7624)
+UpdateLoweredStat:
 	ld a, [H_PRODUCT + 2]
 	ld [hli], a
 	ld a, [H_PRODUCT + 3]
@@ -7871,7 +7871,7 @@
 	ld [hl], a
 	pop de
 	pop hl
-UpdateLoweredStatDone: ; 3f62c (f:762c)
+UpdateLoweredStatDone:
 	ld b, c
 	inc b
 	push de
@@ -7895,12 +7895,12 @@
 	call QuarterSpeedDueToParalysis
 	jp HalveAttackDueToBurn
 
-CantLowerAnymore_Pop: ; 3f64d (f:764d)
+CantLowerAnymore_Pop:
 	pop de
 	pop hl
 	inc [hl]
 
-CantLowerAnymore: ; 3f650 (f:7650)
+CantLowerAnymore:
 	ld a, [de]
 	cp ATTACK_DOWN_SIDE_EFFECT
 	ret nc
@@ -7907,13 +7907,13 @@
 	ld hl, NothingHappenedText
 	jp PrintText
 
-MoveMissed: ; 3f65a (f:765a)
+MoveMissed:
 	ld a, [de]
 	cp $44
 	ret nc
 	jp ConditionalPrintButItFailed
 
-MonsStatsFellText: ; 3f661 (f:7661)
+MonsStatsFellText:
 	TX_FAR _MonsStatsFellText
 	TX_ASM
 	ld hl, FellText
@@ -7930,15 +7930,15 @@
 	ld hl, GreatlyFellText
 	ret
 
-GreatlyFellText: ; 3f67e (f:767e)
+GreatlyFellText:
 	db $0a
 	TX_FAR _GreatlyFellText
 
-FellText: ; 3f683 (f:7683)
+FellText:
 	TX_FAR _FellText
 	db "@"
 
-PrintStatText: ; 3f688 (f:7688)
+PrintStatText:
 	ld hl, StatsTextStrings
 	ld c, "@"
 .asm_3f68d
@@ -7954,7 +7954,7 @@
 	ld bc, $a
 	jp CopyData
 
-StatsTextStrings: ; 3f69f (f:769f)
+StatsTextStrings:
 	db "ATTACK@"
 	db "DEFENSE@"
 	db "SPEED@"
@@ -7962,7 +7962,7 @@
 	db "ACCURACY@"
 	db "EVADE@"
 
-StatModifierRatios: ; 3f6cb (f:76cb)
+StatModifierRatios:
 ; first byte is numerator, second byte is denominator
 	db 25, 100  ; 0.25
 	db 28, 100  ; 0.28
@@ -7978,7 +7978,7 @@
 	db 35,  10  ; 3.50
 	db  4,   1  ; 4.00
 
-BideEffect: ; 3f6e5 (f:76e5)
+BideEffect:
 	ld hl, wPlayerBattleStatus1
 	ld de, wPlayerBideAccumulatedDamage
 	ld bc, wPlayerNumAttacksLeft
@@ -8005,7 +8005,7 @@
 	add XSTATITEM_ANIM
 	jp PlayBattleAnimation2
 
-ThrashPetalDanceEffect: ; 3f717 (f:7717)
+ThrashPetalDanceEffect:
 	ld hl, wPlayerBattleStatus1
 	ld de, wPlayerNumAttacksLeft
 	ld a, [H_WHOSETURN]
@@ -8024,7 +8024,7 @@
 	add ANIM_B0
 	jp PlayBattleAnimation2
 
-SwitchAndTeleportEffect: ; 3f739 (f:7739)
+SwitchAndTeleportEffect:
 	ld a, [H_WHOSETURN]
 	and a
 	jr nz, .asm_3f791
@@ -8127,19 +8127,19 @@
 .asm_3f7ff
 	jp PrintText
 
-RanFromBattleText: ; 3f802 (f:7802)
+RanFromBattleText:
 	TX_FAR _RanFromBattleText
 	db "@"
 
-RanAwayScaredText: ; 3f807 (f:7807)
+RanAwayScaredText:
 	TX_FAR _RanAwayScaredText
 	db "@"
 
-WasBlownAwayText: ; 3f80c (f:780c)
+WasBlownAwayText:
 	TX_FAR _WasBlownAwayText
 	db "@"
 
-TwoToFiveAttacksEffect: ; 3f811 (f:7811)
+TwoToFiveAttacksEffect:
 	ld hl, wPlayerBattleStatus1
 	ld de, wPlayerNumAttacksLeft
 	ld bc, wPlayerNumHits
@@ -8184,7 +8184,7 @@
 	ld [hl], a ; set Twineedle's effect to poison effect
 	jr .saveNumberOfHits
 
-FlinchSideEffect: ; 3f85b (f:785b)
+FlinchSideEffect:
 	call CheckTargetSubstitute
 	ret nz
 	ld hl, wEnemyBattleStatus1
@@ -8208,10 +8208,10 @@
 	call ClearHyperBeam
 	ret
 
-OneHitKOEffect: ; 3f884 (f:7884)
+OneHitKOEffect:
 	jpab OneHitKOEffect_
 
-ChargeEffect: ; 3f88c (f:788c)
+ChargeEffect:
 	ld hl, wPlayerBattleStatus1
 	ld de, wPlayerMoveEffect
 	ld a, [H_WHOSETURN]
@@ -8245,7 +8245,7 @@
 	ld hl, ChargeMoveEffectText
 	jp PrintText
 
-ChargeMoveEffectText: ; 3f8c8 (f:78c8)
+ChargeMoveEffectText:
 	TX_FAR _ChargeMoveEffectText
 	TX_ASM
 	ld a, [wChargeMoveNum]
@@ -8269,31 +8269,31 @@
 .asm_3f8f8
 	ret
 
-MadeWhirlwindText: ; 3f8f9 (f:78f9)
+MadeWhirlwindText:
 	TX_FAR _MadeWhirlwindText
 	db "@"
 
-TookInSunlightText: ; 3f8fe (f:78fe)
+TookInSunlightText:
 	TX_FAR _TookInSunlightText
 	db "@"
 
-LoweredItsHeadText: ; 3f903 (f:7903)
+LoweredItsHeadText:
 	TX_FAR _LoweredItsHeadText
 	db "@"
 
-SkyAttackGlowingText: ; 3f908 (f:7908)
+SkyAttackGlowingText:
 	TX_FAR _SkyAttackGlowingText
 	db "@"
 
-FlewUpHighText: ; 3f90d (f:790d)
+FlewUpHighText:
 	TX_FAR _FlewUpHighText
 	db "@"
 
-DugAHoleText: ; 3f912 (f:7912)
+DugAHoleText:
 	TX_FAR _DugAHoleText
 	db "@"
 
-TrappingEffect: ; 3f917 (f:7917)
+TrappingEffect:
 	ld hl, wPlayerBattleStatus1
 	ld de, wPlayerNumAttacksLeft
 	ld a, [H_WHOSETURN]
@@ -8318,22 +8318,22 @@
 	ld [de], a
 	ret
 
-MistEffect: ; 3f941 (f:7941)
+MistEffect:
 	jpab MistEffect_
 
-FocusEnergyEffect: ; 3f949 (f:7949)
+FocusEnergyEffect:
 	jpab FocusEnergyEffect_
 
-RecoilEffect: ; 3f951 (f:7951)
+RecoilEffect:
 	jpab RecoilEffect_
 
-ConfusionSideEffect: ; 3f959 (f:7959)
+ConfusionSideEffect:
 	call BattleRandom
 	cp $19
 	ret nc
 	jr ConfusionSideEffectSuccess
 
-ConfusionEffect: ; 3f961 (f:7961)
+ConfusionEffect:
 	call CheckTargetSubstitute
 	jr nz, ConfusionEffectFailed
 	call MoveHitTest
@@ -8341,7 +8341,7 @@
 	and a
 	jr nz, ConfusionEffectFailed
 
-ConfusionSideEffectSuccess: ; 3f96f (f:796f)
+ConfusionSideEffectSuccess:
 	ld a, [H_WHOSETURN]
 	and a
 	ld hl, wEnemyBattleStatus1
@@ -8367,11 +8367,11 @@
 	ld hl, BecameConfusedText
 	jp PrintText
 
-BecameConfusedText: ; 3f9a1 (f:79a1)
+BecameConfusedText:
 	TX_FAR _BecameConfusedText
 	db "@"
 
-ConfusionEffectFailed: ; 3f9a6 (f:79a6)
+ConfusionEffectFailed:
 	cp CONFUSION_SIDE_EFFECT
 	ret z
 	ld c, 50
@@ -8378,13 +8378,13 @@
 	call DelayFrames
 	jp ConditionalPrintButItFailed
 
-ParalyzeEffect: ; 3f9b1 (f:79b1)
+ParalyzeEffect:
 	jpab ParalyzeEffect_
 
-SubstituteEffect: ; 3f9b9 (f:79b9)
+SubstituteEffect:
 	jpab SubstituteEffect_
 
-HyperBeamEffect: ; 3f9c1 (f:79c1)
+HyperBeamEffect:
 	ld hl, wPlayerBattleStatus2
 	ld a, [H_WHOSETURN]
 	and a
@@ -8394,7 +8394,7 @@
 	set NeedsToRecharge, [hl] ; mon now needs to recharge
 	ret
 
-ClearHyperBeam: ; 3f9cf (f:79cf)
+ClearHyperBeam:
 	push hl
 	ld hl, wEnemyBattleStatus2
 	ld a, [H_WHOSETURN]
@@ -8406,7 +8406,7 @@
 	pop hl
 	ret
 
-RageEffect: ; 3f9df (f:79df)
+RageEffect:
 	ld hl, wPlayerBattleStatus2
 	ld a, [H_WHOSETURN]
 	and a
@@ -8416,7 +8416,7 @@
 	set UsingRage, [hl] ; mon is now in "rage" mode
 	ret
 
-MimicEffect: ; 3f9ed (f:79ed)
+MimicEffect:
 	ld c, 50
 	call DelayFrames
 	call MoveHitTest
@@ -8488,18 +8488,18 @@
 .asm_3fa74
 	jp PrintButItFailedText_
 
-MimicLearnedMoveText: ; 3fa77 (f:7a77)
+MimicLearnedMoveText:
 	TX_FAR _MimicLearnedMoveText
 	db "@"
 
-LeechSeedEffect: ; 3fa7c (f:7a7c)
+LeechSeedEffect:
 	jpab LeechSeedEffect_
 
-SplashEffect: ; 3fa84 (f:7a84)
+SplashEffect:
 	call PlayCurrentMoveAnimation
 	jp PrintNoEffectText
 
-DisableEffect: ; 3fa8a (f:7a8a)
+DisableEffect:
 	call MoveHitTest
 	ld a, [wMoveMissed]
 	and a
@@ -8582,74 +8582,74 @@
 .moveMissed
 	jp PrintButItFailedText_
 
-MoveWasDisabledText: ; 3fb09 (f:7b09)
+MoveWasDisabledText:
 	TX_FAR _MoveWasDisabledText
 	db "@"
 
-PayDayEffect: ; 3fb0e (f:7b0e)
+PayDayEffect:
 	jpab PayDayEffect_
 
-ConversionEffect: ; 3fb16 (f:7b16)
+ConversionEffect:
 	jpab ConversionEffect_
 
-HazeEffect: ; 3fb1e (f:7b1e)
+HazeEffect:
 	jpab HazeEffect_
 
-HealEffect: ; 3fb26 (f:7b26)
+HealEffect:
 	jpab HealEffect_
 
-TransformEffect: ; 3fb2e (f:7b2e)
+TransformEffect:
 	jpab TransformEffect_
 
-ReflectLightScreenEffect: ; 3fb36 (f:7b36)
+ReflectLightScreenEffect:
 	jpab ReflectLightScreenEffect_
 
-NothingHappenedText: ; 3fb3e (f:7b3e)
+NothingHappenedText:
 	TX_FAR _NothingHappenedText
 	db "@"
 
-PrintNoEffectText: ; 3fb43 (f:7b43)
+PrintNoEffectText:
 	ld hl, NoEffectText
 	jp PrintText
 
-NoEffectText: ; 3fb49 (f:7b49)
+NoEffectText:
 	TX_FAR _NoEffectText
 	db "@"
 
-ConditionalPrintButItFailed: ; 3fb4e (f:7b4e)
+ConditionalPrintButItFailed:
 	ld a, [wMoveDidntMiss]
 	and a
 	ret nz ; return if the side effect failed, yet the attack was successful
 
-PrintButItFailedText_: ; 3fb53 (f:7b53)
+PrintButItFailedText_:
 	ld hl, ButItFailedText
 	jp PrintText
 
-ButItFailedText: ; 3fb59 (f:7b59)
+ButItFailedText:
 	TX_FAR _ButItFailedText
 	db "@"
 
-PrintDidntAffectText: ; 3fb5e (f:7b5e)
+PrintDidntAffectText:
 	ld hl, DidntAffectText
 	jp PrintText
 
-DidntAffectText: ; 3fb64 (f:7b64)
+DidntAffectText:
 	TX_FAR _DidntAffectText
 	db "@"
 
-IsUnaffectedText: ; 3fb69 (f:7b69)
+IsUnaffectedText:
 	TX_FAR _IsUnaffectedText
 	db "@"
 
-PrintMayNotAttackText: ; 3fb6e (f:7b6e)
+PrintMayNotAttackText:
 	ld hl, ParalyzedMayNotAttackText
 	jp PrintText
 
-ParalyzedMayNotAttackText: ; 3fb74 (f:7b74)
+ParalyzedMayNotAttackText:
 	TX_FAR _ParalyzedMayNotAttackText
 	db "@"
 
-CheckTargetSubstitute: ; 3fb79 (f:7b79)
+CheckTargetSubstitute:
 	push hl
 	ld hl, wEnemyBattleStatus2
 	ld a, [H_WHOSETURN]
@@ -8661,7 +8661,7 @@
 	pop hl
 	ret
 
-PlayCurrentMoveAnimation2: ; 3fb89 (f:7b89)
+PlayCurrentMoveAnimation2:
 ; animation at MOVENUM will be played unless MOVENUM is 0
 ; plays wAnimationType 3 or 6
 	ld a, [H_WHOSETURN]
@@ -8673,7 +8673,7 @@
 	and a
 	ret z
 
-PlayBattleAnimation2: ; 3fb96 (f:7b96)
+PlayBattleAnimation2:
 ; play animation ID at a and animation type 6 or 3
 	ld [wAnimationID], a
 	ld a, [H_WHOSETURN]
@@ -8685,7 +8685,7 @@
 	ld [wAnimationType], a
 	jp PlayBattleAnimationGotID
 
-PlayCurrentMoveAnimation: ; 3fba8 (f:7ba8)
+PlayCurrentMoveAnimation:
 ; animation at MOVENUM will be played unless MOVENUM is 0
 ; resets wAnimationType
 	xor a
@@ -8699,11 +8699,11 @@
 	and a
 	ret z
 
-PlayBattleAnimation: ; 3fbb9 (f:7bb9)
+PlayBattleAnimation:
 ; play animation ID at a and predefined animation type
 	ld [wAnimationID], a
 
-PlayBattleAnimationGotID: ; 3fbbc (f:7bbc)
+PlayBattleAnimationGotID:
 ; play animation at wAnimationID
 	push hl
 	push de
--- a/engine/battle/decrement_pp.asm
+++ b/engine/battle/decrement_pp.asm
@@ -1,4 +1,4 @@
-DecrementPP: ; 68000 (1a:4000)
+DecrementPP:
 ; after using a move, decrement pp in battle and (if not transformed?) in party
 	ld a, [de]
 	cp a, STRUGGLE
--- a/engine/battle/display_effectiveness.asm
+++ b/engine/battle/display_effectiveness.asm
@@ -1,4 +1,4 @@
-DisplayEffectiveness: ; 2fb7b (b:7b7b)
+DisplayEffectiveness:
 	ld a, [wDamageMultipliers]
 	and a, $7F
 	cp a, $0A
@@ -9,10 +9,10 @@
 .done
 	jp PrintText
 
-SuperEffectiveText: ; 2fb8e (b:7b8e)
+SuperEffectiveText:
 	TX_FAR _SuperEffectiveText
 	db "@"
 
-NotVeryEffectiveText: ; 2fb93 (b:7b93)
+NotVeryEffectiveText:
 	TX_FAR _NotVeryEffectiveText
 	db "@"
--- a/engine/battle/draw_hud_pokeball_gfx.asm
+++ b/engine/battle/draw_hud_pokeball_gfx.asm
@@ -1,4 +1,4 @@
-DrawAllPokeballs: ; 3a849 (e:6849)
+DrawAllPokeballs:
 	call LoadPartyPokeballGfx
 	call SetupOwnPartyPokeballs
 	ld a, [wIsInBattle]
@@ -6,17 +6,17 @@
 	ret z ; return if wild pokémon
 	jp SetupEnemyPartyPokeballs
 
-DrawEnemyPokeballs: ; 3a857 (e:6857)
+DrawEnemyPokeballs:
 	call LoadPartyPokeballGfx
 	jp SetupEnemyPartyPokeballs
 
-LoadPartyPokeballGfx: ; 3a85d (e:685d)
+LoadPartyPokeballGfx:
 	ld de, PokeballTileGraphics
 	ld hl, vSprites + $310
 	lb bc, BANK(PokeballTileGraphics), (PokeballTileGraphicsEnd - PokeballTileGraphics) / $10
 	jp CopyVideoData
 
-SetupOwnPartyPokeballs: ; 3a869 (e:6869)
+SetupOwnPartyPokeballs:
 	call PlacePlayerHUDTiles
 	ld hl, wPartyMon1
 	ld de, wPartyCount
@@ -30,7 +30,7 @@
 	ld hl, wOAMBuffer
 	jp WritePokeballOAMData
 
-SetupEnemyPartyPokeballs: ; 3a887 (e:6887)
+SetupEnemyPartyPokeballs:
 	call PlaceEnemyHUDTiles
 	ld hl, wEnemyMons
 	ld de, wEnemyPartyCount
@@ -66,7 +66,7 @@
 	jr nz, .monloop
 	ret
 
-PickPokeball: ; 3a8c2 (e:68c2)
+PickPokeball:
 	inc hl
 	ld a, [hli]
 	and a
@@ -94,7 +94,7 @@
 	add hl, bc ; next mon struct
 	ret
 
-WritePokeballOAMData: ; 3a8e1 (e:68e1)
+WritePokeballOAMData:
 	ld de, wBuffer
 	ld c, PARTY_LENGTH
 .loop
@@ -116,7 +116,7 @@
 	jr nz, .loop
 	ret
 
-PlacePlayerHUDTiles: ; 3a902 (e:6902)
+PlacePlayerHUDTiles:
 	ld hl, PlayerBattleHUDGraphicsTiles
 	ld de, wHUDGraphicsTiles
 	ld bc, $3
@@ -125,13 +125,13 @@
 	ld de, -1
 	jr PlaceHUDTiles
 
-PlayerBattleHUDGraphicsTiles: ; 3a916 (e:6916)
+PlayerBattleHUDGraphicsTiles:
 ; The tile numbers for specific parts of the battle display for the player's pokemon
 	db $73 ; unused ($73 is hardcoded into the routine that uses these bytes)
 	db $77 ; lower-right corner tile of the HUD
 	db $6F ; lower-left triangle tile of the HUD
 
-PlaceEnemyHUDTiles: ; 3a919 (e:6919)
+PlaceEnemyHUDTiles:
 	ld hl, EnemyBattleHUDGraphicsTiles
 	ld de, wHUDGraphicsTiles
 	ld bc, $3
@@ -140,13 +140,13 @@
 	ld de, $1
 	jr PlaceHUDTiles
 
-EnemyBattleHUDGraphicsTiles: ; 3a92d (e:692d)
+EnemyBattleHUDGraphicsTiles:
 ; The tile numbers for specific parts of the battle display for the enemy
 	db $73 ; unused ($73 is hardcoded in the routine that uses these bytes)
 	db $74 ; lower-left corner tile of the HUD
 	db $78 ; lower-right triangle tile of the HUD
 
-PlaceHUDTiles: ; 3a930 (e:6930)
+PlaceHUDTiles:
 	ld [hl], $73
 	ld bc, SCREEN_WIDTH
 	add hl, bc
@@ -163,7 +163,7 @@
 	ld [hl], a
 	ret
 
-SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948)
+SetupPlayerAndEnemyPokeballs:
 	call LoadPartyPokeballGfx
 	ld hl, wPartyMons
 	ld de, wPartyCount
@@ -187,6 +187,6 @@
 	jp WritePokeballOAMData
 
 ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon)
-PokeballTileGraphics:: ; 3a97e (e:697e)
+PokeballTileGraphics::
 	INCBIN "gfx/pokeball.2bpp"
 PokeballTileGraphicsEnd:
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
@@ -1,4 +1,4 @@
-EndOfBattle: ; 137aa (4:77aa)
+EndOfBattle:
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
 	jr nz, .notLinkBattle
@@ -74,15 +74,15 @@
 	ld [wDestinationWarpID], a
 	ret
 
-YouWinText: ; 13853 (4:7853)
+YouWinText:
 	db "YOU WIN@"
 
-YouLoseText: ; 1385b (4:785b)
+YouLoseText:
 	db "YOU LOSE@"
 
-DrawText: ; 13864 (4:7864)
+DrawText:
 	db "  DRAW@"
 
-PickUpPayDayMoneyText: ; 1386b (4:786b)
+PickUpPayDayMoneyText:
 	TX_FAR _PickUpPayDayMoneyText
 	db "@"
--- a/engine/battle/experience.asm
+++ b/engine/battle/experience.asm
@@ -1,4 +1,4 @@
-GainExperience: ; 5524f (15:524f)
+GainExperience:
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
 	ret z ; return if link battle
@@ -291,7 +291,7 @@
 	predef_jump FlagActionPredef ; set the fought current enemy flag for the mon that is currently out
 
 ; divide enemy base stats, catch rate, and base exp by the number of mons gaining exp
-DivideExpDataByNumMonsGainingExp: ; 5546c (15:546c)
+DivideExpDataByNumMonsGainingExp:
 	ld a, [wPartyGainExpFlags]
 	ld b, a
 	xor a
@@ -325,7 +325,7 @@
 	ret
 
 ; multiplies exp by 1.5
-BoostExp: ; 5549f (15:549f)
+BoostExp:
 	ld a, [H_QUOTIENT + 2]
 	ld b, a
 	ld a, [H_QUOTIENT + 3]
@@ -339,7 +339,7 @@
 	ld [H_QUOTIENT + 2], a
 	ret
 
-GainedText: ; 554b2 (15:54b2)
+GainedText:
 	TX_FAR _GainedText
 	TX_ASM
 	ld a, [wBoostExpByExpAll]
@@ -353,20 +353,20 @@
 	ld hl, BoostedText
 	ret
 
-WithExpAllText: ; 554cb (15:54cb)
+WithExpAllText:
 	TX_FAR _WithExpAllText
 	TX_ASM
 	ld hl, ExpPointsText
 	ret
 
-BoostedText: ; 554d4 (15:54d4)
+BoostedText:
 	TX_FAR _BoostedText
 
-ExpPointsText: ; 554d8 (15:54d8)
+ExpPointsText:
 	TX_FAR _ExpPointsText
 	db "@"
 
-GrewLevelText: ; 554dd (15:54dd)
+GrewLevelText:
 	TX_FAR _GrewLevelText
 	db $0b
 	db "@"
--- a/engine/battle/get_trainer_name.asm
+++ b/engine/battle/get_trainer_name.asm
@@ -1,4 +1,4 @@
-GetTrainerName_: ; 13a58 (4:7a58)
+GetTrainerName_:
 	ld hl, wGrassRate
 	ld a, [wLinkState]
 	and a
--- a/engine/battle/ghost_marowak_anim.asm
+++ b/engine/battle/ghost_marowak_anim.asm
@@ -1,4 +1,4 @@
-MarowakAnim: ; 708ca (1c:48ca)
+MarowakAnim:
 ; animate the ghost being unveiled as a Marowak
 	ld a, $e4
 	ld [rOBP1], a
@@ -49,7 +49,7 @@
 	jp ClearSprites
 
 ; copies a mon pic's  from background VRAM to sprite VRAM and sets up OAM
-CopyMonPicFromBGToSpriteVRAM: ; 7092a (1c:492a)
+CopyMonPicFromBGToSpriteVRAM:
 	ld de, vFrontPic
 	ld hl, vSprites
 	ld bc, 7 * 7
--- a/engine/battle/init_battle_variables.asm
+++ b/engine/battle/init_battle_variables.asm
@@ -1,4 +1,4 @@
-InitBattleVariables: ; 525af (14:65af)
+InitBattleVariables:
 	ld a, [hTilesetType]
 	ld [wSavedTilesetType], a
 	xor a
--- a/engine/battle/link_battle_versus_text.asm
+++ b/engine/battle/link_battle_versus_text.asm
@@ -1,5 +1,5 @@
 ; display "[player] VS [enemy]" text box with pokeballs representing their parties next to the names
-DisplayLinkBattleVersusTextBox: ; 372d6 (d:72d6)
+DisplayLinkBattleVersusTextBox:
 	call LoadTextBoxTilePatterns
 	coord hl, 3, 4
 	ld b, $7
--- a/engine/battle/moveEffects/conversion_effect.asm
+++ b/engine/battle/moveEffects/conversion_effect.asm
@@ -1,4 +1,4 @@
-ConversionEffect_: ; 139a3 (4:79a3)
+ConversionEffect_:
 	ld hl, wEnemyMonType1
 	ld de, wBattleMonType1
 	ld a, [H_WHOSETURN]
@@ -24,12 +24,12 @@
 	ld hl, ConvertedTypeText
 	jp PrintText
 
-ConvertedTypeText: ; 139cd (4:79cd)
+ConvertedTypeText:
 	TX_FAR _ConvertedTypeText
 	db "@"
 
-PrintButItFailedText: ; 139d2 (4:79d2)
+PrintButItFailedText:
 	ld hl, PrintButItFailedText_
-CallBankF: ; 139d5 (4:79d5)
+CallBankF:
 	ld b, BANK(PrintButItFailedText_)
 	jp Bankswitch
--- a/engine/battle/moveEffects/drain_hp_effect.asm
+++ b/engine/battle/moveEffects/drain_hp_effect.asm
@@ -1,4 +1,4 @@
-DrainHPEffect_: ; 783f (1:783f)
+DrainHPEffect_:
 	ld hl, wDamage
 	ld a, [hl]
 	srl a ; divide damage by 2
@@ -95,10 +95,10 @@
 .printText
 	jp PrintText
 
-SuckedHealthText: ; 78dc (1:78dc)
+SuckedHealthText:
 	TX_FAR _SuckedHealthText
 	db "@"
 
-DreamWasEatenText: ; 78e1 (1:78e1)
+DreamWasEatenText:
 	TX_FAR _DreamWasEatenText
 	db "@"
--- a/engine/battle/moveEffects/focus_energy_effect.asm
+++ b/engine/battle/moveEffects/focus_energy_effect.asm
@@ -1,4 +1,4 @@
-FocusEnergyEffect_: ; 27f86 (9:7f86)
+FocusEnergyEffect_:
 	ld hl, wPlayerBattleStatus2
 	ld a, [H_WHOSETURN]
 	and a
@@ -16,7 +16,7 @@
 	call DelayFrames
 	jpab PrintButItFailedText_
 
-GettingPumpedText: ; 27fb3 (9:7fb3)
+GettingPumpedText:
 	db $0a
 	TX_FAR _GettingPumpedText
 	db "@"
--- a/engine/battle/moveEffects/haze_effect.asm
+++ b/engine/battle/moveEffects/haze_effect.asm
@@ -1,4 +1,4 @@
-HazeEffect_: ; 139da (4:79da)
+HazeEffect_:
 	ld a, $7
 ; store 7 on every stat mod
 	ld hl, wPlayerMonAttackMod
@@ -45,7 +45,7 @@
 	ld hl, StatusChangesEliminatedText
 	jp PrintText
 
-CureVolatileStatuses: ; 13a37 (4:7a37)
+CureVolatileStatuses:
 ; only cures statuses of the Pokemon not using Haze
 	res Confused, [hl]
 	inc hl ; BATTSTATUS2
@@ -58,7 +58,7 @@
 	ld [hl], a
 	ret
 
-ResetStatMods: ; 13a43 (4:7a43)
+ResetStatMods:
 	ld b, $8
 .loop
 	ld [hli], a
@@ -66,7 +66,7 @@
 	jr nz, .loop
 	ret
 
-ResetStats: ; 13a4a (4:7a4a)
+ResetStats:
 	ld b, $8
 .loop
 	ld a, [hli]
@@ -76,6 +76,6 @@
 	jr nz, .loop
 	ret
 
-StatusChangesEliminatedText: ; 13a53 (4:7a53)
+StatusChangesEliminatedText:
 	TX_FAR _StatusChangesEliminatedText
 	db "@"
--- a/engine/battle/moveEffects/heal_effect.asm
+++ b/engine/battle/moveEffects/heal_effect.asm
@@ -1,4 +1,4 @@
-HealEffect_: ; 3b9ec (e:79ec)
+HealEffect_:
 	ld a, [H_WHOSETURN]
 	and a
 	ld de, wBattleMonHP
@@ -107,14 +107,14 @@
 	ld hl, PrintButItFailedText_
 	jp BankswitchEtoF
 
-StartedSleepingEffect: ; 3baa2 (e:7aa2)
+StartedSleepingEffect:
 	TX_FAR _StartedSleepingEffect
 	db "@"
 
-FellAsleepBecameHealthyText: ; 3baa7 (e:7aa7)
+FellAsleepBecameHealthyText:
 	TX_FAR _FellAsleepBecameHealthyText
 	db "@"
 
-RegainedHealthText: ; 3baac (e:7aac)
+RegainedHealthText:
 	TX_FAR _RegainedHealthText
 	db "@"
--- a/engine/battle/moveEffects/leech_seed_effect.asm
+++ b/engine/battle/moveEffects/leech_seed_effect.asm
@@ -1,4 +1,4 @@
-LeechSeedEffect_: ; 2bea9 (a:7ea9)
+LeechSeedEffect_:
 	callab MoveHitTest
 	ld a, [wMoveMissed]
 	and a
@@ -31,10 +31,10 @@
 	ld hl, EvadedAttackText
 	jp PrintText
 
-WasSeededText: ; 2bef2 (a:7ef2)
+WasSeededText:
 	TX_FAR _WasSeededText
 	db "@"
 
-EvadedAttackText: ; 2bef7 (a:7ef7)
+EvadedAttackText:
 	TX_FAR _EvadedAttackText
 	db "@"
--- a/engine/battle/moveEffects/mist_effect.asm
+++ b/engine/battle/moveEffects/mist_effect.asm
@@ -1,4 +1,4 @@
-MistEffect_: ; 33f2b (c:7f2b)
+MistEffect_:
 	ld hl, wPlayerBattleStatus2
 	ld a, [H_WHOSETURN]
 	and a
@@ -14,6 +14,6 @@
 .mistAlreadyInUse
 	jpab PrintButItFailedText_
 
-ShroudedInMistText: ; 33f52 (c:7f52)
+ShroudedInMistText:
 	TX_FAR _ShroudedInMistText
 	db "@"
--- a/engine/battle/moveEffects/one_hit_ko_effect.asm
+++ b/engine/battle/moveEffects/one_hit_ko_effect.asm
@@ -1,4 +1,4 @@
-OneHitKOEffect_: ; 33f57 (c:7f57)
+OneHitKOEffect_:
 	ld hl, wDamage
 	xor a
 	ld [hli], a
--- a/engine/battle/moveEffects/paralyze_effect.asm
+++ b/engine/battle/moveEffects/paralyze_effect.asm
@@ -1,4 +1,4 @@
-ParalyzeEffect_: ; 52601 (14:6601)
+ParalyzeEffect_:
 	ld hl, wEnemyMonStatus
 	ld de, wPlayerMoveType
 	ld a, [H_WHOSETURN]
--- a/engine/battle/moveEffects/pay_day_effect.asm
+++ b/engine/battle/moveEffects/pay_day_effect.asm
@@ -1,4 +1,4 @@
-PayDayEffect_: ; 2feb8 (b:7eb8)
+PayDayEffect_:
 	xor a
 	ld hl, wcd6d
 	ld [hli], a
@@ -40,6 +40,6 @@
 	ld hl, CoinsScatteredText
 	jp PrintText
 
-CoinsScatteredText: ; 2ff04 (b:7f04)
+CoinsScatteredText:
 	TX_FAR _CoinsScatteredText
 	db "@"
--- a/engine/battle/moveEffects/recoil_effect.asm
+++ b/engine/battle/moveEffects/recoil_effect.asm
@@ -1,4 +1,4 @@
-RecoilEffect_: ; 1392c (4:792c)
+RecoilEffect_:
 	ld a, [H_WHOSETURN]
 	and a
 	ld a, [wPlayerMoveNum]
@@ -65,6 +65,6 @@
 	predef UpdateHPBar2
 	ld hl, HitWithRecoilText
 	jp PrintText
-HitWithRecoilText: ; 1399e (4:799e)
+HitWithRecoilText:
 	TX_FAR _HitWithRecoilText
 	db "@"
--- a/engine/battle/moveEffects/reflect_light_screen_effect.asm
+++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm
@@ -1,4 +1,4 @@
-ReflectLightScreenEffect_: ; 3bb97 (e:7b97)
+ReflectLightScreenEffect_:
 	ld hl, wPlayerBattleStatus3
 	ld de, wPlayerMoveEffect
 	ld a, [H_WHOSETURN]
@@ -32,14 +32,14 @@
 	ld hl, PrintButItFailedText_
 	jp BankswitchEtoF
 
-LightScreenProtectedText: ; 3bbd7 (e:7bd7)
+LightScreenProtectedText:
 	TX_FAR _LightScreenProtectedText
 	db "@"
 
-ReflectGainedArmorText: ; 3bbdc (e:7bdc)
+ReflectGainedArmorText:
 	TX_FAR _ReflectGainedArmorText
 	db "@"
 
-BankswitchEtoF: ; 3bbe1 (e:7be1)
+BankswitchEtoF:
 	ld b, BANK(BattleCore)
 	jp Bankswitch
--- a/engine/battle/moveEffects/substitute_effect.asm
+++ b/engine/battle/moveEffects/substitute_effect.asm
@@ -1,4 +1,4 @@
-SubstituteEffect_: ; 17dad (5:7dad)
+SubstituteEffect_:
 	ld c, 50
 	call DelayFrames
 	ld hl, wBattleMonMaxHP
@@ -64,14 +64,14 @@
 .printText
 	jp PrintText
 
-SubstituteText: ; 17e1d (5:7e1d)
+SubstituteText:
 	TX_FAR _SubstituteText
 	db "@"
 
-HasSubstituteText: ; 17e22 (5:7e22)
+HasSubstituteText:
 	TX_FAR _HasSubstituteText
 	db "@"
 
-TooWeakSubstituteText: ; 17e27 (5:7e27)
+TooWeakSubstituteText:
 	TX_FAR _TooWeakSubstituteText
 	db "@"
--- a/engine/battle/moveEffects/transform_effect.asm
+++ b/engine/battle/moveEffects/transform_effect.asm
@@ -1,4 +1,4 @@
-TransformEffect_: ; 3bab1 (e:7ab1)
+TransformEffect_:
 	ld hl, wBattleMonSpecies
 	ld de, wEnemyMonSpecies
 	ld bc, wEnemyBattleStatus3
@@ -143,6 +143,6 @@
 	ld hl, PrintButItFailedText_
 	jp BankswitchEtoF
 
-TransformedText: ; 3bb92 (e:7b92)
+TransformedText:
 	TX_FAR _TransformedText
 	db "@"
--- a/engine/battle/print_type.asm
+++ b/engine/battle/print_type.asm
@@ -1,6 +1,6 @@
 ; [wd0b5] = pokemon ID
 ; hl = dest addr
-PrintMonType: ; 27d6b (9:7d6b)
+PrintMonType:
 	call GetPredefRegisters
 	push hl
 	call GetMonHeader
@@ -19,12 +19,12 @@
 
 ; a = type
 ; hl = dest addr
-PrintType: ; 27d89 (9:7d89)
+PrintType:
 	push hl
 	jr PrintType_
 
 ; erase "TYPE2/" if the mon only has 1 type
-EraseType2Text: ; 27d8c (9:7d8c)
+EraseType2Text:
 	ld a, " "
 	ld bc, $13
 	add hl, bc
@@ -31,13 +31,13 @@
 	ld bc, $6
 	jp FillMemory
 
-PrintMoveType: ; 27d98 (9:7d98)
+PrintMoveType:
 	call GetPredefRegisters
 	push hl
 	ld a, [wPlayerMoveType]
 ; fall through
 
-PrintType_: ; 27d9f (9:7d9f)
+PrintType_:
 	add a
 	ld hl, TypeNames
 	ld e, a
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -1,4 +1,4 @@
-ReadTrainer: ; 39c53 (e:5c53)
+ReadTrainer:
 
 ; don't change any moves in a link battle
 	ld a,[wLinkState]
--- a/engine/battle/safari_zone.asm
+++ b/engine/battle/safari_zone.asm
@@ -1,4 +1,4 @@
-PrintSafariZoneBattleText: ; 4277 (1:4277)
+PrintSafariZoneBattleText:
 	ld hl, wSafariBaitFactor
 	ld a, [hl]
 	and a
@@ -27,10 +27,10 @@
 	pop hl
 	jp PrintText
 
-SafariZoneEatingText: ; 42a7 (1:42a7)
+SafariZoneEatingText:
 	TX_FAR _SafariZoneEatingText
 	db "@"
 
-SafariZoneAngryText: ; 42ac (1:42ac)
+SafariZoneAngryText:
 	TX_FAR _SafariZoneAngryText
 	db "@"
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -1,4 +1,4 @@
-SaveTrainerName: ; 27e4a (9:7e4a)
+SaveTrainerName:
 	ld hl,TrainerNamePointers
 	ld a,[wTrainerClass]
 	dec a
@@ -18,7 +18,7 @@
 	jr nz,.CopyCharacter
 	ret
 
-TrainerNamePointers: ; 27e64 (9:7e64)
+TrainerNamePointers:
 ; what is the point of these?
 	dw YoungsterName
 	dw BugCatcherName
@@ -68,45 +68,45 @@
 	dw wTrainerName
 	dw wTrainerName
 
-YoungsterName: ; 27ec2 (9:7ec2)
+YoungsterName:
 	db "YOUNGSTER@"
-BugCatcherName: ; 27ecc (9:7ecc)
+BugCatcherName:
 	db "BUG CATCHER@"
-LassName: ; 27ed8 (9:7ed8)
+LassName:
 	db "LASS@"
-JrTrainerMName: ; 27edd (9:7edd)
+JrTrainerMName:
 	db "JR.TRAINER♂@"
-JrTrainerFName: ; 27ee9 (9:7ee9)
+JrTrainerFName:
 	db "JR.TRAINER♀@"
-PokemaniacName: ; 27ef5 (9:7ef5)
+PokemaniacName:
 	db "POKéMANIAC@"
-SuperNerdName: ; 27f00 (9:7f00)
+SuperNerdName:
 	db "SUPER NERD@"
-BurglarName: ; 27f0b (9:7f0b)
+BurglarName:
 	db "BURGLAR@"
-EngineerName: ; 27f13 (9:7f13)
+EngineerName:
 	db "ENGINEER@"
-JugglerXName: ; 27f1c (9:7f1c)
+JugglerXName:
 	db "JUGGLER@"
-SwimmerName: ; 27f24 (9:7f24)
+SwimmerName:
 	db "SWIMMER@"
-BeautyName: ; 27f2c (9:7f2c)
+BeautyName:
 	db "BEAUTY@"
-RockerName: ; 27f33 (9:7f33)
+RockerName:
 	db "ROCKER@"
-JugglerName: ; 27f3a (9:7f3a)
+JugglerName:
 	db "JUGGLER@"
-BlackbeltName: ; 27f42 (9:7f42)
+BlackbeltName:
 	db "BLACKBELT@"
-ProfOakName: ; 27f4c (9:7f4c)
+ProfOakName:
 	db "PROF.OAK@"
-ChiefName: ; 27f55 (9:7f55)
+ChiefName:
 	db "CHIEF@"
-ScientistName: ; 27f5b (9:7f5b)
+ScientistName:
 	db "SCIENTIST@"
-RocketName: ; 27f65 (9:7f65)
+RocketName:
 	db "ROCKET@"
-CooltrainerMName: ; 27f6c (9:7f6c)
+CooltrainerMName:
 	db "COOLTRAINER♂@"
-CooltrainerFName: ; 27f79 (9:7f79)
+CooltrainerFName:
 	db "COOLTRAINER♀@"
--- a/engine/battle/scale_sprites.asm
+++ b/engine/battle/scale_sprites.asm
@@ -1,7 +1,7 @@
 ; scales both uncompressed sprite chunks by two in every dimension (creating 2x2 output pixels per input pixel)
 ; assumes that input sprite chunks are 4x4 tiles, and the rightmost and bottommost 4 pixels will be ignored
 ; resulting in a 7*7 tile output sprite chunk
-ScaleSpriteByTwo: ; 2fe40 (b:7e40)
+ScaleSpriteByTwo:
 	ld de, sSpriteBuffer1 + (4*4*8) - 5          ; last byte of input data, last 4 rows already skipped
 	ld hl, sSpriteBuffer0 + SPRITEBUFFERSIZE - 1 ; end of destination buffer
 	call ScaleLastSpriteColumnByTwo               ; last tile column is special case
@@ -10,7 +10,7 @@
 	ld hl, sSpriteBuffer1 + SPRITEBUFFERSIZE - 1 ; end of destination buffer
 	call ScaleLastSpriteColumnByTwo               ; last tile column is special case
 
-ScaleFirstThreeSpriteColumnsByTwo: ; 2fe55 (b:7e55)
+ScaleFirstThreeSpriteColumnsByTwo:
 	ld b, $3 ; 3 tile columns
 .columnLoop
 	ld c, 4*8 - 4 ; $1c, 4 tiles minus 4 unused rows
@@ -39,7 +39,7 @@
 	jr nz, .columnLoop
 	ret
 
-ScaleLastSpriteColumnByTwo: ; 2fe7d (b:7e7d)
+ScaleLastSpriteColumnByTwo:
 	ld a, 4*8 - 4 ; $1c, 4 tiles minus 4 unused rows
 	ld [H_SPRITEINTERLACECOUNTER], a
 	ld bc, -1
@@ -61,7 +61,7 @@
 ; scales the given 4 bits in a (4x1 pixels) to 2 output bytes (8x2 pixels)
 ; hl: destination pointer
 ; bc: destination pointer offset (added after the two bytes have been written)
-ScalePixelsByTwo: ; 2fe97 (b:7e97)
+ScalePixelsByTwo:
 	push hl
 	and $f
 	ld hl, DuplicateBitsTable
@@ -78,7 +78,7 @@
 	ret
 
 ; repeats each input bit twice
-DuplicateBitsTable: ; 2fea8 (b:7ea8)
+DuplicateBitsTable:
 	db $00, $03, $0c, $0f
 	db $30, $33, $3c, $3f
 	db $c0, $c3, $cc, $cf
--- a/engine/battle/scroll_draw_trainer_pic.asm
+++ b/engine/battle/scroll_draw_trainer_pic.asm
@@ -1,4 +1,4 @@
-_ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3)
+_ScrollTrainerPicAfterBattle:
 ; Load the enemy trainer's pic and scrolls it into
 ; the screen from the right.
 	xor a
@@ -32,7 +32,7 @@
 	jr .scrollLoop
 
 ; write one 7-tile column of the trainer pic to the tilemap
-DrawTrainerPicColumn: ; 39707 (e:5707)
+DrawTrainerPicColumn:
 	push hl
 	push de
 	push bc
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -1,6 +1,6 @@
 ; creates a set of moves that may be used and returns its address in hl
 ; unused slots are filled with 0, all used slots may be chosen with equal probability
-AIEnemyTrainerChooseMoves: ; 39719 (e:5719)
+AIEnemyTrainerChooseMoves:
 	ld a, $a
 	ld hl, wBuffer ; init temporary move selection array. Only the moves with the lowest numbers are chosen in the end
 	ld [hli], a   ; move 1
@@ -103,7 +103,7 @@
 	ld hl, wEnemyMonMoves    ; use original move set
 	ret
 
-AIMoveChoiceModificationFunctionPointers: ; 397a3 (e:57a3)
+AIMoveChoiceModificationFunctionPointers:
 	dw AIMoveChoiceModification1
 	dw AIMoveChoiceModification2
 	dw AIMoveChoiceModification3
@@ -110,7 +110,7 @@
 	dw AIMoveChoiceModification4 ; unused, does nothing
 
 ; discourages moves that cause no damage but only a status ailment if player's mon already has one
-AIMoveChoiceModification1: ; 397ab (e:57ab)
+AIMoveChoiceModification1:
 	ld a, [wBattleMonStatus]
 	and a
 	ret z ; return if no status ailment on player's mon
@@ -155,7 +155,7 @@
 ; slightly encourage moves with specific effects.
 ; in particular, stat-modifying moves and other move effects
 ; that fall in-bewteen
-AIMoveChoiceModification2: ; 397e7 (e:57e7)
+AIMoveChoiceModification2:
 	ld a, [wAILayer2Encouragement]
 	cp $1
 	ret nz
@@ -188,7 +188,7 @@
 ; encourages moves that are effective against the player's mon (even if non-damaging).
 ; discourage damaging moves that are ineffective or not very effective against the player's mon,
 ; unless there's no damaging move that deals at least neutral damage
-AIMoveChoiceModification3: ; 39817 (e:5817)
+AIMoveChoiceModification3:
 	ld hl, wBuffer - 1 ; temp move selection array (-1 byte offset)
 	ld de, wEnemyMonMoves ; enemy moves
 	ld b, NUM_MOVES + 1
@@ -255,10 +255,10 @@
 	jr z, .nextMove
 	inc [hl] ; sligthly discourage this move
 	jr .nextMove
-AIMoveChoiceModification4: ; 39883 (e:5883)
+AIMoveChoiceModification4:
 	ret
 
-ReadMove: ; 39884 (e:5884)
+ReadMove:
 	push hl
 	push de
 	push bc
@@ -275,7 +275,7 @@
 
 ; move choice modification methods that are applied for each trainer class
 ; 0 is sentinel value
-TrainerClassMoveChoiceModifications: ; 3989b (e:589b)
+TrainerClassMoveChoiceModifications:
 	db 0      ; YOUNGSTER
 	db 1,0    ; BUG CATCHER
 	db 1,0    ; LASS
@@ -336,7 +336,7 @@
 
 INCLUDE "data/trainer_parties.asm"
 
-TrainerAI: ; 3a52e (e:652e)
+TrainerAI:
 	and a
 	ld a,[wIsInBattle]
 	dec a
@@ -368,7 +368,7 @@
 	call Random
 	jp [hl]
 
-TrainerAIPointers: ; 3a55c (e:655c)
+TrainerAIPointers:
 ; one entry per trainer class
 ; first byte, number of times (per Pokémon) it can occur
 ; next two bytes, pointer to AI subroutine for trainer class
@@ -420,27 +420,27 @@
 	dbw 2,AgathaAI ; agatha
 	dbw 1,LanceAI ; lance
 
-JugglerAI: ; 3a5e9 (e:65e9)
+JugglerAI:
 	cp $40
 	ret nc
 	jp AISwitchIfEnoughMons
 
-BlackbeltAI: ; 3a5ef (e:65ef)
+BlackbeltAI:
 	cp $20
 	ret nc
 	jp AIUseXAttack
 
-GiovanniAI: ; 3a5f5 (e:65f5)
+GiovanniAI:
 	cp $40
 	ret nc
 	jp AIUseGuardSpec
 
-CooltrainerMAI: ; 3a5fb (e:65fb)
+CooltrainerMAI:
 	cp $40
 	ret nc
 	jp AIUseXAttack
 
-CooltrainerFAI: ; 3a601 (e:6601)
+CooltrainerFAI:
 	cp $40
 	ld a,$A
 	call AICheckIfHPBelowFraction
@@ -450,7 +450,7 @@
 	ret nc
 	jp AISwitchIfEnoughMons
 
-BrockAI: ; 3a614 (e:6614)
+BrockAI:
 ; if his active monster has a status condition, use a full heal
 	ld a,[wEnemyMonStatus]
 	and a
@@ -457,17 +457,17 @@
 	ret z
 	jp AIUseFullHeal
 
-MistyAI: ; 3a61c (e:661c)
+MistyAI:
 	cp $40
 	ret nc
 	jp AIUseXDefend
 
-LtSurgeAI: ; 3a622 (e:6622)
+LtSurgeAI:
 	cp $40
 	ret nc
 	jp AIUseXSpeed
 
-ErikaAI: ; 3a628 (e:6628)
+ErikaAI:
 	cp $80
 	ret nc
 	ld a,$A
@@ -475,17 +475,17 @@
 	ret nc
 	jp AIUseSuperPotion
 
-KogaAI: ; 3a634 (e:6634)
+KogaAI:
 	cp $40
 	ret nc
 	jp AIUseXAttack
 
-BlaineAI: ; 3a63a (e:663a)
+BlaineAI:
 	cp $40
 	ret nc
 	jp AIUseSuperPotion
 
-SabrinaAI: ; 3a640 (e:6640)
+SabrinaAI:
 	cp $40
 	ret nc
 	ld a,$A
@@ -493,7 +493,7 @@
 	ret nc
 	jp AIUseHyperPotion
 
-Sony2AI: ; 3a64c (e:664c)
+Sony2AI:
 	cp $20
 	ret nc
 	ld a,5
@@ -501,7 +501,7 @@
 	ret nc
 	jp AIUsePotion
 
-Sony3AI: ; 3a658 (e:6658)
+Sony3AI:
 	cp $20
 	ret nc
 	ld a,5
@@ -509,7 +509,7 @@
 	ret nc
 	jp AIUseFullRestore
 
-LoreleiAI: ; 3a664 (e:6664)
+LoreleiAI:
 	cp $80
 	ret nc
 	ld a,5
@@ -517,12 +517,12 @@
 	ret nc
 	jp AIUseSuperPotion
 
-BrunoAI: ; 3a670 (e:6670)
+BrunoAI:
 	cp $40
 	ret nc
 	jp AIUseXDefend
 
-AgathaAI: ; 3a676 (e:6676)
+AgathaAI:
 	cp $14
 	jp c,AISwitchIfEnoughMons
 	cp $80
@@ -532,7 +532,7 @@
 	ret nc
 	jp AIUseSuperPotion
 
-LanceAI: ; 3a687 (e:6687)
+LanceAI:
 	cp $80
 	ret nc
 	ld a,5
@@ -540,23 +540,23 @@
 	ret nc
 	jp AIUseHyperPotion
 
-GenericAI: ; 3a693 (e:6693)
+GenericAI:
 	and a ; clear carry
 	ret
 
 ; end of individual trainer AI routines
 
-DecrementAICount: ; 3a695 (e:6695)
+DecrementAICount:
 	ld hl,wAICount
 	dec [hl]
 	scf
 	ret
 
-AIPlayRestoringSFX: ; 3a69b (e:669b)
+AIPlayRestoringSFX:
 	ld a,SFX_HEAL_AILMENT
 	jp PlaySoundWaitForCurrent
 
-AIUseFullRestore: ; 3a6a0 (e:66a0)
+AIUseFullRestore:
 	call AICureStatus
 	ld a,FULL_RESTORE
 	ld [wAIItem],a
@@ -580,25 +580,25 @@
 	ld [wEnemyMonHP],a
 	jr AIPrintItemUseAndUpdateHPBar
 
-AIUsePotion: ; 3a6ca (e:66ca)
+AIUsePotion:
 ; enemy trainer heals his monster with a potion
 	ld a,POTION
 	ld b,20
 	jr AIRecoverHP
 
-AIUseSuperPotion: ; 3a6d0 (e:66d0)
+AIUseSuperPotion:
 ; enemy trainer heals his monster with a super potion
 	ld a,SUPER_POTION
 	ld b,50
 	jr AIRecoverHP
 
-AIUseHyperPotion: ; 3a6d6 (e:66d6)
+AIUseHyperPotion:
 ; enemy trainer heals his monster with a hyper potion
 	ld a,HYPER_POTION
 	ld b,200
 	; fallthrough
 
-AIRecoverHP: ; 3a6da (e:66da)
+AIRecoverHP:
 ; heal b HP and print "trainer used $(a) on pokemon!"
 	ld [wAIItem],a
 	ld hl,wEnemyMonHP + 1
@@ -639,7 +639,7 @@
 	ld [wHPBarNewHP+1],a
 	; fallthrough
 
-AIPrintItemUseAndUpdateHPBar: ; 3a718 (e:6718)
+AIPrintItemUseAndUpdateHPBar:
 	call AIPrintItemUse_
 	coord hl, 2, 2
 	xor a
@@ -647,7 +647,7 @@
 	predef UpdateHPBar2
 	jp DecrementAICount
 
-AISwitchIfEnoughMons: ; 3a72a (e:672a)
+AISwitchIfEnoughMons:
 ; enemy trainer switches if there are 3 or more unfainted mons in party
 	ld a,[wEnemyPartyCount]
 	ld c,a
@@ -677,7 +677,7 @@
 	and a
 	ret
 
-SwitchEnemyMon: ; 3a74b (e:674b)
+SwitchEnemyMon:
 
 ; prepare to withdraw the active monster: copy hp, number, and status to roster
 
@@ -708,17 +708,17 @@
 	scf
 	ret
 
-AIBattleWithdrawText: ; 3a781 (e:6781)
+AIBattleWithdrawText:
 	TX_FAR _AIBattleWithdrawText
 	db "@"
 
-AIUseFullHeal: ; 3a786 (e:6786)
+AIUseFullHeal:
 	call AIPlayRestoringSFX
 	call AICureStatus
 	ld a,FULL_HEAL
 	jp AIPrintItemUse
 
-AICureStatus: ; 3a791 (e:6791)
+AICureStatus:
 ; cures the status of enemy's active pokemon
 	ld a,[wEnemyMonPartyPos]
 	ld hl,wEnemyMon1Status
@@ -738,7 +738,7 @@
 	ld a,X_ACCURACY
 	jp AIPrintItemUse
 
-AIUseGuardSpec: ; 3a7b5 (e:67b5)
+AIUseGuardSpec:
 	call AIPlayRestoringSFX
 	ld hl,wEnemyBattleStatus2
 	set 1,[hl]
@@ -752,7 +752,7 @@
 	ld a,DIRE_HIT
 	jp AIPrintItemUse
 
-AICheckIfHPBelowFraction: ; 3a7cf (e:67cf)
+AICheckIfHPBelowFraction:
 ; return carry if enemy trainer's current HP is below 1 / a of the maximum
 	ld [H_DIVISOR],a
 	ld hl,wEnemyMonMaxHP
@@ -778,27 +778,27 @@
 	sub c
 	ret
 
-AIUseXAttack: ; 3a7f2 (e:67f2)
+AIUseXAttack:
 	ld b,$A
 	ld a,X_ATTACK
 	jr AIIncreaseStat
 
-AIUseXDefend: ; 3a7f8 (e:67f8)
+AIUseXDefend:
 	ld b,$B
 	ld a,X_DEFEND
 	jr AIIncreaseStat
 
-AIUseXSpeed: ; 3a7fe (e:67fe)
+AIUseXSpeed:
 	ld b,$C
 	ld a,X_SPEED
 	jr AIIncreaseStat
 
-AIUseXSpecial: ; 3a804 (e:6804)
+AIUseXSpecial:
 	ld b,$D
 	ld a,X_SPECIAL
 	; fallthrough
 
-AIIncreaseStat: ; 3a808 (e:6808)
+AIIncreaseStat:
 	ld [wAIItem],a
 	push bc
 	call AIPrintItemUse_
@@ -820,12 +820,12 @@
 	ld [hl],a
 	jp DecrementAICount
 
-AIPrintItemUse: ; 3a82c (e:682c)
+AIPrintItemUse:
 	ld [wAIItem],a
 	call AIPrintItemUse_
 	jp DecrementAICount
 
-AIPrintItemUse_: ; 3a835 (e:6835)
+AIPrintItemUse_:
 ; print "x used [wAIItem] on z!"
 	ld a,[wAIItem]
 	ld [wd11e],a
@@ -833,6 +833,6 @@
 	ld hl, AIBattleUseItemText
 	jp PrintText
 
-AIBattleUseItemText: ; 3a844 (e:6844)
+AIBattleUseItemText:
 	TX_FAR _AIBattleUseItemText
 	db "@"
--- a/engine/battle/trainer_pic_money_pointers.asm
+++ b/engine/battle/trainer_pic_money_pointers.asm
@@ -1,4 +1,4 @@
-TrainerPicAndMoneyPointers: ; 39914 (e:5914)
+TrainerPicAndMoneyPointers:
 ; trainer pic pointers and base money.
 ; money received after battle = base money × level of highest-level enemy mon
 	dw YoungsterPic
--- a/engine/battle/unused_stats_functions.asm
+++ b/engine/battle/unused_stats_functions.asm
@@ -1,5 +1,5 @@
 ; does nothing since no stats are ever selected (barring glitches)
-DoubleSelectedStats: ; 39680 (e:5680)
+DoubleSelectedStats:
 	ld a, [H_WHOSETURN]
 	and a
 	ld a, [wPlayerStatsToDouble]
@@ -29,7 +29,7 @@
 	ret
 
 ; does nothing since no stats are ever selected (barring glitches)
-HalveSelectedStats: ; 396a7 (e:56a7)
+HalveSelectedStats:
 	ld a, [H_WHOSETURN]
 	and a
 	ld a, [wPlayerStatsToHalve]
--- a/engine/battle/wild_encounters.asm
+++ b/engine/battle/wild_encounters.asm
@@ -1,6 +1,6 @@
 ; try to initiate a wild pokemon encounter
 ; returns success in Z
-TryDoWildEncounter: ; 13870 (4:7870)
+TryDoWildEncounter:
 	ld a, [wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
@@ -101,7 +101,7 @@
 	xor a
 	ret
 
-WildMonEncounterSlotChances: ; 13918 (4:7918)
+WildMonEncounterSlotChances:
 ; There are 10 slots for wild pokemon, and this is the table that defines how common each of
 ; those 10 slots is. A random number is generated and then the first byte of each pair in this
 ; table is compared against that random number. If the random number is less than or equal
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -1,7 +1,7 @@
 ; performs the appropriate action when the player uses the gameboy on the table in the Colosseum or Trade Center
 ; In the Colosseum, it starts a battle. In the Trade Center, it displays the trade selection screen.
 ; Before doing either action, it swaps random numbers, trainer names and party data with the other gameboy.
-CableClub_DoBattleOrTrade: ; 5317 (1:5317)
+CableClub_DoBattleOrTrade:
 	ld c, 80
 	call DelayFrames
 	call ClearScreen
@@ -289,7 +289,7 @@
 	call PlayMusic
 	jr CallCurrentTradeCenterFunction
 
-PleaseWaitString: ; 550f (1:550f)
+PleaseWaitString:
 	db "PLEASE WAIT!@"
 
 CallCurrentTradeCenterFunction:
@@ -576,7 +576,7 @@
 	jr nz, .cancelMenuItem_Loop
 	; fall through
 
-ReturnToCableClubRoom: ; 577d (1:577d)
+ReturnToCableClubRoom:
 	call GBPalWhiteOutWithDelay3
 	ld hl, wFontLoaded
 	ld a, [hl]
@@ -871,7 +871,7 @@
 	ld [wTradeCenterPointerTableIndex], a
 	jp CallCurrentTradeCenterFunction
 
-WillBeTradedText: ; 5a24 (1:5a24)
+WillBeTradedText:
 	TX_FAR _WillBeTradedText
 	db "@"
 
@@ -882,11 +882,11 @@
 	db   "Too bad! The trade"
 	next "was canceled!@"
 
-TradeCenterPointerTable: ; 5a5b (1:5a5b)
+TradeCenterPointerTable:
 	dw TradeCenter_SelectMon
 	dw TradeCenter_Trade
 
-CableClub_Run: ; 5a5f (1:5a5f)
+CableClub_Run:
 	ld a, [wLinkState]
 	cp LINK_STATE_START_TRADE
 	jr z, .doBattleOrTrade
@@ -923,15 +923,15 @@
 	ld [wNewSoundID], a
 	jp PlaySound
 
-EmptyFunc3: ; 5aaf (1:5aaf)
+EmptyFunc3:
 	ret
 
-Diploma_TextBoxBorder: ; 5ab0 (1:5ab0)
+Diploma_TextBoxBorder:
 	call GetPredefRegisters
 
 ; b = height
 ; c = width
-CableClub_TextBoxBorder: ; 5ab3 (1:5ab3)
+CableClub_TextBoxBorder:
 	push hl
 	ld a, $78 ; border upper left corner tile
 	ld [hli], a
@@ -962,7 +962,7 @@
 	ret
 
 ; c = width
-CableClub_DrawHorizontalLine: ; 5ae0 (1:5ae0)
+CableClub_DrawHorizontalLine:
 	ld d, c
 .asm_5ae1
 	ld [hli], a
--- a/engine/clear_save.asm
+++ b/engine/clear_save.asm
@@ -1,4 +1,4 @@
-DoClearSaveDialogue: ; 1c98a (7:498a)
+DoClearSaveDialogue:
 	call ClearScreen
 	call RunDefaultPaletteCommand
 	call LoadFontTilePatterns
@@ -18,6 +18,6 @@
 	callba ClearSAV
 	jp Init
 
-ClearSaveDataText: ; 1c9c1 (7:49c1)
+ClearSaveDataText:
 	TX_FAR _ClearSaveDataText
 	db "@"
--- a/engine/evolution.asm
+++ b/engine/evolution.asm
@@ -1,4 +1,4 @@
-EvolveMon: ; 7bde9 (1e:7de9)
+EvolveMon:
 	push hl
 	push de
 	push bc
@@ -93,16 +93,16 @@
 	ld a, [wEvoOldSpecies]
 	jr .done
 
-EvolutionSetWholeScreenPalette: ; 7beb4 (1e:7eb4)
+EvolutionSetWholeScreenPalette:
 	ld b, SET_PAL_POKEMON_WHOLE_SCREEN
 	jp RunPaletteCommand
 
-Evolution_LoadPic: ; 7beb9 (1e:7eb9)
+Evolution_LoadPic:
 	call GetMonHeader
 	coord hl, 7, 2
 	jp LoadFlippedFrontSpriteByMonIndex
 
-Evolution_BackAndForthAnim: ; 7bec2 (1e:7ec2)
+Evolution_BackAndForthAnim:
 ; show the mon change back and forth between the new and old species b times
 	ld a, $31
 	ld [wEvoMonTileOffset], a
@@ -114,7 +114,7 @@
 	jr nz, Evolution_BackAndForthAnim
 	ret
 
-Evolution_ChangeMonPic: ; 7bed6 (1e:7ed6)
+Evolution_ChangeMonPic:
 	push bc
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -139,7 +139,7 @@
 	pop bc
 	ret
 
-Evolution_CheckForCancel: ; 7befa (1e:7efa)
+Evolution_CheckForCancel:
 	call DelayFrame
 	push bc
 	call JoypadLowSensitivity
--- a/engine/evolve_trade.asm
+++ b/engine/evolve_trade.asm
@@ -1,4 +1,4 @@
-EvolveTradeMon: ; 17d7d (5:7d7d)
+EvolveTradeMon:
 ; Verify the TradeMon's species name before
 ; attempting to initiate a trade evolution.
 
--- a/engine/evos_moves.asm
+++ b/engine/evos_moves.asm
@@ -1,5 +1,5 @@
 ; try to evolve the mon in [wWhichPokemon]
-TryEvolvingMon: ; 3ad0e (e:6d0e)
+TryEvolvingMon:
 	ld hl, wCanEvolveFlags
 	xor a
 	ld [hl], a
@@ -10,7 +10,7 @@
 
 ; this is only called after battle
 ; it is supposed to do level up evolutions, though there is a bug that allows item evolutions to occur
-EvolutionAfterBattle: ; 3ad1c (e:6d1c)
+EvolutionAfterBattle:
 	ld a, [hTilesetType]
 	push af
 	xor a
@@ -257,7 +257,7 @@
 	call nz, PlayDefaultMusic
 	ret
 
-RenameEvolvedMon: ; 3aef7 (e:6ef7)
+RenameEvolvedMon:
 ; Renames the mon to its new, evolved form's standard name unless it had a
 ; nickname, in which case the nickname is kept.
 	ld a, [wd0b5]
@@ -287,7 +287,7 @@
 	pop de
 	jp CopyData
 
-CancelledEvolution: ; 3af2e (e:6f2e)
+CancelledEvolution:
 	ld hl, StoppedEvolvingText
 	call PrintText
 	call ClearScreen
@@ -295,29 +295,29 @@
 	call Evolution_ReloadTilesetTilePatterns
 	jp Evolution_PartyMonLoop
 
-EvolvedText: ; 3af3e (e:6f3e)
+EvolvedText:
 	TX_FAR _EvolvedText
 	db "@"
 
-IntoText: ; 3af43 (e:6f43)
+IntoText:
 	TX_FAR _IntoText
 	db "@"
 
-StoppedEvolvingText: ; 3af48 (e:6f48)
+StoppedEvolvingText:
 	TX_FAR _StoppedEvolvingText
 	db "@"
 
-IsEvolvingText: ; 3af4d (e:6f4d)
+IsEvolvingText:
 	TX_FAR _IsEvolvingText
 	db "@"
 
-Evolution_ReloadTilesetTilePatterns: ; 3af52 (e:6f52)
+Evolution_ReloadTilesetTilePatterns:
 	ld a, [wLinkState]
 	cp LINK_STATE_TRADING
 	ret z
 	jp ReloadTilesetTilePatterns
 
-LearnMoveFromLevelUp: ; 3af5b (e:6f5b)
+LearnMoveFromLevelUp:
 	ld hl, EvosMovesPointerTable
 	ld a, [wd11e] ; species
 	ld [wcf91], a
@@ -377,7 +377,7 @@
 
 ; writes the moves a mon has at level [wCurEnemyLVL] to [de]
 ; move slots are being filled up sequentially and shifted if all slots are full
-WriteMonMoves: ; 3afb8 (e:6fb8)
+WriteMonMoves:
 	call GetPredefRegisters
 	push hl
 	push de
@@ -497,7 +497,7 @@
 	ret
 
 ; shifts all move data one up (freeing 4th move slot)
-WriteMonMoves_ShiftMoveData: ; 3b04e (e:704e)
+WriteMonMoves_ShiftMoveData:
 	ld c, NUM_MOVES - 1
 .loop
 	inc de
@@ -507,7 +507,7 @@
 	jr nz, .loop
 	ret
 
-Evolution_FlagAction: ; 3b057 (e:7057)
+Evolution_FlagAction:
 	predef_jump FlagActionPredef
 
 INCLUDE "data/evos_moves.asm"
--- a/engine/experience.asm
+++ b/engine/experience.asm
@@ -1,5 +1,5 @@
 ; calculates the level a mon should be based on its current exp
-CalcLevelFromExperience: ; 58f43 (16:4f43)
+CalcLevelFromExperience:
 	ld a, [wLoadedMonSpecies]
 	ld [wd0b5], a
 	call GetMonHeader
@@ -28,7 +28,7 @@
 	ret
 
 ; calculates the amount of experience needed for level d
-CalcExperience: ; 58f6a (16:4f6a)
+CalcExperience:
 	ld a, [wMonHGrowthRate]
 	add a
 	add a
@@ -137,7 +137,7 @@
 	ret
 
 ; calculates d*d
-CalcDSquared: ; 59010 (16:5010)
+CalcDSquared:
 	xor a
 	ld [H_MULTIPLICAND], a
 	ld [H_MULTIPLICAND + 1], a
@@ -151,7 +151,7 @@
 ; resulting in
 ;  (a*n^3)/b + sign*c*n^2 + d*n - e
 ; where sign = -1 <=> S=1
-GrowthRateTable: ; 5901d (16:501d)
+GrowthRateTable:
 	db $11,$00,$00,$00 ; medium fast      n^3
 	db $34,$0A,$00,$1E ; (unused?)    3/4 n^3 + 10 n^2         - 30
 	db $34,$14,$00,$46 ; (unused?)    3/4 n^3 + 20 n^2         - 70
--- a/engine/game_corner_slots.asm
+++ b/engine/game_corner_slots.asm
@@ -1,4 +1,4 @@
-StartSlotMachine: ; 37e2d (d:7e2d)
+StartSlotMachine:
 	ld a, [wHiddenObjectFunctionArgument]
 	cp $fd
 	jr z, .printOutOfOrder
@@ -41,14 +41,14 @@
 	call PrintPredefTextID
 	ret
 
-GameCornerOutOfOrderText: ; 37e79 (d:7e79)
+GameCornerOutOfOrderText:
 	TX_FAR _GameCornerOutOfOrderText
 	db "@"
 
-GameCornerOutToLunchText: ; 37e7e (d:7e7e)
+GameCornerOutToLunchText:
 	TX_FAR _GameCornerOutToLunchText
 	db "@"
 
-GameCornerSomeonesKeysText: ; 37e83 (d:7e83)
+GameCornerSomeonesKeysText:
 	TX_FAR _GameCornerSomeonesKeysText
 	db "@"
--- a/engine/game_corner_slots2.asm
+++ b/engine/game_corner_slots2.asm
@@ -1,4 +1,4 @@
-AbleToPlaySlotsCheck: ; 2ff09 (b:7f09)
+AbleToPlaySlotsCheck:
 	ld a, [wSpriteStateData1 + 2]
 	and $8
 	jr z, .done ; not able
@@ -22,10 +22,10 @@
 	ld [wCanPlaySlots], a
 	ret
 
-GameCornerCoinCaseText: ; 2ff32 (b:7f32)
+GameCornerCoinCaseText:
 	TX_FAR _GameCornerCoinCaseText
 	db "@"
 
-GameCornerNoCoinsText: ; 2ff37 (b:7f37)
+GameCornerNoCoinsText:
 	TX_FAR _GameCornerNoCoinsText
 	db "@"
--- a/engine/gamefreak.asm
+++ b/engine/gamefreak.asm
@@ -1,4 +1,4 @@
-LoadShootingStarGraphics: ; 70000 (1c:4000)
+LoadShootingStarGraphics:
 	ld a, $f9
 	ld [rOBP0], a
 	ld a, $a4
@@ -24,7 +24,7 @@
 	ld bc, GameFreakShootingStarOAMDataEnd - GameFreakShootingStarOAMData
 	jp CopyData
 
-AnimateShootingStar: ; 70044 (1c:4044)
+AnimateShootingStar:
 	call LoadShootingStarGraphics
 	ld a, SFX_SHOOTING_STAR
 	call PlaySound
@@ -145,11 +145,11 @@
 	and a
 	ret
 
-SmallStarsOAM: ; 700ee (1c:40ee)
+SmallStarsOAM:
 	db $00,$00,$A2,$90
 SmallStarsOAMEnd:
 
-SmallStarsWaveCoordsPointerTable: ; 700f2 (1c:40f2)
+SmallStarsWaveCoordsPointerTable:
 	dw SmallStarsWave1Coords
 	dw SmallStarsWave2Coords
 	dw SmallStarsWave3Coords
@@ -160,34 +160,34 @@
 ; The stars that fall from the Gamefreak logo come in 4 waves of 4 OAM entries.
 ; These arrays contain the Y and X coordinates of each OAM entry.
 
-SmallStarsWave1Coords: ; 700fe (1c:40fe)
+SmallStarsWave1Coords:
 	db $68,$30
 	db $68,$40
 	db $68,$58
 	db $68,$78
 
-SmallStarsWave2Coords: ; 70106 (1c:4106)
+SmallStarsWave2Coords:
 	db $68,$38
 	db $68,$48
 	db $68,$60
 	db $68,$70
 
-SmallStarsWave3Coords: ; 7010e (1c:410e)
+SmallStarsWave3Coords:
 	db $68,$34
 	db $68,$4C
 	db $68,$54
 	db $68,$64
 
-SmallStarsWave4Coords: ; 70116 (1c:4116)
+SmallStarsWave4Coords:
 	db $68,$3C
 	db $68,$5C
 	db $68,$6C
 	db $68,$74
 
-SmallStarsEmptyWave: ; 7011e (1c:411e)
+SmallStarsEmptyWave:
 	db $FF
 
-MoveDownSmallStars: ; 7011f (1c:411f)
+MoveDownSmallStars:
 	ld b, 8
 .loop
 	ld hl, wOAMBuffer + $5c
@@ -213,7 +213,7 @@
 	jr nz, .loop
 	ret
 
-GameFreakLogoOAMData: ; 70140 (1c:4140)
+GameFreakLogoOAMData:
 	db $48,$50,$8D,$00
 	db $48,$58,$8E,$00
 	db $50,$50,$8F,$00
@@ -232,7 +232,7 @@
 	db $60,$78,$86,$00
 GameFreakLogoOAMDataEnd:
 
-GameFreakShootingStarOAMData: ; 70180 (1c:4180)
+GameFreakShootingStarOAMData:
 	db $00,$A0,$A0,$10
 	db $00,$A8,$A0,$30
 	db $08,$A0,$A1,$10
@@ -239,6 +239,6 @@
 	db $08,$A8,$A1,$30
 GameFreakShootingStarOAMDataEnd:
 
-FallingStar: ; 70190 (1c:4190)
+FallingStar:
 	INCBIN "gfx/falling_star.2bpp"
 FallingStarEnd:
--- a/engine/give_pokemon.asm
+++ b/engine/give_pokemon.asm
@@ -1,4 +1,4 @@
-_GivePokemon: ; 4fda5 (13:7da5)
+_GivePokemon:
 ; returns success in carry
 ; and whether the mon was added to the party in [wAddedToParty]
 	call EnableAutoTextBoxDrawing
@@ -51,7 +51,7 @@
 	scf
 	ret
 
-SetPokedexOwnedFlag: ; 4fe11 (13:7e11)
+SetPokedexOwnedFlag:
 	ld a, [wcf91]
 	push af
 	ld [wd11e], a
@@ -68,15 +68,15 @@
 	ld hl, GotMonText
 	jp PrintText
 
-GotMonText: ; 4fe39 (13:7e39)
+GotMonText:
 	TX_FAR _GotMonText
 	db $0b
 	db "@"
 
-SetToBoxText: ; 4fe3f (13:7e3f)
+SetToBoxText:
 	TX_FAR _SetToBoxText
 	db "@"
 
-BoxIsFullText: ; 4fe44 (13:7e44)
+BoxIsFullText:
 	TX_FAR _BoxIsFullText
 	db "@"
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -1,4 +1,4 @@
-AnimateHallOfFame: ; 701a0 (1c:41a0)
+AnimateHallOfFame:
 	call HoFFadeOutScreenAndMusic
 	call ClearScreen
 	ld c, 100
@@ -91,10 +91,10 @@
 	res 3, [hl]
 	ret
 
-HallOfFameText: ; 7026b (1c:426b)
+HallOfFameText:
 	db "HALL OF FAME@"
 
-HoFShowMonOrPlayer: ; 70278 (1c:4278)
+HoFShowMonOrPlayer:
 	call ClearScreen
 	ld a, $d0
 	ld [hSCY], a
@@ -149,7 +149,7 @@
 	jr nz, .ScrollPic
 	ret
 
-HoFDisplayAndRecordMonInfo: ; 702e1 (1c:42e1)
+HoFDisplayAndRecordMonInfo:
 	ld a, [wHoFPartyMonIndex]
 	ld hl, wPartyMonNicks
 	call GetPartyMonName
@@ -156,7 +156,7 @@
 	call HoFDisplayMonInfo
 	jp HoFRecordMonInfo
 
-HoFDisplayMonInfo: ; 702f0 (1c:42f0)
+HoFDisplayMonInfo:
 	coord hl, 0, 2
 	ld b, 9
 	ld c, 10
@@ -177,12 +177,12 @@
 	ld a, [wHoFMonSpecies]
 	jp PlayCry
 
-HoFMonInfoText: ; 70329 (1c:4329)
+HoFMonInfoText:
 	db   "LEVEL/"
 	next "TYPE1/"
 	next "TYPE2/@"
 
-HoFLoadPlayerPics: ; 7033e (1c:433e)
+HoFLoadPlayerPics:
 	ld de, RedPicFront
 	ld a, BANK(RedPicFront)
 	call UncompressSpriteFromDE
@@ -200,13 +200,13 @@
 	call InterlaceMergeSpriteBuffers
 	ld c, $1
 
-HoFLoadMonPlayerPicTileIDs: ; 7036d (1c:436d)
+HoFLoadMonPlayerPicTileIDs:
 ; c = base tile ID
 	ld b, 0
 	coord hl, 12, 5
 	predef_jump CopyTileIDsFromList
 
-HoFDisplayPlayerStats: ; 70377 (1c:4377)
+HoFDisplayPlayerStats:
 	SetEvent EVENT_HALL_OF_FAME_DEX_RATING
 	predef DisplayDexRating
 	coord hl, 0, 4
@@ -245,26 +245,26 @@
 	call HoFPrintTextAndDelay
 	ld hl, wDexRatingText
 
-HoFPrintTextAndDelay: ; 703e2 (1c:43e2)
+HoFPrintTextAndDelay:
 	call PrintText
 	ld c, 120
 	jp DelayFrames
 
-HoFPlayTimeText: ; 703ea (1c:43ea)
+HoFPlayTimeText:
 	db "PLAY TIME@"
 
-HoFMoneyText: ; 703f4 (1c:43f4)
+HoFMoneyText:
 	db "MONEY@"
 
-DexSeenOwnedText: ; 703fa (1c:43fa)
+DexSeenOwnedText:
 	TX_FAR _DexSeenOwnedText
 	db "@"
 
-DexRatingText: ; 703ff (1c:43ff)
+DexRatingText:
 	TX_FAR _DexRatingText
 	db "@"
 
-HoFRecordMonInfo: ; 70404 (1c:4404)
+HoFRecordMonInfo:
 	ld hl, wHallOfFame
 	ld bc, HOF_MON
 	ld a, [wHoFPartyMonIndex]
@@ -279,7 +279,7 @@
 	ld bc, NAME_LENGTH
 	jp CopyData
 
-HoFFadeOutScreenAndMusic: ; 70423 (1c:4423)
+HoFFadeOutScreenAndMusic:
 	ld a, 10
 	ld [wAudioFadeOutCounterReloadValue], a
 	ld [wAudioFadeOutCounter], a
--- a/engine/hidden_object_functions14.asm
+++ b/engine/hidden_object_functions14.asm
@@ -1,4 +1,4 @@
-PrintNotebookText: ; 52996 (14:6996)
+PrintNotebookText:
 	call EnableAutoTextBoxDrawing
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -5,12 +5,12 @@
 	ld a, [wHiddenObjectFunctionArgument]
 	jp PrintPredefTextID
 
-TMNotebook: ; 529a4 (14:69a4)
+TMNotebook:
 	TX_FAR TMNotebookText
 	db $0d
 	db "@"
 
-ViridianSchoolNotebook: ; 529aa (14:69aa)
+ViridianSchoolNotebook:
 	TX_ASM
 	ld hl, ViridianSchoolNotebookText1
 	call PrintText
@@ -31,7 +31,7 @@
 .doneReading
 	jp TextScriptEnd
 
-TurnPageSchoolNotebook: ; 529db (14:69db)
+TurnPageSchoolNotebook:
 	ld hl, TurnPageText
 	call PrintText
 	call YesNoChoice
@@ -39,56 +39,56 @@
 	and a
 	ret
 
-TurnPageText: ; 529e9 (14:69e9)
+TurnPageText:
 	TX_FAR _TurnPageText
 	db "@"
 
-ViridianSchoolNotebookText5: ; 529ee (14:69ee)
+ViridianSchoolNotebookText5:
 	TX_FAR _ViridianSchoolNotebookText5
 	db $0d
 	db "@"
 
-ViridianSchoolNotebookText1: ; 529f4 (14:69f4)
+ViridianSchoolNotebookText1:
 	TX_FAR _ViridianSchoolNotebookText1
 	db "@"
 
-ViridianSchoolNotebookText2: ; 529f9 (14:69f9)
+ViridianSchoolNotebookText2:
 	TX_FAR _ViridianSchoolNotebookText2
 	db "@"
 
-ViridianSchoolNotebookText3: ; 529fe (14:69fe)
+ViridianSchoolNotebookText3:
 	TX_FAR _ViridianSchoolNotebookText3
 	db "@"
 
-ViridianSchoolNotebookText4: ; 52a03 (14:6a03)
+ViridianSchoolNotebookText4:
 	TX_FAR _ViridianSchoolNotebookText4
 	db "@"
 
-PrintFightingDojoText2: ; 52a08 (14:6a08)
+PrintFightingDojoText2:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump FightingDojoText_52a10
 
-FightingDojoText_52a10: ; 52a10 (14:6a10)
+FightingDojoText_52a10:
 	TX_FAR _FightingDojoText_52a10
 	db "@"
 
-PrintFightingDojoText3: ; 52a15 (14:6a15)
+PrintFightingDojoText3:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump FightingDojoText_52a1d
 
-FightingDojoText_52a1d: ; 52a1d (14:6a1d)
+FightingDojoText_52a1d:
 	TX_FAR _FightingDojoText_52a1d
 	db "@"
 
-PrintFightingDojoText: ; 52a22 (14:6a22)
+PrintFightingDojoText:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump FightingDojoText
 
-FightingDojoText: ; 52a2a (14:6a2a)
+FightingDojoText:
 	TX_FAR _FightingDojoText
 	db "@"
 
-PrintIndigoPlateauHQText: ; 52a2f (14:6a2f)
+PrintIndigoPlateauHQText:
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
@@ -95,6 +95,6 @@
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump IndigoPlateauHQText
 
-IndigoPlateauHQText: ; 52a3d (14:6a3d)
+IndigoPlateauHQText:
 	TX_FAR _IndigoPlateauHQText
 	db "@"
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -1,19 +1,19 @@
-PrintRedSNESText: ; 5db79 (17:5b79)
+PrintRedSNESText:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump RedBedroomSNESText
 
-RedBedroomSNESText: ; 5db81 (17:5b81)
+RedBedroomSNESText:
 	TX_FAR _RedBedroomSNESText
 	db "@"
 
-OpenRedsPC: ; 5db86 (17:5b86)
+OpenRedsPC:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump RedBedroomPCText
 
-RedBedroomPCText: ; 5db8e (17:5b8e)
+RedBedroomPCText:
 	TX_PLAYERS_PC
 
-Route15GateLeftBinoculars: ; 5db8f (17:5b8f)
+Route15GateLeftBinoculars:
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
@@ -24,11 +24,11 @@
 	call PlayCry
 	jp DisplayMonFrontSpriteInBox
 
-Route15UpstairsBinocularsText: ; 5dba8 (17:5ba8)
+Route15UpstairsBinocularsText:
 	TX_FAR _Route15UpstairsBinocularsText
 	db "@"
 
-AerodactylFossil: ; 5dbad (17:5bad)
+AerodactylFossil:
 	ld a, FOSSIL_AERODACTYL
 	ld [wcf91], a
 	call DisplayMonFrontSpriteInBox
@@ -36,11 +36,11 @@
 	tx_pre AerodactylFossilText
 	ret
 
-AerodactylFossilText: ; 5dbbe (17:5bbe)
+AerodactylFossilText:
 	TX_FAR _AerodactylFossilText
 	db "@"
 
-KabutopsFossil: ; 5bdc3 (17:5bc3)
+KabutopsFossil:
 	ld a, FOSSIL_KABUTOPS
 	ld [wcf91], a
 	call DisplayMonFrontSpriteInBox
@@ -48,11 +48,11 @@
 	tx_pre KabutopsFossilText
 	ret
 
-KabutopsFossilText: ; 5dbd4 (17:5bd4)
+KabutopsFossilText:
 	TX_FAR _KabutopsFossilText
 	db "@"
 
-DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9)
+DisplayMonFrontSpriteInBox:
 ; Displays a pokemon's front sprite in a pop-up window.
 ; [wcf91] = pokemon interal id number
 	ld a, 1
@@ -81,7 +81,7 @@
 	ld [hWY], a
 	ret
 
-PrintBlackboardLinkCableText: ; 5dc1a (17:5c1a)
+PrintBlackboardLinkCableText:
 	call EnableAutoTextBoxDrawing
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -89,7 +89,7 @@
 	call PrintPredefTextID
 	ret
 
-LinkCableHelp: ; 5dc29 (17:5c29)
+LinkCableHelp:
 	TX_ASM
 	call SaveScreenTilesToBuffer1
 	ld hl, LinkCableHelpText1
@@ -142,38 +142,38 @@
 	call LoadScreenTilesFromBuffer1
 	jp TextScriptEnd
 
-LinkCableHelpText1: ; 5dc9e (17:5c9e)
+LinkCableHelpText1:
 	TX_FAR _LinkCableHelpText1
 	db "@"
 
-LinkCableHelpText2: ; 5dca3 (17:5ca3)
+LinkCableHelpText2:
 	TX_FAR _LinkCableHelpText2
 	db "@"
 
-HowToLinkText: ; 5dca8 (17:5ca8)
+HowToLinkText:
 	db   "HOW TO LINK"
 	next "COLOSSEUM"
 	next "TRADE CENTER"
 	next "STOP READING@"
 
-LinkCableInfoTexts: ; 5dcd8 (17:5cd8)
+LinkCableInfoTexts:
 	dw LinkCableInfoText1
 	dw LinkCableInfoText2
 	dw LinkCableInfoText3
 
-LinkCableInfoText1: ; 5dcde (17:5cde)
+LinkCableInfoText1:
 	TX_FAR _LinkCableInfoText1
 	db "@"
 
-LinkCableInfoText2: ; 5dce3 (17:5ce3)
+LinkCableInfoText2:
 	TX_FAR _LinkCableInfoText2
 	db "@"
 
-LinkCableInfoText3: ; 5dce8 (17:5ce8)
+LinkCableInfoText3:
 	TX_FAR _LinkCableInfoText3
 	db "@"
 
-ViridianSchoolBlackboard: ; 5dced (17:5ced)
+ViridianSchoolBlackboard:
 	TX_ASM
 	call SaveScreenTilesToBuffer1
 	ld hl, ViridianSchoolBlackboardText1
@@ -259,25 +259,25 @@
 	call LoadScreenTilesFromBuffer1
 	jp TextScriptEnd
 
-ViridianSchoolBlackboardText1: ; 5dda2 (17:5da2)
+ViridianSchoolBlackboardText1:
 	TX_FAR _ViridianSchoolBlackboardText1
 	db "@"
 
-ViridianSchoolBlackboardText2: ; 5dda7 (17:5da7)
+ViridianSchoolBlackboardText2:
 	TX_FAR _ViridianSchoolBlackboardText2
 	db "@"
 
-StatusAilmentText1: ; 5ddac (17:5dac)
+StatusAilmentText1:
 	db   " SLP"
 	next " PSN"
 	next " PAR@"
 
-StatusAilmentText2: ; 5ddbb (17:5dbb)
+StatusAilmentText2:
 	db   " BRN"
 	next " FRZ"
 	next " QUIT@@"
 
-ViridianBlackboardStatusPointers: ; 5ddcc (17:5ddc)
+ViridianBlackboardStatusPointers:
 	dw ViridianBlackboardSleepText
 	dw ViridianBlackboardPoisonText
 	dw ViridianBlackboardPrlzText
@@ -284,35 +284,35 @@
 	dw ViridianBlackboardBurnText
 	dw ViridianBlackboardFrozenText
 
-ViridianBlackboardSleepText: ; 5ddd6 (17:5dd6)
+ViridianBlackboardSleepText:
 	TX_FAR _ViridianBlackboardSleepText
 	db "@"
 
-ViridianBlackboardPoisonText: ; 5dddb (17:5ddb)
+ViridianBlackboardPoisonText:
 	TX_FAR _ViridianBlackboardPoisonText
 	db "@"
 
-ViridianBlackboardPrlzText: ; 5dde0 (17:5de0)
+ViridianBlackboardPrlzText:
 	TX_FAR _ViridianBlackboardPrlzText
 	db "@"
 
-ViridianBlackboardBurnText: ; 5dde5 (17:5de5)
+ViridianBlackboardBurnText:
 	TX_FAR _ViridianBlackboardBurnText
 	db "@"
 
-ViridianBlackboardFrozenText: ; 5ddea (17:5dea)
+ViridianBlackboardFrozenText:
 	TX_FAR _ViridianBlackboardFrozenText
 	db "@"
 
-PrintTrashText: ; 5ddef (17:5def)
+PrintTrashText:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump VermilionGymTrashText
 
-VermilionGymTrashText: ; 5ddf7 (17:5df7)
+VermilionGymTrashText:
 	TX_FAR _VermilionGymTrashText
 	db "@"
 
-GymTrashScript: ; 5ddfc (17:5dfc)
+GymTrashScript:
 	call EnableAutoTextBoxDrawing
 	ld a, [wHiddenObjectFunctionArgument]
 	ld [wGymTrashCanIndex], a
@@ -410,7 +410,7 @@
 .done
 	jp PrintPredefTextID
 
-GymTrashCans: ; 5de7d (17:5e7d)
+GymTrashCans:
 ; byte 0: mask for random number
 ; bytes 1-4: indices of the trash cans that can have the second lock
 ;            (but see the comment above explaining a bug regarding this)
@@ -434,7 +434,7 @@
 	db 2, 11, 13,  0,  0 ; 14
 ; 5dec8
 
-VermilionGymTrashSuccessText1: ; 5dec8 (17:5ec8)
+VermilionGymTrashSuccessText1:
 	TX_FAR _VermilionGymTrashSuccessText1
 	TX_ASM
 	call WaitForSoundToFinish
@@ -444,12 +444,12 @@
 	jp TextScriptEnd
 
 ; unused
-VermilionGymTrashSuccessText2: ; 5dedb (17:5edb)
+VermilionGymTrashSuccessText2:
 	TX_FAR _VermilionGymTrashSuccessText2
 	db "@"
 
 ; unused
-VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0)
+VermilionGymTrashSuccesPlaySfx:
 	TX_ASM
 	call WaitForSoundToFinish
 	ld a, SFX_SWITCH
@@ -457,7 +457,7 @@
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
-VermilionGymTrashSuccessText3: ; 5deef (17:5eef)
+VermilionGymTrashSuccessText3:
 	TX_FAR _VermilionGymTrashSuccessText3
 	TX_ASM
 	call WaitForSoundToFinish
@@ -466,7 +466,7 @@
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
-VermilionGymTrashFailText: ; 5df02 (17:5f02)
+VermilionGymTrashFailText:
 	TX_FAR _VermilionGymTrashFailText
 	TX_ASM
 	call WaitForSoundToFinish
--- a/engine/hidden_object_functions18.asm
+++ b/engine/hidden_object_functions18.asm
@@ -1,4 +1,4 @@
-GymStatues: ; 62419 (18:6419)
+GymStatues:
 ; if in a gym and have the corresponding badge, a = GymStatueText2_id and jp PrintPredefTextID
 ; if in a gym and don’t have the corresponding badge, a = GymStatueText1_id and jp PrintPredefTextID
 ; else ret
@@ -28,7 +28,7 @@
 .haveBadge
 	jp PrintPredefTextID
 
-.BadgeFlags: ; 62442 (18:6442)
+.BadgeFlags:
 	db PEWTER_GYM,   %00000001
 	db CERULEAN_GYM, %00000010
 	db VERMILION_GYM,%00000100
@@ -39,15 +39,15 @@
 	db VIRIDIAN_GYM, %10000000
 	db $ff
 
-GymStatueText1: ; 62453 (18:6453)
+GymStatueText1:
 	TX_FAR _GymStatueText1
 	db "@"
 
-GymStatueText2: ; 62458 (18:6458)
+GymStatueText2:
 	TX_FAR _GymStatueText2
 	db "@"
 
-PrintBenchGuyText: ; 6245d (18:645d)
+PrintBenchGuyText:
 	call EnableAutoTextBoxDrawing
 	ld hl, BenchGuyTextPointers
 	ld a, [wCurMap]
@@ -71,7 +71,7 @@
 	jp PrintPredefTextID
 
 ; format: db map id, player sprite facing direction, text id of PredefTextIDPointerTable
-BenchGuyTextPointers: ; 6247e (18:647e)
+BenchGuyTextPointers:
 	db VIRIDIAN_POKECENTER,   SPRITE_FACING_LEFT
 	db (ViridianCityPokecenterBenchGuyText_id   - TextPredefs) / 2 + 1
 	db PEWTER_POKECENTER,     SPRITE_FACING_LEFT
@@ -98,59 +98,59 @@
 	db (RockTunnelPokecenterBenchGuyText_id     - TextPredefs) / 2 + 1
 	db $FF
 
-ViridianCityPokecenterBenchGuyText: ; 624a3 (18:64a3)
+ViridianCityPokecenterBenchGuyText:
 	TX_FAR _ViridianCityPokecenterGuyText
 	db "@"
 
-PewterCityPokecenterBenchGuyText: ; 624a8 (18:64a8)
+PewterCityPokecenterBenchGuyText:
 	TX_FAR _PewterCityPokecenterGuyText
 	db "@"
 
-CeruleanCityPokecenterBenchGuyText: ; 624ad (18:64ad)
+CeruleanCityPokecenterBenchGuyText:
 	TX_FAR _CeruleanPokecenterGuyText
 	db "@"
 
-LavenderCityPokecenterBenchGuyText: ; 624b2 (18:64b2)
+LavenderCityPokecenterBenchGuyText:
 	TX_FAR _LavenderPokecenterGuyText
 	db "@"
 
-MtMoonPokecenterBenchGuyText: ; 624b7 (18:64b7)
+MtMoonPokecenterBenchGuyText:
 	TX_FAR _MtMoonPokecenterBenchGuyText
 	db "@"
 
-RockTunnelPokecenterBenchGuyText: ; 624bc (18:64bc)
+RockTunnelPokecenterBenchGuyText:
 	TX_FAR _RockTunnelPokecenterGuyText
 	db "@"
 
-UnusedBenchGuyText1: ; 624c1 (18:64c1)
+UnusedBenchGuyText1:
 	TX_FAR _UnusedBenchGuyText1
 	db "@"
 
-UnusedBenchGuyText2: ; 624c6 (18:64c6)
+UnusedBenchGuyText2:
 	TX_FAR _UnusedBenchGuyText2
 	db "@"
 
-UnusedBenchGuyText3: ; 624cb (18:64cb)
+UnusedBenchGuyText3:
 	TX_FAR _UnusedBenchGuyText3
 	db "@"
 
-VermilionCityPokecenterBenchGuyText: ; 624d0 (18:64d0)
+VermilionCityPokecenterBenchGuyText:
 	TX_FAR _VermilionPokecenterGuyText
 	db "@"
 
-CeladonCityPokecenterBenchGuyText: ; 624d5 (18:64d5)
+CeladonCityPokecenterBenchGuyText:
 	TX_FAR _CeladonCityPokecenterGuyText
 	db "@"
 
-FuchsiaCityPokecenterBenchGuyText: ; 624da (18:64da)
+FuchsiaCityPokecenterBenchGuyText:
 	TX_FAR _FuchsiaCityPokecenterGuyText
 	db "@"
 
-CinnabarIslandPokecenterBenchGuyText: ; 624df (18:64df)
+CinnabarIslandPokecenterBenchGuyText:
 	TX_FAR _CinnabarPokecenterGuyText
 	db "@"
 
-SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4)
+SaffronCityPokecenterBenchGuyText:
 	TX_ASM
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ld hl, SaffronCityPokecenterBenchGuyText2
@@ -160,32 +160,32 @@
 	call PrintText
 	jp TextScriptEnd
 
-SaffronCityPokecenterBenchGuyText1: ; 624f8 (18:64f8)
+SaffronCityPokecenterBenchGuyText1:
 	TX_FAR _SaffronCityPokecenterGuyText1
 	db "@"
 
-SaffronCityPokecenterBenchGuyText2: ; 624fd (18:64fd)
+SaffronCityPokecenterBenchGuyText2:
 	TX_FAR _SaffronCityPokecenterGuyText2
 	db "@"
 
-CeladonCityHotelText: ; 62502 (18:6502)
+CeladonCityHotelText:
 	TX_FAR _CeladonCityHotelText
 	db "@"
 
 	ret
 
-UnusedPredefText: ; 62508 (18:6508)
+UnusedPredefText:
 	db "@"
 
-PrintBookcaseText: ; 6509 (18:6509)
+PrintBookcaseText:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump BookcaseText
 
-BookcaseText: ; 62511 (18:6511)
+BookcaseText:
 	TX_FAR _BookcaseText
 	db "@"
 
-OpenPokemonCenterPC: ; 62516 (18:6516)
+OpenPokemonCenterPC:
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP ; check to see if player is facing up
 	ret nz
@@ -194,5 +194,5 @@
 	ld [wAutoTextBoxDrawingControl], a
 	tx_pre_jump PokemonCenterPCText
 
-PokemonCenterPCText: ; 62529 (18:6529)
+PokemonCenterPCText:
 	TX_POKECENTER_PC
--- a/engine/hidden_object_functions3.asm
+++ b/engine/hidden_object_functions3.asm
@@ -1,5 +1,5 @@
 ; prints text for bookshelves in buildings without sign events
-PrintBookshelfText: ; fb50 (3:7b50)
+PrintBookshelfText:
 	ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction
 	cp SPRITE_FACING_UP
 	jr nz, .noMatch
@@ -37,7 +37,7 @@
 	jpba PrintCardKeyText
 
 ; format: db tileset id, bookshelf tile id, text id
-BookshelfTileIDs: ; fb8b (3:7b8b)
+BookshelfTileIDs:
 	db PLATEAU,      $30
 	db (IndigoPlateauStatues_id   - TextPredefs) / 2 + 1
 	db HOUSE,        $3D
@@ -74,7 +74,7 @@
 	db (BookOrSculptureText_id   - TextPredefs) / 2 + 1
 	db $FF
 
-IndigoPlateauStatues: ; fbbf (3:7bbf)
+IndigoPlateauStatues:
 	TX_ASM
 	ld hl, IndigoPlateauStatuesText1
 	call PrintText
@@ -87,19 +87,19 @@
 	call PrintText
 	jp TextScriptEnd
 
-IndigoPlateauStatuesText1: ; fbd9 (3:7bd9)
+IndigoPlateauStatuesText1:
 	TX_FAR _IndigoPlateauStatuesText1
 	db "@"
 
-IndigoPlateauStatuesText2: ; fbde (3:7bde)
+IndigoPlateauStatuesText2:
 	TX_FAR _IndigoPlateauStatuesText2
 	db "@"
 
-IndigoPlateauStatuesText3: ; fbe3 (3:7be3)
+IndigoPlateauStatuesText3:
 	TX_FAR _IndigoPlateauStatuesText3
 	db "@"
 
-BookOrSculptureText: ; fbe8 (3:7be8)
+BookOrSculptureText:
 	TX_ASM
 	ld hl, PokemonBooksText
 	ld a, [wCurMapTileset]
@@ -113,19 +113,19 @@
 	call PrintText
 	jp TextScriptEnd
 
-PokemonBooksText: ; fc03 (3:7c03)
+PokemonBooksText:
 	TX_FAR _PokemonBooksText
 	db "@"
 
-DiglettSculptureText: ; fc08 (3:7c08)
+DiglettSculptureText:
 	TX_FAR _DiglettSculptureText
 	db "@"
 
-ElevatorText: ; fc0d (3:7c0d)
+ElevatorText:
 	TX_FAR _ElevatorText
 	db "@"
 
-TownMapText: ; fc12 (3:7c12)
+TownMapText:
 	TX_FAR _TownMapText
 	db $06
 	TX_ASM
@@ -148,6 +148,6 @@
 	push af
 	jp CloseTextDisplay
 
-PokemonStuffText: ; fc45 (3:7c45)
+PokemonStuffText:
 	TX_FAR _PokemonStuffText
 	db "@"
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -1,20 +1,20 @@
-PrintNewBikeText: ; 1e94b (7:694b)
+PrintNewBikeText:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump NewBicycleText
 
-NewBicycleText: ; 1e953 (7:6953)
+NewBicycleText:
 	TX_FAR _NewBicycleText
 	db "@"
 
-DisplayOakLabLeftPoster: ; 1e958 (7:6958)
+DisplayOakLabLeftPoster:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump PushStartText
 
-PushStartText: ; 1e960 (7:6960)
+PushStartText:
 	TX_FAR _PushStartText
 	db "@"
 
-DisplayOakLabRightPoster: ; 1e965 (7:6965)
+DisplayOakLabRightPoster:
 	call EnableAutoTextBoxDrawing
 	ld hl, wPokedexOwned
 	ld b, wPokedexOwnedEnd - wPokedexOwned
@@ -28,15 +28,15 @@
 .ownLessThanTwo
 	jp PrintPredefTextID
 
-SaveOptionText: ; 1e97e (7:697e)
+SaveOptionText:
 	TX_FAR _SaveOptionText
 	db "@"
 
-StrengthsAndWeaknessesText: ; 1e983 (7:6983)
+StrengthsAndWeaknessesText:
 	TX_FAR _StrengthsAndWeaknessesText
 	db "@"
 
-SafariZoneCheck: ; 1e988 (7:6988)
+SafariZoneCheck:
 	CheckEventHL EVENT_IN_SAFARI_ZONE ; if we are not in the Safari Zone,
 	jr z, SafariZoneGameStillGoing ; don't bother printing game over text
 	ld a, [wNumSafariBalls]
@@ -44,7 +44,7 @@
 	jr z, SafariZoneGameOver
 	jr SafariZoneGameStillGoing
 
-SafariZoneCheckSteps: ; 1e997 (7:6997)
+SafariZoneCheckSteps:
 	ld a, [wSafariSteps]
 	ld b, a
 	ld a, [wSafariSteps + 1]
@@ -56,12 +56,12 @@
 	ld [wSafariSteps], a
 	ld a, c
 	ld [wSafariSteps + 1], a
-SafariZoneGameStillGoing: ; 1e9ab (7:69ab)
+SafariZoneGameStillGoing:
 	xor a
 	ld [wSafariZoneGameOver], a
 	ret
 
-SafariZoneGameOver: ; 1e9b0 (7:69b0)
+SafariZoneGameOver:
 	call EnableAutoTextBoxDrawing
 	xor a
 	ld [wAudioFadeOutControl], a
@@ -90,13 +90,13 @@
 	ld [wSafariZoneGameOver], a
 	ret
 
-PrintSafariGameOverText: ; 1e9ed (7:69ed)
+PrintSafariGameOverText:
 	xor a
 	ld [wJoyIgnore], a
 	ld hl, SafariGameOverText
 	jp PrintText
 
-SafariGameOverText: ; 1e9f7 (7:69f7)
+SafariGameOverText:
 	TX_ASM
 	ld a, [wNumSafariBalls]
 	and a
@@ -108,15 +108,15 @@
 	call PrintText
 	jp TextScriptEnd
 
-TimesUpText: ; 1ea0d (7:6a0d)
+TimesUpText:
 	TX_FAR _TimesUpText
 	db "@"
 
-GameOverText: ; 1ea12 (7:6a12)
+GameOverText:
 	TX_FAR _GameOverText
 	db "@"
 
-PrintCinnabarQuiz: ; 1ea17 (7:6a17)
+PrintCinnabarQuiz:
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
@@ -123,7 +123,7 @@
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump CinnabarGymQuiz
 
-CinnabarGymQuiz: ; 1ea25 (7:6a25)
+CinnabarGymQuiz:
 	TX_ASM
 	xor a
 	ld [wOpponentAfterWrongAnswer], a
@@ -153,11 +153,11 @@
 	call CinnabarGymQuiz_1ea92
 	jp TextScriptEnd
 
-CinnabarGymQuizIntroText: ; 1ea5b (7:6a5b)
+CinnabarGymQuizIntroText:
 	TX_FAR _CinnabarGymQuizIntroText
 	db "@"
 
-CinnabarQuizQuestions: ; 1ea60 (7:6a60)
+CinnabarQuizQuestions:
 	dw CinnabarQuizQuestionsText1
 	dw CinnabarQuizQuestionsText2
 	dw CinnabarQuizQuestionsText3
@@ -165,35 +165,35 @@
 	dw CinnabarQuizQuestionsText5
 	dw CinnabarQuizQuestionsText6
 
-CinnabarQuizQuestionsText1: ; 1ea6c (7:6a6c)
+CinnabarQuizQuestionsText1:
 	TX_FAR _CinnabarQuizQuestionsText1
 	db "@"
 
-CinnabarQuizQuestionsText2: ; 1ea71 (7:6a71)
+CinnabarQuizQuestionsText2:
 	TX_FAR _CinnabarQuizQuestionsText2
 	db "@"
 
-CinnabarQuizQuestionsText3: ; 1ea76 (7:6a76)
+CinnabarQuizQuestionsText3:
 	TX_FAR _CinnabarQuizQuestionsText3
 	db "@"
 
-CinnabarQuizQuestionsText4: ; 1ea7b (7:6a7b)
+CinnabarQuizQuestionsText4:
 	TX_FAR _CinnabarQuizQuestionsText4
 	db "@"
 
-CinnabarQuizQuestionsText5: ; 1ea80 (7:6a80)
+CinnabarQuizQuestionsText5:
 	TX_FAR _CinnabarQuizQuestionsText5
 	db "@"
 
-CinnabarQuizQuestionsText6: ; 1ea85 (7:6a85)
+CinnabarQuizQuestionsText6:
 	TX_FAR _CinnabarQuizQuestionsText6
 	db "@"
 
-CinnabarGymGateFlagAction: ; 1ea8a (7:6a8a)
+CinnabarGymGateFlagAction:
 	EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
 	predef_jump FlagActionPredef
 
-CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92)
+CinnabarGymQuiz_1ea92:
 	call YesNoChoice
 	ld a, [$ffdc]
 	ld c, a
@@ -234,7 +234,7 @@
 	ld [wOpponentAfterWrongAnswer], a
 	ret
 
-CinnabarGymQuizCorrectText: ; 1eae3 (7:6ae3)
+CinnabarGymQuizCorrectText:
 	db $0b
 	TX_FAR _CinnabarGymQuizCorrectText
 	db $06
@@ -254,11 +254,11 @@
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
-CinnabarGymQuizIncorrectText: ; 1eb05 (7:6b05)
+CinnabarGymQuizIncorrectText:
 	TX_FAR _CinnabarGymQuizIncorrectText
 	db "@"
 
-UpdateCinnabarGymGateTileBlocks_: ; 1eb0a (7:6b0a)
+UpdateCinnabarGymGateTileBlocks_:
 ; Update the overworld map with open floor blocks or locked gate blocks
 ; depending on event flags.
 	ld a, 6
@@ -301,7 +301,7 @@
 	jr nz, .loop
 	ret
 
-CinnabarGymGateCoords: ; 1eb48 (7:6b48)
+CinnabarGymGateCoords:
 	; format: x-coord, y-coord, direction, padding
 	; direction: $54 = horizontal gate, $5f = vertical gate
 	db $09,$03,$54,$00
@@ -311,16 +311,16 @@
 	db $02,$06,$54,$00
 	db $02,$03,$54,$00
 
-PrintMagazinesText: ; 1eb60 (7:6b60)
+PrintMagazinesText:
 	call EnableAutoTextBoxDrawing
 	tx_pre MagazinesText
 	ret
 
-MagazinesText: ; 1eb69 (7:6b69)
+MagazinesText:
 	TX_FAR _MagazinesText
 	db "@"
 
-BillsHousePC: ; 1eb6e (7:6b6e)
+BillsHousePC:
 	call EnableAutoTextBoxDrawing
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
@@ -366,11 +366,11 @@
 	tx_pre BillsHousePokemonList
 	ret
 
-BillsHouseMonitorText: ; 1ebdd (7:6bdd)
+BillsHouseMonitorText:
 	TX_FAR _BillsHouseMonitorText
 	db "@"
 
-BillsHouseInitiatedText: ; 1ebe2 (7:6be2)
+BillsHouseInitiatedText:
 	TX_FAR _BillsHouseInitiatedText
 	db $06
 	TX_ASM
@@ -386,7 +386,7 @@
 	call DelayFrames
 	jp TextScriptEnd
 
-BillsHousePokemonList: ; 1ec05 (7:6c05)
+BillsHousePokemonList:
 	TX_ASM
 	call SaveScreenTilesToBuffer1
 	ld hl, BillsHousePokemonListText1
@@ -440,11 +440,11 @@
 	call LoadScreenTilesFromBuffer2
 	jp TextScriptEnd
 
-BillsHousePokemonListText1: ; 1ec7f (7:6c7f)
+BillsHousePokemonListText1:
 	TX_FAR _BillsHousePokemonListText1
 	db "@"
 
-BillsMonListText: ; 1ec84 (7:6c84)
+BillsMonListText:
 	db   "EEVEE"
 	next "FLAREON"
 	next "JOLTEON"
@@ -451,11 +451,11 @@
 	next "VAPOREON"
 	next "CANCEL@"
 
-BillsHousePokemonListText2: ; 1ecaa (7:6caa)
+BillsHousePokemonListText2:
 	TX_FAR _BillsHousePokemonListText2
 	db "@"
 
-DisplayOakLabEmailText: ; 1ecaf (7:6caf)
+DisplayOakLabEmailText:
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
@@ -462,6 +462,6 @@
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump OakLabEmailText
 
-OakLabEmailText: ; 1ecbd (7:6cbd)
+OakLabEmailText:
 	TX_FAR _OakLabEmailText
 	db "@"
--- a/engine/hp_bar.asm
+++ b/engine/hp_bar.asm
@@ -1,9 +1,9 @@
-HPBarLength: ; f9dc (3:79dc)
+HPBarLength:
 	call GetPredefRegisters
 
 ; calculates bc * 48 / de, the number of pixels the HP bar has
 ; the result is always at least 1
-GetHPBarLength: ; f9df (3:79df)
+GetHPBarLength:
 	push hl
 	xor a
 	ld hl, H_MULTIPLICAND
@@ -45,7 +45,7 @@
 	ret
 
 ; predef $48
-UpdateHPBar: ; fa1d (3:7a1d)
+UpdateHPBar:
 UpdateHPBar2:
 	push hl
 	ld hl, wHPBarOldHP
@@ -136,7 +136,7 @@
 ; animates the HP bar going up or down for (a) ticks (two waiting frames each)
 ; stops prematurely if bar is filled up
 ; e: current health (in pixels) to start with
-UpdateHPBar_AnimateHPBar: ; fab1 (3:7ab1)
+UpdateHPBar_AnimateHPBar:
 	push hl
 .barAnimationLoop
 	push af
@@ -162,7 +162,7 @@
 	ret
 
 ; compares old HP and new HP and sets c and z flags accordingly
-UpdateHPBar_CompareNewHPToOldHP: ; fad1 (3:7ad1)
+UpdateHPBar_CompareNewHPToOldHP:
 	ld a, d
 	sub b
 	ret nz
@@ -171,7 +171,7 @@
 	ret
 
 ; calcs HP difference between bc and de (into de)
-UpdateHPBar_CalcHPDifference: ; fad7 (3:7ad7)
+UpdateHPBar_CalcHPDifference:
 	ld a, d
 	sub b
 	jr c, .oldHPGreater
@@ -200,7 +200,7 @@
 	ld de, $0
 	ret
 
-UpdateHPBar_PrintHPNumber: ; faf5 (3:7af5)
+UpdateHPBar_PrintHPNumber:
 	push af
 	push de
 	ld a, [wHPBarType]
@@ -240,7 +240,7 @@
 ; calcs number of HP bar pixels for old and new HP value
 ; d: new pixels
 ; e: old pixels
-UpdateHPBar_CalcOldNewHPBarPixels: ; fb30 (3:7b30)
+UpdateHPBar_CalcOldNewHPBarPixels:
 	push hl
 	ld hl, wHPBarMaxHP
 	ld a, [hli]  ; max HP into de
--- a/engine/in_game_trades.asm
+++ b/engine/in_game_trades.asm
@@ -1,4 +1,4 @@
-DoInGameTradeDialogue: ; 71ad9 (1c:5ad9)
+DoInGameTradeDialogue:
 ; trigger the trade offer/action specified by wWhichTrade
 	call SaveScreenTilesToBuffer2
 	ld hl,TradeMons
@@ -75,7 +75,7 @@
 	jp PrintText
 
 ; copies name of species a to hl
-InGameTrade_GetMonName: ; 71b6a (1c:5b6a)
+InGameTrade_GetMonName:
 	push de
 	ld [wd11e],a
 	call GetMonName
@@ -86,7 +86,7 @@
 
 INCLUDE "data/trades.asm"
 
-InGameTrade_DoTrade: ; 71c07 (1c:5c07)
+InGameTrade_DoTrade:
 	xor a ; NORMAL_PARTY_MENU
 	ld [wPartyMenuTypeOrMessageID],a
 	dec a
@@ -150,7 +150,7 @@
 	ld [wInGameTradeTextPointerTableIndex],a
 	ret
 
-InGameTrade_RestoreScreen: ; 71ca2 (1c:5ca2)
+InGameTrade_RestoreScreen:
 	call GBPalWhiteOutWithDelay3
 	call RestoreScreenTilesAndReloadTilePatterns
 	call ReloadTilesetTilePatterns
@@ -161,7 +161,7 @@
 	call DelayFrames
 	jpba LoadWildData
 
-InGameTrade_PrepareTradeData: ; 71cc1 (1c:5cc1)
+InGameTrade_PrepareTradeData:
 	ld hl, wTradedPlayerMonSpecies
 	ld a, [wInGameTradeGiveMonSpecies]
 	ld [hli], a ; wTradedPlayerMonSpecies
@@ -191,7 +191,7 @@
 	ld de, wTradedEnemyMonOTID
 	jp CopyData
 
-InGameTrade_CopyData: ; 71d11 (1c:5d11)
+InGameTrade_CopyData:
 	push hl
 	push bc
 	call CopyData
@@ -199,7 +199,7 @@
 	pop hl
 	ret
 
-InGameTrade_CopyDataToReceivedMon: ; 71d19 (1c:5d19)
+InGameTrade_CopyDataToReceivedMon:
 	ld hl, wPartyMonNicks
 	ld bc, NAME_LENGTH
 	call InGameTrade_GetReceivedMonPointer
@@ -221,7 +221,7 @@
 
 ; the received mon's index is (partyCount - 1),
 ; so this adds bc to hl (partyCount - 1) times and moves the result to de
-InGameTrade_GetReceivedMonPointer: ; 71d4f (1c:5d4f)
+InGameTrade_GetReceivedMonPointer:
 	ld a, [wPartyCount]
 	dec a
 	call AddNTimes
@@ -229,16 +229,16 @@
 	ld d, h
 	ret
 
-InGameTrade_TrainerString: ; 71d59 (1c:5d59)
+InGameTrade_TrainerString:
 	; "TRAINER@@@@@@@@@@"
 	db $5d, "@@@@@@@@@@"
 
-InGameTradeTextPointers: ; 71d64 (1c:5d64)
+InGameTradeTextPointers:
 	dw TradeTextPointers1
 	dw TradeTextPointers2
 	dw TradeTextPointers3
 
-TradeTextPointers1: ; 71d6a (1c:5d6a)
+TradeTextPointers1:
 	dw WannaTrade1Text
 	dw NoTrade1Text
 	dw WrongMon1Text
@@ -245,7 +245,7 @@
 	dw Thanks1Text
 	dw AfterTrade1Text
 
-TradeTextPointers2: ; 71d74 (1c:5d74)
+TradeTextPointers2:
 	dw WannaTrade2Text
 	dw NoTrade2Text
 	dw WrongMon2Text
@@ -252,7 +252,7 @@
 	dw Thanks2Text
 	dw AfterTrade2Text
 
-TradeTextPointers3: ; 71d7e (1c:5d7e)
+TradeTextPointers3:
 	dw WannaTrade3Text
 	dw NoTrade3Text
 	dw WrongMon3Text
@@ -259,70 +259,70 @@
 	dw Thanks3Text
 	dw AfterTrade3Text
 
-ConnectCableText: ; 71d88 (1c:5d88)
+ConnectCableText:
 	TX_FAR _ConnectCableText
 	db "@"
 
-TradedForText: ; 71d8d (1c:5d8d)
+TradedForText:
 	TX_FAR _TradedForText
 	db $11, $a, "@"
 
-WannaTrade1Text: ; 71d94 (1c:5d94)
+WannaTrade1Text:
 	TX_FAR _WannaTrade1Text
 	db "@"
 
-NoTrade1Text: ; 71d99 (1c:5d99)
+NoTrade1Text:
 	TX_FAR _NoTrade1Text
 	db "@"
 
-WrongMon1Text: ; 71d9e (1c:5d9e)
+WrongMon1Text:
 	TX_FAR _WrongMon1Text
 	db "@"
 
-Thanks1Text: ; 71da3 (1c:5da3)
+Thanks1Text:
 	TX_FAR _Thanks1Text
 	db "@"
 
-AfterTrade1Text: ; 71da8 (1c:5da8)
+AfterTrade1Text:
 	TX_FAR _AfterTrade1Text
 	db "@"
 
-WannaTrade2Text: ; 71dad (1c:5dad)
+WannaTrade2Text:
 	TX_FAR _WannaTrade2Text
 	db "@"
 
-NoTrade2Text: ; 71db2 (1c:5db2)
+NoTrade2Text:
 	TX_FAR _NoTrade2Text
 	db "@"
 
-WrongMon2Text: ; 71db7 (1c:5db7)
+WrongMon2Text:
 	TX_FAR _WrongMon2Text
 	db "@"
 
-Thanks2Text: ; 71dbc (1c:5dbc)
+Thanks2Text:
 	TX_FAR _Thanks2Text
 	db "@"
 
-AfterTrade2Text: ; 71dc1 (1c:5dc1)
+AfterTrade2Text:
 	TX_FAR _AfterTrade2Text
 	db "@"
 
-WannaTrade3Text: ; 71dc6 (1c:5dc6)
+WannaTrade3Text:
 	TX_FAR _WannaTrade3Text
 	db "@"
 
-NoTrade3Text: ; 71dcb (1c:5dcb)
+NoTrade3Text:
 	TX_FAR _NoTrade3Text
 	db "@"
 
-WrongMon3Text: ; 71dd0 (1c:5dd0)
+WrongMon3Text:
 	TX_FAR _WrongMon3Text
 	db "@"
 
-Thanks3Text: ; 71dd5 (1c:5dd5)
+Thanks3Text:
 	TX_FAR _Thanks3Text
 	db "@"
 
-AfterTrade3Text: ; 71dda (1c:5dda)
+AfterTrade3Text:
 	TX_FAR _AfterTrade3Text
 	db "@"
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -2,7 +2,7 @@
 MOVE_GENGAR_LEFT    EQU $01
 MOVE_NIDORINO_RIGHT EQU $ff
 
-PlayIntro: ; 41682 (10:5682)
+PlayIntro:
 	xor a
 	ld [hJoyHeld], a
 	inc a
@@ -17,7 +17,7 @@
 	call DelayFrame
 	ret
 
-PlayIntroScene: ; 4169d (10:569d)
+PlayIntroScene:
 	ld b, SET_PAL_NIDORINO_INTRO
 	call RunPaletteCommand
 	ld a, %11100100
@@ -137,7 +137,7 @@
 	ld de, IntroNidorinoAnimation7
 	jp AnimateIntroNidorino
 
-AnimateIntroNidorino: ; 41793 (10:5793)
+AnimateIntroNidorino:
 	ld a, [de]
 	cp $50
 	ret z
@@ -154,7 +154,7 @@
 	inc de
 	jr AnimateIntroNidorino
 
-UpdateIntroNidorinoOAM: ; 417ae (10:57ae)
+UpdateIntroNidorinoOAM:
 	ld hl, wOAMBuffer
 	ld a, [wIntroNidorinoBaseTile]
 	ld d, a
@@ -173,7 +173,7 @@
 	jr nz, .loop
 	ret
 
-InitIntroNidorinoOAM: ; 417c7 (10:57c7)
+InitIntroNidorinoOAM:
 	ld hl, wOAMBuffer
 	ld d, 0
 .loop
@@ -202,17 +202,17 @@
 	jr nz, .loop
 	ret
 
-IntroClearScreen: ; 417f0 (10:57f0)
+IntroClearScreen:
 	ld hl, vBGMap1
 	ld bc, $240
 	jr IntroClearCommon
 
-IntroClearMiddleOfScreen: ; 417f8 (10:57f8)
+IntroClearMiddleOfScreen:
 ; clear the area of the tile map between the black bars on the top and bottom
 	coord hl, 0, 4
 	ld bc, SCREEN_WIDTH * 10
 
-IntroClearCommon: ; 417fe (10:57fe)
+IntroClearCommon:
 	ld [hl], $0
 	inc hl
 	dec bc
@@ -221,7 +221,7 @@
 	jr nz, IntroClearCommon
 	ret
 
-IntroPlaceBlackTiles: ; 41807 (10:5807)
+IntroPlaceBlackTiles:
 	ld a, $1
 .loop
 	ld [hli], a
@@ -229,7 +229,7 @@
 	jr nz, .loop
 	ret
 
-IntroMoveMon: ; 4180e (10:580e)
+IntroMoveMon:
 ; d = number of times to move the mon (2 pixels each time)
 ; e: $00 = move Gengar right, $01 = move Gengar left, $ff = move Nidorino right
 	ld a, e
@@ -266,20 +266,20 @@
 	jr nz, IntroMoveMon
 	ret
 
-IntroCopyTiles: ; 4183f (10:583f)
+IntroCopyTiles:
 	coord hl, 13, 7
 
-CopyTileIDsFromList_ZeroBaseTileID: ; 41842 (10:5842)
+CopyTileIDsFromList_ZeroBaseTileID:
 	ld c, 0
 	predef_jump CopyTileIDsFromList
 
-PlayMoveSoundB: ; 41849 (10:5849)
+PlayMoveSoundB:
 ; unused
 	predef GetMoveSoundB
 	ld a, b
 	jp PlaySound
 
-LoadIntroGraphics: ; 41852 (10:5852)
+LoadIntroGraphics:
 	ld hl, FightIntroBackMon
 	ld de, vChars2
 	ld bc, FightIntroBackMonEnd - FightIntroBackMon
@@ -301,7 +301,7 @@
 	ld a, BANK(FightIntroFrontMon)
 	jp FarCopyData2
 
-PlayShootingStar: ; 4188a (10:588a)
+PlayShootingStar:
 	ld b, SET_PAL_GAME_FREAK_INTRO
 	call RunPaletteCommand
 	callba LoadCopyrightAndTextBoxTiles
@@ -338,7 +338,7 @@
 	call ClearSprites
 	jp Delay3
 
-IntroDrawBlackBars: ; 418e9 (10:58e9)
+IntroDrawBlackBars:
 ; clear the screen and draw black bars on the top and bottom
 	call IntroClearScreen
 	coord hl, 0, 0
@@ -354,14 +354,14 @@
 	ld c, $80
 	jp IntroPlaceBlackTiles
 
-EmptyFunc4: ; 4190c (10:590c)
+EmptyFunc4:
 	ret
 
-IntroNidorinoAnimation0: ; 4190d (10:590d)
+IntroNidorinoAnimation0:
 	db 0, 0
 	db $50
 
-IntroNidorinoAnimation1: ; 41910 (10:5910)
+IntroNidorinoAnimation1:
 ; This is a sequence of pixel movements for part of the Nidorino animation. This
 ; list describes how Nidorino should hop.
 ; First byte is y movement, second byte is x movement
@@ -372,7 +372,7 @@
 	db  2, 2
 	db $50 ; list terminator
 
-IntroNidorinoAnimation2: ; 4191b (10:591b)
+IntroNidorinoAnimation2:
 ; This is a sequence of pixel movements for part of the Nidorino animation.
 ; First byte is y movement, second byte is x movement
 	db  0,  0
@@ -382,7 +382,7 @@
 	db  2, -2
 	db $50 ; list terminator
 
-IntroNidorinoAnimation3: ; 41926 (10:5926)
+IntroNidorinoAnimation3:
 ; This is a sequence of pixel movements for part of the Nidorino animation.
 ; First byte is y movement, second byte is x movement
 	db   0, 0
@@ -392,7 +392,7 @@
 	db  12, 6
 	db $50 ; list terminator
 
-IntroNidorinoAnimation4: ; 41931 (10:5931)
+IntroNidorinoAnimation4:
 ; This is a sequence of pixel movements for part of the Nidorino animation.
 ; First byte is y movement, second byte is x movement
 	db  0,  0
@@ -402,7 +402,7 @@
 	db  8, -4
 	db $50 ; list terminator
 
-IntroNidorinoAnimation5: ; 4193c (10:593c)
+IntroNidorinoAnimation5:
 ; This is a sequence of pixel movements for part of the Nidorino animation.
 ; First byte is y movement, second byte is x movement
 	db  0, 0
@@ -412,7 +412,7 @@
 	db  8, 4
 	db $50 ; list terminator
 
-IntroNidorinoAnimation6: ; 41947 (10:5947)
+IntroNidorinoAnimation6:
 ; This is a sequence of pixel movements for part of the Nidorino animation.
 ; First byte is y movement, second byte is x movement
 	db 0, 0
@@ -421,7 +421,7 @@
 	db 0, 0
 	db $50 ; list terminator
 
-IntroNidorinoAnimation7: ; 41950 (10:5950)
+IntroNidorinoAnimation7:
 ; This is a sequence of pixel movements for part of the Nidorino animation.
 ; First byte is y movement, second byte is x movement
 	db -8, -16
@@ -430,17 +430,17 @@
 	db -4, -10
 	db $50 ; list terminator
 
-GameFreakIntro: ; 41959 (10:5959)
+GameFreakIntro:
 	INCBIN "gfx/gamefreak_intro.2bpp"
 	INCBIN "gfx/gamefreak_logo.2bpp"
 	ds $10 ; blank tile
 GameFreakIntroEnd:
 
-FightIntroBackMon: ; 41a99 (10:5a99)
+FightIntroBackMon:
 	INCBIN "gfx/intro_fight.2bpp"
 FightIntroBackMonEnd:
 
-FightIntroFrontMon: ; 42099 (10:6099)
+FightIntroFrontMon:
 
 IF DEF(_RED)
 	INCBIN "gfx/red/intro_nido_1.6x6.2bpp"
--- a/engine/items/itemfinder.asm
+++ b/engine/items/itemfinder.asm
@@ -1,4 +1,4 @@
-HiddenItemNear: ; 7481f (1d:481f)
+HiddenItemNear:
 	ld hl, HiddenItemCoords
 	ld b, 0
 .loop
@@ -43,7 +43,7 @@
 	scf
 	ret
 
-Sub5ClampTo0: ; 7486b (1d:486b)
+Sub5ClampTo0:
 ; subtract 5 but clamp to 0
 	sub 5
 	cp $f0
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1,4 +1,4 @@
-UseItem_: ; d5c7 (3:55c7)
+UseItem_:
 	ld a,1
 	ld [wActionResultOrTookBattleTurn],a ; initialise to success value
 	ld a,[wcf91]	;contains item_ID
@@ -15,7 +15,7 @@
 	ld l,a
 	jp [hl]
 
-ItemUsePtrTable: ; d5e1 (3:55e1)
+ItemUsePtrTable:
 	dw ItemUseBall       ; MASTER_BALL
 	dw ItemUseBall       ; ULTRA_BALL
 	dw ItemUseBall       ; GREAT_BALL
@@ -100,7 +100,7 @@
 	dw ItemUsePPRestore  ; ELIXER
 	dw ItemUsePPRestore  ; MAX_ELIXER
 
-ItemUseBall: ; d687 (3:5687)
+ItemUseBall:
 
 ; Balls can't be used out of battle.
 	ld a,[wIsInBattle]
@@ -583,43 +583,43 @@
 	ld [wItemQuantity],a
 	jp RemoveItemFromInventory
 
-ItemUseBallText00: ; d937 (3:5937)
+ItemUseBallText00:
 ;"It dodged the thrown ball!"
 ;"This pokemon can't be caught"
 	TX_FAR _ItemUseBallText00
 	db "@"
-ItemUseBallText01: ; d93c (3:593c)
+ItemUseBallText01:
 ;"You missed the pokemon!"
 	TX_FAR _ItemUseBallText01
 	db "@"
-ItemUseBallText02: ; d941 (3:5941)
+ItemUseBallText02:
 ;"Darn! The pokemon broke free!"
 	TX_FAR _ItemUseBallText02
 	db "@"
-ItemUseBallText03: ; d946 (3:5946)
+ItemUseBallText03:
 ;"Aww! It appeared to be caught!"
 	TX_FAR _ItemUseBallText03
 	db "@"
-ItemUseBallText04: ; d94b (3:594b)
+ItemUseBallText04:
 ;"Shoot! It was so close too!"
 	TX_FAR _ItemUseBallText04
 	db "@"
-ItemUseBallText05: ; d950 (3:5950)
+ItemUseBallText05:
 ;"All right! {MonName} was caught!"
 ;play sound
 	TX_FAR _ItemUseBallText05
 	db $12,$06
 	db "@"
-ItemUseBallText07: ; d957 (3:5957)
+ItemUseBallText07:
 ;"X was transferred to Bill's PC"
 	TX_FAR _ItemUseBallText07
 	db "@"
-ItemUseBallText08: ; d95c (3:595c)
+ItemUseBallText08:
 ;"X was transferred to someone's PC"
 	TX_FAR _ItemUseBallText08
 	db "@"
 
-ItemUseBallText06: ; d961 (3:5961)
+ItemUseBallText06:
 ;"New DEX data will be added..."
 ;play sound
 	TX_FAR _ItemUseBallText06
@@ -626,13 +626,13 @@
 	db $13,$06
 	db "@"
 
-ItemUseTownMap: ; d968 (3:5968)
+ItemUseTownMap:
 	ld a,[wIsInBattle]
 	and a
 	jp nz,ItemUseNotTime
 	jpba DisplayTownMap
 
-ItemUseBicycle: ; d977 (3:5977)
+ItemUseBicycle:
 	ld a,[wIsInBattle]
 	and a
 	jp nz,ItemUseNotTime
@@ -663,7 +663,7 @@
 	jp PrintText
 
 ; used for Surf out-of-battle effect
-ItemUseSurfboard: ; d9b4 (3:59b4)
+ItemUseSurfboard:
 	ld a,[wWalkBikeSurfState]
 	ld [wWalkBikeSurfStateCopy],a
 	cp a,2 ; is the player already surfing?
@@ -742,18 +742,18 @@
 	ld [wSimulatedJoypadStatesIndex],a
 	ret
 
-SurfingGotOnText: ; da4c (3:5a4c)
+SurfingGotOnText:
 	TX_FAR _SurfingGotOnText
 	db "@"
 
-SurfingNoPlaceToGetOffText: ; da51 (3:5a51)
+SurfingNoPlaceToGetOffText:
 	TX_FAR _SurfingNoPlaceToGetOffText
 	db "@"
 
-ItemUsePokedex: ; da56 (3:5a56)
+ItemUsePokedex:
 	predef_jump ShowPokedexMenu
 
-ItemUseEvoStone: ; da5b (3:5a5b)
+ItemUseEvoStone:
 	ld a,[wIsInBattle]
 	and a
 	jp nz,ItemUseNotTime
@@ -794,12 +794,12 @@
 	pop af
 	ret
 
-ItemUseVitamin: ; dab4 (3:5ab4)
+ItemUseVitamin:
 	ld a,[wIsInBattle]
 	and a
 	jp nz,ItemUseNotTime
 
-ItemUseMedicine: ; dabb (3:5abb)
+ItemUseMedicine:
 	ld a,[wPartyCount]
 	and a
 	jp z,.emptyParty
@@ -1414,15 +1414,15 @@
 	ld [wWhichPokemon],a
 	jp RemoveUsedItem
 
-VitaminStatRoseText: ; df24 (3:5f24)
+VitaminStatRoseText:
 	TX_FAR _VitaminStatRoseText
 	db "@"
 
-VitaminNoEffectText: ; df29 (3:5f29)
+VitaminNoEffectText:
 	TX_FAR _VitaminNoEffectText
 	db "@"
 
-VitaminText: ; df2e (3:5f2e)
+VitaminText:
 	db "HEALTH@"
 	db "ATTACK@"
 	db "DEFENSE@"
@@ -1429,7 +1429,7 @@
 	db "SPEED@"
 	db "SPECIAL@"
 
-ItemUseBait: ; df52 (3:5f52)
+ItemUseBait:
 	ld hl,ThrewBaitText
 	call PrintText
 	ld hl,wEnemyMonCatchRate ; catch rate
@@ -1439,7 +1439,7 @@
 	ld de,wSafariEscapeFactor ; escape factor
 	jr BaitRockCommon
 
-ItemUseRock: ; df67 (3:5f67)
+ItemUseRock:
 	ld hl,ThrewRockText
 	call PrintText
 	ld hl,wEnemyMonCatchRate ; catch rate
@@ -1453,7 +1453,7 @@
 	ld hl,wSafariEscapeFactor ; escape factor
 	ld de,wSafariBaitFactor ; bait factor
 
-BaitRockCommon: ; df7f (3:5f7f)
+BaitRockCommon:
 	ld [wAnimationID],a
 	xor a
 	ld [wAnimationType],a
@@ -1476,16 +1476,16 @@
 	ld c,70
 	jp DelayFrames
 
-ThrewBaitText: ; dfa5 (3:5fa5)
+ThrewBaitText:
 	TX_FAR _ThrewBaitText
 	db "@"
 
-ThrewRockText: ; dfaa (3:5faa)
+ThrewRockText:
 	TX_FAR _ThrewRockText
 	db "@"
 
 ; also used for Dig out-of-battle effect
-ItemUseEscapeRope: ; dfaf (3:5faf)
+ItemUseEscapeRope:
 	ld a,[wIsInBattle]
 	and a
 	jr nz,.notUsable
@@ -1523,14 +1523,14 @@
 .notUsable
 	jp ItemUseNotTime
 
-EscapeRopeTilesets: ; dffd (3:5ffd)
+EscapeRopeTilesets:
 	db FOREST, CEMETERY, CAVERN, FACILITY, INTERIOR
 	db $ff ; terminator
 
-ItemUseRepel: ; e003 (3:6003)
+ItemUseRepel:
 	ld b,100
 
-ItemUseRepelCommon: ; e005 (3:6005)
+ItemUseRepelCommon:
 	ld a,[wIsInBattle]
 	and a
 	jp nz,ItemUseNotTime
@@ -1539,7 +1539,7 @@
 	jp PrintItemUseTextAndRemoveItem
 
 ; handles X Accuracy item
-ItemUseXAccuracy: ; e013 (3:6013)
+ItemUseXAccuracy:
 	ld a,[wIsInBattle]
 	and a
 	jp z,ItemUseNotTime
@@ -1549,7 +1549,7 @@
 
 ; This function is bugged and never works. It always jumps to ItemUseNotTime.
 ; The Card Key is handled in a different way.
-ItemUseCardKey: ; e022 (3:6022)
+ItemUseCardKey:
 	xor a
 	ld [wUnusedD71F],a
 	call GetTileAndCoordsInFrontOfPlayer
@@ -1609,7 +1609,7 @@
 ; 02: X
 ; 03: ID?
 
-CardKeyTable1: ; e072 (3:6072)
+CardKeyTable1:
 	db  SILPH_CO_2F,$04,$04,$00
 	db  SILPH_CO_2F,$04,$05,$01
 	db  SILPH_CO_4F,$0C,$04,$02
@@ -1622,7 +1622,7 @@
 	db SILPH_CO_10F,$08,$0B,$09
 	db $ff
 
-CardKeyTable2: ; e09b (3:609b)
+CardKeyTable2:
 	db SILPH_CO_3F,$08,$09,$0A
 	db SILPH_CO_3F,$09,$09,$0B
 	db SILPH_CO_5F,$04,$07,$0C
@@ -1635,12 +1635,12 @@
 	db SILPH_CO_9F,$09,$03,$13
 	db $ff
 
-CardKeyTable3: ; e0c4 (3:60c4)
+CardKeyTable3:
 	db SILPH_CO_11F,$08,$09,$14
 	db SILPH_CO_11F,$09,$09,$15
 	db $ff
 
-ItemUsePokedoll: ; e0cd (3:60cd)
+ItemUsePokedoll:
 	ld a,[wIsInBattle]
 	dec a
 	jp nz,ItemUseNotTime
@@ -1648,7 +1648,7 @@
 	ld [wEscapedFromBattle],a
 	jp PrintItemUseTextAndRemoveItem
 
-ItemUseGuardSpec: ; e0dc (3:60dc)
+ItemUseGuardSpec:
 	ld a,[wIsInBattle]
 	and a
 	jp z,ItemUseNotTime
@@ -1656,15 +1656,15 @@
 	set ProtectedByMist,[hl] ; Mist bit
 	jp PrintItemUseTextAndRemoveItem
 
-ItemUseSuperRepel: ; e0eb (3:60eb)
+ItemUseSuperRepel:
 	ld b,200
 	jp ItemUseRepelCommon
 
-ItemUseMaxRepel: ; e0f0 (3:60f0)
+ItemUseMaxRepel:
 	ld b,250
 	jp ItemUseRepelCommon
 
-ItemUseDireHit: ; e0f5 (3:60f5)
+ItemUseDireHit:
 	ld a,[wIsInBattle]
 	and a
 	jp z,ItemUseNotTime
@@ -1672,7 +1672,7 @@
 	set GettingPumped,[hl] ; Focus Energy bit
 	jp PrintItemUseTextAndRemoveItem
 
-ItemUseXStat: ; e104 (3:6104)
+ItemUseXStat:
 	ld a,[wIsInBattle]
 	and a
 	jr nz,.inBattle
@@ -1705,7 +1705,7 @@
 	ld [hl],a ; restore [wPlayerMoveNum]
 	ret
 
-ItemUsePokeflute: ; e140 (3:6140)
+ItemUsePokeflute:
 	ld a,[wIsInBattle]
 	and a
 	jr nz,.inBattle
@@ -1789,7 +1789,7 @@
 ; [wWereAnyMonsAsleep] should be initialized to 0
 ; OUTPUT:
 ; [wWereAnyMonsAsleep]: set to 1 if any pokemon were asleep
-WakeUpEntireParty: ; e1e5 (3:61e5)
+WakeUpEntireParty:
 	ld de,44
 	ld c,6
 .loop
@@ -1811,7 +1811,7 @@
 ; Format:
 ; 00: Y
 ; 01: X
-Route12SnorlaxFluteCoords: ; e1fd (3:61fd)
+Route12SnorlaxFluteCoords:
 	db 62,9  ; one space West of Snorlax
 	db 61,10 ; one space North of Snorlax
 	db 63,10 ; one space South of Snorlax
@@ -1821,20 +1821,20 @@
 ; Format:
 ; 00: Y
 ; 01: X
-Route16SnorlaxFluteCoords: ; e206 (3:6206)
+Route16SnorlaxFluteCoords:
 	db 10,27 ; one space East of Snorlax
 	db 10,25 ; one space West of Snorlax
 	db $ff ; terminator
 
-PlayedFluteNoEffectText: ; e20b (3:620b)
+PlayedFluteNoEffectText:
 	TX_FAR _PlayedFluteNoEffectText
 	db "@"
 
-FluteWokeUpText: ; e210 (3:6210)
+FluteWokeUpText:
 	TX_FAR _FluteWokeUpText
 	db "@"
 
-PlayedFluteHadEffectText: ; e215 (3:6215)
+PlayedFluteHadEffectText:
 	TX_FAR _PlayedFluteHadEffectText
 	db $06
 	TX_ASM
@@ -1855,7 +1855,7 @@
 .done
 	jp TextScriptEnd ; end text
 
-ItemUseCoinCase: ; e23a (3:623a)
+ItemUseCoinCase:
 	ld a,[wIsInBattle]
 	and a
 	jp nz,ItemUseNotTime
@@ -1862,11 +1862,11 @@
 	ld hl,CoinCaseNumCoinsText
 	jp PrintText
 
-CoinCaseNumCoinsText: ; e247 (3:6247)
+CoinCaseNumCoinsText:
 	TX_FAR _CoinCaseNumCoinsText
 	db "@"
 
-ItemUseOldRod: ; e24c (3:624c)
+ItemUseOldRod:
 	call FishingInit
 	jp c, ItemUseNotTime
 	lb bc, 5, MAGIKARP
@@ -1873,7 +1873,7 @@
 	ld a, $1 ; set bite
 	jr RodResponse
 
-ItemUseGoodRod: ; e259 (3:6259)
+ItemUseGoodRod:
 	call FishingInit
 	jp c,ItemUseNotTime
 .RandomLoop
@@ -1901,12 +1901,12 @@
 
 INCLUDE "data/good_rod.asm"
 
-ItemUseSuperRod: ; e283 (3:6283)
+ItemUseSuperRod:
 	call FishingInit
 	jp c, ItemUseNotTime
 	call ReadSuperRodData
 	ld a, e
-RodResponse: ; e28d (3:628d)
+RodResponse:
 	ld [wRodResponse], a
 
 	dec a ; is there a bite?
@@ -1933,7 +1933,7 @@
 
 ; checks if fishing is possible and if so, runs initialization code common to all rods
 ; unsets carry if fishing is possible, sets carry if not
-FishingInit: ; e2b4 (3:62b4)
+FishingInit:
 	ld a,[wIsInBattle]
 	and a
 	jr z,.notInBattle
@@ -1958,10 +1958,10 @@
 	scf ; can't fish when surfing
 	ret
 
-ItemUseOaksParcel: ; e2de (3:62de)
+ItemUseOaksParcel:
 	jp ItemUseNotYoursToUse
 
-ItemUseItemfinder: ; e2e1 (3:62e1)
+ItemUseItemfinder:
 	ld a,[wIsInBattle]
 	and a
 	jp nz,ItemUseNotTime
@@ -1981,20 +1981,20 @@
 .printText
 	jp PrintText
 
-ItemfinderFoundItemText: ; e30d (3:630d)
+ItemfinderFoundItemText:
 	TX_FAR _ItemfinderFoundItemText
 	db "@"
 
-ItemfinderFoundNothingText: ; e312 (3:6312)
+ItemfinderFoundNothingText:
 	TX_FAR _ItemfinderFoundNothingText
 	db "@"
 
-ItemUsePPUp: ; e317 (3:6317)
+ItemUsePPUp:
 	ld a,[wIsInBattle]
 	and a
 	jp nz,ItemUseNotTime
 
-ItemUsePPRestore: ; e31e (3:631e)
+ItemUsePPRestore:
 	ld a,[wWhichPokemon]
 	push af
 	ld a,[wcf91]
@@ -2170,31 +2170,31 @@
 	ld [wActionResultOrTookBattleTurn],a ; item use failed
 	ret
 
-RaisePPWhichTechniqueText: ; e45d (3:645d)
+RaisePPWhichTechniqueText:
 	TX_FAR _RaisePPWhichTechniqueText
 	db "@"
 
-RestorePPWhichTechniqueText: ; e462 (3:6462)
+RestorePPWhichTechniqueText:
 	TX_FAR _RestorePPWhichTechniqueText
 	db "@"
 
-PPMaxedOutText: ; e467 (3:6467)
+PPMaxedOutText:
 	TX_FAR _PPMaxedOutText
 	db "@"
 
-PPIncreasedText: ; e46c (3:646c)
+PPIncreasedText:
 	TX_FAR _PPIncreasedText
 	db "@"
 
-PPRestoredText: ; e471 (3:6471)
+PPRestoredText:
 	TX_FAR _PPRestoredText
 	db "@"
 
 ; for items that can't be used from the Item menu
-UnusableItem: ; e476 (3:6476)
+UnusableItem:
 	jp ItemUseNotTime
 
-ItemUseTMHM: ; e479 (3:6479)
+ItemUseTMHM:
 	ld a,[wIsInBattle]
 	and a
 	jp nz,ItemUseNotTime
@@ -2291,23 +2291,23 @@
 	ret c
 	jp RemoveUsedItem
 
-BootedUpTMText: ; e54f (3:654f)
+BootedUpTMText:
 	TX_FAR _BootedUpTMText
 	db "@"
 
-BootedUpHMText: ; e554 (3:6554)
+BootedUpHMText:
 	TX_FAR _BootedUpHMText
 	db "@"
 
-TeachMachineMoveText: ; e559 (3:6559)
+TeachMachineMoveText:
 	TX_FAR _TeachMachineMoveText
 	db "@"
 
-MonCannotLearnMachineMoveText: ; e55e (3:655e)
+MonCannotLearnMachineMoveText:
 	TX_FAR _MonCannotLearnMachineMoveText
 	db "@"
 
-PrintItemUseTextAndRemoveItem: ; e563 (3:6563)
+PrintItemUseTextAndRemoveItem:
 	ld hl,ItemUseText00
 	call PrintText
 	ld a,SFX_HEAL_AILMENT
@@ -2314,25 +2314,25 @@
 	call PlaySound
 	call WaitForTextScrollButtonPress ; wait for button press
 
-RemoveUsedItem: ; e571 (3:6571)
+RemoveUsedItem:
 	ld hl,wNumBagItems
 	ld a,1 ; one item
 	ld [wItemQuantity],a
 	jp RemoveItemFromInventory
 
-ItemUseNoEffect: ; e57c (3:657c)
+ItemUseNoEffect:
 	ld hl,ItemUseNoEffectText
 	jr ItemUseFailed
 
-ItemUseNotTime: ; e581 (3:6581)
+ItemUseNotTime:
 	ld hl,ItemUseNotTimeText
 	jr ItemUseFailed
 
-ItemUseNotYoursToUse: ; e586 (3:6586)
+ItemUseNotYoursToUse:
 	ld hl,ItemUseNotYoursToUseText
 	jr ItemUseFailed
 
-ThrowBallAtTrainerMon: ; e58b (3:658b)
+ThrowBallAtTrainerMon:
 	call RunDefaultPaletteCommand
 	call LoadScreenTilesFromBuffer1 ; restore saved screen
 	call Delay3
@@ -2345,67 +2345,67 @@
 	call PrintText
 	jr RemoveUsedItem
 
-NoCyclingAllowedHere: ; e5ac (3:65ac)
+NoCyclingAllowedHere:
 	ld hl,NoCyclingAllowedHereText
 	jr ItemUseFailed
 
-BoxFullCannotThrowBall: ; e5b1 (3:65b1)
+BoxFullCannotThrowBall:
 	ld hl,BoxFullCannotThrowBallText
 	jr ItemUseFailed
 
-SurfingAttemptFailed: ; e5b6 (3:65b6)
+SurfingAttemptFailed:
 	ld hl,NoSurfingHereText
 
-ItemUseFailed: ; e5b9 (3:65b9)
+ItemUseFailed:
 	xor a
 	ld [wActionResultOrTookBattleTurn],a ; item use failed
 	jp PrintText
 
-ItemUseNotTimeText: ; e5c0 (3:65c0)
+ItemUseNotTimeText:
 	TX_FAR _ItemUseNotTimeText
 	db "@"
 
-ItemUseNotYoursToUseText: ; e5c5 (3:65c5)
+ItemUseNotYoursToUseText:
 	TX_FAR _ItemUseNotYoursToUseText
 	db "@"
 
-ItemUseNoEffectText: ; e5ca (3:65ca)
+ItemUseNoEffectText:
 	TX_FAR _ItemUseNoEffectText
 	db "@"
 
-ThrowBallAtTrainerMonText1: ; e5cf (3:65cf)
+ThrowBallAtTrainerMonText1:
 	TX_FAR _ThrowBallAtTrainerMonText1
 	db "@"
 
-ThrowBallAtTrainerMonText2: ; e5d4 (3:65d4)
+ThrowBallAtTrainerMonText2:
 	TX_FAR _ThrowBallAtTrainerMonText2
 	db "@"
 
-NoCyclingAllowedHereText: ; e5d9 (3:65d9)
+NoCyclingAllowedHereText:
 	TX_FAR _NoCyclingAllowedHereText
 	db "@"
 
-NoSurfingHereText: ; e5de (3:65de)
+NoSurfingHereText:
 	TX_FAR _NoSurfingHereText
 	db "@"
 
-BoxFullCannotThrowBallText: ; e5e3 (3:65e3)
+BoxFullCannotThrowBallText:
 	TX_FAR _BoxFullCannotThrowBallText
 	db "@"
 
-ItemUseText00: ; e5e8 (3:65e8)
+ItemUseText00:
 	TX_FAR _ItemUseText001
 	db $05
 	TX_FAR _ItemUseText002
 	db "@"
 
-GotOnBicycleText: ; e5f2 (3:65f2)
+GotOnBicycleText:
 	TX_FAR _GotOnBicycleText1
 	db $05
 	TX_FAR _GotOnBicycleText2
 	db "@"
 
-GotOffBicycleText: ; e5fc (3:65fc)
+GotOffBicycleText:
 	TX_FAR _GotOffBicycleText1
 	db $05
 	TX_FAR _GotOffBicycleText2
@@ -2416,7 +2416,7 @@
 ; INPUT:
 ; [wWhichPokemon] = index of pokemon in party
 ; [wCurrentMenuItem] = index of move (when using a PP Up)
-RestoreBonusPP: ; e606 (3:6606)
+RestoreBonusPP:
 	ld hl,wPartyMon1Moves
 	ld bc, wPartyMon2 - wPartyMon1
 	ld a,[wWhichPokemon]
@@ -2458,7 +2458,7 @@
 ; INPUT:
 ; [de] = normal max PP
 ; [hl] = move PP
-AddBonusPP: ; e642 (3:6642)
+AddBonusPP:
 	push bc
 	ld a,[de] ; normal max PP of move
 	ld [H_DIVIDEND + 3],a
@@ -2507,7 +2507,7 @@
 ; [wCurrentMenuItem] = move index
 ; OUTPUT:
 ; [wMaxPP] = max PP
-GetMaxPP: ; e677 (3:6677)
+GetMaxPP:
 	ld a,[wMonDataLocation]
 	and a
 	ld hl,wPartyMon1Moves
@@ -2567,11 +2567,11 @@
 	ld [wMaxPP],a ; store max PP
 	ret
 
-GetSelectedMoveOffset: ; e6e3 (3:66e3)
+GetSelectedMoveOffset:
 	ld a,[wWhichPokemon]
 	call AddNTimes
 
-GetSelectedMoveOffset2: ; e6e9 (3:66e9)
+GetSelectedMoveOffset2:
 	ld a,[wCurrentMenuItem]
 	ld c,a
 	ld b,0
@@ -2586,7 +2586,7 @@
 ; [wItemQuantity] = quantity to toss
 ; OUTPUT:
 ; clears carry flag if the item is tossed, sets carry flag if not
-TossItem_: ; e6f1 (3:66f1)
+TossItem_:
 	push hl
 	ld a,[wcf91]
 	call IsItemHM
@@ -2636,15 +2636,15 @@
 	scf
 	ret
 
-ThrewAwayItemText: ; e755 (3:6755)
+ThrewAwayItemText:
 	TX_FAR _ThrewAwayItemText
 	db "@"
 
-IsItOKToTossItemText: ; e75a (3:675a)
+IsItOKToTossItemText:
 	TX_FAR _IsItOKToTossItemText
 	db "@"
 
-TooImportantToTossText: ; e75f (3:675f)
+TooImportantToTossText:
 	TX_FAR _TooImportantToTossText
 	db "@"
 
@@ -2655,7 +2655,7 @@
 ; [wIsKeyItem] = result
 ; 00: item is not key item
 ; 01: item is key item
-IsKeyItem_: ; e764 (3:6764)
+IsKeyItem_:
 	ld a,$01
 	ld [wIsKeyItem],a
 	ld a,[wcf91]
@@ -2686,7 +2686,7 @@
 
 INCLUDE "data/key_items.asm"
 
-SendNewMonToBox: ; e7a4 (3:67a4)
+SendNewMonToBox:
 	ld de, wNumInBox
 	ld a, [de]
 	inc a
@@ -2855,7 +2855,7 @@
 ; checks if the tile in front of the player is a shore or water tile
 ; used for surfing and fishing
 ; unsets carry if it is, sets carry if not
-IsNextTileShoreOrWater: ; e8b8 (3:68b8)
+IsNextTileShoreOrWater:
 	ld a, [wCurMapTileset]
 	ld hl, WaterTilesets
 	ld de,1
@@ -2880,11 +2880,11 @@
 	ret
 
 ; tilesets with water
-WaterTilesets: ; e8e0 (3:68e0)
+WaterTilesets:
 	db OVERWORLD, FOREST, DOJO, GYM, SHIP, SHIP_PORT, CAVERN, FACILITY, PLATEAU
 	db $ff ; terminator
 
-ReadSuperRodData: ; e8ea (3:68ea)
+ReadSuperRodData:
 ; return e = 2 if no fish on this map
 ; return e = 1 if a bite, bc = level,species
 ; return e = 0 if no bite
@@ -2933,13 +2933,13 @@
 
 ; reloads map view and processes sprite data
 ; for items that cause the overworld to be displayed
-ItemUseReloadOverworldData: ; e9c5 (3:69c5)
+ItemUseReloadOverworldData:
 	call LoadCurrentMapView
 	jp UpdateSprites
 
 ; creates a list at wBuffer of maps where the mon in [wd11e] can be found.
 ; this is used by the pokedex to display locations the mon can be found on the map.
-FindWildLocationsOfMon: ; e9cb (3:69cb)
+FindWildLocationsOfMon:
 	ld hl, WildDataPointers
 	ld de, wBuffer
 	ld c, $0
@@ -2968,7 +2968,7 @@
 	ld [de], a
 	ret
 
-CheckMapForMon: ; e9f0 (3:69f0)
+CheckMapForMon:
 	inc hl
 	ld b, $a
 .loop
--- a/engine/items/tm_prices.asm
+++ b/engine/items/tm_prices.asm
@@ -1,4 +1,4 @@
-GetMachinePrice: ; 7bf86 (1e:7f86)
+GetMachinePrice:
 ; Input:  [wcf91] = Item Id of a TM
 ; Output: Stores the TM price at hItemPrice
 	ld a, [wcf91] ; a contains TM item id
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -1,5 +1,5 @@
 ; checks if the mon in [wWhichPokemon] already knows the move in [wMoveNum]
-CheckIfMoveIsKnown: ; 2fe18 (b:7e18)
+CheckIfMoveIsKnown:
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMon1Moves
 	ld bc, wPartyMon2 - wPartyMon1
@@ -21,6 +21,6 @@
 	scf
 	ret
 
-AlreadyKnowsText: ; 2fe3b (b:7e3b)
+AlreadyKnowsText:
 	TX_FAR _AlreadyKnowsText
 	db "@"
--- a/engine/items/tms.asm
+++ b/engine/items/tms.asm
@@ -1,5 +1,5 @@
 ; tests if mon [wcf91] can learn move [wMoveNum]
-CanLearnTM: ; 1373e (4:773e)
+CanLearnTM:
 	ld a, [wcf91]
 	ld [wd0b5], a
 	call GetMonHeader
@@ -22,7 +22,7 @@
 
 ; converts TM/HM number in wd11e into move number
 ; HMs start at 51
-TMToMove: ; 13763 (4:7763)
+TMToMove:
 	ld a, [wd11e]
 	dec a
 	ld hl, TechnicalMachines
--- a/engine/learn_move.asm
+++ b/engine/learn_move.asm
@@ -1,4 +1,4 @@
-LearnMove: ; 6e43 (1:6e43)
+LearnMove:
 	call SaveScreenTilesToBuffer1
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMonNicks
@@ -8,7 +8,7 @@
 	ld bc, NAME_LENGTH
 	call CopyData
 
-DontAbandonLearning: ; 6e5b (1:6e5b)
+DontAbandonLearning:
 	ld hl, wPartyMon1Moves
 	ld bc, wPartyMon2Moves - wPartyMon1Moves
 	ld a, [wWhichPokemon]
@@ -73,7 +73,7 @@
 	call CopyData
 	jp PrintLearnedMove
 
-AbandonLearning: ; 6eda (1:6eda)
+AbandonLearning:
 	ld hl, AbandonLearningText
 	call PrintText
 	coord hl, 14, 7
@@ -89,13 +89,13 @@
 	ld b, 0
 	ret
 
-PrintLearnedMove: ; 6efe (1:6efe)
+PrintLearnedMove:
 	ld hl, LearnedMove1Text
 	call PrintText
 	ld b, 1
 	ret
 
-TryingToLearn: ; 6f07 (1:6f07)
+TryingToLearn:
 	push hl
 	ld hl, TryingToLearnText
 	call PrintText
@@ -183,27 +183,27 @@
 	scf
 	ret
 
-LearnedMove1Text: ; 6fb4 (1:6fb4)
+LearnedMove1Text:
 	TX_FAR _LearnedMove1Text
 	db $b,6,"@"
 
-WhichMoveToForgetText: ; 6fb4 (1:6fb4)
+WhichMoveToForgetText:
 	TX_FAR _WhichMoveToForgetText
 	db "@"
 
-AbandonLearningText: ; 6fb9 (1:6fb9)
+AbandonLearningText:
 	TX_FAR _AbandonLearningText
 	db "@"
 
-DidNotLearnText: ; 6fbe (1:6fbe)
+DidNotLearnText:
 	TX_FAR _DidNotLearnText
 	db "@"
 
-TryingToLearnText: ; 6fc3 (1:6fc3)
+TryingToLearnText:
 	TX_FAR _TryingToLearnText
 	db "@"
 
-OneTwoAndText: ; 6fc8 (1:6fc8)
+OneTwoAndText:
 	TX_FAR _OneTwoAndText
 	db $a
 	TX_ASM
@@ -212,13 +212,13 @@
 	ld hl, PoofText
 	ret
 
-PoofText: ; 6fd7 (1:6fd7)
+PoofText:
 	TX_FAR _PoofText
 	db $a
-ForgotAndText: ; 6fdc (1:6fdc)
+ForgotAndText:
 	TX_FAR _ForgotAndText
 	db "@"
 
-HMCantDeleteText: ; 6fe1 (1:6fe1)
+HMCantDeleteText:
 	TX_FAR _HMCantDeleteText
 	db "@"
--- a/engine/load_pokedex_tiles.asm
+++ b/engine/load_pokedex_tiles.asm
@@ -1,5 +1,5 @@
 ; Loads tile patterns for tiles used in the pokedex.
-LoadPokedexTilePatterns: ; 17840 (5:7840)
+LoadPokedexTilePatterns:
 	call LoadHpBarAndStatusTilePatterns
 	ld de,PokedexTileGraphics
 	ld hl,vChars2 + $600
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -1,4 +1,4 @@
-DisplayPCMainMenu:: ; 213c8 (8:53c8)
+DisplayPCMainMenu::
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 	call SaveScreenTilesToBuffer2
@@ -111,7 +111,7 @@
 	ld hl, SwitchOnText
 	call PrintText
 
-BillsPCMenu: ; 214e8 (8:54e8)
+BillsPCMenu:
 	ld a, [wParentMenuItem]
 	ld [wCurrentMenuItem], a
 	ld hl, vChars2 + $780
@@ -185,7 +185,7 @@
 	cp $3
 	jp z, BillsPCChangeBox ; change box
 
-ExitBillsPC: ; 21588 (8:5588)
+ExitBillsPC:
 	ld a, [wFlags_0xcd60]
 	bit 3, a ; accessing Bill's PC through another PC?
 	jr nz, .next
@@ -204,7 +204,7 @@
 	res 6, [hl]
 	ret
 
-BillsPCDeposit: ; 215ac (8:55ac)
+BillsPCDeposit:
 	ld a, [wPartyCount]
 	dec a
 	jr nz, .partyLargeEnough
@@ -253,7 +253,7 @@
 	call PrintText
 	jp BillsPCMenu
 
-BillsPCWithdraw: ; 21618 (8:5618)
+BillsPCWithdraw:
 	ld a, [wNumInBox]
 	and a
 	jr nz, .boxNotEmpty
@@ -290,7 +290,7 @@
 	call PrintText
 	jp BillsPCMenu
 
-BillsPCRelease: ; 21673 (8:5673)
+BillsPCRelease:
 	ld a, [wNumInBox]
 	and a
 	jr nz, .loop
@@ -317,11 +317,11 @@
 	call PrintText
 	jp BillsPCMenu
 
-BillsPCChangeBox: ; 216b3 (8:56b3)
+BillsPCChangeBox:
 	callba ChangeBox
 	jp BillsPCMenu
 
-DisplayMonListMenu: ; 216be (8:56be)
+DisplayMonListMenu:
 	ld a, l
 	ld [wListPointer], a
 	ld a, h
@@ -338,7 +338,7 @@
 	ld [wPartyAndBillsPCSavedMenuItem], a
 	ret
 
-BillsPCMenuText: ; 216e1 (8:56e1)
+BillsPCMenuText:
 	db   "WITHDRAW ", $4a
 	next "DEPOSIT ",  $4a
 	next "RELEASE ",  $4a
@@ -346,10 +346,10 @@
 	next "SEE YA!"
 	db "@"
 
-BoxNoPCText: ; 21713 (8:5713)
+BoxNoPCText:
 	db "BOX No.@"
 
-KnowsHMMove:: ; 2171b (8:571b)
+KnowsHMMove::
 ; returns whether mon with party index [wWhichPokemon] knows an HM move
 	ld hl, wPartyMon1Moves
 	ld bc, wPartyMon2 - wPartyMon1
@@ -376,7 +376,7 @@
 	and a
 	ret
 
-HMMoveArray: ; 21745 (8:5745)
+HMMoveArray:
 	db CUT
 	db FLY
 	db SURF
@@ -384,7 +384,7 @@
 	db FLASH
 	db -1
 
-DisplayDepositWithdrawMenu: ; 2174b (8:574b)
+DisplayDepositWithdrawMenu:
 	coord hl, 9, 10
 	ld b, 6
 	ld c, 9
@@ -505,7 +505,7 @@
 	TX_FAR _MonWasReleasedText
 	db "@"
 
-CableClubLeftGameboy:: ; 5824 (8:5825)
+CableClubLeftGameboy::
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	ret z
@@ -522,7 +522,7 @@
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump JustAMomentText
 
-CableClubRightGameboy:: ; 5845 (8:5845)
+CableClubRightGameboy::
 	ld a, [hSerialConnectionStatus]
 	cp USING_INTERNAL_CLOCK
 	ret z
@@ -539,7 +539,7 @@
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump JustAMomentText
 
-JustAMomentText:: ; 21865 (8:5865)
+JustAMomentText::
 	TX_FAR _JustAMomentText
 	db "@"
 
@@ -549,6 +549,6 @@
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump OpenBillsPCText
 
-OpenBillsPCText:: ; 21878 (8:5878)
+OpenBillsPCText::
 	db $FD ; FuncTX_BillsPC
 
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -1,4 +1,4 @@
-DisplayDiploma: ; 566e2 (15:66e2)
+DisplayDiploma:
 	call SaveScreenTilesToBuffer2
 	call GBPalWhiteOutWithDelay3
 	call ClearScreen
@@ -69,7 +69,7 @@
 	call Delay3
 	jp GBPalNormal
 
-UnusedPlayerNameLengthFunc: ; 56777 (15:6777)
+UnusedPlayerNameLengthFunc:
 ; Unused function that does a calculation involving the length of the player's
 ; name.
 	ld hl, wPlayerName
@@ -81,7 +81,7 @@
 	dec c
 	jr .loop
 
-DiplomaTextPointersAndCoords: ; 56784 (15:6784)
+DiplomaTextPointersAndCoords:
 	dw DiplomaText
 	dwCoord 5, 2
 	dw DiplomaPlayer
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -50,7 +50,7 @@
 	call RunDefaultPaletteCommand
 	jp GBPalNormal
 
-LeaguePCShowTeam: ; 765e5 (1d:65e5)
+LeaguePCShowTeam:
 	ld c, PARTY_LENGTH
 .loop
 	push bc
@@ -77,7 +77,7 @@
 	scf
 	ret
 
-LeaguePCShowMon: ; 76610 (1d:6610)
+LeaguePCShowMon:
 	call GBPalWhiteOutWithDelay3
 	call ClearScreen
 	ld hl, wHallOfFame
@@ -112,9 +112,9 @@
 	call PrintNumber
 	jpba HoFDisplayMonInfo
 
-HallOfFameNoText: ; 76670 (1d:6670)
+HallOfFameNoText:
 	db "HALL OF FAME No   @"
 
-AccessedHoFPCText: ; 76683 (1d:6683)
+AccessedHoFPCText:
 	TX_FAR _AccessedHoFPCText
 	db "@"
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -1,4 +1,4 @@
-MainMenu: ; 5af2 (1:5af2)
+MainMenu:
 ; Check save file
 	call InitOptions
 	xor a
@@ -124,7 +124,7 @@
 	call SpecialWarpIn
 	jp SpecialEnterMap
 
-InitOptions: ; 5bff (1:5bff)
+InitOptions:
 	ld a,1 ; no delay
 	ld [wLetterPrintingDelayFlags],a
 	ld a,3 ; medium speed
@@ -131,7 +131,7 @@
 	ld [wOptions],a
 	ret
 
-LinkMenu: ; 5c0a (1:5c0a)
+LinkMenu:
 	xor a
 	ld [wLetterPrintingDelayFlags], a
 	ld hl, wd72e
@@ -292,19 +292,19 @@
 	res 6, [hl]
 	ret
 
-WhereWouldYouLikeText: ; 5d43 (1:5d43)
+WhereWouldYouLikeText:
 	TX_FAR _WhereWouldYouLikeText
 	db "@"
 
-PleaseWaitText: ; 5d48 (1:5d48)
+PleaseWaitText:
 	TX_FAR _PleaseWaitText
 	db "@"
 
-LinkCanceledText: ; 5d4d (1:5d4d)
+LinkCanceledText:
 	TX_FAR _LinkCanceledText
 	db "@"
 
-StartNewGame: ; 5d52 (1:5d52)
+StartNewGame:
 	ld hl, wd732
 	res 1, [hl]
 	call OakSpeech
@@ -312,7 +312,7 @@
 	call DelayFrames
 
 ; enter map after using a special warp or loading the game from the main menu
-SpecialEnterMap: ; 5d5f (1:5d5f)
+SpecialEnterMap:
 	xor a
 	ld [hJoyPressed], a
 	ld [hJoyHeld], a
@@ -328,19 +328,19 @@
 	ret nz
 	jp EnterMap
 
-ContinueText: ; 5d7e (1:5d7e)
+ContinueText:
 	db "CONTINUE", $4e
 
-NewGameText: ; 5d87 (1:5d87)
+NewGameText:
 	db "NEW GAME", $4e
 	db "OPTION@"
 
-CableClubOptionsText: ; 5d97 (1:5d97)
+CableClubOptionsText:
 	db "TRADE CENTER", $4e
 	db "COLOSSEUM",    $4e
 	db "CANCEL@"
 
-DisplayContinueGameInfo: ; 5db5 (1:5db5)
+DisplayContinueGameInfo:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 	coord hl, 4, 7
@@ -364,7 +364,7 @@
 	ld c, 30
 	jp DelayFrames
 
-PrintSaveScreenText: ; 5def (1:5def)
+PrintSaveScreenText:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 	coord hl, 4, 0
@@ -390,7 +390,7 @@
 	ld c, 30
 	jp DelayFrames
 
-PrintNumBadges: ; 5e2f (1:5e2f)
+PrintNumBadges:
 	push hl
 	ld hl, wObtainedBadges
 	ld b, $1
@@ -400,7 +400,7 @@
 	lb bc, 1, 2
 	jp PrintNumber
 
-PrintNumOwnedMons: ; 5e42 (1:5e42)
+PrintNumOwnedMons:
 	push hl
 	ld hl, wPokedexOwned
 	ld b, wPokedexOwnedEnd - wPokedexOwned
@@ -410,7 +410,7 @@
 	lb bc, 1, 3
 	jp PrintNumber
 
-PrintPlayTime: ; 5e55 (1:5e55)
+PrintPlayTime:
 	ld de, wPlayTimeHours
 	lb bc, 1, 3
 	call PrintNumber
@@ -420,13 +420,13 @@
 	lb bc, LEADING_ZEROES | 1, 2
 	jp PrintNumber
 
-SaveScreenInfoText: ; 5e6a (1:5e6a)
+SaveScreenInfoText:
 	db   "PLAYER"
 	next "BADGES    "
 	next "#DEX    "
 	next "TIME@"
 
-DisplayOptionMenu: ; 5e8a (1:5e8a)
+DisplayOptionMenu:
 	coord hl, 0, 0
 	ld b,3
 	ld c,18
@@ -578,23 +578,23 @@
 	ld [wOptionsTextSpeedCursorX],a ; text speed cursor X coordinate
 	jp .eraseOldMenuCursor
 
-TextSpeedOptionText: ; 5fc0 (1:5fc0)
+TextSpeedOptionText:
 	db   "TEXT SPEED"
 	next " FAST  MEDIUM SLOW@"
 
-BattleAnimationOptionText: ; 5fde (1:5fde)
+BattleAnimationOptionText:
 	db   "BATTLE ANIMATION"
 	next " ON       OFF@"
 
-BattleStyleOptionText: ; 5ffd (1:5ffd)
+BattleStyleOptionText:
 	db   "BATTLE STYLE"
 	next " SHIFT    SET@"
 
-OptionMenuCancelText: ; 6018 (1:6018)
+OptionMenuCancelText:
 	db "CANCEL@"
 
 ; sets the options variable according to the current placement of the menu cursors in the options menu
-SetOptionsFromCursorPositions: ; 601f (1:601f)
+SetOptionsFromCursorPositions:
 	ld hl,TextSpeedOptionData
 	ld a,[wOptionsTextSpeedCursorX] ; text speed cursor X coordinate
 	ld c,a
@@ -630,7 +630,7 @@
 	ret
 
 ; reads the options variable and places menu cursors in the correct positions within the options menu
-SetCursorPositionsFromOptions: ; 604c (1:604c)
+SetCursorPositionsFromOptions:
 	ld hl,TextSpeedOptionData + 1
 	ld a,[wOptions]
 	ld c,a
@@ -674,7 +674,7 @@
 ; Format:
 ; 00: X coordinate of menu cursor
 ; 01: delay after printing a letter (in frames)
-TextSpeedOptionData: ; 6096 (1:6096)
+TextSpeedOptionData:
 	db 14,5 ; Slow
 	db  7,3 ; Medium
 	db  1,1 ; Fast
@@ -681,7 +681,7 @@
 	db 7 ; default X coordinate (Medium)
 	db $ff ; terminator
 
-CheckForPlayerNameInSRAM: ; 609e (1:609e)
+CheckForPlayerNameInSRAM:
 ; Check if the player name data in SRAM has a string terminator character
 ; (indicating that a name may have been saved there) and return whether it does
 ; in carry.
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -1,4 +1,4 @@
-AskName: ; 64eb (1:64eb)
+AskName:
 	call SaveScreenTilesToBuffer1
 	call GetPredefRegisters
 	push hl
@@ -53,7 +53,7 @@
 	TX_FAR _DoYouWantToNicknameText
 	db "@"
 
-DisplayNameRaterScreen: ; 655c (1:655c)
+DisplayNameRaterScreen:
 	ld hl, wBuffer
 	xor a
 	ld [wUpdateSpritesEnabled], a
@@ -81,7 +81,7 @@
 	scf
 	ret
 
-DisplayNamingScreen: ; 6596 (1:6596)
+DisplayNamingScreen:
 	push hl
 	ld hl, wd730
 	set 6, [hl]
@@ -323,7 +323,7 @@
 	ld [wTopMenuItemX], a
 	jp EraseMenuCursor
 
-LoadEDTile: ; 675b (1:675b)
+LoadEDTile:
 	ld de, ED_Tile
 	ld hl, vFont + $700
 	ld bc, (ED_TileEnd - ED_Tile) / $8
@@ -331,11 +331,11 @@
 	;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8
 	jp CopyVideoDataDouble
 
-ED_Tile: ; 6767 (1:6767)
+ED_Tile:
 	INCBIN "gfx/ED_tile.1bpp"
 ED_TileEnd:
 
-PrintAlphabet: ; 676f (1:676f)
+PrintAlphabet:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ld a, [wAlphabetCase]
@@ -365,13 +365,13 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	jp Delay3
 
-LowerCaseAlphabet: ; 679e (1:679e)
+LowerCaseAlphabet:
 	db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥UPPER CASE@"
 
-UpperCaseAlphabet: ; 67d6 (1:67d6)
+UpperCaseAlphabet:
 	db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥lower case@"
 
-PrintNicknameAndUnderscores: ; 680e (1:680e)
+PrintNicknameAndUnderscores:
 	call CalcStringLength
 	ld a, c
 	ld [wNamingScreenNameLength], a
@@ -425,7 +425,7 @@
 	ld [hl], $77 ; raised underscore tile id
 	ret
 
-DakutensAndHandakutens: ; 6871 (1:6871)
+DakutensAndHandakutens:
 	push de
 	call CalcStringLength
 	dec hl
@@ -439,7 +439,7 @@
 	ld [wNamingScreenLetter], a
 	ret
 
-Dakutens: ; 6885 (1:6885)
+Dakutens:
 	db "かが", "きぎ", "くぐ", "けげ", "こご"
 	db "さざ", "しじ", "すず", "せぜ", "そぞ"
 	db "ただ", "ちぢ", "つづ", "てで", "とど"
@@ -450,13 +450,13 @@
 	db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
 	db $ff
 
-Handakutens: ; 68d6 (1:68d6)
+Handakutens:
 	db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
 	db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
 	db $ff
 
 ; calculates the length of the string at wcf4b and stores it in c
-CalcStringLength: ; 68eb (1:68eb)
+CalcStringLength:
 	ld hl, wcf4b
 	ld c, $0
 .loop
@@ -467,7 +467,7 @@
 	inc c
 	jr .loop
 
-PrintNamingText: ; 68f8 (1:68f8)
+PrintNamingText:
 	coord hl, 0, 1
 	ld a, [wNamingScreenType]
 	ld de, YourTextString
@@ -499,14 +499,14 @@
 .placeString
 	jp PlaceString
 
-YourTextString: ; 693f (1:693f)
+YourTextString:
 	db "YOUR @"
 
-RivalsTextString: ; 6945 (1:6945)
+RivalsTextString:
 	db "RIVAL's @"
 
-NameTextString: ; 694d (1:694d)
+NameTextString:
 	db "NAME?@"
 
-NicknameTextString: ; 6953 (1:6953)
+NicknameTextString:
 	db "NICKNAME?@"
--- a/engine/menu/oaks_pc.asm
+++ b/engine/menu/oaks_pc.asm
@@ -1,4 +1,4 @@
-OpenOaksPC: ; 1e915 (7:6915)
+OpenOaksPC:
 	call SaveScreenTilesToBuffer2
 	ld hl, AccessedOaksPCText
 	call PrintText
@@ -14,14 +14,14 @@
 	call PrintText
 	jp LoadScreenTilesFromBuffer2
 
-GetDexRatedText: ; 1e93b (7:693b)
+GetDexRatedText:
 	TX_FAR _GetDexRatedText
 	db "@"
 
-ClosedOaksPCText: ; 1e940 (7:6940)
+ClosedOaksPCText:
 	TX_FAR _ClosedOaksPCText
 	db $0d,"@"
 
-AccessedOaksPCText: ; 1e946 (7:6946)
+AccessedOaksPCText:
 	TX_FAR _AccessedOaksPCText
 	db "@"
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -17,7 +17,7 @@
 ; f6: health returned
 ; f7: revitalized
 ; f8: leveled up
-DrawPartyMenu_: ; 12cd2 (4:6cd2)
+DrawPartyMenu_:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a
 	call ClearScreen
@@ -24,7 +24,7 @@
 	call UpdateSprites
 	callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics
 
-RedrawPartyMenu_: ; 12ce3 (4:6ce3)
+RedrawPartyMenu_:
 	ld a,[wPartyMenuTypeOrMessageID]
 	cp a,SWAP_MONS_PARTY_MENU
 	jp z,.printMessage
@@ -234,7 +234,7 @@
 	call PrintText
 	jr .done
 
-PartyMenuItemUseMessagePointers: ; 12e61 (4:6e61)
+PartyMenuItemUseMessagePointers:
 	dw AntidoteText
 	dw BurnHealText
 	dw IceHealText
@@ -245,7 +245,7 @@
 	dw ReviveText
 	dw RareCandyText
 
-PartyMenuMessagePointers: ; 12e73 (4:6e73)
+PartyMenuMessagePointers:
 	dw PartyMenuNormalText
 	dw PartyMenuItemUseText
 	dw PartyMenuBattleText
@@ -253,65 +253,65 @@
 	dw PartyMenuSwapMonText
 	dw PartyMenuItemUseText
 
-PartyMenuNormalText: ; 12e7f (4:6e7f)
+PartyMenuNormalText:
 	TX_FAR _PartyMenuNormalText
 	db "@"
 
-PartyMenuItemUseText: ; 12e84 (4:6e84)
+PartyMenuItemUseText:
 	TX_FAR _PartyMenuItemUseText
 	db "@"
 
-PartyMenuBattleText: ; 12e89 (4:6e89)
+PartyMenuBattleText:
 	TX_FAR _PartyMenuBattleText
 	db "@"
 
-PartyMenuUseTMText: ; 12e8e (4:6e8e)
+PartyMenuUseTMText:
 	TX_FAR _PartyMenuUseTMText
 	db "@"
 
-PartyMenuSwapMonText: ; 12e93 (4:6e93)
+PartyMenuSwapMonText:
 	TX_FAR _PartyMenuSwapMonText
 	db "@"
 
-PotionText: ; 12e98 (4:6e98)
+PotionText:
 	TX_FAR _PotionText
 	db "@"
 
-AntidoteText: ; 12e9d (4:6e9d)
+AntidoteText:
 	TX_FAR _AntidoteText
 	db "@"
 
-ParlyzHealText: ; 12ea2 (4:6ea2)
+ParlyzHealText:
 	TX_FAR _ParlyzHealText
 	db "@"
 
-BurnHealText: ; 12ea7 (4:6ea7)
+BurnHealText:
 	TX_FAR _BurnHealText
 	db "@"
 
-IceHealText: ; 12eac (4:6eac)
+IceHealText:
 	TX_FAR _IceHealText
 	db "@"
 
-AwakeningText: ; 12eb1 (4:6eb1)
+AwakeningText:
 	TX_FAR _AwakeningText
 	db "@"
 
-FullHealText: ; 12eb6 (4:6eb6)
+FullHealText:
 	TX_FAR _FullHealText
 	db "@"
 
-ReviveText: ; 12ebb (4:6ebb)
+ReviveText:
 	TX_FAR _ReviveText
 	db "@"
 
-RareCandyText: ; 12ec0 (4:6ec0)
+RareCandyText:
 	TX_FAR _RareCandyText
 	db $0B
 	db $06
 	db "@"
 
-SetPartyMenuHPBarColor: ; 12ec7 (4:6ec7)
+SetPartyMenuHPBarColor:
 	ld hl, wPartyMenuHPBarColors
 	ld a, [wWhichPartyMenuHPBar]
 	ld c, a
--- a/engine/menu/pc.asm
+++ b/engine/menu/pc.asm
@@ -1,4 +1,4 @@
-ActivatePC: ; 17e2c (5:7e2c)
+ActivatePC:
 	call SaveScreenTilesToBuffer2
 	ld a, SFX_TURN_ON_PC
 	call PlaySound
@@ -9,7 +9,7 @@
 	set 3, [hl]
 	call LoadScreenTilesFromBuffer2
 	call Delay3
-PCMainMenu: ; 17e48 (5:7e48)
+PCMainMenu:
 	callba DisplayPCMainMenu
 	ld hl, wFlags_0xcd60
 	set 5, [hl]
@@ -58,19 +58,19 @@
 	call PrintText
 	callba PlayerPC
 	jr ReloadMainMenu
-OaksPC: ; 17ec0 (5:7ec0)
+OaksPC:
 	ld a, SFX_ENTER_PC
 	call PlaySound
 	call WaitForSoundToFinish
 	callba OpenOaksPC
 	jr ReloadMainMenu
-PKMNLeague: ; 17ed2 (5:7ed2)
+PKMNLeague:
 	ld a, SFX_ENTER_PC
 	call PlaySound
 	call WaitForSoundToFinish
 	callba PKMNLeaguePC
 	jr ReloadMainMenu
-BillsPC: ; 17ee4 (5:7ee4)
+BillsPC:
 	ld a, SFX_ENTER_PC
 	call PlaySound
 	call WaitForSoundToFinish
@@ -83,13 +83,13 @@
 .printText
 	call PrintText
 	callba BillsPC_
-ReloadMainMenu: ; 17f06 (5:7f06)
+ReloadMainMenu:
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	call ReloadMapData
 	call UpdateSprites
 	jp PCMainMenu
-LogOff: ; 17f13 (5:7f13)
+LogOff:
 	ld a, SFX_TURN_OFF_PC
 	call PlaySound
 	call WaitForSoundToFinish
@@ -98,24 +98,24 @@
 	res 5, [hl]
 	ret
 
-TurnedOnPC1Text: ; 17f23 (5:7f23)
+TurnedOnPC1Text:
 	TX_FAR _TurnedOnPC1Text
 	db "@"
 
-AccessedBillsPCText: ; 17f28 (5:7f28)
+AccessedBillsPCText:
 	TX_FAR _AccessedBillsPCText
 	db "@"
 
-AccessedSomeonesPCText: ; 17f2d (5:7f2d)
+AccessedSomeonesPCText:
 	TX_FAR _AccessedSomeonesPCText
 	db "@"
 
-AccessedMyPCText: ; 17f32 (5:7f32)
+AccessedMyPCText:
 	TX_FAR _AccessedMyPCText
 	db "@"
 
 ; removes one of the specified item ID [hItemToRemoveID] from bag (if existent)
-RemoveItemByID: ; 17f37 (5:7f37)
+RemoveItemByID:
 	ld hl, wBagItems
 	ld a, [hItemToRemoveID]
 	ld b, a
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -1,4 +1,4 @@
-PlayerPC: ; 78e6 (1:78e6)
+PlayerPC:
 	ld hl, wd730
 	set 6, [hl]
 	ld a, ITEM_NAME
@@ -16,7 +16,7 @@
 	ld hl, TurnedOnPC2Text
 	call PrintText
 
-PlayerPCMenu: ; 790c (1:790c)
+PlayerPCMenu:
 	ld a, [wParentMenuItem]
 	ld [wCurrentMenuItem], a
 	ld hl, wFlags_0xcd60
@@ -62,7 +62,7 @@
 	dec a
 	jp z, PlayerPCToss
 
-ExitPlayerPC: ; 796d (1:796d)
+ExitPlayerPC:
 	ld a, [wFlags_0xcd60]
 	bit 3, a ; accessing player's PC through another PC?
 	jr nz, .next
@@ -83,7 +83,7 @@
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-PlayerPCDeposit: ; 7995 (1:7995)
+PlayerPCDeposit:
 	xor a
 	ld [wCurrentMenuItem], a
 	ld [wListScrollOffset], a
@@ -137,7 +137,7 @@
 	call PrintText
 	jp .loop
 
-PlayerPCWithdraw: ; 7a12 (1:7a12)
+PlayerPCWithdraw:
 	xor a
 	ld [wCurrentMenuItem], a
 	ld [wListScrollOffset], a
@@ -191,7 +191,7 @@
 	call PrintText
 	jp .loop
 
-PlayerPCToss: ; 7a8f (1:7a8f)
+PlayerPCToss:
 	xor a
 	ld [wCurrentMenuItem], a
 	ld [wListScrollOffset], a
@@ -240,64 +240,64 @@
 	call TossItem ; disallows tossing key items
 	jp .loop
 
-PlayersPCMenuEntries: ; 7af5 (1:7af5)
+PlayersPCMenuEntries:
 	db   "WITHDRAW ITEM"
 	next "DEPOSIT ITEM"
 	next "TOSS ITEM"
 	next "LOG OFF@"
 
-TurnedOnPC2Text: ; 7b22 (1:7b22)
+TurnedOnPC2Text:
 	TX_FAR _TurnedOnPC2Text
 	db "@"
 
-WhatDoYouWantText: ; 7b27 (1:7b27)
+WhatDoYouWantText:
 	TX_FAR _WhatDoYouWantText
 	db "@"
 
-WhatToDepositText: ; 7b2c (1:7b2c)
+WhatToDepositText:
 	TX_FAR _WhatToDepositText
 	db "@"
 
-DepositHowManyText: ; 7b31 (1:7b31)
+DepositHowManyText:
 	TX_FAR _DepositHowManyText
 	db "@"
 
-ItemWasStoredText: ; 7b36 (1:7b36)
+ItemWasStoredText:
 	TX_FAR _ItemWasStoredText
 	db "@"
 
-NothingToDepositText: ; 7b3b (1:7b3b)
+NothingToDepositText:
 	TX_FAR _NothingToDepositText
 	db "@"
 
-NoRoomToStoreText: ; 7b40 (1:7b40)
+NoRoomToStoreText:
 	TX_FAR _NoRoomToStoreText
 	db "@"
 
-WhatToWithdrawText: ; 7b45 (1:7b45)
+WhatToWithdrawText:
 	TX_FAR _WhatToWithdrawText
 	db "@"
 
-WithdrawHowManyText: ; 7b4a (1:7b4a)
+WithdrawHowManyText:
 	TX_FAR _WithdrawHowManyText
 	db "@"
 
-WithdrewItemText: ; 7b4f (1:7b4f)
+WithdrewItemText:
 	TX_FAR _WithdrewItemText
 	db "@"
 
-NothingStoredText: ; 7b54 (1:7b54)
+NothingStoredText:
 	TX_FAR _NothingStoredText
 	db "@"
 
-CantCarryMoreText: ; 7b59 (1:7b59)
+CantCarryMoreText:
 	TX_FAR _CantCarryMoreText
 	db "@"
 
-WhatToTossText: ; 7b5e (1:7b5e)
+WhatToTossText:
 	TX_FAR _WhatToTossText
 	db "@"
 
-TossHowManyText: ; 7b63 (1:7b63)
+TossHowManyText:
 	TX_FAR _TossHowManyText
 	db "@"
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -1,4 +1,4 @@
-ShowPokedexMenu: ; 40000 (10:4000)
+ShowPokedexMenu:
 	call GBPalWhiteOut
 	call ClearScreen
 	call UpdateSprites
@@ -57,7 +57,7 @@
 ; 00: showed pokemon data or area
 ; 01: the player chose Quit
 ; 02: the pokemon has not been seen yet or the player pressed the B button
-HandlePokedexSideMenu: ; 4006d (10:406d)
+HandlePokedexSideMenu:
 	call PlaceUnfilledArrowMenuCursor
 	ld a,[wCurrentMenuItem]
 	push af
@@ -150,7 +150,7 @@
 
 ; handles the list of pokemon on the left of the pokedex screen
 ; sets carry flag if player presses A, unsets carry flag if player presses B
-HandlePokedexListMenu: ; 40111 (10:4111)
+HandlePokedexListMenu:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a
 ; draw the horizontal line separating the seen and owned amounts from the menu
@@ -342,7 +342,7 @@
 	and a
 	ret
 
-DrawPokedexVerticalLine: ; 4028e (10:428e)
+DrawPokedexVerticalLine:
 	ld c,9 ; height of line
 	ld de,20 ; width of screen
 	ld a,$71 ; vertical line tile
@@ -354,16 +354,16 @@
 	jr nz,.loop
 	ret
 
-PokedexSeenText: ; 4029d (10:429d)
+PokedexSeenText:
 	db "SEEN@"
 
-PokedexOwnText: ; 402a2 (10:42a2)
+PokedexOwnText:
 	db "OWN@"
 
-PokedexContentsText: ; 402a6 (10:42a6)
+PokedexContentsText:
 	db "CONTENTS@"
 
-PokedexMenuItemsText: ; 402af (10:42af)
+PokedexMenuItemsText:
 	db   "DATA"
 	next "CRY"
 	next "AREA"
@@ -373,7 +373,7 @@
 ; INPUT:
 ; [wd11e] = pokedex number
 ; hl = address of bit field
-IsPokemonBitSet: ; 402c2 (10:42c2)
+IsPokemonBitSet:
 	ld a,[wd11e]
 	dec a
 	ld c,a
@@ -384,7 +384,7 @@
 	ret
 
 ; function to display pokedex data from outside the pokedex
-ShowPokedexData: ; 402d1 (10:42d1)
+ShowPokedexData:
 	call GBPalWhiteOutWithDelay3
 	call ClearScreen
 	call UpdateSprites
@@ -391,7 +391,7 @@
 	callab LoadPokedexTilePatterns ; load pokedex tiles
 
 ; function to display pokedex data from inside the pokedex
-ShowPokedexDataInternal: ; 402e2 (10:42e2)
+ShowPokedexDataInternal:
 	ld hl,wd72c
 	set 1,[hl]
 	ld a,$33 ; 3/7 volume
@@ -567,15 +567,15 @@
 	ld [rNR50],a
 	ret
 
-HeightWeightText: ; 40448 (10:4448)
+HeightWeightText:
 	db "HT  ?",$60,"??",$61,$4E,"WT   ???lb@"
 
 ; XXX does anything point to this?
-PokeText: ; 4045d (10:445d)
+PokeText:
 	db "#@"
 
 ; horizontal line that divides the pokedex text description from the rest of the data
-PokedexDataDividerLine: ; 4045f (10:445f)
+PokedexDataDividerLine:
 	db $68,$69,$6B,$69,$6B
 	db $69,$6B,$69,$6B,$6B
 	db $6B,$6B,$69,$6B,$69
@@ -588,7 +588,7 @@
 ; c = number of tile ID's to write
 ; de = amount to destination address after each tile (1 for horizontal, 20 for vertical)
 ; hl = destination address
-DrawTileLine: ; 40474 (10:4474)
+DrawTileLine:
 	push bc
 	push de
 .loop
@@ -602,7 +602,7 @@
 
 INCLUDE "data/pokedex_entries.asm"
 
-PokedexToIndex: ; 40ff9 (10:4ff9)
+PokedexToIndex:
 	; converts the Pokédex number at wd11e to an index
 	push bc
 	push hl
@@ -623,7 +623,7 @@
 	pop bc
 	ret
 
-IndexToPokedex: ; 41010 (10:5010)
+IndexToPokedex:
 	; converts the indexédex number at wd11e to a Pokédex number
 	push bc
 	push hl
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -1,4 +1,4 @@
-CeladonPrizeMenu: ; 5271b (14:671b)
+CeladonPrizeMenu:
 	ld b,COIN_CASE
 	call IsItemInBag
 	jr nz,.havingCoinCase
@@ -42,20 +42,20 @@
 	res 6,[hl]
 	ret
 
-RequireCoinCaseTextPtr: ; 5277e (14:677e)
+RequireCoinCaseTextPtr:
 	TX_FAR _RequireCoinCaseText
 	db $0D
 	db "@"
 
-ExchangeCoinsForPrizesTextPtr: ; 52784 (14:6784)
+ExchangeCoinsForPrizesTextPtr:
 	TX_FAR _ExchangeCoinsForPrizesText
 	db "@"
 
-WhichPrizeTextPtr: ; 52789 (14:6789)
+WhichPrizeTextPtr:
 	TX_FAR _WhichPrizeText
 	db "@"
 
-GetPrizeMenuId: ; 5278e (14:678e)
+GetPrizeMenuId:
 ; determine which one among the three
 ; prize-texts has been selected
 ; using the text ID (stored in [hSpriteIndexOrTextID])
@@ -147,7 +147,7 @@
 
 INCLUDE "data/prizes.asm"
 
-PrintPrizePrice: ; 5287a (14:687a)
+PrintPrizePrice:
 	coord hl, 11, 0
 	ld b,$01
 	ld c,$07
@@ -171,7 +171,7 @@
 .SixSpacesText
 	db "      @"
 
-LoadCoinsToSubtract: ; 528b1 (14:68b1)
+LoadCoinsToSubtract:
 	ld a,[wWhichPrize]
 	add a
 	ld d,0
@@ -186,7 +186,7 @@
 	ld [hCoins + 1],a
 	ret
 
-HandlePrizeChoice: ; 528c6 (14:68c6)
+HandlePrizeChoice:
 	ld a,[wCurrentMenuItem]
 	ld [wWhichPrize],a
 	ld d,0
@@ -260,35 +260,35 @@
 	ld hl,OhFineThenTextPtr
 	jp PrintText
 
-UnknownData52951: ; 52951 (14:6951)
+UnknownData52951:
 ; XXX what's this?
 	db $00,$01,$00,$01,$00,$01,$00,$00,$01
 
-HereYouGoTextPtr: ; 5295a (14:695a)
+HereYouGoTextPtr:
 	TX_FAR _HereYouGoText
 	db $0D
 	db "@"
 
-SoYouWantPrizeTextPtr: ; 52960 (14:6960)
+SoYouWantPrizeTextPtr:
 	TX_FAR _SoYouWantPrizeText
 	db "@"
 
-SorryNeedMoreCoinsText: ; 52965 (14:6965)
+SorryNeedMoreCoinsText:
 	TX_FAR _SorryNeedMoreCoinsText
 	db $0D
 	db "@"
 
-PrizeRoomBagIsFullTextPtr: ; 5296b (14:696b)
+PrizeRoomBagIsFullTextPtr:
 	TX_FAR _OopsYouDontHaveEnoughRoomText
 	db $0D
 	db "@"
 
-OhFineThenTextPtr: ; 52971 (14:6971)
+OhFineThenTextPtr:
 	TX_FAR _OhFineThenText
 	db $0D ; wait keypress (A/B) without blink
 	db "@"
 
-GetPrizeMonLevel: ; 52977 (14:6977)
+GetPrizeMonLevel:
 	ld a,[wcf91]
 	ld b,a
 	ld hl,PrizeMonLevelDictionary
--- a/engine/menu/start_menu.asm
+++ b/engine/menu/start_menu.asm
@@ -1,4 +1,4 @@
-DisplayStartMenu:: ; 2acd (0:2acd)
+DisplayStartMenu::
 	ld a,BANK(StartMenu_Pokedex)
 	ld [H_LOADEDROMBANK],a
 	ld [MBC1RomBank],a
@@ -7,7 +7,7 @@
 	ld a, SFX_START_MENU
 	call PlaySound
 
-RedisplayStartMenu:: ; 2adf (0:2adf)
+RedisplayStartMenu::
 	callba DrawStartMenu
 	callba PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone
 	call UpdateSprites
@@ -76,7 +76,7 @@
 	jp z,StartMenu_Option
 
 ; EXIT falls through to here
-CloseStartMenu:: ; 2b70 (0:2b70)
+CloseStartMenu::
 	call Joypad
 	ld a,[hJoyPressed]
 	bit 0,a ; was A button newly pressed?
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -1,4 +1,4 @@
-StartMenu_Pokedex: ; 13095 (4:7095)
+StartMenu_Pokedex:
 	predef ShowPokedexMenu
 	call LoadScreenTilesFromBuffer2 ; restore saved screen
 	call Delay3
@@ -6,7 +6,7 @@
 	call UpdateSprites
 	jp RedisplayStartMenu
 
-StartMenu_Pokemon: ; 130a9 (4:70a9)
+StartMenu_Pokemon:
 	ld a,[wPartyCount]
 	and a
 	jp z,RedisplayStartMenu
@@ -284,7 +284,7 @@
 	db "@"
 
 ; writes a blank tile to all possible menu cursor positions on the party menu
-ErasePartyMenuCursors: ; 132ed (4:72ed)
+ErasePartyMenuCursors:
 	coord hl, 0, 1
 	ld bc,2 * 20 ; menu cursor positions are 2 rows apart
 	ld a,6 ; 6 menu cursor positions
@@ -295,11 +295,11 @@
 	jr nz,.loop
 	ret
 
-ItemMenuLoop: ; 132fc (4:72fc)
+ItemMenuLoop:
 	call LoadScreenTilesFromBuffer2DisableBGTransfer ; restore saved screen
 	call RunDefaultPaletteCommand
 
-StartMenu_Item: ; 13302 (4:7302)
+StartMenu_Item:
 	ld a,[wLinkState]
 	dec a ; is the player in the Colosseum or Trade Centre?
 	jr nz,.notInCableClubRoom
@@ -438,16 +438,16 @@
 .tossZeroItems
 	jp ItemMenuLoop
 
-CannotUseItemsHereText: ; 1342a (4:742a)
+CannotUseItemsHereText:
 	TX_FAR _CannotUseItemsHereText
 	db "@"
 
-CannotGetOffHereText: ; 1342f (4:742f)
+CannotGetOffHereText:
 	TX_FAR _CannotGetOffHereText
 	db "@"
 
 ; items which bring up the party menu when used
-UsableItems_PartyMenu: ; 13434 (4:7434)
+UsableItems_PartyMenu:
 	db MOON_STONE
 	db ANTIDOTE
 	db BURN_HEAL
@@ -487,7 +487,7 @@
 	db $ff
 
 ; items which close the item menu when used
-UsableItems_CloseMenu: ; 13459 (4:7459)
+UsableItems_CloseMenu:
 	db ESCAPE_ROPE
 	db ITEMFINDER
 	db POKE_FLUTE
@@ -496,7 +496,7 @@
 	db SUPER_ROD
 	db $ff
 
-StartMenu_TrainerInfo: ; 13460 (4:7460)
+StartMenu_TrainerInfo:
 	call GBPalWhiteOut
 	call ClearScreen
 	call UpdateSprites
@@ -521,7 +521,7 @@
 	jp RedisplayStartMenu
 
 ; loads tile patterns and draws everything except for gym leader faces / badges
-DrawTrainerInfo: ; 1349a (4:749a)
+DrawTrainerInfo:
 	ld de,RedPicFront
 	lb bc, BANK(RedPicFront), $01
 	predef DisplayPicCenteredOrUpperRight
@@ -610,17 +610,17 @@
 	lb bc, LEADING_ZEROES | 1, 2
 	jp PrintNumber
 
-TrainerInfo_FarCopyData: ; 1357f (4:757f)
+TrainerInfo_FarCopyData:
 	ld a,BANK(TrainerInfoTextBoxTileGraphics)
 	jp FarCopyData2
 
-TrainerInfo_NameMoneyTimeText: ; 13584 (4:7584)
+TrainerInfo_NameMoneyTimeText:
 	db   "NAME/"
 	next "MONEY/"
 	next "TIME/@"
 
 ; $76 is a circle tile
-TrainerInfo_BadgesText: ; 13597 (4:7597)
+TrainerInfo_BadgesText:
 	db $76,"BADGES",$76,"@"
 
 ; draws a text box on the trainer info screen
@@ -630,7 +630,7 @@
 ; [wTrainerInfoTextBoxWidthPlus1] = width
 ; [wTrainerInfoTextBoxWidth] = width - 1
 ; [wTrainerInfoTextBoxNextRowOffset] = distance from the end of a text box row to the start of the next
-TrainerInfo_DrawTextBox: ; 135a0 (4:75a0)
+TrainerInfo_DrawTextBox:
 	ld a,$79 ; upper left corner tile ID
 	lb de, $7a, $7b ; top edge and upper right corner tile ID's
 	call TrainerInfo_DrawHorizontalEdge ; draw top edge
@@ -649,7 +649,7 @@
 	ld a,$7d ; lower left corner tile ID
 	lb de,$77, $7e ; bottom edge and lower right corner tile ID's
 
-TrainerInfo_DrawHorizontalEdge: ; 135c3 (4:75c3)
+TrainerInfo_DrawHorizontalEdge:
 	ld [hli],a ; place left corner tile
 	ld a,[wTrainerInfoTextBoxWidth]
 	ld c,a
@@ -662,7 +662,7 @@
 	ld [hl],a ; place right corner tile
 	ret
 
-TrainerInfo_NextTextBoxRow: ; 135d0 (4:75d0)
+TrainerInfo_NextTextBoxRow:
 	ld a,[wTrainerInfoTextBoxNextRowOffset] ; distance to the start of the next row
 .loop
 	inc hl
@@ -674,7 +674,7 @@
 ; INPUT:
 ; hl = address of top tile in the line
 ; a = tile ID
-TrainerInfo_DrawVerticalLine: ; 135d8 (4:75d8)
+TrainerInfo_DrawVerticalLine:
 	ld de,20
 	ld c,8
 .loop
@@ -684,7 +684,7 @@
 	jr nz,.loop
 	ret
 
-StartMenu_SaveReset: ; 135e3 (4:75e3)
+StartMenu_SaveReset:
 	ld a,[wd72e]
 	bit 6,a ; is the player using the link feature?
 	jp nz,Init
@@ -692,7 +692,7 @@
 	call LoadScreenTilesFromBuffer2 ; restore saved screen
 	jp HoldTextDisplayOpen
 
-StartMenu_Option: ; 135f6 (4:75f6)
+StartMenu_Option:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a
 	call ClearScreen
@@ -703,7 +703,7 @@
 	call UpdateSprites
 	jp RedisplayStartMenu
 
-SwitchPartyMon: ; 13613 (4:7613)
+SwitchPartyMon:
 	call SwitchPartyMon_InitVarOrSwapData ; swap data
 	ld a, [wSwappedMenuItem]
 	call SwitchPartyMon_ClearGfx
@@ -711,7 +711,7 @@
 	call SwitchPartyMon_ClearGfx
 	jp RedrawPartyMenu_
 
-SwitchPartyMon_ClearGfx: ; 13625 (4:7625)
+SwitchPartyMon_ClearGfx:
 	push af
 	coord hl, 0, 0
 	ld bc, SCREEN_WIDTH * 2
@@ -737,7 +737,7 @@
 	ld a, SFX_SWAP
 	jp PlaySound
 
-SwitchPartyMon_InitVarOrSwapData: ; 13653 (4:7653)
+SwitchPartyMon_InitVarOrSwapData:
 ; This is used to initialise [wMenuItemToSwap] and to actually swap the data.
 	ld a, [wMenuItemToSwap]
 	and a ; has [wMenuItemToSwap] been initialised yet?
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -1,15 +1,15 @@
-DrawHP: ; 128ef (4:68ef)
+DrawHP:
 ; Draws the HP bar in the stats screen
 	call GetPredefRegisters
 	ld a, $1
 	jr DrawHP_
 
-DrawHP2: ; 128f6 (4:68f6)
+DrawHP2:
 ; Draws the HP bar in the party screen
 	call GetPredefRegisters
 	ld a, $2
 
-DrawHP_: ; 128fb (4:68fb)
+DrawHP_:
 	ld [wHPBarType], a
 	push hl
 	ld a, [wLoadedMonHP]
@@ -63,7 +63,7 @@
 
 
 ; Predef 0x37
-StatusScreen: ; 12953 (4:6953)
+StatusScreen:
 	call LoadMonData
 	ld a, [wMonDataLocation]
 	cp BOX_DATA
@@ -192,34 +192,34 @@
 	ld a, [wWhichPokemon]
 	jp SkipFixedLengthTextEntries
 
-OTPointers: ; 12a95 (4:6a95)
+OTPointers:
 	dw wPartyMonOT
 	dw wEnemyMonOT
 	dw wBoxMonOT
 	dw wDayCareMonOT
 
-NamePointers2: ; 12a9d (4:6a9d)
+NamePointers2:
 	dw wPartyMonNicks
 	dw wEnemyMonNicks
 	dw wBoxMonNicks
 	dw wDayCareMonName
 
-Type1Text: ; 12aa5 (4:6aa5)
+Type1Text:
 	db "TYPE1/", $4e
 
-Type2Text: ; 12aac (4:6aac)
+Type2Text:
 	db "TYPE2/", $4e
 
-IDNoText: ; 12ab3 (4:6ab3)
+IDNoText:
 	db $73, "№", "/", $4e
 
-OTText: ; 12ab7 (4:6ab7)
+OTText:
 	db "OT/", $4e, "@"
 
-StatusText: ; 12abc (4:6abc)
+StatusText:
 	db "STATUS/@"
 
-OKText: ; 12ac4 (4:6ac4)
+OKText:
 	db "OK@"
 
 ; Draws a line starting from hl high b and wide c
@@ -244,7 +244,7 @@
 	INCBIN "gfx/p_tile.1bpp"
 PTileEnd:
 
-PrintStatsBox: ; 12ae4 (4:6ae4)
+PrintStatsBox:
 	ld a, d
 	and a ; a is 0 from the status screen
 	jr nz, .DifferentBox
@@ -287,13 +287,13 @@
 	add hl, de
 	ret
 
-StatsText: ; 12b3a (4:6b3a)
+StatsText:
 	db   "ATTACK"
 	next "DEFENSE"
 	next "SPEED"
 	next "SPECIAL@"
 
-StatusScreen2: ; 12b57 (4:6b57)
+StatusScreen2:
 	ld a, [hTilesetType]
 	push af
 	xor a
@@ -435,7 +435,7 @@
 	call GBPalWhiteOut
 	jp ClearScreen
 
-CalcExpToLevelUp: ; 12c86 (4:6c86)
+CalcExpToLevelUp:
 	ld a, [wLoadedMonLevel]
 	cp MAX_LEVEL
 	jr z, .atMaxLevel
@@ -461,16 +461,16 @@
 	ld [hl], a
 	ret
 
-StatusScreenExpText: ; 12caf (4:6caf)
+StatusScreenExpText:
 	db   "EXP POINTS"
 	next "LEVEL UP@"
 
-StatusScreen_ClearName: ; 12cc3 (4:6cc3)
+StatusScreen_ClearName:
 	ld bc, 10
 	ld a, " "
 	jp FillMemory
 
-StatusScreen_PrintPP: ; 12ccb (4:6ccb)
+StatusScreen_PrintPP:
 ; print PP or -- c times, going down two rows each time
 	ld [hli], a
 	ld [hld], a
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -1,4 +1,4 @@
-VendingMachineMenu: ; 74ee0 (1d:4ee0)
+VendingMachineMenu:
 	ld hl, VendingMachineText1
 	call PrintText
 	ld a, MONEY_BOX
@@ -80,38 +80,38 @@
 	ld hl, VendingMachineText7
 	jp PrintText
 
-VendingMachineText1: ; 74f99 (1d:4f99)
+VendingMachineText1:
 	TX_FAR _VendingMachineText1
 	db "@"
 
-DrinkText: ; 74f9e (1d:4f9e)
+DrinkText:
 	db   "FRESH WATER"
 	next "SODA POP"
 	next "LEMONADE"
 	next "CANCEL@"
 
-DrinkPriceText: ; 74fc3 (1d:4fc3)
+DrinkPriceText:
 	db   "¥200"
 	next "¥300"
 	next "¥350",$4E,"@"
 
-VendingMachineText4: ; 74fd3 (1d:4fd3)
+VendingMachineText4:
 	TX_FAR _VendingMachineText4
 	db "@"
 
-VendingMachineText5: ; 74fd8 (1d:4fd8)
+VendingMachineText5:
 	TX_FAR _VendingMachineText5
 	db "@"
 
-VendingMachineText6: ; 74fdd (1d:4fdd)
+VendingMachineText6:
 	TX_FAR _VendingMachineText6
 	db "@"
 
-VendingMachineText7: ; 74fe2 (1d:4fe2)
+VendingMachineText7:
 	TX_FAR _VendingMachineText7
 	db "@"
 
-LoadVendingMachineItem: ; 74fe7 (1d:4fe7)
+LoadVendingMachineItem:
 	ld hl, VendingPrices
 	ld a, [wCurrentMenuItem]
 	add a
@@ -129,7 +129,7 @@
 	ld [hVendingMachinePrice + 2], a
 	ret
 
-VendingPrices: ; 75000 (1d:5000)
+VendingPrices:
 	db FRESH_WATER,$00,$02,$00
 	db SODA_POP,   $00,$03,$00
 	db LEMONADE,   $00,$03,$50
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -1,4 +1,4 @@
-AnimatePartyMon_ForceSpeed1: ; 716f7 (1c:56f7)
+AnimatePartyMon_ForceSpeed1:
 	xor a
 	ld [wCurrentMenuItem], a
 	ld b, a
@@ -9,7 +9,7 @@
 ; 0: green
 ; 1: yellow
 ; 2: red
-AnimatePartyMon: ; 716ff (1c:56ff)
+AnimatePartyMon:
 	ld hl, wPartyMenuHPBarColors
 	ld a, [wCurrentMenuItem]
 	ld c, a
@@ -17,7 +17,7 @@
 	add hl, bc
 	ld a, [hl]
 
-GetAnimationSpeed: ; 7170a (1c:570a)
+GetAnimationSpeed:
 	ld c, a
 	ld hl, PartyMonSpeeds
 	add hl, bc
@@ -85,15 +85,15 @@
 ; The members of the PartyMonSpeeds array specify the number of V-blanks
 ; that each frame lasts for green HP, yellow HP, and red HP in order.
 ; On the naming screen, the yellow HP speed is always used.
-PartyMonSpeeds: ; 71769 (1c:5769)
+PartyMonSpeeds:
 	db 5, 16, 32
 
-LoadMonPartySpriteGfx: ; 7176c (1c:576c)
+LoadMonPartySpriteGfx:
 ; Load mon party sprite tile patterns into VRAM during V-blank.
 	ld hl, MonPartySpritePointers
 	ld a, $1c
 
-LoadAnimSpriteGfx: ; 71771 (1c:5771)
+LoadAnimSpriteGfx:
 ; Load animated sprite tile patterns into VRAM during V-blank. hl is the address
 ; of an array of structures that contain arguments for CopyVideoData and a is
 ; the number of structures in the array.
@@ -125,7 +125,7 @@
 	jr nz, .loop
 	ret
 
-LoadMonPartySpriteGfxWithLCDDisabled: ; 71791 (1c:5791)
+LoadMonPartySpriteGfxWithLCDDisabled:
 ; Load mon party sprite tile patterns into VRAM immediately by disabling the
 ; LCD.
 	call DisableLCD
@@ -162,7 +162,7 @@
 	jr nz, .asm_7179c
 	jp EnableLCD
 
-MonPartySpritePointers: ; 717c0 (1c:57c0)
+MonPartySpritePointers:
 	dw SlowbroSprite + $c0
 	db $40 / $10 ; 40 bytes
 	db BANK(SlowbroSprite)
@@ -303,7 +303,7 @@
 	db BANK(MonPartySprites)
 	dw vSprites + $780
 
-WriteMonPartySpriteOAMByPartyIndex: ; 71868 (1c:5868)
+WriteMonPartySpriteOAMByPartyIndex:
 ; Write OAM blocks for the party mon in [hPartyMonIndex].
 	push hl
 	push de
@@ -322,7 +322,7 @@
 	pop hl
 	ret
 
-WriteMonPartySpriteOAMBySpecies: ; 71882 (1c:5882)
+WriteMonPartySpriteOAMBySpecies:
 ; Write OAM blocks for the party sprite of the species in
 ; [wMonPartySpriteSpecies].
 	xor a
@@ -332,7 +332,7 @@
 	ld [wOAMBaseTile], a
 	jr WriteMonPartySpriteOAM
 
-UnusedPartyMonSpriteFunction: ; 71890 (1c:5890)
+UnusedPartyMonSpriteFunction:
 ; This function is unused and doesn't appear to do anything useful. It looks
 ; like it may have been intended to load the tile patterns and OAM data for
 ; the mon party sprite associated with the species in [wcf91].
@@ -370,7 +370,7 @@
 	pop hl
 	jp CopyVideoData
 
-WriteMonPartySpriteOAM: ; 718c3 (1c:58c3)
+WriteMonPartySpriteOAM:
 ; Write the OAM blocks for the first animation frame into the OAM buffer and
 ; make a copy at wMonPartySpritesSavedOAM.
 	push af
@@ -396,7 +396,7 @@
 	ld bc, $60
 	jp CopyData
 
-GetPartyMonSpriteID: ; 718e9 (1c:58e9)
+GetPartyMonSpriteID:
 	ld [wd11e], a
 	predef IndexToPokedex
 	ld a, [wd11e]
@@ -419,5 +419,5 @@
 
 INCLUDE "data/mon_party_sprites.asm"
 
-MonPartySprites: ; 71959 (1c:5959)
+MonPartySprites:
 	INCBIN "gfx/mon_ow_sprites.2bpp"
--- a/engine/multiply_divide.asm
+++ b/engine/multiply_divide.asm
@@ -1,4 +1,4 @@
-_Multiply: ; 37d41 (d:7d41)
+_Multiply:
 	ld a, $8
 	ld b, a
 	xor a
@@ -59,7 +59,7 @@
 	ld [H_PRODUCT], a
 	ret
 
-_Divide: ; 37da5 (d:7da5)
+_Divide:
 	xor a
 	ld [H_DIVIDEBUFFER], a
 	ld [H_DIVIDEBUFFER+1], a
--- a/engine/oak_speech.asm
+++ b/engine/oak_speech.asm
@@ -1,4 +1,4 @@
-SetDefaultNames: ; 60ca (1:60ca)
+SetDefaultNames:
 	ld a, [wLetterPrintingDelayFlags]
 	push af
 	ld a, [wOptions]
@@ -31,7 +31,7 @@
 	ld bc, NAME_LENGTH
 	jp CopyData
 
-OakSpeech: ; 6115 (1:6115)
+OakSpeech:
 	ld a,$FF
 	call PlaySound ; stop music
 	ld a, BANK(Music_Routes2)
@@ -152,25 +152,25 @@
 	call DelayFrames
 	call GBFadeOutToWhite
 	jp ClearScreen
-OakSpeechText1: ; 6253 (1:6253)
+OakSpeechText1:
 	TX_FAR _OakSpeechText1
 	db "@"
-OakSpeechText2: ; 6258 (1:6258)
+OakSpeechText2:
 	TX_FAR _OakSpeechText2A
 	db $14 ; play NIDORINA cry from TextCommandSounds
 	TX_FAR _OakSpeechText2B
 	db "@"
-IntroducePlayerText: ; 6262 (1:6262)
+IntroducePlayerText:
 	TX_FAR _IntroducePlayerText
 	db "@"
-IntroduceRivalText: ; 6267 (1:6267)
+IntroduceRivalText:
 	TX_FAR _IntroduceRivalText
 	db "@"
-OakSpeechText3: ; 626c (1:626c)
+OakSpeechText3:
 	TX_FAR _OakSpeechText3
 	db "@"
 
-FadeInIntroPic: ; 6271 (1:6271)
+FadeInIntroPic:
 	ld hl,IntroFadePalettes
 	ld b,6
 .next
@@ -182,7 +182,7 @@
 	jr nz,.next
 	ret
 
-IntroFadePalettes: ; 6282 (1:6282)
+IntroFadePalettes:
 	db %01010100
 	db %10101000
 	db %11111100
@@ -190,7 +190,7 @@
 	db %11110100
 	db %11100100
 
-MovePicLeft: ; 6288 (1:6288)
+MovePicLeft:
 	ld a,119
 	ld [rWX],a
 	call DelayFrame
@@ -206,9 +206,9 @@
 	ld [rWX],a
 	jr .next
 
-DisplayPicCenteredOrUpperRight: ; 62a1 (1:62a1)
+DisplayPicCenteredOrUpperRight:
 	call GetPredefRegisters
-IntroDisplayPicCenteredOrUpperRight: ; 62a4 (1:62a4)
+IntroDisplayPicCenteredOrUpperRight:
 ; b = bank
 ; de = address of compressed pic
 ; c: 0 = centred, non-zero = upper-right
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -1,4 +1,4 @@
-ChoosePlayerName: ; 695d (1:695d)
+ChoosePlayerName:
 	call OakSpeechSlidePicRight
 	ld de, DefaultNamesPlayer
 	call DisplayIntroNameTextBox
@@ -27,11 +27,11 @@
 	ld hl, YourNameIsText
 	jp PrintText
 
-YourNameIsText: ; 699f (1:699f)
+YourNameIsText:
 	TX_FAR _YourNameIsText
 	db "@"
 
-ChooseRivalName: ; 69a4 (1:69a4)
+ChooseRivalName:
 	call OakSpeechSlidePicRight
 	ld de, DefaultNamesRival
 	call DisplayIntroNameTextBox
@@ -60,11 +60,11 @@
 	ld hl, HisNameIsText
 	jp PrintText
 
-HisNameIsText: ; 69e7 (1:69e7)
+HisNameIsText:
 	TX_FAR _HisNameIsText
 	db "@"
 
-OakSpeechSlidePicLeft: ; 69ec (1:69ec)
+OakSpeechSlidePicLeft:
 	push de
 	coord hl, 0, 0
 	lb bc, 12, 11
@@ -81,12 +81,12 @@
 	ld a, $ff
 	jr OakSpeechSlidePicCommon
 
-OakSpeechSlidePicRight: ; 6a12 (1:6a12)
+OakSpeechSlidePicRight:
 	coord hl, 5, 4
 	lb de, 6, 6 * SCREEN_WIDTH + 5
 	xor a
 
-OakSpeechSlidePicCommon: ; 6a19 (1:6a19)
+OakSpeechSlidePicCommon:
 	push hl
 	push de
 	push bc
@@ -159,7 +159,7 @@
 	pop hl
 	ret
 
-DisplayIntroNameTextBox: ; 6a6c (1:6a6c)
+DisplayIntroNameTextBox:
 	push de
 	coord hl, 0, 0
 	ld b, $a
@@ -188,7 +188,7 @@
 	db "NAME@"
 
 IF DEF(_RED)
-DefaultNamesPlayer: ; 6aa8 (1:6aa8)
+DefaultNamesPlayer:
 	db   "NEW NAME"
 	next "RED"
 	next "ASH"
@@ -195,7 +195,7 @@
 	next "JACK"
 	db   "@"
 
-DefaultNamesRival: ; 6abe (1:6abe)
+DefaultNamesRival:
 	db   "NEW NAME"
 	next "BLUE"
 	next "GARY"
@@ -204,7 +204,7 @@
 ENDC
 
 IF DEF(_BLUE)
-DefaultNamesPlayer: ; 6aa8 (1:6aa8)
+DefaultNamesPlayer:
 	db   "NEW NAME"
 	next "BLUE"
 	next "GARY"
@@ -211,7 +211,7 @@
 	next "JOHN"
 	db   "@"
 
-DefaultNamesRival: ; 6abe (1:6abe)
+DefaultNamesRival:
 	db   "NEW NAME"
 	next "RED"
 	next "ASH"
@@ -219,7 +219,7 @@
 	db   "@"
 ENDC
 
-GetDefaultName: ; 6ad6 (1:6ad6)
+GetDefaultName:
 ; a = name index
 ; hl = name list
 	ld b, a
@@ -244,12 +244,12 @@
 	jp CopyData
 
 IF DEF(_RED)
-DefaultNamesPlayerList: ; 6af2 (1:6af2)
+DefaultNamesPlayerList:
 	db "NEW NAME@"
 	db "RED@"
 	db "ASH@"
 	db "JACK@"
-DefaultNamesRivalList: ; 6b08 (1:6b08)
+DefaultNamesRivalList:
 	db "NEW NAME@"
 	db "BLUE@"
 	db "GARY@"
@@ -256,12 +256,12 @@
 	db "JOHN@"
 ENDC
 IF DEF(_BLUE)
-DefaultNamesPlayerList: ; 6af2 (1:6af2)
+DefaultNamesPlayerList:
 	db "NEW NAME@"
 	db "BLUE@"
 	db "GARY@"
 	db "JOHN@"
-DefaultNamesRivalList: ; 6b08 (1:6b08)
+DefaultNamesRivalList:
 	db "NEW NAME@"
 	db "RED@"
 	db "ASH@"
@@ -268,5 +268,5 @@
 	db "JACK@"
 ENDC
 
-TextTerminator_6b20: ; 6b20 (1:6b20)
+TextTerminator_6b20:
 	db "@"
--- a/engine/overworld/cable_club_npc.asm
+++ b/engine/overworld/cable_club_npc.asm
@@ -1,4 +1,4 @@
-CableClubNPC: ; 71c5 (1:71c5)
+CableClubNPC:
 	ld hl, CableClubNPCWelcomeText
 	call PrintText
 	CheckEvent EVENT_GOT_POKEDEX
@@ -109,35 +109,35 @@
 	ld [hl], a
 	jpab LinkMenu
 
-CableClubNPCAreaReservedFor2FriendsLinkedByCableText: ; 72b3 (1:72b3)
+CableClubNPCAreaReservedFor2FriendsLinkedByCableText:
 	TX_FAR _CableClubNPCAreaReservedFor2FriendsLinkedByCableText
 	db "@"
 
-CableClubNPCWelcomeText: ; 72b8 (1:72b8)
+CableClubNPCWelcomeText:
 	TX_FAR _CableClubNPCWelcomeText
 	db "@"
 
-CableClubNPCPleaseApplyHereHaveToSaveText: ; 72bd (1:72bd)
+CableClubNPCPleaseApplyHereHaveToSaveText:
 	TX_FAR _CableClubNPCPleaseApplyHereHaveToSaveText
 	db "@"
 
-CableClubNPCPleaseWaitText: ; 72c2 (1:72c2)
+CableClubNPCPleaseWaitText:
 	TX_FAR _CableClubNPCPleaseWaitText
 	db $a, "@"
 
-CableClubNPCLinkClosedBecauseOfInactivityText: ; 72c8 (1:72c8)
+CableClubNPCLinkClosedBecauseOfInactivityText:
 	TX_FAR _CableClubNPCLinkClosedBecauseOfInactivityText
 	db "@"
 
-CableClubNPCPleaseComeAgainText: ; 72cd (1:72cd)
+CableClubNPCPleaseComeAgainText:
 	TX_FAR _CableClubNPCPleaseComeAgainText
 	db "@"
 
-CableClubNPCMakingPreparationsText: ; 72d2 (1:72d2)
+CableClubNPCMakingPreparationsText:
 	TX_FAR _CableClubNPCMakingPreparationsText
 	db "@"
 
-CloseLinkConnection: ; 72d7 (1:72d7)
+CloseLinkConnection:
 	call Delay3
 	ld a, CONNECTION_NOT_ESTABLISHED
 	ld [hSerialConnectionStatus], a
--- a/engine/overworld/card_key.asm
+++ b/engine/overworld/card_key.asm
@@ -1,4 +1,4 @@
-PrintCardKeyText: ; 52673 (14:6673)
+PrintCardKeyText:
 	ld hl, SilphCoMapList
 	ld a, [wCurMap]
 	ld b, a
@@ -58,7 +58,7 @@
 	ld [hSpriteIndexOrTextID], a
 	jp PrintPredefTextID
 
-SilphCoMapList: ; 526e3 (14:66e3)
+SilphCoMapList:
 	db SILPH_CO_2F
 	db SILPH_CO_3F
 	db SILPH_CO_4F
@@ -71,19 +71,19 @@
 	db SILPH_CO_11F
 	db $FF
 
-CardKeySuccessText: ; 526ee (14:66ee)
+CardKeySuccessText:
 	TX_FAR _CardKeySuccessText1
 	db $0b
 	TX_FAR _CardKeySuccessText2
 	db "@"
 
-CardKeyFailText: ; 526f8 (14:66f8)
+CardKeyFailText:
 	TX_FAR _CardKeyFailText
 	db "@"
 
 ; d = Y
 ; e = X
-GetCoordsInFrontOfPlayer: ; 526fd (14:66fd)
+GetCoordsInFrontOfPlayer:
 	ld a, [wYCoord]
 	ld d, a
 	ld a, [wXCoord]
--- a/engine/overworld/cinnabar_lab.asm
+++ b/engine/overworld/cinnabar_lab.asm
@@ -1,4 +1,4 @@
-GiveFossilToCinnabarLab: ; 61006 (18:5006)
+GiveFossilToCinnabarLab:
 	ld hl, wd730
 	set 6, [hl]
 	xor a
@@ -72,23 +72,23 @@
 	call PrintText
 	ret
 
-LabFossil_610ae: ; 610ae (18:50ae)
+LabFossil_610ae:
 	TX_FAR _Lab4Text_610ae
 	db "@"
 
-LabFossil_610b3: ; 610b3 (18:50b3)
+LabFossil_610b3:
 	TX_FAR _Lab4Text_610b3
 	db "@"
 
-LabFossil_610b8: ; 610b8 (18:50b8)
+LabFossil_610b8:
 	TX_FAR _Lab4Text_610b8
 	db "@"
 
-LabFossil_610bd: ; 610bd (18:50bd)
+LabFossil_610bd:
 	TX_FAR _Lab4Text_610bd
 	db "@"
 
-PrintFossilsInBag: ; 610c2 (18:50c2)
+PrintFossilsInBag:
 ; Prints each fossil in the player's bag on a separate line in the menu.
 	ld hl, wFilteredBagItems
 	xor a
@@ -112,7 +112,7 @@
 	jr .loop
 
 ; loads the names of the fossil item and the resulting mon
-LoadFossilItemAndMonName: ; 610eb (18:50eb)
+LoadFossilItemAndMonName:
 	ld a, [wFossilMon]
 	ld [wd11e], a
 	call GetMonName
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
@@ -1,4 +1,4 @@
-UsedCut: ; ef54 (3:6f54)
+UsedCut:
 	xor a
 	ld [wActionResultOrTookBattleTurn], a ; initialise to failure value
 	ld a, [wCurMapTileset]
@@ -67,11 +67,11 @@
 	call UpdateSprites
 	jp RedrawMapView
 
-UsedCutText: ; eff2 (3:6ff2)
+UsedCutText:
 	TX_FAR _UsedCutText
 	db "@"
 
-InitCutAnimOAM: ; eff7 (3:6ff7)
+InitCutAnimOAM:
 	xor a
 	ld [wWhichAnimationOffsets], a
 	ld a, $e4
@@ -111,22 +111,22 @@
 	jr nz, .loop
 	ret
 
-LoadCutGrassAnimationTilePattern: ; f04c (3:704c)
+LoadCutGrassAnimationTilePattern:
 	ld de, AnimationTileset2 + $60 ; tile depicting a leaf
 	lb bc, BANK(AnimationTileset2), $01
 	jp CopyVideoData
 
-WriteCutOrBoulderDustAnimationOAMBlock: ; f055 (3:7055)
+WriteCutOrBoulderDustAnimationOAMBlock:
 	call GetCutOrBoulderDustAnimationOffsets
 	ld a, $9
 	ld de, CutOrBoulderDustAnimationTilesAndAttributes
 	jp WriteOAMBlock
 
-CutOrBoulderDustAnimationTilesAndAttributes: ; f060 (3:7060)
+CutOrBoulderDustAnimationTilesAndAttributes:
 	db $FC,$10,$FD,$10
 	db $FE,$10,$FF,$10
 
-GetCutOrBoulderDustAnimationOffsets: ; f068 (3:7068)
+GetCutOrBoulderDustAnimationOffsets:
 	ld hl, wSpriteStateData1 + 4
 	ld a, [hli] ; player's sprite screen Y position
 	ld b, a
@@ -157,7 +157,7 @@
 	ld c, a
 	ret
 
-CutAnimationOffsets: ; f08f (3:708f)
+CutAnimationOffsets:
 ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn
 	db  8, 36 ; player is facing down
 	db  8,  4 ; player is facing up
@@ -164,7 +164,7 @@
 	db -8, 20 ; player is facing left
 	db 24, 20 ; player is facing right
 
-BoulderDustAnimationOffsets: ; f097 (3:7097)
+BoulderDustAnimationOffsets:
 ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn
 ; These offsets represent 2 blocks away from the player
 	db  8,  52 ; player is facing down
@@ -172,7 +172,7 @@
 	db -24, 20 ; player is facing left
 	db 40,  20 ; player is facing right
 
-ReplaceTreeTileBlock: ; f09f (3:709f)
+ReplaceTreeTileBlock:
 ; Determine the address of the tile block that contains the tile in front of the
 ; player (i.e. where the tree is) and replace it with the corresponding tile
 ; block that doesn't have the tree.
@@ -248,7 +248,7 @@
 	ld [hl], a
 	ret
 
-CutTreeBlockSwaps: ; f100 (3:7100)
+CutTreeBlockSwaps:
 ; first byte = tileset block containing the cut tree
 ; second byte = corresponding tileset block after the cut animation happens
 	db $32, $6D
--- a/engine/overworld/cut2.asm
+++ b/engine/overworld/cut2.asm
@@ -1,4 +1,4 @@
-AnimCut: ; 79e96 (1e:5e96)
+AnimCut:
 	ld a, [wCutTile]
 	cp $52
 	jr z, .grass
@@ -43,7 +43,7 @@
 	jr nz, .cutGrassLoop
 	ret
 
-AnimCutGrass_UpdateOAMEntries: ; 79eed (1e:5eed)
+AnimCutGrass_UpdateOAMEntries:
 	push bc
 	ld hl, wOAMBuffer + $91
 	ld a, 1
@@ -74,7 +74,7 @@
 	jr nz, AnimCutGrass_UpdateOAMEntries
 	ret
 
-AnimCutGrass_SwapOAMEntries: ; 79f30 (1e:5f30)
+AnimCutGrass_SwapOAMEntries:
 	ld hl, wOAMBuffer + $90
 	ld de, wBuffer
 	ld bc, $8
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -1,5 +1,5 @@
 ; returns whether the player is standing on a door tile in carry
-IsPlayerStandingOnDoorTile: ; 1a609 (6:6609)
+IsPlayerStandingOnDoorTile:
 	push de
 	ld hl, DoorTileIDPointers
 	ld a, [wCurMapTileset]
@@ -25,7 +25,7 @@
 	and a
 	ret
 
-DoorTileIDPointers: ; 1a62c (6:662c)
+DoorTileIDPointers:
 	dbw OVERWORLD,   OverworldDoorTileIDs
 	dbw FOREST,      ForestDoorTileIDs
 	dbw MART,        MartDoorTileIDs
@@ -41,35 +41,35 @@
 	dbw PLATEAU,     PlateauDoorTileIDs
 	db $ff
 
-OverworldDoorTileIDs: ; 1a654 (6:6654)
+OverworldDoorTileIDs:
 	db $1B,$58,$00
 
-ForestDoorTileIDs: ; 1a657 (6:6657)
+ForestDoorTileIDs:
 	db $3a,$00
 
-MartDoorTileIDs: ; 1a659 (6:6659)
+MartDoorTileIDs:
 	db $5e,$00
 
-HouseDoorTileIDs: ; 1a65b (6:665b)
+HouseDoorTileIDs:
 	db $54,$00
 
-TilesetMuseumDoorTileIDs: ; 1a65d (6:665d)
+TilesetMuseumDoorTileIDs:
 	db $3b,$00
 
-ShipDoorTileIDs: ; 1a65f (6:665f)
+ShipDoorTileIDs:
 	db $1e,$00
 
-LobbyDoorTileIDs: ; 1a661 (6:6661)
+LobbyDoorTileIDs:
 	db $1c,$38,$1a,$00
 
-MansionDoorTileIDs: ; 1a665 (6:6665)
+MansionDoorTileIDs:
 	db $1a,$1c,$53,$00
 
-LabDoorTileIDs: ; 1a669 (6:6669)
+LabDoorTileIDs:
 	db $34,$00
 
-FacilityDoorTileIDs: ; 1a66b (6:666b)
+FacilityDoorTileIDs:
 	db $43,$58,$1b,$00
 
-PlateauDoorTileIDs: ; 1a66f (6:666f)
+PlateauDoorTileIDs:
 	db $3b,$1b,$00
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -1,4 +1,4 @@
-ShakeElevator: ; 7bf15 (1e:7f15)
+ShakeElevator:
 	ld de, -$20
 	call ShakeElevatorRedrawRow
 	ld de, SCREEN_HEIGHT * $20
@@ -39,7 +39,7 @@
 	call UpdateSprites
 	jp PlayDefaultMusic
 
-ShakeElevatorRedrawRow: ; 7bf64 (1e:7f64)
+ShakeElevatorRedrawRow:
 ; This function is used to redraw certain portions of the screen, but it does
 ; not appear to ever result in any visible effect, so this function seems to
 ; be pointless.
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -1,4 +1,4 @@
-EmotionBubble: ; 17c47 (5:7c47)
+EmotionBubble:
 	ld a, [wWhichEmotionBubble]
 	ld c, a
 	ld b, 0
@@ -61,14 +61,14 @@
 	call DelayFrame
 	jp UpdateSprites
 
-EmotionBubblesPointerTable: ; 17caf (5:7caf)
+EmotionBubblesPointerTable:
 	dw EmotionBubbles
 	dw EmotionBubbles + $40
 	dw EmotionBubbles + $80
 
-EmotionBubblesOAM: ; 17cb5 (5:7cb5)
+EmotionBubblesOAM:
 	db $F8,$00,$F9,$00
 	db $FA,$00,$FB,$00
 
-EmotionBubbles: ; 17cbd (5:7cbd)
+EmotionBubbles:
 	INCBIN "gfx/emotion_bubbles.2bpp"
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -1,4 +1,4 @@
-AnimateHealingMachine: ; 70433 (1c:4433)
+AnimateHealingMachine:
 	ld de, PokeCenterFlashingMonitorAndHealBall
 	ld hl, vChars0 + $7c0
 	lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), $03 ; loads one too many tiles
@@ -62,10 +62,10 @@
 	ld [hl], a
 	jp UpdateSprites
 
-PokeCenterFlashingMonitorAndHealBall: ; 704b7 (1c:44b7)
+PokeCenterFlashingMonitorAndHealBall:
 	INCBIN "gfx/pokecenter_ball.2bpp"
 
-PokeCenterOAMData: ; 704d7 (1c:44d7)
+PokeCenterOAMData:
 	db $24,$34,$7C,$10 ; heal machine monitor
 	db $2B,$30,$7D,$10 ; pokeballs 1-6
 	db $2B,$38,$7D,$30
@@ -75,7 +75,7 @@
 	db $35,$38,$7D,$30
 
 ; d = value to xor with palette
-FlashSprite8Times: ; 704f3 (1c:44f3)
+FlashSprite8Times:
 	ld b, 8
 .loop
 	ld a, [rOBP1]
@@ -87,7 +87,7 @@
 	jr nz, .loop
 	ret
 
-CopyHealingMachineOAM: ; 70503 (1c:4503)
+CopyHealingMachineOAM:
 ; copy one OAM entry and advance the pointers
 	ld a, [de]
 	inc de
--- a/engine/overworld/hidden_items.asm
+++ b/engine/overworld/hidden_items.asm
@@ -1,4 +1,4 @@
-HiddenItems: ; 76688 (1d:6688)
+HiddenItems:
 	ld hl, HiddenItemCoords
 	call FindHiddenItemOrCoinsIndex
 	ld [wHiddenItemOrCoinsIndex], a
@@ -20,7 +20,7 @@
 
 INCLUDE "data/hidden_item_coords.asm"
 
-FoundHiddenItemText: ; 7675b (1d:675b)
+FoundHiddenItemText:
 	TX_FAR _FoundHiddenItemText
 	TX_ASM
 	ld a, [wHiddenObjectFunctionArgument] ; item ID
@@ -45,11 +45,11 @@
 	call PrintText
 	jp TextScriptEnd
 
-HiddenItemBagFullText: ; 76794 (1d:6794)
+HiddenItemBagFullText:
 	TX_FAR _HiddenItemBagFullText
 	db "@"
 
-HiddenCoins: ; 76799 (1d:6799)
+HiddenCoins:
 	ld b, COIN_CASE
 	predef GetQuantityOfItemInBag
 	ld a, b
@@ -120,17 +120,17 @@
 
 INCLUDE "data/hidden_coins.asm"
 
-FoundHiddenCoinsText: ; 76847 (1d:6847)
+FoundHiddenCoinsText:
 	TX_FAR _FoundHiddenCoinsText
 	db $10,"@"
 
-DroppedHiddenCoinsText: ; 7684d (1d:684d)
+DroppedHiddenCoinsText:
 	TX_FAR _FoundHiddenCoins2Text
 	db $10
 	TX_FAR _DroppedHiddenCoinsText
 	db "@"
 
-FindHiddenItemOrCoinsIndex: ; 76857 (1d:6857)
+FindHiddenItemOrCoinsIndex:
 	ld a, [wHiddenObjectY]
 	ld d, a
 	ld a, [wHiddenObjectX]
--- a/engine/overworld/hidden_objects.asm
+++ b/engine/overworld/hidden_objects.asm
@@ -1,4 +1,4 @@
-IsPlayerOnDungeonWarp: ; 46981 (11:6981)
+IsPlayerOnDungeonWarp:
 	xor a
 	ld [wWhichDungeonWarp], a
 	ld a, [wd72d]
@@ -15,7 +15,7 @@
 	ret
 
 ; if a hidden object was found, stores $00 in [$ffee], else stores $ff
-CheckForHiddenObject: ; 469a0 (11:69a0)
+CheckForHiddenObject:
 	ld hl, $ffeb
 	xor a
 	ld [hli], a
@@ -86,7 +86,7 @@
 
 ; checks if the coordinates in front of the player's sprite match Y in b and X in c
 ; [hCoordsInFrontOfPlayerMatch] = $00 if they match, $ff if they don't match
-CheckIfCoordsInFrontOfPlayerMatch: ; 46a01 (11:6a01)
+CheckIfCoordsInFrontOfPlayerMatch:
 	ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction
 	cp SPRITE_FACING_UP
 	jr z, .facingUp
--- a/engine/overworld/is_player_just_outside_map.asm
+++ b/engine/overworld/is_player_just_outside_map.asm
@@ -1,5 +1,5 @@
 ; returns whether the player is one tile outside the map in Z
-IsPlayerJustOutsideMap: ; 128d8 (4:68d8)
+IsPlayerJustOutsideMap:
 	ld a, [wYCoord]
 	ld b, a
 	ld a, [wCurMapHeight]
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -1,4 +1,4 @@
-HandleLedges: ; 1a672 (6:6672)
+HandleLedges:
 	ld a, [wd736]
 	bit 6, a ; already jumping down ledge
 	ret nz
@@ -55,7 +55,7 @@
 	ret
 
 	; (player direction) (tile player standing on) (ledge tile) (input required)
-LedgeTiles: ; 1a6cf (6:66cf)
+LedgeTiles:
 	db SPRITE_FACING_DOWN, $2C,$37,D_DOWN
 	db SPRITE_FACING_DOWN, $39,$36,D_DOWN
 	db SPRITE_FACING_DOWN, $39,$37,D_DOWN
@@ -66,7 +66,7 @@
 	db SPRITE_FACING_RIGHT,$39,$0D,D_RIGHT
 	db $FF
 
-LoadHoppingShadowOAM: ; 1a6f0 (6:66f0)
+LoadHoppingShadowOAM:
 	ld hl, vChars1 + $7f0
 	ld de, LedgeHoppingShadow
 	lb bc, BANK(LedgeHoppingShadow), (LedgeHoppingShadowEnd - LedgeHoppingShadow) / $8
@@ -77,10 +77,10 @@
 	call WriteOAMBlock
 	ret
 
-LedgeHoppingShadow: ; 1a708 (6:6708)
+LedgeHoppingShadow:
 	INCBIN "gfx/ledge_hopping_shadow.1bpp"
 LedgeHoppingShadowEnd:
 
-LedgeHoppingShadowOAM: ; 1a710 (6:6710)
+LedgeHoppingShadowOAM:
 	db $FF,$10,$FF,$20
 	db $FF,$40,$FF,$60
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
@@ -8,7 +8,7 @@
 ; fields, respectively, within loops. The X is the loop index.
 ; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y*
 ; denote fields of the sprite slots interated over in the inner loop.
-InitMapSprites: ; 1785b (5:785b)
+InitMapSprites:
 	call InitOutsideMapSprites
 	ret c ; return if the map is an outside map (already handled by above call)
 ; if the map is an inside map (i.e. mapID >= $25)
@@ -29,7 +29,7 @@
 ; This is used for both inside and outside maps, since it is called by
 ; InitOutsideMapSprites.
 ; Loads tile pattern data for sprites into VRAM.
-LoadMapSpriteTilePatterns: ; 17871 (5:7871)
+LoadMapSpriteTilePatterns:
 	ld a,[wNumSprites]
 	and a ; are there any sprites?
 	jr nz,.spritesExist
@@ -236,7 +236,7 @@
 ; de = pointer to sprite sheet
 ; bc = length in bytes
 ; a = ROM bank
-ReadSpriteSheetData: ; 17971 (5:7971)
+ReadSpriteSheetData:
 	ld a,[hli]
 	ld e,a
 	ld a,[hli]
@@ -250,7 +250,7 @@
 
 ; Loads sprite set for outside maps (cities and routes) and sets VRAM slots.
 ; sets carry if the map is a city or route, unsets carry if not
-InitOutsideMapSprites: ; 1797b (5:797b)
+InitOutsideMapSprites:
 	ld a,[wCurMap]
 	cp a,REDS_HOUSE_1F ; is the map a city or a route (map ID less than $25)?
 	ret nc ; if not, return
@@ -380,7 +380,7 @@
 
 ; Chooses the correct sprite set ID depending on the player's position within
 ; the map for maps with two sprite sets.
-GetSplitMapSpriteSetID: ; 17a1a (5:7a1a)
+GetSplitMapSpriteSetID:
 	cp a,$f8
 	jr z,.route20
 	ld hl,SplitMapSpriteSets
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -1,4 +1,4 @@
-UpdatePlayerSprite: ; 4e31 (1:4e31)
+UpdatePlayerSprite:
 	ld a, [wSpriteStateData2]
 	and a
 	jr z, .checkIfTextBoxInFrontOfSprite
@@ -98,7 +98,7 @@
 	ld [wSpriteStateData2 + 7], a
 	ret
 
-UnusedReadSpriteDataFunction: ; 4ec7 (1:4ec7)
+UnusedReadSpriteDataFunction:
 	push bc
 	push af
 	ld a, [H_CURRENTSPRITEOFFSET]
@@ -109,7 +109,7 @@
 	pop bc
 	ret
 
-UpdateNPCSprite: ; 4ed1 (1:4ed1)
+UpdateNPCSprite:
 	ld a, [H_CURRENTSPRITEOFFSET]
 	swap a
 	dec a
@@ -249,7 +249,7 @@
 	jr TryWalking
 
 ; changes facing direction by zeroing the movement delta and calling TryWalking
-ChangeFacingDirection: ; 4fc8 (1:4fc8)
+ChangeFacingDirection:
 	ld de, $0
 	; fall through
 
@@ -259,7 +259,7 @@
 ; e: X movement delta (-1, 0 or 1)
 ; hl: pointer to tile the sprite would walk onto
 ; set carry on failure, clears carry on success
-TryWalking: ; 4fcb (1:4fcb)
+TryWalking:
 	push hl
 	ld h, $c1
 	ld a, [H_CURRENTSPRITEOFFSET]
@@ -298,7 +298,7 @@
 	jp UpdateSpriteImage
 
 ; update the walking animation parameters for a sprite that is currently walking
-UpdateSpriteInWalkingAnimation: ; 4ffe (1:4ffe)
+UpdateSpriteInWalkingAnimation:
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $7
 	ld l, a
@@ -371,7 +371,7 @@
 	ret
 
 ; update delay value (c2x8) for sprites in the delayed state (c1x1)
-UpdateSpriteMovementDelay: ; 5057 (1:5057)
+UpdateSpriteMovementDelay:
 	ld h, $c2
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $6
@@ -392,7 +392,7 @@
 	inc a
 	ld l, a
 	ld [hl], $1             ; c1x1 = 1 (mark as ready to move)
-notYetMoving: ; 5073 (1:5073)
+notYetMoving:
 	ld h, $c1
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $8
@@ -400,7 +400,7 @@
 	ld [hl], $0             ; c1x8 = 0 (walk animation frame)
 	jp UpdateSpriteImage
 
-MakeNPCFacePlayer: ; 507f (1:507f)
+MakeNPCFacePlayer:
 ; Make an NPC face the player if the player has spoken to him or her.
 
 ; Check if the behaviour of the NPC facing the player when spoken to is
@@ -434,7 +434,7 @@
 	ld [hl], c              ; c1x9: set facing direction
 	jr notYetMoving
 
-InitializeSpriteStatus: ; 50ad (1:50ad)
+InitializeSpriteStatus:
 	ld [hl], $1   ; $c1x1: set movement status to ready
 	inc l
 	ld [hl], $ff  ; $c1x2: set sprite image to $ff (invisible/off screen)
@@ -448,7 +448,7 @@
 	ret
 
 ; calculates the spprite's scrren position form its map position and the player position
-InitializeSpriteScreenPosition: ; 50bd (1:50bd)
+InitializeSpriteScreenPosition:
 	ld h, $c2
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $4
@@ -472,7 +472,7 @@
 	ret
 
 ; tests if sprite is off screen or otherwise unable to do anything
-CheckSpriteAvailability: ; 50dc (1:50dc)
+CheckSpriteAvailability:
 	predef IsObjectHidden
 	ld a, [$ffe5]
 	and a
@@ -553,7 +553,7 @@
 .done
 	ret
 
-UpdateSpriteImage: ; 5157 (1:5157)
+UpdateSpriteImage:
 	ld h, $c1
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $8
@@ -578,7 +578,7 @@
 ; d: Y movement delta (-1, 0 or 1)
 ; e: X movement delta (-1, 0 or 1)
 ; set carry on failure, clears carry on success
-CanWalkOntoTile: ; 516e (1:516e)
+CanWalkOntoTile:
 	ld h, $c2
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $6
@@ -689,7 +689,7 @@
 ; calculates the tile pointer pointing to the tile the current sprite stancs on
 ; this is always the lower left tile of the 2x2 tile blocks all sprites are snapped to
 ; hl: output pointer
-GetTileSpriteStandsOn: ; 5207 (1:5207)
+GetTileSpriteStandsOn:
 	ld h, $c1
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $4
@@ -718,7 +718,7 @@
 	ret
 
 ; loads [de+a] into a
-LoadDEPlusA: ; 522f (1:522f)
+LoadDEPlusA:
 	add e
 	ld e, a
 	jr nc, .noCarry
@@ -727,7 +727,7 @@
 	ld a, [de]
 	ret
 
-DoScriptedNPCMovement: ; 5236 (1:5236)
+DoScriptedNPCMovement:
 ; This is an alternative method of scripting an NPC's movement and is only used
 ; a few times in the game. It is used when the NPC and player must walk together
 ; in sync, such as when the player is following the NPC somewhere. An NPC can't
@@ -798,7 +798,7 @@
 	inc [hl]
 	ret
 
-InitScriptedNPCMovement: ; 52a6 (1:52a6)
+InitScriptedNPCMovement:
 	xor a
 	ld [wNPCMovementDirections2Index], a
 	ld a, 8
@@ -805,16 +805,16 @@
 	ld [wScriptedNPCWalkCounter], a
 	jp AnimScriptedNPCMovement
 
-GetSpriteScreenYPointer: ; 52b2 (1:52b2)
+GetSpriteScreenYPointer:
 	ld a, $4
 	ld b, a
 	jr GetSpriteScreenXYPointerCommon
 
-GetSpriteScreenXPointer: ; 52b7 (1:52b7)
+GetSpriteScreenXPointer:
 	ld a, $6
 	ld b, a
 
-GetSpriteScreenXYPointerCommon: ; 52ba (1:52ba)
+GetSpriteScreenXYPointerCommon:
 	ld hl, wSpriteStateData1
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add l
@@ -822,7 +822,7 @@
 	ld l, a
 	ret
 
-AnimScriptedNPCMovement: ; 52c3 (1:52c3)
+AnimScriptedNPCMovement:
 	ld hl, wSpriteStateData2
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $e
@@ -861,7 +861,7 @@
 	ld [hl], a
 	ret
 
-AdvanceScriptedNPCAnimFrameCounter: ; 5301 (1:5301)
+AdvanceScriptedNPCAnimFrameCounter:
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $7
 	ld l, a
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -1,4 +1,4 @@
-PlayerStepOutFromDoor: ; 1a3e0 (6:63e0)
+PlayerStepOutFromDoor:
 	ld hl, wd730
 	res 1, [hl]
 	call IsPlayerStandingOnDoorTile
@@ -27,7 +27,7 @@
 	res 7, [hl]
 	ret
 
-_EndNPCMovementScript: ; 1a41d (6:641d)
+_EndNPCMovementScript:
 	ld hl, wd730
 	res 7, [hl]
 	ld hl, wd72e
@@ -44,7 +44,7 @@
 	ld [wSimulatedJoypadStatesEnd], a
 	ret
 
-PalletMovementScriptPointerTable: ; 1a442 (6:6442)
+PalletMovementScriptPointerTable:
 	dw PalletMovementScript_OakMoveLeft
 	dw PalletMovementScript_PlayerMoveLeft
 	dw PalletMovementScript_WaitAndWalkToLab
@@ -51,7 +51,7 @@
 	dw PalletMovementScript_WalkToLab
 	dw PalletMovementScript_Done
 
-PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c)
+PalletMovementScript_OakMoveLeft:
 	ld a, [wXCoord]
 	sub $a
 	ld [wNumStepsToTake], a
@@ -85,7 +85,7 @@
 	ld [wJoyIgnore], a
 	ret
 
-PalletMovementScript_PlayerMoveLeft: ; 1a485 (6:6485)
+PalletMovementScript_PlayerMoveLeft:
 	ld a, [wd730]
 	bit 0, a ; is an NPC being moved by a script?
 	ret nz ; return if Oak is still moving
@@ -98,12 +98,12 @@
 	ld [wNPCMovementScriptFunctionNum], a
 	ret
 
-PalletMovementScript_WaitAndWalkToLab: ; 1a4a1 (6:64a1)
+PalletMovementScript_WaitAndWalkToLab:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a ; is the player done moving left yet?
 	ret nz
 
-PalletMovementScript_WalkToLab: ; 1a4a6 (6:64a6)
+PalletMovementScript_WalkToLab:
 	xor a
 	ld [wOverrideSimulatedJoypadStatesMask], a
 	ld a, [wSpriteIndex]
@@ -127,7 +127,7 @@
 	ld [wNPCMovementScriptFunctionNum], a
 	ret
 
-RLEList_ProfOakWalkToLab: ; 1a4dc (6:64dc)
+RLEList_ProfOakWalkToLab:
 	db NPC_MOVEMENT_DOWN, $05
 	db NPC_MOVEMENT_LEFT, $01
 	db NPC_MOVEMENT_DOWN, $05
@@ -136,7 +136,7 @@
 	db $E0, $01 ; stand still
 	db $FF
 
-RLEList_PlayerWalkToLab: ; 1a4e9 (6:64e9)
+RLEList_PlayerWalkToLab:
 	db D_UP, $02
 	db D_RIGHT, $03
 	db D_DOWN, $05
@@ -144,7 +144,7 @@
 	db D_DOWN, $06
 	db $FF
 
-PalletMovementScript_Done: ; 1a4f4 (6:64f4)
+PalletMovementScript_Done:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -157,11 +157,11 @@
 	res 7, [hl]
 	jp EndNPCMovementScript
 
-PewterMuseumGuyMovementScriptPointerTable: ; 1a510 (6:6510)
+PewterMuseumGuyMovementScriptPointerTable:
 	dw PewterMovementScript_WalkToMuseum
 	dw PewterMovementScript_Done
 
-PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514)
+PewterMovementScript_WalkToMuseum:
 	ld a, BANK(Music_MuseumGuy)
 	ld [wAudioROMBank], a
 	ld [wAudioSavedROMBank], a
@@ -189,7 +189,7 @@
 	ld [wNPCMovementScriptFunctionNum], a
 	ret
 
-RLEList_PewterMuseumPlayer: ; 1a559 (6:6559)
+RLEList_PewterMuseumPlayer:
 	db 0, $01
 	db D_UP, $03
 	db D_LEFT, $0D
@@ -196,7 +196,7 @@
 	db D_UP, $06
 	db $FF
 
-RLEList_PewterMuseumGuy: ; 1a562 (6:6562)
+RLEList_PewterMuseumGuy:
 	db NPC_MOVEMENT_UP, $06
 	db NPC_MOVEMENT_LEFT, $0D
 	db NPC_MOVEMENT_UP, $03
@@ -203,7 +203,7 @@
 	db NPC_MOVEMENT_LEFT, $01
 	db $FF
 
-PewterMovementScript_Done: ; 1a56b (6:656b)
+PewterMovementScript_Done:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -213,11 +213,11 @@
 	res 7, [hl]
 	jp EndNPCMovementScript
 
-PewterGymGuyMovementScriptPointerTable: ; 1a57d (6:657d)
+PewterGymGuyMovementScriptPointerTable:
 	dw PewterMovementScript_WalkToGym
 	dw PewterMovementScript_Done
 
-PewterMovementScript_WalkToGym: ; 1a581 (6:6581)
+PewterMovementScript_WalkToGym:
 	ld a, BANK(Music_MuseumGuy)
 	ld [wAudioROMBank], a
 	ld [wAudioSavedROMBank], a
@@ -248,7 +248,7 @@
 	ld [wNPCMovementScriptFunctionNum], a
 	ret
 
-RLEList_PewterGymPlayer: ; 1a5cd (6:65cd)
+RLEList_PewterGymPlayer:
 	db 0, $01
 	db D_RIGHT, $02
 	db D_DOWN, $05
@@ -257,7 +257,7 @@
 	db D_LEFT, $0F
 	db $FF
 
-RLEList_PewterGymGuy: ; 1a5da (6:65da)
+RLEList_PewterGymGuy:
 	db NPC_MOVEMENT_DOWN, $02
 	db NPC_MOVEMENT_LEFT, $0F
 	db NPC_MOVEMENT_UP, $05
@@ -266,7 +266,7 @@
 	db NPC_MOVEMENT_RIGHT, $03
 	db $FF
 
-FreezeEnemyTrainerSprite: ; 1a5e7 (6:65e7)
+FreezeEnemyTrainerSprite:
 	ld a, [wCurMap]
 	cp POKEMONTOWER_7
 	ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them
@@ -285,7 +285,7 @@
 	ld [H_SPRITEINDEX], a
 	jp SetSpriteMovementBytesToFF
 
-RivalIDs: ; 1a605 (6:6605)
+RivalIDs:
 	db OPP_SONY1
 	db OPP_SONY2
 	db OPP_SONY3
--- a/engine/overworld/oaks_aide.asm
+++ b/engine/overworld/oaks_aide.asm
@@ -45,27 +45,27 @@
 	ld [hOaksAideResult], a
 	ret
 
-OaksAideHiText: ; 59091 (16:5091)
+OaksAideHiText:
 	TX_FAR _OaksAideHiText
 	db "@"
 
-OaksAideUhOhText: ; 59096 (16:5096)
+OaksAideUhOhText:
 	TX_FAR _OaksAideUhOhText
 	db "@"
 
-OaksAideComeBackText: ; 5909b (16:509b)
+OaksAideComeBackText:
 	TX_FAR _OaksAideComeBackText
 	db "@"
 
-OaksAideHereYouGoText: ; 590a0 (16:50a0)
+OaksAideHereYouGoText:
 	TX_FAR _OaksAideHereYouGoText
 	db "@"
 
-OaksAideGotItemText: ; 590a5 (16:50a5)
+OaksAideGotItemText:
 	TX_FAR _OaksAideGotItemText
 	db $0b
 	db "@"
 
-OaksAideNoRoomText: ; 590ab (16:50ab)
+OaksAideNoRoomText:
 	TX_FAR _OaksAideNoRoomText
 	db "@"
--- a/engine/overworld/oam.asm
+++ b/engine/overworld/oam.asm
@@ -166,7 +166,7 @@
 	add hl, de
 	jr .clear
 
-GetSpriteScreenXY: ; 4bd1 (1:4bd1)
+GetSpriteScreenXY:
 	inc e
 	inc e
 	ld a, [de] ; c1x4
--- a/engine/overworld/pewter_guys.asm
+++ b/engine/overworld/pewter_guys.asm
@@ -1,4 +1,4 @@
-PewterGuys: ; 37ca1 (d:7ca1)
+PewterGuys:
 	ld hl, wSimulatedJoypadStatesEnd
 	ld a, [wSimulatedJoypadStatesIndex]
 	dec a ; this decrement causes it to overwrite the last byte before $FF in the list
@@ -48,7 +48,7 @@
 	inc hl
 	jr .findMatchingCoordsLoop
 
-PointerTable_37ce6: ; 37ce6 (d:7ce6)
+PointerTable_37ce6:
 	dw PewterMuseumGuyCoords
 	dw PewterGymGuyCoords
 
@@ -55,7 +55,7 @@
 ; these are the four coordinates of the spaces below, above, to the left and
 ; to the right of the museum guy, and pointers to different movements for
 ; the player to make to get positioned before the main movement.
-PewterMuseumGuyCoords: ; 37cea (d:7cea)
+PewterMuseumGuyCoords:
 	db 18, 27
 	dw .down
 	db 16, 27
@@ -78,7 +78,7 @@
 ; different movements for the player to make to get positioned before the
 ; main movement
 ; $00 is a pause
-PewterGymGuyCoords: ; 37d06 (d:7d06)
+PewterGymGuyCoords:
 	db 16, 34
 	dw .one
 	db 17, 35
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -1,4 +1,4 @@
-EnterMapAnim: ; 70510 (1c:4510)
+EnterMapAnim:
 	call InitFacingDirectionList
 	ld a, $ec
 	ld [wSpriteStateData1 + 4], a ; player's sprite Y screen position
@@ -63,7 +63,7 @@
 	call LoadPlayerSpriteGraphics
 	jr .restoreDefaultMusic
 
-FlyAnimationEnterScreenCoords: ; 70592 (1c:4592)
+FlyAnimationEnterScreenCoords:
 ; y, x pairs
 ; This is the sequence of screen coordinates used by the overworld
 ; Fly animation when the player is entering a map.
@@ -80,7 +80,7 @@
 	db $3C, $48
 	db $3C, $40
 
-PlayerSpinWhileMovingDown: ; 705aa (1c:45aa)
+PlayerSpinWhileMovingDown:
 	ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	ld a, $10
 	ld [hli], a ; wPlayerSpinWhileMovingUpOrDownAnimDeltaY
@@ -90,7 +90,7 @@
 	ld [hl], a ; wPlayerSpinWhileMovingUpOrDownAnimFrameDelay
 	jp PlayerSpinWhileMovingUpOrDown
 
-_LeaveMapAnim: ; 705ba (1c:45ba)
+_LeaveMapAnim:
 	call InitFacingDirectionList
 	call IsPlayerStandingOnWarpPadOrHole
 	ld a, b
@@ -167,7 +167,7 @@
 	call GBFadeOutToWhite
 	jp RestoreFacingDirectionAndYScreenPos
 
-FlyAnimationScreenCoords1: ; 7064f (1c:464f)
+FlyAnimationScreenCoords1:
 ; y, x pairs
 ; This is the sequence of screen coordinates used by the first part
 ; of the Fly overworld animation.
@@ -184,7 +184,7 @@
 	db $2A, $98
 	db $27, $A0
 
-FlyAnimationScreenCoords2: ; 70667 (1c:4667)
+FlyAnimationScreenCoords2:
 ; y, x pairs
 ; This is the sequence of screen coordinates used by the second part
 ; of the Fly overworld animation.
@@ -201,7 +201,7 @@
 
 	db $F0, $00
 
-LeaveMapThroughHoleAnim: ; 7067d (1c:467d)
+LeaveMapThroughHoleAnim:
 	ld a, $ff
 	ld [wUpdateSpritesEnabled], a ; disable UpdateSprites
 	; shift upper half of player's sprite down 8 pixels and hide lower half
@@ -223,7 +223,7 @@
 	ld [wUpdateSpritesEnabled], a ; enable UpdateSprites
 	jp RestoreFacingDirectionAndYScreenPos
 
-DoFlyAnimation: ; 706ae (1c:46ae)
+DoFlyAnimation:
 	ld a, [wFlyAnimBirdSpriteImageIndex]
 	xor $1 ; make the bird flap its wings
 	ld [wFlyAnimBirdSpriteImageIndex], a
@@ -247,7 +247,7 @@
 	jr nz, DoFlyAnimation
 	ret
 
-LoadBirdSpriteGraphics: ; 706d7 (1c:46d7)
+LoadBirdSpriteGraphics:
 	ld de, BirdSprite
 	ld hl, vNPCSprites
 	lb bc, BANK(BirdSprite), $0c
@@ -257,7 +257,7 @@
 	lb bc, BANK(BirdSprite), $0c
 	jp CopyVideoData
 
-InitFacingDirectionList: ; 706ef (1c:46ef)
+InitFacingDirectionList:
 	ld a, [wSpriteStateData1 + 2] ; player's sprite facing direction (image index is locked to standing images)
 	ld [wSavedPlayerFacingDirection], a
 	ld a, [wSpriteStateData1 + 4] ; player's sprite Y screen position
@@ -276,12 +276,12 @@
 	dec hl
 	ret
 
-PlayerSpinningFacingOrder: ; 70713 (1c:4713)
+PlayerSpinningFacingOrder:
 ; The order of the direction the player's sprite is facing when teleporting
 ; away. Creates a spinning effect.
 	db SPRITE_FACING_DOWN, SPRITE_FACING_LEFT, SPRITE_FACING_UP, SPRITE_FACING_RIGHT
 
-SpinPlayerSprite: ; 70717 (1c:4717)
+SpinPlayerSprite:
 ; copy the current value from the list into the sprite data and rotate the list
 	ld a, [hl]
 	ld [wSpriteStateData1 + 2], a ; player's sprite facing direction (image index is locked to standing images)
@@ -295,7 +295,7 @@
 	pop hl
 	ret
 
-PlayerSpinInPlace: ; 70730 (1c:4730)
+PlayerSpinInPlace:
 	call SpinPlayerSprite
 	ld a, [wPlayerSpinInPlaceAnimFrameDelay]
 	ld c, a
@@ -316,7 +316,7 @@
 	call DelayFrames
 	jr PlayerSpinInPlace
 
-PlayerSpinWhileMovingUpOrDown: ; 70755 (1c:4755)
+PlayerSpinWhileMovingUpOrDown:
 	call SpinPlayerSprite
 	ld a, [wPlayerSpinWhileMovingUpOrDownAnimDeltaY]
 	ld c, a
@@ -332,7 +332,7 @@
 	call DelayFrames
 	jr PlayerSpinWhileMovingUpOrDown
 
-RestoreFacingDirectionAndYScreenPos: ; 70772 (1c:4772)
+RestoreFacingDirectionAndYScreenPos:
 	ld a, [wSavedPlayerScreenY]
 	ld [wSpriteStateData1 + 4], a
 	ld a, [wSavedPlayerFacingDirection]
@@ -340,7 +340,7 @@
 	ret
 
 ; if SGB, 2 frames, else 3 frames
-GetPlayerTeleportAnimFrameDelay: ; 7077f (1c:477f)
+GetPlayerTeleportAnimFrameDelay:
 	ld a, [wOnSGB]
 	xor $1
 	inc a
@@ -347,7 +347,7 @@
 	inc a
 	ret
 
-IsPlayerStandingOnWarpPadOrHole: ; 70787 (1c:4787)
+IsPlayerStandingOnWarpPadOrHole:
 	ld b, 0
 	ld hl, .warpPadAndHoleData
 	ld a, [wCurMapTileset]
@@ -374,7 +374,7 @@
 	ret
 
 ; format: db tileset id, tile id, value to be put in [wStandingOnWarpPadOrHole]
-.warpPadAndHoleData: ; 707a9 (1c:47a9)
+.warpPadAndHoleData:
 	db FACILITY, $20, 1 ; warp pad
 	db FACILITY, $11, 2 ; hole
 	db CAVERN,   $22, 2 ; hole
@@ -381,7 +381,7 @@
 	db INTERIOR, $55, 1 ; warp pad
 	db $FF
 
-FishingAnim: ; 707b6 (1c:47b6)
+FishingAnim:
 	ld c, 10
 	call DelayFrames
 	ld hl, wd736
@@ -462,19 +462,19 @@
 	ld [hl], a
 	ret
 
-NoNibbleText: ; 70847 (1c:4847)
+NoNibbleText:
 	TX_FAR _NoNibbleText
 	db "@"
 
-NothingHereText: ; 7084c (1c:484c)
+NothingHereText:
 	TX_FAR _NothingHereText
 	db "@"
 
-ItsABiteText: ; 70851 (1c:4851)
+ItsABiteText:
 	TX_FAR _ItsABiteText
 	db "@"
 
-FishingRodOAM: ; 70856 (1c:4856)
+FishingRodOAM:
 ; specifies how the fishing rod should be drawn on the screen
 ; first byte = screen y coordinate
 ; second byte = screen x coordinate
@@ -485,7 +485,7 @@
 	db $50, $40, $FE, $00 ; player facing left
 	db $50, $58, $FE, $20 ; player facing right ($20 means "horizontally flip the tile")
 
-RedFishingTiles: ; 70866 (1c:4866)
+RedFishingTiles:
 	dw RedFishingTilesFront
 	db 2, BANK(RedFishingTilesFront)
 	dw vNPCSprites + $20
@@ -502,7 +502,7 @@
 	db 3, BANK(RedFishingRodTiles)
 	dw vNPCSprites2 + $7d0
 
-_HandleMidJump: ; 7087e (1c:487e)
+_HandleMidJump:
 	ld a, [wPlayerJumpingYScreenCoordsIndex]
 	ld c, a
 	inc a
@@ -534,6 +534,6 @@
 	ld [wJoyIgnore], a
 	ret
 
-PlayerJumpingYScreenCoords: ; 708ba (1c:48ba)
+PlayerJumpingYScreenCoords:
 ; Sequence of y screen coordinates for player's sprite when jumping over a ledge.
 	db $38, $36, $34, $32, $31, $30, $30, $30, $31, $32, $33, $34, $36, $38, $3C, $3C
--- a/engine/overworld/pokecenter.asm
+++ b/engine/overworld/pokecenter.asm
@@ -1,4 +1,4 @@
-DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6)
+DisplayPokemonCenterDialogue_:
 	call SaveScreenTilesToBuffer1 ; save screen
 	ld hl, PokemonCenterWelcomeText
 	call PrintText
@@ -45,24 +45,24 @@
 	call PrintText
 	jp UpdateSprites
 
-PokemonCenterWelcomeText: ; 705d (1:705d)
+PokemonCenterWelcomeText:
 	TX_FAR _PokemonCenterWelcomeText
 	db "@"
 
-ShallWeHealYourPokemonText: ; 7062 (1:7062)
+ShallWeHealYourPokemonText:
 	db $a
 	TX_FAR _ShallWeHealYourPokemonText
 	db "@"
 
-NeedYourPokemonText: ; 7068 (1:7068)
+NeedYourPokemonText:
 	TX_FAR _NeedYourPokemonText
 	db "@"
 
-PokemonFightingFitText: ; 706d (1:706d)
+PokemonFightingFitText:
 	TX_FAR _PokemonFightingFitText
 	db "@"
 
-PokemonCenterFarewellText: ; 7072 (1:7072)
+PokemonCenterFarewellText:
 	db $a
 	TX_FAR _PokemonCenterFarewellText
 	db "@"
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -1,4 +1,4 @@
-DisplayPokemartDialogue_: ; 6c20 (1:6c20)
+DisplayPokemartDialogue_:
 	ld a,[wListScrollOffset]
 	ld [wSavedListScrollOffset],a
 	call UpdateSprites
@@ -227,46 +227,46 @@
 	ld [wListScrollOffset],a
 	ret
 
-PokemartBuyingGreetingText: ; 6e0c (1:6e0c)
+PokemartBuyingGreetingText:
 	TX_FAR _PokemartBuyingGreetingText
 	db "@"
 
-PokemartTellBuyPriceText: ; 6e11 (1:6e11)
+PokemartTellBuyPriceText:
 	TX_FAR _PokemartTellBuyPriceText
 	db "@"
 
-PokemartBoughtItemText: ; 6e16 (1:6e16)
+PokemartBoughtItemText:
 	TX_FAR _PokemartBoughtItemText
 	db "@"
 
-PokemartNotEnoughMoneyText: ; 6e1b (1:6e1b)
+PokemartNotEnoughMoneyText:
 	TX_FAR _PokemartNotEnoughMoneyText
 	db "@"
 
-PokemartItemBagFullText: ; 6e20 (1:6e20)
+PokemartItemBagFullText:
 	TX_FAR _PokemartItemBagFullText
 	db "@"
 
-PokemonSellingGreetingText: ; 6e25 (1:6e25)
+PokemonSellingGreetingText:
 	TX_FAR _PokemonSellingGreetingText
 	db "@"
 
-PokemartTellSellPriceText: ; 6e2a (1:6e2a)
+PokemartTellSellPriceText:
 	TX_FAR _PokemartTellSellPriceText
 	db "@"
 
-PokemartItemBagEmptyText: ; 6e2f (1:6e2f)
+PokemartItemBagEmptyText:
 	TX_FAR _PokemartItemBagEmptyText
 	db "@"
 
-PokemartUnsellableItemText: ; 6e34 (1:6e34)
+PokemartUnsellableItemText:
 	TX_FAR _PokemartUnsellableItemText
 	db "@"
 
-PokemartThankYouText: ; 6e39 (1:6e39)
+PokemartThankYouText:
 	TX_FAR _PokemartThankYouText
 	db "@"
 
-PokemartAnythingElseText: ; 6e3e (1:6e3e)
+PokemartAnythingElseText:
 	TX_FAR _PokemartAnythingElseText
 	db "@"
--- a/engine/overworld/saffron_guards.asm
+++ b/engine/overworld/saffron_guards.asm
@@ -1,4 +1,4 @@
-RemoveGuardDrink: ; 5a59f (16:659f)
+RemoveGuardDrink:
 	ld hl, GuardDrinksList
 .drinkLoop
 	ld a, [hli]
@@ -12,5 +12,5 @@
 	jr z, .drinkLoop
 	jpba RemoveItemByID
 
-GuardDrinksList: ; 5a5b7 (16:65b7)
+GuardDrinksList:
 	db FRESH_WATER, SODA_POP, LEMONADE, $00
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -1,4 +1,4 @@
-AnimateBoulderDust: ; 79f54 (1e:5f54)
+AnimateBoulderDust:
 	ld a, $1
 	ld [wWhichAnimationOffsets], a ; select the boulder dust offsets
 	ld a, [wUpdateSpritesEnabled]
@@ -29,7 +29,7 @@
 	ld [wUpdateSpritesEnabled], a
 	jp LoadPlayerSpriteGraphics
 
-GetMoveBoulderDustFunctionPointer: ; 79f92 (1e:5f92)
+GetMoveBoulderDustFunctionPointer:
 	ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction
 	ld hl, MoveBoulderDustFunctionPointerTable
 	ld c, a
@@ -51,7 +51,7 @@
 	pop hl
 	ret
 
-MoveBoulderDustFunctionPointerTable: ; 79fb0 (1e:5fb0)
+MoveBoulderDustFunctionPointerTable:
 ; facing down
 	db $FF,$00
 	dw AdjustOAMBlockYPos
@@ -68,7 +68,7 @@
 	db $FF,$01
 	dw AdjustOAMBlockXPos
 
-LoadSmokeTileFourTimes: ; 79fc0 (1e:5fc0)
+LoadSmokeTileFourTimes:
 	ld hl, vChars1 + $7c0
 	ld c, $4
 .loop
@@ -83,11 +83,11 @@
 	jr nz, .loop
 	ret
 
-LoadSmokeTile: ; 79fd4 (1e:5fd4)
+LoadSmokeTile:
 	ld de, SSAnneSmokePuffTile
 	lb bc, BANK(SSAnneSmokePuffTile), (SSAnneSmokePuffTileEnd - SSAnneSmokePuffTile) / $10
 	jp CopyVideoData
 
-SSAnneSmokePuffTile: ; 79fdd (1e:5fdd)
+SSAnneSmokePuffTile:
 	INCBIN "gfx/ss_anne_smoke_puff.2bpp"
 SSAnneSmokePuffTileEnd:
--- a/engine/overworld/trainers.asm
+++ b/engine/overworld/trainers.asm
@@ -1,4 +1,4 @@
-_GetSpritePosition1: ; 567f9 (15:67f9)
+_GetSpritePosition1:
 	ld hl, wSpriteStateData1
 	ld de, $4
 	ld a, [wSpriteIndex]
@@ -17,7 +17,7 @@
 	ld [$ffee], a
 	ret
 
-_GetSpritePosition2: ; 56819 (15:6819)
+_GetSpritePosition2:
 	ld hl, wSpriteStateData1
 	ld de, $4
 	ld a, [wSpriteIndex]
@@ -36,7 +36,7 @@
 	ld [wSavedSpriteMapX], a
 	ret
 
-_SetSpritePosition1: ; 5683d (15:683d)
+_SetSpritePosition1:
 	ld hl, wSpriteStateData1
 	ld de, $4
 	ld a, [wSpriteIndex]
@@ -55,7 +55,7 @@
 	ld [hl], a
 	ret
 
-_SetSpritePosition2: ; 5685d (15:685d)
+_SetSpritePosition2:
 	ld hl, wSpriteStateData1
 	ld de, $0004
 	ld a, [wSpriteIndex]
@@ -74,7 +74,7 @@
 	ld [hl], a
 	ret
 
-TrainerWalkUpToPlayer: ; 56881 (15:6881)
+TrainerWalkUpToPlayer:
 	ld a, [wSpriteIndex]
 	swap a
 	ld [wTrainerSpriteOffset], a
@@ -149,7 +149,7 @@
 
 ; input: de = offset within sprite entry
 ; output: de = pointer to sprite data
-GetSpriteDataPointer: ; 56903 (15:6903)
+GetSpriteDataPointer:
 	push de
 	add hl, de
 	ld a, [H_SPRITEINDEX]
@@ -161,7 +161,7 @@
 	ret
 
 ; tests if this trainer is in the right position to engage the player and do so if she is.
-TrainerEngage: ; 5690f (15:690f)
+TrainerEngage:
 	push hl
 	push de
 	ld a, [wTrainerSpriteOffset]
@@ -225,7 +225,7 @@
 	set 0, [hl]
 	call EngageMapTrainer
 	ld a, $ff
-.noEngage: ; 56988 (15:6988)
+.noEngage:
 	ld [wTrainerSpriteOffset], a
 	pop de
 	pop hl
@@ -232,7 +232,7 @@
 	ret
 
 ; reads trainer's Y position to wTrainerScreenY and X position to wTrainerScreenX
-ReadTrainerScreenPosition: ; 5698e (15:698e)
+ReadTrainerScreenPosition:
 	ld a, [wTrainerSpriteOffset]
 	add $4
 	ld d, $0
@@ -254,7 +254,7 @@
 ; checks if the sprite is properly lined up with the player with respect to the direction it's looking. Also checks the distance between player and sprite
 ; note that this does not necessarily mean the sprite is seeing the player, he could be behind it's back
 ; a: distance player to sprite
-CheckSpriteCanSeePlayer: ; 569af (15:69af)
+CheckSpriteCanSeePlayer:
 	ld b, a
 	ld a, [wTrainerEngageDistance] ; how far the trainer can see
 	cp b
@@ -290,7 +290,7 @@
 	ret
 
 ; tests if the player is in front of the sprite (rather than behind it)
-CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3)
+CheckPlayerIsInFrontOfSprite:
 	ld a, [wCurMap]
 	cp POWER_PLANT
 	jp z, .engage       ; bypass this for power plant to get voltorb fake items to work
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -1,4 +1,4 @@
-_RunPaletteCommand: ; 71ddf (1c:5ddf)
+_RunPaletteCommand:
 	call GetPredefRegisters
 	ld a, b
 	cp $ff
@@ -19,13 +19,13 @@
 	push de
 	jp [hl]
 
-SetPal_BattleBlack: ; 71dff (1c:5dff)
+SetPal_BattleBlack:
 	ld hl, PalPacket_Black
 	ld de, BlkPacket_Battle
 	ret
 
 ; uses PalPacket_Empty to build a packet based on mon IDs and health color
-SetPal_Battle: ; 71e06 (1c:5e06)
+SetPal_Battle:
 	ld hl, PalPacket_Empty
 	ld de, wPalPacket
 	ld bc, $10
@@ -58,13 +58,13 @@
 	ld [wDefaultPaletteCommand], a
 	ret
 
-SetPal_TownMap: ; 71e48 (1c:5e48)
+SetPal_TownMap:
 	ld hl, PalPacket_TownMap
 	ld de, BlkPacket_WholeScreen
 	ret
 
 ; uses PalPacket_Empty to build a packet based the mon ID
-SetPal_StatusScreen: ; 71e4f (1c:5e4f)
+SetPal_StatusScreen:
 	ld hl, PalPacket_Empty
 	ld de, wPalPacket
 	ld bc, $10
@@ -87,12 +87,12 @@
 	ld de, BlkPacket_StatusScreen
 	ret
 
-SetPal_PartyMenu: ; 71e7b (1c:5e7b)
+SetPal_PartyMenu:
 	ld hl, PalPacket_PartyMenu
 	ld de, wPartyMenuBlkPacket
 	ret
 
-SetPal_Pokedex: ; 71e82 (1c:5e82)
+SetPal_Pokedex:
 	ld hl, PalPacket_Pokedex
 	ld de, wPalPacket
 	ld bc, $10
@@ -105,28 +105,28 @@
 	ld de, BlkPacket_Pokedex
 	ret
 
-SetPal_Slots: ; 71e9f (1c:5e9f)
+SetPal_Slots:
 	ld hl, PalPacket_Slots
 	ld de, BlkPacket_Slots
 	ret
 
-SetPal_TitleScreen: ; 71ea6 (1c:5ea6)
+SetPal_TitleScreen:
 	ld hl, PalPacket_Titlescreen
 	ld de, BlkPacket_Titlescreen
 	ret
 
 ; used mostly for menus and the Oak intro
-SetPal_Generic: ; 71ead (1c:5ead)
+SetPal_Generic:
 	ld hl, PalPacket_Generic
 	ld de, BlkPacket_WholeScreen
 	ret
 
-SetPal_NidorinoIntro: ; 71eb4 (1c:5eb4)
+SetPal_NidorinoIntro:
 	ld hl, PalPacket_NidorinoIntro
 	ld de, BlkPacket_NidorinoIntro
 	ret
 
-SetPal_GameFreakIntro: ; 71ebb (1c:5ebb)
+SetPal_GameFreakIntro:
 	ld hl, PalPacket_GameFreakIntro
 	ld de, BlkPacket_GameFreakIntro
 	ld a, SET_PAL_GENERIC
@@ -134,7 +134,7 @@
 	ret
 
 ; uses PalPacket_Empty to build a packet based on the current map
-SetPal_Overworld: ; 71ec7 (1c:5ec7)
+SetPal_Overworld:
 	ld hl, PalPacket_Empty
 	ld de, wPalPacket
 	ld bc, $10
@@ -181,7 +181,7 @@
 
 ; used when a Pokemon is the only thing on the screen
 ; such as evolution, trading and the Hall of Fame
-SetPal_PokemonWholeScreen: ; 71f17 (1c:5f17)
+SetPal_PokemonWholeScreen:
 	push bc
 	ld hl, PalPacket_Empty
 	ld de, wPalPacket
@@ -200,7 +200,7 @@
 	ld de, BlkPacket_WholeScreen
 	ret
 
-SetPal_TrainerCard: ; 71f3b (1c:5f3b)
+SetPal_TrainerCard:
 	ld hl, BlkPacket_TrainerCard
 	ld de, wTrainerCardBlkPacket
 	ld bc, $40
@@ -240,7 +240,7 @@
 	ld de, wTrainerCardBlkPacket
 	ret
 
-SetPalFunctions: ; 71f73 (1c:5f73)
+SetPalFunctions:
 	dw SetPal_BattleBlack
 	dw SetPal_Battle
 	dw SetPal_TownMap
@@ -258,7 +258,7 @@
 
 ; The length of the blk data of each badge on the Trainer Card.
 ; The Rainbow Badge has 3 entries because of its many colors.
-BadgeBlkDataLengths: ; 71f8f (1c:5f8f)
+BadgeBlkDataLengths:
 	db 6     ; Boulder Badge
 	db 6     ; Cascade Badge
 	db 6     ; Thunder Badge
@@ -268,12 +268,12 @@
 	db 6     ; Volcano Badge
 	db 6     ; Earth Badge
 
-DeterminePaletteID: ; 71f97 (1c:5f97)
+DeterminePaletteID:
 	bit Transformed, a ; a is battle status 3
 	ld a, PAL_GREYMON  ; if the mon has used Transform, use Ditto's palette
 	ret nz
 	ld a, [hl]
-DeterminePaletteIDOutOfBattle: ; 71f9d (1c:5f9d)
+DeterminePaletteIDOutOfBattle:
 	ld [wd11e], a
 	and a ; is the mon index 0?
 	jr z, .skipDexNumConversion
@@ -289,13 +289,13 @@
 	ld a, [hl]
 	ret
 
-InitPartyMenuBlkPacket: ; 71fb6 (1c:5fb6)
+InitPartyMenuBlkPacket:
 	ld hl, BlkPacket_PartyMenu
 	ld de, wPartyMenuBlkPacket
 	ld bc, $30
 	jp CopyData
 
-UpdatePartyMenuBlkPacket: ; 71fc2 (1c:5fc2)
+UpdatePartyMenuBlkPacket:
 ; Update the blk packet with the palette of the HP bar that is
 ; specified in [wWhichPartyMenuHPBar].
 	ld hl, wPartyMenuHPBarColors
@@ -323,7 +323,7 @@
 	ld [hl], e
 	ret
 
-SendSGBPacket: ; 71feb (1c:5feb)
+SendSGBPacket:
 ;check number of packets
 	ld a,[hl]
 	and a,$07
@@ -388,7 +388,7 @@
 ; else send 16 more bytes
 	jr .loop2
 
-LoadSGB: ; 7202b (1c:602b)
+LoadSGB:
 	xor a
 	ld [wOnSGB], a
 	call CheckSGB
@@ -422,7 +422,7 @@
 	ld hl, MaskEnCancelPacket
 	jp SendSGBPacket
 
-PrepareSuperNintendoVRAMTransfer: ; 72075 (1c:6075)
+PrepareSuperNintendoVRAMTransfer:
 	ld hl, .packetPointers
 	ld c, 9
 .loop
@@ -451,7 +451,7 @@
 	dw DataSnd_725a8
 	dw DataSnd_725b8
 
-CheckSGB: ; 7209b (1c:609b)
+CheckSGB:
 ; Returns whether the game is running on an SGB in carry.
 	ld hl, MltReq2Packet
 	di
@@ -503,12 +503,12 @@
 	scf
 	ret
 
-SendMltReq1Packet: ; 72102 (1c:6102)
+SendMltReq1Packet:
 	ld hl, MltReq1Packet
 	call SendSGBPacket
 	jp Wait7000
 
-CopyGfxToSuperNintendoVRAM: ; 7210b (1c:610b)
+CopyGfxToSuperNintendoVRAM:
 	di
 	push de
 	call DisableLCD
@@ -547,7 +547,7 @@
 	ei
 	ret
 
-Wait7000: ; 7214a (1c:614a)
+Wait7000:
 ; Each loop takes 9 cycles so this routine actually waits 63000 cycles.
 	ld de, 7000
 .loop
@@ -560,7 +560,7 @@
 	jr nz, .loop
 	ret
 
-SendSGBPackets: ; 72156 (1c:6156)
+SendSGBPackets:
 	ld a, [wGBC]
 	and a
 	jr z, .notGBC
@@ -575,7 +575,7 @@
 	pop hl
 	jp SendSGBPacket
 
-InitGBCPalettes: ; 7216d (1c:616d)
+InitGBCPalettes:
 	ld a, $80 ; index 0 with auto-increment
 	ld [rBGPI], a
 	inc hl
@@ -597,10 +597,10 @@
 	jr nz, .loop
 	ret
 
-EmptyFunc5: ; 72187 (1c:6187)
+EmptyFunc5:
 	ret
 
-CopySGBBorderTiles: ; 72188 (1c:6188)
+CopySGBBorderTiles:
 ; SGB tile data is stored in a 4BPP planar format.
 ; Each tile is 32 bytes. The first 16 bytes contain bit planes 1 and 2, while
 ; the second 16 bytes contain bit planes 3 and 4.
--- a/engine/play_time.asm
+++ b/engine/play_time.asm
@@ -1,4 +1,4 @@
-TrackPlayTime: ; 18dee (6:4dee)
+TrackPlayTime:
 	call CountDownIgnoreInputBitReset
 	ld a, [wd732]
 	bit 0, a
@@ -36,7 +36,7 @@
 	ld [wPlayTimeMaxed], a
 	ret
 
-CountDownIgnoreInputBitReset: ; 18e36 (6:4e36)
+CountDownIgnoreInputBitReset:
 	ld a, [wIgnoreInputCounter]
 	and a
 	jr nz, .asm_18e40
--- a/engine/pokedex_rating.asm
+++ b/engine/pokedex_rating.asm
@@ -1,4 +1,4 @@
-DisplayDexRating: ; 44169 (11:4169)
+DisplayDexRating:
 	ld hl, wPokedexSeen
 	ld b, wPokedexSeenEnd - wPokedexSeen
 	call CountSetBits
@@ -51,11 +51,11 @@
 	ld [de], a
 	ret
 
-PokedexRatingText_441cc: ; 441cc (11:41cc)
+PokedexRatingText_441cc:
 	TX_FAR _OaksLabText_441cc
 	db "@"
 
-DexRatingsTable: ; 441d1 (11:41d1)
+DexRatingsTable:
 	db 10
 	dw PokedexRatingText_44201
 	db 20
@@ -89,66 +89,66 @@
 	db 152
 	dw PokedexRatingText_4424c
 
-PokedexRatingText_44201: ; 44201 (11:4201)
+PokedexRatingText_44201:
 	TX_FAR _OaksLabText_44201
 	db "@"
 
-PokedexRatingText_44206: ; 44206 (11:4206)
+PokedexRatingText_44206:
 	TX_FAR _OaksLabText_44206
 	db "@"
 
-PokedexRatingText_4420b: ; 4420b (11:420b)
+PokedexRatingText_4420b:
 	TX_FAR _OaksLabText_4420b
 	db "@"
 
-PokedexRatingText_44210: ; 44210 (11:4210)
+PokedexRatingText_44210:
 	TX_FAR _OaksLabText_44210
 	db "@"
 
-PokedexRatingText_44215: ; 44215 (11:4215)
+PokedexRatingText_44215:
 	TX_FAR _OaksLabText_44215
 	db "@"
 
-PokedexRatingText_4421a: ; 4421a (11:421a)
+PokedexRatingText_4421a:
 	TX_FAR _OaksLabText_4421a
 	db "@"
 
-PokedexRatingText_4421f: ; 4421f (11:421f)
+PokedexRatingText_4421f:
 	TX_FAR _OaksLabText_4421f
 	db "@"
 
-PokedexRatingText_44224: ; 44224 (11:4224)
+PokedexRatingText_44224:
 	TX_FAR _OaksLabText_44224
 	db "@"
 
-PokedexRatingText_44229: ; 44229 (11:4229)
+PokedexRatingText_44229:
 	TX_FAR _OaksLabText_44229
 	db "@"
 
-PokedexRatingText_4422e: ; 4422e (11:422e)
+PokedexRatingText_4422e:
 	TX_FAR _OaksLabText_4422e
 	db "@"
 
-PokedexRatingText_44233: ; 44233 (11:4233)
+PokedexRatingText_44233:
 	TX_FAR _OaksLabText_44233
 	db "@"
 
-PokedexRatingText_44238: ; 44238 (11:4238)
+PokedexRatingText_44238:
 	TX_FAR _OaksLabText_44238
 	db "@"
 
-PokedexRatingText_4423d: ; 4423d (11:423d)
+PokedexRatingText_4423d:
 	TX_FAR _OaksLabText_4423d
 	db "@"
 
-PokedexRatingText_44242: ; 44242 (11:4242)
+PokedexRatingText_44242:
 	TX_FAR _OaksLabText_44242
 	db "@"
 
-PokedexRatingText_44247: ; 44247 (11:4247)
+PokedexRatingText_44247:
 	TX_FAR _OaksLabText_44247
 	db "@"
 
-PokedexRatingText_4424c: ; 4424c (11:424c)
+PokedexRatingText_4424c:
 	TX_FAR _OaksLabText_4424c
 	db "@"
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -49,7 +49,7 @@
 
 	ret
 
-PredefPointers:: ; 4fe79 (13:7e79)
+PredefPointers::
 ; these are pointers to ASM routines.
 ; they appear to be used in overworld map scripts.
 	add_predef DrawPlayerHUDAndHPBar
--- a/engine/predefs12.asm
+++ b/engine/predefs12.asm
@@ -1,5 +1,5 @@
 ; b = new colour for BG colour 0 (usually white) for 4 frames
-ChangeBGPalColor0_4Frames: ; 480eb (12:40eb)
+ChangeBGPalColor0_4Frames:
 	call GetPredefRegisters
 	ld a, [rBGP]
 	or b
@@ -11,7 +11,7 @@
 	ld [rBGP], a
 	ret
 
-PredefShakeScreenVertically: ; 480ff (12:40ff)
+PredefShakeScreenVertically:
 ; Moves the window down and then back in a sequence of progressively smaller
 ; numbers of pixels, starting at b.
 	call GetPredefRegisters
@@ -37,7 +37,7 @@
 	ld c, 3
 	jp DelayFrames
 
-PredefShakeScreenHorizontally: ; 48125 (12:4125)
+PredefShakeScreenHorizontally:
 ; Moves the window right and then back in a sequence of progressively smaller
 ; numbers of pixels, starting at b.
 	call GetPredefRegisters
--- a/engine/predefs17.asm
+++ b/engine/predefs17.asm
@@ -1,6 +1,6 @@
 ; this function temporarily makes the starters (and Ivysaur) seen
 ; so that the full Pokedex information gets displayed in Oak's lab
-StarterDex: ; 5c0dc (17:40dc)
+StarterDex:
 	ld a, %01001011 ; set starter flags
 	ld [wPokedexOwned], a
 	predef ShowPokedexData
--- a/engine/predefs17_2.asm
+++ b/engine/predefs17_2.asm
@@ -1,5 +1,5 @@
 ; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in wd11e
-SetPartyMonTypes: ; 5db5e (17:5b5e)
+SetPartyMonTypes:
 	call GetPredefRegisters
 	ld bc, wPartyMon1Type - wPartyMon1 ; $5
 	add hl, bc
--- a/engine/predefs7.asm
+++ b/engine/predefs7.asm
@@ -1,4 +1,4 @@
-DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6)
+DisplayElevatorFloorMenu:
 	ld hl, WhichFloorText
 	call PrintText
 	ld hl, wItemList
@@ -43,6 +43,6 @@
 	ld [hli], a ; destination map ID
 	ret
 
-WhichFloorText: ; 1ca14 (7:4a14)
+WhichFloorText:
 	TX_FAR _WhichFloorText
 	db "@"
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -1,4 +1,4 @@
-LoadSAV: ; 735e8 (1c:75e8)
+LoadSAV:
 ;(if carry -> write
 ;"the file data is destroyed")
 	call ClearScreen
@@ -27,11 +27,11 @@
 	ld [wSaveFileStatus], a
 	ret
 
-FileDataDestroyedText: ; 7361e (1c:761e)
+FileDataDestroyedText:
 	TX_FAR _FileDataDestroyedText
 	db "@"
 
-LoadSAV0: ; 73623 (1c:7623)
+LoadSAV0:
 	ld a, SRAM_ENABLE
 	ld [MBC1SRamEnable], a
 	ld a, $1
@@ -78,7 +78,7 @@
 	and a
 	jp SAVGoodChecksum
 
-LoadSAV1: ; 73690 (1c:7690)
+LoadSAV1:
 	ld a, SRAM_ENABLE
 	ld [MBC1SRamEnable], a
 	ld a, $1
@@ -98,7 +98,7 @@
 	and a
 	jp SAVGoodChecksum
 
-LoadSAV2: ; 736bd (1c:76bd)
+LoadSAV2:
 	ld a, SRAM_ENABLE
 	ld [MBC1SRamEnable], a
 	ld a, $1
@@ -122,22 +122,22 @@
 	and a
 	jp SAVGoodChecksum
 
-SAVBadCheckSum: ; 736f7 (1c:76f7)
+SAVBadCheckSum:
 	scf
 
-SAVGoodChecksum: ; 736f8 (1c:76f8)
+SAVGoodChecksum:
 	ld a, $0
 	ld [MBC1SRamBankingMode], a
 	ld [MBC1SRamEnable], a
 	ret
 
-LoadSAVIgnoreBadCheckSum: ; 73701 (1c:7701)
+LoadSAVIgnoreBadCheckSum:
 ; unused function that loads save data and ignores bad checksums
 	call LoadSAV0
 	call LoadSAV1
 	jp LoadSAV2
 
-SaveSAV: ; 7370a (1c:770a)
+SaveSAV:
 	callba PrintSaveScreenText
 	ld hl,WouldYouLikeToSaveText
 	call SaveSAVConfirm
@@ -173,7 +173,7 @@
 NowSavingString:
 	db "Now saving...@"
 
-SaveSAVConfirm: ; 73768 (1c:7768)
+SaveSAVConfirm:
 	call PrintText
 	coord hl, 0, 7
 	lb bc, 8, 1
@@ -187,15 +187,15 @@
 	TX_FAR _WouldYouLikeToSaveText
 	db "@"
 
-GameSavedText: ; 73782 (1c:7782)
+GameSavedText:
 	TX_FAR _GameSavedText
 	db "@"
 
-OlderFileWillBeErasedText: ; 73787 (1c:7787)
+OlderFileWillBeErasedText:
 	TX_FAR _OlderFileWillBeErasedText
 	db "@"
 
-SaveSAVtoSRAM0: ; 7378c (1c:778c)
+SaveSAVtoSRAM0:
 	ld a, SRAM_ENABLE
 	ld [MBC1SRamEnable], a
 	ld a, $1
@@ -228,7 +228,7 @@
 	ld [MBC1SRamEnable], a
 	ret
 
-SaveSAVtoSRAM1: ; 737e2 (1c:77e2)
+SaveSAVtoSRAM1:
 ; stored pokémon
 	ld a, SRAM_ENABLE
 	ld [MBC1SRamEnable], a
@@ -248,7 +248,7 @@
 	ld [MBC1SRamEnable], a
 	ret
 
-SaveSAVtoSRAM2: ; 7380f (1c:780f)
+SaveSAVtoSRAM2:
 	ld a, SRAM_ENABLE
 	ld [MBC1SRamEnable], a
 	ld a, $1
@@ -271,7 +271,7 @@
 	ld [MBC1SRamEnable], a
 	ret
 
-SaveSAVtoSRAM: ; 73848 (1c:7848)
+SaveSAVtoSRAM:
 	ld a, $2
 	ld [wSaveFileStatus], a
 	call SaveSAVtoSRAM0
@@ -278,7 +278,7 @@
 	call SaveSAVtoSRAM1
 	jp SaveSAVtoSRAM2
 
-SAVCheckSum: ; 73856 (1c:7856)
+SAVCheckSum:
 ;Check Sum (result[1 byte] is complemented)
 	ld d, 0
 .loop
@@ -293,7 +293,7 @@
 	cpl
 	ret
 
-CalcIndividualBoxCheckSums: ; 73863 (1c:7863)
+CalcIndividualBoxCheckSums:
 	ld hl, sBox1 ; sBox7
 	ld de, sBank2IndividualBoxChecksums ; sBank3IndividualBoxChecksums
 	ld b, NUM_BOXES / 2
@@ -310,7 +310,7 @@
 	jr nz, .loop
 	ret
 
-GetBoxSRAMLocation: ; 7387b (1c:787b)
+GetBoxSRAMLocation:
 ; in: a = box num
 ; out: b = box SRAM bank, hl = pointer to start of box
 	ld hl, BoxSRAMPointerTable
@@ -331,7 +331,7 @@
 	ld l, a
 	ret
 
-BoxSRAMPointerTable: ; 73895 (1c:7895)
+BoxSRAMPointerTable:
 	dw sBox1 ; sBox7
 	dw sBox2 ; sBox8
 	dw sBox3 ; sBox9
@@ -339,7 +339,7 @@
 	dw sBox5 ; sBox11
 	dw sBox6 ; sBox12
 
-ChangeBox:: ; 738a1 (1c:78a1)
+ChangeBox::
 	ld hl, WhenYouChangeBoxText
 	call PrintText
 	call YesNoChoice
@@ -385,11 +385,11 @@
 	call WaitForSoundToFinish
 	ret
 
-WhenYouChangeBoxText: ; 73909 (1c:7909)
+WhenYouChangeBoxText:
 	TX_FAR _WhenYouChangeBoxText
 	db "@"
 
-CopyBoxToOrFromSRAM: ; 7390e (1c:790e)
+CopyBoxToOrFromSRAM:
 ; copy an entire box from hl to de with b as the SRAM bank
 	push hl
 	ld a, SRAM_ENABLE
@@ -418,7 +418,7 @@
 	ld [MBC1SRamEnable], a
 	ret
 
-DisplayChangeBoxMenu: ; 7393f (1c:793f)
+DisplayChangeBoxMenu:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ld a, A_BUTTON | B_BUTTON
@@ -489,11 +489,11 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ret
 
-ChooseABoxText: ; 739d4 (1c:79d4)
+ChooseABoxText:
 	TX_FAR _ChooseABoxText
 	db "@"
 
-BoxNames: ; 739d9 (1c:79d9)
+BoxNames:
 	db   "BOX 1"
 	next "BOX 2"
 	next "BOX 3"
@@ -507,10 +507,10 @@
 	next "BOX11"
 	next "BOX12@"
 
-BoxNoText: ; 73a21 (1c:7a21)
+BoxNoText:
 	db "BOX No.@"
 
-EmptyAllSRAMBoxes: ; 73a29 (1c:7a29)
+EmptyAllSRAMBoxes:
 ; marks all boxes in SRAM as empty (initialisation for the first time the
 ; player changes the box)
 	ld a, SRAM_ENABLE
@@ -528,7 +528,7 @@
 	ld [MBC1SRamEnable], a
 	ret
 
-EmptySRAMBoxesInBank: ; 73a4b (1c:7a4b)
+EmptySRAMBoxesInBank:
 ; marks every box in the current SRAM bank as empty
 	ld hl, sBox1 ; sBox7
 	call EmptySRAMBox
@@ -549,7 +549,7 @@
 	call CalcIndividualBoxCheckSums
 	ret
 
-EmptySRAMBox: ; 73a7f (1c:7a7f)
+EmptySRAMBox:
 	xor a
 	ld [hli], a
 	dec a
@@ -556,7 +556,7 @@
 	ld [hl], a
 	ret
 
-GetMonCountsForAllBoxes: ; 73a84 (1c:7a84)
+GetMonCountsForAllBoxes:
 	ld hl, wBoxMonCounts
 	push hl
 	ld a, SRAM_ENABLE
@@ -585,7 +585,7 @@
 
 	ret
 
-GetMonCountsForBoxesInBank: ; 73ab8 (1c:7ab8)
+GetMonCountsForBoxesInBank:
 	ld a, [sBox1] ; sBox7
 	ld [hli], a
 	ld a, [sBox2] ; sBox8
@@ -600,7 +600,7 @@
 	ld [hli], a
 	ret
 
-SAVCheckRandomID: ; 73ad1 (1c:7ad1)
+SAVCheckRandomID:
 ;checks if Sav file is the same by checking player's name 1st letter ($a598)
 ; and the two random numbers generated at game beginning
 ;(which are stored at wPlayerID)s
@@ -634,7 +634,7 @@
 	ld [MBC1SRamEnable],a
 	ret
 
-SaveHallOfFameTeams: ; 73b0d (1c:7b0d)
+SaveHallOfFameTeams:
 	ld a, [wNumHoFTeams]
 	dec a
 	cp HOF_TEAM_CAPACITY
@@ -658,7 +658,7 @@
 	ld bc, HOF_TEAM
 	jr HallOfFame_Copy
 
-LoadHallOfFameTeams: ; 73b3f (1c:7b3f)
+LoadHallOfFameTeams:
 	ld hl, sHallOfFame
 	ld bc, HOF_TEAM
 	ld a, [wHoFTeamIndex]
@@ -667,7 +667,7 @@
 	ld bc, HOF_TEAM
 	; fallthrough
 
-HallOfFame_Copy: ; 73b51 (1c:7b51)
+HallOfFame_Copy:
 	ld a, SRAM_ENABLE
 	ld [MBC1SRamEnable], a
 	ld a, $1
@@ -680,7 +680,7 @@
 	ld [MBC1SRamEnable], a
 	ret
 
-ClearSAV: ; 73b6a (1c:7b6a)
+ClearSAV:
 	ld a, SRAM_ENABLE
 	ld [MBC1SRamEnable], a
 	ld a, $1
@@ -698,7 +698,7 @@
 	ld [MBC1SRamEnable], a
 	ret
 
-PadSRAM_FF: ; 73b8f (1c:7b8f)
+PadSRAM_FF:
 	ld [MBC1SRamBank], a
 	ld hl, $a000
 	ld bc, $2000
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -1,4 +1,4 @@
-PromptUserToPlaySlots: ; 3730e (d:730e)
+PromptUserToPlaySlots:
 	call SaveScreenTilesToBuffer2
 	ld a, BANK(DisplayTextIDInit)
 	ld [wAutoTextBoxDrawingControl], a
@@ -52,11 +52,11 @@
 	push af
 	jp CloseTextDisplay
 
-PlaySlotMachineText: ; 37390 (d:7390)
+PlaySlotMachineText:
 	TX_FAR _PlaySlotMachineText
 	db "@"
 
-MainSlotMachineLoop: ; 37395 (d:7395)
+MainSlotMachineLoop:
 	call SlotMachine_PrintCreditCoins
 	xor a
 	ld hl, wPayoutCoins
@@ -146,32 +146,32 @@
 	call SlotMachine_PutOutLitBalls
 	jp MainSlotMachineLoop
 
-CoinMultiplierSlotMachineText: ; 3745e (d:745e)
+CoinMultiplierSlotMachineText:
 	db   "×3"
 	next "×2"
 	next "×1@"
 
-OutOfCoinsSlotMachineText: ; 37467 (d:7467)
+OutOfCoinsSlotMachineText:
 	TX_FAR _OutOfCoinsSlotMachineText
 	db "@"
 
-BetHowManySlotMachineText: ; 3746c (d:746c)
+BetHowManySlotMachineText:
 	TX_FAR _BetHowManySlotMachineText
 	db "@"
 
-StartSlotMachineText: ; 37471 (d:7471)
+StartSlotMachineText:
 	TX_FAR _StartSlotMachineText
 	db "@"
 
-NotEnoughCoinsSlotMachineText: ; 37476 (d:7476)
+NotEnoughCoinsSlotMachineText:
 	TX_FAR _NotEnoughCoinsSlotMachineText
 	db "@"
 
-OneMoreGoSlotMachineText: ; 3747b (d:747b)
+OneMoreGoSlotMachineText:
 	TX_FAR _OneMoreGoSlotMachineText
 	db "@"
 
-SlotMachine_SetFlags: ; 37480 (d:7480)
+SlotMachine_SetFlags:
 	ld hl, wSlotMachineFlags
 	bit 7, [hl]
 	ret nz
@@ -201,7 +201,7 @@
 	set 7, [hl]
 	ret
 
-SlotMachine_SpinWheels: ; 374ad (d:74ad)
+SlotMachine_SpinWheels:
 	ld c, 20
 .loop1
 	push bc
@@ -233,7 +233,7 @@
 ; visible. The 3 functions below ensure this by checking if the wheel offset
 ; is even before stopping the wheel.
 
-SlotMachine_StopOrAnimWheel1: ; 374df (d:74df)
+SlotMachine_StopOrAnimWheel1:
 	ld a, [wStoppingWhichSlotMachineWheel]
 	cp 1
 	jr c, .animWheel
@@ -251,7 +251,7 @@
 .animWheel
 	jp SlotMachine_AnimWheel1
 
-SlotMachine_StopOrAnimWheel2: ; 374fb (d:74fb)
+SlotMachine_StopOrAnimWheel2:
 	ld a, [wStoppingWhichSlotMachineWheel]
 	cp 2
 	jr c, .animWheel
@@ -269,7 +269,7 @@
 .animWheel
 	jp SlotMachine_AnimWheel2
 
-SlotMachine_StopOrAnimWheel3: ; 37517 (d:7517)
+SlotMachine_StopOrAnimWheel3:
 	ld a, [wStoppingWhichSlotMachineWheel]
 	cp 3
 	jr c, .animWheel
@@ -285,7 +285,7 @@
 	and a
 	ret
 
-SlotMachine_StopWheel1Early: ; 3752c (d:752c)
+SlotMachine_StopWheel1Early:
 	call SlotMachine_GetWheel1Tiles
 	ld hl, wSlotMachineWheel1BottomTile
 	ld a, [wSlotMachineFlags]
@@ -314,7 +314,7 @@
 	ld [hl], 0
 	ret
 
-SlotMachine_StopWheel2Early: ; 37552 (d:7552)
+SlotMachine_StopWheel2Early:
 	call SlotMachine_GetWheel2Tiles
 	ld a, [wSlotMachineFlags]
 	and $80
@@ -337,7 +337,7 @@
 	ld [wSlotMachineWheel2SlipCounter], a
 	ret
 
-SlotMachine_FindWheel1Wheel2Matches: ; 3756e (d:756e)
+SlotMachine_FindWheel1Wheel2Matches:
 ; return whether wheel 1 and wheel 2's current positions allow a match (given
 ; that wheel 3 stops in a good position) in Z
 	ld hl, wSlotMachineWheel1BottomTile
@@ -363,7 +363,7 @@
 	dec de
 	ret
 
-SlotMachine_CheckForMatches: ; 37588 (d:7588)
+SlotMachine_CheckForMatches:
 	call SlotMachine_GetWheel3Tiles
 	ld a, [wSlotMachineBet]
 	cp 2
@@ -475,7 +475,7 @@
 	ld [rOBP0], a
 	jp .done
 
-SymbolLinedUpSlotMachineText: ; 37665 (d:7665)
+SymbolLinedUpSlotMachineText:
 	TX_ASM
 	push bc
 	call SlotMachine_PrintWinningSymbol
@@ -487,11 +487,11 @@
 	inc bc
 	ret
 
-LinedUpText: ; 37673 (d:7673)
+LinedUpText:
 	TX_FAR _LinedUpText
 	db "@"
 
-SlotRewardPointers: ; 37678 (d:7678)
+SlotRewardPointers:
 	dw SlotReward300Func
 	dw SlotReward300Text
 	dw SlotReward100Func
@@ -505,24 +505,24 @@
 	dw SlotReward15Func
 	dw SlotReward15Text
 
-SlotReward300Text: ; 37690 (d:7690)
+SlotReward300Text:
 	db "300@"
 
-SlotReward100Text: ; 37694 (d:7694)
+SlotReward100Text:
 	db "100@"
 
-SlotReward8Text: ; 37698 (d:7698)
+SlotReward8Text:
 	db "8@"
 
-SlotReward15Text: ; 3769a (d:769a)
+SlotReward15Text:
 	db "15@"
 
-NotThisTimeText: ; 3769d (d:769d)
+NotThisTimeText:
 	TX_FAR _NotThisTimeText
 	db "@"
 
 ; compares the slot machine tiles at bc, de, and hl
-SlotMachine_CheckForMatch: ; 376a2 (d:76a2)
+SlotMachine_CheckForMatch:
 	ld a, [de]
 	cp [hl]
 	ret nz
@@ -530,24 +530,24 @@
 	cp [hl]
 	ret
 
-SlotMachine_GetWheel3Tiles: ; 376a8 (d:76a8)
+SlotMachine_GetWheel3Tiles:
 	ld de, wSlotMachineWheel3BottomTile
 	ld hl, SlotMachineWheel3
 	ld a, [wSlotMachineWheel3Offset]
 	call SlotMachine_GetWheelTiles
 
-SlotMachine_GetWheel2Tiles: ; 376b4 (d:76b4)
+SlotMachine_GetWheel2Tiles:
 	ld de, wSlotMachineWheel2BottomTile
 	ld hl, SlotMachineWheel2
 	ld a, [wSlotMachineWheel2Offset]
 	call SlotMachine_GetWheelTiles
 
-SlotMachine_GetWheel1Tiles: ; 376c0 (d:76c0)
+SlotMachine_GetWheel1Tiles:
 	ld de, wSlotMachineWheel1BottomTile
 	ld hl, SlotMachineWheel1
 	ld a, [wSlotMachineWheel1Offset]
 
-SlotMachine_GetWheelTiles: ; 376c9 (d:76c9)
+SlotMachine_GetWheelTiles:
 	ld c, a
 	ld b, 0
 	add hl, bc
@@ -561,7 +561,7 @@
 	jr nz, .loop
 	ret
 
-SlotReward8Func: ; 376d7 (d:76d7)
+SlotReward8Func:
 	ld hl, wSlotMachineAllowMatchesCounter
 	ld a, [hl]
 	and a
@@ -572,7 +572,7 @@
 	ld de, 8
 	ret
 
-SlotReward15Func: ; 376e5 (d:76e5)
+SlotReward15Func:
 	ld hl, wSlotMachineAllowMatchesCounter
 	ld a, [hl]
 	and a
@@ -583,7 +583,7 @@
 	ld de, 15
 	ret
 
-SlotReward100Func: ; 376f3 (d:76f3)
+SlotReward100Func:
 	ld a, SFX_GET_KEY_ITEM
 	call PlaySound
 	xor a
@@ -592,7 +592,7 @@
 	ld de, 100
 	ret
 
-SlotReward300Func: ; 37702 (d:7702)
+SlotReward300Func:
 	ld hl, YeahText
 	call PrintText
 	ld a, SFX_GET_ITEM_2
@@ -608,11 +608,11 @@
 	ld de, 300
 	ret
 
-YeahText: ; 37722 (d:7722)
+YeahText:
 	TX_FAR _YeahText
 	db $0a, "@"
 
-SlotMachine_PrintWinningSymbol: ; 37728 (d:7728)
+SlotMachine_PrintWinningSymbol:
 ; prints winning symbol and down arrow in text box
 	coord hl, 2, 14
 	ld a, [wSlotMachineWinningSymbol]
@@ -630,7 +630,7 @@
 	ld [hl], $ee ; down arrow
 	ret
 
-SlotMachine_SubtractBetFromPlayerCoins: ; 37741 (d:7741)
+SlotMachine_SubtractBetFromPlayerCoins:
 	ld hl, wTempCoins2 + 1
 	ld a, [wSlotMachineBet]
 	ld [hld], a
@@ -640,19 +640,19 @@
 	ld c, $2
 	predef SubBCDPredef
 
-SlotMachine_PrintCreditCoins: ; 37754 (d:7754)
+SlotMachine_PrintCreditCoins:
 	coord hl, 5, 1
 	ld de, wPlayerCoins
 	ld c, $2
 	jp PrintBCDNumber
 
-SlotMachine_PrintPayoutCoins: ; 3775f (d:775f)
+SlotMachine_PrintPayoutCoins:
 	coord hl, 11, 1
 	ld de, wPayoutCoins
 	lb bc, LEADING_ZEROES | 2, 4 ; 2 bytes, 4 digits
 	jp PrintNumber
 
-SlotMachine_PayCoinsToPlayer: ; 3776b (d:776b)
+SlotMachine_PayCoinsToPlayer:
 	ld a, $1
 	ld [wMuteAudioAndPauseMusic], a
 	call WaitForSoundToFinish
@@ -709,12 +709,12 @@
 	call DelayFrames
 	jr .loop
 
-SlotMachine_PutOutLitBalls: ; 377ce (d:77ce)
+SlotMachine_PutOutLitBalls:
 	ld a, $23
 	ld [wNewSlotMachineBallTile], a
 	jr SlotMachine_UpdateThreeCoinBallTiles
 
-SlotMachine_LightBalls: ; 377d5 (d:77d5)
+SlotMachine_LightBalls:
 	ld a, $14
 	ld [wNewSlotMachineBallTile], a
 	ld a, [wSlotMachineBet]
@@ -723,22 +723,22 @@
 	dec a
 	jr z, SlotMachine_UpdateTwoCoinBallTiles
 
-SlotMachine_UpdateThreeCoinBallTiles: ; 377e3 (d:77e3)
+SlotMachine_UpdateThreeCoinBallTiles:
 	coord hl, 3, 2
 	call SlotMachine_UpdateBallTiles
 	coord hl, 3, 10
 	call SlotMachine_UpdateBallTiles
 
-SlotMachine_UpdateTwoCoinBallTiles: ; 377ef (d:77ef)
+SlotMachine_UpdateTwoCoinBallTiles:
 	coord hl, 3, 4
 	call SlotMachine_UpdateBallTiles
 	coord hl, 3, 8
 	call SlotMachine_UpdateBallTiles
 
-SlotMachine_UpdateOneCoinBallTiles: ; 377fb (d:77fb)
+SlotMachine_UpdateOneCoinBallTiles:
 	coord hl, 3, 6
 
-SlotMachine_UpdateBallTiles: ; 377fe (d:77fe)
+SlotMachine_UpdateBallTiles:
 	ld a, [wNewSlotMachineBallTile]
 	ld [hl], a
 	ld bc, 13
@@ -753,7 +753,7 @@
 	ld [hl], a
 	ret
 
-SlotMachine_AnimWheel1: ; 37813 (d:7813)
+SlotMachine_AnimWheel1:
 	ld bc, SlotMachineWheel1
 	ld de, wSlotMachineWheel1Offset
 	ld hl, wOAMBuffer
@@ -761,7 +761,7 @@
 	ld [wBaseCoordX], a
 	jr SlotMachine_AnimWheel
 
-SlotMachine_AnimWheel2: ; 37823 (d:7823)
+SlotMachine_AnimWheel2:
 	ld bc, SlotMachineWheel2
 	ld de, wSlotMachineWheel2Offset
 	ld hl, wOAMBuffer + $30
@@ -769,7 +769,7 @@
 	ld [wBaseCoordX], a
 	jr SlotMachine_AnimWheel
 
-SlotMachine_AnimWheel3: ; 37833 (d:7833)
+SlotMachine_AnimWheel3:
 	ld bc, SlotMachineWheel3
 	ld de, wSlotMachineWheel3Offset
 	ld hl, wOAMBuffer + $60
@@ -776,7 +776,7 @@
 	ld a, $70
 	ld [wBaseCoordX], a
 
-SlotMachine_AnimWheel: ; 37841 (d:7841)
+SlotMachine_AnimWheel:
 	ld a, $58
 	ld [wBaseCoordY], a
 	push de
@@ -821,7 +821,7 @@
 	ld [de], a
 	ret
 
-SlotMachine_HandleInputWhileWheelsSpin: ; 37882 (d:7882)
+SlotMachine_HandleInputWhileWheelsSpin:
 	call DelayFrame
 	call JoypadLowSensitivity
 	ld a, [hJoy5]
@@ -845,7 +845,7 @@
 	ret nz
 	jr .loop
 
-LoadSlotMachineTiles: ; 378a8 (d:78a8)
+LoadSlotMachineTiles:
 	call DisableLCD
 	ld hl, SlotMachineTiles2
 	ld de, vChars0
@@ -876,12 +876,12 @@
 	call SlotMachine_AnimWheel2
 	jp SlotMachine_AnimWheel3
 
-SlotMachineMap: ; 378f5 (d:78f5)
+SlotMachineMap:
 	INCBIN "gfx/tilemaps/slotmachine.map"
 
 INCLUDE "data/slot_machine_wheels.asm"
 
-SlotMachineTiles1: ; 37a51 (d:7a51)
+SlotMachineTiles1:
 IF DEF(_RED)
 	INCBIN "gfx/red/slotmachine1.2bpp"
 ENDC
--- a/engine/status_ailments.asm
+++ b/engine/status_ailments.asm
@@ -1,4 +1,4 @@
-PrintStatusAilment: ; 747de (1d:47de)
+PrintStatusAilment:
 	ld a, [de]
 	bit PSN, a
 	jr nz, .psn
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -1,9 +1,9 @@
 ; copy text of fixed length NAME_LENGTH (like player name, rival name, mon names, ...)
-CopyFixedLengthText: ; 42b1 (1:42b1)
+CopyFixedLengthText:
 	ld bc, NAME_LENGTH
 	jp CopyData
 
-SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7)
+SetDefaultNamesBeforeTitlescreen:
 	ld hl, NintenText
 	ld de, wPlayerName
 	call CopyFixedLengthText
@@ -21,7 +21,7 @@
 	ld [wAudioROMBank], a
 	ld [wAudioSavedROMBank], a
 
-DisplayTitleScreen: ; 42dd (1:42dd)
+DisplayTitleScreen:
 	call GBPalWhiteOut
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -158,7 +158,7 @@
 	call .ScrollTitleScreenPokemonLogo
 	jr .bouncePokemonLogoLoop
 
-.TitleScreenPokemonLogoYScrolls: ; 43db (1:43db)
+.TitleScreenPokemonLogoYScrolls:
 ; Controls the bouncing effect of the Pokemon logo on the title screen
 	db -4,16  ; y scroll amount, number of times to scroll
 	db 3,4
@@ -257,7 +257,7 @@
 .doClearSaveDialogue
 	jpba DoClearSaveDialogue
 
-TitleScreenPickNewMon: ; 4496 (1:4496)
+TitleScreenPickNewMon:
 	ld a, vBGMap0 / $100
 	call TitleScreenCopyTileMapToVRAM
 
@@ -285,7 +285,7 @@
 	callba TitleScroll
 	ret
 
-TitleScreenScrollInMon: ; 44c1 (1:44c1)
+TitleScreenScrollInMon:
 	ld d, 0 ; scroll in
 	callba TitleScroll
 	xor a
@@ -292,7 +292,7 @@
 	ld [hWY], a
 	ret
 
-ScrollTitleScreenGameVersion: ; 44cf (1:44cf)
+ScrollTitleScreenGameVersion:
 .wait
 	ld a, [rLY]
 	cp l
@@ -307,7 +307,7 @@
 	jr z, .wait2
 	ret
 
-DrawPlayerCharacter: ; 44dd (1:44dd)
+DrawPlayerCharacter:
 	ld hl, PlayerCharacterTitleGraphics
 	ld de, vSprites
 	ld bc, PlayerCharacterTitleGraphicsEnd - PlayerCharacterTitleGraphics
@@ -344,13 +344,13 @@
 	jr nz, .loop
 	ret
 
-ClearBothBGMaps: ; 4519 (1:4519)
+ClearBothBGMaps:
 	ld hl, vBGMap0
 	ld bc, $400 * 2
 	ld a, " "
 	jp FillMemory
 
-LoadTitleMonSprite: ; 4524 (1:4524)
+LoadTitleMonSprite:
 	ld [wcf91], a
 	ld [wd0b5], a
 	coord hl, 5, 10
@@ -357,17 +357,17 @@
 	call GetMonHeader
 	jp LoadFrontSpriteByMonIndex
 
-TitleScreenCopyTileMapToVRAM: ; 4533 (1:4533)
+TitleScreenCopyTileMapToVRAM:
 	ld [H_AUTOBGTRANSFERDEST + 1], a
 	jp Delay3
 
-LoadCopyrightAndTextBoxTiles: ; 4538 (1:4538)
+LoadCopyrightAndTextBoxTiles:
 	xor a
 	ld [hWY], a
 	call ClearScreen
 	call LoadTextBoxTilePatterns
 
-LoadCopyrightTiles: ; 4541 (1:4541)
+LoadCopyrightTiles:
 	ld de, NintendoCopyrightLogoGraphics
 	ld hl, vChars2 + $600
 	lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $10
@@ -376,7 +376,7 @@
 	ld de, CopyrightTextString
 	jp PlaceString
 
-CopyrightTextString: ; 4556 (1:4556)
+CopyrightTextString:
 	db   $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A             ; ©'95.'96.'98 Nintendo
 	next $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72     ; ©'95.'96.'98 Creatures inc.
 	next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc.
@@ -385,13 +385,13 @@
 INCLUDE "data/title_mons.asm"
 
 ; prints version text (red, blue)
-PrintGameVersionOnTitleScreen: ; 4598 (1:4598)
+PrintGameVersionOnTitleScreen:
 	coord hl, 7, 8
 	ld de, VersionOnTitleScreenText
 	jp PlaceString
 
 ; these point to special tiles specifically loaded for that purpose and are not usual text
-VersionOnTitleScreenText: ; 45a1 (1:45a1)
+VersionOnTitleScreenText:
 IF DEF(_RED)
 	db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version"
 ENDC
--- a/engine/titlescreen2.asm
+++ b/engine/titlescreen2.asm
@@ -1,22 +1,22 @@
-TitleScroll_WaitBall: ; 37244 (d:7244)
+TitleScroll_WaitBall:
 ; Wait around for the TitleBall animation to play out.
 ; hi: speed
 ; lo: duration
 	db $05, $05, 0
 
-TitleScroll_In: ; 37247 (d:7247)
+TitleScroll_In:
 ; Scroll a TitleMon in from the right.
 ; hi: speed
 ; lo: duration
 	db $a2, $94, $84, $63, $52, $31, $11, 0
 
-TitleScroll_Out: ; 3724f (d:724f)
+TitleScroll_Out:
 ; Scroll a TitleMon out to the left.
 ; hi: speed
 ; lo: duration
 	db $12, $22, $32, $42, $52, $62, $83, $93, 0
 
-TitleScroll: ; 37258 (d:7258)
+TitleScroll:
 	ld a, d
 
 	ld bc, TitleScroll_In
@@ -31,7 +31,7 @@
 	ld e, 0 ; don't animate titleball
 .ok
 
-_TitleScroll: ; 3726a (d:726a)
+_TitleScroll:
 	ld a, [bc]
 	and a
 	ret z
@@ -82,12 +82,12 @@
 	jr z, .wait2
 	ret
 
-TitleBallYTable: ; 372a0 (d:72a0)
+TitleBallYTable:
 ; OBJ y-positions for the Poke Ball held by Red in the title screen.
 ; This is really two 0-terminated lists. Initiated with an index of 1.
 	db 0, $71, $6f, $6e, $6d, $6c, $6d, $6e, $6f, $71, $74, 0
 
-TitleScreenAnimateBallIfStarterOut: ; 372ac (d:72ac)
+TitleScreenAnimateBallIfStarterOut:
 ; Animate the TitleBall if a starter just got scrolled out.
 	ld a, [wTitleMonSpecies]
 	cp STARTER1
@@ -102,7 +102,7 @@
 	ld d, 0
 	jp _TitleScroll
 
-GetTitleBallY: ; 372c4 (d:72c4)
+GetTitleBallY:
 ; Get position e from TitleBallYTable
 	push de
 	push hl
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -1,4 +1,4 @@
-DisplayTownMap: ; 70e3e (1c:4e3e)
+DisplayTownMap:
 	call LoadTownMap
 	ld hl, wUpdateSpritesEnabled
 	ld a, [hl]
@@ -105,11 +105,11 @@
 
 INCLUDE "data/town_map_order.asm"
 
-TownMapCursor: ; 70f40 (1c:4f40)
+TownMapCursor:
 	INCBIN "gfx/town_map_cursor.1bpp"
 TownMapCursorEnd:
 
-LoadTownMap_Nest: ; 70f60 (1c:4f60)
+LoadTownMap_Nest:
 	call LoadTownMap
 	ld hl, wUpdateSpritesEnabled
 	ld a, [hl]
@@ -131,10 +131,10 @@
 	ld [hl], a
 	ret
 
-MonsNestText: ; 70f89 (1c:4f89)
+MonsNestText:
 	db "'s NEST@"
 
-LoadTownMap_Fly: ; 70f90 (1c:4f90)
+LoadTownMap_Fly:
 	call ClearSprites
 	call LoadTownMap
 	call LoadPlayerSpriteGraphics
@@ -243,10 +243,10 @@
 	ld hl, wFlyLocationsList + 11
 	jr .pressedDown
 
-ToText: ; 7106d (1c:506d)
+ToText:
 	db "To@"
 
-BuildFlyLocationsList: ; 71070 (1c:5070)
+BuildFlyLocationsList:
 	ld hl, wFlyLocationsList - 1
 	ld [hl], $ff
 	inc hl
@@ -270,11 +270,11 @@
 	ld [hl], $ff
 	ret
 
-TownMapUpArrow: ; 71093 (1c:5093)
+TownMapUpArrow:
 	INCBIN "gfx/up_arrow.1bpp"
 TownMapUpArrowEnd:
 
-LoadTownMap: ; 7109b (1c:509b)
+LoadTownMap:
 	call GBPalWhiteOutWithDelay3
 	call ClearScreen
 	call UpdateSprites
@@ -324,11 +324,11 @@
 	ld [wTownMapSpriteBlinkingEnabled], a
 	ret
 
-CompressedMap: ; 71100 (1c:5100)
+CompressedMap:
 ; you can decompress this file with the redrle program in the extras/ dir
 	INCBIN "gfx/town_map.rle"
 
-ExitTownMap: ; 711ab (1c:51ab)
+ExitTownMap:
 ; clear town map graphics data and load usual graphics data
 	xor a
 	ld [wTownMapSpriteBlinkingEnabled], a
@@ -340,7 +340,7 @@
 	call UpdateSprites
 	jp RunDefaultPaletteCommand
 
-DrawPlayerOrBirdSprite: ; 711c4 (1c:51c4)
+DrawPlayerOrBirdSprite:
 ; a = map number
 ; b = OAM base tile
 	push af
@@ -366,7 +366,7 @@
 	ld bc, $a0
 	jp CopyData
 
-DisplayWildLocations: ; 711ef (1c:51ef)
+DisplayWildLocations:
 	callba FindWildLocationsOfMon
 	call ZeroOutDuplicatesInList
 	ld hl, wOAMBuffer
@@ -414,10 +414,10 @@
 	ld bc, $a0
 	jp CopyData
 
-AreaUnknownText: ; 7124a (1c:524a)
+AreaUnknownText:
 	db " AREA UNKNOWN@"
 
-TownMapCoordsToOAMCoords: ; 71258 (1c:5258)
+TownMapCoordsToOAMCoords:
 ; in: lower nybble of a = x, upper nybble of a = y
 ; out: b and [hl] = (y * 8) + 24, c and [hl+1] = (x * 8) + 24
 	push af
@@ -435,7 +435,7 @@
 	ld [hli], a
 	ret
 
-WritePlayerOrBirdSpriteOAM: ; 7126d (1c:526d)
+WritePlayerOrBirdSpriteOAM:
 	ld a, [wOAMBaseTile]
 	and a
 	ld hl, wOAMBuffer + $90 ; for player sprite
@@ -442,7 +442,7 @@
 	jr z, WriteTownMapSpriteOAM
 	ld hl, wOAMBuffer + $80 ; for bird sprite
 
-WriteTownMapSpriteOAM: ; 71279 (1c:5279)
+WriteTownMapSpriteOAM:
 	push hl
 
 ; Subtract 4 from c (X coord) and 4 from b (Y coord). However, the carry from c
@@ -454,7 +454,7 @@
 	ld c, l
 	pop hl
 
-WriteAsymmetricMonPartySpriteOAM: ; 71281 (1c:5281)
+WriteAsymmetricMonPartySpriteOAM:
 ; Writes 4 OAM blocks for a helix mon party sprite, since it does not have
 ; a vertical line of symmetry.
 	lb de, 2, 2
@@ -487,7 +487,7 @@
 	jr nz, .loop
 	ret
 
-WriteSymmetricMonPartySpriteOAM: ; 712a6 (1c:52a6)
+WriteSymmetricMonPartySpriteOAM:
 ; Writes 4 OAM blocks for a mon party sprite other than a helix. All the
 ; sprites other than the helix one have a vertical line of symmetry which allows
 ; the X-flip OAM bit to be used so that only 2 rather than 4 tile patterns are
@@ -529,7 +529,7 @@
 	jr nz, .loop
 	ret
 
-ZeroOutDuplicatesInList: ; 712d9 (1c:52d9)
+ZeroOutDuplicatesInList:
 ; replace duplicate bytes in the list of wild pokemon locations with 0
 	ld de, wBuffer
 .loop
@@ -552,7 +552,7 @@
 	inc hl
 	jr .zeroDuplicatesLoop
 
-LoadTownMapEntry: ; 712f1 (1c:52f1)
+LoadTownMapEntry:
 ; in: a = map number
 ; out: lower nybble of [de] = x, upper nybble of [de] = y, hl = address of name
 	cp REDS_HOUSE_1F
@@ -586,11 +586,11 @@
 
 INCLUDE "text/map_names.asm"
 
-MonNestIcon: ; 716be (1c:56be)
+MonNestIcon:
 	INCBIN "gfx/mon_nest_icon.1bpp"
 MonNestIconEnd:
 
-TownMapSpriteBlinkingAnimation: ; 716c6 (1c:56c6)
+TownMapSpriteBlinkingAnimation:
 	ld a, [wAnimCounter]
 	inc a
 	cp 25
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -1,4 +1,4 @@
-InternalClockTradeAnim: ; 410e2 (10:50e2)
+InternalClockTradeAnim:
 ; Do the trading animation with the player's gameboy on the left.
 ; In-game trades and internally clocked link cable trades use this.
 	ld a, [wTradedPlayerMonSpecies]
@@ -8,7 +8,7 @@
 	ld de, InternalClockTradeFuncSequence
 	jr TradeAnimCommon
 
-ExternalClockTradeAnim: ; 410f3 (10:50f3)
+ExternalClockTradeAnim:
 ; Do the trading animation with the player's gameboy on the right.
 ; Externally clocked link cable trades use this.
 	ld a, [wTradedEnemyMonSpecies]
@@ -17,7 +17,7 @@
 	ld [wRightGBMonSpecies], a
 	ld de, ExternalClockTradeFuncSequence
 
-TradeAnimCommon: ; 41102 (10:5102)
+TradeAnimCommon:
 	ld a, [wOptions]
 	push af
 	ld a, [hSCY]
@@ -69,7 +69,7 @@
 ; They are from opposite perspectives. The external clock one makes use of
 ; Trade_SwapNames to swap the player and enemy names for some functions.
 
-InternalClockTradeFuncSequence: ; 41138 (10:5138)
+InternalClockTradeFuncSequence:
 	tradefunc LoadTradingGFXAndMonNames
 	tradefunc Trade_ShowPlayerMon
 	tradefunc Trade_DrawOpenEndOfLinkCable
@@ -88,7 +88,7 @@
 	tradefunc Trade_Cleanup
 	db $FF
 
-ExternalClockTradeFuncSequence: ; 41149 (10:5149)
+ExternalClockTradeFuncSequence:
 	tradefunc LoadTradingGFXAndMonNames
 	tradefunc Trade_ShowClearedWindow
 	tradefunc PrintTradeWillTradeText
@@ -112,7 +112,7 @@
 	tradefunc Trade_Cleanup
 	db $FF
 
-TradeFuncPointerTable: ; 4115f (10:515f)
+TradeFuncPointerTable:
 	addtradefunc LoadTradingGFXAndMonNames
 	addtradefunc Trade_ShowPlayerMon
 	addtradefunc Trade_DrawOpenEndOfLinkCable
@@ -131,11 +131,11 @@
 	addtradefunc Trade_SlideTextBoxOffScreen
 	addtradefunc Trade_SwapNames
 
-Trade_Delay100: ; 41181 (10:5181)
+Trade_Delay100:
 	ld c, 100
 	jp DelayFrames
 
-Trade_CopyTileMapToVRAM: ; 41186 (10:5186)
+Trade_CopyTileMapToVRAM:
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a
 	call Delay3
@@ -143,17 +143,17 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ret
 
-Trade_Delay80: ; 41191 (10:5191)
+Trade_Delay80:
 	ld c, 80
 	jp DelayFrames
 
-Trade_ClearTileMap: ; 41196 (10:5196)
+Trade_ClearTileMap:
 	coord hl, 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
 	jp FillMemory
 
-LoadTradingGFXAndMonNames: ; 411a1 (10:51a1)
+LoadTradingGFXAndMonNames:
 	call Trade_ClearTileMap
 	call DisableLCD
 	ld hl, TradingAnimationGraphics
@@ -196,12 +196,12 @@
 	ld [wd11e], a
 	jp GetMonName
 
-Trade_LoadMonPartySpriteGfx: ; 4120b (10:520b)
+Trade_LoadMonPartySpriteGfx:
 	ld a, %11010000
 	ld [rOBP1], a
 	jpba LoadMonPartySpriteGfx
 
-Trade_SwapNames: ; 41217 (10:5217)
+Trade_SwapNames:
 	ld hl, wPlayerName
 	ld de, wBuffer
 	ld bc, NAME_LENGTH
@@ -215,7 +215,7 @@
 	ld bc, NAME_LENGTH
 	jp CopyData
 
-Trade_Cleanup: ; 4123b (10:523b)
+Trade_Cleanup:
 	xor a
 	call LoadGBPal
 	ld hl, wd730
@@ -222,7 +222,7 @@
 	res 6, [hl] ; turn off instant text printing
 	ret
 
-Trade_ShowPlayerMon: ; 41245 (10:5245)
+Trade_ShowPlayerMon:
 	ld a, %10101011
 	ld [rLCDC], a
 	ld a, $50
@@ -264,7 +264,7 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ret
 
-Trade_DrawOpenEndOfLinkCable: ; 41298 (10:5298)
+Trade_DrawOpenEndOfLinkCable:
 	call Trade_ClearTileMap
 	ld b, vBGMap0 / $100
 	call CopyScreenTileBufferToVRAM
@@ -296,7 +296,7 @@
 	jr nz, .loop
 	ret
 
-Trade_AnimateBallEnteringLinkCable: ; 412d2 (10:52d2)
+Trade_AnimateBallEnteringLinkCable:
 	ld a, TRADE_BALL_SHAKE_ANIM
 	call Trade_ShowAnimation
 	ld c, 10
@@ -345,11 +345,11 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ret
 
-Trade_BallInsideLinkCableOAM: ; 4132e (10:532e)
+Trade_BallInsideLinkCableOAM:
 	db $7E,$00,$7E,$20
 	db $7E,$40,$7E,$60
 
-Trade_ShowEnemyMon: ; 41336 (10:5336)
+Trade_ShowEnemyMon:
 	ld a, TRADE_BALL_TILT_ANIM
 	call Trade_ShowAnimation
 	call Trade_ShowClearedWindow
@@ -375,7 +375,7 @@
 	call ClearScreenArea
 	jp PrintTradeTakeCareText
 
-Trade_AnimLeftToRight: ; 41376 (10:5376)
+Trade_AnimLeftToRight:
 ; Animates the mon moving from the left GB to the right one.
 	call Trade_InitGameboyTransferGfx
 	ld a, $1
@@ -409,7 +409,7 @@
 	call Trade_AnimMonMoveVertical
 	jp ClearSprites
 
-Trade_AnimRightToLeft: ; 413c6 (10:53c6)
+Trade_AnimRightToLeft:
 ; Animates the mon moving from the right GB to the left one.
 	call Trade_InitGameboyTransferGfx
 	xor a
@@ -441,7 +441,7 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	jp ClearSprites
 
-Trade_InitGameboyTransferGfx: ; 41411 (10:5411)
+Trade_InitGameboyTransferGfx:
 ; Initialises the graphics for showing a mon moving between gameboys.
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -458,7 +458,7 @@
 	ld [hWY], a
 	ret
 
-Trade_DrawLeftGameboy: ; 4142d (10:542d)
+Trade_DrawLeftGameboy:
 	call Trade_ClearTileMap
 
 ; draw link cable
@@ -488,7 +488,7 @@
 
 	jp DelayFrame
 
-Trade_DrawRightGameboy: ; 4145c (10:545c)
+Trade_DrawRightGameboy:
 	call Trade_ClearTileMap
 
 ; draw horizontal segment of link cable
@@ -535,7 +535,7 @@
 
 	jp DelayFrame
 
-Trade_DrawCableAcrossScreen: ; 4149f (10:549f)
+Trade_DrawCableAcrossScreen:
 ; Draws the link cable across the screen.
 	call Trade_ClearTileMap
 	coord hl, 0, 4
@@ -547,7 +547,7 @@
 	jr nz, .loop
 	ret
 
-Trade_CopyCableTilesOffScreen: ; 414ae (10:54ae)
+Trade_CopyCableTilesOffScreen:
 ; This is used to copy the link cable tiles off screen so that the cable
 ; continues when the screen is scrolled.
 	push hl
@@ -563,7 +563,7 @@
 	ld c, 10
 	jp DelayFrames
 
-Trade_AnimMonMoveHorizontal: ; 414c5 (10:54c5)
+Trade_AnimMonMoveHorizontal:
 ; Animates the mon going through the link cable horizontally over a distance of
 ; b 16-pixel units.
 	ld a, [wTradedMonMovingRight]
@@ -590,7 +590,7 @@
 	jr nz, Trade_AnimMonMoveHorizontal
 	ret
 
-Trade_AnimCircledMon: ; 414e8 (10:54e8)
+Trade_AnimCircledMon:
 ; Cycles between the two animation frames of the mon party sprite, cycles
 ; between a circle and an oval around the mon sprite, and makes the cable flash.
 	push de
@@ -614,11 +614,11 @@
 	pop de
 	ret
 
-Trade_WriteCircledMonOAM: ; 41505 (10:5505)
+Trade_WriteCircledMonOAM:
 	callba WriteMonPartySpriteOAMBySpecies
 	call Trade_WriteCircleOAM
 
-Trade_AddOffsetsToOAMCoords: ; 41510 (10:5510)
+Trade_AddOffsetsToOAMCoords:
 	ld hl, wOAMBuffer
 	ld c, $14
 .loop
@@ -634,7 +634,7 @@
 	jr nz, .loop
 	ret
 
-Trade_AnimMonMoveVertical: ; 41525 (10:5525)
+Trade_AnimMonMoveVertical:
 ; Animates the mon going through the link cable vertically as well as
 ; horizontally for a bit. The last bit of horizontal movement (when moving
 ; right) or the first bit of horizontal movement (when moving left) are done
@@ -670,7 +670,7 @@
 	jr nz, .loop
 	ret
 
-Trade_WriteCircleOAM: ; 41558 (10:5558)
+Trade_WriteCircleOAM:
 ; Writes the OAM blocks for the circle around the traded mon as it passes
 ; the link cable.
 	ld hl, Trade_CircleOAMPointers
@@ -697,7 +697,7 @@
 	jr nz, .loop
 	ret
 
-Trade_CircleOAMPointers: ; 41574 (10:5574)
+Trade_CircleOAMPointers:
 	dw Trade_CircleOAM0
 	db $08,$08
 	dw Trade_CircleOAM1
@@ -707,24 +707,24 @@
 	dw Trade_CircleOAM3
 	db $18,$18
 
-Trade_CircleOAM0: ; 41584 (10:5584)
+Trade_CircleOAM0:
 	db $38,$10,$39,$10
 	db $3A,$10,$3B,$10
 
-Trade_CircleOAM1: ; 4158c (10:558c)
+Trade_CircleOAM1:
 	db $39,$30,$38,$30
 	db $3B,$30,$3A,$30
 
-Trade_CircleOAM2: ; 41594 (10:5594)
+Trade_CircleOAM2:
 	db $3A,$50,$3B,$50
 	db $38,$50,$39,$50
 
-Trade_CircleOAM3: ; 4159c (10:559c)
+Trade_CircleOAM3:
 	db $3B,$70,$3A,$70
 	db $39,$70,$38,$70
 
 ; a = species
-Trade_LoadMonSprite: ; 415a4 (10:55a4)
+Trade_LoadMonSprite:
 	ld [wcf91], a
 	ld [wd0b5], a
 	ld [wWholeScreenPaletteMonSpecies], a
@@ -740,7 +740,7 @@
 	ld c, 10
 	jp DelayFrames
 
-Trade_ShowClearedWindow: ; 415c8 (10:55c8)
+Trade_ShowClearedWindow:
 ; clears the window and covers the BG entirely with the window
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -755,7 +755,7 @@
 	ld [hSCX], a
 	ret
 
-Trade_SlideTextBoxOffScreen: ; 415df (10:55df)
+Trade_SlideTextBoxOffScreen:
 ; Slides the window right until it's off screen. The window usually just has
 ; a text box at the bottom when this is called. However, when this is called
 ; after Trade_ShowEnemyMon in the external clock sequence, there is a mon pic
@@ -777,7 +777,7 @@
 	ld [rWX], a
 	ret
 
-PrintTradeWentToText: ; 415fe (10:55fe)
+PrintTradeWentToText:
 	ld hl, TradeWentToText
 	call PrintText
 	ld c, 200
@@ -784,11 +784,11 @@
 	call DelayFrames
 	jp Trade_SlideTextBoxOffScreen
 
-TradeWentToText: ; 4160c (10:560c)
+TradeWentToText:
 	TX_FAR _TradeWentToText
 	db "@"
 
-PrintTradeForSendsText: ; 41611 (10:5611)
+PrintTradeForSendsText:
 	ld hl, TradeForText
 	call PrintText
 	call Trade_Delay80
@@ -796,15 +796,15 @@
 	call PrintText
 	jp Trade_Delay80
 
-TradeForText: ; 41623 (10:5623)
+TradeForText:
 	TX_FAR _TradeForText
 	db "@"
 
-TradeSendsText: ; 41628 (10:5628)
+TradeSendsText:
 	TX_FAR _TradeSendsText
 	db "@"
 
-PrintTradeFarewellText: ; 4162d (10:562d)
+PrintTradeFarewellText:
 	ld hl, TradeWavesFarewellText
 	call PrintText
 	call Trade_Delay80
@@ -813,24 +813,24 @@
 	call Trade_Delay80
 	jp Trade_SlideTextBoxOffScreen
 
-TradeWavesFarewellText: ; 41642 (10:5642)
+TradeWavesFarewellText:
 	TX_FAR _TradeWavesFarewellText
 	db "@"
 
-TradeTransferredText: ; 41647 (10:5647)
+TradeTransferredText:
 	TX_FAR _TradeTransferredText
 	db "@"
 
-PrintTradeTakeCareText: ; 4164c (10:564c)
+PrintTradeTakeCareText:
 	ld hl, TradeTakeCareText
 	call PrintText
 	jp Trade_Delay80
 
-TradeTakeCareText: ; 41655 (10:5655)
+TradeTakeCareText:
 	TX_FAR _TradeTakeCareText
 	db "@"
 
-PrintTradeWillTradeText: ; 4165a (10:565a)
+PrintTradeWillTradeText:
 	ld hl, TradeWillTradeText
 	call PrintText
 	call Trade_Delay80
@@ -838,15 +838,15 @@
 	call PrintText
 	jp Trade_Delay80
 
-TradeWillTradeText: ; 4166c (10:566c)
+TradeWillTradeText:
 	TX_FAR _TradeWillTradeText
 	db "@"
 
-TradeforText: ; 41671 (10:5671)
+TradeforText:
 	TX_FAR _TradeforText
 	db "@"
 
-Trade_ShowAnimation: ; 41676 (10:5676)
+Trade_ShowAnimation:
 	ld [wAnimationID], a
 	xor a
 	ld [wAnimationType], a
--- a/engine/trade2.asm
+++ b/engine/trade2.asm
@@ -1,4 +1,4 @@
-Trade_PrintPlayerMonInfoText: ; 42769 (10:6769)
+Trade_PrintPlayerMonInfoText:
 	coord hl, 5, 0
 	ld de,Trade_MonInfoText
 	call PlaceString
@@ -20,7 +20,7 @@
 	lb bc, LEADING_ZEROES | 2, 5
 	jp PrintNumber
 
-Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7)
+Trade_PrintEnemyMonInfoText:
 	coord hl, 5, 10
 	ld de,Trade_MonInfoText
 	call PlaceString
@@ -42,7 +42,7 @@
 	lb bc, LEADING_ZEROES | 2, 5
 	jp PrintNumber
 
-Trade_MonInfoText: ; 427e5 (10:67e5)
+Trade_MonInfoText:
 	db "──",$74,$F2,$4E
 	db $4E
 	db "OT/",$4E
--- a/engine/turn_sprite.asm
+++ b/engine/turn_sprite.asm
@@ -1,4 +1,4 @@
-UpdateSpriteFacingOffsetAndDelayMovement: ; 13074 (4:7074)
+UpdateSpriteFacingOffsetAndDelayMovement:
 	ld h, $c2
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $8
--- a/home.asm
+++ b/home.asm
@@ -118,7 +118,7 @@
 INCLUDE "home/overworld.asm"
 
 
-CheckForUserInterruption:: ; 12f8 (0:12f8)
+CheckForUserInterruption::
 ; Return carry if Up+Select+B, Start or A are pressed in c frames.
 ; Used only in the intro and title screen.
 	call DelayFrame
@@ -148,7 +148,7 @@
 ; function to load position data for destination warp when switching maps
 ; INPUT:
 ; a = ID of destination warp within destination map
-LoadDestinationWarpPosition:: ; 1313 (0:1313)
+LoadDestinationWarpPosition::
 	ld b,a
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -170,7 +170,7 @@
 	ret
 
 
-DrawHPBar:: ; 1336 (0:1336)
+DrawHPBar::
 ; Draw an HP bar d tiles long, and fill it to e pixels.
 ; If c is nonzero, show at least a sliver regardless.
 ; The right end of the bar changes with [wHPBarType].
@@ -252,11 +252,11 @@
 ; [wcf91] = pokemon ID
 ; wLoadedMon = base address of pokemon data
 ; wMonHeader = base address of base stats
-LoadMonData:: ; 1372 (0:1372)
+LoadMonData::
 	jpab LoadMonData_
 
 
-OverwritewMoves:: ; 137a (0:137a)
+OverwritewMoves::
 ; Write c to [wMoves + b]. Unused.
 	ld hl, wMoves
 	ld e, b
@@ -266,11 +266,11 @@
 	ld [hl], a
 	ret
 
-LoadFlippedFrontSpriteByMonIndex:: ; 1384 (0:1384)
+LoadFlippedFrontSpriteByMonIndex::
 	ld a, 1
 	ld [wSpriteFlipped], a
 
-LoadFrontSpriteByMonIndex:: ; 1389 (0:1389)
+LoadFrontSpriteByMonIndex::
 	push hl
 	ld a, [wd11e]
 	push af
@@ -311,13 +311,13 @@
 	ret
 
 
-PlayCry:: ; 13d0 (0:13d0)
+PlayCry::
 ; Play monster a's cry.
 	call GetCryData
 	call PlaySound
 	jp WaitForSoundToFinish
 
-GetCryData:: ; 13d9 (0:13d9)
+GetCryData::
 ; Load cry data for monster a.
 	dec a
 	ld c, a
@@ -348,7 +348,7 @@
 	ret
 
 
-DisplayPartyMenu:: ; 13fc (0:13fc)
+DisplayPartyMenu::
 	ld a,[hTilesetType]
 	push af
 	xor a
@@ -359,7 +359,7 @@
 	call DrawPartyMenu
 	jp HandlePartyMenuInput
 
-GoBackToPartyMenu:: ; 1411 (0:1411)
+GoBackToPartyMenu::
 	ld a,[hTilesetType]
 	push af
 	xor a
@@ -368,7 +368,7 @@
 	call RedrawPartyMenu
 	jp HandlePartyMenuInput
 
-PartyMenuInit:: ; 1420 (0:1420)
+PartyMenuInit::
 	ld a, 1 ; hardcoded bank
 	call BankswitchHome
 	call LoadHpBarAndStatusTilePatterns
@@ -407,7 +407,7 @@
 	ld [hl], a ; old menu item ID
 	ret
 
-HandlePartyMenuInput:: ; 145a (0:145a)
+HandlePartyMenuInput::
 	ld a,1
 	ld [wMenuWrappingEnabled],a
 	ld a,$40
@@ -463,14 +463,14 @@
 	callba SwitchPartyMon
 	jr HandlePartyMenuInput
 
-DrawPartyMenu:: ; 14d4 (0:14d4)
+DrawPartyMenu::
 	ld hl, DrawPartyMenu_
 	jr DrawPartyMenuCommon
 
-RedrawPartyMenu:: ; 14d9 (0:14d9)
+RedrawPartyMenu::
 	ld hl, RedrawPartyMenu_
 
-DrawPartyMenuCommon:: ; 14dc (0:14dc)
+DrawPartyMenuCommon::
 	ld b, BANK(RedrawPartyMenu_)
 	jp Bankswitch
 
@@ -478,7 +478,7 @@
 ; INPUT:
 ; de = address of status condition
 ; hl = destination address
-PrintStatusCondition:: ; 14e1 (0:14e1)
+PrintStatusCondition::
 	push de
 	dec de
 	dec de ; de = address of current HP
@@ -514,7 +514,7 @@
 ; INPUT:
 ; hl = destination address
 ; [wLoadedMonLevel] = level
-PrintLevel:: ; 150b (0:150b)
+PrintLevel::
 	ld a,$6e ; ":L" tile ID
 	ld [hli],a
 	ld c,2 ; number of digits
@@ -530,19 +530,19 @@
 ; INPUT:
 ; hl = destination address
 ; [wLoadedMonLevel] = level
-PrintLevelFull:: ; 151b (0:151b)
+PrintLevelFull::
 	ld a,$6e ; ":L" tile ID
 	ld [hli],a
 	ld c,3 ; number of digits
 	ld a,[wLoadedMonLevel] ; level
 
-PrintLevelCommon:: ; 1523 (0:1523)
+PrintLevelCommon::
 	ld [wd11e],a
 	ld de,wd11e
 	ld b,LEFT_ALIGN | 1 ; 1 byte
 	jp PrintNumber
 
-GetwMoves:: ; 152e (0:152e)
+GetwMoves::
 ; Unused. Returns the move at index a from wMoves in a
 	ld hl,wMoves
 	ld c,a
@@ -554,7 +554,7 @@
 ; copies the base stat data of a pokemon to wMonHeader
 ; INPUT:
 ; [wd0b5] = pokemon ID
-GetMonHeader:: ; 1537 (0:1537)
+GetMonHeader::
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,BANK(BaseStats)
@@ -618,12 +618,12 @@
 	ret
 
 ; copy party pokemon's name to wcd6d
-GetPartyMonName2:: ; 15b4 (0:15b4)
+GetPartyMonName2::
 	ld a,[wWhichPokemon] ; index within party
 	ld hl,wPartyMonNicks
 
 ; this is called more often
-GetPartyMonName:: ; 15ba (0:15ba)
+GetPartyMonName::
 	push hl
 	push bc
 	call SkipFixedLengthTextEntries ; add NAME_LENGTH to hl, a times
@@ -649,7 +649,7 @@
 ; bits 0-4: length of BCD number in bytes
 ; Note that bits 5 and 7 are modified during execution. The above reflects
 ; their meaning at the beginning of the functions's execution.
-PrintBCDNumber:: ; 15cd (0:15cd)
+PrintBCDNumber::
 	ld b,c ; save flags in b
 	res 7,c
 	res 6,c
@@ -687,7 +687,7 @@
 .done
 	ret
 
-PrintBCDDigit:: ; 1604 (0:1604)
+PrintBCDDigit::
 	and $f
 	and a
 	jr z,.zeroDigit
@@ -717,7 +717,7 @@
 ; uncompresses the front or back sprite of the specified mon
 ; assumes the corresponding mon header is already loaded
 ; hl contains offset to sprite pointer ($b for front or $d for back)
-UncompressMonSprite:: ; 1627 (0:1627)
+UncompressMonSprite::
 	ld bc,wMonHeader
 	add hl,bc
 	ld a,[hli]
@@ -762,7 +762,7 @@
 	jp UncompressSpriteData
 
 ; de: destination location
-LoadMonFrontSprite:: ; 1665 (0:1665)
+LoadMonFrontSprite::
 	push de
 	ld hl, wMonHFrontSprite - wMonHeader
 	call UncompressMonSprite
@@ -776,7 +776,7 @@
 ; calculates alignment parameters to place both sprite chunks in the center of the 7*7 tile sprite buffers
 ; de: destination location
 ; a,c:  sprite dimensions (in tiles of 8x8 each)
-LoadUncompressedSpriteData:: ; 1672 (0:1672)
+LoadUncompressedSpriteData::
 	push de
 	and $f
 	ld [H_SPRITEWIDTH], a ; each byte contains 8 pixels (in 1bpp), so tiles=bytes for width
@@ -825,7 +825,7 @@
 
 ; copies and aligns the sprite data properly inside the sprite buffer
 ; sprite buffers are 7*7 tiles in size, the loaded sprite is centered within this area
-AlignSpriteDataCentered:: ; 16c2 (0:16c2)
+AlignSpriteDataCentered::
 	ld a, [H_SPRITEOFFSET]
 	ld b, $0
 	ld c, a
@@ -851,7 +851,7 @@
 	ret
 
 ; fills the sprite buffer (pointed to in hl) with zeros
-ZeroSpriteBuffer:: ; 16df (0:16df)
+ZeroSpriteBuffer::
 	ld bc, SPRITEBUFFERSIZE
 .nextByteLoop
 	xor a
@@ -865,7 +865,7 @@
 ; combines the (7*7 tiles, 1bpp) sprite chunks in buffer 0 and 1 into a 2bpp sprite located in buffer 1 through 2
 ; in the resulting sprite, the rows of the two source sprites are interlaced
 ; de: output address
-InterlaceMergeSpriteBuffers:: ; 16ea (0:16ea)
+InterlaceMergeSpriteBuffers::
 	xor a
 	ld [$4000], a
 	push de
@@ -924,7 +924,7 @@
 INCLUDE "home/audio.asm"
 
 
-UpdateSprites:: ; 2429 (0:2429)
+UpdateSprites::
 	ld a, [wUpdateSpritesEnabled]
 	dec a
 	ret nz
@@ -941,33 +941,33 @@
 
 INCLUDE "data/mart_inventories.asm"
 
-TextScriptEndingChar:: ; 24d6 (0:24d6)
+TextScriptEndingChar::
 	db "@"
-TextScriptEnd:: ; 24d7 (0:24d7)
+TextScriptEnd::
 	ld hl,TextScriptEndingChar
 	ret
 
-ExclamationText:: ; 24db (0:24db)
+ExclamationText::
 	TX_FAR _ExclamationText
 	db "@"
 
-GroundRoseText:: ; 24e0 (0:24e0)
+GroundRoseText::
 	TX_FAR _GroundRoseText
 	db "@"
 
-BoulderText:: ; 24e5 (0:24e5)
+BoulderText::
 	TX_FAR _BoulderText
 	db "@"
 
-MartSignText:: ; 24ea (0:24ea)
+MartSignText::
 	TX_FAR _MartSignText
 	db "@"
 
-PokeCenterSignText:: ; 24ef (0:24ef)
+PokeCenterSignText::
 	TX_FAR _PokeCenterSignText
 	db "@"
 
-PickUpItemText:: ; 24f4 (0:24f4)
+PickUpItemText::
 ; XXX better label (what does predef $5C do?)
 	TX_ASM
 	predef PickUpItem
@@ -977,7 +977,7 @@
 INCLUDE "home/pic.asm"
 
 
-ResetPlayerSpriteData:: ; 28a6 (0:28a6)
+ResetPlayerSpriteData::
 	ld hl, wSpriteStateData1
 	call ResetPlayerSpriteData_ClearSpriteData
 	ld hl, wSpriteStateData2
@@ -993,12 +993,12 @@
 	ret
 
 ; overwrites sprite data with zeroes
-ResetPlayerSpriteData_ClearSpriteData:: ; 28c4 (0:28c4)
+ResetPlayerSpriteData_ClearSpriteData::
 	ld bc, $10
 	xor a
 	jp FillMemory
 
-FadeOutAudio:: ; 28cb (0:28cb)
+FadeOutAudio::
 	ld a, [wAudioFadeOutControl]
 	and a
 	jr nz, .asm_28dc
@@ -1049,7 +1049,7 @@
 
 ; this function is used to display sign messages, sprite dialog, etc.
 ; INPUT: [hSpriteIndexOrTextID] = sprite ID or text ID
-DisplayTextID:: ; 2920 (0:2920)
+DisplayTextID::
 	ld a,[H_LOADEDROMBANK]
 	push af
 	callba DisplayTextIDInit ; initialization
@@ -1143,7 +1143,7 @@
 	and a
 	jr nz,HoldTextDisplayOpen
 
-AfterDisplayingTextID:: ; 29d6 (0:29d6)
+AfterDisplayingTextID::
 	ld a,[wEnteringCableClub]
 	and a
 	jr nz,HoldTextDisplayOpen
@@ -1150,13 +1150,13 @@
 	call WaitForTextScrollButtonPress ; wait for a button press after displaying all the text
 
 ; loop to hold the dialogue box open as long as the player keeps holding down the A button
-HoldTextDisplayOpen:: ; 29df (0:29df)
+HoldTextDisplayOpen::
 	call Joypad
 	ld a,[hJoyHeld]
 	bit 0,a ; is the A button being pressed?
 	jr nz,HoldTextDisplayOpen
 
-CloseTextDisplay:: ; 29e8 (0:29e8)
+CloseTextDisplay::
 	ld a,[wCurMap]
 	call SwitchToMapRomBank
 	ld a,$90
@@ -1192,7 +1192,7 @@
 	ld [MBC1RomBank],a
 	jp UpdateSprites
 
-DisplayPokemartDialogue:: ; 2a2e (0:2a2e)
+DisplayPokemartDialogue::
 	push hl
 	ld hl,PokemartGreetingText
 	call PrintText
@@ -1212,11 +1212,11 @@
 	ld [MBC1RomBank],a
 	jp AfterDisplayingTextID
 
-PokemartGreetingText:: ; 2a55 (0:2a55)
+PokemartGreetingText::
 	TX_FAR _PokemartGreetingText
 	db "@"
 
-LoadItemList:: ; 2a5a (0:2a5a)
+LoadItemList::
 	ld a,1
 	ld [wUpdateSpritesEnabled],a
 	ld a,h
@@ -1232,7 +1232,7 @@
 	jr nz,.loop
 	ret
 
-DisplayPokemonCenterDialogue:: ; 2a72 (0:2a72)
+DisplayPokemonCenterDialogue::
 ; zeroing these doesn't appear to serve any purpose
 	xor a
 	ld [$ff8b],a
@@ -1251,20 +1251,20 @@
 	ld [MBC1RomBank],a
 	jp AfterDisplayingTextID
 
-DisplaySafariGameOverText:: ; 2a90 (0:2a90)
+DisplaySafariGameOverText::
 	callab PrintSafariGameOverText
 	jp AfterDisplayingTextID
 
-DisplayPokemonFaintedText:: ; 2a9b (0:2a9b)
+DisplayPokemonFaintedText::
 	ld hl,PokemonFaintedText
 	call PrintText
 	jp AfterDisplayingTextID
 
-PokemonFaintedText:: ; 2aa4 (0:2aa4)
+PokemonFaintedText::
 	TX_FAR _PokemonFaintedText
 	db "@"
 
-DisplayPlayerBlackedOutText:: ; 2aa9 (0:2aa9)
+DisplayPlayerBlackedOutText::
 	ld hl,PlayerBlackedOutText
 	call PrintText
 	ld a,[wd732]
@@ -1272,16 +1272,16 @@
 	ld [wd732],a
 	jp HoldTextDisplayOpen
 
-PlayerBlackedOutText:: ; 2aba (0:2aba)
+PlayerBlackedOutText::
 	TX_FAR _PlayerBlackedOutText
 	db "@"
 
-DisplayRepelWoreOffText:: ; 2abf (0:2abf)
+DisplayRepelWoreOffText::
 	ld hl,RepelWoreOffText
 	call PrintText
 	jp AfterDisplayingTextID
 
-RepelWoreOffText:: ; 2ac8 (0:2ac8)
+RepelWoreOffText::
 	TX_FAR _RepelWoreOffText
 	db "@"
 
@@ -1293,7 +1293,7 @@
 ; b = length of string of bytes
 ; OUTPUT:
 ; [wNumSetBits] = number of set bits
-CountSetBits:: ; 2b7f (0:2b7f)
+CountSetBits::
 	ld c,0
 .loop
 	ld a,[hli]
@@ -1314,11 +1314,11 @@
 
 ; subtracts the amount the player paid from their money
 ; sets carry flag if there is enough money and unsets carry flag if not
-SubtractAmountPaidFromMoney:: ; 2b96 (0:2b96)
+SubtractAmountPaidFromMoney::
 	jpba SubtractAmountPaidFromMoney_
 
 ; adds the amount the player sold to their money
-AddAmountSoldToMoney:: ; 2b9e (0:2b9e)
+AddAmountSoldToMoney::
 	ld de,wPlayerMoney + 2
 	ld hl,$ffa1 ; total price of items
 	ld c,3 ; length of money in bytes
@@ -1335,7 +1335,7 @@
 ; HL = address of inventory (either wNumBagItems or wNumBoxItems)
 ; [wWhichPokemon] = index (within the inventory) of the item to remove
 ; [wItemQuantity] = quantity to remove
-RemoveItemFromInventory:: ; 2bbb (0:2bbb)
+RemoveItemFromInventory::
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,BANK(RemoveItemFromInventory_)
@@ -1353,7 +1353,7 @@
 ; [wcf91] = item ID
 ; [wItemQuantity] = item quantity
 ; sets carry flag if successful, unsets carry flag if unsuccessful
-AddItemToInventory:: ; 2bcf (0:2bcf)
+AddItemToInventory::
 	push bc
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -1371,7 +1371,7 @@
 ; INPUT:
 ; [wListMenuID] = list menu ID
 ; [wListPointer] = address of the list (2 bytes)
-DisplayListMenuID:: ; 2be6 (0:2be6)
+DisplayListMenuID::
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a ; disable auto-transfer
 	ld a,1
@@ -1425,7 +1425,7 @@
 	ld c,10
 	call DelayFrames
 
-DisplayListMenuIDLoop:: ; 2c53 (0:2c53)
+DisplayListMenuIDLoop::
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a ; disable transfer
 	call PrintListMenuEntries
@@ -1562,7 +1562,7 @@
 	dec [hl]
 	jp DisplayListMenuIDLoop
 
-DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
+DisplayChooseQuantityMenu::
 ; text box dimensions/coordinates for just quantity
 	coord hl, 15, 9
 	ld b,1 ; height
@@ -1681,13 +1681,13 @@
 	ld a,$ff
 	ret
 
-InitialQuantityText:: ; 2e30 (0:2e30)
+InitialQuantityText::
 	db "×01@"
 
-SpacesBetweenQuantityAndPriceText:: ; 2e34 (0:2e34)
+SpacesBetweenQuantityAndPriceText::
 	db "      @"
 
-ExitListMenu:: ; 2e3b (0:2e3b)
+ExitListMenu::
 	ld a,[wCurrentMenuItem]
 	ld [wChosenMenuItem],a
 	ld a,CANCELLED_MENU
@@ -1703,7 +1703,7 @@
 	scf
 	ret
 
-PrintListMenuEntries:: ; 2e5a (0:2e5a)
+PrintListMenuEntries::
 	coord hl, 5, 3
 	ld b,9
 	ld c,14
@@ -1892,10 +1892,10 @@
 	ld de,ListMenuCancelText
 	jp PlaceString
 
-ListMenuCancelText:: ; 2f97 (0:2f97)
+ListMenuCancelText::
 	db "CANCEL@"
 
-GetMonName:: ; 2f9e (0:2f9e)
+GetMonName::
 	push hl
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -1921,7 +1921,7 @@
 	pop hl
 	ret
 
-GetItemName:: ; 2fcf (0:2fcf)
+GetItemName::
 ; given an item ID at [wd11e], store the name of the item into a string
 ;     starting at wcd6d
 	push hl
@@ -1946,7 +1946,7 @@
 	pop hl
 	ret
 
-GetMachineName:: ; 2ff3 (0:2ff3)
+GetMachineName::
 ; copies the name of the TM/HM in [wd11e] to wcd6d
 	push hl
 	push de
@@ -1999,14 +1999,14 @@
 	pop hl
 	ret
 
-TechnicalPrefix:: ; 303c (0:303c)
+TechnicalPrefix::
 	db "TM"
-HiddenPrefix:: ; 303e (0:303e)
+HiddenPrefix::
 	db "HM"
 
 ; sets carry if item is HM, clears carry if item is not HM
 ; Input: a = item ID
-IsItemHM:: ; 3040 (0:3040)
+IsItemHM::
 	cp a,HM_01
 	jr c,.notHM
 	cp a,TM_01
@@ -2017,16 +2017,16 @@
 
 ; sets carry if move is an HM, clears carry if move is not an HM
 ; Input: a = move ID
-IsMoveHM:: ; 3049 (0:3049)
+IsMoveHM::
 	ld hl,HMMoves
 	ld de,1
 	jp IsInArray
 
-HMMoves:: ; 3052 (0:3052)
+HMMoves::
 	db CUT,FLY,SURF,STRENGTH,FLASH
 	db $ff ; terminator
 
-GetMoveName:: ; 3058 (0:3058)
+GetMoveName::
 	push hl
 	ld a,MOVE_NAME
 	ld [wNameListType],a
@@ -2040,7 +2040,7 @@
 	ret
 
 ; reloads text box tile patterns, current map view, and tileset tile patterns
-ReloadMapData:: ; 3071 (0:3071)
+ReloadMapData::
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,[wCurMap]
@@ -2056,7 +2056,7 @@
 	ret
 
 ; reloads tileset tile patterns
-ReloadTilesetTilePatterns:: ; 3090 (0:3090)
+ReloadTilesetTilePatterns::
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,[wCurMap]
@@ -2070,13 +2070,13 @@
 	ret
 
 ; shows the town map and lets the player choose a destination to fly to
-ChooseFlyDestination:: ; 30a9 (0:30a9)
+ChooseFlyDestination::
 	ld hl,wd72e
 	res 4,[hl]
 	jpba LoadTownMap_Fly
 
 ; causes the text box to close without waiting for a button press after displaying text
-DisableWaitingAfterTextDisplay:: ; 30b6 (0:30b6)
+DisableWaitingAfterTextDisplay::
 	ld a,$01
 	ld [wDoNotWaitForButtonPressAfterDisplayingText],a
 	ret
@@ -2090,7 +2090,7 @@
 ; 00: unsucessful
 ; 01: successful
 ; 02: not able to be used right now, no extra menu displayed (only certain items use this)
-UseItem:: ; 30bc (0:30bc)
+UseItem::
 	jpba UseItem_
 
 ; confirms the item toss and then tosses the item
@@ -2101,7 +2101,7 @@
 ; [wItemQuantity] = quantity to toss
 ; OUTPUT:
 ; clears carry flag if the item is tossed, sets carry flag if not
-TossItem:: ; 30c4 (0:30c4)
+TossItem::
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,BANK(TossItem_)
@@ -2121,7 +2121,7 @@
 ; [wIsKeyItem] = result
 ; 00: item is not key item
 ; 01: item is key item
-IsKeyItem:: ; 30d9 (0:30d9)
+IsKeyItem::
 	push hl
 	push de
 	push bc
@@ -2135,7 +2135,7 @@
 ; INPUT:
 ; [wTextBoxID] = text box ID
 ; b, c = y, x cursor position (TWO_OPTION_MENU only)
-DisplayTextBoxID:: ; 30e8 (0:30e8)
+DisplayTextBoxID::
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,BANK(DisplayTextBoxID_)
@@ -2150,7 +2150,7 @@
 
 ; not zero if an NPC movement script is running, the player character is
 ; automatically stepping down from a door, or joypad states are being simulated
-IsPlayerCharacterBeingControlledByGame:: ; 30fd (0:30fd)
+IsPlayerCharacterBeingControlledByGame::
 	ld a, [wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
@@ -2161,7 +2161,7 @@
 	and $80
 	ret
 
-RunNPCMovementScript:: ; 310e (0:310e)
+RunNPCMovementScript::
 	ld hl, wd736
 	bit 0, [hl]
 	res 0, [hl]
@@ -2196,14 +2196,14 @@
 .playerStepOutFromDoor
 	jpba PlayerStepOutFromDoor
 
-EndNPCMovementScript:: ; 314e (0:314e)
+EndNPCMovementScript::
 	jpba _EndNPCMovementScript
 
-EmptyFunc2:: ; 3156 (0:3156)
+EmptyFunc2::
 	ret
 
 ; stores hl in [wTrainerHeaderPtr]
-StoreTrainerHeaderPointer:: ; 3157 (0:3157)
+StoreTrainerHeaderPointer::
 	ld a, h
 	ld [wTrainerHeaderPtr], a
 	ld a, l
@@ -2212,7 +2212,7 @@
 
 ; executes the current map script from the function pointer array provided in hl.
 ; a: map script index to execute (unless overridden by [wd733] bit 4)
-ExecuteCurMapScriptInTable:: ; 3160 (0:3160)
+ExecuteCurMapScriptInTable::
 	push af
 	push de
 	call StoreTrainerHeaderPointer
@@ -2231,7 +2231,7 @@
 	ld a, [wCurMapScript]
 	ret
 
-LoadGymLeaderAndCityName:: ; 317f (0:317f)
+LoadGymLeaderAndCityName::
 	push de
 	ld de, wGymCityName
 	ld bc, $11
@@ -2248,7 +2248,7 @@
 ;    4 -> before battle text (into hl)
 ;    6 -> after battle text (into hl)
 ;    8 -> end battle text (into hl)
-ReadTrainerHeaderInfo:: ; 3193 (0:3193)
+ReadTrainerHeaderInfo::
 	push de
 	push af
 	ld d, $0
@@ -2290,7 +2290,7 @@
 TrainerFlagAction::
 	predef_jump FlagActionPredef
 
-TalkToTrainer:: ; 31cc (0:31cc)
+TalkToTrainer::
 	call StoreTrainerHeaderPointer
 	xor a
 	call ReadTrainerHeaderInfo     ; read flag's bit
@@ -2329,7 +2329,7 @@
 	jp StartTrainerBattle
 
 ; checks if any trainers are seeing the player and wanting to fight
-CheckFightingMapTrainers:: ; 3219 (0:3219)
+CheckFightingMapTrainers::
 	call CheckForEngagingTrainers
 	ld a, [wSpriteIndex]
 	cp $ff
@@ -2355,7 +2355,7 @@
 	ret
 
 ; display the before battle text after the enemy trainer has walked up to the player's sprite
-DisplayEnemyTrainerTextAndStartBattle:: ; 324c (0:324c)
+DisplayEnemyTrainerTextAndStartBattle::
 	ld a, [wd730]
 	and $1
 	ret nz ; return if the enemy trainer hasn't finished walking to the player's sprite
@@ -2365,7 +2365,7 @@
 	call DisplayTextID
 	; fall through
 
-StartTrainerBattle:: ; 325d (0:325d)
+StartTrainerBattle::
 	xor a
 	ld [wJoyIgnore], a
 	call InitBattleEnemyParameters
@@ -2378,7 +2378,7 @@
 	inc [hl]        ; increment map script index (next script function is usually EndTrainerBattle)
 	ret
 
-EndTrainerBattle:: ; 3275 (0:3275)
+EndTrainerBattle::
 	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	set 6, [hl]
@@ -2412,7 +2412,7 @@
 	res 4, [hl]
 	ret nz
 
-ResetButtonPressedAndMapScript:: ; 32c1 (0:32c1)
+ResetButtonPressedAndMapScript::
 	xor a
 	ld [wJoyIgnore], a
 	ld [hJoyHeld], a
@@ -2422,11 +2422,11 @@
 	ret
 
 ; calls TrainerWalkUpToPlayer
-TrainerWalkUpToPlayer_Bank0:: ; 32cf (0:32cf)
+TrainerWalkUpToPlayer_Bank0::
 	jpba TrainerWalkUpToPlayer
 
 ; sets opponent type and mon set/lvl based on the engaging trainer data
-InitBattleEnemyParameters:: ; 32d7 (0:32d7)
+InitBattleEnemyParameters::
 	ld a, [wEngagedTrainerClass]
 	ld [wCurOpponent], a
 	ld [wEnemyMonOrTrainerClass], a
@@ -2439,25 +2439,25 @@
 	ld [wCurEnemyLVL], a
 	ret
 
-GetSpritePosition1:: ; 32ef (0:32ef)
+GetSpritePosition1::
 	ld hl, _GetSpritePosition1
 	jr SpritePositionBankswitch
 
-GetSpritePosition2:: ; 32f4 (0:32f4)
+GetSpritePosition2::
 	ld hl, _GetSpritePosition2
 	jr SpritePositionBankswitch
 
-SetSpritePosition1:: ; 32f9 (0:32f9)
+SetSpritePosition1::
 	ld hl, _SetSpritePosition1
 	jr SpritePositionBankswitch
 
-SetSpritePosition2:: ; 32fe (0:32fe)
+SetSpritePosition2::
 	ld hl, _SetSpritePosition2
-SpritePositionBankswitch:: ; 3301 (0:3301)
+SpritePositionBankswitch::
 	ld b, BANK(_GetSpritePosition1) ; BANK(_GetSpritePosition2), BANK(_SetSpritePosition1), BANK(_SetSpritePosition2)
 	jp Bankswitch ; indirect jump to one of the four functions
 
-CheckForEngagingTrainers:: ; 3306 (0:3306)
+CheckForEngagingTrainers::
 	xor a
 	call ReadTrainerHeaderInfo       ; read trainer flag's bit (unused)
 	ld d, h                          ; store trainer header address in de
@@ -2505,7 +2505,7 @@
 
 ; hl = text if the player wins
 ; de = text if the player loses
-SaveEndBattleTextPointers:: ; 3354 (0:3354)
+SaveEndBattleTextPointers::
 	ld a, [H_LOADEDROMBANK]
 	ld [wEndBattleTextRomBank], a
 	ld a, h
@@ -2520,7 +2520,7 @@
 
 ; loads data of some trainer on the current map and plays pre-battle music
 ; [wSpriteIndex]: sprite ID of trainer who is engaged
-EngageMapTrainer:: ; 336a (0:336a)
+EngageMapTrainer::
 	ld hl, wMapSpriteExtraData
 	ld d, $0
 	ld a, [wSpriteIndex]
@@ -2534,7 +2534,7 @@
 	ld [wEnemyMonAttackMod], a
 	jp PlayTrainerMusic
 
-PrintEndBattleText:: ; 3381 (0:3381)
+PrintEndBattleText::
 	push hl
 	ld hl, wd72d
 	bit 7, [hl]
@@ -2557,7 +2557,7 @@
 	callba FreezeEnemyTrainerSprite
 	jp WaitForSoundToFinish
 
-GetSavedEndBattleTextPointer:: ; 33b7 (0:33b7)
+GetSavedEndBattleTextPointer::
 	ld a, [wBattleResult]
 	and a
 ; won battle
@@ -2574,7 +2574,7 @@
 	ld l, a
 	ret
 
-TrainerEndBattleText:: ; 33cf (0:33cf)
+TrainerEndBattleText::
 	TX_FAR _TrainerNameText
 	TX_ASM
 	call GetSavedEndBattleTextPointer
@@ -2584,7 +2584,7 @@
 ; only engage withe trainer if the player is not already
 ; engaged with another trainer
 ; XXX unused?
-CheckIfAlreadyEngaged:: ; 33dd (0:33dd)
+CheckIfAlreadyEngaged::
 	ld a, [wFlags_0xcd60]
 	bit 0, a
 	ret nz
@@ -2592,7 +2592,7 @@
 	xor a
 	ret
 
-PlayTrainerMusic:: ; 33e8 (0:33e8)
+PlayTrainerMusic::
 	ld a, [wEngagedTrainerClass]
 	cp OPP_SONY1
 	ret z
@@ -2643,7 +2643,7 @@
 ; and if so, decodes the RLE movement data
 ; b = player Y
 ; c = player X
-DecodeArrowMovementRLE:: ; 3442 (0:3442)
+DecodeArrowMovementRLE::
 	ld a, [hli]
 	cp $ff
 	ret z ; no match in the list
@@ -2667,33 +2667,33 @@
 	inc hl
 	jr DecodeArrowMovementRLE
 
-FuncTX_ItemStoragePC:: ; 3460 (0:3460)
+FuncTX_ItemStoragePC::
 	call SaveScreenTilesToBuffer2
 	ld b, BANK(PlayerPC)
 	ld hl, PlayerPC
 	jr bankswitchAndContinue
 
-FuncTX_BillsPC:: ; 346a (0:346a)
+FuncTX_BillsPC::
 	call SaveScreenTilesToBuffer2
 	ld b, BANK(BillsPC_)
 	ld hl, BillsPC_
 	jr bankswitchAndContinue
 
-FuncTX_SlotMachine:: ; 3474 (0:3474)
+FuncTX_SlotMachine::
 ; XXX find a better name for this function
 ; special_F7
 	ld b,BANK(CeladonPrizeMenu)
 	ld hl,CeladonPrizeMenu
-bankswitchAndContinue:: ; 3479 (0:3479)
+bankswitchAndContinue::
 	call Bankswitch
 	jp HoldTextDisplayOpen        ; continue to main text-engine function
 
-FuncTX_PokemonCenterPC:: ; 347f (0:347f)
+FuncTX_PokemonCenterPC::
 	ld b, BANK(ActivatePC)
 	ld hl, ActivatePC
 	jr bankswitchAndContinue
 
-StartSimulatingJoypadStates:: ; 3486 (0:3486)
+StartSimulatingJoypadStates::
 	xor a
 	ld [wOverrideSimulatedJoypadStatesMask], a
 	ld [wSpriteStateData2 + $06], a ; player's sprite movement byte 1
@@ -2701,7 +2701,7 @@
 	set 7, [hl]
 	ret
 
-IsItemInBag:: ; 3493 (0:3493)
+IsItemInBag::
 ; given an item_id in b
 ; set zero flag if item isn't in player's bag
 ; else reset zero flag
@@ -2711,16 +2711,16 @@
 	and a
 	ret
 
-DisplayPokedex:: ; 349b (0:349b)
+DisplayPokedex::
 	ld [wd11e], a
 	jpba _DisplayPokedex
 
-SetSpriteFacingDirectionAndDelay:: ; 34a6 (0:34a6)
+SetSpriteFacingDirectionAndDelay::
 	call SetSpriteFacingDirection
 	ld c, 6
 	jp DelayFrames
 
-SetSpriteFacingDirection:: ; 34ae (0:34ae)
+SetSpriteFacingDirection::
 	ld a, $9
 	ld [H_SPRITEDATAOFFSET], a
 	call GetPointerWithinSpriteStateData1
@@ -2728,7 +2728,7 @@
 	ld [hl], a
 	ret
 
-SetSpriteImageIndexAfterSettingFacingDirection:: ; 34b9 (0:34b9)
+SetSpriteImageIndexAfterSettingFacingDirection::
 	ld de, -7
 	add hl, de
 	ld [hl], a
@@ -2740,7 +2740,7 @@
 ; OUTPUT:
 ; [wCoordIndex] = if there is match, the matching array index
 ; sets carry if the coordinates are in the array, clears carry if not
-ArePlayerCoordsInArray:: ; 34bf (0:34bf)
+ArePlayerCoordsInArray::
 	ld a,[wYCoord]
 	ld b,a
 	ld a,[wXCoord]
@@ -2747,7 +2747,7 @@
 	ld c,a
 	; fallthrough
 
-CheckCoords:: ; 34c7 (0:34c7)
+CheckCoords::
 	xor a
 	ld [wCoordIndex],a
 .loop
@@ -2781,7 +2781,7 @@
 ; OUTPUT:
 ; [wCoordIndex] = if there is match, the matching array index
 ; sets carry if the coordinates are in the array, clears carry if not
-CheckBoulderCoords:: ; 34e4 (0:34e4)
+CheckBoulderCoords::
 	push hl
 	ld hl, wSpriteStateData2 + $04
 	ld a, [H_SPRITEINDEX]
@@ -2798,11 +2798,11 @@
 	pop hl
 	jp CheckCoords
 
-GetPointerWithinSpriteStateData1:: ; 34fc (0:34fc)
+GetPointerWithinSpriteStateData1::
 	ld h, $c1
 	jr _GetPointerWithinSpriteStateData
 
-GetPointerWithinSpriteStateData2:: ; 3500 (0:3500)
+GetPointerWithinSpriteStateData2::
 	ld h, $c2
 
 _GetPointerWithinSpriteStateData:
@@ -2819,7 +2819,7 @@
 ; the final $ff will be replicated in the output list and a contains the number of bytes written
 ; de: input list
 ; hl: output list
-DecodeRLEList:: ; 350c (0:350c)
+DecodeRLEList::
 	xor a
 	ld [wRLEByteCount], a     ; count written bytes here
 .listLoop
@@ -2846,7 +2846,7 @@
 	ret
 
 ; sets movement byte 1 for sprite [H_SPRITEINDEX] to $FE and byte 2 to [hSpriteMovementByte2]
-SetSpriteMovementBytesToFE:: ; 3533 (0:3533)
+SetSpriteMovementBytesToFE::
 	push hl
 	call GetSpriteMovementByte1Pointer
 	ld [hl], $fe
@@ -2857,7 +2857,7 @@
 	ret
 
 ; sets both movement bytes for sprite [H_SPRITEINDEX] to $FF
-SetSpriteMovementBytesToFF:: ; 3541 (0:3541)
+SetSpriteMovementBytesToFF::
 	push hl
 	call GetSpriteMovementByte1Pointer
 	ld [hl],$FF
@@ -2867,7 +2867,7 @@
 	ret
 
 ; returns the sprite movement byte 1 pointer for sprite [H_SPRITEINDEX] in hl
-GetSpriteMovementByte1Pointer:: ; 354e (0:354e)
+GetSpriteMovementByte1Pointer::
 	ld h,$C2
 	ld a,[H_SPRITEINDEX]
 	swap a
@@ -2876,7 +2876,7 @@
 	ret
 
 ; returns the sprite movement byte 2 pointer for sprite [H_SPRITEINDEX] in hl
-GetSpriteMovementByte2Pointer:: ; 3558 (0:3558)
+GetSpriteMovementByte2Pointer::
 	push de
 	ld hl,wMapSpriteData
 	ld a,[H_SPRITEINDEX]
@@ -2888,7 +2888,7 @@
 	pop de
 	ret
 
-GetTrainerInformation:: ; 3566 (0:3566)
+GetTrainerInformation::
 	call GetTrainerName
 	ld a, [wLinkState]
 	and a
@@ -2921,7 +2921,7 @@
 	ld [hl], d
 	ret
 
-GetTrainerName:: ; 359e (0:359e)
+GetTrainerName::
 	jpba GetTrainerName_
 
 
@@ -2942,7 +2942,7 @@
 	jp StringCmp
 
 
-BankswitchHome:: ; 35bc (0:35bc)
+BankswitchHome::
 ; switches to bank # in a
 ; Only use this when in the home bank!
 	ld [wBankswitchHomeTemp],a
@@ -2953,7 +2953,7 @@
 	ld [MBC1RomBank],a
 	ret
 
-BankswitchBack:: ; 35cd (0:35cd)
+BankswitchBack::
 ; returns from BankswitchHome
 	ld a,[wBankswitchHomeSavedROMBank]
 	ld [H_LOADEDROMBANK],a
@@ -2960,7 +2960,7 @@
 	ld [MBC1RomBank],a
 	ret
 
-Bankswitch:: ; 35d6 (0:35d6)
+Bankswitch::
 ; self-contained bankswitch, use this when not in the home bank
 ; switches to the bank in b
 	ld a,[H_LOADEDROMBANK]
@@ -2980,18 +2980,18 @@
 
 ; displays yes/no choice
 ; yes -> set carry
-YesNoChoice:: ; 35ec (0:35ec)
+YesNoChoice::
 	call SaveScreenTilesToBuffer1
 	call InitYesNoTextBoxParameters
 	jr DisplayYesNoChoice
 
-Func_35f4:: ; 35f4 (0:35f4)
+Func_35f4::
 	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
 	call InitYesNoTextBoxParameters
 	jp DisplayTextBoxID
 
-InitYesNoTextBoxParameters:: ; 35ff (0:35ff)
+InitYesNoTextBoxParameters::
 	xor a ; YES_NO_MENU
 	ld [wTwoOptionMenuID], a
 	coord hl, 14, 7
@@ -2998,7 +2998,7 @@
 	ld bc, $80f
 	ret
 
-YesNoChoicePokeCenter:: ; 360a (0:360a)
+YesNoChoicePokeCenter::
 	call SaveScreenTilesToBuffer1
 	ld a, HEAL_CANCEL_MENU
 	ld [wTwoOptionMenuID], a
@@ -3006,13 +3006,13 @@
 	lb bc, 8, 12
 	jr DisplayYesNoChoice
 
-Func_361a:: ; 361a (0:361a)
+Func_361a::
 	call SaveScreenTilesToBuffer1
 	ld a, WIDE_YES_NO_MENU
 	ld [wTwoOptionMenuID], a
 	coord hl, 12, 7
 	lb bc, 8, 13
-DisplayYesNoChoice:: ; 3628 (0:3628)
+DisplayYesNoChoice::
 	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
@@ -3019,7 +3019,7 @@
 	jp LoadScreenTilesFromBuffer1
 
 ; calculates the difference |a-b|, setting carry flag if a<b
-CalcDifference:: ; 3633 (0:3633)
+CalcDifference::
 	sub b
 	ret nc
 	cpl
@@ -3027,11 +3027,11 @@
 	scf
 	ret
 
-MoveSprite:: ; 363a (0:363a)
+MoveSprite::
 ; move the sprite [H_SPRITEINDEX] with the movement pointed to by de
 ; actually only copies the movement data to wNPCMovementDirections for later
 	call SetSpriteMovementBytesToFF
-MoveSprite_:: ; 363d (0:363d)
+MoveSprite_::
 	push hl
 	push bc
 	call GetSpriteMovementByte1Pointer
@@ -3064,7 +3064,7 @@
 	ret
 
 ; divides [hDividend2] by [hDivisor2] and stores the quotient in [hQuotient2]
-DivideBytes:: ; 366b (0:366b)
+DivideBytes::
 	push hl
 	ld hl, $ffe7
 	xor a
@@ -3149,7 +3149,7 @@
 	ret
 
 
-UncompressSpriteFromDE:: ; 36eb (0:36eb)
+UncompressSpriteFromDE::
 ; Decompress pic at a:de.
 	ld hl, wSpriteInputPtr
 	ld [hl], e
@@ -3158,7 +3158,7 @@
 	jp UncompressSpriteData
 
 
-SaveScreenTilesToBuffer2:: ; 36f4 (0:36f4)
+SaveScreenTilesToBuffer2::
 	coord hl, 0, 0
 	ld de, wTileMapBackup2
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -3165,7 +3165,7 @@
 	call CopyData
 	ret
 
-LoadScreenTilesFromBuffer2:: ; 3701 (0:3701)
+LoadScreenTilesFromBuffer2::
 	call LoadScreenTilesFromBuffer2DisableBGTransfer
 	ld a, 1
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -3172,7 +3172,7 @@
 	ret
 
 ; loads screen tiles stored in wTileMapBackup2 but leaves H_AUTOBGTRANSFERENABLED disabled
-LoadScreenTilesFromBuffer2DisableBGTransfer:: ; 3709 (0:3709)
+LoadScreenTilesFromBuffer2DisableBGTransfer::
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ld hl, wTileMapBackup2
@@ -3181,13 +3181,13 @@
 	call CopyData
 	ret
 
-SaveScreenTilesToBuffer1:: ; 3719 (0:3719)
+SaveScreenTilesToBuffer1::
 	coord hl, 0, 0
 	ld de, wTileMapBackup
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	jp CopyData
 
-LoadScreenTilesFromBuffer1:: ; 3725 (0:3725)
+LoadScreenTilesFromBuffer1::
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ld hl, wTileMapBackup
@@ -3198,7 +3198,7 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ret
 
-DelayFrames:: ; 3739 (0:3739)
+DelayFrames::
 ; wait n frames, where n is the value in c
 	call DelayFrame
 	dec c
@@ -3205,7 +3205,7 @@
 	jr nz,DelayFrames
 	ret
 
-PlaySoundWaitForCurrent:: ; 3740 (0:3740)
+PlaySoundWaitForCurrent::
 	push af
 	call WaitForSoundToFinish
 	pop af
@@ -3212,7 +3212,7 @@
 	jp PlaySound
 
 ; Wait for sound to finish playing
-WaitForSoundToFinish:: ; 3748 (0:3748)
+WaitForSoundToFinish::
 	ld a, [wLowHealthAlarm]
 	and $80
 	ret nz
@@ -3230,7 +3230,7 @@
 	pop hl
 	ret
 
-NamePointers:: ; 375d (0:375d)
+NamePointers::
 	dw MonsterNames
 	dw MoveNames
 	dw UnusedNames
@@ -3239,7 +3239,7 @@
 	dw wEnemyMonOT ; enemy's OT names list
 	dw TrainerNames
 
-GetName:: ; 376b (0:376b)
+GetName::
 ; arguments:
 ; [wd0b5] = which name
 ; [wNameListType] = which list
@@ -3324,7 +3324,7 @@
 	ld [MBC1RomBank],a
 	ret
 
-GetItemPrice:: ; 37df (0:37df)
+GetItemPrice::
 ; Stores item's price as BCD at hItemPrice (3 bytes)
 ; Input: [wcf91] = item id
 	ld a, [H_LOADEDROMBANK]
@@ -3370,12 +3370,12 @@
 	ret
 
 ; copies a string from [de] to [wcf4b]
-CopyStringToCF4B:: ; 3826 (0:3826)
+CopyStringToCF4B::
 	ld hl, wcf4b
 	; fall through
 
 ; copies a string from [de] to [hl]
-CopyString:: ; 3829 (0:3829)
+CopyString::
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -3398,7 +3398,7 @@
 ;    report only one button press.
 ; 3. Same as 2, but report no buttons as pressed if A or B is held down.
 ;    ([hJoy7] == 1, [hJoy6] == 0)
-JoypadLowSensitivity:: ; 3831 (0:3831)
+JoypadLowSensitivity::
 	call Joypad
 	ld a,[hJoy7] ; flag
 	and a ; get all currently pressed buttons or only newly pressed buttons?
@@ -3437,7 +3437,7 @@
 	ld [H_FRAMECOUNTER],a
 	ret
 
-WaitForTextScrollButtonPress:: ; 3865 (0:3865)
+WaitForTextScrollButtonPress::
 	ld a, [H_DOWNARROWBLINKCNT1]
 	push af
 	ld a, [H_DOWNARROWBLINKCNT2]
@@ -3468,7 +3468,7 @@
 	ret
 
 ; (unless in link battle) waits for A or B being pressed and outputs the scrolling sound effect
-ManualTextScroll:: ; 3898 (0:3898)
+ManualTextScroll::
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
 	jr z, .inLinkBattle
@@ -3486,7 +3486,7 @@
 ; FF99 = multiplier
 ; OUTPUT
 ; FF95-FF98 = product
-Multiply:: ; 38ac (0:38ac)
+Multiply::
 	push hl
 	push bc
 	callab _Multiply
@@ -3503,7 +3503,7 @@
 ; OUTPUT
 ; FF95-FF98 = quotient
 ; FF99 = remainder
-Divide:: ; 38b9 (0:38b9)
+Divide::
 	push hl
 	push de
 	push bc
@@ -3524,7 +3524,7 @@
 ; This function is used to wait a short period after printing a letter to the
 ; screen unless the player presses the A/B button or the delay is turned off
 ; through the [wd730] or [wLetterPrintingDelayFlags] flags.
-PrintLetterDelay:: ; 38d3 (0:38d3)
+PrintLetterDelay::
 	ld a,[wd730]
 	bit 6,a
 	ret nz
@@ -3570,7 +3570,7 @@
 ; Copies [hl, bc) to [de, bc - hl).
 ; In other words, the source data is from hl up to but not including bc,
 ; and the destination is de.
-CopyDataUntil:: ; 3913 (0:3913)
+CopyDataUntil::
 	ld a,[hli]
 	ld [de],a
 	inc de
@@ -3586,10 +3586,10 @@
 ; wWhichPokemon determines the pokemon.
 ; [wRemoveMonFromBox] == 0 specifies the party.
 ; [wRemoveMonFromBox] != 0 specifies the current box.
-RemovePokemon:: ; 391f (0:391f)
+RemovePokemon::
 	jpab _RemovePokemon
 
-AddPartyMon:: ; 3927 (0:3927)
+AddPartyMon::
 	push hl
 	push de
 	push bc
@@ -3600,7 +3600,7 @@
 	ret
 
 ; calculates all 5 stats of current mon and writes them to [de]
-CalcStats:: ; 3936 (0:3936)
+CalcStats::
 	ld c, $0
 .statsLoop
 	inc c
@@ -3620,7 +3620,7 @@
 ; c: stat to calc (HP=1,Atk=2,Def=3,Spd=4,Spc=5)
 ; b: consider stat exp?
 ; hl: base ptr to stat exp values ([hl + 2*c - 1] and [hl + 2*c])
-CalcStat:: ; 394a (0:394a)
+CalcStat::
 	push hl
 	push de
 	push bc
@@ -3799,7 +3799,7 @@
 	pop hl
 	ret
 
-AddEnemyMonToPlayerParty:: ; 3a53 (0:3a53)
+AddEnemyMonToPlayerParty::
 	ld a, [H_LOADEDROMBANK]
 	push af
 	ld a, BANK(_AddEnemyMonToPlayerParty)
@@ -3812,7 +3812,7 @@
 	ld [MBC1RomBank], a
 	ret
 
-MoveMon:: ; 3a68 (0:3a68)
+MoveMon::
 	ld a, [H_LOADEDROMBANK]
 	push af
 	ld a, BANK(_MoveMon)
@@ -3827,7 +3827,7 @@
 
 ; skips a text entries, each of size NAME_LENGTH (like trainer name, OT name, rival name, ...)
 ; hl: base pointer, will be incremented by NAME_LENGTH * a
-SkipFixedLengthTextEntries:: ; 3a7d (0:3a7d)
+SkipFixedLengthTextEntries::
 	and a
 	ret z
 	ld bc, NAME_LENGTH
@@ -3837,7 +3837,7 @@
 	jr nz, .skipLoop
 	ret
 
-AddNTimes:: ; 3a87 (0:3a87)
+AddNTimes::
 ; add bc to hl a times
 	and a
 	ret z
@@ -3849,7 +3849,7 @@
 
 ; Compare strings, c bytes in length, at de and hl.
 ; Often used to compare big endian numbers in battle calculations.
-StringCmp:: ; 3a8e (0:3a8e)
+StringCmp::
 	ld a,[de]
 	cp [hl]
 	ret nz
@@ -3864,7 +3864,7 @@
 ; b = Y coordinate of upper left corner of sprite
 ; c = X coordinate of upper left corner of sprite
 ; de = base address of 4 tile number and attribute pairs
-WriteOAMBlock:: ; 3a97 (0:3a97)
+WriteOAMBlock::
 	ld h,wOAMBuffer / $100
 	swap a ; multiply by 16
 	ld l,a
@@ -3896,11 +3896,11 @@
 	ld [hli],a
 	ret
 
-HandleMenuInput:: ; 3abe (0:3abe)
+HandleMenuInput::
 	xor a
 	ld [wPartyMenuAnimMonEnabled],a
 
-HandleMenuInput_:: ; 3ac2 (0:3ac2)
+HandleMenuInput_::
 	ld a,[H_DOWNARROWBLINKCNT1]
 	push af
 	ld a,[H_DOWNARROWBLINKCNT2]
@@ -4014,7 +4014,7 @@
 	jr z,.checkOtherKeys
 	jr .checkIfAButtonOrBButtonPressed
 
-PlaceMenuCursor:: ; 3b7c (0:3b7c)
+PlaceMenuCursor::
 	ld a,[wTopMenuItemY]
 	and a ; is the y coordinate 0?
 	jr z,.adjustForXCoord
@@ -4093,7 +4093,7 @@
 ; manipulated. In the case of submenus, this is used to show the location of
 ; the menu cursor in the parent menu. In the case of swapping items in list,
 ; this is used to mark the item that was first chosen to be swapped.
-PlaceUnfilledArrowMenuCursor:: ; 3bec (0:3bec)
+PlaceUnfilledArrowMenuCursor::
 	ld b,a
 	ld a,[wMenuCursorLocation]
 	ld l,a
@@ -4104,7 +4104,7 @@
 	ret
 
 ; Replaces the menu cursor with a blank space.
-EraseMenuCursor:: ; 3bf9 (0:3bf9)
+EraseMenuCursor::
 	ld a,[wMenuCursorLocation]
 	ld l,a
 	ld a,[wMenuCursorLocation + 1]
@@ -4120,7 +4120,7 @@
 ; initliazed with a down arrow, this function does nothing.
 ; That allows this to be called without worrying about if a down arrow should
 ; be blinking.
-HandleDownArrowBlinkTiming:: ; 3c04 (0:3c04)
+HandleDownArrowBlinkTiming::
 	ld a,[hl]
 	ld b,a
 	ld a,$ee ; down arrow
@@ -4165,20 +4165,20 @@
 ; text boxes by DisplayTextID. Both functions cause DisplayTextID to wait
 ; for a button press after displaying text (unless [wEnteringCableClub] is set).
 
-EnableAutoTextBoxDrawing:: ; 3c3c (0:3c3c)
+EnableAutoTextBoxDrawing::
 	xor a
 	jr AutoTextBoxDrawingCommon
 
-DisableAutoTextBoxDrawing:: ; 3c3f (0:3c3f)
+DisableAutoTextBoxDrawing::
 	ld a,$01
 
-AutoTextBoxDrawingCommon:: ; 3c41 (0:3c41)
+AutoTextBoxDrawingCommon::
 	ld [wAutoTextBoxDrawingControl],a
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText],a ; make DisplayTextID wait for button press
 	ret
 
-PrintText:: ; 3c49 (0:3c49)
+PrintText::
 ; Print text hl at (1, 14).
 	push hl
 	ld a,MESSAGE_BOX
@@ -4187,7 +4187,7 @@
 	call UpdateSprites
 	call Delay3
 	pop hl
-PrintText_NoCreatingTextBox:: ; 3c59 (0:3c59)
+PrintText_NoCreatingTextBox::
 	coord bc, 1, 14
 	jp TextCommandProcessor
 
@@ -4462,7 +4462,7 @@
 	ret
 
 
-RestoreScreenTilesAndReloadTilePatterns:: ; 3dbe (0:3dbe)
+RestoreScreenTilesAndReloadTilePatterns::
 	call ClearSprites
 	ld a, $1
 	ld [wUpdateSpritesEnabled], a
@@ -4499,9 +4499,9 @@
 	ret
 
 
-RunDefaultPaletteCommand:: ; 3ded (0:3ded)
+RunDefaultPaletteCommand::
 	ld b,$ff
-RunPaletteCommand:: ; 3def (0:3def)
+RunPaletteCommand::
 	ld a,[wOnSGB]
 	and a
 	ret z
@@ -4524,7 +4524,7 @@
 
 ; Copy the current map's sprites' tile patterns to VRAM again after they have
 ; been overwritten by other tile patterns.
-ReloadMapSpriteTilePatterns:: ; 3e08 (0:3e08)
+ReloadMapSpriteTilePatterns::
 	ld hl, wFontLoaded
 	ld a, [hl]
 	push af
@@ -4588,10 +4588,10 @@
 INCLUDE "home/predef.asm"
 
 
-UpdateCinnabarGymGateTileBlocks:: ; 3ead (0:3ead)
+UpdateCinnabarGymGateTileBlocks::
 	jpba UpdateCinnabarGymGateTileBlocks_
 
-CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ; 3eb5 (0:3eb5)
+CheckForHiddenObjectOrBookshelfOrCardKeyDoor::
 	ld a, [H_LOADEDROMBANK]
 	push af
 	ld a, [hJoyHeld]
@@ -4628,7 +4628,7 @@
 	ld [H_LOADEDROMBANK], a
 	ret
 
-PrintPredefTextID:: ; 3ef5 (0:3ef5)
+PrintPredefTextID::
 	ld [hSpriteIndexOrTextID], a
 	ld hl, TextPredefs
 	call SetMapTextPointer
@@ -4636,7 +4636,7 @@
 	set 0, [hl]
 	call DisplayTextID
 
-RestoreMapTextPointer:: ; 3f05 (0:3f05)
+RestoreMapTextPointer::
 	ld hl, wMapTextPtr
 	ld a, [$ffec]
 	ld [hli], a
@@ -4644,7 +4644,7 @@
 	ld [hl], a
 	ret
 
-SetMapTextPointer:: ; 3f0f (0:3f0f)
+SetMapTextPointer::
 	ld a, [wMapTextPtr]
 	ld [$ffec], a
 	ld a, [wMapTextPtr + 1]
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -1,4 +1,4 @@
-PlayDefaultMusic:: ; 2307 (0:2307)
+PlayDefaultMusic::
 	call WaitForSoundToFinish
 	xor a
 	ld c, a
@@ -6,7 +6,7 @@
 	ld [wLastMusicSoundID], a
 	jr PlayDefaultMusicCommon
 
-PlayDefaultMusicFadeOutCurrent:: ; 2312 (0:2312)
+PlayDefaultMusicFadeOutCurrent::
 ; Fade out the current music and then play the default music.
 	ld c, 10
 	ld d, 0
@@ -18,7 +18,7 @@
 	ld c, 8
 	ld d, c
 
-PlayDefaultMusicCommon:: ; 2324 (0:2324)
+PlayDefaultMusicCommon::
 	ld a, [wWalkBikeSurfState]
 	and a
 	jr z, .walking
@@ -66,7 +66,7 @@
 	ld [wNewSoundID], a
 	jp PlaySound
 
-UpdateMusic6Times:: ; 235f (0:235f)
+UpdateMusic6Times::
 ; This is called when entering a map, before fading out the current music and
 ; playing the default music (i.e. the map's music or biking/surfing music).
 	ld a, [wAudioROMBank]
@@ -101,7 +101,7 @@
 	jr nz, .loop
 	ret
 
-CompareMapMusicBankWithCurrentBank:: ; 2385 (0:2385)
+CompareMapMusicBankWithCurrentBank::
 ; Compares the map music's audio ROM bank with the current audio ROM bank
 ; and updates the audio ROM bank variables.
 ; Returns whether the banks are different in carry.
@@ -128,7 +128,7 @@
 	scf
 	ret
 
-PlayMusic:: ; 23a1 (0:23a1)
+PlayMusic::
 	ld b, a
 	ld [wNewSoundID], a
 	xor a
@@ -139,7 +139,7 @@
 	ld a, b
 
 ; plays music specified by a. If value is $ff, music is stopped
-PlaySound:: ; 23b1 (0:23b1)
+PlaySound::
 	push hl
 	push de
 	push bc
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -348,7 +348,7 @@
 
 ; function to determine if there will be a battle and execute it (either a trainer battle or wild battle)
 ; sets carry if a battle occurred and unsets carry if not
-NewBattle:: ; 0683 (0:0683)
+NewBattle::
 	ld a,[wd72d]
 	bit 4,a
 	jr nz,.noBattle
@@ -363,7 +363,7 @@
 	ret
 
 ; function to make bikes twice as fast as walking
-BikeSpeedup:: ; 06a0 (0:06a0)
+BikeSpeedup::
 	ld a,[wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
@@ -377,7 +377,7 @@
 	jp AdvancePlayerSprite
 
 ; check if the player has stepped onto a warp after having not collided
-CheckWarpsNoCollision:: ; 06b4 (0:06b4)
+CheckWarpsNoCollision::
 	ld a,[wNumberOfWarps]
 	and a
 	jp z,CheckMapConnections
@@ -389,7 +389,7 @@
 	ld a,[wXCoord]
 	ld e,a
 	ld hl,wWarpEntries
-CheckWarpsNoCollisionLoop:: ; 06cc (0:06cc)
+CheckWarpsNoCollisionLoop::
 	ld a,[hli] ; check if the warp's Y position matches
 	cp d
 	jr nz,CheckWarpsNoCollisionRetry1
@@ -426,7 +426,7 @@
 	jr WarpFound1
 
 ; check if the player has stepped onto a warp after having collided
-CheckWarpsCollision:: ; 0706 (0:0706)
+CheckWarpsCollision::
 	ld a,[wNumberOfWarps]
 	ld c,a
 	ld hl,wWarpEntries
@@ -455,20 +455,20 @@
 	jr nz,.loop
 	jp OverworldLoop
 
-CheckWarpsNoCollisionRetry1:: ; 072f (0:072f)
+CheckWarpsNoCollisionRetry1::
 	inc hl
-CheckWarpsNoCollisionRetry2:: ; 0730 (0:0730)
+CheckWarpsNoCollisionRetry2::
 	inc hl
 	inc hl
 	jp ContinueCheckWarpsNoCollisionLoop
 
-WarpFound1:: ; 0735 (0:0735)
+WarpFound1::
 	ld a,[hli]
 	ld [wDestinationWarpID],a
 	ld a,[hli]
 	ld [hWarpDestinationMap],a
 
-WarpFound2:: ; 073c (0:073c)
+WarpFound2::
 	ld a,[wNumberOfWarps]
 	sub c
 	ld [wWarpedFromWhichWarp],a ; save ID of used warp
@@ -526,13 +526,13 @@
 	call IgnoreInputForHalfSecond
 	jp EnterMap
 
-ContinueCheckWarpsNoCollisionLoop:: ; 07b5 (0:07b5)
+ContinueCheckWarpsNoCollisionLoop::
 	inc b ; increment warp number
 	dec c ; decrement number of warps
 	jp nz,CheckWarpsNoCollisionLoop
 
 ; if no matching warp was found
-CheckMapConnections:: ; 07ba (0:07ba)
+CheckMapConnections::
 .checkWestMap
 	ld a,[wXCoord]
 	cp a,$ff
@@ -670,7 +670,7 @@
 	jp OverworldLoop
 
 ; function to play a sound when changing maps
-PlayMapChangeSound:: ; 08c9 (0:08c9)
+PlayMapChangeSound::
 	aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on
 	cp a,$0b ; door tile in tileset 0
 	jr nz,.didNotGoThroughDoor
@@ -685,7 +685,7 @@
 	ret nz
 	jp GBFadeOutToBlack
 
-CheckIfInOutsideMap:: ; 08e1 (0:08e1)
+CheckIfInOutsideMap::
 ; If the player is in an outside map (a town or route), set the z flag
 	ld a, [wCurMapTileset]
 	and a ; most towns/routes have tileset 0 (OVERWORLD)
@@ -699,7 +699,7 @@
 ; "function 1" passes when the player is at the edge of the map and is facing towards the outside of the map
 ; "function 2" passes when the the tile in front of the player is among a certain set
 ; sets carry if the check passes, otherwise clears carry
-ExtraWarpCheck:: ; 08e9 (0:08e9)
+ExtraWarpCheck::
 	ld a, [wCurMap]
 	cp SS_ANNE_3
 	jr z, .useFunction1
@@ -729,7 +729,7 @@
 	ld b, BANK(IsWarpTileInFrontOfPlayer)
 	jp Bankswitch
 
-MapEntryAfterBattle:: ; 091f (0:091f)
+MapEntryAfterBattle::
 	callba IsPlayerStandingOnWarp ; for enabling warp testing after collisions
 	ld a,[wMapPalOffset]
 	and a
@@ -853,7 +853,7 @@
 INCLUDE "data/bike_riding_tilesets.asm"
 
 ; load the tile pattern data of the current tileset into VRAM
-LoadTilesetTilePatternData:: ; 09e8 (0:09e8)
+LoadTilesetTilePatternData::
 	ld a,[wTileSetGFXPtr]
 	ld l,a
 	ld a,[wTileSetGFXPtr + 1]
@@ -865,7 +865,7 @@
 
 ; this loads the current maps complete tile map (which references blocks, not individual tiles) to C6E8
 ; it can also load partial tile maps of connected maps into a border of length 3 around the current map
-LoadTileBlockMap:: ; 09fc (0:09fc)
+LoadTileBlockMap::
 ; fill C6E8-CBFB with the background tile
 	ld hl,wOverworldMap
 	ld a,[wMapBackgroundTile]
@@ -994,7 +994,7 @@
 .done
 	ret
 
-LoadNorthSouthConnectionsTileMap:: ; 0ade (0:0ade)
+LoadNorthSouthConnectionsTileMap::
 	ld c,MAP_BORDER
 .loop
 	push de
@@ -1026,7 +1026,7 @@
 	jr nz,.loop
 	ret
 
-LoadEastWestConnectionsTileMap:: ; 0b02 (0:0b02)
+LoadEastWestConnectionsTileMap::
 	push hl
 	push de
 	ld c,MAP_BORDER
@@ -1058,7 +1058,7 @@
 ; function to check if there is a sign or sprite in front of the player
 ; if so, it is stored in [hSpriteIndexOrTextID]
 ; if not, [hSpriteIndexOrTextID] is set to 0
-IsSpriteOrSignInFrontOfPlayer:: ; 0b23 (0:0b23)
+IsSpriteOrSignInFrontOfPlayer::
 	xor a
 	ld [hSpriteIndexOrTextID],a
 	ld a,[wNumSigns]
@@ -1112,9 +1112,9 @@
 
 ; part of the above function, but sometimes its called on its own, when signs are irrelevant
 ; the caller must zero [hSpriteIndexOrTextID]
-IsSpriteInFrontOfPlayer:: ; 0b6b (0:0b6b)
+IsSpriteInFrontOfPlayer::
 	ld d,$10 ; talking range in pixels (normal range)
-IsSpriteInFrontOfPlayer2:: ; 0b6d (0:0b6d)
+IsSpriteInFrontOfPlayer2::
 	lb bc, $3c, $40 ; Y and X position of player sprite
 	ld a,[wSpriteStateData1 + 9] ; direction the player is facing
 .checkIfPlayerFacingUp
@@ -1198,7 +1198,7 @@
 
 ; function to check if the player will jump down a ledge and check if the tile ahead is passable (when not surfing)
 ; sets the carry flag if there is a collision, and unsets it if there isn't a collision
-CollisionCheckOnLand:: ; 0bd1 (0:0bd1)
+CollisionCheckOnLand::
 	ld a,[wd736]
 	bit 6,a ; is the player jumping?
 	jr nz,.noCollision
@@ -1238,7 +1238,7 @@
 
 ; function that checks if the tile in front of the player is passable
 ; clears carry if it is, sets carry if not
-CheckTilePassable:: ; 0c10 (0:0c10)
+CheckTilePassable::
 	predef GetTileAndCoordsInFrontOfPlayer ; get tile in front of player
 	ld a,[wTileInFrontOfPlayer] ; tile in front of player
 	ld c,a
@@ -1261,7 +1261,7 @@
 ; and check for collisions that only occur between certain pairs of tiles
 ; Input: hl - address of directional collision data
 ; sets carry if there is a collision and unsets carry if not
-CheckForJumpingAndTilePairCollisions:: ; 0c2a (0:0c2a)
+CheckForJumpingAndTilePairCollisions::
 	push hl
 	predef GetTileAndCoordsInFrontOfPlayer ; get the tile in front of the player
 	push de
@@ -1276,11 +1276,11 @@
 	ret nz
 ; if not jumping
 
-CheckForTilePairCollisions2:: ; 0c44 (0:0c44)
+CheckForTilePairCollisions2::
 	aCoord 8, 9 ; tile the player is on
 	ld [wTilePlayerStandingOn],a
 
-CheckForTilePairCollisions:: ; 0c4a (0:0c4a)
+CheckForTilePairCollisions::
 	ld a,[wTileInFrontOfPlayer]
 	ld c,a
 .tilePairCollisionLoop
@@ -1330,7 +1330,7 @@
 ; these entries indicate that the player may not cross between tile 1 and tile 2
 ; it's mainly used to simulate differences in elevation
 
-TilePairCollisionsLand:: ; 0c7e (0:0c7e)
+TilePairCollisionsLand::
 	db CAVERN, $20, $05
 	db CAVERN, $41, $05
 	db FOREST, $30, $2E
@@ -1344,7 +1344,7 @@
 	db FOREST, $5F, $2E
 	db $FF
 
-TilePairCollisionsWater:: ; 0ca0 (0:0ca0)
+TilePairCollisionsWater::
 	db FOREST, $14, $2E
 	db FOREST, $48, $2E
 	db CAVERN, $14, $05
@@ -1351,7 +1351,7 @@
 	db $FF
 
 ; this builds a tile map from the tile block map based on the current X/Y coordinates of the player's character
-LoadCurrentMapView:: ; 0caa (0:0caa)
+LoadCurrentMapView::
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,[wTileSetBank] ; tile data ROM bank
@@ -1441,7 +1441,7 @@
 	ld [MBC1RomBank],a ; restore previous ROM bank
 	ret
 
-AdvancePlayerSprite:: ; 0d27 (0:0d27)
+AdvancePlayerSprite::
 	ld a,[wSpriteStateData1 + 3] ; delta Y
 	ld b,a
 	ld a,[wSpriteStateData1 + 5] ; delta X
@@ -1639,7 +1639,7 @@
 ; the following four functions are used to move the pointer to the upper left
 ; corner of the tile block map in the direction of motion
 
-MoveTileBlockMapPointerEast:: ; 0e65 (0:0e65)
+MoveTileBlockMapPointerEast::
 	ld a,[de]
 	add a,$01
 	ld [de],a
@@ -1650,7 +1650,7 @@
 	ld [de],a
 	ret
 
-MoveTileBlockMapPointerWest:: ; 0e6f (0:0e6f)
+MoveTileBlockMapPointerWest::
 	ld a,[de]
 	sub a,$01
 	ld [de],a
@@ -1661,7 +1661,7 @@
 	ld [de],a
 	ret
 
-MoveTileBlockMapPointerSouth:: ; 0e79 (0:0e79)
+MoveTileBlockMapPointerSouth::
 	add a,MAP_BORDER * 2
 	ld b,a
 	ld a,[de]
@@ -1674,7 +1674,7 @@
 	ld [de],a
 	ret
 
-MoveTileBlockMapPointerNorth:: ; 0e85 (0:0e85)
+MoveTileBlockMapPointerNorth::
 	add a,MAP_BORDER * 2
 	ld b,a
 	ld a,[de]
@@ -1690,7 +1690,7 @@
 ; the following 6 functions are used to tell the V-blank handler to redraw
 ; the portion of the map that was newly exposed due to the player's movement
 
-ScheduleNorthRowRedraw:: ; 0e91 (0:0e91)
+ScheduleNorthRowRedraw::
 	coord hl, 0, 0
 	call CopyToRedrawRowOrColumnSrcTiles
 	ld a,[wMapViewVRAMPointer]
@@ -1701,7 +1701,7 @@
 	ld [hRedrawRowOrColumnMode],a
 	ret
 
-CopyToRedrawRowOrColumnSrcTiles:: ; 0ea6 (0:0ea6)
+CopyToRedrawRowOrColumnSrcTiles::
 	ld de,wRedrawRowOrColumnSrcTiles
 	ld c,2 * SCREEN_WIDTH
 .loop
@@ -1712,7 +1712,7 @@
 	jr nz,.loop
 	ret
 
-ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2)
+ScheduleSouthRowRedraw::
 	coord hl, 0, 16
 	call CopyToRedrawRowOrColumnSrcTiles
 	ld a,[wMapViewVRAMPointer]
@@ -1731,7 +1731,7 @@
 	ld [hRedrawRowOrColumnMode],a
 	ret
 
-ScheduleEastColumnRedraw:: ; 0ed3 (0:0ed3)
+ScheduleEastColumnRedraw::
 	coord hl, 18, 0
 	call ScheduleColumnRedrawHelper
 	ld a,[wMapViewVRAMPointer]
@@ -1749,7 +1749,7 @@
 	ld [hRedrawRowOrColumnMode],a
 	ret
 
-ScheduleColumnRedrawHelper:: ; 0ef2 (0:0ef2)
+ScheduleColumnRedrawHelper::
 	ld de,wRedrawRowOrColumnSrcTiles
 	ld c,SCREEN_HEIGHT
 .loop
@@ -1769,7 +1769,7 @@
 	jr nz,.loop
 	ret
 
-ScheduleWestColumnRedraw:: ; 0f08 (0:0f08)
+ScheduleWestColumnRedraw::
 	coord hl, 0, 0
 	call ScheduleColumnRedrawHelper
 	ld a,[wMapViewVRAMPointer]
@@ -1782,7 +1782,7 @@
 
 ; function to write the tiles that make up a tile block to memory
 ; Input: c = tile block ID, hl = destination address
-DrawTileBlock:: ; 0f1d (0:0f1d)
+DrawTileBlock::
 	push hl
 	ld a,[wTileSetBlocksPtr] ; pointer to tiles
 	ld l,a
@@ -1823,7 +1823,7 @@
 	ret
 
 ; function to update joypad state and simulate button presses
-JoypadOverworld:: ; 0f4d (0:0f4d)
+JoypadOverworld::
 	xor a
 	ld [wSpriteStateData1 + 3],a
 	ld [wSpriteStateData1 + 5],a
@@ -1893,7 +1893,7 @@
 ; so the old value of c is used. 2429 is always called before this function,
 ; and 2429 always sets c to 0xF0. There is no 0xF0 background tile, so it
 ; is considered impassable and it is detected as a collision.
-CollisionCheckOnWater:: ; 0fb7 (0:0fb7)
+CollisionCheckOnWater::
 	ld a,[wd730]
 	bit 7,a
 	jp nz,.noCollision ; return and clear carry if button presses are being simulated
@@ -1952,7 +1952,7 @@
 	jr .stopSurfing ; if it is the boarding platform tile, stop surfing
 
 ; function to run the current map's script
-RunMapScript:: ; 101b (0:101b)
+RunMapScript::
 	push hl
 	push de
 	push bc
@@ -1978,21 +1978,21 @@
 .return
 	ret
 
-LoadWalkingPlayerSpriteGraphics:: ; 104d (0:104d)
+LoadWalkingPlayerSpriteGraphics::
 	ld de,RedSprite
 	ld hl,vNPCSprites
 	jr LoadPlayerSpriteGraphicsCommon
 
-LoadSurfingPlayerSpriteGraphics:: ; 1055 (0:1055)
+LoadSurfingPlayerSpriteGraphics::
 	ld de,SeelSprite
 	ld hl,vNPCSprites
 	jr LoadPlayerSpriteGraphicsCommon
 
-LoadBikePlayerSpriteGraphics:: ; 105d (0:105d)
+LoadBikePlayerSpriteGraphics::
 	ld de,RedCyclingSprite
 	ld hl,vNPCSprites
 
-LoadPlayerSpriteGraphicsCommon:: ; 1063 (0:1063)
+LoadPlayerSpriteGraphicsCommon::
 	push de
 	push hl
 	lb bc, BANK(RedSprite), $0c
@@ -2010,7 +2010,7 @@
 	jp CopyVideoData
 
 ; function to load data from the map header
-LoadMapHeader:: ; 107c (0:107c)
+LoadMapHeader::
 	callba MarkTownVisitedAndLoadMissableObjects
 	ld a,[wCurMapTileset]
 	ld [wUnusedD119],a
@@ -2289,7 +2289,7 @@
 
 ; function to copy map connection data from ROM to WRAM
 ; Input: hl = source, de = destination
-CopyMapConnectionHeader:: ; 1238 (0:1238)
+CopyMapConnectionHeader::
 	ld c,$0b
 .loop
 	ld a,[hli]
@@ -2300,7 +2300,7 @@
 	ret
 
 ; function to load map data
-LoadMapData:: ; 1241 (0:1241)
+LoadMapData::
 	ld a,[H_LOADEDROMBANK]
 	push af
 	call DisableLCD
@@ -2362,7 +2362,7 @@
 
 ; function to switch to the ROM bank that a map is stored in
 ; Input: a = map number
-SwitchToMapRomBank:: ; 12bc (0:12bc)
+SwitchToMapRomBank::
 	push hl
 	push bc
 	ld c,a
@@ -2381,7 +2381,7 @@
 	pop hl
 	ret
 
-IgnoreInputForHalfSecond: ; 12da (0:12da)
+IgnoreInputForHalfSecond:
 	ld a, 30
 	ld [wIgnoreInputCounter], a
 	ld hl, wd730
@@ -2390,12 +2390,12 @@
 	ld [hl], a ; set ignore input bit
 	ret
 
-ResetUsingStrengthOutOfBattleBit: ; 12e7 (0:12e7)
+ResetUsingStrengthOutOfBattleBit:
 	ld hl, wd728
 	res 0, [hl]
 	ret
 
-ForceBikeOrSurf:: ; 12ed (0:12ed)
+ForceBikeOrSurf::
 	ld b, BANK(RedSprite)
 	ld hl, LoadPlayerSpriteGraphics
 	call Bankswitch
--- a/home/pic.asm
+++ b/home/pic.asm
@@ -1,6 +1,6 @@
 ; bankswitches and runs _UncompressSpriteData
 ; bank is given in a, sprite input stream is pointed to in wSpriteInputPtr
-UncompressSpriteData:: ; 24fd (0:24fd)
+UncompressSpriteData::
 	ld b, a
 	ld a, [H_LOADEDROMBANK]
 	push af
@@ -18,7 +18,7 @@
 	ret
 
 ; initializes necessary data to load a sprite and runs UncompressSpriteDataLoop
-_UncompressSpriteData:: ; 251a (0:251a)
+_UncompressSpriteData::
 	ld hl, sSpriteBuffer1
 	ld c, (2*SPRITEBUFFERSIZE) % $100
 	ld b, (2*SPRITEBUFFERSIZE) / $100
@@ -55,7 +55,7 @@
 ; uncompresses a chunk from the sprite input data stream (pointed to at wd0da) into sSpriteBuffer1 or sSpriteBuffer2
 ; each chunk is a 1bpp sprite. A 2bpp sprite consist of two chunks which are merged afterwards
 ; note that this is an endless loop which is terminated during a call to MoveToNextBufferPosition by manipulating the stack
-UncompressSpriteDataLoop:: ; 2556 (0:2556)
+UncompressSpriteDataLoop::
 	ld hl, sSpriteBuffer1
 	ld a, [wSpriteLoadFlags]
 	bit 0, a
@@ -145,7 +145,7 @@
 ; moves output pointer to next position
 ; also cancels the calling function if the all output is done (by removing the return pointer from stack)
 ; and calls postprocessing functions according to the unpack mode
-MoveToNextBufferPosition:: ; 25d8 (0:25d8)
+MoveToNextBufferPosition::
 	ld a, [wSpriteHeight]
 	ld b, a
 	ld a, [wSpriteCurPosY]
@@ -206,7 +206,7 @@
 	jp UnpackSprite
 
 ; writes 2 bits (from a) to the output buffer (pointed to from wSpriteOutputPtr)
-WriteSpriteBitsToBuffer:: ; 2649 (0:2649)
+WriteSpriteBitsToBuffer::
 	ld e, a
 	ld a, [wSpriteOutputBitOffset]
 	and a
@@ -234,7 +234,7 @@
 	ret
 
 ; reads next bit from input stream and returns it in a
-ReadNextInputBit:: ; 2670 (0:2670)
+ReadNextInputBit::
 	ld a, [wSpriteInputBitCounter]
 	dec a
 	jr nz, .curByteHasMoreBitsToRead
@@ -250,7 +250,7 @@
 	ret
 
 ; reads next byte from input stream and returns it in a
-ReadNextInputByte:: ; 268b (0:268b)
+ReadNextInputByte::
 	ld a, [wSpriteInputPtr]
 	ld l, a
 	ld a, [wSpriteInputPtr+1]
@@ -265,7 +265,7 @@
 	ret
 
 ; the nth item is 2^n - 1
-LengthEncodingOffsetList:: ; 269f (0:269f)
+LengthEncodingOffsetList::
 	dw %0000000000000001
 	dw %0000000000000011
 	dw %0000000000000111
@@ -284,7 +284,7 @@
 	dw %1111111111111111
 
 ; unpacks the sprite data depending on the unpack mode
-UnpackSprite:: ; 26bf (0:26bf)
+UnpackSprite::
 	ld a, [wSpriteUnpackMode]
 	cp $2
 	jp z, UnpackSpriteMode2
@@ -297,7 +297,7 @@
 
 ; decodes differential encoded sprite data
 ; input bit value 0 preserves the current bit value and input bit value 1 toggles it (starting from initial value 0).
-SpriteDifferentialDecode:: ; 26d4 (0:26d4)
+SpriteDifferentialDecode::
 	xor a
 	ld [wSpriteCurPosX], a
 	ld [wSpriteCurPosY], a
@@ -382,7 +382,7 @@
 	ret
 
 ; decodes the nybble stored in a. Last decoded data is assumed to be in e (needed to determine if initial value is 0 or 1)
-DifferentialDecodeNybble:: ; 276d (0:276d)
+DifferentialDecodeNybble::
 	srl a               ; c=a%2, a/=2
 	ld c, $0
 	jr nc, .evenNumber
@@ -424,7 +424,7 @@
 	ld e, a ; update last decoded data
 	ret
 
-DecodeNybble0Table:: ; 27a7 (0:27a7)
+DecodeNybble0Table::
 	dn $0, $1
 	dn $3, $2
 	dn $7, $6
@@ -433,7 +433,7 @@
 	dn $c, $d
 	dn $8, $9
 	dn $b, $a
-DecodeNybble1Table:: ; 27af (0:27af)
+DecodeNybble1Table::
 	dn $f, $e
 	dn $c, $d
 	dn $8, $9
@@ -442,7 +442,7 @@
 	dn $3, $2
 	dn $7, $6
 	dn $4, $5
-DecodeNybble0TableFlipped:: ; 27b7 (0:27b7)
+DecodeNybble0TableFlipped::
 	dn $0, $8
 	dn $c, $4
 	dn $e, $6
@@ -451,7 +451,7 @@
 	dn $3, $b
 	dn $1, $9
 	dn $d, $5
-DecodeNybble1TableFlipped:: ; 27bf (0:27bf)
+DecodeNybble1TableFlipped::
 	dn $f, $7
 	dn $3, $b
 	dn $1, $9
@@ -462,7 +462,7 @@
 	dn $2, $a
 
 ; combines the two loaded chunks with xor (the chunk loaded second is the destination). The source chunk is differeintial decoded beforehand.
-XorSpriteChunks:: ; 27c7 (0:27c7)
+XorSpriteChunks::
 	xor a
 	ld [wSpriteCurPosX], a
 	ld [wSpriteCurPosY], a
@@ -527,7 +527,7 @@
 	ret
 
 ; reverses the bits in the nybble given in register a
-ReverseNybble:: ; 2837 (0:2837)
+ReverseNybble::
 	ld de, NybbleReverseTable
 	add e
 	ld e, a
@@ -538,7 +538,7 @@
 	ret
 
 ; resets sprite buffer pointers to buffer 1 and 2, depending on wSpriteLoadFlags
-ResetSpriteBufferPointers:: ; 2841 (0:2841)
+ResetSpriteBufferPointers::
 	ld a, [wSpriteLoadFlags]
 	bit 0, a
 	jr nz, .buffer2Selected
@@ -560,11 +560,11 @@
 	ret
 
 ; maps each nybble to its reverse
-NybbleReverseTable:: ; 2867 (0:2867)
+NybbleReverseTable::
 	db $0, $8, $4, $c, $2, $a, $6 ,$e, $1, $9, $5, $d, $3, $b, $7 ,$f
 
 ; combines the two loaded chunks with xor (the chunk loaded second is the destination). Both chunks are differeintial decoded beforehand.
-UnpackSpriteMode2:: ; 2877 (0:2877)
+UnpackSpriteMode2::
 	call ResetSpriteBufferPointers
 	ld a, [wSpriteFlipped]
 	push af
@@ -581,7 +581,7 @@
 	jp XorSpriteChunks
 
 ; stores hl into the output pointers
-StoreSpriteOutputPointer:: ; 2897 (0:2897)
+StoreSpriteOutputPointer::
 	ld a, l
 	ld [wSpriteOutputPtr], a
 	ld [wSpriteOutputPtrCached], a
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -1,4 +1,4 @@
-Serial:: ; 2125 (0:2125)
+Serial::
 	push af
 	push bc
 	push de
@@ -52,7 +52,7 @@
 ; hl = send data
 ; de = receive data
 ; bc = length of data
-Serial_ExchangeBytes:: ; 216f (0:216f)
+Serial_ExchangeBytes::
 	ld a, 1
 	ld [hSerialIgnoringInitialData], a
 .loop
@@ -86,7 +86,7 @@
 	jr nz, .loop
 	ret
 
-Serial_ExchangeByte:: ; 219a (0:219a)
+Serial_ExchangeByte::
 	xor a
 	ld [hSerialReceivedNewData], a
 	ld a, [hSerialConnectionStatus]
@@ -174,7 +174,7 @@
 	call DelayFrame
 	jp Serial_ExchangeByte
 
-WaitLoop_15Iterations:: ; 2231 (0:2231)
+WaitLoop_15Iterations::
 	ld a, 15
 .waitLoop
 	dec a
@@ -181,7 +181,7 @@
 	jr nz, .waitLoop
 	ret
 
-IsUnknownCounterZero:: ; 2237 (0:2237)
+IsUnknownCounterZero::
 	push hl
 	ld hl, wUnknownSerialCounter
 	ld a, [hli]
@@ -190,7 +190,7 @@
 	ret
 
 ; a is always 0 when this is called
-SetUnknownCounterToFFFF:: ; 223f (0:223f)
+SetUnknownCounterToFFFF::
 	dec a
 	ld [wUnknownSerialCounter], a
 	ld [wUnknownSerialCounter + 1], a
@@ -198,7 +198,7 @@
 
 ; This is used to exchange the button press and selected menu item on the link menu.
 ; The data is sent thrice and read twice to increase reliability.
-Serial_ExchangeLinkMenuSelection:: ; 2247 (0:2247)
+Serial_ExchangeLinkMenuSelection::
 	ld hl, wLinkMenuSelectionSendBuffer
 	ld de, wLinkMenuSelectionReceiveBuffer
 	ld c, 2 ; number of bytes to save
@@ -223,13 +223,13 @@
 	jr nz, .loop
 	ret
 
-Serial_PrintWaitingTextAndSyncAndExchangeNybble:: ; 226e (0:226e)
+Serial_PrintWaitingTextAndSyncAndExchangeNybble::
 	call SaveScreenTilesToBuffer1
 	callab PrintWaitingText
 	call Serial_SyncAndExchangeNybble
 	jp LoadScreenTilesFromBuffer1
 
-Serial_SyncAndExchangeNybble:: ; 227f (0:227f)
+Serial_SyncAndExchangeNybble::
 	ld a, $ff
 	ld [wSerialExchangeNybbleReceiveData], a
 .loop1
@@ -269,7 +269,7 @@
 	ld [wSerialSyncAndExchangeNybbleReceiveData], a
 	ret
 
-Serial_ExchangeNybble:: ; 22c3 (0:22c3)
+Serial_ExchangeNybble::
 	call .doExchange
 	ld a, [wSerialExchangeNybbleSendData]
 	add $60
@@ -292,7 +292,7 @@
 	ld [wSerialExchangeNybbleReceiveData], a
 	ret
 
-Serial_SendZeroByte:: ; 22ed (0:22ed)
+Serial_SendZeroByte::
 	xor a
 	ld [hSerialSendData], a
 	ld a, [hSerialConnectionStatus]
@@ -302,7 +302,7 @@
 	ld [rSC], a
 	ret
 
-Serial_TryEstablishingExternallyClockedConnection:: ; 22fa (0:22fa)
+Serial_TryEstablishingExternallyClockedConnection::
 	ld a, ESTABLISH_CONNECTION_WITH_EXTERNAL_CLOCK
 	ld [rSB], a
 	xor a
--- a/home/text.asm
+++ b/home/text.asm
@@ -46,9 +46,9 @@
 	jr nz, .loop
 	ret
 
-PlaceString:: ; 1955 (0:1955)
+PlaceString::
 	push hl
-PlaceNextChar:: ; 1956 (0:1956)
+PlaceNextChar::
 	ld a,[de]
 
 	cp "@"
@@ -123,11 +123,11 @@
 	jp z,Char5A
 	ld [hli],a
 	call PrintLetterDelay
-PlaceNextChar_inc:: ; 19e8 (0:19e8)
+PlaceNextChar_inc::
 	inc de
 	jp PlaceNextChar
 
-Char00:: ; 19ec (0:19ec)
+Char00::
 	ld b,h
 	ld c,l
 	pop hl
@@ -184,7 +184,7 @@
 	ld de,Char4AText
 	jr FinishDTE
 
-Char59:: ; 1a2f (0:1a2f)
+Char59::
 ; depending on whose turn it is, print
 ; enemy active monster’s name, prefixed with “Enemy ”
 ; or
@@ -194,13 +194,13 @@
 	xor 1
 	jr MonsterNameCharsCommon
 
-Char5A:: ; 1a35 (0:1a35)
+Char5A::
 ; depending on whose turn it is, print
 ; player active monster’s name
 ; or
 ; enemy active monster’s name, prefixed with “Enemy ”
 	ld a,[H_WHOSETURN]
-MonsterNameCharsCommon:: ; 1a37 (0:1a37)
+MonsterNameCharsCommon::
 	push de
 	and a
 	jr nz,.Enemy
@@ -216,7 +216,7 @@
 	ld l,c
 	ld de,wEnemyMonNick ; enemy active monster name
 
-FinishDTE:: ; 1a4b (0:1a4b)
+FinishDTE::
 	call PlaceString
 	ld h,b
 	ld l,c
@@ -224,24 +224,24 @@
 	inc de
 	jp PlaceNextChar
 
-Char5CText:: ; 1a55 (0:1a55)
+Char5CText::
 	db "TM@"
-Char5DText:: ; 1a58 (0:1a58)
+Char5DText::
 	db "TRAINER@"
-Char5BText:: ; 1a60 (0:1a60)
+Char5BText::
 	db "PC@"
-Char5EText:: ; 1a63 (0:1a63)
+Char5EText::
 	db "ROCKET@"
-Char54Text:: ; 1a6a (0:1a6a)
+Char54Text::
 	db "POKé@"
-Char56Text:: ; 1a6f (0:1a6f)
+Char56Text::
 	db "……@"
-Char5AText:: ; 1a72 (0:1a72)
+Char5AText::
 	db "Enemy @"
-Char4AText:: ; 1a79 (0:1a79)
+Char4AText::
 	db $E1,$E2,"@" ; PKMN
 
-Char55:: ; 1a7c (0:1a7c)
+Char55::
 	push de
 	ld b,h
 	ld c,l
@@ -253,38 +253,38 @@
 	inc de
 	jp PlaceNextChar
 
-Char55Text:: ; 1a8c (0:1a8c)
+Char55Text::
 ; equivalent to Char4B
 	TX_FAR _Char55Text
 	db "@"
 
-Char5F:: ; 1a91 (0:1a91)
+Char5F::
 ; ends a Pokédex entry
 	ld [hl],"."
 	pop hl
 	ret
 
-Char58:: ; 1a95 (0:1a95)
+Char58::
 	ld a,[wLinkState]
 	cp LINK_STATE_BATTLING
 	jp z,Next1AA2
 	ld a,$EE
 	Coorda 18, 16
-Next1AA2:: ; 1aa2 (0:1aa2)
+Next1AA2::
 	call ProtectedDelay3
 	call ManualTextScroll
 	ld a, " "
 	Coorda 18, 16
-Char57:: ; 1aad (0:1aad)
+Char57::
 	pop hl
 	ld de,Char58Text
 	dec de
 	ret
 
-Char58Text:: ; 1ab3 (0:1ab3)
+Char58Text::
 	db "@"
 
-Char51:: ; 1ab4 (0:1ab4)
+Char51::
 	push de
 	ld a,$EE
 	Coorda 18, 16
@@ -299,7 +299,7 @@
 	coord hl, 1, 14
 	jp PlaceNextChar_inc
 
-Char49:: ; 1ad5 (0:1ad5)
+Char49::
 	push de
 	ld a,$EE
 	Coorda 18, 16
@@ -316,7 +316,7 @@
 	push hl
 	jp PlaceNextChar_inc
 
-Char4B:: ; 1af8 (0:1af8)
+Char4B::
 	ld a,$EE
 	Coorda 18, 16
 	call ProtectedDelay3
@@ -326,7 +326,7 @@
 	ld a, " "
 	Coorda 18, 16
 	;fall through
-Char4C:: ; 1b0a (0:1b0a)
+Char4C::
 	push de
 	call Next1B18
 	call Next1B18
@@ -334,7 +334,7 @@
 	pop de
 	jp PlaceNextChar_inc
 
-Next1B18:: ; 1b18 (0:1b18)
+Next1B18::
 	coord hl, 0, 14
 	coord de, 0, 13
 	ld b,60
@@ -361,13 +361,13 @@
 
 	ret
 
-ProtectedDelay3:: ; 1b3a (0:1b3a)
+ProtectedDelay3::
 	push bc
 	call Delay3
 	pop bc
 	ret
 
-TextCommandProcessor:: ; 1b40 (0:1b40)
+TextCommandProcessor::
 	ld a,[wLetterPrintingDelayFlags]
 	push af
 	set 1,a
@@ -380,7 +380,7 @@
 	ld a,b
 	ld [wUnusedCC3B],a
 
-NextTextCommand:: ; 1b55 (0:1b55)
+NextTextCommand::
 	ld a,[hli]
 	cp a, "@" ; terminator
 	jr nz,.doTextCommand
@@ -411,7 +411,7 @@
 ; AAAA = address of upper left corner
 ; BB = height
 ; CC = width
-TextCommand04:: ; 1b78 (0:1b78)
+TextCommand04::
 	pop hl
 	ld a,[hli]
 	ld e,a
@@ -430,7 +430,7 @@
 
 ; place string inline
 ; 00{string}
-TextCommand00:: ; 1b8a (0:1b8a)
+TextCommand00::
 	pop hl
 	ld d,h
 	ld e,l
@@ -445,7 +445,7 @@
 ; place string from RAM
 ; 01AAAA
 ; AAAA = address of string
-TextCommand01:: ; 1b97 (0:1b97)
+TextCommand01::
 	pop hl
 	ld a,[hli]
 	ld e,a
@@ -464,7 +464,7 @@
 ; BB
 ; bits 0-4 = length in bytes
 ; bits 5-7 = unknown flags
-TextCommand02:: ; 1ba5 (0:1ba5)
+TextCommand02::
 	pop hl
 	ld a,[hli]
 	ld e,a
@@ -484,7 +484,7 @@
 ; repoint destination address
 ; 03AAAA
 ; AAAA = new destination address
-TextCommand03:: ; 1bb7 (0:1bb7)
+TextCommand03::
 	pop hl
 	ld a,[hli]
 	ld [wUnusedCC3A],a
@@ -497,7 +497,7 @@
 ; repoint destination to second line of dialogue text box
 ; 05
 ; (no arguments)
-TextCommand05:: ; 1bc5 (0:1bc5)
+TextCommand05::
 	pop hl
 	coord bc, 1, 16 ; address of second line of dialogue text box
 	jp NextTextCommand
@@ -505,7 +505,7 @@
 ; blink arrow and wait for A or B to be pressed
 ; 06
 ; (no arguments)
-TextCommand06:: ; 1bcc (0:1bcc)
+TextCommand06::
 	ld a,[wLinkState]
 	cp a,LINK_STATE_BATTLING
 	jp z,TextCommand0D
@@ -522,7 +522,7 @@
 ; scroll text up one line
 ; 07
 ; (no arguments)
-TextCommand07:: ; 1be7 (0:1be7)
+TextCommand07::
 	ld a," "
 	Coorda 18, 16 ; place blank space in lower right corner of dialogue text box
 	call Next1B18 ; scroll up text
@@ -533,7 +533,7 @@
 
 ; execute asm inline
 ; 08{code}
-TextCommand08:: ; 1bf9 (0:1bf9)
+TextCommand08::
 	pop hl
 	ld de,NextTextCommand
 	push de ; return address
@@ -545,7 +545,7 @@
 ; BB
 ; bits 0-3 = how many digits to display
 ; bits 4-7 = how long the number is in bytes
-TextCommand09:: ; 1bff (0:1bff)
+TextCommand09::
 	pop hl
 	ld a,[hli]
 	ld e,a
@@ -572,7 +572,7 @@
 ; wait half a second if the user doesn't hold A or B
 ; 0A
 ; (no arguments)
-TextCommand0A:: ; 1c1d (0:1c1d)
+TextCommand0A::
 	push bc
 	call Joypad
 	ld a,[hJoyHeld]
@@ -588,7 +588,7 @@
 ; plays sounds
 ; this actually handles various command ID's, not just 0B
 ; (no arguments)
-TextCommand0B:: ; 1c31 (0:1c31)
+TextCommand0B::
 	pop hl
 	push bc
 	dec hl
@@ -625,7 +625,7 @@
 	jp NextTextCommand
 
 ; format: text command ID, sound ID or cry ID
-TextCommandSounds:: ; 1c64 (0:1c64)
+TextCommandSounds::
 	db $0B,SFX_GET_ITEM_1
 	db $12,SFX_CAUGHT_MON
 	db $0E,SFX_POKEDEX_RATING
@@ -640,7 +640,7 @@
 ; draw ellipses
 ; 0CAA
 ; AA = number of ellipses to draw
-TextCommand0C:: ; 1c78 (0:1c78)
+TextCommand0C::
 	pop hl
 	ld a,[hli]
 	ld d,a
@@ -669,7 +669,7 @@
 ; wait for A or B to be pressed
 ; 0D
 ; (no arguments)
-TextCommand0D:: ; 1c9a (0:1c9a)
+TextCommand0D::
 	push bc
 	call ManualTextScroll ; wait for A or B to be pressed
 	pop bc
@@ -680,7 +680,7 @@
 ; 17AAAABB
 ; AAAA = address of text commands
 ; BB = bank
-TextCommand17:: ; 1ca3 (0:1ca3)
+TextCommand17::
 	pop hl
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -701,7 +701,7 @@
 	ld [MBC1RomBank],a
 	jp NextTextCommand
 
-TextCommandJumpTable:: ; 1cc1 (0:1cc1)
+TextCommandJumpTable::
 	dw TextCommand00
 	dw TextCommand01
 	dw TextCommand02
--- a/home/timer.asm
+++ b/home/timer.asm
@@ -1,3 +1,3 @@
 ; timer interrupt is apparently not invoked anyway
-Timer:: ; 2306 (0:2306)
+Timer::
 	reti
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -1,7 +1,7 @@
 ; this function seems to be used only once
 ; it store the address of a row and column of the VRAM background map in hl
 ; INPUT: h - row, l - column, b - high byte of background tile map address in VRAM
-GetRowColAddressBgMap:: ; 1cdd (0:1cdd)
+GetRowColAddressBgMap::
 	xor a
 	srl h
 	rr a
@@ -18,7 +18,7 @@
 
 ; clears a VRAM background map with blank space tiles
 ; INPUT: h - high byte of background tile map address in VRAM
-ClearBgMap:: ; 1cf0 (0:1cf0)
+ClearBgMap::
 	ld a," "
 	jr .next
 	ld a,l
@@ -33,7 +33,7 @@
 	jr nz,.loop
 	ret
 
-RedrawRowOrColumn:: ; 1d01 (0:1d01)
+RedrawRowOrColumn::
 ; This function redraws a BG row of height 2 or a BG column of width 2.
 ; One of its main uses is redrawing the row or column that will be exposed upon
 ; scrolling the BG when the player takes a step. Redrawing only the exposed
@@ -119,7 +119,7 @@
 ; on when talking to sprites, battling, using menus, etc. This is because
 ; the above function, RedrawRowOrColumn, is used when walking to
 ; improve efficiency.
-AutoBgMapTransfer:: ; 1d57 (0:1d57)
+AutoBgMapTransfer::
 	ld a,[H_AUTOBGTRANSFERENABLED]
 	and a
 	ret z
@@ -167,7 +167,7 @@
 	ld [H_AUTOBGTRANSFERPORTION],a ; store next portion
 	ld b,6
 
-TransferBgRows:: ; 1d9e (0:1d9e)
+TransferBgRows::
 ; unrolled loop and using pop for speed
 
 	rept 20 / 2 - 1
@@ -201,7 +201,7 @@
 
 ; Copies [H_VBCOPYBGNUMROWS] rows from H_VBCOPYBGSRC to H_VBCOPYBGDEST.
 ; If H_VBCOPYBGSRC is XX00, the transfer is disabled.
-VBlankCopyBgMap:: ; 1de1 (0:1de1)
+VBlankCopyBgMap::
 	ld a,[H_VBCOPYBGSRC] ; doubles as enabling byte
 	and a
 	ret z
--- a/main.asm
+++ b/main.asm
@@ -179,7 +179,7 @@
 	db "Waiting...!@"
 
 
-_UpdateSprites: ; 4c34 (1:4c34)
+_UpdateSprites:
 	ld h, $c1
 	inc h
 	ld a, $e    ; wSpriteStateData2 + $0e
@@ -587,7 +587,7 @@
 
 INCLUDE "engine/cable_club.asm"
 
-LoadTrainerInfoTextBoxTiles: ; 5ae6 (1:5ae6)
+LoadTrainerInfoTextBoxTiles:
 	ld de, TrainerInfoTextBoxTileGraphics
 	ld hl, vChars2 + $760
 	lb bc, BANK(TrainerInfoTextBoxTileGraphics), (TrainerInfoTextBoxTileGraphicsEnd - TrainerInfoTextBoxTileGraphics) / $10
@@ -597,7 +597,7 @@
 
 INCLUDE "engine/oak_speech.asm"
 
-SpecialWarpIn: ; 62ce (1:62ce)
+SpecialWarpIn:
 	call LoadSpecialWarpData
 	predef LoadTilesetHeader
 	ld hl,wd732
@@ -628,7 +628,7 @@
 	ret
 
 ; gets the map ID, tile block map view pointer, tileset, and coordinates
-LoadSpecialWarpData: ; 62ff (1:62ff)
+LoadSpecialWarpData:
 	ld a, [wd72d]
 	cp TRADE_CENTER
 	jr nz, .notTradeCenter
@@ -756,7 +756,7 @@
 ; while I was debugging the program."
 ; http://www.ign.com/articles/2000/02/09/abc-news-pokamon-chat-transcript
 
-SetIshiharaTeam: ; 64ca (1:64ca)
+SetIshiharaTeam:
 	ld de, IshiharaTeam
 .loop
 	ld a, [de]
@@ -770,7 +770,7 @@
 	call AddPartyMon
 	jr .loop
 
-IshiharaTeam: ; 64df (1:64df)
+IshiharaTeam:
 	db EXEGGUTOR,90
 	db MEW,20
 	db JOLTEON,56
@@ -778,7 +778,7 @@
 	db ARTICUNO,57
 	db $FF
 
-EmptyFunc: ; 64ea (1:64ea)
+EmptyFunc:
 	ret
 
 INCLUDE "engine/menu/naming_screen.asm"
@@ -787,7 +787,7 @@
 
 ; subtracts the amount the player paid from their money
 ; sets carry flag if there is enough money and unsets carry flag if not
-SubtractAmountPaidFromMoney_: ; 6b21 (1:6b21)
+SubtractAmountPaidFromMoney_:
 	ld de,wPlayerMoney
 	ld hl,hMoney ; total price of items
 	ld c,3 ; length of money in bytes
@@ -803,7 +803,7 @@
 	and a
 	ret
 
-HandleItemListSwapping: ; 6b44 (1:6b44)
+HandleItemListSwapping:
 	ld a,[wListMenuID]
 	cp a,ITEMLISTMENU
 	jp nz,DisplayListMenuIDLoop ; only rearrange item list menus
@@ -990,7 +990,7 @@
 	db -1
 
 ; function that performs initialization for DisplayTextID
-DisplayTextIDInit: ; 7096 (1:7096)
+DisplayTextIDInit:
 	xor a
 	ld [wListMenuID],a
 	ld a,[wAutoTextBoxDrawingControl]
@@ -1069,7 +1069,7 @@
 	ret
 
 ; function that displays the start menu
-DrawStartMenu: ; 710b (1:710b)
+DrawStartMenu:
 	CheckEvent EVENT_GOT_POKEDEX
 ; menu with pokedex
 	coord hl, 10, 0
@@ -1129,28 +1129,28 @@
 	res 6,[hl] ; turn pauses between printing letters back on
 	ret
 
-StartMenuPokedexText: ; 718f (1:718f)
+StartMenuPokedexText:
 	db "POKéDEX@"
 
-StartMenuPokemonText: ; 7197 (1:7197)
+StartMenuPokemonText:
 	db "POKéMON@"
 
-StartMenuItemText: ; 719f (1:719f)
+StartMenuItemText:
 	db "ITEM@"
 
-StartMenuSaveText: ; 71a4 (1:71a4)
+StartMenuSaveText:
 	db "SAVE@"
 
-StartMenuResetText: ; 71a9 (1:71a9)
+StartMenuResetText:
 	db "RESET@"
 
-StartMenuExitText: ; 71af (1:71af)
+StartMenuExitText:
 	db "EXIT@"
 
-StartMenuOptionText: ; 71b4 (1:71b4)
+StartMenuOptionText:
 	db "OPTION@"
 
-PrintStartMenuItem: ; 71bb (1:71bb)
+PrintStartMenuItem:
 	push hl
 	call PlaceString
 	pop hl
@@ -1161,7 +1161,7 @@
 INCLUDE "engine/overworld/cable_club_npc.asm"
 
 ; function to draw various text boxes
-DisplayTextBoxID_: ; 72ea (1:72ea)
+DisplayTextBoxID_:
 	ld a,[wTextBoxID]
 	cp a,TWO_OPTION_MENU
 	jp z,DisplayTwoOptionMenu
@@ -1212,7 +1212,7 @@
 
 ; function to search a table terminated with $ff for a byte matching c in increments of de
 ; sets carry flag if a match is found and clears carry flag if not
-SearchTextBoxTable: ; 734c (1:734c)
+SearchTextBoxTable:
 	dec de
 .loop
 	ld a,[hli]
@@ -1235,7 +1235,7 @@
 ; c = width
 ; d = row of upper left corner
 ; e = column of upper left corner
-GetTextBoxIDCoords: ; 735a (1:735a)
+GetTextBoxIDCoords:
 	ld a,[hli] ; column of upper left corner
 	ld e,a
 	ld a,[hli] ; row of upper left corner
@@ -1251,7 +1251,7 @@
 	ret
 
 ; function to load a text address and text coordinates from the TextBoxTextAndCoordTable
-GetTextBoxIDText: ; 7367 (1:7367)
+GetTextBoxIDText:
 	ld a,[hli]
 	ld e,a
 	ld a,[hli]
@@ -1271,7 +1271,7 @@
 ; e = column
 ; OUTPUT:
 ; hl = address of upper left corner of text box
-GetAddressOfScreenCoords: ; 7375 (1:7375)
+GetAddressOfScreenCoords:
 	push bc
 	coord hl, 0, 0
 	ld bc,20
@@ -1290,7 +1290,7 @@
 ; Format:
 ; 00: text box ID
 ; 01-02: function address
-TextBoxFunctionTable: ; 7387 (1:7387)
+TextBoxFunctionTable:
 	dbw MONEY_BOX, DisplayMoneyBox
 	dbw BUY_SELL_QUIT_MENU, DoBuySellQuitMenu
 	dbw FIELD_MOVE_MON_MENU, DisplayFieldMoveMonMenu
@@ -1302,7 +1302,7 @@
 ; 02: row of upper left corner
 ; 03: column of lower right corner
 ; 04: row of lower right corner
-TextBoxCoordTable: ; 7391 (1:7391)
+TextBoxCoordTable:
 	db MESSAGE_BOX,       0, 12, 19, 17
 	db $03,               0,  0, 19, 14
 	db $07,               0,  0, 11,  6
@@ -1321,7 +1321,7 @@
 ; 07: column of beginning of text
 ; 08: row of beginning of text
 ; table of window positions and corresponding text [key, start column, start row, end column, end row, text pointer [2 bytes], text column, text row]
-TextBoxTextAndCoordTable: ; 73b0 (1:73b0)
+TextBoxTextAndCoordTable:
 	db JP_MOCHIMONO_MENU_TEMPLATE
 	db 0,0,14,17   ; text box coordinates
 	dw JapaneseMochimonoText
@@ -1379,56 +1379,56 @@
 
 ; note that there is no terminator
 
-BuySellQuitText: ; 7413 (1:7413)
+BuySellQuitText:
 	db   "BUY"
 	next "SELL"
 	next "QUIT@@"
 
-UseTossText: ; 7422 (1:7422)
+UseTossText:
 	db   "USE"
 	next "TOSS@"
 
-JapaneseSaveMessageText: ; 742b (1:742b)
+JapaneseSaveMessageText:
 	db   "きろく"
 	next "メッセージ@"
 
-JapaneseSpeedOptionsText: ; 7435 (1:7435)
+JapaneseSpeedOptionsText:
 	db   "はやい"
 	next "おそい@"
 
-MoneyText: ; 743d (1:743d)
+MoneyText:
 	db "MONEY@"
 
-JapaneseMochimonoText: ; 7443 (1:7443)
+JapaneseMochimonoText:
 	db "もちもの@"
 
-JapaneseMainMenuText: ; 7448 (1:7448)
+JapaneseMainMenuText:
 	db   "つづきから"
 	next "さいしょから@"
 
-BattleMenuText: ; 7455 (1:7455)
+BattleMenuText:
 	db   "FIGHT ",$E1,$E2
 	next "ITEM  RUN@"
 
-SafariZoneBattleMenuText: ; 7468 (1:7468)
+SafariZoneBattleMenuText:
 	db   "BALL×       BAIT"
 	next "THROW ROCK  RUN@"
 
-SwitchStatsCancelText: ; 7489 (1:7489)
+SwitchStatsCancelText:
 	db   "SWITCH"
 	next "STATS"
 	next "CANCEL@"
 
-JapaneseAhText: ; 749d (1:749d)
+JapaneseAhText:
 	db "アッ!@"
 
-JapanesePokedexMenu: ; 74a1 (1:74a1)
+JapanesePokedexMenu:
 	db   "データをみる"
 	next "なきごえ"
 	next "ぶんぷをみる"
 	next "キャンセル@"
 
-DisplayMoneyBox: ; 74ba (1:74ba)
+DisplayMoneyBox:
 	ld hl, wd730
 	set 6, [hl]
 	ld a, MONEY_BOX_TEMPLATE
@@ -1446,10 +1446,10 @@
 	res 6, [hl]
 	ret
 
-CurrencyString: ; 74e2 (1:74e2)
+CurrencyString:
 	db "      ¥@"
 
-DoBuySellQuitMenu: ; 74ea (1:74ea)
+DoBuySellQuitMenu:
 	ld a, [wd730]
 	set 6, a ; no printing delay
 	ld [wd730], a
@@ -1504,7 +1504,7 @@
 ; b = Y of upper left corner of text region
 ; c = X of upper left corner of text region
 ; hl = address where the text box border should be drawn
-DisplayTwoOptionMenu: ; 7559 (1:7559)
+DisplayTwoOptionMenu:
 	push hl
 	ld a, [wd730]
 	set 6, a ; no printing delay
@@ -1641,7 +1641,7 @@
 ; they cover be fully saved/restored by the two functions below.
 ; The bottom and right edges of the menu may remain after the function returns.
 
-TwoOptionMenu_SaveScreenTiles: ; 763e (1:763e)
+TwoOptionMenu_SaveScreenTiles:
 	ld de, wBuffer
 	lb bc, 5, 6
 .loop
@@ -1659,7 +1659,7 @@
 	jr nz, .loop
 	ret
 
-TwoOptionMenu_RestoreScreenTiles: ; 7656 (1:7656)
+TwoOptionMenu_RestoreScreenTiles:
 	ld de, wBuffer
 	lb bc, 5, 6
 .loop
@@ -1683,7 +1683,7 @@
 ; 01: byte height
 ; 02: byte put blank line before first menu item
 ; 03: word text pointer
-TwoOptionMenuStrings: ; 7671 (1:7671)
+TwoOptionMenuStrings:
 	db 4,3,0
 	dw .YesNoMenu
 	db 6,3,0
@@ -1716,7 +1716,7 @@
 .HealCancelMenu ; 76d5 (1:36d5)
 	db "HEAL",$4E,"CANCEL@"
 
-DisplayFieldMoveMonMenu: ; 76e1 (1:76e1)
+DisplayFieldMoveMonMenu:
 	xor a
 	ld hl, wFieldMoves
 	ld [hli], a ; wFieldMoves
@@ -1836,7 +1836,7 @@
 	ld de, PokemonMenuEntries
 	jp PlaceString
 
-FieldMoveNames: ; 778d (1:778d)
+FieldMoveNames:
 	db "CUT@"
 	db "FLY@"
 	db "@"
@@ -1847,12 +1847,12 @@
 	db "TELEPORT@"
 	db "SOFTBOILED@"
 
-PokemonMenuEntries: ; 77c2 (1:77c2)
+PokemonMenuEntries:
 	db   "STATS"
 	next "SWITCH"
 	next "CANCEL@"
 
-GetMonFieldMoves: ; 77d6 (1:77d6)
+GetMonFieldMoves:
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMon1Moves
 	ld bc, wPartyMon2 - wPartyMon1
@@ -1909,7 +1909,7 @@
 ; Name index = index of name in FieldMoveNames
 ; Leftmost tile = -1 + tile column in which the first letter of the move's name should be displayed
 ;                 "SOFTBOILED" is $08 because it has 4 more letters than "SURF", for example, whose value is $0C
-FieldMoveDisplayData: ; 7823 (1:7823)
+FieldMoveDisplayData:
 	db CUT, $01, $0C
 	db FLY, $02, $0C
 	db $B4, $03, $0C ; unused field move
@@ -1926,7 +1926,7 @@
 
 INCLUDE "engine/menu/players_pc.asm"
 
-_RemovePokemon: ; 7b68 (1:7b68)
+_RemovePokemon:
 	ld hl, wPartyCount
 	ld a, [wRemoveMonFromBox]
 	and a
@@ -2022,7 +2022,7 @@
 .asm_7c15
 	jp CopyDataUntil
 
-_DisplayPokedex: ; 7c18 (1:7c18)
+_DisplayPokedex:
 	ld hl, wd730
 	set 6, [hl]
 	predef ShowPokedexData
@@ -2051,7 +2051,7 @@
 
 INCLUDE "data/map_header_banks.asm"
 
-ClearVariablesAfterLoadingMapData: ; c335 (3:4335)
+ClearVariablesAfterLoadingMapData:
 	ld a, SCREEN_HEIGHT_PIXELS
 	ld [hWY], a
 	ld [rWY], a
@@ -2073,7 +2073,7 @@
 	ret
 
 ; only used for setting bit 2 of wd736 upon entering a new map
-IsPlayerStandingOnWarp: ; c35f (3:435f)
+IsPlayerStandingOnWarp:
 	ld a, [wNumberOfWarps]
 	and a
 	ret z
@@ -2105,7 +2105,7 @@
 	jr nz, .loop
 	ret
 
-CheckForceBikeOrSurf: ; c38b (3:438b)
+CheckForceBikeOrSurf:
 	ld hl, wd732
 	bit 5, [hl]
 	ret nz
@@ -2158,7 +2158,7 @@
 
 INCLUDE "data/force_bike_surf.asm"
 
-IsPlayerFacingEdgeOfMap: ; c3ff (3:43ff)
+IsPlayerFacingEdgeOfMap:
 	push hl
 	push de
 	push bc
@@ -2224,7 +2224,7 @@
 	scf
 	ret
 
-IsWarpTileInFrontOfPlayer: ; c44e (3:444e)
+IsWarpTileInFrontOfPlayer:
 	push hl
 	push de
 	push bc
@@ -2250,7 +2250,7 @@
 	pop hl
 	ret
 
-.warpTileListPointers: ; c477 (3:4477)
+.warpTileListPointers:
 	dw .facingDownWarpTiles
 	dw .facingUpWarpTiles
 	dw .facingLeftWarpTiles
@@ -2278,7 +2278,7 @@
 	and a
 	jr .done
 
-IsPlayerStandingOnDoorTileOrWarpTile: ; c49d (3:449d)
+IsPlayerStandingOnDoorTileOrWarpTile:
 	push hl
 	push de
 	push bc
@@ -2307,7 +2307,7 @@
 
 INCLUDE "data/warp_tile_ids.asm"
 
-PrintSafariZoneSteps: ; c52f (3:452f)
+PrintSafariZoneSteps:
 	ld a, [wCurMap]
 	cp SAFARI_ZONE_EAST
 	ret c
@@ -2339,16 +2339,16 @@
 	lb bc, 1, 2
 	jp PrintNumber
 
-SafariSteps: ; c579 (3:4579)
+SafariSteps:
 	db "/500@"
 
-SafariBallText: ; c57e (3:457e)
+SafariBallText:
 	db "BALL×× @"
 
-GetTileAndCoordsInFrontOfPlayer: ; c586 (3:4586)
+GetTileAndCoordsInFrontOfPlayer:
 	call GetPredefRegisters
 
-_GetTileAndCoordsInFrontOfPlayer: ; c589 (3:4589)
+_GetTileAndCoordsInFrontOfPlayer:
 	ld a, [wYCoord]
 	ld d, a
 	ld a, [wXCoord]
@@ -2385,7 +2385,7 @@
 	ld [wTileInFrontOfPlayer], a
 	ret
 
-GetTileTwoStepsInFrontOfPlayer: ; c5be (3:45be)
+GetTileTwoStepsInFrontOfPlayer:
 	xor a
 	ld [$ffdb], a
 	ld hl, wYCoord
@@ -2433,7 +2433,7 @@
 	ld [wTileInFrontOfPlayer], a
 	ret
 
-CheckForCollisionWhenPushingBoulder: ; c60b (3:460b)
+CheckForCollisionWhenPushingBoulder:
 	call GetTileTwoStepsInFrontOfPlayer
 	ld hl, wTileSetCollisionPtr
 	ld a, [hli]
@@ -2459,7 +2459,7 @@
 	ret
 
 ; sets a to $ff if there is a collision and $00 if there is no collision
-CheckForBoulderCollisionWithSprites: ; c636 (3:4636)
+CheckForBoulderCollisionWithSprites:
 	ld a, [wBoulderSpriteIndex]
 	dec a
 	swap a
@@ -2536,7 +2536,7 @@
 	xor a
 	ret
 
-ApplyOutOfBattlePoisonDamage: ; c69c (3:469c)
+ApplyOutOfBattlePoisonDamage:
 	ld a, [wd730]
 	add a
 	jp c, .noBlackOut ; no black out if joypad states are being simulated
@@ -2649,7 +2649,7 @@
 	ld [wOutOfBattleBlackout], a
 	ret
 
-LoadTilesetHeader: ; c754 (3:4754)
+LoadTilesetHeader:
 	call GetPredefRegisters
 	push hl
 	ld d, 0
@@ -2710,7 +2710,7 @@
 
 INCLUDE "data/tileset_headers.asm"
 
-IncrementDayCareMonExp: ; c8de (3:48de)
+IncrementDayCareMonExp:
 	ld a, [wDayCareInUse]
 	and a
 	ret z
@@ -2731,7 +2731,7 @@
 
 INCLUDE "data/hide_show_data.asm"
 
-PrintStrengthTxt: ; cd99 (3:4d99)
+PrintStrengthTxt:
 	ld hl, wd728
 	set 0, [hl]
 	ld hl, UsedStrengthText
@@ -2739,7 +2739,7 @@
 	ld hl, CanMoveBouldersText
 	jp PrintText
 
-UsedStrengthText: ; cdaa (3:4daa)
+UsedStrengthText:
 	TX_FAR _UsedStrengthText
 	TX_ASM
 	ld a, [wcf91]
@@ -2747,11 +2747,11 @@
 	call Delay3
 	jp TextScriptEnd
 
-CanMoveBouldersText: ; cdbb (3:4dbb)
+CanMoveBouldersText:
 	TX_FAR _CanMoveBouldersText
 	db "@"
 
-IsSurfingAllowed: ; cdc0 (3:4dc0)
+IsSurfingAllowed:
 ; Returns whether surfing is allowed in bit 1 of wd728.
 ; Surfing isn't allowed on the Cycling Road or in the lowest level of the
 ; Seafoam Islands before the current has been slowed with boulders.
@@ -2778,14 +2778,14 @@
 	ld hl, CyclingIsFunText
 	jp PrintText
 
-CoordsData_cdf7: ; cdf7 (3:4df7)
+CoordsData_cdf7:
 	db $0B,$07,$FF
 
-CurrentTooFastText: ; cdfa (3:4dfa)
+CurrentTooFastText:
 	TX_FAR _CurrentTooFastText
 	db "@"
 
-CyclingIsFunText: ; cdff (3:4dff)
+CyclingIsFunText:
 	TX_FAR _CyclingIsFunText
 	db "@"
 
@@ -2795,7 +2795,7 @@
 ; [wcf91] = item ID
 ; [wItemQuantity] = item quantity
 ; sets carry flag if successful, unsets carry flag if unsuccessful
-AddItemToInventory_: ; ce04 (3:4e04)
+AddItemToInventory_:
 	ld a,[wItemQuantity] ; a = item quantity
 	push af
 	push bc
@@ -2888,7 +2888,7 @@
 ; hl = address of inventory (either wNumBagItems or wNumBoxItems)
 ; [wWhichPokemon] = index (within the inventory) of the item to remove
 ; [wItemQuantity] = quantity to remove
-RemoveItemFromInventory_: ; ce74 (3:4e74)
+RemoveItemFromInventory_:
 	push hl
 	inc hl
 	ld a,[wWhichPokemon] ; index (within the inventory) of the item being removed
@@ -2942,7 +2942,7 @@
 
 ; wild pokemon data: from 4EB8 to 55C7
 
-LoadWildData: ; ceb8 (3:4eb8)
+LoadWildData:
 	ld hl,WildDataPointers
 	ld a,[wCurMap]
 
@@ -2978,7 +2978,7 @@
 
 INCLUDE "engine/items/items.asm"
 
-DrawBadges: ; ea03 (3:6a03)
+DrawBadges:
 ; Draw 4x2 gym leader faces, with the faces replaced by
 ; badges if they are owned. Used in the player status screen.
 
@@ -3096,7 +3096,7 @@
 .FaceBadgeTiles
 	db $20, $28, $30, $38, $40, $48, $50, $58
 
-GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e)
+GymLeaderFaceAndBadgeTileGraphics:
 	INCBIN "gfx/badges.2bpp"
 
 ; replaces a tile block with the one specified in [wNewTileBlockID]
@@ -3103,7 +3103,7 @@
 ; and redraws the map view if necessary
 ; b = Y
 ; c = X
-ReplaceTileBlock: ; ee9e (3:6e9e)
+ReplaceTileBlock:
 	call GetPredefRegisters
 	ld hl, wOverworldMap
 	ld a, [wCurMapWidth]
@@ -3147,7 +3147,7 @@
 	call CompareHLWithBC
 	ret c ; return if the replaced tile block is above the map view in memory
 
-RedrawMapView: ; eedc (3:6edc)
+RedrawMapView:
 	ld a, [wIsInBattle]
 	inc a
 	ret z
@@ -3218,7 +3218,7 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ret
 
-CompareHLWithBC: ; ef4e (3:6f4e)
+CompareHLWithBC:
 	ld a, h
 	sub b
 	ret nz
@@ -3228,7 +3228,7 @@
 
 INCLUDE "engine/overworld/cut.asm"
 
-MarkTownVisitedAndLoadMissableObjects: ; f113 (3:7113)
+MarkTownVisitedAndLoadMissableObjects:
 	ld a, [wCurMap]
 	cp ROUTE_1
 	jr nc, .notInTown
@@ -3247,7 +3247,7 @@
 	ld h, [hl]
 	; fall through
 
-LoadMissableObjects: ; f132 (3:7132)
+LoadMissableObjects:
 	ld l, a
 	push hl
 	ld de, MapHS00             ; calculate difference between out pointer and the base pointer
@@ -3297,7 +3297,7 @@
 	ld [de], a                 ; write sentinel
 	ret
 
-InitializeMissableObjectsFlags: ; f175 (3:7175)
+InitializeMissableObjectsFlags:
 	ld hl, wMissableObjectFlags
 	ld bc, wMissableObjectFlagsEnd - wMissableObjectFlags
 	xor a
@@ -3328,7 +3328,7 @@
 	jr .missableObjectsLoop
 
 ; tests if current sprite is a missable object that is hidden/has been removed
-IsObjectHidden: ; f1a6 (3:71a6)
+IsObjectHidden:
 	ld a, [H_CURRENTSPRITEOFFSET]
 	swap a
 	ld b, a
@@ -3355,7 +3355,7 @@
 
 ; adds missable object (items, leg. pokemon, etc.) to the map
 ; [wMissableObjectIndex]: index of the missable object to be added (global index)
-ShowObject: ; f1c8 (3:71c8)
+ShowObject:
 ShowObject2:
 	ld hl, wMissableObjectFlags
 	ld a, [wMissableObjectIndex]
@@ -3366,7 +3366,7 @@
 
 ; removes missable object (items, leg. pokemon, etc.) from the map
 ; [wMissableObjectIndex]: index of the missable object to be removed (global index)
-HideObject: ; f1d7 (3:71d7)
+HideObject:
 	ld hl, wMissableObjectFlags
 	ld a, [wMissableObjectIndex]
 	ld c, a
@@ -3444,7 +3444,7 @@
 	ld c, a
 	ret
 
-TryPushingBoulder: ; f225 (3:7225)
+TryPushingBoulder:
 	ld a, [wd728]
 	bit 0, a ; using Strength?
 	ret z
@@ -3516,19 +3516,19 @@
 	set 1, [hl]
 	ret
 
-PushBoulderUpMovementData: ; f2ad (3:72ad)
+PushBoulderUpMovementData:
 	db NPC_MOVEMENT_UP,$FF
 
-PushBoulderDownMovementData: ; f2af (3:72af)
+PushBoulderDownMovementData:
 	db NPC_MOVEMENT_DOWN,$FF
 
-PushBoulderLeftMovementData: ; f2b1 (3:72b1)
+PushBoulderLeftMovementData:
 	db NPC_MOVEMENT_LEFT,$FF
 
-PushBoulderRightMovementData: ; f2b3 (3:72b3)
+PushBoulderRightMovementData:
 	db NPC_MOVEMENT_RIGHT,$FF
 
-DoBoulderDustAnimation: ; f2b5 (3:72b5)
+DoBoulderDustAnimation:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -3544,13 +3544,13 @@
 	ld a, SFX_CUT
 	jp PlaySound
 
-ResetBoulderPushFlags: ; f2dd (3:72dd)
+ResetBoulderPushFlags:
 	ld hl, wFlags_0xcd60
 	res 1, [hl]
 	res 6, [hl]
 	ret
 
-_AddPartyMon: ; f2e5 (3:72e5)
+_AddPartyMon:
 ; Adds a new mon to the player's or enemy's party.
 ; [wMonDataLocation] is used in an unusual way in this function.
 ; If the lower nybble is 0, the mon is added to the player's party, else the enemy's.
@@ -3797,10 +3797,10 @@
 	scf
 	ret
 
-LoadMovePPs: ; f473 (3:7473)
+LoadMovePPs:
 	call GetPredefRegisters
 	; fallthrough
-AddPartyMon_WriteMovePP: ; f476 (3:7476)
+AddPartyMon_WriteMovePP:
 	ld b, NUM_MOVES
 .pploop
 	ld a, [hli]     ; read move ID
@@ -3829,7 +3829,7 @@
 
 ; adds enemy mon [wcf91] (at position [wWhichPokemon] in enemy list) to own party
 ; used in the cable club trade center
-_AddEnemyMonToPlayerParty: ; f49d (3:749d)
+_AddEnemyMonToPlayerParty:
 	ld hl, wPartyCount
 	ld a, [hl]
 	cp PARTY_LENGTH
@@ -3890,7 +3890,7 @@
 	and a
 	ret                  ; return success
 
-_MoveMon: ; f51e (3:751e)
+_MoveMon:
 	ld a, [wMoveMonType]
 	and a
 	jr z, .checkPartyMonSlots
@@ -4356,7 +4356,7 @@
 	jr nz, .asm_f7ce
 	ret
 
-DivideBCD_f7d7: ; f7d7 (3:77d7)
+DivideBCD_f7d7:
 	ld a, [$ffa4]
 	swap a
 	and $f
@@ -4381,7 +4381,7 @@
 	ld [$ffa2], a
 	ret
 
-DivideBCD_f800: ; f800 (3:7800)
+DivideBCD_f800:
 	ld bc, $3
 .asm_f803
 	ld de, $ff9f
@@ -4511,7 +4511,7 @@
 	ret
 
 
-GetQuantityOfItemInBag: ; f8a5 (3:78a5)
+GetQuantityOfItemInBag:
 ; In: b = item ID
 ; Out: b = how many of that item are in the bag
 	call GetPredefRegisters
@@ -4530,7 +4530,7 @@
 	ld b, 0
 	ret
 
-FindPathToPlayer: ; f8ba (3:78ba)
+FindPathToPlayer:
 	xor a
 	ld hl, hFindPathNumSteps
 	ld [hli], a ; hFindPathNumSteps
@@ -4606,7 +4606,7 @@
 	ld [hl], $ff
 	ret
 
-CalcPositionOfPlayerRelativeToNPC: ; f929 (3:7929)
+CalcPositionOfPlayerRelativeToNPC:
 	xor a
 	ld [hNPCPlayerRelativePosFlags], a
 	ld a, [wSpriteStateData1 + 4] ; player's sprite screen Y position in pixels
@@ -4683,7 +4683,7 @@
 	ld [hNPCPlayerRelativePosFlags], a
 	ret
 
-ConvertNPCMovementDirectionsToJoypadMasks: ; f9a0 (3:79a0)
+ConvertNPCMovementDirectionsToJoypadMasks:
 	ld a, [hNPCMovementDirections2Index]
 	ld [wNPCMovementDirections2Index], a
 	dec a
@@ -4704,7 +4704,7 @@
 	jr nz, .loop
 	ret
 
-ConvertNPCMovementDirectionToJoypadMask: ; f9bf (3:79bf)
+ConvertNPCMovementDirectionToJoypadMask:
 	push hl
 	ld b, a
 	ld hl, NPCMovementDirectionsToJoypadMasksTable
@@ -4722,7 +4722,7 @@
 	pop hl
 	ret
 
-NPCMovementDirectionsToJoypadMasksTable: ; f9d2 (3:79d2)
+NPCMovementDirectionsToJoypadMasksTable:
 	db NPC_MOVEMENT_UP, D_UP
 	db NPC_MOVEMENT_DOWN, D_DOWN
 	db NPC_MOVEMENT_LEFT, D_LEFT
--- a/scripts/agatha.asm
+++ b/scripts/agatha.asm
@@ -1,4 +1,4 @@
-AgathaScript: ; 7642d (1d:642d)
+AgathaScript:
 	call AgathaShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
 	ld hl, AgathaTrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wAgathaCurScript], a
 	ret
 
-AgathaShowOrHideExitBlock: ; 76443 (1d:6443)
+AgathaShowOrHideExitBlock:
 ; Blocks or clears the exit to the next room.
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
@@ -25,12 +25,12 @@
 	lb bc, 0, 2
 	predef_jump ReplaceTileBlock
 
-ResetAgathaScript: ; 76464 (1d:6464)
+ResetAgathaScript:
 	xor a
 	ld [wAgathaCurScript], a
 	ret
 
-AgathaScriptPointers: ; 76469 (1d:6469)
+AgathaScriptPointers:
 	dw AgathaScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw AgathaScript2
@@ -37,10 +37,10 @@
 	dw AgathaScript3
 	dw AgathaScript4
 
-AgathaScript4: ; 76473 (1d:6473)
+AgathaScript4:
 	ret
 
-AgathaScriptWalkIntoRoom: ; 76474 (1d:6474)
+AgathaScriptWalkIntoRoom:
 ; Walk six steps upward.
 	ld hl, wSimulatedJoypadStatesEnd
 	ld a, D_UP
@@ -58,7 +58,7 @@
 	ld [wCurMapScript], a
 	ret
 
-AgathaScript0: ; 76490 (1d:6490)
+AgathaScript0:
 	ld hl, AgathaEntranceCoords
 	call ArePlayerCoordsInArray
 	jp nc, CheckFightingMapTrainers
@@ -86,7 +86,7 @@
 	ld [wCurMapScript], a
 	ret
 
-AgathaEntranceCoords: ; 764d1 (1d:64d1)
+AgathaEntranceCoords:
 	db $0A,$04
 	db $0A,$05
 	db $0B,$04
@@ -93,7 +93,7 @@
 	db $0B,$05
 	db $FF
 
-AgathaScript3: ; 764da (1d:64da)
+AgathaScript3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -104,7 +104,7 @@
 	ld [wCurMapScript], a
 	ret
 
-AgathaScript2: ; 764ed (1d:64ed)
+AgathaScript2:
 	call EndTrainerBattle
 	ld a, [wIsInBattle]
 	cp $ff
@@ -116,12 +116,12 @@
 	ld [wGaryCurScript], a
 	ret
 
-AgathaTextPointers: ; 76505 (1d:6505)
+AgathaTextPointers:
 	dw AgathaText1
 	dw AgathaDontRunAwayText
 
-AgathaTrainerHeaders: ; 76509 (1d:6509)
-AgathaTrainerHeader0: ; 76509 (1d:6509)
+AgathaTrainerHeaders:
+AgathaTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_AGATHAS_ROOM_TRAINER_0
@@ -132,24 +132,24 @@
 
 	db $ff
 
-AgathaText1: ; 76516 (1d:6516)
+AgathaText1:
 	TX_ASM
 	ld hl, AgathaTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-AgathaBeforeBattleText: ; 76520 (1d:6520)
+AgathaBeforeBattleText:
 	TX_FAR _AgathaBeforeBattleText
 	db "@"
 
-AgathaEndBattleText: ; 76525 (1d:6525)
+AgathaEndBattleText:
 	TX_FAR _AgathaEndBattleText
 	db "@"
 
-AgathaAfterBattleText: ; 7652a (1d:652a)
+AgathaAfterBattleText:
 	TX_FAR _AgathaAfterBattleText
 	db "@"
 
-AgathaDontRunAwayText: ; 7652f (1d:652f)
+AgathaDontRunAwayText:
 	TX_FAR _AgathaDontRunAwayText
 	db "@"
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -1,10 +1,10 @@
-BillsHouseScript: ; 1e76a (7:676a)
+BillsHouseScript:
 	call EnableAutoTextBoxDrawing
 	ld a, [wBillsHouseCurScript]
 	ld hl, BillsHouseScriptPointers
 	jp CallFunctionInTable
 
-BillsHouseScriptPointers: ; 1e776 (7:6776)
+BillsHouseScriptPointers:
 	dw BillsHouseScript0
 	dw BillsHouseScript1
 	dw BillsHouseScript2
@@ -12,10 +12,10 @@
 	dw BillsHouseScript4
 	dw BillsHouseScript5
 
-BillsHouseScript0: ; 1e782 (7:6782)
+BillsHouseScript0:
 	ret
 
-BillsHouseScript1: ; 1e783 (7:6783)
+BillsHouseScript1:
 	ld a, [wSpriteStateData1 + 9]
 	and a ; cp SPRITE_FACING_DOWN
 	ld de, MovementData_1e79c
@@ -29,7 +29,7 @@
 	ld [wBillsHouseCurScript], a
 	ret
 
-MovementData_1e79c: ; 1e79c (7:679c)
+MovementData_1e79c:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
@@ -36,7 +36,7 @@
 	db $FF
 
 ; make Bill walk around the player
-MovementData_1e7a0: ; 1e7a0 (7:67a0)
+MovementData_1e7a0:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
@@ -44,7 +44,7 @@
 	db NPC_MOVEMENT_UP
 	db $FF
 
-BillsHouseScript2: ; 1e7a6 (7:67a6)
+BillsHouseScript2:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -58,7 +58,7 @@
 	ld [wBillsHouseCurScript], a
 	ret
 
-BillsHouseScript3: ; 1e7c5 (7:67c5)
+BillsHouseScript3:
 	CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL
 	ret z
 	ld a, $f0
@@ -87,7 +87,7 @@
 	ld [wBillsHouseCurScript], a
 	ret
 
-MovementData_1e807: ; 1e807 (7:6807)
+MovementData_1e807:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
@@ -95,7 +95,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-BillsHouseScript4: ; 1e80d (7:680d)
+BillsHouseScript4:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -107,7 +107,7 @@
 	ld [wBillsHouseCurScript], a
 	ret
 
-BillsHouseScript5: ; 1e827 (7:6827)
+BillsHouseScript5:
 	ld a, $4
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -115,16 +115,16 @@
 	ld [wBillsHouseCurScript], a
 	ret
 
-BillsHouseTextPointers: ; 1e834 (7:6834)
+BillsHouseTextPointers:
 	dw BillsHouseText1
 	dw BillsHouseText2
 	dw BillsHouseText3
 	dw BillsHouseText4
 
-BillsHouseText4: ; 1e83c (7:683c)
+BillsHouseText4:
 	TX_BILLS_PC
 
-BillsHouseText1: ; 1e83d (7:683d)
+BillsHouseText1:
 	TX_ASM
 	ld hl, BillsHouseText_1e865
 	call PrintText
@@ -145,19 +145,19 @@
 .asm_1e862
 	jp TextScriptEnd
 
-BillsHouseText_1e865: ; 1e865 (7:6865)
+BillsHouseText_1e865:
 	TX_FAR _BillsHouseText_1e865
 	db "@"
 
-BillsHouseText_1e86a: ; 1e86a (7:686a)
+BillsHouseText_1e86a:
 	TX_FAR _BillsHouseText_1e86a
 	db "@"
 
-BillsHouseText_1e86f: ; 1e86f (7:686f)
+BillsHouseText_1e86f:
 	TX_FAR _BillsHouseText_1e86f
 	db "@"
 
-BillsHouseText2: ; 1e874 (7:6874)
+BillsHouseText2:
 	TX_ASM
 	CheckEvent EVENT_GOT_SS_TICKET
 	jr nz, .asm_1e8a9
@@ -185,30 +185,30 @@
 .asm_1e8b7
 	jp TextScriptEnd
 
-BillThankYouText: ; 1e8ba (7:68ba)
+BillThankYouText:
 	TX_FAR _BillThankYouText
 	db "@"
 
-SSTicketReceivedText: ; 1e8bf (7:68bf)
+SSTicketReceivedText:
 	TX_FAR _SSTicketReceivedText
 	TX_SFX_KEY_ITEM
 	TX_BUTTON_SOUND
 	db "@"
 
-SSTicketNoRoomText: ; 1e8c6 (7:68c6)
+SSTicketNoRoomText:
 	TX_FAR _SSTicketNoRoomText
 	db "@"
 
-BillsHouseText_1e8cb: ; 1e8cb (7:68cb)
+BillsHouseText_1e8cb:
 	TX_FAR _BillsHouseText_1e8cb
 	db "@"
 
-BillsHouseText3: ; 1e8d0 (7:68d0)
+BillsHouseText3:
 	TX_ASM
 	ld hl, BillsHouseText_1e8da
 	call PrintText
 	jp TextScriptEnd
 
-BillsHouseText_1e8da: ; 1e8da (7:68da)
+BillsHouseText_1e8da:
 	TX_FAR _BillsHouseText_1e8da
 	db "@"
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -1,14 +1,14 @@
-BluesHouseScript: ; 19b3b (6:5b3b)
+BluesHouseScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, BluesHouseScriptPointers
 	ld a, [wBluesHouseCurScript]
 	jp CallFunctionInTable
 
-BluesHouseScriptPointers: ; 19b47 (6:5b47)
+BluesHouseScriptPointers:
 	dw BluesHouseScript0
 	dw BluesHouseScript1
 
-BluesHouseScript0: ; 19b4b (6:5b4b)
+BluesHouseScript0:
 	SetEvent EVENT_ENTERED_BLUES_HOUSE
 
 	; trigger the next script
@@ -16,15 +16,15 @@
 	ld [wBluesHouseCurScript], a
 	ret
 
-BluesHouseScript1: ; 19b56 (6:5b56)
+BluesHouseScript1:
 	ret
 
-BluesHouseTextPointers: ; 19b57 (6:5b57)
+BluesHouseTextPointers:
 	dw BluesHouseText1
 	dw BluesHouseText2
 	dw BluesHouseText3
 
-BluesHouseText1: ; 19b5d (6:5b5d)
+BluesHouseText1:
 	TX_ASM
 	CheckEvent EVENT_GOT_TOWN_MAP
 	jr nz, .GotMap
@@ -59,24 +59,24 @@
 .done
 	jp TextScriptEnd
 
-DaisyInitialText: ; 19baa (6:5baa)
+DaisyInitialText:
 	TX_FAR _DaisyInitialText
 	db "@"
 
-DaisyOfferMapText: ; 19baf (6:5baf)
+DaisyOfferMapText:
 	TX_FAR _DaisyOfferMapText
 	db "@"
 
-GotMapText: ; 19bb4 (6:5bb4)
+GotMapText:
 	TX_FAR _GotMapText
 	TX_SFX_KEY_ITEM
 	db "@"
 
-DaisyBagFullText: ; 19bba (6:5bba)
+DaisyBagFullText:
 	TX_FAR _DaisyBagFullText
 	db "@"
 
-DaisyUseMapText: ; 19bbf (6:5bbf)
+DaisyUseMapText:
 	TX_FAR _DaisyUseMapText
 	db "@"
 
--- a/scripts/bruno.asm
+++ b/scripts/bruno.asm
@@ -1,4 +1,4 @@
-BrunoScript: ; 762d6 (1d:62d6)
+BrunoScript:
 	call BrunoShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
 	ld hl, BrunoTrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wBrunoCurScript], a
 	ret
 
-BrunoShowOrHideExitBlock: ; 762ec (1d:62ec)
+BrunoShowOrHideExitBlock:
 ; Blocks or clears the exit to the next room.
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
@@ -25,12 +25,12 @@
 	lb bc, 0, 2
 	predef_jump ReplaceTileBlock
 
-ResetBrunoScript: ; 7630d (1d:630d)
+ResetBrunoScript:
 	xor a
 	ld [wBrunoCurScript], a
 	ret
 
-BrunoScriptPointers: ; 76312 (1d:6312)
+BrunoScriptPointers:
 	dw BrunoScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw BrunoScript2
@@ -37,10 +37,10 @@
 	dw BrunoScript3
 	dw BrunoScript4
 
-BrunoScript4: ; 7631c (1d:631c)
+BrunoScript4:
 	ret
 
-BrunoScriptWalkIntoRoom: ; 7631d (1d:631d)
+BrunoScriptWalkIntoRoom:
 ; Walk six steps upward.
 	ld hl, wSimulatedJoypadStatesEnd
 	ld a, D_UP
@@ -58,7 +58,7 @@
 	ld [wCurMapScript], a
 	ret
 
-BrunoScript0: ; 76339 (1d:6339)
+BrunoScript0:
 	ld hl, BrunoEntranceCoords
 	call ArePlayerCoordsInArray
 	jp nc, CheckFightingMapTrainers
@@ -86,7 +86,7 @@
 	ld [wCurMapScript], a
 	ret
 
-BrunoEntranceCoords: ; 7637a (1d:637a)
+BrunoEntranceCoords:
 	db $0A,$04
 	db $0A,$05
 	db $0B,$04
@@ -93,7 +93,7 @@
 	db $0B,$05
 	db $FF
 
-BrunoScript3: ; 76383 (1d:6383)
+BrunoScript3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -104,7 +104,7 @@
 	ld [wCurMapScript], a
 	ret
 
-BrunoScript2: ; 76396 (1d:6396)
+BrunoScript2:
 	call EndTrainerBattle
 	ld a, [wIsInBattle]
 	cp $ff
@@ -113,12 +113,12 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-BrunoTextPointers: ; 763a8 (1d:63a8)
+BrunoTextPointers:
 	dw BrunoText1
 	dw BrunoDontRunAwayText
 
-BrunoTrainerHeaders: ; 763ac (1d:63ac)
-BrunoTrainerHeader0: ; 763ac (1d:63ac)
+BrunoTrainerHeaders:
+BrunoTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_BRUNOS_ROOM_TRAINER_0
@@ -129,24 +129,24 @@
 
 	db $ff
 
-BrunoText1: ; 763b9 (1d:63b9)
+BrunoText1:
 	TX_ASM
 	ld hl, BrunoTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-BrunoBeforeBattleText: ; 763c3 (1d:63c3)
+BrunoBeforeBattleText:
 	TX_FAR _BrunoBeforeBattleText
 	db "@"
 
-BrunoEndBattleText: ; 763c8 (1d:63c8)
+BrunoEndBattleText:
 	TX_FAR _BrunoEndBattleText
 	db "@"
 
-BrunoAfterBattleText: ; 763cd (1d:63cd)
+BrunoAfterBattleText:
 	TX_FAR _BrunoAfterBattleText
 	db "@"
 
-BrunoDontRunAwayText: ; 763d2 (1d:63d2)
+BrunoDontRunAwayText:
 	TX_FAR _BrunoDontRunAwayText
 	db "@"
--- a/scripts/celadoncity.asm
+++ b/scripts/celadoncity.asm
@@ -1,10 +1,10 @@
-CeladonCityScript: ; 19956 (6:5956)
+CeladonCityScript:
 	call EnableAutoTextBoxDrawing
 	ResetEvents EVENT_1B8, EVENT_1BF
 	ResetEvent EVENT_67F
 	ret
 
-CeladonCityTextPointers: ; 19966 (6:5966)
+CeladonCityTextPointers:
 	dw CeladonCityText1
 	dw CeladonCityText2
 	dw CeladonCityText3
@@ -24,23 +24,23 @@
 	dw CeladonCityText17
 	dw CeladonCityText18
 
-CeladonCityText1: ; 1998a (6:598a)
+CeladonCityText1:
 	TX_FAR _CeladonCityText1
 	db "@"
 
-CeladonCityText2: ; 1998f (6:598f)
+CeladonCityText2:
 	TX_FAR _CeladonCityText2
 	db "@"
 
-CeladonCityText3: ; 19994 (6:5994)
+CeladonCityText3:
 	TX_FAR _CeladonCityText3
 	db "@"
 
-CeladonCityText4: ; 19999 (6:5999)
+CeladonCityText4:
 	TX_FAR _CeladonCityText4
 	db "@"
 
-CeladonCityText5: ; 1999e (6:599e)
+CeladonCityText5:
 	TX_ASM
 	CheckEvent EVENT_GOT_TM41
 	jr nz, .asm_7053f
@@ -63,27 +63,27 @@
 .Done
 	jp TextScriptEnd
 
-TM41PreText: ; 199d2 (6:59d2)
+TM41PreText:
 	TX_FAR _TM41PreText
 	db "@"
 
-ReceivedTM41Text: ; 199d7 (6:59d7)
+ReceivedTM41Text:
 	TX_FAR _ReceivedTM41Text
 	db $0B, "@"
 
-TM41ExplanationText: ; 199dd (6:59dd)
+TM41ExplanationText:
 	TX_FAR _TM41ExplanationText
 	db "@"
 
-TM41NoRoomText: ; 199e2 (6:59e2)
+TM41NoRoomText:
 	TX_FAR _TM41NoRoomText
 	db "@"
 
-CeladonCityText6: ; 199e7 (6:59e7)
+CeladonCityText6:
 	TX_FAR _CeladonCityText6
 	db "@"
 
-CeladonCityText7: ; 199ec (6:59ec)
+CeladonCityText7:
 	TX_FAR _CeladonCityText7
 	TX_ASM
 	ld a, POLIWRATH
@@ -90,42 +90,42 @@
 	call PlayCry
 	jp TextScriptEnd
 
-CeladonCityText8: ; 199f9 (6:59f9)
+CeladonCityText8:
 	TX_FAR _CeladonCityText8
 	db "@"
 
-CeladonCityText9: ; 199fe (6:59fe)
+CeladonCityText9:
 	TX_FAR _CeladonCityText9
 	db "@"
 
-CeladonCityText10: ; 19a03 (6:5a03)
+CeladonCityText10:
 	TX_FAR _CeladonCityText10
 	db "@"
 
-CeladonCityText11: ; 19a08 (6:5a08)
+CeladonCityText11:
 	TX_FAR _CeladonCityText11
 	db "@"
 
-CeladonCityText13: ; 19a0d (6:5a0d)
+CeladonCityText13:
 	TX_FAR _CeladonCityText13
 	db "@"
 
-CeladonCityText14: ; 19a12 (6:5a12)
+CeladonCityText14:
 	TX_FAR _CeladonCityText14
 	db "@"
 
-CeladonCityText15: ; 19a17 (6:5a17)
+CeladonCityText15:
 	TX_FAR _CeladonCityText15
 	db "@"
 
-CeladonCityText16: ; 19a1c (6:5a1c)
+CeladonCityText16:
 	TX_FAR _CeladonCityText16
 	db "@"
 
-CeladonCityText17: ; 19a21 (6:5a21)
+CeladonCityText17:
 	TX_FAR _CeladonCityText17
 	db "@"
 
-CeladonCityText18: ; 19a26 (6:5a26)
+CeladonCityText18:
 	TX_FAR _CeladonCityText18
 	db "@"
--- a/scripts/celadondiner.asm
+++ b/scripts/celadondiner.asm
@@ -1,8 +1,8 @@
-CeladonDinerScript: ; 49151 (12:5151)
+CeladonDinerScript:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonDinerTextPointers: ; 49155 (12:5155)
+CeladonDinerTextPointers:
 	dw CeladonDinerText1
 	dw CeladonDinerText2
 	dw CeladonDinerText3
@@ -9,23 +9,23 @@
 	dw CeladonDinerText4
 	dw CeladonDinerText5
 
-CeladonDinerText1: ; 4915f (12:515f)
+CeladonDinerText1:
 	TX_FAR _CeladonDinerText1
 	db "@"
 
-CeladonDinerText2: ; 49164 (12:5164)
+CeladonDinerText2:
 	TX_FAR _CeladonDinerText2
 	db "@"
 
-CeladonDinerText3: ; 49169 (12:5169)
+CeladonDinerText3:
 	TX_FAR _CeladonDinerText3
 	db "@"
 
-CeladonDinerText4: ; 4916e (12:516e)
+CeladonDinerText4:
 	TX_FAR _CeladonDinerText4
 	db "@"
 
-CeladonDinerText5: ; 49173 (12:5173)
+CeladonDinerText5:
 	TX_ASM
 	CheckEvent EVENT_GOT_COIN_CASE
 	jr nz, .asm_eb14d
@@ -48,18 +48,18 @@
 .asm_68b61
 	jp TextScriptEnd
 
-CeladonDinerText_491a7: ; 491a7 (12:51a7)
+CeladonDinerText_491a7:
 	TX_FAR _CeladonDinerText_491a7
 	db "@"
 
-ReceivedCoinCaseText: ; 491ac (12:51ac)
+ReceivedCoinCaseText:
 	TX_FAR _ReceivedCoinCaseText
 	db $11, "@"
 
-CoinCaseNoRoomText: ; 491b2 (12:51b2)
+CoinCaseNoRoomText:
 	TX_FAR _CoinCaseNoRoomText
 	db "@"
 
-CeladonDinerText_491b7: ; 491b7 (12:51b7)
+CeladonDinerText_491b7:
 	TX_FAR _CeladonDinerText_491b7
 	db "@"
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -1,4 +1,4 @@
-CeladonGameCornerScript: ; 48bbd (12:4bbd)
+CeladonGameCornerScript:
 	call CeladonGameCornerScript_48bcf
 	call CeladonGameCornerScript_48bec
 	call EnableAutoTextBoxDrawing
@@ -6,7 +6,7 @@
 	ld a, [wCeladonGameCornerCurScript]
 	jp CallFunctionInTable
 
-CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf)
+CeladonGameCornerScript_48bcf:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -23,7 +23,7 @@
 	ld [wLuckySlotHiddenObjectIndex], a
 	ret
 
-CeladonGameCornerScript_48bec: ; 48bec (12:4bec)
+CeladonGameCornerScript_48bec:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -35,7 +35,7 @@
 	lb bc, 2, 8
 	predef_jump ReplaceTileBlock
 
-CeladonGameCornerScript_48c07: ; 48c07 (12:4c07)
+CeladonGameCornerScript_48c07:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wCeladonGameCornerCurScript], a
@@ -42,15 +42,15 @@
 	ld [wCurMapScript], a
 	ret
 
-CeladonGameCornerScriptPointers: ; 48c12 (12:4c12)
+CeladonGameCornerScriptPointers:
 	dw CeladonGameCornerScript0
 	dw CeladonGameCornerScript1
 	dw CeladonGameCornerScript2
 
-CeladonGameCornerScript0: ; 48c18 (12:4c18)
+CeladonGameCornerScript0:
 	ret
 
-CeladonGameCornerScript1: ; 48c19 (12:4c19)
+CeladonGameCornerScript1:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeladonGameCornerScript_48c07
@@ -81,7 +81,7 @@
 	ld [wCeladonGameCornerCurScript], a
 	ret
 
-MovementData_48c5a: ; 48c5a (12:4c5a)
+MovementData_48c5a:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
@@ -92,7 +92,7 @@
 	db NPC_MOVEMENT_RIGHT
 	db $FF
 
-MovementData_48c63: ; 48c63 (12:4c63)
+MovementData_48c63:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
@@ -100,7 +100,7 @@
 	db NPC_MOVEMENT_RIGHT
 	db $FF
 
-CeladonGameCornerScript2: ; 48c69 (12:4c69)
+CeladonGameCornerScript2:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -116,7 +116,7 @@
 	ld [wCeladonGameCornerCurScript], a
 	ret
 
-CeladonGameCornerTextPointers: ; 48c8a (12:4c8a)
+CeladonGameCornerTextPointers:
 	dw CeladonGameCornerText1
 	dw CeladonGameCornerText2
 	dw CeladonGameCornerText3
@@ -131,11 +131,11 @@
 	dw CeladonGameCornerText12
 	dw CeladonGameCornerText13
 
-CeladonGameCornerText1: ; 48ca4 (12:4ca4)
+CeladonGameCornerText1:
 	TX_FAR _CeladonGameCornerText1
 	db "@"
 
-CeladonGameCornerText2: ; 48ca9 (12:4ca9)
+CeladonGameCornerText2:
 	TX_ASM
 	call CeladonGameCornerScript_48f1e
 	ld hl, CeladonGameCornerText_48d22
@@ -192,39 +192,39 @@
 	call PrintText
 	jp TextScriptEnd
 
-CeladonGameCornerText_48d22: ; 48d22 (12:4d22)
+CeladonGameCornerText_48d22:
 	TX_FAR _CeladonGameCornerText_48d22
 	db "@"
 
-CeladonGameCornerText_48d27: ; 48d27 (12:4d27)
+CeladonGameCornerText_48d27:
 	TX_FAR _CeladonGameCornerText_48d27
 	db "@"
 
-CeladonGameCornerText_48d2c: ; 48d2c (12:4d2c)
+CeladonGameCornerText_48d2c:
 	TX_FAR _CeladonGameCornerText_48d2c
 	db "@"
 
-CeladonGameCornerText_48d31: ; 48d31 (12:4d31)
+CeladonGameCornerText_48d31:
 	TX_FAR _CeladonGameCornerText_48d31
 	db "@"
 
-CeladonGameCornerText_48d36: ; 48d36 (12:4d36)
+CeladonGameCornerText_48d36:
 	TX_FAR _CeladonGameCornerText_48d36
 	db "@"
 
-CeladonGameCornerText_48d3b: ; 48d3b (12:4d3b)
+CeladonGameCornerText_48d3b:
 	TX_FAR _CeladonGameCornerText_48d3b
 	db "@"
 
-CeladonGameCornerText3: ; 48d40 (12:4d40)
+CeladonGameCornerText3:
 	TX_FAR _CeladonGameCornerText3
 	db "@"
 
-CeladonGameCornerText4: ; 48d45 (12:4d45)
+CeladonGameCornerText4:
 	TX_FAR _CeladonGameCornerText4
 	db "@"
 
-CeladonGameCornerText5: ; 48d4a (12:4d4a)
+CeladonGameCornerText5:
 	TX_ASM
 	CheckEvent EVENT_GOT_10_COINS
 	jr nz, .asm_48d89
@@ -261,28 +261,28 @@
 	call PrintText
 	jp TextScriptEnd
 
-CeladonGameCornerText_48d9c: ; 48d9c (12:4d9c)
+CeladonGameCornerText_48d9c:
 	TX_FAR _CeladonGameCornerText_48d9c
 	db "@"
 
-Received10CoinsText: ; 48da1 (12:4da1)
+Received10CoinsText:
 	TX_FAR _Received10CoinsText
 	TX_SFX_ITEM
 	db "@"
 
-CeladonGameCornerText_48da7: ; 48da7 (12:4da7)
+CeladonGameCornerText_48da7:
 	TX_FAR _CeladonGameCornerText_48da7
 	db "@"
 
-CeladonGameCornerText_48dac: ; 48dac (12:4dac)
+CeladonGameCornerText_48dac:
 	TX_FAR _CeladonGameCornerText_48dac
 	db "@"
 
-CeladonGameCornerText6: ; 48db1 (12:4db1)
+CeladonGameCornerText6:
 	TX_FAR _CeladonGameCornerText6
 	db "@"
 
-CeladonGameCornerText7: ; 48db6 (12:4db6)
+CeladonGameCornerText7:
 	TX_ASM
 	CheckEvent EVENT_BEAT_ERIKA
 	ld hl, CeladonGameCornerText_48dca
@@ -292,19 +292,19 @@
 	call PrintText
 	jp TextScriptEnd
 
-CeladonGameCornerText_48dca: ; 48dca (12:4dca)
+CeladonGameCornerText_48dca:
 	TX_FAR _CeladonGameCornerText_48dca
 	db "@"
 
-CeladonGameCornerText_48dcf: ; 48dcf (12:4dcf)
+CeladonGameCornerText_48dcf:
 	TX_FAR _CeladonGameCornerText_48dcf
 	db "@"
 
-CeladonGameCornerText8: ; 48dd4 (12:4dd4)
+CeladonGameCornerText8:
 	TX_FAR _CeladonGameCornerText8
 	db "@"
 
-CeladonGameCornerText9: ; 48dd9 (12:4dd9)
+CeladonGameCornerText9:
 	TX_ASM
 	CheckEvent EVENT_GOT_20_COINS_2
 	jr nz, .asm_48e13
@@ -339,24 +339,24 @@
 	call PrintText
 	jp TextScriptEnd
 
-CeladonGameCornerText_48e26: ; 48e26 (12:4e26)
+CeladonGameCornerText_48e26:
 	TX_FAR _CeladonGameCornerText_48e26
 	db "@"
 
-Received20CoinsText: ; 48e2b (12:4e2b)
+Received20CoinsText:
 	TX_FAR _Received20CoinsText
 	TX_SFX_ITEM
 	db "@"
 
-CeladonGameCornerText_48e31: ; 48e31 (12:4e31)
+CeladonGameCornerText_48e31:
 	TX_FAR _CeladonGameCornerText_48e31
 	db "@"
 
-CeladonGameCornerText_48e36: ; 48e36 (12:4e36)
+CeladonGameCornerText_48e36:
 	TX_FAR _CeladonGameCornerText_48e36
 	db "@"
 
-CeladonGameCornerText10: ; 48e3b (12:4e3b)
+CeladonGameCornerText10:
 	TX_ASM
 	CheckEvent EVENT_GOT_20_COINS
 	jr nz, .asm_48e75
@@ -391,24 +391,24 @@
 	call PrintText
 	jp TextScriptEnd
 
-CeladonGameCornerText_48e88: ; 48e88 (12:4e88)
+CeladonGameCornerText_48e88:
 	TX_FAR _CeladonGameCornerText_48e88
 	db "@"
 
-CeladonGameCornerText_48e8d: ; 48e8d (12:4e8d)
+CeladonGameCornerText_48e8d:
 	TX_FAR _CeladonGameCornerText_48e8d
 	TX_SFX_ITEM
 	db "@"
 
-CeladonGameCornerText_48e93: ; 48e93 (12:4e93)
+CeladonGameCornerText_48e93:
 	TX_FAR _CeladonGameCornerText_48e93
 	db "@"
 
-CeladonGameCornerText_48e98: ; 48e98 (12:4e98)
+CeladonGameCornerText_48e98:
 	TX_FAR _CeladonGameCornerText_48e98
 	db "@"
 
-CeladonGameCornerText11: ; 48e9d (12:4e9d)
+CeladonGameCornerText11:
 	TX_ASM
 	ld hl, CeladonGameCornerText_48ece
 	call PrintText
@@ -430,19 +430,19 @@
 	ld [wCeladonGameCornerCurScript], a
 	jp TextScriptEnd
 
-CeladonGameCornerText_48ece: ; 48ece (12:4ece)
+CeladonGameCornerText_48ece:
 	TX_FAR _CeladonGameCornerText_48ece
 	db "@"
 
-CeladonGameCornerText_48ed3: ; 48ed3 (12:4ed3)
+CeladonGameCornerText_48ed3:
 	TX_FAR _CeladonGameCornerText_48ed3
 	db "@"
 
-CeladonGameCornerText13: ; 48ed8 (12:4ed8)
+CeladonGameCornerText13:
 	TX_FAR _CeladonGameCornerText_48ed8
 	db "@"
 
-CeladonGameCornerText12: ; 48edd (12:4edd)
+CeladonGameCornerText12:
 	TX_ASM
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -459,7 +459,7 @@
 	predef ReplaceTileBlock
 	jp TextScriptEnd
 
-CeladonGameCornerText_48f09: ; 48f09 (12:4f09)
+CeladonGameCornerText_48f09:
 	TX_FAR _CeladonGameCornerText_48f09
 	TX_ASM
 	ld a, SFX_SWITCH
@@ -467,11 +467,11 @@
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
-CeladonGameCornerText_48f19: ; 48f19 (12:4f19)
+CeladonGameCornerText_48f19:
 	TX_FAR _CeladonGameCornerText_48f19
 	db "@"
 
-CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e)
+CeladonGameCornerScript_48f1e:
 	ld hl, wd730
 	set 6, [hl]
 	coord hl, 11, 0
@@ -507,19 +507,19 @@
 	res 6, [hl]
 	ret
 
-GameCornerMoneyText: ; 48f7a (12:4f7a)
+GameCornerMoneyText:
 	db "MONEY@"
 
-GameCornerCoinText: ; 48f80 (12:4f80)
+GameCornerCoinText:
 	db "COIN@"
 
-GameCornerBlankText1: ; 48f85 (12:4f85)
+GameCornerBlankText1:
 	db "       @"
 
-GameCornerBlankText2: ; 48f8d (12:4f8d)
+GameCornerBlankText2:
 	db "       @"
 
-Has9990Coins: ; 48f95 (12:4f95)
+Has9990Coins:
 	ld a, $99
 	ld [hCoins], a
 	ld a, $90
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@@ -1,4 +1,4 @@
-CeladonGymScript: ; 4890a (12:490a)
+CeladonGymScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -11,18 +11,18 @@
 	ld [wCeladonGymCurScript], a
 	ret
 
-CeladonGymScript_48927: ; 48927 (12:4927)
+CeladonGymScript_48927:
 	ld hl, Gym4CityName
 	ld de, Gym4LeaderName
 	jp LoadGymLeaderAndCityName
 
-Gym4CityName: ; 48930 (12:4930)
+Gym4CityName:
 	db "CELADON CITY@"
 
-Gym4LeaderName: ; 4893d (12:493d)
+Gym4LeaderName:
 	db "ERIKA@"
 
-CeladonGymText_48943: ; 48943 (12:4943)
+CeladonGymText_48943:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wCeladonGymCurScript], a
@@ -29,13 +29,13 @@
 	ld [wCurMapScript], a
 	ret
 
-CeladonGymScriptPointers: ; 4894e (12:494e)
+CeladonGymScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw CeladonGymScript3
 
-CeladonGymScript3: ; 48956 (12:4956)
+CeladonGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeladonGymText_48943
@@ -42,7 +42,7 @@
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-CeladonGymText_48963: ; 48963 (12:4963)
+CeladonGymText_48963:
 	ld a, $9
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -70,7 +70,7 @@
 
 	jp CeladonGymText_48943
 
-CeladonGymTextPointers: ; 489a6 (12:49a6)
+CeladonGymTextPointers:
 	dw CeladonGymText1
 	dw CeladonGymText2
 	dw CeladonGymText3
@@ -83,8 +83,8 @@
 	dw TM21Text
 	dw TM21NoRoomText
 
-CeladonGymTrainerHeaders: ; 489bc (12:49bc)
-CeladonGymTrainerHeader0: ; 489bc (12:49bc)
+CeladonGymTrainerHeaders:
+CeladonGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_0
@@ -93,7 +93,7 @@
 	dw CeladonGymEndBattleText2 ; TextEndBattle
 	dw CeladonGymEndBattleText2 ; TextEndBattle
 
-CeladonGymTrainerHeader2: ; 489c8 (12:49c8)
+CeladonGymTrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2
@@ -102,7 +102,7 @@
 	dw CeladonGymEndBattleText3 ; TextEndBattle
 	dw CeladonGymEndBattleText3 ; TextEndBattle
 
-CeladonGymTrainerHeader3: ; 489d4 (12:49d4)
+CeladonGymTrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3
@@ -111,7 +111,7 @@
 	dw CeladonGymEndBattleText4 ; TextEndBattle
 	dw CeladonGymEndBattleText4 ; TextEndBattle
 
-CeladonGymTrainerHeader4: ; 489e0 (12:49e0)
+CeladonGymTrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4
@@ -120,7 +120,7 @@
 	dw CeladonGymEndBattleText5 ; TextEndBattle
 	dw CeladonGymEndBattleText5 ; TextEndBattle
 
-CeladonGymTrainerHeader5: ; 489ec (12:49ec)
+CeladonGymTrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5
@@ -129,7 +129,7 @@
 	dw CeladonGymEndBattleText6 ; TextEndBattle
 	dw CeladonGymEndBattleText6 ; TextEndBattle
 
-CeladonGymTrainerHeader6: ; 489f8 (12:49f8)
+CeladonGymTrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6
@@ -138,7 +138,7 @@
 	dw CeladonGymEndBattleText7 ; TextEndBattle
 	dw CeladonGymEndBattleText7 ; TextEndBattle
 
-CeladonGymTrainerHeader7: ; 48a04 (12:4a04)
+CeladonGymTrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_7, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_7, 1
@@ -149,7 +149,7 @@
 
 	db $ff
 
-CeladonGymText1: ; 48a11 (12:4a11)
+CeladonGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_ERIKA
 	jr z, .asm_48a2d
@@ -183,154 +183,154 @@
 .asm_48a5b
 	jp TextScriptEnd
 
-CeladonGymText_48a5e: ; 48a5e (12:4a5e)
+CeladonGymText_48a5e:
 	TX_FAR _CeladonGymText_48a5e
 	db "@"
 
-CeladonGymText_48a63: ; 48a63 (12:4a63)
+CeladonGymText_48a63:
 	TX_FAR _CeladonGymText_48a63
 	db "@"
 
-CeladonGymText_48a68: ; 48a68 (12:4a68)
+CeladonGymText_48a68:
 	TX_FAR _CeladonGymText_48a68
 	db "@"
 
-CeladonGymText9: ; 48a6d (12:4a6d)
+CeladonGymText9:
 	TX_FAR _CeladonGymText9
 	db "@"
 
-TM21Text: ; 48a72 (12:4a72)
+TM21Text:
 	TX_FAR _ReceivedTM21Text
 	db $0B
 	TX_FAR _TM21ExplanationText
 	db "@"
 
-TM21NoRoomText: ; 48a7c (12:4a7c)
+TM21NoRoomText:
 	TX_FAR _TM21NoRoomText
 	db "@"
 
-CeladonGymText2: ; 48a81 (12:4a81)
+CeladonGymText2:
 	TX_ASM
 	ld hl, CeladonGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-CeladonGymBattleText2: ; 48a8b (12:4a8b)
+CeladonGymBattleText2:
 	TX_FAR _CeladonGymBattleText2
 	db "@"
 
-CeladonGymEndBattleText2: ; 48a90 (12:4a90)
+CeladonGymEndBattleText2:
 	TX_FAR _CeladonGymEndBattleText2
 	db "@"
 
-CeladonGymAfterBattleText2: ; 48a95 (12:4a95)
+CeladonGymAfterBattleText2:
 	TX_FAR _CeladonGymAfterBattleText2
 	db "@"
 
-CeladonGymText3: ; 48a9a (12:4a9a)
+CeladonGymText3:
 	TX_ASM
 	ld hl, CeladonGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-CeladonGymBattleText3: ; 48aa4 (12:4aa4)
+CeladonGymBattleText3:
 	TX_FAR _CeladonGymBattleText3
 	db "@"
 
-CeladonGymEndBattleText3: ; 48aa9 (12:4aa9)
+CeladonGymEndBattleText3:
 	TX_FAR _CeladonGymEndBattleText3
 	db "@"
 
-CeladonGymAfterBattleText3: ; 48aae (12:4aae)
+CeladonGymAfterBattleText3:
 	TX_FAR _CeladonGymAfterBattleText3
 	db "@"
 
-CeladonGymText4: ; 48ab3 (12:4ab3)
+CeladonGymText4:
 	TX_ASM
 	ld hl, CeladonGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-CeladonGymBattleText4: ; 48abd (12:4abd)
+CeladonGymBattleText4:
 	TX_FAR _CeladonGymBattleText4
 	db "@"
 
-CeladonGymEndBattleText4: ; 48ac2 (12:4ac2)
+CeladonGymEndBattleText4:
 	TX_FAR _CeladonGymEndBattleText4
 	db "@"
 
-CeladonGymAfterBattleText4: ; 48ac7 (12:4ac7)
+CeladonGymAfterBattleText4:
 	TX_FAR _CeladonGymAfterBattleText4
 	db "@"
 
-CeladonGymText5: ; 48acc (12:4acc)
+CeladonGymText5:
 	TX_ASM
 	ld hl, CeladonGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-CeladonGymBattleText5: ; 48ad6 (12:4ad6)
+CeladonGymBattleText5:
 	TX_FAR _CeladonGymBattleText5
 	db "@"
 
-CeladonGymEndBattleText5: ; 48adb (12:4adb)
+CeladonGymEndBattleText5:
 	TX_FAR _CeladonGymEndBattleText5
 	db "@"
 
-CeladonGymAfterBattleText5: ; 48ae0 (12:4ae0)
+CeladonGymAfterBattleText5:
 	TX_FAR _CeladonGymAfterBattleText5
 	db "@"
 
-CeladonGymText6: ; 48ae5 (12:4ae5)
+CeladonGymText6:
 	TX_ASM
 	ld hl, CeladonGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-CeladonGymBattleText6: ; 48aef (12:4aef)
+CeladonGymBattleText6:
 	TX_FAR _CeladonGymBattleText6
 	db "@"
 
-CeladonGymEndBattleText6: ; 48af4 (12:4af4)
+CeladonGymEndBattleText6:
 	TX_FAR _CeladonGymEndBattleText6
 	db "@"
 
-CeladonGymAfterBattleText6: ; 48af9 (12:4af9)
+CeladonGymAfterBattleText6:
 	TX_FAR _CeladonGymAfterBattleText6
 	db "@"
 
-CeladonGymText7: ; 48afe (12:4afe)
+CeladonGymText7:
 	TX_ASM
 	ld hl, CeladonGymTrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-CeladonGymBattleText7: ; 48b08 (12:4b08)
+CeladonGymBattleText7:
 	TX_FAR _CeladonGymBattleText7
 	db "@"
 
-CeladonGymEndBattleText7: ; 48b0d (12:4b0d)
+CeladonGymEndBattleText7:
 	TX_FAR _CeladonGymEndBattleText7
 	db "@"
 
-CeladonGymAfterBattleText7: ; 48b12 (12:4b12)
+CeladonGymAfterBattleText7:
 	TX_FAR _CeladonGymAfterBattleText7
 	db "@"
 
-CeladonGymText8: ; 48b17 (12:4b17)
+CeladonGymText8:
 	TX_ASM
 	ld hl, CeladonGymTrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-CeladonGymBattleText8: ; 48b21 (12:4b21)
+CeladonGymBattleText8:
 	TX_FAR _CeladonGymBattleText8
 	db "@"
 
-CeladonGymEndBattleText8: ; 48b26 (12:4b26)
+CeladonGymEndBattleText8:
 	TX_FAR _CeladonGymEndBattleText8
 	db "@"
 
-CeladonGymAfterBattleText8: ; 48b2b (12:4b2b)
+CeladonGymAfterBattleText8:
 	TX_FAR _CeladonGymAfterBattleText8
 	db "@"
--- a/scripts/celadonhotel.asm
+++ b/scripts/celadonhotel.asm
@@ -1,19 +1,19 @@
-CeladonHotelScript: ; 49269 (12:5269)
+CeladonHotelScript:
 	jp EnableAutoTextBoxDrawing
 
-CeladonHotelTextPointers: ; 4926c (12:526c)
+CeladonHotelTextPointers:
 	dw CeladonHotelText1
 	dw CeladonHotelText2
 	dw CeladonHotelText3
 
-CeladonHotelText1: ; 49272 (12:5272)
+CeladonHotelText1:
 	TX_FAR _CeladonHotelText1
 	db "@"
 
-CeladonHotelText2: ; 49277 (12:5277)
+CeladonHotelText2:
 	TX_FAR _CeladonHotelText2
 	db "@"
 
-CeladonHotelText3: ; 4927c (12:527c)
+CeladonHotelText3:
 	TX_FAR _CeladonHotelText3
 	db "@"
--- a/scripts/celadonhouse.asm
+++ b/scripts/celadonhouse.asm
@@ -1,20 +1,20 @@
-CeladonHouseScript: ; 4920e (12:520e)
+CeladonHouseScript:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonHouseTextPointers: ; 49212 (12:5212)
+CeladonHouseTextPointers:
 	dw CeladonHouseText1
 	dw CeladonHouseText2
 	dw CeladonHouseText3
 
-CeladonHouseText1: ; 49218 (12:5218)
+CeladonHouseText1:
 	TX_FAR _CeladonHouseText1
 	db "@"
 
-CeladonHouseText2: ; 4921d (12:521d)
+CeladonHouseText2:
 	TX_FAR _CeladonHouseText2
 	db "@"
 
-CeladonHouseText3: ; 49222 (12:5222)
+CeladonHouseText3:
 	TX_FAR _CeladonHouseText3
 	db "@"
--- a/scripts/celadonmansion1.asm
+++ b/scripts/celadonmansion1.asm
@@ -1,7 +1,7 @@
-CeladonMansion1Script: ; 48694 (12:4694)
+CeladonMansion1Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMansion1TextPointers: ; 48697 (12:4697)
+CeladonMansion1TextPointers:
 	dw CeladonMansion1Text1
 	dw CeladonMansion1Text2
 	dw CeladonMansion1Text3
@@ -8,32 +8,32 @@
 	dw CeladonMansion1Text4
 	dw CeladonMansion1Text5
 
-CeladonMansion1_486a1: ; 486a1 (12:46a1)
+CeladonMansion1_486a1:
 	call PlayCry
 	jp TextScriptEnd
 
-CeladonMansion1Text1: ; 486a7 (12:46a7)
+CeladonMansion1Text1:
 	TX_FAR _CeladonMansion1Text1
 	TX_ASM
 	ld a, MEOWTH
 	jp CeladonMansion1_486a1
 
-CeladonMansion1Text2: ; 486b1 (12:46b1)
+CeladonMansion1Text2:
 	TX_FAR _CeladonMansion1Text2
 	db "@"
 
-CeladonMansion1Text3: ; 486b6 (12:46b6)
+CeladonMansion1Text3:
 	TX_FAR _CeladonMansion1Text3
 	TX_ASM
 	ld a, CLEFAIRY
 	jp CeladonMansion1_486a1
 
-CeladonMansion1Text4: ; 486c0 (12:46c0)
+CeladonMansion1Text4:
 	TX_FAR _CeladonMansion1Text4
 	TX_ASM
 	ld a, NIDORAN_F
 	jp CeladonMansion1_486a1
 
-CeladonMansion1Text5: ; 486ca (12:46ca)
+CeladonMansion1Text5:
 	TX_FAR _CeladonMansion1Text5
 	db "@"
--- a/scripts/celadonmansion2.asm
+++ b/scripts/celadonmansion2.asm
@@ -1,10 +1,10 @@
-CeladonMansion2Script: ; 4873a (12:473a)
+CeladonMansion2Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonMansion2TextPointers: ; 4873e (12:473e)
+CeladonMansion2TextPointers:
 	dw CeladonMansion2Text1
 
-CeladonMansion2Text1: ; 48740 (12:4740)
+CeladonMansion2Text1:
 	TX_FAR _CeladonMansion2Text1
 	db "@"
--- a/scripts/celadonmansion3.asm
+++ b/scripts/celadonmansion3.asm
@@ -1,7 +1,7 @@
-CeladonMansion3Script: ; 48790 (12:4790)
+CeladonMansion3Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMansion3TextPointers: ; 48793 (12:4793)
+CeladonMansion3TextPointers:
 	dw ProgrammerText
 	dw GraphicArtistText
 	dw WriterText
@@ -11,19 +11,19 @@
 	dw GameFreakPCText3
 	dw GameFreakSignText
 
-ProgrammerText: ; 487a3 (12:47a3)
+ProgrammerText:
 	TX_FAR _ProgrammerText
 	db "@"
 
-GraphicArtistText: ; 487a8 (12:47a8)
+GraphicArtistText:
 	TX_FAR _GraphicArtistText
 	db "@"
 
-WriterText: ; 487ad (12:47ad)
+WriterText:
 	TX_FAR _WriterText
 	db "@"
 
-DirectorText: ; 487b2 (12:47b2)
+DirectorText:
 	TX_ASM
 
 	; check pokédex
@@ -54,18 +54,18 @@
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	jp TextScriptEnd
 
-GameFreakPCText1: ; 487eb (12:47eb)
+GameFreakPCText1:
 	TX_FAR _CeladonMansion3Text5
 	db "@"
 
-GameFreakPCText2: ; 487f0 (12:47f0)
+GameFreakPCText2:
 	TX_FAR _CeladonMansion3Text6
 	db "@"
 
-GameFreakPCText3: ; 487f5 (12:47f5)
+GameFreakPCText3:
 	TX_FAR _CeladonMansion3Text7
 	db "@"
 
-GameFreakSignText: ; 487fa (12:47fa)
+GameFreakSignText:
 	TX_FAR _CeladonMansion3Text8
 	db "@"
--- a/scripts/celadonmansion4.asm
+++ b/scripts/celadonmansion4.asm
@@ -1,9 +1,9 @@
-CeladonMansion4Script: ; 4886b (12:486b)
+CeladonMansion4Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMansion4TextPointers: ; 4886e (12:486e)
+CeladonMansion4TextPointers:
 	dw CeladonMansion4Text1
 
-CeladonMansion4Text1: ; 48870 (12:4870)
+CeladonMansion4Text1:
 	TX_FAR _CeladonMansion4Text1
 	db "@"
--- a/scripts/celadonmansion5.asm
+++ b/scripts/celadonmansion5.asm
@@ -1,15 +1,15 @@
-CeladonMansion5Script: ; 1dd3a (7:5d3a)
+CeladonMansion5Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMansion5TextPointers: ; 1dd3d (7:5d3d)
+CeladonMansion5TextPointers:
 	dw CeladonMansion5Text1
 	dw CeladonMansion5Text2
 
-CeladonMansion5Text1: ; 1dd41 (7:5d41)
+CeladonMansion5Text1:
 	TX_FAR _CeladonMansion5Text1
 	db "@"
 
-CeladonMansion5Text2: ; 1dd46 (7:5d46)
+CeladonMansion5Text2:
 	TX_ASM
 	lb bc, EEVEE, 25
 	call GivePokemon
--- a/scripts/celadonprizeroom.asm
+++ b/scripts/celadonprizeroom.asm
@@ -1,7 +1,7 @@
-CeladonPrizeRoomScript: ; 490f0 (12:50f0)
+CeladonPrizeRoomScript:
 	jp EnableAutoTextBoxDrawing
 
-CeladonPrizeRoomTextPointers: ; 490f3 (12:50f3)
+CeladonPrizeRoomTextPointers:
 	dw CeladonPrizeRoomText1
 	dw CeladonPrizeRoomText2
 	dw CeladonPrizeRoomText3
@@ -8,13 +8,13 @@
 	dw CeladonPrizeRoomText3
 	dw CeladonPrizeRoomText3
 
-CeladonPrizeRoomText1: ; 490fd (12:50fd)
+CeladonPrizeRoomText1:
 	TX_FAR _CeladonPrizeRoomText1
 	db "@"
 
-CeladonPrizeRoomText2: ; 49102 (12:5102)
+CeladonPrizeRoomText2:
 	TX_FAR _CeladonPrizeRoomText2
 	db "@"
 
-CeladonPrizeRoomText3: ; 49107 (12:5107)
+CeladonPrizeRoomText3:
 	TX_PRIZE_VENDOR
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@@ -1,10 +1,10 @@
-CeruleanCityScript: ; 19480 (6:5480)
+CeruleanCityScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, CeruleanCityScriptPointers
 	ld a, [wCeruleanCityCurScript]
 	jp CallFunctionInTable
 
-CeruleanCityScript_1948c: ; 1948c (6:548c)
+CeruleanCityScript_1948c:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wCeruleanCityCurScript], a
@@ -12,7 +12,7 @@
 	ld [wMissableObjectIndex], a
 	predef_jump HideObject
 
-CeruleanCityScriptPointers: ; 1949d (6:549d)
+CeruleanCityScriptPointers:
 	dw CeruleanCityScript0
 	dw CeruleanCityScript1
 	dw CeruleanCityScript2
@@ -19,7 +19,7 @@
 	dw CeruleanCityScript3
 	dw CeruleanCityScript4
 
-CeruleanCityScript4: ; 194a7 (6:54a7)
+CeruleanCityScript4:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeruleanCityScript_1948c
@@ -34,7 +34,7 @@
 	ld [wCeruleanCityCurScript], a
 	ret
 
-CeruleanCityScript0: ; 194c8 (6:54c8)
+CeruleanCityScript0:
 	CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
 	jr nz, .asm_194f7
 	ld hl, CeruleanCityCoords1
@@ -96,23 +96,23 @@
 	ld [wCeruleanCityCurScript], a
 	ret
 
-CeruleanCityCoords1: ; 1954f (6:554f)
+CeruleanCityCoords1:
 	db $07,$1e
 	db $09,$1e
 	db $ff
 
-CeruleanCityCoords2: ; 19554 (6:5554)
+CeruleanCityCoords2:
 	db $06,$14
 	db $06,$15
 	db $ff
 
-CeruleanCityMovement1: ; 19559 (6:5559)
+CeruleanCityMovement1:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-CeruleanCityScript_1955d: ; 1955d (6:555d)
+CeruleanCityScript_1955d:
 	ld a,1
 	ld [H_SPRITEINDEX],a
 	xor a ; SPRITE_FACING_DOWN
@@ -119,7 +119,7 @@
 	ld [hSpriteFacingDirection],a
 	jp SetSpriteFacingDirectionAndDelay ; face object
 
-CeruleanCityScript1: ; 19567 (6:5567)
+CeruleanCityScript1:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -160,7 +160,7 @@
 	ld [wCeruleanCityCurScript], a
 	ret
 
-CeruleanCityScript2: ; 195b1 (6:55b1)
+CeruleanCityScript2:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeruleanCityScript_1948c
@@ -193,7 +193,7 @@
 	ld [wCeruleanCityCurScript], a
 	ret
 
-CeruleanCityMovement3: ; 19600 (6:5600)
+CeruleanCityMovement3:
 	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -203,7 +203,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-CeruleanCityMovement4: ; 19608 (6:5608)
+CeruleanCityMovement4:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -213,7 +213,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-CeruleanCityScript3: ; 19610 (6:5610)
+CeruleanCityScript3:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -227,7 +227,7 @@
 	ld [wCeruleanCityCurScript], a
 	ret
 
-CeruleanCityTextPointers: ; 1962d (6:562d)
+CeruleanCityTextPointers:
 	dw CeruleanCityText1
 	dw CeruleanCityText2
 	dw CeruleanCityText3
@@ -246,7 +246,7 @@
 	dw CeruleanCityText16
 	dw CeruleanCityText17
 
-CeruleanCityText1: ; 1964f (6:564f)
+CeruleanCityText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_CERULEAN_RIVAL
 	; do pre-battle text
@@ -261,23 +261,23 @@
 .end
 	jp TextScriptEnd
 
-CeruleanCityText_19668: ; 19668 (6:5668)
+CeruleanCityText_19668:
 	TX_FAR _CeruleanCityText_19668
 	db "@"
 
-CeruleanCityText_1966d: ; 1966d (6:566d)
+CeruleanCityText_1966d:
 	TX_FAR _CeruleanCityText_1966d
 	db "@"
 
-CeruleanCityText_19672: ; 19672 (6:5672)
+CeruleanCityText_19672:
 	TX_FAR _CeruleanCityText_19672
 	db "@"
 
-CeruleanCityText_19677: ; 19677 (6:5677)
+CeruleanCityText_19677:
 	TX_FAR _CeruleanCityText_19677
 	db "@"
 
-CeruleanCityText2: ; 1967c (6:567c)
+CeruleanCityText2:
 	TX_ASM
 	CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
 	jr nz, .asm_4ca20
@@ -314,46 +314,46 @@
 .Done
 	jp TextScriptEnd
 
-CeruleanCityText_196d9: ; 196d9 (6:56d9)
+CeruleanCityText_196d9:
 	TX_FAR _CeruleanCityText_196d9
 	db "@"
 
-ReceivedTM28Text: ; 196de (6:56de)
+ReceivedTM28Text:
 	TX_FAR _ReceivedTM28Text
 	db $0B
 	TX_FAR _ReceivedTM28Text2
 	db $0D, "@"
 
-TM28NoRoomText: ; 196e9 (6:56e9)
+TM28NoRoomText:
 	TX_FAR _TM28NoRoomText
 	db "@"
 
-CeruleanCityText_196ee: ; 196ee (6:56ee)
+CeruleanCityText_196ee:
 	TX_FAR _CeruleanCityText_196ee
 	db "@"
 
-CeruleanCityText_196f3: ; 196f3 (6:56f3)
+CeruleanCityText_196f3:
 	TX_FAR _CeruleanCityText_196f3
 	db "@"
 
-CeruleanCityText3: ; 196f8 (6:56f8)
+CeruleanCityText3:
 	TX_FAR _CeruleanCityText3
 	db "@"
 
-CeruleanCityText4: ; 196fd (6:56fd)
+CeruleanCityText4:
 	TX_FAR _CeruleanCityText4
 	db "@"
 
-CeruleanCityText5: ; 19702 (6:5702)
+CeruleanCityText5:
 	TX_FAR _CeruleanCityText5
 	db "@"
 
-CeruleanCityText11: ; 19707 (6:5707)
-CeruleanCityText6: ; 19707 (6:5707)
+CeruleanCityText11:
+CeruleanCityText6:
 	TX_FAR _CeruleanCityText6
 	db "@"
 
-CeruleanCityText7: ; 1970c (6:570c)
+CeruleanCityText7:
 	TX_ASM
 	ld a, [hRandomAdd]
 	cp $b4
@@ -373,19 +373,19 @@
 .asm_d486e
 	jp TextScriptEnd
 
-CeruleanCityText_19730: ; 19730 (6:5730)
+CeruleanCityText_19730:
 	TX_FAR _CeruleanCityText_19730
 	db "@"
 
-CeruleanCityText_19735: ; 19735 (6:5735)
+CeruleanCityText_19735:
 	TX_FAR _CeruleanCityText_19735
 	db "@"
 
-CeruleanCityText_1973a: ; 1973a (6:573a)
+CeruleanCityText_1973a:
 	TX_FAR _CeruleanCityText_1973a
 	db "@"
 
-CeruleanCityText8: ; 1973f (6:573f)
+CeruleanCityText8:
 	TX_ASM
 	ld a, [hRandomAdd]
 	cp $b4
@@ -411,42 +411,42 @@
 .asm_f2f38
 	jp TextScriptEnd
 
-CeruleanCityText_1976f: ; 1976f (6:576f)
+CeruleanCityText_1976f:
 	TX_FAR _CeruleanCityText_1976f
 	db "@"
 
-CeruleanCityText_19774: ; 19774 (6:5774)
+CeruleanCityText_19774:
 	TX_FAR _CeruleanCityText_19774
 	db "@"
 
-CeruleanCityText_19779: ; 19779 (6:5779)
+CeruleanCityText_19779:
 	TX_FAR _CeruleanCityText_19779
 	db "@"
 
-CeruleanCityText_1977e: ; 1977e (6:577e)
+CeruleanCityText_1977e:
 	TX_FAR _CeruleanCityText_1977e
 	db "@"
 
-CeruleanCityText9: ; 19783 (6:5783)
+CeruleanCityText9:
 	TX_FAR _CeruleanCityText9
 	db "@"
 
-CeruleanCityText10: ; 19788 (6:5788)
+CeruleanCityText10:
 	TX_FAR _CeruleanCityText10
 	db "@"
 
-CeruleanCityText12: ; 1978d (6:578d)
+CeruleanCityText12:
 	TX_FAR _CeruleanCityText12
 	db "@"
 
-CeruleanCityText13: ; 19792 (6:5792)
+CeruleanCityText13:
 	TX_FAR _CeruleanCityText13
 	db "@"
 
-CeruleanCityText16: ; 19797 (6:5797)
+CeruleanCityText16:
 	TX_FAR _CeruleanCityText16
 	db "@"
 
-CeruleanCityText17: ; 1979c (6:579c)
+CeruleanCityText17:
 	TX_FAR _CeruleanCityText17
 	db "@"
--- a/scripts/ceruleancity2.asm
+++ b/scripts/ceruleancity2.asm
@@ -1,4 +1,4 @@
-CeruleanHideRocket: ; 74872 (1d:4872)
+CeruleanHideRocket:
 ; code similar to this appears in a lot of banks; this particular
 ; one is called after you beat the Rocket that gives you TM28 DIG.
 ; the screen then fades out, he disappears, and fades back in
--- a/scripts/ceruleangym.asm
+++ b/scripts/ceruleangym.asm
@@ -1,4 +1,4 @@
-CeruleanGymScript: ; 5c6b3 (17:46b3)
+CeruleanGymScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -11,18 +11,18 @@
 	ld [wCeruleanGymCurScript], a
 	ret
 
-CeruleanGymScript_5c6d0: ; 5c6d0 (17:46d0)
+CeruleanGymScript_5c6d0:
 	ld hl, Gym2CityName
 	ld de, Gym2LeaderName
 	jp LoadGymLeaderAndCityName
 
-Gym2CityName: ; 5c6d9 (17:46d9)
+Gym2CityName:
 	db "CERULEAN CITY@"
 
-Gym2LeaderName: ; 5c6e7 (17:46e7)
+Gym2LeaderName:
 	db "MISTY@"
 
-CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed)
+CeruleanGymScript_5c6ed:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wCeruleanGymCurScript], a
@@ -29,13 +29,13 @@
 	ld [wCurMapScript], a
 	ret
 
-CeruleanGymScriptPointers: ; 5c6f8 (17:46f8)
+CeruleanGymScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw CeruleanGymScript3
 
-CeruleanGymScript3: ; 5c700 (17:4700)
+CeruleanGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeruleanGymScript_5c6ed
@@ -42,7 +42,7 @@
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-CeruleanGymScript_5c70d: ; 5c70d (17:470d)
+CeruleanGymScript_5c70d:
 	ld a, $5
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -70,7 +70,7 @@
 
 	jp CeruleanGymScript_5c6ed
 
-CeruleanGymTextPointers: ; 5c74a (17:474a)
+CeruleanGymTextPointers:
 	dw CeruleanGymText1
 	dw CeruleanGymText2
 	dw CeruleanGymText3
@@ -79,8 +79,8 @@
 	dw CeruleanGymText6
 	dw CeruleanGymText7
 
-CeruleanGymTrainerHeaders: ; 5c758 (17:4758)
-CeruleanGymTrainerHeader0: ; 5c758 (17:4758)
+CeruleanGymTrainerHeaders:
+CeruleanGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_0
@@ -89,7 +89,7 @@
 	dw CeruleanGymEndBattleText1 ; TextEndBattle
 	dw CeruleanGymEndBattleText1 ; TextEndBattle
 
-CeruleanGymTrainerHeader1: ; 5c764 (17:4764)
+CeruleanGymTrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_1
@@ -100,7 +100,7 @@
 
 	db $ff
 
-CeruleanGymText1: ; 5c771 (17:4771)
+CeruleanGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_MISTY
 	jr z, .asm_5c78d
@@ -135,68 +135,68 @@
 .asm_5c7bb
 	jp TextScriptEnd
 
-CeruleanGymText_5c7be: ; 5c7be (17:47be)
+CeruleanGymText_5c7be:
 	TX_FAR _CeruleanGymText_5c7be
 	db "@"
 
-CeruleanGymText_5c7c3: ; 5c7c3 (17:47c3)
+CeruleanGymText_5c7c3:
 	TX_FAR _CeruleanGymText_5c7c3
 	db "@"
 
-CeruleanGymText5: ; 5c7c8 (17:47c8)
+CeruleanGymText5:
 	TX_FAR _CeruleanGymText_5c7c8
 	db "@"
 
-CeruleanGymText6: ; 5c7cd (17:47cd)
-ReceivedTM11Text: ; 5c7cd (17:47cd)
+CeruleanGymText6:
+ReceivedTM11Text:
 	TX_FAR _ReceivedTM11Text
 	db $0B, "@"
 
-CeruleanGymText7: ; 5c7d3 (17:47d3)
+CeruleanGymText7:
 	TX_FAR _CeruleanGymText_5c7d3
 	db "@"
 
-CeruleanGymText_5c7d8: ; 5c7d8 (17:47d8)
+CeruleanGymText_5c7d8:
 	TX_FAR _CeruleanGymText_5c7d8
 	db $11, $6, "@"
 
-CeruleanGymText2: ; 5c7df (17:47df)
+CeruleanGymText2:
 	TX_ASM
 	ld hl, CeruleanGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-CeruleanGymBattleText1: ; 5c7e9 (17:47e9)
+CeruleanGymBattleText1:
 	TX_FAR _CeruleanGymBattleText1
 	db "@"
 
-CeruleanGymEndBattleText1: ; 5c7ee (17:47ee)
+CeruleanGymEndBattleText1:
 	TX_FAR _CeruleanGymEndBattleText1
 	db "@"
 
-CeruleanGymAfterBattleText1: ; 5c7f3 (17:47f3)
+CeruleanGymAfterBattleText1:
 	TX_FAR _CeruleanGymAfterBattleText1
 	db "@"
 
-CeruleanGymText3: ; 5c7f8 (17:47f8)
+CeruleanGymText3:
 	TX_ASM
 	ld hl, CeruleanGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-CeruleanGymBattleText2: ; 5c802 (17:4802)
+CeruleanGymBattleText2:
 	TX_FAR _CeruleanGymBattleText2
 	db "@"
 
-CeruleanGymEndBattleText2: ; 5c807 (17:4807)
+CeruleanGymEndBattleText2:
 	TX_FAR _CeruleanGymEndBattleText2
 	db "@"
 
-CeruleanGymAfterBattleText2: ; 5c80c (17:480c)
+CeruleanGymAfterBattleText2:
 	TX_FAR _CeruleanGymAfterBattleText2
 	db "@"
 
-CeruleanGymText4: ; 5c811 (17:4811)
+CeruleanGymText4:
 	TX_ASM
 	CheckEvent EVENT_BEAT_MISTY
 	jr nz, .asm_5c821
@@ -209,10 +209,10 @@
 .asm_5c827
 	jp TextScriptEnd
 
-CeruleanGymText_5c82a: ; 5c82a (17:482a)
+CeruleanGymText_5c82a:
 	TX_FAR _CeruleanGymText_5c82a
 	db "@"
 
-CeruleanGymText_5c82f: ; 5c82f (17:482f)
+CeruleanGymText_5c82f:
 	TX_FAR _CeruleanGymText_5c82f
 	db "@"
--- a/scripts/ceruleanhouse1.asm
+++ b/scripts/ceruleanhouse1.asm
@@ -1,15 +1,15 @@
-CeruleanHouse1Script: ; 1d6f6 (7:56f6)
+CeruleanHouse1Script:
 	jp EnableAutoTextBoxDrawing
 
-CeruleanHouse1TextPointers: ; 1d6f9 (7:56f9)
+CeruleanHouse1TextPointers:
 	dw CeruleanHouse1Text1
 	dw CeruleanHouse1Text2
 
-CeruleanHouse1Text1: ; 1d6fd (7:56fd)
+CeruleanHouse1Text1:
 	TX_FAR _CeruleanHouse1Text1
 	db "@"
 
-CeruleanHouse1Text2: ; 1d702 (7:5702)
+CeruleanHouse1Text2:
 	TX_ASM
 	ld a, $6
 	ld [wWhichTrade], a
--- a/scripts/ceruleanhouse2.asm
+++ b/scripts/ceruleanhouse2.asm
@@ -1,4 +1,4 @@
-CeruleanHouse2Script: ; 74e09 (1d:4e09)
+CeruleanHouse2Script:
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	dec a
@@ -5,10 +5,10 @@
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-CeruleanHouse2TextPointers: ; 74e13 (1d:4e13)
+CeruleanHouse2TextPointers:
 	dw CeruleanHouse2Text1
 
-CeruleanHouse2Text1: ; 74e15 (1d:4e15)
+CeruleanHouse2Text1:
 	TX_ASM
 	ld hl, CeruleanHouse2Text_74e77
 	call PrintText
@@ -51,22 +51,22 @@
 	call PrintText
 	jp TextScriptEnd
 
-BadgeItemList: ; 74e6d (1d:4e6d)
+BadgeItemList:
 	db $8,BOULDERBADGE,CASCADEBADGE,THUNDERBADGE,RAINBOWBADGE,SOULBADGE,MARSHBADGE,VOLCANOBADGE,EARTHBADGE,$FF
 
-CeruleanHouse2Text_74e77: ; 74e77 (1d:4e77)
+CeruleanHouse2Text_74e77:
 	TX_FAR _CeruleanHouse2Text_74e77
 	db "@"
 
-CeruleanHouse2Text_74e7c: ; 74e7c (1d:4e7c)
+CeruleanHouse2Text_74e7c:
 	TX_FAR _CeruleanHouse2Text_74e7c
 	db "@"
 
-CeruleanHouse2Text_74e81: ; 74e81 (1d:4e81)
+CeruleanHouse2Text_74e81:
 	TX_FAR _CeruleanHouse2Text_74e81
 	db "@"
 
-TextPointers_74e86: ; 74e86 (1d:4e86)
+TextPointers_74e86:
 	dw CeruleanHouse2Text_74e96
 	dw CeruleanHouse2Text_74e9b
 	dw CeruleanHouse2Text_74ea0
@@ -76,34 +76,34 @@
 	dw CeruleanHouse2Text_74eb4
 	dw CeruleanHouse2Text_74eb9
 
-CeruleanHouse2Text_74e96: ; 74e96 (1d:4e96)
+CeruleanHouse2Text_74e96:
 	TX_FAR _CeruleanHouse2Text_74e96
 	db "@"
 
-CeruleanHouse2Text_74e9b: ; 74e9b (1d:4e9b)
+CeruleanHouse2Text_74e9b:
 	TX_FAR _CeruleanHouse2Text_74e9b
 	db "@"
 
-CeruleanHouse2Text_74ea0: ; 74ea0 (1d:4ea0)
+CeruleanHouse2Text_74ea0:
 	TX_FAR _CeruleanHouse2Text_74ea0
 	db "@"
 
-CeruleanHouse2Text_74ea5: ; 74ea5 (1d:4ea5)
+CeruleanHouse2Text_74ea5:
 	TX_FAR _CeruleanHouse2Text_74ea5
 	db "@"
 
-CeruleanHouse2Text_74eaa: ; 74eaa (1d:4eaa)
+CeruleanHouse2Text_74eaa:
 	TX_FAR _CeruleanHouse2Text_74eaa
 	db "@"
 
-CeruleanHouse2Text_74eaf: ; 74eaf (1d:4eaf)
+CeruleanHouse2Text_74eaf:
 	TX_FAR _CeruleanHouse2Text_74eaf
 	db "@"
 
-CeruleanHouse2Text_74eb4: ; 74eb4 (1d:4eb4)
+CeruleanHouse2Text_74eb4:
 	TX_FAR _CeruleanHouse2Text_74eb4
 	db "@"
 
-CeruleanHouse2Text_74eb9: ; 74eb9 (1d:4eb9)
+CeruleanHouse2Text_74eb9:
 	TX_FAR _CeruleanHouse2Text_74eb9
 	db "@"
--- a/scripts/ceruleanhousetrashed.asm
+++ b/scripts/ceruleanhousetrashed.asm
@@ -1,13 +1,13 @@
-CeruleanHouseTrashedScript: ; 1d685 (7:5685)
+CeruleanHouseTrashedScript:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeruleanHouseTrashedTextPointers: ; 1d689 (7:5689)
+CeruleanHouseTrashedTextPointers:
 	dw CeruleanHouseTrashedText1
 	dw CeruleanHouseTrashedText2
 	dw CeruleanHouseTrashedText3
 
-CeruleanHouseTrashedText1: ; 1d68f (7:568f)
+CeruleanHouseTrashedText1:
 	TX_ASM
 	ld b, $e4
 	predef GetQuantityOfItemInBag
@@ -22,18 +22,18 @@
 .asm_8dfe9
 	jp TextScriptEnd
 
-CeruleanHouseTrashedText_1d6ab: ; 1d6ab (7:56ab)
+CeruleanHouseTrashedText_1d6ab:
 	TX_FAR _CeruleanTrashedText_1d6ab
 	db "@"
 
-CeruleanHouseTrashedText_1d6b0: ; 1d6b0 (7:56b0)
+CeruleanHouseTrashedText_1d6b0:
 	TX_FAR _CeruleanTrashedText_1d6b0
 	db "@"
 
-CeruleanHouseTrashedText2: ; 1d6b5 (7:56b5)
+CeruleanHouseTrashedText2:
 	TX_FAR _CeruleanHouseTrashedText2
 	db "@"
 
-CeruleanHouseTrashedText3: ; 1d6ba (7:56ba)
+CeruleanHouseTrashedText3:
 	TX_FAR _CeruleanHouseTrashedText3
 	db "@"
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -1,4 +1,4 @@
-CinnabarGymScript: ; 7574a (1d:574a)
+CinnabarGymScript:
 	call CinnabarGymScript_75759
 	call EnableAutoTextBoxDrawing
 	ld hl, CinnabarGymScriptPointers
@@ -5,7 +5,7 @@
 	ld a, [wCinnabarGymCurScript]
 	jp CallFunctionInTable
 
-CinnabarGymScript_75759: ; 75759 (1d:5759)
+CinnabarGymScript_75759:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -17,17 +17,17 @@
 	call nz, UpdateCinnabarGymGateTileBlocks
 	ResetEvent EVENT_2A7
 	ret
-CinnabarGymScript_75772: ; 75772 (1d:5772)
+CinnabarGymScript_75772:
 	ld hl, Gym7CityName
 	ld de, Gym7LeaderName
 	jp LoadGymLeaderAndCityName
 
-Gym7CityName: ; 7577b (1d:577b)
+Gym7CityName:
 	db "CINNABAR ISLAND@"
-Gym7LeaderName: ; 7578b (1d:578b)
+Gym7LeaderName:
 	db "BLAINE@"
 
-CinnabarGymScript_75792: ; 75792 (1d:5792)
+CinnabarGymScript_75792:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wCinnabarGymCurScript], a
@@ -35,18 +35,18 @@
 	ld [wOpponentAfterWrongAnswer], a
 	ret
 
-CinnabarGymScript_757a0: ; 757a0 (1d:57a0)
+CinnabarGymScript_757a0:
 	ld a, [hSpriteIndexOrTextID]
 	ld [wTrainerHeaderFlagBit], a
 	ret
 
-CinnabarGymScriptPointers: ; 757a6 (1d:57a6)
+CinnabarGymScriptPointers:
 	dw CinnabarGymScript0
 	dw CinnabarGymScript1
 	dw CinnabarGymScript2
 	dw CinnabarGymScript3
 
-CinnabarGymScript0: ; 757ae (1d:57ae)
+CinnabarGymScript0:
 	ld a, [wOpponentAfterWrongAnswer]
 	and a
 	ret z
@@ -68,16 +68,16 @@
 	ld [wCurMapScript], a
 	ret
 
-MovementData_757d7: ; 757d7 (1d:57d7)
+MovementData_757d7:
 	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_UP
 	db $FF
 
-MovementData_757da: ; 757da (1d:57da)
+MovementData_757da:
 	db NPC_MOVEMENT_LEFT
 	db $FF
 
-CinnabarGymScript1: ; 757dc (1d:57dc)
+CinnabarGymScript1:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -88,10 +88,10 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-CinnabarGymFlagAction: ; 757f1 (1d:57f1)
+CinnabarGymFlagAction:
 	predef_jump FlagActionPredef
 
-CinnabarGymScript2: ; 757f6 (1d:57f6)
+CinnabarGymScript2:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CinnabarGymScript_75792
@@ -133,13 +133,13 @@
 	ld [wCurMapScript], a
 	ret
 
-CinnabarGymScript3: ; 7584a (1d:584a)
+CinnabarGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CinnabarGymScript_75792
 	ld a, $f0
 	ld [wJoyIgnore], a
-CinnabarGymScript3_75857: ; 75857 (1d:5857)
+CinnabarGymScript3_75857:
 	ld a, $a
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -170,7 +170,7 @@
 
 	jp CinnabarGymScript_75792
 
-CinnabarGymTextPointers: ; 7589f (1d:589f)
+CinnabarGymTextPointers:
 	dw CinnabarGymText1
 	dw CinnabarGymText2
 	dw CinnabarGymText3
@@ -184,7 +184,7 @@
 	dw ReceivedTM38Text
 	dw TM38NoRoomText
 
-CinnabarGymScript_758b7: ; 758b7 (1d:58b7)
+CinnabarGymScript_758b7:
 	ld a, [hSpriteIndexOrTextID]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
@@ -204,7 +204,7 @@
 	ld [wCurMapScript], a
 	jp TextScriptEnd
 
-CinnabarGymText1: ; 758df (1d:58df)
+CinnabarGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_BLAINE
 	jr z, .asm_d9332
@@ -227,35 +227,35 @@
 	ld [wGymLeaderNo], a
 	jp CinnabarGymScript_758b7
 
-BlaineBattleText: ; 75914 (1d:5914)
+BlaineBattleText:
 	TX_FAR _BlaineBattleText
 	db "@"
 
-BlaineEndBattleText: ; 75919 (1d:5919)
+BlaineEndBattleText:
 	TX_FAR _BlaineEndBattleText
 	db $11
 	db $d
 	db "@"
 
-BlaineFireBlastText: ; 75920 (1d:5920)
+BlaineFireBlastText:
 	TX_FAR _BlaineFireBlastText
 	db "@"
 
-BlaineBadgeText: ; 75925 (1d:5925)
+BlaineBadgeText:
 	TX_FAR _BlaineBadgeText
 	db "@"
 
-ReceivedTM38Text: ; 7592a (1d:592a)
+ReceivedTM38Text:
 	TX_FAR _ReceivedTM38Text
 	db $0B
 	TX_FAR _TM38ExplanationText
 	db "@"
 
-TM38NoRoomText: ; 75934 (1d:5934)
+TM38NoRoomText:
 	TX_FAR _TM38NoRoomText
 	db "@"
 
-CinnabarGymText2: ; 75939 (1d:5939)
+CinnabarGymText2:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0
@@ -271,19 +271,19 @@
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_7595f: ; 7595f (1d:595f)
+CinnabarGymText_7595f:
 	TX_FAR _CinnabarGymText_7595f
 	db "@"
 
-CinnabarGymText_75964: ; 75964 (1d:5964)
+CinnabarGymText_75964:
 	TX_FAR _CinnabarGymText_75964
 	db "@"
 
-CinnabarGymText_75969: ; 75969 (1d:5969)
+CinnabarGymText_75969:
 	TX_FAR _CinnabarGymText_75969
 	db "@"
 
-CinnabarGymText3: ; 7596e (1d:596e)
+CinnabarGymText3:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1
@@ -299,19 +299,19 @@
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75994: ; 75994 (1d:5994)
+CinnabarGymText_75994:
 	TX_FAR _CinnabarGymText_75994
 	db "@"
 
-CinnabarGymText_75999: ; 75999 (1d:5999)
+CinnabarGymText_75999:
 	TX_FAR _CinnabarGymText_75999
 	db "@"
 
-CinnabarGymText_7599e: ; 7599e (1d:599e)
+CinnabarGymText_7599e:
 	TX_FAR _CinnabarGymText_7599e
 	db "@"
 
-CinnabarGymText4: ; 759a3 (1d:59a3)
+CinnabarGymText4:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2
@@ -327,19 +327,19 @@
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_759c9: ; 759c9 (1d:59c9)
+CinnabarGymText_759c9:
 	TX_FAR _CinnabarGymText_759c9
 	db "@"
 
-CinnabarGymText_759ce: ; 759ce (1d:59ce)
+CinnabarGymText_759ce:
 	TX_FAR _CinnabarGymText_759ce
 	db "@"
 
-CinnabarGymText_759d3: ; 759d3 (1d:59d3)
+CinnabarGymText_759d3:
 	TX_FAR _CinnabarGymText_759d3
 	db "@"
 
-CinnabarGymText5: ; 759d8 (1d:59d8)
+CinnabarGymText5:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3
@@ -355,19 +355,19 @@
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_759fe: ; 759fe (1d:59fe)
+CinnabarGymText_759fe:
 	TX_FAR _CinnabarGymText_759fe
 	db "@"
 
-CinnabarGymText_75a03: ; 75a03 (1d:5a03)
+CinnabarGymText_75a03:
 	TX_FAR _CinnabarGymText_75a03
 	db "@"
 
-CinnabarGymText_75a08: ; 75a08 (1d:5a08)
+CinnabarGymText_75a08:
 	TX_FAR _CinnabarGymText_75a08
 	db "@"
 
-CinnabarGymText6: ; 75a0d (1d:5a0d)
+CinnabarGymText6:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4
@@ -383,19 +383,19 @@
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75a33: ; 75a33 (1d:5a33)
+CinnabarGymText_75a33:
 	TX_FAR _CinnabarGymText_75a33
 	db "@"
 
-CinnabarGymText_75a38: ; 75a38 (1d:5a38)
+CinnabarGymText_75a38:
 	TX_FAR _CinnabarGymText_75a38
 	db "@"
 
-CinnabarGymText_75a3d: ; 75a3d (1d:5a3d)
+CinnabarGymText_75a3d:
 	TX_FAR _CinnabarGymText_75a3d
 	db "@"
 
-CinnabarGymText7: ; 75a42 (1d:5a42)
+CinnabarGymText7:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5
@@ -411,19 +411,19 @@
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75a68: ; 75a68 (1d:5a68)
+CinnabarGymText_75a68:
 	TX_FAR _CinnabarGymText_75a68
 	db "@"
 
-CinnabarGymText_75a6d: ; 75a6d (1d:5a6d)
+CinnabarGymText_75a6d:
 	TX_FAR _CinnabarGymText_75a6d
 	db "@"
 
-CinnabarGymText_75a72: ; 75a72 (1d:5a72)
+CinnabarGymText_75a72:
 	TX_FAR _CinnabarGymText_75a72
 	db "@"
 
-CinnabarGymText8: ; 75a77 (1d:5a77)
+CinnabarGymText8:
 	TX_ASM
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6
@@ -439,19 +439,19 @@
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75a9d: ; 75a9d (1d:5a9d)
+CinnabarGymText_75a9d:
 	TX_FAR _CinnabarGymText_75a9d
 	db "@"
 
-CinnabarGymText_75aa2: ; 75aa2 (1d:5aa2)
+CinnabarGymText_75aa2:
 	TX_FAR _CinnabarGymText_75aa2
 	db "@"
 
-CinnabarGymText_75aa7: ; 75aa7 (1d:5aa7)
+CinnabarGymText_75aa7:
 	TX_FAR _CinnabarGymText_75aa7
 	db "@"
 
-CinnabarGymText9: ; 75aac (1d:5aac)
+CinnabarGymText9:
 	TX_ASM
 	CheckEvent EVENT_BEAT_BLAINE
 	jr nz, .asm_627d9
@@ -463,10 +463,10 @@
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75ac2: ; 75ac2 (1d:5ac2)
+CinnabarGymText_75ac2:
 	TX_FAR _CinnabarGymText_75ac2
 	db "@"
 
-CinnabarGymText_75ac7: ; 75ac7 (1d:5ac7)
+CinnabarGymText_75ac7:
 	TX_FAR _CinnabarGymText_75ac7
 	db "@"
--- a/scripts/cinnabarisland.asm
+++ b/scripts/cinnabarisland.asm
@@ -1,4 +1,4 @@
-CinnabarIslandScript: ; 1ca19 (7:4a19)
+CinnabarIslandScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
@@ -8,11 +8,11 @@
 	ld a, [wCinnabarIslandCurScript]
 	jp CallFunctionInTable
 
-CinnabarIslandScriptPointers: ; 1ca34 (7:4a34)
+CinnabarIslandScriptPointers:
 	dw CinnabarIslandScript0
 	dw CinnabarIslandScript1
 
-CinnabarIslandScript0: ; 1ca38 (7:4a38)
+CinnabarIslandScript0:
 	ld b, SECRET_KEY
 	call IsItemInBag
 	ret nz
@@ -41,7 +41,7 @@
 	ld [wCinnabarIslandCurScript], a
 	ret
 
-CinnabarIslandScript1: ; 1ca73 (7:4a73)
+CinnabarIslandScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -50,7 +50,7 @@
 	ld [wCinnabarIslandCurScript], a
 	ret
 
-CinnabarIslandTextPointers: ; 1ca81 (7:4a81)
+CinnabarIslandTextPointers:
 	dw CinnabarIslandText1
 	dw CinnabarIslandText2
 	dw CinnabarIslandText3
@@ -60,26 +60,26 @@
 	dw CinnabarIslandText7
 	dw CinnabarIslandText8
 
-CinnabarIslandText8: ; 1ca91 (7:4a91)
+CinnabarIslandText8:
 	TX_FAR _CinnabarIslandText8
 	db "@"
 
-CinnabarIslandText1: ; 1ca96 (7:4a96)
+CinnabarIslandText1:
 	TX_FAR _CinnabarIslandText1
 	db "@"
 
-CinnabarIslandText2: ; 1ca9b (7:4a9b)
+CinnabarIslandText2:
 	TX_FAR _CinnabarIslandText2
 	db "@"
 
-CinnabarIslandText3: ; 1caa0 (7:4aa0)
+CinnabarIslandText3:
 	TX_FAR _CinnabarIslandText3
 	db "@"
 
-CinnabarIslandText6: ; 1caa5 (7:4aa5)
+CinnabarIslandText6:
 	TX_FAR _CinnabarIslandText6
 	db "@"
 
-CinnabarIslandText7: ; 1caaa (7:4aaa)
+CinnabarIslandText7:
 	TX_FAR _CinnabarIslandText7
 	db "@"
--- a/scripts/colosseum.asm
+++ b/scripts/colosseum.asm
@@ -1,9 +1,9 @@
-ColosseumScript: ; 4fd7d (13:7d7d)
+ColosseumScript:
 	jp TradeCenterScript
 
-ColosseumTextPointers: ; 4fd80 (13:7d80)
+ColosseumTextPointers:
 	dw ColosseumText1
 
-ColosseumText1: ; 4fd82 (13:7d82)
+ColosseumText1:
 	TX_FAR _ColosseumText1
 	db "@"
--- a/scripts/copycatshouse1f.asm
+++ b/scripts/copycatshouse1f.asm
@@ -1,20 +1,20 @@
-CopycatsHouse1FScript: ; 75ec3 (1d:5ec3)
+CopycatsHouse1FScript:
 	jp EnableAutoTextBoxDrawing
 
-CopycatsHouse1FTextPointers: ; 75ec6 (1d:5ec6)
+CopycatsHouse1FTextPointers:
 	dw CopycatsHouse1FText1
 	dw CopycatsHouse1FText2
 	dw CopycatsHouse1FText3
 
-CopycatsHouse1FText1: ; 75ecc (1d:5ecc)
+CopycatsHouse1FText1:
 	TX_FAR _CopycatsHouse1FText1
 	db "@"
 
-CopycatsHouse1FText2: ; 75ed1 (1d:5ed1)
+CopycatsHouse1FText2:
 	TX_FAR _CopycatsHouse1FText2
 	db "@"
 
-CopycatsHouse1FText3: ; 75ed6 (1d:5ed6)
+CopycatsHouse1FText3:
 	TX_FAR _CopycatsHouse1FText3
 	TX_ASM
 	ld a, CHANSEY
--- a/scripts/copycatshouse2f.asm
+++ b/scripts/copycatshouse2f.asm
@@ -1,7 +1,7 @@
-CopycatsHouse2FScript: ; 5cc71 (17:4c71)
+CopycatsHouse2FScript:
 	jp EnableAutoTextBoxDrawing
 
-CopycatsHouse2FTextPointers: ; 5cc74 (17:4c74)
+CopycatsHouse2FTextPointers:
 	dw CopycatsHouse2FText1
 	dw CopycatsHouse2FText2
 	dw CopycatsHouse2FText3
@@ -10,7 +10,7 @@
 	dw CopycatsHouse2FText6
 	dw CopycatsHouse2FText7
 
-CopycatsHouse2FText1: ; 5cc82 (17:4c82)
+CopycatsHouse2FText1:
 	TX_ASM
 	CheckEvent EVENT_GOT_TM31
 	jr nz, .asm_7ccf3
@@ -43,44 +43,44 @@
 .asm_62ecd
 	jp TextScriptEnd
 
-CopycatsHouse2FText_5ccd4: ; 5ccd4 (17:4cd4)
+CopycatsHouse2FText_5ccd4:
 	TX_FAR _CopycatsHouse2FText_5ccd4
 	db "@"
 
-TM31PreReceiveText: ; 5ccd9 (17:4cd9)
+TM31PreReceiveText:
 	TX_FAR _TM31PreReceiveText
 	db "@"
 
-ReceivedTM31Text: ; 5ccde (17:4cde)
+ReceivedTM31Text:
 	TX_FAR _ReceivedTM31Text
 	db $0B
-TM31ExplanationText1: ; 5cce3 (17:4ce3)
+TM31ExplanationText1:
 	TX_FAR _TM31ExplanationText1
 	db $d, "@"
 
-TM31ExplanationText2: ; 5cce9 (17:4ce9)
+TM31ExplanationText2:
 	TX_FAR _TM31ExplanationText2
 	db "@"
 
-TM31NoRoomText: ; 5ccee (17:4cee)
+TM31NoRoomText:
 	TX_FAR _TM31NoRoomText
 	db $d, "@"
 
-CopycatsHouse2FText2: ; 5ccf4 (17:4cf4)
+CopycatsHouse2FText2:
 	TX_FAR _CopycatsHouse2FText2
 	db "@"
 
-CopycatsHouse2FText5: ; 5ccf9 (17:4cf9)
-CopycatsHouse2FText4: ; 5ccf9 (17:4cf9)
-CopycatsHouse2FText3: ; 5ccf9 (17:4cf9)
+CopycatsHouse2FText5:
+CopycatsHouse2FText4:
+CopycatsHouse2FText3:
 	TX_FAR _CopycatsHouse2FText3
 	db "@"
 
-CopycatsHouse2FText6: ; 5ccfe (17:4cfe)
+CopycatsHouse2FText6:
 	TX_FAR _CopycatsHouse2FText6
 	db "@"
 
-CopycatsHouse2FText7: ; 5cd03 (17:4d03)
+CopycatsHouse2FText7:
 	TX_ASM
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
@@ -91,10 +91,10 @@
 	call PrintText
 	jp TextScriptEnd
 
-CopycatsHouse2FText_5cd17: ; 5cd17 (17:4d17)
+CopycatsHouse2FText_5cd17:
 	TX_FAR _CopycatsHouse2FText_5cd17
 	db "@"
 
-CopycatsHouse2FText_5cd1c: ; 5cd1c (17:4d1c)
+CopycatsHouse2FText_5cd1c:
 	TX_FAR _CopycatsHouse2FText_5cd1c
 	db "@"
--- a/scripts/daycarem.asm
+++ b/scripts/daycarem.asm
@@ -1,10 +1,10 @@
-DayCareMScript: ; 5624f (15:624f)
+DayCareMScript:
 	jp EnableAutoTextBoxDrawing
 
-DayCareMTextPointers: ; 56252 (15:6252)
+DayCareMTextPointers:
 	dw DayCareMText1
 
-DayCareMText1: ; 56254 (15:6254)
+DayCareMText1:
 	TX_ASM
 	call SaveScreenTilesToBuffer2
 	ld a, [wDayCareInUse]
@@ -210,60 +210,60 @@
 	call PrintText
 	jp TextScriptEnd
 
-DayCareIntroText: ; 5640f (15:640f)
+DayCareIntroText:
 	TX_FAR _DayCareIntroText
 	db "@"
 
-DayCareWhichMonText: ; 56414 (15:6414)
+DayCareWhichMonText:
 	TX_FAR _DayCareWhichMonText
 	db "@"
 
-DayCareWillLookAfterMonText: ; 56419 (15:6419)
+DayCareWillLookAfterMonText:
 	TX_FAR _DayCareWillLookAfterMonText
 	db "@"
 
-DayCareComeSeeMeInAWhileText: ; 5641e (15:641e)
+DayCareComeSeeMeInAWhileText:
 	TX_FAR _DayCareComeSeeMeInAWhileText
 	db "@"
 
-DayCareMonHasGrownText: ; 56423 (15:6423)
+DayCareMonHasGrownText:
 	TX_FAR _DayCareMonHasGrownText
 	db "@"
 
-DayCareOweMoneyText: ; 56428 (15:6428)
+DayCareOweMoneyText:
 	TX_FAR _DayCareOweMoneyText
 	db "@"
 
-DayCareGotMonBackText: ; 5642d (15:642d)
+DayCareGotMonBackText:
 	TX_FAR _DayCareGotMonBackText
 	db "@"
 
-DayCareMonNeedsMoreTimeText: ; 56432 (15:6432)
+DayCareMonNeedsMoreTimeText:
 	TX_FAR _DayCareMonNeedsMoreTimeText
 	db "@"
 
-DayCareAllRightThenText: ; 56437 (15:6437)
+DayCareAllRightThenText:
 	TX_FAR _DayCareAllRightThenText
-DayCareComeAgainText: ; 5643b (15:643b)
+DayCareComeAgainText:
 	TX_FAR _DayCareComeAgainText
 	db "@"
 
-DayCareNoRoomForMonText: ; 56440 (15:6440)
+DayCareNoRoomForMonText:
 	TX_FAR _DayCareNoRoomForMonText
 	db "@"
 
-DayCareOnlyHaveOneMonText: ; 56445 (15:6445)
+DayCareOnlyHaveOneMonText:
 	TX_FAR _DayCareOnlyHaveOneMonText
 	db "@"
 
-DayCareCantAcceptMonWithHMText: ; 5644a (15:644a)
+DayCareCantAcceptMonWithHMText:
 	TX_FAR _DayCareCantAcceptMonWithHMText
 	db "@"
 
-DayCareHeresYourMonText: ; 5644f (15:644f)
+DayCareHeresYourMonText:
 	TX_FAR _DayCareHeresYourMonText
 	db "@"
 
-DayCareNotEnoughMoneyText: ; 56454 (15:6454)
+DayCareNotEnoughMoneyText:
 	TX_FAR _DayCareNotEnoughMoneyText
 	db "@"
--- a/scripts/diglettscave.asm
+++ b/scripts/diglettscave.asm
@@ -1,5 +1,5 @@
-DiglettsCaveScript: ; 61f6e (18:5f6e)
+DiglettsCaveScript:
 	jp EnableAutoTextBoxDrawing
 
-DiglettsCaveTextPointers: ; 61f71 (18:5f71)
+DiglettsCaveTextPointers:
 	db "@"
--- a/scripts/diglettscaveroute11.asm
+++ b/scripts/diglettscaveroute11.asm
@@ -1,12 +1,12 @@
-DiglettsCaveEntranceRoute11Script: ; 1e5ba (7:65ba)
+DiglettsCaveEntranceRoute11Script:
 	call EnableAutoTextBoxDrawing
 	ld a, ROUTE_11
 	ld [wLastMap], a
 	ret
 
-DiglettsCaveEntranceRoute11TextPointers: ; 1e5c3 (7:65c3)
+DiglettsCaveEntranceRoute11TextPointers:
 	dw DiglettsCaveEntranceRoute11Text1
 
-DiglettsCaveEntranceRoute11Text1: ; 1e5c5 (7:65c5)
+DiglettsCaveEntranceRoute11Text1:
 	TX_FAR _DiglettsCaveEntRoute11Text1
 	db "@"
--- a/scripts/diglettscaveroute2.asm
+++ b/scripts/diglettscaveroute2.asm
@@ -1,11 +1,11 @@
-DiglettsCaveRoute2Script: ; 1deb0 (7:5eb0)
+DiglettsCaveRoute2Script:
 	ld a, ROUTE_2
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-DiglettsCaveRoute2TextPointers: ; 1deb8 (7:5eb8)
+DiglettsCaveRoute2TextPointers:
 	dw DiglettsCaveRoute2Text1
 
-DiglettsCaveRoute2Text1: ; 1deba (7:5eba)
+DiglettsCaveRoute2Text1:
 	TX_FAR _DiglettsCaveRoute2Text1
 	db "@"
--- a/scripts/fanclub.asm
+++ b/scripts/fanclub.asm
@@ -1,4 +1,4 @@
-FanClubScript: ; 59b70 (16:5b70)
+FanClubScript:
 	jp EnableAutoTextBoxDrawing
 
 FanClubBikeInBag:
@@ -11,7 +11,7 @@
 	ld b, BIKE_VOUCHER
 	jp IsItemInBag
 
-FanClubTextPointers: ; 59b84 (16:5b84)
+FanClubTextPointers:
 	dw FanClubText1
 	dw FanClubText2
 	dw FanClubText3
@@ -160,14 +160,14 @@
 	TX_FAR FanClubBagFullText
 	db "@"
 
-FanClubText6: ; 59c88 (16:5c88)
+FanClubText6:
 	TX_FAR _FanClubText6
 	db "@"
 
-FanClubText7: ; 59c8d (16:5c8d)
+FanClubText7:
 	TX_FAR _FanClubText7
 	db "@"
 
-FanClubText8: ; 59c92 (16:5c92)
+FanClubText8:
 	TX_FAR _FanClubText8
 	db "@"
--- a/scripts/fightingdojo.asm
+++ b/scripts/fightingdojo.asm
@@ -1,4 +1,4 @@
-FightingDojoScript: ; 5cd5d (17:4d5d)
+FightingDojoScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, FightingDojoTrainerHeaders
 	ld de, FightingDojoScriptPointers
@@ -7,7 +7,7 @@
 	ld [wFightingDojoCurScript], a
 	ret
 
-FightingDojoScript_5cd70: ; 5cd70 (17:4d70)
+FightingDojoScript_5cd70:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wFightingDojoCurScript], a
@@ -14,13 +14,13 @@
 	ld [wCurMapScript], a
 	ret
 
-FightingDojoScriptPointers: ; 5cd7b (17:4d7b)
+FightingDojoScriptPointers:
 	dw FightingDojoScript1
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw FightingDojoScript3
 
-FightingDojoScript1: ; 5cd83 (17:4d83)
+FightingDojoScript1:
 	CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
 	ret nz
 	call CheckFightingMapTrainers
@@ -52,7 +52,7 @@
 	call DisplayTextID
 	ret
 
-FightingDojoScript3: ; 5cdc6 (17:4dc6)
+FightingDojoScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, FightingDojoScript_5cd70
@@ -80,7 +80,7 @@
 	ld [wCurMapScript], a
 	ret
 
-FightingDojoTextPointers: ; 5ce03 (17:4e03)
+FightingDojoTextPointers:
 	dw FightingDojoText1
 	dw FightingDojoText2
 	dw FightingDojoText3
@@ -90,8 +90,8 @@
 	dw FightingDojoText7
 	dw FightingDojoText8
 
-FightingDojoTrainerHeaders: ; 5ce13 (17:4e13)
-FightingDojoTrainerHeader0: ; 5ce13 (17:4e13)
+FightingDojoTrainerHeaders:
+FightingDojoTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_0
@@ -100,7 +100,7 @@
 	dw FightingDojoEndBattleText1 ; TextEndBattle
 	dw FightingDojoEndBattleText1 ; TextEndBattle
 
-FightingDojoTrainerHeader1: ; 5ce1f (17:4e1f)
+FightingDojoTrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_1
@@ -109,7 +109,7 @@
 	dw FightingDojoEndBattleText2 ; TextEndBattle
 	dw FightingDojoEndBattleText2 ; TextEndBattle
 
-FightingDojoTrainerHeader2: ; 5ce2b (17:4e2b)
+FightingDojoTrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_2
@@ -118,7 +118,7 @@
 	dw FightingDojoEndBattleText3 ; TextEndBattle
 	dw FightingDojoEndBattleText3 ; TextEndBattle
 
-FightingDojoTrainerHeader3: ; 5ce37 (17:4e37)
+FightingDojoTrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
@@ -129,7 +129,7 @@
 
 	db $ff
 
-FightingDojoText1: ; 5ce44 (17:4e44)
+FightingDojoText1:
 	TX_ASM
 	CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
 	jp nz, .continue1
@@ -161,95 +161,95 @@
 .asm_9dba4
 	jp TextScriptEnd
 
-FightingDojoText_5ce8e: ; 5ce8e (17:4e8e)
+FightingDojoText_5ce8e:
 	TX_FAR _FightingDojoText_5ce8e
 	db "@"
 
-FightingDojoText_5ce93: ; 5ce93 (17:4e93)
+FightingDojoText_5ce93:
 	TX_FAR _FightingDojoText_5ce93
 	db "@"
 
-FightingDojoText8: ; 5ce98 (17:4e98)
+FightingDojoText8:
 	TX_FAR _FightingDojoText_5ce98
 	db "@"
 
-FightingDojoText_5ce9d: ; 5ce9d (17:4e9d)
+FightingDojoText_5ce9d:
 	TX_FAR _FightingDojoText_5ce9d
 	db "@"
 
-FightingDojoText2: ; 5cea2 (17:4ea2)
+FightingDojoText2:
 	TX_ASM
 	ld hl, FightingDojoTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-FightingDojoBattleText1: ; 5ceac (17:4eac)
+FightingDojoBattleText1:
 	TX_FAR _FightingDojoBattleText1
 	db "@"
 
-FightingDojoEndBattleText1: ; 5ceb1 (17:4eb1)
+FightingDojoEndBattleText1:
 	TX_FAR _FightingDojoEndBattleText1
 	db "@"
 
-FightingDojoAfterBattleText1: ; 5ceb6 (17:4eb6)
+FightingDojoAfterBattleText1:
 	TX_FAR _FightingDojoAfterBattleText1
 	db "@"
 
-FightingDojoText3: ; 5cebb (17:4ebb)
+FightingDojoText3:
 	TX_ASM
 	ld hl, FightingDojoTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-FightingDojoBattleText2: ; 5cec5 (17:4ec5)
+FightingDojoBattleText2:
 	TX_FAR _FightingDojoBattleText2
 	db "@"
 
-FightingDojoEndBattleText2: ; 5ceca (17:4eca)
+FightingDojoEndBattleText2:
 	TX_FAR _FightingDojoEndBattleText2
 	db "@"
 
-FightingDojoAfterBattleText2: ; 5cecf (17:4ecf)
+FightingDojoAfterBattleText2:
 	TX_FAR _FightingDojoAfterBattleText2
 	db "@"
 
-FightingDojoText4: ; 5ced4 (17:4ed4)
+FightingDojoText4:
 	TX_ASM
 	ld hl, FightingDojoTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-FightingDojoBattleText3: ; 5cede (17:4ede)
+FightingDojoBattleText3:
 	TX_FAR _FightingDojoBattleText3
 	db "@"
 
-FightingDojoEndBattleText3: ; 5cee3 (17:4ee3)
+FightingDojoEndBattleText3:
 	TX_FAR _FightingDojoEndBattleText3
 	db "@"
 
-FightingDojoAfterBattleText3: ; 5cee8 (17:4ee8)
+FightingDojoAfterBattleText3:
 	TX_FAR _FightingDojoAfterBattleText3
 	db "@"
 
-FightingDojoText5: ; 5ceed (17:4eed)
+FightingDojoText5:
 	TX_ASM
 	ld hl, FightingDojoTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-FightingDojoBattleText4: ; 5cef7 (17:4ef7)
+FightingDojoBattleText4:
 	TX_FAR _FightingDojoBattleText4
 	db "@"
 
-FightingDojoEndBattleText4: ; 5cefc (17:4efc)
+FightingDojoEndBattleText4:
 	TX_FAR _FightingDojoEndBattleText4
 	db "@"
 
-FightingDojoAfterBattleText4: ; 5cf01 (17:4f01)
+FightingDojoAfterBattleText4:
 	TX_FAR _FightingDojoAfterBattleText4
 	db "@"
 
-FightingDojoText6: ; 5cf06 (17:4f06)
+FightingDojoText6:
 ; Hitmonlee Poké Ball
 	TX_ASM
 	CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN
@@ -280,11 +280,11 @@
 .done
 	jp TextScriptEnd
 
-WantHitmonleeText: ; 5cf49 (17:4f49)
+WantHitmonleeText:
 	TX_FAR _WantHitmonleeText
 	db "@"
 
-FightingDojoText7: ; 5cf4e (17:4f4e)
+FightingDojoText7:
 ; Hitmonchan Poké Ball
 	TX_ASM
 	CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN
@@ -315,10 +315,10 @@
 .done
 	jp TextScriptEnd
 
-WantHitmonchanText: ; 5cf91 (17:4f91)
+WantHitmonchanText:
 	TX_FAR _WantHitmonchanText
 	db "@"
 
-OtherHitmonText: ; 5cf96 (17:4f96)
+OtherHitmonText:
 	TX_FAR _OtherHitmonText
 	db "@"
--- a/scripts/fuchsiacity.asm
+++ b/scripts/fuchsiacity.asm
@@ -1,7 +1,7 @@
-FuchsiaCityScript: ; 19a2b (6:5a2b)
+FuchsiaCityScript:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaCityTextPointers: ; 19a2e (6:5a2e)
+FuchsiaCityTextPointers:
 	dw FuchsiaCityText1
 	dw FuchsiaCityText2
 	dw FuchsiaCityText3
@@ -27,53 +27,53 @@
 	dw FuchsiaCityText23
 	dw FuchsiaCityText24
 
-FuchsiaCityText1: ; 19a5e (6:5a5e)
+FuchsiaCityText1:
 	TX_FAR _FuchsiaCityText1
 	db "@"
 
-FuchsiaCityText2: ; 19a63 (6:5a63)
+FuchsiaCityText2:
 	TX_FAR _FuchsiaCityText2
 	db "@"
 
-FuchsiaCityText3: ; 19a68 (6:5a68)
+FuchsiaCityText3:
 	TX_FAR _FuchsiaCityText3
 	db "@"
 
-FuchsiaCityText4: ; 19a6d (6:5a6d)
+FuchsiaCityText4:
 	TX_FAR _FuchsiaCityText4
 	db "@"
 
-FuchsiaCityText5: ; 19a72 (6:5a72)
-FuchsiaCityText6: ; 19a72 (6:5a72)
-FuchsiaCityText7: ; 19a72 (6:5a72)
-FuchsiaCityText8: ; 19a72 (6:5a72)
-FuchsiaCityText9: ; 19a72 (6:5a72)
-FuchsiaCityText10: ; 19a72 (6:5a72)
+FuchsiaCityText5:
+FuchsiaCityText6:
+FuchsiaCityText7:
+FuchsiaCityText8:
+FuchsiaCityText9:
+FuchsiaCityText10:
 	TX_FAR _FuchsiaCityText5
 	db "@"
 
-FuchsiaCityText12: ; 19a77 (6:5a77)
-FuchsiaCityText11: ; 19a77 (6:5a77)
+FuchsiaCityText12:
+FuchsiaCityText11:
 	TX_FAR _FuchsiaCityText11
 	db "@"
 
-FuchsiaCityText13: ; 19a7c (6:5a7c)
+FuchsiaCityText13:
 	TX_FAR _FuchsiaCityText13
 	db "@"
 
-FuchsiaCityText16: ; 19a81 (6:5a81)
+FuchsiaCityText16:
 	TX_FAR _FuchsiaCityText16
 	db "@"
 
-FuchsiaCityText17: ; 19a86 (6:5a86)
+FuchsiaCityText17:
 	TX_FAR _FuchsiaCityText17
 	db "@"
 
-FuchsiaCityText18: ; 19a8b (6:5a8b)
+FuchsiaCityText18:
 	TX_FAR _FuchsiaCityText18
 	db "@"
 
-FuchsiaCityText19: ; 19a90 (6:5a90)
+FuchsiaCityText19:
 	TX_ASM
 	ld hl, FuchsiaCityChanseyText
 	call PrintText
@@ -81,11 +81,11 @@
 	call DisplayPokedex
 	jp TextScriptEnd
 
-FuchsiaCityChanseyText: ; 19a9f (6:5a9f)
+FuchsiaCityChanseyText:
 	TX_FAR _FuchsiaCityChanseyText
 	db "@"
 
-FuchsiaCityText20: ; 19aa4 (6:5aa4)
+FuchsiaCityText20:
 	TX_ASM
 	ld hl, FuchsiaCityVoltorbText
 	call PrintText
@@ -93,11 +93,11 @@
 	call DisplayPokedex
 	jp TextScriptEnd
 
-FuchsiaCityVoltorbText: ; 19ab3 (6:5ab3)
+FuchsiaCityVoltorbText:
 	TX_FAR _FuchsiaCityVoltorbText
 	db "@"
 
-FuchsiaCityText21: ; 19ab8 (6:5ab8)
+FuchsiaCityText21:
 	TX_ASM
 	ld hl, FuchsiaCityKangaskhanText
 	call PrintText
@@ -105,11 +105,11 @@
 	call DisplayPokedex
 	jp TextScriptEnd
 
-FuchsiaCityKangaskhanText: ; 19ac7 (6:5ac7)
+FuchsiaCityKangaskhanText:
 	TX_FAR _FuchsiaCityKangaskhanText
 	db "@"
 
-FuchsiaCityText22: ; 19acc (6:5acc)
+FuchsiaCityText22:
 	TX_ASM
 	ld hl, FuchsiaCitySlowpokeText
 	call PrintText
@@ -117,11 +117,11 @@
 	call DisplayPokedex
 	jp TextScriptEnd
 
-FuchsiaCitySlowpokeText: ; 19adb (6:5adb)
+FuchsiaCitySlowpokeText:
 	TX_FAR _FuchsiaCitySlowpokeText
 	db "@"
 
-FuchsiaCityText23: ; 19ae0 (6:5ae0)
+FuchsiaCityText23:
 	TX_ASM
 	ld hl, FuchsiaCityLaprasText
 	call PrintText
@@ -129,11 +129,11 @@
 	call DisplayPokedex
 	jp TextScriptEnd
 
-FuchsiaCityLaprasText: ; 19aef (6:5aef)
+FuchsiaCityLaprasText:
 	TX_FAR _FuchsiaCityLaprasText
 	db "@"
 
-FuchsiaCityText24: ; 19af4 (6:5af4)
+FuchsiaCityText24:
 	TX_ASM
 	CheckEvent EVENT_GOT_DOME_FOSSIL
 	jr nz, .asm_3b4e8
@@ -156,14 +156,14 @@
 .asm_4343f
 	jp TextScriptEnd
 
-FuchsiaCityOmanyteText: ; 19b20 (6:5b20)
+FuchsiaCityOmanyteText:
 	TX_FAR _FuchsiaCityOmanyteText
 	db "@"
 
-FuchsiaCityKabutoText: ; 19b25 (6:5b25)
+FuchsiaCityKabutoText:
 	TX_FAR _FuchsiaCityKabutoText
 	db "@"
 
-FuchsiaCityText_19b2a: ; 19b2a (6:5b2a)
+FuchsiaCityText_19b2a:
 	TX_FAR _FuchsiaCityText_19b2a
 	db "@"
--- a/scripts/fuchsiagym.asm
+++ b/scripts/fuchsiagym.asm
@@ -1,4 +1,4 @@
-FuchsiaGymScript: ; 7543d (1d:543d)
+FuchsiaGymScript:
 	call FuchsiaGymScript_75453
 	call EnableAutoTextBoxDrawing
 	ld hl, FuchsiaGymTrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wFuchsiaGymCurScript], a
 	ret
 
-FuchsiaGymScript_75453: ; 75453 (1d:5453)
+FuchsiaGymScript_75453:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -18,12 +18,12 @@
 	call LoadGymLeaderAndCityName
 	ret
 
-Gym5CityName: ; 75465 (1d:5465)
+Gym5CityName:
 	db "FUCHSIA CITY@"
-Gym5LeaderName: ; 75472 (1d:5472)
+Gym5LeaderName:
 	db "KOGA@"
 
-FuchsiaGymScript_75477: ; 75477 (1d:5477)
+FuchsiaGymScript_75477:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wFuchsiaGymCurScript], a
@@ -30,19 +30,19 @@
 	ld [wCurMapScript], a
 	ret
 
-FuchsiaGymScriptPointers: ; 75482 (1d:5482)
+FuchsiaGymScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw FuchsiaGymScript3
 
-FuchsiaGymScript3: ; 7548a (1d:548a)
+FuchsiaGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, FuchsiaGymScript_75477
 	ld a, $f0
 	ld [wJoyIgnore], a
-FuchsiaGymScript3_75497: ; 75497 (1d:5497)
+FuchsiaGymScript3_75497:
 	ld a, $9
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -70,7 +70,7 @@
 
 	jp FuchsiaGymScript_75477
 
-FuchsiaGymTextPointers: ; 754d5 (1d:54d5)
+FuchsiaGymTextPointers:
 	dw FuchsiaGymText1
 	dw FuchsiaGymText2
 	dw FuchsiaGymText3
@@ -83,8 +83,8 @@
 	dw FuchsiaGymText10
 	dw FuchsiaGymText11
 
-FuchsiaGymTrainerHeaders: ; 754eb (1d:54eb)
-FuchsiaGymTrainerHeader0: ; 754eb (1d:54eb)
+FuchsiaGymTrainerHeaders:
+FuchsiaGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_0
@@ -93,7 +93,7 @@
 	dw FuchsiaGymEndBattleText1 ; TextEndBattle
 	dw FuchsiaGymEndBattleText1 ; TextEndBattle
 
-FuchsiaGymTrainerHeader2: ; 754f7 (1d:54f7)
+FuchsiaGymTrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2
@@ -102,7 +102,7 @@
 	dw FuchsiaGymEndBattleText2 ; TextEndBattle
 	dw FuchsiaGymEndBattleText2 ; TextEndBattle
 
-FuchsiaGymTrainerHeader3: ; 75503 (1d:5503)
+FuchsiaGymTrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3
@@ -111,7 +111,7 @@
 	dw FuchsiaGymEndBattleText3 ; TextEndBattle
 	dw FuchsiaGymEndBattleText3 ; TextEndBattle
 
-FuchsiaGymTrainerHeader4: ; 7550f (1d:550f)
+FuchsiaGymTrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4
@@ -120,7 +120,7 @@
 	dw FuchsiaGymEndBattleText4 ; TextEndBattle
 	dw FuchsiaGymEndBattleText4 ; TextEndBattle
 
-FuchsiaGymTrainerHeader5: ; 7551b (1d:551b)
+FuchsiaGymTrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
@@ -129,7 +129,7 @@
 	dw FuchsiaGymEndBattleText5 ; TextEndBattle
 	dw FuchsiaGymEndBattleText5 ; TextEndBattle
 
-FuchsiaGymTrainerHeader6: ; 75527 (1d:5527)
+FuchsiaGymTrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_6
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_6
@@ -140,7 +140,7 @@
 
 	db $ff
 
-FuchsiaGymText1: ; 75534 (1d:5534)
+FuchsiaGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_KOGA
 	jr z, .asm_181b6
@@ -175,143 +175,143 @@
 .asm_e84c6
 	jp TextScriptEnd
 
-KogaBeforeBattleText: ; 75581 (1d:5581)
+KogaBeforeBattleText:
 	TX_FAR _KogaBeforeBattleText
 	db "@"
 
-KogaAfterBattleText: ; 75586 (1d:5586)
+KogaAfterBattleText:
 	TX_FAR _KogaAfterBattleText
 	db "@"
 
-KogaExplainToxicText: ; 7558b (1d:558b)
+KogaExplainToxicText:
 	TX_FAR _KogaExplainToxicText
 	db "@"
 
-FuchsiaGymText9: ; 75590 (1d:5590)
+FuchsiaGymText9:
 	TX_FAR _FuchsiaGymText9
 	db "@"
 
-FuchsiaGymText10: ; 75595 (1d:5595)
+FuchsiaGymText10:
 	TX_FAR _ReceivedTM06Text
 	db $11
 
-TM06ExplanationText: ; 7559a (1d:559a)
+TM06ExplanationText:
 	TX_FAR _TM06ExplanationText
 	db "@"
 
-FuchsiaGymText11: ; 7559f (1d:559f)
+FuchsiaGymText11:
 	TX_FAR _TM06NoRoomText
 	db "@"
 
-FuchsiaGymText2: ; 755a4 (1d:55a4)
+FuchsiaGymText2:
 	TX_ASM
 	ld hl, FuchsiaGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-FuchsiaGymBattleText1: ; 755ae (1d:55ae)
+FuchsiaGymBattleText1:
 	TX_FAR _FuchsiaGymBattleText1
 	db "@"
 
-FuchsiaGymEndBattleText1: ; 755b3 (1d:55b3)
+FuchsiaGymEndBattleText1:
 	TX_FAR _FuchsiaGymEndBattleText1
 	db "@"
 
-FuchsiaGymAfterBattleText1: ; 755b8 (1d:55b8)
+FuchsiaGymAfterBattleText1:
 	TX_FAR _FuchsiaGymAfterBattleText1
 	db "@"
 
-FuchsiaGymText3: ; 755bd (1d:55bd)
+FuchsiaGymText3:
 	TX_ASM
 	ld hl, FuchsiaGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-FuchsiaGymBattleText2: ; 755c7 (1d:55c7)
+FuchsiaGymBattleText2:
 	TX_FAR _FuchsiaGymBattleText2
 	db "@"
 
-FuchsiaGymEndBattleText2: ; 755cc (1d:55cc)
+FuchsiaGymEndBattleText2:
 	TX_FAR _FuchsiaGymEndBattleText2
 	db "@"
 
-FuchsiaGymAfterBattleText2: ; 755d1 (1d:55d1)
+FuchsiaGymAfterBattleText2:
 	TX_FAR _FuchsiaGymAfterBattleText2
 	db "@"
 
-FuchsiaGymText4: ; 755d6 (1d:55d6)
+FuchsiaGymText4:
 	TX_ASM
 	ld hl, FuchsiaGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-FuchsiaGymBattleText3: ; 755e0 (1d:55e0)
+FuchsiaGymBattleText3:
 	TX_FAR _FuchsiaGymBattleText3
 	db "@"
 
-FuchsiaGymEndBattleText3: ; 755e5 (1d:55e5)
+FuchsiaGymEndBattleText3:
 	TX_FAR _FuchsiaGymEndBattleText3
 	db "@"
 
-FuchsiaGymAfterBattleText3: ; 755ea (1d:55ea)
+FuchsiaGymAfterBattleText3:
 	TX_FAR _FuchsiaGymAfterBattleText3
 	db "@"
 
-FuchsiaGymText5: ; 755ef (1d:55ef)
+FuchsiaGymText5:
 	TX_ASM
 	ld hl, FuchsiaGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-FuchsiaGymBattleText4: ; 755f9 (1d:55f9)
+FuchsiaGymBattleText4:
 	TX_FAR _FuchsiaGymBattleText4
 	db "@"
 
-FuchsiaGymEndBattleText4: ; 755fe (1d:55fe)
+FuchsiaGymEndBattleText4:
 	TX_FAR _FuchsiaGymEndBattleText4
 	db "@"
 
-FuchsiaGymAfterBattleText4: ; 75603 (1d:5603)
+FuchsiaGymAfterBattleText4:
 	TX_FAR _FuchsiaGymAfterBattleText4
 	db "@"
 
-FuchsiaGymText6: ; 75608 (1d:5608)
+FuchsiaGymText6:
 	TX_ASM
 	ld hl, FuchsiaGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-FuchsiaGymBattleText5: ; 75612 (1d:5612)
+FuchsiaGymBattleText5:
 	TX_FAR _FuchsiaGymBattleText5
 	db "@"
 
-FuchsiaGymEndBattleText5: ; 75617 (1d:5617)
+FuchsiaGymEndBattleText5:
 	TX_FAR _FuchsiaGymEndBattleText5
 	db "@"
 
-FuchsiaGymAfterBattleText5: ; 7561c (1d:561c)
+FuchsiaGymAfterBattleText5:
 	TX_FAR _FuchsiaGymAfterBattleText5
 	db "@"
 
-FuchsiaGymText7: ; 75621 (1d:5621)
+FuchsiaGymText7:
 	TX_ASM
 	ld hl, FuchsiaGymTrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-FuchsiaGymBattleText6: ; 7562b (1d:562b)
+FuchsiaGymBattleText6:
 	TX_FAR _FuchsiaGymBattleText6
 	db "@"
 
-FuchsiaGymEndBattleText6: ; 75630 (1d:5630)
+FuchsiaGymEndBattleText6:
 	TX_FAR _FuchsiaGymEndBattleText6
 	db "@"
 
-FuchsiaGymAfterBattleText6: ; 75635 (1d:5635)
+FuchsiaGymAfterBattleText6:
 	TX_FAR _FuchsiaGymAfterBattleText6
 	db "@"
 
-FuchsiaGymText8: ; 7563a (1d:563a)
+FuchsiaGymText8:
 	TX_ASM
 	CheckEvent EVENT_BEAT_KOGA
 	ld hl, FuchsiaGymText_75653
@@ -321,10 +321,10 @@
 	call PrintText
 	jp TextScriptEnd
 
-FuchsiaGymText_7564e: ; 7564e (1d:564e)
+FuchsiaGymText_7564e:
 	TX_FAR _FuchsiaGymText_7564e
 	db "@"
 
-FuchsiaGymText_75653: ; 75653 (1d:5653)
+FuchsiaGymText_75653:
 	TX_FAR _FuchsiaGymText_75653
 	db "@"
--- a/scripts/fuchsiahouse1.asm
+++ b/scripts/fuchsiahouse1.asm
@@ -1,20 +1,20 @@
-FuchsiaHouse1Script: ; 75018 (1d:5018)
+FuchsiaHouse1Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-FuchsiaHouse1TextPointers: ; 7501c (1d:501c)
+FuchsiaHouse1TextPointers:
 	dw FuchsiaHouse1Text1
 	dw FuchsiaHouse1Text2
 	dw FuchsiaHouse1Text3
 
-FuchsiaHouse1Text1: ; 75022 (1d:5022)
+FuchsiaHouse1Text1:
 	TX_FAR _FuchsiaHouse1Text1
 	db "@"
 
-FuchsiaHouse1Text2: ; 75027 (1d:5027)
+FuchsiaHouse1Text2:
 	TX_FAR _FuchsiaHouse1Text2
 	db "@"
 
-FuchsiaHouse1Text3: ; 7502c (1d:502c)
+FuchsiaHouse1Text3:
 	TX_FAR _FuchsiaHouse1Text3
 	db "@"
--- a/scripts/fuchsiahouse2.asm
+++ b/scripts/fuchsiahouse2.asm
@@ -1,7 +1,7 @@
-FuchsiaHouse2Script: ; 750b5 (1d:50b5)
+FuchsiaHouse2Script:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaHouse2TextPointers: ; 750b8 (1d:50b8)
+FuchsiaHouse2TextPointers:
 	dw FuchsiaHouse2Text1
 	dw PickUpItemText
 	dw BoulderText
@@ -8,7 +8,7 @@
 	dw FuchsiaHouse2Text4
 	dw FuchsiaHouse2Text5
 
-FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
+FuchsiaHouse2Text1:
 	TX_ASM
 	CheckEvent EVENT_GOT_HM04
 	jr nz, .subtract
@@ -55,44 +55,44 @@
 .asm_52039
 	jp TextScriptEnd
 
-WardenGibberishText1: ; 75135 (1d:5135)
+WardenGibberishText1:
 	TX_FAR _WardenGibberishText1
 	db "@"
 
-WardenGibberishText2: ; 7513a (1d:513a)
+WardenGibberishText2:
 	TX_FAR _WardenGibberishText2
 	db "@"
 
-WardenGibberishText3: ; 7513f (1d:513f)
+WardenGibberishText3:
 	TX_FAR _WardenGibberishText3
 	db "@"
 
-WardenTeethText1: ; 75144 (1d:5144)
+WardenTeethText1:
 	TX_FAR _WardenTeethText1
 	db $0b
 
-WardenTeethText2: ; 75149 (1d:5149)
+WardenTeethText2:
 	TX_FAR _WardenTeethText2
 	db "@"
 
-WardenThankYouText: ; 7514e (1d:514e)
+WardenThankYouText:
 	TX_FAR _WardenThankYouText
 	db "@"
 
-ReceivedHM04Text: ; 75153 (1d:5153)
+ReceivedHM04Text:
 	TX_FAR _ReceivedHM04Text
 	db $0B, "@"
 
-HM04ExplanationText: ; 75159 (1d:5159)
+HM04ExplanationText:
 	TX_FAR _HM04ExplanationText
 	db "@"
 
-HM04NoRoomText: ; 7515e (1d:515e)
+HM04NoRoomText:
 	TX_FAR _HM04NoRoomText
 	db "@"
 
-FuchsiaHouse2Text5: ; 75163 (1d:5163)
-FuchsiaHouse2Text4: ; 75163 (1d:5163)
+FuchsiaHouse2Text5:
+FuchsiaHouse2Text4:
 	TX_ASM
 	ld a, [H_SPRITEINDEX]
 	cp $4
@@ -103,10 +103,10 @@
 	call PrintText
 	jp TextScriptEnd
 
-FuchsiaHouse2Text_75176: ; 75176 (1d:5176)
+FuchsiaHouse2Text_75176:
 	TX_FAR _FuchsiaHouse2Text_75176
 	db "@"
 
-FuchsiaHouse2Text_7517b: ; 7517b (1d:517b)
+FuchsiaHouse2Text_7517b:
 	TX_FAR _FuchsiaHouse2Text_7517b
 	db "@"
--- a/scripts/fuchsiahouse3.asm
+++ b/scripts/fuchsiahouse3.asm
@@ -1,10 +1,10 @@
-FuchsiaHouse3Script: ; 5617c (15:617c)
+FuchsiaHouse3Script:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaHouse3TextPointers: ; 5617f (15:617f)
+FuchsiaHouse3TextPointers:
 	dw FuchsiaHouse3Text1
 
-FuchsiaHouse3Text1: ; 56181 (15:6181)
+FuchsiaHouse3Text1:
 	TX_ASM
 	ld a, [wd728]
 	bit 4, a
@@ -43,11 +43,11 @@
 	call PrintText
 	jp TextScriptEnd
 
-FuchsiaHouse3Text_561bd: ; 561bd (15:61bd)
+FuchsiaHouse3Text_561bd:
 	TX_FAR _FuchsiaHouse3Text_561bd
 	db "@"
 
-FuchsiaHouse3Text_561c2: ; 561c2 (15:61c2)
+FuchsiaHouse3Text_561c2:
 	TX_FAR _FuchsiaHouse3Text_561c2
 	db $0B
 	db "@"
@@ -62,14 +62,14 @@
 	line "もっと いいもんが つれるんじゃ!"
 	done
 
-FuchsiaHouse3Text_56212: ; 56212 (15:6212)
+FuchsiaHouse3Text_56212:
 	TX_FAR _FuchsiaHouse3Text_56212
 	db "@"
 
-FuchsiaHouse3Text_56217: ; 56217 (15:6217)
+FuchsiaHouse3Text_56217:
 	TX_FAR _FuchsiaHouse3Text_56217
 	db "@"
 
-FuchsiaHouse3Text_5621c: ; 5621c (15:621c)
+FuchsiaHouse3Text_5621c:
 	TX_FAR _FuchsiaHouse3Text_5621c
 	db "@"
--- a/scripts/fuchsiameetingroom.asm
+++ b/scripts/fuchsiameetingroom.asm
@@ -1,20 +1,20 @@
-FuchsiaMeetingRoomScript: ; 756e3 (1d:56e3)
+FuchsiaMeetingRoomScript:
 	call EnableAutoTextBoxDrawing
 	ret
 
-FuchsiaMeetingRoomTextPointers: ; 756e7 (1d:56e7)
+FuchsiaMeetingRoomTextPointers:
 	dw FuchsiaMeetingRoomText1
 	dw FuchsiaMeetingRoomText2
 	dw FuchsiaMeetingRoomText3
 
-FuchsiaMeetingRoomText1: ; 756ed (1d:56ed)
+FuchsiaMeetingRoomText1:
 	TX_FAR _FuchsiaMeetingRoomText1
 	db "@"
 
-FuchsiaMeetingRoomText2: ; 756f2 (1d:56f2)
+FuchsiaMeetingRoomText2:
 	TX_FAR _FuchsiaMeetingRoomText2
 	db "@"
 
-FuchsiaMeetingRoomText3: ; 756f7 (1d:56f7)
+FuchsiaMeetingRoomText3:
 	TX_FAR _FuchsiaMeetingRoomText3
 	db "@"
--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@@ -1,16 +1,16 @@
-GaryScript: ; 75f1d (1d:5f1d)
+GaryScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, GaryScriptPointers
 	ld a, [wGaryCurScript]
 	jp CallFunctionInTable
 
-ResetGaryScript: ; 75f29 (1d:5f29)
+ResetGaryScript:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wGaryCurScript], a
 	ret
 
-GaryScriptPointers: ; 75f31 (1d:5f31)
+GaryScriptPointers:
 	dw GaryScript0
 	dw GaryScript1
 	dw GaryScript2
@@ -23,10 +23,10 @@
 	dw GaryScript9
 	dw GaryScript10
 
-GaryScript0: ; 75f47 (1d:5f47)
+GaryScript0:
 	ret
 
-GaryScript1: ; 75f48 (1d:5f48)
+GaryScript1:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	ld hl, wSimulatedJoypadStatesEnd
@@ -39,13 +39,13 @@
 	ld [wGaryCurScript], a
 	ret
 
-GaryEntrance_RLEMovement: ; 75f63 (1d:5f63)
+GaryEntrance_RLEMovement:
 	db D_UP,1
 	db D_RIGHT,1
 	db D_UP,3
 	db $ff
 
-GaryScript2: ; 75f6a (1d:5f6a)
+GaryScript2:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -89,7 +89,7 @@
 	ld [wGaryCurScript], a
 	ret
 
-GaryScript3: ; 75fbb (1d:5fbb)
+GaryScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, ResetGaryScript
@@ -107,7 +107,7 @@
 	ld [wGaryCurScript], a
 	ret
 
-GaryScript4: ; 75fe4 (1d:5fe4)
+GaryScript4:
 	callba Music_Cities1AlternateTempo
 	ld a, $2
 	ld [hSpriteIndexOrTextID], a
@@ -126,7 +126,7 @@
 	ld [wGaryCurScript], a
 	ret
 
-OakEntranceAfterVictoryMovement: ; 76014 (1d:6014)
+OakEntranceAfterVictoryMovement:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
@@ -134,7 +134,7 @@
 	db NPC_MOVEMENT_UP
 	db $FF
 
-GaryScript5: ; 7601a (1d:601a)
+GaryScript5:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -157,7 +157,7 @@
 	ld [wGaryCurScript], a
 	ret
 
-GaryScript6: ; 76047 (1d:6047)
+GaryScript6:
 	ld a, $2
 	ld [H_SPRITEINDEX], a
 	ld a, SPRITE_FACING_RIGHT
@@ -170,7 +170,7 @@
 	ld [wGaryCurScript], a
 	ret
 
-GaryScript7: ; 7605f (1d:605f)
+GaryScript7:
 	ld a, $2
 	ld [H_SPRITEINDEX], a
 	xor a ; SPRITE_FACING_DOWN
@@ -187,12 +187,12 @@
 	ld [wGaryCurScript], a
 	ret
 
-OakExitGaryRoomMovement: ; 76080 (1d:6080)
+OakExitGaryRoomMovement:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db $FF
 
-GaryScript8: ; 76083 (1d:6083)
+GaryScript8:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -203,7 +203,7 @@
 	ld [wGaryCurScript], a
 	ret
 
-GaryScript9: ; 76099 (1d:6099)
+GaryScript9:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	ld hl, wSimulatedJoypadStatesEnd
@@ -216,12 +216,12 @@
 	ld [wGaryCurScript], a
 	ret
 
-WalkToHallOfFame_RLEMovment: ; 760b4 (1d:60b4)
+WalkToHallOfFame_RLEMovment:
 	db D_UP,4
 	db D_LEFT,1
 	db $ff
 
-GaryScript10: ; 760b9 (1d:60b9)
+GaryScript10:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -231,7 +231,7 @@
 	ld [wGaryCurScript], a
 	ret
 
-GaryScript_760c8: ; 760c8 (1d:60c8)
+GaryScript_760c8:
 	ld a, $f0
 	ld [wJoyIgnore], a
 	call DisplayTextID
@@ -239,7 +239,7 @@
 	ld [wJoyIgnore], a
 	ret
 
-GaryTextPointers: ; 760d6 (1d:60d6)
+GaryTextPointers:
 	dw GaryText1
 	dw GaryText2
 	dw GaryText3
@@ -246,7 +246,7 @@
 	dw GaryText4
 	dw GaryText5
 
-GaryText1: ; 760e0 (1d:60e0)
+GaryText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_CHAMPION_RIVAL
 	ld hl, GaryChampionIntroText
@@ -256,27 +256,27 @@
 	call PrintText
 	jp TextScriptEnd
 
-GaryChampionIntroText: ; 760f4 (1d:60f4)
+GaryChampionIntroText:
 	TX_FAR _GaryChampionIntroText
 	db "@"
 
-GaryDefeatedText: ; 760f9 (1d:60f9)
+GaryDefeatedText:
 	TX_FAR _GaryDefeatedText
 	db "@"
 
-GaryVictoryText: ; 760fe (1d:60fe)
+GaryVictoryText:
 	TX_FAR _GaryVictoryText
 	db "@"
 
-GaryText_76103: ; 76103 (1d:6103)
+GaryText_76103:
 	TX_FAR _GaryText_76103
 	db "@"
 
-GaryText2: ; 76108 (1d:6108)
+GaryText2:
 	TX_FAR _GaryText2
 	db "@"
 
-GaryText3: ; 7610d (1d:610d)
+GaryText3:
 	TX_ASM
 	ld a, [wPlayerStarter]
 	ld [wd11e], a
@@ -285,14 +285,14 @@
 	call PrintText
 	jp TextScriptEnd
 
-GaryText_76120: ; 76120 (1d:6120)
+GaryText_76120:
 	TX_FAR _GaryText_76120
 	db "@"
 
-GaryText4: ; 76125 (1d:6125)
+GaryText4:
 	TX_FAR _GaryText_76125
 	db "@"
 
-GaryText5: ; 7612a (1d:612a)
+GaryText5:
 	TX_FAR _GaryText_7612a
 	db "@"
--- a/scripts/halloffameroom.asm
+++ b/scripts/halloffameroom.asm
@@ -1,25 +1,25 @@
-HallofFameRoomScript: ; 5a49e (16:649e)
+HallofFameRoomScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, HallofFameRoomScriptPointers
 	ld a, [wHallOfFameRoomCurScript]
 	jp CallFunctionInTable
 
-HallofFameRoomScript_5a4aa: ; 5a4aa (16:64aa)
+HallofFameRoomScript_5a4aa:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wHallOfFameRoomCurScript], a
 	ret
 
-HallofFameRoomScriptPointers: ; 5a4b2 (16:64b2)
+HallofFameRoomScriptPointers:
 	dw HallofFameRoomScript0
 	dw HallofFameRoomScript1
 	dw HallofFameRoomScript2
 	dw HallofFameRoomScript3
 
-HallofFameRoomScript3: ; 5a4ba (16:64ba)
+HallofFameRoomScript3:
 	ret
 
-HallofFameRoomScript2: ; 5a4bb (16:64bb)
+HallofFameRoomScript2:
 	call Delay3
 	ld a, [wLetterPrintingDelayFlags]
 	push af
@@ -55,7 +55,7 @@
 	call WaitForTextScrollButtonPress
 	jp Init
 
-HallofFameRoomScript0: ; 5a50d (16:650d)
+HallofFameRoomScript0:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	ld hl, wSimulatedJoypadStatesEnd
@@ -68,11 +68,11 @@
 	ld [wHallOfFameRoomCurScript], a
 	ret
 
-RLEMovement5a528: ; 5a528 (16:6528)
+RLEMovement5a528:
 	db D_UP,$5
 	db $ff
 
-HallofFameRoomScript1: ; 5a52b (16:652b)
+HallofFameRoomScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -101,9 +101,9 @@
 	ld [wHallOfFameRoomCurScript], a
 	ret
 
-HallofFameRoomTextPointers: ; 5a56a (16:656a)
+HallofFameRoomTextPointers:
 	dw HallofFameRoomText1
 
-HallofFameRoomText1: ; 5a56c (16:656c)
+HallofFameRoomText1:
 	TX_FAR _HallofFameRoomText1
 	db "@"
--- a/scripts/indigoplateau.asm
+++ b/scripts/indigoplateau.asm
@@ -1,4 +1,4 @@
-IndigoPlateauScript: ; 50935 (14:4935)
+IndigoPlateauScript:
 	ret
 
-IndigoPlateauTextPointers: ; 50936 (14:4936)
+IndigoPlateauTextPointers:
--- a/scripts/lab1.asm
+++ b/scripts/lab1.asm
@@ -1,8 +1,8 @@
-Lab1Script: ; 75b8c (1d:5b8c)
+Lab1Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-Lab1TextPointers: ; 75b90 (1d:5b90)
+Lab1TextPointers:
 	dw Lab1Text1
 	dw Lab1Text2
 	dw Lab1Text3
@@ -9,22 +9,22 @@
 	dw Lab1Text4
 	dw Lab1Text5
 
-Lab1Text1: ; 75b9a (1d:5b9a)
+Lab1Text1:
 	TX_FAR _Lab1Text1
 	db "@"
 
-Lab1Text2: ; 75b9f (1d:5b9f)
+Lab1Text2:
 	TX_FAR _Lab1Text2
 	db "@"
 
-Lab1Text3: ; 75ba4 (1d:5ba4)
+Lab1Text3:
 	TX_FAR _Lab1Text3
 	db "@"
 
-Lab1Text4: ; 75ba9 (1d:5ba9)
+Lab1Text4:
 	TX_FAR _Lab1Text4
 	db "@"
 
-Lab1Text5: ; 75bae (1d:5bae)
+Lab1Text5:
 	TX_FAR _Lab1Text5
 	db "@"
--- a/scripts/lab2.asm
+++ b/scripts/lab2.asm
@@ -1,25 +1,25 @@
-Lab2Script: ; 75c21 (1d:5c21)
+Lab2Script:
 	jp EnableAutoTextBoxDrawing
 
-Lab2TextPointers: ; 75c24 (1d:5c24)
+Lab2TextPointers:
 	dw Lab2Text1
 	dw Lab2Text2
 	dw Lab2Text3
 
-Lab2Text1: ; 75c2a (1d:5c2a)
+Lab2Text1:
 	TX_FAR _Lab2Text1
 	db "@"
 
-Lab2Text2: ; 75c2f (1d:5c2f)
+Lab2Text2:
 	TX_ASM
 	ld a, $7
 	ld [wWhichTrade], a
 	jr Lab2DoTrade
 
-Lab2Text3: ; 75c37 (1d:5c37)
+Lab2Text3:
 	TX_ASM
 	ld a, $8
 	ld [wWhichTrade], a
-Lab2DoTrade: ; 75c3d (1d:5c3d)
+Lab2DoTrade:
 	predef DoInGameTradeDialogue
 	jp TextScriptEnd
--- a/scripts/lab3.asm
+++ b/scripts/lab3.asm
@@ -1,7 +1,7 @@
-Lab3Script: ; 75c87 (1d:5c87)
+Lab3Script:
 	jp EnableAutoTextBoxDrawing
 
-Lab3TextPointers: ; 75c8a (1d:5c8a)
+Lab3TextPointers:
 	dw Lab3Text1
 	dw Lab3Text2
 	dw Lab3Text3
@@ -8,7 +8,7 @@
 	dw Lab3Text4
 	dw Lab3Text5
 
-Lab3Text1: ; 75c94 (1d:5c94)
+Lab3Text1:
 	TX_ASM
 	CheckEvent EVENT_GOT_TM35
 	jr nz, .asm_e551a
@@ -31,31 +31,31 @@
 .asm_eb896
 	jp TextScriptEnd
 
-TM35PreReceiveText: ; 75cc8 (1d:5cc8)
+TM35PreReceiveText:
 	TX_FAR _TM35PreReceiveText
 	db "@"
 
-ReceivedTM35Text: ; 75ccd (1d:5ccd)
+ReceivedTM35Text:
 	TX_FAR _ReceivedTM35Text
 	db $0B, "@"
 
-TM35ExplanationText: ; 75cd3 (1d:5cd3)
+TM35ExplanationText:
 	TX_FAR _TM35ExplanationText
 	db "@"
 
-TM35NoRoomText: ; 75cd8 (1d:5cd8)
+TM35NoRoomText:
 	TX_FAR _TM35NoRoomText
 	db "@"
 
-Lab3Text2: ; 75cdd (1d:5cdd)
+Lab3Text2:
 	TX_FAR _Lab3Text2
 	db "@"
 
-Lab3Text4: ; 75ce2 (1d:5ce2)
-Lab3Text3: ; 75ce2 (1d:5ce2)
+Lab3Text4:
+Lab3Text3:
 	TX_FAR _Lab3Text3
 	db "@"
 
-Lab3Text5: ; 75ce7 (1d:5ce7)
+Lab3Text5:
 	TX_FAR _Lab3Text5
 	db "@"
--- a/scripts/lab4.asm
+++ b/scripts/lab4.asm
@@ -1,11 +1,11 @@
-Lab4Script: ; 75d31 (1d:5d31)
+Lab4Script:
 	jp EnableAutoTextBoxDrawing
 
-Lab4TextPointers: ; 75d34 (1d:5d34)
+Lab4TextPointers:
 	dw Lab4Text1
 	dw Lab4Text2
 
-Lab4Script_GetFossilsInBag: ; 75d38 (1d:5d38)
+Lab4Script_GetFossilsInBag:
 ; construct a list of all fossils in the player's bag
 	xor a
 	ld [wFilteredBagItemsCount], a
@@ -40,13 +40,13 @@
 	ld [de], a
 	ret
 
-FossilsList: ; 75d68 (1d:5d68)
+FossilsList:
 	db DOME_FOSSIL
 	db HELIX_FOSSIL
 	db OLD_AMBER
 	db $00
 
-Lab4Text1: ; 75d6c (1d:5d6c)
+Lab4Text1:
 	TX_ASM
 	CheckEvent EVENT_GAVE_FOSSIL_TO_LAB
 	jr nz, .asm_75d96
@@ -82,23 +82,23 @@
 	ResetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_LAB_HANDING_OVER_FOSSIL_MON
 	jr .asm_75d93
 
-Lab4Text_75dc6: ; 75dc6 (1d:5dc6)
+Lab4Text_75dc6:
 	TX_FAR _Lab4Text_75dc6
 	db "@"
 
-Lab4Text_75dcb: ; 75dcb (1d:5dcb)
+Lab4Text_75dcb:
 	TX_FAR _Lab4Text_75dcb
 	db "@"
 
-Lab4Text_75dd0: ; 75dd0 (1d:5dd0)
+Lab4Text_75dd0:
 	TX_FAR _Lab4Text_75dd0
 	db "@"
 
-Lab4Text_75dd5: ; 75dd5 (1d:5dd5)
+Lab4Text_75dd5:
 	TX_FAR _Lab4Text_75dd5
 	db "@"
 
-Lab4Text2: ; 75dda (1d:5dda)
+Lab4Text2:
 	TX_ASM
 	ld a, $3
 	ld [wWhichTrade], a
@@ -105,5 +105,5 @@
 	predef DoInGameTradeDialogue
 	jp TextScriptEnd
 
-LoadFossilItemAndMonNameBank1D: ; 75de8 (1d:5de8)
+LoadFossilItemAndMonNameBank1D:
 	jpba LoadFossilItemAndMonName
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@@ -1,4 +1,4 @@
-LanceScript: ; 5a2ae (16:62ae)
+LanceScript:
 	call LanceShowOrHideEntranceBlocks
 	call EnableAutoTextBoxDrawing
 	ld hl, LanceTrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wLanceCurScript], a
 	ret
 
-LanceShowOrHideEntranceBlocks: ; 5a2c4 (16:62c4)
+LanceShowOrHideEntranceBlocks:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -23,7 +23,7 @@
 	ld a, $72
 	ld b, $73
 
-LanceSetEntranceBlocks: ; 5a2de (16:62de)
+LanceSetEntranceBlocks:
 ; Replaces the tile blocks so the player can't leave.
 	push bc
 	ld [wNewTileBlockID], a
@@ -34,15 +34,15 @@
 	ld [wNewTileBlockID], a
 	lb bc, 6, 3
 
-LanceSetEntranceBlock: ; 5a2f0 (16:62f0)
+LanceSetEntranceBlock:
 	predef_jump ReplaceTileBlock
 
-ResetLanceScript: ; 5a2f5 (16:62f5)
+ResetLanceScript:
 	xor a
 	ld [wLanceCurScript], a
 	ret
 
-LanceScriptPointers: ; 5a2fa (16:62fa)
+LanceScriptPointers:
 	dw LanceScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw LanceScript2
@@ -49,10 +49,10 @@
 	dw LanceScript3
 	dw LanceScript4
 
-LanceScript4: ; 5a304 (16:6304)
+LanceScript4:
 	ret
 
-LanceScript0: ; 5a305 (16:6305)
+LanceScript0:
 	CheckEvent EVENT_BEAT_LANCE
 	ret nz
 	ld hl, LanceTriggerMovementCoords
@@ -77,7 +77,7 @@
 	call PlaySound
 	jp LanceShowOrHideEntranceBlocks
 
-LanceTriggerMovementCoords: ; 5a33e (16:633e)
+LanceTriggerMovementCoords:
 	db $01,$05
 	db $02,$06
 	db $0B,$05
@@ -85,7 +85,7 @@
 	db $10,$18
 	db $FF
 
-LanceScript2: ; 5a349 (16:6349)
+LanceScript2:
 	call EndTrainerBattle
 	ld a, [wIsInBattle]
 	cp $ff
@@ -94,7 +94,7 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-WalkToLance: ; 5a35b (16:635b)
+WalkToLance:
 ; Moves the player down the hallway to Lance's room.
 	ld a, $ff
 	ld [wJoyIgnore], a
@@ -109,7 +109,7 @@
 	ld [wCurMapScript], a
 	ret
 
-WalkToLance_RLEList: ; 5a379 (16:6379)
+WalkToLance_RLEList:
 	db D_UP, $0C
 	db D_LEFT, $0C
 	db D_DOWN, $07
@@ -116,7 +116,7 @@
 	db D_LEFT, $06
 	db $FF
 
-LanceScript3: ; 5a382 (16:6382)
+LanceScript3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -127,11 +127,11 @@
 	ld [wCurMapScript], a
 	ret
 
-LanceTextPointers: ; 5a395 (16:6395)
+LanceTextPointers:
 	dw LanceText1
 
-LanceTrainerHeaders: ; 5a397 (16:6397)
-LanceTrainerHeader0: ; 5a397 (16:6397)
+LanceTrainerHeaders:
+LanceTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_LANCES_ROOM_TRAINER_0
@@ -142,21 +142,21 @@
 
 	db $ff
 
-LanceText1: ; 5a3a4 (16:63a4)
+LanceText1:
 	TX_ASM
 	ld hl, LanceTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-LanceBeforeBattleText: ; 5a3ae (16:63ae)
+LanceBeforeBattleText:
 	TX_FAR _LanceBeforeBattleText
 	db "@"
 
-LanceEndBattleText: ; 5a3b3 (16:63b3)
+LanceEndBattleText:
 	TX_FAR _LanceEndBattleText
 	db "@"
 
-LanceAfterBattleText: ; 5a3b8 (16:63b8)
+LanceAfterBattleText:
 	TX_FAR _LanceAfterBattleText
 	TX_ASM
 	SetEvent EVENT_BEAT_LANCE
--- a/scripts/lavenderhouse1.asm
+++ b/scripts/lavenderhouse1.asm
@@ -1,8 +1,8 @@
-LavenderHouse1Script: ; 1d8a8 (7:58a8)
+LavenderHouse1Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-LavenderHouse1TextPointers: ; 1d8ac (7:58ac)
+LavenderHouse1TextPointers:
 	dw LavenderHouse1Text1
 	dw LavenderHouse1Text2
 	dw LavenderHouse1Text3
@@ -10,7 +10,7 @@
 	dw LavenderHouse1Text5
 	dw LavenderHouse1Text6
 
-LavenderHouse1Text1: ; 1d8b8 (7:58b8)
+LavenderHouse1Text1:
 	TX_ASM
 	CheckEvent EVENT_RESCUED_MR_FUJI
 	jr nz, .asm_72e5d
@@ -23,15 +23,15 @@
 .asm_6957f
 	jp TextScriptEnd
 
-LavenderHouse1Text_1d8d1: ; 1d8d1 (7:58d1)
+LavenderHouse1Text_1d8d1:
 	TX_FAR _LavenderHouse1Text_1d8d1
 	db "@"
 
-LavenderHouse1Text_1d8d6: ; 1d8d6 (7:58d6)
+LavenderHouse1Text_1d8d6:
 	TX_FAR _LavenderHouse1Text_1d8d6
 	db "@"
 
-LavenderHouse1Text2: ; 1d8db (7:58db)
+LavenderHouse1Text2:
 	TX_ASM
 	CheckEvent EVENT_RESCUED_MR_FUJI
 	jr nz, .asm_06470
@@ -44,15 +44,15 @@
 .asm_3d208
 	jp TextScriptEnd
 
-LavenderHouse1Text_1d8f4: ; 1d8f4 (7:58f4)
+LavenderHouse1Text_1d8f4:
 	TX_FAR _LavenderHouse1Text_1d8f4
 	db "@"
 
-LavenderHouse1Text_1d8f9: ; 1d8f9 (7:58f9)
+LavenderHouse1Text_1d8f9:
 	TX_FAR _LavenderHouse1Text_1d8f9
 	db "@"
 
-LavenderHouse1Text3: ; 1d8fe (7:58fe)
+LavenderHouse1Text3:
 	TX_FAR _LavenderHouse1Text3
 	TX_ASM
 	ld a, PSYDUCK
@@ -59,7 +59,7 @@
 	call PlayCry
 	jp TextScriptEnd
 
-LavenderHouse1Text4: ; 1d90b (7:590b)
+LavenderHouse1Text4:
 	TX_FAR _LavenderHouse1Text4
 	TX_ASM
 	ld a, NIDORINO
@@ -66,7 +66,7 @@
 	call PlayCry
 	jp TextScriptEnd
 
-LavenderHouse1Text5: ; 1d918 (7:5918)
+LavenderHouse1Text5:
 	TX_ASM
 	CheckEvent EVENT_GOT_POKE_FLUTE
 	jr nz, .asm_15ac2
@@ -89,24 +89,24 @@
 .asm_da749
 	jp TextScriptEnd
 
-LavenderHouse1Text_1d94c: ; 1d94c (7:594c)
+LavenderHouse1Text_1d94c:
 	TX_FAR _LavenderHouse1Text_1d94c
 	db "@"
 
-ReceivedFluteText: ; 1d951 (7:5951)
+ReceivedFluteText:
 	TX_FAR _ReceivedFluteText
 	db $11
 	TX_FAR _FluteExplanationText
 	db "@"
 
-FluteNoRoomText: ; 1d95b (7:595b)
+FluteNoRoomText:
 	TX_FAR _FluteNoRoomText
 	db "@"
 
-MrFujiAfterFluteText: ; 1d960 (7:5960)
+MrFujiAfterFluteText:
 	TX_FAR _MrFujiAfterFluteText
 	db "@"
 
-LavenderHouse1Text6: ; 1d965 (7:5965)
+LavenderHouse1Text6:
 	TX_FAR _LavenderHouse1Text6
 	db "@"
--- a/scripts/lavenderhouse2.asm
+++ b/scripts/lavenderhouse2.asm
@@ -1,12 +1,12 @@
-LavenderHouse2Script: ; 1d9ae (7:59ae)
+LavenderHouse2Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-LavenderHouse2TextPointers: ; 1d9b2 (7:59b2)
+LavenderHouse2TextPointers:
 	dw LavenderHouse2Text1
 	dw LavenderHouse2Text2
 
-LavenderHouse2Text1: ; 1d9b6 (7:59b6)
+LavenderHouse2Text1:
 	TX_FAR _LavenderHouse2Text1
 	TX_ASM
 	ld a, CUBONE
@@ -13,7 +13,7 @@
 	call PlayCry
 	jp TextScriptEnd
 
-LavenderHouse2Text2: ; 1d9c3 (7:59c3)
+LavenderHouse2Text2:
 	TX_ASM
 	CheckEvent EVENT_RESCUED_MR_FUJI
 	jr nz, .asm_65711
@@ -26,10 +26,10 @@
 .asm_64be1
 	jp TextScriptEnd
 
-LavenderHouse2Text_1d9dc: ; 1d9dc (7:59dc)
+LavenderHouse2Text_1d9dc:
 	TX_FAR _LavenderHouse2Text_1d9dc
 	db "@"
 
-LavenderHouse2Text_1d9e1: ; 1d9e1 (7:59e1)
+LavenderHouse2Text_1d9e1:
 	TX_FAR _LavenderHouse2Text_1d9e1
 	db "@"
--- a/scripts/lavendertown.asm
+++ b/scripts/lavendertown.asm
@@ -1,7 +1,7 @@
-LavenderTownScript: ; 4410b (11:410b)
+LavenderTownScript:
 	jp EnableAutoTextBoxDrawing
 
-LavenderTownTextPointers: ; 4410e (11:410e)
+LavenderTownTextPointers:
 	dw LavenderTownText1
 	dw LavenderTownText2
 	dw LavenderTownText3
@@ -12,7 +12,7 @@
 	dw LavenderTownText8
 	dw LavenderTownText9
 
-LavenderTownText1: ; 44120 (11:4120)
+LavenderTownText1:
 	TX_ASM
 	ld hl, LavenderTownText_4413c
 	call PrintText
@@ -26,38 +26,38 @@
 	call PrintText
 	jp TextScriptEnd
 
-LavenderTownText_4413c: ; 4413c (11:413c)
+LavenderTownText_4413c:
 	TX_FAR _LavenderTownText_4413c
 	db "@"
 
-LavenderTownText_44141: ; 44141 (11:4141)
+LavenderTownText_44141:
 	TX_FAR _LavenderTownText_44141
 	db "@"
 
-LavenderTownText_44146: ; 44146 (11:4146)
+LavenderTownText_44146:
 	TX_FAR _LavenderTownText_44146
 	db "@"
 
-LavenderTownText2: ; 4414b (11:414b)
+LavenderTownText2:
 	TX_FAR _LavenderTownText2
 	db "@"
 
-LavenderTownText3: ; 44150 (11:4150)
+LavenderTownText3:
 	TX_FAR _LavenderTownText3
 	db "@"
 
-LavenderTownText4: ; 44155 (11:4155)
+LavenderTownText4:
 	TX_FAR _LavenderTownText4
 	db "@"
 
-LavenderTownText5: ; 4415a (11:415a)
+LavenderTownText5:
 	TX_FAR _LavenderTownText5
 	db "@"
 
-LavenderTownText8: ; 4415f (11:415f)
+LavenderTownText8:
 	TX_FAR _LavenderTownText8
 	db "@"
 
-LavenderTownText9: ; 44164 (11:4164)
+LavenderTownText9:
 	TX_FAR _LavenderTownText9
 	db "@"
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -1,4 +1,4 @@
-LoreleiScript: ; 7617b (1d:617b)
+LoreleiScript:
 	call LoreleiShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
 	ld hl, LoreleiTrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wLoreleiCurScript], a
 	ret
 
-LoreleiShowOrHideExitBlock: ; 76191 (1d:6191)
+LoreleiShowOrHideExitBlock:
 ; Blocks or clears the exit to the next room.
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
@@ -27,12 +27,12 @@
 	lb bc, 0, 2
 	predef_jump ReplaceTileBlock
 
-ResetLoreleiScript: ; 761b6 (1d:61b6)
+ResetLoreleiScript:
 	xor a
 	ld [wLoreleiCurScript], a
 	ret
 
-LoreleiScriptPointers: ; 761bb (1d:61bb)
+LoreleiScriptPointers:
 	dw LoreleiScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw LoreleiScript2
@@ -39,10 +39,10 @@
 	dw LoreleiScript3
 	dw LoreleiScript4
 
-LoreleiScript4: ; 761c5 (1d:61c5)
+LoreleiScript4:
 	ret
 
-LoreleiScriptWalkIntoRoom: ; 761c6 (1d:61c6)
+LoreleiScriptWalkIntoRoom:
 ; Walk six steps upward.
 	ld hl, wSimulatedJoypadStatesEnd
 	ld a, D_UP
@@ -60,7 +60,7 @@
 	ld [wCurMapScript], a
 	ret
 
-LoreleiScript0: ; 761e2 (1d:61e2)
+LoreleiScript0:
 	ld hl, LoreleiEntranceCoords
 	call ArePlayerCoordsInArray
 	jp nc, CheckFightingMapTrainers
@@ -88,7 +88,7 @@
 	ld [wCurMapScript], a
 	ret
 
-LoreleiEntranceCoords: ; 76223 (1d:6223)
+LoreleiEntranceCoords:
 	db $0A,$04
 	db $0A,$05
 	db $0B,$04
@@ -95,7 +95,7 @@
 	db $0B,$05
 	db $FF
 
-LoreleiScript3: ; 7622c (1d:622c)
+LoreleiScript3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -106,7 +106,7 @@
 	ld [wCurMapScript], a
 	ret
 
-LoreleiScript2: ; 7623f (1d:623f)
+LoreleiScript2:
 	call EndTrainerBattle
 	ld a, [wIsInBattle]
 	cp $ff
@@ -115,12 +115,12 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-LoreleiTextPointers: ; 76251 (1d:6251)
+LoreleiTextPointers:
 	dw LoreleiText1
 	dw LoreleiDontRunAwayText
 
-LoreleiTrainerHeaders: ; 76255 (1d:6255)
-LoreleiTrainerHeader0: ; 76255 (1d:6255)
+LoreleiTrainerHeaders:
+LoreleiTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_LORELEIS_ROOM_TRAINER_0
@@ -131,24 +131,24 @@
 
 	db $ff
 
-LoreleiText1: ; 76262 (1d:6262)
+LoreleiText1:
 	TX_ASM
 	ld hl, LoreleiTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-LoreleiBeforeBattleText: ; 7626c (1d:626c)
+LoreleiBeforeBattleText:
 	TX_FAR _LoreleiBeforeBattleText
 	db "@"
 
-LoreleiEndBattleText: ; 76271 (1d:6271)
+LoreleiEndBattleText:
 	TX_FAR _LoreleiEndBattleText
 	db "@"
 
-LoreleiAfterBattleText: ; 76276 (1d:6276)
+LoreleiAfterBattleText:
 	TX_FAR _LoreleiAfterBattleText
 	db "@"
 
-LoreleiDontRunAwayText: ; 7627b (1d:627b)
+LoreleiDontRunAwayText:
 	TX_FAR _LoreleiDontRunAwayText
 	db "@"
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@@ -1,4 +1,4 @@
-Mansion1Script: ; 442af (11:42af)
+Mansion1Script:
 	call Mansion1Subscript1
 	call EnableAutoTextBoxDrawing
 	ld hl, Mansion1TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wMansion1CurScript], a
 	ret
 
-Mansion1Subscript1: ; 442c5 (11:42c5)
+Mansion1Subscript1:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -33,19 +33,19 @@
 	lb bc, 13, 13
 	jp Mansion1Script_4430b
 
-Mansion1Script_44304: ; 44304 (11:4304)
+Mansion1Script_44304:
 	ld a, $2d
 	ld [wNewTileBlockID], a
 	jr Mansion1ReplaceBlock
 
-Mansion1Script_4430b: ; 4430b (11:430b)
+Mansion1Script_4430b:
 	ld a, $e
 	ld [wNewTileBlockID], a
-Mansion1ReplaceBlock: ; 44310 (11:4310)
+Mansion1ReplaceBlock:
 	predef ReplaceTileBlock
 	ret
 
-Mansion1Script_Switches: ; 44316 (11:4316)
+Mansion1Script_Switches:
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
@@ -55,19 +55,19 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion1ScriptPointers: ; 44326 (11:4326)
+Mansion1ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Mansion1TextPointers: ; 4432c (11:432c)
+Mansion1TextPointers:
 	dw Mansion1Text1
 	dw PickUpItemText
 	dw PickUpItemText
 	dw Mansion1Text4
 
-Mansion1TrainerHeaders: ; 44334 (11:4334)
-Mansion1TrainerHeader0: ; 44334 (11:4334)
+Mansion1TrainerHeaders:
+Mansion1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MANSION_1_TRAINER_0
@@ -78,25 +78,25 @@
 
 	db $ff
 
-Mansion1Text1: ; 44341 (11:4341)
+Mansion1Text1:
 	TX_ASM
 	ld hl, Mansion1TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Mansion1BattleText2: ; 4434b (11:434b)
+Mansion1BattleText2:
 	TX_FAR _Mansion1BattleText2
 	db "@"
 
-Mansion1EndBattleText2: ; 44350 (11:4350)
+Mansion1EndBattleText2:
 	TX_FAR _Mansion1EndBattleText2
 	db "@"
 
-Mansion1AfterBattleText2: ; 44355 (11:4355)
+Mansion1AfterBattleText2:
 	TX_FAR _Mansion1AfterBattleText2
 	db "@"
 
-Mansion1Text4: ; 4435a (11:435a)
+Mansion1Text4:
 	TX_ASM
 	ld hl, MansionSwitchText
 	call PrintText
@@ -122,14 +122,14 @@
 .asm_44392
 	jp TextScriptEnd
 
-MansionSwitchText: ; 44395 (11:4395)
+MansionSwitchText:
 	TX_FAR _MansionSwitchText
 	db "@"
 
-MansionSwitchPressedText: ; 4439a (11:439a)
+MansionSwitchPressedText:
 	TX_FAR _MansionSwitchPressedText
 	db "@"
 
-MansionSwitchNotPressedText: ; 4439f (11:439f)
+MansionSwitchNotPressedText:
 	TX_FAR _MansionSwitchNotPressedText
 	db "@"
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -1,4 +1,4 @@
-Mansion2Script: ; 51fd8 (14:5fd8)
+Mansion2Script:
 	call Mansion2Script_51fee
 	call EnableAutoTextBoxDrawing
 	ld hl, Mansion2TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wMansion2CurScript], a
 	ret
 
-Mansion2Script_51fee: ; 51fee (14:5fee)
+Mansion2Script_51fee:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -37,11 +37,11 @@
 	call Mansion2Script_5202f
 	ret
 
-Mansion2Script_5202f: ; 5202f (14:602f)
+Mansion2Script_5202f:
 	ld [wNewTileBlockID], a
 	predef_jump ReplaceTileBlock
 
-Mansion2Script_Switches: ; 52037 (14:6037)
+Mansion2Script_Switches:
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
@@ -51,12 +51,12 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion2ScriptPointers: ; 52047 (14:6047)
+Mansion2ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Mansion2TextPointers: ; 5204d (14:604d)
+Mansion2TextPointers:
 	dw Mansion2Text1
 	dw PickUpItemText
 	dw Mansion2Text3
@@ -63,8 +63,8 @@
 	dw Mansion2Text4
 	dw Mansion2Text5
 
-Mansion2TrainerHeaders: ; 52057 (14:6057)
-Mansion2TrainerHeader0: ; 52057 (14:6057)
+Mansion2TrainerHeaders:
+Mansion2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MANSION_2_TRAINER_0
@@ -75,34 +75,34 @@
 
 	db $ff
 
-Mansion2Text1: ; 52064 (14:6064)
+Mansion2Text1:
 	TX_ASM
 	ld hl, Mansion2TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Mansion2BattleText1: ; 5206e (14:606e)
+Mansion2BattleText1:
 	TX_FAR _Mansion2BattleText1
 	db "@"
 
-Mansion2EndBattleText1: ; 52073 (14:6073)
+Mansion2EndBattleText1:
 	TX_FAR _Mansion2EndBattleText1
 	db "@"
 
-Mansion2AfterBattleText1: ; 52078 (14:6078)
+Mansion2AfterBattleText1:
 	TX_FAR _Mansion2AfterBattleText1
 	db "@"
 
-Mansion2Text3: ; 5207d (14:607d)
+Mansion2Text3:
 	TX_FAR _Mansion2Text3
 	db "@"
 
-Mansion2Text4: ; 52082 (14:6082)
+Mansion2Text4:
 	TX_FAR _Mansion2Text4
 	db "@"
 
-Mansion3Text6: ; 52087 (14:6087)
-Mansion2Text5: ; 52087 (14:6087)
+Mansion3Text6:
+Mansion2Text5:
 	TX_ASM
 	ld hl, Mansion2Text_520c2
 	call PrintText
@@ -128,14 +128,14 @@
 .asm_520bf
 	jp TextScriptEnd
 
-Mansion2Text_520c2: ; 520c2 (14:60c2)
+Mansion2Text_520c2:
 	TX_FAR _Mansion2Text_520c2
 	db "@"
 
-Mansion2Text_520c7: ; 520c7 (14:60c7)
+Mansion2Text_520c7:
 	TX_FAR _Mansion2Text_520c7
 	db "@"
 
-Mansion2Text_520cc: ; 520cc (14:60cc)
+Mansion2Text_520cc:
 	TX_FAR _Mansion2Text_520cc
 	db "@"
--- a/scripts/mansion3.asm
+++ b/scripts/mansion3.asm
@@ -1,4 +1,4 @@
-Mansion3Script: ; 521ee (14:61ee)
+Mansion3Script:
 	call Mansion3Script_52204
 	call EnableAutoTextBoxDrawing
 	ld hl, Mansion3TrainerHeader0
@@ -8,7 +8,7 @@
 	ld [wMansion3CurScript], a
 	ret
 
-Mansion3Script_52204: ; 52204 (14:6204)
+Mansion3Script_52204:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -31,12 +31,12 @@
 	call Mansion2Script_5202f
 	ret
 
-Mansion3ScriptPointers: ; 52235 (14:6235)
+Mansion3ScriptPointers:
 	dw Mansion3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Mansion3Script0: ; 5223b (14:623b)
+Mansion3Script0:
 	ld hl, CoordsData_52254
 	call Mansion3Script_5225b
 	ld a, [wWhichDungeonWarp]
@@ -50,13 +50,13 @@
 	ld [wDungeonWarpDestinationMap], a
 	ret
 
-CoordsData_52254: ; 52254 (14:6254)
+CoordsData_52254:
 	db $0E,$10
 	db $0E,$11
 	db $0E,$13
 	db $FF
 
-Mansion3Script_5225b: ; 5225b (14:625b)
+Mansion3Script_5225b:
 	xor a
 	ld [wWhichDungeonWarp], a
 	ld a, [wd72d]
@@ -72,7 +72,7 @@
 	set 4, [hl]
 	ret
 
-Mansion3Script_Switches: ; 5227a (14:627a)
+Mansion3Script_Switches:
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
@@ -82,7 +82,7 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion3TextPointers: ; 5228a (14:628a)
+Mansion3TextPointers:
 	dw Mansion3Text1
 	dw Mansion3Text2
 	dw PickUpItemText
@@ -90,8 +90,8 @@
 	dw Mansion3Text5
 	dw Mansion3Text6
 
-Mansion3TrainerHeaders: ; 52296 (14:6296)
-Mansion3TrainerHeader0: ; 52296 (14:6296)
+Mansion3TrainerHeaders:
+Mansion3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_0
@@ -100,7 +100,7 @@
 	dw Mansion3EndBattleText1 ; TextEndBattle
 	dw Mansion3EndBattleText1 ; TextEndBattle
 
-Mansion3TrainerHeader2: ; 522a2 (14:62a2)
+Mansion3TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_2
@@ -111,42 +111,42 @@
 
 	db $ff
 
-Mansion3Text1: ; 522af (14:62af)
+Mansion3Text1:
 	TX_ASM
 	ld hl, Mansion3TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Mansion3Text2: ; 522b9 (14:62b9)
+Mansion3Text2:
 	TX_ASM
 	ld hl, Mansion3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Mansion3BattleText1: ; 522c3 (14:62c3)
+Mansion3BattleText1:
 	TX_FAR _Mansion3BattleText1
 	db "@"
 
-Mansion3EndBattleText1: ; 522c8 (14:62c8)
+Mansion3EndBattleText1:
 	TX_FAR _Mansion3EndBattleText1
 	db "@"
 
-Mansion3AfterBattleText1: ; 522cd (14:62cd)
+Mansion3AfterBattleText1:
 	TX_FAR _Mansion3AfterBattleText1
 	db "@"
 
-Mansion3BattleText2: ; 522d2 (14:62d2)
+Mansion3BattleText2:
 	TX_FAR _Mansion3BattleText2
 	db "@"
 
-Mansion3EndBattleText2: ; 522d7 (14:62d7)
+Mansion3EndBattleText2:
 	TX_FAR _Mansion3EndBattleText2
 	db "@"
 
-Mansion3AfterBattleText2: ; 522dc (14:62dc)
+Mansion3AfterBattleText2:
 	TX_FAR _Mansion3AfterBattleText2
 	db "@"
 
-Mansion3Text5: ; 522e1 (14:62e1)
+Mansion3Text5:
 	TX_FAR _Mansion3Text5
 	db "@"
--- a/scripts/mansion4.asm
+++ b/scripts/mansion4.asm
@@ -1,4 +1,4 @@
-Mansion4Script: ; 523b9 (14:63b9)
+Mansion4Script:
 	call Mansion4Script_523cf
 	call EnableAutoTextBoxDrawing
 	ld hl, Mansion4TrainerHeader0
@@ -8,7 +8,7 @@
 	ld [wMansion4CurScript], a
 	ret
 
-Mansion4Script_523cf: ; 523cf (14:63cf)
+Mansion4Script_523cf:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -43,7 +43,7 @@
 	call Mansion2Script_5202f
 	ret
 
-Mansion4Script_Switches: ; 52420 (14:6420)
+Mansion4Script_Switches:
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
@@ -53,12 +53,12 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion4ScriptPointers: ; 52430 (14:6430)
+Mansion4ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Mansion4TextPointers: ; 52436 (14:6436)
+Mansion4TextPointers:
 	dw Mansion4Text1
 	dw Mansion4Text2
 	dw PickUpItemText
@@ -69,8 +69,8 @@
 	dw PickUpItemText
 	dw Mansion3Text6
 
-Mansion4TrainerHeaders: ; 52448 (14:6448)
-Mansion4TrainerHeader0: ; 52448 (14:6448)
+Mansion4TrainerHeaders:
+Mansion4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_0
@@ -79,7 +79,7 @@
 	dw Mansion4EndBattleText1 ; TextEndBattle
 	dw Mansion4EndBattleText1 ; TextEndBattle
 
-Mansion4TrainerHeader2: ; 52454 (14:6454)
+Mansion4TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_2
@@ -90,42 +90,42 @@
 
 	db $ff
 
-Mansion4Text1: ; 52461 (14:6461)
+Mansion4Text1:
 	TX_ASM
 	ld hl, Mansion4TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Mansion4Text2: ; 5246b (14:646b)
+Mansion4Text2:
 	TX_ASM
 	ld hl, Mansion4TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Mansion4BattleText1: ; 52475 (14:6475)
+Mansion4BattleText1:
 	TX_FAR _Mansion4BattleText1
 	db "@"
 
-Mansion4EndBattleText1: ; 5247a (14:647a)
+Mansion4EndBattleText1:
 	TX_FAR _Mansion4EndBattleText1
 	db "@"
 
-Mansion4AfterBattleText1: ; 5247f (14:647f)
+Mansion4AfterBattleText1:
 	TX_FAR _Mansion4AfterBattleText1
 	db "@"
 
-Mansion4BattleText2: ; 52484 (14:6484)
+Mansion4BattleText2:
 	TX_FAR _Mansion4BattleText2
 	db "@"
 
-Mansion4EndBattleText2: ; 52489 (14:6489)
+Mansion4EndBattleText2:
 	TX_FAR _Mansion4EndBattleText2
 	db "@"
 
-Mansion4AfterBattleText2: ; 5248e (14:648e)
+Mansion4AfterBattleText2:
 	TX_FAR _Mansion4AfterBattleText2
 	db "@"
 
-Mansion4Text7: ; 52493 (14:6493)
+Mansion4Text7:
 	TX_FAR _Mansion4Text7
 	db "@"
--- a/scripts/mtmoon1.asm
+++ b/scripts/mtmoon1.asm
@@ -1,4 +1,4 @@
-MtMoon1Script: ; 499c8 (12:59c8)
+MtMoon1Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, MtMoon1TrainerHeader0
 	ld de, MtMoon1ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wMtMoon1CurScript], a
 	ret
 
-MtMoon1ScriptPointers: ; 499db (12:59db)
+MtMoon1ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-MtMoon1TextPointers: ; 499e1 (12:59e1)
+MtMoon1TextPointers:
 	dw MtMoon1Text1
 	dw MtMoon1Text2
 	dw MtMoon1Text3
@@ -28,8 +28,8 @@
 	dw PickUpItemText
 	dw MtMoon1Text14
 
-MtMoon1TrainerHeaders: ; 499fd (12:59fd)
-MtMoon1TrainerHeader0: ; 499fd (12:59fd)
+MtMoon1TrainerHeaders:
+MtMoon1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_0
@@ -38,7 +38,7 @@
 	dw MtMoon1EndBattleText2 ; TextEndBattle
 	dw MtMoon1EndBattleText2 ; TextEndBattle
 
-MtMoon1TrainerHeader2: ; 49a09 (12:5a09)
+MtMoon1TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2
@@ -47,7 +47,7 @@
 	dw MtMoon1EndBattleText3 ; TextEndBattle
 	dw MtMoon1EndBattleText3 ; TextEndBattle
 
-MtMoon1TrainerHeader3: ; 49a15 (12:5a15)
+MtMoon1TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3
@@ -56,7 +56,7 @@
 	dw MtMoon1EndBattleText4 ; TextEndBattle
 	dw MtMoon1EndBattleText4 ; TextEndBattle
 
-MtMoon1TrainerHeader4: ; 49a21 (12:5a21)
+MtMoon1TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4
@@ -65,7 +65,7 @@
 	dw MtMoon1EndBattleText5 ; TextEndBattle
 	dw MtMoon1EndBattleText5 ; TextEndBattle
 
-MtMoon1TrainerHeader5: ; 49a2d (12:5a2d)
+MtMoon1TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5
@@ -74,7 +74,7 @@
 	dw MtMoon1EndBattleText6 ; TextEndBattle
 	dw MtMoon1EndBattleText6 ; TextEndBattle
 
-MtMoon1TrainerHeader6: ; 49a39 (12:5a39)
+MtMoon1TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6
@@ -83,7 +83,7 @@
 	dw MtMoon1EndBattleText7 ; TextEndBattle
 	dw MtMoon1EndBattleText7 ; TextEndBattle
 
-MtMoon1TrainerHeader7: ; 49a45 (12:5a45)
+MtMoon1TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_7
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_7
@@ -94,132 +94,132 @@
 
 	db $ff
 
-MtMoon1Text1: ; 49a52 (12:5a52)
+MtMoon1Text1:
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon1Text2: ; 49a5c (12:5a5c)
+MtMoon1Text2:
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon1Text3: ; 49a66 (12:5a66)
+MtMoon1Text3:
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon1Text4: ; 49a70 (12:5a70)
+MtMoon1Text4:
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon1Text5: ; 49a7a (12:5a7a)
+MtMoon1Text5:
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon1Text6: ; 49a84 (12:5a84)
+MtMoon1Text6:
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon1Text7: ; 49a8e (12:5a8e)
+MtMoon1Text7:
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon1BattleText2: ; 49a98 (12:5a98)
+MtMoon1BattleText2:
 	TX_FAR _MtMoon1BattleText2
 	db "@"
 
-MtMoon1EndBattleText2: ; 49a9d (12:5a9d)
+MtMoon1EndBattleText2:
 	TX_FAR _MtMoon1EndBattleText2
 	db "@"
 
-MtMoon1AfterBattleText2: ; 49aa2 (12:5aa2)
+MtMoon1AfterBattleText2:
 	TX_FAR _MtMoon1AfterBattleText2
 	db "@"
 
-MtMoon1BattleText3: ; 49aa7 (12:5aa7)
+MtMoon1BattleText3:
 	TX_FAR _MtMoon1BattleText3
 	db "@"
 
-MtMoon1EndBattleText3: ; 49aac (12:5aac)
+MtMoon1EndBattleText3:
 	TX_FAR _MtMoon1EndBattleText3
 	db "@"
 
-MtMoon1AfterBattleText3: ; 49ab1 (12:5ab1)
+MtMoon1AfterBattleText3:
 	TX_FAR _MtMoon1AfterBattleText3
 	db "@"
 
-MtMoon1BattleText4: ; 49ab6 (12:5ab6)
+MtMoon1BattleText4:
 	TX_FAR _MtMoon1BattleText4
 	db "@"
 
-MtMoon1EndBattleText4: ; 49abb (12:5abb)
+MtMoon1EndBattleText4:
 	TX_FAR _MtMoon1EndBattleText4
 	db "@"
 
-MtMoon1AfterBattleText4: ; 49ac0 (12:5ac0)
+MtMoon1AfterBattleText4:
 	TX_FAR _MtMoon1AfterBattleText4
 	db "@"
 
-MtMoon1BattleText5: ; 49ac5 (12:5ac5)
+MtMoon1BattleText5:
 	TX_FAR _MtMoon1BattleText5
 	db "@"
 
-MtMoon1EndBattleText5: ; 49aca (12:5aca)
+MtMoon1EndBattleText5:
 	TX_FAR _MtMoon1EndBattleText5
 	db "@"
 
-MtMoon1AfterBattleText5: ; 49acf (12:5acf)
+MtMoon1AfterBattleText5:
 	TX_FAR _MtMoon1AfterBattleText5
 	db "@"
 
-MtMoon1BattleText6: ; 49ad4 (12:5ad4)
+MtMoon1BattleText6:
 	TX_FAR _MtMoon1BattleText6
 	db "@"
 
-MtMoon1EndBattleText6: ; 49ad9 (12:5ad9)
+MtMoon1EndBattleText6:
 	TX_FAR _MtMoon1EndBattleText6
 	db "@"
 
-MtMoon1AfterBattleText6: ; 49ade (12:5ade)
+MtMoon1AfterBattleText6:
 	TX_FAR _MtMoon1AfterBattleText6
 	db "@"
 
-MtMoon1BattleText7: ; 49ae3 (12:5ae3)
+MtMoon1BattleText7:
 	TX_FAR _MtMoon1BattleText7
 	db "@"
 
-MtMoon1EndBattleText7: ; 49ae8 (12:5ae8)
+MtMoon1EndBattleText7:
 	TX_FAR _MtMoon1EndBattleText7
 	db "@"
 
-MtMoon1AfterBattleText7: ; 49aed (12:5aed)
+MtMoon1AfterBattleText7:
 	TX_FAR _MtMoon1AfterBattleText7
 	db "@"
 
-MtMoon1BattleText8: ; 49af2 (12:5af2)
+MtMoon1BattleText8:
 	TX_FAR _MtMoon1BattleText8
 	db "@"
 
-MtMoon1EndBattleText8: ; 49af7 (12:5af7)
+MtMoon1EndBattleText8:
 	TX_FAR _MtMoon1EndBattleText8
 	db "@"
 
-MtMoon1AfterBattleText8: ; 49afc (12:5afc)
+MtMoon1AfterBattleText8:
 	TX_FAR _MtMoon1AfterBattleText8
 	db "@"
 
-MtMoon1Text14: ; 49b01 (12:5b01)
+MtMoon1Text14:
 	TX_FAR _MtMoon1Text14
 	db "@"
--- a/scripts/mtmoon2.asm
+++ b/scripts/mtmoon2.asm
@@ -1,10 +1,10 @@
-MtMoon2Script: ; 51a42 (14:5a42)
+MtMoon2Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-MtMoon2TextPointers: ; 51a46 (14:5a46)
+MtMoon2TextPointers:
 	dw MtMoonText1
 
-MtMoonText1: ; 51a48 (14:5a48)
+MtMoonText1:
 	TX_FAR _MtMoonText1
 	db "@"
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@@ -1,4 +1,4 @@
-MtMoon3Script: ; 49d0b (12:5d0b)
+MtMoon3Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, MtMoon3TrainerHeader0
 	ld de, MtMoon3ScriptPointers
@@ -18,7 +18,7 @@
 	res 4, [hl]
 	ret
 
-CoordsData_49d37: ; 49d37 (12:5d37)
+CoordsData_49d37:
 	db $05,$0B
 	db $05,$0C
 	db $05,$0D
@@ -37,7 +37,7 @@
 	db $08,$0E
 	db $FF
 
-MtMoon3Script_49d58: ; 49d58 (12:5d58)
+MtMoon3Script_49d58:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wMtMoon3CurScript], a
@@ -44,7 +44,7 @@
 	ld [wCurMapScript], a
 	ret
 
-MtMoon3ScriptPointers: ; 49d63 (12:5d63)
+MtMoon3ScriptPointers:
 	dw MtMoon3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -52,7 +52,7 @@
 	dw MtMoon3Script4
 	dw MtMoon3Script5
 
-MtMoon3Script0: ; 49d6f (12:5d6f)
+MtMoon3Script0:
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	jp nz, MtMoon3Script_49d91
 	ld a, [wYCoord]
@@ -67,12 +67,12 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-MtMoon3Script_49d91: ; 49d91 (12:5d91)
+MtMoon3Script_49d91:
 	CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL
 	jp z, CheckFightingMapTrainers
 	ret
 
-MtMoon3Script3: ; 49d9a (12:5d9a)
+MtMoon3Script3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, MtMoon3Script_49d58
@@ -86,7 +86,7 @@
 	ld [wCurMapScript], a
 	ret
 
-MtMoon3Script4: ; 49dba (12:5dba)
+MtMoon3Script4:
 	ld a, $1
 	ld [H_SPRITEINDEX], a
 	call SetSpriteMovementBytesToFF
@@ -109,25 +109,25 @@
 	ld [wCurMapScript], a
 	ret
 
-CoordsData_49dea: ; 49dea (12:5dea)
+CoordsData_49dea:
 	db $07,$0C
 	db $06,$0B
 	db $05,$0C
 	db $FF
 
-CoordsData_49df1: ; 49df1 (12:5df1)
+CoordsData_49df1:
 	db $07,$0D
 	db $06,$0E
 	db $05,$0E
 	db $FF
 
-MovementData_49df8: ; 49df8 (12:5df8)
+MovementData_49df8:
 	db NPC_MOVEMENT_RIGHT
 
-MovementData_49df9: ; 49df9 (12:5df9)
+MovementData_49df9:
 	db NPC_MOVEMENT_UP,$FF
 
-MtMoon3Script5: ; 49dfb (12:5dfb)
+MtMoon3Script5:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -154,7 +154,7 @@
 	ld [wCurMapScript], a
 	ret
 
-MtMoon3TextPointers: ; 49e34 (12:5e34)
+MtMoon3TextPointers:
 	dw MtMoon3Text1
 	dw MtMoon3Text2
 	dw MtMoon3Text3
@@ -166,8 +166,8 @@
 	dw PickUpItemText
 	dw MtMoon3Text_49f99
 
-MtMoon3TrainerHeaders: ; 49e48 (12:5e48)
-MtMoon3TrainerHeader0: ; 49e48 (12:5e48)
+MtMoon3TrainerHeaders:
+MtMoon3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_0
@@ -176,7 +176,7 @@
 	dw MtMoon3EndBattleText2 ; TextEndBattle
 	dw MtMoon3EndBattleText2 ; TextEndBattle
 
-MtMoon3TrainerHeader2: ; 49e54 (12:5e54)
+MtMoon3TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2
@@ -185,7 +185,7 @@
 	dw MtMoon3EndBattleText3 ; TextEndBattle
 	dw MtMoon3EndBattleText3 ; TextEndBattle
 
-MtMoon3TrainerHeader3: ; 49e60 (12:5e60)
+MtMoon3TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3
@@ -194,7 +194,7 @@
 	dw MtMoon3EndBattleText4 ; TextEndBattle
 	dw MtMoon3EndBattleText4 ; TextEndBattle
 
-MtMoon3TrainerHeader4: ; 49e6c (12:5e6c)
+MtMoon3TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_4
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_4
@@ -205,7 +205,7 @@
 
 	db $ff
 
-MtMoon3Text1: ; 49e79 (12:5e79)
+MtMoon3Text1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	jr z, .asm_49e8d
@@ -237,31 +237,31 @@
 .asm_49ebe
 	jp TextScriptEnd
 
-MtMoon3Text2: ; 49ec1 (12:5ec1)
+MtMoon3Text2:
 	TX_ASM
 	ld hl, MtMoon3TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon3Text3: ; 49ecb (12:5ecb)
+MtMoon3Text3:
 	TX_ASM
 	ld hl, MtMoon3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon3Text4: ; 49ed5 (12:5ed5)
+MtMoon3Text4:
 	TX_ASM
 	ld hl, MtMoon3TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon3Text5: ; 49edf (12:5edf)
+MtMoon3Text5:
 	TX_ASM
 	ld hl, MtMoon3TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon3Text6: ; 49ee9 (12:5ee9)
+MtMoon3Text6:
 	TX_ASM
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -285,11 +285,11 @@
 .asm_49f21
 	jp TextScriptEnd
 
-MtMoon3Text_49f24: ; 49f24 (12:5f24)
+MtMoon3Text_49f24:
 	TX_FAR _MtMoon3Text_49f24
 	db "@"
 
-MtMoon3Text7: ; 49f29 (12:5f29)
+MtMoon3Text7:
 	TX_ASM
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -313,91 +313,91 @@
 .asm_49f61
 	jp TextScriptEnd
 
-MtMoon3Text_49f64: ; 49f64 (12:5f64)
+MtMoon3Text_49f64:
 	TX_FAR _MtMoon3Text_49f64
 	db "@"
 
-MtMoon3Script_49f69: ; 49f69 (12:5f69)
+MtMoon3Script_49f69:
 	ld hl, MtMoon3Text_49f6f
 	jp PrintText
 
-MtMoon3Text_49f6f: ; 49f6f (12:5f6f)
+MtMoon3Text_49f6f:
 	TX_FAR _MtMoon3Text_49f6f
 	db $11, $d, "@"
 
-MtMoon3Script_49f76: ; 49f76 (12:5f76)
+MtMoon3Script_49f76:
 	ld hl, MtMoon3Text_49f7f
 	call PrintText
 	jp TextScriptEnd
 
-MtMoon3Text_49f7f: ; 49f7f (12:5f7f)
+MtMoon3Text_49f7f:
 	TX_FAR _MtMoon3Text_49f7f
 	db $d, "@"
 
-MtMoon3Text_49f85: ; 49f85 (12:5f85)
+MtMoon3Text_49f85:
 	TX_FAR _MtMoon3Text_49f85
 	db "@"
 
-MtMoon3Text_49f8a: ; 49f8a (12:5f8a)
+MtMoon3Text_49f8a:
 	TX_FAR _MtMoon3Text_49f8a
 	db "@"
 
-MtMoon3Text_49f8f: ; 49f8f (12:5f8f)
+MtMoon3Text_49f8f:
 	TX_FAR _MtMoon3Text_49f8f
 	db "@"
 
-MtMoon3Text_49f94: ; 49f94 (12:5f94)
+MtMoon3Text_49f94:
 	TX_FAR _MtMoon3Text_49f94
 	db "@"
 
-MtMoon3Text_49f99: ; 49f99 (12:5f99)
+MtMoon3Text_49f99:
 	TX_FAR _MtMoon3Text_49f99
 	db $11, "@"
 
-MtMoon3BattleText2: ; 49f9f (12:5f9f)
+MtMoon3BattleText2:
 	TX_FAR _MtMoon3BattleText2
 	db "@"
 
-MtMoon3EndBattleText2: ; 49fa4 (12:5fa4)
+MtMoon3EndBattleText2:
 	TX_FAR _MtMoon3EndBattleText2
 	db "@"
 
-MtMoon3AfterBattleText2: ; 49fa9 (12:5fa9)
+MtMoon3AfterBattleText2:
 	TX_FAR _MtMoon3AfterBattleText2
 	db "@"
 
-MtMoon3BattleText3: ; 49fae (12:5fae)
+MtMoon3BattleText3:
 	TX_FAR _MtMoon3BattleText3
 	db "@"
 
-MtMoon3EndBattleText3: ; 49fb3 (12:5fb3)
+MtMoon3EndBattleText3:
 	TX_FAR _MtMoon3EndBattleText3
 	db "@"
 
-MtMoon3AfterBattleText3: ; 49fb8 (12:5fb8)
+MtMoon3AfterBattleText3:
 	TX_FAR _MtMoon3AfterBattleText3
 	db "@"
 
-MtMoon3BattleText4: ; 49fbd (12:5fbd)
+MtMoon3BattleText4:
 	TX_FAR _MtMoon3BattleText4
 	db "@"
 
-MtMoon3EndBattleText4: ; 49fc2 (12:5fc2)
+MtMoon3EndBattleText4:
 	TX_FAR _MtMoon3EndBattleText4
 	db "@"
 
-MtMoon3AfterBattleText4: ; 49fc7 (12:5fc7)
+MtMoon3AfterBattleText4:
 	TX_FAR _MtMoon3AfterBattleText4
 	db "@"
 
-MtMoon3BattleText5: ; 49fcc (12:5fcc)
+MtMoon3BattleText5:
 	TX_FAR _MtMoon3BattleText5
 	db "@"
 
-MtMoon3EndBattleText5: ; 49fd1 (12:5fd1)
+MtMoon3EndBattleText5:
 	TX_FAR _MtMoon3EndBattleText5
 	db "@"
 
-MtMoon3AfterBattleText5: ; 49fd6 (12:5fd6)
+MtMoon3AfterBattleText5:
 	TX_FAR _MtMoon3AfterBattleText5
 	db "@"
--- a/scripts/museum1f.asm
+++ b/scripts/museum1f.asm
@@ -1,4 +1,4 @@
-Museum1FScript: ; 5c0f7 (17:40f7)
+Museum1FScript:
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	xor a
@@ -7,11 +7,11 @@
 	ld a, [wMuseum1fCurScript]
 	jp CallFunctionInTable
 
-Museum1FScriptPointers: ; 5c109 (17:4109)
+Museum1FScriptPointers:
 	dw Museum1FScript0
 	dw Museum1FScript1
 
-Museum1FScript0: ; 5c10d (17:410d)
+Museum1FScript0:
 	ld a, [wYCoord]
 	cp $4
 	ret nz
@@ -28,10 +28,10 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Museum1FScript1: ; 5c12a (17:412a)
+Museum1FScript1:
 	ret
 
-Museum1FTextPointers: ; 5c12b (17:412b)
+Museum1FTextPointers:
 	dw Museum1FText1
 	dw Museum1FText2
 	dw Museum1FText3
@@ -38,7 +38,7 @@
 	dw Museum1FText4
 	dw Museum1FText5
 
-Museum1FText1: ; 5c135 (17:4135)
+Museum1FText1:
 	TX_ASM
 	ld a, [wYCoord]
 	cp $4
@@ -123,7 +123,7 @@
 	ld [wMuseum1fCurScript], a
 	jr Museum1FScriptEnd
 
-Museum1FScript_5c1f9: ; 5c1f9 (17:41f9)
+Museum1FScript_5c1f9:
 	ld hl, Museum1FText_5c22e
 	call PrintText
 	call YesNoChoice
@@ -136,56 +136,56 @@
 .asm_d1144
 	ld hl, Museum1FText_5c238
 	call PrintText
-Museum1FScriptEnd: ; 5c217 (17:4217)
+Museum1FScriptEnd:
 	jp TextScriptEnd
 
-Museum1FText_5c21a: ; 5c21a (17:421a)
+Museum1FText_5c21a:
 	TX_FAR _Museum1FText_5c21a
 	db "@"
 
-Museum1FText_5c21f: ; 5c21f (17:421f)
+Museum1FText_5c21f:
 	TX_FAR _Museum1FText_5c21f
 	db "@"
 
-Museum1FText_5c224: ; 5c224 (17:4224)
+Museum1FText_5c224:
 	TX_FAR _Museum1FText_5c224
 	db "@"
 
-Museum1FText_5c229: ; 5c229 (17:4229)
+Museum1FText_5c229:
 	TX_FAR _Museum1FText_5c229
 	db "@"
 
-Museum1FText_5c22e: ; 5c22e (17:422e)
+Museum1FText_5c22e:
 	TX_FAR _Museum1FText_5c22e
 	db "@"
 
-Museum1FText_5c233: ; 5c233 (17:4233)
+Museum1FText_5c233:
 	TX_FAR _Museum1FText_5c233
 	db "@"
 
-Museum1FText_5c238: ; 5c238 (17:4238)
+Museum1FText_5c238:
 	TX_FAR _Museum1FText_5c238
 	db "@"
 
-Museum1FText_5c23d: ; 5c23d (17:423d)
+Museum1FText_5c23d:
 	TX_FAR _Museum1FText_5c23d
 	db "@"
 
-Museum1FText_5c242: ; 5c242 (17:4242)
+Museum1FText_5c242:
 	TX_FAR _Museum1FText_5c242
 	db "@"
 
-Museum1FText2: ; 5c247 (17:4247)
+Museum1FText2:
 	TX_ASM
 	ld hl, Museum1FText_5c251
 	call PrintText
 	jp TextScriptEnd
 
-Museum1FText_5c251: ; 5c251 (17:4251)
+Museum1FText_5c251:
 	TX_FAR _Museum1FText_5c251
 	db "@"
 
-Museum1FText3: ; 5c256 (17:4256)
+Museum1FText3:
 	TX_ASM
 	CheckEvent EVENT_GOT_OLD_AMBER
 	jr nz, .asm_5c285
@@ -209,38 +209,38 @@
 	call PrintText
 	jp TextScriptEnd
 
-Museum1FText_5c28e: ; 5c28e (17:428e)
+Museum1FText_5c28e:
 	TX_FAR _Museum1FText_5c28e
 	db "@"
 
-ReceivedOldAmberText: ; 5c293 (17:4293)
+ReceivedOldAmberText:
 	TX_FAR _ReceivedOldAmberText
 	db $0B, "@"
 
-Museum1FText_5c299: ; 5c299 (17:4299)
+Museum1FText_5c299:
 	TX_FAR _Museum1FText_5c299
 	db "@"
 
-Museum1FText_5c29e: ; 5c29e (17:429e)
+Museum1FText_5c29e:
 	TX_FAR _Museum1FText_5c29e
 	db "@"
 
-Museum1FText4: ; 5c2a3 (17:42a3)
+Museum1FText4:
 	TX_ASM
 	ld hl, Museum1FText_5c2ad
 	call PrintText
 	jp TextScriptEnd
 
-Museum1FText_5c2ad: ; 5c2ad (17:42ad)
+Museum1FText_5c2ad:
 	TX_FAR _Museum1FText_5c2ad
 	db "@"
 
-Museum1FText5: ; 5c2b2 (17:42b2)
+Museum1FText5:
 	TX_ASM
 	ld hl, Museum1FText_5c2bc
 	call PrintText
 	jp TextScriptEnd
 
-Museum1FText_5c2bc: ; 5c2bc (17:42bc)
+Museum1FText_5c2bc:
 	TX_FAR _Museum1FText_5c2bc
 	db "@"
--- a/scripts/museum2f.asm
+++ b/scripts/museum2f.asm
@@ -1,7 +1,7 @@
-Museum2FScript: ; 5c317 (17:4317)
+Museum2FScript:
 	jp EnableAutoTextBoxDrawing
 
-Museum2FTextPointers: ; 5c31a (17:431a)
+Museum2FTextPointers:
 	dw Museum2FText1
 	dw Museum2FText2
 	dw Museum2FText3
@@ -10,30 +10,30 @@
 	dw Museum2FText6
 	dw Museum2FText7
 
-Museum2FText1: ; 5c328 (17:4328)
+Museum2FText1:
 	TX_FAR _Museum2FText1
 	db "@"
 
-Museum2FText2: ; 5c32d (17:432d)
+Museum2FText2:
 	TX_FAR _Museum2FText2
 	db "@"
 
-Museum2FText3: ; 5c332 (17:4332)
+Museum2FText3:
 	TX_FAR _Museum2FText3
 	db "@"
 
-Museum2FText4: ; 5c337 (17:4337)
+Museum2FText4:
 	TX_FAR _Museum2FText4
 	db "@"
 
-Museum2FText5: ; 5c33c (17:433c)
+Museum2FText5:
 	TX_FAR _Museum2FText5
 	db "@"
 
-Museum2FText6: ; 5c341 (17:4341)
+Museum2FText6:
 	TX_FAR _Museum2FText6
 	db "@"
 
-Museum2FText7: ; 5c346 (17:4346)
+Museum2FText7:
 	TX_FAR _Museum2FText7
 	db "@"
--- a/scripts/namerater.asm
+++ b/scripts/namerater.asm
@@ -1,7 +1,7 @@
-NameRaterScript: ; 1da12 (7:5a12)
+NameRaterScript:
 	jp EnableAutoTextBoxDrawing
 
-NameRaterScript_1da15: ; 1da15 (7:5a15)
+NameRaterScript_1da15:
 	call PrintText
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
@@ -8,7 +8,7 @@
 	and a
 	ret
 
-NameRaterScript_1da20: ; 1da20 (7:5a20)
+NameRaterScript_1da20:
 	ld hl, wPartyMonOT
 	ld bc, NAME_LENGTH
 	ld a, [wWhichPokemon]
@@ -37,10 +37,10 @@
 	scf
 	ret
 
-NameRaterTextPointers: ; 1da54 (7:5a54)
+NameRaterTextPointers:
 	dw NameRaterText1
 
-NameRaterText1: ; 1da56 (7:5a56)
+NameRaterText1:
 	TX_ASM
 	call SaveScreenTilesToBuffer2
 	ld hl, NameRaterText_1dab3
@@ -78,30 +78,30 @@
 	ld hl, NameRaterText_1dacc
 	jr .asm_1daa8
 
-NameRaterText_1dab3: ; 1dab3 (7:5ab3)
+NameRaterText_1dab3:
 	TX_FAR _NameRaterText_1dab3
 	db "@"
 
-NameRaterText_1dab8: ; 1dab8 (7:5ab8)
+NameRaterText_1dab8:
 	TX_FAR _NameRaterText_1dab8
 	db "@"
 
-NameRaterText_1dabd: ; 1dabd (7:5abd)
+NameRaterText_1dabd:
 	TX_FAR _NameRaterText_1dabd
 	db "@"
 
-NameRaterText_1dac2: ; 1dac2 (7:5ac2)
+NameRaterText_1dac2:
 	TX_FAR _NameRaterText_1dac2
 	db "@"
 
-NameRaterText_1dac7: ; 1dac7 (7:5ac7)
+NameRaterText_1dac7:
 	TX_FAR _NameRaterText_1dac7
 	db "@"
 
-NameRaterText_1dacc: ; 1dacc (7:5acc)
+NameRaterText_1dacc:
 	TX_FAR _NameRaterText_1dacc
 	db "@"
 
-NameRaterText_1dad1: ; 1dad1 (7:5ad1)
+NameRaterText_1dad1:
 	TX_FAR _NameRaterText_1dad1
 	db "@"
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -1,4 +1,4 @@
-OaksLabScript: ; 1cb0e (7:4b0e)
+OaksLabScript:
 	CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2
 	call nz, OaksLabScript_1d076
 	ld a, $1
@@ -9,7 +9,7 @@
 	ld a, [wOaksLabCurScript]
 	jp CallFunctionInTable
 
-OaksLabScriptPointers: ; 1cb28 (7:4b28)
+OaksLabScriptPointers:
 	dw OaksLabScript0
 	dw OaksLabScript1
 	dw OaksLabScript2
@@ -30,7 +30,7 @@
 	dw OaksLabScript17
 	dw OaksLabScript18
 
-OaksLabScript0: ; 1cb4e (7:4b4e)
+OaksLabScript0:
 	CheckEvent EVENT_OAK_APPEARED_IN_PALLET
 	ret z
 	ld a, [wNPCMovementScriptFunctionNum]
@@ -46,7 +46,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript1: ; 1cb6e (7:4b6e)
+OaksLabScript1:
 	ld a, $8
 	ld [H_SPRITEINDEX], a
 	ld de, OakEntryMovement
@@ -56,13 +56,13 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OakEntryMovement: ; 1cb7e (7:4b7e)
+OakEntryMovement:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db $FF
 
-OaksLabScript2: ; 1cb82 (7:4b82)
+OaksLabScript2:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -77,7 +77,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript3: ; 1cba2 (7:4ba2)
+OaksLabScript3:
 	call Delay3
 	ld hl, wSimulatedJoypadStatesEnd
 	ld de, PlayerEntryMovementRLE
@@ -100,11 +100,11 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-PlayerEntryMovementRLE: ; 1cbcf (7:4bcf)
+PlayerEntryMovementRLE:
 	db D_UP,$8
 	db $ff
 
-OaksLabScript4: ; 1cbd2 (7:4bd2)
+OaksLabScript4:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -124,7 +124,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript5: ; 1cbfd (7:4bfd)
+OaksLabScript5:
 	ld a, $fc
 	ld [wJoyIgnore], a
 	ld a, $11
@@ -150,7 +150,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript6: ; 1cc36 (7:4c36)
+OaksLabScript6:
 	ld a, [wYCoord]
 	cp $6
 	ret nz
@@ -180,7 +180,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript7: ; 1cc72 (7:4c72)
+OaksLabScript7:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -190,7 +190,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript8: ; 1cc80 (7:4c80)
+OaksLabScript8:
 	ld a, [wPlayerStarter]
 	cp STARTER1
 	jr z, .Charmander
@@ -288,7 +288,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript9: ; 1cd00 (7:4d00)
+OaksLabScript9:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -339,7 +339,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript10: ; 1cd6d (7:4d6d)
+OaksLabScript10:
 	ld a, [wYCoord]
 	cp $6
 	ret nz
@@ -375,7 +375,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript11: ; 1cdb9 (7:4db9)
+OaksLabScript11:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -414,7 +414,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript12: ; 1ce03 (7:4e03)
+OaksLabScript12:
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, PLAYER_DIR_UP
@@ -435,7 +435,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript13: ; 1ce32 (7:4e32)
+OaksLabScript13:
 	ld c, 20
 	call DelayFrames
 	ld a, $10
@@ -470,7 +470,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-OaksLabScript14: ; 1ce6d (7:4e6d)
+OaksLabScript14:
 	ld a, [wd730]
 	bit 0, a
 	jr nz, .asm_1ce8c
@@ -506,7 +506,7 @@
 .done
 	ret
 
-OaksLabScript15: ; 1ceb0 (7:4eb0)
+OaksLabScript15:
 	xor a
 	ld [hJoyHeld], a
 	call EnableAutoTextBoxDrawing
@@ -538,7 +538,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript_1cefd: ; 1cefd (7:4efd)
+OaksLabScript_1cefd:
 	ld a, $1
 	ld [H_SPRITEINDEX], a
 	ld a, SPRITE_FACING_UP
@@ -550,7 +550,7 @@
 	ld [hSpriteFacingDirection], a
 	jp SetSpriteFacingDirectionAndDelay
 
-OaksLabScript16: ; 1cf12 (7:4f12)
+OaksLabScript16:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -624,7 +624,7 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript17: ; 1cfd4 (7:4fd4)
+OaksLabScript17:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -647,10 +647,10 @@
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript18: ; 1d009 (7:5009)
+OaksLabScript18:
 	ret
 
-OaksLabScript_RemoveParcel: ; 1d00a (7:500a)
+OaksLabScript_RemoveParcel:
 	ld hl, wBagItems
 	ld bc, $0000
 .loop
@@ -670,7 +670,7 @@
 	ld [wItemQuantity], a
 	jp RemoveItemFromInventory
 
-OaksLabScript_1d02b: ; 1d02b (7:502b)
+OaksLabScript_1d02b:
 	ld a, $7c
 	ld [$ffeb], a
 	ld a, $8
@@ -711,7 +711,7 @@
 	call SetSpritePosition1
 	ret
 
-OaksLabScript_1d076: ; 1d076 (7:5076)
+OaksLabScript_1d076:
 	ld hl, OaksLabTextPointers + $36 ; starts at OaksLabText28
 	ld a, l
 	ld [wMapTextPtr], a
@@ -719,7 +719,7 @@
 	ld [wMapTextPtr+1], a
 	ret
 
-OaksLabTextPointers: ; 1d082 (7:5082)
+OaksLabTextPointers:
 	dw OaksLabText1
 	dw OaksLabText2
 	dw OaksLabText3
@@ -759,8 +759,8 @@
 	dw OaksLabText37
 	dw OaksLabText38
 
-OaksLabText28: ; 1d0ce (7:50ce)
-OaksLabText1: ; 1d0ce (7:50ce)
+OaksLabText28:
+OaksLabText1:
 	TX_ASM
 	CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2
 	jr nz, .asm_1d0de
@@ -779,20 +779,20 @@
 .asm_1d0f0
 	jp TextScriptEnd
 
-OaksLabGaryText1: ; 1d0f3 (7:50f3)
+OaksLabGaryText1:
 	TX_FAR _OaksLabGaryText1
 	db "@"
 
-OaksLabText40: ; 1d0f8 (7:50f8)
+OaksLabText40:
 	TX_FAR _OaksLabText40
 	db "@"
 
-OaksLabText41: ; 1d0fd (7:50fd)
+OaksLabText41:
 	TX_FAR _OaksLabText41
 	db "@"
 
-OaksLabText29: ; 1d102 (7:5102)
-OaksLabText2: ; 1d102 (7:5102)
+OaksLabText29:
+OaksLabText2:
 	TX_ASM
 	ld a, STARTER2
 	ld [wRivalStarterTemp], a
@@ -802,8 +802,8 @@
 	ld b, $2
 	jr OaksLabScript_1d133
 
-OaksLabText30: ; 1d113 (7:5113)
-OaksLabText3: ; 1d113 (7:5113)
+OaksLabText30:
+OaksLabText3:
 	TX_ASM
 	ld a, STARTER3
 	ld [wRivalStarterTemp], a
@@ -813,8 +813,8 @@
 	ld b, $3
 	jr OaksLabScript_1d133
 
-OaksLabText31: ; 1d124 (7:5124)
-OaksLabText4: ; 1d124 (7:5124)
+OaksLabText31:
+OaksLabText4:
 	TX_ASM
 	ld a, STARTER1
 	ld [wRivalStarterTemp], a
@@ -823,7 +823,7 @@
 	ld a, STARTER3
 	ld b, $4
 
-OaksLabScript_1d133: ; 1d133 (7:5133)
+OaksLabScript_1d133:
 	ld [wcf91], a
 	ld [wd11e], a
 	ld a, b
@@ -836,11 +836,11 @@
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText39: ; 1d152 (7:5152)
+OaksLabText39:
 	TX_FAR _OaksLabText39
 	db "@"
 
-OaksLabScript_1d157: ; 1d157 (7:5157)
+OaksLabScript_1d157:
 	ld a, $5
 	ld [H_SPRITEINDEX], a
 	ld a, $9
@@ -868,28 +868,28 @@
 	jr z, OaksLabLookAtSquirtle
 	jr OaksLabLookAtBulbasaur
 
-OaksLabLookAtCharmander: ; 1d195 (7:5195)
+OaksLabLookAtCharmander:
 	ld hl, OaksLabCharmanderText
 	jr OaksLabMonChoiceMenu
-OaksLabCharmanderText: ; 1d19a (7:519a)
+OaksLabCharmanderText:
 	TX_FAR _OaksLabCharmanderText
 	db "@"
 
-OaksLabLookAtSquirtle: ; 1d19f (7:519f)
+OaksLabLookAtSquirtle:
 	ld hl, OaksLabSquirtleText
 	jr OaksLabMonChoiceMenu
-OaksLabSquirtleText: ; 1d1a4 (7:51a4)
+OaksLabSquirtleText:
 	TX_FAR _OaksLabSquirtleText
 	db "@"
 
-OaksLabLookAtBulbasaur: ; 1d1a9 (7:51a9)
+OaksLabLookAtBulbasaur:
 	ld hl, OaksLabBulbasaurText
 	jr OaksLabMonChoiceMenu
-OaksLabBulbasaurText: ; 1d1ae (7:51ae)
+OaksLabBulbasaurText:
 	TX_FAR _OaksLabBulbasaurText
 	db "@"
 
-OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
+OaksLabMonChoiceMenu:
 	call PrintText
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -935,19 +935,19 @@
 	ld [wJoyIgnore], a
 	ld a, $8
 	ld [wOaksLabCurScript], a
-OaksLabMonChoiceEnd: ; 1d21f (7:521f)
+OaksLabMonChoiceEnd:
 	jp TextScriptEnd
 
-OaksLabMonEnergeticText: ; 1d222 (7:5222)
+OaksLabMonEnergeticText:
 	TX_FAR _OaksLabMonEnergeticText
 	db "@"
 
-OaksLabReceivedMonText: ; 1d227 (7:5227)
+OaksLabReceivedMonText:
 	TX_FAR _OaksLabReceivedMonText
 	TX_SFX_KEY_ITEM
 	db "@"
 
-OaksLabScript_1d22d: ; 1d22d (7:522d)
+OaksLabScript_1d22d:
 	ld a, $5
 	ld [H_SPRITEINDEX], a
 	ld a, $9
@@ -958,12 +958,12 @@
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabLastMonText: ; 1d243 (7:5243)
+OaksLabLastMonText:
 	TX_FAR _OaksLabLastMonText
 	db "@"
 
-OaksLabText32: ; 1d248 (7:5248)
-OaksLabText5: ; 1d248 (7:5248)
+OaksLabText32:
+OaksLabText5:
 	TX_ASM
 	CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS
 	jr nz, .asm_1d266
@@ -1034,208 +1034,208 @@
 .asm_1d2ed
 	jp TextScriptEnd
 
-OaksLabText_1d2f0: ; 1d2f0 (7:52f0)
+OaksLabText_1d2f0:
 	TX_FAR _OaksLabText_1d2f0
 	db "@"
 
-OaksLabText_1d2f5: ; 1d2f5 (7:52f5)
+OaksLabText_1d2f5:
 	TX_FAR _OaksLabText_1d2f5
 	db "@"
 
-OaksLabText_1d2fa: ; 1d2fa (7:52fa)
+OaksLabText_1d2fa:
 	TX_FAR _OaksLabText_1d2fa
 	db "@"
 
-OaksLabDeliverParcelText: ; 1d2ff (7:52ff)
+OaksLabDeliverParcelText:
 	TX_FAR _OaksLabDeliverParcelText1
 	TX_SFX_KEY_ITEM
 	TX_FAR _OaksLabDeliverParcelText2
 	db "@"
 
-OaksLabAroundWorldText: ; 1d309 (7:5309)
+OaksLabAroundWorldText:
 	TX_FAR _OaksLabAroundWorldText
 	db "@"
 
-OaksLabGivePokeballsText: ; 1d30e (7:530e)
+OaksLabGivePokeballsText:
 	TX_FAR _OaksLabGivePokeballsText1
 	TX_SFX_KEY_ITEM
 	TX_FAR _OaksLabGivePokeballsText2
 	db "@"
 
-OaksLabPleaseVisitText: ; 1d318 (7:5318)
+OaksLabPleaseVisitText:
 	TX_FAR _OaksLabPleaseVisitText
 	db "@"
 
-OaksLabText_1d31d: ; 1d31d (7:531d)
+OaksLabText_1d31d:
 	TX_FAR _OaksLabText_1d31d
 	db "@"
 
-OaksLabText34: ; 1d322 (7:5322)
-OaksLabText33: ; 1d322 (7:5322)
-OaksLabText7: ; 1d322 (7:5322)
-OaksLabText6: ; 1d322 (7:5322)
+OaksLabText34:
+OaksLabText33:
+OaksLabText7:
+OaksLabText6:
 	TX_ASM
 	ld hl, OaksLabText_1d32c
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText_1d32c: ; 1d32c (7:532c)
+OaksLabText_1d32c:
 	TX_FAR _OaksLabText_1d32c
 	db "@"
 
-OaksLabText35: ; 1d331 (7:5331)
-OaksLabText8: ; 1d331 (7:5331)
+OaksLabText35:
+OaksLabText8:
 	TX_FAR _OaksLabText8
 	db "@"
 
-OaksLabText36: ; 1d336 (7:5336)
-OaksLabText9: ; 1d336 (7:5336)
+OaksLabText36:
+OaksLabText9:
 	TX_ASM
 	ld hl, OaksLabText_1d340
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText_1d340: ; 1d340 (7:5340)
+OaksLabText_1d340:
 	TX_FAR _OaksLabText_1d340
 	db "@"
 
-OaksLabText17: ; 1d345 (7:5345)
+OaksLabText17:
 	TX_ASM
 	ld hl, OaksLabRivalWaitingText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalWaitingText: ; 1d34f (7:534f)
+OaksLabRivalWaitingText:
 	TX_FAR _OaksLabRivalWaitingText
 	db "@"
 
-OaksLabText18: ; 1d354 (7:5354)
+OaksLabText18:
 	TX_ASM
 	ld hl, OaksLabChooseMonText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabChooseMonText: ; 1d35e (7:535e)
+OaksLabChooseMonText:
 	TX_FAR _OaksLabChooseMonText
 	db "@"
 
-OaksLabText19: ; 1d363 (7:5363)
+OaksLabText19:
 	TX_ASM
 	ld hl, OaksLabRivalInterjectionText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalInterjectionText: ; 1d36d (7:536d)
+OaksLabRivalInterjectionText:
 	TX_FAR _OaksLabRivalInterjectionText
 	db "@"
 
-OaksLabText20: ; 1d372 (7:5372)
+OaksLabText20:
 	TX_ASM
 	ld hl, OaksLabBePatientText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabBePatientText: ; 1d37c (7:537c)
+OaksLabBePatientText:
 	TX_FAR _OaksLabBePatientText
 	db "@"
 
-OaksLabText12: ; 1d381 (7:5381)
+OaksLabText12:
 	TX_ASM
 	ld hl, OaksLabLeavingText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabLeavingText: ; 1d38b (7:538b)
+OaksLabLeavingText:
 	TX_FAR _OaksLabLeavingText
 	db "@"
 
-OaksLabText13: ; 1d390 (7:5390)
+OaksLabText13:
 	TX_ASM
 	ld hl, OaksLabRivalPickingMonText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalPickingMonText: ; 1d39a (7:539a)
+OaksLabRivalPickingMonText:
 	TX_FAR _OaksLabRivalPickingMonText
 	db "@"
 
-OaksLabText14: ; 1d39f (7:539f)
+OaksLabText14:
 	TX_ASM
 	ld hl, OaksLabRivalReceivedMonText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalReceivedMonText: ; 1d3a9 (7:53a9)
+OaksLabRivalReceivedMonText:
 	TX_FAR _OaksLabRivalReceivedMonText
 	TX_SFX_KEY_ITEM
 	db "@"
 
-OaksLabText15: ; 1d3af (7:53af)
+OaksLabText15:
 	TX_ASM
 	ld hl, OaksLabRivalChallengeText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalChallengeText: ; 1d3b9 (7:53b9)
+OaksLabRivalChallengeText:
 	TX_FAR _OaksLabRivalChallengeText
 	db "@"
 
-OaksLabText_1d3be: ; 1d3be (7:53be)
+OaksLabText_1d3be:
 	TX_FAR _OaksLabText_1d3be
 	db "@"
 
-OaksLabText_1d3c3: ; 1d3c3 (7:53c3)
+OaksLabText_1d3c3:
 	TX_FAR _OaksLabText_1d3c3
 	db "@"
 
-OaksLabText16: ; 1d3c8 (7:53c8)
+OaksLabText16:
 	TX_ASM
 	ld hl, OaksLabRivalToughenUpText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalToughenUpText: ; 1d3d2 (7:53d2)
+OaksLabRivalToughenUpText:
 	TX_FAR _OaksLabRivalToughenUpText
 	db "@"
 
-OaksLabText21: ; 1d3d7 (7:53d7)
+OaksLabText21:
 	TX_FAR _OaksLabText21
 	db "@"
 
-OaksLabText22: ; 1d3dc (7:53dc)
+OaksLabText22:
 	TX_FAR _OaksLabText22
 	db "@"
 
-OaksLabText23: ; 1d3e1 (7:53e1)
+OaksLabText23:
 	TX_FAR _OaksLabText23
 	db "@"
 
-OaksLabText24: ; 1d3e6 (7:53e6)
+OaksLabText24:
 	TX_FAR _OaksLabText24
 	db "@"
 
-OaksLabText25: ; 1d3eb (7:53eb)
+OaksLabText25:
 	TX_FAR _OaksLabText25
 	TX_SFX_KEY_ITEM
 	db "@"
 
-OaksLabText26: ; 1d3f1 (7:53f1)
+OaksLabText26:
 	TX_FAR _OaksLabText26
 	db "@"
 
-OaksLabText27: ; 1d3f6 (7:53f6)
+OaksLabText27:
 	TX_FAR _OaksLabText27
 	db "@"
 
-OaksLabText38: ; 1d3fb (7:53fb)
-OaksLabText37: ; 1d3fb (7:53fb)
-OaksLabText11: ; 1d3fb (7:53fb)
-OaksLabText10: ; 1d3fb (7:53fb)
+OaksLabText38:
+OaksLabText37:
+OaksLabText11:
+OaksLabText10:
 	TX_ASM
 	ld hl, OaksLabText_1d405
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText_1d405: ; 1d405 (7:5405)
+OaksLabText_1d405:
 	TX_FAR _OaksLabText_1d405
 	db "@"
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -1,4 +1,4 @@
-PalletTownScript: ; 18e5b (6:4e5b)
+PalletTownScript:
 	CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK
 	jr z,.next
 	SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS
@@ -8,7 +8,7 @@
 	ld a,[wPalletTownCurScript]
 	jp CallFunctionInTable
 
-PalletTownScriptPointers: ; 18e73 (6:4e73)
+PalletTownScriptPointers:
 	dw PalletTownScript0
 	dw PalletTownScript1
 	dw PalletTownScript2
@@ -17,7 +17,7 @@
 	dw PalletTownScript5
 	dw PalletTownScript6
 
-PalletTownScript0: ; 18e81 (6:4e81)
+PalletTownScript0:
 	CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB
 	ret nz
 	ld a,[wYCoord]
@@ -42,7 +42,7 @@
 	ld [wPalletTownCurScript],a
 	ret
 
-PalletTownScript1: ; 18eb2 (6:4eb2)
+PalletTownScript1:
 	xor a
 	ld [wcf0d],a
 	ld a,1
@@ -59,7 +59,7 @@
 	ld [wPalletTownCurScript],a
 	ret
 
-PalletTownScript2: ; 18ed2 (6:4ed2)
+PalletTownScript2:
 	ld a,1
 	ld [H_SPRITEINDEX],a
 	ld a,SPRITE_FACING_UP
@@ -89,7 +89,7 @@
 	ld [wPalletTownCurScript],a
 	ret
 
-PalletTownScript3: ; 18f12 (6:4f12)
+PalletTownScript3:
 	ld a,[wd730]
 	bit 0,a
 	ret nz
@@ -119,7 +119,7 @@
 	ld [wPalletTownCurScript],a
 	ret
 
-PalletTownScript4: ; 18f4b (6:4f4b)
+PalletTownScript4:
 	ld a,[wNPCMovementScriptPointerTableNum]
 	and a ; is the movement script over?
 	ret nz
@@ -129,7 +129,7 @@
 	ld [wPalletTownCurScript],a
 	ret
 
-PalletTownScript5: ; 18f56 (6:4f56)
+PalletTownScript5:
 	CheckEvent EVENT_DAISY_WALKING
 	jr nz,.next
 	CheckBothEventsSet EVENT_GOT_TOWN_MAP, EVENT_ENTERED_BLUES_HOUSE, 1
@@ -145,10 +145,10 @@
 	CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK
 	ret z
 	SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2
-PalletTownScript6: ; 18f87 (6:4f87)
+PalletTownScript6:
 	ret
 
-PalletTownTextPointers: ; 18f88 (6:4f88)
+PalletTownTextPointers:
 	dw PalletTownText1
 	dw PalletTownText2
 	dw PalletTownText3
@@ -157,7 +157,7 @@
 	dw PalletTownText6
 	dw PalletTownText7
 
-PalletTownText1: ; 18f96 (6:4f96)
+PalletTownText1:
 	TX_ASM
 	ld a,[wcf0d]
 	and a
@@ -172,7 +172,7 @@
 	call PrintText
 	jp TextScriptEnd
 
-OakAppearsText: ; 18fb0 (6:4fb0)
+OakAppearsText:
 	TX_FAR _OakAppearsText
 	TX_ASM
 	ld c,10
@@ -185,7 +185,7 @@
 	ld [wPlayerMovingDirection],a
 	jp TextScriptEnd
 
-OakWalksUpText: ; 18fce (6:4fce)
+OakWalksUpText:
 	TX_FAR _OakWalksUpText
 	db "@"
 
--- a/scripts/pewtercity.asm
+++ b/scripts/pewtercity.asm
@@ -1,10 +1,10 @@
-PewterCityScript: ; 19237 (6:5237)
+PewterCityScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, PewterCityScriptPointers
 	ld a, [wPewterCityCurScript]
 	jp CallFunctionInTable
 
-PewterCityScriptPointers: ; 19243 (6:5243)
+PewterCityScriptPointers:
 	dw PewterCityScript0
 	dw PewterCityScript1
 	dw PewterCityScript2
@@ -13,7 +13,7 @@
 	dw PewterCityScript5
 	dw PewterCityScript6
 
-PewterCityScript0: ; 19251 (6:5251)
+PewterCityScript0:
 	xor a
 	ld [wMuseum1fCurScript], a
 	ResetEvent EVENT_BOUGHT_MUSEUM_TICKET
@@ -20,7 +20,7 @@
 	call PewterCityScript_1925e
 	ret
 
-PewterCityScript_1925e: ; 1925e (6:525e)
+PewterCityScript_1925e:
 	CheckEvent EVENT_BEAT_BROCK
 	ret nz
 	ld hl, CoordsData_19277
@@ -32,7 +32,7 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-CoordsData_19277: ; 19277 (6:5277)
+CoordsData_19277:
 	db $11,$23
 	db $11,$24
 	db $12,$25
@@ -39,7 +39,7 @@
 	db $13,$25
 	db $ff
 
-PewterCityScript1: ; 19280 (6:5280)
+PewterCityScript1:
 	ld a, [wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
@@ -76,7 +76,7 @@
 	ld [wPewterCityCurScript], a
 	ret
 
-MovementData_PewterMuseumGuyExit: ; 192ce (6:52ce)
+MovementData_PewterMuseumGuyExit:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -83,7 +83,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-PewterCityScript2: ; 192d3 (6:52d3)
+PewterCityScript2:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -94,7 +94,7 @@
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityScript3: ; 192e9 (6:52e9)
+PewterCityScript3:
 	ld a, $3
 	ld [wSpriteIndex], a
 	call SetSpritePosition2
@@ -107,7 +107,7 @@
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityScript4: ; 19305 (6:5305)
+PewterCityScript4:
 	ld a, [wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
@@ -144,7 +144,7 @@
 	ld [wPewterCityCurScript], a
 	ret
 
-MovementData_PewterGymGuyExit: ; 19353 (6:5353)
+MovementData_PewterGymGuyExit:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
@@ -152,7 +152,7 @@
 	db NPC_MOVEMENT_RIGHT
 	db $FF
 
-PewterCityScript5: ; 19359 (6:5359)
+PewterCityScript5:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -163,7 +163,7 @@
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityScript6: ; 1936f (6:536f)
+PewterCityScript6:
 	ld a, $5
 	ld [wSpriteIndex], a
 	call SetSpritePosition2
@@ -176,7 +176,7 @@
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityTextPointers: ; 1938b (6:538b)
+PewterCityTextPointers:
 	dw PewterCityText1
 	dw PewterCityText2
 	dw PewterCityText3
@@ -192,15 +192,15 @@
 	dw PewterCityText13
 	dw PewterCityText14
 
-PewterCityText1: ; 193a7 (6:53a7)
+PewterCityText1:
 	TX_FAR _PewterCityText1
 	db "@"
 
-PewterCityText2: ; 193ac (6:53ac)
+PewterCityText2:
 	TX_FAR _PewterCityText2
 	db "@"
 
-PewterCityText3: ; 193b1 (6:53b1)
+PewterCityText3:
 	TX_ASM
 	ld hl, PewterCityText_193f1
 	call PrintText
@@ -230,23 +230,23 @@
 .asm_193ee
 	jp TextScriptEnd
 
-PewterCityText_193f1: ; 193f1 (6:53f1)
+PewterCityText_193f1:
 	TX_FAR _PewterCityText_193f1
 	db "@"
 
-PewterCityText_193f6: ; 193f6 (6:53f6)
+PewterCityText_193f6:
 	TX_FAR _PewterCityText_193f6
 	db "@"
 
-PewterCityText_193fb: ; 193fb (6:53fb)
+PewterCityText_193fb:
 	TX_FAR _PewterCityText_193fb
 	db "@"
 
-PewterCityText13: ; 19400 (6:5400)
+PewterCityText13:
 	TX_FAR _PewterCityText13
 	db "@"
 
-PewterCityText4: ; 19405 (6:5405)
+PewterCityText4:
 	TX_ASM
 	ld hl, PewterCityText_19427
 	call PrintText
@@ -263,19 +263,19 @@
 .asm_19424
 	jp TextScriptEnd
 
-PewterCityText_19427: ; 19427 (6:5427)
+PewterCityText_19427:
 	TX_FAR _PewterCityText_19427
 	db "@"
 
-PewterCityText_1942c: ; 1942c (6:542c)
+PewterCityText_1942c:
 	TX_FAR _PewterCityText_1942c
 	db "@"
 
-PewterCityText_19431: ; 19431 (6:5431)
+PewterCityText_19431:
 	TX_FAR _PewterCityText_19431
 	db "@"
 
-PewterCityText5: ; 19436 (6:5436)
+PewterCityText5:
 	TX_ASM
 	ld hl, PewterCityText_1945d
 	call PrintText
@@ -293,32 +293,32 @@
 	ld [wPewterCityCurScript], a
 	jp TextScriptEnd
 
-PewterCityText_1945d: ; 1945d (6:545d)
+PewterCityText_1945d:
 	TX_FAR _PewterCityText_1945d
 	db "@"
 
-PewterCityText14: ; 19462 (6:5462)
+PewterCityText14:
 
-PewterCityText_19462: ; 19462 (6:5462)
+PewterCityText_19462:
 	TX_FAR _PewterCityText_19462
 	db "@"
 
-PewterCityText6: ; 19467 (6:5467)
+PewterCityText6:
 	TX_FAR _PewterCityText6
 	db "@"
 
-PewterCityText7: ; 1946c (6:546c)
+PewterCityText7:
 	TX_FAR _PewterCityText7
 	db "@"
 
-PewterCityText10: ; 19471 (6:5471)
+PewterCityText10:
 	TX_FAR _PewterCityText10
 	db "@"
 
-PewterCityText11: ; 19476 (6:5476)
+PewterCityText11:
 	TX_FAR _PewterCityText11
 	db "@"
 
-PewterCityText12: ; 1947b (6:547b)
+PewterCityText12:
 	TX_FAR _PewterCityText12
 	db "@"
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -1,4 +1,4 @@
-PewterGymScript: ; 5c387 (17:4387)
+PewterGymScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -11,18 +11,18 @@
 	ld [wPewterGymCurScript], a
 	ret
 
-PewterGymScript_5c3a4: ; 5c3a4 (17:43a4)
+PewterGymScript_5c3a4:
 	ld hl, Gym1CityName
 	ld de, Gym1LeaderName
 	jp LoadGymLeaderAndCityName
 
-Gym1CityName: ; 5c3ad (17:43ad)
+Gym1CityName:
 	db "PEWTER CITY@"
 
-Gym1LeaderName: ; 5c3b9 (17:43b9)
+Gym1LeaderName:
 	db "BROCK@"
 
-PewterGymScript_5c3bf: ; 5c3bf (17:43bf)
+PewterGymScript_5c3bf:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wPewterGymCurScript], a
@@ -29,13 +29,13 @@
 	ld [wCurMapScript], a
 	ret
 
-PewterGymScriptPointers: ; 5c3ca (17:43ca)
+PewterGymScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw PewterGymScript3
 
-PewterGymScript3: ; 5c3d2 (17:43d2)
+PewterGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PewterGymScript_5c3bf
@@ -42,7 +42,7 @@
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-PewterGymScript_5c3df: ; 5c3df (17:43df)
+PewterGymScript_5c3df:
 	ld a, $4
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -79,7 +79,7 @@
 
 	jp PewterGymScript_5c3bf
 
-PewterGymTextPointers: ; 5c435 (17:4435)
+PewterGymTextPointers:
 	dw PewterGymText1
 	dw PewterGymText2
 	dw PewterGymText3
@@ -87,8 +87,8 @@
 	dw PewterGymText5
 	dw PewterGymText6
 
-PewterGymTrainerHeaders: ; 5c441 (17:4441)
-PewterGymTrainerHeader0: ; 5c441 (17:4441)
+PewterGymTrainerHeaders:
+PewterGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0
 	db ($5 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_PEWTER_GYM_TRAINER_0
@@ -99,7 +99,7 @@
 
 	db $ff
 
-PewterGymText1: ; 5c44e (17:444e)
+PewterGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_BROCK
 	jr z, .asm_5c46a
@@ -135,53 +135,53 @@
 .asm_5c49b
 	jp TextScriptEnd
 
-PewterGymText_5c49e: ; 5c49e (17:449e)
+PewterGymText_5c49e:
 	TX_FAR _PewterGymText_5c49e
 	db "@"
 
-PewterGymText_5c4a3: ; 5c4a3 (17:44a3)
+PewterGymText_5c4a3:
 	TX_FAR _PewterGymText_5c4a3
 	db "@"
 
-PewterGymText4: ; 5c4a8 (17:44a8)
+PewterGymText4:
 	TX_FAR _TM34PreReceiveText
 	db "@"
 
-PewterGymText5: ; 5c4ad (17:44ad)
+PewterGymText5:
 	TX_FAR _ReceivedTM34Text
 	db $0B
 	TX_FAR _TM34ExplanationText
 	db "@"
 
-PewterGymText6: ; 5c4b7 (17:44b7)
+PewterGymText6:
 	TX_FAR _TM34NoRoomText
 	db "@"
 
-PewterGymText_5c4bc: ; 5c4bc (17:44bc)
+PewterGymText_5c4bc:
 	TX_FAR _PewterGymText_5c4bc
 	db $0B
 	TX_FAR _PewterGymText_5c4c1
 	db "@"
 
-PewterGymText2: ; 5c4c6 (17:44c6)
+PewterGymText2:
 	TX_ASM
 	ld hl, PewterGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PewterGymBattleText1: ; 5c4d0 (17:44d0)
+PewterGymBattleText1:
 	TX_FAR _PewterGymBattleText1
 	db "@"
 
-PewterGymEndBattleText1: ; 5c4d5 (17:44d5)
+PewterGymEndBattleText1:
 	TX_FAR _PewterGymEndBattleText1
 	db "@"
 
-PewterGymAfterBattleText1: ; 5c4da (17:44da)
+PewterGymAfterBattleText1:
 	TX_FAR _PewterGymAfterBattleText1
 	db "@"
 
-PewterGymText3: ; 5c4df (17:44df)
+PewterGymText3:
 	TX_ASM
 	ld a, [wBeatGymFlags]
 	bit 0, a
@@ -208,22 +208,22 @@
 .asm_5c512
 	jp TextScriptEnd
 
-PewterGymText_5c515: ; 5c515 (17:4515)
+PewterGymText_5c515:
 	TX_FAR _PewterGymText_5c515
 	db "@"
 
-PewterGymText_5c51a: ; 5c51a (17:451a)
+PewterGymText_5c51a:
 	TX_FAR _PewterGymText_5c51a
 	db "@"
 
-PewterGymText_5c51f: ; 5c51f (17:451f)
+PewterGymText_5c51f:
 	TX_FAR _PewterGymText_5c51f
 	db "@"
 
-PewterGymText_5c524: ; 5c524 (17:4524)
+PewterGymText_5c524:
 	TX_FAR _PewterGymText_5c524
 	db "@"
 
-PewterGymText_5c529: ; 5c529 (17:4529)
+PewterGymText_5c529:
 	TX_FAR _PewterGymText_5c529
 	db "@"
--- a/scripts/pewterhouse1.asm
+++ b/scripts/pewterhouse1.asm
@@ -1,12 +1,12 @@
-PewterHouse1Script: ; 1d5f3 (7:55f3)
+PewterHouse1Script:
 	jp EnableAutoTextBoxDrawing
 
-PewterHouse1TextPointers: ; 1d5f6 (7:55f6)
+PewterHouse1TextPointers:
 	dw PewterHouse1Text1
 	dw PewterHouse1Text2
 	dw PewterHouse1Text3
 
-PewterHouse1Text1: ; 1d5fc (7:55fc)
+PewterHouse1Text1:
 	TX_FAR _PewterHouse1Text1
 	TX_ASM
 	ld a, NIDORAN_M
@@ -14,10 +14,10 @@
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
-PewterHouse1Text2: ; 1d60c (7:560c)
+PewterHouse1Text2:
 	TX_FAR _PewterHouse1Text2
 	db "@"
 
-PewterHouse1Text3: ; 1d611 (7:5611)
+PewterHouse1Text3:
 	TX_FAR _PewterHouse1Text3
 	db "@"
--- a/scripts/pewterhouse2.asm
+++ b/scripts/pewterhouse2.asm
@@ -1,14 +1,14 @@
-PewterHouse2Script: ; 1d648 (7:5648)
+PewterHouse2Script:
 	jp EnableAutoTextBoxDrawing
 
-PewterHouse2TextPointers: ; 1d64b (7:564b)
+PewterHouse2TextPointers:
 	dw PewterHouse2Text1
 	dw PewterHouse2Text2
 
-PewterHouse2Text1: ; 1d64f (7:564f)
+PewterHouse2Text1:
 	TX_FAR _PewterHouse2Text1
 	db "@"
 
-PewterHouse2Text2: ; 1d654 (7:5654)
+PewterHouse2Text2:
 	TX_FAR _PewterHouse2Text2
 	db "@"
--- a/scripts/pokemontower1.asm
+++ b/scripts/pokemontower1.asm
@@ -1,7 +1,7 @@
-PokemonTower1Script: ; 6042c (18:442c)
+PokemonTower1Script:
 	jp EnableAutoTextBoxDrawing
 
-PokemonTower1TextPointers: ; 6042f (18:442f)
+PokemonTower1TextPointers:
 	dw PokemonTower1Text1
 	dw PokemonTower1Text2
 	dw PokemonTower1Text3
@@ -8,22 +8,22 @@
 	dw PokemonTower1Text4
 	dw PokemonTower1Text5
 
-PokemonTower1Text1: ; 60439 (18:4439)
+PokemonTower1Text1:
 	TX_FAR _PokemonTower1Text1
 	db "@"
 
-PokemonTower1Text2: ; 6043e (18:443e)
+PokemonTower1Text2:
 	TX_FAR _PokemonTower1Text2
 	db "@"
 
-PokemonTower1Text3: ; 60443 (18:4443)
+PokemonTower1Text3:
 	TX_FAR _PokemonTower1Text3
 	db "@"
 
-PokemonTower1Text4: ; 60448 (18:4448)
+PokemonTower1Text4:
 	TX_FAR _PokemonTower1Text4
 	db "@"
 
-PokemonTower1Text5: ; 6044d (18:444d)
+PokemonTower1Text5:
 	TX_FAR _PokemonTower1Text5
 	db "@"
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@@ -1,10 +1,10 @@
-PokemonTower2Script: ; 604f2 (18:44f2)
+PokemonTower2Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower2ScriptPointers
 	ld a, [wPokemonTower2CurScript]
 	jp CallFunctionInTable
 
-PokemonTower2Script_604fe: ; 604fe (18:44fe)
+PokemonTower2Script_604fe:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wPokemonTower2CurScript], a
@@ -11,12 +11,12 @@
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower2ScriptPointers: ; 60509 (18:4509)
+PokemonTower2ScriptPointers:
 	dw PokemonTower2Script0
 	dw PokemonTower2Script1
 	dw PokemonTower2Script2
 
-PokemonTower2Script0: ; 6050f (18:450f)
+PokemonTower2Script0:
 	CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
 	ret nz
 	ld hl, CoordsData_6055e
@@ -53,12 +53,12 @@
 	ld [hJoyPressed], a
 	ret
 
-CoordsData_6055e: ; 6055e (18:455e)
+CoordsData_6055e:
 	db $05,$0F
 	db $06,$0E
 	db $0F ; isn't this supposed to end in $ff?
 
-PokemonTower2Script1: ; 60563 (18:4563)
+PokemonTower2Script1:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PokemonTower2Script_604fe
@@ -85,7 +85,7 @@
 	ld [wCurMapScript], a
 	ret
 
-MovementData_605a9: ; 605a9 (18:45a9)
+MovementData_605a9:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -96,7 +96,7 @@
 	db NPC_MOVEMENT_RIGHT
 	db $FF
 
-MovementData_605b2: ; 605b2 (18:45b2)
+MovementData_605b2:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_RIGHT
@@ -107,7 +107,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-PokemonTower2Script2: ; 605bb (18:45bb)
+PokemonTower2Script2:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -122,11 +122,11 @@
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower2TextPointers: ; 605db (18:45db)
+PokemonTower2TextPointers:
 	dw PokemonTower2Text1
 	dw PokemonTower2Text2
 
-PokemonTower2Text1: ; 605df (18:45df)
+PokemonTower2Text1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
 	jr z, .asm_16f24
@@ -167,22 +167,22 @@
 .asm_41852
 	jp TextScriptEnd
 
-PokemonTower2Text_6062d: ; 6062d (18:462d)
+PokemonTower2Text_6062d:
 	TX_FAR _PokemonTower2Text_6062d
 	db "@"
 
-PokemonTower2Text_60632: ; 60632 (18:4632)
+PokemonTower2Text_60632:
 	TX_FAR _PokemonTower2Text_60632
 	db "@"
 
-PokemonTower2Text_60637: ; 60637 (18:4637)
+PokemonTower2Text_60637:
 	TX_FAR _PokemonTower2Text_60637
 	db "@"
 
-PokemonTower2Text_6063c: ; 6063c (18:463c)
+PokemonTower2Text_6063c:
 	TX_FAR _PokemonTower2Text_6063c
 	db "@"
 
-PokemonTower2Text2: ; 60641 (18:4641)
+PokemonTower2Text2:
 	TX_FAR _PokemonTower2Text2
 	db "@"
--- a/scripts/pokemontower3.asm
+++ b/scripts/pokemontower3.asm
@@ -1,4 +1,4 @@
-PokemonTower3Script: ; 606cc (18:46cc)
+PokemonTower3Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower3TrainerHeaders
 	ld de, PokemonTower3ScriptPointers
@@ -7,19 +7,19 @@
 	ld [wPokemonTower3CurScript], a
 	ret
 
-PokemonTower3ScriptPointers: ; 606df (18:46df)
+PokemonTower3ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PokemonTower3TextPointers: ; 606e5 (18:46e5)
+PokemonTower3TextPointers:
 	dw PokemonTower3Text1
 	dw PokemonTower3Text2
 	dw PokemonTower3Text3
 	dw PickUpItemText
 
-PokemonTower3TrainerHeaders: ; 606ed (18:46ed)
-PokemonTower3TrainerHeader0: ; 606ed (18:46ed)
+PokemonTower3TrainerHeaders:
+PokemonTower3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_0
@@ -28,7 +28,7 @@
 	dw PokemonTower3EndBattleText1 ; TextEndBattle
 	dw PokemonTower3EndBattleText1 ; TextEndBattle
 
-PokemonTower3TrainerHeader1: ; 606f9 (18:46f9)
+PokemonTower3TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_1
@@ -37,7 +37,7 @@
 	dw PokemonTower3EndBattleText2 ; TextEndBattle
 	dw PokemonTower3EndBattleText2 ; TextEndBattle
 
-PokemonTower3TrainerHeader2: ; 60705 (18:4705)
+PokemonTower3TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_2
@@ -47,56 +47,56 @@
 	dw PokemonTower3EndBattleText3 ; TextEndBattle
 	db $ff
 
-PokemonTower3Text1: ; 60712 (18:4712)
+PokemonTower3Text1:
 	TX_ASM
 	ld hl, PokemonTower3TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower3Text2: ; 6071c (18:471c)
+PokemonTower3Text2:
 	TX_ASM
 	ld hl, PokemonTower3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower3Text3: ; 60726 (18:4726)
+PokemonTower3Text3:
 	TX_ASM
 	ld hl, PokemonTower3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower3BattleText1: ; 60730 (18:4730)
+PokemonTower3BattleText1:
 	TX_FAR _PokemonTower3BattleText1
 	db "@"
 
-PokemonTower3EndBattleText1: ; 60735 (18:4735)
+PokemonTower3EndBattleText1:
 	TX_FAR _PokemonTower3EndBattleText1
 	db "@"
 
-PokemonTower3AfterBattleText1: ; 6073a (18:473a)
+PokemonTower3AfterBattleText1:
 	TX_FAR _PokemonTower3AfterBattleText1
 	db "@"
 
-PokemonTower3BattleText2: ; 6073f (18:473f)
+PokemonTower3BattleText2:
 	TX_FAR _PokemonTower3BattleText2
 	db "@"
 
-PokemonTower3EndBattleText2: ; 60744 (18:4744)
+PokemonTower3EndBattleText2:
 	TX_FAR _PokemonTower3EndBattleText2
 	db "@"
 
-PokemonTower3AfterBattleText2: ; 60749 (18:4749)
+PokemonTower3AfterBattleText2:
 	TX_FAR _PokemonTower3AfterBattleText2
 	db "@"
 
-PokemonTower3BattleText3: ; 6074e (18:474e)
+PokemonTower3BattleText3:
 	TX_FAR _PokemonTower3BattleText3
 	db "@"
 
-PokemonTower3EndBattleText3: ; 60753 (18:4753)
+PokemonTower3EndBattleText3:
 	TX_FAR _PokemonTower3EndBattleText3
 	db "@"
 
-PokemonTower3AfterBattleText3: ; 60758 (18:4758)
+PokemonTower3AfterBattleText3:
 	TX_FAR _PokemonTower3AfterBattleText3
 	db "@"
--- a/scripts/pokemontower4.asm
+++ b/scripts/pokemontower4.asm
@@ -1,4 +1,4 @@
-PokemonTower4Script: ; 607f6 (18:47f6)
+PokemonTower4Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower4TrainerHeaders
 	ld de, PokemonTower4ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wPokemonTower4CurScript], a
 	ret
 
-PokemonTower4ScriptPointers: ; 60809 (18:4809)
+PokemonTower4ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PokemonTower4TextPointers: ; 6080f (18:480f)
+PokemonTower4TextPointers:
 	dw PokemonTower4Text1
 	dw PokemonTower4Text2
 	dw PokemonTower4Text3
@@ -20,8 +20,8 @@
 	dw PickUpItemText
 	dw PickUpItemText
 
-PokemonTower4TrainerHeaders: ; 6081b (18:481b)
-PokemonTower4TrainerHeader0: ; 6081b (18:481b)
+PokemonTower4TrainerHeaders:
+PokemonTower4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_0
@@ -30,7 +30,7 @@
 	dw PokemonTower4EndBattleText1 ; TextEndBattle
 	dw PokemonTower4EndBattleText1 ; TextEndBattle
 
-PokemonTower4TrainerHeader1: ; 60827 (18:4827)
+PokemonTower4TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_1
@@ -39,7 +39,7 @@
 	dw PokemonTower4EndBattleText2 ; TextEndBattle
 	dw PokemonTower4EndBattleText2 ; TextEndBattle
 
-PokemonTower4TrainerHeader2: ; 60833 (18:4833)
+PokemonTower4TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_2
@@ -50,56 +50,56 @@
 
 	db $ff
 
-PokemonTower4Text1: ; 60840 (18:4840)
+PokemonTower4Text1:
 	TX_ASM
 	ld hl, PokemonTower4TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower4Text2: ; 6084a (18:484a)
+PokemonTower4Text2:
 	TX_ASM
 	ld hl, PokemonTower4TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower4Text3: ; 60854 (18:4854)
+PokemonTower4Text3:
 	TX_ASM
 	ld hl, PokemonTower4TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower4BattleText1: ; 6085e (18:485e)
+PokemonTower4BattleText1:
 	TX_FAR _PokemonTower4BattleText1
 	db "@"
 
-PokemonTower4EndBattleText1: ; 60863 (18:4863)
+PokemonTower4EndBattleText1:
 	TX_FAR _PokemonTower4EndBattleText1
 	db "@"
 
-PokemonTower4AfterBattleText1: ; 60868 (18:4868)
+PokemonTower4AfterBattleText1:
 	TX_FAR _PokemonTower4AfterBattleText1
 	db "@"
 
-PokemonTower4BattleText2: ; 6086d (18:486d)
+PokemonTower4BattleText2:
 	TX_FAR _PokemonTower4BattleText2
 	db "@"
 
-PokemonTower4EndBattleText2: ; 60872 (18:4872)
+PokemonTower4EndBattleText2:
 	TX_FAR _PokemonTower4EndBattleText2
 	db "@"
 
-PokemonTower4AfterBattleText2: ; 60877 (18:4877)
+PokemonTower4AfterBattleText2:
 	TX_FAR _PokemonTower4AfterBattleText2
 	db "@"
 
-PokemonTower4BattleText3: ; 6087c (18:487c)
+PokemonTower4BattleText3:
 	TX_FAR _PokemonTower4BattleText3
 	db "@"
 
-PokemonTower4EndBattleText3: ; 60881 (18:4881)
+PokemonTower4EndBattleText3:
 	TX_FAR _PokemonTower4EndBattleText3
 	db "@"
 
-PokemonTower4AfterBattleText3: ; 60886 (18:4886)
+PokemonTower4AfterBattleText3:
 	TX_FAR _PokemonTower4AfterBattleText3
 	db "@"
--- a/scripts/pokemontower5.asm
+++ b/scripts/pokemontower5.asm
@@ -1,4 +1,4 @@
-PokemonTower5Script: ; 60932 (18:4932)
+PokemonTower5Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower5TrainerHeaders
 	ld de, PokemonTower5ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wPokemonTower5CurScript], a
 	ret
 
-PokemonTower5ScriptPointers: ; 60945 (18:4945)
+PokemonTower5ScriptPointers:
 	dw PokemonTower5Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PokemonTower5Script0: ; 6094b (18:494b)
+PokemonTower5Script0:
 	ld hl, CoordsData_60992
 	call ArePlayerCoordsInArray
 	jr c, .asm_60960
@@ -41,7 +41,7 @@
 	ld [wJoyIgnore], a
 	ret
 
-CoordsData_60992: ; 60992 (18:4992)
+CoordsData_60992:
 	db $08,$0A
 	db $08,$0B
 	db $09,$0A
@@ -48,7 +48,7 @@
 	db $09,$0B
 	db $FF
 
-PokemonTower5TextPointers: ; 6099b (18:499b)
+PokemonTower5TextPointers:
 	dw PokemonTower5Text1
 	dw PokemonTower5Text2
 	dw PokemonTower5Text3
@@ -57,8 +57,8 @@
 	dw PickUpItemText
 	dw PokemonTower5Text7
 
-PokemonTower5TrainerHeaders: ; 609a9 (18:49a9)
-PokemonTower5TrainerHeader0: ; 609a9 (18:49a9)
+PokemonTower5TrainerHeaders:
+PokemonTower5TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_0
@@ -67,7 +67,7 @@
 	dw PokemonTower5EndBattleText1 ; TextEndBattle
 	dw PokemonTower5EndBattleText1 ; TextEndBattle
 
-PokemonTower5TrainerHeader1: ; 609b5 (18:49b5)
+PokemonTower5TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_1
@@ -76,7 +76,7 @@
 	dw PokemonTower5EndBattleText2 ; TextEndBattle
 	dw PokemonTower5EndBattleText2 ; TextEndBattle
 
-PokemonTower5TrainerHeader2: ; 609c1 (18:49c1)
+PokemonTower5TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_2
@@ -85,7 +85,7 @@
 	dw PokemonTower5EndBattleText3 ; TextEndBattle
 	dw PokemonTower5EndBattleText3 ; TextEndBattle
 
-PokemonTower5TrainerHeader3: ; 609cd (18:49cd)
+PokemonTower5TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_3
@@ -96,82 +96,82 @@
 
 	db $ff
 
-PokemonTower5Text1: ; 609da (18:49da)
+PokemonTower5Text1:
 	TX_FAR _PokemonTower5Text1
 	db "@"
 
-PokemonTower5Text2: ; 609df (18:49df)
+PokemonTower5Text2:
 	TX_ASM
 	ld hl, PokemonTower5TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower5BattleText1: ; 609e9 (18:49e9)
+PokemonTower5BattleText1:
 	TX_FAR _PokemonTower5BattleText1
 	db "@"
 
-PokemonTower5EndBattleText1: ; 609ee (18:49ee)
+PokemonTower5EndBattleText1:
 	TX_FAR _PokemonTower5EndBattleText1
 	db "@"
 
-PokemonTower5AfterBattleText1: ; 609f3 (18:49f3)
+PokemonTower5AfterBattleText1:
 	TX_FAR _PokemonTower5AfterBattleText1
 	db "@"
 
-PokemonTower5Text3: ; 609f8 (18:49f8)
+PokemonTower5Text3:
 	TX_ASM
 	ld hl, PokemonTower5TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower5BattleText2: ; 60a02 (18:4a02)
+PokemonTower5BattleText2:
 	TX_FAR _PokemonTower5BattleText2
 	db "@"
 
-PokemonTower5EndBattleText2: ; 60a07 (18:4a07)
+PokemonTower5EndBattleText2:
 	TX_FAR _PokemonTower5EndBattleText2
 	db "@"
 
-PokemonTower5AfterBattleText2: ; 60a0c (18:4a0c)
+PokemonTower5AfterBattleText2:
 	TX_FAR _PokemonTower5AfterBattleText2
 	db "@"
 
-PokemonTower5Text4: ; 60a11 (18:4a11)
+PokemonTower5Text4:
 	TX_ASM
 	ld hl, PokemonTower5TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower5BattleText3: ; 60a1b (18:4a1b)
+PokemonTower5BattleText3:
 	TX_FAR _PokemonTower5BattleText3
 	db "@"
 
-PokemonTower5EndBattleText3: ; 60a20 (18:4a20)
+PokemonTower5EndBattleText3:
 	TX_FAR _PokemonTower5EndBattleText3
 	db "@"
 
-PokemonTower5AfterBattleText3: ; 60a25 (18:4a25)
+PokemonTower5AfterBattleText3:
 	TX_FAR _PokemonTower5AfterBattleText3
 	db "@"
 
-PokemonTower5Text5: ; 60a2a (18:4a2a)
+PokemonTower5Text5:
 	TX_ASM
 	ld hl, PokemonTower5TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower5BattleText4: ; 60a34 (18:4a34)
+PokemonTower5BattleText4:
 	TX_FAR _PokemonTower5BattleText4
 	db "@"
 
-PokemonTower5EndBattleText4: ; 60a39 (18:4a39)
+PokemonTower5EndBattleText4:
 	TX_FAR _PokemonTower5EndBattleText4
 	db "@"
 
-PokemonTower5AfterBattleText4: ; 60a3e (18:4a3e)
+PokemonTower5AfterBattleText4:
 	TX_FAR _PokemonTower5AfterBattleText4
 	db "@"
 
-PokemonTower5Text7: ; 60a43 (18:4a43)
+PokemonTower5Text7:
 	TX_FAR _PokemonTower5Text7
 	db "@"
--- a/scripts/pokemontower6.asm
+++ b/scripts/pokemontower6.asm
@@ -1,4 +1,4 @@
-PokemonTower6Script: ; 60aef (18:4aef)
+PokemonTower6Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower6TrainerHeaders
 	ld de, PokemonTower6ScriptPointers
@@ -7,7 +7,7 @@
 	ld [wPokemonTower6CurScript], a
 	ret
 
-PokemonTower6Script_60b02: ; 60b02 (18:4b02)
+PokemonTower6Script_60b02:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wPokemonTower6CurScript], a
@@ -14,7 +14,7 @@
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower6ScriptPointers: ; 60b0d (18:4b0d)
+PokemonTower6ScriptPointers:
 	dw PokemonTower6Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -21,7 +21,7 @@
 	dw PokemonTower6Script3
 	dw PokemonTower6Script4
 
-PokemonTower6Script0: ; 60b17 (18:4b17)
+PokemonTower6Script0:
 	CheckEvent EVENT_BEAT_GHOST_MAROWAK
 	jp nz, CheckFightingMapTrainers
 	ld hl, CoordsData_60b45
@@ -41,10 +41,10 @@
 	ld [wCurMapScript], a
 	ret
 
-CoordsData_60b45: ; 60b45 (18:4b45)
+CoordsData_60b45:
 	db $10,$0A,$FF
 
-PokemonTower6Script4: ; 60b48 (18:4b48)
+PokemonTower6Script4:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PokemonTower6Script_60b02
@@ -84,7 +84,7 @@
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower6Script3: ; 60ba1 (18:4ba1)
+PokemonTower6Script3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -94,7 +94,7 @@
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower6TextPointers: ; 60bb1 (18:4bb1)
+PokemonTower6TextPointers:
 	dw PokemonTower6Text1
 	dw PokemonTower6Text2
 	dw PokemonTower6Text3
@@ -103,8 +103,8 @@
 	dw PokemonTower6Text6
 	dw PokemonTower6Text7
 
-PokemonTower6TrainerHeaders: ; 60bbf (18:4bbf)
-PokemonTower6TrainerHeader0: ; 60bbf (18:4bbf)
+PokemonTower6TrainerHeaders:
+PokemonTower6TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_0
@@ -113,7 +113,7 @@
 	dw PokemonTower6EndBattleText1 ; TextEndBattle
 	dw PokemonTower6EndBattleText1 ; TextEndBattle
 
-PokemonTower6TrainerHeader1: ; 60bcb (18:4bcb)
+PokemonTower6TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_1
@@ -122,7 +122,7 @@
 	dw PokemonTower6EndBattleText2 ; TextEndBattle
 	dw PokemonTower6EndBattleText2 ; TextEndBattle
 
-PokemonTower6TrainerHeader2: ; 60bd7 (18:4bd7)
+PokemonTower6TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_2
@@ -133,25 +133,25 @@
 
 	db $ff
 
-PokemonTower6Text1: ; 60be4 (18:4be4)
+PokemonTower6Text1:
 	TX_ASM
 	ld hl, PokemonTower6TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower6Text2: ; 60bee (18:4bee)
+PokemonTower6Text2:
 	TX_ASM
 	ld hl, PokemonTower6TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower6Text3: ; 60bf8 (18:4bf8)
+PokemonTower6Text3:
 	TX_ASM
 	ld hl, PokemonTower6TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower6Text7: ; 60c02 (18:4c02)
+PokemonTower6Text7:
 	TX_ASM
 	ld hl, PokemonTower2Text_60c1f
 	call PrintText
@@ -164,50 +164,50 @@
 	call PrintText
 	jp TextScriptEnd
 
-PokemonTower2Text_60c1f: ; 60c1f (18:4c1f)
+PokemonTower2Text_60c1f:
 	TX_FAR _PokemonTower2Text_60c1f
 	db "@"
 
-PokemonTower2Text_60c24: ; 60c24 (18:4c24)
+PokemonTower2Text_60c24:
 	TX_FAR _PokemonTower2Text_60c24
 	db "@"
 
-PokemonTower6BattleText1: ; 60c29 (18:4c29)
+PokemonTower6BattleText1:
 	TX_FAR _PokemonTower6BattleText1
 	db "@"
 
-PokemonTower6EndBattleText1: ; 60c2e (18:4c2e)
+PokemonTower6EndBattleText1:
 	TX_FAR _PokemonTower6EndBattleText1
 	db "@"
 
-PokemonTower6AfterBattleText1: ; 60c33 (18:4c33)
+PokemonTower6AfterBattleText1:
 	TX_FAR _PokemonTower6AfterBattleText1
 	db "@"
 
-PokemonTower6BattleText2: ; 60c38 (18:4c38)
+PokemonTower6BattleText2:
 	TX_FAR _PokemonTower6BattleText2
 	db "@"
 
-PokemonTower6EndBattleText2: ; 60c3d (18:4c3d)
+PokemonTower6EndBattleText2:
 	TX_FAR _PokemonTower6EndBattleText2
 	db "@"
 
-PokemonTower6AfterBattleText2: ; 60c42 (18:4c42)
+PokemonTower6AfterBattleText2:
 	TX_FAR _PokemonTower6AfterBattleText2
 	db "@"
 
-PokemonTower6BattleText3: ; 60c47 (18:4c47)
+PokemonTower6BattleText3:
 	TX_FAR _PokemonTower6BattleText3
 	db "@"
 
-PokemonTower6EndBattleText3: ; 60c4c (18:4c4c)
+PokemonTower6EndBattleText3:
 	TX_FAR _PokemonTower6EndBattleText3
 	db "@"
 
-PokemonTower6AfterBattleText3: ; 60c51 (18:4c51)
+PokemonTower6AfterBattleText3:
 	TX_FAR _PokemonTower6AfterBattleText3
 	db "@"
 
-PokemonTower6Text6: ; 60c56 (18:4c56)
+PokemonTower6Text6:
 	TX_FAR _PokemonTower6Text6
 	db "@"
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -1,4 +1,4 @@
-PokemonTower7Script: ; 60d05 (18:4d05)
+PokemonTower7Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower7TrainerHeaders
 	ld de, PokemonTower7ScriptPointers
@@ -7,7 +7,7 @@
 	ld [wPokemonTower7CurScript], a
 	ret
 
-PokemonTower7Script_60d18: ; 60d18 (18:4d18)
+PokemonTower7Script_60d18:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wPokemonTower7CurScript], a
@@ -21,7 +21,7 @@
 	dw PokemonTower7Script3
 	dw PokemonTower7Script4
 
-PokemonTower7Script2: ; 60d23 (18:4d23)
+PokemonTower7Script2:
 	ld hl, wFlags_0xcd60
 	res 0, [hl]
 	ld a, [wIsInBattle]
@@ -39,7 +39,7 @@
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower7Script3: ; 60d56 (18:4d56)
+PokemonTower7Script3:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -63,7 +63,7 @@
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower7Script4: ; 60d86 (18:4d86)
+PokemonTower7Script4:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	ld a, HS_POKEMONTOWER_7_MR_FUJI
@@ -84,7 +84,7 @@
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower7Script_60db6: ; 60db6 (18:4db6)
+PokemonTower7Script_60db6:
 	ld hl, CoordsData_60de3
 	ld a, [wSpriteIndex]
 	dec a
@@ -116,7 +116,7 @@
 	inc hl
 	jr .asm_60dcb
 
-CoordsData_60de3: ; 60de3 (18:4de3)
+CoordsData_60de3:
 	db $0C,$09
 	dw MovementData_60e13
 	db $0B,$0A
@@ -198,14 +198,14 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-PokemonTower7TextPointers: ; 60e3f (18:4e3f)
+PokemonTower7TextPointers:
 	dw PokemonTower7Text1
 	dw PokemonTower7Text2
 	dw PokemonTower7Text3
 	dw PokemonTower7FujiText
 
-PokemonTower7TrainerHeaders: ; 60e47 (18:4e47)
-PokemonTower7TrainerHeader0: ; 60e47 (18:4e47)
+PokemonTower7TrainerHeaders:
+PokemonTower7TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_0
@@ -214,7 +214,7 @@
 	dw PokemonTower7EndBattleText1 ; TextEndBattle
 	dw PokemonTower7EndBattleText1 ; TextEndBattle
 
-PokemonTower7TrainerHeader1: ; 60e53 (18:4e53)
+PokemonTower7TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_1
@@ -223,7 +223,7 @@
 	dw PokemonTower7EndBattleText2 ; TextEndBattle
 	dw PokemonTower7EndBattleText2 ; TextEndBattle
 
-PokemonTower7TrainerHeader2: ; 60e5f (18:4e5f)
+PokemonTower7TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_2
@@ -234,19 +234,19 @@
 
 	db $ff
 
-PokemonTower7Text1: ; 60e6c (18:4e6c)
+PokemonTower7Text1:
 	TX_ASM
 	ld hl, PokemonTower7TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower7Text2: ; 60e76 (18:4e76)
+PokemonTower7Text2:
 	TX_ASM
 	ld hl, PokemonTower7TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower7Text3: ; 60e80 (18:4e80)
+PokemonTower7Text3:
 	TX_ASM
 	ld hl, PokemonTower7TrainerHeader2
 	call TalkToTrainer
@@ -276,38 +276,38 @@
 	TX_FAR _TowerRescueFujiText
 	db "@"
 
-PokemonTower7BattleText1: ; 60ec9 (18:4ec9)
+PokemonTower7BattleText1:
 	TX_FAR _PokemonTower7BattleText1
 	db "@"
 
-PokemonTower7EndBattleText1: ; 60ece (18:4ece)
+PokemonTower7EndBattleText1:
 	TX_FAR _PokemonTower7EndBattleText1
 	db "@"
 
-PokemonTower7AfterBattleText1: ; 60ed3 (18:4ed3)
+PokemonTower7AfterBattleText1:
 	TX_FAR _PokemonTower7AfterBattleText1
 	db "@"
 
-PokemonTower7BattleText2: ; 60ed8 (18:4ed8)
+PokemonTower7BattleText2:
 	TX_FAR _PokemonTower7BattleText2
 	db "@"
 
-PokemonTower7EndBattleText2: ; 60edd (18:4edd)
+PokemonTower7EndBattleText2:
 	TX_FAR _PokemonTower7EndBattleText2
 	db "@"
 
-PokemonTower7AfterBattleText2: ; 60ee2 (18:4ee2)
+PokemonTower7AfterBattleText2:
 	TX_FAR _PokemonTower7AfterBattleText2
 	db "@"
 
-PokemonTower7BattleText3: ; 60ee7 (18:4ee7)
+PokemonTower7BattleText3:
 	TX_FAR _PokemonTower7BattleText3
 	db "@"
 
-PokemonTower7EndBattleText3: ; 60eec (18:4eec)
+PokemonTower7EndBattleText3:
 	TX_FAR _PokemonTower7EndBattleText3
 	db "@"
 
-PokemonTower7AfterBattleText3: ; 60ef1 (18:4ef1)
+PokemonTower7AfterBattleText3:
 	TX_FAR _PokemonTower7AfterBattleText3
 	db "@"
--- a/scripts/redshouse1f.asm
+++ b/scripts/redshouse1f.asm
@@ -1,7 +1,7 @@
-RedsHouse1FScript: ; 48168 (12:4168)
+RedsHouse1FScript:
 	jp EnableAutoTextBoxDrawing
 
-RedsHouse1FTextPointers: ; 4816b (12:416b)
+RedsHouse1FTextPointers:
 	dw RedsHouse1FText1
 	dw RedsHouse1FText2
 
@@ -18,11 +18,11 @@
 .done
 	jp TextScriptEnd
 
-MomWakeUpText: ; 48185 (12:4185)
+MomWakeUpText:
 	TX_FAR _MomWakeUpText
 	db "@"
 
-MomHealPokemon: ; 4818a (12:418a)
+MomHealPokemon:
 	ld hl, MomHealText1
 	call PrintText
 	call GBFadeOutToWhite
@@ -42,10 +42,10 @@
 	ld hl, MomHealText2
 	jp PrintText
 
-MomHealText1: ; 481bc (12:41bc)
+MomHealText1:
 	TX_FAR _MomHealText1
 	db "@"
-MomHealText2: ; 481c1 (12:41c1)
+MomHealText2:
 	TX_FAR _MomHealText2
 	db "@"
 
@@ -60,10 +60,10 @@
 	call PrintText
 	jp TextScriptEnd
 
-StandByMeText: ; 481da (12:41da)
+StandByMeText:
 	TX_FAR _StandByMeText
 	db "@"
 
-TVWrongSideText: ; 481df (12:41df)
+TVWrongSideText:
 	TX_FAR _TVWrongSideText
 	db "@"
--- a/scripts/redshouse2f.asm
+++ b/scripts/redshouse2f.asm
@@ -1,14 +1,14 @@
-RedsHouse2FScript: ; 5c0b0 (17:40b0)
+RedsHouse2FScript:
 	call EnableAutoTextBoxDrawing
 	ld hl,RedsHouse2FScriptPointers
 	ld a,[wRedsHouse2CurScript]
 	jp CallFunctionInTable
 
-RedsHouse2FScriptPointers: ; 5c0bc (17:40bc)
+RedsHouse2FScriptPointers:
 	dw RedsHouse2FScript0
 	dw RedsHouse2FScript1
 
-RedsHouse2FScript0: ; 5c0c0 (17:40c0)
+RedsHouse2FScript0:
 	xor a
 	ld [hJoyHeld],a
 	ld a,PLAYER_DIR_UP
@@ -17,8 +17,8 @@
 	ld [wRedsHouse2CurScript],a
 	ret
 
-RedsHouse2FScript1: ; 5c0ce (17:40ce)
+RedsHouse2FScript1:
 	ret
 
-RedsHouse2FTextPointers: ; 5c0cf (17:40cf)
+RedsHouse2FTextPointers:
 	db "@"
--- a/scripts/rockethideout1.asm
+++ b/scripts/rockethideout1.asm
@@ -1,4 +1,4 @@
-RocketHideout1Script: ; 44bca (11:4bca)
+RocketHideout1Script:
 	call RocketHideout1Script_44be0
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout1TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wRocketHideout1CurScript], a
 	ret
 
-RocketHideout1Script_44be0: ; 44be0 (11:4be0)
+RocketHideout1Script_44be0:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -30,12 +30,12 @@
 	lb bc, 8, 12
 	predef_jump ReplaceTileBlock
 
-RocketHideout1ScriptPointers: ; 44c0e (11:4c0e)
+RocketHideout1ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-RocketHideout1TextPointers: ; 44c14 (11:4c14)
+RocketHideout1TextPointers:
 	dw RocketHideout1Text1
 	dw RocketHideout1Text2
 	dw RocketHideout1Text3
@@ -44,8 +44,8 @@
 	dw PickUpItemText
 	dw PickUpItemText
 
-RocketHideout1TrainerHeaders: ; 44c22 (11:4c22)
-RocketHideout1TrainerHeader0: ; 44c22 (11:4c22)
+RocketHideout1TrainerHeaders:
+RocketHideout1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0
@@ -54,7 +54,7 @@
 	dw RocketHideout1EndBattleText2 ; TextEndBattle
 	dw RocketHideout1EndBattleText2 ; TextEndBattle
 
-RocketHideout1TrainerHeader2: ; 44c2e (11:4c2e)
+RocketHideout1TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
@@ -63,7 +63,7 @@
 	dw RocketHideout1EndBattleText3 ; TextEndBattle
 	dw RocketHideout1EndBattleText3 ; TextEndBattle
 
-RocketHideout1TrainerHeader3: ; 44c3a (11:4c3a)
+RocketHideout1TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
@@ -72,7 +72,7 @@
 	dw RocketHideout1EndBattleText4 ; TextEndBattle
 	dw RocketHideout1EndBattleText4 ; TextEndBattle
 
-RocketHideout1TrainerHeader4: ; 44c46 (11:4c46)
+RocketHideout1TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
@@ -81,7 +81,7 @@
 	dw RocketHideout1EndBattleText5 ; TextEndBattle
 	dw RocketHideout1EndBattleText5 ; TextEndBattle
 
-RocketHideout1TrainerHeader5: ; 44c52 (11:4c52)
+RocketHideout1TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
@@ -92,37 +92,37 @@
 
 	db $ff
 
-RocketHideout1Text1: ; 44c5f (11:4c5f)
+RocketHideout1Text1:
 	TX_ASM
 	ld hl, RocketHideout1TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout1Text2: ; 44c69 (11:4c69)
+RocketHideout1Text2:
 	TX_ASM
 	ld hl, RocketHideout1TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout1Text3: ; 44c73 (11:4c73)
+RocketHideout1Text3:
 	TX_ASM
 	ld hl, RocketHideout1TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout1Text4: ; 44c7d (11:4c7d)
+RocketHideout1Text4:
 	TX_ASM
 	ld hl, RocketHideout1TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout1Text5: ; 44c87 (11:4c87)
+RocketHideout1Text5:
 	TX_ASM
 	ld hl, RocketHideout1TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout1EndBattleText6: ; 44c91 (11:4c91)
+RocketHideout1EndBattleText6:
 	TX_FAR _RocketHideout1EndBattleText6
 	TX_ASM
 	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
@@ -129,61 +129,61 @@
 	ld hl, RocketHideout1Text_44c9f
 	ret
 
-RocketHideout1Text_44c9f: ; 44c9f (11:4c9f)
+RocketHideout1Text_44c9f:
 	db $6, "@"
 
-RocketHideout1BattleText2: ; 44ca1 (11:4ca1)
+RocketHideout1BattleText2:
 	TX_FAR _RocketHideout1BattleText2
 	db "@"
 
-RocketHideout1EndBattleText2: ; 44ca6 (11:4ca6)
+RocketHideout1EndBattleText2:
 	TX_FAR _RocketHideout1EndBattleText2
 	db "@"
 
-RocketHideout1AfterBattleTxt2: ; 44cab (11:4cab)
+RocketHideout1AfterBattleTxt2:
 	TX_FAR _RocketHideout1AfterBattleTxt2
 	db "@"
 
-RocketHideout1BattleText3: ; 44cb0 (11:4cb0)
+RocketHideout1BattleText3:
 	TX_FAR _RocketHideout1BattleText3
 	db "@"
 
-RocketHideout1EndBattleText3: ; 44cb5 (11:4cb5)
+RocketHideout1EndBattleText3:
 	TX_FAR _RocketHideout1EndBattleText3
 	db "@"
 
-RocketHideout1AfterBattleTxt3: ; 44cba (11:4cba)
+RocketHideout1AfterBattleTxt3:
 	TX_FAR _RocketHideout1AfterBattleTxt3
 	db "@"
 
-RocketHideout1BattleText4: ; 44cbf (11:4cbf)
+RocketHideout1BattleText4:
 	TX_FAR _RocketHideout1BattleText4
 	db "@"
 
-RocketHideout1EndBattleText4: ; 44cc4 (11:4cc4)
+RocketHideout1EndBattleText4:
 	TX_FAR _RocketHideout1EndBattleText4
 	db "@"
 
-RocketHideout1AfterBattleTxt4: ; 44cc9 (11:4cc9)
+RocketHideout1AfterBattleTxt4:
 	TX_FAR _RocketHideout1AfterBattleTxt4
 	db "@"
 
-RocketHideout1BattleText5: ; 44cce (11:4cce)
+RocketHideout1BattleText5:
 	TX_FAR _RocketHideout1BattleText5
 	db "@"
 
-RocketHideout1EndBattleText5: ; 44cd3 (11:4cd3)
+RocketHideout1EndBattleText5:
 	TX_FAR _RocketHideout1EndBattleText5
 	db "@"
 
-RocketHideout1AfterBattleTxt5: ; 44cd8 (11:4cd8)
+RocketHideout1AfterBattleTxt5:
 	TX_FAR _RocketHideout1AfterBattleTxt5
 	db "@"
 
-RocketHideout1BattleText6: ; 44cdd (11:4cdd)
+RocketHideout1BattleText6:
 	TX_FAR _RocketHideout1BattleText6
 	db "@"
 
-RocketHideout1AfterBattleTxt6: ; 44ce2 (11:4ce2)
+RocketHideout1AfterBattleTxt6:
 	TX_FAR _RocketHideout1AfterBattleTxt6
 	db "@"
--- a/scripts/rockethideout2.asm
+++ b/scripts/rockethideout2.asm
@@ -1,4 +1,4 @@
-RocketHideout2Script: ; 44e27 (11:4e27)
+RocketHideout2Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout2TrainerHeaders
 	ld de, RocketHideout2ScriptPointers
@@ -7,13 +7,13 @@
 	ld [wRocketHideout2CurScript], a
 	ret
 
-RocketHideout2ScriptPointers: ; 44e3a (11:4e3a)
+RocketHideout2ScriptPointers:
 	dw RocketHideout2Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw RocketHideout2Script3
 
-RocketHideout2Script0: ; 44e42 (11:4e42)
+RocketHideout2Script0:
 	ld a, [wYCoord]
 	ld b, a
 	ld a, [wXCoord]
@@ -36,7 +36,7 @@
 ;format:
 ;db y,x
 ;dw pointer to movement
-RocketHideout2ArrowTilePlayerMovement: ; 44e6d (11:4e6d)
+RocketHideout2ArrowTilePlayerMovement:
 	db $9,$4
 	dw RocketHideout2ArrowMovement1
 	db $b,$4
@@ -127,135 +127,135 @@
 
 ;format: direction, count
 ;each list is read starting from the $FF and working backwards
-RocketHideout2ArrowMovement1: ; 44f1a (11:4f1a)
+RocketHideout2ArrowMovement1:
 	db D_LEFT,$02
 	db $FF
 
-RocketHideout2ArrowMovement2: ; 44f1d (11:4f1d)
+RocketHideout2ArrowMovement2:
 	db D_RIGHT,$04
 	db $FF
 
-RocketHideout2ArrowMovement3: ; 44f20 (11:4f20)
+RocketHideout2ArrowMovement3:
 	db D_UP,$04
 	db D_RIGHT,$04
 	db $FF
 
-RocketHideout2ArrowMovement4: ; 44f25 (11:4f25)
+RocketHideout2ArrowMovement4:
 	db D_UP,$04
 	db D_RIGHT,$04
 	db D_UP,$01
 	db $FF
 
-RocketHideout2ArrowMovement5: ; 44f2c (11:4f2c)
+RocketHideout2ArrowMovement5:
 	db D_LEFT,$02
 	db D_UP,$03
 	db $FF
 
-RocketHideout2ArrowMovement6: ; 44f31 (11:4f31)
+RocketHideout2ArrowMovement6:
 	db D_DOWN,$02
 	db D_RIGHT,$04
 	db $FF
 
-RocketHideout2ArrowMovement7: ; 44f36 (11:4f36)
+RocketHideout2ArrowMovement7:
 	db D_UP,$02
 	db $FF
 
-RocketHideout2ArrowMovement8: ; 44f39 (11:4f39)
+RocketHideout2ArrowMovement8:
 	db D_UP,$04
 	db $FF
 
-RocketHideout2ArrowMovement9: ; 44f3c (11:4f3c)
+RocketHideout2ArrowMovement9:
 	db D_LEFT,$06
 	db $FF
 
-RocketHideout2ArrowMovement10: ; 44f3f (11:4f3f)
+RocketHideout2ArrowMovement10:
 	db D_UP,$01
 	db $FF
 
-RocketHideout2ArrowMovement11: ; 44f42 (11:4f42)
+RocketHideout2ArrowMovement11:
 	db D_LEFT,$06
 	db D_UP,$04
 	db $FF
 
-RocketHideout2ArrowMovement12: ; 44f47 (11:4f47)
+RocketHideout2ArrowMovement12:
 	db D_DOWN,$02
 	db $FF
 
-RocketHideout2ArrowMovement13: ; 44f4a (11:4f4a)
+RocketHideout2ArrowMovement13:
 	db D_LEFT,$08
 	db $FF
 
-RocketHideout2ArrowMovement14: ; 44f4d (11:4f4d)
+RocketHideout2ArrowMovement14:
 	db D_LEFT,$08
 	db D_UP,$01
 	db $FF
 
-RocketHideout2ArrowMovement15: ; 44f52 (11:4f52)
+RocketHideout2ArrowMovement15:
 	db D_LEFT,$08
 	db D_UP,$06
 	db $FF
 
-RocketHideout2ArrowMovement16: ; 44f57 (11:4f57)
+RocketHideout2ArrowMovement16:
 	db D_UP,$02
 	db D_RIGHT,$04
 	db $FF
 
-RocketHideout2ArrowMovement17: ; 44f5c (11:4f5c)
+RocketHideout2ArrowMovement17:
 	db D_UP,$02
 	db D_RIGHT,$04
 	db D_UP,$02
 	db $FF
 
-RocketHideout2ArrowMovement18: ; 44f63 (11:4f63)
+RocketHideout2ArrowMovement18:
 	db D_DOWN,$02
 	db D_RIGHT,$04
 	db D_DOWN,$02
 	db $FF
 
-RocketHideout2ArrowMovement19: ; 44f6a (11:4f6a)
+RocketHideout2ArrowMovement19:
 	db D_DOWN,$02
 	db D_RIGHT,$04
 	db $FF
 
-RocketHideout2ArrowMovement20: ; 44f6f (11:4f6f)
+RocketHideout2ArrowMovement20:
 	db D_LEFT,$0A
 	db $FF
 
-RocketHideout2ArrowMovement21: ; 44f72 (11:4f72)
+RocketHideout2ArrowMovement21:
 	db D_LEFT,$0A
 	db D_UP,$02
 	db $FF
 
-RocketHideout2ArrowMovement22: ; 44f77 (11:4f77)
+RocketHideout2ArrowMovement22:
 	db D_LEFT,$0A
 	db D_UP,$04
 	db $FF
 
-RocketHideout2ArrowMovement23: ; 44f7c (11:4f7c)
+RocketHideout2ArrowMovement23:
 	db D_UP,$02
 	db D_RIGHT,$02
 	db $FF
 
-RocketHideout2ArrowMovement24: ; 44f81 (11:4f81)
+RocketHideout2ArrowMovement24:
 	db D_RIGHT,$01
 	db D_DOWN,$02
 	db $FF
 
-RocketHideout2ArrowMovement25: ; 44f86 (11:4f86)
+RocketHideout2ArrowMovement25:
 	db D_RIGHT,$01
 	db $FF
 
-RocketHideout2ArrowMovement26: ; 44f89 (11:4f89)
+RocketHideout2ArrowMovement26:
 	db D_DOWN,$02
 	db D_RIGHT,$02
 	db $FF
 
-RocketHideout2ArrowMovement27: ; 44f8e (11:4f8e)
+RocketHideout2ArrowMovement27:
 	db D_DOWN,$02
 	db D_LEFT,$02
 	db $FF
 
-RocketHideout2ArrowMovement28: ; 44f93 (11:4f93)
+RocketHideout2ArrowMovement28:
 	db D_UP,$02
 	db D_RIGHT,$04
 	db D_UP,$02
@@ -262,46 +262,46 @@
 	db D_LEFT,$03
 	db $FF
 
-RocketHideout2ArrowMovement29: ; 44f9c (11:4f9c)
+RocketHideout2ArrowMovement29:
 	db D_DOWN,$02
 	db D_LEFT,$04
 	db $FF
 
-RocketHideout2ArrowMovement30: ; 44fa1 (11:4fa1)
+RocketHideout2ArrowMovement30:
 	db D_LEFT,$06
 	db D_UP,$04
 	db D_LEFT,$05
 	db $FF
 
-RocketHideout2ArrowMovement31: ; 44fa8 (11:4fa8)
+RocketHideout2ArrowMovement31:
 	db D_UP,$02
 	db $FF
 
-RocketHideout2ArrowMovement32: ; 44fab (11:4fab)
+RocketHideout2ArrowMovement32:
 	db D_UP,$01
 	db $FF
 
-RocketHideout2ArrowMovement33: ; 44fae (11:4fae)
+RocketHideout2ArrowMovement33:
 	db D_UP,$03
 	db $FF
 
-RocketHideout2ArrowMovement34: ; 44fb1 (11:4fb1)
+RocketHideout2ArrowMovement34:
 	db D_UP,$05
 	db $FF
 
-RocketHideout2ArrowMovement35: ; 44fb4 (11:4fb4)
+RocketHideout2ArrowMovement35:
 	db D_RIGHT,$01
 	db D_DOWN,$02
 	db D_LEFT,$04
 	db $FF
 
-RocketHideout2ArrowMovement36: ; 44fbb (11:4fbb)
+RocketHideout2ArrowMovement36:
 	db D_LEFT,$0A
 	db D_UP,$02
 	db D_LEFT,$05
 	db $FF
 
-RocketHideout2Script3: ; 44fc2 (11:4fc2)
+RocketHideout2Script3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	jr nz, LoadSpinnerArrowTiles
@@ -313,7 +313,7 @@
 	ld [wCurMapScript], a
 	ret
 
-LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7)
+LoadSpinnerArrowTiles:
 	ld a, [wSpriteStateData1 + 2]
 	srl a
 	srl a
@@ -400,7 +400,7 @@
 	spinner Gym_GFX, GYM_SPINNER + $100, 1, vGymSpinner + $100
 	spinner Gym_GFX, GYM_SPINNER + $110, 1, vGymSpinner + $110
 
-SpinnerPlayerFacingDirections: ; 45083 (11:5083)
+SpinnerPlayerFacingDirections:
 ; This isn't the order of the facing directions.  Rather, it's a list of
 ; the facing directions that come next. For example, when the player is
 ; facing down (00), the next facing direction is left (08).
@@ -410,10 +410,10 @@
 	db $00 ; right -> down
 
 ; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ
-SpinnerArrowAnimTiles: ; 45087 (11:5087)
+SpinnerArrowAnimTiles:
 	INCBIN "gfx/spinner_arrow.2bpp"
 
-RocketHideout2TextPointers: ; 450c7 (11:50c7)
+RocketHideout2TextPointers:
 	dw RocketHideout2Text1
 	dw PickUpItemText
 	dw PickUpItemText
@@ -420,8 +420,8 @@
 	dw PickUpItemText
 	dw PickUpItemText
 
-RocketHideout2TrainerHeaders: ; 450d1 (11:50d1)
-RocketHideout2TrainerHeader0: ; 450d1 (11:50d1)
+RocketHideout2TrainerHeaders:
+RocketHideout2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0
@@ -432,20 +432,20 @@
 
 	db $ff
 
-RocketHideout2Text1: ; 450de (11:50de)
+RocketHideout2Text1:
 	TX_ASM
 	ld hl, RocketHideout2TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout2BattleText2: ; 450e8 (11:50e8)
+RocketHideout2BattleText2:
 	TX_FAR _RocketHideout2BattleText2
 	db "@"
 
-RocketHideout2EndBattleText2: ; 450ed (11:50ed)
+RocketHideout2EndBattleText2:
 	TX_FAR _RocketHideout2EndBattleText2
 	db "@"
 
-RocketHideout2AfterBattleTxt2: ; 450f2 (11:50f2)
+RocketHideout2AfterBattleTxt2:
 	TX_FAR _RocketHideout2AfterBattleTxt2
 	db "@"
--- a/scripts/rockethideout3.asm
+++ b/scripts/rockethideout3.asm
@@ -1,4 +1,4 @@
-RocketHideout3Script: ; 45225 (11:5225)
+RocketHideout3Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout3TrainerHeaders
 	ld de, RocketHideout3ScriptPointers
@@ -7,13 +7,13 @@
 	ld [wRocketHideout3CurScript], a
 	ret
 
-RocketHideout3ScriptPointers: ; 45238 (11:5238)
+RocketHideout3ScriptPointers:
 	dw RocketHideout3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw RocketHideout3Script3
 
-RocketHideout3Script0: ; 45240 (11:5240)
+RocketHideout3Script0:
 	ld a, [wYCoord]
 	ld b, a
 	ld a, [wXCoord]
@@ -36,7 +36,7 @@
 ;format:
 ;db y,x
 ;dw pointer to movement
-RocketHideout3ArrowTilePlayerMovement: ; 4526b (11:526b)
+RocketHideout3ArrowTilePlayerMovement:
 	db $d,$a
 	dw RocketHideout3ArrowMovement6
 	db $13,$a
@@ -73,28 +73,28 @@
 
 ;format: direction, count
 ;each list is read starting from the $FF and working backwards
-RocketHideout3ArrowMovement1: ; 452ac (11:52ac)
+RocketHideout3ArrowMovement1:
 	db D_RIGHT,$04
 	db D_UP,$04
 	db D_RIGHT,$04
 	db $FF
 
-RocketHideout3ArrowMovement2: ; 452b3 (11:52b3)
+RocketHideout3ArrowMovement2:
 	db D_DOWN,$04
 	db D_RIGHT,$04
 	db $FF
 
-RocketHideout3ArrowMovement3: ; 452b8 (11:52b8)
+RocketHideout3ArrowMovement3:
 	db D_LEFT,$02
 	db $FF
 
-RocketHideout3ArrowMovement4: ; 452bb (11:52bb)
+RocketHideout3ArrowMovement4:
 	db D_RIGHT,$04
 	db D_UP,$02
 	db D_RIGHT,$02
 	db $FF
 
-RocketHideout3ArrowMovement5: ; 452c2 (11:52c2)
+RocketHideout3ArrowMovement5:
 	db D_RIGHT,$04
 	db D_UP,$02
 	db D_RIGHT,$02
@@ -101,37 +101,37 @@
 	db D_UP,$03
 	db $FF
 
-RocketHideout3ArrowMovement6: ; 452cb (11:52cb)
+RocketHideout3ArrowMovement6:
 	db D_RIGHT,$04
 	db $FF
 
-RocketHideout3ArrowMovement7: ; 452ce (11:52ce)
+RocketHideout3ArrowMovement7:
 	db D_RIGHT,$02
 	db $FF
 
-RocketHideout3ArrowMovement8: ; 452d1 (11:52d1)
+RocketHideout3ArrowMovement8:
 	db D_RIGHT,$04
 	db D_UP,$02
 	db $FF
 
-RocketHideout3ArrowMovement9: ; 452d6 (11:52d6)
+RocketHideout3ArrowMovement9:
 	db D_RIGHT,$04
 	db D_UP,$04
 	db $FF
 
-RocketHideout3ArrowMovement10: ; 452db (11:52db)
+RocketHideout3ArrowMovement10:
 	db D_DOWN,$04
 	db $FF
 
-RocketHideout3ArrowMovement11: ; 452de (11:52de)
+RocketHideout3ArrowMovement11:
 	db D_UP,$02
 	db $FF
 
-RocketHideout3ArrowMovement12: ; 452e1 (11:52e1)
+RocketHideout3ArrowMovement12:
 	db D_UP,$01
 	db $FF
 
-RocketHideout3Script3: ; 452e4 (11:452e4)
+RocketHideout3Script3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	jp nz, LoadSpinnerArrowTiles
@@ -143,14 +143,14 @@
 	ld [wCurMapScript], a
 	ret
 
-RocketHideout3TextPointers: ; 452fa (11:52fa)
+RocketHideout3TextPointers:
 	dw RocketHideout3Text1
 	dw RocketHideout3Text2
 	dw PickUpItemText
 	dw PickUpItemText
 
-RocketHideout3TrainerHeaders: ; 45302 (11:5302)
-RocketHideout3TrainerHeader0: ; 45302 (11:5302)
+RocketHideout3TrainerHeaders:
+RocketHideout3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0
@@ -159,7 +159,7 @@
 	dw RocketHideout3EndBattleText2 ; TextEndBattle
 	dw RocketHideout3EndBattleText2 ; TextEndBattle
 
-RocketHideout3TrainerHeader2: ; 4530e (11:530e)
+RocketHideout3TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2
@@ -170,38 +170,38 @@
 
 	db $ff
 
-RocketHideout3Text1: ; 4531b (11:531b)
+RocketHideout3Text1:
 	TX_ASM
 	ld hl, RocketHideout3TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout3BattleText2: ; 45325 (11:5325)
+RocketHideout3BattleText2:
 	TX_FAR _RocketHideout3BattleText2
 	db "@"
 
-RocketHideout3EndBattleText2: ; 4532a (11:532a)
+RocketHideout3EndBattleText2:
 	TX_FAR _RocketHideout3EndBattleText2
 	db "@"
 
-RocketHideout3AfterBattleTxt2: ; 4532f (11:532f)
+RocketHideout3AfterBattleTxt2:
 	TX_FAR _RocketHideout3AfterBattleTxt2
 	db "@"
 
-RocketHideout3Text2: ; 45334 (11:5334)
+RocketHideout3Text2:
 	TX_ASM
 	ld hl, RocketHideout3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout3BattleTxt: ; 4533e (11:533e)
+RocketHideout3BattleTxt:
 	TX_FAR _RocketHideout3BattleTxt
 	db "@"
 
-RocketHideout3EndBattleText3: ; 45343 (11:5343)
+RocketHideout3EndBattleText3:
 	TX_FAR _RocketHideout3EndBattleText3
 	db "@"
 
-RocketHideout3AfterBattleText3: ; 45348 (11:5348)
+RocketHideout3AfterBattleText3:
 	TX_FAR _RocketHide3AfterBattleText3
 	db "@"
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@@ -1,4 +1,4 @@
-RocketHideout4Script: ; 4545d (11:545d)
+RocketHideout4Script:
 	call RocketHideout4Script_45473
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout4TrainerHeader0
@@ -8,7 +8,7 @@
 	ld [wRocketHideout4CurScript], a
 	ret
 
-RocketHideout4Script_45473: ; 45473 (11:5473)
+RocketHideout4Script_45473:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -30,7 +30,7 @@
 	lb bc, 5, 12
 	predef_jump ReplaceTileBlock
 
-RocketHideout4Script_454a3: ; 454a3 (11:54a3)
+RocketHideout4Script_454a3:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wRocketHideout4CurScript], a
@@ -43,7 +43,7 @@
 	dw EndTrainerBattle
 	dw RocketHideout4Script3
 
-RocketHideout4Script3: ; 454b6 (11:54b6)
+RocketHideout4Script3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, RocketHideout4Script_454a3
@@ -72,7 +72,7 @@
 	ld [wCurMapScript], a
 	ret
 
-RocketHideout4TextPointers: ; 45501 (11:5501)
+RocketHideout4TextPointers:
 	dw RocketHideout4Text1
 	dw RocketHideout4Text2
 	dw RocketHideout4Text3
@@ -84,8 +84,8 @@
 	dw PickUpItemText
 	dw RocketHideout4Text10
 
-RocketHideout4TrainerHeaders: ; 45515 (11:5515)
-RocketHideout4TrainerHeader0: ; 45515 (11:5515)
+RocketHideout4TrainerHeaders:
+RocketHideout4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
@@ -94,7 +94,7 @@
 	dw RocketHideout4EndBattleText2 ; TextEndBattle
 	dw RocketHideout4EndBattleText2 ; TextEndBattle
 
-RocketHideout4TrainerHeader2: ; 45521 (11:5521)
+RocketHideout4TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
@@ -103,7 +103,7 @@
 	dw RocketHideout4EndBattleText3 ; TextEndBattle
 	dw RocketHideout4EndBattleText3 ; TextEndBattle
 
-RocketHideout4TrainerHeader3: ; 4552d (11:552d)
+RocketHideout4TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
@@ -114,7 +114,7 @@
 
 	db $ff
 
-RocketHideout4Text1: ; 4553a (11:553a)
+RocketHideout4Text1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
 	jp nz, .asm_545571
@@ -142,69 +142,69 @@
 .asm_209f0
 	jp TextScriptEnd
 
-RocketHideout4Text_4557a: ; 4557a (11:557a)
+RocketHideout4Text_4557a:
 	TX_FAR _RocketHideout4Text_4557a
 	db "@"
 
-RocketHideout4Text_4557f: ; 4557f (11:557f)
+RocketHideout4Text_4557f:
 	TX_FAR _RocketHideout4Text_4557f
 	db "@"
 
-RocketHideout4Text10: ; 45584 (11:5584)
+RocketHideout4Text10:
 	TX_FAR _RocketHideout4Text_45584
 	db "@"
 
-RocketHideout4Text2: ; 45589 (11:5589)
+RocketHideout4Text2:
 	TX_ASM
 	ld hl, RocketHideout4TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout4BattleText2: ; 45593 (11:5593)
+RocketHideout4BattleText2:
 	TX_FAR _RocketHideout4BattleText2
 	db "@"
 
-RocketHideout4EndBattleText2: ; 45598 (11:5598)
+RocketHideout4EndBattleText2:
 	TX_FAR _RocketHideout4EndBattleText2
 	db "@"
 
-RocketHideout4AfterBattleText2: ; 4559d (11:559d)
+RocketHideout4AfterBattleText2:
 	TX_FAR _RocketHide4AfterBattleText2
 	db "@"
 
-RocketHideout4Text3: ; 455a2 (11:55a2)
+RocketHideout4Text3:
 	TX_ASM
 	ld hl, RocketHideout4TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout4BattleText3: ; 455ac (11:55ac)
+RocketHideout4BattleText3:
 	TX_FAR _RocketHideout4BattleText3
 	db "@"
 
-RocketHideout4EndBattleText3: ; 455b1 (11:55b1)
+RocketHideout4EndBattleText3:
 	TX_FAR _RocketHideout4EndBattleText3
 	db "@"
 
-RocketHideout4AfterBattleText3: ; 455b6 (11:55b6)
+RocketHideout4AfterBattleText3:
 	TX_FAR _RocketHide4AfterBattleText3
 	db "@"
 
-RocketHideout4Text4: ; 455bb (11:55bb)
+RocketHideout4Text4:
 	TX_ASM
 	ld hl, RocketHideout4TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout4BattleText4: ; 455c5 (11:55c5)
+RocketHideout4BattleText4:
 	TX_FAR _RocketHideout4BattleText4
 	db "@"
 
-RocketHideout4EndBattleText4: ; 455ca (11:55ca)
+RocketHideout4EndBattleText4:
 	TX_FAR _RocketHideout4EndBattleText4
 	db "@"
 
-RocketHideout4AfterBattleText4: ; 455cf (11:55cf)
+RocketHideout4AfterBattleText4:
 	TX_ASM
 	ld hl, RocketHideout4Text_455ec
 	call PrintText
@@ -216,6 +216,6 @@
 .asm_455e9
 	jp TextScriptEnd
 
-RocketHideout4Text_455ec: ; 455ec (11:55ec)
+RocketHideout4Text_455ec:
 	TX_FAR _RocketHideout4Text_455ec
 	db "@"
--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/rockethideoutelevator.asm
@@ -1,4 +1,4 @@
-RocketHideoutElevatorScript: ; 45710 (11:5710)
+RocketHideoutElevatorScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -14,7 +14,7 @@
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-RocketHideoutElevatorScript_4572c: ; 4572c (11:572c)
+RocketHideoutElevatorScript_4572c:
 	ld hl, wWarpEntries
 	ld a, [wWarpedFromWhichWarp]
 	ld b, a
@@ -22,7 +22,7 @@
 	ld c, a
 	call RocketHideoutElevatorScript_4573a
 
-RocketHideoutElevatorScript_4573a: ; 4573a (11:573a)
+RocketHideoutElevatorScript_4573a:
 	inc hl
 	inc hl
 	ld a, b
@@ -31,7 +31,7 @@
 	ld [hli], a
 	ret
 
-RocketHideoutElevatorScript_45741: ; 45741 (11:5741)
+RocketHideoutElevatorScript_45741:
 	ld hl, RocketHideoutElavatorFloors
 	call LoadItemList
 	ld hl, RocketHideoutElevatorWarpMaps
@@ -40,7 +40,7 @@
 	call CopyData
 	ret
 
-RocketHideoutElavatorFloors: ; 45754 (11:5754)
+RocketHideoutElavatorFloors:
 	db $03 ; num elements in list
 	db FLOOR_B1F
 	db FLOOR_B2F
@@ -47,7 +47,7 @@
 	db FLOOR_B4F
 	db $FF ; terminator
 
-RocketHideoutElevatorWarpMaps: ; 45759 (11:5759)
+RocketHideoutElevatorWarpMaps:
 ; first byte is warp number
 ; second byte is map number
 ; These specify where the player goes after getting out of the elevator.
@@ -56,15 +56,15 @@
 	db $02, ROCKET_HIDEOUT_4
 RocketHideoutElevatorWarpMapsEnd:
 
-RocketHideoutElevatorScript_4575f: ; 4575f (11:575f)
+RocketHideoutElevatorScript_4575f:
 	call Delay3
 	callba ShakeElevator
 	ret
 
-RocketHideoutElevatorTextPointers: ; 4576b (11:576b)
+RocketHideoutElevatorTextPointers:
 	dw RocketHideoutElevatorText1
 
-RocketHideoutElevatorText1: ; 4576d (11:576d)
+RocketHideoutElevatorText1:
 	TX_ASM
 	ld b, LIFT_KEY
 	call IsItemInBag
@@ -79,6 +79,6 @@
 .asm_45788
 	jp TextScriptEnd
 
-RocketHideoutElevatorText_4578b: ; 4578b (11:578b)
+RocketHideoutElevatorText_4578b:
 	TX_FAR _RocketElevatorText_4578b
 	db $d, "@"
--- a/scripts/rocktunnel1.asm
+++ b/scripts/rocktunnel1.asm
@@ -1,4 +1,4 @@
-RockTunnel1Script: ; 444dc (11:44dc)
+RockTunnel1Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, RockTunnel1TrainerHeaders
 	ld de, RockTunnel1ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRockTunnel1CurScript], a
 	ret
 
-RockTunnel1ScriptPointers: ; 444ef (11:44ef)
+RockTunnel1ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-RockTunnel1TextPointers: ; 444f5 (11:44f5)
+RockTunnel1TextPointers:
 	dw RockTunnel1Text1
 	dw RockTunnel1Text2
 	dw RockTunnel1Text3
@@ -22,8 +22,8 @@
 	dw RockTunnel1Text7
 	dw RockTunnel1Text8
 
-RockTunnel1TrainerHeaders: ; 44505 (11:4505)
-RockTunnel1TrainerHeader1: ; 44505 (11:4505)
+RockTunnel1TrainerHeaders:
+RockTunnel1TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1
@@ -32,7 +32,7 @@
 	dw RockTunnel1EndBattleText1 ; TextEndBattle
 	dw RockTunnel1EndBattleText1 ; TextEndBattle
 
-RockTunnel1TrainerHeader2: ; 44511 (11:4511)
+RockTunnel1TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2
@@ -41,7 +41,7 @@
 	dw RockTunnel1EndBattleText2 ; TextEndBattle
 	dw RockTunnel1EndBattleText2 ; TextEndBattle
 
-RockTunnel1TrainerHeader3: ; 4451d (11:451d)
+RockTunnel1TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3
@@ -50,7 +50,7 @@
 	dw RockTunnel1EndBattleText3 ; TextEndBattle
 	dw RockTunnel1EndBattleText3 ; TextEndBattle
 
-RockTunnel1TrainerHeader4: ; 44529 (11:4529)
+RockTunnel1TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4
@@ -59,7 +59,7 @@
 	dw RockTunnel1EndBattleText4 ; TextEndBattle
 	dw RockTunnel1EndBattleText4 ; TextEndBattle
 
-RockTunnel1TrainerHeader5: ; 44535 (11:4535)
+RockTunnel1TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5
@@ -68,7 +68,7 @@
 	dw RockTunnel1EndBattleText5 ; TextEndBattle
 	dw RockTunnel1EndBattleText5 ; TextEndBattle
 
-RockTunnel1TrainerHeader6: ; 44541 (11:4541)
+RockTunnel1TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6
@@ -77,7 +77,7 @@
 	dw RockTunnel1EndBattleText6 ; TextEndBattle
 	dw RockTunnel1EndBattleText6 ; TextEndBattle
 
-RockTunnel1TrainerHeader7: ; 4454d (11:454d)
+RockTunnel1TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7
@@ -88,127 +88,127 @@
 
 	db $ff
 
-RockTunnel1Text1: ; 4455a (11:455a)
+RockTunnel1Text1:
 	TX_ASM
 	ld hl, RockTunnel1TrainerHeader1
 	jr RockTunnel1TalkToTrainer
 
-RockTunnel1Text2: ; 44560 (11:4560)
+RockTunnel1Text2:
 	TX_ASM
 	ld hl, RockTunnel1TrainerHeader2
 	jr RockTunnel1TalkToTrainer
 
-RockTunnel1Text3: ; 44566 (11:4566)
+RockTunnel1Text3:
 	TX_ASM
 	ld hl, RockTunnel1TrainerHeader3
 	jr RockTunnel1TalkToTrainer
 
-RockTunnel1Text4: ; 4456c (11:456c)
+RockTunnel1Text4:
 	TX_ASM
 	ld hl, RockTunnel1TrainerHeader4
 	jr RockTunnel1TalkToTrainer
 
-RockTunnel1Text5: ; 44572 (11:4572)
+RockTunnel1Text5:
 	TX_ASM
 	ld hl, RockTunnel1TrainerHeader5
 	jr RockTunnel1TalkToTrainer
 
-RockTunnel1Text6: ; 44578 (11:4578)
+RockTunnel1Text6:
 	TX_ASM
 	ld hl, RockTunnel1TrainerHeader6
 	jr RockTunnel1TalkToTrainer
 
-RockTunnel1Text7: ; 4457e (11:457e)
+RockTunnel1Text7:
 	TX_ASM
 	ld hl, RockTunnel1TrainerHeader7
-RockTunnel1TalkToTrainer: ; 44582 (11:4582)
+RockTunnel1TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RockTunnel1BattleText1: ; 44588 (11:4588)
+RockTunnel1BattleText1:
 	TX_FAR _RockTunnel1BattleText1
 	db "@"
 
-RockTunnel1EndBattleText1: ; 4458d (11:458d)
+RockTunnel1EndBattleText1:
 	TX_FAR _RockTunnel1EndBattleText1
 	db "@"
 
-RockTunnel1AfterBattleText1: ; 44592 (11:4592)
+RockTunnel1AfterBattleText1:
 	TX_FAR _RockTunnel1AfterBattleText1
 	db "@"
 
-RockTunnel1BattleText2: ; 44597 (11:4597)
+RockTunnel1BattleText2:
 	TX_FAR _RockTunnel1BattleText2
 	db "@"
 
-RockTunnel1EndBattleText2: ; 4459c (11:459c)
+RockTunnel1EndBattleText2:
 	TX_FAR _RockTunnel1EndBattleText2
 	db "@"
 
-RockTunnel1AfterBattleText2: ; 445a1 (11:45a1)
+RockTunnel1AfterBattleText2:
 	TX_FAR _RockTunnel1AfterBattleText2
 	db "@"
 
-RockTunnel1BattleText3: ; 445a6 (11:45a6)
+RockTunnel1BattleText3:
 	TX_FAR _RockTunnel1BattleText3
 	db "@"
 
-RockTunnel1EndBattleText3: ; 445ab (11:45ab)
+RockTunnel1EndBattleText3:
 	TX_FAR _RockTunnel1EndBattleText3
 	db "@"
 
-RockTunnel1AfterBattleText3: ; 445b0 (11:45b0)
+RockTunnel1AfterBattleText3:
 	TX_FAR _RockTunnel1AfterBattleText3
 	db "@"
 
-RockTunnel1BattleText4: ; 445b5 (11:45b5)
+RockTunnel1BattleText4:
 	TX_FAR _RockTunnel1BattleText4
 	db "@"
 
-RockTunnel1EndBattleText4: ; 445ba (11:45ba)
+RockTunnel1EndBattleText4:
 	TX_FAR _RockTunnel1EndBattleText4
 	db "@"
 
-RockTunnel1AfterBattleText4: ; 445bf (11:45bf)
+RockTunnel1AfterBattleText4:
 	TX_FAR _RockTunnel1AfterBattleText4
 	db "@"
 
-RockTunnel1BattleText5: ; 445c4 (11:45c4)
+RockTunnel1BattleText5:
 	TX_FAR _RockTunnel1BattleText5
 	db "@"
 
-RockTunnel1EndBattleText5: ; 445c9 (11:45c9)
+RockTunnel1EndBattleText5:
 	TX_FAR _RockTunnel1EndBattleText5
 	db "@"
 
-RockTunnel1AfterBattleText5: ; 445ce (11:45ce)
+RockTunnel1AfterBattleText5:
 	TX_FAR _RockTunnel1AfterBattleText5
 	db "@"
 
-RockTunnel1BattleText6: ; 445d3 (11:45d3)
+RockTunnel1BattleText6:
 	TX_FAR _RockTunnel1BattleText6
 	db "@"
 
-RockTunnel1EndBattleText6: ; 445d8 (11:45d8)
+RockTunnel1EndBattleText6:
 	TX_FAR _RockTunnel1EndBattleText6
 	db "@"
 
-RockTunnel1AfterBattleText6: ; 445dd (11:45dd)
+RockTunnel1AfterBattleText6:
 	TX_FAR _RockTunnel1AfterBattleText6
 	db "@"
 
-RockTunnel1BattleText7: ; 445e2 (11:45e2)
+RockTunnel1BattleText7:
 	TX_FAR _RockTunnel1BattleText7
 	db "@"
 
-RockTunnel1EndBattleText7: ; 445e7 (11:45e7)
+RockTunnel1EndBattleText7:
 	TX_FAR _RockTunnel1EndBattleText7
 	db "@"
 
-RockTunnel1AfterBattleText7: ; 445ec (11:45ec)
+RockTunnel1AfterBattleText7:
 	TX_FAR _RockTunnel1AfterBattleText7
 	db "@"
 
-RockTunnel1Text8: ; 445f1 (11:45f1)
+RockTunnel1Text8:
 	TX_FAR _RockTunnel1Text8
 	db "@"
--- a/scripts/rocktunnel2.asm
+++ b/scripts/rocktunnel2.asm
@@ -1,4 +1,4 @@
-RockTunnel2Script: ; 45feb (11:5feb)
+RockTunnel2Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, RockTunnel2TrainerHeaders
 	ld de, RockTunnel2ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRockTunnel2CurScript], a
 	ret
 
-RockTunnel2ScriptPointers: ; 45ffe (11:5ffe)
+RockTunnel2ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-RockTunnel2TextPointers: ; 46004 (11:6004)
+RockTunnel2TextPointers:
 	dw RockTunnel2Text1
 	dw RockTunnel2Text2
 	dw RockTunnel2Text3
@@ -22,8 +22,8 @@
 	dw RockTunnel2Text7
 	dw RockTunnel2Text8
 
-RockTunnel2TrainerHeaders: ; 46014 (11:6014)
-RockTunnel2TrainerHeader0: ; 46014 (11:6014)
+RockTunnel2TrainerHeaders:
+RockTunnel2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0
@@ -32,7 +32,7 @@
 	dw RockTunnel2EndBattleText2 ; TextEndBattle
 	dw RockTunnel2EndBattleText2 ; TextEndBattle
 
-RockTunnel2TrainerHeader2: ; 46020 (11:6020)
+RockTunnel2TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
@@ -41,7 +41,7 @@
 	dw RockTunnel2EndBattleText3 ; TextEndBattle
 	dw RockTunnel2EndBattleText3 ; TextEndBattle
 
-RockTunnel2TrainerHeader3: ; 4602c (11:602c)
+RockTunnel2TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
@@ -50,7 +50,7 @@
 	dw RockTunnel2EndBattleText4 ; TextEndBattle
 	dw RockTunnel2EndBattleText4 ; TextEndBattle
 
-RockTunnel2TrainerHeader4: ; 46038 (11:6038)
+RockTunnel2TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
@@ -59,7 +59,7 @@
 	dw RockTunnel2EndBattleText5 ; TextEndBattle
 	dw RockTunnel2EndBattleText5 ; TextEndBattle
 
-RockTunnel2TrainerHeader5: ; 46044 (11:6044)
+RockTunnel2TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
@@ -68,7 +68,7 @@
 	dw RockTunnel2EndBattleText6 ; TextEndBattle
 	dw RockTunnel2EndBattleText6 ; TextEndBattle
 
-RockTunnel2TrainerHeader6: ; 46050 (11:6050)
+RockTunnel2TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
@@ -77,7 +77,7 @@
 	dw RockTunnel2EndBattleText7 ; TextEndBattle
 	dw RockTunnel2EndBattleText7 ; TextEndBattle
 
-RockTunnel2TrainerHeader7: ; 4605c (11:605c)
+RockTunnel2TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7
@@ -86,7 +86,7 @@
 	dw RockTunnel2EndBattleText8 ; TextEndBattle
 	dw RockTunnel2EndBattleText8 ; TextEndBattle
 
-RockTunnel2TrainerHeader8: ; 46068 (11:6068)
+RockTunnel2TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1
@@ -97,146 +97,146 @@
 
 	db $ff
 
-RockTunnel2Text1: ; 46075 (11:6075)
+RockTunnel2Text1:
 	TX_ASM
 	ld hl, RockTunnel2TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RockTunnel2Text2: ; 4607f (11:607f)
+RockTunnel2Text2:
 	TX_ASM
 	ld hl, RockTunnel2TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RockTunnel2Text3: ; 46089 (11:6089)
+RockTunnel2Text3:
 	TX_ASM
 	ld hl, RockTunnel2TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RockTunnel2Text4: ; 46093 (11:6093)
+RockTunnel2Text4:
 	TX_ASM
 	ld hl, RockTunnel2TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RockTunnel2Text5: ; 4609d (11:609d)
+RockTunnel2Text5:
 	TX_ASM
 	ld hl, RockTunnel2TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RockTunnel2Text6: ; 460a7 (11:60a7)
+RockTunnel2Text6:
 	TX_ASM
 	ld hl, RockTunnel2TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RockTunnel2Text7: ; 460b1 (11:60b1)
+RockTunnel2Text7:
 	TX_ASM
 	ld hl, RockTunnel2TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RockTunnel2Text8: ; 460bb (11:60bb)
+RockTunnel2Text8:
 	TX_ASM
 	ld hl, RockTunnel2TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RockTunnel2BattleText2: ; 460c5 (11:60c5)
+RockTunnel2BattleText2:
 	TX_FAR _RockTunnel2BattleText2
 	db "@"
 
-RockTunnel2EndBattleText2: ; 460ca (11:60ca)
+RockTunnel2EndBattleText2:
 	TX_FAR _RockTunnel2EndBattleText2
 	db "@"
 
-RockTunnel2AfterBattleText2: ; 460cf (11:60cf)
+RockTunnel2AfterBattleText2:
 	TX_FAR _RockTunnel2AfterBattleText2
 	db "@"
 
-RockTunnel2BattleText3: ; 460d4 (11:60d4)
+RockTunnel2BattleText3:
 	TX_FAR _RockTunnel2BattleText3
 	db "@"
 
-RockTunnel2EndBattleText3: ; 460d9 (11:60d9)
+RockTunnel2EndBattleText3:
 	TX_FAR _RockTunnel2EndBattleText3
 	db "@"
 
-RockTunnel2AfterBattleText3: ; 460de (11:60de)
+RockTunnel2AfterBattleText3:
 	TX_FAR _RockTunnel2AfterBattleText3
 	db "@"
 
-RockTunnel2BattleText4: ; 460e3 (11:60e3)
+RockTunnel2BattleText4:
 	TX_FAR _RockTunnel2BattleText4
 	db "@"
 
-RockTunnel2EndBattleText4: ; 460e8 (11:60e8)
+RockTunnel2EndBattleText4:
 	TX_FAR _RockTunnel2EndBattleText4
 	db "@"
 
-RockTunnel2AfterBattleText4: ; 460ed (11:60ed)
+RockTunnel2AfterBattleText4:
 	TX_FAR _RockTunnel2AfterBattleText4
 	db "@"
 
-RockTunnel2BattleText5: ; 460f2 (11:60f2)
+RockTunnel2BattleText5:
 	TX_FAR _RockTunnel2BattleText5
 	db "@"
 
-RockTunnel2EndBattleText5: ; 460f7 (11:60f7)
+RockTunnel2EndBattleText5:
 	TX_FAR _RockTunnel2EndBattleText5
 	db "@"
 
-RockTunnel2AfterBattleText5: ; 460fc (11:60fc)
+RockTunnel2AfterBattleText5:
 	TX_FAR _RockTunnel2AfterBattleText5
 	db "@"
 
-RockTunnel2BattleText6: ; 46101 (11:6101)
+RockTunnel2BattleText6:
 	TX_FAR _RockTunnel2BattleText6
 	db "@"
 
-RockTunnel2EndBattleText6: ; 46106 (11:6106)
+RockTunnel2EndBattleText6:
 	TX_FAR _RockTunnel2EndBattleText6
 	db "@"
 
-RockTunnel2AfterBattleText6: ; 4610b (11:610b)
+RockTunnel2AfterBattleText6:
 	TX_FAR _RockTunnel2AfterBattleText6
 	db "@"
 
-RockTunnel2BattleText7: ; 46110 (11:6110)
+RockTunnel2BattleText7:
 	TX_FAR _RockTunnel2BattleText7
 	db "@"
 
-RockTunnel2EndBattleText7: ; 46115 (11:6115)
+RockTunnel2EndBattleText7:
 	TX_FAR _RockTunnel2EndBattleText7
 	db "@"
 
-RockTunnel2AfterBattleText7: ; 4611a (11:611a)
+RockTunnel2AfterBattleText7:
 	TX_FAR _RockTunnel2AfterBattleText7
 	db "@"
 
-RockTunnel2BattleText8: ; 4611f (11:611f)
+RockTunnel2BattleText8:
 	TX_FAR _RockTunnel2BattleText8
 	db "@"
 
-RockTunnel2EndBattleText8: ; 46124 (11:6124)
+RockTunnel2EndBattleText8:
 	TX_FAR _RockTunnel2EndBattleText8
 	db "@"
 
-RockTunnel2AfterBattleText8: ; 46129 (11:6129)
+RockTunnel2AfterBattleText8:
 	TX_FAR _RockTunnel2AfterBattleText8
 	db "@"
 
-RockTunnel2BattleText9: ; 4612e (11:612e)
+RockTunnel2BattleText9:
 	TX_FAR _RockTunnel2BattleText9
 	db "@"
 
-RockTunnel2EndBattleText9: ; 46133 (11:6133)
+RockTunnel2EndBattleText9:
 	TX_FAR _RockTunnel2EndBattleText9
 	db "@"
 
-RockTunnel2AfterBattleText9: ; 46138 (11:6138)
+RockTunnel2AfterBattleText9:
 	TX_FAR _RockTunnel2AfterBattleText9
 	db "@"
--- a/scripts/route1.asm
+++ b/scripts/route1.asm
@@ -1,12 +1,12 @@
-Route1Script: ; 1caaf (7:4aaf)
+Route1Script:
 	jp EnableAutoTextBoxDrawing
 
-Route1TextPointers: ; 1cab2 (7:4ab2)
+Route1TextPointers:
 	dw Route1Text1
 	dw Route1Text2
 	dw Route1Text3
 
-Route1Text1: ; 1cab8 (7:4ab8)
+Route1Text1:
 	TX_ASM
 	CheckAndSetEvent EVENT_GOT_POTION_SAMPLE
 	jr nz, .asm_1cada
@@ -26,26 +26,26 @@
 	call PrintText
 	jp TextScriptEnd
 
-Route1ViridianMartSampleText: ; 1cae3 (7:4ae3)
+Route1ViridianMartSampleText:
 	TX_FAR _Route1ViridianMartSampleText
 	db "@"
 
-Route1Text_1cae8: ; 1cae8 (7:4ae8)
+Route1Text_1cae8:
 	TX_FAR _Route1Text_1cae8
 	db $0b,"@"
 
-Route1Text_1caee: ; 1caee (7:4aee)
+Route1Text_1caee:
 	TX_FAR _Route1Text_1caee
 	db "@"
 
-Route1Text_1caf3: ; 1caf3 (7:4af3)
+Route1Text_1caf3:
 	TX_FAR _Route1Text_1caf3
 	db "@"
 
-Route1Text2: ; 1caf8 (7:4af8)
+Route1Text2:
 	TX_FAR _Route1Text2
 	db "@"
 
-Route1Text3: ; 1cafd (7:4afd)
+Route1Text3:
 	TX_FAR _Route1Text3
 	db "@"
--- a/scripts/route10.asm
+++ b/scripts/route10.asm
@@ -1,4 +1,4 @@
-Route10Script: ; 59336 (16:5336)
+Route10Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route10TrainerHeaders
 	ld de, Route10ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute10CurScript], a
 	ret
 
-Route10ScriptPointers: ; 59349 (16:5349)
+Route10ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route10TextPointers: ; 5934f (16:534f)
+Route10TextPointers:
 	dw Route10Text1
 	dw Route10Text2
 	dw Route10Text3
@@ -24,8 +24,8 @@
 	dw Route10Text9
 	dw Route10Text10
 
-Route10TrainerHeaders: ; 59363 (16:5363)
-Route10TrainerHeader0: ; 59363 (16:5363)
+Route10TrainerHeaders:
+Route10TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_0
@@ -34,7 +34,7 @@
 	dw Route10EndBattleText1 ; TextEndBattle
 	dw Route10EndBattleText1 ; TextEndBattle
 
-Route10TrainerHeader1: ; 5936f (16:536f)
+Route10TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_1
@@ -43,7 +43,7 @@
 	dw Route10EndBattleText2 ; TextEndBattle
 	dw Route10EndBattleText2 ; TextEndBattle
 
-Route10TrainerHeader2: ; 5937b (16:537b)
+Route10TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_2
@@ -52,7 +52,7 @@
 	dw Route10EndBattleText3 ; TextEndBattle
 	dw Route10EndBattleText3 ; TextEndBattle
 
-Route10TrainerHeader3: ; 59387 (16:5387)
+Route10TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_3
@@ -61,7 +61,7 @@
 	dw Route10EndBattleText4 ; TextEndBattle
 	dw Route10EndBattleText4 ; TextEndBattle
 
-Route10TrainerHeader4: ; 59393 (16:5393)
+Route10TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_4
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_4
@@ -70,7 +70,7 @@
 	dw Route10EndBattleText5 ; TextEndBattle
 	dw Route10EndBattleText5 ; TextEndBattle
 
-Route10TrainerHeader5: ; 5939f (16:539f)
+Route10TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_5
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_5
@@ -81,119 +81,119 @@
 
 	db $ff
 
-Route10Text1: ; 593ac (16:53ac)
+Route10Text1:
 	TX_ASM
 	ld hl, Route10TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText1: ; 593b6 (16:53b6)
+Route10BattleText1:
 	TX_FAR _Route10BattleText1
 	db "@"
 
-Route10EndBattleText1: ; 593bb (16:53bb)
+Route10EndBattleText1:
 	TX_FAR _Route10EndBattleText1
 	db "@"
 
-Route10AfterBattleText1: ; 593c0 (16:53c0)
+Route10AfterBattleText1:
 	TX_FAR _Route10AfterBattleText1
 	db "@"
 
-Route10Text2: ; 593c5 (16:53c5)
+Route10Text2:
 	TX_ASM
 	ld hl, Route10TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText2: ; 593cf (16:53cf)
+Route10BattleText2:
 	TX_FAR _Route10BattleText2
 	db "@"
 
-Route10EndBattleText2: ; 593d4 (16:53d4)
+Route10EndBattleText2:
 	TX_FAR _Route10EndBattleText2
 	db "@"
 
-Route10AfterBattleText2: ; 593d9 (16:53d9)
+Route10AfterBattleText2:
 	TX_FAR _Route10AfterBattleText2
 	db "@"
 
-Route10Text3: ; 593de (16:53de)
+Route10Text3:
 	TX_ASM
 	ld hl, Route10TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText3: ; 593e8 (16:53e8)
+Route10BattleText3:
 	TX_FAR _Route10BattleText3
 	db "@"
 
-Route10EndBattleText3: ; 593ed (16:53ed)
+Route10EndBattleText3:
 	TX_FAR _Route10EndBattleText3
 	db "@"
 
-Route10AfterBattleText3: ; 593f2 (16:53f2)
+Route10AfterBattleText3:
 	TX_FAR _Route10AfterBattleText3
 	db "@"
 
-Route10Text4: ; 593f7 (16:53f7)
+Route10Text4:
 	TX_ASM
 	ld hl, Route10TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText4: ; 59401 (16:5401)
+Route10BattleText4:
 	TX_FAR _Route10BattleText4
 	db "@"
 
-Route10EndBattleText4: ; 59406 (16:5406)
+Route10EndBattleText4:
 	TX_FAR _Route10EndBattleText4
 	db "@"
 
-Route10AfterBattleText4: ; 5940b (16:540b)
+Route10AfterBattleText4:
 	TX_FAR _Route10AfterBattleText4
 	db "@"
 
-Route10Text5: ; 59410 (16:5410)
+Route10Text5:
 	TX_ASM
 	ld hl, Route10TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText5: ; 5941a (16:541a)
+Route10BattleText5:
 	TX_FAR _Route10BattleText5
 	db "@"
 
-Route10EndBattleText5: ; 5941f (16:541f)
+Route10EndBattleText5:
 	TX_FAR _Route10EndBattleText5
 	db "@"
 
-Route10AfterBattleText5: ; 59424 (16:5424)
+Route10AfterBattleText5:
 	TX_FAR _Route10AfterBattleText5
 	db "@"
 
-Route10Text6: ; 59429 (16:5429)
+Route10Text6:
 	TX_ASM
 	ld hl, Route10TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText6: ; 59433 (16:5433)
+Route10BattleText6:
 	TX_FAR _Route10BattleText6
 	db "@"
 
-Route10EndBattleText6: ; 59438 (16:5438)
+Route10EndBattleText6:
 	TX_FAR _Route10EndBattleText6
 	db "@"
 
-Route10AfterBattleText6: ; 5943d (16:543d)
+Route10AfterBattleText6:
 	TX_FAR _Route10AfterBattleText6
 	db "@"
 
-Route10Text9: ; 59442 (16:5442)
-Route10Text7: ; 59442 (16:5442)
+Route10Text9:
+Route10Text7:
 	TX_FAR _Route10Text7 ; _Route10Text9
 	db "@"
 
-Route10Text10: ; 59447 (16:5447)
+Route10Text10:
 	TX_FAR _Route10Text10
 	db "@"
--- a/scripts/route11.asm
+++ b/scripts/route11.asm
@@ -1,4 +1,4 @@
-Route11Script: ; 5944c (16:544c)
+Route11Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route11TrainerHeaders
 	ld de, Route11ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute11CurScript], a
 	ret
 
-Route11ScriptPointers: ; 5945f (16:545f)
+Route11ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route11TextPointers: ; 59465 (16:5465)
+Route11TextPointers:
 	dw Route11Text1
 	dw Route11Text2
 	dw Route11Text3
@@ -25,8 +25,8 @@
 	dw Route11Text10
 	dw Route11Text11
 
-Route11TrainerHeaders: ; 5947b (16:547b)
-Route11TrainerHeader0: ; 5947b (16:547b)
+Route11TrainerHeaders:
+Route11TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_0
@@ -35,7 +35,7 @@
 	dw Route11EndBattleText1 ; TextEndBattle
 	dw Route11EndBattleText1 ; TextEndBattle
 
-Route11TrainerHeader1: ; 59487 (16:5487)
+Route11TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_1
@@ -44,7 +44,7 @@
 	dw Route11EndBattleText2 ; TextEndBattle
 	dw Route11EndBattleText2 ; TextEndBattle
 
-Route11TrainerHeader2: ; 59493 (16:5493)
+Route11TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_2
@@ -53,7 +53,7 @@
 	dw Route11EndBattleText3 ; TextEndBattle
 	dw Route11EndBattleText3 ; TextEndBattle
 
-Route11TrainerHeader3: ; 5949f (16:549f)
+Route11TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_3
@@ -62,7 +62,7 @@
 	dw Route11EndBattleText4 ; TextEndBattle
 	dw Route11EndBattleText4 ; TextEndBattle
 
-Route11TrainerHeader4: ; 594ab (16:54ab)
+Route11TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_4
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_4
@@ -71,7 +71,7 @@
 	dw Route11EndBattleText5 ; TextEndBattle
 	dw Route11EndBattleText5 ; TextEndBattle
 
-Route11TrainerHeader5: ; 594b7 (16:54b7)
+Route11TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_5
@@ -80,7 +80,7 @@
 	dw Route11EndBattleText6 ; TextEndBattle
 	dw Route11EndBattleText6 ; TextEndBattle
 
-Route11TrainerHeader6: ; 594c3 (16:54c3)
+Route11TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_6
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_6
@@ -89,7 +89,7 @@
 	dw Route11EndBattleText7 ; TextEndBattle
 	dw Route11EndBattleText7 ; TextEndBattle
 
-Route11TrainerHeader7: ; 594cf (16:54cf)
+Route11TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_7, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_7, 1
@@ -98,7 +98,7 @@
 	dw Route11EndBattleText8 ; TextEndBattle
 	dw Route11EndBattleText8 ; TextEndBattle
 
-Route11TrainerHeader8: ; 594db (16:54db)
+Route11TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_8, 1
@@ -107,7 +107,7 @@
 	dw Route11EndBattleText9 ; TextEndBattle
 	dw Route11EndBattleText9 ; TextEndBattle
 
-Route11TrainerHeader9: ; 594e7 (16:54e7)
+Route11TrainerHeader9:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_9, 1
@@ -118,186 +118,186 @@
 
 	db $ff
 
-Route11Text1: ; 594f4 (16:54f4)
+Route11Text1:
 	TX_ASM
 	ld hl, Route11TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText1: ; 594fe (16:54fe)
+Route11BattleText1:
 	TX_FAR _Route11BattleText1
 	db "@"
 
-Route11EndBattleText1: ; 59503 (16:5503)
+Route11EndBattleText1:
 	TX_FAR _Route11EndBattleText1
 	db "@"
 
-Route11AfterBattleText1: ; 59508 (16:5508)
+Route11AfterBattleText1:
 	TX_FAR _Route11AfterBattleText1
 	db "@"
 
-Route11Text2: ; 5950d (16:550d)
+Route11Text2:
 	TX_ASM
 	ld hl, Route11TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText2: ; 59517 (16:5517)
+Route11BattleText2:
 	TX_FAR _Route11BattleText2
 	db "@"
 
-Route11EndBattleText2: ; 5951c (16:551c)
+Route11EndBattleText2:
 	TX_FAR _Route11EndBattleText2
 	db "@"
 
-Route11AfterBattleText2: ; 59521 (16:5521)
+Route11AfterBattleText2:
 	TX_FAR _Route11AfterBattleText2
 	db "@"
 
-Route11Text3: ; 59526 (16:5526)
+Route11Text3:
 	TX_ASM
 	ld hl, Route11TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText3: ; 59530 (16:5530)
+Route11BattleText3:
 	TX_FAR _Route11BattleText3
 	db "@"
 
-Route11EndBattleText3: ; 59535 (16:5535)
+Route11EndBattleText3:
 	TX_FAR _Route11EndBattleText3
 	db "@"
 
-Route11AfterBattleText3: ; 5953a (16:553a)
+Route11AfterBattleText3:
 	TX_FAR _Route11AfterBattleText3
 	db "@"
 
-Route11Text4: ; 5953f (16:553f)
+Route11Text4:
 	TX_ASM
 	ld hl, Route11TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText4: ; 59549 (16:5549)
+Route11BattleText4:
 	TX_FAR _Route11BattleText4
 	db "@"
 
-Route11EndBattleText4: ; 5954e (16:554e)
+Route11EndBattleText4:
 	TX_FAR _Route11EndBattleText4
 	db "@"
 
-Route11AfterBattleText4: ; 59553 (16:5553)
+Route11AfterBattleText4:
 	TX_FAR _Route11AfterBattleText4
 	db "@"
 
-Route11Text5: ; 59558 (16:5558)
+Route11Text5:
 	TX_ASM
 	ld hl, Route11TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText5: ; 59562 (16:5562)
+Route11BattleText5:
 	TX_FAR _Route11BattleText5
 	db "@"
 
-Route11EndBattleText5: ; 59567 (16:5567)
+Route11EndBattleText5:
 	TX_FAR _Route11EndBattleText5
 	db "@"
 
-Route11AfterBattleText5: ; 5956c (16:556c)
+Route11AfterBattleText5:
 	TX_FAR _Route11AfterBattleText5
 	db "@"
 
-Route11Text6: ; 59571 (16:5571)
+Route11Text6:
 	TX_ASM
 	ld hl, Route11TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText6: ; 5957b (16:557b)
+Route11BattleText6:
 	TX_FAR _Route11BattleText6
 	db "@"
 
-Route11EndBattleText6: ; 59580 (16:5580)
+Route11EndBattleText6:
 	TX_FAR _Route11EndBattleText6
 	db "@"
 
-Route11AfterBattleText6: ; 59585 (16:5585)
+Route11AfterBattleText6:
 	TX_FAR _Route11AfterBattleText6
 	db "@"
 
-Route11Text7: ; 5958a (16:558a)
+Route11Text7:
 	TX_ASM
 	ld hl, Route11TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText7: ; 59594 (16:5594)
+Route11BattleText7:
 	TX_FAR _Route11BattleText7
 	db "@"
 
-Route11EndBattleText7: ; 59599 (16:5599)
+Route11EndBattleText7:
 	TX_FAR _Route11EndBattleText7
 	db "@"
 
-Route11AfterBattleText7: ; 5959e (16:559e)
+Route11AfterBattleText7:
 	TX_FAR _Route11AfterBattleText7
 	db "@"
 
-Route11Text8: ; 595a3 (16:55a3)
+Route11Text8:
 	TX_ASM
 	ld hl, Route11TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText8: ; 595ad (16:55ad)
+Route11BattleText8:
 	TX_FAR _Route11BattleText8
 	db "@"
 
-Route11EndBattleText8: ; 595b2 (16:55b2)
+Route11EndBattleText8:
 	TX_FAR _Route11EndBattleText8
 	db "@"
 
-Route11AfterBattleText8: ; 595b7 (16:55b7)
+Route11AfterBattleText8:
 	TX_FAR _Route11AfterBattleText8
 	db "@"
 
-Route11Text9: ; 595bc (16:55bc)
+Route11Text9:
 	TX_ASM
 	ld hl, Route11TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText9: ; 595c6 (16:55c6)
+Route11BattleText9:
 	TX_FAR _Route11BattleText9
 	db "@"
 
-Route11EndBattleText9: ; 595cb (16:55cb)
+Route11EndBattleText9:
 	TX_FAR _Route11EndBattleText9
 	db "@"
 
-Route11AfterBattleText9: ; 595d0 (16:55d0)
+Route11AfterBattleText9:
 	TX_FAR _Route11AfterBattleText9
 	db "@"
 
-Route11Text10: ; 595d5 (16:55d5)
+Route11Text10:
 	TX_ASM
 	ld hl, Route11TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText10: ; 595df (16:55df)
+Route11BattleText10:
 	TX_FAR _Route11BattleText10
 	db "@"
 
-Route11EndBattleText10: ; 595e4 (16:55e4)
+Route11EndBattleText10:
 	TX_FAR _Route11EndBattleText10
 	db "@"
 
-Route11AfterBattleText10: ; 595e9 (16:55e9)
+Route11AfterBattleText10:
 	TX_FAR _Route11AfterBattleText10
 	db "@"
 
-Route11Text11: ; 595ee (16:55ee)
+Route11Text11:
 	TX_FAR _Route11Text11
 	db "@"
--- a/scripts/route11gate.asm
+++ b/scripts/route11gate.asm
@@ -1,9 +1,9 @@
-Route11GateScript: ; 4940c (12:540c)
+Route11GateScript:
 	jp EnableAutoTextBoxDrawing
 
-Route11GateTextPointers: ; 4940f (12:540f)
+Route11GateTextPointers:
 	dw Route11GateText1
 
-Route11GateText1: ; 49411 (12:5411)
+Route11GateText1:
 	TX_FAR _Route11GateText1
 	db "@"
--- a/scripts/route11gateupstairs.asm
+++ b/scripts/route11gateupstairs.asm
@@ -1,21 +1,21 @@
-Route11GateUpstairsScript: ; 49454 (12:5454)
+Route11GateUpstairsScript:
 	jp DisableAutoTextBoxDrawing
 
-Route11GateUpstairsTextPointers: ; 49457 (12:5457)
+Route11GateUpstairsTextPointers:
 	dw Route11GateUpstairsText1
 	dw Route11GateUpstairsText2
 	dw Route11GateUpstairsText3
 	dw Route11GateUpstairsText4
 
-Route11GateUpstairsText1: ; 4945f (12:545f)
+Route11GateUpstairsText1:
 	TX_ASM
 	xor a
 	ld [wWhichTrade], a
 	predef DoInGameTradeDialogue
-Route11GateUpstairsScriptEnd: ; 49469 (12:5469)
+Route11GateUpstairsScriptEnd:
 	jp TextScriptEnd
 
-Route11GateUpstairsText2: ; 4946c (12:546c)
+Route11GateUpstairsText2:
 	TX_ASM
 	CheckEvent EVENT_GOT_ITEMFINDER, 1
 	jr c, .asm_4949b
@@ -41,11 +41,11 @@
 .asm_494a1
 	jr Route11GateUpstairsScriptEnd
 
-Route11GateUpstairsText_494a3: ; 494a3 (12:54a3)
+Route11GateUpstairsText_494a3:
 	TX_FAR _Route11GateUpstairsText_494a3
 	db "@"
 
-Route11GateUpstairsText3: ; 494a8 (12:54a8)
+Route11GateUpstairsText3:
 	TX_ASM
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
@@ -66,11 +66,11 @@
 	TX_FAR _BinocularsNoSnorlaxText
 	db "@"
 
-Route11GateUpstairsText4: ; 494ce (12:54ce)
+Route11GateUpstairsText4:
 	TX_ASM
 	ld hl, Route11GateUpstairsText_494d5
 	jp GateUpstairsScript_PrintIfFacingUp
 
-Route11GateUpstairsText_494d5: ; 494d5 (12:54d5)
+Route11GateUpstairsText_494d5:
 	TX_FAR _Route11GateUpstairsText_494d5
 	db "@"
--- a/scripts/route12.asm
+++ b/scripts/route12.asm
@@ -1,4 +1,4 @@
-Route12Script: ; 595f3 (16:55f3)
+Route12Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route12TrainerHeaders
 	ld de, Route12ScriptPointers
@@ -7,7 +7,7 @@
 	ld [wRoute12CurScript], a
 	ret
 
-Route12Script_59606: ; 59606 (16:5606)
+Route12Script_59606:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wRoute12CurScript], a
@@ -14,13 +14,13 @@
 	ld [wCurMapScript], a
 	ret
 
-Route12ScriptPointers: ; 59611 (16:5611)
+Route12ScriptPointers:
 	dw Route12Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw Route12Script3
 
-Route12Script0: ; 59619 (16:5619)
+Route12Script0:
 	CheckEventHL EVENT_BEAT_ROUTE12_SNORLAX
 	jp nz, CheckFightingMapTrainers
 	CheckEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX
@@ -41,7 +41,7 @@
 	ld [wCurMapScript], a
 	ret
 
-Route12Script3: ; 5964c (16:564c)
+Route12Script3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jr z, Route12Script_59606
@@ -60,7 +60,7 @@
 	ld [wCurMapScript], a
 	ret
 
-Route12TextPointers: ; 59675 (16:5675)
+Route12TextPointers:
 	dw Route12Text1
 	dw Route12Text2
 	dw Route12Text3
@@ -76,8 +76,8 @@
 	dw Route12Text13
 	dw Route12Text14
 
-Route12TrainerHeaders: ; 59691 (16:5691)
-Route12TrainerHeader0: ; 59691 (16:5691)
+Route12TrainerHeaders:
+Route12TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_0
@@ -86,7 +86,7 @@
 	dw Route12EndBattleText1 ; TextEndBattle
 	dw Route12EndBattleText1 ; TextEndBattle
 
-Route12TrainerHeader1: ; 5969d (16:569d)
+Route12TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_1
@@ -95,7 +95,7 @@
 	dw Route12EndBattleText2 ; TextEndBattle
 	dw Route12EndBattleText2 ; TextEndBattle
 
-Route12TrainerHeader2: ; 596a9 (16:56a9)
+Route12TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_2
@@ -104,7 +104,7 @@
 	dw Route12EndBattleText3 ; TextEndBattle
 	dw Route12EndBattleText3 ; TextEndBattle
 
-Route12TrainerHeader3: ; 596b5 (16:56b5)
+Route12TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_3
@@ -113,7 +113,7 @@
 	dw Route12EndBattleText4 ; TextEndBattle
 	dw Route12EndBattleText4 ; TextEndBattle
 
-Route12TrainerHeader4: ; 596c1 (16:56c1)
+Route12TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_4
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_4
@@ -122,7 +122,7 @@
 	dw Route12EndBattleText5 ; TextEndBattle
 	dw Route12EndBattleText5 ; TextEndBattle
 
-Route12TrainerHeader5: ; 596cd (16:56cd)
+Route12TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_5
@@ -131,7 +131,7 @@
 	dw Route12EndBattleText6 ; TextEndBattle
 	dw Route12EndBattleText6 ; TextEndBattle
 
-Route12TrainerHeader6: ; 596d9 (16:56d9)
+Route12TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_6, 1
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_6, 1
@@ -142,148 +142,148 @@
 
 	db $ff
 
-Route12Text1: ; 596e6 (16:56e6)
+Route12Text1:
 	TX_FAR _Route12Text1
 	db "@"
 
-Route12Text13: ; 596eb (16:56eb)
+Route12Text13:
 	TX_FAR _Route12Text13
 	db "@"
 
-Route12Text14: ; 596f0 (16:56f0)
+Route12Text14:
 	TX_FAR _Route12Text14
 	db "@"
 
-Route12Text2: ; 596f5 (16:56f5)
+Route12Text2:
 	TX_ASM
 	ld hl, Route12TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route12BattleText1: ; 596ff (16:56ff)
+Route12BattleText1:
 	TX_FAR _Route12BattleText1
 	db "@"
 
-Route12EndBattleText1: ; 59704 (16:5704)
+Route12EndBattleText1:
 	TX_FAR _Route12EndBattleText1
 	db "@"
 
-Route12AfterBattleText1: ; 59709 (16:5709)
+Route12AfterBattleText1:
 	TX_FAR _Route12AfterBattleText1
 	db "@"
 
-Route12Text3: ; 5970e (16:570e)
+Route12Text3:
 	TX_ASM
 	ld hl, Route12TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route12BattleText2: ; 59718 (16:5718)
+Route12BattleText2:
 	TX_FAR _Route12BattleText2
 	db "@"
 
-Route12EndBattleText2: ; 5971d (16:571d)
+Route12EndBattleText2:
 	TX_FAR _Route12EndBattleText2
 	db "@"
 
-Route12AfterBattleText2: ; 59722 (16:5722)
+Route12AfterBattleText2:
 	TX_FAR _Route12AfterBattleText2
 	db "@"
 
-Route12Text4: ; 59727 (16:5727)
+Route12Text4:
 	TX_ASM
 	ld hl, Route12TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route12BattleText3: ; 59731 (16:5731)
+Route12BattleText3:
 	TX_FAR _Route12BattleText3
 	db "@"
 
-Route12EndBattleText3: ; 59736 (16:5736)
+Route12EndBattleText3:
 	TX_FAR _Route12EndBattleText3
 	db "@"
 
-Route12AfterBattleText3: ; 5973b (16:573b)
+Route12AfterBattleText3:
 	TX_FAR _Route12AfterBattleText3
 	db "@"
 
-Route12Text5: ; 59740 (16:5740)
+Route12Text5:
 	TX_ASM
 	ld hl, Route12TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route12BattleText4: ; 5974a (16:574a)
+Route12BattleText4:
 	TX_FAR _Route12BattleText4
 	db "@"
 
-Route12EndBattleText4: ; 5974f (16:574f)
+Route12EndBattleText4:
 	TX_FAR _Route12EndBattleText4
 	db "@"
 
-Route12AfterBattleText4: ; 59754 (16:5754)
+Route12AfterBattleText4:
 	TX_FAR _Route12AfterBattleText4
 	db "@"
 
-Route12Text6: ; 59759 (16:5759)
+Route12Text6:
 	TX_ASM
 	ld hl, Route12TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route12BattleText5: ; 59763 (16:5763)
+Route12BattleText5:
 	TX_FAR _Route12BattleText5
 	db "@"
 
-Route12EndBattleText5: ; 59768 (16:5768)
+Route12EndBattleText5:
 	TX_FAR _Route12EndBattleText5
 	db "@"
 
-Route12AfterBattleText5: ; 5976d (16:576d)
+Route12AfterBattleText5:
 	TX_FAR _Route12AfterBattleText5
 	db "@"
 
-Route12Text7: ; 59772 (16:5772)
+Route12Text7:
 	TX_ASM
 	ld hl, Route12TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route12BattleText6: ; 5977c (16:577c)
+Route12BattleText6:
 	TX_FAR _Route12BattleText6
 	db "@"
 
-Route12EndBattleText6: ; 59781 (16:5781)
+Route12EndBattleText6:
 	TX_FAR _Route12EndBattleText6
 	db "@"
 
-Route12AfterBattleText6: ; 59786 (16:5786)
+Route12AfterBattleText6:
 	TX_FAR _Route12AfterBattleText6
 	db "@"
 
-Route12Text8: ; 5978b (16:578b)
+Route12Text8:
 	TX_ASM
 	ld hl, Route12TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route12BattleText7: ; 59795 (16:5795)
+Route12BattleText7:
 	TX_FAR _Route12BattleText7
 	db "@"
 
-Route12EndBattleText7: ; 5979a (16:579a)
+Route12EndBattleText7:
 	TX_FAR _Route12EndBattleText7
 	db "@"
 
-Route12AfterBattleText7: ; 5979f (16:579f)
+Route12AfterBattleText7:
 	TX_FAR _Route12AfterBattleText7
 	db "@"
 
-Route12Text11: ; 597a4 (16:57a4)
+Route12Text11:
 	TX_FAR _Route12Text11
 	db "@"
 
-Route12Text12: ; 597a9 (16:57a9)
+Route12Text12:
 	TX_FAR _Route12Text12
 	db "@"
--- a/scripts/route12gate.asm
+++ b/scripts/route12gate.asm
@@ -1,9 +1,9 @@
-Route12GateScript: ; 49504 (12:5504)
+Route12GateScript:
 	jp EnableAutoTextBoxDrawing
 
-Route12GateTextPointers: ; 49507 (12:5507)
+Route12GateTextPointers:
 	dw Route12GateText1
 
-Route12GateText1: ; 49509 (12:5509)
+Route12GateText1:
 	TX_FAR _Route12GateText1
 	db "@"
--- a/scripts/route12gateupstairs.asm
+++ b/scripts/route12gateupstairs.asm
@@ -1,12 +1,12 @@
-Route12GateUpstairsScript: ; 49560 (12:5560)
+Route12GateUpstairsScript:
 	jp DisableAutoTextBoxDrawing
 
-Route12GateUpstairsTextPointers: ; 49563 (12:5563)
+Route12GateUpstairsTextPointers:
 	dw Route12GateUpstairsText1
 	dw Route12GateUpstairsText2
 	dw Route12GateUpstairsText3
 
-Route12GateUpstairsText1: ; 49569 (12:5569)
+Route12GateUpstairsText1:
 	TX_ASM
 	CheckEvent EVENT_GOT_TM39, 1
 	jr c, .asm_0ad3c
@@ -29,41 +29,41 @@
 .asm_4ba56
 	jp TextScriptEnd
 
-TM39PreReceiveText: ; 4959c (12:559c)
+TM39PreReceiveText:
 	TX_FAR _TM39PreReceiveText
 	db "@"
 
-ReceivedTM39Text: ; 495a1 (12:55a1)
+ReceivedTM39Text:
 	TX_FAR _ReceivedTM39Text
 	db $0B, "@"
 
-TM39ExplanationText: ; 495a7 (12:55a7)
+TM39ExplanationText:
 	TX_FAR _TM39ExplanationText
 	db "@"
 
-TM39NoRoomText: ; 495ac (12:55ac)
+TM39NoRoomText:
 	TX_FAR _TM39NoRoomText
 	db "@"
 
-Route12GateUpstairsText2: ; 495b1 (12:55b1)
+Route12GateUpstairsText2:
 	TX_ASM
 	ld hl, Route12GateUpstairsText_495b8
 	jp GateUpstairsScript_PrintIfFacingUp
 
-Route12GateUpstairsText_495b8: ; 495b8 (12:55b8)
+Route12GateUpstairsText_495b8:
 	TX_FAR _Route12GateUpstairsText_495b8
 	db "@"
 
-Route12GateUpstairsText3: ; 495bd (12:55bd)
+Route12GateUpstairsText3:
 	TX_ASM
 	ld hl, Route12GateUpstairsText_495c4
 	jp GateUpstairsScript_PrintIfFacingUp
 
-Route12GateUpstairsText_495c4: ; 495c4 (12:55c4)
+Route12GateUpstairsText_495c4:
 	TX_FAR _Route12GateUpstairsText_495c4
 	db "@"
 
-GateUpstairsScript_PrintIfFacingUp: ; 495c9 (12:55c9)
+GateUpstairsScript_PrintIfFacingUp:
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	jr z, .up
--- a/scripts/route12house.asm
+++ b/scripts/route12house.asm
@@ -1,10 +1,10 @@
-Route12HouseScript: ; 5647f (15:647f)
+Route12HouseScript:
 	jp EnableAutoTextBoxDrawing
 
-Route12HouseTextPointers: ; 56482 (15:6482)
+Route12HouseTextPointers:
 	dw Route12HouseText1
 
-Route12HouseText1: ; 56484 (15:6484)
+Route12HouseText1:
 	TX_ASM
 	ld a, [wd728]
 	bit 5, a
@@ -34,24 +34,24 @@
 	call PrintText
 	jp TextScriptEnd
 
-Route12HouseText_564c0: ; 564c0 (15:64c0)
+Route12HouseText_564c0:
 	TX_FAR _Route12HouseText_564c0
 	db "@"
 
-Route12HouseText_564c5: ; 564c5 (15:64c5)
+Route12HouseText_564c5:
 	TX_FAR _Route12HouseText_564c5
 	db $0B
 	TX_FAR _Route12HouseText_564ca
 	db "@"
 
-Route12HouseText_564cf: ; 564cf (15:64cf)
+Route12HouseText_564cf:
 	TX_FAR _Route12HouseText_564cf
 	db "@"
 
-Route12HouseText_564d4: ; 564d4 (15:64d4)
+Route12HouseText_564d4:
 	TX_FAR _Route12HouseText_564d4
 	db "@"
 
-Route12HouseText_564d9: ; 564d9 (15:64d9)
+Route12HouseText_564d9:
 	TX_FAR _Route12HouseText_564d9
 	db "@"
--- a/scripts/route13.asm
+++ b/scripts/route13.asm
@@ -1,4 +1,4 @@
-Route13Script: ; 5581e (15:581e)
+Route13Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route13TrainerHeaders
 	ld de, Route13ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute13CurScript], a
 	ret
 
-Route13ScriptPointers: ; 55831 (15:5831)
+Route13ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route13TextPointers: ; 55837 (15:5837)
+Route13TextPointers:
 	dw Route13Text1
 	dw Route13Text2
 	dw Route13Text3
@@ -27,8 +27,8 @@
 	dw Route13Text12
 	dw Route13Text13
 
-Route13TrainerHeaders: ; 55851 (15:5851)
-Route13TrainerHeader0: ; 55851 (15:5851)
+Route13TrainerHeaders:
+Route13TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_0
@@ -37,7 +37,7 @@
 	dw Route13EndBattleText2 ; TextEndBattle
 	dw Route13EndBattleText2 ; TextEndBattle
 
-Route13TrainerHeader2: ; 5585d (15:585d)
+Route13TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2
@@ -46,7 +46,7 @@
 	dw Route13EndBattleText3 ; TextEndBattle
 	dw Route13EndBattleText3 ; TextEndBattle
 
-Route13TrainerHeader3: ; 55869 (15:5869)
+Route13TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3
@@ -55,7 +55,7 @@
 	dw Route13EndBattleText4 ; TextEndBattle
 	dw Route13EndBattleText4 ; TextEndBattle
 
-Route13TrainerHeader4: ; 55875 (15:5875)
+Route13TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4
@@ -64,7 +64,7 @@
 	dw Route13EndBattleText5 ; TextEndBattle
 	dw Route13EndBattleText5 ; TextEndBattle
 
-Route13TrainerHeader5: ; 55881 (15:5881)
+Route13TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5
@@ -73,7 +73,7 @@
 	dw Route13EndBattleText6 ; TextEndBattle
 	dw Route13EndBattleText6 ; TextEndBattle
 
-Route13TrainerHeader6: ; 5588d (15:588d)
+Route13TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6
@@ -82,7 +82,7 @@
 	dw Route13EndBattleText7 ; TextEndBattle
 	dw Route13EndBattleText7 ; TextEndBattle
 
-Route13TrainerHeader7: ; 55899 (15:5899)
+Route13TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7
@@ -91,7 +91,7 @@
 	dw Route13EndBattleText8 ; TextEndBattle
 	dw Route13EndBattleText8 ; TextEndBattle
 
-Route13TrainerHeader8: ; 558a5 (15:58a5)
+Route13TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1
@@ -100,7 +100,7 @@
 	dw Route13EndBattleText9 ; TextEndBattle
 	dw Route13EndBattleText9 ; TextEndBattle
 
-Route13TrainerHeader9: ; 558b1 (15:58b1)
+Route13TrainerHeader9:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1
@@ -109,7 +109,7 @@
 	dw Route13EndBattleText10 ; TextEndBattle
 	dw Route13EndBattleText10 ; TextEndBattle
 
-Route13TrainerHeader10: ; 558bd (15:58bd)
+Route13TrainerHeader10:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_10, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_10, 1
@@ -120,194 +120,194 @@
 
 	db $ff
 
-Route13Text1: ; 558ca (15:58ca)
+Route13Text1:
 	TX_ASM
 	ld hl, Route13TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route13BattleText2: ; 558d4 (15:58d4)
+Route13BattleText2:
 	TX_FAR _Route13BattleText2
 	db "@"
 
-Route13EndBattleText2: ; 558d9 (15:58d9)
+Route13EndBattleText2:
 	TX_FAR _Route13EndBattleText2
 	db "@"
 
-Route13AfterBattleText2: ; 558de (15:58de)
+Route13AfterBattleText2:
 	TX_FAR _Route13AfterBattleText2
 	db "@"
 
-Route13Text2: ; 558e3 (15:58e3)
+Route13Text2:
 	TX_ASM
 	ld hl, Route13TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route13BattleText3: ; 558ed (15:58ed)
+Route13BattleText3:
 	TX_FAR _Route13BattleText3
 	db "@"
 
-Route13EndBattleText3: ; 558f2 (15:58f2)
+Route13EndBattleText3:
 	TX_FAR _Route13EndBattleText3
 	db "@"
 
-Route13AfterBattleText3: ; 558f7 (15:58f7)
+Route13AfterBattleText3:
 	TX_FAR _Route13AfterBattleText3
 	db "@"
 
-Route13Text3: ; 558fc (15:58fc)
+Route13Text3:
 	TX_ASM
 	ld hl, Route13TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route13BattleText4: ; 55906 (15:5906)
+Route13BattleText4:
 	TX_FAR _Route13BattleText4
 	db "@"
 
-Route13EndBattleText4: ; 5590b (15:590b)
+Route13EndBattleText4:
 	TX_FAR _Route13EndBattleText4
 	db "@"
 
-Route13AfterBattleText4: ; 55910 (15:5910)
+Route13AfterBattleText4:
 	TX_FAR _Route13AfterBattleText4
 	db "@"
 
-Route13Text4: ; 55915 (15:5915)
+Route13Text4:
 	TX_ASM
 	ld hl, Route13TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route13BattleText5: ; 5591f (15:591f)
+Route13BattleText5:
 	TX_FAR _Route13BattleText5
 	db "@"
 
-Route13EndBattleText5: ; 55924 (15:5924)
+Route13EndBattleText5:
 	TX_FAR _Route13EndBattleText5
 	db "@"
 
-Route13AfterBattleText5: ; 55929 (15:5929)
+Route13AfterBattleText5:
 	TX_FAR _Route13AfterBattleText5
 	db "@"
 
-Route13Text5: ; 5592e (15:592e)
+Route13Text5:
 	TX_ASM
 	ld hl, Route13TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route13BattleText6: ; 55938 (15:5938)
+Route13BattleText6:
 	TX_FAR _Route13BattleText6
 	db "@"
 
-Route13EndBattleText6: ; 5593d (15:593d)
+Route13EndBattleText6:
 	TX_FAR _Route13EndBattleText6
 	db "@"
 
-Route13AfterBattleText6: ; 55942 (15:5942)
+Route13AfterBattleText6:
 	TX_FAR _Route13AfterBattleText6
 	db "@"
 
-Route13Text6: ; 55947 (15:5947)
+Route13Text6:
 	TX_ASM
 	ld hl, Route13TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route13BattleText7: ; 55951 (15:5951)
+Route13BattleText7:
 	TX_FAR _Route13BattleText7
 	db "@"
 
-Route13EndBattleText7: ; 55956 (15:5956)
+Route13EndBattleText7:
 	TX_FAR _Route13EndBattleText7
 	db "@"
 
-Route13AfterBattleText7: ; 5595b (15:595b)
+Route13AfterBattleText7:
 	TX_FAR _Route13AfterBattleText7
 	db "@"
 
-Route13Text7: ; 55960 (15:5960)
+Route13Text7:
 	TX_ASM
 	ld hl, Route13TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route13BattleText8: ; 5596a (15:596a)
+Route13BattleText8:
 	TX_FAR _Route13BattleText8
 	db "@"
 
-Route13EndBattleText8: ; 5596f (15:596f)
+Route13EndBattleText8:
 	TX_FAR _Route13EndBattleText8
 	db "@"
 
-Route13AfterBattleText8: ; 55974 (15:5974)
+Route13AfterBattleText8:
 	TX_FAR _Route13AfterBattleText8
 	db "@"
 
-Route13Text8: ; 55979 (15:5979)
+Route13Text8:
 	TX_ASM
 	ld hl, Route13TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route13BattleText9: ; 55983 (15:5983)
+Route13BattleText9:
 	TX_FAR _Route13BattleText9
 	db "@"
 
-Route13EndBattleText9: ; 55988 (15:5988)
+Route13EndBattleText9:
 	TX_FAR _Route13EndBattleText9
 	db "@"
 
-Route13AfterBattleText9: ; 5598d (15:598d)
+Route13AfterBattleText9:
 	TX_FAR _Route13AfterBattleText9
 	db "@"
 
-Route13Text9: ; 55992 (15:5992)
+Route13Text9:
 	TX_ASM
 	ld hl, Route13TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route13BattleText10: ; 5599c (15:599c)
+Route13BattleText10:
 	TX_FAR _Route13BattleText10
 	db "@"
 
-Route13EndBattleText10: ; 559a1 (15:59a1)
+Route13EndBattleText10:
 	TX_FAR _Route13EndBattleText10
 	db "@"
 
-Route13AfterBattleText10: ; 559a6 (15:59a6)
+Route13AfterBattleText10:
 	TX_FAR _Route13AfterBattleText10
 	db "@"
 
-Route13Text10: ; 559ab (15:59ab)
+Route13Text10:
 	TX_ASM
 	ld hl, Route13TrainerHeader10
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route13BattleText11: ; 559b5 (15:59b5)
+Route13BattleText11:
 	TX_FAR _Route13BattleText11
 	db "@"
 
-Route13EndBattleText11: ; 559ba (15:59ba)
+Route13EndBattleText11:
 	TX_FAR _Route13EndBattleText11
 	db "@"
 
-Route13AfterBattleText11: ; 559bf (15:59bf)
+Route13AfterBattleText11:
 	TX_FAR _Route13AfterBattleText11
 	db "@"
 
-Route13Text11: ; 559c4 (15:59c4)
+Route13Text11:
 	TX_FAR _Route13Text11
 	db "@"
 
-Route13Text12: ; 559c9 (15:59c9)
+Route13Text12:
 	TX_FAR _Route13Text12
 	db "@"
 
-Route13Text13: ; 559ce (15:59ce)
+Route13Text13:
 	TX_FAR _Route13Text13
 	db "@"
--- a/scripts/route14.asm
+++ b/scripts/route14.asm
@@ -1,4 +1,4 @@
-Route14Script: ; 559d3 (15:59d3)
+Route14Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route14TrainerHeaders
 	ld de, Route14ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute14CurScript], a
 	ret
 
-Route14ScriptPointers: ; 559e6 (15:59e6)
+Route14ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route14TextPointers: ; 559ec (15:59ec)
+Route14TextPointers:
 	dw Route14Text1
 	dw Route14Text2
 	dw Route14Text3
@@ -25,8 +25,8 @@
 	dw Route14Text10
 	dw Route14Text11
 
-Route14TrainerHeaders: ; 55a02 (15:5a02)
-Route14TrainerHeader0: ; 55a02 (15:5a02)
+Route14TrainerHeaders:
+Route14TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_0
@@ -35,7 +35,7 @@
 	dw Route14EndBattleText1 ; TextEndBattle
 	dw Route14EndBattleText1 ; TextEndBattle
 
-Route14TrainerHeader1: ; 55a0e (15:5a0e)
+Route14TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_1
@@ -44,7 +44,7 @@
 	dw Route14EndBattleText2 ; TextEndBattle
 	dw Route14EndBattleText2 ; TextEndBattle
 
-Route14TrainerHeader2: ; 55a1a (15:5a1a)
+Route14TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_2
@@ -53,7 +53,7 @@
 	dw Route14EndBattleText3 ; TextEndBattle
 	dw Route14EndBattleText3 ; TextEndBattle
 
-Route14TrainerHeader3: ; 55a26 (15:5a26)
+Route14TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_3
@@ -62,7 +62,7 @@
 	dw Route14EndBattleText4 ; TextEndBattle
 	dw Route14EndBattleText4 ; TextEndBattle
 
-Route14TrainerHeader4: ; 55a32 (15:5a32)
+Route14TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_4
@@ -71,7 +71,7 @@
 	dw Route14EndBattleText5 ; TextEndBattle
 	dw Route14EndBattleText5 ; TextEndBattle
 
-Route14TrainerHeader5: ; 55a3e (15:5a3e)
+Route14TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_5
@@ -80,7 +80,7 @@
 	dw Route14EndBattleText6 ; TextEndBattle
 	dw Route14EndBattleText6 ; TextEndBattle
 
-Route14TrainerHeader6: ; 55a4a (15:5a4a)
+Route14TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_6
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_6
@@ -89,7 +89,7 @@
 	dw Route14EndBattleText7 ; TextEndBattle
 	dw Route14EndBattleText7 ; TextEndBattle
 
-Route14TrainerHeader7: ; 55a56 (15:5a56)
+Route14TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_7, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_7, 1
@@ -98,7 +98,7 @@
 	dw Route14EndBattleText8 ; TextEndBattle
 	dw Route14EndBattleText8 ; TextEndBattle
 
-Route14TrainerHeader8: ; 55a62 (15:5a62)
+Route14TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_8, 1
@@ -107,7 +107,7 @@
 	dw Route14EndBattleText9 ; TextEndBattle
 	dw Route14EndBattleText9 ; TextEndBattle
 
-Route14TrainerHeader9: ; 55a6e (15:5a6e)
+Route14TrainerHeader9:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_9, 1
@@ -118,186 +118,186 @@
 
 	db $ff
 
-Route14Text1: ; 55a7b (15:5a7b)
+Route14Text1:
 	TX_ASM
 	ld hl, Route14TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route14BattleText1: ; 55a85 (15:5a85)
+Route14BattleText1:
 	TX_FAR _Route14BattleText1
 	db "@"
 
-Route14EndBattleText1: ; 55a8a (15:5a8a)
+Route14EndBattleText1:
 	TX_FAR _Route14EndBattleText1
 	db "@"
 
-Route14AfterBattleText1: ; 55a8f (15:5a8f)
+Route14AfterBattleText1:
 	TX_FAR _Route14AfterBattleText1
 	db "@"
 
-Route14Text2: ; 55a94 (15:5a94)
+Route14Text2:
 	TX_ASM
 	ld hl, Route14TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route14BattleText2: ; 55a9e (15:5a9e)
+Route14BattleText2:
 	TX_FAR _Route14BattleText2
 	db "@"
 
-Route14EndBattleText2: ; 55aa3 (15:5aa3)
+Route14EndBattleText2:
 	TX_FAR _Route14EndBattleText2
 	db "@"
 
-Route14AfterBattleText2: ; 55aa8 (15:5aa8)
+Route14AfterBattleText2:
 	TX_FAR _Route14AfterBattleText2
 	db "@"
 
-Route14Text3: ; 55aad (15:5aad)
+Route14Text3:
 	TX_ASM
 	ld hl, Route14TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route14BattleText3: ; 55ab7 (15:5ab7)
+Route14BattleText3:
 	TX_FAR _Route14BattleText3
 	db "@"
 
-Route14EndBattleText3: ; 55abc (15:5abc)
+Route14EndBattleText3:
 	TX_FAR _Route14EndBattleText3
 	db "@"
 
-Route14AfterBattleText3: ; 55ac1 (15:5ac1)
+Route14AfterBattleText3:
 	TX_FAR _Route14AfterBattleText3
 	db "@"
 
-Route14Text4: ; 55ac6 (15:5ac6)
+Route14Text4:
 	TX_ASM
 	ld hl, Route14TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route14BattleText4: ; 55ad0 (15:5ad0)
+Route14BattleText4:
 	TX_FAR _Route14BattleText4
 	db "@"
 
-Route14EndBattleText4: ; 55ad5 (15:5ad5)
+Route14EndBattleText4:
 	TX_FAR _Route14EndBattleText4
 	db "@"
 
-Route14AfterBattleText4: ; 55ada (15:5ada)
+Route14AfterBattleText4:
 	TX_FAR _Route14AfterBattleText4
 	db "@"
 
-Route14Text5: ; 55adf (15:5adf)
+Route14Text5:
 	TX_ASM
 	ld hl, Route14TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route14BattleText5: ; 55ae9 (15:5ae9)
+Route14BattleText5:
 	TX_FAR _Route14BattleText5
 	db "@"
 
-Route14EndBattleText5: ; 55aee (15:5aee)
+Route14EndBattleText5:
 	TX_FAR _Route14EndBattleText5
 	db "@"
 
-Route14AfterBattleText5: ; 55af3 (15:5af3)
+Route14AfterBattleText5:
 	TX_FAR _Route14AfterBattleText5
 	db "@"
 
-Route14Text6: ; 55af8 (15:5af8)
+Route14Text6:
 	TX_ASM
 	ld hl, Route14TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route14BattleText6: ; 55b02 (15:5b02)
+Route14BattleText6:
 	TX_FAR _Route14BattleText6
 	db "@"
 
-Route14EndBattleText6: ; 55b07 (15:5b07)
+Route14EndBattleText6:
 	TX_FAR _Route14EndBattleText6
 	db "@"
 
-Route14AfterBattleText6: ; 55b0c (15:5b0c)
+Route14AfterBattleText6:
 	TX_FAR _Route14AfterBattleText6
 	db "@"
 
-Route14Text7: ; 55b11 (15:5b11)
+Route14Text7:
 	TX_ASM
 	ld hl, Route14TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route14BattleText7: ; 55b1b (15:5b1b)
+Route14BattleText7:
 	TX_FAR _Route14BattleText7
 	db "@"
 
-Route14EndBattleText7: ; 55b20 (15:5b20)
+Route14EndBattleText7:
 	TX_FAR _Route14EndBattleText7
 	db "@"
 
-Route14AfterBattleText7: ; 55b25 (15:5b25)
+Route14AfterBattleText7:
 	TX_FAR _Route14AfterBattleText7
 	db "@"
 
-Route14Text8: ; 55b2a (15:5b2a)
+Route14Text8:
 	TX_ASM
 	ld hl, Route14TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route14BattleText8: ; 55b34 (15:5b34)
+Route14BattleText8:
 	TX_FAR _Route14BattleText8
 	db "@"
 
-Route14EndBattleText8: ; 55b39 (15:5b39)
+Route14EndBattleText8:
 	TX_FAR _Route14EndBattleText8
 	db "@"
 
-Route14AfterBattleText8: ; 55b3e (15:5b3e)
+Route14AfterBattleText8:
 	TX_FAR _Route14AfterBattleText8
 	db "@"
 
-Route14Text9: ; 55b43 (15:5b43)
+Route14Text9:
 	TX_ASM
 	ld hl, Route14TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route14BattleText9: ; 55b4d (15:5b4d)
+Route14BattleText9:
 	TX_FAR _Route14BattleText9
 	db "@"
 
-Route14EndBattleText9: ; 55b52 (15:5b52)
+Route14EndBattleText9:
 	TX_FAR _Route14EndBattleText9
 	db "@"
 
-Route14AfterBattleText9: ; 55b57 (15:5b57)
+Route14AfterBattleText9:
 	TX_FAR _Route14AfterBattleText9
 	db "@"
 
-Route14Text10: ; 55b5c (15:5b5c)
+Route14Text10:
 	TX_ASM
 	ld hl, Route14TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route14BattleText10: ; 55b66 (15:5b66)
+Route14BattleText10:
 	TX_FAR _Route14BattleText10
 	db "@"
 
-Route14EndBattleText10: ; 55b6b (15:5b6b)
+Route14EndBattleText10:
 	TX_FAR _Route14EndBattleText10
 	db "@"
 
-Route14AfterBattleText10: ; 55b70 (15:5b70)
+Route14AfterBattleText10:
 	TX_FAR _Route14AfterBattleText10
 	db "@"
 
-Route14Text11: ; 55b75 (15:5b75)
+Route14Text11:
 	TX_FAR _Route14Text11
 	db "@"
--- a/scripts/route15.asm
+++ b/scripts/route15.asm
@@ -1,4 +1,4 @@
-Route15Script: ; 597ae (16:57ae)
+Route15Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route15TrainerHeaders
 	ld de, Route15ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute15CurScript], a
 	ret
 
-Route15ScriptPointers: ; 597c1 (16:57c1)
+Route15ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route15TextPointers: ; 597c7 (16:57c7)
+Route15TextPointers:
 	dw Route15Text1
 	dw Route15Text2
 	dw Route15Text3
@@ -26,8 +26,8 @@
 	dw PickUpItemText
 	dw Route15Text12
 
-Route15TrainerHeaders: ; 597df (16:57df)
-Route15TrainerHeader0: ; 597df (16:57df)
+Route15TrainerHeaders:
+Route15TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_0
@@ -36,7 +36,7 @@
 	dw Route15EndBattleText1 ; TextEndBattle
 	dw Route15EndBattleText1 ; TextEndBattle
 
-Route15TrainerHeader1: ; 597eb (16:57eb)
+Route15TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_1
@@ -45,7 +45,7 @@
 	dw Route15EndBattleText2 ; TextEndBattle
 	dw Route15EndBattleText2 ; TextEndBattle
 
-Route15TrainerHeader2: ; 597f7 (16:57f7)
+Route15TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_2
@@ -54,7 +54,7 @@
 	dw Route15EndBattleText3 ; TextEndBattle
 	dw Route15EndBattleText3 ; TextEndBattle
 
-Route15TrainerHeader3: ; 59803 (16:5803)
+Route15TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_3
@@ -63,7 +63,7 @@
 	dw Route15EndBattleText4 ; TextEndBattle
 	dw Route15EndBattleText4 ; TextEndBattle
 
-Route15TrainerHeader4: ; 5980f (16:580f)
+Route15TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_4
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_4
@@ -72,7 +72,7 @@
 	dw Route15EndBattleText5 ; TextEndBattle
 	dw Route15EndBattleText5 ; TextEndBattle
 
-Route15TrainerHeader5: ; 5981b (16:581b)
+Route15TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_5
@@ -81,7 +81,7 @@
 	dw Route15EndBattleText6 ; TextEndBattle
 	dw Route15EndBattleText6 ; TextEndBattle
 
-Route15TrainerHeader6: ; 59827 (16:5827)
+Route15TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_6
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_6
@@ -90,7 +90,7 @@
 	dw Route15EndBattleText7 ; TextEndBattle
 	dw Route15EndBattleText7 ; TextEndBattle
 
-Route15TrainerHeader7: ; 59833 (16:5833)
+Route15TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_7, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_7, 1
@@ -99,7 +99,7 @@
 	dw Route15EndBattleText8 ; TextEndBattle
 	dw Route15EndBattleText8 ; TextEndBattle
 
-Route15TrainerHeader8: ; 5983f (16:583f)
+Route15TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_8, 1
@@ -108,7 +108,7 @@
 	dw Route15EndBattleText9 ; TextEndBattle
 	dw Route15EndBattleText9 ; TextEndBattle
 
-Route15TrainerHeader9: ; 5984b (16:584b)
+Route15TrainerHeader9:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_9, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_9, 1
@@ -119,178 +119,178 @@
 
 	db $ff
 
-Route15Text1: ; 59858 (16:5858)
+Route15Text1:
 	TX_ASM
 	ld hl, Route15TrainerHeader0
 	jr Route15TalkToTrainer
 
-Route15Text2: ; 5985e (16:585e)
+Route15Text2:
 	TX_ASM
 	ld hl, Route15TrainerHeader1
 	jr Route15TalkToTrainer
 
-Route15Text3: ; 59864 (16:5864)
+Route15Text3:
 	TX_ASM
 	ld hl, Route15TrainerHeader2
 	jr Route15TalkToTrainer
 
-Route15Text4: ; 5986a (16:586a)
+Route15Text4:
 	TX_ASM
 	ld hl, Route15TrainerHeader3
 	jr Route15TalkToTrainer
 
-Route15Text5: ; 59870 (16:5870)
+Route15Text5:
 	TX_ASM
 	ld hl, Route15TrainerHeader4
 	jr Route15TalkToTrainer
 
-Route15Text6: ; 59876 (16:5876)
+Route15Text6:
 	TX_ASM
 	ld hl, Route15TrainerHeader5
 	jr Route15TalkToTrainer
 
-Route15Text7: ; 5987c (16:587c)
+Route15Text7:
 	TX_ASM
 	ld hl, Route15TrainerHeader6
 	jr Route15TalkToTrainer
 
-Route15Text8: ; 59882 (16:5882)
+Route15Text8:
 	TX_ASM
 	ld hl, Route15TrainerHeader7
 	jr Route15TalkToTrainer
 
-Route15Text9: ; 59888 (16:5888)
+Route15Text9:
 	TX_ASM
 	ld hl, Route15TrainerHeader8
 	jr Route15TalkToTrainer
 
-Route15Text10: ; 5988e (16:588e)
+Route15Text10:
 	TX_ASM
 	ld hl, Route15TrainerHeader9
-Route15TalkToTrainer: ; 59892 (16:5892)
+Route15TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route15BattleText1: ; 59898 (16:5898)
+Route15BattleText1:
 	TX_FAR _Route15BattleText1
 	db "@"
 
-Route15EndBattleText1: ; 5989d (16:589d)
+Route15EndBattleText1:
 	TX_FAR _Route15EndBattleText1
 	db "@"
 
-Route15AfterBattleText1: ; 598a2 (16:58a2)
+Route15AfterBattleText1:
 	TX_FAR _Route15AfterBattleText1
 	db "@"
 
-Route15BattleText2: ; 598a7 (16:58a7)
+Route15BattleText2:
 	TX_FAR _Route15BattleText2
 	db "@"
 
-Route15EndBattleText2: ; 598ac (16:58ac)
+Route15EndBattleText2:
 	TX_FAR _Route15EndBattleText2
 	db "@"
 
-Route15AfterBattleText2: ; 598b1 (16:58b1)
+Route15AfterBattleText2:
 	TX_FAR _Route15AfterBattleText2
 	db "@"
 
-Route15BattleText3: ; 598b6 (16:58b6)
+Route15BattleText3:
 	TX_FAR _Route15BattleText3
 	db "@"
 
-Route15EndBattleText3: ; 598bb (16:58bb)
+Route15EndBattleText3:
 	TX_FAR _Route15EndBattleText3
 	db "@"
 
-Route15AfterBattleText3: ; 598c0 (16:58c0)
+Route15AfterBattleText3:
 	TX_FAR _Route15AfterBattleText3
 	db "@"
 
-Route15BattleText4: ; 598c5 (16:58c5)
+Route15BattleText4:
 	TX_FAR _Route15BattleText4
 	db "@"
 
-Route15EndBattleText4: ; 598ca (16:58ca)
+Route15EndBattleText4:
 	TX_FAR _Route15EndBattleText4
 	db "@"
 
-Route15AfterBattleText4: ; 598cf (16:58cf)
+Route15AfterBattleText4:
 	TX_FAR _Route15AfterBattleText4
 	db "@"
 
-Route15BattleText5: ; 598d4 (16:58d4)
+Route15BattleText5:
 	TX_FAR _Route15BattleText5
 	db "@"
 
-Route15EndBattleText5: ; 598d9 (16:58d9)
+Route15EndBattleText5:
 	TX_FAR _Route15EndBattleText5
 	db "@"
 
-Route15AfterBattleText5: ; 598de (16:58de)
+Route15AfterBattleText5:
 	TX_FAR _Route15AfterBattleText5
 	db "@"
 
-Route15BattleText6: ; 598e3 (16:58e3)
+Route15BattleText6:
 	TX_FAR _Route15BattleText6
 	db "@"
 
-Route15EndBattleText6: ; 598e8 (16:58e8)
+Route15EndBattleText6:
 	TX_FAR _Route15EndBattleText6
 	db "@"
 
-Route15AfterBattleText6: ; 598ed (16:58ed)
+Route15AfterBattleText6:
 	TX_FAR _Route15AfterBattleText6
 	db "@"
 
-Route15BattleText7: ; 598f2 (16:58f2)
+Route15BattleText7:
 	TX_FAR _Route15BattleText7
 	db "@"
 
-Route15EndBattleText7: ; 598f7 (16:58f7)
+Route15EndBattleText7:
 	TX_FAR _Route15EndBattleText7
 	db "@"
 
-Route15AfterBattleText7: ; 598fc (16:58fc)
+Route15AfterBattleText7:
 	TX_FAR _Route15AfterBattleText7
 	db "@"
 
-Route15BattleText8: ; 59901 (16:5901)
+Route15BattleText8:
 	TX_FAR _Route15BattleText8
 	db "@"
 
-Route15EndBattleText8: ; 59906 (16:5906)
+Route15EndBattleText8:
 	TX_FAR _Route15EndBattleText8
 	db "@"
 
-Route15AfterBattleText8: ; 5990b (16:590b)
+Route15AfterBattleText8:
 	TX_FAR _Route15AfterBattleText8
 	db "@"
 
-Route15BattleText9: ; 59910 (16:5910)
+Route15BattleText9:
 	TX_FAR _Route15BattleText9
 	db "@"
 
-Route15EndBattleText9: ; 59915 (16:5915)
+Route15EndBattleText9:
 	TX_FAR _Route15EndBattleText9
 	db "@"
 
-Route15AfterBattleText9: ; 5991a (16:591a)
+Route15AfterBattleText9:
 	TX_FAR _Route15AfterBattleText9
 	db "@"
 
-Route15BattleText10: ; 5991f (16:591f)
+Route15BattleText10:
 	TX_FAR _Route15BattleText10
 	db "@"
 
-Route15EndBattleText10: ; 59924 (16:5924)
+Route15EndBattleText10:
 	TX_FAR _Route15EndBattleText10
 	db "@"
 
-Route15AfterBattleText10: ; 59929 (16:5929)
+Route15AfterBattleText10:
 	TX_FAR _Route15AfterBattleText10
 	db "@"
 
-Route15Text12: ; 5992e (16:592e)
+Route15Text12:
 	TX_FAR _Route15Text12
 	db "@"
--- a/scripts/route15gate.asm
+++ b/scripts/route15gate.asm
@@ -1,9 +1,9 @@
-Route15GateScript: ; 49602 (12:5602)
+Route15GateScript:
 	jp EnableAutoTextBoxDrawing
 
-Route15GateTextPointers: ; 49605 (12:5605)
+Route15GateTextPointers:
 	dw Route15GateText1
 
-Route15GateText1: ; 49607 (12:5607)
+Route15GateText1:
 	TX_FAR _Route15GateText1
 	db "@"
--- a/scripts/route15gateupstairs.asm
+++ b/scripts/route15gateupstairs.asm
@@ -1,11 +1,11 @@
-Route15GateUpstairsScript: ; 4964a (12:564a)
+Route15GateUpstairsScript:
 	jp DisableAutoTextBoxDrawing
 
-Route15GateUpstairsTextPointers: ; 4964d (12:564d)
+Route15GateUpstairsTextPointers:
 	dw Route15GateUpstairsText1
 	dw Route15GateUpstairsText2
 
-Route15GateUpstairsText1: ; 49651 (12:5651)
+Route15GateUpstairsText1:
 	TX_ASM
 	CheckEvent EVENT_GOT_EXP_ALL
 	jr nz, .asm_49683
@@ -30,15 +30,15 @@
 .asm_49689
 	jp TextScriptEnd
 
-Route15GateUpstairsText_4968c: ; 4968c (12:568c)
+Route15GateUpstairsText_4968c:
 	TX_FAR _Route15GateUpstairsText_4968c
 	db "@"
 
-Route15GateUpstairsText2: ; 49691 (12:5691)
+Route15GateUpstairsText2:
 	TX_ASM
 	ld hl, Route15GateUpstairsText_49698
 	jp GateUpstairsScript_PrintIfFacingUp
 
-Route15GateUpstairsText_49698: ; 49698 (12:5698)
+Route15GateUpstairsText_49698:
 	TX_FAR _Route15GateUpstairsText_49698
 	db "@"
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@@ -1,4 +1,4 @@
-Route16Script: ; 59933 (16:5933)
+Route16Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route16TrainerHeaders
 	ld de, Route16ScriptPointers
@@ -7,7 +7,7 @@
 	ld [wRoute16CurScript], a
 	ret
 
-Route16Script_59946: ; 59946 (16:5946)
+Route16Script_59946:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wRoute16CurScript], a
@@ -14,13 +14,13 @@
 	ld [wCurMapScript], a
 	ret
 
-Route16ScriptPointers: ; 59951 (16:5951)
+Route16ScriptPointers:
 	dw Route16Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw Route16Script3
 
-Route16Script0: ; 59959 (16:5959)
+Route16Script0:
 	CheckEventHL EVENT_BEAT_ROUTE16_SNORLAX
 	jp nz, CheckFightingMapTrainers
 	CheckEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX
@@ -42,7 +42,7 @@
 	ld [wCurMapScript], a
 	ret
 
-Route16Script3: ; 5998f (16:598f)
+Route16Script3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route16Script_59946
@@ -61,7 +61,7 @@
 	ld [wCurMapScript], a
 	ret
 
-Route16TextPointers: ; 599b9 (16:59b9)
+Route16TextPointers:
 	dw Route16Text1
 	dw Route16Text2
 	dw Route16Text3
@@ -74,8 +74,8 @@
 	dw Route16Text10
 	dw Route16Text11
 
-Route16TrainerHeaders: ; 599cf (16:59cf)
-Route16TrainerHeader0: ; 599cf (16:59cf)
+Route16TrainerHeaders:
+Route16TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_0
@@ -84,7 +84,7 @@
 	dw Route16EndBattleText1 ; TextEndBattle
 	dw Route16EndBattleText1 ; TextEndBattle
 
-Route16TrainerHeader1: ; 599db (16:59db)
+Route16TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_1
@@ -93,7 +93,7 @@
 	dw Route16EndBattleText2 ; TextEndBattle
 	dw Route16EndBattleText2 ; TextEndBattle
 
-Route16TrainerHeader2: ; 599e7 (16:59e7)
+Route16TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_2
@@ -102,7 +102,7 @@
 	dw Route16EndBattleText3 ; TextEndBattle
 	dw Route16EndBattleText3 ; TextEndBattle
 
-Route16TrainerHeader3: ; 599f3 (16:59f3)
+Route16TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_3
@@ -111,7 +111,7 @@
 	dw Route16EndBattleText4 ; TextEndBattle
 	dw Route16EndBattleText4 ; TextEndBattle
 
-Route16TrainerHeader4: ; 599ff (16:59ff)
+Route16TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_4
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_4
@@ -120,7 +120,7 @@
 	dw Route16EndBattleText5 ; TextEndBattle
 	dw Route16EndBattleText5 ; TextEndBattle
 
-Route16TrainerHeader5: ; 59a0b (16:5a0b)
+Route16TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_5
@@ -131,130 +131,130 @@
 
 	db $ff
 
-Route16Text1: ; 59a18 (16:5a18)
+Route16Text1:
 	TX_ASM
 	ld hl, Route16TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route16BattleText1: ; 59a22 (16:5a22)
+Route16BattleText1:
 	TX_FAR _Route16BattleText1
 	db "@"
 
-Route16EndBattleText1: ; 59a27 (16:5a27)
+Route16EndBattleText1:
 	TX_FAR _Route16EndBattleText1
 	db "@"
 
-Route16AfterBattleText1: ; 59a2c (16:5a2c)
+Route16AfterBattleText1:
 	TX_FAR _Route16AfterBattleText1
 	db "@"
 
-Route16Text2: ; 59a31 (16:5a31)
+Route16Text2:
 	TX_ASM
 	ld hl, Route16TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route16BattleText2: ; 59a3b (16:5a3b)
+Route16BattleText2:
 	TX_FAR _Route16BattleText2
 	db "@"
 
-Route16EndBattleText2: ; 59a40 (16:5a40)
+Route16EndBattleText2:
 	TX_FAR _Route16EndBattleText2
 	db "@"
 
-Route16AfterBattleText2: ; 59a45 (16:5a45)
+Route16AfterBattleText2:
 	TX_FAR _Route16AfterBattleText2
 	db "@"
 
-Route16Text3: ; 59a4a (16:5a4a)
+Route16Text3:
 	TX_ASM
 	ld hl, Route16TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route16BattleText3: ; 59a54 (16:5a54)
+Route16BattleText3:
 	TX_FAR _Route16BattleText3
 	db "@"
 
-Route16EndBattleText3: ; 59a59 (16:5a59)
+Route16EndBattleText3:
 	TX_FAR _Route16EndBattleText3
 	db "@"
 
-Route16AfterBattleText3: ; 59a5e (16:5a5e)
+Route16AfterBattleText3:
 	TX_FAR _Route16AfterBattleText3
 	db "@"
 
-Route16Text4: ; 59a63 (16:5a63)
+Route16Text4:
 	TX_ASM
 	ld hl, Route16TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route16BattleText4: ; 59a6d (16:5a6d)
+Route16BattleText4:
 	TX_FAR _Route16BattleText4
 	db "@"
 
-Route16EndBattleText4: ; 59a72 (16:5a72)
+Route16EndBattleText4:
 	TX_FAR _Route16EndBattleText4
 	db "@"
 
-Route16AfterBattleText4: ; 59a77 (16:5a77)
+Route16AfterBattleText4:
 	TX_FAR _Route16AfterBattleText4
 	db "@"
 
-Route16Text5: ; 59a7c (16:5a7c)
+Route16Text5:
 	TX_ASM
 	ld hl, Route16TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route16BattleText5: ; 59a86 (16:5a86)
+Route16BattleText5:
 	TX_FAR _Route16BattleText5
 	db "@"
 
-Route16EndBattleText5: ; 59a8b (16:5a8b)
+Route16EndBattleText5:
 	TX_FAR _Route16EndBattleText5
 	db "@"
 
-Route16AfterBattleText5: ; 59a90 (16:5a90)
+Route16AfterBattleText5:
 	TX_FAR _Route16AfterBattleText5
 	db "@"
 
-Route16Text6: ; 59a95 (16:5a95)
+Route16Text6:
 	TX_ASM
 	ld hl, Route16TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route16BattleText6: ; 59a9f (16:5a9f)
+Route16BattleText6:
 	TX_FAR _Route16BattleText6
 	db "@"
 
-Route16EndBattleText6: ; 59aa4 (16:5aa4)
+Route16EndBattleText6:
 	TX_FAR _Route16EndBattleText6
 	db "@"
 
-Route16AfterBattleText6: ; 59aa9 (16:5aa9)
+Route16AfterBattleText6:
 	TX_FAR _Route16AfterBattleText6
 	db "@"
 
-Route16Text7: ; 59aae (16:5aae)
+Route16Text7:
 	TX_FAR _Route16Text7
 	db "@"
 
-Route16Text10: ; 59ab3 (16:5ab3)
+Route16Text10:
 	TX_FAR _Route16Text10
 	db "@"
 
-Route16Text11: ; 59ab8 (16:5ab8)
+Route16Text11:
 	TX_FAR _Route16Text11
 	db "@"
 
-Route16Text8: ; 59abd (16:5abd)
+Route16Text8:
 	TX_FAR _Route16Text8
 	db "@"
 
-Route16Text9: ; 59ac2 (16:5ac2)
+Route16Text9:
 	TX_FAR _Route16Text9
 	db "@"
--- a/scripts/route16gate.asm
+++ b/scripts/route16gate.asm
@@ -1,4 +1,4 @@
-Route16GateScript: ; 496be (12:56be)
+Route16GateScript:
 	ld hl, wd732
 	res 5, [hl]
 	call EnableAutoTextBoxDrawing
@@ -6,13 +6,13 @@
 	ld hl, Route16GateScriptPointers
 	jp CallFunctionInTable
 
-Route16GateScriptPointers: ; 496cf (12:56cf)
+Route16GateScriptPointers:
 	dw Route16GateScript0
 	dw Route16GateScript1
 	dw Route16GateScript2
 	dw Route16GateScript3
 
-Route16GateScript0: ; 496d7 (12:56d7)
+Route16GateScript0:
 	call Route16GateScript_49755
 	ret nz
 	ld hl, CoordsData_49714
@@ -43,7 +43,7 @@
 	ld [wRoute16GateCurScript], a
 	ret
 
-CoordsData_49714: ; 49714 (12:5714)
+CoordsData_49714:
 	db $07,$04
 	db $08,$04
 	db $09,$04
@@ -50,7 +50,7 @@
 	db $0A,$04
 	db $FF
 
-Route16GateScript1: ; 4971d (12:571d)
+Route16GateScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -57,7 +57,7 @@
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-Route16GateScript2: ; 49727 (12:5727)
+Route16GateScript2:
 	ld a, $1
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -70,7 +70,7 @@
 	ld [wRoute16GateCurScript], a
 	ret
 
-Route16GateScript3: ; 49741 (12:5741)
+Route16GateScript3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -82,16 +82,16 @@
 	ld [wRoute16GateCurScript], a
 	ret
 
-Route16GateScript_49755: ; 49755 (12:5755)
+Route16GateScript_49755:
 	ld b, BICYCLE
 	jp IsItemInBag
 
-Route16GateTextPointers: ; 4975a (12:575a)
+Route16GateTextPointers:
 	dw Route16GateText1
 	dw Route16GateText2
 	dw Route16GateText3
 
-Route16GateText1: ; 49760 (12:5760)
+Route16GateText1:
 	TX_ASM
 	call Route16GateScript_49755
 	jr z, .asm_0bdf3
@@ -104,18 +104,18 @@
 .asm_56c9d
 	jp TextScriptEnd
 
-Route16GateText_49777: ; 49777 (12:5777)
+Route16GateText_49777:
 	TX_FAR _Route16GateText_49777
 	db "@"
 
-Route16GateText_4977c: ; 4977c (12:577c)
+Route16GateText_4977c:
 	TX_FAR _Route16GateText_4977c
 	db "@"
 
-Route16GateText3: ; 49781 (12:5781)
+Route16GateText3:
 	TX_FAR _Route16GateText_49781
 	db "@"
 
-Route16GateText2: ; 49786 (12:5786)
+Route16GateText2:
 	TX_FAR _Route16GateText2
 	db "@"
--- a/scripts/route16gateupstairs.asm
+++ b/scripts/route16gateupstairs.asm
@@ -1,46 +1,46 @@
-Route16GateUpstairsScript: ; 4980b (12:580b)
+Route16GateUpstairsScript:
 	jp DisableAutoTextBoxDrawing
 
-Route16GateUpstairsTextPointers: ; 4980e (12:580e)
+Route16GateUpstairsTextPointers:
 	dw Route16GateUpstairsText1
 	dw Route16GateUpstairsText2
 	dw Route16GateUpstairsText3
 	dw Route16GateUpstairsText4
 
-Route16GateUpstairsText1: ; 49816 (12:5816)
+Route16GateUpstairsText1:
 	TX_ASM
 	ld hl, Route16GateUpstairsText_49820
 	call PrintText
 	jp TextScriptEnd
 
-Route16GateUpstairsText_49820: ; 49820 (12:5820)
+Route16GateUpstairsText_49820:
 	TX_FAR _Route16GateUpstairsText_49820
 	db "@"
 
-Route16GateUpstairsText2: ; 49825 (12:5825)
+Route16GateUpstairsText2:
 	TX_ASM
 	ld hl, Route16GateUpstairsText_4982f
 	call PrintText
 	jp TextScriptEnd
 
-Route16GateUpstairsText_4982f: ; 4982f (12:582f)
+Route16GateUpstairsText_4982f:
 	TX_FAR _Route16GateUpstairsText_4982f
 	db "@"
 
-Route16GateUpstairsText3: ; 49834 (12:5834)
+Route16GateUpstairsText3:
 	TX_ASM
 	ld hl, Route16GateUpstairsText_4983b
 	jp GateUpstairsScript_PrintIfFacingUp
 
-Route16GateUpstairsText_4983b: ; 4983b (12:583b)
+Route16GateUpstairsText_4983b:
 	TX_FAR _Route16GateUpstairsText_4983b
 	db "@"
 
-Route16GateUpstairsText4: ; 49840 (12:5840)
+Route16GateUpstairsText4:
 	TX_ASM
 	ld hl, Route16GateUpstairsText_49847
 	jp GateUpstairsScript_PrintIfFacingUp
 
-Route16GateUpstairsText_49847: ; 49847 (12:5847)
+Route16GateUpstairsText_49847:
 	TX_FAR _Route16GateUpstairsText_49847
 	db "@"
--- a/scripts/route16house.asm
+++ b/scripts/route16house.asm
@@ -1,11 +1,11 @@
-Route16HouseScript: ; 1e5f8 (7:65f8)
+Route16HouseScript:
 	jp EnableAutoTextBoxDrawing
 
-Route16HouseTextPointers: ; 1e5fb (7:65fb)
+Route16HouseTextPointers:
 	dw Route16HouseText1
 	dw Route16HouseText2
 
-Route16HouseText1: ; 1e5ff (7:65ff)
+Route16HouseText1:
 	TX_ASM
 	CheckEvent EVENT_GOT_HM02
 	ld hl, HM02ExplanationText
@@ -24,23 +24,23 @@
 	call PrintText
 	jp TextScriptEnd
 
-Route16HouseText3: ; 1e62b (7:662b)
+Route16HouseText3:
 	TX_FAR _Route16HouseText3
 	db "@"
 
-ReceivedHM02Text: ; 1e630 (7:6630)
+ReceivedHM02Text:
 	TX_FAR _ReceivedHM02Text
 	db $11, "@"
 
-HM02ExplanationText: ; 1e636 (7:6636)
+HM02ExplanationText:
 	TX_FAR _HM02ExplanationText
 	db "@"
 
-HM02NoRoomText: ; 1e63b (7:663b)
+HM02NoRoomText:
 	TX_FAR _HM02NoRoomText
 	db "@"
 
-Route16HouseText2: ; 1e640 (7:6640)
+Route16HouseText2:
 	TX_ASM
 	ld hl, Route16HouseText_1e652
 	call PrintText
@@ -49,6 +49,6 @@
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
-Route16HouseText_1e652: ; 1e652 (7:6652)
+Route16HouseText_1e652:
 	TX_FAR _Route16HouseText_1e652
 	db "@"
--- a/scripts/route17.asm
+++ b/scripts/route17.asm
@@ -1,4 +1,4 @@
-Route17Script: ; 55b7a (15:5b7a)
+Route17Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route17TrainerHeaders
 	ld de, Route17ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute17CurScript], a
 	ret
 
-Route17ScriptPointers: ; 55b8d (15:5b8d)
+Route17ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route17TextPointers: ; 55b93 (15:5b93)
+Route17TextPointers:
 	dw Route17Text1
 	dw Route17Text2
 	dw Route17Text3
@@ -30,8 +30,8 @@
 	dw Route17Text15
 	dw Route17Text16
 
-Route17TrainerHeaders: ; 55bb3 (15:5bb3)
-Route17TrainerHeader0: ; 55bb3 (15:5bb3)
+Route17TrainerHeaders:
+Route17TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_0
@@ -40,7 +40,7 @@
 	dw Route17EndBattleText1 ; TextEndBattle
 	dw Route17EndBattleText1 ; TextEndBattle
 
-Route17TrainerHeader1: ; 55bbf (15:5bbf)
+Route17TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_1
@@ -49,7 +49,7 @@
 	dw Route17EndBattleText2 ; TextEndBattle
 	dw Route17EndBattleText2 ; TextEndBattle
 
-Route17TrainerHeader2: ; 55bcb (15:5bcb)
+Route17TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_2
@@ -58,7 +58,7 @@
 	dw Route17EndBattleText3 ; TextEndBattle
 	dw Route17EndBattleText3 ; TextEndBattle
 
-Route17TrainerHeader3: ; 55bd7 (15:5bd7)
+Route17TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_3
@@ -67,7 +67,7 @@
 	dw Route17EndBattleText4 ; TextEndBattle
 	dw Route17EndBattleText4 ; TextEndBattle
 
-Route17TrainerHeader4: ; 55be3 (15:5be3)
+Route17TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_4
@@ -76,7 +76,7 @@
 	dw Route17EndBattleText5 ; TextEndBattle
 	dw Route17EndBattleText5 ; TextEndBattle
 
-Route17TrainerHeader5: ; 55bef (15:5bef)
+Route17TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_5
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_5
@@ -85,7 +85,7 @@
 	dw Route17EndBattleText6 ; TextEndBattle
 	dw Route17EndBattleText6 ; TextEndBattle
 
-Route17TrainerHeader6: ; 55bfb (15:5bfb)
+Route17TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_6
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_6
@@ -94,7 +94,7 @@
 	dw Route17EndBattleText7 ; TextEndBattle
 	dw Route17EndBattleText7 ; TextEndBattle
 
-Route17TrainerHeader7: ; 55c07 (15:5c07)
+Route17TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_7, 1
@@ -103,7 +103,7 @@
 	dw Route17EndBattleText8 ; TextEndBattle
 	dw Route17EndBattleText8 ; TextEndBattle
 
-Route17TrainerHeader8: ; 55c13 (15:5c13)
+Route17TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_8, 1
@@ -112,7 +112,7 @@
 	dw Route17EndBattleText9 ; TextEndBattle
 	dw Route17EndBattleText9 ; TextEndBattle
 
-Route17TrainerHeader9: ; 55c1f (15:5c1f)
+Route17TrainerHeader9:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_9, 1
@@ -123,206 +123,206 @@
 
 	db $ff
 
-Route17Text1: ; 55c2c (15:5c2c)
+Route17Text1:
 	TX_ASM
 	ld hl, Route17TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText1: ; 55c36 (15:5c36)
+Route17BattleText1:
 	TX_FAR _Route17BattleText1
 	db "@"
 
-Route17EndBattleText1: ; 55c3b (15:5c3b)
+Route17EndBattleText1:
 	TX_FAR _Route17EndBattleText1
 	db "@"
 
-Route17AfterBattleText1: ; 55c40 (15:5c40)
+Route17AfterBattleText1:
 	TX_FAR _Route17AfterBattleText1
 	db "@"
 
-Route17Text2: ; 55c45 (15:5c45)
+Route17Text2:
 	TX_ASM
 	ld hl, Route17TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText2: ; 55c4f (15:5c4f)
+Route17BattleText2:
 	TX_FAR _Route17BattleText2
 	db "@"
 
-Route17EndBattleText2: ; 55c54 (15:5c54)
+Route17EndBattleText2:
 	TX_FAR _Route17EndBattleText2
 	db "@"
 
-Route17AfterBattleText2: ; 55c59 (15:5c59)
+Route17AfterBattleText2:
 	TX_FAR _Route17AfterBattleText2
 	db "@"
 
-Route17Text3: ; 55c5e (15:5c5e)
+Route17Text3:
 	TX_ASM
 	ld hl, Route17TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText3: ; 55c68 (15:5c68)
+Route17BattleText3:
 	TX_FAR _Route17BattleText3
 	db "@"
 
-Route17EndBattleText3: ; 55c6d (15:5c6d)
+Route17EndBattleText3:
 	TX_FAR _Route17EndBattleText3
 	db "@"
 
-Route17AfterBattleText3: ; 55c72 (15:5c72)
+Route17AfterBattleText3:
 	TX_FAR _Route17AfterBattleText3
 	db "@"
 
-Route17Text4: ; 55c77 (15:5c77)
+Route17Text4:
 	TX_ASM
 	ld hl, Route17TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText4: ; 55c81 (15:5c81)
+Route17BattleText4:
 	TX_FAR _Route17BattleText4
 	db "@"
 
-Route17EndBattleText4: ; 55c86 (15:5c86)
+Route17EndBattleText4:
 	TX_FAR _Route17EndBattleText4
 	db "@"
 
-Route17AfterBattleText4: ; 55c8b (15:5c8b)
+Route17AfterBattleText4:
 	TX_FAR _Route17AfterBattleText4
 	db "@"
 
-Route17Text5: ; 55c90 (15:5c90)
+Route17Text5:
 	TX_ASM
 	ld hl, Route17TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText5: ; 55c9a (15:5c9a)
+Route17BattleText5:
 	TX_FAR _Route17BattleText5
 	db "@"
 
-Route17EndBattleText5: ; 55c9f (15:5c9f)
+Route17EndBattleText5:
 	TX_FAR _Route17EndBattleText5
 	db "@"
 
-Route17AfterBattleText5: ; 55ca4 (15:5ca4)
+Route17AfterBattleText5:
 	TX_FAR _Route17AfterBattleText5
 	db "@"
 
-Route17Text6: ; 55ca9 (15:5ca9)
+Route17Text6:
 	TX_ASM
 	ld hl, Route17TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText6: ; 55cb3 (15:5cb3)
+Route17BattleText6:
 	TX_FAR _Route17BattleText6
 	db "@"
 
-Route17EndBattleText6: ; 55cb8 (15:5cb8)
+Route17EndBattleText6:
 	TX_FAR _Route17EndBattleText6
 	db "@"
 
-Route17AfterBattleText6: ; 55cbd (15:5cbd)
+Route17AfterBattleText6:
 	TX_FAR _Route17AfterBattleText6
 	db "@"
 
-Route17Text7: ; 55cc2 (15:5cc2)
+Route17Text7:
 	TX_ASM
 	ld hl, Route17TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText7: ; 55ccc (15:5ccc)
+Route17BattleText7:
 	TX_FAR _Route17BattleText7
 	db "@"
 
-Route17EndBattleText7: ; 55cd1 (15:5cd1)
+Route17EndBattleText7:
 	TX_FAR _Route17EndBattleText7
 	db "@"
 
-Route17AfterBattleText7: ; 55cd6 (15:5cd6)
+Route17AfterBattleText7:
 	TX_FAR _Route17AfterBattleText7
 	db "@"
 
-Route17Text8: ; 55cdb (15:5cdb)
+Route17Text8:
 	TX_ASM
 	ld hl, Route17TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText8: ; 55ce5 (15:5ce5)
+Route17BattleText8:
 	TX_FAR _Route17BattleText8
 	db "@"
 
-Route17EndBattleText8: ; 55cea (15:5cea)
+Route17EndBattleText8:
 	TX_FAR _Route17EndBattleText8
 	db "@"
 
-Route17AfterBattleText8: ; 55cef (15:5cef)
+Route17AfterBattleText8:
 	TX_FAR _Route17AfterBattleText8
 	db "@"
 
-Route17Text9: ; 55cf4 (15:5cf4)
+Route17Text9:
 	TX_ASM
 	ld hl, Route17TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText9: ; 55cfe (15:5cfe)
+Route17BattleText9:
 	TX_FAR _Route17BattleText9
 	db "@"
 
-Route17EndBattleText9: ; 55d03 (15:5d03)
+Route17EndBattleText9:
 	TX_FAR _Route17EndBattleText9
 	db "@"
 
-Route17AfterBattleText9: ; 55d08 (15:5d08)
+Route17AfterBattleText9:
 	TX_FAR _Route17AfterBattleText9
 	db "@"
 
-Route17Text10: ; 55d0d (15:5d0d)
+Route17Text10:
 	TX_ASM
 	ld hl, Route17TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route17BattleText10: ; 55d17 (15:5d17)
+Route17BattleText10:
 	TX_FAR _Route17BattleText10
 	db "@"
 
-Route17EndBattleText10: ; 55d1c (15:5d1c)
+Route17EndBattleText10:
 	TX_FAR _Route17EndBattleText10
 	db "@"
 
-Route17AfterBattleText10: ; 55d21 (15:5d21)
+Route17AfterBattleText10:
 	TX_FAR _Route17AfterBattleText10
 	db "@"
 
-Route17Text11: ; 55d26 (15:5d26)
+Route17Text11:
 	TX_FAR _Route17Text11
 	db "@"
 
-Route17Text12: ; 55d2b (15:5d2b)
+Route17Text12:
 	TX_FAR _Route17Text12
 	db "@"
 
-Route17Text13: ; 55d30 (15:5d30)
+Route17Text13:
 	TX_FAR _Route17Text13
 	db "@"
 
-Route17Text14: ; 55d35 (15:5d35)
+Route17Text14:
 	TX_FAR _Route17Text14
 	db "@"
 
-Route17Text15: ; 55d3a (15:5d3a)
+Route17Text15:
 	TX_FAR _Route17Text15
 	db "@"
 
-Route17Text16: ; 55d3f (15:5d3f)
+Route17Text16:
 	TX_FAR _Route17Text16
 	db "@"
--- a/scripts/route18.asm
+++ b/scripts/route18.asm
@@ -1,4 +1,4 @@
-Route18Script: ; 59ac7 (16:5ac7)
+Route18Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route18TrainerHeaders
 	ld de, Route18ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute18CurScript], a
 	ret
 
-Route18ScriptPointers: ; 59ada (16:5ada)
+Route18ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route18TextPointers: ; 59ae0 (16:5ae0)
+Route18TextPointers:
 	dw Route18Text1
 	dw Route18Text2
 	dw Route18Text3
@@ -19,8 +19,8 @@
 	dw Route18Text4
 	dw Route18Text5
 
-Route18TrainerHeaders: ; 59aea (16:5aea)
-Route18TrainerHeader0: ; 59aea (16:5aea)
+Route18TrainerHeaders:
+Route18TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_0
@@ -29,7 +29,7 @@
 	dw Route18EndBattleText1 ; TextEndBattle
 	dw Route18EndBattleText1 ; TextEndBattle
 
-Route18TrainerHeader1: ; 59af6 (16:5af6)
+Route18TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_1
@@ -38,7 +38,7 @@
 	dw Route18EndBattleText2 ; TextEndBattle
 	dw Route18EndBattleText2 ; TextEndBattle
 
-Route18TrainerHeader2: ; 59b02 (16:5b02)
+Route18TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_2
@@ -49,64 +49,64 @@
 
 	db $ff
 
-Route18Text1: ; 59b0f (16:5b0f)
+Route18Text1:
 	TX_ASM
 	ld hl, Route18TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route18BattleText1: ; 59b19 (16:5b19)
+Route18BattleText1:
 	TX_FAR _Route18BattleText1
 	db "@"
 
-Route18EndBattleText1: ; 59b1e (16:5b1e)
+Route18EndBattleText1:
 	TX_FAR _Route18EndBattleText1
 	db "@"
 
-Route18AfterBattleText1: ; 59b23 (16:5b23)
+Route18AfterBattleText1:
 	TX_FAR _Route18AfterBattleText1
 	db "@"
 
-Route18Text2: ; 59b28 (16:5b28)
+Route18Text2:
 	TX_ASM
 	ld hl, Route18TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route18BattleText2: ; 59b32 (16:5b32)
+Route18BattleText2:
 	TX_FAR _Route18BattleText2
 	db "@"
 
-Route18EndBattleText2: ; 59b37 (16:5b37)
+Route18EndBattleText2:
 	TX_FAR _Route18EndBattleText2
 	db "@"
 
-Route18AfterBattleText2: ; 59b3c (16:5b3c)
+Route18AfterBattleText2:
 	TX_FAR _Route18AfterBattleText2
 	db "@"
 
-Route18Text3: ; 59b41 (16:5b41)
+Route18Text3:
 	TX_ASM
 	ld hl, Route18TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route18BattleText3: ; 59b4b (16:5b4b)
+Route18BattleText3:
 	TX_FAR _Route18BattleText3
 	db "@"
 
-Route18EndBattleText3: ; 59b50 (16:5b50)
+Route18EndBattleText3:
 	TX_FAR _Route18EndBattleText3
 	db "@"
 
-Route18AfterBattleText3: ; 59b55 (16:5b55)
+Route18AfterBattleText3:
 	TX_FAR _Route18AfterBattleText3
 	db "@"
 
-Route18Text4: ; 59b5a (16:5b5a)
+Route18Text4:
 	TX_FAR _Route18Text4
 	db "@"
 
-Route18Text5: ; 59b5f (16:5b5f)
+Route18Text5:
 	TX_FAR _Route18Text5
 	db "@"
--- a/scripts/route18gate.asm
+++ b/scripts/route18gate.asm
@@ -1,4 +1,4 @@
-Route18GateScript: ; 49876 (12:5876)
+Route18GateScript:
 	ld hl, wd732
 	res 5, [hl]
 	call EnableAutoTextBoxDrawing
@@ -6,13 +6,13 @@
 	ld hl, Route18GateScriptPointers
 	jp CallFunctionInTable
 
-Route18GateScriptPointers: ; 49887 (12:5887)
+Route18GateScriptPointers:
 	dw Route18GateScript0
 	dw Route18GateScript1
 	dw Route18GateScript2
 	dw Route18GateScript3
 
-Route18GateScript0: ; 4988f (12:588f)
+Route18GateScript0:
 	call Route16GateScript_49755
 	ret nz
 	ld hl, CoordsData_498cc
@@ -43,7 +43,7 @@
 	ld [wRoute18GateCurScript], a
 	ret
 
-CoordsData_498cc: ; 498cc (12:58cc)
+CoordsData_498cc:
 	db $03,$04
 	db $04,$04
 	db $05,$04
@@ -50,7 +50,7 @@
 	db $06,$04
 	db $FF
 
-Route18GateScript1: ; 498d5 (12:58d5)
+Route18GateScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -57,7 +57,7 @@
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-Route18GateScript2: ; 498df (12:58df)
+Route18GateScript2:
 	ld a, $1
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -70,7 +70,7 @@
 	ld [wRoute18GateCurScript], a
 	ret
 
-Route18GateScript3: ; 498f9 (12:58f9)
+Route18GateScript3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -82,11 +82,11 @@
 	ld [wRoute18GateCurScript], a
 	ret
 
-Route18GateTextPointers: ; 4990d (12:590d)
+Route18GateTextPointers:
 	dw Route18GateText1
 	dw Route18GateText2
 
-Route18GateText1: ; 49911 (12:5911)
+Route18GateText1:
 	TX_ASM
 	call Route16GateScript_49755
 	jr z, .asm_3c84d
@@ -99,14 +99,14 @@
 .asm_a8410
 	jp TextScriptEnd
 
-Route18GateText_49928: ; 49928 (12:5928)
+Route18GateText_49928:
 	TX_FAR _Route18GateText_49928
 	db "@"
 
-Route18GateText_4992d: ; 4992d (12:592d)
+Route18GateText_4992d:
 	TX_FAR _Route18GateText_4992d
 	db "@"
 
-Route18GateText2: ; 49932 (12:5932)
+Route18GateText2:
 	TX_FAR _Route18GateText_49932
 	db "@"
--- a/scripts/route18gateupstairs.asm
+++ b/scripts/route18gateupstairs.asm
@@ -1,12 +1,12 @@
-Route18GateUpstairsScript: ; 49975 (12:5975)
+Route18GateUpstairsScript:
 	jp DisableAutoTextBoxDrawing
 
-Route18GateUpstairsTextPointers: ; 49978 (12:5978)
+Route18GateUpstairsTextPointers:
 	dw Route18GateUpstairsText1
 	dw Route18GateUpstairsText2
 	dw Route18GateUpstairsText3
 
-Route18GateUpstairsText1: ; 4997e (12:597e)
+Route18GateUpstairsText1:
 	TX_ASM
 	ld a, $5
 	ld [wWhichTrade], a
@@ -13,20 +13,20 @@
 	predef DoInGameTradeDialogue
 	jp TextScriptEnd
 
-Route18GateUpstairsText2: ; 4998c (12:598c)
+Route18GateUpstairsText2:
 	TX_ASM
 	ld hl, Route18GateUpstairsText_49993
 	jp GateUpstairsScript_PrintIfFacingUp
 
-Route18GateUpstairsText_49993: ; 49993 (12:5993)
+Route18GateUpstairsText_49993:
 	TX_FAR _Route18GateUpstairsText_49993
 	db "@"
 
-Route18GateUpstairsText3: ; 49998 (12:5998)
+Route18GateUpstairsText3:
 	TX_ASM
 	ld hl, Route18GateUpstairsText_4999f
 	jp GateUpstairsScript_PrintIfFacingUp
 
-Route18GateUpstairsText_4999f: ; 4999f (12:599f)
+Route18GateUpstairsText_4999f:
 	TX_FAR _Route18GateUpstairsText_4999f
 	db "@"
--- a/scripts/route19.asm
+++ b/scripts/route19.asm
@@ -1,4 +1,4 @@
-Route19Script: ; 55d44 (15:5d44)
+Route19Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route19TrainerHeaders
 	ld de, Route19ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute19CurScript], a
 	ret
 
-Route19ScriptPointers: ; 55d57 (15:5d57)
+Route19ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route19TextPointers: ; 55d5d (15:5d5d)
+Route19TextPointers:
 	dw Route19Text1
 	dw Route19Text2
 	dw Route19Text3
@@ -25,8 +25,8 @@
 	dw Route19Text10
 	dw Route19Text11
 
-Route19TrainerHeaders: ; 55d73 (15:5d73)
-Route19TrainerHeader0: ; 55d73 (15:5d73)
+Route19TrainerHeaders:
+Route19TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_0
@@ -35,7 +35,7 @@
 	dw Route19EndBattleText1 ; TextEndBattle
 	dw Route19EndBattleText1 ; TextEndBattle
 
-Route19TrainerHeader1: ; 55d7f (15:5d7f)
+Route19TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_1
@@ -44,7 +44,7 @@
 	dw Route19EndBattleText2 ; TextEndBattle
 	dw Route19EndBattleText2 ; TextEndBattle
 
-Route19TrainerHeader2: ; 55d8b (15:5d8b)
+Route19TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_2
@@ -53,7 +53,7 @@
 	dw Route19EndBattleText3 ; TextEndBattle
 	dw Route19EndBattleText3 ; TextEndBattle
 
-Route19TrainerHeader3: ; 55d97 (15:5d97)
+Route19TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_3
@@ -62,7 +62,7 @@
 	dw Route19EndBattleText4 ; TextEndBattle
 	dw Route19EndBattleText4 ; TextEndBattle
 
-Route19TrainerHeader4: ; 55da3 (15:5da3)
+Route19TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_4
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_4
@@ -71,7 +71,7 @@
 	dw Route19EndBattleText5 ; TextEndBattle
 	dw Route19EndBattleText5 ; TextEndBattle
 
-Route19TrainerHeader5: ; 55daf (15:5daf)
+Route19TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_5
@@ -80,7 +80,7 @@
 	dw Route19EndBattleText6 ; TextEndBattle
 	dw Route19EndBattleText6 ; TextEndBattle
 
-Route19TrainerHeader6: ; 55dbb (15:5dbb)
+Route19TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_6
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_6
@@ -89,7 +89,7 @@
 	dw Route19EndBattleText7 ; TextEndBattle
 	dw Route19EndBattleText7 ; TextEndBattle
 
-Route19TrainerHeader7: ; 55dc7 (15:5dc7)
+Route19TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_7, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_7, 1
@@ -98,7 +98,7 @@
 	dw Route19EndBattleText8 ; TextEndBattle
 	dw Route19EndBattleText8 ; TextEndBattle
 
-Route19TrainerHeader8: ; 55dd3 (15:5dd3)
+Route19TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_8, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_8, 1
@@ -107,7 +107,7 @@
 	dw Route19EndBattleText9 ; TextEndBattle
 	dw Route19EndBattleText9 ; TextEndBattle
 
-Route19TrainerHeader9: ; 55ddf (15:5ddf)
+Route19TrainerHeader9:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_9, 1
@@ -118,186 +118,186 @@
 
 	db $ff
 
-Route19Text1: ; 55dec (15:5dec)
+Route19Text1:
 	TX_ASM
 	ld hl, Route19TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route19Text2: ; 55df6 (15:5df6)
+Route19Text2:
 	TX_ASM
 	ld hl, Route19TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route19Text3: ; 55e00 (15:5e00)
+Route19Text3:
 	TX_ASM
 	ld hl, Route19TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route19Text4: ; 55e0a (15:5e0a)
+Route19Text4:
 	TX_ASM
 	ld hl, Route19TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route19Text5: ; 55e14 (15:5e14)
+Route19Text5:
 	TX_ASM
 	ld hl, Route19TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route19Text6: ; 55e1e (15:5e1e)
+Route19Text6:
 	TX_ASM
 	ld hl, Route19TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route19Text7: ; 55e28 (15:5e28)
+Route19Text7:
 	TX_ASM
 	ld hl, Route19TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route19Text8: ; 55e32 (15:5e32)
+Route19Text8:
 	TX_ASM
 	ld hl, Route19TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route19Text9: ; 55e3c (15:5e3c)
+Route19Text9:
 	TX_ASM
 	ld hl, Route19TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route19Text10: ; 55e46 (15:5e46)
+Route19Text10:
 	TX_ASM
 	ld hl, Route19TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route19BattleText1: ; 55e50 (15:5e50)
+Route19BattleText1:
 	TX_FAR _Route19BattleText1
 	db "@"
 
-Route19EndBattleText1: ; 55e55 (15:5e55)
+Route19EndBattleText1:
 	TX_FAR _Route19EndBattleText1
 	db "@"
 
-Route19AfterBattleText1: ; 55e5a (15:5e5a)
+Route19AfterBattleText1:
 	TX_FAR _Route19AfterBattleText1
 	db "@"
 
-Route19BattleText2: ; 55e5f (15:5e5f)
+Route19BattleText2:
 	TX_FAR _Route19BattleText2
 	db "@"
 
-Route19EndBattleText2: ; 55e64 (15:5e64)
+Route19EndBattleText2:
 	TX_FAR _Route19EndBattleText2
 	db "@"
 
-Route19AfterBattleText2: ; 55e69 (15:5e69)
+Route19AfterBattleText2:
 	TX_FAR _Route19AfterBattleText2
 	db "@"
 
-Route19BattleText3: ; 55e6e (15:5e6e)
+Route19BattleText3:
 	TX_FAR _Route19BattleText3
 	db "@"
 
-Route19EndBattleText3: ; 55e73 (15:5e73)
+Route19EndBattleText3:
 	TX_FAR _Route19EndBattleText3
 	db "@"
 
-Route19AfterBattleText3: ; 55e78 (15:5e78)
+Route19AfterBattleText3:
 	TX_FAR _Route19AfterBattleText3
 	db "@"
 
-Route19BattleText4: ; 55e7d (15:5e7d)
+Route19BattleText4:
 	TX_FAR _Route19BattleText4
 	db "@"
 
-Route19EndBattleText4: ; 55e82 (15:5e82)
+Route19EndBattleText4:
 	TX_FAR _Route19EndBattleText4
 	db "@"
 
-Route19AfterBattleText4: ; 55e87 (15:5e87)
+Route19AfterBattleText4:
 	TX_FAR _Route19AfterBattleText4
 	db "@"
 
-Route19BattleText5: ; 55e8c (15:5e8c)
+Route19BattleText5:
 	TX_FAR _Route19BattleText5
 	db "@"
 
-Route19EndBattleText5: ; 55e91 (15:5e91)
+Route19EndBattleText5:
 	TX_FAR _Route19EndBattleText5
 	db "@"
 
-Route19AfterBattleText5: ; 55e96 (15:5e96)
+Route19AfterBattleText5:
 	TX_FAR _Route19AfterBattleText5
 	db "@"
 
-Route19BattleText6: ; 55e9b (15:5e9b)
+Route19BattleText6:
 	TX_FAR _Route19BattleText6
 	db "@"
 
-Route19EndBattleText6: ; 55ea0 (15:5ea0)
+Route19EndBattleText6:
 	TX_FAR _Route19EndBattleText6
 	db "@"
 
-Route19AfterBattleText6: ; 55ea5 (15:5ea5)
+Route19AfterBattleText6:
 	TX_FAR _Route19AfterBattleText6
 	db "@"
 
-Route19BattleText7: ; 55eaa (15:5eaa)
+Route19BattleText7:
 	TX_FAR _Route19BattleText7
 	db "@"
 
-Route19EndBattleText7: ; 55eaf (15:5eaf)
+Route19EndBattleText7:
 	TX_FAR _Route19EndBattleText7
 	db "@"
 
-Route19AfterBattleText7: ; 55eb4 (15:5eb4)
+Route19AfterBattleText7:
 	TX_FAR _Route19AfterBattleText7
 	db "@"
 
-Route19BattleText8: ; 55eb9 (15:5eb9)
+Route19BattleText8:
 	TX_FAR _Route19BattleText8
 	db "@"
 
-Route19EndBattleText8: ; 55ebe (15:5ebe)
+Route19EndBattleText8:
 	TX_FAR _Route19EndBattleText8
 	db "@"
 
-Route19AfterBattleText8: ; 55ec3 (15:5ec3)
+Route19AfterBattleText8:
 	TX_FAR _Route19AfterBattleText8
 	db "@"
 
-Route19BattleText9: ; 55ec8 (15:5ec8)
+Route19BattleText9:
 	TX_FAR _Route19BattleText9
 	db "@"
 
-Route19EndBattleText9: ; 55ecd (15:5ecd)
+Route19EndBattleText9:
 	TX_FAR _Route19EndBattleText9
 	db "@"
 
-Route19AfterBattleText9: ; 55ed2 (15:5ed2)
+Route19AfterBattleText9:
 	TX_FAR _Route19AfterBattleText9
 	db "@"
 
-Route19BattleText10: ; 55ed7 (15:5ed7)
+Route19BattleText10:
 	TX_FAR _Route19BattleText10
 	db "@"
 
-Route19EndBattleText10: ; 55edc (15:5edc)
+Route19EndBattleText10:
 	TX_FAR _Route19EndBattleText10
 	db "@"
 
-Route19AfterBattleText10: ; 55ee1 (15:5ee1)
+Route19AfterBattleText10:
 	TX_FAR _Route19AfterBattleText10
 	db "@"
 
-Route19Text11: ; 55ee6 (15:5ee6)
+Route19Text11:
 	TX_FAR _Route19Text11
 	db "@"
--- a/scripts/route2.asm
+++ b/scripts/route2.asm
@@ -1,16 +1,16 @@
-Route2Script: ; 554e3 (15:54e3)
+Route2Script:
 	jp EnableAutoTextBoxDrawing
 
-Route2TextPointers: ; 554e6 (15:54e6)
+Route2TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw Route2Text3
 	dw Route2Text4
 
-Route2Text3: ; 554ee (15:54ee)
+Route2Text3:
 	TX_FAR _Route2Text3
 	db "@"
 
-Route2Text4: ; 554f3 (15:54f3)
+Route2Text4:
 	TX_FAR _Route2Text4
 	db "@"
--- a/scripts/route20.asm
+++ b/scripts/route20.asm
@@ -1,4 +1,4 @@
-Route20Script: ; 50ca9 (14:4ca9)
+Route20Script:
 	CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS
 	call nz, Route20Script_50cc6
 	call EnableAutoTextBoxDrawing
@@ -9,7 +9,7 @@
 	ld [wRoute20CurScript], a
 	ret
 
-Route20Script_50cc6: ; 50cc6 (14:4cc6)
+Route20Script_50cc6:
 	CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
 	jr z, .asm_50cef
 	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1
@@ -26,7 +26,7 @@
 	pop hl
 	jr .asm_50cdc
 
-.MissableObjectIDs: ; 50ce8 (14:4ce8)
+.MissableObjectIDs:
 	db HS_SEAFOAM_ISLANDS_2_BOULDER_1
 	db HS_SEAFOAM_ISLANDS_2_BOULDER_2
 	db HS_SEAFOAM_ISLANDS_3_BOULDER_1
@@ -48,20 +48,20 @@
 	call Route20Script_50d14
 	ret
 
-Route20Script_50d0c: ; 50d0c (14:4d0c)
+Route20Script_50d0c:
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 
-Route20Script_50d14: ; 50d14 (14:4d14)
+Route20Script_50d14:
 	ld [wMissableObjectIndex], a
 	predef_jump HideObject
 
-Route20ScriptPointers: ; 50d1c (14:4d1c)
+Route20ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route20TextPointers: ; 50d22 (14:4d22)
+Route20TextPointers:
 	dw Route20Text1
 	dw Route20Text2
 	dw Route20Text3
@@ -75,8 +75,8 @@
 	dw Route20Text11
 	dw Route20Text12
 
-Route20TrainerHeaders: ; 50d3a (14:4d3a)
-Route20TrainerHeader0: ; 50d3a (14:4d3a)
+Route20TrainerHeaders:
+Route20TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_0
@@ -85,7 +85,7 @@
 	dw Route20EndBattleText1 ; TextEndBattle
 	dw Route20EndBattleText1 ; TextEndBattle
 
-Route20TrainerHeader2: ; 50d46 (14:4d46)
+Route20TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2
@@ -94,7 +94,7 @@
 	dw Route20EndBattleText2 ; TextEndBattle
 	dw Route20EndBattleText2 ; TextEndBattle
 
-Route20TrainerHeader3: ; 50d52 (14:4d52)
+Route20TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3
@@ -103,7 +103,7 @@
 	dw Route20EndBattleText3 ; TextEndBattle
 	dw Route20EndBattleText3 ; TextEndBattle
 
-Route20TrainerHeader4: ; 50d5e (14:4d5e)
+Route20TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4
@@ -112,7 +112,7 @@
 	dw Route20EndBattleText4 ; TextEndBattle
 	dw Route20EndBattleText4 ; TextEndBattle
 
-Route20TrainerHeader5: ; 50d6a (14:4d6a)
+Route20TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5
@@ -121,7 +121,7 @@
 	dw Route20EndBattleText5 ; TextEndBattle
 	dw Route20EndBattleText5 ; TextEndBattle
 
-Route20TrainerHeader6: ; 50d76 (14:4d76)
+Route20TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6
@@ -130,7 +130,7 @@
 	dw Route20EndBattleText6 ; TextEndBattle
 	dw Route20EndBattleText6 ; TextEndBattle
 
-Route20TrainerHeader7: ; 50d82 (14:4d82)
+Route20TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7
@@ -139,7 +139,7 @@
 	dw Route20EndBattleText7 ; TextEndBattle
 	dw Route20EndBattleText7 ; TextEndBattle
 
-Route20TrainerHeader8: ; 50d8e (14:4d8e)
+Route20TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1
@@ -148,7 +148,7 @@
 	dw Route20EndBattleText8 ; TextEndBattle
 	dw Route20EndBattleText8 ; TextEndBattle
 
-Route20TrainerHeader9: ; 50d9a (14:4d9a)
+Route20TrainerHeader9:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1
@@ -157,7 +157,7 @@
 	dw Route20EndBattleText9 ; TextEndBattle
 	dw Route20EndBattleText9 ; TextEndBattle
 
-Route20TrainerHeader10: ; 50da6 (14:4da6)
+Route20TrainerHeader10:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_10, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_10, 1
@@ -168,187 +168,187 @@
 
 	db $ff
 
-Route20Text1: ; 50db3 (14:4db3)
+Route20Text1:
 	TX_ASM
 	ld hl, Route20TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route20Text2: ; 50dbd (14:4dbd)
+Route20Text2:
 	TX_ASM
 	ld hl, Route20TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route20Text3: ; 50dc7 (14:4dc7)
+Route20Text3:
 	TX_ASM
 	ld hl, Route20TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route20Text4: ; 50dd1 (14:4dd1)
+Route20Text4:
 	TX_ASM
 	ld hl, Route20TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route20Text5: ; 50ddb (14:4ddb)
+Route20Text5:
 	TX_ASM
 	ld hl, Route20TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route20Text6: ; 50de5 (14:4de5)
+Route20Text6:
 	TX_ASM
 	ld hl, Route20TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route20Text7: ; 50def (14:4def)
+Route20Text7:
 	TX_ASM
 	ld hl, Route20TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route20Text8: ; 50df9 (14:4df9)
+Route20Text8:
 	TX_ASM
 	ld hl, Route20TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route20Text9: ; 50e03 (14:4e03)
+Route20Text9:
 	TX_ASM
 	ld hl, Route20TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route20Text10: ; 50e0d (14:4e0d)
+Route20Text10:
 	TX_ASM
 	ld hl, Route20TrainerHeader10
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route20BattleText1: ; 50e17 (14:4e17)
+Route20BattleText1:
 	TX_FAR _Route20BattleText1
 	db "@"
 
-Route20EndBattleText1: ; 50e1c (14:4e1c)
+Route20EndBattleText1:
 	TX_FAR _Route20EndBattleText1
 	db "@"
 
-Route20AfterBattleText1: ; 50e21 (14:4e21)
+Route20AfterBattleText1:
 	TX_FAR _Route20AfterBattleText1
 	db "@"
 
-Route20BattleText2: ; 50e26 (14:4e26)
+Route20BattleText2:
 	TX_FAR _Route20BattleText2
 	db "@"
 
-Route20EndBattleText2: ; 50e2b (14:4e2b)
+Route20EndBattleText2:
 	TX_FAR _Route20EndBattleText2
 	db "@"
 
-Route20AfterBattleText2: ; 50e30 (14:4e30)
+Route20AfterBattleText2:
 	TX_FAR _Route20AfterBattleText2
 	db "@"
 
-Route20BattleText3: ; 50e35 (14:4e35)
+Route20BattleText3:
 	TX_FAR _Route20BattleText3
 	db "@"
 
-Route20EndBattleText3: ; 50e3a (14:4e3a)
+Route20EndBattleText3:
 	TX_FAR _Route20EndBattleText3
 	db "@"
 
-Route20AfterBattleText3: ; 50e3f (14:4e3f)
+Route20AfterBattleText3:
 	TX_FAR _Route20AfterBattleText3
 	db "@"
 
-Route20BattleText4: ; 50e44 (14:4e44)
+Route20BattleText4:
 	TX_FAR _Route20BattleText4
 	db "@"
 
-Route20EndBattleText4: ; 50e49 (14:4e49)
+Route20EndBattleText4:
 	TX_FAR _Route20EndBattleText4
 	db "@"
 
-Route20AfterBattleText4: ; 50e4e (14:4e4e)
+Route20AfterBattleText4:
 	TX_FAR _Route20AfterBattleText4
 	db "@"
 
-Route20BattleText5: ; 50e53 (14:4e53)
+Route20BattleText5:
 	TX_FAR _Route20BattleText5
 	db "@"
 
-Route20EndBattleText5: ; 50e58 (14:4e58)
+Route20EndBattleText5:
 	TX_FAR _Route20EndBattleText5
 	db "@"
 
-Route20AfterBattleText5: ; 50e5d (14:4e5d)
+Route20AfterBattleText5:
 	TX_FAR _Route20AfterBattleText5
 	db "@"
 
-Route20BattleText6: ; 50e62 (14:4e62)
+Route20BattleText6:
 	TX_FAR _Route20BattleText6
 	db "@"
 
-Route20EndBattleText6: ; 50e67 (14:4e67)
+Route20EndBattleText6:
 	TX_FAR _Route20EndBattleText6
 	db "@"
 
-Route20AfterBattleText6: ; 50e6c (14:4e6c)
+Route20AfterBattleText6:
 	TX_FAR _Route20AfterBattleText6
 	db "@"
 
-Route20BattleText7: ; 50e71 (14:4e71)
+Route20BattleText7:
 	TX_FAR _Route20BattleText7
 	db "@"
 
-Route20EndBattleText7: ; 50e76 (14:4e76)
+Route20EndBattleText7:
 	TX_FAR _Route20EndBattleText7
 	db "@"
 
-Route20AfterBattleText7: ; 50e7b (14:4e7b)
+Route20AfterBattleText7:
 	TX_FAR _Route20AfterBattleText7
 	db "@"
 
-Route20BattleText8: ; 50e80 (14:4e80)
+Route20BattleText8:
 	TX_FAR _Route20BattleText8
 	db "@"
 
-Route20EndBattleText8: ; 50e85 (14:4e85)
+Route20EndBattleText8:
 	TX_FAR _Route20EndBattleText8
 	db "@"
 
-Route20AfterBattleText8: ; 50e8a (14:4e8a)
+Route20AfterBattleText8:
 	TX_FAR _Route20AfterBattleText8
 	db "@"
 
-Route20BattleText9: ; 50e8f (14:4e8f)
+Route20BattleText9:
 	TX_FAR _Route20BattleText9
 	db "@"
 
-Route20EndBattleText9: ; 50e94 (14:4e94)
+Route20EndBattleText9:
 	TX_FAR _Route20EndBattleText9
 	db "@"
 
-Route20AfterBattleText9: ; 50e99 (14:4e99)
+Route20AfterBattleText9:
 	TX_FAR _Route20AfterBattleText9
 	db "@"
 
-Route20BattleText10: ; 50e9e (14:4e9e)
+Route20BattleText10:
 	TX_FAR _Route20BattleText10
 	db "@"
 
-Route20EndBattleText10: ; 50ea3 (14:4ea3)
+Route20EndBattleText10:
 	TX_FAR _Route20EndBattleText10
 	db "@"
 
-Route20AfterBattleText10: ; 50ea8 (14:4ea8)
+Route20AfterBattleText10:
 	TX_FAR _Route20AfterBattleText10
 	db "@"
 
-Route20Text12: ; 50ead (14:4ead)
-Route20Text11: ; 50ead (14:4ead)
+Route20Text12:
+Route20Text11:
 	TX_FAR _Route20Text11
 	db "@"
--- a/scripts/route21.asm
+++ b/scripts/route21.asm
@@ -1,4 +1,4 @@
-Route21Script: ; 55eeb (15:5eeb)
+Route21Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route21TrainerHeaders
 	ld de, Route21ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute21CurScript], a
 	ret
 
-Route21ScriptPointers: ; 55efe (15:5efe)
+Route21ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route21TextPointers: ; 55f04 (15:5f04)
+Route21TextPointers:
 	dw Route21Text1
 	dw Route21Text2
 	dw Route21Text3
@@ -23,8 +23,8 @@
 	dw Route21Text8
 	dw Route21Text9
 
-Route21TrainerHeaders: ; 55f16 (15:5f16)
-Route21TrainerHeader0: ; 55f16 (15:5f16)
+Route21TrainerHeaders:
+Route21TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_0
@@ -33,7 +33,7 @@
 	dw Route21EndBattleText1 ; TextEndBattle
 	dw Route21EndBattleText1 ; TextEndBattle
 
-Route21TrainerHeader1: ; 55f22 (15:5f22)
+Route21TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_1
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_1
@@ -42,7 +42,7 @@
 	dw Route21EndBattleText2 ; TextEndBattle
 	dw Route21EndBattleText2 ; TextEndBattle
 
-Route21TrainerHeader2: ; 55f2e (15:5f2e)
+Route21TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_2
@@ -51,7 +51,7 @@
 	dw Route21EndBattleText3 ; TextEndBattle
 	dw Route21EndBattleText3 ; TextEndBattle
 
-Route21TrainerHeader3: ; 55f3a (15:5f3a)
+Route21TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_3
@@ -60,7 +60,7 @@
 	dw Route21EndBattleText4 ; TextEndBattle
 	dw Route21EndBattleText4 ; TextEndBattle
 
-Route21TrainerHeader4: ; 55f46 (15:5f46)
+Route21TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_4
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_4
@@ -69,7 +69,7 @@
 	dw Route21EndBattleText5 ; TextEndBattle
 	dw Route21EndBattleText5 ; TextEndBattle
 
-Route21TrainerHeader5: ; 55f52 (15:5f52)
+Route21TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_5
@@ -78,7 +78,7 @@
 	dw Route21EndBattleText6 ; TextEndBattle
 	dw Route21EndBattleText6 ; TextEndBattle
 
-Route21TrainerHeader6: ; 55f5e (15:5f5e)
+Route21TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_6
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_6
@@ -87,7 +87,7 @@
 	dw Route21EndBattleText7 ; TextEndBattle
 	dw Route21EndBattleText7 ; TextEndBattle
 
-Route21TrainerHeader7: ; 55f6a (15:5f6a)
+Route21TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_7, 1
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_7, 1
@@ -96,7 +96,7 @@
 	dw Route21EndBattleText8 ; TextEndBattle
 	dw Route21EndBattleText8 ; TextEndBattle
 
-Route21TrainerHeader8: ; 55f76 (15:5f76)
+Route21TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_8, 1
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_8, 1
@@ -107,164 +107,164 @@
 
 	db $ff
 
-Route21Text1: ; 55f83 (15:5f83)
+Route21Text1:
 	TX_ASM
 	ld hl, Route21TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text2: ; 55f8d (15:5f8d)
+Route21Text2:
 	TX_ASM
 	ld hl, Route21TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text3: ; 55f97 (15:5f97)
+Route21Text3:
 	TX_ASM
 	ld hl, Route21TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text4: ; 55fa1 (15:5fa1)
+Route21Text4:
 	TX_ASM
 	ld hl, Route21TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text5: ; 55fab (15:5fab)
+Route21Text5:
 	TX_ASM
 	ld hl, Route21TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text6: ; 55fb5 (15:5fb5)
+Route21Text6:
 	TX_ASM
 	ld hl, Route21TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text7: ; 55fbf (15:5fbf)
+Route21Text7:
 	TX_ASM
 	ld hl, Route21TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text8: ; 55fc9 (15:5fc9)
+Route21Text8:
 	TX_ASM
 	ld hl, Route21TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text9: ; 55fd3 (15:5fd3)
+Route21Text9:
 	TX_ASM
 	ld hl, Route21TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21BattleText1: ; 55fdd (15:5fdd)
+Route21BattleText1:
 	TX_FAR _Route21BattleText1
 	db "@"
 
-Route21EndBattleText1: ; 55fe2 (15:5fe2)
+Route21EndBattleText1:
 	TX_FAR _Route21EndBattleText1
 	db "@"
 
-Route21AfterBattleText1: ; 55fe7 (15:5fe7)
+Route21AfterBattleText1:
 	TX_FAR _Route21AfterBattleText1
 	db "@"
 
-Route21BattleText2: ; 55fec (15:5fec)
+Route21BattleText2:
 	TX_FAR _Route21BattleText2
 	db "@"
 
-Route21EndBattleText2: ; 55ff1 (15:5ff1)
+Route21EndBattleText2:
 	TX_FAR _Route21EndBattleText2
 	db "@"
 
-Route21AfterBattleText2: ; 55ff6 (15:5ff6)
+Route21AfterBattleText2:
 	TX_FAR _Route21AfterBattleText2
 	db "@"
 
-Route21BattleText3: ; 55ffb (15:5ffb)
+Route21BattleText3:
 	TX_FAR _Route21BattleText3
 	db "@"
 
-Route21EndBattleText3: ; 56000 (15:6000)
+Route21EndBattleText3:
 	TX_FAR _Route21EndBattleText3
 	db "@"
 
-Route21AfterBattleText3: ; 56005 (15:6005)
+Route21AfterBattleText3:
 	TX_FAR _Route21AfterBattleText3
 	db "@"
 
-Route21BattleText4: ; 5600a (15:600a)
+Route21BattleText4:
 	TX_FAR _Route21BattleText4
 	db "@"
 
-Route21EndBattleText4: ; 5600f (15:600f)
+Route21EndBattleText4:
 	TX_FAR _Route21EndBattleText4
 	db "@"
 
-Route21AfterBattleText4: ; 56014 (15:6014)
+Route21AfterBattleText4:
 	TX_FAR _Route21AfterBattleText4
 	db "@"
 
-Route21BattleText5: ; 56019 (15:6019)
+Route21BattleText5:
 	TX_FAR _Route21BattleText5
 	db "@"
 
-Route21EndBattleText5: ; 5601e (15:601e)
+Route21EndBattleText5:
 	TX_FAR _Route21EndBattleText5
 	db "@"
 
-Route21AfterBattleText5: ; 56023 (15:6023)
+Route21AfterBattleText5:
 	TX_FAR _Route21AfterBattleText5
 	db "@"
 
-Route21BattleText6: ; 56028 (15:6028)
+Route21BattleText6:
 	TX_FAR _Route21BattleText6
 	db "@"
 
-Route21EndBattleText6: ; 5602d (15:602d)
+Route21EndBattleText6:
 	TX_FAR _Route21EndBattleText6
 	db "@"
 
-Route21AfterBattleText6: ; 56032 (15:6032)
+Route21AfterBattleText6:
 	TX_FAR _Route21AfterBattleText6
 	db "@"
 
-Route21BattleText7: ; 56037 (15:6037)
+Route21BattleText7:
 	TX_FAR _Route21BattleText7
 	db "@"
 
-Route21EndBattleText7: ; 5603c (15:603c)
+Route21EndBattleText7:
 	TX_FAR _Route21EndBattleText7
 	db "@"
 
-Route21AfterBattleText7: ; 56041 (15:6041)
+Route21AfterBattleText7:
 	TX_FAR _Route21AfterBattleText7
 	db "@"
 
-Route21BattleText8: ; 56046 (15:6046)
+Route21BattleText8:
 	TX_FAR _Route21BattleText8
 	db "@"
 
-Route21EndBattleText8: ; 5604b (15:604b)
+Route21EndBattleText8:
 	TX_FAR _Route21EndBattleText8
 	db "@"
 
-Route21AfterBattleText8: ; 56050 (15:6050)
+Route21AfterBattleText8:
 	TX_FAR _Route21AfterBattleText8
 	db "@"
 
-Route21BattleText9: ; 56055 (15:6055)
+Route21BattleText9:
 	TX_FAR _Route21BattleText9
 	db "@"
 
-Route21EndBattleText9: ; 5605a (15:605a)
+Route21EndBattleText9:
 	TX_FAR _Route21EndBattleText9
 	db "@"
 
-Route21AfterBattleText9: ; 5605f (15:605f)
+Route21AfterBattleText9:
 	TX_FAR _Route21AfterBattleText9
 	db "@"
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -1,10 +1,10 @@
-Route22Script: ; 50eb2 (14:4eb2)
+Route22Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route22ScriptPointers
 	ld a, [wRoute22CurScript]
 	jp CallFunctionInTable
 
-Route22ScriptPointers: ; 50ebe (14:4ebe)
+Route22ScriptPointers:
 	dw Route22Script0
 	dw Route22Script1
 	dw Route22Script2
@@ -14,14 +14,14 @@
 	dw Route22Script6
 	dw Route22Script7
 
-Route22Script_50ece: ; 50ece (14:4ece)
+Route22Script_50ece:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wRoute22CurScript], a
-Route22Script7: ; 50ed5 (14:4ed5)
+Route22Script7:
 	ret
 
-Route22Script_50ed6: ; 50ed6 (14:4ed6)
+Route22Script_50ed6:
 	ld a, [wRivalStarter]
 	ld b, a
 .asm_50eda
@@ -35,7 +35,7 @@
 	ld [wTrainerNo], a
 	ret
 
-Route22MoveRivalSprite: ; 50ee6 (14:4ee6)
+Route22MoveRivalSprite:
 	ld de, Route22RivalMovementData
 	ld a, [wcf0d]
 	cp $1
@@ -47,7 +47,7 @@
 	ld [hSpriteFacingDirection], a
 	jp SetSpriteFacingDirectionAndDelay
 
-Route22RivalMovementData: ; 50efb (14:4efb)
+Route22RivalMovementData:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
@@ -54,7 +54,7 @@
 	db NPC_MOVEMENT_RIGHT
 	db $FF
 
-Route22Script0: ; 50f00 (14:4f00)
+Route22Script0:
 	CheckEvent EVENT_ROUTE22_RIVAL_WANTS_BATTLE
 	ret z
 	ld hl, .Route22RivalBattleCoords
@@ -102,7 +102,7 @@
 	ld [wRoute22CurScript], a
 	ret
 
-Route22Script1: ; 50f62 (14:4f62)
+Route22Script1:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -139,13 +139,13 @@
 	ld [wRoute22CurScript], a
 	ret
 
-StarterMons_50faf: ; 50faf (14:4faf)
+StarterMons_50faf:
 ; starter the rival picked, rival trainer number
 	db STARTER2,$04
 	db STARTER3,$05
 	db STARTER1,$06
 
-Route22Script2: ; 50fb5 (14:4fb5)
+Route22Script2:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route22Script_50ece
@@ -183,18 +183,18 @@
 	ld [wRoute22CurScript], a
 	ret
 
-Route22Script_51008: ; 51008 (14:5008)
+Route22Script_51008:
 	ld de, Route22RivalExitMovementData1
 	jr Route22MoveRival1
 
-Route22Script_5100d: ; 5100d (14:500d)
+Route22Script_5100d:
 	ld de, Route22RivalExitMovementData2
-Route22MoveRival1: ; 51010 (14:5010)
+Route22MoveRival1:
 	ld a, $1
 	ld [H_SPRITEINDEX], a
 	jp MoveSprite
 
-Route22RivalExitMovementData1: ; 51017 (14:5017)
+Route22RivalExitMovementData1:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
@@ -204,7 +204,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-Route22RivalExitMovementData2: ; 5101f (14:501f)
+Route22RivalExitMovementData2:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
@@ -217,7 +217,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-Route22Script3: ; 5102a (14:502a)
+Route22Script3:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -232,7 +232,7 @@
 	ld [wRoute22CurScript], a
 	ret
 
-Route22Script_5104e: ; 5104e (14:504e)
+Route22Script_5104e:
 	ld a, $2
 	ld [wEmotionBubbleSpriteIndex], a
 	xor a ; EXCLAMATION_BUBBLE
@@ -256,7 +256,7 @@
 	ld [wRoute22CurScript], a
 	ret
 
-Route22Script4: ; 51087 (14:5087)
+Route22Script4:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -295,12 +295,12 @@
 	ld [wRoute22CurScript], a
 	ret
 
-StarterMons_510d9: ; 510d9 (14:50d9)
+StarterMons_510d9:
 	db STARTER2,$0a
 	db STARTER3,$0b
 	db STARTER1,$0c
 
-Route22Script5: ; 510df (14:50df)
+Route22Script5:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route22Script_50ece
@@ -342,27 +342,27 @@
 	ld [wRoute22CurScript], a
 	ret
 
-Route22Script_5113d: ; 5113d (14:513d)
+Route22Script_5113d:
 	ld de, MovementData_5114c
 	jr Route22MoveRival2
 
-Route22Script_51142: ; 51142 (14:5142)
+Route22Script_51142:
 	ld de, MovementData_5114d
-Route22MoveRival2: ; 51145 (14:5145)
+Route22MoveRival2:
 	ld a, $2
 	ld [H_SPRITEINDEX], a
 	jp MoveSprite
 
-MovementData_5114c: ; 5114c (14:514c)
+MovementData_5114c:
 	db NPC_MOVEMENT_LEFT
 
-MovementData_5114d: ; 5114d (14:514d)
+MovementData_5114d:
 	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_LEFT
 	db $FF
 
-Route22Script6: ; 51151 (14:5151)
+Route22Script6:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -377,12 +377,12 @@
 	ld [wRoute22CurScript], a
 	ret
 
-Route22TextPointers: ; 51175 (14:5175)
+Route22TextPointers:
 	dw Route22Text1
 	dw Route22Text2
 	dw Route22FrontGateText
 
-Route22Text1: ; 5117b (14:517b)
+Route22Text1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
 	jr z, .asm_5118b
@@ -395,7 +395,7 @@
 .asm_51191
 	jp TextScriptEnd
 
-Route22Text2: ; 51194 (14:5194)
+Route22Text2:
 	TX_ASM
 	CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
 	jr z, .asm_511a4
@@ -408,38 +408,38 @@
 .asm_511aa
 	jp TextScriptEnd
 
-Route22RivalBeforeBattleText1: ; 511ad (14:51ad)
+Route22RivalBeforeBattleText1:
 	TX_FAR _Route22RivalBeforeBattleText1
 	db "@"
 
-Route22RivalAfterBattleText1: ; 511b2 (14:51b2)
+Route22RivalAfterBattleText1:
 	TX_FAR _Route22RivalAfterBattleText1
 	db "@"
 
-Route22RivalDefeatedText1: ; 511b7 (14:51b7)
+Route22RivalDefeatedText1:
 	TX_FAR _Route22RivalDefeatedText1
 	db "@"
 
-Route22Text_511bc: ; 511bc (14:51bc)
+Route22Text_511bc:
 	TX_FAR _Route22Text_511bc
 	db "@"
 
-Route22RivalBeforeBattleText2: ; 511c1 (14:51c1)
+Route22RivalBeforeBattleText2:
 	TX_FAR _Route22RivalBeforeBattleText2
 	db "@"
 
-Route22RivalAfterBattleText2: ; 511c6 (14:51c6)
+Route22RivalAfterBattleText2:
 	TX_FAR _Route22RivalAfterBattleText2
 	db "@"
 
-Route22RivalDefeatedText2: ; 511cb (14:51cb)
+Route22RivalDefeatedText2:
 	TX_FAR _Route22RivalDefeatedText2
 	db "@"
 
-Route22Text_511d0: ; 511d0 (14:51d0)
+Route22Text_511d0:
 	TX_FAR _Route22Text_511d0
 	db "@"
 
-Route22FrontGateText: ; 511d5 (14:51d5)
+Route22FrontGateText:
 	TX_FAR _Route22FrontGateText
 	db "@"
--- a/scripts/route22gate.asm
+++ b/scripts/route22gate.asm
@@ -1,4 +1,4 @@
-Route22GateScript: ; 1e683 (7:6683)
+Route22GateScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route22GateScriptPointers
 	ld a, [wRoute22GateCurScript]
@@ -12,12 +12,12 @@
 	ld [wLastMap], a
 	ret
 
-Route22GateScriptPointers: ; 1e69e (7:669e)
+Route22GateScriptPointers:
 	dw Route22GateScript0
 	dw Route22GateScript1
 	dw Route22GateScript2
 
-Route22GateScript0: ; 1e6a4 (7:66a4)
+Route22GateScript0:
 	ld hl, Route22GateScriptCoords
 	call ArePlayerCoordsInArray
 	ret nc
@@ -27,12 +27,12 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Route22GateScriptCoords: ; 1e6b5 (7:66b5)
+Route22GateScriptCoords:
 	db 2,4
 	db 2,5
 	db $ff
 
-Route22GateScript_1e6ba: ; 1e6ba (7:66ba)
+Route22GateScript_1e6ba:
 	ld a, $1
 	ld [wSimulatedJoypadStatesIndex], a
 	ld a, D_DOWN
@@ -41,7 +41,7 @@
 	ld [wJoyIgnore], a
 	jp StartSimulatingJoypadStates
 
-Route22GateScript1: ; 1e6cd (7:66cd)
+Route22GateScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -50,13 +50,13 @@
 	call Delay3
 	ld a, $0
 	ld [wRoute22GateCurScript], a
-Route22GateScript2: ; 1e6de (7:66de)
+Route22GateScript2:
 	ret
 
-Route22GateTextPointers: ; 1e6df (7:66df)
+Route22GateTextPointers:
 	dw Route22GateText1
 
-Route22GateText1: ; 1e6e1 (7:66e1)
+Route22GateText1:
 	TX_ASM
 	ld a, [wObtainedBadges]
 	bit 0, a
@@ -74,7 +74,7 @@
 	ld [wRoute22GateCurScript], a
 	jp TextScriptEnd
 
-Route22GateText_1e704: ; 1e704 (7:6704)
+Route22GateText_1e704:
 	TX_FAR _Route22GateText_1e704
 	TX_ASM
 	ld a, SFX_DENIED
@@ -83,10 +83,10 @@
 	ld hl, Route22GateText_1e715
 	ret
 
-Route22GateText_1e715: ; 1e715 (7:6715)
+Route22GateText_1e715:
 	TX_FAR _Route22GateText_1e715
 	db "@"
 
-Route22GateText_1e71a: ; 1e71a (7:671a)
+Route22GateText_1e71a:
 	TX_FAR _Route22GateText_1e71a
 	db $0B, "@"
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -1,4 +1,4 @@
-Route23Script: ; 511da (14:51da)
+Route23Script:
 	call Route23Script_511e9
 	call EnableAutoTextBoxDrawing
 	ld hl, Route23ScriptPointers
@@ -5,7 +5,7 @@
 	ld a, [wRoute23CurScript]
 	jp CallFunctionInTable
 
-Route23Script_511e9: ; 511e9 (14:51e9)
+Route23Script_511e9:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -19,12 +19,12 @@
 	ld [wMissableObjectIndex], a
 	predef_jump HideObject
 
-Route23ScriptPointers: ; 51213 (14:5213)
+Route23ScriptPointers:
 	dw Route23Script0
 	dw Route23Script1
 	dw Route23Script2
 
-Route23Script0: ; 51219 (14:5219)
+Route23Script0:
 	ld hl, YCoordsData_51255
 	ld a, [wYCoord]
 	ld b, a
@@ -60,10 +60,10 @@
 	ld [hJoyHeld], a
 	ret
 
-YCoordsData_51255: ; 51255 (14:5255)
+YCoordsData_51255:
 	db $23,$38,$55,$60,$69,$77,$88,$FF
 
-Route23Script_5125d: ; 5125d (14:525d)
+Route23Script_5125d:
 	ld hl, BadgeTextPointers
 	ld a, [wWhichBadge]
 	ld c, a
@@ -82,7 +82,7 @@
 	jr nz, .copyTextLoop
 	ret
 
-BadgeTextPointers: ; 51276 (14:5276)
+BadgeTextPointers:
 	dw CascadeBadgeText
 	dw ThunderBadgeText
 	dw RainbowBadgeText
@@ -91,28 +91,28 @@
 	dw VolcanoBadgeText
 	dw EarthBadgeText
 
-EarthBadgeText: ; 51284 (14:5284)
+EarthBadgeText:
 	db "EARTHBADGE@"
 
-VolcanoBadgeText: ; 5128f (14:528f)
+VolcanoBadgeText:
 	db "VOLCANOBADGE@"
 
-MarshBadgeText: ; 5129c (14:529c)
+MarshBadgeText:
 	db "MARSHBADGE@"
 
-SoulBadgeText: ; 512a7 (14:52a7)
+SoulBadgeText:
 	db "SOULBADGE@"
 
-RainbowBadgeText: ; 512b1 (14:52b1)
+RainbowBadgeText:
 	db "RAINBOWBADGE@"
 
-ThunderBadgeText: ; 512be (14:52be)
+ThunderBadgeText:
 	db "THUNDERBADGE@"
 
-CascadeBadgeText: ; 512cb (14:52cb)
+CascadeBadgeText:
 	db "CASCADEBADGE@"
 
-Route23Script_512d8: ; 512d8 (14:52d8)
+Route23Script_512d8:
 	ld a, $1
 	ld [wSimulatedJoypadStatesIndex], a
 	ld a, D_DOWN
@@ -122,16 +122,16 @@
 	ld [wJoyIgnore], a
 	jp StartSimulatingJoypadStates
 
-Route23Script1: ; 512ec (14:52ec)
+Route23Script1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
-Route23Script2: ; 512f1 (14:52f1)
+Route23Script2:
 	ld a, $0
 	ld [wRoute23CurScript], a
 	ret
 
-Route23TextPointers: ; 512f7 (14:52f7)
+Route23TextPointers:
 	dw Route23Text1
 	dw Route23Text2
 	dw Route23Text3
@@ -141,49 +141,49 @@
 	dw Route23Text7
 	dw Route23Text8
 
-Route23Text1: ; 51307 (14:5307)
+Route23Text1:
 	TX_ASM
 	EventFlagBit a, EVENT_PASSED_EARTHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK
 	call Route23Script_51346
 	jp TextScriptEnd
 
-Route23Text2: ; 51310 (14:5310)
+Route23Text2:
 	TX_ASM
 	EventFlagBit a, EVENT_PASSED_VOLCANOBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK
 	call Route23Script_51346
 	jp TextScriptEnd
 
-Route23Text3: ; 51319 (14:5319)
+Route23Text3:
 	TX_ASM
 	EventFlagBit a, EVENT_PASSED_MARSHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK
 	call Route23Script_51346
 	jp TextScriptEnd
 
-Route23Text4: ; 51322 (14:5322)
+Route23Text4:
 	TX_ASM
 	EventFlagBit a, EVENT_PASSED_SOULBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK
 	call Route23Script_51346
 	jp TextScriptEnd
 
-Route23Text5: ; 5132b (14:532b)
+Route23Text5:
 	TX_ASM
 	EventFlagBit a, EVENT_PASSED_RAINBOWBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK
 	call Route23Script_51346
 	jp TextScriptEnd
 
-Route23Text6: ; 51334 (14:5334)
+Route23Text6:
 	TX_ASM
 	EventFlagBit a, EVENT_PASSED_THUNDERBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK
 	call Route23Script_51346
 	jp TextScriptEnd
 
-Route23Text7: ; 5133d (14:533d)
+Route23Text7:
 	TX_ASM
 	EventFlagBit a, EVENT_PASSED_CASCADEBADGE_CHECK
 	call Route23Script_51346
 	jp TextScriptEnd
 
-Route23Script_51346: ; 51346 (14:5346)
+Route23Script_51346:
 	ld [wWhichBadge], a
 	call Route23Script_5125d
 	ld a, [wWhichBadge]
@@ -213,11 +213,11 @@
 	ld [wRoute23CurScript], a
 	ret
 
-Route23Script_51388: ; 51388 (14:5388)
+Route23Script_51388:
 	ld hl, VictoryRoadGuardText2
 	jp PrintText
 
-VictoryRoadGuardText1: ; 5138e (14:538e)
+VictoryRoadGuardText1:
 	TX_FAR _VictoryRoadGuardText1
 	TX_ASM
 	ld a, SFX_DENIED
@@ -225,12 +225,12 @@
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
-VictoryRoadGuardText2: ; 5139e (14:539e)
+VictoryRoadGuardText2:
 	TX_FAR _VictoryRoadGuardText2
 	db $b
 	TX_FAR _VictoryRoadGuardText_513a3
 	db "@"
 
-Route23Text8: ; 513a8 (14:53a8)
+Route23Text8:
 	TX_FAR _Route23Text8
 	db "@"
--- a/scripts/route24.asm
+++ b/scripts/route24.asm
@@ -1,4 +1,4 @@
-Route24Script: ; 513ad (14:53ad)
+Route24Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route24TrainerHeaders
 	ld de, Route24ScriptPointers
@@ -7,7 +7,7 @@
 	ld [wRoute24CurScript], a
 	ret
 
-Route24Script_513c0: ; 513c0 (14:53c0)
+Route24Script_513c0:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wRoute24CurScript], a
@@ -14,7 +14,7 @@
 	ld [wCurMapScript], a
 	ret
 
-Route24ScriptPointers: ; 513cb (14:53cb)
+Route24ScriptPointers:
 	dw Route24Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -21,7 +21,7 @@
 	dw Route24Script3
 	dw Route24Script4
 
-Route24Script0: ; 513d5 (14:53d5)
+Route24Script0:
 	CheckEvent EVENT_GOT_NUGGET
 	jp nz, CheckFightingMapTrainers
 	ld hl, CoordsData_5140e
@@ -44,10 +44,10 @@
 	ld [wCurMapScript], a
 	ret
 
-CoordsData_5140e: ; 5140e (14:540e)
+CoordsData_5140e:
 	db $0F,$0A,$FF
 
-Route24Script4: ; 51411 (14:5411)
+Route24Script4:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -57,7 +57,7 @@
 	ld [wCurMapScript], a
 	ret
 
-Route24Script3: ; 51422 (14:5422)
+Route24Script3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route24Script_513c0
@@ -75,7 +75,7 @@
 	ld [wCurMapScript], a
 	ret
 
-Route24TextPointers: ; 5144b (14:544b)
+Route24TextPointers:
 	dw Route24Text1
 	dw Route24Text2
 	dw Route24Text3
@@ -85,8 +85,8 @@
 	dw Route24Text7
 	dw PickUpItemText
 
-Route24TrainerHeaders: ; 5145b (14:545b)
-Route24TrainerHeader0: ; 5145b (14:545b)
+Route24TrainerHeaders:
+Route24TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_0
@@ -95,7 +95,7 @@
 	dw Route24EndBattleText1 ; TextEndBattle
 	dw Route24EndBattleText1 ; TextEndBattle
 
-Route24TrainerHeader2: ; 51467 (14:5467)
+Route24TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2
@@ -104,7 +104,7 @@
 	dw Route24EndBattleText2 ; TextEndBattle
 	dw Route24EndBattleText2 ; TextEndBattle
 
-Route24TrainerHeader3: ; 51473 (14:5473)
+Route24TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3
@@ -113,7 +113,7 @@
 	dw Route24EndBattleText3 ; TextEndBattle
 	dw Route24EndBattleText3 ; TextEndBattle
 
-Route24TrainerHeader4: ; 5147f (14:547f)
+Route24TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4
@@ -122,7 +122,7 @@
 	dw Route24EndBattleText4 ; TextEndBattle
 	dw Route24EndBattleText4 ; TextEndBattle
 
-Route24TrainerHeader5: ; 5148b (14:548b)
+Route24TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5
@@ -131,7 +131,7 @@
 	dw Route24EndBattleText5 ; TextEndBattle
 	dw Route24EndBattleText5 ; TextEndBattle
 
-Route24TrainerHeader6: ; 51497 (14:5497)
+Route24TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_6
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_6
@@ -142,7 +142,7 @@
 
 	db $ff
 
-Route24Text1: ; 514a4 (14:54a4)
+Route24Text1:
 	TX_ASM
 	ResetEvent EVENT_NUGGET_REWARD_AVAILABLE
 	CheckEvent EVENT_GOT_NUGGET
@@ -183,136 +183,136 @@
 	SetEvent EVENT_NUGGET_REWARD_AVAILABLE
 	jp TextScriptEnd
 
-Route24Text_51510: ; 51510 (14:5510)
+Route24Text_51510:
 	TX_FAR _Route24Text_51510
 	db $0B
 	TX_FAR _Route24Text_51515
 	db "@"
 
-Route24Text_5151a: ; 5151a (14:551a)
+Route24Text_5151a:
 	TX_FAR _Route24Text_5151a
 	db $0B, $6, "@"
 
-Route24Text_51521: ; 51521 (14:5521)
+Route24Text_51521:
 	TX_FAR _Route24Text_51521
 	db "@"
 
-Route24Text_51526: ; 51526 (14:5526)
+Route24Text_51526:
 	TX_FAR _Route24Text_51526
 	db "@"
 
-Route24Text_5152b: ; 5152b (14:552b)
+Route24Text_5152b:
 	TX_FAR _Route24Text_5152b
 	db "@"
 
-Route24Text_51530: ; 51530 (14:5530)
+Route24Text_51530:
 	TX_FAR _Route24Text_51530
 	db "@"
 
-Route24Text2: ; 51535 (14:5535)
+Route24Text2:
 	TX_ASM
 	ld hl, Route24TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route24Text3: ; 5153f (14:553f)
+Route24Text3:
 	TX_ASM
 	ld hl, Route24TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route24Text4: ; 51549 (14:5549)
+Route24Text4:
 	TX_ASM
 	ld hl, Route24TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route24Text5: ; 51553 (14:5553)
+Route24Text5:
 	TX_ASM
 	ld hl, Route24TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route24Text6: ; 5155d (14:555d)
+Route24Text6:
 	TX_ASM
 	ld hl, Route24TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route24Text7: ; 51567 (14:5567)
+Route24Text7:
 	TX_ASM
 	ld hl, Route24TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route24BattleText1: ; 51571 (14:5571)
+Route24BattleText1:
 	TX_FAR _Route24BattleText1
 	db "@"
 
-Route24EndBattleText1: ; 51576 (14:5576)
+Route24EndBattleText1:
 	TX_FAR _Route24EndBattleText1
 	db "@"
 
-Route24AfterBattleText1: ; 5157b (14:557b)
+Route24AfterBattleText1:
 	TX_FAR _Route24AfterBattleText1
 	db "@"
 
-Route24BattleText2: ; 51580 (14:5580)
+Route24BattleText2:
 	TX_FAR _Route24BattleText2
 	db "@"
 
-Route24EndBattleText2: ; 51585 (14:5585)
+Route24EndBattleText2:
 	TX_FAR _Route24EndBattleText2
 	db "@"
 
-Route24AfterBattleText2: ; 5158a (14:558a)
+Route24AfterBattleText2:
 	TX_FAR _Route24AfterBattleText2
 	db "@"
 
-Route24BattleText3: ; 5158f (14:558f)
+Route24BattleText3:
 	TX_FAR _Route24BattleText3
 	db "@"
 
-Route24EndBattleText3: ; 51594 (14:5594)
+Route24EndBattleText3:
 	TX_FAR _Route24EndBattleText3
 	db "@"
 
-Route24AfterBattleText3: ; 51599 (14:5599)
+Route24AfterBattleText3:
 	TX_FAR _Route24AfterBattleText3
 	db "@"
 
-Route24BattleText4: ; 5159e (14:559e)
+Route24BattleText4:
 	TX_FAR _Route24BattleText4
 	db "@"
 
-Route24EndBattleText4: ; 515a3 (14:55a3)
+Route24EndBattleText4:
 	TX_FAR _Route24EndBattleText4
 	db "@"
 
-Route24AfterBattleText4: ; 515a8 (14:55a8)
+Route24AfterBattleText4:
 	TX_FAR _Route24AfterBattleText4
 	db "@"
 
-Route24BattleText5: ; 515ad (14:55ad)
+Route24BattleText5:
 	TX_FAR _Route24BattleText5
 	db "@"
 
-Route24EndBattleText5: ; 515b2 (14:55b2)
+Route24EndBattleText5:
 	TX_FAR _Route24EndBattleText5
 	db "@"
 
-Route24AfterBattleText5: ; 515b7 (14:55b7)
+Route24AfterBattleText5:
 	TX_FAR _Route24AfterBattleText5
 	db "@"
 
-Route24BattleText6: ; 515bc (14:55bc)
+Route24BattleText6:
 	TX_FAR _Route24BattleText6
 	db "@"
 
-Route24EndBattleText6: ; 515c1 (14:55c1)
+Route24EndBattleText6:
 	TX_FAR _Route24EndBattleText6
 	db "@"
 
-Route24AfterBattleText6: ; 515c6 (14:55c6)
+Route24AfterBattleText6:
 	TX_FAR _Route24AfterBattleText6
 	db "@"
--- a/scripts/route25.asm
+++ b/scripts/route25.asm
@@ -1,4 +1,4 @@
-Route25Script: ; 515cb (14:55cb)
+Route25Script:
 	call Route25Script_515e1
 	call EnableAutoTextBoxDrawing
 	ld hl, Route25TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wRoute25CurScript], a
 	ret
 
-Route25Script_515e1: ; 515e1 (14:55e1)
+Route25Script_515e1:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -35,12 +35,12 @@
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 
-Route25ScriptPointers: ; 51622 (14:5622)
+Route25ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route25TextPointers: ; 51628 (14:5628)
+Route25TextPointers:
 	dw Route25Text1
 	dw Route25Text2
 	dw Route25Text3
@@ -53,8 +53,8 @@
 	dw PickUpItemText
 	dw Route25Text11
 
-Route25TrainerHeaders: ; 5163e (14:563e)
-Route25TrainerHeader0: ; 5163e (14:563e)
+Route25TrainerHeaders:
+Route25TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_0
@@ -63,7 +63,7 @@
 	dw Route25EndBattleText1 ; TextEndBattle
 	dw Route25EndBattleText1 ; TextEndBattle
 
-Route25TrainerHeader2: ; 5164a (14:564a)
+Route25TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2
@@ -72,7 +72,7 @@
 	dw Route25EndBattleText2 ; TextEndBattle
 	dw Route25EndBattleText2 ; TextEndBattle
 
-Route25TrainerHeader3: ; 51656 (14:5656)
+Route25TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3
@@ -81,7 +81,7 @@
 	dw Route25EndBattleText3 ; TextEndBattle
 	dw Route25EndBattleText3 ; TextEndBattle
 
-Route25TrainerHeader4: ; 51662 (14:5662)
+Route25TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4
@@ -90,7 +90,7 @@
 	dw Route25EndBattleText4 ; TextEndBattle
 	dw Route25EndBattleText4 ; TextEndBattle
 
-Route25TrainerHeader5: ; 5166e (14:566e)
+Route25TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5
@@ -99,7 +99,7 @@
 	dw Route25EndBattleText5 ; TextEndBattle
 	dw Route25EndBattleText5 ; TextEndBattle
 
-Route25TrainerHeader6: ; 5167a (14:567a)
+Route25TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6
@@ -108,7 +108,7 @@
 	dw Route25EndBattleText6 ; TextEndBattle
 	dw Route25EndBattleText6 ; TextEndBattle
 
-Route25TrainerHeader7: ; 51686 (14:5686)
+Route25TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7
@@ -117,7 +117,7 @@
 	dw Route25EndBattleText7 ; TextEndBattle
 	dw Route25EndBattleText7 ; TextEndBattle
 
-Route25TrainerHeader8: ; 51692 (14:5692)
+Route25TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1
@@ -126,7 +126,7 @@
 	dw Route25EndBattleText8 ; TextEndBattle
 	dw Route25EndBattleText8 ; TextEndBattle
 
-Route25TrainerHeader9: ; 5169e (14:569e)
+Route25TrainerHeader9:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_9, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_9, 1
@@ -137,168 +137,168 @@
 
 	db $ff
 
-Route25Text1: ; 516ab (14:56ab)
+Route25Text1:
 	TX_ASM
 	ld hl, Route25TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route25Text2: ; 516b5 (14:56b5)
+Route25Text2:
 	TX_ASM
 	ld hl, Route25TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route25Text3: ; 516bf (14:56bf)
+Route25Text3:
 	TX_ASM
 	ld hl, Route25TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route25Text4: ; 516c9 (14:56c9)
+Route25Text4:
 	TX_ASM
 	ld hl, Route25TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route25Text5: ; 516d3 (14:56d3)
+Route25Text5:
 	TX_ASM
 	ld hl, Route25TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route25Text6: ; 516dd (14:56dd)
+Route25Text6:
 	TX_ASM
 	ld hl, Route25TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route25Text7: ; 516e7 (14:56e7)
+Route25Text7:
 	TX_ASM
 	ld hl, Route25TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route25Text8: ; 516f1 (14:56f1)
+Route25Text8:
 	TX_ASM
 	ld hl, Route25TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route25Text9: ; 516fb (14:56fb)
+Route25Text9:
 	TX_ASM
 	ld hl, Route25TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route25BattleText1: ; 51705 (14:5705)
+Route25BattleText1:
 	TX_FAR _Route25BattleText1
 	db "@"
 
-Route25EndBattleText1: ; 5170a (14:570a)
+Route25EndBattleText1:
 	TX_FAR _Route25EndBattleText1
 	db "@"
 
-Route25AfterBattleText1: ; 5170f (14:570f)
+Route25AfterBattleText1:
 	TX_FAR _Route25AfterBattleText1
 	db "@"
 
-Route25BattleText2: ; 51714 (14:5714)
+Route25BattleText2:
 	TX_FAR _Route25BattleText2
 	db "@"
 
-Route25EndBattleText2: ; 51719 (14:5719)
+Route25EndBattleText2:
 	TX_FAR _Route25EndBattleText2
 	db "@"
 
-Route25AfterBattleText2: ; 5171e (14:571e)
+Route25AfterBattleText2:
 	TX_FAR _Route25AfterBattleText2
 	db "@"
 
-Route25BattleText3: ; 51723 (14:5723)
+Route25BattleText3:
 	TX_FAR _Route25BattleText3
 	db "@"
 
-Route25EndBattleText3: ; 51728 (14:5728)
+Route25EndBattleText3:
 	TX_FAR _Route25EndBattleText3
 	db "@"
 
-Route25AfterBattleText3: ; 5172d (14:572d)
+Route25AfterBattleText3:
 	TX_FAR _Route25AfterBattleText3
 	db "@"
 
-Route25BattleText4: ; 51732 (14:5732)
+Route25BattleText4:
 	TX_FAR _Route25BattleText4
 	db "@"
 
-Route25EndBattleText4: ; 51737 (14:5737)
+Route25EndBattleText4:
 	TX_FAR _Route25EndBattleText4
 	db "@"
 
-Route25AfterBattleText4: ; 5173c (14:573c)
+Route25AfterBattleText4:
 	TX_FAR _Route25AfterBattleText4
 	db "@"
 
-Route25BattleText5: ; 51741 (14:5741)
+Route25BattleText5:
 	TX_FAR _Route25BattleText5
 	db "@"
 
-Route25EndBattleText5: ; 51746 (14:5746)
+Route25EndBattleText5:
 	TX_FAR _Route25EndBattleText5
 	db "@"
 
-Route25AfterBattleText5: ; 5174b (14:574b)
+Route25AfterBattleText5:
 	TX_FAR _Route25AfterBattleText5
 	db "@"
 
-Route25BattleText6: ; 51750 (14:5750)
+Route25BattleText6:
 	TX_FAR _Route25BattleText6
 	db "@"
 
-Route25EndBattleText6: ; 51755 (14:5755)
+Route25EndBattleText6:
 	TX_FAR _Route25EndBattleText6
 	db "@"
 
-Route25AfterBattleText6: ; 5175a (14:575a)
+Route25AfterBattleText6:
 	TX_FAR _Route25AfterBattleText6
 	db "@"
 
-Route25BattleText7: ; 5175f (14:575f)
+Route25BattleText7:
 	TX_FAR _Route25BattleText7
 	db "@"
 
-Route25EndBattleText7: ; 51764 (14:5764)
+Route25EndBattleText7:
 	TX_FAR _Route25EndBattleText7
 	db "@"
 
-Route25AfterBattleText7: ; 51769 (14:5769)
+Route25AfterBattleText7:
 	TX_FAR _Route25AfterBattleText7
 	db "@"
 
-Route25BattleText8: ; 5176e (14:576e)
+Route25BattleText8:
 	TX_FAR _Route25BattleText8
 	db "@"
 
-Route25EndBattleText8: ; 51773 (14:5773)
+Route25EndBattleText8:
 	TX_FAR _Route25EndBattleText8
 	db "@"
 
-Route25AfterBattleText8: ; 51778 (14:5778)
+Route25AfterBattleText8:
 	TX_FAR _Route25AfterBattleText8
 	db "@"
 
-Route25BattleText9: ; 5177d (14:577d)
+Route25BattleText9:
 	TX_FAR _Route25BattleText9
 	db "@"
 
-Route25EndBattleText9: ; 51782 (14:5782)
+Route25EndBattleText9:
 	TX_FAR _Route25EndBattleText9
 	db "@"
 
-Route25AfterBattleText9: ; 51787 (14:5787)
+Route25AfterBattleText9:
 	TX_FAR _Route25AfterBattleText9
 	db "@"
 
-Route25Text11: ; 5178c (14:578c)
+Route25Text11:
 	TX_FAR _Route25Text11
 	db "@"
--- a/scripts/route2gate.asm
+++ b/scripts/route2gate.asm
@@ -1,11 +1,11 @@
-Route2GateScript: ; 5d5d4 (17:55d4)
+Route2GateScript:
 	jp EnableAutoTextBoxDrawing
 
-Route2GateTextPointers: ; 5d5d7 (17:55d7)
+Route2GateTextPointers:
 	dw Route2GateText1
 	dw Route2GateText2
 
-Route2GateText1: ; 5d5db (17:55db)
+Route2GateText1:
 	TX_ASM
 	CheckEvent EVENT_GOT_HM05
 	jr nz, .asm_5d60d
@@ -30,10 +30,10 @@
 .asm_5d613
 	jp TextScriptEnd
 
-Route2GateText_5d616: ; 5d616 (17:5616)
+Route2GateText_5d616:
 	TX_FAR _Route2GateText_5d616
 	db "@"
 
-Route2GateText2: ; 5d61b (17:561b)
+Route2GateText2:
 	TX_FAR _Route2GateText2
 	db "@"
--- a/scripts/route2house.asm
+++ b/scripts/route2house.asm
@@ -1,15 +1,15 @@
-Route2HouseScript: ; 1deed (7:5eed)
+Route2HouseScript:
 	jp EnableAutoTextBoxDrawing
 
-Route2HouseTextPointers: ; 1def0 (7:5ef0)
+Route2HouseTextPointers:
 	dw Route2HouseText1
 	dw Route2HouseText2
 
-Route2HouseText1: ; 1def4 (7:5ef4)
+Route2HouseText1:
 	TX_FAR _Route2HouseText1
 	db "@"
 
-Route2HouseText2: ; 1def9 (7:5ef9)
+Route2HouseText2:
 	TX_ASM
 	ld a, $1
 	ld [wWhichTrade], a
--- a/scripts/route3.asm
+++ b/scripts/route3.asm
@@ -1,4 +1,4 @@
-Route3Script: ; 554f8 (15:54f8)
+Route3Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route3TrainerHeader0
 	ld de, Route3ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute3CurScript], a
 	ret
 
-Route3ScriptPointers: ; 5550b (15:550b)
+Route3ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route3TextPointers: ; 55511 (15:5511)
+Route3TextPointers:
 	dw Route3Text1
 	dw Route3Text2
 	dw Route3Text3
@@ -24,8 +24,8 @@
 	dw Route3Text9
 	dw Route3Text10
 
-Route3TrainerHeaders: ; 55525 (15:5525)
-Route3TrainerHeader0: ; 55525 (15:5525)
+Route3TrainerHeaders:
+Route3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_0
@@ -34,7 +34,7 @@
 	dw Route3EndBattleText1 ; TextEndBattle
 	dw Route3EndBattleText1 ; TextEndBattle
 
-Route3TrainerHeader2: ; 55531 (15:5531)
+Route3TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2
@@ -43,7 +43,7 @@
 	dw Route3EndBattleText2 ; TextEndBattle
 	dw Route3EndBattleText2 ; TextEndBattle
 
-Route3TrainerHeader3: ; 5553d (15:553d)
+Route3TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3
@@ -52,7 +52,7 @@
 	dw Route3EndBattleText3 ; TextEndBattle
 	dw Route3EndBattleText3 ; TextEndBattle
 
-Route3TrainerHeader4: ; 55549 (15:5549)
+Route3TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4
@@ -61,7 +61,7 @@
 	dw Route3EndBattleText4 ; TextEndBattle
 	dw Route3EndBattleText4 ; TextEndBattle
 
-Route3TrainerHeader5: ; 55555 (15:5555)
+Route3TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5
@@ -70,7 +70,7 @@
 	dw Route3EndBattleText5 ; TextEndBattle
 	dw Route3EndBattleText5 ; TextEndBattle
 
-Route3TrainerHeader6: ; 55561 (15:5561)
+Route3TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6
@@ -79,7 +79,7 @@
 	dw Route3EndBattleText6 ; TextEndBattle
 	dw Route3EndBattleText6 ; TextEndBattle
 
-Route3TrainerHeader7: ; 5556d (15:556d)
+Route3TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1
@@ -88,7 +88,7 @@
 	dw Route3EndBattleText7 ; TextEndBattle
 	dw Route3EndBattleText7 ; TextEndBattle
 
-Route3TrainerHeader8: ; 55579 (15:5579)
+Route3TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_8, 1
@@ -99,154 +99,154 @@
 
 	db $ff
 
-Route3Text1: ; 55586 (15:5586)
+Route3Text1:
 	TX_FAR _Route3Text1
 	db "@"
 
-Route3Text2: ; 5558b (15:558b)
+Route3Text2:
 	TX_ASM
 	ld hl, Route3TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route3BattleText1: ; 55595 (15:5595)
+Route3BattleText1:
 	TX_FAR _Route3BattleText1
 	db "@"
 
-Route3EndBattleText1: ; 5559a (15:559a)
+Route3EndBattleText1:
 	TX_FAR _Route3EndBattleText1
 	db "@"
 
-Route3AfterBattleText1: ; 5559f (15:559f)
+Route3AfterBattleText1:
 	TX_FAR _Route3AfterBattleText1
 	db "@"
 
-Route3Text3: ; 555a4 (15:55a4)
+Route3Text3:
 	TX_ASM
 	ld hl, Route3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route3BattleText2: ; 555ae (15:55ae)
+Route3BattleText2:
 	TX_FAR _Route3BattleText2
 	db "@"
 
-Route3EndBattleText2: ; 555b3 (15:55b3)
+Route3EndBattleText2:
 	TX_FAR _Route3EndBattleText2
 	db "@"
 
-Route3AfterBattleText2: ; 555b8 (15:55b8)
+Route3AfterBattleText2:
 	TX_FAR _Route3AfterBattleText2
 	db "@"
 
-Route3Text4: ; 555bd (15:55bd)
+Route3Text4:
 	TX_ASM
 	ld hl, Route3TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route3BattleText3: ; 555c7 (15:55c7)
+Route3BattleText3:
 	TX_FAR _Route3BattleText3
 	db "@"
 
-Route3EndBattleText3: ; 555cc (15:55cc)
+Route3EndBattleText3:
 	TX_FAR _Route3EndBattleText3
 	db "@"
 
-Route3AfterBattleText3: ; 555d1 (15:55d1)
+Route3AfterBattleText3:
 	TX_FAR _Route3AfterBattleText3
 	db "@"
 
-Route3Text5: ; 555d6 (15:55d6)
+Route3Text5:
 	TX_ASM
 	ld hl, Route3TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route3BattleText4: ; 555e0 (15:55e0)
+Route3BattleText4:
 	TX_FAR _Route3BattleText4
 	db "@"
 
-Route3EndBattleText4: ; 555e5 (15:55e5)
+Route3EndBattleText4:
 	TX_FAR _Route3EndBattleText4
 	db "@"
 
-Route3AfterBattleText4: ; 555ea (15:55ea)
+Route3AfterBattleText4:
 	TX_FAR _Route3AfterBattleText4
 	db "@"
 
-Route3Text6: ; 555ef (15:55ef)
+Route3Text6:
 	TX_ASM
 	ld hl, Route3TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route3BattleText5: ; 555f9 (15:55f9)
+Route3BattleText5:
 	TX_FAR _Route3BattleText5
 	db "@"
 
-Route3EndBattleText5: ; 555fe (15:55fe)
+Route3EndBattleText5:
 	TX_FAR _Route3EndBattleText5
 	db "@"
 
-Route3AfterBattleText5: ; 55603 (15:5603)
+Route3AfterBattleText5:
 	TX_FAR _Route3AfterBattleText5
 	db "@"
 
-Route3Text7: ; 55608 (15:5608)
+Route3Text7:
 	TX_ASM
 	ld hl, Route3TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route3BattleText6: ; 55612 (15:5612)
+Route3BattleText6:
 	TX_FAR _Route3BattleText6
 	db "@"
 
-Route3EndBattleText6: ; 55617 (15:5617)
+Route3EndBattleText6:
 	TX_FAR _Route3EndBattleText6
 	db "@"
 
-Route3AfterBattleText6: ; 5561c (15:561c)
+Route3AfterBattleText6:
 	TX_FAR _Route3AfterBattleText6
 	db "@"
 
-Route3Text8: ; 55621 (15:5621)
+Route3Text8:
 	TX_ASM
 	ld hl, Route3TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route3BattleText7: ; 5562b (15:562b)
+Route3BattleText7:
 	TX_FAR _Route3BattleText7
 	db "@"
 
-Route3EndBattleText7: ; 55630 (15:5630)
+Route3EndBattleText7:
 	TX_FAR _Route3EndBattleText7
 	db "@"
 
-Route3AfterBattleText7: ; 55635 (15:5635)
+Route3AfterBattleText7:
 	TX_FAR _Route3AfterBattleText7
 	db "@"
 
-Route3Text9: ; 5563a (15:563a)
+Route3Text9:
 	TX_ASM
 	ld hl, Route3TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route3BattleText8: ; 55644 (15:5644)
+Route3BattleText8:
 	TX_FAR _Route3BattleText8
 	db "@"
 
-Route3EndBattleText8: ; 55649 (15:5649)
+Route3EndBattleText8:
 	TX_FAR _Route3EndBattleText8
 	db "@"
 
-Route3AfterBattleText8: ; 5564e (15:564e)
+Route3AfterBattleText8:
 	TX_FAR _Route3AfterBattleText8
 	db "@"
 
-Route3Text10: ; 55653 (15:5653)
+Route3Text10:
 	TX_FAR _Route3Text10
 	db "@"
--- a/scripts/route4.asm
+++ b/scripts/route4.asm
@@ -1,4 +1,4 @@
-Route4Script: ; 55658 (15:5658)
+Route4Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route4TrainerHeaders
 	ld de, Route4ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute4CurScript], a
 	ret
 
-Route4ScriptPointers: ; 5566b (15:566b)
+Route4ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route4TextPointers: ; 55671 (15:5671)
+Route4TextPointers:
 	dw Route4Text1
 	dw Route4Text2
 	dw PickUpItemText
@@ -20,8 +20,8 @@
 	dw Route4Text5
 	dw Route4Text6
 
-Route4TrainerHeaders: ; 5567d (15:567d)
-Route4TrainerHeader0: ; 5567d (15:567d)
+Route4TrainerHeaders:
+Route4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_4_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_4_TRAINER_0
@@ -32,32 +32,32 @@
 
 	db $ff
 
-Route4Text1: ; 5568a (15:568a)
+Route4Text1:
 	TX_FAR _Route4Text1
 	db "@"
 
-Route4Text2: ; 5568f (15:568f)
+Route4Text2:
 	TX_ASM
 	ld hl, Route4TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route4BattleText1: ; 55699 (15:5699)
+Route4BattleText1:
 	TX_FAR _Route4BattleText1
 	db "@"
 
-Route4EndBattleText1: ; 5569e (15:569e)
+Route4EndBattleText1:
 	TX_FAR _Route4EndBattleText1
 	db "@"
 
-Route4AfterBattleText1: ; 556a3 (15:56a3)
+Route4AfterBattleText1:
 	TX_FAR _Route4AfterBattleText1
 	db "@"
 
-Route4Text5: ; 556a8 (15:56a8)
+Route4Text5:
 	TX_FAR _Route4Text5
 	db "@"
 
-Route4Text6: ; 556ad (15:56ad)
+Route4Text6:
 	TX_FAR _Route4Text6
 	db "@"
--- a/scripts/route5.asm
+++ b/scripts/route5.asm
@@ -1,9 +1,9 @@
-Route5Script: ; 556b2 (15:56b2)
+Route5Script:
 	jp EnableAutoTextBoxDrawing
 
-Route5TextPointers: ; 556b5 (15:56b5)
+Route5TextPointers:
 	dw Route5Text1
 
-Route5Text1: ; 556b7 (15:56b7)
+Route5Text1:
 	TX_FAR _Route5Text1
 	db "@"
--- a/scripts/route5gate.asm
+++ b/scripts/route5gate.asm
@@ -1,14 +1,14 @@
-Route5GateScript: ; 1df33 (7:5f33)
+Route5GateScript:
 	call EnableAutoTextBoxDrawing
 	ld a, [wRoute5GateCurScript]
 	ld hl, Route5GateScriptPointers
 	jp CallFunctionInTable
 
-Route5GateScriptPointers: ; 1df3f (7:5f3f)
+Route5GateScriptPointers:
 	dw Route5GateScript0
 	dw Route5GateScript1
 
-Route5GateScript_1df43: ; 1df43 (7:5f43)
+Route5GateScript_1df43:
 	ld a, D_UP
 	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
@@ -15,7 +15,7 @@
 	ld [wSimulatedJoypadStatesIndex], a
 	jp StartSimulatingJoypadStates
 
-Route5GateScript0: ; 1df50 (7:5f50)
+Route5GateScript0:
 	ld a, [wd728]
 	bit 6, a
 	ret nz
@@ -45,12 +45,12 @@
 	set 6, [hl]
 	ret
 
-CoordsData_1df8f: ; 1df8f (7:5f8f)
+CoordsData_1df8f:
 	db 3,3
 	db 3,4
 	db $ff
 
-Route5GateScript1: ; 1df94 (7:5f94)
+Route5GateScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -60,15 +60,15 @@
 	ld [wRoute5GateCurScript], a
 	ret
 
-Route5GateTextPointers: ; 1dfa4 (7:5fa4)
+Route5GateTextPointers:
 	dw Route5GateText1
 	dw Route5GateText2
 	dw Route5GateText3
 
-Route8GateText1: ; 1dfaa (7:5faa)
-Route7GateText1: ; 1dfaa (7:5faa)
-Route6GateText1: ; 1dfaa (7:5faa)
-Route5GateText1: ; 1dfaa (7:5faa)
+Route8GateText1:
+Route7GateText1:
+Route6GateText1:
+Route5GateText1:
 	TX_ASM
 	ld a, [wd728]
 	bit 6, a
@@ -94,23 +94,23 @@
 	call PrintText
 	jp TextScriptEnd
 
-Route8GateText2: ; 1dfe7 (7:5fe7)
-Route7GateText2: ; 1dfe7 (7:5fe7)
-Route6GateText2: ; 1dfe7 (7:5fe7)
-Route5GateText2: ; 1dfe7 (7:5fe7)
+Route8GateText2:
+Route7GateText2:
+Route6GateText2:
+Route5GateText2:
 	TX_FAR _SaffronGateText_1dfe7
 	db "@"
 
-Route8GateText3: ; 1dfec (7:5fec)
-Route7GateText3: ; 1dfec (7:5fec)
-Route6GateText3: ; 1dfec (7:5fec)
-Route5GateText3: ; 1dfec (7:5fec)
+Route8GateText3:
+Route7GateText3:
+Route6GateText3:
+Route5GateText3:
 	TX_FAR _SaffronGateText_8aaa9
 	db $11
 	TX_FAR _SaffronGateText_1dff1
 	db "@"
 
-SaffronGateText_1dff6: ; 1dff6 (7:5ff6)
+SaffronGateText_1dff6:
 	TX_FAR _SaffronGateText_1dff6
 	db "@"
 
--- a/scripts/route6.asm
+++ b/scripts/route6.asm
@@ -1,4 +1,4 @@
-Route6Script: ; 590b0 (16:50b0)
+Route6Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route6TrainerHeaders
 	ld de, Route6ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute6CurScript], a
 	ret
 
-Route6ScriptPointers: ; 590c3 (16:50c3)
+Route6ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route6TextPointers: ; 590c9 (16:50c9)
+Route6TextPointers:
 	dw Route6Text1
 	dw Route6Text2
 	dw Route6Text3
@@ -21,8 +21,8 @@
 	dw Route6Text6
 	dw Route6Text7
 
-Route6TrainerHeaders: ; 590d7 (16:50d7)
-Route6TrainerHeader0: ; 590d7 (16:50d7)
+Route6TrainerHeaders:
+Route6TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_0
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_0
@@ -31,7 +31,7 @@
 	dw Route6EndBattleText1 ; TextEndBattle
 	dw Route6EndBattleText1 ; TextEndBattle
 
-Route6TrainerHeader1: ; 590e3 (16:50e3)
+Route6TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_1
 	db ($0 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_1
@@ -40,7 +40,7 @@
 	dw Route6EndBattleText2 ; TextEndBattle
 	dw Route6EndBattleText2 ; TextEndBattle
 
-Route6TrainerHeader2: ; 590ef (16:50ef)
+Route6TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_2
@@ -49,7 +49,7 @@
 	dw Route6EndBattleText3 ; TextEndBattle
 	dw Route6EndBattleText3 ; TextEndBattle
 
-Route6TrainerHeader3: ; 590fb (16:50fb)
+Route6TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_3
@@ -58,7 +58,7 @@
 	dw Route6EndBattleText4 ; TextEndBattle
 	dw Route6EndBattleText4 ; TextEndBattle
 
-Route6TrainerHeader4: ; 59107 (16:5107)
+Route6TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_4
@@ -67,7 +67,7 @@
 	dw Route6EndBattleText5 ; TextEndBattle
 	dw Route6EndBattleText5 ; TextEndBattle
 
-Route6TrainerHeader5: ; 59113 (16:5113)
+Route6TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_5
@@ -78,110 +78,110 @@
 
 	db $ff
 
-Route6Text1: ; 59120 (16:5120)
+Route6Text1:
 	TX_ASM
 	ld hl, Route6TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route6BattleText1: ; 5912a (16:512a)
+Route6BattleText1:
 	TX_FAR _Route6BattleText1
 	db "@"
 
-Route6EndBattleText1: ; 5912f (16:512f)
+Route6EndBattleText1:
 	TX_FAR _Route6EndBattleText1
 	db "@"
 
-Route6AfterBattleText1: ; 59134 (16:5134)
+Route6AfterBattleText1:
 	TX_FAR _Route6AfterBattleText1
 	db "@"
 
-Route6Text2: ; 59139 (16:5139)
+Route6Text2:
 	TX_ASM
 	ld hl, Route6TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route6BattleText2: ; 59143 (16:5143)
+Route6BattleText2:
 	TX_FAR _Route6BattleText2
 	db "@"
 
-Route6EndBattleText2: ; 59148 (16:5148)
+Route6EndBattleText2:
 	TX_FAR _Route6EndBattleText2
 	db "@"
 
-Route6Text3: ; 5914d (16:514d)
+Route6Text3:
 	TX_ASM
 	ld hl, Route6TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route6BattleText3: ; 59157 (16:5157)
+Route6BattleText3:
 	TX_FAR _Route6BattleText3
 	db "@"
 
-Route6EndBattleText3: ; 5915c (16:515c)
+Route6EndBattleText3:
 	TX_FAR _Route6EndBattleText3
 	db "@"
 
-Route6AfterBattleText3: ; 59161 (16:5161)
+Route6AfterBattleText3:
 	TX_FAR _Route6AfterBattleText3
 	db "@"
 
-Route6Text4: ; 59166 (16:5166)
+Route6Text4:
 	TX_ASM
 	ld hl, Route6TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route6BattleText4: ; 59170 (16:5170)
+Route6BattleText4:
 	TX_FAR _Route6BattleText4
 	db "@"
 
-Route6EndBattleText4: ; 59175 (16:5175)
+Route6EndBattleText4:
 	TX_FAR _Route6EndBattleText4
 	db "@"
 
-Route6AfterBattleText4: ; 5917a (16:517a)
+Route6AfterBattleText4:
 	TX_FAR _Route6AfterBattleText4
 	db "@"
 
-Route6Text5: ; 5917f (16:517f)
+Route6Text5:
 	TX_ASM
 	ld hl, Route6TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route6BattleText5: ; 59189 (16:5189)
+Route6BattleText5:
 	TX_FAR _Route6BattleText5
 	db "@"
 
-Route6EndBattleText5: ; 5918e (16:518e)
+Route6EndBattleText5:
 	TX_FAR _Route6EndBattleText5
 	db "@"
 
-Route6AfterBattleText5: ; 59193 (16:5193)
+Route6AfterBattleText5:
 	TX_FAR _Route6AfterBattleText5
 	db "@"
 
-Route6Text6: ; 59198 (16:5198)
+Route6Text6:
 	TX_ASM
 	ld hl, Route6TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route6BattleText6: ; 591a2 (16:51a2)
+Route6BattleText6:
 	TX_FAR _Route6BattleText6
 	db "@"
 
-Route6EndBattleText6: ; 591a7 (16:51a7)
+Route6EndBattleText6:
 	TX_FAR _Route6EndBattleText6
 	db "@"
 
-Route6AfterBattleText6: ; 591ac (16:51ac)
+Route6AfterBattleText6:
 	TX_FAR _Route6AfterBattleText6
 	db "@"
 
-Route6Text7: ; 591b1 (16:51b1)
+Route6Text7:
 	TX_FAR _Route6Text7
 	db "@"
--- a/scripts/route6gate.asm
+++ b/scripts/route6gate.asm
@@ -1,4 +1,4 @@
-Route6GateScript: ; 1e03d (7:603d)
+Route6GateScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route6GateScriptPointers
 	ld a, [wRoute6GateCurScript]
@@ -5,11 +5,11 @@
 	call CallFunctionInTable
 	ret
 
-Route6GateScriptPointers: ; 1e04a (7:604a)
+Route6GateScriptPointers:
 	dw Route6GateScript0
 	dw Route6GateScript1
 
-Route6GateScript0: ; 1e04e (7:604e)
+Route6GateScript0:
 	ld a, [wd728]
 	bit 6, a
 	ret nz
@@ -38,11 +38,11 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-CoordsData_1e08c: ; 1e08c (7:608c)
+CoordsData_1e08c:
 	db $02,$03
 	db $02,$04,$FF
 
-Route6GateScript1: ; 1e091 (7:6091)
+Route6GateScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -52,7 +52,7 @@
 	ld [wRoute6GateCurScript], a
 	ret
 
-Route6GateScript_1e0a1: ; 1e0a1 (7:60a1)
+Route6GateScript_1e0a1:
 	ld hl, wd730
 	set 7, [hl]
 	ld a, $80
@@ -64,7 +64,7 @@
 	ld [wOverrideSimulatedJoypadStatesMask], a
 	ret
 
-Route6GateTextPointers: ; 1e0b8 (7:60b8)
+Route6GateTextPointers:
 	dw Route6GateText1
 	dw Route6GateText2
 	dw Route6GateText3
--- a/scripts/route7.asm
+++ b/scripts/route7.asm
@@ -1,9 +1,9 @@
-Route7Script: ; 48152 (12:4152)
+Route7Script:
 	jp EnableAutoTextBoxDrawing
 
-Route7TextPointers: ; 48155 (12:4155)
+Route7TextPointers:
 	dw Route7Text1
 
-Route7Text1: ; 48157 (12:4157)
+Route7Text1:
 	TX_FAR _Route7Text1
 	db "@"
--- a/scripts/route7gate.asm
+++ b/scripts/route7gate.asm
@@ -1,4 +1,4 @@
-Route7GateScript: ; 1e100 (7:6100)
+Route7GateScript:
 	call EnableAutoTextBoxDrawing
 	ld a, [wRoute7GateCurScript]
 	ld hl, Route7GateScriptPointers
@@ -5,11 +5,11 @@
 	call CallFunctionInTable
 	ret
 
-Route7GateScriptPointers: ; 1e10d (7:610d)
+Route7GateScriptPointers:
 	dw Route7GateScript0
 	dw Route7GateScript1
 
-Route7GateScript_1e111: ; 1e111 (7:6111)
+Route7GateScript_1e111:
 	ld hl, wd730
 	set 7, [hl]
 	ld a, $20
@@ -21,7 +21,7 @@
 	ld [wOverrideSimulatedJoypadStatesMask], a
 	ret
 
-Route7GateScript0: ; 1e128 (7:6128)
+Route7GateScript0:
 	ld a, [wd728]
 	bit 6, a
 	ret nz
@@ -51,12 +51,12 @@
 	set 6, [hl]
 	ret
 
-CoordsData_1e167: ; 1e167 (7:6167)
+CoordsData_1e167:
 	db 3,3
 	db 4,3
 	db $ff
 
-Route7GateScript1: ; 1e16c (7:616c)
+Route7GateScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -67,7 +67,7 @@
 	ld [wCurMapScript], a
 	ret
 
-Route7GateTextPointers: ; 1e17f (7:617f)
+Route7GateTextPointers:
 	dw Route7GateText1
 	dw Route7GateText2
 	dw Route7GateText3
--- a/scripts/route8.asm
+++ b/scripts/route8.asm
@@ -1,4 +1,4 @@
-Route8Script: ; 591b6 (16:51b6)
+Route8Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route8TrainerHeaders
 	ld de, Route8ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute8CurScript], a
 	ret
 
-Route8ScriptPointers: ; 591c9 (16:51c9)
+Route8ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route8TextPointers: ; 591cf (16:51cf)
+Route8TextPointers:
 	dw Route8Text1
 	dw Route8Text2
 	dw Route8Text3
@@ -24,8 +24,8 @@
 	dw Route8Text9
 	dw Route8Text10
 
-Route8TrainerHeaders: ; 591e3 (16:51e3)
-Route8TrainerHeader0: ; 591e3 (16:51e3)
+Route8TrainerHeaders:
+Route8TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_0
@@ -34,7 +34,7 @@
 	dw Route8EndBattleText1 ; TextEndBattle
 	dw Route8EndBattleText1 ; TextEndBattle
 
-Route8TrainerHeader1: ; 591ef (16:51ef)
+Route8TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_1
@@ -43,7 +43,7 @@
 	dw Route8EndBattleText2 ; TextEndBattle
 	dw Route8EndBattleText2 ; TextEndBattle
 
-Route8TrainerHeader2: ; 591fb (16:51fb)
+Route8TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_2
@@ -52,7 +52,7 @@
 	dw Route8EndBattleText3 ; TextEndBattle
 	dw Route8EndBattleText3 ; TextEndBattle
 
-Route8TrainerHeader3: ; 59207 (16:5207)
+Route8TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_3
@@ -61,7 +61,7 @@
 	dw Route8EndBattleText4 ; TextEndBattle
 	dw Route8EndBattleText4 ; TextEndBattle
 
-Route8TrainerHeader4: ; 59213 (16:5213)
+Route8TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_4
@@ -70,7 +70,7 @@
 	dw Route8EndBattleText5 ; TextEndBattle
 	dw Route8EndBattleText5 ; TextEndBattle
 
-Route8TrainerHeader5: ; 5921f (16:521f)
+Route8TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_5
@@ -79,7 +79,7 @@
 	dw Route8EndBattleText6 ; TextEndBattle
 	dw Route8EndBattleText6 ; TextEndBattle
 
-Route8TrainerHeader6: ; 5922b (16:522b)
+Route8TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_6
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_6
@@ -88,7 +88,7 @@
 	dw Route8EndBattleText7 ; TextEndBattle
 	dw Route8EndBattleText7 ; TextEndBattle
 
-Route8TrainerHeader7: ; 59237 (16:5237)
+Route8TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_7, 1
@@ -97,7 +97,7 @@
 	dw Route8EndBattleText8 ; TextEndBattle
 	dw Route8EndBattleText8 ; TextEndBattle
 
-Route8TrainerHeader8: ; 59243 (16:5243)
+Route8TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_8, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_8, 1
@@ -108,168 +108,168 @@
 
 	db $ff
 
-Route8Text1: ; 59250 (16:5250)
+Route8Text1:
 	TX_ASM
 	ld hl, Route8TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route8BattleText1: ; 5925a (16:525a)
+Route8BattleText1:
 	TX_FAR _Route8BattleText1
 	db "@"
 
-Route8EndBattleText1: ; 5925f (16:525f)
+Route8EndBattleText1:
 	TX_FAR _Route8EndBattleText1
 	db "@"
 
-Route8AfterBattleText1: ; 59264 (16:5264)
+Route8AfterBattleText1:
 	TX_FAR _Route8AfterBattleText1
 	db "@"
 
-Route8Text2: ; 59269 (16:5269)
+Route8Text2:
 	TX_ASM
 	ld hl, Route8TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route8BattleText2: ; 59273 (16:5273)
+Route8BattleText2:
 	TX_FAR _Route8BattleText2
 	db "@"
 
-Route8EndBattleText2: ; 59278 (16:5278)
+Route8EndBattleText2:
 	TX_FAR _Route8EndBattleText2
 	db "@"
 
-Route8AfterBattleText2: ; 5927d (16:527d)
+Route8AfterBattleText2:
 	TX_FAR _Route8AfterBattleText2
 	db "@"
 
-Route8Text3: ; 59282 (16:5282)
+Route8Text3:
 	TX_ASM
 	ld hl, Route8TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route8BattleText3: ; 5928c (16:528c)
+Route8BattleText3:
 	TX_FAR _Route8BattleText3
 	db "@"
 
-Route8EndBattleText3: ; 59291 (16:5291)
+Route8EndBattleText3:
 	TX_FAR _Route8EndBattleText3
 	db "@"
 
-Route8AfterBattleText3: ; 59296 (16:5296)
+Route8AfterBattleText3:
 	TX_FAR _Route8AfterBattleText3
 	db "@"
 
-Route8Text4: ; 5929b (16:529b)
+Route8Text4:
 	TX_ASM
 	ld hl, Route8TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route8BattleText4: ; 592a5 (16:52a5)
+Route8BattleText4:
 	TX_FAR _Route8BattleText4
 	db "@"
 
-Route8EndBattleText4: ; 592aa (16:52aa)
+Route8EndBattleText4:
 	TX_FAR _Route8EndBattleText4
 	db "@"
 
-Route8AfterBattleText4: ; 592af (16:52af)
+Route8AfterBattleText4:
 	TX_FAR _Route8AfterBattleText4
 	db "@"
 
-Route8Text5: ; 592b4 (16:52b4)
+Route8Text5:
 	TX_ASM
 	ld hl, Route8TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route8BattleText5: ; 592be (16:52be)
+Route8BattleText5:
 	TX_FAR _Route8BattleText5
 	db "@"
 
-Route8EndBattleText5: ; 592c3 (16:52c3)
+Route8EndBattleText5:
 	TX_FAR _Route8EndBattleText5
 	db "@"
 
-Route8AfterBattleText5: ; 592c8 (16:52c8)
+Route8AfterBattleText5:
 	TX_FAR _Route8AfterBattleText5
 	db "@"
 
-Route8Text6: ; 592cd (16:52cd)
+Route8Text6:
 	TX_ASM
 	ld hl, Route8TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route8BattleText6: ; 592d7 (16:52d7)
+Route8BattleText6:
 	TX_FAR _Route8BattleText6
 	db "@"
 
-Route8EndBattleText6: ; 592dc (16:52dc)
+Route8EndBattleText6:
 	TX_FAR _Route8EndBattleText6
 	db "@"
 
-Route8AfterBattleText6: ; 592e1 (16:52e1)
+Route8AfterBattleText6:
 	TX_FAR _Route8AfterBattleText6
 	db "@"
 
-Route8Text7: ; 592e6 (16:52e6)
+Route8Text7:
 	TX_ASM
 	ld hl, Route8TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route8BattleText7: ; 592f0 (16:52f0)
+Route8BattleText7:
 	TX_FAR _Route8BattleText7
 	db "@"
 
-Route8EndBattleText7: ; 592f5 (16:52f5)
+Route8EndBattleText7:
 	TX_FAR _Route8EndBattleText7
 	db "@"
 
-Route8AfterBattleText7: ; 592fa (16:52fa)
+Route8AfterBattleText7:
 	TX_FAR _Route8AfterBattleText7
 	db "@"
 
-Route8Text8: ; 592ff (16:52ff)
+Route8Text8:
 	TX_ASM
 	ld hl, Route8TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route8BattleText8: ; 59309 (16:5309)
+Route8BattleText8:
 	TX_FAR _Route8BattleText8
 	db "@"
 
-Route8EndBattleText8: ; 5930e (16:530e)
+Route8EndBattleText8:
 	TX_FAR _Route8EndBattleText8
 	db "@"
 
-Route8AfterBattleText8: ; 59313 (16:5313)
+Route8AfterBattleText8:
 	TX_FAR _Route8AfterBattleText8
 	db "@"
 
-Route8Text9: ; 59318 (16:5318)
+Route8Text9:
 	TX_ASM
 	ld hl, Route8TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route8BattleText9: ; 59322 (16:5322)
+Route8BattleText9:
 	TX_FAR _Route8BattleText9
 	db "@"
 
-Route8EndBattleText9: ; 59327 (16:5327)
+Route8EndBattleText9:
 	TX_FAR _Route8EndBattleText9
 	db "@"
 
-Route8AfterBattleText9: ; 5932c (16:532c)
+Route8AfterBattleText9:
 	TX_FAR _Route8AfterBattleText9
 	db "@"
 
-Route8Text10: ; 59331 (16:5331)
+Route8Text10:
 	TX_FAR _Route8Text10
 	db "@"
--- a/scripts/route8gate.asm
+++ b/scripts/route8gate.asm
@@ -1,14 +1,14 @@
-Route8GateScript: ; 1e1c7 (7:61c7)
+Route8GateScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route8GateScriptPointers
 	ld a, [wRoute8GateCurScript]
 	jp CallFunctionInTable
 
-Route8GateScriptPointers: ; 1e1d3 (7:61d3)
+Route8GateScriptPointers:
 	dw Route8GateScript0
 	dw Route8GateScript1
 
-Route8GateScript_1e1d7: ; 1e1d7 (7:61d7)
+Route8GateScript_1e1d7:
 	ld hl, wd730
 	set 7, [hl]
 	ld a, $10
@@ -20,7 +20,7 @@
 	ld [wOverrideSimulatedJoypadStatesMask], a
 	ret
 
-Route8GateScript0: ; 1e1ee (7:61ee)
+Route8GateScript0:
 	ld a, [wd728]
 	bit 6, a
 	ret nz
@@ -49,12 +49,12 @@
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-CoordsData_1e22c: ; 1e22c (7:622c)
+CoordsData_1e22c:
 	db 3,2
 	db 4,2
 	db $ff
 
-Route8GateScript1: ; 1e231 (7:6231)
+Route8GateScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -64,7 +64,7 @@
 	ld [wRoute8GateCurScript], a
 	ret
 
-Route8GateTextPointers: ; 1e241 (7:6241)
+Route8GateTextPointers:
 	dw Route8GateText1
 	dw Route8GateText2
 	dw Route8GateText3
--- a/scripts/route9.asm
+++ b/scripts/route9.asm
@@ -1,4 +1,4 @@
-Route9Script: ; 556bc (15:56bc)
+Route9Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route9TrainerHeaders
 	ld de, Route9ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wRoute9CurScript], a
 	ret
 
-Route9ScriptPointers: ; 556cf (15:56cf)
+Route9ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route9TextPointers: ; 556d5 (15:56d5)
+Route9TextPointers:
 	dw Route9Text1
 	dw Route9Text2
 	dw Route9Text3
@@ -25,8 +25,8 @@
 	dw PickUpItemText
 	dw Route9Text11
 
-Route9TrainerHeaders: ; 556eb (15:56eb)
-Route9TrainerHeader0: ; 556eb (15:56eb)
+Route9TrainerHeaders:
+Route9TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_0
@@ -35,7 +35,7 @@
 	dw Route9EndBattleText1 ; TextEndBattle
 	dw Route9EndBattleText1 ; TextEndBattle
 
-Route9TrainerHeader2: ; 556f7 (15:56f7)
+Route9TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2
@@ -44,7 +44,7 @@
 	dw Route9EndBattleText2 ; TextEndBattle
 	dw Route9EndBattleText2 ; TextEndBattle
 
-Route9TrainerHeader3: ; 55703 (15:5703)
+Route9TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3
@@ -53,7 +53,7 @@
 	dw Route9EndBattleText3 ; TextEndBattle
 	dw Route9EndBattleText3 ; TextEndBattle
 
-Route9TrainerHeader4: ; 5570f (15:570f)
+Route9TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4
@@ -62,7 +62,7 @@
 	dw Route9EndBattleText4 ; TextEndBattle
 	dw Route9EndBattleText4 ; TextEndBattle
 
-Route9TrainerHeader5: ; 5571b (15:571b)
+Route9TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5
@@ -71,7 +71,7 @@
 	dw Route9EndBattleText5 ; TextEndBattle
 	dw Route9EndBattleText5 ; TextEndBattle
 
-Route9TrainerHeader6: ; 55727 (15:5727)
+Route9TrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6
@@ -80,7 +80,7 @@
 	dw Route9EndBattleText6 ; TextEndBattle
 	dw Route9EndBattleText6 ; TextEndBattle
 
-Route9TrainerHeader7: ; 55733 (15:5733)
+Route9TrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7
@@ -89,7 +89,7 @@
 	dw Route9EndBattleText7 ; TextEndBattle
 	dw Route9EndBattleText7 ; TextEndBattle
 
-Route9TrainerHeader8: ; 5573f (15:573f)
+Route9TrainerHeader8:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1
@@ -98,7 +98,7 @@
 	dw Route9EndBattleText8 ; TextEndBattle
 	dw Route9EndBattleText8 ; TextEndBattle
 
-Route9TrainerHeader9: ; 5574b (15:574b)
+Route9TrainerHeader9:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_9, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_9, 1
@@ -109,161 +109,161 @@
 
 	db $ff
 
-Route9Text1: ; 55758 (15:5758)
+Route9Text1:
 	TX_ASM
 	ld hl, Route9TrainerHeader0
 	jr Route9TalkToTrainer
 
-Route9Text2: ; 5575e (15:575e)
+Route9Text2:
 	TX_ASM
 	ld hl, Route9TrainerHeader2
 	jr Route9TalkToTrainer
 
-Route9Text3: ; 55764 (15:5764)
+Route9Text3:
 	TX_ASM
 	ld hl, Route9TrainerHeader3
 	jr Route9TalkToTrainer
 
-Route9Text4: ; 5576a (15:576a)
+Route9Text4:
 	TX_ASM
 	ld hl, Route9TrainerHeader4
 	jr Route9TalkToTrainer
 
-Route9Text5: ; 55770 (15:5770)
+Route9Text5:
 	TX_ASM
 	ld hl, Route9TrainerHeader5
 	jr Route9TalkToTrainer
 
-Route9Text6: ; 55776 (15:5776)
+Route9Text6:
 	TX_ASM
 	ld hl, Route9TrainerHeader6
 	jr Route9TalkToTrainer
 
-Route9Text7: ; 5577c (15:577c)
+Route9Text7:
 	TX_ASM
 	ld hl, Route9TrainerHeader7
 	jr Route9TalkToTrainer
 
-Route9Text8: ; 55782 (15:5782)
+Route9Text8:
 	TX_ASM
 	ld hl, Route9TrainerHeader8
 	jr Route9TalkToTrainer
 
-Route9Text9: ; 55788 (15:5788)
+Route9Text9:
 	TX_ASM
 	ld hl, Route9TrainerHeader9
-Route9TalkToTrainer: ; 5578c (15:578c)
+Route9TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route9BattleText1: ; 55792 (15:5792)
+Route9BattleText1:
 	TX_FAR _Route9BattleText1
 	db "@"
 
-Route9EndBattleText1: ; 55797 (15:5797)
+Route9EndBattleText1:
 	TX_FAR _Route9EndBattleText1
 	db "@"
 
-Route9AfterBattleText1: ; 5579c (15:579c)
+Route9AfterBattleText1:
 	TX_FAR _Route9AfterBattleText1
 	db "@"
 
-Route9BattleText2: ; 557a1 (15:57a1)
+Route9BattleText2:
 	TX_FAR _Route9BattleText2
 	db "@"
 
-Route9EndBattleText2: ; 557a6 (15:57a6)
+Route9EndBattleText2:
 	TX_FAR _Route9EndBattleText2
 	db "@"
 
-Route9AfterBattleText2: ; 557ab (15:57ab)
+Route9AfterBattleText2:
 	TX_FAR _Route9AfterBattleText2
 	db "@"
 
-Route9BattleText3: ; 557b0 (15:57b0)
+Route9BattleText3:
 	TX_FAR _Route9BattleText3
 	db "@"
 
-Route9EndBattleText3: ; 557b5 (15:57b5)
+Route9EndBattleText3:
 	TX_FAR _Route9EndBattleText3
 	db "@"
 
-Route9AfterBattleText3: ; 557ba (15:57ba)
+Route9AfterBattleText3:
 	TX_FAR _Route9AfterBattleText3
 	db "@"
 
-Route9BattleText4: ; 557bf (15:57bf)
+Route9BattleText4:
 	TX_FAR _Route9BattleText4
 	db "@"
 
-Route9EndBattleText4: ; 557c4 (15:57c4)
+Route9EndBattleText4:
 	TX_FAR _Route9EndBattleText4
 	db "@"
 
-Route9AfterBattleText4: ; 557c9 (15:57c9)
+Route9AfterBattleText4:
 	TX_FAR _Route9AfterBattleText4
 	db "@"
 
-Route9BattleText5: ; 557ce (15:57ce)
+Route9BattleText5:
 	TX_FAR _Route9BattleText5
 	db "@"
 
-Route9EndBattleText5: ; 557d3 (15:57d3)
+Route9EndBattleText5:
 	TX_FAR _Route9EndBattleText5
 	db "@"
 
-Route9AfterBattleText5: ; 557d8 (15:57d8)
+Route9AfterBattleText5:
 	TX_FAR _Route9AfterBattleText5
 	db "@"
 
-Route9BattleText6: ; 557dd (15:57dd)
+Route9BattleText6:
 	TX_FAR _Route9BattleText6
 	db "@"
 
-Route9EndBattleText6: ; 557e2 (15:57e2)
+Route9EndBattleText6:
 	TX_FAR _Route9EndBattleText6
 	db "@"
 
-Route9AfterBattleText6: ; 557e7 (15:57e7)
+Route9AfterBattleText6:
 	TX_FAR _Route9AfterBattleText6
 	db "@"
 
-Route9BattleText7: ; 557ec (15:57ec)
+Route9BattleText7:
 	TX_FAR _Route9BattleText7
 	db "@"
 
-Route9EndBattleText7: ; 557f1 (15:57f1)
+Route9EndBattleText7:
 	TX_FAR _Route9EndBattleText7
 	db "@"
 
-Route9AfterBattleText7: ; 557f6 (15:57f6)
+Route9AfterBattleText7:
 	TX_FAR _Route9AfterBattleText7
 	db "@"
 
-Route9BattleText8: ; 557fb (15:57fb)
+Route9BattleText8:
 	TX_FAR _Route9BattleText8
 	db "@"
 
-Route9EndBattleText8: ; 55800 (15:5800)
+Route9EndBattleText8:
 	TX_FAR _Route9EndBattleText8
 	db "@"
 
-Route9AfterBattleText8: ; 55805 (15:5805)
+Route9AfterBattleText8:
 	TX_FAR _Route9AfterBattleText8
 	db "@"
 
-Route9BattleText9: ; 5580a (15:580a)
+Route9BattleText9:
 	TX_FAR _Route9BattleText9
 	db "@"
 
-Route9EndBattleText9: ; 5580f (15:580f)
+Route9EndBattleText9:
 	TX_FAR _Route9EndBattleText9
 	db "@"
 
-Route9AfterBattleText9: ; 55814 (15:5814)
+Route9AfterBattleText9:
 	TX_FAR _Route9AfterBattleText9
 	db "@"
 
-Route9Text11: ; 55819 (15:5819)
+Route9Text11:
 	TX_FAR _Route9Text11
 	db "@"
--- a/scripts/safarizonecenter.asm
+++ b/scripts/safarizonecenter.asm
@@ -1,15 +1,15 @@
-SafariZoneCenterScript: ; 45bb2 (11:5bb2)
+SafariZoneCenterScript:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneCenterTextPointers: ; 45bb5 (11:5bb5)
+SafariZoneCenterTextPointers:
 	dw PickUpItemText
 	dw SafariZoneCenterText2
 	dw SafariZoneCenterText3
 
-SafariZoneCenterText2: ; 45bbb (11:5bbb)
+SafariZoneCenterText2:
 	TX_FAR _SafariZoneCenterText2
 	db "@"
 
-SafariZoneCenterText3: ; 45bc0 (11:5bc0)
+SafariZoneCenterText3:
 	TX_FAR _SafariZoneCenterText3
 	db "@"
--- a/scripts/safarizoneeast.asm
+++ b/scripts/safarizoneeast.asm
@@ -1,7 +1,7 @@
-SafariZoneEastScript: ; 4586b (11:586b)
+SafariZoneEastScript:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneEastTextPointers: ; 4586e (11:586e)
+SafariZoneEastTextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
@@ -10,14 +10,14 @@
 	dw SafariZoneEastText6
 	dw SafariZoneEastText7
 
-SafariZoneEastText5: ; 4587c (11:587c)
+SafariZoneEastText5:
 	TX_FAR _SafariZoneEastText5
 	db "@"
 
-SafariZoneEastText6: ; 45881 (11:5881)
+SafariZoneEastText6:
 	TX_FAR _SafariZoneEastText6
 	db "@"
 
-SafariZoneEastText7: ; 45886 (11:5886)
+SafariZoneEastText7:
 	TX_FAR _SafariZoneEastText7
 	db "@"
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/safarizoneentrance.asm
@@ -1,10 +1,10 @@
-SafariZoneEntranceScript: ; 751cd (1d:51cd)
+SafariZoneEntranceScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, SafariZoneEntranceScriptPointers
 	ld a, [wSafariZoneEntranceCurScript]
 	jp CallFunctionInTable
 
-SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
+SafariZoneEntranceScriptPointers:
 	dw .SafariZoneEntranceScript0
 	dw .SafariZoneEntranceScript1
 	dw .SafariZoneEntranceScript2
@@ -42,7 +42,7 @@
 	ld [wSafariZoneEntranceCurScript], a
 	ret
 
-.CoordsData_75221: ; 75221 (1d:5221)
+.CoordsData_75221:
 	db $02,$03
 	db $02,$04
 	db $FF
@@ -130,7 +130,7 @@
 	and a
 	ret
 
-SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9)
+SafariZoneEntranceTextPointers:
 	dw .SafariZoneEntranceText1
 	dw .SafariZoneEntranceText2
 	dw .SafariZoneEntranceText1
--- a/scripts/safarizonenorth.asm
+++ b/scripts/safarizonenorth.asm
@@ -1,7 +1,7 @@
-SafariZoneNorthScript: ; 459ab (11:59ab)
+SafariZoneNorthScript:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneNorthTextPointers: ; 459ae (11:59ae)
+SafariZoneNorthTextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw SafariZoneNorthText3
@@ -10,22 +10,22 @@
 	dw SafariZoneNorthText6
 	dw SafariZoneNorthText7
 
-SafariZoneNorthText3: ; 459bc (11:59bc)
+SafariZoneNorthText3:
 	TX_FAR _SafariZoneNorthText3
 	db "@"
 
-SafariZoneNorthText4: ; 459c1 (11:59c1)
+SafariZoneNorthText4:
 	TX_FAR _SafariZoneNorthText4
 	db "@"
 
-SafariZoneNorthText5: ; 459c6 (11:59c6)
+SafariZoneNorthText5:
 	TX_FAR _SafariZoneNorthText5
 	db "@"
 
-SafariZoneNorthText6: ; 459cb (11:59cb)
+SafariZoneNorthText6:
 	TX_FAR _SafariZoneNorthText6
 	db "@"
 
-SafariZoneNorthText7: ; 459d0 (11:59d0)
+SafariZoneNorthText7:
 	TX_FAR _SafariZoneNorthText7
 	db "@"
--- a/scripts/safarizoneresthouse1.asm
+++ b/scripts/safarizoneresthouse1.asm
@@ -1,14 +1,14 @@
-SafariZoneRestHouse1Script: ; 45ced (11:5ced)
+SafariZoneRestHouse1Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneRestHouse1TextPointers: ; 45cf0 (11:5cf0)
+SafariZoneRestHouse1TextPointers:
 	dw SafariZoneRestHouse1Text1
 	dw SafariZoneRestHouse1Text2
 
-SafariZoneRestHouse1Text1: ; 45cf4 (11:5cf4)
+SafariZoneRestHouse1Text1:
 	TX_FAR _SafariZoneRestHouse1Text1
 	db "@"
 
-SafariZoneRestHouse1Text2: ; 45cf9 (11:5cf9)
+SafariZoneRestHouse1Text2:
 	TX_FAR _SafariZoneRestHouse1Text2
 	db "@"
--- a/scripts/safarizoneresthouse2.asm
+++ b/scripts/safarizoneresthouse2.asm
@@ -1,20 +1,20 @@
-SafariZoneRestHouse2Script: ; 45d2a (11:5d2a)
+SafariZoneRestHouse2Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SafariZoneRestHouse2TextPointers: ; 45d2e (11:5d2e)
+SafariZoneRestHouse2TextPointers:
 	dw SafariZoneRestHouse2Text1
 	dw SafariZoneRestHouse2Text2
 	dw SafariZoneRestHouse2Text3
 
-SafariZoneRestHouse2Text1: ; 45d34 (11:5d34)
+SafariZoneRestHouse2Text1:
 	TX_FAR _SafariZoneRestHouse2Text1
 	db "@"
 
-SafariZoneRestHouse2Text2: ; 45d39 (11:5d39)
+SafariZoneRestHouse2Text2:
 	TX_FAR _SafariZoneRestHouse2Text2
 	db "@"
 
-SafariZoneRestHouse2Text3: ; 45d3e (11:5d3e)
+SafariZoneRestHouse2Text3:
 	TX_FAR _SafariZoneRestHouse2Text3
 	db "@"
--- a/scripts/safarizoneresthouse3.asm
+++ b/scripts/safarizoneresthouse3.asm
@@ -1,20 +1,20 @@
-SafariZoneRestHouse3Script: ; 45d75 (11:5d75)
+SafariZoneRestHouse3Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SafariZoneRestHouse3TextPointers: ; 45d79 (11:5d79)
+SafariZoneRestHouse3TextPointers:
 	dw SafariZoneRestHouse3Text1
 	dw SafariZoneRestHouse3Text2
 	dw SafariZoneRestHouse3Text3
 
-SafariZoneRestHouse3Text1: ; 45d7f (11:5d7f)
+SafariZoneRestHouse3Text1:
 	TX_FAR _SafariZoneRestHouse3Text1
 	db "@"
 
-SafariZoneRestHouse3Text2: ; 45d84 (11:5d84)
+SafariZoneRestHouse3Text2:
 	TX_FAR _SafariZoneRestHouse3Text2
 	db "@"
 
-SafariZoneRestHouse3Text3: ; 45d89 (11:5d89)
+SafariZoneRestHouse3Text3:
 	TX_FAR _SafariZoneRestHouse3Text3
 	db "@"
--- a/scripts/safarizoneresthouse4.asm
+++ b/scripts/safarizoneresthouse4.asm
@@ -1,20 +1,20 @@
-SafariZoneRestHouse4Script: ; 45dc0 (11:5dc0)
+SafariZoneRestHouse4Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SafariZoneRestHouse4TextPointers: ; 45dc4 (11:5dc4)
+SafariZoneRestHouse4TextPointers:
 	dw SafariZoneRestHouse4Text1
 	dw SafariZoneRestHouse4Text2
 	dw SafariZoneRestHouse4Text3
 
-SafariZoneRestHouse4Text1: ; 45dca (11:5dca)
+SafariZoneRestHouse4Text1:
 	TX_FAR _SafariZoneRestHouse4Text1
 	db "@"
 
-SafariZoneRestHouse4Text2: ; 45dcf (11:5dcf)
+SafariZoneRestHouse4Text2:
 	TX_FAR _SafariZoneRestHouse4Text2
 	db "@"
 
-SafariZoneRestHouse4Text3: ; 45dd4 (11:5dd4)
+SafariZoneRestHouse4Text3:
 	TX_FAR _SafariZoneRestHouse4Text3
 	db "@"
--- a/scripts/safarizonesecrethouse.asm
+++ b/scripts/safarizonesecrethouse.asm
@@ -1,10 +1,10 @@
-SafariZoneSecretHouseScript: ; 4a317 (12:6317)
+SafariZoneSecretHouseScript:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneSecretHouseTextPointers: ; 4a31a (12:631a)
+SafariZoneSecretHouseTextPointers:
 	dw SafariZoneSecretHouseText1
 
-SafariZoneSecretHouseText1: ; 4a31c (12:631c)
+SafariZoneSecretHouseText1:
 	TX_ASM
 	CheckEvent EVENT_GOT_HM03
 	jr nz, .asm_20a9b
@@ -27,18 +27,18 @@
 .asm_8f1fc
 	jp TextScriptEnd
 
-SafariZoneSecretHouseText_4a350: ; 4a350 (12:6350)
+SafariZoneSecretHouseText_4a350:
 	TX_FAR _SecretHouseText_4a350
 	db "@"
 
-ReceivedHM03Text: ; 4a355 (12:6355)
+ReceivedHM03Text:
 	TX_FAR _ReceivedHM03Text
 	db $0B, "@"
 
-HM03ExplanationText: ; 4a35b (12:635b)
+HM03ExplanationText:
 	TX_FAR _HM03ExplanationText
 	db "@"
 
-HM03NoRoomText: ; 4a360 (12:6360)
+HM03NoRoomText:
 	TX_FAR _HM03NoRoomText
 	db "@"
--- a/scripts/safarizonewest.asm
+++ b/scripts/safarizonewest.asm
@@ -1,7 +1,7 @@
-SafariZoneWestScript: ; 4a1b5 (12:61b5)
+SafariZoneWestScript:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneWestTextPointers: ; 4a1b8 (12:61b8)
+SafariZoneWestTextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
@@ -11,18 +11,18 @@
 	dw SafariZoneWestText7
 	dw SafariZoneWestText8
 
-SafariZoneWestText5: ; 4a1c8 (12:61c8)
+SafariZoneWestText5:
 	TX_FAR _SafariZoneWestText5
 	db "@"
 
-SafariZoneWestText6: ; 4a1cd (12:61cd)
+SafariZoneWestText6:
 	TX_FAR _SafariZoneWestText6
 	db "@"
 
-SafariZoneWestText7: ; 4a1d2 (12:61d2)
+SafariZoneWestText7:
 	TX_FAR _SafariZoneWestText7
 	db "@"
 
-SafariZoneWestText8: ; 4a1d7 (12:61d7)
+SafariZoneWestText8:
 	TX_FAR _SafariZoneWestText8
 	db "@"
--- a/scripts/saffroncity.asm
+++ b/scripts/saffroncity.asm
@@ -1,7 +1,7 @@
-SaffronCityScript: ; 50c00 (14:4c00)
+SaffronCityScript:
 	jp EnableAutoTextBoxDrawing
 
-SaffronCityTextPointers: ; 50c03 (14:4c03)
+SaffronCityTextPointers:
 	dw SaffronCityText1
 	dw SaffronCityText2
 	dw SaffronCityText3
@@ -28,94 +28,94 @@
 	dw SaffronCityText24
 	dw SaffronCityText25
 
-SaffronCityText1: ; 50c35 (14:4c35)
+SaffronCityText1:
 	TX_FAR _SaffronCityText1
 	db "@"
 
-SaffronCityText2: ; 50c3a (14:4c3a)
+SaffronCityText2:
 	TX_FAR _SaffronCityText2
 	db "@"
 
-SaffronCityText3: ; 50c3f (14:4c3f)
+SaffronCityText3:
 	TX_FAR _SaffronCityText3
 	db "@"
 
-SaffronCityText4: ; 50c44 (14:4c44)
+SaffronCityText4:
 	TX_FAR _SaffronCityText4
 	db "@"
 
-SaffronCityText5: ; 50c49 (14:4c49)
+SaffronCityText5:
 	TX_FAR _SaffronCityText5
 	db "@"
 
-SaffronCityText6: ; 50c4e (14:4c4e)
+SaffronCityText6:
 	TX_FAR _SaffronCityText6
 	db "@"
 
-SaffronCityText7: ; 50c53 (14:4c53)
+SaffronCityText7:
 	TX_FAR _SaffronCityText7
 	db "@"
 
-SaffronCityText8: ; 50c58 (14:4c58)
+SaffronCityText8:
 	TX_FAR _SaffronCityText8
 	db "@"
 
-SaffronCityText9: ; 50c5d (14:4c5d)
+SaffronCityText9:
 	TX_FAR _SaffronCityText9
 	db "@"
 
-SaffronCityText10: ; 50c62 (14:4c62)
+SaffronCityText10:
 	TX_FAR _SaffronCityText10
 	db "@"
 
-SaffronCityText11: ; 50c67 (14:4c67)
+SaffronCityText11:
 	TX_FAR _SaffronCityText11
 	db "@"
 
-SaffronCityText12: ; 50c6c (14:4c6c)
+SaffronCityText12:
 	TX_FAR _SaffronCityText12
 	db $15, "@" ; play PIDGEOT cry from TextCommandSounds
 
-SaffronCityText13: ; 50c72 (14:4c72)
+SaffronCityText13:
 	TX_FAR _SaffronCityText13
 	db "@"
 
-SaffronCityText14: ; 50c77 (14:4c77)
+SaffronCityText14:
 	TX_FAR _SaffronCityText14
 	db "@"
 
-SaffronCityText15: ; 50c7c (14:4c7c)
+SaffronCityText15:
 	TX_FAR _SaffronCityText15
 	db "@"
 
-SaffronCityText16: ; 50c81 (14:4c81)
+SaffronCityText16:
 	TX_FAR _SaffronCityText16
 	db "@"
 
-SaffronCityText17: ; 50c86 (14:4c86)
+SaffronCityText17:
 	TX_FAR _SaffronCityText17
 	db "@"
 
-SaffronCityText18: ; 50c8b (14:4c8b)
+SaffronCityText18:
 	TX_FAR _SaffronCityText18
 	db "@"
 
-SaffronCityText20: ; 50c90 (14:4c90)
+SaffronCityText20:
 	TX_FAR _SaffronCityText20
 	db "@"
 
-SaffronCityText21: ; 50c95 (14:4c95)
+SaffronCityText21:
 	TX_FAR _SaffronCityText21
 	db "@"
 
-SaffronCityText22: ; 50c9a (14:4c9a)
+SaffronCityText22:
 	TX_FAR _SaffronCityText22
 	db "@"
 
-SaffronCityText24: ; 50c9f (14:4c9f)
+SaffronCityText24:
 	TX_FAR _SaffronCityText24
 	db "@"
 
-SaffronCityText25: ; 50ca4 (14:4ca4)
+SaffronCityText25:
 	TX_FAR _SaffronCityText25
 	db "@"
--- a/scripts/saffrongym.asm
+++ b/scripts/saffrongym.asm
@@ -1,4 +1,4 @@
-SaffronGymScript: ; 5d00d (17:500d)
+SaffronGymScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -16,13 +16,13 @@
 	ld de, Gym6LeaderName
 	jp LoadGymLeaderAndCityName
 
-Gym6CityName: ; 5d033 (17:5033)
+Gym6CityName:
 	db "SAFFRON CITY@"
 
-Gym6LeaderName: ; 5d040 (17:5040)
+Gym6LeaderName:
 	db "SABRINA@"
 
-SaffronGymText_5d048: ; 5d048 (17:5048)
+SaffronGymText_5d048:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wSaffronGymCurScript], a
@@ -29,13 +29,13 @@
 	ld [wCurMapScript], a
 	ret
 
-SaffronGymScriptPointers: ; 5d053 (17:5053)
+SaffronGymScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw SaffronGymScript3
 
-SaffronGymScript3: ; 5d05b (17:505b)
+SaffronGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SaffronGymText_5d048
@@ -42,7 +42,7 @@
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-SaffronGymText_5d068: ; 5d068 (17:5068)
+SaffronGymText_5d068:
 	ld a, $a
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -70,7 +70,7 @@
 
 	jp SaffronGymText_5d048
 
-SaffronGymTextPointers: ; 5d0ab (17:50ab)
+SaffronGymTextPointers:
 	dw SaffronGymText1
 	dw SaffronGymText2
 	dw SaffronGymText3
@@ -84,8 +84,8 @@
 	dw SaffronGymText11
 	dw SaffronGymText12
 
-SaffronGymTrainerHeaders: ; 5d0c3 (17:50c3)
-SaffronGymTrainerHeader0: ; 5d0c3 (17:50c3)
+SaffronGymTrainerHeaders:
+SaffronGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_0
@@ -94,7 +94,7 @@
 	dw SaffronGymEndBattleText1 ; TextEndBattle
 	dw SaffronGymEndBattleText1 ; TextEndBattle
 
-SaffronGymTrainerHeader1: ; 5d0cf (17:50cf)
+SaffronGymTrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_1
@@ -103,7 +103,7 @@
 	dw SaffronGymEndBattleText2 ; TextEndBattle
 	dw SaffronGymEndBattleText2 ; TextEndBattle
 
-SaffronGymTrainerHeader2: ; 5d0db (17:50db)
+SaffronGymTrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_2
@@ -112,7 +112,7 @@
 	dw SaffronGymEndBattleText3 ; TextEndBattle
 	dw SaffronGymEndBattleText3 ; TextEndBattle
 
-SaffronGymTrainerHeader3: ; 5d0e7 (17:50e7)
+SaffronGymTrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_3
@@ -121,7 +121,7 @@
 	dw SaffronGymEndBattleText4 ; TextEndBattle
 	dw SaffronGymEndBattleText4 ; TextEndBattle
 
-SaffronGymTrainerHeader4: ; 5d0f3 (17:50f3)
+SaffronGymTrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_4
@@ -130,7 +130,7 @@
 	dw SaffronGymEndBattleText5 ; TextEndBattle
 	dw SaffronGymEndBattleText5 ; TextEndBattle
 
-SaffronGymTrainerHeader5: ; 5d0ff (17:50ff)
+SaffronGymTrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_5
@@ -139,7 +139,7 @@
 	dw SaffronGymEndBattleText6 ; TextEndBattle
 	dw SaffronGymEndBattleText6 ; TextEndBattle
 
-SaffronGymTrainerHeader6: ; 5d10b (17:510b)
+SaffronGymTrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1
@@ -150,7 +150,7 @@
 
 	db $ff
 
-SaffronGymText1: ; 5d118 (17:5118)
+SaffronGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_SABRINA
 	jr z, .asm_5d134
@@ -183,77 +183,77 @@
 .asm_5d15f
 	jp TextScriptEnd
 
-SaffronGymText_5d162: ; 5d162 (17:5162)
+SaffronGymText_5d162:
 	TX_FAR _SaffronGymText_5d162
 	db "@"
 
-SaffronGymText_5d167: ; 5d167 (17:5167)
+SaffronGymText_5d167:
 	TX_FAR _SaffronGymText_5d167
 	db $11 ; play same sound as red giving oak parcel
 	db $6 ; wait for keypress
 	db "@"
 
-SaffronGymText_5d16e: ; 5d16e (17:516e)
+SaffronGymText_5d16e:
 	TX_FAR _SaffronGymText_5d16e
 	db "@"
 
-SaffronGymText10: ; 5d173 (17:5173)
+SaffronGymText10:
 	TX_FAR _SaffronGymText_5d173
 	db "@"
 
-SaffronGymText11: ; 5d178 (17:5178)
+SaffronGymText11:
 	TX_FAR ReceivedTM46Text
 	db $b
 	TX_FAR _TM46ExplanationText
 	db "@"
 
-SaffronGymText12: ; 5d182 (17:5182)
+SaffronGymText12:
 	TX_FAR _TM46NoRoomText
 	db "@"
 
-SaffronGymText2: ; 5d187 (17:5187)
+SaffronGymText2:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText3: ; 5d191 (17:5191)
+SaffronGymText3:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText4: ; 5d19b (17:519b)
+SaffronGymText4:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText5: ; 5d1a5 (17:51a5)
+SaffronGymText5:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText6: ; 5d1af (17:51af)
+SaffronGymText6:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText7: ; 5d1b9 (17:51b9)
+SaffronGymText7:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText8: ; 5d1c3 (17:51c3)
+SaffronGymText8:
 	TX_ASM
 	ld hl, SaffronGymTrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText9: ; 5d1cd (17:51cd)
+SaffronGymText9:
 	TX_ASM
 	CheckEvent EVENT_BEAT_SABRINA
 	jr nz, .asm_5d1dd
@@ -266,94 +266,94 @@
 .asm_5d1e3
 	jp TextScriptEnd
 
-SaffronGymText_5d1e6: ; 5d1e6 (17:51e6)
+SaffronGymText_5d1e6:
 	TX_FAR _SaffronGymText_5d1e6
 	db "@"
 
-SaffronGymText_5d1eb: ; 5d1eb (17:51eb)
+SaffronGymText_5d1eb:
 	TX_FAR _SaffronGymText_5d1eb
 	db "@"
 
-SaffronGymBattleText1: ; 5d1f0 (17:51f0)
+SaffronGymBattleText1:
 	TX_FAR _SaffronGymBattleText1
 	db "@"
 
-SaffronGymEndBattleText1: ; 5d1f5 (17:51f5)
+SaffronGymEndBattleText1:
 	TX_FAR _SaffronGymEndBattleText1
 	db "@"
 
-SaffronGymAfterBattleText1: ; 5d1fa (17:51fa)
+SaffronGymAfterBattleText1:
 	TX_FAR _SaffronGymAfterBattleText1
 	db "@"
 
-SaffronGymBattleText2: ; 5d1ff (17:51ff)
+SaffronGymBattleText2:
 	TX_FAR _SaffronGymBattleText2
 	db "@"
 
-SaffronGymEndBattleText2: ; 5d204 (17:5204)
+SaffronGymEndBattleText2:
 	TX_FAR _SaffronGymEndBattleText2
 	db "@"
 
-SaffronGymAfterBattleText2: ; 5d209 (17:5209)
+SaffronGymAfterBattleText2:
 	TX_FAR _SaffronGymAfterBattleText2
 	db "@"
 
-SaffronGymBattleText3: ; 5d20e (17:520e)
+SaffronGymBattleText3:
 	TX_FAR _SaffronGymBattleText3
 	db "@"
 
-SaffronGymEndBattleText3: ; 5d213 (17:5213)
+SaffronGymEndBattleText3:
 	TX_FAR _SaffronGymEndBattleText3
 	db "@"
 
-SaffronGymAfterBattleText3: ; 5d218 (17:5218)
+SaffronGymAfterBattleText3:
 	TX_FAR _SaffronGymAfterBattleText3
 	db "@"
 
-SaffronGymBattleText4: ; 5d21d (17:521d)
+SaffronGymBattleText4:
 	TX_FAR _SaffronGymBattleText4
 	db "@"
 
-SaffronGymEndBattleText4: ; 5d222 (17:5222)
+SaffronGymEndBattleText4:
 	TX_FAR _SaffronGymEndBattleText4
 	db "@"
 
-SaffronGymAfterBattleText4: ; 5d227 (17:5227)
+SaffronGymAfterBattleText4:
 	TX_FAR _SaffronGymAfterBattleText4
 	db "@"
 
-SaffronGymBattleText5: ; 5d22c (17:522c)
+SaffronGymBattleText5:
 	TX_FAR _SaffronGymBattleText5
 	db "@"
 
-SaffronGymEndBattleText5: ; 5d231 (17:5231)
+SaffronGymEndBattleText5:
 	TX_FAR _SaffronGymEndBattleText5
 	db "@"
 
-SaffronGymAfterBattleText5: ; 5d236 (17:5236)
+SaffronGymAfterBattleText5:
 	TX_FAR _SaffronGymAfterBattleText5
 	db "@"
 
-SaffronGymBattleText6: ; 5d23b (17:523b)
+SaffronGymBattleText6:
 	TX_FAR _SaffronGymBattleText6
 	db "@"
 
-SaffronGymEndBattleText6: ; 5d240 (17:5240)
+SaffronGymEndBattleText6:
 	TX_FAR _SaffronGymEndBattleText6
 	db "@"
 
-SaffronGymAfterBattleText6: ; 5d245 (17:5245)
+SaffronGymAfterBattleText6:
 	TX_FAR _SaffronGymAfterBattleText6
 	db "@"
 
-SaffronGymBattleText7: ; 5d24a (17:524a)
+SaffronGymBattleText7:
 	TX_FAR _SaffronGymBattleText7
 	db "@"
 
-SaffronGymEndBattleText7: ; 5d24f (17:524f)
+SaffronGymEndBattleText7:
 	TX_FAR _SaffronGymEndBattleText7
 	db "@"
 
-SaffronGymAfterBattleText7: ; 5d254 (17:5254)
+SaffronGymAfterBattleText7:
 	TX_FAR _SaffronGymAfterBattleText7
 	db "@"
--- a/scripts/saffronhouse1.asm
+++ b/scripts/saffronhouse1.asm
@@ -1,17 +1,17 @@
-SaffronHouse1Script: ; 1dddd (7:5ddd)
+SaffronHouse1Script:
 	jp EnableAutoTextBoxDrawing
 
-SaffronHouse1TextPointers: ; 1dde0 (7:5de0)
+SaffronHouse1TextPointers:
 	dw SaffronHouse1Text1
 	dw SaffronHouse1Text2
 	dw SaffronHouse1Text3
 	dw SaffronHouse1Text4
 
-SaffronHouse1Text1: ; 1dde8 (7:5de8)
+SaffronHouse1Text1:
 	TX_FAR _SaffronHouse1Text1
 	db "@"
 
-SaffronHouse1Text2: ; 1dded (7:5ded)
+SaffronHouse1Text2:
 	TX_FAR _SaffronHouse1Text2
 	TX_ASM
 	ld a, PIDGEY
@@ -18,10 +18,10 @@
 	call PlayCry
 	jp TextScriptEnd
 
-SaffronHouse1Text3: ; 1ddfa (7:5dfa)
+SaffronHouse1Text3:
 	TX_FAR _SaffronHouse1Text3
 	db "@"
 
-SaffronHouse1Text4: ; 1ddff (7:5dff)
+SaffronHouse1Text4:
 	TX_FAR _SaffronHouse1Text4
 	db "@"
--- a/scripts/saffronhouse2.asm
+++ b/scripts/saffronhouse2.asm
@@ -1,10 +1,10 @@
-SaffronHouse2Script: ; 1de3c (7:5e3c)
+SaffronHouse2Script:
 	jp EnableAutoTextBoxDrawing
 
-SaffronHouse2TextPointers: ; 1de3f (7:5e3f)
+SaffronHouse2TextPointers:
 	dw SaffronHouse2Text1
 
-SaffronHouse2Text1: ; 1de41 (7:5e41)
+SaffronHouse2Text1:
 	TX_ASM
 	CheckEvent EVENT_GOT_TM29
 	jr nz, .asm_9e72b
@@ -27,18 +27,18 @@
 .asm_fe4e1
 	jp TextScriptEnd
 
-TM29PreReceiveText: ; 1de75 (7:5e75)
+TM29PreReceiveText:
 	TX_FAR _TM29PreReceiveText
 	db "@"
 
-ReceivedTM29Text: ; 1de7a (7:5e7a)
+ReceivedTM29Text:
 	TX_FAR _ReceivedTM29Text
 	db $0B, "@"
 
-TM29ExplanationText: ; 1de80 (7:5e80)
+TM29ExplanationText:
 	TX_FAR _TM29ExplanationText
 	db "@"
 
-TM29NoRoomText: ; 1de85 (7:5e85)
+TM29NoRoomText:
 	TX_FAR _TM29NoRoomText
 	db "@"
--- a/scripts/school.asm
+++ b/scripts/school.asm
@@ -1,14 +1,14 @@
-SchoolScript: ; 1d54c (7:554c)
+SchoolScript:
 	jp EnableAutoTextBoxDrawing
 
-SchoolTextPointers: ; 1d54f (7:554f)
+SchoolTextPointers:
 	dw SchoolText1
 	dw SchoolText2
 
-SchoolText1: ; 1d553 (7:5553)
+SchoolText1:
 	TX_FAR _SchoolText1
 	db "@"
 
-SchoolText2: ; 1d558 (7:5558)
+SchoolText2:
 	TX_FAR _SchoolText2
 	db "@"
--- a/scripts/silphco1.asm
+++ b/scripts/silphco1.asm
@@ -1,4 +1,4 @@
-SilphCo1Script: ; 5d44e (17:544e)
+SilphCo1Script:
 	call EnableAutoTextBoxDrawing
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ret z
@@ -8,9 +8,9 @@
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 
-SilphCo1TextPointers: ; 5d469 (17:5469)
+SilphCo1TextPointers:
 	dw SilphCo1Text1
 
-SilphCo1Text1: ; 5d46b (17:546b)
+SilphCo1Text1:
 	TX_FAR _SilphCo1Text1
 	db "@"
--- a/scripts/silphco10.asm
+++ b/scripts/silphco10.asm
@@ -1,4 +1,4 @@
-SilphCo10Script: ; 5a139 (16:6139)
+SilphCo10Script:
 	call SilphCo10Script_5a14f
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo10TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wSilphCo10CurScript], a
 	ret
 
-SilphCo10Script_5a14f: ; 5a14f (16:614f)
+SilphCo10Script_5a14f:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -23,11 +23,11 @@
 	lb bc, 4, 5
 	predef_jump ReplaceTileBlock
 
-SilphCo10GateCoords: ; 5a173 (16:6173)
+SilphCo10GateCoords:
 	db $04,$05
 	db $FF
 
-SilphCo10Text_5a176: ; 5a176 (16:6176)
+SilphCo10Text_5a176:
 	ld a, [$ffe0]
 	and a
 	ret z
@@ -34,12 +34,12 @@
 	SetEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR
 	ret
 
-SilphCo10ScriptPointers: ; 5a180 (16:6180)
+SilphCo10ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo10TextPointers: ; 5a186 (16:6186)
+SilphCo10TextPointers:
 	dw SilphCo10Text1
 	dw SilphCo10Text2
 	dw SilphCo10Text3
@@ -47,8 +47,8 @@
 	dw PickUpItemText
 	dw PickUpItemText
 
-SilphCo10TrainerHeaders: ; 5a192 (16:6192)
-SilphCo10TrainerHeader0: ; 5a192 (16:6192)
+SilphCo10TrainerHeaders:
+SilphCo10TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_10F_TRAINER_0
@@ -57,7 +57,7 @@
 	dw SilphCo10EndBattleText1 ; TextEndBattle
 	dw SilphCo10EndBattleText1 ; TextEndBattle
 
-SilphCo10TrainerHeader1: ; 5a19e (16:619e)
+SilphCo10TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_10F_TRAINER_1
@@ -68,19 +68,19 @@
 
 	db $ff
 
-SilphCo10Text1: ; 5a1ab (16:61ab)
+SilphCo10Text1:
 	TX_ASM
 	ld hl, SilphCo10TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo10Text2: ; 5a1b5 (16:61b5)
+SilphCo10Text2:
 	TX_ASM
 	ld hl, SilphCo10TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo10Text3: ; 5a1bf (16:61bf)
+SilphCo10Text3:
 	TX_ASM
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ld hl, SilphCo10Text_5a1d8
@@ -90,34 +90,34 @@
 	call PrintText
 	jp TextScriptEnd
 
-SilphCo10Text_5a1d3: ; 5a1d3 (16:61d3)
+SilphCo10Text_5a1d3:
 	TX_FAR _SilphCo10Text_5a1d3
 	db "@"
 
-SilphCo10Text_5a1d8: ; 5a1d8 (16:61d8)
+SilphCo10Text_5a1d8:
 	TX_FAR _SilphCo10Text_5a1d8
 	db "@"
 
-SilphCo10BattleText1: ; 5a1dd (16:61dd)
+SilphCo10BattleText1:
 	TX_FAR _SilphCo10BattleText1
 	db "@"
 
-SilphCo10EndBattleText1: ; 5a1e2 (16:61e2)
+SilphCo10EndBattleText1:
 	TX_FAR _SilphCo10EndBattleText1
 	db "@"
 
-SilphCo10AfterBattleText1: ; 5a1e7 (16:61e7)
+SilphCo10AfterBattleText1:
 	TX_FAR _SilphCo10AfterBattleText1
 	db "@"
 
-SilphCo10BattleText2: ; 5a1ec (16:61ec)
+SilphCo10BattleText2:
 	TX_FAR _SilphCo10BattleText2
 	db "@"
 
-SilphCo10EndBattleText2: ; 5a1f1 (16:61f1)
+SilphCo10EndBattleText2:
 	TX_FAR _SilphCo10EndBattleText2
 	db "@"
 
-SilphCo10AfterBattleText2: ; 5a1f6 (16:61f6)
+SilphCo10AfterBattleText2:
 	TX_FAR _SilphCo10AfterBattleText2
 	db "@"
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -1,4 +1,4 @@
-SilphCo11Script: ; 620fa (18:60fa)
+SilphCo11Script:
 	call SilphCo11Script_62110
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo11TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wSilphCo11CurScript], a
 	ret
 
-SilphCo11Script_62110: ; 62110 (18:6110)
+SilphCo11Script_62110:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -23,11 +23,11 @@
 	lb bc, 6, 3
 	predef_jump ReplaceTileBlock
 
-SilphCo11GateCoords: ; 62134 (18:6134)
+SilphCo11GateCoords:
 	db $06,$03
 	db $FF
 
-SilphCo11Script_62137: ; 62137 (18:6137)
+SilphCo11Script_62137:
 	push hl
 	ld hl, wCardKeyDoorY
 	ld a, [hli]
@@ -63,7 +63,7 @@
 	ld [$ffe0], a
 	ret
 
-SilphCo11Script_62163: ; 62163 (18:6163)
+SilphCo11Script_62163:
 	ld a, [$ffe0]
 	and a
 	ret z
@@ -70,7 +70,7 @@
 	SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR
 	ret
 
-SilphCo11Script_6216d: ; 6216d (18:616d)
+SilphCo11Script_6216d:
 	ld hl, MissableObjectIDs_6219b
 .asm_62170
 	ld a, [hli]
@@ -93,7 +93,7 @@
 	pop hl
 	jr .asm_62184
 
-MissableObjectIDs_62194: ; 62194 (18:6194)
+MissableObjectIDs_62194:
 	db HS_SAFFRON_CITY_8
 	db HS_SAFFRON_CITY_9
 	db HS_SAFFRON_CITY_A
@@ -102,7 +102,7 @@
 	db HS_SAFFRON_CITY_D
 	db $FF
 
-MissableObjectIDs_6219b: ; 6219b (18:619b)
+MissableObjectIDs_6219b:
 	db HS_SAFFRON_CITY_1
 	db HS_SAFFRON_CITY_2
 	db HS_SAFFRON_CITY_3
@@ -145,16 +145,16 @@
 	db HS_SILPH_CO_11F_3
 	db $FF
 
-SilphCo11Script_621c4: ; 621c4 (18:61c4)
+SilphCo11Script_621c4:
 	xor a
 	ld [wJoyIgnore], a
 
-SilphCo11Script_621c8: ; 621c8 (18:61c8)
+SilphCo11Script_621c8:
 	ld [wSilphCo11CurScript], a
 	ld [wCurMapScript], a
 	ret
 
-SilphCo11ScriptPointers: ; 621cf (18:61cf)
+SilphCo11ScriptPointers:
 	dw SilphCo11Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -162,7 +162,7 @@
 	dw SilphCo11Script4
 	dw SilphCo11Script5
 
-SilphCo11Script0: ; 621db (18:61db)
+SilphCo11Script0:
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ret nz
 	ld hl, CoordsData_62211
@@ -185,18 +185,18 @@
 	ld a, $3
 	jp SilphCo11Script_621c8
 
-CoordsData_62211: ; 62211 (18:6211)
+CoordsData_62211:
 	db $0D,$06
 	db $0C,$07
 	db $FF
 
-MovementData_62216: ; 62216 (18:6216)
+MovementData_62216:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-SilphCo11Script_6221a: ; 6221a (18:621a)
+SilphCo11Script_6221a:
 	ld [wPlayerMovingDirection], a
 	ld a, $3
 	ld [H_SPRITEINDEX], a
@@ -204,7 +204,7 @@
 	ld [hSpriteFacingDirection], a
 	jp SetSpriteFacingDirectionAndDelay
 
-SilphCo11Script5: ; 62227 (18:6227)
+SilphCo11Script5:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SilphCo11Script_621c4
@@ -234,7 +234,7 @@
 	ld [wJoyIgnore], a
 	jp SilphCo11Script_621c8
 
-SilphCo11Script3: ; 6226a (18:626a)
+SilphCo11Script3:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -256,7 +256,7 @@
 	ld a, $4
 	jp SilphCo11Script_621c8
 
-SilphCo11Script4: ; 62293 (18:6293)
+SilphCo11Script4:
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
@@ -272,7 +272,7 @@
 	ld a, $5
 	jp SilphCo11Script_621c8
 
-SilphCo11TextPointers: ; 622b7 (18:62b7)
+SilphCo11TextPointers:
 	dw SilphCo11Text1
 	dw SilphCo11Text2
 	dw SilphCo11Text3
@@ -280,8 +280,8 @@
 	dw SilphCo11Text5
 	dw SilphCo11Text6
 
-SilphCo11TrainerHeaders: ; 622c3 (18:62c3)
-SilphCo11TrainerHeader0: ; 622c3 (18:62c3)
+SilphCo11TrainerHeaders:
+SilphCo11TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_0
@@ -290,7 +290,7 @@
 	dw SilphCo11EndBattleText1 ; TextEndBattle
 	dw SilphCo11EndBattleText1 ; TextEndBattle
 
-SilphCo11TrainerHeader1: ; 622cf (18:62cf)
+SilphCo11TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_1
@@ -301,7 +301,7 @@
 
 	db $ff
 
-SilphCo11Text1: ; 622dc (18:62dc)
+SilphCo11Text1:
 	TX_ASM
 	CheckEvent EVENT_GOT_MASTER_BALL
 	jp nz, .asm_62308
@@ -324,75 +324,75 @@
 .asm_6230e
 	jp TextScriptEnd
 
-SilphCoPresidentText: ; 62311 (18:6311)
+SilphCoPresidentText:
 	TX_FAR _SilphCoPresidentText
 	db "@"
 
-ReceivedSilphCoMasterBallText: ; 62316 (18:6316)
+ReceivedSilphCoMasterBallText:
 	TX_FAR _ReceivedSilphCoMasterBallText
 	db $11, "@"
 
-SilphCo10Text_6231c: ; 6231c (18:631c)
+SilphCo10Text_6231c:
 	TX_FAR _SilphCo10Text_6231c
 	db "@"
 
-SilphCoMasterBallNoRoomText: ; 62321 (18:6321)
+SilphCoMasterBallNoRoomText:
 	TX_FAR _SilphCoMasterBallNoRoomText
 	db "@"
 
-SilphCo11Text2: ; 62326 (18:6326)
+SilphCo11Text2:
 	TX_FAR _SilphCo11Text2
 	db "@"
 
-SilphCo11Text3: ; 6232b (18:632b)
+SilphCo11Text3:
 	TX_FAR _SilphCo11Text3
 	db "@"
 
-SilphCo10Text_62330: ; 62330 (18:6330)
+SilphCo10Text_62330:
 	TX_FAR _SilphCo10Text_62330
 	db "@"
 
-SilphCo11Text6: ; 62335 (18:6335)
+SilphCo11Text6:
 	TX_FAR _SilphCo10Text_62335
 	db "@"
 
-SilphCo11Text4: ; 6233a (18:633a)
+SilphCo11Text4:
 	TX_ASM
 	ld hl, SilphCo11TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo11BattleText1: ; 62344 (18:6344)
+SilphCo11BattleText1:
 	TX_FAR _SilphCo11BattleText1
 	db "@"
 
-SilphCo11EndBattleText1: ; 62349 (18:6349)
+SilphCo11EndBattleText1:
 	TX_FAR _SilphCo11EndBattleText1
 	db "@"
 
-SilphCo11AfterBattleText1: ; 6234e (18:634e)
+SilphCo11AfterBattleText1:
 	TX_FAR _SilphCo11AfterBattleText1
 	db "@"
 
-SilphCo11Text5: ; 62353 (18:6353)
+SilphCo11Text5:
 	TX_ASM
 	ld hl, SilphCo11TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo11BattleText2: ; 6235d (18:635d)
+SilphCo11BattleText2:
 	TX_FAR _SilphCo11BattleText2
 	db "@"
 
-SilphCo11EndBattleText2: ; 62362 (18:6362)
+SilphCo11EndBattleText2:
 	TX_FAR _SilphCo11EndBattleText2
 	db "@"
 
-SilphCo11AfterBattleText2: ; 62367 (18:6367)
+SilphCo11AfterBattleText2:
 	TX_FAR _SilphCo11AfterBattleText2
 	db "@"
 
-SilphCo10Text_6236c: ; 6236c (18:636c)
+SilphCo10Text_6236c:
 	TX_ASM
 	ld hl, SilphCo10Text_6237b
 	call PrintText
@@ -400,6 +400,6 @@
 	call DisplayPokedex
 	jp TextScriptEnd
 
-SilphCo10Text_6237b: ; 6237b (18:637b)
+SilphCo10Text_6237b:
 	TX_FAR _SilphCo10Text_6237b
 	db "@"
--- a/scripts/silphco2.asm
+++ b/scripts/silphco2.asm
@@ -1,4 +1,4 @@
-SilphCo2Script: ; 59cf1 (16:5cf1)
+SilphCo2Script:
 	call SilphCo2Script_59d07
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo2TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wSilphCo2CurScript], a
 	ret
 
-SilphCo2Script_59d07: ; 59d07 (16:5d07)
+SilphCo2Script_59d07:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -32,12 +32,12 @@
 	lb bc, 5, 2
 	predef_jump ReplaceTileBlock
 
-SilphCo2GateCoords: ; 59d3e (16:5d3e)
+SilphCo2GateCoords:
 	db $02,$02
 	db $05,$02
 	db $FF
 
-SilphCo2Script_59d43: ; 59d43 (16:5d43)
+SilphCo2Script_59d43:
 	push hl
 	ld hl, wCardKeyDoorY
 	ld a, [hli]
@@ -73,7 +73,7 @@
 	ld [$ffe0], a
 	ret
 
-SilphCo2Script_59d6f: ; 59d6f (16:5d6f)
+SilphCo2Script_59d6f:
 	EventFlagAddress hl, EVENT_SILPH_CO_2_UNLOCKED_DOOR1
 	ld a, [$ffe0]
 	and a
@@ -86,12 +86,12 @@
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1
 	ret
 
-SilphCo2ScriptPointers: ; 59d80 (16:5d80)
+SilphCo2ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo2TextPointers: ; 59d86 (16:5d86)
+SilphCo2TextPointers:
 	dw SilphCo2Text1
 	dw SilphCo2Text2
 	dw SilphCo2Text3
@@ -98,8 +98,8 @@
 	dw SilphCo2Text4
 	dw SilphCo2Text5
 
-SilphCo2TrainerHeaders: ; 59d90 (16:5d90)
-SilphCo2TrainerHeader0: ; 59d90 (16:5d90)
+SilphCo2TrainerHeaders:
+SilphCo2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_0
@@ -108,7 +108,7 @@
 	dw SilphCo2EndBattleText1 ; TextEndBattle
 	dw SilphCo2EndBattleText1 ; TextEndBattle
 
-SilphCo2TrainerHeader1: ; 59d9c (16:5d9c)
+SilphCo2TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_1
@@ -117,7 +117,7 @@
 	dw SilphCo2EndBattleText2 ; TextEndBattle
 	dw SilphCo2EndBattleText2 ; TextEndBattle
 
-SilphCo2TrainerHeader2: ; 59da8 (16:5da8)
+SilphCo2TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_2
@@ -126,7 +126,7 @@
 	dw SilphCo2EndBattleText3 ; TextEndBattle
 	dw SilphCo2EndBattleText3 ; TextEndBattle
 
-SilphCo2TrainerHeader3: ; 59db4 (16:5db4)
+SilphCo2TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_3
@@ -137,7 +137,7 @@
 
 	db $ff
 
-SilphCo2Text1: ; 59dc1 (16:5dc1)
+SilphCo2Text1:
 	TX_ASM
 	CheckEvent EVENT_GOT_TM36
 	jr nz, .asm_59de4
@@ -156,90 +156,90 @@
 	call PrintText
 	jp TextScriptEnd
 
-SilphCo2Text_59ded: ; 59ded (16:5ded)
+SilphCo2Text_59ded:
 	TX_FAR _SilphCo2Text_59ded
 	db "@"
 
-ReceivedTM36Text: ; 59df2 (16:5df2)
+ReceivedTM36Text:
 	TX_FAR _ReceivedTM36Text
 	db $0B, "@"
 
-TM36ExplanationText: ; 59df8 (16:5df8)
+TM36ExplanationText:
 	TX_FAR _TM36ExplanationText
 	db "@"
 
-TM36NoRoomText: ; 59dfd (16:5dfd)
+TM36NoRoomText:
 	TX_FAR _TM36NoRoomText
 	db "@"
 
-SilphCo2Text2: ; 59e02 (16:5e02)
+SilphCo2Text2:
 	TX_ASM
 	ld hl, SilphCo2TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo2Text3: ; 59e0c (16:5e0c)
+SilphCo2Text3:
 	TX_ASM
 	ld hl, SilphCo2TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo2Text4: ; 59e16 (16:5e16)
+SilphCo2Text4:
 	TX_ASM
 	ld hl, SilphCo2TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo2Text5: ; 59e20 (16:5e20)
+SilphCo2Text5:
 	TX_ASM
 	ld hl, SilphCo2TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo2BattleText1: ; 59e2a (16:5e2a)
+SilphCo2BattleText1:
 	TX_FAR _SilphCo2BattleText1
 	db "@"
 
-SilphCo2EndBattleText1: ; 59e2f (16:5e2f)
+SilphCo2EndBattleText1:
 	TX_FAR _SilphCo2EndBattleText1
 	db "@"
 
-SilphCo2AfterBattleText1: ; 59e34 (16:5e34)
+SilphCo2AfterBattleText1:
 	TX_FAR _SilphCo2AfterBattleText1
 	db "@"
 
-SilphCo2BattleText2: ; 59e39 (16:5e39)
+SilphCo2BattleText2:
 	TX_FAR _SilphCo2BattleText2
 	db "@"
 
-SilphCo2EndBattleText2: ; 59e3e (16:5e3e)
+SilphCo2EndBattleText2:
 	TX_FAR _SilphCo2EndBattleText2
 	db "@"
 
-SilphCo2AfterBattleText2: ; 59e43 (16:5e43)
+SilphCo2AfterBattleText2:
 	TX_FAR _SilphCo2AfterBattleText2
 	db "@"
 
-SilphCo2BattleText3: ; 59e48 (16:5e48)
+SilphCo2BattleText3:
 	TX_FAR _SilphCo2BattleText3
 	db "@"
 
-SilphCo2EndBattleText3: ; 59e4d (16:5e4d)
+SilphCo2EndBattleText3:
 	TX_FAR _SilphCo2EndBattleText3
 	db "@"
 
-SilphCo2AfterBattleText3: ; 59e52 (16:5e52)
+SilphCo2AfterBattleText3:
 	TX_FAR _SilphCo2AfterBattleText3
 	db "@"
 
-SilphCo2BattleText4: ; 59e57 (16:5e57)
+SilphCo2BattleText4:
 	TX_FAR _SilphCo2BattleText4
 	db "@"
 
-SilphCo2EndBattleText4: ; 59e5c (16:5e5c)
+SilphCo2EndBattleText4:
 	TX_FAR _SilphCo2EndBattleText4
 	db "@"
 
-SilphCo2AfterBattleText4: ; 59e61 (16:5e61)
+SilphCo2AfterBattleText4:
 	TX_FAR _SilphCo2AfterBattleText4
 	db "@"
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@@ -1,4 +1,4 @@
-SilphCo3Script: ; 59f5b (16:5f5b)
+SilphCo3Script:
 	call SilphCo3Script_59f71
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo3TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wSilphCo3CurScript], a
 	ret
 
-SilphCo3Script_59f71: ; 59f71 (16:5f71)
+SilphCo3Script_59f71:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -32,12 +32,12 @@
 	lb bc, 4, 8
 	predef_jump ReplaceTileBlock
 
-SilphCo3GateCoords: ; 59fa8 (16:5fa8)
+SilphCo3GateCoords:
 	db $04,$04
 	db $04,$08
 	db $FF
 
-SilphCo3Script_59fad: ; 59fad (16:5fad)
+SilphCo3Script_59fad:
 	EventFlagAddress hl, EVENT_SILPH_CO_3_UNLOCKED_DOOR1
 	ld a, [$ffe0]
 	and a
@@ -50,19 +50,19 @@
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1
 	ret
 
-SilphCo3ScriptPointers: ; 59fbe (16:5fbe)
+SilphCo3ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo3TextPointers: ; 59fc4 (16:5fc4)
+SilphCo3TextPointers:
 	dw SilphCo3Text1
 	dw SilphCo3Text2
 	dw SilphCo3Text3
 	dw PickUpItemText
 
-SilphCo3TrainerHeaders: ; 59fcc (16:5fcc)
-SilphCo3TrainerHeader0: ; 59fcc (16:5fcc)
+SilphCo3TrainerHeaders:
+SilphCo3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_0
@@ -71,7 +71,7 @@
 	dw SilphCo3EndBattleText1 ; TextEndBattle
 	dw SilphCo3EndBattleText1 ; TextEndBattle
 
-SilphCo3TrainerHeader1: ; 59fd8 (16:5fd8)
+SilphCo3TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_1
@@ -82,7 +82,7 @@
 
 	db $ff
 
-SilphCo3Text1: ; 59fe5 (16:5fe5)
+SilphCo3Text1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ld hl, SilphCo3Text_59ffe
@@ -92,46 +92,46 @@
 	call PrintText
 	jp TextScriptEnd
 
-SilphCo3Text_59ff9: ; 59ff9 (16:5ff9)
+SilphCo3Text_59ff9:
 	TX_FAR _SilphCo3Text_59ff9
 	db "@"
 
-SilphCo3Text_59ffe: ; 59ffe (16:5ffe)
+SilphCo3Text_59ffe:
 	TX_FAR _SilphCo3Text_59ffe
 	db "@"
 
-SilphCo3Text2: ; 5a003 (16:6003)
+SilphCo3Text2:
 	TX_ASM
 	ld hl, SilphCo3TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo3BattleText1: ; 5a00d (16:600d)
+SilphCo3BattleText1:
 	TX_FAR _SilphCo3BattleText1
 	db "@"
 
-SilphCo3EndBattleText1: ; 5a012 (16:6012)
+SilphCo3EndBattleText1:
 	TX_FAR _SilphCo3EndBattleText1
 	db "@"
 
-SilphCo3AfterBattleText1: ; 5a017 (16:6017)
+SilphCo3AfterBattleText1:
 	TX_FAR _SilphCo3AfterBattleText1
 	db "@"
 
-SilphCo3Text3: ; 5a01c (16:601c)
+SilphCo3Text3:
 	TX_ASM
 	ld hl, SilphCo3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo3BattleText2: ; 5a026 (16:6026)
+SilphCo3BattleText2:
 	TX_FAR _SilphCo3BattleText2
 	db "@"
 
-SilphCo3EndBattleText2: ; 5a02b (16:602b)
+SilphCo3EndBattleText2:
 	TX_FAR _SilphCo3EndBattleText2
 	db "@"
 
-SilphCo3AfterBattleText2: ; 5a030 (16:6030)
+SilphCo3AfterBattleText2:
 	TX_FAR _SilphCo3AfterBattleText2
 	db "@"
--- a/scripts/silphco4.asm
+++ b/scripts/silphco4.asm
@@ -1,4 +1,4 @@
-SilphCo4Script: ; 19d0b (6:5d0b)
+SilphCo4Script:
 	call SilphCo4Script_19d21
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo4TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wSilphCo4CurScript], a
 	ret
 
-SilphCo4Script_19d21: ; 19d21 (6:5d21)
+SilphCo4Script_19d21:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -32,12 +32,12 @@
 	lb bc, 4, 6
 	predef_jump ReplaceTileBlock
 
-SilphCo4GateCoords: ; 19d58 (6:5d58)
+SilphCo4GateCoords:
 	db $06,$02
 	db $04,$06
 	db $FF
 
-SilphCo4Script_19d5d: ; 19d5d (6:5d5d)
+SilphCo4Script_19d5d:
 	push hl
 	ld hl, wCardKeyDoorY
 	ld a, [hli]
@@ -73,7 +73,7 @@
 	ld [$ffe0], a
 	ret
 
-SilphCo4Script_19d89: ; 19d89 (6:5d89)
+SilphCo4Script_19d89:
 	EventFlagAddress hl, EVENT_SILPH_CO_4_UNLOCKED_DOOR1
 	ld a, [$ffe0]
 	and a
@@ -86,12 +86,12 @@
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1
 	ret
 
-SilphCo4ScriptPointers: ; 19d9a (6:5d9a)
+SilphCo4ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo4TextPointers: ; 19da0 (6:5da0)
+SilphCo4TextPointers:
 	dw SilphCo4Text1
 	dw SilphCo4Text2
 	dw SilphCo4Text3
@@ -100,8 +100,8 @@
 	dw PickUpItemText
 	dw PickUpItemText
 
-SilphCo4TrainerHeaders: ; 19dae (6:5dae)
-SilphCo4TrainerHeader0: ; 19dae (6:5dae)
+SilphCo4TrainerHeaders:
+SilphCo4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_0
@@ -110,7 +110,7 @@
 	dw SilphCo4EndBattleText2 ; TextEndBattle
 	dw SilphCo4EndBattleText2 ; TextEndBattle
 
-SilphCo4TrainerHeader2: ; 19dba (6:5dba)
+SilphCo4TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2
@@ -119,7 +119,7 @@
 	dw SilphCo4EndBattleText3 ; TextEndBattle
 	dw SilphCo4EndBattleText3 ; TextEndBattle
 
-SilphCo4TrainerHeader3: ; 19dc6 (6:5dc6)
+SilphCo4TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_3
@@ -130,7 +130,7 @@
 
 	db $ff
 
-SilphCo4Text1: ; 19dd3 (6:5dd3)
+SilphCo4Text1:
 	TX_ASM
 	ld hl, SilphCo4Text_19de0
 	ld de, SilphCo4Text_19de5
@@ -137,64 +137,64 @@
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo4Text_19de0: ; 19de0 (6:5de0)
+SilphCo4Text_19de0:
 	TX_FAR _SilphCo4Text_19de0
 	db "@"
 
-SilphCo4Text_19de5: ; 19de5 (6:5de5)
+SilphCo4Text_19de5:
 	TX_FAR _SilphCo4Text_19de5
 	db "@"
 
-SilphCo4Text2: ; 19dea (6:5dea)
+SilphCo4Text2:
 	TX_ASM
 	ld hl, SilphCo4TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo4BattleText2: ; 19df4 (6:5df4)
+SilphCo4BattleText2:
 	TX_FAR _SilphCo4BattleText2
 	db "@"
 
-SilphCo4EndBattleText2: ; 19df9 (6:5df9)
+SilphCo4EndBattleText2:
 	TX_FAR _SilphCo4EndBattleText2
 	db "@"
 
-SilphCo4AfterBattleText2: ; 19dfe (6:5dfe)
+SilphCo4AfterBattleText2:
 	TX_FAR _SilphCo4AfterBattleText2
 	db "@"
 
-SilphCo4Text3: ; 19e03 (6:5e03)
+SilphCo4Text3:
 	TX_ASM
 	ld hl, SilphCo4TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo4BattleText3: ; 19e0d (6:5e0d)
+SilphCo4BattleText3:
 	TX_FAR _SilphCo4BattleText3
 	db "@"
 
-SilphCo4EndBattleText3: ; 19e12 (6:5e12)
+SilphCo4EndBattleText3:
 	TX_FAR _SilphCo4EndBattleText3
 	db "@"
 
-SilphCo4AfterBattleText3: ; 19e17 (6:5e17)
+SilphCo4AfterBattleText3:
 	TX_FAR _SilphCo4AfterBattleText3
 	db "@"
 
-SilphCo4Text4: ; 19e1c (6:5e1c)
+SilphCo4Text4:
 	TX_ASM
 	ld hl, SilphCo4TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo4BattleText4: ; 19e26 (6:5e26)
+SilphCo4BattleText4:
 	TX_FAR _SilphCo4BattleText4
 	db "@"
 
-SilphCo4EndBattleText4: ; 19e2b (6:5e2b)
+SilphCo4EndBattleText4:
 	TX_FAR _SilphCo4EndBattleText4
 	db "@"
 
-SilphCo4AfterBattleText4: ; 19e30 (6:5e30)
+SilphCo4AfterBattleText4:
 	TX_FAR _SilphCo4AfterBattleText4
 	db "@"
--- a/scripts/silphco5.asm
+++ b/scripts/silphco5.asm
@@ -1,4 +1,4 @@
-SilphCo5Script: ; 19f37 (6:5f37)
+SilphCo5Script:
 	call SilphCo5Script_19f4d
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo5TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wSilphCo5CurScript], a
 	ret
 
-SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
+SilphCo5Script_19f4d:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -41,13 +41,13 @@
 	lb bc, 5, 7
 	predef_jump ReplaceTileBlock
 
-SilphCo5GateCoords: ; 19f97 (6:5f97)
+SilphCo5GateCoords:
 	db $02,$03
 	db $06,$03
 	db $05,$07
 	db $FF
 
-SilphCo5Script_19f9e: ; 19f9e (6:5f9e)
+SilphCo5Script_19f9e:
 	EventFlagAddress hl, EVENT_SILPH_CO_5_UNLOCKED_DOOR1
 	ld a, [$ffe0]
 	and a
@@ -65,12 +65,12 @@
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1
 	ret
 
-SilphCo5ScriptPointers: ; 19fb6 (6:5fb6)
+SilphCo5ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo5TextPointers: ; 19fbc (6:5fbc)
+SilphCo5TextPointers:
 	dw SilphCo5Text1
 	dw SilphCo5Text2
 	dw SilphCo5Text3
@@ -83,8 +83,8 @@
 	dw SilphCo5Text10
 	dw SilphCo5Text11
 
-SilphCo5TrainerHeaders: ; 19fd2 (6:5fd2)
-Silphco5TrainerHeader0: ; 19fd2 (6:5fd2)
+SilphCo5TrainerHeaders:
+Silphco5TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0
@@ -93,7 +93,7 @@
 	dw SilphCo5EndBattleText2 ; TextEndBattle
 	dw SilphCo5EndBattleText2 ; TextEndBattle
 
-Silphco5TrainerHeader2: ; 19fde (6:5fde)
+Silphco5TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2
@@ -102,7 +102,7 @@
 	dw SilphCo5EndBattleText3 ; TextEndBattle
 	dw SilphCo5EndBattleText3 ; TextEndBattle
 
-Silphco5TrainerHeader3: ; 19fea (6:5fea)
+Silphco5TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3
@@ -111,7 +111,7 @@
 	dw SilphCo5EndBattleText4 ; TextEndBattle
 	dw SilphCo5EndBattleText4 ; TextEndBattle
 
-Silphco5TrainerHeader4: ; 19ff6 (6:5ff6)
+Silphco5TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_4
@@ -122,7 +122,7 @@
 
 	db $ff
 
-SilphCo5Text1: ; 1a003 (6:6003)
+SilphCo5Text1:
 	TX_ASM
 	ld hl, SilphCo5Text_1a010
 	ld de, SilphCo5Text_1a015
@@ -129,94 +129,94 @@
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo5Text_1a010: ; 1a010 (6:6010)
+SilphCo5Text_1a010:
 	TX_FAR _SilphCo5Text_1a010
 	db "@"
 
-SilphCo5Text_1a015: ; 1a015 (6:6015)
+SilphCo5Text_1a015:
 	TX_FAR _SilphCo5Text_1a015
 	db "@"
 
-SilphCo5Text2: ; 1a01a (6:601a)
+SilphCo5Text2:
 	TX_ASM
 	ld hl, Silphco5TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo5BattleText2: ; 1a024 (6:6024)
+SilphCo5BattleText2:
 	TX_FAR _SilphCo5BattleText2
 	db "@"
 
-SilphCo5EndBattleText2: ; 1a029 (6:6029)
+SilphCo5EndBattleText2:
 	TX_FAR _SilphCo5EndBattleText2
 	db "@"
 
-SilphCo5AfterBattleText2: ; 1a02e (6:602e)
+SilphCo5AfterBattleText2:
 	TX_FAR _SilphCo5AfterBattleText2
 	db "@"
 
-SilphCo5Text3: ; 1a033 (6:6033)
+SilphCo5Text3:
 	TX_ASM
 	ld hl, Silphco5TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo5BattleText3: ; 1a03d (6:603d)
+SilphCo5BattleText3:
 	TX_FAR _SilphCo5BattleText3
 	db "@"
 
-SilphCo5EndBattleText3: ; 1a042 (6:6042)
+SilphCo5EndBattleText3:
 	TX_FAR _SilphCo5EndBattleText3
 	db "@"
 
-SilphCo5AfterBattleText3: ; 1a047 (6:6047)
+SilphCo5AfterBattleText3:
 	TX_FAR _SilphCo5AfterBattleText3
 	db "@"
 
-SilphCo5Text4: ; 1a04c (6:604c)
+SilphCo5Text4:
 	TX_ASM
 	ld hl, Silphco5TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo5BattleText4: ; 1a056 (6:6056)
+SilphCo5BattleText4:
 	TX_FAR _SilphCo5BattleText4
 	db "@"
 
-SilphCo5EndBattleText4: ; 1a05b (6:605b)
+SilphCo5EndBattleText4:
 	TX_FAR _SilphCo5EndBattleText4
 	db "@"
 
-SilphCo5AfterBattleText4: ; 1a060 (6:6060)
+SilphCo5AfterBattleText4:
 	TX_FAR _SilphCo5AfterBattleText4
 	db "@"
 
-SilphCo5Text5: ; 1a065 (6:6065)
+SilphCo5Text5:
 	TX_ASM
 	ld hl, Silphco5TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo5BattleText5: ; 1a06f (6:606f)
+SilphCo5BattleText5:
 	TX_FAR _SilphCo5BattleText5
 	db "@"
 
-SilphCo5EndBattleText5: ; 1a074 (6:6074)
+SilphCo5EndBattleText5:
 	TX_FAR _SilphCo5EndBattleText5
 	db "@"
 
-SilphCo5AfterBattleText5: ; 1a079 (6:6079)
+SilphCo5AfterBattleText5:
 	TX_FAR _SilphCo5AfterBattleText5
 	db "@"
 
-SilphCo5Text9: ; 1a07e (6:607e)
+SilphCo5Text9:
 	TX_FAR _SilphCo5Text9
 	db "@"
 
-SilphCo5Text10: ; 1a083 (6:6083)
+SilphCo5Text10:
 	TX_FAR _SilphCo5Text10
 	db "@"
 
-SilphCo5Text11: ; 1a088 (6:6088)
+SilphCo5Text11:
 	TX_FAR _SilphCo5Text11
 	db "@"
--- a/scripts/silphco6.asm
+++ b/scripts/silphco6.asm
@@ -1,4 +1,4 @@
-SilphCo6Script: ; 1a1a9 (6:61a9)
+SilphCo6Script:
 	call SilphCo6Script_1a1bf
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo6TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wSilphCo6CurScript], a
 	ret
 
-SilphCo6Script_1a1bf: ; 1a1bf (6:61bf)
+SilphCo6Script_1a1bf:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -23,11 +23,11 @@
 	lb bc, 6, 2
 	predef_jump ReplaceTileBlock
 
-SilphCo6GateCoords: ; 1a1e3 (6:61e3)
+SilphCo6GateCoords:
 	db $06,$02
 	db $FF
 
-SilphCo6Script_1a1e6: ; 1a1e6 (6:61e6)
+SilphCo6Script_1a1e6:
 	ld a, [$ffe0]
 	and a
 	ret z
@@ -34,12 +34,12 @@
 	SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR
 	ret
 
-SilphCo6ScriptPointers: ; 1a1f0 (6:61f0)
+SilphCo6ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo6TextPointers: ; 1a1f6 (6:61f6)
+SilphCo6TextPointers:
 	dw SilphCo6Text1
 	dw SilphCo6Text2
 	dw SilphCo6Text3
@@ -51,8 +51,8 @@
 	dw PickUpItemText
 	dw PickUpItemText
 
-SilphCo6TrainerHeaders: ; 1a20a (6:620a)
-SilphCo6TrainerHeader0: ; 1a20a (6:620a)
+SilphCo6TrainerHeaders:
+SilphCo6TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_0
@@ -61,7 +61,7 @@
 	dw SilphCo6EndBattleText2 ; TextEndBattle
 	dw SilphCo6EndBattleText2 ; TextEndBattle
 
-SilphCo6TrainerHeader2: ; 1a216 (6:6216)
+SilphCo6TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2
@@ -70,7 +70,7 @@
 	dw SilphCo6EndBattleText3 ; TextEndBattle
 	dw SilphCo6EndBattleText3 ; TextEndBattle
 
-SilphCo6TrainerHeader3: ; 1a222 (6:6222)
+SilphCo6TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1
@@ -81,7 +81,7 @@
 
 	db $ff
 
-SilphCo6Script_1a22f: ; 1a22f (6:622f)
+SilphCo6Script_1a22f:
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	jr nz, .asm_1a238
 	jr .asm_1a23a
@@ -91,7 +91,7 @@
 .asm_1a23a
 	jp PrintText
 
-SilphCo6Text1: ; 1a23d (6:623d)
+SilphCo6Text1:
 	TX_ASM
 	ld hl, SilphCo6Text_1a24a
 	ld de, SilphCo6Text_1a24f
@@ -98,15 +98,15 @@
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo6Text_1a24a: ; 1a24a (6:624a)
+SilphCo6Text_1a24a:
 	TX_FAR _SilphCo6Text_1a24a
 	db "@"
 
-SilphCo6Text_1a24f: ; 1a24f (6:624f)
+SilphCo6Text_1a24f:
 	TX_FAR _SilphCo6Text_1a24f
 	db "@"
 
-SilphCo6Text2: ; 1a254 (6:6254)
+SilphCo6Text2:
 	TX_ASM
 	ld hl, SilphCo6Text_1a261
 	ld de, SilphCo6Text_1a266
@@ -113,15 +113,15 @@
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo6Text_1a261: ; 1a261 (6:6261)
+SilphCo6Text_1a261:
 	TX_FAR _SilphCo6Text_1a261
 	db "@"
 
-SilphCo6Text_1a266: ; 1a266 (6:6266)
+SilphCo6Text_1a266:
 	TX_FAR _SilphCo6Text_1a266
 	db "@"
 
-SilphCo6Text3: ; 1a26b (6:626b)
+SilphCo6Text3:
 	TX_ASM
 	ld hl, SilphCo6Text_1a278
 	ld de, SilphCo6Text_1a27d
@@ -128,15 +128,15 @@
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo6Text_1a278: ; 1a278 (6:6278)
+SilphCo6Text_1a278:
 	TX_FAR _SilphCo6Text_1a278
 	db "@"
 
-SilphCo6Text_1a27d: ; 1a27d (6:627d)
+SilphCo6Text_1a27d:
 	TX_FAR _SilphCo6Text_1a27d
 	db "@"
 
-SilphCo6Text4: ; 1a282 (6:6282)
+SilphCo6Text4:
 	TX_ASM
 	ld hl, SilphCo6Text_1a28f
 	ld de, SilphCo6Text_1a294
@@ -143,15 +143,15 @@
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo6Text_1a28f: ; 1a28f (6:628f)
+SilphCo6Text_1a28f:
 	TX_FAR _SilphCo6Text_1a28f
 	db "@"
 
-SilphCo6Text_1a294: ; 1a294 (6:6294)
+SilphCo6Text_1a294:
 	TX_FAR _SilphCo6Text_1a294
 	db "@"
 
-SilphCo6Text5: ; 1a299 (6:6299)
+SilphCo6Text5:
 	TX_ASM
 	ld hl, SilphCo6Text_1a2a6
 	ld de, SilphCo6Text_1a2ab
@@ -158,64 +158,64 @@
 	call SilphCo6Script_1a22f
 	jp TextScriptEnd
 
-SilphCo6Text_1a2a6: ; 1a2a6 (6:62a6)
+SilphCo6Text_1a2a6:
 	TX_FAR _SilphCo6Text_1a2a6
 	db "@"
 
-SilphCo6Text_1a2ab: ; 1a2ab (6:62ab)
+SilphCo6Text_1a2ab:
 	TX_FAR _SilphCo6Text_1a2ab
 	db "@"
 
-SilphCo6Text6: ; 1a2b0 (6:62b0)
+SilphCo6Text6:
 	TX_ASM
 	ld hl, SilphCo6TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo6BattleText2: ; 1a2ba (6:62ba)
+SilphCo6BattleText2:
 	TX_FAR _SilphCo6BattleText2
 	db "@"
 
-SilphCo6EndBattleText2: ; 1a2bf (6:62bf)
+SilphCo6EndBattleText2:
 	TX_FAR _SilphCo6EndBattleText2
 	db "@"
 
-SilphCo6AfterBattleText2: ; 1a2c4 (6:62c4)
+SilphCo6AfterBattleText2:
 	TX_FAR _SilphCo6AfterBattleText2
 	db "@"
 
-SilphCo6Text7: ; 1a2c9 (6:62c9)
+SilphCo6Text7:
 	TX_ASM
 	ld hl, SilphCo6TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo6BattleText3: ; 1a2d3 (6:62d3)
+SilphCo6BattleText3:
 	TX_FAR _SilphCo6BattleText3
 	db "@"
 
-SilphCo6EndBattleText3: ; 1a2d8 (6:62d8)
+SilphCo6EndBattleText3:
 	TX_FAR _SilphCo6EndBattleText3
 	db "@"
 
-SilphCo6AfterBattleText3: ; 1a2dd (6:62dd)
+SilphCo6AfterBattleText3:
 	TX_FAR _SilphCo6AfterBattleText3
 	db "@"
 
-SilphCo6Text8: ; 1a2e2 (6:62e2)
+SilphCo6Text8:
 	TX_ASM
 	ld hl, SilphCo6TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo6BattleText4: ; 1a2ec (6:62ec)
+SilphCo6BattleText4:
 	TX_FAR _SilphCo6BattleText4
 	db "@"
 
-SilphCo6EndBattleText4: ; 1a2f1 (6:62f1)
+SilphCo6EndBattleText4:
 	TX_FAR _SilphCo6EndBattleText4
 	db "@"
 
-SilphCo6AfterBattleText4: ; 1a2f6 (6:62f6)
+SilphCo6AfterBattleText4:
 	TX_FAR _SilphCo6AfterBattleText4
 	db "@"
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -1,4 +1,4 @@
-SilphCo7Script: ; 51b61 (14:5b61)
+SilphCo7Script:
 	call SilphCo7Script_51b77
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo7TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wSilphCo7CurScript], a
 	ret
 
-SilphCo7Script_51b77: ; 51b77 (14:5b77)
+SilphCo7Script_51b77:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -41,13 +41,13 @@
 	lb bc, 6, 10
 	predef_jump ReplaceTileBlock
 
-SilphCo7GateCoords: ; 51bc1 (14:5bc1)
+SilphCo7GateCoords:
 	db $03,$05
 	db $02,$0A
 	db $06,$0A
 	db $FF
 
-SilphCo7Text_51bc8: ; 51bc8 (14:5bc8)
+SilphCo7Text_51bc8:
 	push hl
 	ld hl, wCardKeyDoorY
 	ld a, [hli]
@@ -83,7 +83,7 @@
 	ld [$ffe0], a
 	ret
 
-SilphCo7Text_51bf4: ; 51bf4 (14:5bf4)
+SilphCo7Text_51bf4:
 	EventFlagAddress hl, EVENT_SILPH_CO_7_UNLOCKED_DOOR1
 	ld a, [$ffe0]
 	and a
@@ -101,16 +101,16 @@
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR3, EVENT_SILPH_CO_7_UNLOCKED_DOOR1
 	ret
 
-SilphCo7Text_51c0c: ; 51c0c (14:5c0c)
+SilphCo7Text_51c0c:
 	xor a
 	ld [wJoyIgnore], a
 
-SilphCo7Text_51c10: ; 51c10 (14:5c10)
+SilphCo7Text_51c10:
 	ld [wSilphCo7CurScript], a
 	ld [wCurMapScript], a
 	ret
 
-SilphCo7ScriptPointers: ; 51c17 (14:5c17)
+SilphCo7ScriptPointers:
 	dw SilphCo7Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -118,7 +118,7 @@
 	dw SilphCo7Script4
 	dw SilphCo7Script5
 
-SilphCo7Script0: ; 51c23 (14:5c23)
+SilphCo7Script0:
 	CheckEvent EVENT_BEAT_SILPH_CO_RIVAL
 	jp nz, CheckFightingMapTrainers
 	ld hl, CoordsData_51c78
@@ -155,12 +155,12 @@
 	ld a, $3
 	jp SilphCo7Text_51c10
 
-CoordsData_51c78: ; 51c78 (14:5c78)
+CoordsData_51c78:
 	db $02,$03
 	db $03,$03
 	db $FF
 
-MovementData_51c7d: ; 51c7d (14:5c7d)
+MovementData_51c7d:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
@@ -167,7 +167,7 @@
 	db NPC_MOVEMENT_UP
 	db $FF
 
-SilphCo7Script3: ; 51c82 (14:5c82)
+SilphCo7Script3:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -202,7 +202,7 @@
 	ld a, $4
 	jp SilphCo7Text_51c10
 
-SilphCo7Script4: ; 51cc8 (14:5cc8)
+SilphCo7Script4:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SilphCo7Text_51c0c
@@ -235,12 +235,12 @@
 	ld a, $5
 	jp SilphCo7Text_51c10
 
-MovementData_51d1a: ; 51d1a (14:5d1a)
+MovementData_51d1a:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
 	db $FF
 
-MovementData_51d1d: ; 51d1d (14:5d1d)
+MovementData_51d1d:
 	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
@@ -250,7 +250,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-SilphCo7Script5: ; 51d25 (14:5d25)
+SilphCo7Script5:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -262,7 +262,7 @@
 	ld [wJoyIgnore], a
 	jp SilphCo7Text_51c10
 
-SilphCo7TextPointers: ; 51d3f (14:5d3f)
+SilphCo7TextPointers:
 	dw SilphCo7Text1
 	dw SilphCo7Text2
 	dw SilphCo7Text3
@@ -279,8 +279,8 @@
 	dw SilphCo7Text14
 	dw SilphCo7Text15
 
-SilphCo7TrainerHeaders: ; 51d5d (14:5d5d)
-SilphCo7TrainerHeader0: ; 51d5d (14:5d5d)
+SilphCo7TrainerHeaders:
+SilphCo7TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_0
@@ -289,7 +289,7 @@
 	dw SilphCo7EndBattleText1 ; TextEndBattle
 	dw SilphCo7EndBattleText1 ; TextEndBattle
 
-SilphCo7TrainerHeader2: ; 51d69 (14:5d69)
+SilphCo7TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2
@@ -298,7 +298,7 @@
 	dw SilphCo7EndBattleText2 ; TextEndBattle
 	dw SilphCo7EndBattleText2 ; TextEndBattle
 
-SilphCo7TrainerHeader3: ; 51d75 (14:5d75)
+SilphCo7TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3
@@ -307,7 +307,7 @@
 	dw SilphCo7EndBattleText3 ; TextEndBattle
 	dw SilphCo7EndBattleText3 ; TextEndBattle
 
-SilphCo7TrainerHeader4: ; 51d81 (14:5d81)
+SilphCo7TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1
@@ -429,100 +429,100 @@
 	TX_FAR _SilphCo7Text_51e4b
 	db "@"
 
-SilphCo7Text5: ; 51e50 (14:5e50)
+SilphCo7Text5:
 	TX_ASM
 	ld hl, SilphCo7TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo7BattleText1: ; 51e5a (14:5e5a)
+SilphCo7BattleText1:
 	TX_FAR _SilphCo7BattleText1
 	db "@"
 
-SilphCo7EndBattleText1: ; 51e5f (14:5e5f)
+SilphCo7EndBattleText1:
 	TX_FAR _SilphCo7EndBattleText1
 	db "@"
 
-SilphCo7AfterBattleText1: ; 51e64 (14:5e64)
+SilphCo7AfterBattleText1:
 	TX_FAR _SilphCo7AfterBattleText1
 	db "@"
 
-SilphCo7Text6: ; 51e69 (14:5e69)
+SilphCo7Text6:
 	TX_ASM
 	ld hl, SilphCo7TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo7BattleText2: ; 51e73 (14:5e73)
+SilphCo7BattleText2:
 	TX_FAR _SilphCo7BattleText2
 	db "@"
 
-SilphCo7EndBattleText2: ; 51e78 (14:5e78)
+SilphCo7EndBattleText2:
 	TX_FAR _SilphCo7EndBattleText2
 	db "@"
 
-SilphCo7AfterBattleText2: ; 51e7d (14:5e7d)
+SilphCo7AfterBattleText2:
 	TX_FAR _SilphCo7AfterBattleText2
 	db "@"
 
-SilphCo7Text7: ; 51e82 (14:5e82)
+SilphCo7Text7:
 	TX_ASM
 	ld hl, SilphCo7TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo7BattleText3: ; 51e8c (14:5e8c)
+SilphCo7BattleText3:
 	TX_FAR _SilphCo7BattleText3
 	db "@"
 
-SilphCo7EndBattleText3: ; 51e91 (14:5e91)
+SilphCo7EndBattleText3:
 	TX_FAR _SilphCo7EndBattleText3
 	db "@"
 
-SilphCo7AfterBattleText3: ; 51e96 (14:5e96)
+SilphCo7AfterBattleText3:
 	TX_FAR _SilphCo7AfterBattleText3
 	db "@"
 
-SilphCo7Text8: ; 51e9b (14:5e9b)
+SilphCo7Text8:
 	TX_ASM
 	ld hl, SilphCo7TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo7BattleText4: ; 51ea5 (14:5ea5)
+SilphCo7BattleText4:
 	TX_FAR _SilphCo7BattleText4
 	db "@"
 
-SilphCo7EndBattleText4: ; 51eaa (14:5eaa)
+SilphCo7EndBattleText4:
 	TX_FAR _SilphCo7EndBattleText4
 	db "@"
 
-SilphCo7AfterBattleText4: ; 51eaf (14:5eaf)
+SilphCo7AfterBattleText4:
 	TX_FAR _SilphCo7AfterBattleText4
 	db "@"
 
-SilphCo7Text9: ; 51eb4 (14:5eb4)
+SilphCo7Text9:
 	TX_ASM
 	ld hl, SilphCo7Text_51ebe
 	call PrintText
 	jp TextScriptEnd
 
-SilphCo7Text_51ebe: ; 51ebe (14:5ebe)
+SilphCo7Text_51ebe:
 	TX_FAR _SilphCo7Text_51ebe
 	db "@"
 
-SilphCo7Text13: ; 51ec3 (14:5ec3)
+SilphCo7Text13:
 	TX_FAR _SilphCo7Text_51ec3
 	db "@"
 
-SilphCo7Text14: ; 51ec8 (14:5ec8)
+SilphCo7Text14:
 	TX_FAR _SilphCo7Text_51ec8
 	db "@"
 
-SilphCo7Text_51ecd: ; 51ecd (14:5ecd)
+SilphCo7Text_51ecd:
 	TX_FAR _SilphCo7Text_51ecd
 	db "@"
 
-SilphCo7Text15: ; 51ed2 (14:5ed2)
+SilphCo7Text15:
 	TX_FAR _SilphCo7Text_51ed2
 	db "@"
--- a/scripts/silphco8.asm
+++ b/scripts/silphco8.asm
@@ -1,4 +1,4 @@
-SilphCo8Script: ; 56504 (15:6504)
+SilphCo8Script:
 	call SilphCo8Script_5651a
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo8TrainerHeader0
@@ -8,7 +8,7 @@
 	ld [wSilphCo8CurScript], a
 	ret
 
-SilphCo8Script_5651a: ; 5651a (15:651a)
+SilphCo8Script_5651a:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -23,11 +23,11 @@
 	lb bc, 4, 3
 	predef_jump ReplaceTileBlock
 
-SilphCo8GateCoords: ; 5653e (15:653e)
+SilphCo8GateCoords:
 	db $04,$03
 	db $FF
 
-SilphCo8Script_56541: ; 56541 (15:6541)
+SilphCo8Script_56541:
 	push hl
 	ld hl, wCardKeyDoorY
 	ld a, [hli]
@@ -63,7 +63,7 @@
 	ld [$ffe0], a
 	ret
 
-SilphCo8Script_5656d: ; 5656d (15:656d)
+SilphCo8Script_5656d:
 	ld a, [$ffe0]
 	and a
 	ret z
@@ -70,19 +70,19 @@
 	SetEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR
 	ret
 
-SilphCo8ScriptPointers: ; 56577 (15:6577)
+SilphCo8ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo8TextPointers: ; 5657d (15:657d)
+SilphCo8TextPointers:
 	dw SilphCo8Text1
 	dw SilphCo8Text2
 	dw SilphCo8Text3
 	dw SilphCo8Text4
 
-SilphCo8TrainerHeaders: ; 56585 (15:6585)
-SilphCo8TrainerHeader0: ; 56585 (15:6585)
+SilphCo8TrainerHeaders:
+SilphCo8TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_0
@@ -91,7 +91,7 @@
 	dw SilphCo8EndBattleText1 ; TextEndBattle
 	dw SilphCo8EndBattleText1 ; TextEndBattle
 
-SilphCo8TrainerHeader1: ; 56591 (15:6591)
+SilphCo8TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_1
@@ -100,7 +100,7 @@
 	dw SilphCo8EndBattleText2 ; TextEndBattle
 	dw SilphCo8EndBattleText2 ; TextEndBattle
 
-SilphCo8TrainerHeader2: ; 5659d (15:659d)
+SilphCo8TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_2
@@ -111,7 +111,7 @@
 
 	db $ff
 
-SilphCo8Text1: ; 565aa (15:65aa)
+SilphCo8Text1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ld hl, SilphCo8Text_565c3
@@ -121,64 +121,64 @@
 	call PrintText
 	jp TextScriptEnd
 
-SilphCo8Text_565be: ; 565be (15:65be)
+SilphCo8Text_565be:
 	TX_FAR _SilphCo8Text_565be
 	db "@"
 
-SilphCo8Text_565c3: ; 565c3 (15:65c3)
+SilphCo8Text_565c3:
 	TX_FAR _SilphCo8Text_565c3
 	db "@"
 
-SilphCo8Text2: ; 565c8 (15:65c8)
+SilphCo8Text2:
 	TX_ASM
 	ld hl, SilphCo8TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo8Text3: ; 565d2 (15:65d2)
+SilphCo8Text3:
 	TX_ASM
 	ld hl, SilphCo8TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo8Text4: ; 565dc (15:65dc)
+SilphCo8Text4:
 	TX_ASM
 	ld hl, SilphCo8TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo8BattleText1: ; 565e6 (15:65e6)
+SilphCo8BattleText1:
 	TX_FAR _SilphCo8BattleText1
 	db "@"
 
-SilphCo8EndBattleText1: ; 565eb (15:65eb)
+SilphCo8EndBattleText1:
 	TX_FAR _SilphCo8EndBattleText1
 	db "@"
 
-SilphCo8AfterBattleText1: ; 565f0 (15:65f0)
+SilphCo8AfterBattleText1:
 	TX_FAR _SilphCo8AfterBattleText1
 	db "@"
 
-SilphCo8BattleText2: ; 565f5 (15:65f5)
+SilphCo8BattleText2:
 	TX_FAR _SilphCo8BattleText2
 	db "@"
 
-SilphCo8EndBattleText2: ; 565fa (15:65fa)
+SilphCo8EndBattleText2:
 	TX_FAR _SilphCo8EndBattleText2
 	db "@"
 
-SilphCo8AfterBattleText2: ; 565ff (15:65ff)
+SilphCo8AfterBattleText2:
 	TX_FAR _SilphCo8AfterBattleText2
 	db "@"
 
-SilphCo8BattleText3: ; 56604 (15:6604)
+SilphCo8BattleText3:
 	TX_FAR _SilphCo8BattleText3
 	db "@"
 
-SilphCo8EndBattleText3: ; 56609 (15:6609)
+SilphCo8EndBattleText3:
 	TX_FAR _SilphCo8EndBattleText3
 	db "@"
 
-SilphCo8AfterBattleText3: ; 5660e (15:660e)
+SilphCo8AfterBattleText3:
 	TX_FAR _SilphCo8AfterBattleText3
 	db "@"
--- a/scripts/silphco9.asm
+++ b/scripts/silphco9.asm
@@ -1,4 +1,4 @@
-SilphCo9Script: ; 5d7bb (17:57bb)
+SilphCo9Script:
 	call SilphCo9Script_5d7d1
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo9TrainerHeaders
@@ -8,7 +8,7 @@
 	ld [wSilphCo9CurScript], a
 	ret
 
-SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
+SilphCo9Script_5d7d1:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -50,7 +50,7 @@
 	lb bc, 6, 5
 	predef_jump ReplaceTileBlock
 
-SilphCo9GateCoords: ; 5d82e (17:582e)
+SilphCo9GateCoords:
 	db $04,$01
 	db $02,$09
 	db $05,$09
@@ -57,7 +57,7 @@
 	db $06,$05
 	db $FF
 
-SilphCo9Script_5d837: ; 5d837 (17:5837)
+SilphCo9Script_5d837:
 	push hl
 	ld hl, wCardKeyDoorY
 	ld a, [hli]
@@ -93,7 +93,7 @@
 	ld [$ffe0], a
 	ret
 
-SilphCo9Script_5d863: ; 5d863 (17:5863)
+SilphCo9Script_5d863:
 	EventFlagAddress hl, EVENT_SILPH_CO_9_UNLOCKED_DOOR1
 	ld a, [$ffe0]
 	and a
@@ -118,19 +118,19 @@
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1
 	ret
 
-SilphCo9ScriptPointers: ; 5d885 (17:5885)
+SilphCo9ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo9TextPointers: ; 5d88b (17:588b)
+SilphCo9TextPointers:
 	dw SilphCo9Text1
 	dw SilphCo9Text2
 	dw SilphCo9Text3
 	dw SilphCo9Text4
 
-SilphCo9TrainerHeaders: ; 5d893 (17:5893)
-SilphCo9TrainerHeader0: ; 5d893 (17:5893)
+SilphCo9TrainerHeaders:
+SilphCo9TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_0
@@ -139,7 +139,7 @@
 	dw SilphCo9EndBattleText1 ; TextEndBattle
 	dw SilphCo9EndBattleText1 ; TextEndBattle
 
-SilphCo9TrainerHeader1: ; 5d89f (17:589f)
+SilphCo9TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_1
@@ -148,7 +148,7 @@
 	dw SilphCo9EndBattleText2 ; TextEndBattle
 	dw SilphCo9EndBattleText2 ; TextEndBattle
 
-SilphCo9TrainerHeader2: ; 5d8ab (17:58ab)
+SilphCo9TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_2
@@ -159,7 +159,7 @@
 
 	db $ff
 
-SilphCo9Text1: ; 5d8b8 (17:58b8)
+SilphCo9Text1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	jr nz, .asm_5d8dc
@@ -178,68 +178,68 @@
 .asm_5d8e2
 	jp TextScriptEnd
 
-SilphCo9Text_5d8e5: ; 5d8e5 (17:58e5)
+SilphCo9Text_5d8e5:
 	TX_FAR _SilphCo9Text_5d8e5
 	db "@"
 
-SilphCo9Text_5d8ea: ; 5d8ea (17:58ea)
+SilphCo9Text_5d8ea:
 	TX_FAR _SilphCo9Text_5d8ea
 	db "@"
 
-SilphCo9Text_5d8ef: ; 5d8ef (17:58ef)
+SilphCo9Text_5d8ef:
 	TX_FAR _SilphCo9Text_5d8ef
 	db "@"
 
-SilphCo9Text2: ; 5d8f4 (17:58f4)
+SilphCo9Text2:
 	TX_ASM
 	ld hl, SilphCo9TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo9Text3: ; 5d8fe (17:58fe)
+SilphCo9Text3:
 	TX_ASM
 	ld hl, SilphCo9TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo9Text4: ; 5d908 (17:5908)
+SilphCo9Text4:
 	TX_ASM
 	ld hl, SilphCo9TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo9BattleText1: ; 5d912 (17:5912)
+SilphCo9BattleText1:
 	TX_FAR _SilphCo9BattleText1
 	db "@"
 
-SilphCo9EndBattleText1: ; 5d917 (17:5917)
+SilphCo9EndBattleText1:
 	TX_FAR _SilphCo9EndBattleText1
 	db "@"
 
-SilphCo9AfterBattleText1: ; 5d91c (17:591c)
+SilphCo9AfterBattleText1:
 	TX_FAR _SilphCo9AfterBattleText1
 	db "@"
 
-SilphCo9BattleText2: ; 5d921 (17:5921)
+SilphCo9BattleText2:
 	TX_FAR _SilphCo9BattleText2
 	db "@"
 
-SilphCo9EndBattleText2: ; 5d926 (17:5926)
+SilphCo9EndBattleText2:
 	TX_FAR _SilphCo9EndBattleText2
 	db "@"
 
-SilphCo9AfterBattleText2: ; 5d92b (17:592b)
+SilphCo9AfterBattleText2:
 	TX_FAR _SilphCo9AfterBattleText2
 	db "@"
 
-SilphCo9BattleText3: ; 5d930 (17:5930)
+SilphCo9BattleText3:
 	TX_FAR _SilphCo9BattleText3
 	db "@"
 
-SilphCo9EndBattleText3: ; 5d935 (17:5935)
+SilphCo9EndBattleText3:
 	TX_FAR _SilphCo9EndBattleText3
 	db "@"
 
-SilphCo9AfterBattleText3: ; 5d93a (17:593a)
+SilphCo9AfterBattleText3:
 	TX_FAR _SilphCo9AfterBattleText3
 	db "@"
--- a/scripts/silphcoelevator.asm
+++ b/scripts/silphcoelevator.asm
@@ -1,4 +1,4 @@
-SilphCoElevatorScript: ; 457c0 (11:57c0)
+SilphCoElevatorScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -14,7 +14,7 @@
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-SilphCoElevatorScript_457dc: ; 457dc (11:57dc)
+SilphCoElevatorScript_457dc:
 	ld hl, wWarpEntries
 	ld a, [wWarpedFromWhichWarp]
 	ld b, a
@@ -22,7 +22,7 @@
 	ld c, a
 	call SilphCoElevatorScript_457ea
 
-SilphCoElevatorScript_457ea: ; 457ea (11:57ea)
+SilphCoElevatorScript_457ea:
 	inc hl
 	inc hl
 	ld a, b
@@ -31,7 +31,7 @@
 	ld [hli], a
 	ret
 
-SilphCoElevatorScript_457f1: ; 457f1 (11:57f1)
+SilphCoElevatorScript_457f1:
 	ld hl, SilphCoElavatorFloors
 	call LoadItemList
 	ld hl, SilphCoElevatorWarpMaps
@@ -40,7 +40,7 @@
 	call CopyData
 	ret
 
-SilphCoElavatorFloors: ; 45804 (11:45804)
+SilphCoElavatorFloors:
 	db $0B ; num elements in list
 	db FLOOR_1F
 	db FLOOR_2F
@@ -55,7 +55,7 @@
 	db FLOOR_11F
 	db $FF ; terminator
 
-SilphCoElevatorWarpMaps: ; 45811 (11:45811)
+SilphCoElevatorWarpMaps:
 ; first byte is warp number
 ; second byte is map number
 ; These specify where the player goes after getting out of the elevator.
@@ -72,15 +72,15 @@
 	db $01, SILPH_CO_11F
 SilphCoElevatorWarpMapsEnd:
 
-SilphCoElevatorScript_45827: ; 45827 (11:5827)
+SilphCoElevatorScript_45827:
 	call Delay3
 	callba ShakeElevator
 	ret
 
-SilphCoElevatorTextPointers: ; 45833 (11:5833)
+SilphCoElevatorTextPointers:
 	dw SilphCoElevatorText1
 
-SilphCoElevatorText1: ; 45835 (11:5835)
+SilphCoElevatorText1:
 	TX_ASM
 	call SilphCoElevatorScript_457f1
 	ld hl, SilphCoElevatorWarpMaps
--- a/scripts/ssanne1.asm
+++ b/scripts/ssanne1.asm
@@ -1,15 +1,15 @@
-SSAnne1Script: ; 61265 (18:5265)
+SSAnne1Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SSAnne1TextPointers: ; 61269 (18:5269)
+SSAnne1TextPointers:
 	dw SSAnne1Text1
 	dw SSAnne1Text2
 
-SSAnne1Text1: ; 6126d (18:526d)
+SSAnne1Text1:
 	TX_FAR _SSAnne1Text1
 	db "@"
 
-SSAnne1Text2: ; 61272 (18:5272)
+SSAnne1Text2:
 	TX_FAR _SSAnne1Text2
 	db "@"
--- a/scripts/ssanne10.asm
+++ b/scripts/ssanne10.asm
@@ -1,4 +1,4 @@
-SSAnne10Script: ; 61d55 (18:5d55)
+SSAnne10Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, SSAnne10TrainerHeaders
 	ld de, SSAnne10ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wSSAnne10CurScript], a
 	ret
 
-SSAnne10ScriptPointers: ; 61d68 (18:5d68)
+SSAnne10ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne10TextPointers: ; 61d6e (18:5d6e)
+SSAnne10TextPointers:
 	dw SSAnne10Text1
 	dw SSAnne10Text2
 	dw SSAnne10Text3
@@ -25,8 +25,8 @@
 	dw PickUpItemText
 	dw PickUpItemText
 
-SSAnne10TrainerHeaders: ; 61d84 (18:5d84)
-SSAnne10TrainerHeader0: ; 61d84 (18:5d84)
+SSAnne10TrainerHeaders:
+SSAnne10TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_0
@@ -35,7 +35,7 @@
 	dw SSAnne10EndBattleText1 ; TextEndBattle
 	dw SSAnne10EndBattleText1 ; TextEndBattle
 
-SSAnne10TrainerHeader1: ; 61d90 (18:5d90)
+SSAnne10TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_1
@@ -44,7 +44,7 @@
 	dw SSAnne10EndBattleText2 ; TextEndBattle
 	dw SSAnne10EndBattleText2 ; TextEndBattle
 
-SSAnne10TrainerHeader2: ; 61d9c (18:5d9c)
+SSAnne10TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_2
@@ -53,7 +53,7 @@
 	dw SSAnne10EndBattleText3 ; TextEndBattle
 	dw SSAnne10EndBattleText3 ; TextEndBattle
 
-SSAnne10TrainerHeader3: ; 61da8 (18:5da8)
+SSAnne10TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_3
@@ -62,7 +62,7 @@
 	dw SSAnne10EndBattleText4 ; TextEndBattle
 	dw SSAnne10EndBattleText4 ; TextEndBattle
 
-SSAnne10TrainerHeader4: ; 61db4 (18:5db4)
+SSAnne10TrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_4
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_4
@@ -71,7 +71,7 @@
 	dw SSAnne10EndBattleText5 ; TextEndBattle
 	dw SSAnne10EndBattleText5 ; TextEndBattle
 
-SSAnne10TrainerHeader5: ; 61dc0 (18:5dc0)
+SSAnne10TrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_5
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_5
@@ -82,43 +82,43 @@
 
 	db $ff
 
-SSAnne10Text1: ; 61dcd (18:5dcd)
+SSAnne10Text1:
 	TX_ASM
 	ld hl, SSAnne10TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text2: ; 61dd7 (18:5dd7)
+SSAnne10Text2:
 	TX_ASM
 	ld hl, SSAnne10TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text3: ; 61de1 (18:5de1)
+SSAnne10Text3:
 	TX_ASM
 	ld hl, SSAnne10TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text4: ; 61deb (18:5deb)
+SSAnne10Text4:
 	TX_ASM
 	ld hl, SSAnne10TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text5: ; 61df5 (18:5df5)
+SSAnne10Text5:
 	TX_ASM
 	ld hl, SSAnne10TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text6: ; 61dff (18:5dff)
+SSAnne10Text6:
 	TX_ASM
 	ld hl, SSAnne10TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text8: ; 61e09 (18:5e09)
+SSAnne10Text8:
 	TX_FAR _SSAnne10Text8
 	TX_ASM
 	ld a, MACHOKE
@@ -125,78 +125,78 @@
 	call PlayCry
 	jp TextScriptEnd
 
-SSAnne10BattleText1: ; 61e16 (18:5e16)
+SSAnne10BattleText1:
 	TX_FAR _SSAnne10BattleText1
 	db "@"
 
-SSAnne10EndBattleText1: ; 61e1b (18:5e1b)
+SSAnne10EndBattleText1:
 	TX_FAR _SSAnne10EndBattleText1
 	db "@"
 
-SSAnne10AfterBattleText1: ; 61e20 (18:5e20)
+SSAnne10AfterBattleText1:
 	TX_FAR _SSAnne10AfterBattleText1
 	db "@"
 
-SSAnne10BattleText2: ; 61e25 (18:5e25)
+SSAnne10BattleText2:
 	TX_FAR _SSAnne10BattleText2
 	db "@"
 
-SSAnne10EndBattleText2: ; 61e2a (18:5e2a)
+SSAnne10EndBattleText2:
 	TX_FAR _SSAnne10EndBattleText2
 	db "@"
 
-SSAnne10AfterBattleText2: ; 61e2f (18:5e2f)
+SSAnne10AfterBattleText2:
 	TX_FAR _SSAnne10AfterBattleText2
 	db "@"
 
-SSAnne10BattleText3: ; 61e34 (18:5e34)
+SSAnne10BattleText3:
 	TX_FAR _SSAnne10BattleText3
 	db "@"
 
-SSAnne10EndBattleText3: ; 61e39 (18:5e39)
+SSAnne10EndBattleText3:
 	TX_FAR _SSAnne10EndBattleText3
 	db "@"
 
-SSAnne10AfterBattleText3: ; 61e3e (18:5e3e)
+SSAnne10AfterBattleText3:
 	TX_FAR _SSAnne10AfterBattleText3
 	db "@"
 
-SSAnne10BattleText4: ; 61e43 (18:5e43)
+SSAnne10BattleText4:
 	TX_FAR _SSAnne10BattleText4
 	db "@"
 
-SSAnne10EndBattleText4: ; 61e48 (18:5e48)
+SSAnne10EndBattleText4:
 	TX_FAR _SSAnne10EndBattleText4
 	db "@"
 
-SSAnne10AfterBattleText4: ; 61e4d (18:5e4d)
+SSAnne10AfterBattleText4:
 	TX_FAR _SSAnne10AfterBattleText4
 	db "@"
 
-SSAnne10BattleText5: ; 61e52 (18:5e52)
+SSAnne10BattleText5:
 	TX_FAR _SSAnne10BattleText5
 	db "@"
 
-SSAnne10EndBattleText5: ; 61e57 (18:5e57)
+SSAnne10EndBattleText5:
 	TX_FAR _SSAnne10EndBattleText5
 	db "@"
 
-SSAnne10AfterBattleText5: ; 61e5c (18:5e5c)
+SSAnne10AfterBattleText5:
 	TX_FAR _SSAnne10AfterBattleText5
 	db "@"
 
-SSAnne10BattleText6: ; 61e61 (18:5e61)
+SSAnne10BattleText6:
 	TX_FAR _SSAnne10BattleText6
 	db "@"
 
-SSAnne10EndBattleText6: ; 61e66 (18:5e66)
+SSAnne10EndBattleText6:
 	TX_FAR _SSAnne10EndBattleText6
 	db "@"
 
-SSAnne10AfterBattleText6: ; 61e6b (18:5e6b)
+SSAnne10AfterBattleText6:
 	TX_FAR _SSAnne10AfterBattleText6
 	db "@"
 
-SSAnne10Text7: ; 61e70 (18:5e70)
+SSAnne10Text7:
 	TX_FAR _SSAnne10Text7
 	db "@"
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@@ -1,16 +1,16 @@
-SSAnne2Script: ; 6139f (18:539f)
+SSAnne2Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, SSAnne2ScriptPointers
 	ld a, [wSSAnne2CurScript]
 	jp CallFunctionInTable
 
-SSAnne2Script_613ab: ; 613ab (18:53ab)
+SSAnne2Script_613ab:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wSSAnne2CurScript], a
 	ret
 
-SSAnne2ScriptPointers: ; 613b3 (18:53b3)
+SSAnne2ScriptPointers:
 	dw SSAnne2Script0
 	dw SSAnne2Script1
 	dw SSAnne2Script2
@@ -17,10 +17,10 @@
 	dw SSAnne2Script3
 	dw SSAnne2Script4
 
-SSAnne2Script4: ; 613bd (18:53bd)
+SSAnne2Script4:
 	ret
 
-SSAnne2Script0: ; 613be (18:53be)
+SSAnne2Script0:
 	ld hl, CoordsData_61411
 	call ArePlayerCoordsInArray
 	ret nc
@@ -56,21 +56,21 @@
 	ld [wSSAnne2CurScript], a
 	ret
 
-MovementData_6140c: ; 6140c (18:540c)
+MovementData_6140c:
 	db NPC_MOVEMENT_DOWN
 
-MovementData_6140d: ; 6140d (18:540d)
+MovementData_6140d:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-CoordsData_61411: ; 61411 (18:5411)
+CoordsData_61411:
 	db $08,$24
 	db $08,$25
 	db $FF
 
-SSAnne2Script_61416: ; 61416 (18:5416)
+SSAnne2Script_61416:
 	ld a, [wXCoord]
 	cp $25
 	jr nz, .asm_61426
@@ -86,7 +86,7 @@
 	ld [H_SPRITEINDEX], a
 	jp SetSpriteFacingDirectionAndDelay
 
-SSAnne2Script1: ; 61430 (18:5430)
+SSAnne2Script1:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -121,7 +121,7 @@
 	ld [wSSAnne2CurScript], a
 	ret
 
-SSAnne2Script2: ; 6146d (18:546d)
+SSAnne2Script2:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SSAnne2Script_613ab
@@ -153,11 +153,11 @@
 	ld [wSSAnne2CurScript], a
 	ret
 
-MovementData_614b7: ; 614b7 (18:54b7)
+MovementData_614b7:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
 
-MovementData_614b9: ; 614b9 (18:54b9)
+MovementData_614b9:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -164,7 +164,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-SSAnne2Script3: ; 614be (18:54be)
+SSAnne2Script3:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -178,16 +178,16 @@
 	ld [wSSAnne2CurScript], a
 	ret
 
-SSAnne2TextPointers: ; 614db (18:54db)
+SSAnne2TextPointers:
 	dw SSAnne2Text1
 	dw SSAnne2Text2
 	dw SSAnne2Text3
 
-SSAnne2Text1: ; 614e1 (18:54e1)
+SSAnne2Text1:
 	TX_FAR _SSAnne2Text1
 	db "@"
 
-SSAnne2Text2: ; 614e6 (18:54e6)
+SSAnne2Text2:
 	TX_ASM
 	ld hl, SSAnneRivalBeforeBattleText
 	call PrintText
@@ -199,18 +199,18 @@
 	call SaveEndBattleTextPointers
 	jp TextScriptEnd
 
-SSAnneRivalBeforeBattleText: ; 61500 (18:5500)
+SSAnneRivalBeforeBattleText:
 	TX_FAR _SSAnneRivalBeforeBattleText
 	db "@"
 
-SSAnneRivalDefeatedText: ; 61505 (18:5505)
+SSAnneRivalDefeatedText:
 	TX_FAR _SSAnneRivalDefeatedText
 	db "@"
 
-SSAnneRivalWonText: ; 6150a (18:550a)
+SSAnneRivalWonText:
 	TX_FAR _SSAnneRivalWonText
 	db "@"
 
-SSAnne2Text3: ; 6150f (18:550f)
+SSAnne2Text3:
 	TX_FAR _SSAnneRivalCaptainText
 	db "@"
--- a/scripts/ssanne3.asm
+++ b/scripts/ssanne3.asm
@@ -1,9 +1,9 @@
-SSAnne3Script: ; 44932 (11:4932)
+SSAnne3Script:
 	jp EnableAutoTextBoxDrawing
 
-SSAnne3TextPointers: ; 44935 (11:4935)
+SSAnne3TextPointers:
 	dw SSAnne3Text1
 
-SSAnne3Text1: ; 44937 (11:4937)
+SSAnne3Text1:
 	TX_FAR _SSAnne3Text1
 	db "@"
--- a/scripts/ssanne4.asm
+++ b/scripts/ssanne4.asm
@@ -1,5 +1,5 @@
-SSAnne4Script: ; 6162e (18:562e)
+SSAnne4Script:
 	jp EnableAutoTextBoxDrawing
 
-SSAnne4TextPointers: ; 61631 (18:5631)
+SSAnne4TextPointers:
 	db "@"
--- a/scripts/ssanne5.asm
+++ b/scripts/ssanne5.asm
@@ -1,4 +1,4 @@
-SSAnne5Script: ; 616ae (18:56ae)
+SSAnne5Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, SSAnne5TrainerHeader0
 	ld de, SSAnne5ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wSSAnne5CurScript], a
 	ret
 
-SSAnne5ScriptPointers: ; 616c1 (18:56c1)
+SSAnne5ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne5TextPointers: ; 616c7 (18:56c7)
+SSAnne5TextPointers:
 	dw SSAnne5Text1
 	dw SSAnne5Text2
 	dw SSAnne5Text3
@@ -19,8 +19,8 @@
 	dw SSAnne5Text4
 	dw SSAnne5Text5
 
-SSAnne5TrainerHeaders: ; 616d1 (18:56d1)
-SSAnne5TrainerHeader0: ; 616d1 (18:56d1)
+SSAnne5TrainerHeaders:
+SSAnne5TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_0
@@ -29,7 +29,7 @@
 	dw SSAnne5EndBattleText1 ; TextEndBattle
 	dw SSAnne5EndBattleText1 ; TextEndBattle
 
-SSAnne5TrainerHeader1: ; 616dd (18:56dd)
+SSAnne5TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_1
@@ -40,50 +40,50 @@
 
 	db $ff
 
-SSAnne5Text1: ; 616ea (18:56ea)
+SSAnne5Text1:
 	TX_FAR _SSAnne5Text1
 	db "@"
 
-SSAnne5Text2: ; 616ef (18:56ef)
+SSAnne5Text2:
 	TX_FAR _SSAnne5Text2
 	db "@"
 
-SSAnne5Text3: ; 616f4 (18:56f4)
+SSAnne5Text3:
 	TX_FAR _SSAnne5Text3
 	db "@"
 
-SSAnne5Text4: ; 616f9 (18:56f9)
+SSAnne5Text4:
 	TX_ASM
 	ld hl, SSAnne5TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne5BattleText1: ; 61703 (18:5703)
+SSAnne5BattleText1:
 	TX_FAR _SSAnne5BattleText1
 	db "@"
 
-SSAnne5EndBattleText1: ; 61708 (18:5708)
+SSAnne5EndBattleText1:
 	TX_FAR _SSAnne5EndBattleText1
 	db "@"
 
-SSAnne5AfterBattleText1: ; 6170d (18:570d)
+SSAnne5AfterBattleText1:
 	TX_FAR _SSAnne5AfterBattleText1
 	db "@"
 
-SSAnne5Text5: ; 61712 (18:5712)
+SSAnne5Text5:
 	TX_ASM
 	ld hl, SSAnne5TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne5BattleText2: ; 6171c (18:571c)
+SSAnne5BattleText2:
 	TX_FAR _SSAnne5BattleText2
 	db "@"
 
-SSAnne5EndBattleText2: ; 61721 (18:5721)
+SSAnne5EndBattleText2:
 	TX_FAR _SSAnne5EndBattleText2
 	db "@"
 
-SSAnne5AfterBattleText2: ; 61726 (18:5726)
+SSAnne5AfterBattleText2:
 	TX_FAR _SSAnne5AfterBattleText2
 	db "@"
--- a/scripts/ssanne6.asm
+++ b/scripts/ssanne6.asm
@@ -1,8 +1,8 @@
-SSAnne6Script: ; 617b3 (18:57b3)
+SSAnne6Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SSAnne6TextPointers: ; 617b7 (18:57b7)
+SSAnne6TextPointers:
 	dw SSAnne6Text1
 	dw SSAnne6Text2
 	dw SSAnne6Text3
@@ -11,31 +11,31 @@
 	dw SSAnne6Text6
 	dw SSAnne6Text7
 
-SSAnne6Text1: ; 617c5 (18:57c5)
+SSAnne6Text1:
 	TX_FAR _SSAnne6Text1
 	db "@"
 
-SSAnne6Text2: ; 617ca (18:57ca)
+SSAnne6Text2:
 	TX_FAR _SSAnne6Text2
 	db "@"
 
-SSAnne6Text3: ; 617cf (18:57cf)
+SSAnne6Text3:
 	TX_FAR _SSAnne6Text3
 	db "@"
 
-SSAnne6Text4: ; 617d4 (18:57d4)
+SSAnne6Text4:
 	TX_FAR _SSAnne6Text4
 	db "@"
 
-SSAnne6Text5: ; 617d9 (18:57d9)
+SSAnne6Text5:
 	TX_FAR _SSAnne6Text5
 	db "@"
 
-SSAnne6Text6: ; 617de (18:57de)
+SSAnne6Text6:
 	TX_FAR _SSAnne6Text6
 	db "@"
 
-SSAnne6Text7: ; 617e3 (18:57e3)
+SSAnne6Text7:
 	TX_ASM
 	ld hl, SSAnne6Text_61807
 	call PrintText
@@ -55,18 +55,18 @@
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne6Text_61807: ; 61807 (18:5807)
+SSAnne6Text_61807:
 	TX_FAR _SSAnne6Text_61807
 	db "@"
 
-SSAnne6Text_6180c: ; 6180c (18:580c)
+SSAnne6Text_6180c:
 	TX_FAR _SSAnne6Text_6180c
 	db "@"
 
-SSAnne6Text_61811: ; 61811 (18:5811)
+SSAnne6Text_61811:
 	TX_FAR _SSAnne6Text_61811
 	db "@"
 
-SSAnne6Text_61816: ; 61816 (18:5816)
+SSAnne6Text_61816:
 	TX_FAR _SSAnne6Text_61816
 	db "@"
--- a/scripts/ssanne7.asm
+++ b/scripts/ssanne7.asm
@@ -1,8 +1,8 @@
-SSAnne7Script: ; 61895 (18:5895)
+SSAnne7Script:
 	call SSAnne7Script_6189b
 	jp EnableAutoTextBoxDrawing
 
-SSAnne7Script_6189b: ; 6189b (18:589b)
+SSAnne7Script_6189b:
 	CheckEvent EVENT_RUBBED_CAPTAINS_BACK
 	ret nz
 	ld hl, wd72d
@@ -9,12 +9,12 @@
 	set 5, [hl]
 	ret
 
-SSAnne7TextPointers: ; 618a7 (18:58a7)
+SSAnne7TextPointers:
 	dw SSAnne7Text1
 	dw SSAnne7Text2
 	dw SSAnne7Text3
 
-SSAnne7Text1: ; 618ad (18:58ad)
+SSAnne7Text1:
 	TX_ASM
 	CheckEvent EVENT_GOT_HM01
 	jr nz, .asm_797c4
@@ -41,7 +41,7 @@
 .asm_0faf5
 	jp TextScriptEnd
 
-SSAnne7RubText: ; 618ec (18:58ec)
+SSAnne7RubText:
 	TX_FAR _SSAnne7RubText
 	TX_ASM
 	ld a, [wAudioROMBank]
@@ -67,26 +67,26 @@
 	res 5, [hl]
 	jp TextScriptEnd
 
-ReceivingHM01Text: ; 61927 (18:5927)
+ReceivingHM01Text:
 	TX_FAR _ReceivingHM01Text
 	db "@"
 
-ReceivedHM01Text: ; 6192c (18:592c)
+ReceivedHM01Text:
 	TX_FAR _ReceivedHM01Text
 	db $11, "@"
 
-SSAnne7Text_61932: ; 61932 (18:5932)
+SSAnne7Text_61932:
 	TX_FAR _SSAnne7Text_61932
 	db "@"
 
-HM01NoRoomText: ; 61937 (18:5937)
+HM01NoRoomText:
 	TX_FAR _HM01NoRoomText
 	db "@"
 
-SSAnne7Text2: ; 6193c (18:593c)
+SSAnne7Text2:
 	TX_FAR _SSAnne7Text2
 	db "@"
 
-SSAnne7Text3: ; 61941 (18:5941)
+SSAnne7Text3:
 	TX_FAR _SSAnne7Text3
 	db "@"
--- a/scripts/ssanne8.asm
+++ b/scripts/ssanne8.asm
@@ -1,4 +1,4 @@
-SSAnne8Script: ; 61976 (18:5976)
+SSAnne8Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, SSAnne8TrainerHeaders
 	ld de, SSAnne8ScriptPointers
@@ -7,12 +7,12 @@
 	ld [wSSAnne8CurScript], a
 	ret
 
-SSAnne8ScriptPointers: ; 61989 (18:5989)
+SSAnne8ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne8TextPointers: ; 6198f (18:598f)
+SSAnne8TextPointers:
 	dw SSAnne8Text1
 	dw SSAnne8Text2
 	dw SSAnne8Text3
@@ -25,8 +25,8 @@
 	dw PickUpItemText
 	dw SSAnne8Text11
 
-SSAnne8TrainerHeaders: ; 619a5 (18:59a5)
-SSAnne8TrainerHeader0: ; 619a5 (18:59a5)
+SSAnne8TrainerHeaders:
+SSAnne8TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_0
@@ -35,7 +35,7 @@
 	dw SSAnne8EndBattleText1 ; TextEndBattle
 	dw SSAnne8EndBattleText1 ; TextEndBattle
 
-SSAnne8TrainerHeader1: ; 619b1 (18:59b1)
+SSAnne8TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_1
@@ -44,7 +44,7 @@
 	dw SSAnne8EndBattleText2 ; TextEndBattle
 	dw SSAnne8EndBattleText2 ; TextEndBattle
 
-SSAnne8TrainerHeader2: ; 619bd (18:59bd)
+SSAnne8TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_2
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_2
@@ -53,7 +53,7 @@
 	dw SSAnne8EndBattleText3 ; TextEndBattle
 	dw SSAnne8EndBattleText3 ; TextEndBattle
 
-SSAnne8TrainerHeader3: ; 619c9 (18:59c9)
+SSAnne8TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_3
@@ -64,31 +64,31 @@
 
 	db $ff
 
-SSAnne8Text1: ; 619d6 (18:59d6)
+SSAnne8Text1:
 	TX_ASM
 	ld hl, SSAnne8TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne8Text2: ; 619e0 (18:59e0)
+SSAnne8Text2:
 	TX_ASM
 	ld hl, SSAnne8TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne8Text3: ; 619ea (18:59ea)
+SSAnne8Text3:
 	TX_ASM
 	ld hl, SSAnne8TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne8Text4: ; 619f4 (18:59f4)
+SSAnne8Text4:
 	TX_ASM
 	ld hl, SSAnne8TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne8Text8: ; 619fe (18:59fe)
+SSAnne8Text8:
 	TX_FAR _SSAnne8Text8
 	TX_ASM
 	ld a, WIGGLYTUFF
@@ -95,70 +95,70 @@
 	call PlayCry
 	jp TextScriptEnd
 
-SSAnne8BattleText1: ; 61a0b (18:5a0b)
+SSAnne8BattleText1:
 	TX_FAR _SSAnne8BattleText1
 	db "@"
 
-SSAnne8EndBattleText1: ; 61a10 (18:5a10)
+SSAnne8EndBattleText1:
 	TX_FAR _SSAnne8EndBattleText1
 	db "@"
 
-SSAnne8AfterBattleText1: ; 61a15 (18:5a15)
+SSAnne8AfterBattleText1:
 	TX_FAR _SSAnne8AfterBattleText1
 	db "@"
 
-SSAnne8BattleText2: ; 61a1a (18:5a1a)
+SSAnne8BattleText2:
 	TX_FAR _SSAnne8BattleText2
 	db "@"
 
-SSAnne8EndBattleText2: ; 61a1f (18:5a1f)
+SSAnne8EndBattleText2:
 	TX_FAR _SSAnne8EndBattleText2
 	db "@"
 
-SSAnne8AfterBattleText2: ; 61a24 (18:5a24)
+SSAnne8AfterBattleText2:
 	TX_FAR _SSAnne8AfterBattleText2
 	db "@"
 
-SSAnne8BattleText3: ; 61a29 (18:5a29)
+SSAnne8BattleText3:
 	TX_FAR _SSAnne8BattleText3
 	db "@"
 
-SSAnne8EndBattleText3: ; 61a2e (18:5a2e)
+SSAnne8EndBattleText3:
 	TX_FAR _SSAnne8EndBattleText3
 	db "@"
 
-SSAnne8AfterBattleText3: ; 61a33 (18:5a33)
+SSAnne8AfterBattleText3:
 	TX_FAR _SSAnne8AfterBattleText3
 	db "@"
 
-SSAnne8BattleText4: ; 61a38 (18:5a38)
+SSAnne8BattleText4:
 	TX_FAR _SSAnne8BattleText4
 	db "@"
 
-SSAnne8EndBattleText4: ; 61a3d (18:5a3d)
+SSAnne8EndBattleText4:
 	TX_FAR _SSAnne8EndBattleText4
 	db "@"
 
-SSAnne8AfterBattleText4: ; 61a42 (18:5a42)
+SSAnne8AfterBattleText4:
 	TX_FAR _SSAnne8AfterBattleText4
 	db "@"
 
-SSAnne8Text5: ; 61a47 (18:5a47)
+SSAnne8Text5:
 	TX_FAR _SSAnne8Text5
 	db "@"
 
-SSAnne8Text6: ; 61a4c (18:5a4c)
+SSAnne8Text6:
 	TX_FAR _SSAnne8Text6
 	db "@"
 
-SSAnne8Text7: ; 61a51 (18:5a51)
+SSAnne8Text7:
 	TX_FAR _SSAnne8Text7
 	db "@"
 
-SSAnne8Text9: ; 61a56 (18:5a56)
+SSAnne8Text9:
 	TX_FAR _SSAnne8Text9
 	db "@"
 
-SSAnne8Text11: ; 61a5b (18:5a5b)
+SSAnne8Text11:
 	TX_FAR _SSAnne8Text11
 	db "@"
--- a/scripts/ssanne9.asm
+++ b/scripts/ssanne9.asm
@@ -1,4 +1,4 @@
-SSAnne9Script: ; 61b4b (18:5b4b)
+SSAnne9Script:
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	xor a
@@ -10,12 +10,12 @@
 	ld [wSSAnne9CurScript], a
 	ret
 
-SSAnne9ScriptPointers: ; 61b64 (18:5b64)
+SSAnne9ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne9TextPointers: ; 61b6a (18:5b6a)
+SSAnne9TextPointers:
 	dw SSAnne9Text1
 	dw SSAnne9Text2
 	dw SSAnne9Text3
@@ -30,8 +30,8 @@
 	dw SSAnne9Text12
 	dw SSAnne9Text13
 
-SSAnne9TrainerHeaders: ; 61b84 (18:5b84)
-SSAnne9TrainerHeader0: ; 61b84 (18:5b84)
+SSAnne9TrainerHeaders:
+SSAnne9TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_0
@@ -40,7 +40,7 @@
 	dw SSAnne9EndBattleText1 ; TextEndBattle
 	dw SSAnne9EndBattleText1 ; TextEndBattle
 
-SSAnne9TrainerHeader1: ; 61b90 (18:5b90)
+SSAnne9TrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_1
@@ -49,7 +49,7 @@
 	dw SSAnne9EndBattleText2 ; TextEndBattle
 	dw SSAnne9EndBattleText2 ; TextEndBattle
 
-SSAnne9TrainerHeader2: ; 61b9c (18:5b9c)
+SSAnne9TrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_2
@@ -58,7 +58,7 @@
 	dw SSAnne9EndBattleText3 ; TextEndBattle
 	dw SSAnne9EndBattleText3 ; TextEndBattle
 
-SSAnne9TrainerHeader3: ; 61ba8 (18:5ba8)
+SSAnne9TrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_3
@@ -69,31 +69,31 @@
 
 	db $ff
 
-SSAnne9Text1: ; 61bb5 (18:5bb5)
+SSAnne9Text1:
 	TX_ASM
 	ld hl, SSAnne9TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne9Text2: ; 61bbf (18:5bbf)
+SSAnne9Text2:
 	TX_ASM
 	ld hl, SSAnne9TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne9Text3: ; 61bc9 (18:5bc9)
+SSAnne9Text3:
 	TX_ASM
 	ld hl, SSAnne9TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne9Text4: ; 61bd3 (18:5bd3)
+SSAnne9Text4:
 	TX_ASM
 	ld hl, SSAnne9TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne9Text5: ; 61bdd (18:5bdd)
+SSAnne9Text5:
 	TX_ASM
 	call SaveScreenTilesToBuffer1
 	ld hl, SSAnne9Text_61bf2
@@ -103,114 +103,114 @@
 	call DisplayPokedex
 	jp TextScriptEnd
 
-SSAnne9Text_61bf2: ; 61bf2 (18:5bf2)
+SSAnne9Text_61bf2:
 	TX_FAR _SSAnne9Text_61bf2
 	db "@"
 
-SSAnne9Text7: ; 61bf7 (18:5bf7)
+SSAnne9Text7:
 	TX_ASM
 	ld hl, SSAnne9Text_61c01
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c01: ; 61c01 (18:5c01)
+SSAnne9Text_61c01:
 	TX_FAR _SSAnne9Text_61c01
 	db "@"
 
-SSAnne9Text8: ; 61c06 (18:5c06)
+SSAnne9Text8:
 	TX_ASM
 	ld hl, SSAnne9Text_61c10
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c10: ; 61c10 (18:5c10)
+SSAnne9Text_61c10:
 	TX_FAR _SSAnne9Text_61c10
 	db "@"
 
-SSAnne9Text10: ; 61c15 (18:5c15)
+SSAnne9Text10:
 	TX_ASM
 	ld hl, SSAnne9Text_61c1f
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c1f: ; 61c1f (18:5c1f)
+SSAnne9Text_61c1f:
 	TX_FAR _SSAnne9Text_61c1f
 	db "@"
 
-SSAnne9Text11: ; 61c24 (18:5c24)
+SSAnne9Text11:
 	TX_ASM
 	ld hl, SSAnne9Text_61c2e
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c2e: ; 61c2e (18:5c2e)
+SSAnne9Text_61c2e:
 	TX_FAR _SSAnne9Text_61c2e
 	db "@"
 
-SSAnne9Text12: ; 61c33 (18:5c33)
+SSAnne9Text12:
 	TX_ASM
 	ld hl, SSAnne9Text_61c3d
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c3d: ; 61c3d (18:5c3d)
+SSAnne9Text_61c3d:
 	TX_FAR _SSAnne9Text_61c3d
 	db "@"
 
-SSAnne9Text13: ; 61c42 (18:5c42)
+SSAnne9Text13:
 	TX_ASM
 	ld hl, SSAnne9Text_61c4c
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c4c: ; 61c4c (18:5c4c)
+SSAnne9Text_61c4c:
 	TX_FAR _SSAnne9Text_61c4c
 	db "@"
 
-SSAnne9BattleText1: ; 61c51 (18:5c51)
+SSAnne9BattleText1:
 	TX_FAR _SSAnne9BattleText1
 	db "@"
 
-SSAnne9EndBattleText1: ; 61c56 (18:5c56)
+SSAnne9EndBattleText1:
 	TX_FAR _SSAnne9EndBattleText1
 	db "@"
 
-SSAnne9AfterBattleText1: ; 61c5b (18:5c5b)
+SSAnne9AfterBattleText1:
 	TX_FAR _SSAnne9AfterBattleText1
 	db "@"
 
-SSAnne9BattleText2: ; 61c60 (18:5c60)
+SSAnne9BattleText2:
 	TX_FAR _SSAnne9BattleText2
 	db "@"
 
-SSAnne9EndBattleText2: ; 61c65 (18:5c65)
+SSAnne9EndBattleText2:
 	TX_FAR _SSAnne9EndBattleText2
 	db "@"
 
-SSAnne9AfterBattleText2: ; 61c6a (18:5c6a)
+SSAnne9AfterBattleText2:
 	TX_FAR _SSAnne9AfterBattleText2
 	db "@"
 
-SSAnne9BattleText3: ; 61c6f (18:5c6f)
+SSAnne9BattleText3:
 	TX_FAR _SSAnne9BattleText3
 	db "@"
 
-SSAnne9EndBattleText3: ; 61c74 (18:5c74)
+SSAnne9EndBattleText3:
 	TX_FAR _SSAnne9EndBattleText3
 	db "@"
 
-SSAnne9AfterBattleText3: ; 61c79 (18:5c79)
+SSAnne9AfterBattleText3:
 	TX_FAR _SSAnne9AfterBattleText3
 	db "@"
 
-SSAnne9BattleText4: ; 61c7e (18:5c7e)
+SSAnne9BattleText4:
 	TX_FAR _SSAnne9BattleText4
 	db "@"
 
-SSAnne9EndBattleText4: ; 61c83 (18:5c83)
+SSAnne9EndBattleText4:
 	TX_FAR _SSAnne9EndBattleText4
 	db "@"
 
-SSAnne9AfterBattleText4: ; 61c88 (18:5c88)
+SSAnne9AfterBattleText4:
 	TX_FAR _SSAnne9AfterBattleText4
 	db "@"
--- a/scripts/tradecenter.asm
+++ b/scripts/tradecenter.asm
@@ -1,4 +1,4 @@
-TradeCenterScript: ; 4fd10 (13:7d10)
+TradeCenterScript:
 	call EnableAutoTextBoxDrawing
 	ld a, [$ffaa]
 	cp $2
@@ -30,9 +30,9 @@
 	ld [wSpriteStateData1 + $19], a
 	ret
 
-TradeCenterTextPointers: ; 4fd4c (13:7d4c)
+TradeCenterTextPointers:
 	dw TradeCenterText1
 
-TradeCenterText1: ; 4fd4e (13:7d4e)
+TradeCenterText1:
 	TX_FAR _TradeCenterText1
 	db "@"
--- a/scripts/undergroundpathentranceroute5.asm
+++ b/scripts/undergroundpathentranceroute5.asm
@@ -1,15 +1,15 @@
-UndergroundPathEntranceRoute5Script: ; 5d6a9 (17:56a9)
+UndergroundPathEntranceRoute5Script:
 	ld a, ROUTE_5
 	ld [wLastMap], a
 	ret
 
-UndergroundPathEntranceRoute5_5d6af: ; 5d6af (17:56af)
+UndergroundPathEntranceRoute5_5d6af:
 	db "@"
 
-UndergroundPathEntranceRoute5TextPointers: ; 5d6b0 (17:56b0)
+UndergroundPathEntranceRoute5TextPointers:
 	dw UndergroundPathEntranceRoute5Text1
 
-UndergroundPathEntranceRoute5Text1: ; 5d6b2 (17:56b2)
+UndergroundPathEntranceRoute5Text1:
 	TX_ASM
 	ld a, $9
 	ld [wWhichTrade], a
--- a/scripts/undergroundpathentranceroute6.asm
+++ b/scripts/undergroundpathentranceroute6.asm
@@ -1,11 +1,11 @@
-UndergroundPathEntranceRoute6Script: ; 5d6ef (17:56ef)
+UndergroundPathEntranceRoute6Script:
 	ld a, ROUTE_6
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathEntranceRoute6TextPointers: ; 5d6f7 (17:56f7)
+UndergroundPathEntranceRoute6TextPointers:
 	dw UndergroundPathEntranceRoute6Text1
 
-UndergroundPathEntranceRoute6Text1: ; 5d6f9 (17:56f9)
+UndergroundPathEntranceRoute6Text1:
 	TX_FAR _UndergrdTunnelEntRoute6Text1
 	db "@"
--- a/scripts/undergroundpathentranceroute7.asm
+++ b/scripts/undergroundpathentranceroute7.asm
@@ -1,11 +1,11 @@
-UndergroundPathEntranceRoute7Script: ; 5d72c (17:572c)
+UndergroundPathEntranceRoute7Script:
 	ld a, ROUTE_7
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathEntranceRoute7TextPointers: ; 5d734 (17:5734)
+UndergroundPathEntranceRoute7TextPointers:
 	dw UndergroundPathEntranceRoute7Text1
 
-UndergroundPathEntranceRoute7Text1: ; 5d736 (17:5736)
+UndergroundPathEntranceRoute7Text1:
 	TX_FAR _UndergroundPathEntRoute7Text1
 	db "@"
--- a/scripts/undergroundpathentranceroute7copy.asm
+++ b/scripts/undergroundpathentranceroute7copy.asm
@@ -1,24 +1,24 @@
-UndergroundPathEntranceRoute7CopyScript: ; 5d769 (17:5769)
+UndergroundPathEntranceRoute7CopyScript:
 	ld a, ROUTE_7
 	ld [wLastMap], a
 	ret
 
-UndergroundPathEntranceRoute7CopyTextPointers: ; 5d76f (17:576f)
+UndergroundPathEntranceRoute7CopyTextPointers:
 	dw UGPathRoute7EntranceUnusedText_5d773
 	dw UGPathRoute7EntranceUnusedText_5d77d
 
-UGPathRoute7EntranceUnusedText_5d773: ; 5d773 (17:5773)
+UGPathRoute7EntranceUnusedText_5d773:
 	TX_FAR _UGPathRoute7EntranceUnusedText_5d773
 	db "@"
 
-UGPathRoute7EntranceUnusedText_5d778: ; 5d778 (17:5778)
+UGPathRoute7EntranceUnusedText_5d778:
 	TX_FAR _UGPathRoute7EntranceUnusedText_5d778
 	db "@"
 
-UGPathRoute7EntranceUnusedText_5d77d: ; 5d77d (17:577d)
+UGPathRoute7EntranceUnusedText_5d77d:
 	TX_FAR _UGPathRoute7EntranceUnusedText_5d77d
 	db "@"
 
-UGPathRoute7EntranceUnusedText_5d782: ; 5d782 (17:5782)
+UGPathRoute7EntranceUnusedText_5d782:
 	TX_FAR _UGPathRoute7EntranceUnusedText_5d782
 	db "@"
--- a/scripts/undergroundpathentranceroute8.asm
+++ b/scripts/undergroundpathentranceroute8.asm
@@ -1,11 +1,11 @@
-UndergroundPathEntranceRoute8Script: ; 1e289 (7:6289)
+UndergroundPathEntranceRoute8Script:
 	ld a, ROUTE_8
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathEntranceRoute8TextPointers: ; 1e291 (7:6291)
+UndergroundPathEntranceRoute8TextPointers:
 	dw UndergroundPathEntranceRoute8Text1
 
-UndergroundPathEntranceRoute8Text1: ; 1e293 (7:6293)
+UndergroundPathEntranceRoute8Text1:
 	TX_FAR _UndergroundPathEntRoute8Text1
 	db "@"
--- a/scripts/undergroundpathns.asm
+++ b/scripts/undergroundpathns.asm
@@ -1,5 +1,5 @@
-UndergroundPathNSScript: ; 61f26 (18:5f26)
+UndergroundPathNSScript:
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathNSTextPointers: ; 61f29 (18:5f29)
+UndergroundPathNSTextPointers:
 	db "@"
--- a/scripts/undergroundpathwe.asm
+++ b/scripts/undergroundpathwe.asm
@@ -1,5 +1,5 @@
-UndergroundPathWEScript: ; 61f4a (18:5f4a)
+UndergroundPathWEScript:
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathWETextPointers: ; 61f4d (18:5f4d)
+UndergroundPathWETextPointers:
 	db "@"
--- a/scripts/vermilioncity.asm
+++ b/scripts/vermilioncity.asm
@@ -1,4 +1,4 @@
-VermilionCityScript: ; 197a1 (6:57a1)
+VermilionCityScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
@@ -13,7 +13,7 @@
 	ld a, [wVermilionCityCurScript]
 	jp CallFunctionInTable
 
-VermilionCityScript_197c0: ; 197c0 (6:57c0)
+VermilionCityScript_197c0:
 	call Random
 	ld a, [$ffd4]
 	and $e
@@ -20,7 +20,7 @@
 	ld [wFirstLockTrashCanIndex], a
 	ret
 
-VermilionCityScript_197cb: ; 197cb (6:57cb)
+VermilionCityScript_197cb:
 	CheckEventHL EVENT_SS_ANNE_LEFT
 	ret z
 	CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT
@@ -30,7 +30,7 @@
 	ld [wVermilionCityCurScript], a
 	ret
 
-VermilionCityScriptPointers: ; 197dc (6:57dc)
+VermilionCityScriptPointers:
 	dw VermilionCityScript0
 	dw VermilionCityScript1
 	dw VermilionCityScript2
@@ -37,7 +37,7 @@
 	dw VermilionCityScript3
 	dw VermilionCityScript4
 
-VermilionCityScript0: ; 197e6 (6:57e6)
+VermilionCityScript0:
 	ld a, [wSpriteStateData1 + 9]
 	and a ; cp SPRITE_FACING_DOWN
 	ret nz
@@ -67,11 +67,11 @@
 	ld [wVermilionCityCurScript], a
 	ret
 
-CoordsData_19823: ; 19823 (6:5823)
+CoordsData_19823:
 	db $1e,$12
 	db $ff
 
-VermilionCityScript4: ; 19826 (6:5826)
+VermilionCityScript4:
 	ld hl, CoordsData_19823
 	call ArePlayerCoordsInArray
 	ret c
@@ -79,7 +79,7 @@
 	ld [wVermilionCityCurScript], a
 	ret
 
-VermilionCityScript2: ; 19833 (6:5833)
+VermilionCityScript2:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	ld a, D_UP
@@ -92,7 +92,7 @@
 	ld [wVermilionCityCurScript], a
 	ret
 
-VermilionCityScript3: ; 1984e (6:584e)
+VermilionCityScript3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -103,7 +103,7 @@
 	ld [wVermilionCityCurScript], a
 	ret
 
-VermilionCityScript1: ; 1985f (6:585f)
+VermilionCityScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -113,7 +113,7 @@
 	ld [wVermilionCityCurScript], a
 	ret
 
-VermilionCityTextPointers: ; 1986f (6:586f)
+VermilionCityTextPointers:
 	dw VermilionCityText1
 	dw VermilionCityText2
 	dw VermilionCityText3
@@ -128,11 +128,11 @@
 	dw VermilionCityText12
 	dw VermilionCityText13
 
-VermilionCityText1: ; 19889 (6:5889)
+VermilionCityText1:
 	TX_FAR _VermilionCityText1
 	db "@"
 
-VermilionCityText2: ; 1988e (6:588e)
+VermilionCityText2:
 	TX_ASM
 	CheckEvent EVENT_SS_ANNE_LEFT
 	jr nz, .asm_1989e
@@ -145,15 +145,15 @@
 .asm_198a4
 	jp TextScriptEnd
 
-VermilionCityText_198a7: ; 198a7 (6:58a7)
+VermilionCityText_198a7:
 	TX_FAR _VermilionCityText_198a7
 	db "@"
 
-VermilionCityText_198ac: ; 198ac (6:58ac)
+VermilionCityText_198ac:
 	TX_FAR _VermilionCityText_198ac
 	db "@"
 
-VermilionCityText3: ; 198b1 (6:58b1)
+VermilionCityText3:
 	TX_ASM
 	CheckEvent EVENT_SS_ANNE_LEFT
 	jr nz, .asm_198f6
@@ -190,36 +190,36 @@
 .asm_198fc
 	jp TextScriptEnd
 
-VermilionCityCoords1: ; 198ff (6:58ff)
+VermilionCityCoords1:
 	db $1d,$13
 	db $1f,$13
 	db $ff
 
-SSAnneWelcomeText4: ; 19904 (6:5904)
+SSAnneWelcomeText4:
 	TX_FAR _SSAnneWelcomeText4
 	db "@"
 
-SSAnneWelcomeText9: ; 19909 (6:5909)
+SSAnneWelcomeText9:
 	TX_FAR _SSAnneWelcomeText9
 	db "@"
 
-SSAnneFlashedTicketText: ; 1990e (6:590e)
+SSAnneFlashedTicketText:
 	TX_FAR _SSAnneFlashedTicketText
 	db "@"
 
-SSAnneNoTicketText: ; 19913 (6:5913)
+SSAnneNoTicketText:
 	TX_FAR _SSAnneNoTicketText
 	db "@"
 
-SSAnneNotHereText: ; 19918 (6:5918)
+SSAnneNotHereText:
 	TX_FAR _SSAnneNotHereText
 	db "@"
 
-VermilionCityText4: ; 1991d (6:591d)
+VermilionCityText4:
 	TX_FAR _VermilionCityText4
 	db "@"
 
-VermilionCityText5: ; 19922 (6:5922)
+VermilionCityText5:
 	TX_FAR _VermilionCityText5
 	TX_ASM
 	ld a, MACHOP
@@ -228,30 +228,30 @@
 	ld hl, VermilionCityText14
 	ret
 
-VermilionCityText14: ; 19933 (6:5933)
+VermilionCityText14:
 	TX_FAR _VermilionCityText14
 	db "@"
 
-VermilionCityText6: ; 19938 (6:5938)
+VermilionCityText6:
 	TX_FAR _VermilionCityText6
 	db "@"
 
-VermilionCityText7: ; 1993d (6:593d)
+VermilionCityText7:
 	TX_FAR _VermilionCityText7
 	db "@"
 
-VermilionCityText8: ; 19942 (6:5942)
+VermilionCityText8:
 	TX_FAR _VermilionCityText8
 	db "@"
 
-VermilionCityText11: ; 19947 (6:5947)
+VermilionCityText11:
 	TX_FAR _VermilionCityText11
 	db "@"
 
-VermilionCityText12: ; 1994c (6:594c)
+VermilionCityText12:
 	TX_FAR _VermilionCityText12
 	db "@"
 
-VermilionCityText13: ; 19951 (6:5951)
+VermilionCityText13:
 	TX_FAR _VermilionCityText13
 	db "@"
--- a/scripts/vermiliondock.asm
+++ b/scripts/vermiliondock.asm
@@ -1,4 +1,4 @@
-VermilionDockScript: ; 1db52 (7:5b52)
+VermilionDockScript:
 	call EnableAutoTextBoxDrawing
 	CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK
 	jr nz, .asm_1db8d
@@ -36,7 +36,7 @@
 	SetEventReuseHL EVENT_WALKED_OUT_OF_DOCK
 	ret
 
-VermilionDock_1db9b: ; 1db9b (7:5b9b)
+VermilionDock_1db9b:
 	SetEventForceReuseHL EVENT_SS_ANNE_LEFT
 	ld a, $ff
 	ld [wJoyIgnore], a
@@ -121,7 +121,7 @@
 	dec [hl]
 	ret
 
-VermilionDock_AnimSmokePuffDriftRight: ; 1dc42 (7:5c42)
+VermilionDock_AnimSmokePuffDriftRight:
 	push bc
 	push de
 	ld hl, wOAMBuffer + $11
@@ -139,7 +139,7 @@
 	pop bc
 	ret
 
-VermilionDock_EmitSmokePuff: ; 1dc59 (7:5c59)
+VermilionDock_EmitSmokePuff:
 ; new smoke puff above the S.S. Anne's front smokestack
 	ld a, [wSSAnneSmokeX]
 	sub 16
@@ -154,13 +154,13 @@
 	call WriteOAMBlock
 	ret
 
-VermilionDockOAMBlock: ; 1dc74 (7:5c74)
+VermilionDockOAMBlock:
 	db $fc, $10
 	db $fd, $10
 	db $fe, $10
 	db $ff, $10
 
-VermilionDock_1dc7c: ; 1dc7c (7:5c7c)
+VermilionDock_1dc7c:
 	ld h, d
 	ld l, $50
 	call .asm_1dc86
@@ -178,7 +178,7 @@
 	jr z, .asm_1dc8e
 	ret
 
-VermilionDock_EraseSSAnne: ; 1dc94 (7:5c94)
+VermilionDock_EraseSSAnne:
 ; Fill the area the S.S. Anne occupies in BG map 0 with water tiles.
 	ld hl, wVermilionDockTileMapBuffer
 	ld bc, (5 * BG_MAP_WIDTH) + SCREEN_WIDTH
@@ -207,9 +207,9 @@
 	call DelayFrames
 	ret
 
-VermilionDockTextPointers: ; 1dcbf (7:5cbf)
+VermilionDockTextPointers:
 	dw VermilionDockText1
 
-VermilionDockText1: ; 1dcc1 (7:5cc1)
+VermilionDockText1:
 	TX_FAR _VermilionDockText1
 	db "@"
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -1,4 +1,4 @@
-VermilionGymScript: ; 5ca26 (17:4a26)
+VermilionGymScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -16,18 +16,18 @@
 	ld [wVermilionGymCurScript], a
 	ret
 
-VermilionGymScript_5ca4c: ; 5ca4c (17:4a4c)
+VermilionGymScript_5ca4c:
 	ld hl, Gym3CityName
 	ld de, Gym3LeaderName
 	jp LoadGymLeaderAndCityName
 
-Gym3CityName: ; 5ca55 (17:4a55)
+Gym3CityName:
 	db "VERMILION CITY@"
 
-Gym3LeaderName: ; 5ca64 (17:4a64)
+Gym3LeaderName:
 	db "LT.SURGE@"
 
-VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d)
+VermilionGymScript_5ca6d:
 	CheckEvent EVENT_2ND_LOCK_OPENED
 	jr nz, .asm_5ca78
 	ld a, $24
@@ -41,7 +41,7 @@
 	lb bc, 2, 2
 	predef_jump ReplaceTileBlock
 
-VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a)
+VermilionGymScript_5ca8a:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wVermilionGymCurScript], a
@@ -48,13 +48,13 @@
 	ld [wCurMapScript], a
 	ret
 
-VermilionGymScriptPointers: ; 5ca95 (17:4a95)
+VermilionGymScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw VermilionGymScript3
 
-VermilionGymScript3: ; 5ca9d (17:4a9d)
+VermilionGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, VermilionGymScript_5ca8a
@@ -61,7 +61,7 @@
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-VermilionGymScript_5caaa: ; 5caaa (17:4aaa)
+VermilionGymScript_5caaa:
 	ld a, $6
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -89,7 +89,7 @@
 
 	jp VermilionGymScript_5ca8a
 
-VermilionGymTextPointers: ; 5cae8 (17:4ae8)
+VermilionGymTextPointers:
 	dw VermilionGymText1
 	dw VermilionGymText2
 	dw VermilionGymText3
@@ -99,8 +99,8 @@
 	dw VermilionGymText7
 	dw VermilionGymText8
 
-VermilionGymTrainerHeaders: ; 5caf8 (17:4af8)
-VermilionGymTrainerHeader0: ; 5caf8 (17:4af8)
+VermilionGymTrainerHeaders:
+VermilionGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_0
@@ -109,7 +109,7 @@
 	dw VermilionGymEndBattleText1 ; TextEndBattle
 	dw VermilionGymEndBattleText1 ; TextEndBattle
 
-VermilionGymTrainerHeader1: ; 5cb04 (17:4b04)
+VermilionGymTrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_1
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_1
@@ -118,7 +118,7 @@
 	dw VermilionGymEndBattleText2 ; TextEndBattle
 	dw VermilionGymEndBattleText2 ; TextEndBattle
 
-VermilionGymTrainerHeader2: ; 5cb10 (17:4b10)
+VermilionGymTrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_2
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_2
@@ -129,7 +129,7 @@
 
 	db $ff
 
-VermilionGymText1: ; 5cb1d (17:4b1d)
+VermilionGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_LT_SURGE
 	jr z, .asm_5cb39
@@ -165,87 +165,87 @@
 .asm_5cb6a
 	jp TextScriptEnd
 
-VermilionGymText_5cb6d: ; 5cb6d (17:4b6d)
+VermilionGymText_5cb6d:
 	TX_FAR _VermilionGymText_5cb6d
 	db "@"
 
-VermilionGymText_5cb72: ; 5cb72 (17:4b72)
+VermilionGymText_5cb72:
 	TX_FAR _VermilionGymText_5cb72
 	db "@"
 
-VermilionGymText6: ; 5cb77 (17:4b77)
+VermilionGymText6:
 	TX_FAR _VermilionGymText_5cb77
 	db "@"
 
-VermilionGymText7: ; 5cb7c (17:4b7c)
+VermilionGymText7:
 	TX_FAR _ReceivedTM24Text
 	db $11
 	TX_FAR _TM24ExplanationText
 	db "@"
 
-VermilionGymText8: ; 5cb86 (17:4b86)
+VermilionGymText8:
 	TX_FAR _TM24NoRoomText
 	db "@"
 
-ReceivedThunderbadgeText: ; 5cb8b (17:4b8b)
+ReceivedThunderbadgeText:
 	TX_FAR _ReceivedThunderbadgeText
 	db "@"
 
-VermilionGymText2: ; 5cb90 (17:4b90)
+VermilionGymText2:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-VermilionGymBattleText1: ; 5cb9a (17:4b9a)
+VermilionGymBattleText1:
 	TX_FAR _VermilionGymBattleText1
 	db "@"
 
-VermilionGymEndBattleText1: ; 5cb9f (17:4b9f)
+VermilionGymEndBattleText1:
 	TX_FAR _VermilionGymEndBattleText1
 	db "@"
 
-VermilionGymAfterBattleText1: ; 5cba4 (17:4ba4)
+VermilionGymAfterBattleText1:
 	TX_FAR _VermilionGymAfterBattleText1
 	db "@"
 
-VermilionGymText3: ; 5cba9 (17:4ba9)
+VermilionGymText3:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-VermilionGymBattleText2: ; 5cbb3 (17:4bb3)
+VermilionGymBattleText2:
 	TX_FAR _VermilionGymBattleText2
 	db "@"
 
-VermilionGymEndBattleText2: ; 5cbb8 (17:4bb8)
+VermilionGymEndBattleText2:
 	TX_FAR _VermilionGymEndBattleText2
 	db "@"
 
-VermilionGymAfterBattleText2: ; 5cbbd (17:4bbd)
+VermilionGymAfterBattleText2:
 	TX_FAR _VermilionGymAfterBattleText2
 	db "@"
 
-VermilionGymText4: ; 5cbc2 (17:4bc2)
+VermilionGymText4:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-VermilionGymBattleText3: ; 5cbcc (17:4bcc)
+VermilionGymBattleText3:
 	TX_FAR _VermilionGymBattleText3
 	db "@"
 
-VermilionGymEndBattleText3: ; 5cbd1 (17:4bd1)
+VermilionGymEndBattleText3:
 	TX_FAR _VermilionGymEndBattleText3
 	db "@"
 
-VermilionGymAfterBattleText3: ; 5cbd6 (17:4bd6)
+VermilionGymAfterBattleText3:
 	TX_FAR _VermilionGymAfterBattleText3
 	db "@"
 
-VermilionGymText5: ; 5cbdb (17:4bdb)
+VermilionGymText5:
 	TX_ASM
 	ld a, [wBeatGymFlags]
 	bit 2, a
@@ -259,10 +259,10 @@
 .asm_5cbf1
 	jp TextScriptEnd
 
-VermilionGymText_5cbf4: ; 5cbf4 (17:4bf4)
+VermilionGymText_5cbf4:
 	TX_FAR _VermilionGymText_5cbf4
 	db "@"
 
-VermilionGymText_5cbf9: ; 5cbf9 (17:4bf9)
+VermilionGymText_5cbf9:
 	TX_FAR _VermilionGymText_5cbf9
 	db "@"
--- a/scripts/vermilionhouse1.asm
+++ b/scripts/vermilionhouse1.asm
@@ -1,17 +1,17 @@
-VermilionHouse1Script: ; 1dafc (7:5afc)
+VermilionHouse1Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-VermilionHouse1TextPointers: ; 1db00 (7:5b00)
+VermilionHouse1TextPointers:
 	dw VermilionHouse1Text1
 	dw VermilionHouse1Text2
 	dw VermilionHouse1Text3
 
-VermilionHouse1Text1: ; 1db06 (7:5b06)
+VermilionHouse1Text1:
 	TX_FAR _VermilionHouse1Text1
 	db "@"
 
-VermilionHouse1Text2: ; 1db0b (7:5b0b)
+VermilionHouse1Text2:
 	TX_FAR _VermilionHouse1Text2
 	TX_ASM
 	ld a, PIDGEY
@@ -19,6 +19,6 @@
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
-VermilionHouse1Text3: ; 1db1b (7:5b1b)
+VermilionHouse1Text3:
 	TX_FAR _VermilionHouse1Text3
 	db "@"
--- a/scripts/vermilionhouse2.asm
+++ b/scripts/vermilionhouse2.asm
@@ -1,10 +1,10 @@
-VermilionHouse2Script: ; 56070 (15:6070)
+VermilionHouse2Script:
 	jp EnableAutoTextBoxDrawing
 
-VermilionHouse2TextPointers: ; 56073 (15:6073)
+VermilionHouse2TextPointers:
 	dw VermilionHouse2Text1
 
-VermilionHouse2Text1: ; 56075 (15:6075)
+VermilionHouse2Text1:
 	TX_ASM
 	ld a, [wd728]
 	bit 3, a
@@ -34,24 +34,24 @@
 	call PrintText
 	jp TextScriptEnd
 
-VermilionHouse2Text_560b1: ; 560b1 (15:60b1)
+VermilionHouse2Text_560b1:
 	TX_FAR _VermilionHouse2Text_560b1
 	db "@"
 
-VermilionHouse2Text_560b6: ; 560b6 (15:60b6)
+VermilionHouse2Text_560b6:
 	TX_FAR _VermilionHouse2Text_560b6
 	db $0B
 	TX_FAR _VermilionHouse2Text_560bb
 	db "@"
 
-VermilionHouse2Text_560c0: ; 560c0 (15:60c0)
+VermilionHouse2Text_560c0:
 	TX_FAR _VermilionHouse2Text_560c0
 	db "@"
 
-VermilionHouse2Text_560c5: ; 560c5 (15:60c5)
+VermilionHouse2Text_560c5:
 	TX_FAR _VermilionHouse2Text_560c5
 	db "@"
 
-VermilionHouse2Text_560ca: ; 560ca (15:60ca)
+VermilionHouse2Text_560ca:
 	TX_FAR _VermilionHouse2Text_560ca
 	db "@"
--- a/scripts/vermilionhouse3.asm
+++ b/scripts/vermilionhouse3.asm
@@ -1,10 +1,10 @@
-VermilionHouse3Script: ; 19c12 (6:5c12)
+VermilionHouse3Script:
 	jp EnableAutoTextBoxDrawing
 
-VermilionHouse3TextPointers: ; 19c15 (6:5c15)
+VermilionHouse3TextPointers:
 	dw VermilionHouse3Text1
 
-VermilionHouse3Text1: ; 19c17 (6:5c17)
+VermilionHouse3Text1:
 	TX_ASM
 	ld a, $4
 	ld [wWhichTrade], a
--- a/scripts/viridiancity.asm
+++ b/scripts/viridiancity.asm
@@ -1,20 +1,20 @@
-ViridianCityScript: ; 18ff1 (6:4ff1)
+ViridianCityScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, ViridianCityScriptPointers
 	ld a, [wViridianCityCurScript]
 	jp CallFunctionInTable
 
-ViridianCityScriptPointers: ; 18ffd (6:4ffd)
+ViridianCityScriptPointers:
 	dw ViridianCityScript0
 	dw ViridianCityScript1
 	dw ViridianCityScript2
 	dw ViridianCityScript3
 
-ViridianCityScript0: ; 19005 (6:5005)
+ViridianCityScript0:
 	call ViridianCityScript_1900b
 	jp ViridianCityScript_1903d
 
-ViridianCityScript_1900b: ; 1900b (6:500b)
+ViridianCityScript_1900b:
 	CheckEvent EVENT_VIRIDIAN_GYM_OPEN
 	ret nz
 	ld a, [wObtainedBadges]
@@ -39,7 +39,7 @@
 	ld [wViridianCityCurScript], a
 	ret
 
-ViridianCityScript_1903d: ; 1903d (6:503d)
+ViridianCityScript_1903d:
 	CheckEvent EVENT_GOT_POKEDEX
 	ret nz
 	ld a, [wYCoord]
@@ -58,7 +58,7 @@
 	ld [wViridianCityCurScript], a
 	ret
 
-ViridianCityScript1: ; 19062 (6:5062)
+ViridianCityScript1:
 	ld a, [wSpriteStateData1 + $34]
 	ld [$ffeb], a
 	ld a, [wSpriteStateData1 + $36]
@@ -81,7 +81,7 @@
 	ld [wViridianCityCurScript], a
 	ret
 
-ViridianCityScript2: ; 1908f (6:508f)
+ViridianCityScript2:
 	ld a, [$ffeb]
 	ld [wSpriteStateData1 + $34], a
 	ld a, [$ffec]
@@ -104,7 +104,7 @@
 	ld [wViridianCityCurScript], a
 	ret
 
-ViridianCityScript3: ; 190c1 (6:50c1)
+ViridianCityScript3:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -113,7 +113,7 @@
 	ld [wViridianCityCurScript], a
 	ret
 
-ViridianCityScript_190cf: ; 190cf (6:50cf)
+ViridianCityScript_190cf:
 	call StartSimulatingJoypadStates
 	ld a, $1
 	ld [wSimulatedJoypadStatesIndex], a
@@ -124,7 +124,7 @@
 	ld [wJoyIgnore], a
 	ret
 
-ViridianCityTextPointers: ; 190e4 (6:50e4)
+ViridianCityTextPointers:
 	dw ViridianCityText1
 	dw ViridianCityText2
 	dw ViridianCityText3
@@ -141,11 +141,11 @@
 	dw ViridianCityText14
 	dw ViridianCityText15
 
-ViridianCityText1: ; 19102 (6:5102)
+ViridianCityText1:
 	TX_FAR _ViridianCityText1
 	db "@"
 
-ViridianCityText2: ; 19107 (6:5107)
+ViridianCityText2:
 	TX_ASM
 	ld a, [wObtainedBadges]
 	cp %01111111
@@ -158,15 +158,15 @@
 	call PrintText
 	jp TextScriptEnd
 
-ViridianCityText_19122: ; 19122 (6:5122)
+ViridianCityText_19122:
 	TX_FAR _ViridianCityText_19122
 	db "@"
 
-ViridianCityText_19127: ; 19127 (6:5127)
+ViridianCityText_19127:
 	TX_FAR _ViridianCityText_19127
 	db "@"
 
-ViridianCityText3: ; 1912c (6:512c)
+ViridianCityText3:
 	TX_ASM
 	ld hl, ViridianCityText_1914d
 	call PrintText
@@ -183,19 +183,19 @@
 .asm_d611f
 	jp TextScriptEnd
 
-ViridianCityText_1914d: ; 1914d (6:514d)
+ViridianCityText_1914d:
 	TX_FAR _ViridianCityText_1914d
 	db "@"
 
-ViridianCityText_19152: ; 19152 (6:5152)
+ViridianCityText_19152:
 	TX_FAR _ViridianCityText_19152
 	db "@"
 
-ViridianCityText_19157: ; 19157 (6:5157)
+ViridianCityText_19157:
 	TX_FAR _ViridianCityText_19157
 	db "@"
 
-ViridianCityText4: ; 1915c (6:515c)
+ViridianCityText4:
 	TX_ASM
 	CheckEvent EVENT_GOT_POKEDEX
 	jr nz, .asm_83894
@@ -208,15 +208,15 @@
 .asm_700a6
 	jp TextScriptEnd
 
-ViridianCityText_19175: ; 19175 (6:5175)
+ViridianCityText_19175:
 	TX_FAR _ViridianCityText_19175
 	db "@"
 
-ViridianCityText_1917a: ; 1917a (6:517a)
+ViridianCityText_1917a:
 	TX_FAR _ViridianCityText_1917a
 	db "@"
 
-ViridianCityText5: ; 1917f (6:517f)
+ViridianCityText5:
 	TX_ASM
 	ld hl, ViridianCityText_19191
 	call PrintText
@@ -225,11 +225,11 @@
 	ld [wViridianCityCurScript], a
 	jp TextScriptEnd
 
-ViridianCityText_19191: ; 19191 (6:5191)
+ViridianCityText_19191:
 	TX_FAR _ViridianCityText_19191
 	db "@"
 
-ViridianCityText6: ; 19196 (6:5196)
+ViridianCityText6:
 	TX_ASM
 	CheckEvent EVENT_GOT_TM42
 	jr nz, .asm_4e5a0
@@ -252,23 +252,23 @@
 .asm_3c73c
 	jp TextScriptEnd
 
-ViridianCityText_191ca: ; 191ca (6:51ca)
+ViridianCityText_191ca:
 	TX_FAR _ViridianCityText_191ca
 	db "@"
 
-ReceivedTM42Text: ; 191cf (6:51cf)
+ReceivedTM42Text:
 	TX_FAR _ReceivedTM42Text
 	db $10, "@"
 
-TM42Explanation: ; 191d5 (6:51d5)
+TM42Explanation:
 	TX_FAR _TM42Explanation
 	db "@"
 
-TM42NoRoomText: ; 191da (6:51da)
+TM42NoRoomText:
 	TX_FAR _TM42NoRoomText
 	db "@"
 
-ViridianCityText7: ; 191df (6:51df)
+ViridianCityText7:
 	TX_ASM
 	ld hl, ViridianCityText_1920a
 	call PrintText
@@ -289,38 +289,38 @@
 .asm_2413a
 	jp TextScriptEnd
 
-ViridianCityText_1920a: ; 1920a (6:520a)
+ViridianCityText_1920a:
 	TX_FAR _ViridianCityText_1920a
 	db "@"
 
-ViridianCityText_1920f: ; 1920f (6:520f)
+ViridianCityText_1920f:
 	TX_FAR _ViridianCityText_1920f
 	db "@"
 
-ViridianCityText_19214: ; 19214 (6:5214)
+ViridianCityText_19214:
 	TX_FAR _ViridianCityText_19214
 	db "@"
 
-ViridianCityText15: ; 19219 (6:5219)
+ViridianCityText15:
 	TX_FAR _ViridianCityText_19219
 	db "@"
 
-ViridianCityText8: ; 1921e (6:521e)
+ViridianCityText8:
 	TX_FAR _ViridianCityText8
 	db "@"
 
-ViridianCityText9: ; 19223 (6:5223)
+ViridianCityText9:
 	TX_FAR _ViridianCityText9
 	db "@"
 
-ViridianCityText10: ; 19228 (6:5228)
+ViridianCityText10:
 	TX_FAR _ViridianCityText10
 	db "@"
 
-ViridianCityText13: ; 1922d (6:522d)
+ViridianCityText13:
 	TX_FAR _ViridianCityText13
 	db "@"
 
-ViridianCityText14: ; 19232 (6:5232)
+ViridianCityText14:
 	TX_FAR _ViridianCityText14
 	db "@"
--- a/scripts/viridianforest.asm
+++ b/scripts/viridianforest.asm
@@ -1,4 +1,4 @@
-ViridianForestScript: ; 6110d (18:510d)
+ViridianForestScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, ViridianForestTrainerHeaders
 	ld de, ViridianForestScriptPointers
@@ -7,12 +7,12 @@
 	ld [wViridianForestCurScript], a
 	ret
 
-ViridianForestScriptPointers: ; 61120 (18:5120)
+ViridianForestScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-ViridianForestTextPointers: ; 61126 (18:5126)
+ViridianForestTextPointers:
 	dw ViridianForestText1
 	dw ViridianForestText2
 	dw ViridianForestText3
@@ -28,8 +28,8 @@
 	dw ViridianForestText13
 	dw ViridianForestText14
 
-ViridianForestTrainerHeaders: ; 61142 (18:5142)
-ViridianForestTrainerHeader0: ; 61142 (18:5142)
+ViridianForestTrainerHeaders:
+ViridianForestTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0
@@ -38,7 +38,7 @@
 	dw ViridianForestEndBattleText1 ; TextEndBattle
 	dw ViridianForestEndBattleText1 ; TextEndBattle
 
-ViridianForestTrainerHeader1: ; 6114e (18:514e)
+ViridianForestTrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1
@@ -47,7 +47,7 @@
 	dw ViridianForestEndBattleText2 ; TextEndBattle
 	dw ViridianForestEndBattleText2 ; TextEndBattle
 
-ViridianForestTrainerHeader2: ; 6115a (18:515a)
+ViridianForestTrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2
@@ -58,88 +58,88 @@
 
 	db $ff
 
-ViridianForestText1: ; 61167 (18:5167)
+ViridianForestText1:
 	TX_FAR _ViridianForestText1
 	db "@"
 
-ViridianForestText2: ; 6116c (18:516c)
+ViridianForestText2:
 	TX_ASM
 	ld hl, ViridianForestTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianForestText3: ; 61176 (18:5176)
+ViridianForestText3:
 	TX_ASM
 	ld hl, ViridianForestTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianForestText4: ; 61180 (18:5180)
+ViridianForestText4:
 	TX_ASM
 	ld hl, ViridianForestTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianForestBattleText1: ; 6118a (18:518a)
+ViridianForestBattleText1:
 	TX_FAR _ViridianForestBattleText1
 	db "@"
 
-ViridianForestEndBattleText1: ; 6118f (18:518f)
+ViridianForestEndBattleText1:
 	TX_FAR _ViridianForestEndBattleText1
 	db "@"
 
-ViridianForestAfterBattleText1: ; 61194 (18:5194)
+ViridianForestAfterBattleText1:
 	TX_FAR _ViridianFrstAfterBattleText1
 	db "@"
 
-ViridianForestBattleText2: ; 61199 (18:5199)
+ViridianForestBattleText2:
 	TX_FAR _ViridianForestBattleText2
 	db "@"
 
-ViridianForestEndBattleText2: ; 6119e (18:519e)
+ViridianForestEndBattleText2:
 	TX_FAR _ViridianForestEndBattleText2
 	db "@"
 
-ViridianForestAfterBattleText2: ; 611a3 (18:51a3)
+ViridianForestAfterBattleText2:
 	TX_FAR _ViridianFrstAfterBattleText2
 	db "@"
 
-ViridianForestBattleText3: ; 611a8 (18:51a8)
+ViridianForestBattleText3:
 	TX_FAR _ViridianForestBattleText3
 	db "@"
 
-ViridianForestEndBattleText3: ; 611ad (18:51ad)
+ViridianForestEndBattleText3:
 	TX_FAR _ViridianForestEndBattleText3
 	db "@"
 
-ViridianForestAfterBattleText3: ; 611b2 (18:51b2)
+ViridianForestAfterBattleText3:
 	TX_FAR _ViridianFrstAfterBattleText3
 	db "@"
 
-ViridianForestText8: ; 611b7 (18:51b7)
+ViridianForestText8:
 	TX_FAR _ViridianForestText8
 	db "@"
 
-ViridianForestText9: ; 611bc (18:51bc)
+ViridianForestText9:
 	TX_FAR _ViridianForestText9
 	db "@"
 
-ViridianForestText10: ; 611c1 (18:51c1)
+ViridianForestText10:
 	TX_FAR _ViridianForestText10
 	db "@"
 
-ViridianForestText11: ; 611c6 (18:51c6)
+ViridianForestText11:
 	TX_FAR _ViridianForestText11
 	db "@"
 
-ViridianForestText12: ; 611cb (18:51cb)
+ViridianForestText12:
 	TX_FAR _ViridianForestText12
 	db "@"
 
-ViridianForestText13: ; 611d0 (18:51d0)
+ViridianForestText13:
 	TX_FAR _ViridianForestText13
 	db "@"
 
-ViridianForestText14: ; 611d5 (18:51d5)
+ViridianForestText14:
 	TX_FAR _ViridianForestText14
 	db "@"
--- a/scripts/viridianforestentrance.asm
+++ b/scripts/viridianforestentrance.asm
@@ -1,14 +1,14 @@
-ViridianForestEntranceScript: ; 5d65c (17:565c)
+ViridianForestEntranceScript:
 	jp EnableAutoTextBoxDrawing
 
-ViridianForestEntranceTextPointers: ; 5d65f (17:565f)
+ViridianForestEntranceTextPointers:
 	dw ViridianForestEntranceText1
 	dw ViridianForestEntranceText2
 
-ViridianForestEntranceText1: ; 5d663 (17:5663)
+ViridianForestEntranceText1:
 	TX_FAR _ViridianForestEntranceText1
 	db "@"
 
-ViridianForestEntranceText2: ; 5d668 (17:5668)
+ViridianForestEntranceText2:
 	TX_FAR _ViridianForestEntranceText2
 	db "@"
--- a/scripts/viridianforestexit.asm
+++ b/scripts/viridianforestexit.asm
@@ -1,14 +1,14 @@
-ViridianForestExitScript: ; 5d587 (17:5587)
+ViridianForestExitScript:
 	jp EnableAutoTextBoxDrawing
 
-ViridianForestExitTextPointers: ; 5d58a (17:558a)
+ViridianForestExitTextPointers:
 	dw ViridianForestExitText1
 	dw ViridianForestExitText2
 
-ViridianForestExitText1: ; 5d58e (17:558e)
+ViridianForestExitText1:
 	TX_FAR _ViridianForestExitText1
 	db "@"
 
-ViridianForestExitText2: ; 5d593 (17:5593)
+ViridianForestExitText2:
 	TX_FAR _ViridianForestExitText2
 	db "@"
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -1,4 +1,4 @@
-ViridianGymScript: ; 748a3 (1d:48a3)
+ViridianGymScript:
 	ld hl, Gym8CityName
 	ld de, Gym8LeaderName
 	call LoadGymLeaderAndCityName
@@ -10,12 +10,12 @@
 	ld [wViridianGymCurScript], a
 	ret
 
-Gym8CityName: ; 748bf (1d:48bf)
+Gym8CityName:
 	db "VIRIDIAN CITY@"
-Gym8LeaderName: ; 748cd (1d:48cd)
+Gym8LeaderName:
 	db "GIOVANNI@"
 
-ViridianGymScript_748d6: ; 748d6 (1d:48d6)
+ViridianGymScript_748d6:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wViridianGymCurScript], a
@@ -22,7 +22,7 @@
 	ld [wCurMapScript], a
 	ret
 
-ViridianGymScriptPointers: ; 748e1 (1d:48e1)
+ViridianGymScriptPointers:
 	dw ViridianGymScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -29,7 +29,7 @@
 	dw ViridianGymScript3
 	dw ViridianGymScript4
 
-ViridianGymScript0: ; 748eb (1d:48eb)
+ViridianGymScript0:
 	ld a, [wYCoord]
 	ld b, a
 	ld a, [wXCoord]
@@ -52,7 +52,7 @@
 ;format:
 ;db y,x
 ;dw pointer to movement
-ViridianGymArrowTilePlayerMovement: ; 74916 (1d:4916)
+ViridianGymArrowTilePlayerMovement:
 	db $b,$13
 	dw ViridianGymArrowMovement1
 	db $1,$13
@@ -80,43 +80,43 @@
 	db $FF
 
 ;format: direction, count
-ViridianGymArrowMovement1: ; 74947 (1d:4947)
+ViridianGymArrowMovement1:
 	db D_UP,$09,$FF
 
-ViridianGymArrowMovement2: ; 7494a (1d:494a)
+ViridianGymArrowMovement2:
 	db D_LEFT,$08,$FF
 
-ViridianGymArrowMovement3: ; 7494d (1d:494d)
+ViridianGymArrowMovement3:
 	db D_DOWN,$09,$FF
 
-ViridianGymArrowMovement4: ; 74950 (1d:4950)
+ViridianGymArrowMovement4:
 	db D_RIGHT,$06,$FF
 
-ViridianGymArrowMovement5: ; 74953 (1d:4953)
+ViridianGymArrowMovement5:
 	db D_DOWN,$02,$FF
 
-ViridianGymArrowMovement6: ; 74956 (1d:4956)
+ViridianGymArrowMovement6:
 	db D_DOWN,$07,$FF
 
-ViridianGymArrowMovement7: ; 74959 (1d:4959)
+ViridianGymArrowMovement7:
 	db D_RIGHT,$08,$FF
 
-ViridianGymArrowMovement8: ; 7495c (1d:495c)
+ViridianGymArrowMovement8:
 	db D_RIGHT,$09,$FF
 
-ViridianGymArrowMovement9: ; 7495f (1d:495f)
+ViridianGymArrowMovement9:
 	db D_UP,$08,$FF
 
-ViridianGymArrowMovement10: ; 74962 (1d:4962)
+ViridianGymArrowMovement10:
 	db D_UP,$06,$FF
 
-ViridianGymArrowMovement11: ; 74965 (1d:4965)
+ViridianGymArrowMovement11:
 	db D_LEFT,$06,$FF
 
-ViridianGymArrowMovement12: ; 74968 (1d:4968)
+ViridianGymArrowMovement12:
 	db D_LEFT,$0C,$FF
 
-ViridianGymScript4: ; 7496b (1d:496b)
+ViridianGymScript4:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	jr nz, .asm_74980
@@ -130,13 +130,13 @@
 .asm_74980
 	jpba LoadSpinnerArrowTiles
 
-ViridianGymScript3: ; 74988 (1d:4988)
+ViridianGymScript3:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, ViridianGymScript_748d6
 	ld a, $f0
 	ld [wJoyIgnore], a
-ViridianGymScript3_74995: ; 74995 (1d:4995)
+ViridianGymScript3_74995:
 	ld a, $c
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -168,7 +168,7 @@
 	SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
 	jp ViridianGymScript_748d6
 
-ViridianGymTextPointers: ; 749ec (1d:49ec)
+ViridianGymTextPointers:
 	dw ViridianGymText1
 	dw ViridianGymText2
 	dw ViridianGymText3
@@ -184,8 +184,8 @@
 	dw ViridianGymText13
 	dw ViridianGymText14
 
-ViridianGymTrainerHeaders: ; 74a08 (1d:4a08)
-ViridianGymTrainerHeader0: ; 74a08 (1d:4a08)
+ViridianGymTrainerHeaders:
+ViridianGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0
@@ -194,7 +194,7 @@
 	dw ViridianGymEndBattleText1 ; TextEndBattle
 	dw ViridianGymEndBattleText1 ; TextEndBattle
 
-ViridianGymTrainerHeader1: ; 74a14 (1d:4a14)
+ViridianGymTrainerHeader1:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1
@@ -203,7 +203,7 @@
 	dw ViridianGymEndBattleText2 ; TextEndBattle
 	dw ViridianGymEndBattleText2 ; TextEndBattle
 
-ViridianGymTrainerHeader2: ; 74a20 (1d:4a20)
+ViridianGymTrainerHeader2:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2
@@ -212,7 +212,7 @@
 	dw ViridianGymEndBattleText3 ; TextEndBattle
 	dw ViridianGymEndBattleText3 ; TextEndBattle
 
-ViridianGymTrainerHeader3: ; 74a2c (1d:4a2c)
+ViridianGymTrainerHeader3:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3
 	db ($2 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3
@@ -221,7 +221,7 @@
 	dw ViridianGymEndBattleText4 ; TextEndBattle
 	dw ViridianGymEndBattleText4 ; TextEndBattle
 
-ViridianGymTrainerHeader4: ; 74a38 (1d:4a38)
+ViridianGymTrainerHeader4:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4
@@ -230,7 +230,7 @@
 	dw ViridianGymEndBattleText5 ; TextEndBattle
 	dw ViridianGymEndBattleText5 ; TextEndBattle
 
-ViridianGymTrainerHeader5: ; 74a44 (1d:4a44)
+ViridianGymTrainerHeader5:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5
@@ -239,7 +239,7 @@
 	dw ViridianGymEndBattleText6 ; TextEndBattle
 	dw ViridianGymEndBattleText6 ; TextEndBattle
 
-ViridianGymTrainerHeader6: ; 74a50 (1d:4a50)
+ViridianGymTrainerHeader6:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1
 	db ($3 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1
@@ -248,7 +248,7 @@
 	dw ViridianGymEndBattleText7 ; TextEndBattle
 	dw ViridianGymEndBattleText7 ; TextEndBattle
 
-ViridianGymTrainerHeader7: ; 74a5c (1d:4a5c)
+ViridianGymTrainerHeader7:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1
 	db ($4 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1
@@ -259,7 +259,7 @@
 
 	db $ff
 
-ViridianGymText1: ; 74a69 (1d:4a69)
+ViridianGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
 	jr z, .asm_6de66
@@ -301,179 +301,179 @@
 .asm_6dff7
 	jp TextScriptEnd
 
-ViridianGymText_74ace: ; 74ace (1d:4ace)
+ViridianGymText_74ace:
 	TX_FAR _ViridianGymText_74ace
 	db "@"
 
-ViridianGymText_74ad3: ; 74ad3 (1d:4ad3)
+ViridianGymText_74ad3:
 	TX_FAR _ViridianGymText_74ad3
 	db $0b, "@"
 
-ViridianGymText_74ad9: ; 74ad9 (1d:4ad9)
+ViridianGymText_74ad9:
 	TX_FAR _ViridianGymText_74ad9
 	db $0d, "@"
 
-ViridianGymText12: ; 74adf (1d:4adf)
+ViridianGymText12:
 	TX_FAR _ViridianGymText12
 	db "@"
 
-ViridianGymText13: ; 74ae4 (1d:4ae4)
+ViridianGymText13:
 	TX_FAR _ReceivedTM27Text
 	db $0b
 
-TM27ExplanationText: ; 74ae9 (1d:4ae9)
+TM27ExplanationText:
 	TX_FAR _TM27ExplanationText
 	db "@"
 
-ViridianGymText14: ; 74aee (1d:4aee)
+ViridianGymText14:
 	TX_FAR _TM27NoRoomText
 	db "@"
 
-ViridianGymText2: ; 74af3 (1d:4af3)
+ViridianGymText2:
 	TX_ASM
 	ld hl, ViridianGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText1: ; 74afd (1d:4afd)
+ViridianGymBattleText1:
 	TX_FAR _ViridianGymBattleText1
 	db "@"
 
-ViridianGymEndBattleText1: ; 74b02 (1d:4b02)
+ViridianGymEndBattleText1:
 	TX_FAR _ViridianGymEndBattleText1
 	db "@"
 
-ViridianGymAfterBattleText1: ; 74b07 (1d:4b07)
+ViridianGymAfterBattleText1:
 	TX_FAR _ViridianGymAfterBattleText1
 	db "@"
 
-ViridianGymText3: ; 74b0c (1d:4b0c)
+ViridianGymText3:
 	TX_ASM
 	ld hl, ViridianGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText2: ; 74b16 (1d:4b16)
+ViridianGymBattleText2:
 	TX_FAR _ViridianGymBattleText2
 	db "@"
 
-ViridianGymEndBattleText2: ; 74b1b (1d:4b1b)
+ViridianGymEndBattleText2:
 	TX_FAR _ViridianGymEndBattleText2
 	db "@"
 
-ViridianGymAfterBattleText2: ; 74b20 (1d:4b20)
+ViridianGymAfterBattleText2:
 	TX_FAR _ViridianGymAfterBattleText2
 	db "@"
 
-ViridianGymText4: ; 74b25 (1d:4b25)
+ViridianGymText4:
 	TX_ASM
 	ld hl, ViridianGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText3: ; 74b2f (1d:4b2f)
+ViridianGymBattleText3:
 	TX_FAR _ViridianGymBattleText3
 	db "@"
 
-ViridianGymEndBattleText3: ; 74b34 (1d:4b34)
+ViridianGymEndBattleText3:
 	TX_FAR _ViridianGymEndBattleText3
 	db "@"
 
-ViridianGymAfterBattleText3: ; 74b39 (1d:4b39)
+ViridianGymAfterBattleText3:
 	TX_FAR _ViridianGymAfterBattleText3
 	db "@"
 
-ViridianGymText5: ; 74b3e (1d:4b3e)
+ViridianGymText5:
 	TX_ASM
 	ld hl, ViridianGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText4: ; 74b48 (1d:4b48)
+ViridianGymBattleText4:
 	TX_FAR _ViridianGymBattleText4
 	db "@"
 
-ViridianGymEndBattleText4: ; 74b4d (1d:4b4d)
+ViridianGymEndBattleText4:
 	TX_FAR _ViridianGymEndBattleText4
 	db "@"
 
-ViridianGymAfterBattleText4: ; 74b52 (1d:4b52)
+ViridianGymAfterBattleText4:
 	TX_FAR _ViridianGymAfterBattleText4
 	db "@"
 
-ViridianGymText6: ; 74b57 (1d:4b57)
+ViridianGymText6:
 	TX_ASM
 	ld hl, ViridianGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText5: ; 74b61 (1d:4b61)
+ViridianGymBattleText5:
 	TX_FAR _ViridianGymBattleText5
 	db "@"
 
-ViridianGymEndBattleText5: ; 74b66 (1d:4b66)
+ViridianGymEndBattleText5:
 	TX_FAR _ViridianGymEndBattleText5
 	db "@"
 
-ViridianGymAfterBattleText5: ; 74b6b (1d:4b6b)
+ViridianGymAfterBattleText5:
 	TX_FAR _ViridianGymAfterBattleText5
 	db "@"
 
-ViridianGymText7: ; 74b70 (1d:4b70)
+ViridianGymText7:
 	TX_ASM
 	ld hl, ViridianGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText6: ; 74b7a (1d:4b7a)
+ViridianGymBattleText6:
 	TX_FAR _ViridianGymBattleText6
 	db "@"
 
-ViridianGymEndBattleText6: ; 74b7f (1d:4b7f)
+ViridianGymEndBattleText6:
 	TX_FAR _ViridianGymEndBattleText6
 	db "@"
 
-ViridianGymAfterBattleText6: ; 74b84 (1d:4b84)
+ViridianGymAfterBattleText6:
 	TX_FAR _ViridianGymAfterBattleText6
 	db "@"
 
-ViridianGymText8: ; 74b89 (1d:4b89)
+ViridianGymText8:
 	TX_ASM
 	ld hl, ViridianGymTrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText7: ; 74b93 (1d:4b93)
+ViridianGymBattleText7:
 	TX_FAR _ViridianGymBattleText7
 	db "@"
 
-ViridianGymEndBattleText7: ; 74b98 (1d:4b98)
+ViridianGymEndBattleText7:
 	TX_FAR _ViridianGymEndBattleText7
 	db "@"
 
-ViridianGymAfterBattleText7: ; 74b9d (1d:4b9d)
+ViridianGymAfterBattleText7:
 	TX_FAR _ViridianGymAfterBattleText7
 	db "@"
 
-ViridianGymText9: ; 74ba2 (1d:4ba2)
+ViridianGymText9:
 	TX_ASM
 	ld hl, ViridianGymTrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText8: ; 74bac (1d:4bac)
+ViridianGymBattleText8:
 	TX_FAR _ViridianGymBattleText8
 	db "@"
 
-ViridianGymEndBattleText8: ; 74bb1 (1d:4bb1)
+ViridianGymEndBattleText8:
 	TX_FAR _ViridianGymEndBattleText8
 	db "@"
 
-ViridianGymAfterBattleText8: ; 74bb6 (1d:4bb6)
+ViridianGymAfterBattleText8:
 	TX_FAR _ViridianGymAfterBattleText8
 	db "@"
 
-ViridianGymText10: ; 74bbb (1d:4bbb)
+ViridianGymText10:
 	TX_ASM
 	CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
 	jr nz, .asm_1abd1
@@ -486,10 +486,10 @@
 .asm_6064d
 	jp TextScriptEnd
 
-ViridianGymText_74bd4: ; 74bd4 (1d:4bd4)
+ViridianGymText_74bd4:
 	TX_FAR _ViridianGymText_74bd4
 	db "@"
 
-ViridianGymText_74bd9: ; 74bd9 (1d:4bd9)
+ViridianGymText_74bd9:
 	TX_FAR _ViridianGymText_74bd9
 	db "@"
--- a/scripts/viridianhouse.asm
+++ b/scripts/viridianhouse.asm
@@ -1,21 +1,21 @@
-ViridianHouseScript: ; 1d58a (7:558a)
+ViridianHouseScript:
 	jp EnableAutoTextBoxDrawing
 
-ViridianHouseTextPointers: ; 1d58d (7:558d)
+ViridianHouseTextPointers:
 	dw ViridianHouseText1
 	dw ViridianHouseText2
 	dw ViridianHouseText3
 	dw ViridianHouseText4
 
-ViridianHouseText1: ; 1d595 (7:5595)
+ViridianHouseText1:
 	TX_FAR _ViridianHouseText1
 	db "@"
 
-ViridianHouseText2: ; 1d59a (7:559a)
+ViridianHouseText2:
 	TX_FAR _ViridianHouseText2
 	db "@"
 
-ViridianHouseText3: ; 1d59f (7:559f)
+ViridianHouseText3:
 	TX_ASM
 	ld hl, ViridianHouseText_1d5b1
 	call PrintText
@@ -24,10 +24,10 @@
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
-ViridianHouseText_1d5b1: ; 1d5b1 (7:55b1)
+ViridianHouseText_1d5b1:
 	TX_FAR _ViridianHouseText_1d5b1
 	db "@"
 
-ViridianHouseText4: ; 1d5b6 (7:55b6)
+ViridianHouseText4:
 	TX_FAR _ViridianHouseText4
 	db "@"
--- a/text/credits_text.asm
+++ b/text/credits_text.asm
@@ -1,4 +1,4 @@
-CreditsTextPointers: ; 742c3 (1d:42c3)
+CreditsTextPointers:
 	dw CredVersion
 	dw CredTajiri
 	dw CredTaOota
@@ -71,129 +71,129 @@
 IF DEF(_BLUE)
 	db -8, "BLUE VERSION STAFF@"
 ENDC
-CredTajiri: ; 74356 (1d:4356)
+CredTajiri:
 	db -6, "SATOSHI TAJIRI@"
-CredTaOota: ; 74366 (1d:4366)
+CredTaOota:
 	db -6, "TAKENORI OOTA@"
-CredMorimoto: ; 74375 (1d:4375)
+CredMorimoto:
 	db -7, "SHIGEKI MORIMOTO@"
-CredWatanabe: ; 74387 (1d:4387)
+CredWatanabe:
 	db -7, "TETSUYA WATANABE@"
-CredMasuda: ; 74399 (1d:4399)
+CredMasuda:
 	db -6, "JUNICHI MASUDA@"
-CredNisino: ; 743a9 (1d:43a9)
+CredNisino:
 	db -5, "KOHJI NISINO@"
-CredSugimori: ; 743b7 (1d:43b7)
+CredSugimori:
 	db -5, "KEN SUGIMORI@"
-CredNishida: ; 743c5 (1d:43c5)
+CredNishida:
 	db -6, "ATSUKO NISHIDA@"
-CredMiyamoto: ; 743d5 (1d:43d5)
+CredMiyamoto:
 	db -7, "SHIGERU MIYAMOTO@"
-CredKawaguchi: ; 743e7 (1d:43e7)
+CredKawaguchi:
 	db -8, "TAKASHI KAWAGUCHI@"
-CredIshihara: ; 743fa (1d:43fa)
+CredIshihara:
 	db -8, "TSUNEKAZU ISHIHARA@"
-CredYamauchi: ; 7440e (1d:440e)
+CredYamauchi:
 	db -7, "HIROSHI YAMAUCHI@"
-CredZinnai: ; 74420 (1d:4420)
+CredZinnai:
 	db -7, "HIROYUKI ZINNAI@"
-CredHishida: ; 74431 (1d:4431)
+CredHishida:
 	db -7, "TATSUYA HISHIDA@"
-CredSakai: ; 74442 (1d:4442)
+CredSakai:
 	db -6, "YASUHIRO SAKAI@"
-CredYamaguchi: ; 74452 (1d:4452)
+CredYamaguchi:
 	db -7, "WATARU YAMAGUCHI@"
-CredYamamoto: ; 74464 (1d:4464)
+CredYamamoto:
 	db -8, "KAZUYUKI YAMAMOTO@"
-CredTaniguchi: ; 74477 (1d:4477)
+CredTaniguchi:
 	db -8, "RYOHSUKE TANIGUCHI@"
-CredNonomura: ; 7448b (1d:448b)
+CredNonomura:
 	db -8, "FUMIHIRO NONOMURA@"
-CredFuziwara: ; 7449e (1d:449e)
+CredFuziwara:
 	db -7, "MOTOFUMI FUZIWARA@"
-CredMatsusima: ; 744b1 (1d:44b1)
+CredMatsusima:
 	db -7, "KENJI MATSUSIMA@"
-CredTomisawa: ; 744c2 (1d:44c2)
+CredTomisawa:
 	db -7, "AKIHITO TOMISAWA@"
-CredKawamoto: ; 744d4 (1d:44d4)
+CredKawamoto:
 	db -7, "HIROSHI KAWAMOTO@"
-CredKakei: ; 744e6 (1d:44e6)
+CredKakei:
 	db -6, "AKIYOSHI KAKEI@"
-CredTsuchiya: ; 744f6 (1d:44f6)
+CredTsuchiya:
 	db -7, "KAZUKI TSUCHIYA@"
-CredTaNakamura: ; 74507 (1d:4507)
+CredTaNakamura:
 	db -6, "TAKEO NAKAMURA@"
-CredYuda: ; 74517 (1d:4517)
+CredYuda:
 	db -6, "MASAMITSU YUDA@"
-CredMon: ; 74527 (1d:4527)
+CredMon:
 	db -3, "#MON@"
-CredDirector: ; 7452d (1d:452d)
+CredDirector:
 	db -3, "DIRECTOR@"
-CredProgrammers: ; 74537 (1d:4537)
+CredProgrammers:
 	db -5, "PROGRAMMERS@"
-CredCharDesign: ; 74544 (1d:4544)
+CredCharDesign:
 	db -7, "CHARACTER DESIGN@"
-CredMusic: ; 74556 (1d:4556)
+CredMusic:
 	db -2, "MUSIC@"
-CredSoundEffects: ; 7455d (1d:455d)
+CredSoundEffects:
 	db -6, "SOUND EFFECTS@"
-CredGameDesign: ; 7456c (1d:456c)
+CredGameDesign:
 	db -5, "GAME DESIGN@"
-CredMonsterDesign: ; 74579 (1d:4579)
+CredMonsterDesign:
 	db -6, "MONSTER DESIGN@"
-CredGameScene: ; 74589 (1d:4589)
+CredGameScene:
 	db -6, "GAME SCENARIO@"
-CredParam: ; 74598 (1d:4598)
+CredParam:
 	db -8, "PARAMETRIC DESIGN@"
-CredMap: ; 745ab (1d:45ab)
+CredMap:
 	db -4, "MAP DESIGN@"
-CredTest: ; 745b7 (1d:45b7)
+CredTest:
 	db -7, "PRODUCT TESTING@"
-CredSpecial: ; 745c8 (1d:45c8)
+CredSpecial:
 	db -6, "SPECIAL THANKS@"
-CredProducers: ; 745d8 (1d:45d8)
+CredProducers:
 	db -4, "PRODUCERS@"
-CredProducer: ; 745e3 (1d:45e3)
+CredProducer:
 	db -4, "PRODUCER@"
-CredExecutive: ; 745ed (1d:45ed)
+CredExecutive:
 	db -8, "EXECUTIVE PRODUCER@"
-CredTamada: ; 74601 (1d:4601)
+CredTamada:
 	db -6, "SOUSUKE TAMADA@"
-CredSaOota: ; 74611 (1d:4611)
+CredSaOota:
 	db -5, "SATOSHI OOTA@"
-CredYoshikawa: ; 7461f (1d:461f)
+CredYoshikawa:
 	db -6, "RENA YOSHIKAWA@"
-CredToOota: ; 7462f (1d:462f)
+CredToOota:
 	db -6, "TOMOMICHI OOTA@"
-CredUSStaff: ; 7463f (1d:463f)
+CredUSStaff:
 	db -7, "US VERSION STAFF@"
-CredUSCoord: ; 74651 (1d:4651)
+CredUSCoord:
 	db -7, "US COORDINATION@"
-CredTilden: ; 74662 (1d:4662)
+CredTilden:
 	db -5, "GAIL TILDEN@"
-CredKawakami: ; 7466f (1d:466f)
+CredKawakami:
 	db -6, "NAOKO KAWAKAMI@"
-CredHiNakamura: ; 7467f (1d:467f)
+CredHiNakamura:
 	db -6, "HIRO NAKAMURA@"
-CredGiese: ; 7468e (1d:468e)
+CredGiese:
 	db -6, "WILLIAM GIESE@"
-CredOsborne: ; 7469d (1d:469d)
+CredOsborne:
 	db -5, "SARA OSBORNE@"
-CredTrans: ; 746ab (1d:46ab)
+CredTrans:
 	db -7, "TEXT TRANSLATION@"
-CredOgasawara: ; 746bd (1d:46bd)
+CredOgasawara:
 	db -6, "NOB OGASAWARA@"
-CredIwata: ; 746cc (1d:46cc)
+CredIwata:
 	db -5, "SATORU IWATA@"
-CredIzushi: ; 746da (1d:46da)
+CredIzushi:
 	db -7, "TAKEHIRO IZUSHI@"
-CredHarada: ; 746eb (1d:46eb)
+CredHarada:
 	db -7, "TAKAHIRO HARADA@"
-CredMurakawa: ; 746fc (1d:46fc)
+CredMurakawa:
 	db -7, "TERUKI MURAKAWA@"
-CredFukui: ; 7470d (1d:470d)
+CredFukui:
 	db -5, "KOHTA FUKUI@"
-CredClub: ; 7471a (1d:471a)
+CredClub:
 	db -9, "NCL SUPER MARIO CLUB@"
-CredPAAD: ; 74730 (1d:4730)
+CredPAAD:
 	db -5, "PAAD TESTING@"
--- a/text/item_names.asm
+++ b/text/item_names.asm
@@ -1,4 +1,4 @@
-ItemNames: ; 472b (1:472b)
+ItemNames:
 	db "MASTER BALL@"
 	db "ULTRA BALL@"
 	db "GREAT BALL@"
--- a/text/map_names.asm
+++ b/text/map_names.asm
@@ -1,107 +1,107 @@
-MapNames: ; 71473 (1c:5473)
-PalletTownName: ; 71473 (1c:5473)
+MapNames:
+PalletTownName:
 	db "PALLET TOWN@"
-ViridianCityName: ; 7147f (1c:547f)
+ViridianCityName:
 	db "VIRIDIAN CITY@"
-PewterCityName: ; 7148d (1c:548d)
+PewterCityName:
 	db "PEWTER CITY@"
-CeruleanCityName: ; 71499 (1c:5499)
+CeruleanCityName:
 	db "CERULEAN CITY@"
-LavenderTownName: ; 714a7 (1c:54a7)
+LavenderTownName:
 	db "LAVENDER TOWN@"
-VermilionCityName: ; 714b5 (1c:54b5)
+VermilionCityName:
 	db "VERMILION CITY@"
-CeladonCityName: ; 714c4 (1c:54c4)
+CeladonCityName:
 	db "CELADON CITY@"
-FuchsiaCityName: ; 714d1 (1c:54d1)
+FuchsiaCityName:
 	db "FUCHSIA CITY@"
-CinnabarIslandName: ; 714de (1c:54de)
+CinnabarIslandName:
 	db "CINNABAR ISLAND@"
-IndigoPlateauName: ; 714ee (1c:54ee)
+IndigoPlateauName:
 	db "INDIGO PLATEAU@"
-SaffronCityName: ; 714fd (1c:54fd)
+SaffronCityName:
 	db "SAFFRON CITY@"
-Route1Name: ; 7150a (1c:550a)
+Route1Name:
 	db "ROUTE 1@"
-Route2Name: ; 71512 (1c:5512)
+Route2Name:
 	db "ROUTE 2@"
-Route3Name: ; 7151a (1c:551a)
+Route3Name:
 	db "ROUTE 3@"
-Route4Name: ; 71522 (1c:5522)
+Route4Name:
 	db "ROUTE 4@"
-Route5Name: ; 7152a (1c:552a)
+Route5Name:
 	db "ROUTE 5@"
-Route6Name: ; 71532 (1c:5532)
+Route6Name:
 	db "ROUTE 6@"
-Route7Name: ; 7153a (1c:553a)
+Route7Name:
 	db "ROUTE 7@"
-Route8Name: ; 71542 (1c:5542)
+Route8Name:
 	db "ROUTE 8@"
-Route9Name: ; 7154a (1c:554a)
+Route9Name:
 	db "ROUTE 9@"
-Route10Name: ; 71552 (1c:5552)
+Route10Name:
 	db "ROUTE 10@"
-Route11Name: ; 7155b (1c:555b)
+Route11Name:
 	db "ROUTE 11@"
-Route12Name: ; 71564 (1c:5564)
+Route12Name:
 	db "ROUTE 12@"
-Route13Name: ; 7156d (1c:556d)
+Route13Name:
 	db "ROUTE 13@"
-Route14Name: ; 71576 (1c:5576)
+Route14Name:
 	db "ROUTE 14@"
-Route15Name: ; 7157f (1c:557f)
+Route15Name:
 	db "ROUTE 15@"
-Route16Name: ; 71588 (1c:5588)
+Route16Name:
 	db "ROUTE 16@"
-Route17Name: ; 71591 (1c:5591)
+Route17Name:
 	db "ROUTE 17@"
-Route18Name: ; 7159a (1c:559a)
+Route18Name:
 	db "ROUTE 18@"
-Route19Name: ; 715a3 (1c:55a3)
+Route19Name:
 	db "SEA ROUTE 19@"
-Route20Name: ; 715b0 (1c:55b0)
+Route20Name:
 	db "SEA ROUTE 20@"
-Route21Name: ; 715bd (1c:55bd)
+Route21Name:
 	db "SEA ROUTE 21@"
-Route22Name: ; 715ca (1c:55ca)
+Route22Name:
 	db "ROUTE 22@"
-Route23Name: ; 715d3 (1c:55d3)
+Route23Name:
 	db "ROUTE 23@"
-Route24Name: ; 715dc (1c:55dc)
+Route24Name:
 	db "ROUTE 24@"
-Route25Name: ; 715e5 (1c:55e5)
+Route25Name:
 	db "ROUTE 25@"
-ViridianForestName: ; 715ee (1c:55ee)
+ViridianForestName:
 	db "VIRIDIAN FOREST@"
-MountMoonName: ; 715fe (1c:55fe)
+MountMoonName:
 	db "MT.MOON@"
-RockTunnelName: ; 71606 (1c:5606)
+RockTunnelName:
 	db "ROCK TUNNEL@"
-SeaCottageName: ; 71612 (1c:5612)
+SeaCottageName:
 	db "SEA COTTAGE@"
-SSAnneName: ; 7161e (1c:561e)
+SSAnneName:
 	db "S.S.ANNE@"
-PokemonLeagueName: ; 71627 (1c:5627)
+PokemonLeagueName:
 	db "#MON LEAGUE@"
-UndergroundPathName: ; 71633 (1c:5633)
+UndergroundPathName:
 	db "UNDERGROUND PATH@"
-PokemonTowerName: ; 71644 (1c:5644)
+PokemonTowerName:
 	db "#MON TOWER@"
-SeafoamIslandsName: ; 7164f (1c:564f)
+SeafoamIslandsName:
 	db "SEAFOAM ISLANDS@"
-VictoryRoadName: ; 7165f (1c:565f)
+VictoryRoadName:
 	db "VICTORY ROAD@"
-DiglettsCaveName: ; 7166c (1c:566c)
+DiglettsCaveName:
 	db "DIGLETT's CAVE@"
-RocketHQName: ; 7167a (1c:567a)
+RocketHQName:
 	db "ROCKET HQ@"
-SilphCoName: ; 71684 (1c:5684)
+SilphCoName:
 	db "SILPH CO.@"
-PokemonMansionName: ; 7168e (1c:568e)
+PokemonMansionName:
 	db $4a," MANSION@"
-SafariZoneName: ; 71698 (1c:5698)
+SafariZoneName:
 	db "SAFARI ZONE@"
-CeruleanCaveName: ; 716a4 (1c:56a4)
+CeruleanCaveName:
 	db "CERULEAN CAVE@"
-PowerPlantName: ; 716b2 (1c:56b2)
+PowerPlantName:
 	db "POWER PLANT@"
--- a/text/monster_names.asm
+++ b/text/monster_names.asm
@@ -1,4 +1,4 @@
-MonsterNames: ; 1c21e (7:421e)
+MonsterNames:
 	db "RHYDON@@@@"
 	db "KANGASKHAN"
 	db "NIDORAN♂@@"
--- a/text/move_names.asm
+++ b/text/move_names.asm
@@ -1,4 +1,4 @@
-MoveNames:: ; b0000 (2c:4000)
+MoveNames::
 	db "POUND@"
 	db "KARATE CHOP@"
 	db "DOUBLESLAP@"
--- a/text/trainer_names.asm
+++ b/text/trainer_names.asm
@@ -1,4 +1,4 @@
-TrainerNames: ; 399ff (e:59ff)
+TrainerNames:
 	db "YOUNGSTER@"
 	db "BUG CATCHER@"
 	db "LASS@"