shithub: pokered

Download patch

ref: 1b9ee46af9f8baac0d266a54130115a719788377
parent: 6bde08504fdc336b1d458bab0bed4ef649cae25a
author: yenatch <yenatch@gmail.com>
date: Mon Jan 27 11:22:41 EST 2014

Get rid of globals.asm. Use ::s to export labels between objects.

globals.asm was a hack that:
- gave rgbasm an extra 100k lines to read
- increased reliance on the python preprocessor
- made the makefile a mess
- gave object creation an extra step
- wasn't even necessary

This speeds up build time by at least a third.

--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@
 
 # generate dependencies for each object
 $(shell $(foreach obj, $(OBJS), \
-	$(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) extras/pokemontools/scan_includes.py $(obj:.o=.asm) | sed s/globals.asm//g)) \
+	$(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) extras/pokemontools/scan_includes.py $(obj:.o=.asm))) \
 ))
 $(shell $(foreach obj, $(OBJS), \
 	$(eval ALL_DEPENDENCIES += $($(obj:.o=)_DEPENDENCIES)) \
@@ -41,7 +41,6 @@
 clean:
 	rm -f $(ROMS)
 	rm -f $(OBJS)
-	rm -f globals.asm
 	@echo "removing *.tx" && find . -iname '*.tx' -exec rm {} +
 	rm -f redrle
 
@@ -51,23 +50,19 @@
 
 %.asm: ;
 .asm.tx:
-	$(eval TEXTQUEUE := $(TEXTQUEUE) $<)
+	$(eval TEXTQUEUE += $<)
 	@rm -f $@
 
-globals.asm: $(ALL_DEPENDENCIES:.asm=.tx) $(OBJS:.o=.tx)
-	@touch $@
-	@$(PYTHON) prequeue.py $(TEXTQUEUE)
-globals.tx: globals.asm
-	@cp $< $@
-
 $(OBJS): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_DEPENDENCIES))
+	@$(PYTHON) prequeue.py $(TEXTQUEUE)
+	@$(eval TEXTQUEUE :=)
 	rgbasm -o $@ $*.tx
 
-pokered.gbc: globals.tx $(RED_OBJS)
+pokered.gbc: $(RED_OBJS)
 	rgblink -n $*.sym -m $*.map -o $@ $(RED_OBJS)
 	rgbfix -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" $@
 
-pokeblue.gbc: globals.tx $(BLUE_OBJS)
+pokeblue.gbc: $(BLUE_OBJS)
 	rgblink -n $*.sym -m $*.map -o $@ $(BLUE_OBJS)
 	rgbfix -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" $@
 
--- a/audio.asm
+++ b/audio.asm
@@ -1,4 +1,3 @@
-INCLUDE "globals.asm"
 
 AUDIO_1 EQU $2
 AUDIO_2 EQU $8
@@ -463,7 +462,7 @@
 
 SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
 
-Func_2136e: ; 2136e (8:536e)
+Func_2136e:: ; 2136e (8:536e)
 	ld a, [$d083]
 	cp $ff
 	jr z, .asm_2139b
@@ -528,7 +527,7 @@
 INCLUDE "audio/engine_2.asm"
 
 
-Music_PokeFluteInBattle: ; 22306 (8:6306)
+Music_PokeFluteInBattle:: ; 22306 (8:6306)
 	ld a, (SFX_08_46 - $4000) / 3 ; PokeFlute outside of battle
 	call PlaySoundWaitForCurrent
 	ld hl, $c00e
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -1,6 +1,6 @@
 ; The first of three duplicated sound engines.
 
-Func_9103: ; 0x9103
+Func_9103:: ; 0x9103
 	ld c, CH0
 .loop
 	ld b, $0
@@ -1273,7 +1273,7 @@
 	ld d, a
 	ret
 
-Func_9876: ; 0x9876
+Func_9876:: ; 0x9876
 	ld [$c001], a
 	cp $ff
 	jp z, Func_9a34
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1,6 +1,6 @@
 ; The second of three duplicated sound engines.
 
-Func_21879: ; 21879 (8:5879)
+Func_21879:: ; 21879 (8:5879)
 	ld c, CH0
 .loop
 	ld b, $0
@@ -1324,7 +1324,7 @@
 	ld d, a
 	ret
 
-Func_22035: ; 22035 (8:6035)
+Func_22035:: ; 22035 (8:6035)
 	ld [$c001], a
 	cp $ff
 	jp z, Func_221f3
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -1,6 +1,6 @@
 ; The third of three duplicated sound engines.
 
-Func_7d177: ; 7d177 (1f:5177)
+Func_7d177:: ; 7d177 (1f:5177)
 	ld c, CH0
 .loop
 	ld b, $0
@@ -1273,7 +1273,7 @@
 	ld d, a
 	ret
 
-Func_7d8ea: ; 7d8ea (1f:58ea)
+Func_7d8ea:: ; 7d8ea (1f:58ea)
 	ld [$c001], a
 	cp $ff
 	jp z, Func_7daa8
--- a/main.asm
+++ b/main.asm
@@ -32,7 +32,7 @@
 
 SECTION "bank0",ROM0[$61]
 
-DisableLCD: ; 0061 (0:0061)
+DisableLCD:: ; 0061 (0:0061)
 	xor a
 	ld [$ff0f],a
 	ld a,[$ffff]
@@ -50,13 +50,13 @@
 	ld [$ffff],a
 	ret
 
-EnableLCD: ; 007b (0:007b)
+EnableLCD:: ; 007b (0:007b)
 	ld a,[$ff40]
 	set 7,a
 	ld [$ff40],a
 	ret
 
-CleanLCD_OAM: ; 0082 (0:0082)
+CleanLCD_OAM:: ; 0082 (0:0082)
 	xor a
 	ld hl,wOAMBuffer
 	ld b,$a0
@@ -66,7 +66,7 @@
 	jr nz,.loop
 	ret
 
-ResetLCD_OAM: ; 008d (0:008d)
+ResetLCD_OAM:: ; 008d (0:008d)
 	ld a,$a0
 	ld hl,wOAMBuffer
 	ld de,$0004
@@ -78,7 +78,7 @@
 	jr nz,.loop
 	ret
 
-FarCopyData: ; 009d (0:009d)
+FarCopyData:: ; 009d (0:009d)
 ; copy bc bytes of data from a:hl to de
 	ld [$CEE9],a ; save future bank # for later
 	ld a,[H_LOADEDROMBANK] ; get current bank #
@@ -91,7 +91,7 @@
 	ld [H_LOADEDROMBANK],a
 	ld [$2000],a
 	ret
-CopyData: ; 00b5 (0:00b5)
+CopyData:: ; 00b5 (0:00b5)
 ; copy bc bytes of data from hl to de
 	ld a,[hli]
 	ld [de],a
@@ -107,7 +107,7 @@
 jp Start
 
 SECTION "start",ROM0[$150]
-Start: ; 0150 (0:0150)
+Start:: ; 0150 (0:0150)
 	cp $11 ; value that indicates Gameboy Color
 	jr z,.gbcDetected
 	xor a
@@ -130,7 +130,7 @@
 ; bit 5 - Left
 ; bit 6 - Up
 ; bit 7 - Down
-ReadJoypadRegister: ; 015f (0:015f)
+ReadJoypadRegister:: ; 015f (0:015f)
 	ld a,%00100000 ; select direction keys
 	ld c,$00
 	ld [rJOYP],a
@@ -169,7 +169,7 @@
 ; [H_NEWLYRELEASEDBUTTONS] = keys released since last time
 ; [H_NEWLYPRESSEDBUTTONS] = keys pressed since last time
 ; [H_CURRENTPRESSEDBUTTONS] = currently pressed keys
-GetJoypadState: ; 019a (0:019a)
+GetJoypadState:: ; 019a (0:019a)
 	ld a, [H_LOADEDROMBANK]
 	push af
 	ld a,Bank(_GetJoypadState)
@@ -182,7 +182,7 @@
 	ret
 
 ; see also MapHeaderBanks
-MapHeaderPointers: ; 01ae (0:01ae)
+MapHeaderPointers:: ; 01ae (0:01ae)
 	dw PalletTown_h
 	dw ViridianCity_h
 	dw PewterCity_h
@@ -436,13 +436,13 @@
 ; at the beginning of each overworld loop iteration as the player jumps
 ; down a ledge
 ; it also ends the jump when it's completed
-HandleMidJump: ; 039e (0:039e)
+HandleMidJump:: ; 039e (0:039e)
 	ld b, BANK(_HandleMidJump)
 	ld hl, _HandleMidJump
 	jp Bankswitch
 
 ; this is jumped to immediately after loading a save / starting a new game / loading a new map
-EnterMap: ; 03a6 (0:03a6)
+EnterMap:: ; 03a6 (0:03a6)
 	ld a,$ff
 	ld [wJoypadForbiddenButtonsMask],a
 	call LoadMapData ; load map data
@@ -482,9 +482,9 @@
 	xor a
 	ld [wJoypadForbiddenButtonsMask],a
 
-OverworldLoop: ; 03ff (0:03ff)
+OverworldLoop:: ; 03ff (0:03ff)
 	call DelayFrame
-OverworldLoopLessDelay: ; 0402 (0:0402)
+OverworldLoopLessDelay:: ; 0402 (0:0402)
 	call DelayFrame
 	call LoadGBPal
 	ld a,[$d736]
@@ -798,7 +798,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:: ; 0683 (0:0683)
 	ld a,[$d72d]
 	bit 4,a
 	jr nz,.noBattle
@@ -815,7 +815,7 @@
 	ret
 
 ; function to make bikes twice as fast as walking
-BikeSpeedup: ; 06a0 (0:06a0)
+BikeSpeedup:: ; 06a0 (0:06a0)
 	ld a,[$cc57]
 	and a
 	ret nz
@@ -829,7 +829,7 @@
 	jp AdvancePlayerSprite
 
 ; check if the player has stepped onto a warp after having not collided
-CheckWarpsNoCollision: ; 06b4 (0:06b4)
+CheckWarpsNoCollision:: ; 06b4 (0:06b4)
 	ld a,[$d3ae] ; number of warps
 	and a
 	jp z,CheckMapConnections
@@ -841,7 +841,7 @@
 	ld a,[W_XCOORD]
 	ld e,a
 	ld hl,$d3af ; start of warp entries
-CheckWarpsNoCollisionLoop: ; 06cc (0:06cc)
+CheckWarpsNoCollisionLoop:: ; 06cc (0:06cc)
 	ld a,[hli] ; check if the warp's Y position matches
 	cp d
 	jr nz,CheckWarpsNoCollisionRetry1
@@ -880,7 +880,7 @@
 	jr WarpFound1
 
 ; check if the player has stepped onto a warp after having collided
-CheckWarpsCollision: ; 0706 (0:0706)
+CheckWarpsCollision:: ; 0706 (0:0706)
 	ld a,[$d3ae] ; number of warps
 	ld c,a
 	ld hl,$d3af ; start of warp entries
@@ -909,20 +909,20 @@
 	jr nz,.loop
 	jp OverworldLoop
 
-CheckWarpsNoCollisionRetry1: ; 072f (0:072f)
+CheckWarpsNoCollisionRetry1:: ; 072f (0:072f)
 	inc hl
-CheckWarpsNoCollisionRetry2: ; 0730 (0:0730)
+CheckWarpsNoCollisionRetry2:: ; 0730 (0:0730)
 	inc hl
 	inc hl
 	jp ContinueCheckWarpsNoCollisionLoop
 
-WarpFound1: ; 0735 (0:0735)
+WarpFound1:: ; 0735 (0:0735)
 	ld a,[hli]
 	ld [$d42f],a ; save target warp ID
 	ld a,[hli]
 	ld [$ff8b],a ; save target map
 
-WarpFound2: ; 073c (0:073c)
+WarpFound2:: ; 073c (0:073c)
 	ld a,[$d3ae] ; number of warps
 	sub c
 	ld [$d73b],a ; save ID of used warp
@@ -982,13 +982,13 @@
 	call Func_12da
 	jp EnterMap
 
-ContinueCheckWarpsNoCollisionLoop: ; 07b5 (0:07b5)
+ContinueCheckWarpsNoCollisionLoop:: ; 07b5 (0:07b5)
 	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:: ; 07ba (0:07ba)
 .checkWestMap
 	ld a,[W_XCOORD]
 	cp a,$ff
@@ -1128,7 +1128,7 @@
 	jp OverworldLoop
 
 ; function to play a sound when changing maps
-PlayMapChangeSound: ; 08c9 (0:08c9)
+PlayMapChangeSound:: ; 08c9 (0:08c9)
 	FuncCoord 8, 8 ; $c448
 	ld a,[Coord] ; upper left tile of the 4x4 square the player's sprite is standing on
 	cp a,$0b ; door tile in tileset 0
@@ -1144,7 +1144,7 @@
 	ret nz
 	jp GBFadeIn1
 
-CheckIfInOutsideMap: ; 08e1 (0:08e1)
+CheckIfInOutsideMap:: ; 08e1 (0:08e1)
 ; If the player is in an outside map (a town or route), set the z flag
 	ld a,[W_CURMAPTILESET]
 	and a ; most towns/routes have tileset 0
@@ -1158,7 +1158,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:: ; 08e9 (0:08e9)
 	ld a,[W_CURMAP]
 	cp a,SS_ANNE_3
 	jr z,.useFunction1
@@ -1188,7 +1188,7 @@
 	ld b, BANK(Func_c44e)
 	jp Bankswitch
 
-MapEntryAfterBattle: ; 091f (0:091f)
+MapEntryAfterBattle:: ; 091f (0:091f)
 	ld b, BANK(Func_c35f)
 	ld hl, Func_c35f
 	call Bankswitch ; function that appears to disable warp testing after collisions if the player is standing on a warp
@@ -1199,7 +1199,7 @@
 
 ; for when all the player's pokemon faint
 ; other code prints the "you blacked out" message before this is called
-HandleBlackOut: ; 0931 (0:0931)
+HandleBlackOut:: ; 0931 (0:0931)
 	call GBFadeIn1
 	ld a,$08
 	call StopMusic
@@ -1213,7 +1213,7 @@
 	call Func_2312
 	jp Func_5d5f
 
-StopMusic: ; 0951 (0:0951)
+StopMusic:: ; 0951 (0:0951)
 	ld [wMusicHeaderPointer],a
 	ld a,$ff
 	ld [$c0ee],a
@@ -1224,7 +1224,7 @@
 	jr nz,.waitLoop
 	jp StopAllSounds
 
-HandleFlyOrTeleportAway: ; 0965 (0:0965)
+HandleFlyOrTeleportAway:: ; 0965 (0:0965)
 	call UpdateSprites ; move sprites
 	call Delay3
 	xor a
@@ -1243,13 +1243,13 @@
 	jp Func_5d5f
 
 ; function that calls a function to do fly away or teleport away graphics
-DoFlyOrTeleportAwayGraphics: ; 098f (0:098f)
+DoFlyOrTeleportAwayGraphics:: ; 098f (0:098f)
 	ld b, BANK(_DoFlyOrTeleportAwayGraphics)
 	ld hl, _DoFlyOrTeleportAwayGraphics
 	jp Bankswitch
 
 ; load sprite graphics based on whether the player is standing, biking, or surfing
-LoadPlayerSpriteGraphics: ; 0997 (0:0997)
+LoadPlayerSpriteGraphics:: ; 0997 (0:0997)
 	ld a,[$d700]
 	dec a
 	jr z,.ridingBike
@@ -1277,7 +1277,7 @@
 
 ; function to check if bike riding is allowed on the current map
 ; sets carry if bike is allowed, clears carry otherwise
-IsBikeRidingAllowed: ; 09c5 (0:09c5)
+IsBikeRidingAllowed:: ; 09c5 (0:09c5)
 	ld a,[W_CURMAP]
 	cp a,ROUTE_23
 	jr z,.allowed
@@ -1298,11 +1298,11 @@
 	scf
 	ret
 
-BikeRidingTilesets: ; 09e2 (0:09e2)
+BikeRidingTilesets:: ; 09e2 (0:09e2)
 	db $00, $03, $0B, $0E, $11, $FF
 
 ; load the tile pattern data of the current tileset into VRAM
-LoadTilesetTilePatternData: ; 09e8 (0:09e8)
+LoadTilesetTilePatternData:: ; 09e8 (0:09e8)
 	ld a,[$d52e]
 	ld l,a
 	ld a,[$d52f]
@@ -1314,7 +1314,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:: ; 09fc (0:09fc)
 ; fill C6E8-CBFB with the background tile
 	ld hl,$c6e8
 	ld a,[$d3ad] ; background tile number
@@ -1443,7 +1443,7 @@
 .done
 	ret
 
-LoadNorthSouthConnectionsTileMap: ; 0ade (0:0ade)
+LoadNorthSouthConnectionsTileMap:: ; 0ade (0:0ade)
 	ld c,$03
 .loop
 	push de
@@ -1475,7 +1475,7 @@
 	jr nz,.loop
 	ret
 
-LoadEastWestConnectionsTileMap: ; 0b02 (0:0b02)
+LoadEastWestConnectionsTileMap:: ; 0b02 (0:0b02)
 	push hl
 	push de
 	ld c,$03
@@ -1507,7 +1507,7 @@
 ; function to check if there is a sign or sprite in front of the player
 ; if so, it is stored in [$FF8C]
 ; if not, [$FF8C] is set to 0
-IsSpriteOrSignInFrontOfPlayer: ; 0b23 (0:0b23)
+IsSpriteOrSignInFrontOfPlayer:: ; 0b23 (0:0b23)
 	xor a
 	ld [$ff8c],a
 	ld a,[$d4b0] ; number of signs in the map
@@ -1563,9 +1563,9 @@
 
 ; part of the above function, but sometimes its called on its own, when signs are irrelevant
 ; the caller must zero [$FF8C]
-IsSpriteInFrontOfPlayer: ; 0b6b (0:0b6b)
+IsSpriteInFrontOfPlayer:: ; 0b6b (0:0b6b)
 	ld d,$10 ; talking range in pixels (normal range)
-IsSpriteInFrontOfPlayer2: ; 0b6d (0:0b6d)
+IsSpriteInFrontOfPlayer2:: ; 0b6d (0:0b6d)
 	ld bc,$3c40 ; Y and X position of player sprite
 	ld a,[$c109] ; direction the player is facing
 .checkIfPlayerFacingUp
@@ -1649,7 +1649,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:: ; 0bd1 (0:0bd1)
 	ld a,[$d736]
 	bit 6,a ; is the player jumping?
 	jr nz,.noCollision
@@ -1689,7 +1689,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:: ; 0c10 (0:0c10)
 	ld a,$35
 	call Predef ; get tile in front of player
 	ld a,[$cfc6] ; tile in front of player
@@ -1713,7 +1713,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:: ; 0c2a (0:0c2a)
 	push hl
 	ld a,$35
 	call Predef ; get the tile in front of the player
@@ -1731,12 +1731,12 @@
 	ret nz
 ; if not jumping
 
-Func_c44: ; 0c44 (0:0c44)
+Func_c44:: ; 0c44 (0:0c44)
 	FuncCoord 8, 9 ; $c45c
 	ld a,[Coord] ; tile the player is on
 	ld [$cf0e],a
 
-CheckForTilePairCollisions: ; 0c4a (0:0c4a)
+CheckForTilePairCollisions:: ; 0c4a (0:0c4a)
 	ld a,[$cfc6] ; tile in front of the player
 	ld c,a
 .tilePairCollisionLoop
@@ -1786,7 +1786,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:: ; 0c7e (0:0c7e)
 	db $11, $20, $05;
 	db $11, $41, $05;
 	db $03, $30, $2E;
@@ -1800,7 +1800,7 @@
 	db $03, $5F, $2E;
 	db $FF;
 
-TilePairCollisionsWater: ; 0ca0 (0:0ca0)
+TilePairCollisionsWater:: ; 0ca0 (0:0ca0)
 	db $03, $14, $2E;
 	db $03, $48, $2E;
 	db $11, $14, $05;
@@ -1807,7 +1807,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:: ; 0caa (0:0caa)
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,[$d52b] ; tile data ROM bank
@@ -1897,7 +1897,7 @@
 	ld [$2000],a ; restore previous ROM bank
 	ret
 
-AdvancePlayerSprite: ; 0d27 (0:0d27)
+AdvancePlayerSprite:: ; 0d27 (0:0d27)
 	ld a,[$c103] ; delta Y
 	ld b,a
 	ld a,[$c105] ; delta X
@@ -2095,7 +2095,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:: ; 0e65 (0:0e65)
 	ld a,[de]
 	add a,$01
 	ld [de],a
@@ -2106,7 +2106,7 @@
 	ld [de],a
 	ret
 
-MoveTileBlockMapPointerWest: ; 0e6f (0:0e6f)
+MoveTileBlockMapPointerWest:: ; 0e6f (0:0e6f)
 	ld a,[de]
 	sub a,$01
 	ld [de],a
@@ -2117,7 +2117,7 @@
 	ld [de],a
 	ret
 
-MoveTileBlockMapPointerSouth: ; 0e79 (0:0e79)
+MoveTileBlockMapPointerSouth:: ; 0e79 (0:0e79)
 	add a,$06
 	ld b,a
 	ld a,[de]
@@ -2130,7 +2130,7 @@
 	ld [de],a
 	ret
 
-MoveTileBlockMapPointerNorth: ; 0e85 (0:0e85)
+MoveTileBlockMapPointerNorth:: ; 0e85 (0:0e85)
 	add a,$06
 	ld b,a
 	ld a,[de]
@@ -2146,7 +2146,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:: ; 0e91 (0:0e91)
 	FuncCoord 0, 0
 	ld hl,Coord
 	call ScheduleRowRedrawHelper
@@ -2158,7 +2158,7 @@
 	ld [H_SCREENEDGEREDRAW],a
 	ret
 
-ScheduleRowRedrawHelper: ; 0ea6 (0:0ea6)
+ScheduleRowRedrawHelper:: ; 0ea6 (0:0ea6)
 	ld de,wScreenEdgeTiles
 	ld c,$28
 .loop
@@ -2169,7 +2169,7 @@
 	jr nz,.loop
 	ret
 
-ScheduleSouthRowRedraw: ; 0eb2 (0:0eb2)
+ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2)
 	FuncCoord 0,16
 	ld hl,Coord
 	call ScheduleRowRedrawHelper
@@ -2189,7 +2189,7 @@
 	ld [H_SCREENEDGEREDRAW],a
 	ret
 
-ScheduleEastColumnRedraw: ; 0ed3 (0:0ed3)
+ScheduleEastColumnRedraw:: ; 0ed3 (0:0ed3)
 	FuncCoord 18,0
 	ld hl,Coord
 	call ScheduleColumnRedrawHelper
@@ -2208,7 +2208,7 @@
 	ld [H_SCREENEDGEREDRAW],a
 	ret
 
-ScheduleColumnRedrawHelper: ; 0ef2 (0:0ef2)
+ScheduleColumnRedrawHelper:: ; 0ef2 (0:0ef2)
 	ld de,wScreenEdgeTiles
 	ld c,$12
 .loop
@@ -2228,7 +2228,7 @@
 	jr nz,.loop
 	ret
 
-ScheduleWestColumnRedraw: ; 0f08 (0:0f08)
+ScheduleWestColumnRedraw:: ; 0f08 (0:0f08)
 	FuncCoord 0,0
 	ld hl,Coord
 	call ScheduleColumnRedrawHelper
@@ -2242,7 +2242,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:: ; 0f1d (0:0f1d)
 	push hl
 	ld a,[$d52c] ; pointer to tiles
 	ld l,a
@@ -2283,7 +2283,7 @@
 	ret
 
 ; function to update joypad state and simulate button presses
-GetJoypadStateOverworld: ; 0f4d (0:0f4d)
+GetJoypadStateOverworld:: ; 0f4d (0:0f4d)
 	xor a
 	ld [$c103],a
 	ld [$c105],a
@@ -2354,7 +2354,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:: ; 0fb7 (0:0fb7)
 	ld a,[$d730]
 	bit 7,a
 	jp nz,.noCollision ; return and clear carry if button presses are being simulated
@@ -2414,7 +2414,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:: ; 101b (0:101b)
 	push hl
 	push de
 	push bc
@@ -2444,21 +2444,21 @@
 .return
 	ret
 
-LoadWalkingPlayerSpriteGraphics: ; 104d (0:104d)
+LoadWalkingPlayerSpriteGraphics:: ; 104d (0:104d)
 	ld de,RedSprite ; $4180
 	ld hl,$8000
 	jr LoadPlayerSpriteGraphicsCommon
 
-LoadSurfingPlayerSpriteGraphics: ; 1055 (0:1055)
+LoadSurfingPlayerSpriteGraphics:: ; 1055 (0:1055)
 	ld de,SeelSprite
 	ld hl,$8000
 	jr LoadPlayerSpriteGraphicsCommon
 
-LoadBikePlayerSpriteGraphics: ; 105d (0:105d)
+LoadBikePlayerSpriteGraphics:: ; 105d (0:105d)
 	ld de,RedCyclingSprite
 	ld hl,$8000
 
-LoadPlayerSpriteGraphicsCommon: ; 1063 (0:1063)
+LoadPlayerSpriteGraphicsCommon:: ; 1063 (0:1063)
 	push de
 	push hl
 	ld bc,(BANK(RedSprite) << 8) + $0c
@@ -2476,7 +2476,7 @@
 	jp CopyVideoData
 
 ; function to load data from the map header
-LoadMapHeader: ; 107c (0:107c)
+LoadMapHeader:: ; 107c (0:107c)
 	ld b, BANK(Func_f113)
 	ld hl, Func_f113
 	call Bankswitch
@@ -2760,7 +2760,7 @@
 
 ; function to copy map connection data from ROM to WRAM
 ; Input: hl = source, de = destination
-CopyMapConnectionHeader: ; 1238 (0:1238)
+CopyMapConnectionHeader:: ; 1238 (0:1238)
 	ld c,$0b
 .loop
 	ld a,[hli]
@@ -2771,7 +2771,7 @@
 	ret
 
 ; function to load map data
-LoadMapData: ; 1241 (0:1241)
+LoadMapData:: ; 1241 (0:1241)
 	ld a,[H_LOADEDROMBANK]
 	push af
 	call DisableLCD
@@ -2835,7 +2835,7 @@
 
 ; function to switch to the ROM bank that a map is stored in
 ; Input: a = map number
-SwitchToMapRomBank: ; 12bc (0:12bc)
+SwitchToMapRomBank:: ; 12bc (0:12bc)
 	push hl
 	push bc
 	ld c,a
@@ -2854,7 +2854,7 @@
 	pop hl
 	ret
 
-Func_12da: ; 12da (0:12da)
+Func_12da:: ; 12da (0:12da)
 	ld a, $1e
 	ld [$d13a], a
 	ld hl, $d730
@@ -2863,7 +2863,7 @@
 	ld [hl], a
 	ret
 
-Func_12e7: ; 12e7 (0:12e7)
+Func_12e7:: ; 12e7 (0:12e7)
 	ld hl, $d728
 	res 0, [hl]
 	ret
@@ -2871,7 +2871,7 @@
 ;appears to be called twice inside function $C38B
 ;if $d700,$d11a == $1 then biking
 ;if $d700,$d11a == $2 then surfing
-ForceBikeOrSurf: ; 12ed (0:12ed)
+ForceBikeOrSurf:: ; 12ed (0:12ed)
 	ld b,5 ;graphics bank 5
 	ld hl,LoadPlayerSpriteGraphics ;load player sprite graphics
 	call Bankswitch ;loads bank 5 and then calls LoadPlayerSpriteGraphics
@@ -2883,7 +2883,7 @@
 ; c = number of frames to wait
 ; sets carry if Up+Select+B, Start, or A is pressed within c frames
 ; unsets carry otherwise
-CheckForUserInterruption: ; 12f8 (0:12f8)
+CheckForUserInterruption:: ; 12f8 (0:12f8)
 	call DelayFrame
 	push bc
 	call GetJoypadStateLowSensitivity
@@ -2906,7 +2906,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:: ; 1313 (0:1313)
 	ld b,a
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -2931,7 +2931,7 @@
 ; c: if nonzero, show at least a sliver of health
 ; d = number of HP bar sections (normally 6)
 ; e = health (in eighths of bar sections) (normally out of 48)
-DrawHPBar: ; 1336 (0:1336)
+DrawHPBar:: ; 1336 (0:1336)
 	push hl
 	push de
 	push bc
@@ -2997,13 +2997,13 @@
 ; [$cf91] = pokemon ID
 ; $cf98 = base address of pokemon data
 ; $d0b8 = base address of base stats
-LoadMonData: ; 1372 (0:1372)
+LoadMonData:: ; 1372 (0:1372)
 	ld hl,LoadMonData_
 	ld b,BANK(LoadMonData_)
 	jp Bankswitch
 
 ; writes c to $d0dc+b
-Func_137a: ; 137a (0:137a)
+Func_137a:: ; 137a (0:137a)
 	ld hl, $d0dc
 	ld e, b
 	ld d, $0
@@ -3012,11 +3012,11 @@
 	ld [hl], a
 	ret
 
-LoadFlippedFrontSpriteByMonIndex: ; 1384 (0:1384)
+LoadFlippedFrontSpriteByMonIndex:: ; 1384 (0:1384)
 	ld a, $1
 	ld [W_SPRITEFLIPPED], a
 
-LoadFrontSpriteByMonIndex: ; 1389 (0:1389)
+LoadFrontSpriteByMonIndex:: ; 1389 (0:1389)
 	push hl
 	ld a, [$d11e]
 	push af
@@ -3060,7 +3060,7 @@
 ; plays the cry of a pokemon
 ; INPUT:
 ; a = pokemon ID
-PlayCry: ; 13d0 (0:13d0)
+PlayCry:: ; 13d0 (0:13d0)
 	call GetCryData
 	call PlaySound ; play cry
 	jp WaitForSoundToFinish ; wait for sound to be done playing
@@ -3068,7 +3068,7 @@
 ; gets a pokemon's cry data
 ; INPUT:
 ; a = pokemon ID
-GetCryData: ; 13d9 (0:13d9)
+GetCryData:: ; 13d9 (0:13d9)
 	dec a
 	ld c,a
 	ld b,0
@@ -3092,7 +3092,7 @@
 	add c ; a = $14 + cryID * 3
 	ret
 
-DisplayPartyMenu: ; 13fc (0:13fc)
+DisplayPartyMenu:: ; 13fc (0:13fc)
 	ld a,[$ffd7]
 	push af
 	xor a
@@ -3103,7 +3103,7 @@
 	call DrawPartyMenu
 	jp HandlePartyMenuInput
 
-GoBackToPartyMenu: ; 1411 (0:1411)
+GoBackToPartyMenu:: ; 1411 (0:1411)
 	ld a,[$ffd7]
 	push af
 	xor a
@@ -3112,7 +3112,7 @@
 	call RedrawPartyMenu
 	jp HandlePartyMenuInput
 
-PartyMenuInit: ; 1420 (0:1420)
+PartyMenuInit:: ; 1420 (0:1420)
 	ld a,$01
 	call BankswitchHome
 	call LoadHpBarAndStatusTilePatterns
@@ -3151,7 +3151,7 @@
 	ld [hl],a ; old menu item ID
 	ret
 
-HandlePartyMenuInput: ; 145a (0:145a)
+HandlePartyMenuInput:: ; 145a (0:145a)
 	ld a,1
 	ld [$cc4a],a
 	ld a,$40
@@ -3211,14 +3211,14 @@
 	call Bankswitch
 	jr HandlePartyMenuInput
 
-DrawPartyMenu: ; 14d4 (0:14d4)
+DrawPartyMenu:: ; 14d4 (0:14d4)
 	ld hl, DrawPartyMenu_
 	jr DrawPartyMenuCommon
 
-RedrawPartyMenu: ; 14d9 (0:14d9)
+RedrawPartyMenu:: ; 14d9 (0:14d9)
 	ld hl, RedrawPartyMenu_
 
-DrawPartyMenuCommon: ; 14dc (0:14dc)
+DrawPartyMenuCommon:: ; 14dc (0:14dc)
 	ld b, BANK(RedrawPartyMenu_)
 	jp Bankswitch
 
@@ -3226,7 +3226,7 @@
 ; INPUT:
 ; de = address of status condition
 ; hl = destination address
-PrintStatusCondition: ; 14e1 (0:14e1)
+PrintStatusCondition:: ; 14e1 (0:14e1)
 	push de
 	dec de
 	dec de ; de = address of current HP
@@ -3262,7 +3262,7 @@
 ; INPUT:
 ; hl = destination address
 ; [$cfb9] = level
-PrintLevel: ; 150b (0:150b)
+PrintLevel:: ; 150b (0:150b)
 	ld a,$6e ; ":L" tile ID
 	ld [hli],a
 	ld c,2 ; number of digits
@@ -3278,19 +3278,19 @@
 ; INPUT:
 ; hl = destination address
 ; [$cfb9] = level
-PrintLevelFull: ; 151b (0:151b)
+PrintLevelFull:: ; 151b (0:151b)
 	ld a,$6e ; ":L" tile ID
 	ld [hli],a
 	ld c,3 ; number of digits
 	ld a,[$cfb9] ; level
 
-PrintLevelCommon: ; 1523 (0:1523)
+PrintLevelCommon:: ; 1523 (0:1523)
 	ld [$d11e],a
 	ld de,$d11e
 	ld b,$41 ; no leading zeroes, left-aligned, one byte
 	jp PrintNumber
 
-Func_152e: ; 152e (0:152e)
+Func_152e:: ; 152e (0:152e)
 	ld hl,$d0dc
 	ld c,a
 	ld b,0
@@ -3301,7 +3301,7 @@
 ; copies the base stat data of a pokemon to $D0B8 (W_MONHEADER)
 ; INPUT:
 ; [$D0B5] = pokemon ID
-GetMonHeader: ; 1537 (0:1537)
+GetMonHeader:: ; 1537 (0:1537)
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,BANK(BulbasaurBaseStats)
@@ -3366,12 +3366,12 @@
 	ret
 
 ; copy party pokemon's name to $CD6D
-GetPartyMonName2: ; 15b4 (0:15b4)
+GetPartyMonName2:: ; 15b4 (0:15b4)
 	ld a,[wWhichPokemon] ; index within party
 	ld hl,W_PARTYMON1NAME
 
 ; this is called more often
-GetPartyMonName: ; 15ba (0:15ba)
+GetPartyMonName:: ; 15ba (0:15ba)
 	push hl
 	push bc
 	call SkipFixedLengthTextEntries ; add 11 to hl, a times
@@ -3397,7 +3397,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:: ; 15cd (0:15cd)
 	ld b,c ; save flags in b
 	res 7,c
 	res 6,c
@@ -3435,7 +3435,7 @@
 .done
 	ret
 
-PrintBCDDigit: ; 1604 (0:1604)
+PrintBCDDigit:: ; 1604 (0:1604)
 	and a,%00001111
 	and a
 	jr z,.zeroDigit
@@ -3465,7 +3465,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:: ; 1627 (0:1627)
 	ld bc,W_MONHEADER
 	add hl,bc
 	ld a,[hli]
@@ -3510,7 +3510,7 @@
 	jp UncompressSpriteData
 
 ; de: destination location
-LoadMonFrontSprite: ; 1665 (0:1665)
+LoadMonFrontSprite:: ; 1665 (0:1665)
 	push de
 	ld hl, W_MONHFRONTSPRITE - W_MONHEADER
 	call UncompressMonSprite
@@ -3524,7 +3524,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:: ; 1672 (0:1672)
 	push de
 	and $f
 	ld [H_SPRITEWIDTH], a ; each byte contains 8 pixels (in 1bpp), so tiles=bytes for width
@@ -3573,7 +3573,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:: ; 16c2 (0:16c2)
 	ld a, [H_SPRITEOFFSET]
 	ld b, $0
 	ld c, a
@@ -3599,7 +3599,7 @@
 	ret
 
 ; fills the sprite buffer (pointed to in hl) with zeros
-ZeroSpriteBuffer: ; 16df (0:16df)
+ZeroSpriteBuffer:: ; 16df (0:16df)
 	ld bc, SPRITEBUFFERSIZE
 .nextByteLoop
 	xor a
@@ -3613,7 +3613,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:: ; 16ea (0:16ea)
 	xor a
 	ld [$4000], a
 	push de
@@ -3659,43 +3659,43 @@
 	ld b, a
 	jp CopyVideoData
 
-Tset0B_Coll: ; 172f (0:172f)
+Tset0B_Coll:: ; 172f (0:172f)
 	INCBIN "gfx/tilesets/0b.tilecoll"
-Tset00_Coll: ; 1735 (0:1735)
+Tset00_Coll:: ; 1735 (0:1735)
 	INCBIN "gfx/tilesets/00.tilecoll"
-Tset01_Coll: ; 1749 (0:1749)
+Tset01_Coll:: ; 1749 (0:1749)
 	INCBIN "gfx/tilesets/01.tilecoll"
-Tset02_Coll: ; 1753 (0:1753)
+Tset02_Coll:: ; 1753 (0:1753)
 	INCBIN "gfx/tilesets/02.tilecoll"
-Tset05_Coll: ; 1759 (0:1759)
+Tset05_Coll:: ; 1759 (0:1759)
 	INCBIN "gfx/tilesets/05.tilecoll"
-Tset03_Coll: ; 1765 (0:1765)
+Tset03_Coll:: ; 1765 (0:1765)
 	INCBIN "gfx/tilesets/03.tilecoll"
-Tset08_Coll: ; 1775 (0:1775)
+Tset08_Coll:: ; 1775 (0:1775)
 	INCBIN "gfx/tilesets/08.tilecoll"
-Tset09_Coll: ; 177f (0:177f)
+Tset09_Coll:: ; 177f (0:177f)
 	INCBIN "gfx/tilesets/09.tilecoll"
-Tset0D_Coll: ; 178a (0:178a)
+Tset0D_Coll:: ; 178a (0:178a)
 	INCBIN "gfx/tilesets/0d.tilecoll"
-Tset0E_Coll: ; 1795 (0:1795)
+Tset0E_Coll:: ; 1795 (0:1795)
 	INCBIN "gfx/tilesets/0e.tilecoll"
-Tset0F_Coll: ; 179a (0:179a)
+Tset0F_Coll:: ; 179a (0:179a)
 	INCBIN "gfx/tilesets/0f.tilecoll"
-Tset10_Coll: ; 17a2 (0:17a2)
+Tset10_Coll:: ; 17a2 (0:17a2)
 	INCBIN "gfx/tilesets/10.tilecoll"
-Tset11_Coll: ; 17ac (0:17ac)
+Tset11_Coll:: ; 17ac (0:17ac)
 	INCBIN "gfx/tilesets/11.tilecoll"
-Tset12_Coll: ; 17b8 (0:17b8)
+Tset12_Coll:: ; 17b8 (0:17b8)
 	INCBIN "gfx/tilesets/12.tilecoll"
-Tset13_Coll: ; 17c0 (0:17c0)
+Tset13_Coll:: ; 17c0 (0:17c0)
 	INCBIN "gfx/tilesets/13.tilecoll"
-Tset14_Coll: ; 17ca (0:17ca)
+Tset14_Coll:: ; 17ca (0:17ca)
 	INCBIN "gfx/tilesets/14.tilecoll"
-Tset15_Coll: ; 17d1 (0:17d1)
+Tset15_Coll:: ; 17d1 (0:17d1)
 	INCBIN "gfx/tilesets/15.tilecoll"
-Tset16_Coll: ; 17dd (0:17dd)
+Tset16_Coll:: ; 17dd (0:17dd)
 	INCBIN "gfx/tilesets/16.tilecoll"
-Tset17_Coll: ; 17f0 (0:17f0)
+Tset17_Coll:: ; 17f0 (0:17f0)
 	INCBIN "gfx/tilesets/17.tilecoll"
 ;Tile Collision ends 0x17f7
 
@@ -3702,7 +3702,7 @@
 ; does the same thing as FarCopyData at 009D
 ; only difference is that it uses [$ff8b] instead of [$cee9] for a temp value
 ; copy bc bytes of data from a:hl to de
-FarCopyData2: ; 17f7 (0:17f7)
+FarCopyData2:: ; 17f7 (0:17f7)
 	ld [$ff8b],a
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -3717,7 +3717,7 @@
 
 ; does a far copy but the source is de and the destination is hl
 ; copy bc bytes of data from a:de to hl
-FarCopyData3: ; 180d (0:180d)
+FarCopyData3:: ; 180d (0:180d)
 	ld [$ff8b],a
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -3740,7 +3740,7 @@
 
 ; copies each source byte to the destination twice (next to each other)
 ; copy bc source bytes from a:hl to de
-FarCopyDataDouble: ; 182b (0:182b)
+FarCopyDataDouble:: ; 182b (0:182b)
 	ld [$ff8b],a
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -3764,7 +3764,7 @@
 
 ; copy (c * 16) bytes from b:de to hl during V-blank
 ; transfers up to 128 bytes per V-blank
-CopyVideoData: ; 1848 (0:1848)
+CopyVideoData:: ; 1848 (0:1848)
 	ld a,[H_AUTOBGTRANSFERENABLED] ; save auto-transfer enabled flag
 	push af
 	xor a
@@ -3807,7 +3807,7 @@
 ; copy (c * 8) source bytes from b:de to hl during V-blank
 ; copies each source byte to the destination twice (next to each other)
 ; transfers up to 64 source bytes per V-blank
-CopyVideoDataDouble: ; 1886 (0:1886)
+CopyVideoDataDouble:: ; 1886 (0:1886)
 	ld a,[H_AUTOBGTRANSFERENABLED] ; save auto-transfer enabled flag
 	push af
 	xor a
@@ -3852,7 +3852,7 @@
 ; hl = address of upper left corner of the area
 ; b = height
 ; c = width
-ClearScreenArea: ; 18c4 (0:18c4)
+ClearScreenArea:: ; 18c4 (0:18c4)
 	ld   a,$7F ; blank tile
 	ld   de,20 ; screen width
 .loop
@@ -3872,7 +3872,7 @@
 ; copies the screen tile buffer from WRAM to VRAM
 ; copying is done in 3 chunks of 6 rows each
 ; b: high byte of VRAM destination address ($98 or $9c for window tile map 0 or 1 resp.)
-CopyScreenTileBufferToVRAM: ; 18d6 (0:18d6)
+CopyScreenTileBufferToVRAM:: ; 18d6 (0:18d6)
 	ld c, $6
 	ld hl, $0000
 	ld de, wTileMap
@@ -3887,7 +3887,7 @@
 	call InitScreenTileBufferTransferParameters
 	jp DelayFrame
 
-InitScreenTileBufferTransferParameters: ; 18fc (0:18fc)
+InitScreenTileBufferTransferParameters:: ; 18fc (0:18fc)
 	ld a, d
 	ld [H_VBCOPYBGSRC+1], a
 	call GetRowColAddressBgMap
@@ -3901,7 +3901,7 @@
 	ld [H_VBCOPYBGSRC], a ; $FF00+$c1
 	ret
 
-ClearScreen: ; 190f (0:190f)
+ClearScreen:: ; 190f (0:190f)
 ; clears all tiles in the tilemap,
 ; then wait three frames
 	ld bc,$0168 ; tilemap size
@@ -3916,7 +3916,7 @@
 	jr nz,.loop
 	jp Delay3
 
-TextBoxBorder: ; 1922 (0:1922)
+TextBoxBorder:: ; 1922 (0:1922)
 ; draw a text box
 ; upper-left corner at coordinates hl
 ; height b
@@ -3958,7 +3958,7 @@
 	ld [hl],"┘"
 	ret
 ;
-NPlaceChar: ; 194f (0:194f)
+NPlaceChar:: ; 194f (0:194f)
 ; place a row of width c of identical characters
 	ld d,c
 .loop
@@ -3967,9 +3967,9 @@
 	jr nz,.loop
 	ret
 
-PlaceString: ; 1955 (0:1955)
+PlaceString:: ; 1955 (0:1955)
 	push hl
-PlaceNextChar: ; 1956 (0:1956)
+PlaceNextChar:: ; 1956 (0:1956)
 	ld a,[de]
 
 	cp "@"
@@ -4045,11 +4045,11 @@
 	jp z,Char5A
 	ld [hli],a
 	call PrintLetterDelay
-Next19E8: ; 19e8 (0:19e8)
+Next19E8:: ; 19e8 (0:19e8)
 	inc de
 	jp PlaceNextChar
 
-Char00: ; 19ec (0:19ec)
+Char00:: ; 19ec (0:19ec)
 	ld b,h
 	ld c,l
 	pop hl
@@ -4057,56 +4057,56 @@
 	dec de
 	ret
 
-Char00Text: ; 0x19f4 “%d ERROR.”
+Char00Text:: ; 0x19f4 “%d ERROR.”
 	TX_FAR _Char00Text
 	db "@"
 
-Char52: ; 0x19f9 player’s name
+Char52:: ; 0x19f9 player’s name
 	push de
 	ld de,W_PLAYERNAME
 	jr FinishDTE
 
-Char53: ; 19ff (0:19ff) ; rival’s name
+Char53:: ; 19ff (0:19ff) ; rival’s name
 	push de
 	ld de,W_RIVALNAME
 	jr FinishDTE
 
-Char5D: ; 1a05 (0:1a05) ; TRAINER
+Char5D:: ; 1a05 (0:1a05) ; TRAINER
 	push de
 	ld de,Char5DText
 	jr FinishDTE
 
-Char5C: ; 1a0b (0:1a0b) ; TM
+Char5C:: ; 1a0b (0:1a0b) ; TM
 	push de
 	ld de,Char5CText
 	jr FinishDTE
 
-Char5B: ; 1a11 (0:1a11) ; PC
+Char5B:: ; 1a11 (0:1a11) ; PC
 	push de
 	ld de,Char5BText
 	jr FinishDTE
 
-Char5E: ; 1a17 (0:1a17) ; ROCKET
+Char5E:: ; 1a17 (0:1a17) ; ROCKET
 	push de
 	ld de,Char5EText
 	jr FinishDTE
 
-Char54: ; 1a1d (0:1a1d) ; POKé
+Char54:: ; 1a1d (0:1a1d) ; POKé
 	push de
 	ld de,Char54Text
 	jr FinishDTE
 
-Char56: ; 1a23 (0:1a23) ; ……
+Char56:: ; 1a23 (0:1a23) ; ……
 	push de
 	ld de,Char56Text
 	jr FinishDTE
 
-Char4A: ; 1a29 (0:1a29) ; PKMN
+Char4A:: ; 1a29 (0:1a29) ; PKMN
 	push de
 	ld de,Char4AText
 	jr FinishDTE
 
-Char59: ; 1a2f (0:1a2f)
+Char59:: ; 1a2f (0:1a2f)
 ; depending on whose turn it is, print
 ; enemy active monster’s name, prefixed with “Enemy ”
 ; or
@@ -4116,13 +4116,13 @@
 	xor 1
 	jr MonsterNameCharsCommon
 
-Char5A: ; 1a35 (0:1a35)
+Char5A:: ; 1a35 (0:1a35)
 ; 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:: ; 1a37 (0:1a37)
 	push de
 	and a
 	jr nz,.Enemy
@@ -4138,7 +4138,7 @@
 	ld l,c
 	ld de,W_ENEMYMONNAME ; enemy active monster name
 
-FinishDTE: ; 1a4b (0:1a4b)
+FinishDTE:: ; 1a4b (0:1a4b)
 	call PlaceString
 	ld h,b
 	ld l,c
@@ -4146,24 +4146,24 @@
 	inc de
 	jp PlaceNextChar
 
-Char5CText: ; 1a55 (0:1a55)
+Char5CText:: ; 1a55 (0:1a55)
 	db "TM@"
-Char5DText: ; 1a58 (0:1a58)
+Char5DText:: ; 1a58 (0:1a58)
 	db "TRAINER@"
-Char5BText: ; 1a60 (0:1a60)
+Char5BText:: ; 1a60 (0:1a60)
 	db "PC@"
-Char5EText: ; 1a63 (0:1a63)
+Char5EText:: ; 1a63 (0:1a63)
 	db "ROCKET@"
-Char54Text: ; 1a6a (0:1a6a)
+Char54Text:: ; 1a6a (0:1a6a)
 	db "POKé@"
-Char56Text: ; 1a6f (0:1a6f)
+Char56Text:: ; 1a6f (0:1a6f)
 	db "……@"
-Char5AText: ; 1a72 (0:1a72)
+Char5AText:: ; 1a72 (0:1a72)
 	db "Enemy @"
-Char4AText: ; 1a79 (0:1a79)
+Char4AText:: ; 1a79 (0:1a79)
 	db $E1,$E2,"@" ; PKMN
 
-Char55: ; 1a7c (0:1a7c)
+Char55:: ; 1a7c (0:1a7c)
 	push de
 	ld b,h
 	ld c,l
@@ -4175,18 +4175,18 @@
 	inc de
 	jp PlaceNextChar
 
-Char55Text: ; 1a8c (0:1a8c)
+Char55Text:: ; 1a8c (0:1a8c)
 ; equivalent to Char4B
 	TX_FAR _Char55Text
 	db "@"
 
-Char5F: ; 1a91 (0:1a91)
+Char5F:: ; 1a91 (0:1a91)
 ; ends a Pokédex entry
 	ld [hl],"."
 	pop hl
 	ret
 
-Char58: ; 1a95 (0:1a95)
+Char58:: ; 1a95 (0:1a95)
 	ld a,[$D12B]
 	cp 4
 	jp z,Next1AA2
@@ -4193,22 +4193,22 @@
 	ld a,$EE
 	FuncCoord 18, 16 ; $c4f2
 	ld [Coord],a
-Next1AA2: ; 1aa2 (0:1aa2)
+Next1AA2:: ; 1aa2 (0:1aa2)
 	call ProtectedDelay3
 	call ManualTextScroll
 	ld a,$7F
 	FuncCoord 18, 16 ; $c4f2
 	ld [Coord],a
-Char57: ; 1aad (0:1aad)
+Char57:: ; 1aad (0:1aad)
 	pop hl
 	ld de,Char58Text
 	dec de
 	ret
 
-Char58Text: ; 1ab3 (0:1ab3)
+Char58Text:: ; 1ab3 (0:1ab3)
 	db "@"
 
-Char51: ; 1ab4 (0:1ab4)
+Char51:: ; 1ab4 (0:1ab4)
 	push de
 	ld a,$EE
 	FuncCoord 18, 16 ; $c4f2
@@ -4226,7 +4226,7 @@
 	ld hl,Coord
 	jp Next19E8
 
-Char49: ; 1ad5 (0:1ad5)
+Char49:: ; 1ad5 (0:1ad5)
 	push de
 	ld a,$EE
 	FuncCoord 18, 16 ; $c4f2
@@ -4246,7 +4246,7 @@
 	push hl
 	jp Next19E8
 
-Char4B: ; 1af8 (0:1af8)
+Char4B:: ; 1af8 (0:1af8)
 	ld a,$EE
 	FuncCoord 18, 16 ; $c4f2
 	ld [Coord],a
@@ -4258,7 +4258,7 @@
 	FuncCoord 18, 16 ; $c4f2
 	ld [Coord],a
 	;fall through
-Char4C: ; 1b0a (0:1b0a)
+Char4C:: ; 1b0a (0:1b0a)
 	push de
 	call Next1B18
 	call Next1B18
@@ -4267,7 +4267,7 @@
 	pop de
 	jp Next19E8
 
-Next1B18: ; 1b18 (0:1b18)
+Next1B18:: ; 1b18 (0:1b18)
 	FuncCoord 0, 14 ; $c4b8
 	ld hl,Coord
 	FuncCoord 0, 13 ; $c4a4
@@ -4297,13 +4297,13 @@
 
 	ret
 
-ProtectedDelay3: ; 1b3a (0:1b3a)
+ProtectedDelay3:: ; 1b3a (0:1b3a)
 	push bc
 	call Delay3
 	pop bc
 	ret
 
-TextCommandProcessor: ; 1b40 (0:1b40)
+TextCommandProcessor:: ; 1b40 (0:1b40)
 	ld a,[$d358]
 	push af
 	set 1,a
@@ -4316,7 +4316,7 @@
 	ld a,b
 	ld [$cc3b],a
 
-NextTextCommand: ; 1b55 (0:1b55)
+NextTextCommand:: ; 1b55 (0:1b55)
 	ld a,[hli]
 	cp a, "@" ; terminator
 	jr nz,.doTextCommand
@@ -4347,7 +4347,7 @@
 ; AAAA = address of upper left corner
 ; BB = height
 ; CC = width
-TextCommand04: ; 1b78 (0:1b78)
+TextCommand04:: ; 1b78 (0:1b78)
 	pop hl
 	ld a,[hli]
 	ld e,a
@@ -4366,7 +4366,7 @@
 
 ; place string inline
 ; 00{string}
-TextCommand00: ; 1b8a (0:1b8a)
+TextCommand00:: ; 1b8a (0:1b8a)
 	pop hl
 	ld d,h
 	ld e,l
@@ -4381,7 +4381,7 @@
 ; place string from RAM
 ; 01AAAA
 ; AAAA = address of string
-TextCommand01: ; 1b97 (0:1b97)
+TextCommand01:: ; 1b97 (0:1b97)
 	pop hl
 	ld a,[hli]
 	ld e,a
@@ -4400,7 +4400,7 @@
 ; BB
 ; bits 0-4 = length in bytes
 ; bits 5-7 = unknown flags
-TextCommand02: ; 1ba5 (0:1ba5)
+TextCommand02:: ; 1ba5 (0:1ba5)
 	pop hl
 	ld a,[hli]
 	ld e,a
@@ -4420,7 +4420,7 @@
 ; repoint destination address
 ; 03AAAA
 ; AAAA = new destination address
-TextCommand03: ; 1bb7 (0:1bb7)
+TextCommand03:: ; 1bb7 (0:1bb7)
 	pop hl
 	ld a,[hli]
 	ld [$cc3a],a
@@ -4433,7 +4433,7 @@
 ; repoint destination to second line of dialogue text box
 ; 05
 ; (no arguments)
-TextCommand05: ; 1bc5 (0:1bc5)
+TextCommand05:: ; 1bc5 (0:1bc5)
 	pop hl
 	FuncCoord 1, 16 ; $c4e1
 	ld bc,Coord ; address of second line of dialogue text box
@@ -4442,7 +4442,7 @@
 ; blink arrow and wait for A or B to be pressed
 ; 06
 ; (no arguments)
-TextCommand06: ; 1bcc (0:1bcc)
+TextCommand06:: ; 1bcc (0:1bcc)
 	ld a,[W_ISLINKBATTLE]
 	cp a,$04
 	jp z,TextCommand0D
@@ -4461,7 +4461,7 @@
 ; scroll text up one line
 ; 07
 ; (no arguments)
-TextCommand07: ; 1be7 (0:1be7)
+TextCommand07:: ; 1be7 (0:1be7)
 	ld a," "
 	FuncCoord 18, 16 ; $c4f2
 	ld [Coord],a ; place blank space in lower right corner of dialogue text box
@@ -4474,7 +4474,7 @@
 
 ; execute asm inline
 ; 08{code}
-TextCommand08: ; 1bf9 (0:1bf9)
+TextCommand08:: ; 1bf9 (0:1bf9)
 	pop hl
 	ld de,NextTextCommand
 	push de ; return address
@@ -4486,7 +4486,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:: ; 1bff (0:1bff)
 	pop hl
 	ld a,[hli]
 	ld e,a
@@ -4513,7 +4513,7 @@
 ; wait half a second if the user doesn't hold A or B
 ; 0A
 ; (no arguments)
-TextCommand0A: ; 1c1d (0:1c1d)
+TextCommand0A:: ; 1c1d (0:1c1d)
 	push bc
 	call GetJoypadState
 	ld a,[H_CURRENTPRESSEDBUTTONS]
@@ -4529,7 +4529,7 @@
 ; plays sounds
 ; this actually handles various command ID's, not just 0B
 ; (no arguments)
-TextCommand0B: ; 1c31 (0:1c31)
+TextCommand0B:: ; 1c31 (0:1c31)
 	pop hl
 	push bc
 	dec hl
@@ -4566,7 +4566,7 @@
 	jp NextTextCommand
 
 ; format: text command ID, sound ID or cry ID
-TextCommandSounds: ; 1c64 (0:1c64)
+TextCommandSounds:: ; 1c64 (0:1c64)
 	db $0B,$86
 	db $12,$9A
 	db $0E,$91
@@ -4581,7 +4581,7 @@
 ; draw ellipses
 ; 0CAA
 ; AA = number of ellipses to draw
-TextCommand0C: ; 1c78 (0:1c78)
+TextCommand0C:: ; 1c78 (0:1c78)
 	pop hl
 	ld a,[hli]
 	ld d,a
@@ -4610,7 +4610,7 @@
 ; wait for A or B to be pressed
 ; 0D
 ; (no arguments)
-TextCommand0D: ; 1c9a (0:1c9a)
+TextCommand0D:: ; 1c9a (0:1c9a)
 	push bc
 	call ManualTextScroll ; wait for A or B to be pressed
 	pop bc
@@ -4621,7 +4621,7 @@
 ; 17AAAABB
 ; AAAA = address of text commands
 ; BB = bank
-TextCommand17: ; 1ca3 (0:1ca3)
+TextCommand17:: ; 1ca3 (0:1ca3)
 	pop hl
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -4642,7 +4642,7 @@
 	ld [$2000],a
 	jp NextTextCommand
 
-TextCommandJumpTable: ; 1cc1 (0:1cc1)
+TextCommandJumpTable:: ; 1cc1 (0:1cc1)
 	dw TextCommand00
 	dw TextCommand01
 	dw TextCommand02
@@ -4661,7 +4661,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:: ; 1cdd (0:1cdd)
 	xor a
 	srl h
 	rr a
@@ -4678,7 +4678,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:: ; 1cf0 (0:1cf0)
 	ld a," "
 	jr .next
 	ld a,l
@@ -4696,7 +4696,7 @@
 ; When the player takes a step, a row or column of 2x2 tile blocks at the edge
 ; of the screen toward which they moved is exposed and has to be redrawn.
 ; This function does the redrawing.
-RedrawExposedScreenEdge: ; 1d01 (0:1d01)
+RedrawExposedScreenEdge:: ; 1d01 (0:1d01)
 	ld a,[H_SCREENEDGEREDRAW]
 	and a
 	ret z
@@ -4775,7 +4775,7 @@
 ; on when talking to sprites, battling, using menus, etc. This is because
 ; the above function, RedrawExposedScreenEdge, is used when walking to
 ; improve efficiency.
-AutoBgMapTransfer: ; 1d57 (0:1d57)
+AutoBgMapTransfer:: ; 1d57 (0:1d57)
 	ld a,[H_AUTOBGTRANSFERENABLED]
 	and a
 	ret z
@@ -4827,7 +4827,7 @@
 	ld b,6
 
 ; unrolled loop and using pop for speed
-TransferBgRows: ; 1d9e (0:1d9e)
+TransferBgRows:: ; 1d9e (0:1d9e)
 	pop de
 	ld [hl],e
 	inc l
@@ -4894,7 +4894,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:: ; 1de1 (0:1de1)
 	ld a,[H_VBCOPYBGSRC] ; doubles as enabling byte
 	and a
 	ret z
@@ -4923,7 +4923,7 @@
 ; It copies each source byte to the destination twice (next to each other).
 ; The function updates the source and destination addresses, so the transfer
 ; can be continued easily by repeatingly calling this function.
-VBlankCopyDouble: ; 1e02 (0:1e02)
+VBlankCopyDouble:: ; 1e02 (0:1e02)
 	ld a,[H_VBCOPYDOUBLESIZE]
 	and a ; are there any bytes to copy?
 	ret z
@@ -5003,7 +5003,7 @@
 ; Copies ([H_VBCOPYSIZE] * 16) bytes from H_VBCOPYSRC to H_VBCOPYDEST.
 ; The function updates the source and destination addresses, so the transfer
 ; can be continued easily by repeatingly calling this function.
-VBlankCopy: ; 1e5e (0:1e5e)
+VBlankCopy:: ; 1e5e (0:1e5e)
 	ld a,[H_VBCOPYSIZE]
 	and a ; are there any bytes to copy?
 	ret z
@@ -5085,7 +5085,7 @@
 	ret
 
 ; This function updates the moving water and flower background tiles.
-UpdateMovingBgTiles: ; 1ebe (0:1ebe)
+UpdateMovingBgTiles:: ; 1ebe (0:1ebe)
 	ld a,[$ffd7]
 	and a
 	ret z
@@ -5146,16 +5146,16 @@
 	jr nz,.flowerTileLoop
 	ret
 
-FlowerTilePattern1: ; 1f19 (0:1f19)
+FlowerTilePattern1:: ; 1f19 (0:1f19)
 	INCBIN "gfx/tilesets/flower/flower1.2bpp"
 
-FlowerTilePattern2: ; 1f29 (0:1f29)
+FlowerTilePattern2:: ; 1f29 (0:1f29)
 	INCBIN "gfx/tilesets/flower/flower2.2bpp"
 
-FlowerTilePattern3: ; 1f39 (0:1f39)
+FlowerTilePattern3:: ; 1f39 (0:1f39)
 	INCBIN "gfx/tilesets/flower/flower3.2bpp"
 
-SoftReset: ; 1f49 (0:1f49)
+SoftReset:: ; 1f49 (0:1f49)
 	call StopAllSounds
 	call GBPalWhiteOut
 	ld c, $20
@@ -5172,7 +5172,7 @@
 ; * 8x8 OBJ size
 ; * OBJ display enabled
 ; * BG display enabled
-InitGame: ; 1f54 (0:1f54)
+InitGame:: ; 1f54 (0:1f54)
 	di
 ; zero I/O registers
 	xor a
@@ -5258,7 +5258,7 @@
 	jp Func_42b7
 
 ; zeroes all VRAM
-ZeroVram: ; 2004 (0:2004)
+ZeroVram:: ; 2004 (0:2004)
 	ld hl,$8000
 	ld bc,$2000
 	xor a
@@ -5265,7 +5265,7 @@
 	jp FillMemory
 
 ; immediately stops all sounds
-StopAllSounds: ; 200e (0:200e)
+StopAllSounds:: ; 200e (0:200e)
 	ld a, Bank(Func_9876)
 	ld [$c0ef], a
 	ld [$c0f0], a
@@ -5276,7 +5276,7 @@
 	dec a
 	jp PlaySound
 
-VBlankHandler: ; 2024 (0:2024)
+VBlankHandler:: ; 2024 (0:2024)
 	push af
 	push bc
 	push de
@@ -5351,7 +5351,7 @@
 	pop af
 	reti
 
-DelayFrame: ; 20af (0:20af)
+DelayFrame:: ; 20af (0:20af)
 ; delay for one frame
 	ld a,1
 	ld [H_VBLANKOCCURRED],a
@@ -5366,7 +5366,7 @@
 
 ; These routines manage gradual fading
 ; (e.g., entering a doorway)
-LoadGBPal: ; 20ba (0:20ba)
+LoadGBPal:: ; 20ba (0:20ba)
 	ld a,[$d35d] ;tells if cur.map is dark (requires HM5_FLASH?)
 	ld b,a
 	ld hl,GBPalTable_00	;16
@@ -5384,16 +5384,16 @@
 	ld [rOBP1],a
 	ret
 
-GBFadeOut1: ; 20d1 (0:20d1)
+GBFadeOut1:: ; 20d1 (0:20d1)
 	ld hl,IncGradGBPalTable_01	;0d
 	ld b,$04
 	jr GBFadeOutCommon
 
-GBFadeOut2: ; 20d8 (0:20d8)
+GBFadeOut2:: ; 20d8 (0:20d8)
 	ld hl,IncGradGBPalTable_02	;1c
 	ld b,$03
 
-GBFadeOutCommon: ; 20dd (0:20dd)
+GBFadeOutCommon:: ; 20dd (0:20dd)
 	ld a,[hli]
 	ld [rBGP],a
 	ld a,[hli]
@@ -5406,16 +5406,16 @@
 	jr nz,GBFadeOutCommon
 	ret
 
-GBFadeIn1: ; 20ef (0:20ef)
+GBFadeIn1:: ; 20ef (0:20ef)
 	ld hl,DecGradGBPalTable_01	;18
 	ld b,$04
 	jr GBFadeInCommon
 
-GBFadeIn2: ; 20f6 (0:20f6)
+GBFadeIn2:: ; 20f6 (0:20f6)
 	ld hl,DecGradGBPalTable_02	;21
 	ld b,$03
 
-GBFadeInCommon: ; 20fb (0:20fb)
+GBFadeInCommon:: ; 20fb (0:20fb)
 	ld a,[hld]
 	ld [rOBP1],a
 	ld a,[hld]
@@ -5428,7 +5428,7 @@
 	jr nz,GBFadeInCommon
 	ret
 
-IncGradGBPalTable_01: ; 210d (0:210d)
+IncGradGBPalTable_01:: ; 210d (0:210d)
 	db %11111111 ;BG Pal
 	db %11111111 ;OBJ Pal 1
 	db %11111111 ;OBJ Pal 2
@@ -5440,16 +5440,16 @@
 	db %11111001
 	db %11100100
 	db %11100100
-GBPalTable_00: ; 2116 (0:2116)
+GBPalTable_00:: ; 2116 (0:2116)
 	db %11100100
 	db %11010000
-DecGradGBPalTable_01: ; 2118 (0:2118)
+DecGradGBPalTable_01:: ; 2118 (0:2118)
 	db %11100000
 	;19
 	db %11100100
 	db %11010000
 	db %11100000
-IncGradGBPalTable_02: ; 211c (0:211c)
+IncGradGBPalTable_02:: ; 211c (0:211c)
 	db %10010000
 	db %10000000
 	db %10010000
@@ -5456,7 +5456,7 @@
 
 	db %01000000
 	db %01000000
-DecGradGBPalTable_02: ; 2121 (0:2121)
+DecGradGBPalTable_02:: ; 2121 (0:2121)
 	db %01000000
 
 	db %00000000
@@ -5463,7 +5463,7 @@
 	db %00000000
 	db %00000000
 
-SerialInterruptHandler: ; 2125 (0:2125)
+SerialInterruptHandler:: ; 2125 (0:2125)
 	push af
 	push bc
 	push de
@@ -5512,7 +5512,7 @@
 	pop af
 	reti
 
-Func_216f: ; 216f (0:216f)
+Func_216f:: ; 216f (0:216f)
 	ld a, $1
 	ld [$FF00+$ab], a
 .asm_2173
@@ -5546,7 +5546,7 @@
 	jr nz, .asm_2173
 	ret
 
-Func_219a: ; 219a (0:219a)
+Func_219a:: ; 219a (0:219a)
 	xor a
 	ld [$FF00+$a9], a
 	ld a, [$FF00+$aa]
@@ -5634,7 +5634,7 @@
 	call DelayFrame
 	jp Func_219a
 
-Func_2231: ; 2231 (0:2231)
+Func_2231:: ; 2231 (0:2231)
 	ld a, $f
 .asm_2233
 	dec a
@@ -5641,7 +5641,7 @@
 	jr nz, .asm_2233
 	ret
 
-Func_2237: ; 2237 (0:2237)
+Func_2237:: ; 2237 (0:2237)
 	push hl
 	ld hl, $cc47
 	ld a, [hli]
@@ -5649,13 +5649,13 @@
 	pop hl
 	ret
 
-Func_223f: ; 223f (0:223f)
+Func_223f:: ; 223f (0:223f)
 	dec a
 	ld [$cc47], a
 	ld [$cc48], a
 	ret
 
-Func_2247: ; 2247 (0:2247)
+Func_2247:: ; 2247 (0:2247)
 	ld hl, $cc42
 	ld de, $cc3d
 	ld c, $2
@@ -5680,7 +5680,7 @@
 	jr nz, .asm_2253
 	ret
 
-Func_226e: ; 226e (0:226e)
+Func_226e:: ; 226e (0:226e)
 	call SaveScreenTilesToBuffer1
 	ld hl, Func_4c05
 	ld b, BANK(Func_4c05)
@@ -5688,7 +5688,7 @@
 	call Func_227f
 	jp LoadScreenTilesFromBuffer1
 
-Func_227f: ; 227f (0:227f)
+Func_227f:: ; 227f (0:227f)
 	ld a, $ff
 	ld [$cc3e], a
 .asm_2284
@@ -5728,7 +5728,7 @@
 	ld [$cc3d], a
 	ret
 
-Func_22c3: ; 22c3 (0:22c3)
+Func_22c3:: ; 22c3 (0:22c3)
 	call asm_22d7
 	ld a, [$cc42]
 	add $60
@@ -5738,7 +5738,7 @@
 	jr nz, asm_22d7
 	ld a, $81
 	ld [$FF00+$2], a
-asm_22d7: ; 22d7 (0:22d7)
+asm_22d7:: ; 22d7 (0:22d7)
 	ld a, [$FF00+$ad]
 	ld [$cc3d], a
 	and $f0
@@ -5751,7 +5751,7 @@
 	ld [$cc3e], a
 	ret
 
-Func_22ed: ; 22ed (0:22ed)
+Func_22ed:: ; 22ed (0:22ed)
 	xor a
 	ld [$FF00+$ac], a
 	ld a, [$FF00+$aa]
@@ -5761,7 +5761,7 @@
 	ld [$FF00+$2], a
 	ret
 
-Func_22fa: ; 22fa (0:22fa)
+Func_22fa:: ; 22fa (0:22fa)
 	ld a, $2
 	ld [$FF00+$1], a
 	xor a
@@ -5771,10 +5771,10 @@
 	ret
 
 ; timer interrupt is apparently not invoked anyway
-TimerHandler: ; 2306 (0:2306)
+TimerHandler:: ; 2306 (0:2306)
 	reti
 
-Func_2307: ; 2307 (0:2307)
+Func_2307:: ; 2307 (0:2307)
 	call WaitForSoundToFinish
 	xor a
 	ld c, a
@@ -5782,7 +5782,7 @@
 	ld [$cfca], a
 	jr asm_2324
 
-Func_2312: ; 2312 (0:2312)
+Func_2312:: ; 2312 (0:2312)
 	ld c, $a
 	ld d, $0
 	ld a, [$d72e]
@@ -5792,7 +5792,7 @@
 	ld [$cfca], a
 	ld c, $8
 	ld d, c
-asm_2324: ; 2324 (0:2324)
+asm_2324:: ; 2324 (0:2324)
 	ld a, [$d700]
 	and a
 	jr z, .asm_2343
@@ -5829,7 +5829,7 @@
 	ld [$c0ee], a
 	jp PlaySound
 
-Func_235f: ; 235f (0:235f)
+Func_235f:: ; 235f (0:235f)
 	ld a, [$c0ef]
 	ld b, a
 	cp $2
@@ -5857,7 +5857,7 @@
 	jr nz, .asm_237a
 	ret
 
-Func_2385: ; 2385 (0:2385)
+Func_2385:: ; 2385 (0:2385)
 	ld a, [$d35c]
 	ld e, a
 	ld a, [$c0ef]
@@ -5877,7 +5877,7 @@
 	scf
 	ret
 
-PlayMusic: ; 23a1 (0:23a1)
+PlayMusic:: ; 23a1 (0:23a1)
 	ld b, a
 	ld [$c0ee], a
 	xor a
@@ -5888,7 +5888,7 @@
 	ld a, b
 
 ; plays music specified by a. If value is $ff, music is stopped
-PlaySound: ; 23b1 (0:23b1)
+PlaySound:: ; 23b1 (0:23b1)
 	push hl
 	push de
 	push bc
@@ -5958,7 +5958,7 @@
 	pop hl
 	ret
 
-UpdateSprites: ; 2429 (0:2429)
+UpdateSprites:: ; 2429 (0:2429)
 	ld a, [$cfcb]
 	dec a
 	ret nz
@@ -5978,16 +5978,16 @@
 ; first byte $FE, next byte # of items, last byte $FF
 
 ; Viridian
-ViridianMartText6: ; 2442 (0:2442)
+ViridianMartText6:: ; 2442 (0:2442)
 	db $FE,4,POKE_BALL,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF
 
 ; Pewter
-PewterMartText1: ; 2449 (0:2449)
+PewterMartText1:: ; 2449 (0:2449)
 	db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING
 	db PARLYZ_HEAL,$FF
 
 ; Cerulean
-CeruleanMartText1: ; 2453 (0:2453)
+CeruleanMartText1:: ; 2453 (0:2453)
 	db $FE,7,POKE_BALL,POTION,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING
 	db PARLYZ_HEAL,$FF
 
@@ -5995,39 +5995,39 @@
 	db $FE,1,BICYCLE,$FF
 
 ; Vermilion
-VermilionMartText1: ; 2461 (0:2461)
+VermilionMartText1:: ; 2461 (0:2461)
 	db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL
 	db REPEL,$FF
 
 ; Lavender
-LavenderMartText1: ; 246a (0:246a)
+LavenderMartText1:: ; 246a (0:246a)
 	db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL
 	db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF
 
 ; Celadon Dept. Store 2F (1)
-CeladonMart2Text1: ; 2476 (0:2476)
+CeladonMart2Text1:: ; 2476 (0:2476)
 	db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE
 	db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF
 
 ; Celadon Dept. Store 2F (2)
-CeladonMart2Text2: ; 2482 (0:2482)
+CeladonMart2Text2:: ; 2482 (0:2482)
 	db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF
 
 ; Celadon Dept. Store 4F
-CeladonMart4Text1: ; 248e (0:248e)
+CeladonMart4Text1:: ; 248e (0:248e)
 	db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF
 
 ; Celadon Dept. Store 5F (1)
-CeladonMart5Text3: ; 2496 (0:2496)
+CeladonMart5Text3:: ; 2496 (0:2496)
 	db $FE,7,X_ACCURACY,GUARD_SPEC_,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED
 	db X_SPECIAL,$FF
 
 ; Celadon Dept. Store 5F (2)
-CeladonMart5Text4: ; 24a0 (0:24a0)
+CeladonMart5Text4:: ; 24a0 (0:24a0)
 	db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF
 
 ; Fuchsia
-FuchsiaMartText1: ; 24a8 (0:24a8)
+FuchsiaMartText1:: ; 24a8 (0:24a8)
 	db $FE,6,ULTRA_BALL,GREAT_BALL,SUPER_POTION,REVIVE,FULL_HEAL
 	db SUPER_REPEL,$FF
 
@@ -6035,47 +6035,47 @@
 	db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF
 
 ; Cinnabar
-CinnabarMartText1: ; 24b9 (0:24b9)
+CinnabarMartText1:: ; 24b9 (0:24b9)
 	db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE
 	db FULL_HEAL,REVIVE,$FF
 
 ; Saffron
-SaffronMartText1: ; 24c3 (0:24c3)
+SaffronMartText1:: ; 24c3 (0:24c3)
 	db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL
 	db REVIVE,$FF
 
 ; Indigo
-IndigoPlateauLobbyText4: ; 24cc (0:24cc)
+IndigoPlateauLobbyText4:: ; 24cc (0:24cc)
 	db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL
 	db REVIVE,MAX_REPEL,$FF
 
-TextScriptEndingChar: ; 24d6 (0:24d6)
+TextScriptEndingChar:: ; 24d6 (0:24d6)
 	db "@"
-TextScriptEnd: ; 24d7 (0:24d7)
+TextScriptEnd:: ; 24d7 (0:24d7)
 	ld hl,TextScriptEndingChar
 	ret
 
-UnnamedText_24db: ; 24db (0:24db)
+UnnamedText_24db:: ; 24db (0:24db)
 	TX_FAR _UnnamedText_24db
 	db "@"
 
-UnnamedText_24e0: ; 24e0 (0:24e0)
+UnnamedText_24e0:: ; 24e0 (0:24e0)
 	TX_FAR _UnnamedText_24e0
 	db "@"
 
-BoulderText: ; 24e5 (0:24e5)
+BoulderText:: ; 24e5 (0:24e5)
 	TX_FAR _BoulderText
 	db "@"
 
-MartSignText: ; 24ea (0:24ea)
+MartSignText:: ; 24ea (0:24ea)
 	TX_FAR _MartSignText
 	db "@"
 
-PokeCenterSignText: ; 24ef (0:24ef)
+PokeCenterSignText:: ; 24ef (0:24ef)
 	TX_FAR _PokeCenterSignText
 	db "@"
 
-Predef5CText: ; 24f4 (0:24f4)
+Predef5CText:: ; 24f4 (0:24f4)
 ; XXX better label (what does predef $5C do?)
 	db $08 ; asm
 	ld a, $5c
@@ -6084,7 +6084,7 @@
 
 ; bankswitches and runs _UncompressSpriteData
 ; bank is given in a, sprite input stream is pointed to in W_SPRITEINPUTPTR
-UncompressSpriteData: ; 24fd (0:24fd)
+UncompressSpriteData:: ; 24fd (0:24fd)
 	ld b, a
 	ld a, [H_LOADEDROMBANK]
 	push af
@@ -6102,7 +6102,7 @@
 	ret
 
 ; initializes necessary data to load a sprite and runs UncompressSpriteDataLoop
-_UncompressSpriteData: ; 251a (0:251a)
+_UncompressSpriteData:: ; 251a (0:251a)
 	ld hl, S_SPRITEBUFFER1
 	ld c, (2*SPRITEBUFFERSIZE) % $100
 	ld b, (2*SPRITEBUFFERSIZE) / $100
@@ -6139,7 +6139,7 @@
 ; uncompresses a chunk from the sprite input data stream (pointed to at $d0da) into S_SPRITEBUFFER1 or S_SPRITEBUFFER2
 ; 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:: ; 2556 (0:2556)
 	ld hl, S_SPRITEBUFFER1
 	ld a, [W_SPRITELOADFLAGS]  ; $d0a8
 	bit 0, a
@@ -6229,7 +6229,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:: ; 25d8 (0:25d8)
 	ld a, [W_SPRITEHEIGHT]
 	ld b, a
 	ld a, [W_SPRITECURPOSY]
@@ -6290,7 +6290,7 @@
 	jp UnpackSprite
 
 ; writes 2 bits (from a) to the output buffer (pointed to from W_SPRITEOUTPUTPTR)
-WriteSpriteBitsToBuffer: ; 2649 (0:2649)
+WriteSpriteBitsToBuffer:: ; 2649 (0:2649)
 	ld e, a
 	ld a, [W_SPRITEOUTPUTBITOFFSET]
 	and a
@@ -6318,7 +6318,7 @@
 	ret
 
 ; reads next bit from input stream and returns it in a
-ReadNextInputBit: ; 2670 (0:2670)
+ReadNextInputBit:: ; 2670 (0:2670)
 	ld a, [W_SPRITEINPUTBITCOUNTER]
 	dec a
 	jr nz, .curByteHasMoreBitsToRead
@@ -6334,7 +6334,7 @@
 	ret
 
 ; reads next byte from input stream and returns it in a
-ReadNextInputByte: ; 268b (0:268b)
+ReadNextInputByte:: ; 268b (0:268b)
 	ld a, [W_SPRITEINPUTPTR]
 	ld l, a
 	ld a, [W_SPRITEINPUTPTR+1]
@@ -6349,7 +6349,7 @@
 	ret
 
 ; the nth item is 2^n - 1
-LengthEncodingOffsetList: ; 269f (0:269f)
+LengthEncodingOffsetList:: ; 269f (0:269f)
 	dw %0000000000000001
 	dw %0000000000000011
 	dw %0000000000000111
@@ -6368,7 +6368,7 @@
 	dw %1111111111111111
 
 ; unpacks the sprite data depending on the unpack mode
-UnpackSprite: ; 26bf (0:26bf)
+UnpackSprite:: ; 26bf (0:26bf)
 	ld a, [W_SPRITEUNPACKMODE]
 	cp $2
 	jp z, UnpackSpriteMode2
@@ -6381,7 +6381,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:: ; 26d4 (0:26d4)
 	xor a
 	ld [W_SPRITECURPOSX], a
 	ld [W_SPRITECURPOSY], a
@@ -6466,7 +6466,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:: ; 276d (0:276d)
 	srl a               ; c=a%2, a/=2
 	ld c, $0
 	jr nc, .evenNumber
@@ -6508,7 +6508,7 @@
 	ld e, a ; update last decoded data
 	ret
 
-DecodeNybble0Table: ; 27a7 (0:27a7)
+DecodeNybble0Table:: ; 27a7 (0:27a7)
 	dn $0, $1
 	dn $3, $2
 	dn $7, $6
@@ -6517,7 +6517,7 @@
 	dn $c, $d
 	dn $8, $9
 	dn $b, $a
-DecodeNybble1Table: ; 27af (0:27af)
+DecodeNybble1Table:: ; 27af (0:27af)
 	dn $f, $e
 	dn $c, $d
 	dn $8, $9
@@ -6526,7 +6526,7 @@
 	dn $3, $2
 	dn $7, $6
 	dn $4, $5
-DecodeNybble0TableFlipped: ; 27b7 (0:27b7)
+DecodeNybble0TableFlipped:: ; 27b7 (0:27b7)
 	dn $0, $8
 	dn $c, $4
 	dn $e, $6
@@ -6535,7 +6535,7 @@
 	dn $3, $b
 	dn $1, $9
 	dn $d, $5
-DecodeNybble1TableFlipped: ; 27bf (0:27bf)
+DecodeNybble1TableFlipped:: ; 27bf (0:27bf)
 	dn $f, $7
 	dn $3, $b
 	dn $1, $9
@@ -6546,7 +6546,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:: ; 27c7 (0:27c7)
 	xor a
 	ld [W_SPRITECURPOSX], a
 	ld [W_SPRITECURPOSY], a
@@ -6611,7 +6611,7 @@
 	ret
 
 ; reverses the bits in the nybble given in register a
-ReverseNybble: ; 2837 (0:2837)
+ReverseNybble:: ; 2837 (0:2837)
 	ld de, NybbleReverseTable
 	add e
 	ld e, a
@@ -6622,7 +6622,7 @@
 	ret
 
 ; resets sprite buffer pointers to buffer 1 and 2, depending on W_SPRITELOADFLAGS
-ResetSpriteBufferPointers: ; 2841 (0:2841)
+ResetSpriteBufferPointers:: ; 2841 (0:2841)
 	ld a, [W_SPRITELOADFLAGS] ; $d0a8
 	bit 0, a
 	jr nz, .buffer2Selected
@@ -6644,11 +6644,11 @@
 	ret
 
 ; maps each nybble to its reverse
-NybbleReverseTable: ; 2867 (0:2867)
+NybbleReverseTable:: ; 2867 (0:2867)
 	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:: ; 2877 (0:2877)
 	call ResetSpriteBufferPointers
 	ld a, [W_SPRITEFLIPPED]
 	push af
@@ -6665,7 +6665,7 @@
 	jp XorSpriteChunks
 
 ; stores hl into the output pointers
-StoreSpriteOutputPointer: ; 2897 (0:2897)
+StoreSpriteOutputPointer:: ; 2897 (0:2897)
 	ld a, l
 	ld [W_SPRITEOUTPUTPTR], a
 	ld [W_SPRITEOUTPUTPTRCACHED], a
@@ -6674,7 +6674,7 @@
 	ld [W_SPRITEOUTPUTPTRCACHED+1], a
 	ret
 
-ResetPlayerSpriteData: ; 28a6 (0:28a6)
+ResetPlayerSpriteData:: ; 28a6 (0:28a6)
 	ld hl, wSpriteStateData1
 	call ResetPlayerSpriteData_ClearSpriteData
 	ld hl, wSpriteStateData2
@@ -6690,12 +6690,12 @@
 	ret
 
 ; overwrites sprite data with zeroes
-ResetPlayerSpriteData_ClearSpriteData: ; 28c4 (0:28c4)
+ResetPlayerSpriteData_ClearSpriteData:: ; 28c4 (0:28c4)
 	ld bc, $10
 	xor a
 	jp FillMemory
 
-Func_28cb: ; 28cb (0:28cb)
+Func_28cb:: ; 28cb (0:28cb)
 	ld a, [wMusicHeaderPointer]
 	and a
 	jr nz, .asm_28dc
@@ -6746,7 +6746,7 @@
 
 ; this function is used to display sign messages, sprite dialog, etc.
 ; INPUT: [$ff8c] = sprite ID or text ID
-DisplayTextID: ; 2920 (0:2920)
+DisplayTextID:: ; 2920 (0:2920)
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld b,BANK(DisplayTextIDInit)
@@ -6848,7 +6848,7 @@
 	and a
 	jr nz,HoldTextDisplayOpen
 
-AfterDisplayingTextID: ; 29d6 (0:29d6)
+AfterDisplayingTextID:: ; 29d6 (0:29d6)
 	ld a,[$cc47]
 	and a
 	jr nz,HoldTextDisplayOpen
@@ -6855,13 +6855,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:: ; 29df (0:29df)
 	call GetJoypadState
 	ld a,[H_CURRENTPRESSEDBUTTONS]
 	bit 0,a ; is the A button being pressed?
 	jr nz,HoldTextDisplayOpen
 
-CloseTextDisplay: ; 29e8 (0:29e8)
+CloseTextDisplay:: ; 29e8 (0:29e8)
 	ld a,[W_CURMAP]
 	call SwitchToMapRomBank
 	ld a,$90
@@ -6897,7 +6897,7 @@
 	ld [$2000],a
 	jp UpdateSprites ; move sprites
 
-DisplayPokemartDialogue: ; 2a2e (0:2a2e)
+DisplayPokemartDialogue:: ; 2a2e (0:2a2e)
 	push hl
 	ld hl,PokemartGreetingText
 	call PrintText
@@ -6917,11 +6917,11 @@
 	ld [$2000],a
 	jp AfterDisplayingTextID
 
-PokemartGreetingText: ; 2a55 (0:2a55)
+PokemartGreetingText:: ; 2a55 (0:2a55)
 	TX_FAR _PokemartGreetingText
 	db "@"
 
-LoadItemList: ; 2a5a (0:2a5a)
+LoadItemList:: ; 2a5a (0:2a5a)
 	ld a,$01
 	ld [$cfcb],a
 	ld a,h
@@ -6937,7 +6937,7 @@
 	jr nz,.loop
 	ret
 
-DisplayPokemonCenterDialogue: ; 2a72 (0:2a72)
+DisplayPokemonCenterDialogue:: ; 2a72 (0:2a72)
 	xor a
 	ld [$ff8b],a
 	ld [$ff8c],a
@@ -6954,22 +6954,22 @@
 	ld [$2000],a
 	jp AfterDisplayingTextID
 
-DisplaySafariGameOverText: ; 2a90 (0:2a90)
+DisplaySafariGameOverText:: ; 2a90 (0:2a90)
 	ld hl, Func_1e9ed
 	ld b, BANK(Func_1e9ed)
 	call Bankswitch
 	jp AfterDisplayingTextID
 
-DisplayPokemonFaintedText: ; 2a9b (0:2a9b)
+DisplayPokemonFaintedText:: ; 2a9b (0:2a9b)
 	ld hl,PokemonFaintedText
 	call PrintText
 	jp AfterDisplayingTextID
 
-PokemonFaintedText: ; 2aa4 (0:2aa4)
+PokemonFaintedText:: ; 2aa4 (0:2aa4)
 	TX_FAR _PokemonFaintedText
 	db "@"
 
-DisplayPlayerBlackedOutText: ; 2aa9 (0:2aa9)
+DisplayPlayerBlackedOutText:: ; 2aa9 (0:2aa9)
 	ld hl,PlayerBlackedOutText
 	call PrintText
 	ld a,[$d732]
@@ -6977,20 +6977,20 @@
 	ld [$d732],a
 	jp HoldTextDisplayOpen
 
-PlayerBlackedOutText: ; 2aba (0:2aba)
+PlayerBlackedOutText:: ; 2aba (0:2aba)
 	TX_FAR _PlayerBlackedOutText
 	db "@"
 
-DisplayRepelWoreOffText: ; 2abf (0:2abf)
+DisplayRepelWoreOffText:: ; 2abf (0:2abf)
 	ld hl,RepelWoreOffText
 	call PrintText
 	jp AfterDisplayingTextID
 
-RepelWoreOffText: ; 2ac8 (0:2ac8)
+RepelWoreOffText:: ; 2ac8 (0:2ac8)
 	TX_FAR _RepelWoreOffText
 	db "@"
 
-DisplayStartMenu: ; 2acd (0:2acd)
+DisplayStartMenu:: ; 2acd (0:2acd)
 	ld a,$04 ; hardcoded Bank, not sure what's it refers to
 	ld [H_LOADEDROMBANK],a
 	ld [$2000],a ; ROM bank 4
@@ -6999,7 +6999,7 @@
 	ld a, (SFX_02_3f - $4000) / 3 ; Start menu sound
 	call PlaySound
 
-RedisplayStartMenu: ; 2adf (0:2adf)
+RedisplayStartMenu:: ; 2adf (0:2adf)
 	ld b,BANK(DrawStartMenu)
 	ld hl,DrawStartMenu
 	call Bankswitch
@@ -7075,7 +7075,7 @@
 	jp z,StartMenu_Option
 
 ; EXIT falls through to here
-CloseStartMenu: ; 2b70 (0:2b70)
+CloseStartMenu:: ; 2b70 (0:2b70)
 	call GetJoypadState
 	ld a,[H_NEWLYPRESSEDBUTTONS]
 	bit 0,a ; was A button newly pressed?
@@ -7089,7 +7089,7 @@
 ; b = length of string of bytes
 ; OUTPUT:
 ; [$D11E] = number of set bits
-CountSetBits: ; 2b7f (0:2b7f)
+CountSetBits:: ; 2b7f (0:2b7f)
 	ld c,0
 .loop
 	ld a,[hli]
@@ -7110,13 +7110,13 @@
 
 ; 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:: ; 2b96 (0:2b96)
 	ld b,BANK(SubtractAmountPaidFromMoney_)
 	ld hl,SubtractAmountPaidFromMoney_
 	jp Bankswitch
 
 ; adds the amount the player sold to their money
-AddAmountSoldToMoney: ; 2b9e (0:2b9e)
+AddAmountSoldToMoney:: ; 2b9e (0:2b9e)
 	ld de,wPlayerMoney + 2
 	ld hl,$ffa1 ; total price of items
 	ld c,3 ; length of money in bytes
@@ -7134,7 +7134,7 @@
 ; HL = address of inventory (either wNumBagItems or wNumBoxItems)
 ; [$CF92] = index (within the inventory) of the item to remove
 ; [$CF96] = quantity to remove
-RemoveItemFromInventory: ; 2bbb (0:2bbb)
+RemoveItemFromInventory:: ; 2bbb (0:2bbb)
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,BANK(RemoveItemFromInventory_)
@@ -7152,7 +7152,7 @@
 ; [$CF91] = item ID
 ; [$CF96] = item quantity
 ; sets carry flag if successful, unsets carry flag if unsuccessful
-AddItemToInventory: ; 2bcf (0:2bcf)
+AddItemToInventory:: ; 2bcf (0:2bcf)
 	push bc
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -7170,7 +7170,7 @@
 ; INPUT:
 ; [wListMenuID] = list menu ID
 ; [$cf8b] = address of the list (2 bytes)
-DisplayListMenuID: ; 2be6 (0:2be6)
+DisplayListMenuID:: ; 2be6 (0:2be6)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a ; disable auto-transfer
 	ld a,1
@@ -7224,7 +7224,7 @@
 	ld c,10
 	call DelayFrames
 
-DisplayListMenuIDLoop: ; 2c53 (0:2c53)
+DisplayListMenuIDLoop:: ; 2c53 (0:2c53)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a ; disable transfer
 	call PrintListMenuEntries
@@ -7359,7 +7359,7 @@
 	dec [hl]
 	jp DisplayListMenuIDLoop
 
-DisplayChooseQuantityMenu: ; 2d57 (0:2d57)
+DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
 ; text box dimensions/coordinates for just quantity
 	FuncCoord 15,9
 	ld hl,Coord
@@ -7487,13 +7487,13 @@
 	ld a,$ff
 	ret
 
-InitialQuantityText: ; 2e30 (0:2e30)
+InitialQuantityText:: ; 2e30 (0:2e30)
 	db "×01@"
 
-SpacesBetweenQuantityAndPriceText: ; 2e34 (0:2e34)
+SpacesBetweenQuantityAndPriceText:: ; 2e34 (0:2e34)
 	db "      @"
 
-ExitListMenu: ; 2e3b (0:2e3b)
+ExitListMenu:: ; 2e3b (0:2e3b)
 	ld a,[wCurrentMenuItem]
 	ld [$d12d],a
 	ld a,$02
@@ -7509,7 +7509,7 @@
 	scf
 	ret
 
-PrintListMenuEntries: ; 2e5a (0:2e5a)
+PrintListMenuEntries:: ; 2e5a (0:2e5a)
 	FuncCoord 5, 3 ; $c3e1
 	ld hl,Coord
 	ld b,$09
@@ -7700,10 +7700,10 @@
 	ld de,ListMenuCancelText
 	jp PlaceString
 
-ListMenuCancelText: ; 2f97 (0:2f97)
+ListMenuCancelText:: ; 2f97 (0:2f97)
 	db "CANCEL@"
 
-GetMonName: ; 2f9e (0:2f9e)
+GetMonName:: ; 2f9e (0:2f9e)
 	push hl
 	ld a,[H_LOADEDROMBANK]
 	push af
@@ -7729,7 +7729,7 @@
 	pop hl
 	ret
 
-GetItemName: ; 2fcf (0:2fcf)
+GetItemName:: ; 2fcf (0:2fcf)
 ; given an item ID at [$D11E], store the name of the item into a string
 ;     starting at $CD6D
 	push hl
@@ -7754,7 +7754,7 @@
 	pop hl
 	ret
 
-GetMachineName: ; 2ff3 (0:2ff3)
+GetMachineName:: ; 2ff3 (0:2ff3)
 ; copies the name of the TM/HM in [$D11E] to $CD6D
 	push hl
 	push de
@@ -7807,14 +7807,14 @@
 	pop hl
 	ret
 
-TechnicalPrefix: ; 303c (0:303c)
+TechnicalPrefix:: ; 303c (0:303c)
 	db "TM"
-HiddenPrefix: ; 303e (0:303e)
+HiddenPrefix:: ; 303e (0:303e)
 	db "HM"
 
 ; sets carry if item is HM, clears carry if item is not HM
 ; Input: a = item ID
-IsItemHM: ; 3040 (0:3040)
+IsItemHM:: ; 3040 (0:3040)
 	cp a,HM_01
 	jr c,.notHM
 	cp a,TM_01
@@ -7825,16 +7825,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:: ; 3049 (0:3049)
 	ld hl,HMMoves
 	ld de,1
 	jp IsInArray
 
-HMMoves: ; 3052 (0:3052)
+HMMoves:: ; 3052 (0:3052)
 	db CUT,FLY,SURF,STRENGTH,FLASH
 	db $ff ; terminator
 
-GetMoveName: ; 3058 (0:3058)
+GetMoveName:: ; 3058 (0:3058)
 	push hl
 	ld a,MOVE_NAME
 	ld [W_LISTTYPE],a
@@ -7848,7 +7848,7 @@
 	ret
 
 ; reloads text box tile patterns, current map view, and tileset tile patterns
-ReloadMapData: ; 3071 (0:3071)
+ReloadMapData:: ; 3071 (0:3071)
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,[W_CURMAP]
@@ -7864,7 +7864,7 @@
 	ret
 
 ; reloads tileset tile patterns
-ReloadTilesetTilePatterns: ; 3090 (0:3090)
+ReloadTilesetTilePatterns:: ; 3090 (0:3090)
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,[W_CURMAP]
@@ -7878,7 +7878,7 @@
 	ret
 
 ; shows the town map and lets the player choose a destination to fly to
-ChooseFlyDestination: ; 30a9 (0:30a9)
+ChooseFlyDestination:: ; 30a9 (0:30a9)
 	ld hl,$d72e
 	res 4,[hl]
 	ld b, BANK(Func_70f90)
@@ -7886,7 +7886,7 @@
 	jp Bankswitch
 
 ; causes the text box to close waithout waiting for a button press after displaying text
-DisableWaitingAfterTextDisplay: ; 30b6 (0:30b6)
+DisableWaitingAfterTextDisplay:: ; 30b6 (0:30b6)
 	ld a,$01
 	ld [$cc3c],a
 	ret
@@ -7900,7 +7900,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:: ; 30bc (0:30bc)
 	ld b,BANK(UseItem_)
 	ld hl,UseItem_
 	jp Bankswitch
@@ -7913,7 +7913,7 @@
 ; [$cf96] = quantity to toss
 ; OUTPUT:
 ; clears carry flag if the item is tossed, sets carry flag if not
-TossItem: ; 30c4 (0:30c4)
+TossItem:: ; 30c4 (0:30c4)
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,BANK(TossItem_)
@@ -7933,7 +7933,7 @@
 ; [$d124] = result
 ; 00: item is not key item
 ; 01: item is key item
-IsKeyItem: ; 30d9 (0:30d9)
+IsKeyItem:: ; 30d9 (0:30d9)
 	push hl
 	push de
 	push bc
@@ -7948,7 +7948,7 @@
 ; function to draw various text boxes
 ; INPUT:
 ; [$D125] = text box ID
-DisplayTextBoxID: ; 30e8 (0:30e8)
+DisplayTextBoxID:: ; 30e8 (0:30e8)
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,BANK(DisplayTextBoxID_)
@@ -7961,7 +7961,7 @@
 	ld [$2000],a
 	ret
 
-Func_30fd: ; 30fd (0:30fd)
+Func_30fd:: ; 30fd (0:30fd)
 	ld a, [$cc57]
 	and a
 	ret nz
@@ -7972,7 +7972,7 @@
 	and $80
 	ret
 
-Func_310e: ; 310e (0:310e)
+Func_310e:: ; 310e (0:310e)
 	ld hl, $d736
 	bit 0, [hl]
 	res 0, [hl]
@@ -8009,16 +8009,16 @@
 	ld hl, Func_1a3e0
 	jp Bankswitch ; indirect jump to Func_1a3e0 (1a3e0 (6:63e0))
 
-Func_314e: ; 314e (0:314e)
+Func_314e:: ; 314e (0:314e)
 	ld b, BANK(Func_1a41d)
 	ld hl, Func_1a41d
 	jp Bankswitch ; indirect jump to Func_1a41d (1a41d (6:641d))
 
-Func_3156: ; 3156 (0:3156)
+Func_3156:: ; 3156 (0:3156)
 	ret
 
 ; stores hl in [W_TRAINERHEADERPTR]
-StoreTrainerHeaderPointer: ; 3157 (0:3157)
+StoreTrainerHeaderPointer:: ; 3157 (0:3157)
 	ld a, h
 	ld [W_TRAINERHEADERPTR], a
 	ld a, l
@@ -8027,7 +8027,7 @@
 
 ; executes the current map script from the function pointer array provided in hl.
 ; a: map script index to execute (unless overridden by [$d733] bit 4)
-ExecuteCurMapScriptInTable: ; 3160 (0:3160)
+ExecuteCurMapScriptInTable:: ; 3160 (0:3160)
 	push af
 	push de
 	call StoreTrainerHeaderPointer
@@ -8046,7 +8046,7 @@
 	ld a, [W_CURMAPSCRIPT]
 	ret
 
-LoadGymLeaderAndCityName: ; 317f (0:317f)
+LoadGymLeaderAndCityName:: ; 317f (0:317f)
 	push de
 	ld de, wGymCityName
 	ld bc, $11
@@ -8063,7 +8063,7 @@
 ;    4 -> before battle text (into hl)
 ;    6 -> after battle text (into hl)
 ;    8 -> end battle text (into hl)
-ReadTrainerHeaderInfo: ; 3193 (0:3193)
+ReadTrainerHeaderInfo:: ; 3193 (0:3193)
 	push de
 	push af
 	ld d, $0
@@ -8103,12 +8103,12 @@
 	ret
 
 ; calls HandleBitArray
-HandleBitArray_Bank0: ; 31c7 (0:31c7)
+HandleBitArray_Bank0:: ; 31c7 (0:31c7)
 	ld a, $10
 	jp Predef ; indirect jump to HandleBitArray (f666 (3:7666))
 
 ; direct talking to a trainer (rather than getting seen by one)
-TalkToTrainer: ; 31cc (0:31cc)
+TalkToTrainer:: ; 31cc (0:31cc)
 	call StoreTrainerHeaderPointer
 	xor a
 	call ReadTrainerHeaderInfo     ; read flag's bit
@@ -8146,7 +8146,7 @@
 	jp Func_325d
 
 ; checks if any trainers are seeing the player and wanting to fight
-CheckFightingMapTrainers: ; 3219 (0:3219)
+CheckFightingMapTrainers:: ; 3219 (0:3219)
 	call CheckForEngagingTrainers
 	ld a, [$cf13]
 	cp $ff
@@ -8172,7 +8172,7 @@
 	inc [hl]      ; progress to battle phase 1 (engaging)
 	ret
 
-Func_324c: ; 324c (0:324c)
+Func_324c:: ; 324c (0:324c)
 	ld a, [$d730]
 	and $1
 	ret nz
@@ -8181,7 +8181,7 @@
 	ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c
 	call DisplayTextID
 
-Func_325d: ; 325d (0:325d)
+Func_325d:: ; 325d (0:325d)
 	xor a
 	ld [wJoypadForbiddenButtonsMask], a
 	call InitBattleEnemyParameters
@@ -8194,7 +8194,7 @@
 	inc [hl]        ; progress to battle phase 2 (battling)
 	ret
 
-EndTrainerBattle: ; 3275 (0:3275)
+EndTrainerBattle:: ; 3275 (0:3275)
 	ld hl, $d126
 	set 5, [hl]
 	set 6, [hl]
@@ -8229,7 +8229,7 @@
 	res 4, [hl]
 	ret nz
 
-ResetButtonPressedAndMapScript: ; 32c1 (0:32c1)
+ResetButtonPressedAndMapScript:: ; 32c1 (0:32c1)
 	xor a
 	ld [wJoypadForbiddenButtonsMask], a
 	ld [H_CURRENTPRESSEDBUTTONS], a
@@ -8239,13 +8239,13 @@
 	ret
 
 ; calls TrainerWalkUpToPlayer
-TrainerWalkUpToPlayer_Bank0: ; 32cf (0:32cf)
+TrainerWalkUpToPlayer_Bank0:: ; 32cf (0:32cf)
 	ld b, BANK(TrainerWalkUpToPlayer)
 	ld hl, TrainerWalkUpToPlayer
 	jp Bankswitch ; indirect jump to TrainerWalkUpToPlayer (56881 (15:6881))
 
 ; sets opponent type and mon set/lvl based on the engaging trainer data
-InitBattleEnemyParameters: ; 32d7 (0:32d7)
+InitBattleEnemyParameters:: ; 32d7 (0:32d7)
 	ld a, [wEngagedTrainerClass]
 	ld [W_CUROPPONENT], a ; $d059
 	ld [W_ENEMYMONORTRAINERCLASS], a
@@ -8258,25 +8258,25 @@
 	ld [W_CURENEMYLVL], a ; $d127
 	ret
 
-Func_32ef: ; 32ef (0:32ef)
+Func_32ef:: ; 32ef (0:32ef)
 	ld hl, Func_567f9
 	jr asm_3301
 
-Func_32f4: ; 32f4 (0:32f4)
+Func_32f4:: ; 32f4 (0:32f4)
 	ld hl, Func_56819
 	jr asm_3301 ; 0x32f7 $8
 
-Func_32f9: ; 32f9 (0:32f9)
+Func_32f9:: ; 32f9 (0:32f9)
 	ld hl, Func_5683d
 	jr asm_3301
 
-Func_32fe: ; 32fe (0:32fe)
+Func_32fe:: ; 32fe (0:32fe)
 	ld hl, Func_5685d
-asm_3301: ; 3301 (0:3301)
+asm_3301:: ; 3301 (0:3301)
 	ld b, $15
 	jp Bankswitch ; indirect jump to one of the four functions
 
-CheckForEngagingTrainers: ; 3306 (0:3306)
+CheckForEngagingTrainers:: ; 3306 (0:3306)
 	xor a
 	call ReadTrainerHeaderInfo       ; read trainer flag's bit (unused)
 	ld d, h                          ; store trainer header address in de
@@ -8324,7 +8324,7 @@
 	jr .trainerLoop
 
 ; saves loaded rom bank and hl as well as de registers
-PreBattleSaveRegisters: ; 3354 (0:3354)
+PreBattleSaveRegisters:: ; 3354 (0:3354)
 	ld a, [H_LOADEDROMBANK]
 	ld [W_PBSTOREDROMBANK], a
 	ld a, h
@@ -8339,7 +8339,7 @@
 
 ; loads data of some trainer on the current map and plays pre-battle music
 ; [$cf13]: sprite ID of trainer who is engaged
-EngageMapTrainer: ; 336a (0:336a)
+EngageMapTrainer:: ; 336a (0:336a)
 	ld hl, W_MAPSPRITEEXTRADATA
 	ld d, $0
 	ld a, [$cf13]
@@ -8353,7 +8353,7 @@
 	ld [wEnemyMonAttackMod], a ; $cd2e
 	jp PlayTrainerMusic
 
-Func_3381: ; 3381 (0:3381)
+Func_3381:: ; 3381 (0:3381)
 	push hl
 	ld hl, $d72d
 	bit 7, [hl]
@@ -8380,7 +8380,7 @@
 	call Bankswitch ; indirect jump to Func_1a5e7 (1a5e7 (6:65e7))
 	jp WaitForSoundToFinish
 
-Func_33b7: ; 33b7 (0:33b7)
+Func_33b7:: ; 33b7 (0:33b7)
 	ld a, [$cf0b]
 	and a
 	jr nz, .asm_33c6
@@ -8396,16 +8396,16 @@
 	ld l, a
 	ret
 
-UnnamedText_33cf: ; 33cf (0:33cf)
+UnnamedText_33cf:: ; 33cf (0:33cf)
 	TX_FAR _UnnamedText_33cf
 	db $08
 
-Func_33d4: ; 33d4 (0:33d4)
+Func_33d4:: ; 33d4 (0:33d4)
 	call Func_33b7
 	call TextCommandProcessor
 	jp TextScriptEnd
 
-Func_33dd: ; 33dd (0:33dd)
+Func_33dd:: ; 33dd (0:33dd)
 	ld a, [wFlags_0xcd60]
 	bit 0, a
 	ret nz
@@ -8413,7 +8413,7 @@
 	xor a
 	ret
 
-PlayTrainerMusic: ; 33e8 (0:33e8)
+PlayTrainerMusic:: ; 33e8 (0:33e8)
 	ld a, [wEngagedTrainerClass]
 	cp $c8 + SONY1
 	ret z
@@ -8458,7 +8458,7 @@
 	ld [$c0ee], a
 	jp PlaySound
 
-FemaleTrainerList: ; 3434 (0:3434)
+FemaleTrainerList:: ; 3434 (0:3434)
 	db $c8+LASS
 	db $c8+JR__TRAINER_F
 	db $c8+BEAUTY
@@ -8465,7 +8465,7 @@
 	db $c8+COOLTRAINER_F
 	db $FF
 
-EvilTrainerList: ; 3439 (0:3439)
+EvilTrainerList:: ; 3439 (0:3439)
 	db $c8+JUGGLER_X
 	db $c8+GAMBLER
 	db $c8+ROCKER
@@ -8476,7 +8476,7 @@
 	db $c8+ROCKET
 	db $FF
 
-Func_3442: ; 3442 (0:3442)
+Func_3442:: ; 3442 (0:3442)
 	ld a, [hli]
 	cp $ff
 	ret z
@@ -8500,33 +8500,33 @@
 	inc hl
 	jr Func_3442
 
-FuncTX_ItemStoragePC: ; 3460 (0:3460)
+FuncTX_ItemStoragePC:: ; 3460 (0:3460)
 	call SaveScreenTilesToBuffer2
 	ld b, BANK(Func_78e6)
 	ld hl, Func_78e6
 	jr bankswitchAndContinue
 
-FuncTX_BillsPC: ; 346a (0:346a)
+FuncTX_BillsPC:: ; 346a (0:346a)
 	call SaveScreenTilesToBuffer2
 	ld b, BANK(Func_214c2)
 	ld hl, Func_214c2
 	jr bankswitchAndContinue
 
-FuncTX_SlotMachine: ; 3474 (0:3474)
+FuncTX_SlotMachine:: ; 3474 (0:3474)
 ; XXX find a better name for this function
 ; special_F7
 	ld b,BANK(CeladonPrizeMenu)
 	ld hl,CeladonPrizeMenu
-bankswitchAndContinue: ; 3479 (0:3479)
+bankswitchAndContinue:: ; 3479 (0:3479)
 	call Bankswitch
 	jp HoldTextDisplayOpen        ; continue to main text-engine function
 
-FuncTX_PokemonCenterPC: ; 347f (0:347f)
+FuncTX_PokemonCenterPC:: ; 347f (0:347f)
 	ld b, BANK(ActivatePC)
 	ld hl, ActivatePC
 	jr bankswitchAndContinue
 
-Func_3486: ; 3486 (0:3486)
+Func_3486:: ; 3486 (0:3486)
 	xor a
 	ld [$cd3b], a
 	ld [$c206], a
@@ -8534,7 +8534,7 @@
 	set 7, [hl]
 	ret
 
-IsItemInBag: ; 3493 (0:3493)
+IsItemInBag:: ; 3493 (0:3493)
 ; given an item_id in b
 ; set zero flag if item isn't in player's bag
 ; else reset zero flag
@@ -8545,18 +8545,18 @@
 	and a
 	ret
 
-DisplayPokedex: ; 349b (0:349b)
+DisplayPokedex:: ; 349b (0:349b)
 	ld [$d11e], a
 	ld b, BANK(Func_7c18)
 	ld hl, Func_7c18
 	jp Bankswitch
 
-Func_34a6: ; 34a6 (0:34a6)
+Func_34a6:: ; 34a6 (0:34a6)
 	call Func_34ae
 	ld c, $6
 	jp DelayFrames
 
-Func_34ae: ; 34ae (0:34ae)
+Func_34ae:: ; 34ae (0:34ae)
 	ld a, $9
 	ld [H_DOWNARROWBLINKCNT1], a ; $FF00+$8b
 	call Func_34fc
@@ -8564,7 +8564,7 @@
 	ld [hl], a
 	ret
 
-Func_34b9: ; 34b9 (0:34b9)
+Func_34b9:: ; 34b9 (0:34b9)
 	ld de, $fff9
 	add hl, de
 	ld [hl], a
@@ -8576,7 +8576,7 @@
 ; OUTPUT:
 ; [$cd3d] = 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:: ; 34bf (0:34bf)
 	ld a,[W_YCOORD]
 	ld b,a
 	ld a,[W_XCOORD]
@@ -8583,7 +8583,7 @@
 	ld c,a
 	; fallthrough
 
-CheckCoords: ; 34c7 (0:34c7)
+CheckCoords:: ; 34c7 (0:34c7)
 	xor a
 	ld [$cd3d],a
 .loop
@@ -8617,7 +8617,7 @@
 ; OUTPUT:
 ; [$cd3d] = 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:: ; 34e4 (0:34e4)
 	push hl
 	ld hl, $c204
 	ld a, [$ff00+$8c]
@@ -8634,13 +8634,13 @@
 	pop hl
 	jp CheckCoords
 
-Func_34fc: ; 34fc (0:34fc)
+Func_34fc:: ; 34fc (0:34fc)
 	ld h, $c1
 	jr asm_3502
 
-Func_3500: ; 3500 (0:3500)
+Func_3500:: ; 3500 (0:3500)
 	ld h, $c2
-asm_3502: ; 3502 (0:3502)
+asm_3502:: ; 3502 (0:3502)
 	ld a, [H_DOWNARROWBLINKCNT1] ; $FF00+$8b
 	ld b, a
 	ld a, [H_DOWNARROWBLINKCNT2] ; $FF00+$8c
@@ -8654,7 +8654,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:: ; 350c (0:350c)
 	xor a
 	ld [wRLEByteCount], a     ; count written bytes here
 .listLoop
@@ -8681,7 +8681,7 @@
 	ret
 
 ; sets movement byte 1 for sprite [$FF8C] to $FE and byte 2 to [$FF8D]
-SetSpriteMovementBytesToFE: ; 3533 (0:3533)
+SetSpriteMovementBytesToFE:: ; 3533 (0:3533)
 	push hl
 	call GetSpriteMovementByte1Pointer
 	ld [hl], $fe
@@ -8692,7 +8692,7 @@
 	ret
 
 ; sets both movement bytes for sprite [$FF8C] to $FF
-SetSpriteMovementBytesToFF: ; 3541 (0:3541)
+SetSpriteMovementBytesToFF:: ; 3541 (0:3541)
 	push hl
 	call GetSpriteMovementByte1Pointer
 	ld [hl],$FF
@@ -8702,7 +8702,7 @@
 	ret
 
 ; returns the sprite movement byte 1 pointer for sprite [$FF8C] in hl
-GetSpriteMovementByte1Pointer: ; 354e (0:354e)
+GetSpriteMovementByte1Pointer:: ; 354e (0:354e)
 	ld h,$C2
 	ld a,[$FF8C] ; the sprite to move
 	swap a
@@ -8711,7 +8711,7 @@
 	ret
 
 ; returns the sprite movement byte 2 pointer for sprite [$FF8C] in hl
-GetSpriteMovementByte2Pointer: ; 3558 (0:3558)
+GetSpriteMovementByte2Pointer:: ; 3558 (0:3558)
 	push de
 	ld hl,W_MAPSPRITEDATA
 	ld a,[$FF8C] ; the sprite to move
@@ -8723,7 +8723,7 @@
 	pop de
 	ret
 
-Func_3566: ; 3566 (0:3566)
+Func_3566:: ; 3566 (0:3566)
 	call Func_359e
 	ld a, [W_ISLINKBATTLE] ; $d12b
 	and a
@@ -8756,7 +8756,7 @@
 	ld [hl], d
 	ret
 
-Func_359e: ; 359e (0:359e)
+Func_359e:: ; 359e (0:359e)
 	ld b, BANK(Func_13a58)
 	ld hl, Func_13a58
 	jp Bankswitch ; indirect jump to Func_13a58 (13a58 (4:7a58))
@@ -8764,7 +8764,7 @@
 ; tests if player's money are at least as much as [$ff9f]
 ; sets carry flag if not enough money
 ; sets zero flag if amounts match exactly
-HasEnoughMoney: ; 35a6 (0:35a6)
+HasEnoughMoney:: ; 35a6 (0:35a6)
 	ld de, wPlayerMoney ; $d347
 	ld hl, $ff9f
 	ld c, $3
@@ -8773,13 +8773,13 @@
 ; tests if player's game corner coins are at least as many as [$ffa0]
 ; sets carry flag if not enough coins
 ; sets zero flag if amounts match exactly
-HasEnoughCoins: ; 35b1 (0:35b1)
+HasEnoughCoins:: ; 35b1 (0:35b1)
 	ld de, wPlayerCoins
 	ld hl, $ffa0
 	ld c, $2
 	jp StringCmp
 
-BankswitchHome: ; 35bc (0:35bc)
+BankswitchHome:: ; 35bc (0:35bc)
 ; switches to bank # in a
 ; Only use this when in the home bank!
 	ld [$CF09],a
@@ -8790,7 +8790,7 @@
 	ld [$2000],a
 	ret
 
-BankswitchBack: ; 35cd (0:35cd)
+BankswitchBack:: ; 35cd (0:35cd)
 ; returns from BankswitchHome
 	ld a,[$CF08]
 	ld [H_LOADEDROMBANK],a
@@ -8797,7 +8797,7 @@
 	ld [$2000],a
 	ret
 
-Bankswitch: ; 35d6 (0:35d6)
+Bankswitch:: ; 35d6 (0:35d6)
 ; self-contained bankswitch, use this when not in the home bank
 ; switches to the bank in b
 	ld a,[H_LOADEDROMBANK]
@@ -8817,18 +8817,18 @@
 
 ; displays yes/no choice
 ; yes -> set carry
-YesNoChoice: ; 35ec (0:35ec)
+YesNoChoice:: ; 35ec (0:35ec)
 	call SaveScreenTilesToBuffer1
 	call InitYesNoTextBoxParameters
 	jr DisplayYesNoChoice
 
-Func_35f4: ; 35f4 (0:35f4)
+Func_35f4:: ; 35f4 (0:35f4)
 	ld a, $14
 	ld [$d125], a
 	call InitYesNoTextBoxParameters
 	jp DisplayTextBoxID
 
-InitYesNoTextBoxParameters: ; 35ff (0:35ff)
+InitYesNoTextBoxParameters:: ; 35ff (0:35ff)
 	xor a
 	ld [$d12c], a
 	FuncCoord 14, 7 ; $c43a
@@ -8836,7 +8836,7 @@
 	ld bc, $80f
 	ret
 
-YesNoChoicePokeCenter: ; 360a (0:360a)
+YesNoChoicePokeCenter:: ; 360a (0:360a)
 	call SaveScreenTilesToBuffer1
 	ld a, $6
 	ld [$d12c], a
@@ -8845,7 +8845,7 @@
 	ld bc, $80c
 	jr DisplayYesNoChoice
 
-Func_361a: ; 361a (0:361a)
+Func_361a:: ; 361a (0:361a)
 	call SaveScreenTilesToBuffer1
 	ld a, $3
 	ld [$d12c], a
@@ -8852,7 +8852,7 @@
 	FuncCoord 12, 7 ; $c438
 	ld hl, Coord
 	ld bc, $080d
-DisplayYesNoChoice: ; 3628 (0:3628)
+DisplayYesNoChoice:: ; 3628 (0:3628)
 	ld a, $14
 	ld [$d125], a
 	call DisplayTextBoxID
@@ -8859,7 +8859,7 @@
 	jp LoadScreenTilesFromBuffer1
 
 ; calculates the difference |a-b|, setting carry flag if a<b
-CalcDifference: ; 3633 (0:3633)
+CalcDifference:: ; 3633 (0:3633)
 	sub b
 	ret nc
 	cpl
@@ -8867,11 +8867,11 @@
 	scf
 	ret
 
-MoveSprite: ; 363a (0:363a)
+MoveSprite:: ; 363a (0:363a)
 ; move the sprite [$FF8C] with the movement pointed to by de
 ; actually only copies the movement data to $CC5B for later
 	call SetSpriteMovementBytesToFF
-MoveSprite_: ; 363d (0:363d)
+MoveSprite_:: ; 363d (0:363d)
 	push hl
 	push bc
 	call GetSpriteMovementByte1Pointer
@@ -8903,7 +8903,7 @@
 	ld [$CD3A],a
 	ret
 
-Func_366b: ; 366b (0:366b)
+Func_366b:: ; 366b (0:366b)
 	push hl
 	ld hl, $ffe7
 	xor a
@@ -8924,7 +8924,7 @@
 	ret
 
 ; copies the tile patterns for letters and numbers into VRAM
-LoadFontTilePatterns: ; 3680 (0:3680)
+LoadFontTilePatterns:: ; 3680 (0:3680)
 	ld a,[rLCDC]
 	bit 7,a ; is the LCD enabled?
 	jr nz,.lcdEnabled
@@ -8941,7 +8941,7 @@
 	jp CopyVideoDataDouble ; if LCD is on, transfer during V-blank
 
 ; copies the text box tile patterns into VRAM
-LoadTextBoxTilePatterns: ; 36a0 (0:36a0)
+LoadTextBoxTilePatterns:: ; 36a0 (0:36a0)
 	ld a,[rLCDC]
 	bit 7,a ; is the LCD enabled?
 	jr nz,.lcdEnabled
@@ -8958,7 +8958,7 @@
 	jp CopyVideoData ; if LCD is on, transfer during V-blank
 
 ; copies HP bar and status display tile patterns into VRAM
-LoadHpBarAndStatusTilePatterns: ; 36c0 (0:36c0)
+LoadHpBarAndStatusTilePatterns:: ; 36c0 (0:36c0)
 	ld a,[rLCDC]
 	bit 7,a ; is the LCD enabled?
 	jr nz,.lcdEnabled
@@ -8976,7 +8976,7 @@
 
 ;Fills memory range with the specified byte.
 ;input registers a = fill_byte, bc = length, hl = address
-FillMemory: ; 36e0 (0:36e0)
+FillMemory:: ; 36e0 (0:36e0)
 	push de
 	ld d, a
 .loop
@@ -8991,7 +8991,7 @@
 
 ; loads sprite that de points to
 ; bank of sprite is given in a
-UncompressSpriteFromDE: ; 36eb (0:36eb)
+UncompressSpriteFromDE:: ; 36eb (0:36eb)
 	ld hl, W_SPRITEINPUTPTR
 	ld [hl], e
 	inc hl
@@ -8998,7 +8998,7 @@
 	ld [hl], d
 	jp UncompressSpriteData
 
-SaveScreenTilesToBuffer2: ; 36f4 (0:36f4)
+SaveScreenTilesToBuffer2:: ; 36f4 (0:36f4)
 	ld hl, wTileMap
 	ld de, wTileMapBackup2
 	ld bc, $168
@@ -9005,7 +9005,7 @@
 	call CopyData
 	ret
 
-LoadScreenTilesFromBuffer2: ; 3701 (0:3701)
+LoadScreenTilesFromBuffer2:: ; 3701 (0:3701)
 	call LoadScreenTilesFromBuffer2DisableBGTransfer
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
@@ -9012,7 +9012,7 @@
 	ret
 
 ; loads screen tiles stored in wTileMapBackup2 but leaves H_AUTOBGTRANSFERENABLED disabled
-LoadScreenTilesFromBuffer2DisableBGTransfer: ; 3709 (0:3709)
+LoadScreenTilesFromBuffer2DisableBGTransfer:: ; 3709 (0:3709)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
 	ld hl, wTileMapBackup2
@@ -9021,13 +9021,13 @@
 	call CopyData
 	ret
 
-SaveScreenTilesToBuffer1: ; 3719 (0:3719)
+SaveScreenTilesToBuffer1:: ; 3719 (0:3719)
 	ld hl, wTileMap
 	ld de, wTileMapBackup
 	ld bc, $168
 	jp CopyData
 
-LoadScreenTilesFromBuffer1: ; 3725 (0:3725)
+LoadScreenTilesFromBuffer1:: ; 3725 (0:3725)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
 	ld hl, wTileMapBackup
@@ -9038,7 +9038,7 @@
 	ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
 	ret
 
-DelayFrames: ; 3739 (0:3739)
+DelayFrames:: ; 3739 (0:3739)
 ; wait n frames, where n is the value in c
 	call DelayFrame
 	dec c
@@ -9045,7 +9045,7 @@
 	jr nz,DelayFrames
 	ret
 
-PlaySoundWaitForCurrent: ; 3740 (0:3740)
+PlaySoundWaitForCurrent:: ; 3740 (0:3740)
 	push af
 	call WaitForSoundToFinish
 	pop af
@@ -9052,7 +9052,7 @@
 	jp PlaySound
 
 ; Wait for sound to finish playing
-WaitForSoundToFinish: ; 3748 (0:3748)
+WaitForSoundToFinish:: ; 3748 (0:3748)
 	ld a, [$d083]
 	and $80
 	ret nz
@@ -9070,7 +9070,7 @@
 	pop hl
 	ret
 
-NamePointers: ; 375d (0:375d)
+NamePointers:: ; 375d (0:375d)
 	dw MonsterNames
 	dw MoveNames
 	dw UnusedNames
@@ -9079,7 +9079,7 @@
 	dw W_ENEMYMON1OT ; enemy's OT names list
 	dw TrainerNames
 
-GetName: ; 376b (0:376b)
+GetName:: ; 376b (0:376b)
 ; arguments:
 ; [$D0B5] = which name
 ; [$D0B6] = which list (W_LISTTYPE)
@@ -9160,7 +9160,7 @@
 	ld [$2000],a
 	ret
 
-GetItemPrice: ; 37df (0:37df)
+GetItemPrice:: ; 37df (0:37df)
 	ld a, [H_LOADEDROMBANK]
 	push af
 	ld a, [wListMenuID] ; $cf94
@@ -9204,12 +9204,12 @@
 	ret
 
 ; copies a string from [de] to [$cf4b]
-CopyStringToCF4B: ; 3826 (0:3826)
+CopyStringToCF4B:: ; 3826 (0:3826)
 	ld hl, $cf4b
 	; fall through
 
 ; copies a string from [de] to [hl]
-CopyString: ; 3829 (0:3829)
+CopyString:: ; 3829 (0:3829)
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -9232,7 +9232,7 @@
 ;    report only one button press.
 ; 3. Same as 2, but report no buttons as pressed if A or B is held down.
 ;    ([$ffb7] == 1, [$ffb6] == 0)
-GetJoypadStateLowSensitivity: ; 3831 (0:3831)
+GetJoypadStateLowSensitivity:: ; 3831 (0:3831)
 	call GetJoypadState
 	ld a,[$ffb7] ; flag
 	and a ; get all currently pressed buttons or only newly pressed buttons?
@@ -9271,7 +9271,7 @@
 	ld [H_FRAMECOUNTER],a
 	ret
 
-WaitForTextScrollButtonPress: ; 3865 (0:3865)
+WaitForTextScrollButtonPress:: ; 3865 (0:3865)
 	ld a, [H_DOWNARROWBLINKCNT1] ; $FF00+$8b
 	push af
 	ld a, [H_DOWNARROWBLINKCNT2] ; $FF00+$8c
@@ -9304,7 +9304,7 @@
 	ret
 
 ; (unlass in link battle) waits for A or B being pressed and outputs the scrolling sound effect
-ManualTextScroll: ; 3898 (0:3898)
+ManualTextScroll:: ; 3898 (0:3898)
 	ld a, [W_ISLINKBATTLE] ; $d12b
 	cp $4
 	jr z, .inLinkBattle
@@ -9322,7 +9322,7 @@
 ; FF99 = multiplier
 ; OUTPUT
 ; FF95-FF98 = product
-Multiply: ; 38ac (0:38ac)
+Multiply:: ; 38ac (0:38ac)
 	push hl
 	push bc
 	ld hl, _Multiply
@@ -9341,7 +9341,7 @@
 ; OUTPUT
 ; FF95-FF98 = quotient
 ; FF99 = remainder
-Divide: ; 38b9 (0:38b9)
+Divide:: ; 38b9 (0:38b9)
 	push hl
 	push de
 	push bc
@@ -9362,7 +9362,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 [$d730] or [$d358] flags.
-PrintLetterDelay: ; 38d3 (0:38d3)
+PrintLetterDelay:: ; 38d3 (0:38d3)
 	ld a,[$d730]
 	bit 6,a
 	ret nz
@@ -9408,7 +9408,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:: ; 3913 (0:3913)
 	ld a,[hli]
 	ld [de],a
 	inc de
@@ -9424,12 +9424,12 @@
 ; wWhichPokemon determines the pokemon.
 ; [$cf95] == 0 specifies the party.
 ; [$cf95] != 0 specifies the current box.
-RemovePokemon: ; 391f (0:391f)
+RemovePokemon:: ; 391f (0:391f)
 	ld hl, _RemovePokemon
 	ld b, BANK(_RemovePokemon)
 	jp Bankswitch
 
-AddPokemonToParty: ; 3927 (0:3927)
+AddPokemonToParty:: ; 3927 (0:3927)
 	push hl
 	push de
 	push bc
@@ -9442,7 +9442,7 @@
 	ret
 
 ; calculates all 5 stats of current mon and writes them to [de]
-CalcStats: ; 3936 (0:3936)
+CalcStats:: ; 3936 (0:3936)
 	ld c, $0
 .statsLoop
 	inc c
@@ -9462,7 +9462,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:: ; 394a (0:394a)
 	push hl
 	push de
 	push bc
@@ -9641,7 +9641,7 @@
 	pop hl
 	ret
 
-AddEnemyMonToPlayerParty: ; 3a53 (0:3a53)
+AddEnemyMonToPlayerParty:: ; 3a53 (0:3a53)
 	ld a, [H_LOADEDROMBANK]
 	push af
 	ld a, BANK(_AddEnemyMonToPlayerParty)
@@ -9654,7 +9654,7 @@
 	ld [$2000], a
 	ret
 
-Func_3a68: ; 3a68 (0:3a68)
+Func_3a68:: ; 3a68 (0:3a68)
 	ld a, [H_LOADEDROMBANK]
 	push af
 	ld a, BANK(Func_f51e)
@@ -9669,7 +9669,7 @@
 
 ; skips a text entries, each of size $b (like trainer name, OT name, rival name, ...)
 ; hl: base pointer, will be incremented by $b * a
-SkipFixedLengthTextEntries: ; 3a7d (0:3a7d)
+SkipFixedLengthTextEntries:: ; 3a7d (0:3a7d)
 	and a
 	ret z
 	ld bc, $b
@@ -9679,7 +9679,7 @@
 	jr nz, .skipLoop
 	ret
 
-AddNTimes: ; 3a87 (0:3a87)
+AddNTimes:: ; 3a87 (0:3a87)
 ; add bc to hl a times
 	and a
 	ret z
@@ -9691,7 +9691,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:: ; 3a8e (0:3a8e)
 	ld a,[de]
 	cp [hl]
 	ret nz
@@ -9706,7 +9706,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:: ; 3a97 (0:3a97)
 	ld h,$c3
 	swap a ; multiply by 16
 	ld l,a
@@ -9738,11 +9738,11 @@
 	ld [hli],a
 	ret
 
-HandleMenuInput: ; 3abe (0:3abe)
+HandleMenuInput:: ; 3abe (0:3abe)
 	xor a
 	ld [$d09b],a
 
-HandleMenuInputPokemonSelection: ; 3ac2 (0:3ac2)
+HandleMenuInputPokemonSelection:: ; 3ac2 (0:3ac2)
 	ld a,[H_DOWNARROWBLINKCNT1]
 	push af
 	ld a,[H_DOWNARROWBLINKCNT2]
@@ -9859,7 +9859,7 @@
 	jr z,.checkOtherKeys
 	jr .checkIfAButtonOrBButtonPressed
 
-PlaceMenuCursor: ; 3b7c (0:3b7c)
+PlaceMenuCursor:: ; 3b7c (0:3b7c)
 	ld a,[wTopMenuItemY]
 	and a ; is the y coordinate 0?
 	jr z,.adjustForXCoord
@@ -9938,7 +9938,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:: ; 3bec (0:3bec)
 	ld b,a
 	ld a,[wMenuCursorLocation]
 	ld l,a
@@ -9949,7 +9949,7 @@
 	ret
 
 ; Replaces the menu cursor with a blank space.
-EraseMenuCursor: ; 3bf9 (0:3bf9)
+EraseMenuCursor:: ; 3bf9 (0:3bf9)
 	ld a,[wMenuCursorLocation]
 	ld l,a
 	ld a,[wMenuCursorLocation + 1]
@@ -9965,7 +9965,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:: ; 3c04 (0:3c04)
 	ld a,[hl]
 	ld b,a
 	ld a,$ee ; down arrow
@@ -10010,20 +10010,20 @@
 ; text boxes by DisplayTextID. Both functions cause DisplayTextID to wait
 ; for a button press after displaying text (unless [$cc47] is set).
 
-EnableAutoTextBoxDrawing: ; 3c3c (0:3c3c)
+EnableAutoTextBoxDrawing:: ; 3c3c (0:3c3c)
 	xor a
 	jr AutoTextBoxDrawingCommon
 
-DisableAutoTextBoxDrawing: ; 3c3f (0:3c3f)
+DisableAutoTextBoxDrawing:: ; 3c3f (0:3c3f)
 	ld a,$01
 
-AutoTextBoxDrawingCommon: ; 3c41 (0:3c41)
+AutoTextBoxDrawingCommon:: ; 3c41 (0:3c41)
 	ld [$cf0c],a ; control text box drawing
 	xor a
 	ld [$cc3c],a ; make DisplayTextID wait for button press
 	ret
 
-PrintText: ; 3c49 (0:3c49)
+PrintText:: ; 3c49 (0:3c49)
 ; given a pointer in hl, print the text there
 	push hl
 	ld a,1
@@ -10032,7 +10032,7 @@
 	call UpdateSprites
 	call Delay3
 	pop hl
-Func_3c59: ; 3c59 (0:3c59)
+Func_3c59:: ; 3c59 (0:3c59)
 	FuncCoord 1,14
 	ld bc,Coord ;$C4B9
 	jp TextCommandProcessor
@@ -10048,7 +10048,7 @@
 ; bits 0-3: number of bytes (only 1 - 3 bytes supported)
 ; c = number of decimal digits
 ; de = address of the number (big-endian)
-PrintNumber: ; 3c5f (0:3c5f)
+PrintNumber:: ; 3c5f (0:3c5f)
 	push bc
 	xor a
 	ld [H_PASTLEADINGZEROES],a
@@ -10181,7 +10181,7 @@
 ; The last value that the number had before becoming negative is kept as the new value of the number.
 ; A more succinct description is that the number is divided by a power of ten
 ; and the quotient becomes the digit while the remainder is stored as the new value of the number.
-PrintNumber_PrintDigit: ; 3d25 (0:3d25)
+PrintNumber_PrintDigit:: ; 3d25 (0:3d25)
 	ld c,0 ; counts number of loop iterations to determine the decimal digit
 .loop
 	ld a,[H_POWEROFTEN]
@@ -10251,7 +10251,7 @@
 	ret
 
 ; prints a leading zero unless they are turned off in the flags
-PrintNumber_PrintLeadingZero: ; 3d83 (0:3d83)
+PrintNumber_PrintLeadingZero:: ; 3d83 (0:3d83)
 	bit 7,d ; print leading zeroes?
 	ret z
 	ld [hl],"0"
@@ -10259,7 +10259,7 @@
 
 ; increments the pointer unless leading zeroes are not being printed,
 ; the number is left-aligned, and no nonzero digits have been printed yet
-PrintNumber_AdvancePointer: ; 3d89 (0:3d89)
+PrintNumber_AdvancePointer:: ; 3d89 (0:3d89)
 	bit 7,d ; print leading zeroes?
 	jr nz,.incrementPointer
 	bit 6,d ; left alignment or right alignment?
@@ -10275,7 +10275,7 @@
 ; INPUT:
 ; a = index within table
 ; hl = address of function pointer table
-CallFunctionInTable: ; 3d97 (0:3d97)
+CallFunctionInTable:: ; 3d97 (0:3d97)
 	push hl
 	push de
 	push bc
@@ -10298,11 +10298,11 @@
 ; searches an array at hl for the value in a.
 ; skips (de − 1) bytes between reads, so to check every byte, de should be 1.
 ; if found, returns count in b and sets carry.
-IsInArray: ; 3dab (0:3dab)
+IsInArray:: ; 3dab (0:3dab)
 	ld b,0
 	; fall through
 
-IsInArrayCummulativeCount: ; 3dad (0:3dad)
+IsInArrayCummulativeCount:: ; 3dad (0:3dad)
 	ld c,a
 .loop
 	ld a,[hl]
@@ -10320,7 +10320,7 @@
 	scf
 	ret
 
-Func_3dbe: ; 3dbe (0:3dbe)
+Func_3dbe:: ; 3dbe (0:3dbe)
 	call CleanLCD_OAM
 	ld a, $1
 	ld [$cfcb], a
@@ -10331,16 +10331,16 @@
 	jr Delay3
 
 ; calls GBPalWhiteOut and then Delay3
-GBPalWhiteOutWithDelay3: ; 3dd4 (0:3dd4)
+GBPalWhiteOutWithDelay3:: ; 3dd4 (0:3dd4)
 	call GBPalWhiteOut
 
-Delay3: ; 3dd7 (0:3dd7)
+Delay3:: ; 3dd7 (0:3dd7)
 ; call Delay with a parameter of 3
 	ld c,3
 	jp DelayFrames
 
 ; resets BGP and OBP0 to their usual colors
-GBPalNormal: ; 3ddc (0:3ddc)
+GBPalNormal:: ; 3ddc (0:3ddc)
 	ld a,%11100100
 	ld [rBGP],a
 	ld a,%11010000
@@ -10348,7 +10348,7 @@
 	ret
 
 ; makes all palette colors white
-GBPalWhiteOut: ; 3de5 (0:3de5)
+GBPalWhiteOut:: ; 3de5 (0:3de5)
 	xor a
 	ld [rBGP],a
 	ld [rOBP0],a
@@ -10355,9 +10355,9 @@
 	ld [rOBP1],a
 	ret
 
-GoPAL_SET_CF1C: ; 3ded (0:3ded)
+GoPAL_SET_CF1C:: ; 3ded (0:3ded)
 	ld b,$ff
-GoPAL_SET: ; 3def (0:3def)
+GoPAL_SET:: ; 3def (0:3def)
 	ld a,[$cf1b]
 	and a
 	ret z
@@ -10364,7 +10364,7 @@
 	ld a,$45
 	jp Predef
 
-Func_3df9: ; 3df9 (0:3df9)
+Func_3df9:: ; 3df9 (0:3df9)
 	ld a, e
 	cp $1b
 	ld d, $0
@@ -10377,7 +10377,7 @@
 	ld [hl], d
 	ret
 
-Func_3e08: ; 3e08 (0:3e08)
+Func_3e08:: ; 3e08 (0:3e08)
 	ld hl, $cfc4
 	ld a, [hl]
 	push af
@@ -10397,7 +10397,7 @@
 	call LoadFontTilePatterns
 	jp UpdateSprites
 
-GiveItem: ; 3e2e (0:3e2e)
+GiveItem:: ; 3e2e (0:3e2e)
 ; Give player quantity c of item b, and copy item name to $cf4b.
 ; Set carry on success. If no room in bag, reset carry.
 	ld a, b
@@ -10413,7 +10413,7 @@
 	scf
 	ret
 
-GivePokemon: ; 3e48 (0:3e48)
+GivePokemon:: ; 3e48 (0:3e48)
 	ld a, b
 	ld [$cf91], a
 	ld a, c
@@ -10424,7 +10424,7 @@
 	ld hl, Func_4fda5
 	jp Bankswitch
 
-GenRandom: ; 3e5c (0:3e5c)
+GenRandom:: ; 3e5c (0:3e5c)
 ; store a random 8-bit value in a
 	push hl
 	push de
@@ -10438,7 +10438,7 @@
 	pop hl
 	ret
 
-Predef: ; 3e6d (0:3e6d)
+Predef:: ; 3e6d (0:3e6d)
 ; runs a predefined ASM command, where the command ID is read from $D0B7
 ; $3E6D grabs the ath pointer from PredefPointers and executes it
 
@@ -10471,7 +10471,7 @@
 
 ;loads hl from cc4f, de from cc51, and bc from cc53
 
-Load16BitRegisters: ; 3e94 (0:3e94)
+Load16BitRegisters:: ; 3e94 (0:3e94)
 	ld a, [$cc4f]
 	ld h, a
 	ld a, [$cc50]
@@ -10486,12 +10486,12 @@
 	ld c, a
 	ret
 
-Func_3ead: ; 3ead (0:3ead)
+Func_3ead:: ; 3ead (0:3ead)
 	ld b, BANK(Func_1eb0a)
 	ld hl, Func_1eb0a
 	jp Bankswitch ; indirect jump to Func_1eb0a (1eb0a (7:6b0a))
 
-Func_3eb5: ; 3eb5 (0:3eb5)
+Func_3eb5:: ; 3eb5 (0:3eb5)
 	ld a, [H_LOADEDROMBANK]
 	push af
 	ld a, [H_CURRENTPRESSEDBUTTONS]
@@ -10528,7 +10528,7 @@
 	ld [H_LOADEDROMBANK], a
 	ret
 
-Func_3ef5: ; 3ef5 (0:3ef5)
+Func_3ef5:: ; 3ef5 (0:3ef5)
 	ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c
 	ld hl, PointerTable_3f22
 	call Func_3f0f
@@ -10536,7 +10536,7 @@
 	set 0, [hl]
 	call DisplayTextID
 
-Func_3f05: ; 3f05 (0:3f05)
+Func_3f05:: ; 3f05 (0:3f05)
 	ld hl, W_MAPTEXTPTR ; $d36c
 	ld a, [$FF00+$ec]
 	ld [hli], a
@@ -10544,7 +10544,7 @@
 	ld [hl], a
 	ret
 
-Func_3f0f: ; 3f0f (0:3f0f)
+Func_3f0f:: ; 3f0f (0:3f0f)
 	ld a, [W_MAPTEXTPTR] ; $d36c
 	ld [$FF00+$ec], a
 	ld a, [$d36d]
@@ -10555,7 +10555,7 @@
 	ld [$d36d], a
 	ret
 
-PointerTable_3f22: ; 3f22 (0:3f22)
+PointerTable_3f22:: ; 3f22 (0:3f22)
 	dw CardKeySuccessText                   ; id = 01
 	dw CardKeyFailText                      ; id = 02
 	dw Route15UpstairsLeftBinoculars        ; id = 03
@@ -53255,7 +53255,7 @@
 	jp Func_3a8e1
 
 ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon)
-PokeballTileGraphics: ; 3a97e (e:697e)
+PokeballTileGraphics:: ; 3a97e (e:697e)
 	INCBIN "gfx/pokeball.2bpp"
 
 ; tiles for gameboy and link cable graphics used for trading sequence animation
@@ -103423,7 +103423,7 @@
 	dw $B188
 	dw $B5EA
 
-Func_738a1: ; 738a1 (1c:78a1)
+Func_738a1:: ; 738a1 (1c:78a1)
 	ld hl, UnnamedText_73909 ; $7909
 	call PrintText
 	call YesNoChoice
--- a/menu/pc.asm
+++ b/menu/pc.asm
@@ -1,5 +1,5 @@
 
-Func_213c8: ; 213c8 (8:53c8)
+Func_213c8:: ; 213c8 (8:53c8)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
 	call SaveScreenTilesToBuffer2
@@ -115,8 +115,8 @@
 LogOffPCText: ; 214ba (8:54ba)
 	db "LOG OFF@"
 
-Func_214c2: ; 214c2 (8:54c2)
-BillsPC_: ; 0x214c2
+Func_214c2:: ; 214c2 (8:54c2)
+BillsPC_:: ; 0x214c2
 	ld hl, $d730
 	set 6, [hl]
 	xor a
@@ -374,7 +374,7 @@
 BoxNoPCText: ; 21713 (8:5713)
 	db "BOX No.@"
 
-Func_2171b: ; 2171b (8:571b)
+Func_2171b:: ; 2171b (8:571b)
 	ld hl, $d173
 	ld bc, $002c
 	jr .asm_21729 ; 0x21721 $6
@@ -536,7 +536,7 @@
 	TX_FAR _MonWasReleasedText
 	db "@"
 
-Func_21825: ; 5824 (8:5825)
+Func_21825:: ; 5824 (8:5825)
 	ld a, [$ff00+$aa]
 	cp $1
 	ret z
@@ -554,7 +554,7 @@
 	ld a, $22
 	jp Func_3ef5
 
-Func_21845: ; 5845 (8:5845)
+Func_21845:: ; 5845 (8:5845)
 	ld a, [$ff00+$aa]
 	cp $2
 	ret z
@@ -572,7 +572,7 @@
 	ld a, $22
 	jp Func_3ef5
 
-UnnamedText_21865: ; 21865 (8:5865)
+UnnamedText_21865:: ; 21865 (8:5865)
 	TX_FAR _UnnamedText_21865
 	db "@"
 
@@ -583,6 +583,6 @@
 	ld a, $23
 	jp Func_3ef5
 
-Unknown_21878: ; 21878 (8:5878)
+Unknown_21878:: ; 21878 (8:5878)
 	db $FD
 
--- a/music/bikeriding.asm
+++ b/music/bikeriding.asm
@@ -1,4 +1,4 @@
-Music_BikeRiding_Ch1: ; 7dbbb (1f:5bbb)
+Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb)
 	tempo 0, 144
 	stereopanning 119
 	duty 3
@@ -7,7 +7,7 @@
 	octave 3
 	note G_, 2
 
-Music_BikeRiding_branch_7dbc9:
+Music_BikeRiding_branch_7dbc9::
 	octave 4
 	note C_, 4
 	note D_, 4
@@ -153,7 +153,7 @@
 	loopchannel 0, Music_BikeRiding_branch_7dbc9
 
 
-Music_BikeRiding_Ch2: ; 7dc6c (1f:5c6c)
+Music_BikeRiding_Ch2:: ; 7dc6c (1f:5c6c)
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 3
@@ -160,7 +160,7 @@
 	octave 4
 	note C_, 2
 
-Music_BikeRiding_branch_7dc75:
+Music_BikeRiding_branch_7dc75::
 	note E_, 4
 	note F_, 4
 	note G_, 4
@@ -302,11 +302,11 @@
 	loopchannel 0, Music_BikeRiding_branch_7dc75
 
 
-Music_BikeRiding_Ch3: ; 7dd14 (1f:5d14)
+Music_BikeRiding_Ch3:: ; 7dd14 (1f:5d14)
 	notetype 12, 1, 3
 	rest 2
 
-Music_BikeRiding_branch_7dd17:
+Music_BikeRiding_branch_7dd17::
 	octave 4
 	note C_, 1
 	rest 1
@@ -643,11 +643,11 @@
 	loopchannel 0, Music_BikeRiding_branch_7dd17
 
 
-Music_BikeRiding_Ch4: ; 7de68 (1f:5e68)
+Music_BikeRiding_Ch4:: ; 7de68 (1f:5e68)
 	dspeed 12
 	rest 2
 
-Music_BikeRiding_branch_7de6a:
+Music_BikeRiding_branch_7de6a::
 	callchannel Music_BikeRiding_branch_7dea7
 	callchannel Music_BikeRiding_branch_7deb4
 	callchannel Music_BikeRiding_branch_7dea7
@@ -669,7 +669,7 @@
 	callchannel Music_BikeRiding_branch_7dea7
 	loopchannel 0, Music_BikeRiding_branch_7de6a
 
-Music_BikeRiding_branch_7dea7:
+Music_BikeRiding_branch_7dea7::
 	rest 2
 	dnote 2, triangle3
 	rest 2
@@ -680,7 +680,7 @@
 	dnote 2, triangle3
 	endchannel
 
-Music_BikeRiding_branch_7deb4:
+Music_BikeRiding_branch_7deb4::
 	rest 2
 	dnote 2, triangle3
 	rest 2
@@ -691,7 +691,7 @@
 	dnote 2, triangle3
 	endchannel
 
-Music_BikeRiding_branch_7dec2:
+Music_BikeRiding_branch_7dec2::
 	rest 2
 	dnote 2, triangle3
 	rest 2
--- a/music/celadon.asm
+++ b/music/celadon.asm
@@ -1,4 +1,4 @@
-Music_Celadon_Ch1: ; b6c7 (2:76c7)
+Music_Celadon_Ch1:: ; b6c7 (2:76c7)
 	tempo 0, 144
 	stereopanning 119
 	duty 3
@@ -8,7 +8,7 @@
 	octave 3
 	note D_, 8
 
-Music_Celadon_branch_b6d4:
+Music_Celadon_branch_b6d4::
 	duty 2
 	notetype 12, 11, 2
 	note G_, 4
@@ -107,7 +107,7 @@
 	loopchannel 0, Music_Celadon_branch_b6d4
 
 
-Music_Celadon_Ch2: ; b73a (2:773a)
+Music_Celadon_Ch2:: ; b73a (2:773a)
 	duty 3
 	notetype 12, 12, 2
 	octave 4
@@ -122,7 +122,7 @@
 	notetype 12, 10, 0
 	note A_, 8
 
-Music_Celadon_branch_b74a:
+Music_Celadon_branch_b74a::
 	duty 2
 	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:: ; b7b5 (2:77b5)
 	notetype 12, 1, 3
 	rest 8
 	octave 5
@@ -239,7 +239,7 @@
 	note F#, 1
 	note G_, 1
 
-Music_Celadon_branch_b7c1:
+Music_Celadon_branch_b7c1::
 	octave 4
 	note D_, 2
 	note B_, 2
--- a/music/cinnabar.asm
+++ b/music/cinnabar.asm
@@ -1,4 +1,4 @@
-Music_Cinnabar_Ch1: ; b86d (2:786d)
+Music_Cinnabar_Ch1:: ; b86d (2:786d)
 	tempo 0, 144
 	stereopanning 119
 	duty 3
@@ -5,7 +5,7 @@
 	vibrato 12, 3, 4
 	togglecall
 
-Music_Cinnabar_branch_b878:
+Music_Cinnabar_branch_b878::
 	notetype 12, 11, 5
 	rest 4
 	octave 3
@@ -85,11 +85,11 @@
 	loopchannel 0, Music_Cinnabar_branch_b878
 
 
-Music_Cinnabar_Ch2: ; b8d4 (2:78d4)
+Music_Cinnabar_Ch2:: ; b8d4 (2:78d4)
 	duty 3
 	vibrato 10, 2, 3
 
-Music_Cinnabar_branch_b8d9:
+Music_Cinnabar_branch_b8d9::
 	notetype 12, 12, 7
 	octave 3
 	note G_, 6
@@ -179,10 +179,10 @@
 	loopchannel 0, Music_Cinnabar_branch_b8d9
 
 
-Music_Cinnabar_Ch3: ; b93d (2:793d)
+Music_Cinnabar_Ch3:: ; b93d (2:793d)
 	notetype 12, 1, 0
 
-Music_Cinnabar_branch_b93f:
+Music_Cinnabar_branch_b93f::
 	octave 4
 	note G_, 1
 	rest 3
--- a/music/cinnabarmansion.asm
+++ b/music/cinnabarmansion.asm
@@ -1,10 +1,10 @@
-Music_CinnabarMansion_Ch1: ; 7ed0f (1f:6d0f)
+Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f)
 	tempo 0, 144
 	stereopanning 119
 	vibrato 11, 2, 5
 	duty 2
 
-Music_CinnabarMansion_branch_7ed19:
+Music_CinnabarMansion_branch_7ed19::
 	notetype 12, 6, 2
 	octave 5
 	note E_, 1
@@ -38,21 +38,21 @@
 	loopchannel 0, Music_CinnabarMansion_branch_7ed19
 
 
-Music_CinnabarMansion_Ch2: ; 7ed40 (1f:6d40)
+Music_CinnabarMansion_Ch2:: ; 7ed40 (1f:6d40)
 	duty 2
 	togglecall
 	vibrato 10, 2, 4
 	notetype 12, 12, 2
 
-Music_CinnabarMansion_branch_7ed48:
+Music_CinnabarMansion_branch_7ed48::
 	rest 16
 	rest 16
 	loopchannel 4, Music_CinnabarMansion_branch_7ed48
 
-Music_CinnabarMansion_branch_7ed4e:
+Music_CinnabarMansion_branch_7ed4e::
 	notetype 12, 12, 2
 
-Music_CinnabarMansion_branch_7ed50:
+Music_CinnabarMansion_branch_7ed50::
 	callchannel Music_CinnabarMansion_branch_7ed6c
 	loopchannel 3, Music_CinnabarMansion_branch_7ed50
 	octave 3
@@ -74,7 +74,7 @@
 	note D#, 4
 	loopchannel 0, Music_CinnabarMansion_branch_7ed4e
 
-Music_CinnabarMansion_branch_7ed6c:
+Music_CinnabarMansion_branch_7ed6c::
 	octave 3
 	note E_, 4
 	note D#, 4
@@ -95,10 +95,10 @@
 	endchannel
 
 
-Music_CinnabarMansion_Ch3: ; 7ed7e (1f:6d7e)
+Music_CinnabarMansion_Ch3:: ; 7ed7e (1f:6d7e)
 	notetype 12, 1, 1
 
-Music_CinnabarMansion_branch_7ed80:
+Music_CinnabarMansion_branch_7ed80::
 	octave 2
 	note B_, 2
 	rest 2
@@ -143,7 +143,7 @@
 	loopchannel 0, Music_CinnabarMansion_branch_7ed80
 
 
-Music_CinnabarMansion_Ch4: ; 7edb0 (1f:6db0)
+Music_CinnabarMansion_Ch4:: ; 7edb0 (1f:6db0)
 	dspeed 6
 	rest 16
 	rest 16
@@ -150,7 +150,7 @@
 	rest 16
 	rest 16
 
-Music_CinnabarMansion_branch_7edb5:
+Music_CinnabarMansion_branch_7edb5::
 	dnote 2, cymbal1
 	dnote 2, cymbal1
 	dnote 4, cymbal2
--- a/music/cities1.asm
+++ b/music/cities1.asm
@@ -1,16 +1,16 @@
-Music_Cities1_branch_aa6f:
+Music_Cities1_branch_aa6f::
 	tempo 0, 232
 	loopchannel 0, Music_Cities1_branch_aa79
 
-Music_Cities1_Ch1: ; aa76 (2:6a76)
+Music_Cities1_Ch1:: ; aa76 (2:6a76)
 	tempo 0, 144
 
-Music_Cities1_branch_aa79:
+Music_Cities1_branch_aa79::
 	stereopanning 119
 	vibrato 8, 2, 4
 	duty 3
 
-Music_Cities1_branch_aa80:
+Music_Cities1_branch_aa80::
 	notetype 12, 12, 5
 	octave 3
 	note G#, 4
@@ -143,7 +143,7 @@
 	note B_, 2
 	octave 3
 
-Music_Cities1_branch_ab12:
+Music_Cities1_branch_ab12::
 	note C#, 2
 	note D#, 2
 	note C#, 2
@@ -242,7 +242,7 @@
 	note F#, 2
 	loopchannel 0, Music_Cities1_branch_aa80
 
-Music_Cities1_branch_ab7d:
+Music_Cities1_branch_ab7d::
 	octave 3
 	note F#, 2
 	note D#, 4
@@ -257,7 +257,7 @@
 	note C#, 2
 	endchannel
 
-Music_Cities1_branch_ab8a:
+Music_Cities1_branch_ab8a::
 	note A_, 2
 	note E_, 2
 	note C#, 2
@@ -268,7 +268,7 @@
 	endchannel
 
 
-Music_Cities1_Ch2: ; ab92 (2:6b92)
+Music_Cities1_Ch2:: ; ab92 (2:6b92)
 	vibrato 5, 1, 5
 	callchannel Music_Cities1_branch_ac00
 	octave 4
@@ -359,7 +359,7 @@
 	note A_, 1
 	loopchannel 0, Music_Cities1_Ch2
 
-Music_Cities1_branch_ac00:
+Music_Cities1_branch_ac00::
 	duty 2
 	notetype 12, 12, 3
 	octave 4
@@ -401,11 +401,11 @@
 	endchannel
 
 
-Music_Cities1_Ch3: ; ac32 (2:6c32)
+Music_Cities1_Ch3:: ; ac32 (2:6c32)
 	notetype 12, 1, 1
 	togglecall
 
-Music_Cities1_branch_ac35:
+Music_Cities1_branch_ac35::
 	vibrato 0, 0, 0
 	octave 4
 	callchannel Music_Cities1_branch_acc5
@@ -532,7 +532,7 @@
 	note F#, 2
 	loopchannel 0, Music_Cities1_branch_ac35
 
-Music_Cities1_branch_acc5:
+Music_Cities1_branch_acc5::
 	rest 2
 	note E_, 2
 	note F#, 2
@@ -543,7 +543,7 @@
 	note G#, 2
 	endchannel
 
-Music_Cities1_branch_acce:
+Music_Cities1_branch_acce::
 	note A_, 2
 	note F#, 2
 	note G#, 2
@@ -579,11 +579,11 @@
 	endchannel
 
 
-Music_Cities1_Ch4: ; acef (2:6cef)
+Music_Cities1_Ch4:: ; acef (2:6cef)
 	dspeed 12
 	callchannel Music_Cities1_branch_ad36
 
-Music_Cities1_branch_acf3:
+Music_Cities1_branch_acf3::
 	callchannel Music_Cities1_branch_ad36
 	callchannel Music_Cities1_branch_ad45
 	callchannel Music_Cities1_branch_ad45
@@ -611,7 +611,7 @@
 	dnote 4, snare6
 	loopchannel 0, Music_Cities1_Ch4
 
-Music_Cities1_branch_ad36:
+Music_Cities1_branch_ad36::
 	dnote 6, snare6
 	dnote 6, snare6
 	dnote 4, snare6
@@ -621,7 +621,7 @@
 	dnote 2, snare6
 	endchannel
 
-Music_Cities1_branch_ad45:
+Music_Cities1_branch_ad45::
 	dnote 6, snare6
 	dnote 6, snare6
 	dnote 4, snare6
@@ -630,7 +630,7 @@
 	dnote 4, snare6
 	endchannel
 
-Music_Cities1_branch_ad52:
+Music_Cities1_branch_ad52::
 	dnote 6, triangle1
 	dnote 6, triangle1
 	dnote 4, triangle2
@@ -639,7 +639,7 @@
 	dnote 4, triangle2
 	endchannel
 
-Music_Cities1_branch_ad5f:
+Music_Cities1_branch_ad5f::
 	dnote 6, triangle1
 	dnote 6, triangle1
 	dnote 4, triangle2
@@ -649,7 +649,7 @@
 	dnote 2, triangle1
 	endchannel
 
-Music_Cities1_branch_ad6e:
+Music_Cities1_branch_ad6e::
 	dnote 6, triangle1
 	dnote 6, triangle1
 	dnote 2, triangle2
--- a/music/cities2.asm
+++ b/music/cities2.asm
@@ -1,4 +1,4 @@
-Music_Cities2_Ch1: ; b504 (2:7504)
+Music_Cities2_Ch1:: ; b504 (2:7504)
 	tempo 0, 148
 	stereopanning 119
 	duty 3
@@ -15,7 +15,7 @@
 	note B_, 2
 	rest 14
 
-Music_Cities2_branch_b51a:
+Music_Cities2_branch_b51a::
 	octave 3
 	note B_, 4
 	octave 4
@@ -94,7 +94,7 @@
 	loopchannel 0, Music_Cities2_branch_b51a
 
 
-Music_Cities2_Ch2: ; b569 (2:7569)
+Music_Cities2_Ch2:: ; b569 (2:7569)
 	duty 3
 	vibrato 8, 2, 3
 	notetype 12, 12, 2
@@ -124,7 +124,7 @@
 	note G#, 1
 	note A_, 1
 
-Music_Cities2_branch_b58b:
+Music_Cities2_branch_b58b::
 	notetype 12, 10, 6
 	note G#, 6
 	notetype 12, 12, 2
@@ -280,7 +280,7 @@
 	loopchannel 0, Music_Cities2_branch_b58b
 
 
-Music_Cities2_Ch3: ; b640 (2:7640)
+Music_Cities2_Ch3:: ; b640 (2:7640)
 	notetype 12, 1, 1
 	rest 16
 	octave 4
@@ -293,7 +293,7 @@
 	note E_, 2
 	note G#, 2
 
-Music_Cities2_branch_b64c:
+Music_Cities2_branch_b64c::
 	note F#, 2
 	note A_, 2
 	note F#, 2
--- a/music/credits.asm
+++ b/music/credits.asm
@@ -1,4 +1,4 @@
-Music_Credits_Ch1: ; 7fc1f (1f:7c1f)
+Music_Credits_Ch1:: ; 7fc1f (1f:7c1f)
 	tempo 0, 140
 	stereopanning 119
 	duty 3
@@ -284,7 +284,7 @@
 	endchannel
 
 
-Music_Credits_Ch2: ; 7fd5f (1f:7d5f)
+Music_Credits_Ch2:: ; 7fd5f (1f:7d5f)
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 5
@@ -574,7 +574,7 @@
 	endchannel
 
 
-Music_Credits_Ch3: ; 7fec2 (1f:7ec2)
+Music_Credits_Ch3:: ; 7fec2 (1f:7ec2)
 	notetype 12, 1, 0
 	octave 5
 	note C#, 6
@@ -717,7 +717,7 @@
 	rest 7
 	endchannel
 
-Music_Credits_branch_7ffa4:
+Music_Credits_branch_7ffa4::
 	octave 4
 	note E_, 2
 	note A_, 2
@@ -729,7 +729,7 @@
 	note A_, 2
 	endchannel
 
-Music_Credits_branch_7ffae:
+Music_Credits_branch_7ffae::
 	octave 4
 	note D_, 2
 	note G_, 2
@@ -741,7 +741,7 @@
 	note G_, 2
 	endchannel
 
-Music_Credits_branch_7ffb8:
+Music_Credits_branch_7ffb8::
 	note G_, 2
 	note B_, 2
 	note G_, 2
@@ -752,7 +752,7 @@
 	note B_, 2
 	endchannel
 
-Music_Credits_branch_7ffc1:
+Music_Credits_branch_7ffc1::
 	octave 4
 	note A_, 2
 	octave 5
@@ -771,7 +771,7 @@
 	note C#, 2
 	endchannel
 
-Music_Credits_branch_7ffd2:
+Music_Credits_branch_7ffd2::
 	note D_, 2
 	note A_, 2
 	note D_, 2
@@ -782,7 +782,7 @@
 	note A_, 2
 	endchannel
 
-Music_Credits_branch_7ffdb:
+Music_Credits_branch_7ffdb::
 	note E_, 2
 	note G#, 2
 	note E_, 2
@@ -793,7 +793,7 @@
 	note G#, 2
 	endchannel
 
-Music_Credits_branch_7ffe4:
+Music_Credits_branch_7ffe4::
 	note E_, 2
 	note B_, 2
 	note E_, 2
@@ -804,7 +804,7 @@
 	note B_, 2
 	endchannel
 
-Music_Credits_branch_7ffed:
+Music_Credits_branch_7ffed::
 	note A_, 1
 	rest 1
 	note A_, 1
--- a/music/defeatedgymleader.asm
+++ b/music/defeatedgymleader.asm
@@ -1,4 +1,4 @@
-Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad)
+Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad)
 	tempo 0, 112
 	stereopanning 119
 	duty 3
@@ -20,7 +20,7 @@
 	notetype 12, 10, 7
 	note A_, 8
 
-Music_DefeatedGymLeader_branch_23ccc:
+Music_DefeatedGymLeader_branch_23ccc::
 	notetype 12, 11, 2
 	octave 3
 	note A_, 2
@@ -162,7 +162,7 @@
 	loopchannel 0, Music_DefeatedGymLeader_branch_23ccc
 
 
-Music_DefeatedGymLeader_Ch2: ; 23d6d (8:7d6d)
+Music_DefeatedGymLeader_Ch2:: ; 23d6d (8:7d6d)
 	duty 2
 	vibrato 24, 2, 4
 	notetype 12, 12, 4
@@ -181,7 +181,7 @@
 	notetype 12, 11, 7
 	note F#, 8
 
-Music_DefeatedGymLeader_branch_23d84:
+Music_DefeatedGymLeader_branch_23d84::
 	notetype 12, 12, 2
 	octave 4
 	note D_, 2
@@ -352,7 +352,7 @@
 	loopchannel 0, Music_DefeatedGymLeader_branch_23d84
 
 
-Music_DefeatedGymLeader_Ch3: ; 23e52 (8:7e52)
+Music_DefeatedGymLeader_Ch3:: ; 23e52 (8:7e52)
 	notetype 12, 1, 0
 	vibrato 16, 1, 2
 	octave 4
@@ -370,7 +370,7 @@
 	note D_, 1
 	note F#, 8
 
-Music_DefeatedGymLeader_branch_23e65:
+Music_DefeatedGymLeader_branch_23e65::
 	octave 4
 	note F#, 1
 	rest 1
--- a/music/defeatedtrainer.asm
+++ b/music/defeatedtrainer.asm
@@ -1,4 +1,4 @@
-Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53)
+Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53)
 	tempo 0, 224
 	stereopanning 119
 	duty 2
@@ -21,7 +21,7 @@
 	duty 1
 	tempo 0, 224
 
-Music_DefeatedTrainer_branch_23a76:
+Music_DefeatedTrainer_branch_23a76::
 	notetype 4, 6, 3
 	octave 3
 	note A_, 6
@@ -95,7 +95,7 @@
 	loopchannel 0, Music_DefeatedTrainer_branch_23a76
 
 
-Music_DefeatedTrainer_Ch2: ; 23ac1 (8:7ac1)
+Music_DefeatedTrainer_Ch2:: ; 23ac1 (8:7ac1)
 	duty 2
 	notetype 4, 12, 3
 	octave 4
@@ -110,7 +110,7 @@
 	notetype 4, 12, 4
 	note D_, 12
 
-Music_DefeatedTrainer_branch_23ad2:
+Music_DefeatedTrainer_branch_23ad2::
 	notetype 4, 8, 5
 	octave 4
 	note D_, 6
@@ -172,7 +172,7 @@
 	loopchannel 0, Music_DefeatedTrainer_branch_23ad2
 
 
-Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15)
+Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15)
 	notetype 4, 1, 0
 	octave 5
 	note D_, 2
@@ -186,7 +186,7 @@
 	note A_, 12
 	notetype 4, 2, 1
 
-Music_DefeatedTrainer_branch_23b24:
+Music_DefeatedTrainer_branch_23b24::
 	note F#, 3
 	rest 3
 	note F#, 3
--- a/music/defeatedwildmon.asm
+++ b/music/defeatedwildmon.asm
@@ -1,4 +1,4 @@
-Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74)
+Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74)
 	tempo 0, 112
 	stereopanning 119
 	executemusic
@@ -14,7 +14,7 @@
 	note F#, 1
 	note E_, 12
 
-Music_DefeatedWildMon_branch_23b8b:
+Music_DefeatedWildMon_branch_23b8b::
 	notetype 12, 6, 2
 	note E_, 2
 	note F#, 2
@@ -67,7 +67,7 @@
 	loopchannel 0, Music_DefeatedWildMon_branch_23b8b
 
 
-Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1)
+Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1)
 	executemusic
 	duty 2
 	notetype 12, 12, 3
@@ -79,7 +79,7 @@
 	notetype 12, 12, 7
 	note B_, 12
 
-Music_DefeatedWildMon_branch_23bce:
+Music_DefeatedWildMon_branch_23bce::
 	notetype 12, 8, 2
 	octave 3
 	note B_, 2
@@ -142,7 +142,7 @@
 	loopchannel 0, Music_DefeatedWildMon_branch_23bce
 
 
-Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e)
+Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e)
 	executemusic
 	notetype 12, 2, 0
 	octave 5
@@ -162,7 +162,7 @@
 	note E_, 1
 	rest 3
 
-Music_DefeatedWildMon_branch_23c21:
+Music_DefeatedWildMon_branch_23c21::
 	octave 4
 	note E_, 1
 	rest 1
--- a/music/dungeon1.asm
+++ b/music/dungeon1.asm
@@ -1,4 +1,4 @@
-Music_Dungeon1_Ch1: ; 7ded1 (1f:5ed1)
+Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1)
 	tempo 0, 144
 	stereopanning 119
 	duty 3
@@ -11,11 +11,11 @@
 	note F#, 8
 	unknownmusic0xee 255
 
-Music_Dungeon1_branch_7dee5:
+Music_Dungeon1_branch_7dee5::
 	notetype 12, 11, 2
 	octave 3
 
-Music_Dungeon1_branch_7dee8:
+Music_Dungeon1_branch_7dee8::
 	callchannel Music_Dungeon1_branch_7dfaa
 	loopchannel 3, Music_Dungeon1_branch_7dee8
 	note E_, 1
@@ -35,7 +35,7 @@
 	note A_, 1
 	note A#, 1
 
-Music_Dungeon1_branch_7deff:
+Music_Dungeon1_branch_7deff::
 	callchannel Music_Dungeon1_branch_7dfaa
 	loopchannel 4, Music_Dungeon1_branch_7deff
 	callchannel Music_Dungeon1_branch_7dfd5
@@ -127,7 +127,7 @@
 	octave 3
 	note C#, 1
 
-Music_Dungeon1_branch_7df6e:
+Music_Dungeon1_branch_7df6e::
 	rest 16
 	loopchannel 8, Music_Dungeon1_branch_7df6e
 	notetype 12, 12, 3
@@ -165,7 +165,7 @@
 	callchannel Music_Dungeon1_branch_7dfaa
 	loopchannel 0, Music_Dungeon1_branch_7dee5
 
-Music_Dungeon1_branch_7dfaa:
+Music_Dungeon1_branch_7dfaa::
 	note E_, 1
 	note D#, 1
 	note B_, 1
@@ -184,7 +184,7 @@
 	note A#, 1
 	endchannel
 
-Music_Dungeon1_branch_7dfbb:
+Music_Dungeon1_branch_7dfbb::
 	octave 2
 	note G_, 2
 	note A#, 4
@@ -196,7 +196,7 @@
 	note A#, 2
 	endchannel
 
-Music_Dungeon1_branch_7dfc5:
+Music_Dungeon1_branch_7dfc5::
 	octave 3
 	note E_, 1
 	note E_, 1
@@ -214,7 +214,7 @@
 	note C_, 1
 	endchannel
 
-Music_Dungeon1_branch_7dfd5:
+Music_Dungeon1_branch_7dfd5::
 	note E_, 1
 	note E_, 1
 	rest 4
@@ -226,7 +226,7 @@
 	endchannel
 
 
-Music_Dungeon1_Ch2: ; 7dfde (1f:5fde)
+Music_Dungeon1_Ch2:: ; 7dfde (1f:5fde)
 	vibrato 11, 1, 5
 	duty 3
 	notetype 12, 0, 15
@@ -236,10 +236,10 @@
 	octave 5
 	note D_, 8
 
-Music_Dungeon1_branch_7dfeb:
+Music_Dungeon1_branch_7dfeb::
 	notetype 12, 12, 2
 
-Music_Dungeon1_branch_7dfed:
+Music_Dungeon1_branch_7dfed::
 	callchannel Music_Dungeon1_branch_7e097
 	loopchannel 3, Music_Dungeon1_branch_7dfed
 	octave 2
@@ -261,7 +261,7 @@
 	note G_, 1
 	note D#, 1
 
-Music_Dungeon1_branch_7e006:
+Music_Dungeon1_branch_7e006::
 	callchannel Music_Dungeon1_branch_7e097
 	loopchannel 4, Music_Dungeon1_branch_7e006
 	rest 2
@@ -359,7 +359,7 @@
 	callchannel Music_Dungeon1_branch_7e097
 	loopchannel 0, Music_Dungeon1_branch_7dfeb
 
-Music_Dungeon1_branch_7e097:
+Music_Dungeon1_branch_7e097::
 	octave 2
 	note E_, 1
 	note E_, 1
@@ -381,7 +381,7 @@
 	note B_, 1
 	endchannel
 
-Music_Dungeon1_branch_7e0ab:
+Music_Dungeon1_branch_7e0ab::
 	octave 2
 	note E_, 1
 	note E_, 1
@@ -393,7 +393,7 @@
 	rest 3
 	endchannel
 
-Music_Dungeon1_branch_7e0b5:
+Music_Dungeon1_branch_7e0b5::
 	octave 2
 	note E_, 1
 	note E_, 1
@@ -400,7 +400,7 @@
 	rest 10
 	endchannel
 
-Music_Dungeon1_branch_7e0ba:
+Music_Dungeon1_branch_7e0ba::
 	octave 1
 	note E_, 1
 	note G_, 1
@@ -408,7 +408,7 @@
 	note D#, 1
 	endchannel
 
-Music_Dungeon1_branch_7e0c0:
+Music_Dungeon1_branch_7e0c0::
 	octave 2
 	note E_, 1
 	note E_, 1
@@ -423,7 +423,7 @@
 	note C_, 1
 	endchannel
 
-Music_Dungeon1_branch_7e0cd:
+Music_Dungeon1_branch_7e0cd::
 	octave 3
 	note E_, 6
 	note G_, 6
@@ -441,7 +441,7 @@
 	endchannel
 
 
-Music_Dungeon1_Ch3: ; 7e0dc (1f:60dc)
+Music_Dungeon1_Ch3:: ; 7e0dc (1f:60dc)
 	notetype 12, 1, 1
 	vibrato 8, 2, 6
 	rest 14
@@ -449,7 +449,7 @@
 	note D_, 1
 	note D#, 1
 
-Music_Dungeon1_branch_7e0e5:
+Music_Dungeon1_branch_7e0e5::
 	callchannel Music_Dungeon1_branch_7e140
 	callchannel Music_Dungeon1_branch_7e140
 	octave 5
@@ -511,7 +511,7 @@
 	rest 16
 	loopchannel 0, Music_Dungeon1_branch_7e0e5
 
-Music_Dungeon1_branch_7e140:
+Music_Dungeon1_branch_7e140::
 	octave 5
 	note E_, 4
 	note B_, 4
@@ -533,7 +533,7 @@
 	note D#, 4
 	endchannel
 
-Music_Dungeon1_branch_7e154:
+Music_Dungeon1_branch_7e154::
 	octave 6
 	note E_, 1
 	note E_, 1
@@ -545,7 +545,7 @@
 	rest 1
 	endchannel
 
-Music_Dungeon1_branch_7e15e:
+Music_Dungeon1_branch_7e15e::
 	octave 3
 	note E_, 1
 	note G_, 1
@@ -553,7 +553,7 @@
 	note D#, 1
 	endchannel
 
-Music_Dungeon1_branch_7e164:
+Music_Dungeon1_branch_7e164::
 	note E_, 4
 	note B_, 4
 	note A#, 4
@@ -574,7 +574,7 @@
 	note D#, 4
 	endchannel
 
-Music_Dungeon1_branch_7e177:
+Music_Dungeon1_branch_7e177::
 	octave 4
 	note E_, 1
 	rest 3
@@ -596,13 +596,13 @@
 	endchannel
 
 
-Music_Dungeon1_Ch4: ; 7e18a (1f:618a)
+Music_Dungeon1_Ch4:: ; 7e18a (1f:618a)
 	dspeed 12
 	rest 14
 	dnote 1, cymbal1
 	dnote 1, cymbal1
 
-Music_Dungeon1_branch_7e190:
+Music_Dungeon1_branch_7e190::
 	callchannel Music_Dungeon1_branch_7e1f1
 	loopchannel 3, Music_Dungeon1_branch_7e190
 	dnote 4, cymbal2
@@ -611,7 +611,7 @@
 	dnote 2, cymbal1
 	dnote 2, cymbal1
 
-Music_Dungeon1_branch_7e1a1:
+Music_Dungeon1_branch_7e1a1::
 	callchannel Music_Dungeon1_branch_7e1f1
 	loopchannel 3, Music_Dungeon1_branch_7e1a1
 	dnote 4, cymbal2
@@ -619,12 +619,12 @@
 	dnote 4, cymbal2
 	dnote 4, cymbal2
 
-Music_Dungeon1_branch_7e1b0:
+Music_Dungeon1_branch_7e1b0::
 	callchannel Music_Dungeon1_branch_7e1fa
 	loopchannel 3, Music_Dungeon1_branch_7e1b0
 	callchannel Music_Dungeon1_branch_7e202
 
-Music_Dungeon1_branch_7e1ba:
+Music_Dungeon1_branch_7e1ba::
 	callchannel Music_Dungeon1_branch_7e1fa
 	loopchannel 3, Music_Dungeon1_branch_7e1ba
 	callchannel Music_Dungeon1_branch_7e202
@@ -635,12 +635,12 @@
 	dnote 2, snare7
 	dnote 4, cymbal2
 
-Music_Dungeon1_branch_7e1cf:
+Music_Dungeon1_branch_7e1cf::
 	rest 16
 	loopchannel 13, Music_Dungeon1_branch_7e1cf
 	rest 12
 
-Music_Dungeon1_branch_7e1d5:
+Music_Dungeon1_branch_7e1d5::
 	callchannel Music_Dungeon1_branch_7e1fa
 	loopchannel 3, Music_Dungeon1_branch_7e1d5
 	dnote 4, cymbal1
@@ -653,7 +653,7 @@
 	callchannel Music_Dungeon1_branch_7e1f1
 	loopchannel 0, Music_Dungeon1_branch_7e190
 
-Music_Dungeon1_branch_7e1f1:
+Music_Dungeon1_branch_7e1f1::
 	dnote 4, cymbal2
 	dnote 4, cymbal1
 	dnote 4, cymbal2
@@ -660,7 +660,7 @@
 	dnote 4, cymbal1
 	endchannel
 
-Music_Dungeon1_branch_7e1fa:
+Music_Dungeon1_branch_7e1fa::
 	dnote 1, cymbal1
 	dnote 1, cymbal1
 	rest 10
@@ -667,7 +667,7 @@
 	dnote 4, cymbal3
 	endchannel
 
-Music_Dungeon1_branch_7e202:
+Music_Dungeon1_branch_7e202::
 	dnote 4, snare7
 	dnote 4, snare8
 	dnote 4, snare8
--- a/music/dungeon2.asm
+++ b/music/dungeon2.asm
@@ -1,4 +1,4 @@
-Music_Dungeon2_Ch1: ; 7e887 (1f:6887)
+Music_Dungeon2_Ch1:: ; 7e887 (1f:6887)
 	tempo 0, 144
 	stereopanning 119
 	duty 3
@@ -5,7 +5,7 @@
 	togglecall
 	vibrato 10, 1, 4
 
-Music_Dungeon2_branch_7e892:
+Music_Dungeon2_branch_7e892::
 	notetype 12, 11, 2
 	octave 4
 	note E_, 4
@@ -70,10 +70,10 @@
 	loopchannel 0, Music_Dungeon2_branch_7e892
 
 
-Music_Dungeon2_Ch2: ; 7e8d8 (1f:68d8)
+Music_Dungeon2_Ch2:: ; 7e8d8 (1f:68d8)
 	vibrato 11, 1, 5
 
-Music_Dungeon2_branch_7e8db:
+Music_Dungeon2_branch_7e8db::
 	duty 3
 	notetype 12, 12, 2
 	octave 3
@@ -162,11 +162,11 @@
 	loopchannel 0, Music_Dungeon2_branch_7e8db
 
 
-Music_Dungeon2_Ch3: ; 7e93b (1f:693b)
+Music_Dungeon2_Ch3:: ; 7e93b (1f:693b)
 	notetype 12, 1, 3
 	vibrato 8, 2, 6
 
-Music_Dungeon2_branch_7e940:
+Music_Dungeon2_branch_7e940::
 	callchannel Music_Dungeon2_branch_7e9d1
 	loopchannel 16, Music_Dungeon2_branch_7e940
 	note E_, 4
@@ -187,7 +187,7 @@
 	rest 4
 	note A#, 4
 
-Music_Dungeon2_branch_7e958:
+Music_Dungeon2_branch_7e958::
 	octave 5
 	note E_, 2
 	rest 2
@@ -288,7 +288,7 @@
 	rest 2
 	endchannel
 
-Music_Dungeon2_branch_7e9d1:
+Music_Dungeon2_branch_7e9d1::
 	octave 4
 	note E_, 2
 	rest 4
@@ -302,10 +302,10 @@
 	endchannel
 
 
-Music_Dungeon2_Ch4: ; 7e9dc (1f:69dc)
+Music_Dungeon2_Ch4:: ; 7e9dc (1f:69dc)
 	dspeed 12
 
-Music_Dungeon2_branch_7e9dd:
+Music_Dungeon2_branch_7e9dd::
 	dnote 4, cymbal1
 	dnote 4, cymbal2
 	dnote 4, cymbal1
--- a/music/dungeon3.asm
+++ b/music/dungeon3.asm
@@ -1,4 +1,4 @@
-Music_Dungeon3_Ch1: ; 7e9f1 (1f:69f1)
+Music_Dungeon3_Ch1:: ; 7e9f1 (1f:69f1)
 	tempo 0, 160
 	stereopanning 119
 	duty 3
@@ -5,10 +5,10 @@
 	togglecall
 	vibrato 8, 1, 4
 
-Music_Dungeon3_branch_7e9fc:
+Music_Dungeon3_branch_7e9fc::
 	notetype 12, 12, 3
 
-Music_Dungeon3_branch_7e9fe:
+Music_Dungeon3_branch_7e9fe::
 	callchannel Music_Dungeon3_branch_7eab2
 	loopchannel 3, Music_Dungeon3_branch_7e9fe
 	octave 2
@@ -24,11 +24,11 @@
 	note D#, 2
 	note E_, 2
 
-Music_Dungeon3_branch_7ea11:
+Music_Dungeon3_branch_7ea11::
 	callchannel Music_Dungeon3_branch_7eac1
 	loopchannel 4, Music_Dungeon3_branch_7ea11
 
-Music_Dungeon3_branch_7ea18:
+Music_Dungeon3_branch_7ea18::
 	callchannel Music_Dungeon3_branch_7eab2
 	loopchannel 4, Music_Dungeon3_branch_7ea18
 	octave 4
@@ -59,11 +59,11 @@
 	note F_, 2
 	note F_, 2
 
-Music_Dungeon3_branch_7ea3c:
+Music_Dungeon3_branch_7ea3c::
 	callchannel Music_Dungeon3_branch_7eace
 	loopchannel 4, Music_Dungeon3_branch_7ea3c
 
-Music_Dungeon3_branch_7ea43:
+Music_Dungeon3_branch_7ea43::
 	callchannel Music_Dungeon3_branch_7eadd
 	loopchannel 3, Music_Dungeon3_branch_7ea43
 	octave 3
@@ -156,7 +156,7 @@
 	rest 16
 	loopchannel 0, Music_Dungeon3_branch_7e9fc
 
-Music_Dungeon3_branch_7eab2:
+Music_Dungeon3_branch_7eab2::
 	octave 2
 	note B_, 2
 	octave 3
@@ -173,7 +173,7 @@
 	note D#, 2
 	endchannel
 
-Music_Dungeon3_branch_7eac1:
+Music_Dungeon3_branch_7eac1::
 	note E_, 2
 	note G#, 2
 	octave 4
@@ -188,7 +188,7 @@
 	note G#, 2
 	endchannel
 
-Music_Dungeon3_branch_7eace:
+Music_Dungeon3_branch_7eace::
 	octave 3
 	note D#, 2
 	octave 2
@@ -205,7 +205,7 @@
 	note B_, 2
 	endchannel
 
-Music_Dungeon3_branch_7eadd:
+Music_Dungeon3_branch_7eadd::
 	note A_, 2
 	note F_, 2
 	octave 3
@@ -220,7 +220,7 @@
 	note F_, 2
 	endchannel
 
-Music_Dungeon3_branch_7eaea:
+Music_Dungeon3_branch_7eaea::
 	octave 3
 	note G#, 2
 	note E_, 2
@@ -235,7 +235,7 @@
 	note C_, 2
 	endchannel
 
-Music_Dungeon3_branch_7eaf7:
+Music_Dungeon3_branch_7eaf7::
 	note D#, 2
 	note G_, 2
 	note D#, 2
@@ -242,7 +242,7 @@
 	note C#, 6
 	endchannel
 
-Music_Dungeon3_branch_7eafc:
+Music_Dungeon3_branch_7eafc::
 	tempo 0, 168
 	octave 1
 	note A#, 1
@@ -335,11 +335,11 @@
 	endchannel
 
 
-Music_Dungeon3_Ch2: ; 7eb68 (1f:6b68)
+Music_Dungeon3_Ch2:: ; 7eb68 (1f:6b68)
 	vibrato 11, 1, 5
 	duty 3
 
-Music_Dungeon3_branch_7eb6d:
+Music_Dungeon3_branch_7eb6d::
 	notetype 12, 13, 3
 	octave 4
 	note D#, 6
@@ -607,7 +607,7 @@
 	loopchannel 0, Music_Dungeon3_branch_7eb6d
 
 
-Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a)
+Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a)
 	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:: ; 7ece4 (1f:6ce4)
 	dspeed 12
 	rest 16
 	rest 16
--- a/music/finalbattle.asm
+++ b/music/finalbattle.asm
@@ -1,4 +1,4 @@
-Music_FinalBattle_Ch1: ; 233a6 (8:73a6)
+Music_FinalBattle_Ch1:: ; 233a6 (8:73a6)
 	tempo 0, 112
 	stereopanning 119
 	duty 3
@@ -104,7 +104,7 @@
 	notetype 12, 11, 7
 	note D#, 4
 
-Music_FinalBattle_branch_23429:
+Music_FinalBattle_branch_23429::
 	notetype 12, 11, 7
 	octave 3
 	note E_, 4
@@ -381,7 +381,7 @@
 	loopchannel 0, Music_FinalBattle_branch_23429
 
 
-Music_FinalBattle_Ch2: ; 2356a (8:756a)
+Music_FinalBattle_Ch2:: ; 2356a (8:756a)
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -479,7 +479,7 @@
 	octave 3
 	note G#, 4
 
-Music_FinalBattle_branch_235e6:
+Music_FinalBattle_branch_235e6::
 	notetype 12, 13, 7
 	octave 4
 	note E_, 8
@@ -709,7 +709,7 @@
 	note B_, 12
 	loopchannel 0, Music_FinalBattle_branch_235e6
 
-Music_FinalBattle_branch_23704:
+Music_FinalBattle_branch_23704::
 	octave 4
 	note E_, 1
 	note E_, 1
@@ -723,7 +723,7 @@
 	note F_, 1
 	endchannel
 
-Music_FinalBattle_branch_23710:
+Music_FinalBattle_branch_23710::
 	octave 4
 	note D_, 2
 	note C#, 2
@@ -738,7 +738,7 @@
 	endchannel
 
 
-Music_FinalBattle_Ch3: ; 2371c (8:771c)
+Music_FinalBattle_Ch3:: ; 2371c (8:771c)
 	notetype 12, 1, 1
 	octave 4
 	note E_, 4
@@ -836,7 +836,7 @@
 	note E_, 1
 	note G_, 1
 
-Music_FinalBattle_branch_2377d:
+Music_FinalBattle_branch_2377d::
 	octave 4
 	note E_, 1
 	octave 3
@@ -1305,7 +1305,7 @@
 	note B_, 4
 	loopchannel 0, Music_FinalBattle_branch_2377d
 
-Music_FinalBattle_branch_2395b:
+Music_FinalBattle_branch_2395b::
 	octave 4
 	note F#, 2
 	octave 5
@@ -1324,7 +1324,7 @@
 	note C#, 2
 	endchannel
 
-Music_FinalBattle_branch_2396c:
+Music_FinalBattle_branch_2396c::
 	octave 4
 	note A_, 2
 	octave 5
--- a/music/gamecorner.asm
+++ b/music/gamecorner.asm
@@ -1,4 +1,4 @@
-Music_GameCorner_Ch1: ; 7e20b (1f:620b)
+Music_GameCorner_Ch1:: ; 7e20b (1f:620b)
 	tempo 0, 120
 	stereopanning 119
 	duty 3
@@ -15,7 +15,7 @@
 	note C#, 2
 	note D#, 16
 
-Music_GameCorner_branch_7e222:
+Music_GameCorner_branch_7e222::
 	notetype 12, 11, 5
 	octave 3
 	note C#, 4
@@ -183,7 +183,7 @@
 	loopchannel 0, Music_GameCorner_branch_7e222
 
 
-Music_GameCorner_Ch2: ; 7e2df (1f:62df)
+Music_GameCorner_Ch2:: ; 7e2df (1f:62df)
 	duty 2
 	vibrato 10, 2, 3
 	notetype 12, 12, 6
@@ -206,7 +206,7 @@
 	note A#, 1
 	note B_, 8
 
-Music_GameCorner_branch_7e2fa:
+Music_GameCorner_branch_7e2fa::
 	duty 2
 	notetype 12, 12, 7
 	octave 3
@@ -343,7 +343,7 @@
 	loopchannel 0, Music_GameCorner_branch_7e2fa
 
 
-Music_GameCorner_Ch3: ; 7e38b (1f:638b)
+Music_GameCorner_Ch3:: ; 7e38b (1f:638b)
 	notetype 12, 1, 3
 	octave 5
 	note C#, 1
@@ -370,7 +370,7 @@
 	note D#, 1
 	rest 1
 
-Music_GameCorner_branch_7e3a5:
+Music_GameCorner_branch_7e3a5::
 	callchannel Music_GameCorner_branch_7e418
 	callchannel Music_GameCorner_branch_7e42d
 	callchannel Music_GameCorner_branch_7e442
@@ -442,7 +442,7 @@
 	callchannel Music_GameCorner_branch_7e42d
 	loopchannel 0, Music_GameCorner_branch_7e3a5
 
-Music_GameCorner_branch_7e418:
+Music_GameCorner_branch_7e418::
 	note E_, 1
 	rest 1
 	note G#, 1
@@ -465,7 +465,7 @@
 	rest 1
 	endchannel
 
-Music_GameCorner_branch_7e42d:
+Music_GameCorner_branch_7e42d::
 	note E_, 1
 	rest 1
 	note G#, 1
@@ -488,7 +488,7 @@
 	rest 1
 	endchannel
 
-Music_GameCorner_branch_7e442:
+Music_GameCorner_branch_7e442::
 	note E_, 1
 	rest 1
 	note B_, 1
@@ -511,7 +511,7 @@
 	rest 1
 	endchannel
 
-Music_GameCorner_branch_7e457:
+Music_GameCorner_branch_7e457::
 	note D#, 1
 	rest 1
 	note A_, 1
@@ -534,7 +534,7 @@
 	rest 1
 	endchannel
 
-Music_GameCorner_branch_7e46c:
+Music_GameCorner_branch_7e46c::
 	note D#, 1
 	rest 1
 	note F#, 1
@@ -557,7 +557,7 @@
 	rest 1
 	endchannel
 
-Music_GameCorner_branch_7e481:
+Music_GameCorner_branch_7e481::
 	note D#, 1
 	rest 1
 	note F#, 1
@@ -580,7 +580,7 @@
 	rest 1
 	endchannel
 
-Music_GameCorner_branch_7e496:
+Music_GameCorner_branch_7e496::
 	note F#, 1
 	rest 1
 	note B_, 1
@@ -603,7 +603,7 @@
 	rest 1
 	endchannel
 
-Music_GameCorner_branch_7e4ab:
+Music_GameCorner_branch_7e4ab::
 	note F#, 1
 	rest 1
 	note A_, 1
--- a/music/gym.asm
+++ b/music/gym.asm
@@ -1,4 +1,4 @@
-Music_Gym_Ch1: ; bcbb (2:7cbb)
+Music_Gym_Ch1:: ; bcbb (2:7cbb)
 	tempo 0, 138
 	stereopanning 119
 	duty 3
@@ -22,7 +22,7 @@
 	note F_, 4
 	note G_, 4
 
-Music_Gym_branch_bcd8:
+Music_Gym_branch_bcd8::
 	note E_, 4
 	note F_, 2
 	note G_, 2
@@ -165,7 +165,7 @@
 	loopchannel 0, Music_Gym_branch_bcd8
 
 
-Music_Gym_Ch2: ; bd6b (2:7d6b)
+Music_Gym_Ch2:: ; bd6b (2:7d6b)
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 7
@@ -184,7 +184,7 @@
 	notetype 12, 12, 7
 	note B_, 4
 
-Music_Gym_branch_bd82:
+Music_Gym_branch_bd82::
 	octave 4
 	note C_, 12
 	octave 3
@@ -288,7 +288,7 @@
 	loopchannel 0, Music_Gym_branch_bd82
 
 
-Music_Gym_Ch3: ; bdfa (2:7dfa)
+Music_Gym_Ch3:: ; bdfa (2:7dfa)
 	notetype 12, 1, 1
 	rest 16
 	rest 10
@@ -297,7 +297,7 @@
 	note F_, 2
 	note D_, 2
 
-Music_Gym_branch_be02:
+Music_Gym_branch_be02::
 	callchannel Music_Gym_branch_be3b
 	callchannel Music_Gym_branch_be44
 	callchannel Music_Gym_branch_be3b
@@ -323,7 +323,7 @@
 	note F_, 2
 	loopchannel 0, Music_Gym_branch_be02
 
-Music_Gym_branch_be3b:
+Music_Gym_branch_be3b::
 	note E_, 2
 	note G_, 2
 	note E_, 2
@@ -334,7 +334,7 @@
 	note G_, 2
 	endchannel
 
-Music_Gym_branch_be44:
+Music_Gym_branch_be44::
 	note D_, 2
 	note F_, 2
 	note D_, 2
@@ -345,7 +345,7 @@
 	note F_, 2
 	endchannel
 
-Music_Gym_branch_be4d:
+Music_Gym_branch_be4d::
 	note F_, 2
 	note A#, 2
 	note F_, 2
--- a/music/gymleaderbattle.asm
+++ b/music/gymleaderbattle.asm
@@ -1,4 +1,4 @@
-Music_GymLeaderBattle_Ch1: ; 22370 (8:6370)
+Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370)
 	tempo 0, 104
 	stereopanning 119
 	duty 3
@@ -57,7 +57,7 @@
 	rest 9
 	note A_, 6
 
-Music_GymLeaderBattle_branch_223b0:
+Music_GymLeaderBattle_branch_223b0::
 	note F#, 1
 	octave 3
 	note C#, 1
@@ -547,7 +547,7 @@
 	loopchannel 0, Music_GymLeaderBattle_branch_223b0
 
 
-Music_GymLeaderBattle_Ch2: ; 225a1 (8:65a1)
+Music_GymLeaderBattle_Ch2:: ; 225a1 (8:65a1)
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
@@ -608,7 +608,7 @@
 	octave 4
 	note C#, 6
 
-Music_GymLeaderBattle_branch_225e0:
+Music_GymLeaderBattle_branch_225e0::
 	notetype 12, 12, 5
 	note D#, 4
 	note C#, 4
@@ -848,7 +848,7 @@
 	loopchannel 0, Music_GymLeaderBattle_branch_225e0
 
 
-Music_GymLeaderBattle_Ch3: ; 226ef (8:66ef)
+Music_GymLeaderBattle_Ch3:: ; 226ef (8:66ef)
 	vibrato 0, 2, 0
 	notetype 12, 1, 3
 	rest 12
@@ -1040,7 +1040,7 @@
 	note C#, 6
 	notetype 12, 1, 4
 
-Music_GymLeaderBattle_branch_227b1:
+Music_GymLeaderBattle_branch_227b1::
 	octave 3
 	note B_, 2
 	octave 4
--- a/music/halloffame.asm
+++ b/music/halloffame.asm
@@ -1,4 +1,4 @@
-Music_HallOfFame_Ch1: ; 7fbaf (1f:7baf)
+Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf)
 	tempo 0, 112
 	stereopanning 119
 	duty 3
@@ -15,7 +15,7 @@
 	note F_, 1
 	note F#, 1
 
-Music_HallOfFame_branch_7fbc5:
+Music_HallOfFame_branch_7fbc5::
 	notetype 12, 8, 0
 	octave 4
 	note C_, 16
@@ -31,11 +31,11 @@
 	loopchannel 0, Music_HallOfFame_branch_7fbc5
 
 
-Music_HallOfFame_Ch2: ; 7fbda (1f:7bda)
+Music_HallOfFame_Ch2:: ; 7fbda (1f:7bda)
 	vibrato 8, 2, 5
 	duty 3
 
-Music_HallOfFame_branch_7fbdf:
+Music_HallOfFame_branch_7fbdf::
 	notetype 12, 12, 4
 	octave 3
 	note G_, 2
@@ -63,10 +63,10 @@
 	loopchannel 0, Music_HallOfFame_branch_7fbdf
 
 
-Music_HallOfFame_Ch3: ; 7fbfc (1f:7bfc)
+Music_HallOfFame_Ch3:: ; 7fbfc (1f:7bfc)
 	notetype 12, 1, 2
 
-Music_HallOfFame_branch_7fbfe:
+Music_HallOfFame_branch_7fbfe::
 	octave 4
 	note D_, 2
 	note G_, 2
--- a/music/headers/musicheaders02.asm
+++ b/music/headers/musicheaders02.asm
@@ -1,4 +1,4 @@
-Music_PalletTown: ; 822e (2:422e)
+Music_PalletTown:: ; 822e (2:422e)
 	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:: ; 8237 (2:4237)
 	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:: ; 8240 (2:4240)
 	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:: ; 8249 (2:4249)
 	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:: ; 8255 (2:4255)
 	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:: ; 825e (2:425e)
 	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:: ; 8267 (2:4267)
 	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:: ; 8270 (2:4270)
 	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:: ; 827c (2:427c)
 	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:: ; 8288 (2:4288)
 	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:: ; 8291 (2:4291)
 	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:: ; 829a (2:429a)
 	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:: ; 82a3 (2:42a3)
 	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:: ; 82af (2:42af)
 	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:: ; 82b8 (2:42b8)
 	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:: ; 82c1 (2:42c1)
 	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:: ; 82cd (2:42cd)
 	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:: ; 82d9 (2:42d9)
 	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:: ; 82d5 (2:42d5)
 	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:: ; 82f1 (2:42f1)
 	db ( $C0 | CH0 )
 	dw Music_IndigoPlateau_Ch1
 	db CH1
--- a/music/headers/musicheaders08.asm
+++ b/music/headers/musicheaders08.asm
@@ -1,4 +1,4 @@
-Music_GymLeaderBattle: ; 202be (8:42be)
+Music_GymLeaderBattle:: ; 202be (8:42be)
 	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:: ; 202c7 (8:42c7)
 	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:: ; 202d0 (8:42d0)
 	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:: ; 202d9 (8:42d9)
 	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:: ; 202e2 (8:42e2)
 	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:: ; 202eb (8:42eb)
 	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:: ; 202f4 (8:42f4)
 	db ( $80 | CH0 )
 	dw Music_DefeatedGymLeader_Ch1
 	db CH1
--- a/music/headers/musicheaders1f.asm
+++ b/music/headers/musicheaders1f.asm
@@ -1,4 +1,4 @@
-Music_TitleScreen: ; 7c249 (1f:4249)
+Music_TitleScreen:: ; 7c249 (1f:4249)
 	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:: ; 7c255 (1f:4255)
 	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:: ; 7c25e (1f:425e)
 	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:: ; 7c267 (1f:4267)
 	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:: ; 7c270 (1f:4270)
 	db $40
 	dw Music_JigglypuffSong_Ch1
 	db CH1
 	dw Music_JigglypuffSong_Ch2
 
-Music_BikeRiding: ; 7c276 (1f:4276)
+Music_BikeRiding:: ; 7c276 (1f:4276)
 	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:: ; 7c282 (1f:4282)
 	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:: ; 7c28b (1f:428b)
 	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:: ; 7c294 (1f:4294)
 	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:: ; 7c2a0 (1f:42a0)
 	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:: ; 7c2ac (1f:42ac)
 	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:: ; 7c2b8 (1f:42b8)
 	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:: ; 7c2c4 (1f:42c4)
 	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:: ; 7c2d0 (1f:42d0)
 	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:: ; 7c2d9 (1f:42d9)
 	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:: ; 7c2e2 (1f:42e2)
 	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:: ; 7c2eb (1f:42eb)
 	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:: ; 7c2f4 (1f:42f4)
 	db ( $80 | CH0 )
 	dw Music_MeetMaleTrainer_Ch1
 	db CH1
--- a/music/headers/sfxheaders02.asm
+++ b/music/headers/sfxheaders02.asm
@@ -1,83 +1,83 @@
-SFX_Headers_02:
+SFX_Headers_02::
 	db $ff, $ff, $ff ; padding
 
-SFX_02_01: ; 8003 (2:4003)
+SFX_02_01:: ; 8003 (2:4003)
 	db CH7
 	dw SFX_02_01_Ch1
 
-SFX_02_02: ; 8006 (2:4006)
+SFX_02_02:: ; 8006 (2:4006)
 	db CH7
 	dw SFX_02_02_Ch1
 
-SFX_02_03: ; 8009 (2:4009)
+SFX_02_03:: ; 8009 (2:4009)
 	db CH7
 	dw SFX_02_03_Ch1
 
-SFX_02_04: ; 800c (2:400c)
+SFX_02_04:: ; 800c (2:400c)
 	db CH7
 	dw SFX_02_04_Ch1
 
-SFX_02_05: ; 800f (2:400f)
+SFX_02_05:: ; 800f (2:400f)
 	db CH7
 	dw SFX_02_05_Ch1
 
-SFX_02_06: ; 8012 (2:4012)
+SFX_02_06:: ; 8012 (2:4012)
 	db CH7
 	dw SFX_02_06_Ch1
 
-SFX_02_07: ; 8015 (2:4015)
+SFX_02_07:: ; 8015 (2:4015)
 	db CH7
 	dw SFX_02_07_Ch1
 
-SFX_02_08: ; 8018 (2:4018)
+SFX_02_08:: ; 8018 (2:4018)
 	db CH7
 	dw SFX_02_08_Ch1
 
-SFX_02_09: ; 801b (2:401b)
+SFX_02_09:: ; 801b (2:401b)
 	db CH7
 	dw SFX_02_09_Ch1
 
-SFX_02_0a: ; 801e (2:401e)
+SFX_02_0a:: ; 801e (2:401e)
 	db CH7
 	dw SFX_02_0a_Ch1
 
-SFX_02_0b: ; 8021 (2:4021)
+SFX_02_0b:: ; 8021 (2:4021)
 	db CH7
 	dw SFX_02_0b_Ch1
 
-SFX_02_0c: ; 8024 (2:4024)
+SFX_02_0c:: ; 8024 (2:4024)
 	db CH7
 	dw SFX_02_0c_Ch1
 
-SFX_02_0d: ; 8027 (2:4027)
+SFX_02_0d:: ; 8027 (2:4027)
 	db CH7
 	dw SFX_02_0d_Ch1
 
-SFX_02_0e: ; 802a (2:402a)
+SFX_02_0e:: ; 802a (2:402a)
 	db CH7
 	dw SFX_02_0e_Ch1
 
-SFX_02_0f: ; 802d (2:402d)
+SFX_02_0f:: ; 802d (2:402d)
 	db CH7
 	dw SFX_02_0f_Ch1
 
-SFX_02_10: ; 8030 (2:4030)
+SFX_02_10:: ; 8030 (2:4030)
 	db CH7
 	dw SFX_02_10_Ch1
 
-SFX_02_11: ; 8033 (2:4033)
+SFX_02_11:: ; 8033 (2:4033)
 	db CH7
 	dw SFX_02_11_Ch1
 
-SFX_02_12: ; 8036 (2:4036)
+SFX_02_12:: ; 8036 (2:4036)
 	db CH7
 	dw SFX_02_12_Ch1
 
-SFX_02_13: ; 8039 (2:4039)
+SFX_02_13:: ; 8039 (2:4039)
 	db CH7
 	dw SFX_02_13_Ch1
 
-SFX_02_14: ; 803c (2:403c)
+SFX_02_14:: ; 803c (2:403c)
 	db ( $80 | CH4 )
 	dw SFX_02_14_Ch1
 	db CH5
@@ -85,7 +85,7 @@
 	db CH7
 	dw SFX_02_14_Ch3
 
-SFX_02_15: ; 8045 (2:4045)
+SFX_02_15:: ; 8045 (2:4045)
 	db ( $80 | CH4 )
 	dw SFX_02_15_Ch1
 	db CH5
@@ -93,7 +93,7 @@
 	db CH7
 	dw SFX_02_15_Ch3
 
-SFX_02_16: ; 804e (2:404e)
+SFX_02_16:: ; 804e (2:404e)
 	db ( $80 | CH4 )
 	dw SFX_02_16_Ch1
 	db CH5
@@ -101,7 +101,7 @@
 	db CH7
 	dw SFX_02_16_Ch3
 
-SFX_02_17: ; 8057 (2:4057)
+SFX_02_17:: ; 8057 (2:4057)
 	db ( $80 | CH4 )
 	dw SFX_02_17_Ch1
 	db CH5
@@ -109,7 +109,7 @@
 	db CH7
 	dw SFX_02_17_Ch3
 
-SFX_02_18: ; 8060 (2:4060)
+SFX_02_18:: ; 8060 (2:4060)
 	db ( $80 | CH4 )
 	dw SFX_02_18_Ch1
 	db CH5
@@ -117,7 +117,7 @@
 	db CH7
 	dw SFX_02_18_Ch3
 
-SFX_02_19: ; 8069 (2:4069)
+SFX_02_19:: ; 8069 (2:4069)
 	db ( $80 | CH4 )
 	dw SFX_02_19_Ch1
 	db CH5
@@ -125,7 +125,7 @@
 	db CH7
 	dw SFX_02_19_Ch3
 
-SFX_02_1a: ; 8072 (2:4072)
+SFX_02_1a:: ; 8072 (2:4072)
 	db ( $80 | CH4 )
 	dw SFX_02_1a_Ch1
 	db CH5
@@ -133,7 +133,7 @@
 	db CH7
 	dw SFX_02_1a_Ch3
 
-SFX_02_1b: ; 807b (2:407b)
+SFX_02_1b:: ; 807b (2:407b)
 	db ( $80 | CH4 )
 	dw SFX_02_1b_Ch1
 	db CH5
@@ -141,7 +141,7 @@
 	db CH7
 	dw SFX_02_1b_Ch3
 
-SFX_02_1c: ; 8084 (2:4084)
+SFX_02_1c:: ; 8084 (2:4084)
 	db ( $80 | CH4 )
 	dw SFX_02_1c_Ch1
 	db CH5
@@ -149,7 +149,7 @@
 	db CH7
 	dw SFX_02_1c_Ch3
 
-SFX_02_1d: ; 808d (2:408d)
+SFX_02_1d:: ; 808d (2:408d)
 	db ( $80 | CH4 )
 	dw SFX_02_1d_Ch1
 	db CH5
@@ -157,7 +157,7 @@
 	db CH7
 	dw SFX_02_1d_Ch3
 
-SFX_02_1e: ; 8096 (2:4096)
+SFX_02_1e:: ; 8096 (2:4096)
 	db ( $80 | CH4 )
 	dw SFX_02_1e_Ch1
 	db CH5
@@ -165,7 +165,7 @@
 	db CH7
 	dw SFX_02_1e_Ch3
 
-SFX_02_1f: ; 809f (2:409f)
+SFX_02_1f:: ; 809f (2:409f)
 	db ( $80 | CH4 )
 	dw SFX_02_1f_Ch1
 	db CH5
@@ -173,7 +173,7 @@
 	db CH7
 	dw SFX_02_1f_Ch3
 
-SFX_02_20: ; 80a8 (2:40a8)
+SFX_02_20:: ; 80a8 (2:40a8)
 	db ( $80 | CH4 )
 	dw SFX_02_20_Ch1
 	db CH5
@@ -181,7 +181,7 @@
 	db CH7
 	dw SFX_02_20_Ch3
 
-SFX_02_21: ; 80b1 (2:40b1)
+SFX_02_21:: ; 80b1 (2:40b1)
 	db ( $80 | CH4 )
 	dw SFX_02_21_Ch1
 	db CH5
@@ -189,7 +189,7 @@
 	db CH7
 	dw SFX_02_21_Ch3
 
-SFX_02_22: ; 80ba (2:40ba)
+SFX_02_22:: ; 80ba (2:40ba)
 	db ( $80 | CH4 )
 	dw SFX_02_22_Ch1
 	db CH5
@@ -197,7 +197,7 @@
 	db CH7
 	dw SFX_02_22_Ch3
 
-SFX_02_23: ; 80c3 (2:40c3)
+SFX_02_23:: ; 80c3 (2:40c3)
 	db ( $80 | CH4 )
 	dw SFX_02_23_Ch1
 	db CH5
@@ -205,7 +205,7 @@
 	db CH7
 	dw SFX_02_23_Ch3
 
-SFX_02_24: ; 80cc (2:40cc)
+SFX_02_24:: ; 80cc (2:40cc)
 	db ( $80 | CH4 )
 	dw SFX_02_24_Ch1
 	db CH5
@@ -213,7 +213,7 @@
 	db CH7
 	dw SFX_02_24_Ch3
 
-SFX_02_25: ; 80d5 (2:40d5)
+SFX_02_25:: ; 80d5 (2:40d5)
 	db ( $80 | CH4 )
 	dw SFX_02_25_Ch1
 	db CH5
@@ -221,7 +221,7 @@
 	db CH7
 	dw SFX_02_25_Ch3
 
-SFX_02_26: ; 80de (2:40de)
+SFX_02_26:: ; 80de (2:40de)
 	db ( $80 | CH4 )
 	dw SFX_02_26_Ch1
 	db CH5
@@ -229,7 +229,7 @@
 	db CH7
 	dw SFX_02_26_Ch3
 
-SFX_02_27: ; 80e7 (2:40e7)
+SFX_02_27:: ; 80e7 (2:40e7)
 	db ( $80 | CH4 )
 	dw SFX_02_27_Ch1
 	db CH5
@@ -237,7 +237,7 @@
 	db CH7
 	dw SFX_02_27_Ch3
 
-SFX_02_28: ; 80f0 (2:40f0)
+SFX_02_28:: ; 80f0 (2:40f0)
 	db ( $80 | CH4 )
 	dw SFX_02_28_Ch1
 	db CH5
@@ -245,7 +245,7 @@
 	db CH7
 	dw SFX_02_28_Ch3
 
-SFX_02_29: ; 80f9 (2:40f9)
+SFX_02_29:: ; 80f9 (2:40f9)
 	db ( $80 | CH4 )
 	dw SFX_02_29_Ch1
 	db CH5
@@ -253,7 +253,7 @@
 	db CH7
 	dw SFX_02_29_Ch3
 
-SFX_02_2a: ; 8102 (2:4102)
+SFX_02_2a:: ; 8102 (2:4102)
 	db ( $80 | CH4 )
 	dw SFX_02_2a_Ch1
 	db CH5
@@ -261,7 +261,7 @@
 	db CH7
 	dw SFX_02_2a_Ch3
 
-SFX_02_2b: ; 810b (2:410b)
+SFX_02_2b:: ; 810b (2:410b)
 	db ( $80 | CH4 )
 	dw SFX_02_2b_Ch1
 	db CH5
@@ -269,7 +269,7 @@
 	db CH7
 	dw SFX_02_2b_Ch3
 
-SFX_02_2c: ; 8114 (2:4114)
+SFX_02_2c:: ; 8114 (2:4114)
 	db ( $80 | CH4 )
 	dw SFX_02_2c_Ch1
 	db CH5
@@ -277,7 +277,7 @@
 	db CH7
 	dw SFX_02_2c_Ch3
 
-SFX_02_2d: ; 811d (2:411d)
+SFX_02_2d:: ; 811d (2:411d)
 	db ( $80 | CH4 )
 	dw SFX_02_2d_Ch1
 	db CH5
@@ -285,7 +285,7 @@
 	db CH7
 	dw SFX_02_2d_Ch3
 
-SFX_02_2e: ; 8126 (2:4126)
+SFX_02_2e:: ; 8126 (2:4126)
 	db ( $80 | CH4 )
 	dw SFX_02_2e_Ch1
 	db CH5
@@ -293,7 +293,7 @@
 	db CH7
 	dw SFX_02_2e_Ch3
 
-SFX_02_2f: ; 812f (2:412f)
+SFX_02_2f:: ; 812f (2:412f)
 	db ( $80 | CH4 )
 	dw SFX_02_2f_Ch1
 	db CH5
@@ -301,7 +301,7 @@
 	db CH7
 	dw SFX_02_2f_Ch3
 
-SFX_02_30: ; 8138 (2:4138)
+SFX_02_30:: ; 8138 (2:4138)
 	db ( $80 | CH4 )
 	dw SFX_02_30_Ch1
 	db CH5
@@ -309,7 +309,7 @@
 	db CH7
 	dw SFX_02_30_Ch3
 
-SFX_02_31: ; 8141 (2:4141)
+SFX_02_31:: ; 8141 (2:4141)
 	db ( $80 | CH4 )
 	dw SFX_02_31_Ch1
 	db CH5
@@ -317,7 +317,7 @@
 	db CH7
 	dw SFX_02_31_Ch3
 
-SFX_02_32: ; 814a (2:414a)
+SFX_02_32:: ; 814a (2:414a)
 	db ( $80 | CH4 )
 	dw SFX_02_32_Ch1
 	db CH5
@@ -325,7 +325,7 @@
 	db CH7
 	dw SFX_02_32_Ch3
 
-SFX_02_33: ; 8153 (2:4153)
+SFX_02_33:: ; 8153 (2:4153)
 	db ( $80 | CH4 )
 	dw SFX_02_33_Ch1
 	db CH5
@@ -333,7 +333,7 @@
 	db CH7
 	dw SFX_02_33_Ch3
 
-SFX_02_34: ; 815c (2:415c)
+SFX_02_34:: ; 815c (2:415c)
 	db ( $80 | CH4 )
 	dw SFX_02_34_Ch1
 	db CH5
@@ -341,7 +341,7 @@
 	db CH7
 	dw SFX_02_34_Ch3
 
-SFX_02_35: ; 8165 (2:4165)
+SFX_02_35:: ; 8165 (2:4165)
 	db ( $80 | CH4 )
 	dw SFX_02_35_Ch1
 	db CH5
@@ -349,7 +349,7 @@
 	db CH7
 	dw SFX_02_35_Ch3
 
-SFX_02_36: ; 816e (2:416e)
+SFX_02_36:: ; 816e (2:416e)
 	db ( $80 | CH4 )
 	dw SFX_02_36_Ch1
 	db CH5
@@ -357,7 +357,7 @@
 	db CH7
 	dw SFX_02_36_Ch3
 
-SFX_02_37: ; 8177 (2:4177)
+SFX_02_37:: ; 8177 (2:4177)
 	db ( $80 | CH4 )
 	dw SFX_02_37_Ch1
 	db CH5
@@ -365,7 +365,7 @@
 	db CH7
 	dw SFX_02_37_Ch3
 
-SFX_02_38: ; 8180 (2:4180)
+SFX_02_38:: ; 8180 (2:4180)
 	db ( $80 | CH4 )
 	dw SFX_02_38_Ch1
 	db CH5
@@ -373,7 +373,7 @@
 	db CH7
 	dw SFX_02_38_Ch3
 
-SFX_02_39: ; 8189 (2:4189)
+SFX_02_39:: ; 8189 (2:4189)
 	db ( $80 | CH4 )
 	dw SFX_02_39_Ch1
 	db CH5
@@ -381,7 +381,7 @@
 	db CH7
 	dw SFX_02_39_Ch3
 
-SFX_02_3a: ; 8192 (2:4192)
+SFX_02_3a:: ; 8192 (2:4192)
 	db ( $80 | CH4 )
 	dw SFX_02_3a_Ch1
 	db CH5
@@ -389,7 +389,7 @@
 	db CH6
 	dw SFX_02_3a_Ch3
 
-SFX_02_3b: ; 819b (2:419b)
+SFX_02_3b:: ; 819b (2:419b)
 	db ( $80 | CH4 )
 	dw SFX_02_3b_Ch1
 	db CH5
@@ -397,27 +397,27 @@
 	db CH6
 	dw SFX_02_3b_Ch3
 
-SFX_02_3c: ; 81a4 (2:41a4)
+SFX_02_3c:: ; 81a4 (2:41a4)
 	db CH4
 	dw SFX_02_3c_Ch1
 
-SFX_02_3d: ; 81a7 (2:41a7)
+SFX_02_3d:: ; 81a7 (2:41a7)
 	db CH4
 	dw SFX_02_3d_Ch1
 
-SFX_02_3e: ; 81aa (2:41aa)
+SFX_02_3e:: ; 81aa (2:41aa)
 	db CH4
 	dw SFX_02_3e_Ch1
 
-SFX_02_3f: ; 81ad (2:41ad)
+SFX_02_3f:: ; 81ad (2:41ad)
 	db CH7
 	dw SFX_02_3f_Ch1
 
-SFX_02_40: ; 81b0 (2:41b0)
+SFX_02_40:: ; 81b0 (2:41b0)
 	db CH4
 	dw SFX_02_40_Ch1
 
-SFX_02_41: ; 81b3 (2:41b3)
+SFX_02_41:: ; 81b3 (2:41b3)
 	db ( $80 | CH4 )
 	dw SFX_02_41_Ch1
 	db CH5
@@ -425,7 +425,7 @@
 	db CH6
 	dw SFX_02_41_Ch3
 
-SFX_02_42: ; 81bc (2:41bc)
+SFX_02_42:: ; 81bc (2:41bc)
 	db ( $80 | CH4 )
 	dw SFX_02_42_Ch1
 	db CH5
@@ -433,131 +433,131 @@
 	db CH6
 	dw SFX_02_42_Ch3
 
-SFX_02_43: ; 81c5 (2:41c5)
+SFX_02_43:: ; 81c5 (2:41c5)
 	db CH4
 	dw SFX_02_43_Ch1
 
-SFX_02_44: ; 81c8 (2:41c8)
+SFX_02_44:: ; 81c8 (2:41c8)
 	db CH4
 	dw SFX_02_44_Ch1
 
-SFX_02_45: ; 81cb (2:41cb)
+SFX_02_45:: ; 81cb (2:41cb)
 	db CH4
 	dw SFX_02_45_Ch1
 
-SFX_02_46: ; 81ce (2:41ce)
+SFX_02_46:: ; 81ce (2:41ce)
 	db CH4
 	dw SFX_02_46_Ch1
 
-SFX_02_47: ; 81d1 (2:41d1)
+SFX_02_47:: ; 81d1 (2:41d1)
 	db CH4
 	dw SFX_02_47_Ch1
 
-SFX_02_48: ; 81d4 (2:41d4)
+SFX_02_48:: ; 81d4 (2:41d4)
 	db CH4
 	dw SFX_02_48_Ch1
 
-SFX_02_49: ; 81d7 (2:41d7)
+SFX_02_49:: ; 81d7 (2:41d7)
 	db CH4
 	dw SFX_02_49_Ch1
 
-SFX_02_4a: ; 81da (2:41da)
+SFX_02_4a:: ; 81da (2:41da)
 	db CH4
 	dw SFX_02_4a_Ch1
 
-SFX_02_4b: ; 81dd (2:41dd)
+SFX_02_4b:: ; 81dd (2:41dd)
 	db CH4
 	dw SFX_02_4b_Ch1
 
-SFX_02_4c: ; 81e0 (2:41e0)
+SFX_02_4c:: ; 81e0 (2:41e0)
 	db CH4
 	dw SFX_02_4c_Ch1
 
-SFX_02_4d: ; 81e3 (2:41e3)
+SFX_02_4d:: ; 81e3 (2:41e3)
 	db CH4
 	dw SFX_02_4d_Ch1
 
-SFX_02_4e: ; 81e6 (2:41e6)
+SFX_02_4e:: ; 81e6 (2:41e6)
 	db CH4
 	dw SFX_02_4e_Ch1
 
-SFX_02_4f: ; 81e9 (2:41e9)
+SFX_02_4f:: ; 81e9 (2:41e9)
 	db CH7
 	dw SFX_02_4f_Ch1
 
-SFX_02_50: ; 81ec (2:41ec)
+SFX_02_50:: ; 81ec (2:41ec)
 	db CH7
 	dw SFX_02_50_Ch1
 
-SFX_02_51: ; 81ef (2:41ef)
+SFX_02_51:: ; 81ef (2:41ef)
 	db ( $40 | CH4 )
 	dw SFX_02_51_Ch1
 	db CH5
 	dw SFX_02_51_Ch2
 
-SFX_02_52: ; 81f5 (2:41f5)
+SFX_02_52:: ; 81f5 (2:41f5)
 	db CH4
 	dw SFX_02_52_Ch1
 
-SFX_02_53: ; 81f8 (2:41f8)
+SFX_02_53:: ; 81f8 (2:41f8)
 	db CH7
 	dw SFX_02_53_Ch1
 
-SFX_02_54: ; 81fb (2:41fb)
+SFX_02_54:: ; 81fb (2:41fb)
 	db ( $40 | CH4 )
 	dw SFX_02_54_Ch1
 	db CH5
 	dw SFX_02_54_Ch2
 
-SFX_02_55: ; 8201 (2:4201)
+SFX_02_55:: ; 8201 (2:4201)
 	db CH4
 	dw SFX_02_55_Ch1
 
-SFX_02_56: ; 8204 (2:4204)
+SFX_02_56:: ; 8204 (2:4204)
 	db CH7
 	dw SFX_02_56_Ch1
 
-SFX_02_57: ; 8207 (2:4207)
+SFX_02_57:: ; 8207 (2:4207)
 	db CH7
 	dw SFX_02_57_Ch1
 
-SFX_02_58: ; 820a (2:420a)
+SFX_02_58:: ; 820a (2:420a)
 	db ( $40 | CH4 )
 	dw SFX_02_58_Ch1
 	db CH5
 	dw SFX_02_58_Ch2
 
-SFX_02_59: ; 8210 (2:4210)
+SFX_02_59:: ; 8210 (2:4210)
 	db ( $40 | CH4 )
 	dw SFX_02_59_Ch1
 	db CH5
 	dw SFX_02_59_Ch2
 
-SFX_02_5a: ; 8216 (2:4216)
+SFX_02_5a:: ; 8216 (2:4216)
 	db ( $40 | CH4 )
 	dw SFX_02_5a_Ch1
 	db CH5
 	dw SFX_02_5a_Ch2
 
-SFX_02_5b: ; 821c (2:421c)
+SFX_02_5b:: ; 821c (2:421c)
 	db CH4
 	dw SFX_02_5b_Ch1
 
-SFX_02_5c: ; 821f (2:421f)
+SFX_02_5c:: ; 821f (2:421f)
 	db CH7
 	dw SFX_02_5c_Ch1
 
-SFX_02_5d: ; 8222 (2:4222)
+SFX_02_5d:: ; 8222 (2:4222)
 	db ( $40 | CH4 )
 	dw SFX_02_5d_Ch1
 	db CH5
 	dw SFX_02_5d_Ch2
 
-SFX_02_5e: ; 8228 (2:4228)
+SFX_02_5e:: ; 8228 (2:4228)
 	db CH2
 	dw SFX_02_5e_Ch1
 
-SFX_02_5f: ; 822b (2:422b)
+SFX_02_5f:: ; 822b (2:422b)
 	db CH4
 	dw SFX_02_5f_Ch1
 
--- a/music/headers/sfxheaders08.asm
+++ b/music/headers/sfxheaders08.asm
@@ -1,83 +1,83 @@
-SFX_Headers_08:
+SFX_Headers_08::
 	db $ff, $ff, $ff ; padding
 
-SFX_08_01: ; 20003 (8:4003)
+SFX_08_01:: ; 20003 (8:4003)
 	db CH7
 	dw SFX_08_01_Ch1
 
-SFX_08_02: ; 20006 (8:4006)
+SFX_08_02:: ; 20006 (8:4006)
 	db CH7
 	dw SFX_08_02_Ch1
 
-SFX_08_03: ; 20009 (8:4009)
+SFX_08_03:: ; 20009 (8:4009)
 	db CH7
 	dw SFX_08_03_Ch1
 
-SFX_08_04: ; 2000c (8:400c)
+SFX_08_04:: ; 2000c (8:400c)
 	db CH7
 	dw SFX_08_04_Ch1
 
-SFX_08_05: ; 2000f (8:400f)
+SFX_08_05:: ; 2000f (8:400f)
 	db CH7
 	dw SFX_08_05_Ch1
 
-SFX_08_06: ; 20012 (8:4012)
+SFX_08_06:: ; 20012 (8:4012)
 	db CH7
 	dw SFX_08_06_Ch1
 
-SFX_08_07: ; 20015 (8:4015)
+SFX_08_07:: ; 20015 (8:4015)
 	db CH7
 	dw SFX_08_07_Ch1
 
-SFX_08_08: ; 20018 (8:4018)
+SFX_08_08:: ; 20018 (8:4018)
 	db CH7
 	dw SFX_08_08_Ch1
 
-SFX_08_09: ; 2001b (8:401b)
+SFX_08_09:: ; 2001b (8:401b)
 	db CH7
 	dw SFX_08_09_Ch1
 
-SFX_08_0a: ; 2001e (8:401e)
+SFX_08_0a:: ; 2001e (8:401e)
 	db CH7
 	dw SFX_08_0a_Ch1
 
-SFX_08_0b: ; 20021 (8:4021)
+SFX_08_0b:: ; 20021 (8:4021)
 	db CH7
 	dw SFX_08_0b_Ch1
 
-SFX_08_0c: ; 20024 (8:4024)
+SFX_08_0c:: ; 20024 (8:4024)
 	db CH7
 	dw SFX_08_0c_Ch1
 
-SFX_08_0d: ; 20027 (8:4027)
+SFX_08_0d:: ; 20027 (8:4027)
 	db CH7
 	dw SFX_08_0d_Ch1
 
-SFX_08_0e: ; 2002a (8:402a)
+SFX_08_0e:: ; 2002a (8:402a)
 	db CH7
 	dw SFX_08_0e_Ch1
 
-SFX_08_0f: ; 2002d (8:402d)
+SFX_08_0f:: ; 2002d (8:402d)
 	db CH7
 	dw SFX_08_0f_Ch1
 
-SFX_08_10: ; 20030 (8:4030)
+SFX_08_10:: ; 20030 (8:4030)
 	db CH7
 	dw SFX_08_10_Ch1
 
-SFX_08_11: ; 20033 (8:4033)
+SFX_08_11:: ; 20033 (8:4033)
 	db CH7
 	dw SFX_08_11_Ch1
 
-SFX_08_12: ; 20036 (8:4036)
+SFX_08_12:: ; 20036 (8:4036)
 	db CH7
 	dw SFX_08_12_Ch1
 
-SFX_08_13: ; 20039 (8:4039)
+SFX_08_13:: ; 20039 (8:4039)
 	db CH7
 	dw SFX_08_13_Ch1
 
-SFX_08_14: ; 2003c (8:403c)
+SFX_08_14:: ; 2003c (8:403c)
 	db ( $80 | CH4 )
 	dw SFX_08_14_Ch1
 	db CH5
@@ -85,7 +85,7 @@
 	db CH7
 	dw SFX_08_14_Ch3
 
-SFX_08_15: ; 20045 (8:4045)
+SFX_08_15:: ; 20045 (8:4045)
 	db ( $80 | CH4 )
 	dw SFX_08_15_Ch1
 	db CH5
@@ -93,7 +93,7 @@
 	db CH7
 	dw SFX_08_15_Ch3
 
-SFX_08_16: ; 2004e (8:404e)
+SFX_08_16:: ; 2004e (8:404e)
 	db ( $80 | CH4 )
 	dw SFX_08_16_Ch1
 	db CH5
@@ -101,7 +101,7 @@
 	db CH7
 	dw SFX_08_16_Ch3
 
-SFX_08_17: ; 20057 (8:4057)
+SFX_08_17:: ; 20057 (8:4057)
 	db ( $80 | CH4 )
 	dw SFX_08_17_Ch1
 	db CH5
@@ -109,7 +109,7 @@
 	db CH7
 	dw SFX_08_17_Ch3
 
-SFX_08_18: ; 20060 (8:4060)
+SFX_08_18:: ; 20060 (8:4060)
 	db ( $80 | CH4 )
 	dw SFX_08_18_Ch1
 	db CH5
@@ -117,7 +117,7 @@
 	db CH7
 	dw SFX_08_18_Ch3
 
-SFX_08_19: ; 20069 (8:4069)
+SFX_08_19:: ; 20069 (8:4069)
 	db ( $80 | CH4 )
 	dw SFX_08_19_Ch1
 	db CH5
@@ -125,7 +125,7 @@
 	db CH7
 	dw SFX_08_19_Ch3
 
-SFX_08_1a: ; 20072 (8:4072)
+SFX_08_1a:: ; 20072 (8:4072)
 	db ( $80 | CH4 )
 	dw SFX_08_1a_Ch1
 	db CH5
@@ -133,7 +133,7 @@
 	db CH7
 	dw SFX_08_1a_Ch3
 
-SFX_08_1b: ; 2007b (8:407b)
+SFX_08_1b:: ; 2007b (8:407b)
 	db ( $80 | CH4 )
 	dw SFX_08_1b_Ch1
 	db CH5
@@ -141,7 +141,7 @@
 	db CH7
 	dw SFX_08_1b_Ch3
 
-SFX_08_1c: ; 20084 (8:4084)
+SFX_08_1c:: ; 20084 (8:4084)
 	db ( $80 | CH4 )
 	dw SFX_08_1c_Ch1
 	db CH5
@@ -149,7 +149,7 @@
 	db CH7
 	dw SFX_08_1c_Ch3
 
-SFX_08_1d: ; 2008d (8:408d)
+SFX_08_1d:: ; 2008d (8:408d)
 	db ( $80 | CH4 )
 	dw SFX_08_1d_Ch1
 	db CH5
@@ -157,7 +157,7 @@
 	db CH7
 	dw SFX_08_1d_Ch3
 
-SFX_08_1e: ; 20096 (8:4096)
+SFX_08_1e:: ; 20096 (8:4096)
 	db ( $80 | CH4 )
 	dw SFX_08_1e_Ch1
 	db CH5
@@ -165,7 +165,7 @@
 	db CH7
 	dw SFX_08_1e_Ch3
 
-SFX_08_1f: ; 2009f (8:409f)
+SFX_08_1f:: ; 2009f (8:409f)
 	db ( $80 | CH4 )
 	dw SFX_08_1f_Ch1
 	db CH5
@@ -173,7 +173,7 @@
 	db CH7
 	dw SFX_08_1f_Ch3
 
-SFX_08_20: ; 200a8 (8:40a8)
+SFX_08_20:: ; 200a8 (8:40a8)
 	db ( $80 | CH4 )
 	dw SFX_08_20_Ch1
 	db CH5
@@ -181,7 +181,7 @@
 	db CH7
 	dw SFX_08_20_Ch3
 
-SFX_08_21: ; 200b1 (8:40b1)
+SFX_08_21:: ; 200b1 (8:40b1)
 	db ( $80 | CH4 )
 	dw SFX_08_21_Ch1
 	db CH5
@@ -189,7 +189,7 @@
 	db CH7
 	dw SFX_08_21_Ch3
 
-SFX_08_22: ; 200ba (8:40ba)
+SFX_08_22:: ; 200ba (8:40ba)
 	db ( $80 | CH4 )
 	dw SFX_08_22_Ch1
 	db CH5
@@ -197,7 +197,7 @@
 	db CH7
 	dw SFX_08_22_Ch3
 
-SFX_08_23: ; 200c3 (8:40c3)
+SFX_08_23:: ; 200c3 (8:40c3)
 	db ( $80 | CH4 )
 	dw SFX_08_23_Ch1
 	db CH5
@@ -205,7 +205,7 @@
 	db CH7
 	dw SFX_08_23_Ch3
 
-SFX_08_24: ; 200cc (8:40cc)
+SFX_08_24:: ; 200cc (8:40cc)
 	db ( $80 | CH4 )
 	dw SFX_08_24_Ch1
 	db CH5
@@ -213,7 +213,7 @@
 	db CH7
 	dw SFX_08_24_Ch3
 
-SFX_08_25: ; 200d5 (8:40d5)
+SFX_08_25:: ; 200d5 (8:40d5)
 	db ( $80 | CH4 )
 	dw SFX_08_25_Ch1
 	db CH5
@@ -221,7 +221,7 @@
 	db CH7
 	dw SFX_08_25_Ch3
 
-SFX_08_26: ; 200de (8:40de)
+SFX_08_26:: ; 200de (8:40de)
 	db ( $80 | CH4 )
 	dw SFX_08_26_Ch1
 	db CH5
@@ -229,7 +229,7 @@
 	db CH7
 	dw SFX_08_26_Ch3
 
-SFX_08_27: ; 200e7 (8:40e7)
+SFX_08_27:: ; 200e7 (8:40e7)
 	db ( $80 | CH4 )
 	dw SFX_08_27_Ch1
 	db CH5
@@ -237,7 +237,7 @@
 	db CH7
 	dw SFX_08_27_Ch3
 
-SFX_08_28: ; 200f0 (8:40f0)
+SFX_08_28:: ; 200f0 (8:40f0)
 	db ( $80 | CH4 )
 	dw SFX_08_28_Ch1
 	db CH5
@@ -245,7 +245,7 @@
 	db CH7
 	dw SFX_08_28_Ch3
 
-SFX_08_29: ; 200f9 (8:40f9)
+SFX_08_29:: ; 200f9 (8:40f9)
 	db ( $80 | CH4 )
 	dw SFX_08_29_Ch1
 	db CH5
@@ -253,7 +253,7 @@
 	db CH7
 	dw SFX_08_29_Ch3
 
-SFX_08_2a: ; 20102 (8:4102)
+SFX_08_2a:: ; 20102 (8:4102)
 	db ( $80 | CH4 )
 	dw SFX_08_2a_Ch1
 	db CH5
@@ -261,7 +261,7 @@
 	db CH7
 	dw SFX_08_2a_Ch3
 
-SFX_08_2b: ; 2010b (8:410b)
+SFX_08_2b:: ; 2010b (8:410b)
 	db ( $80 | CH4 )
 	dw SFX_08_2b_Ch1
 	db CH5
@@ -269,7 +269,7 @@
 	db CH7
 	dw SFX_08_2b_Ch3
 
-SFX_08_2c: ; 20114 (8:4114)
+SFX_08_2c:: ; 20114 (8:4114)
 	db ( $80 | CH4 )
 	dw SFX_08_2c_Ch1
 	db CH5
@@ -277,7 +277,7 @@
 	db CH7
 	dw SFX_08_2c_Ch3
 
-SFX_08_2d: ; 2011d (8:411d)
+SFX_08_2d:: ; 2011d (8:411d)
 	db ( $80 | CH4 )
 	dw SFX_08_2d_Ch1
 	db CH5
@@ -285,7 +285,7 @@
 	db CH7
 	dw SFX_08_2d_Ch3
 
-SFX_08_2e: ; 20126 (8:4126)
+SFX_08_2e:: ; 20126 (8:4126)
 	db ( $80 | CH4 )
 	dw SFX_08_2e_Ch1
 	db CH5
@@ -293,7 +293,7 @@
 	db CH7
 	dw SFX_08_2e_Ch3
 
-SFX_08_2f: ; 2012f (8:412f)
+SFX_08_2f:: ; 2012f (8:412f)
 	db ( $80 | CH4 )
 	dw SFX_08_2f_Ch1
 	db CH5
@@ -301,7 +301,7 @@
 	db CH7
 	dw SFX_08_2f_Ch3
 
-SFX_08_30: ; 20138 (8:4138)
+SFX_08_30:: ; 20138 (8:4138)
 	db ( $80 | CH4 )
 	dw SFX_08_30_Ch1
 	db CH5
@@ -309,7 +309,7 @@
 	db CH7
 	dw SFX_08_30_Ch3
 
-SFX_08_31: ; 20141 (8:4141)
+SFX_08_31:: ; 20141 (8:4141)
 	db ( $80 | CH4 )
 	dw SFX_08_31_Ch1
 	db CH5
@@ -317,7 +317,7 @@
 	db CH7
 	dw SFX_08_31_Ch3
 
-SFX_08_32: ; 2014a (8:414a)
+SFX_08_32:: ; 2014a (8:414a)
 	db ( $80 | CH4 )
 	dw SFX_08_32_Ch1
 	db CH5
@@ -325,7 +325,7 @@
 	db CH7
 	dw SFX_08_32_Ch3
 
-SFX_08_33: ; 20153 (8:4153)
+SFX_08_33:: ; 20153 (8:4153)
 	db ( $80 | CH4 )
 	dw SFX_08_33_Ch1
 	db CH5
@@ -333,7 +333,7 @@
 	db CH7
 	dw SFX_08_33_Ch3
 
-SFX_08_34: ; 2015c (8:415c)
+SFX_08_34:: ; 2015c (8:415c)
 	db ( $80 | CH4 )
 	dw SFX_08_34_Ch1
 	db CH5
@@ -341,7 +341,7 @@
 	db CH7
 	dw SFX_08_34_Ch3
 
-SFX_08_35: ; 20165 (8:4165)
+SFX_08_35:: ; 20165 (8:4165)
 	db ( $80 | CH4 )
 	dw SFX_08_35_Ch1
 	db CH5
@@ -349,7 +349,7 @@
 	db CH7
 	dw SFX_08_35_Ch3
 
-SFX_08_36: ; 2016e (8:416e)
+SFX_08_36:: ; 2016e (8:416e)
 	db ( $80 | CH4 )
 	dw SFX_08_36_Ch1
 	db CH5
@@ -357,7 +357,7 @@
 	db CH7
 	dw SFX_08_36_Ch3
 
-SFX_08_37: ; 20177 (8:4177)
+SFX_08_37:: ; 20177 (8:4177)
 	db ( $80 | CH4 )
 	dw SFX_08_37_Ch1
 	db CH5
@@ -365,7 +365,7 @@
 	db CH7
 	dw SFX_08_37_Ch3
 
-SFX_08_38: ; 20180 (8:4180)
+SFX_08_38:: ; 20180 (8:4180)
 	db ( $80 | CH4 )
 	dw SFX_08_38_Ch1
 	db CH5
@@ -373,7 +373,7 @@
 	db CH7
 	dw SFX_08_38_Ch3
 
-SFX_08_39: ; 20189 (8:4189)
+SFX_08_39:: ; 20189 (8:4189)
 	db ( $80 | CH4 )
 	dw SFX_08_39_Ch1
 	db CH5
@@ -381,7 +381,7 @@
 	db CH7
 	dw SFX_08_39_Ch3
 
-SFX_08_3a: ; 20192 (8:4192)
+SFX_08_3a:: ; 20192 (8:4192)
 	db ( $80 | CH4 )
 	dw SFX_08_3a_Ch1
 	db CH5
@@ -389,7 +389,7 @@
 	db CH6
 	dw SFX_08_3a_Ch3
 
-SFX_08_3b: ; 2019b (8:419b)
+SFX_08_3b:: ; 2019b (8:419b)
 	db ( $80 | CH4 )
 	dw SFX_08_3b_Ch1
 	db CH5
@@ -397,55 +397,55 @@
 	db CH6
 	dw SFX_08_3b_Ch3
 
-SFX_08_3c: ; 201a4 (8:41a4)
+SFX_08_3c:: ; 201a4 (8:41a4)
 	db CH4
 	dw SFX_08_3c_Ch1
 
-SFX_08_3d: ; 201a7 (8:41a7)
+SFX_08_3d:: ; 201a7 (8:41a7)
 	db CH4
 	dw SFX_08_3d_Ch1
 
-SFX_08_3e: ; 201aa (8:41aa)
+SFX_08_3e:: ; 201aa (8:41aa)
 	db CH4
 	dw SFX_08_3e_Ch1
 
-SFX_08_3f: ; 201ad (8:41ad)
+SFX_08_3f:: ; 201ad (8:41ad)
 	db CH7
 	dw SFX_08_3f_Ch1
 
-SFX_08_40: ; 201b0 (8:41b0)
+SFX_08_40:: ; 201b0 (8:41b0)
 	db CH4
 	dw SFX_08_40_Ch1
 
-SFX_08_41: ; 201b3 (8:41b3)
+SFX_08_41:: ; 201b3 (8:41b3)
 	db ( $40 | CH4 )
 	dw SFX_08_41_Ch1
 	db CH5
 	dw SFX_08_41_Ch2
 
-SFX_08_42: ; 201b9 (8:41b9)
+SFX_08_42:: ; 201b9 (8:41b9)
 	db ( $40 | CH4 )
 	dw SFX_08_42_Ch1
 	db CH7
 	dw SFX_08_42_Ch2
 
-SFX_08_43: ; 201bf (8:41bf)
+SFX_08_43:: ; 201bf (8:41bf)
 	db ( $40 | CH4 )
 	dw SFX_08_43_Ch1
 	db CH7
 	dw SFX_08_43_Ch2
 
-SFX_08_44: ; 201c5 (8:41c5)
+SFX_08_44:: ; 201c5 (8:41c5)
 	db CH7
 	dw SFX_08_44_Ch1
 
-SFX_08_45: ; 201c8 (8:41c8)
+SFX_08_45:: ; 201c8 (8:41c8)
 	db ( $40 | CH4 )
 	dw SFX_08_45_Ch1
 	db CH5
 	dw SFX_08_45_Ch2
 
-SFX_08_46: ; 201ce (8:41ce)
+SFX_08_46:: ; 201ce (8:41ce)
 	db ( $80 | CH4 )
 	dw SFX_08_46_Ch1
 	db CH5
@@ -453,139 +453,139 @@
 	db CH6
 	dw SFX_08_46_Ch3
 
-SFX_08_47: ; 201d7 (8:41d7)
+SFX_08_47:: ; 201d7 (8:41d7)
 	db CH7
 	dw SFX_08_47_Ch1
 
-SFX_08_48: ; 201da (8:41da)
+SFX_08_48:: ; 201da (8:41da)
 	db CH4
 	dw SFX_08_48_Ch1
 
-SFX_08_49: ; 201dd (8:41dd)
+SFX_08_49:: ; 201dd (8:41dd)
 	db CH4
 	dw SFX_08_49_Ch1
 
-SFX_08_4a: ; 201e0 (8:41e0)
+SFX_08_4a:: ; 201e0 (8:41e0)
 	db CH7
 	dw SFX_08_4a_Ch1
 
-SFX_08_4b: ; 201e3 (8:41e3)
+SFX_08_4b:: ; 201e3 (8:41e3)
 	db CH7
 	dw SFX_08_4b_Ch1
 
-SFX_08_4c: ; 201e6 (8:41e6)
+SFX_08_4c:: ; 201e6 (8:41e6)
 	db CH7
 	dw SFX_08_4c_Ch1
 
-SFX_08_4d: ; 201e9 (8:41e9)
+SFX_08_4d:: ; 201e9 (8:41e9)
 	db CH7
 	dw SFX_08_4d_Ch1
 
-SFX_08_4e: ; 201ec (8:41ec)
+SFX_08_4e:: ; 201ec (8:41ec)
 	db CH7
 	dw SFX_08_4e_Ch1
 
-SFX_08_4f: ; 201ef (8:41ef)
+SFX_08_4f:: ; 201ef (8:41ef)
 	db CH7
 	dw SFX_08_4f_Ch1
 
-SFX_08_50: ; 201f2 (8:41f2)
+SFX_08_50:: ; 201f2 (8:41f2)
 	db CH7
 	dw SFX_08_50_Ch1
 
-SFX_08_51: ; 201f5 (8:41f5)
+SFX_08_51:: ; 201f5 (8:41f5)
 	db CH7
 	dw SFX_08_51_Ch1
 
-SFX_08_52: ; 201f8 (8:41f8)
+SFX_08_52:: ; 201f8 (8:41f8)
 	db CH7
 	dw SFX_08_52_Ch1
 
-SFX_08_53: ; 201fb (8:41fb)
+SFX_08_53:: ; 201fb (8:41fb)
 	db CH7
 	dw SFX_08_53_Ch1
 
-SFX_08_54: ; 201fe (8:41fe)
+SFX_08_54:: ; 201fe (8:41fe)
 	db CH7
 	dw SFX_08_54_Ch1
 
-SFX_08_55: ; 20201 (8:4201)
+SFX_08_55:: ; 20201 (8:4201)
 	db CH7
 	dw SFX_08_55_Ch1
 
-SFX_08_56: ; 20204 (8:4204)
+SFX_08_56:: ; 20204 (8:4204)
 	db CH7
 	dw SFX_08_56_Ch1
 
-SFX_08_57: ; 20207 (8:4207)
+SFX_08_57:: ; 20207 (8:4207)
 	db CH7
 	dw SFX_08_57_Ch1
 
-SFX_08_58: ; 2020a (8:420a)
+SFX_08_58:: ; 2020a (8:420a)
 	db CH7
 	dw SFX_08_58_Ch1
 
-SFX_08_59: ; 2020d (8:420d)
+SFX_08_59:: ; 2020d (8:420d)
 	db CH7
 	dw SFX_08_59_Ch1
 
-SFX_08_5a: ; 20210 (8:4210)
+SFX_08_5a:: ; 20210 (8:4210)
 	db CH7
 	dw SFX_08_5a_Ch1
 
-SFX_08_5b: ; 20213 (8:4213)
+SFX_08_5b:: ; 20213 (8:4213)
 	db CH7
 	dw SFX_08_5b_Ch1
 
-SFX_08_5c: ; 20216 (8:4216)
+SFX_08_5c:: ; 20216 (8:4216)
 	db CH7
 	dw SFX_08_5c_Ch1
 
-SFX_08_5d: ; 20219 (8:4219)
+SFX_08_5d:: ; 20219 (8:4219)
 	db CH7
 	dw SFX_08_5d_Ch1
 
-SFX_08_5e: ; 2021c (8:421c)
+SFX_08_5e:: ; 2021c (8:421c)
 	db ( $40 | CH4 )
 	dw SFX_08_5e_Ch1
 	db CH7
 	dw SFX_08_5e_Ch2
 
-SFX_08_5f: ; 20222 (8:4222)
+SFX_08_5f:: ; 20222 (8:4222)
 	db CH7
 	dw SFX_08_5f_Ch1
 
-SFX_08_60: ; 20225 (8:4225)
+SFX_08_60:: ; 20225 (8:4225)
 	db CH7
 	dw SFX_08_60_Ch1
 
-SFX_08_61: ; 20228 (8:4228)
+SFX_08_61:: ; 20228 (8:4228)
 	db CH7
 	dw SFX_08_61_Ch1
 
-SFX_08_62: ; 2022b (8:422b)
+SFX_08_62:: ; 2022b (8:422b)
 	db CH7
 	dw SFX_08_62_Ch1
 
-SFX_08_63: ; 2022e (8:422e)
+SFX_08_63:: ; 2022e (8:422e)
 	db CH7
 	dw SFX_08_63_Ch1
 
-SFX_08_64: ; 20231 (8:4231)
+SFX_08_64:: ; 20231 (8:4231)
 	db ( $40 | CH4 )
 	dw SFX_08_64_Ch1
 	db CH7
 	dw SFX_08_64_Ch2
 
-SFX_08_65: ; 20237 (8:4237)
+SFX_08_65:: ; 20237 (8:4237)
 	db CH7
 	dw SFX_08_65_Ch1
 
-SFX_08_66: ; 2023a (8:423a)
+SFX_08_66:: ; 2023a (8:423a)
 	db CH7
 	dw SFX_08_66_Ch1
 
-SFX_08_67: ; 2023d (8:423d)
+SFX_08_67:: ; 2023d (8:423d)
 	db ( $80 | CH4 )
 	dw SFX_08_67_Ch1
 	db CH5
@@ -593,7 +593,7 @@
 	db CH7
 	dw SFX_08_67_Ch3
 
-SFX_08_68: ; 20246 (8:4246)
+SFX_08_68:: ; 20246 (8:4246)
 	db ( $80 | CH4 )
 	dw SFX_08_68_Ch1
 	db CH5
@@ -601,13 +601,13 @@
 	db CH7
 	dw SFX_08_68_Ch3
 
-SFX_08_69: ; 2024f (8:424f)
+SFX_08_69:: ; 2024f (8:424f)
 	db ( $40 | CH4 )
 	dw SFX_08_69_Ch1
 	db CH7
 	dw SFX_08_69_Ch2
 
-SFX_08_6a: ; 20255 (8:4255)
+SFX_08_6a:: ; 20255 (8:4255)
 	db ( $80 | CH4 )
 	dw SFX_08_6a_Ch1
 	db CH5
@@ -615,13 +615,13 @@
 	db CH7
 	dw SFX_08_6a_Ch3
 
-SFX_08_6b: ; 2025e (8:425e)
+SFX_08_6b:: ; 2025e (8:425e)
 	db ( $40 | CH4 )
 	dw SFX_08_6b_Ch1
 	db CH7
 	dw SFX_08_6b_Ch2
 
-SFX_08_6c: ; 20264 (8:4264)
+SFX_08_6c:: ; 20264 (8:4264)
 	db ( $80 | CH4 )
 	dw SFX_08_6c_Ch1
 	db CH5
@@ -629,7 +629,7 @@
 	db CH7
 	dw SFX_08_6c_Ch3
 
-SFX_08_6d: ; 2026d (8:426d)
+SFX_08_6d:: ; 2026d (8:426d)
 	db ( $80 | CH4 )
 	dw SFX_08_6d_Ch1
 	db CH5
@@ -637,7 +637,7 @@
 	db CH7
 	dw SFX_08_6d_Ch3
 
-SFX_08_6e: ; 20276 (8:4276)
+SFX_08_6e:: ; 20276 (8:4276)
 	db ( $80 | CH4 )
 	dw SFX_08_6e_Ch1
 	db CH5
@@ -645,7 +645,7 @@
 	db CH7
 	dw SFX_08_6e_Ch3
 
-SFX_08_6f: ; 2027f (8:427f)
+SFX_08_6f:: ; 2027f (8:427f)
 	db ( $80 | CH4 )
 	dw SFX_08_6f_Ch1
 	db CH5
@@ -653,7 +653,7 @@
 	db CH7
 	dw SFX_08_6f_Ch3
 
-SFX_08_70: ; 20288 (8:4288)
+SFX_08_70:: ; 20288 (8:4288)
 	db ( $80 | CH4 )
 	dw SFX_08_70_Ch1
 	db CH5
@@ -661,25 +661,25 @@
 	db CH7
 	dw SFX_08_70_Ch3
 
-SFX_08_71: ; 20291 (8:4291)
+SFX_08_71:: ; 20291 (8:4291)
 	db ( $40 | CH4 )
 	dw SFX_08_71_Ch1
 	db CH5
 	dw SFX_08_71_Ch2
 
-SFX_08_72: ; 20297 (8:4297)
+SFX_08_72:: ; 20297 (8:4297)
 	db ( $40 | CH4 )
 	dw SFX_08_72_Ch1
 	db CH5
 	dw SFX_08_72_Ch2
 
-SFX_08_73: ; 2029d (8:429d)
+SFX_08_73:: ; 2029d (8:429d)
 	db ( $40 | CH4 )
 	dw SFX_08_73_Ch1
 	db CH5
 	dw SFX_08_73_Ch2
 
-SFX_08_74: ; 202a3 (8:42a3)
+SFX_08_74:: ; 202a3 (8:42a3)
 	db ( $80 | CH4 )
 	dw SFX_08_74_Ch1
 	db CH5
@@ -687,13 +687,13 @@
 	db CH7
 	dw SFX_08_74_Ch3
 
-SFX_08_75: ; 202ac (8:42ac)
+SFX_08_75:: ; 202ac (8:42ac)
 	db ( $40 | CH4 )
 	dw SFX_08_75_Ch1
 	db CH5
 	dw SFX_08_75_Ch2
 
-SFX_08_76: ; 202b2 (8:42b2)
+SFX_08_76:: ; 202b2 (8:42b2)
 	db ( $80 | CH4 )
 	dw SFX_08_76_Ch1
 	db CH5
@@ -701,7 +701,7 @@
 	db CH7
 	dw SFX_08_76_Ch3
 
-SFX_08_77: ; 202bb (8:42bb)
+SFX_08_77:: ; 202bb (8:42bb)
 	db CH4
 	dw SFX_08_77_Ch1
 
--- a/music/headers/sfxheaders1f.asm
+++ b/music/headers/sfxheaders1f.asm
@@ -1,83 +1,83 @@
-SFX_Headers_1f:
+SFX_Headers_1f::
 	db $ff, $ff, $ff ; padding
 
-SFX_1f_01: ; 7c003 (1f:4003)
+SFX_1f_01:: ; 7c003 (1f:4003)
 	db CH7
 	dw SFX_1f_01_Ch1
 
-SFX_1f_02: ; 7c006 (1f:4006)
+SFX_1f_02:: ; 7c006 (1f:4006)
 	db CH7
 	dw SFX_1f_02_Ch1
 
-SFX_1f_03: ; 7c009 (1f:4009)
+SFX_1f_03:: ; 7c009 (1f:4009)
 	db CH7
 	dw SFX_1f_03_Ch1
 
-SFX_1f_04: ; 7c00c (1f:400c)
+SFX_1f_04:: ; 7c00c (1f:400c)
 	db CH7
 	dw SFX_1f_04_Ch1
 
-SFX_1f_05: ; 7c00f (1f:400f)
+SFX_1f_05:: ; 7c00f (1f:400f)
 	db CH7
 	dw SFX_1f_05_Ch1
 
-SFX_1f_06: ; 7c012 (1f:4012)
+SFX_1f_06:: ; 7c012 (1f:4012)
 	db CH7
 	dw SFX_1f_06_Ch1
 
-SFX_1f_07: ; 7c015 (1f:4015)
+SFX_1f_07:: ; 7c015 (1f:4015)
 	db CH7
 	dw SFX_1f_07_Ch1
 
-SFX_1f_08: ; 7c018 (1f:4018)
+SFX_1f_08:: ; 7c018 (1f:4018)
 	db CH7
 	dw SFX_1f_08_Ch1
 
-SFX_1f_09: ; 7c01b (1f:401b)
+SFX_1f_09:: ; 7c01b (1f:401b)
 	db CH7
 	dw SFX_1f_09_Ch1
 
-SFX_1f_0a: ; 7c01e (1f:401e)
+SFX_1f_0a:: ; 7c01e (1f:401e)
 	db CH7
 	dw SFX_1f_0a_Ch1
 
-SFX_1f_0b: ; 7c021 (1f:4021)
+SFX_1f_0b:: ; 7c021 (1f:4021)
 	db CH7
 	dw SFX_1f_0b_Ch1
 
-SFX_1f_0c: ; 7c024 (1f:4024)
+SFX_1f_0c:: ; 7c024 (1f:4024)
 	db CH7
 	dw SFX_1f_0c_Ch1
 
-SFX_1f_0d: ; 7c027 (1f:4027)
+SFX_1f_0d:: ; 7c027 (1f:4027)
 	db CH7
 	dw SFX_1f_0d_Ch1
 
-SFX_1f_0e: ; 7c02a (1f:402a)
+SFX_1f_0e:: ; 7c02a (1f:402a)
 	db CH7
 	dw SFX_1f_0e_Ch1
 
-SFX_1f_0f: ; 7c02d (1f:402d)
+SFX_1f_0f:: ; 7c02d (1f:402d)
 	db CH7
 	dw SFX_1f_0f_Ch1
 
-SFX_1f_10: ; 7c030 (1f:4030)
+SFX_1f_10:: ; 7c030 (1f:4030)
 	db CH7
 	dw SFX_1f_10_Ch1
 
-SFX_1f_11: ; 7c033 (1f:4033)
+SFX_1f_11:: ; 7c033 (1f:4033)
 	db CH7
 	dw SFX_1f_11_Ch1
 
-SFX_1f_12: ; 7c036 (1f:4036)
+SFX_1f_12:: ; 7c036 (1f:4036)
 	db CH7
 	dw SFX_1f_12_Ch1
 
-SFX_1f_13: ; 7c039 (1f:4039)
+SFX_1f_13:: ; 7c039 (1f:4039)
 	db CH7
 	dw SFX_1f_13_Ch1
 
-SFX_1f_14: ; 7c03c (1f:403c)
+SFX_1f_14:: ; 7c03c (1f:403c)
 	db ( $80 | CH4 )
 	dw SFX_1f_14_Ch1
 	db CH5
@@ -85,7 +85,7 @@
 	db CH7
 	dw SFX_1f_14_Ch3
 
-SFX_1f_15: ; 7c045 (1f:4045)
+SFX_1f_15:: ; 7c045 (1f:4045)
 	db ( $80 | CH4 )
 	dw SFX_1f_15_Ch1
 	db CH5
@@ -93,7 +93,7 @@
 	db CH7
 	dw SFX_1f_15_Ch3
 
-SFX_1f_16: ; 7c04e (1f:404e)
+SFX_1f_16:: ; 7c04e (1f:404e)
 	db ( $80 | CH4 )
 	dw SFX_1f_16_Ch1
 	db CH5
@@ -101,7 +101,7 @@
 	db CH7
 	dw SFX_1f_16_Ch3
 
-SFX_1f_17: ; 7c057 (1f:4057)
+SFX_1f_17:: ; 7c057 (1f:4057)
 	db ( $80 | CH4 )
 	dw SFX_1f_17_Ch1
 	db CH5
@@ -109,7 +109,7 @@
 	db CH7
 	dw SFX_1f_17_Ch3
 
-SFX_1f_18: ; 7c060 (1f:4060)
+SFX_1f_18:: ; 7c060 (1f:4060)
 	db ( $80 | CH4 )
 	dw SFX_1f_18_Ch1
 	db CH5
@@ -117,7 +117,7 @@
 	db CH7
 	dw SFX_1f_18_Ch3
 
-SFX_1f_19: ; 7c069 (1f:4069)
+SFX_1f_19:: ; 7c069 (1f:4069)
 	db ( $80 | CH4 )
 	dw SFX_1f_19_Ch1
 	db CH5
@@ -125,7 +125,7 @@
 	db CH7
 	dw SFX_1f_19_Ch3
 
-SFX_1f_1a: ; 7c072 (1f:4072)
+SFX_1f_1a:: ; 7c072 (1f:4072)
 	db ( $80 | CH4 )
 	dw SFX_1f_1a_Ch1
 	db CH5
@@ -133,7 +133,7 @@
 	db CH7
 	dw SFX_1f_1a_Ch3
 
-SFX_1f_1b: ; 7c07b (1f:407b)
+SFX_1f_1b:: ; 7c07b (1f:407b)
 	db ( $80 | CH4 )
 	dw SFX_1f_1b_Ch1
 	db CH5
@@ -141,7 +141,7 @@
 	db CH7
 	dw SFX_1f_1b_Ch3
 
-SFX_1f_1c: ; 7c084 (1f:4084)
+SFX_1f_1c:: ; 7c084 (1f:4084)
 	db ( $80 | CH4 )
 	dw SFX_1f_1c_Ch1
 	db CH5
@@ -149,7 +149,7 @@
 	db CH7
 	dw SFX_1f_1c_Ch3
 
-SFX_1f_1d: ; 7c08d (1f:408d)
+SFX_1f_1d:: ; 7c08d (1f:408d)
 	db ( $80 | CH4 )
 	dw SFX_1f_1d_Ch1
 	db CH5
@@ -157,7 +157,7 @@
 	db CH7
 	dw SFX_1f_1d_Ch3
 
-SFX_1f_1e: ; 7c096 (1f:4096)
+SFX_1f_1e:: ; 7c096 (1f:4096)
 	db ( $80 | CH4 )
 	dw SFX_1f_1e_Ch1
 	db CH5
@@ -165,7 +165,7 @@
 	db CH7
 	dw SFX_1f_1e_Ch3
 
-SFX_1f_1f: ; 7c09f (1f:409f)
+SFX_1f_1f:: ; 7c09f (1f:409f)
 	db ( $80 | CH4 )
 	dw SFX_1f_1f_Ch1
 	db CH5
@@ -173,7 +173,7 @@
 	db CH7
 	dw SFX_1f_1f_Ch3
 
-SFX_1f_20: ; 7c0a8 (1f:40a8)
+SFX_1f_20:: ; 7c0a8 (1f:40a8)
 	db ( $80 | CH4 )
 	dw SFX_1f_20_Ch1
 	db CH5
@@ -181,7 +181,7 @@
 	db CH7
 	dw SFX_1f_20_Ch3
 
-SFX_1f_21: ; 7c0b1 (1f:40b1)
+SFX_1f_21:: ; 7c0b1 (1f:40b1)
 	db ( $80 | CH4 )
 	dw SFX_1f_21_Ch1
 	db CH5
@@ -189,7 +189,7 @@
 	db CH7
 	dw SFX_1f_21_Ch3
 
-SFX_1f_22: ; 7c0ba (1f:40ba)
+SFX_1f_22:: ; 7c0ba (1f:40ba)
 	db ( $80 | CH4 )
 	dw SFX_1f_22_Ch1
 	db CH5
@@ -197,7 +197,7 @@
 	db CH7
 	dw SFX_1f_22_Ch3
 
-SFX_1f_23: ; 7c0c3 (1f:40c3)
+SFX_1f_23:: ; 7c0c3 (1f:40c3)
 	db ( $80 | CH4 )
 	dw SFX_1f_23_Ch1
 	db CH5
@@ -205,7 +205,7 @@
 	db CH7
 	dw SFX_1f_23_Ch3
 
-SFX_1f_24: ; 7c0cc (1f:40cc)
+SFX_1f_24:: ; 7c0cc (1f:40cc)
 	db ( $80 | CH4 )
 	dw SFX_1f_24_Ch1
 	db CH5
@@ -213,7 +213,7 @@
 	db CH7
 	dw SFX_1f_24_Ch3
 
-SFX_1f_25: ; 7c0d5 (1f:40d5)
+SFX_1f_25:: ; 7c0d5 (1f:40d5)
 	db ( $80 | CH4 )
 	dw SFX_1f_25_Ch1
 	db CH5
@@ -221,7 +221,7 @@
 	db CH7
 	dw SFX_1f_25_Ch3
 
-SFX_1f_26: ; 7c0de (1f:40de)
+SFX_1f_26:: ; 7c0de (1f:40de)
 	db ( $80 | CH4 )
 	dw SFX_1f_26_Ch1
 	db CH5
@@ -229,7 +229,7 @@
 	db CH7
 	dw SFX_1f_26_Ch3
 
-SFX_1f_27: ; 7c0e7 (1f:40e7)
+SFX_1f_27:: ; 7c0e7 (1f:40e7)
 	db ( $80 | CH4 )
 	dw SFX_1f_27_Ch1
 	db CH5
@@ -237,7 +237,7 @@
 	db CH7
 	dw SFX_1f_27_Ch3
 
-SFX_1f_28: ; 7c0f0 (1f:40f0)
+SFX_1f_28:: ; 7c0f0 (1f:40f0)
 	db ( $80 | CH4 )
 	dw SFX_1f_28_Ch1
 	db CH5
@@ -245,7 +245,7 @@
 	db CH7
 	dw SFX_1f_28_Ch3
 
-SFX_1f_29: ; 7c0f9 (1f:40f9)
+SFX_1f_29:: ; 7c0f9 (1f:40f9)
 	db ( $80 | CH4 )
 	dw SFX_1f_29_Ch1
 	db CH5
@@ -253,7 +253,7 @@
 	db CH7
 	dw SFX_1f_29_Ch3
 
-SFX_1f_2a: ; 7c102 (1f:4102)
+SFX_1f_2a:: ; 7c102 (1f:4102)
 	db ( $80 | CH4 )
 	dw SFX_1f_2a_Ch1
 	db CH5
@@ -261,7 +261,7 @@
 	db CH7
 	dw SFX_1f_2a_Ch3
 
-SFX_1f_2b: ; 7c10b (1f:410b)
+SFX_1f_2b:: ; 7c10b (1f:410b)
 	db ( $80 | CH4 )
 	dw SFX_1f_2b_Ch1
 	db CH5
@@ -269,7 +269,7 @@
 	db CH7
 	dw SFX_1f_2b_Ch3
 
-SFX_1f_2c: ; 7c114 (1f:4114)
+SFX_1f_2c:: ; 7c114 (1f:4114)
 	db ( $80 | CH4 )
 	dw SFX_1f_2c_Ch1
 	db CH5
@@ -277,7 +277,7 @@
 	db CH7
 	dw SFX_1f_2c_Ch3
 
-SFX_1f_2d: ; 7c11d (1f:411d)
+SFX_1f_2d:: ; 7c11d (1f:411d)
 	db ( $80 | CH4 )
 	dw SFX_1f_2d_Ch1
 	db CH5
@@ -285,7 +285,7 @@
 	db CH7
 	dw SFX_1f_2d_Ch3
 
-SFX_1f_2e: ; 7c126 (1f:4126)
+SFX_1f_2e:: ; 7c126 (1f:4126)
 	db ( $80 | CH4 )
 	dw SFX_1f_2e_Ch1
 	db CH5
@@ -293,7 +293,7 @@
 	db CH7
 	dw SFX_1f_2e_Ch3
 
-SFX_1f_2f: ; 7c12f (1f:412f)
+SFX_1f_2f:: ; 7c12f (1f:412f)
 	db ( $80 | CH4 )
 	dw SFX_1f_2f_Ch1
 	db CH5
@@ -301,7 +301,7 @@
 	db CH7
 	dw SFX_1f_2f_Ch3
 
-SFX_1f_30: ; 7c138 (1f:4138)
+SFX_1f_30:: ; 7c138 (1f:4138)
 	db ( $80 | CH4 )
 	dw SFX_1f_30_Ch1
 	db CH5
@@ -309,7 +309,7 @@
 	db CH7
 	dw SFX_1f_30_Ch3
 
-SFX_1f_31: ; 7c141 (1f:4141)
+SFX_1f_31:: ; 7c141 (1f:4141)
 	db ( $80 | CH4 )
 	dw SFX_1f_31_Ch1
 	db CH5
@@ -317,7 +317,7 @@
 	db CH7
 	dw SFX_1f_31_Ch3
 
-SFX_1f_32: ; 7c14a (1f:414a)
+SFX_1f_32:: ; 7c14a (1f:414a)
 	db ( $80 | CH4 )
 	dw SFX_1f_32_Ch1
 	db CH5
@@ -325,7 +325,7 @@
 	db CH7
 	dw SFX_1f_32_Ch3
 
-SFX_1f_33: ; 7c153 (1f:4153)
+SFX_1f_33:: ; 7c153 (1f:4153)
 	db ( $80 | CH4 )
 	dw SFX_1f_33_Ch1
 	db CH5
@@ -333,7 +333,7 @@
 	db CH7
 	dw SFX_1f_33_Ch3
 
-SFX_1f_34: ; 7c15c (1f:415c)
+SFX_1f_34:: ; 7c15c (1f:415c)
 	db ( $80 | CH4 )
 	dw SFX_1f_34_Ch1
 	db CH5
@@ -341,7 +341,7 @@
 	db CH7
 	dw SFX_1f_34_Ch3
 
-SFX_1f_35: ; 7c165 (1f:4165)
+SFX_1f_35:: ; 7c165 (1f:4165)
 	db ( $80 | CH4 )
 	dw SFX_1f_35_Ch1
 	db CH5
@@ -349,7 +349,7 @@
 	db CH7
 	dw SFX_1f_35_Ch3
 
-SFX_1f_36: ; 7c16e (1f:416e)
+SFX_1f_36:: ; 7c16e (1f:416e)
 	db ( $80 | CH4 )
 	dw SFX_1f_36_Ch1
 	db CH5
@@ -357,7 +357,7 @@
 	db CH7
 	dw SFX_1f_36_Ch3
 
-SFX_1f_37: ; 7c177 (1f:4177)
+SFX_1f_37:: ; 7c177 (1f:4177)
 	db ( $80 | CH4 )
 	dw SFX_1f_37_Ch1
 	db CH5
@@ -365,7 +365,7 @@
 	db CH7
 	dw SFX_1f_37_Ch3
 
-SFX_1f_38: ; 7c180 (1f:4180)
+SFX_1f_38:: ; 7c180 (1f:4180)
 	db ( $80 | CH4 )
 	dw SFX_1f_38_Ch1
 	db CH5
@@ -373,7 +373,7 @@
 	db CH7
 	dw SFX_1f_38_Ch3
 
-SFX_1f_39: ; 7c189 (1f:4189)
+SFX_1f_39:: ; 7c189 (1f:4189)
 	db ( $80 | CH4 )
 	dw SFX_1f_39_Ch1
 	db CH5
@@ -381,7 +381,7 @@
 	db CH7
 	dw SFX_1f_39_Ch3
 
-SFX_1f_3a: ; 7c192 (1f:4192)
+SFX_1f_3a:: ; 7c192 (1f:4192)
 	db ( $80 | CH4 )
 	dw SFX_1f_3a_Ch1
 	db CH5
@@ -389,7 +389,7 @@
 	db CH6
 	dw SFX_1f_3a_Ch3
 
-SFX_1f_3b: ; 7c19b (1f:419b)
+SFX_1f_3b:: ; 7c19b (1f:419b)
 	db ( $80 | CH4 )
 	dw SFX_1f_3b_Ch1
 	db CH5
@@ -397,27 +397,27 @@
 	db CH6
 	dw SFX_1f_3b_Ch3
 
-SFX_1f_3c: ; 7c1a4 (1f:41a4)
+SFX_1f_3c:: ; 7c1a4 (1f:41a4)
 	db CH4
 	dw SFX_1f_3c_Ch1
 
-SFX_1f_3d: ; 7c1a7 (1f:41a7)
+SFX_1f_3d:: ; 7c1a7 (1f:41a7)
 	db CH4
 	dw SFX_1f_3d_Ch1
 
-SFX_1f_3e: ; 7c1aa (1f:41aa)
+SFX_1f_3e:: ; 7c1aa (1f:41aa)
 	db CH4
 	dw SFX_1f_3e_Ch1
 
-SFX_1f_3f: ; 7c1ad (1f:41ad)
+SFX_1f_3f:: ; 7c1ad (1f:41ad)
 	db CH7
 	dw SFX_1f_3f_Ch1
 
-SFX_1f_40: ; 7c1b0 (1f:41b0)
+SFX_1f_40:: ; 7c1b0 (1f:41b0)
 	db CH4
 	dw SFX_1f_40_Ch1
 
-SFX_1f_41: ; 7c1b3 (1f:41b3)
+SFX_1f_41:: ; 7c1b3 (1f:41b3)
 	db ( $80 | CH4 )
 	dw SFX_1f_41_Ch1
 	db CH5
@@ -425,7 +425,7 @@
 	db CH6
 	dw SFX_1f_41_Ch3
 
-SFX_1f_42: ; 7c1bc (1f:41bc)
+SFX_1f_42:: ; 7c1bc (1f:41bc)
 	db ( $80 | CH4 )
 	dw SFX_1f_42_Ch1
 	db CH5
@@ -433,165 +433,165 @@
 	db CH6
 	dw SFX_1f_42_Ch3
 
-SFX_1f_43: ; 7c1c5 (1f:41c5)
+SFX_1f_43:: ; 7c1c5 (1f:41c5)
 	db CH4
 	dw SFX_1f_43_Ch1
 
-SFX_1f_44: ; 7c1c8 (1f:41c8)
+SFX_1f_44:: ; 7c1c8 (1f:41c8)
 	db CH4
 	dw SFX_1f_44_Ch1
 
-SFX_1f_45: ; 7c1cb (1f:41cb)
+SFX_1f_45:: ; 7c1cb (1f:41cb)
 	db CH4
 	dw SFX_1f_45_Ch1
 
-SFX_1f_46: ; 7c1ce (1f:41ce)
+SFX_1f_46:: ; 7c1ce (1f:41ce)
 	db CH4
 	dw SFX_1f_46_Ch1
 
-SFX_1f_47: ; 7c1d1 (1f:41d1)
+SFX_1f_47:: ; 7c1d1 (1f:41d1)
 	db CH4
 	dw SFX_1f_47_Ch1
 
-SFX_1f_48: ; 7c1d4 (1f:41d4)
+SFX_1f_48:: ; 7c1d4 (1f:41d4)
 	db CH4
 	dw SFX_1f_48_Ch1
 
-SFX_1f_49: ; 7c1d7 (1f:41d7)
+SFX_1f_49:: ; 7c1d7 (1f:41d7)
 	db CH4
 	dw SFX_1f_49_Ch1
 
-SFX_1f_4a: ; 7c1da (1f:41da)
+SFX_1f_4a:: ; 7c1da (1f:41da)
 	db CH4
 	dw SFX_1f_4a_Ch1
 
-SFX_1f_4b: ; 7c1dd (1f:41dd)
+SFX_1f_4b:: ; 7c1dd (1f:41dd)
 	db CH4
 	dw SFX_1f_4b_Ch1
 
-SFX_1f_4c: ; 7c1e0 (1f:41e0)
+SFX_1f_4c:: ; 7c1e0 (1f:41e0)
 	db CH4
 	dw SFX_1f_4c_Ch1
 
-SFX_1f_4d: ; 7c1e3 (1f:41e3)
+SFX_1f_4d:: ; 7c1e3 (1f:41e3)
 	db CH4
 	dw SFX_1f_4d_Ch1
 
-SFX_1f_4e: ; 7c1e6 (1f:41e6)
+SFX_1f_4e:: ; 7c1e6 (1f:41e6)
 	db CH4
 	dw SFX_1f_4e_Ch1
 
-SFX_1f_4f: ; 7c1e9 (1f:41e9)
+SFX_1f_4f:: ; 7c1e9 (1f:41e9)
 	db CH7
 	dw SFX_1f_4f_Ch1
 
-SFX_1f_50: ; 7c1ec (1f:41ec)
+SFX_1f_50:: ; 7c1ec (1f:41ec)
 	db CH7
 	dw SFX_1f_50_Ch1
 
-SFX_1f_51: ; 7c1ef (1f:41ef)
+SFX_1f_51:: ; 7c1ef (1f:41ef)
 	db ( $40 | CH4 )
 	dw SFX_1f_51_Ch1
 	db CH5
 	dw SFX_1f_51_Ch2
 
-SFX_1f_52: ; 7c1f5 (1f:41f5)
+SFX_1f_52:: ; 7c1f5 (1f:41f5)
 	db CH4
 	dw SFX_1f_52_Ch1
 
-SFX_1f_53: ; 7c1f8 (1f:41f8)
+SFX_1f_53:: ; 7c1f8 (1f:41f8)
 	db CH7
 	dw SFX_1f_53_Ch1
 
-SFX_1f_54: ; 7c1fb (1f:41fb)
+SFX_1f_54:: ; 7c1fb (1f:41fb)
 	db ( $40 | CH4 )
 	dw SFX_1f_54_Ch1
 	db CH5
 	dw SFX_1f_54_Ch2
 
-SFX_1f_55: ; 7c201 (1f:4201)
+SFX_1f_55:: ; 7c201 (1f:4201)
 	db CH4
 	dw SFX_1f_55_Ch1
 
-SFX_1f_56: ; 7c204 (1f:4204)
+SFX_1f_56:: ; 7c204 (1f:4204)
 	db CH7
 	dw SFX_1f_56_Ch1
 
-SFX_1f_57: ; 7c207 (1f:4207)
+SFX_1f_57:: ; 7c207 (1f:4207)
 	db CH7
 	dw SFX_1f_57_Ch1
 
-SFX_1f_58: ; 7c20a (1f:420a)
+SFX_1f_58:: ; 7c20a (1f:420a)
 	db ( $40 | CH4 )
 	dw SFX_1f_58_Ch1
 	db CH5
 	dw SFX_1f_58_Ch2
 
-SFX_1f_59: ; 7c210 (1f:4210)
+SFX_1f_59:: ; 7c210 (1f:4210)
 	db ( $40 | CH4 )
 	dw SFX_1f_59_Ch1
 	db CH5
 	dw SFX_1f_59_Ch2
 
-SFX_1f_5a: ; 7c216 (1f:4216)
+SFX_1f_5a:: ; 7c216 (1f:4216)
 	db ( $40 | CH4 )
 	dw SFX_1f_5a_Ch1
 	db CH5
 	dw SFX_1f_5a_Ch2
 
-SFX_1f_5b: ; 7c21c (1f:421c)
+SFX_1f_5b:: ; 7c21c (1f:421c)
 	db CH4
 	dw SFX_1f_5b_Ch1
 
-SFX_1f_5c: ; 7c21f (1f:421f)
+SFX_1f_5c:: ; 7c21f (1f:421f)
 	db CH7
 	dw SFX_1f_5c_Ch1
 
-SFX_1f_5d: ; 7c222 (1f:4222)
+SFX_1f_5d:: ; 7c222 (1f:4222)
 	db ( $40 | CH4 )
 	dw SFX_1f_5d_Ch1
 	db CH5
 	dw SFX_1f_5d_Ch2
 
-SFX_1f_5e: ; 7c228 (1f:4228)
+SFX_1f_5e:: ; 7c228 (1f:4228)
 	db CH7
 	dw SFX_1f_5e_Ch1
 
-SFX_1f_5f: ; 7c22b (1f:422b)
+SFX_1f_5f:: ; 7c22b (1f:422b)
 	db CH4
 	dw SFX_1f_5f_Ch1
 
-SFX_1f_60: ; 7c22e (1f:422e)
+SFX_1f_60:: ; 7c22e (1f:422e)
 	db CH4
 	dw SFX_1f_60_Ch1
 
-SFX_1f_61: ; 7c231 (1f:4231)
+SFX_1f_61:: ; 7c231 (1f:4231)
 	db CH7
 	dw SFX_1f_61_Ch1
 
-SFX_1f_62: ; 7c234 (1f:4234)
+SFX_1f_62:: ; 7c234 (1f:4234)
 	db CH7
 	dw SFX_1f_62_Ch1
 
-SFX_1f_63: ; 7c237 (1f:4237)
+SFX_1f_63:: ; 7c237 (1f:4237)
 	db CH7
 	dw SFX_1f_63_Ch1
 
-SFX_1f_64: ; 7c23a (1f:423a)
+SFX_1f_64:: ; 7c23a (1f:423a)
 	db CH4
 	dw SFX_1f_64_Ch1
 
-SFX_1f_65: ; 7c23d (1f:423d)
+SFX_1f_65:: ; 7c23d (1f:423d)
 	db CH4
 	dw SFX_1f_65_Ch1
 
-SFX_1f_66: ; 7c240 (1f:4240)
+SFX_1f_66:: ; 7c240 (1f:4240)
 	db ( $40 | CH4 )
 	dw SFX_1f_66_Ch1
 	db CH5
 	dw SFX_1f_66_Ch2
 
-SFX_1f_67: ; 7c246 (1f:4246)
+SFX_1f_67:: ; 7c246 (1f:4246)
 	db CH4
 	dw SFX_1f_67_Ch1
 
--- a/music/indigoplateau.asm
+++ b/music/indigoplateau.asm
@@ -1,4 +1,4 @@
-Music_IndigoPlateau_Ch1: ; a5f0 (2:65f0)
+Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0)
 	tempo 0, 132
 	stereopanning 119
 	duty 3
@@ -13,7 +13,7 @@
 	notetype 12, 10, 4
 	note A#, 4
 
-Music_IndigoPlateau_branch_a605:
+Music_IndigoPlateau_branch_a605::
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 11, 4
 	octave 3
@@ -73,7 +73,7 @@
 	note A#, 8
 	loopchannel 0, Music_IndigoPlateau_branch_a605
 
-Music_IndigoPlateau_branch_a659:
+Music_IndigoPlateau_branch_a659::
 	notetype 12, 11, 2
 	octave 2
 	note A_, 4
@@ -86,7 +86,7 @@
 	endchannel
 
 
-Music_IndigoPlateau_Ch2: ; a664 (2:6664)
+Music_IndigoPlateau_Ch2:: ; a664 (2:6664)
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -98,7 +98,7 @@
 	notetype 12, 5, 10
 	note D#, 4
 
-Music_IndigoPlateau_branch_a673:
+Music_IndigoPlateau_branch_a673::
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
 	note A_, 4
@@ -134,7 +134,7 @@
 	note D#, 8
 	loopchannel 0, Music_IndigoPlateau_branch_a673
 
-Music_IndigoPlateau_branch_a6af:
+Music_IndigoPlateau_branch_a6af::
 	notetype 12, 12, 2
 	octave 3
 	note D_, 4
@@ -147,7 +147,7 @@
 	endchannel
 
 
-Music_IndigoPlateau_Ch3: ; a6ba (2:66ba)
+Music_IndigoPlateau_Ch3:: ; a6ba (2:66ba)
 	notetype 12, 1, 0
 	octave 4
 	note D_, 2
@@ -160,7 +160,7 @@
 	rest 2
 	note D#, 4
 
-Music_IndigoPlateau_branch_a6c6:
+Music_IndigoPlateau_branch_a6c6::
 	callchannel Music_IndigoPlateau_branch_a6fe
 	callchannel Music_IndigoPlateau_branch_a6fe
 	callchannel Music_IndigoPlateau_branch_a6fe
@@ -205,7 +205,7 @@
 	note D#, 8
 	loopchannel 0, Music_IndigoPlateau_branch_a6c6
 
-Music_IndigoPlateau_branch_a6fe:
+Music_IndigoPlateau_branch_a6fe::
 	octave 4
 	note D_, 2
 	rest 2
@@ -225,7 +225,7 @@
 	endchannel
 
 
-Music_IndigoPlateau_Ch4: ; a70f (2:670f)
+Music_IndigoPlateau_Ch4:: ; a70f (2:670f)
 	dspeed 6
 	dnote 16, mutedsnare2
 	dnote 16, mutedsnare2
@@ -240,7 +240,7 @@
 	dnote 1, mutedsnare3
 	dnote 1, mutedsnare3
 
-Music_IndigoPlateau_branch_a728:
+Music_IndigoPlateau_branch_a728::
 	callchannel Music_IndigoPlateau_branch_a791
 	callchannel Music_IndigoPlateau_branch_a77e
 	callchannel Music_IndigoPlateau_branch_a791
@@ -277,7 +277,7 @@
 	dnote 1, mutedsnare2
 	loopchannel 0, Music_IndigoPlateau_branch_a728
 
-Music_IndigoPlateau_branch_a77e:
+Music_IndigoPlateau_branch_a77e::
 	dnote 4, mutedsnare2
 	dnote 4, mutedsnare3
 	dnote 4, mutedsnare4
@@ -289,7 +289,7 @@
 	dnote 2, mutedsnare3
 	endchannel
 
-Music_IndigoPlateau_branch_a791:
+Music_IndigoPlateau_branch_a791::
 	dnote 4, mutedsnare2
 	dnote 4, mutedsnare3
 	dnote 4, mutedsnare4
@@ -303,7 +303,7 @@
 	dnote 1, mutedsnare3
 	endchannel
 
-Music_IndigoPlateau_branch_a7a8:
+Music_IndigoPlateau_branch_a7a8::
 	dnote 4, mutedsnare2
 	dnote 4, mutedsnare3
 	dnote 4, mutedsnare2
--- a/music/introbattle.asm
+++ b/music/introbattle.asm
@@ -1,4 +1,4 @@
-Music_IntroBattle_Ch1: ; 7f844 (1f:7844)
+Music_IntroBattle_Ch1:: ; 7f844 (1f:7844)
 	tempo 0, 98
 	stereopanning 119
 	duty 3
@@ -90,7 +90,7 @@
 	endchannel
 
 
-Music_IntroBattle_Ch2: ; 7f8bc (1f:78bc)
+Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc)
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -165,7 +165,7 @@
 	endchannel
 
 
-Music_IntroBattle_Ch3: ; 7f91d (1f:791d)
+Music_IntroBattle_Ch3:: ; 7f91d (1f:791d)
 	notetype 12, 1, 0
 	rest 8
 	octave 4
@@ -229,7 +229,7 @@
 	endchannel
 
 
-Music_IntroBattle_Ch4: ; 7f95b (1f:795b)
+Music_IntroBattle_Ch4:: ; 7f95b (1f:795b)
 	dspeed 6
 	dnote 1, mutedsnare4
 	dnote 1, mutedsnare4
--- a/music/jigglypuffsong.asm
+++ b/music/jigglypuffsong.asm
@@ -1,4 +1,4 @@
-Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d)
+Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d)
 	tempo 0, 144
 	stereopanning 119
 	vibrato 8, 2, 4
@@ -21,7 +21,7 @@
 	endchannel
 
 
-Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a)
+Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a)
 	vibrato 5, 1, 5
 	duty 2
 	dutycycle 10
--- a/music/lavender.asm
+++ b/music/lavender.asm
@@ -1,4 +1,4 @@
-Music_Lavender_Ch1: ; bb58 (2:7b58)
+Music_Lavender_Ch1:: ; bb58 (2:7b58)
 	tempo 0, 152
 	stereopanning 119
 	duty 1
@@ -11,7 +11,7 @@
 	rest 16
 	notetype 12, 10, 7
 
-Music_Lavender_branch_bb6b:
+Music_Lavender_branch_bb6b::
 	octave 3
 	note G_, 8
 	note G_, 8
@@ -62,12 +62,12 @@
 	loopchannel 0, Music_Lavender_branch_bb6b
 
 
-Music_Lavender_Ch2: ; bb9e (2:7b9e)
+Music_Lavender_Ch2:: ; bb9e (2:7b9e)
 	vibrato 0, 3, 4
 	duty 3
 	notetype 12, 9, 1
 
-Music_Lavender_branch_bba5:
+Music_Lavender_branch_bba5::
 	octave 5
 	note C_, 4
 	note G_, 4
@@ -76,7 +76,7 @@
 	loopchannel 0, Music_Lavender_branch_bba5
 
 
-Music_Lavender_Ch3: ; bbae (2:7bae)
+Music_Lavender_Ch3:: ; bbae (2:7bae)
 	vibrato 4, 1, 1
 	notetype 12, 3, 5
 	rest 16
@@ -85,7 +85,7 @@
 	rest 16
 	notetype 12, 2, 5
 
-Music_Lavender_branch_bbb9:
+Music_Lavender_branch_bbb9::
 	octave 4
 	note E_, 16
 	note D_, 16
@@ -186,7 +186,7 @@
 	loopchannel 0, Music_Lavender_branch_bbb9
 
 
-Music_Lavender_Ch4: ; bc21 (2:7c21)
+Music_Lavender_Ch4:: ; bc21 (2:7c21)
 	dspeed 12
 	rest 16
 	rest 16
@@ -193,7 +193,7 @@
 	rest 16
 	rest 16
 
-Music_Lavender_branch_bc26:
+Music_Lavender_branch_bc26::
 	dnote 8, triangle2
 	dnote 8, triangle2
 	loopchannel 0, Music_Lavender_branch_bc26
--- a/music/meeteviltrainer.asm
+++ b/music/meeteviltrainer.asm
@@ -1,4 +1,4 @@
-Music_MeetEvilTrainer_Ch1: ; 7f69d (1f:769d)
+Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d)
 	tempo 0, 124
 	stereopanning 119
 	duty 2
@@ -11,7 +11,7 @@
 	notetype 12, 4, 15
 	note D_, 4
 
-Music_MeetEvilTrainer_branch_7f6ae:
+Music_MeetEvilTrainer_branch_7f6ae::
 	notetype 12, 10, 1
 	note D_, 4
 	note D_, 4
@@ -21,7 +21,7 @@
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae
 
 
-Music_MeetEvilTrainer_Ch2: ; 7f6ba (1f:76ba)
+Music_MeetEvilTrainer_Ch2:: ; 7f6ba (1f:76ba)
 	duty 1
 	notetype 12, 11, 6
 	octave 3
@@ -29,7 +29,7 @@
 	note A#, 2
 	note B_, 8
 
-Music_MeetEvilTrainer_branch_7f6c2:
+Music_MeetEvilTrainer_branch_7f6c2::
 	notetype 12, 12, 2
 	octave 4
 	note D#, 2
@@ -60,7 +60,7 @@
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2
 
 
-Music_MeetEvilTrainer_Ch3: ; 7f6e6 (1f:76e6)
+Music_MeetEvilTrainer_Ch3:: ; 7f6e6 (1f:76e6)
 	notetype 12, 1, 0
 	rest 8
 	octave 4
@@ -69,7 +69,7 @@
 	note F_, 1
 	rest 1
 
-Music_MeetEvilTrainer_branch_7f6ee:
+Music_MeetEvilTrainer_branch_7f6ee::
 	note F#, 1
 	rest 3
 	note F#, 1
--- a/music/meetfemaletrainer.asm
+++ b/music/meetfemaletrainer.asm
@@ -1,4 +1,4 @@
-Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9)
+Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9)
 	tempo 0, 124
 	stereopanning 119
 	duty 1
@@ -13,7 +13,7 @@
 	note C_, 2
 	notetype 12, 8, 1
 
-Music_MeetFemaleTrainer_branch_7f70c:
+Music_MeetFemaleTrainer_branch_7f70c::
 	octave 3
 	note E_, 4
 	loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c
@@ -26,7 +26,7 @@
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c
 
 
-Music_MeetFemaleTrainer_Ch2: ; 7f71c (1f:771c)
+Music_MeetFemaleTrainer_Ch2:: ; 7f71c (1f:771c)
 	duty 2
 	notetype 12, 12, 2
 	octave 3
@@ -35,7 +35,7 @@
 	octave 4
 	note B_, 12
 
-Music_MeetFemaleTrainer_branch_7f726:
+Music_MeetFemaleTrainer_branch_7f726::
 	notetype 12, 12, 2
 	octave 3
 	note B_, 4
@@ -71,7 +71,7 @@
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f726
 
 
-Music_MeetFemaleTrainer_Ch3: ; 7f74b (1f:774b)
+Music_MeetFemaleTrainer_Ch3:: ; 7f74b (1f:774b)
 	notetype 12, 1, 0
 	rest 8
 	octave 5
@@ -83,7 +83,7 @@
 	note A_, 1
 	rest 1
 
-Music_MeetFemaleTrainer_branch_7f756:
+Music_MeetFemaleTrainer_branch_7f756::
 	callchannel Music_MeetFemaleTrainer_branch_7f770
 	note G#, 1
 	rest 3
@@ -104,7 +104,7 @@
 	rest 3
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f756
 
-Music_MeetFemaleTrainer_branch_7f770:
+Music_MeetFemaleTrainer_branch_7f770::
 	note G#, 1
 	rest 3
 	note E_, 1
--- a/music/meetmaletrainer.asm
+++ b/music/meetmaletrainer.asm
@@ -1,4 +1,4 @@
-Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b)
+Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b)
 	tempo 0, 112
 	stereopanning 119
 	duty 3
@@ -13,7 +13,7 @@
 	note F_, 12
 	rest 16
 
-Music_MeetMaleTrainer_branch_7f78f:
+Music_MeetMaleTrainer_branch_7f78f::
 	octave 3
 	note B_, 4
 	note A_, 4
@@ -32,7 +32,7 @@
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f78f
 
 
-Music_MeetMaleTrainer_Ch2: ; 7f7a2 (1f:77a2)
+Music_MeetMaleTrainer_Ch2:: ; 7f7a2 (1f:77a2)
 	duty 3
 	vibrato 24, 2, 2
 	notetype 12, 12, 4
@@ -49,7 +49,7 @@
 	note E_, 1
 	rest 9
 
-Music_MeetMaleTrainer_branch_7f7b5:
+Music_MeetMaleTrainer_branch_7f7b5::
 	notetype 12, 12, 4
 	octave 4
 	note E_, 6
@@ -75,7 +75,7 @@
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5
 
 
-Music_MeetMaleTrainer_Ch3: ; 7f7d2 (1f:77d2)
+Music_MeetMaleTrainer_Ch3:: ; 7f7d2 (1f:77d2)
 	notetype 12, 1, 0
 	rest 6
 	octave 4
@@ -100,7 +100,7 @@
 	note F#, 1
 	rest 1
 
-Music_MeetMaleTrainer_branch_7f7ea:
+Music_MeetMaleTrainer_branch_7f7ea::
 	note E_, 1
 	rest 1
 	note B_, 1
--- a/music/meetprofoak.asm
+++ b/music/meetprofoak.asm
@@ -1,4 +1,4 @@
-Music_MeetProfOak_Ch1: ; af59 (2:6f59)
+Music_MeetProfOak_Ch1:: ; af59 (2:6f59)
 	tempo 0, 112
 	stereopanning 119
 	duty 3
@@ -38,7 +38,7 @@
 	note F#, 2
 	note F#, 4
 
-Music_MeetProfOak_branch_af85:
+Music_MeetProfOak_branch_af85::
 	note F#, 6
 	note E_, 4
 	note A_, 2
@@ -74,7 +74,7 @@
 	loopchannel 0, Music_MeetProfOak_branch_af85
 
 
-Music_MeetProfOak_Ch2: ; afa9 (2:6fa9)
+Music_MeetProfOak_Ch2:: ; afa9 (2:6fa9)
 	vibrato 8, 1, 1
 	duty 2
 	notetype 12, 12, 4
@@ -155,7 +155,7 @@
 	note B_, 4
 	notetype 12, 11, 5
 
-Music_MeetProfOak_branch_b005:
+Music_MeetProfOak_branch_b005::
 	octave 4
 	note C#, 6
 	octave 3
@@ -208,7 +208,7 @@
 	loopchannel 0, Music_MeetProfOak_branch_b005
 
 
-Music_MeetProfOak_Ch3: ; b03d (2:703d)
+Music_MeetProfOak_Ch3:: ; b03d (2:703d)
 	notetype 12, 1, 2
 	rest 10
 	octave 4
@@ -336,7 +336,7 @@
 	note G#, 1
 	rest 1
 
-Music_MeetProfOak_branch_b0bc:
+Music_MeetProfOak_branch_b0bc::
 	octave 4
 	note A_, 1
 	rest 1
@@ -363,7 +363,7 @@
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b0bc
 
-Music_MeetProfOak_branch_b0d8:
+Music_MeetProfOak_branch_b0d8::
 	octave 4
 	note G#, 1
 	rest 1
@@ -383,7 +383,7 @@
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b0d8
 
-Music_MeetProfOak_branch_b0ed:
+Music_MeetProfOak_branch_b0ed::
 	note F#, 1
 	rest 1
 	note A_, 1
@@ -402,7 +402,7 @@
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b0ed
 
-Music_MeetProfOak_branch_b101:
+Music_MeetProfOak_branch_b101::
 	note G#, 1
 	rest 1
 	note B_, 1
--- a/music/meetrival.asm
+++ b/music/meetrival.asm
@@ -1,11 +1,11 @@
-Music_MeetRival_branch_b119:
+Music_MeetRival_branch_b119::
 	tempo 0, 100
 	loopchannel 0, Music_MeetRival_branch_b123
 
-Music_MeetRival_Ch1: ; b120 (2:7120)
+Music_MeetRival_Ch1:: ; b120 (2:7120)
 	tempo 0, 112
 
-Music_MeetRival_branch_b123:
+Music_MeetRival_branch_b123::
 	stereopanning 119
 	duty 3
 	vibrato 6, 3, 4
@@ -31,7 +31,7 @@
 	note G_, 2
 	note A_, 2
 
-Music_MeetRival_branch_b140:
+Music_MeetRival_branch_b140::
 	note B_, 4
 	note A#, 2
 	note A_, 4
@@ -119,14 +119,14 @@
 	note A_, 2
 	loopchannel 0, Music_MeetRival_branch_b140
 
-Music_MeetRival_branch_b19b:
+Music_MeetRival_branch_b19b::
 	tempo 0, 100
 	loopchannel 0, Music_MeetRival_branch_b1a5
 
-Music_MeetRival_branch_b1a2:
+Music_MeetRival_branch_b1a2::
 	tempo 0, 112
 
-Music_MeetRival_branch_b1a5:
+Music_MeetRival_branch_b1a5::
 	stereopanning 119
 	duty 3
 	vibrato 6, 3, 4
@@ -143,7 +143,7 @@
 	loopchannel 0, Music_MeetRival_branch_b140
 
 
-Music_MeetRival_Ch2: ; b1bb (2:71bb)
+Music_MeetRival_Ch2:: ; b1bb (2:71bb)
 	duty 3
 	vibrato 10, 2, 6
 	notetype 12, 12, 7
@@ -170,7 +170,7 @@
 	note F_, 2
 	note F#, 2
 
-Music_MeetRival_branch_b1d8:
+Music_MeetRival_branch_b1d8::
 	notetype 12, 12, 7
 	note G_, 4
 	note D_, 2
@@ -230,7 +230,7 @@
 	note F#, 2
 	loopchannel 0, Music_MeetRival_branch_b1d8
 
-Music_MeetRival_branch_b21d:
+Music_MeetRival_branch_b21d::
 	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:: ; b233 (2:7233)
 	notetype 12, 1, 4
 	octave 5
 	note D_, 2
@@ -273,7 +273,7 @@
 	note G_, 1
 	rest 1
 
-Music_MeetRival_branch_b24b:
+Music_MeetRival_branch_b24b::
 	note G_, 2
 	octave 5
 	note D_, 2
@@ -378,7 +378,7 @@
 	note D_, 2
 	loopchannel 0, Music_MeetRival_branch_b24b
 
-Music_MeetRival_branch_b2b5:
+Music_MeetRival_branch_b2b5::
 	notetype 12, 1, 4
 	octave 4
 	note G_, 1
--- a/music/museumguy.asm
+++ b/music/museumguy.asm
@@ -1,4 +1,4 @@
-Music_MuseumGuy_Ch1: ; adae (2:6dae)
+Music_MuseumGuy_Ch1:: ; adae (2:6dae)
 	tempo 0, 128
 	stereopanning 119
 	duty 2
@@ -29,7 +29,7 @@
 	note E_, 2
 	note E_, 6
 
-Music_MuseumGuy_branch_add6:
+Music_MuseumGuy_branch_add6::
 	callchannel Music_MuseumGuy_branch_ade7
 	callchannel Music_MuseumGuy_branch_adec
 	callchannel Music_MuseumGuy_branch_ade7
@@ -39,7 +39,7 @@
 	note E_, 6
 	loopchannel 0, Music_MuseumGuy_branch_add6
 
-Music_MuseumGuy_branch_ade7:
+Music_MuseumGuy_branch_ade7::
 	note E_, 2
 	note E_, 6
 	note F#, 2
@@ -46,7 +46,7 @@
 	note F#, 6
 	endchannel
 
-Music_MuseumGuy_branch_adec:
+Music_MuseumGuy_branch_adec::
 	note E_, 2
 	note E_, 6
 	note D_, 2
@@ -54,7 +54,7 @@
 	endchannel
 
 
-Music_MuseumGuy_Ch2: ; adf1 (2:6df1)
+Music_MuseumGuy_Ch2:: ; adf1 (2:6df1)
 	duty 2
 	notetype 12, 12, 1
 	octave 4
@@ -107,7 +107,7 @@
 	note A_, 2
 	note A_, 4
 
-Music_MuseumGuy_branch_ae26:
+Music_MuseumGuy_branch_ae26::
 	octave 3
 	note A_, 2
 	octave 4
@@ -165,7 +165,7 @@
 	loopchannel 0, Music_MuseumGuy_branch_ae26
 
 
-Music_MuseumGuy_Ch3: ; ae6e (2:6e6e)
+Music_MuseumGuy_Ch3:: ; ae6e (2:6e6e)
 	notetype 12, 1, 0
 	rest 16
 	octave 4
@@ -194,7 +194,7 @@
 	note A_, 1
 	rest 3
 
-Music_MuseumGuy_branch_ae8e:
+Music_MuseumGuy_branch_ae8e::
 	callchannel Music_MuseumGuy_branch_aec1
 	rest 3
 	octave 6
@@ -231,7 +231,7 @@
 	rest 3
 	loopchannel 0, Music_MuseumGuy_branch_ae8e
 
-Music_MuseumGuy_branch_aeb8:
+Music_MuseumGuy_branch_aeb8::
 	note A_, 1
 	rest 1
 	note A_, 1
@@ -242,7 +242,7 @@
 	rest 5
 	endchannel
 
-Music_MuseumGuy_branch_aec1:
+Music_MuseumGuy_branch_aec1::
 	octave 6
 	note C#, 1
 	rest 1
@@ -261,7 +261,7 @@
 	endchannel
 
 
-Music_MuseumGuy_Ch4: ; aed1 (2:6ed1)
+Music_MuseumGuy_Ch4:: ; aed1 (2:6ed1)
 	dspeed 12
 	rest 16
 	rest 16
@@ -275,7 +275,7 @@
 	dnote 1, mutedsnare3
 	dnote 1, mutedsnare3
 
-Music_MuseumGuy_branch_aee1:
+Music_MuseumGuy_branch_aee1::
 	dnote 4, mutedsnare2
 	dnote 6, mutedsnare2
 	dnote 2, mutedsnare2
--- a/music/oakslab.asm
+++ b/music/oakslab.asm
@@ -1,4 +1,4 @@
-Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9)
+Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9)
 	tempo 0, 140
 	stereopanning 119
 	duty 3
@@ -16,7 +16,7 @@
 	note A_, 1
 	note B_, 1
 
-Music_OaksLab_branch_7eed0:
+Music_OaksLab_branch_7eed0::
 	octave 4
 	note C#, 4
 	octave 3
@@ -69,7 +69,7 @@
 	loopchannel 0, Music_OaksLab_branch_7eed0
 
 
-Music_OaksLab_Ch2: ; 7ef05 (1f:6f05)
+Music_OaksLab_Ch2:: ; 7ef05 (1f:6f05)
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 4
@@ -84,7 +84,7 @@
 	note F#, 1
 	note G#, 1
 
-Music_OaksLab_branch_7ef16:
+Music_OaksLab_branch_7ef16::
 	note A_, 6
 	note G#, 1
 	note F#, 1
@@ -144,7 +144,7 @@
 	loopchannel 0, Music_OaksLab_branch_7ef16
 
 
-Music_OaksLab_Ch3: ; 7ef52 (1f:6f52)
+Music_OaksLab_Ch3:: ; 7ef52 (1f:6f52)
 	notetype 12, 1, 1
 	rest 2
 	octave 4
@@ -155,7 +155,7 @@
 	note E_, 1
 	rest 1
 
-Music_OaksLab_branch_7ef5c:
+Music_OaksLab_branch_7ef5c::
 	note C#, 1
 	rest 1
 	note A_, 1
--- a/music/pallettown.asm
+++ b/music/pallettown.asm
@@ -1,10 +1,10 @@
-Music_PalletTown_Ch1: ; a7c5 (2:67c5)
+Music_PalletTown_Ch1:: ; a7c5 (2:67c5)
 	tempo 0, 160
 	stereopanning 119
 	duty 2
 	notetype 12, 12, 3
 
-Music_PalletTown_branch_a7ce:
+Music_PalletTown_branch_a7ce::
 	octave 3
 	note B_, 4
 	octave 4
@@ -148,10 +148,10 @@
 	endchannel
 
 
-Music_PalletTown_Ch2: ; a85f (2:685f)
+Music_PalletTown_Ch2:: ; a85f (2:685f)
 	duty 2
 
-Music_PalletTown_branch_a861:
+Music_PalletTown_branch_a861::
 	notetype 12, 13, 3
 	octave 5
 	note D_, 2
@@ -262,11 +262,11 @@
 	endchannel
 
 
-Music_PalletTown_Ch3: ; a8de (2:68de)
+Music_PalletTown_Ch3:: ; a8de (2:68de)
 	vibrato 24, 2, 8
 	notetype 12, 1, 2
 
-Music_PalletTown_branch_a8e3:
+Music_PalletTown_branch_a8e3::
 	octave 4
 	note G_, 6
 	note E_, 6
--- a/music/pkmnhealed.asm
+++ b/music/pkmnhealed.asm
@@ -1,4 +1,4 @@
-Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3)
+Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3)
 	tempo 0, 144
 	stereopanning 119
 	duty 2
@@ -19,7 +19,7 @@
 	endchannel
 
 
-Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4)
+Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4)
 	duty 2
 	notetype 12, 12, 3
 	octave 4
@@ -33,7 +33,7 @@
 	endchannel
 
 
-Music_PkmnHealed_Ch3: ; 9bd2 (2:5bd2)
+Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2)
 	notetype 12, 1, 0
 	octave 4
 	note E_, 2
--- a/music/pokecenter.asm
+++ b/music/pokecenter.asm
@@ -1,4 +1,4 @@
-Music_Pokecenter_Ch1: ; be56 (2:7e56)
+Music_Pokecenter_Ch1:: ; be56 (2:7e56)
 	tempo 0, 144
 	stereopanning 119
 	duty 3
@@ -5,7 +5,7 @@
 	vibrato 10, 2, 2
 	togglecall
 
-Music_Pokecenter_branch_be61:
+Music_Pokecenter_branch_be61::
 	notetype 12, 10, 3
 	octave 3
 	note F#, 2
@@ -149,10 +149,10 @@
 	loopchannel 0, Music_Pokecenter_branch_be61
 
 
-Music_Pokecenter_Ch2: ; bef9 (2:7ef9)
+Music_Pokecenter_Ch2:: ; bef9 (2:7ef9)
 	vibrato 8, 2, 5
 
-Music_Pokecenter_branch_befc:
+Music_Pokecenter_branch_befc::
 	callchannel Music_Pokecenter_branch_bf4e
 	duty 3
 	notetype 12, 10, 5
@@ -215,7 +215,7 @@
 	note D_, 8
 	loopchannel 0, Music_Pokecenter_branch_befc
 
-Music_Pokecenter_branch_bf4e:
+Music_Pokecenter_branch_bf4e::
 	duty 2
 	notetype 12, 12, 2
 	octave 4
@@ -232,7 +232,7 @@
 	note C#, 6
 	endchannel
 
-Music_Pokecenter_branch_bf60:
+Music_Pokecenter_branch_bf60::
 	duty 2
 	notetype 12, 12, 2
 	octave 4
@@ -248,10 +248,10 @@
 	endchannel
 
 
-Music_Pokecenter_Ch3: ; bf70 (2:7f70)
+Music_Pokecenter_Ch3:: ; bf70 (2:7f70)
 	notetype 12, 1, 0
 
-Music_Pokecenter_branch_bf72:
+Music_Pokecenter_branch_bf72::
 	octave 4
 	note D_, 2
 	note F#, 2
@@ -341,7 +341,7 @@
 	note E_, 2
 	loopchannel 0, Music_Pokecenter_branch_bf72
 
-Music_Pokecenter_branch_bfd9:
+Music_Pokecenter_branch_bfd9::
 	note E_, 2
 	note A_, 2
 	note E_, 2
@@ -352,7 +352,7 @@
 	note A_, 2
 	endchannel
 
-Music_Pokecenter_branch_bfe2:
+Music_Pokecenter_branch_bfe2::
 	note E_, 2
 	note A_, 2
 	note E_, 2
@@ -363,7 +363,7 @@
 	note A_, 2
 	endchannel
 
-Music_Pokecenter_branch_bfeb:
+Music_Pokecenter_branch_bfeb::
 	note F#, 2
 	note A_, 2
 	note F#, 2
--- a/music/pokemontower.asm
+++ b/music/pokemontower.asm
@@ -1,4 +1,4 @@
-Music_PokemonTower_Ch1: ; 7f04a (1f:704a)
+Music_PokemonTower_Ch1:: ; 7f04a (1f:704a)
 	tempo 0, 152
 	stereopanning 119
 	duty 3
@@ -9,7 +9,7 @@
 	octave 4
 	note B_, 12
 
-Music_PokemonTower_branch_7f05a:
+Music_PokemonTower_branch_7f05a::
 	notetype 12, 11, 4
 	octave 4
 	note G_, 1
@@ -140,7 +140,7 @@
 	loopchannel 0, Music_PokemonTower_branch_7f05a
 
 
-Music_PokemonTower_Ch2: ; 7f0e3 (1f:70e3)
+Music_PokemonTower_Ch2:: ; 7f0e3 (1f:70e3)
 	vibrato 20, 3, 4
 	duty 3
 	notetype 12, 10, 0
@@ -149,7 +149,7 @@
 	octave 4
 	note E_, 4
 
-Music_PokemonTower_branch_7f0ee:
+Music_PokemonTower_branch_7f0ee::
 	notetype 12, 12, 1
 	octave 5
 	note C_, 8
@@ -292,7 +292,7 @@
 	loopchannel 0, Music_PokemonTower_branch_7f0ee
 
 
-Music_PokemonTower_Ch3: ; 7f19a (1f:719a)
+Music_PokemonTower_Ch3:: ; 7f19a (1f:719a)
 	vibrato 4, 1, 1
 	notetype 12, 1, 3
 	rest 8
@@ -299,7 +299,7 @@
 	octave 5
 	note G_, 8
 
-Music_PokemonTower_branch_7f1a2:
+Music_PokemonTower_branch_7f1a2::
 	note E_, 1
 	rest 7
 	note E_, 1
--- a/music/routes1.asm
+++ b/music/routes1.asm
@@ -1,4 +1,4 @@
-Music_Routes1_Ch1: ; 9bde (2:5bde)
+Music_Routes1_Ch1:: ; 9bde (2:5bde)
 	tempo 0, 152
 	stereopanning 119
 	vibrato 4, 2, 3
@@ -5,7 +5,7 @@
 	duty 2
 	togglecall
 
-Music_Routes1_branch_9be9:
+Music_Routes1_branch_9be9::
 	notetype 12, 10, 1
 	rest 4
 	octave 4
@@ -106,10 +106,10 @@
 	endchannel
 
 
-Music_Routes1_Ch2: ; 9c51 (2:5c51)
+Music_Routes1_Ch2:: ; 9c51 (2:5c51)
 	duty 2
 
-Music_Routes1_branch_9c53:
+Music_Routes1_branch_9c53::
 	notetype 12, 13, 1
 	callchannel Music_Routes1_branch_9c65
 	callchannel Music_Routes1_branch_9c78
@@ -117,7 +117,7 @@
 	callchannel Music_Routes1_branch_9c8d
 	loopchannel 0, Music_Routes1_branch_9c53
 
-Music_Routes1_branch_9c65:
+Music_Routes1_branch_9c65::
 	octave 4
 	note D_, 1
 	note E_, 1
@@ -138,7 +138,7 @@
 	note E_, 6
 	endchannel
 
-Music_Routes1_branch_9c78:
+Music_Routes1_branch_9c78::
 	note C#, 1
 	note D_, 1
 	note E_, 2
@@ -161,7 +161,7 @@
 	note F#, 2
 	endchannel
 
-Music_Routes1_branch_9c8d:
+Music_Routes1_branch_9c8d::
 	note C#, 1
 	note D_, 1
 	note E_, 2
@@ -234,11 +234,11 @@
 	endchannel
 
 
-Music_Routes1_Ch3: ; 9cd8 (2:5cd8)
+Music_Routes1_Ch3:: ; 9cd8 (2:5cd8)
 	vibrato 8, 2, 5
 	notetype 12, 1, 3
 
-Music_Routes1_branch_9cdd:
+Music_Routes1_branch_9cdd::
 	rest 2
 	octave 4
 	note D_, 4
@@ -309,7 +309,7 @@
 	endchannel
 
 
-Music_Routes1_Ch4: ; 9d24 (2:5d24)
+Music_Routes1_Ch4:: ; 9d24 (2:5d24)
 	dspeed 12
 	rest 4
 	dnote 2, mutedsnare1
--- a/music/routes2.asm
+++ b/music/routes2.asm
@@ -1,10 +1,10 @@
-Music_Routes2_Ch1: ; 9db9 (2:5db9)
+Music_Routes2_Ch1:: ; 9db9 (2:5db9)
 	tempo 0, 152
 	stereopanning 119
 	vibrato 9, 2, 5
 	duty 1
 
-Music_Routes2_branch_9dc3:
+Music_Routes2_branch_9dc3::
 	notetype 12, 11, 2
 	octave 2
 	note B_, 4
@@ -142,11 +142,11 @@
 	endchannel
 
 
-Music_Routes2_Ch2: ; 9e4f (2:5e4f)
+Music_Routes2_Ch2:: ; 9e4f (2:5e4f)
 	vibrato 8, 2, 6
 	duty 3
 
-Music_Routes2_branch_9e54:
+Music_Routes2_branch_9e54::
 	notetype 12, 13, 4
 	octave 4
 	note E_, 6
@@ -216,10 +216,10 @@
 	endchannel
 
 
-Music_Routes2_Ch3: ; 9e9b (2:5e9b)
+Music_Routes2_Ch3:: ; 9e9b (2:5e9b)
 	vibrato 9, 2, 8
 
-Music_Routes2_branch_9e9e:
+Music_Routes2_branch_9e9e::
 	notetype 12, 1, 1
 	octave 3
 	note E_, 2
@@ -324,7 +324,7 @@
 	endchannel
 
 
-Music_Routes2_Ch4: ; 9f08 (2:5f08)
+Music_Routes2_Ch4:: ; 9f08 (2:5f08)
 	dspeed 12
 	dnote 2, snare3
 	rest 2
--- a/music/routes3.asm
+++ b/music/routes3.asm
@@ -1,4 +1,4 @@
-Music_Routes3_Ch1: ; 9fad (2:5fad)
+Music_Routes3_Ch1:: ; 9fad (2:5fad)
 	tempo 0, 148
 	stereopanning 119
 	duty 3
@@ -15,7 +15,7 @@
 	rest 16
 	rest 15
 
-Music_Routes3_branch_9fc3:
+Music_Routes3_branch_9fc3::
 	notetype 12, 11, 5
 	note E_, 6
 	note D_, 1
@@ -77,7 +77,7 @@
 	loopchannel 0, Music_Routes3_branch_9fc3
 
 
-Music_Routes3_Ch2: ; a009 (2:6009)
+Music_Routes3_Ch2:: ; a009 (2:6009)
 	vibrato 8, 2, 3
 	duty 2
 	notetype 12, 12, 7
@@ -92,7 +92,7 @@
 	rest 15
 	rest 16
 
-Music_Routes3_branch_a01a:
+Music_Routes3_branch_a01a::
 	notetype 12, 12, 7
 	duty 2
 	octave 4
@@ -178,7 +178,7 @@
 	loopchannel 0, Music_Routes3_branch_a01a
 
 
-Music_Routes3_Ch3: ; a07f (2:607f)
+Music_Routes3_Ch3:: ; a07f (2:607f)
 	vibrato 4, 1, 0
 	notetype 6, 1, 2
 	octave 4
@@ -213,7 +213,7 @@
 	rest 2
 	note G_, 8
 
-Music_Routes3_branch_a0a3:
+Music_Routes3_branch_a0a3::
 	notetype 12, 1, 2
 	note E_, 1
 	rest 1
@@ -354,7 +354,7 @@
 	loopchannel 0, Music_Routes3_branch_a0a3
 
 
-Music_Routes3_Ch4: ; a131 (2:6131)
+Music_Routes3_Ch4:: ; a131 (2:6131)
 	dspeed 6
 	dnote 1, mutedsnare4
 	dnote 1, mutedsnare4
@@ -393,7 +393,7 @@
 	dnote 1, mutedsnare3
 	dnote 1, mutedsnare3
 
-Music_Routes3_branch_a17a:
+Music_Routes3_branch_a17a::
 	dnote 12, mutedsnare2
 	dnote 2, mutedsnare2
 	dnote 2, mutedsnare3
--- a/music/routes4.asm
+++ b/music/routes4.asm
@@ -1,4 +1,4 @@
-Music_Routes4_Ch1: ; a26a (2:626a)
+Music_Routes4_Ch1:: ; a26a (2:626a)
 	tempo 0, 148
 	stereopanning 119
 	duty 3
@@ -22,7 +22,7 @@
 	note F#, 1
 	note B_, 1
 
-Music_Routes4_branch_a28a:
+Music_Routes4_branch_a28a::
 	notetype 12, 11, 7
 	note B_, 6
 	note E_, 2
@@ -138,7 +138,7 @@
 	loopchannel 0, Music_Routes4_branch_a28a
 
 
-Music_Routes4_Ch2: ; a304 (2:6304)
+Music_Routes4_Ch2:: ; a304 (2:6304)
 	vibrato 12, 2, 4
 	duty 1
 	notetype 12, 9, 2
@@ -164,7 +164,7 @@
 	octave 4
 	note D#, 1
 
-Music_Routes4_branch_a325:
+Music_Routes4_branch_a325::
 	notetype 12, 12, 7
 	note E_, 6
 	octave 3
@@ -288,7 +288,7 @@
 	loopchannel 0, Music_Routes4_branch_a325
 
 
-Music_Routes4_Ch3: ; a3c4 (2:63c4)
+Music_Routes4_Ch3:: ; a3c4 (2:63c4)
 	notetype 12, 1, 0
 	octave 4
 	note E_, 1
@@ -308,7 +308,7 @@
 	note D#, 1
 	rest 3
 
-Music_Routes4_branch_a3d7:
+Music_Routes4_branch_a3d7::
 	note E_, 1
 	rest 3
 	note E_, 1
@@ -506,7 +506,7 @@
 	loopchannel 0, Music_Routes4_branch_a3d7
 
 
-Music_Routes4_Ch4: ; a49d (2:649d)
+Music_Routes4_Ch4:: ; a49d (2:649d)
 	dspeed 12
 	rest 16
 	rest 12
@@ -515,7 +515,7 @@
 	dnote 1, mutedsnare3
 	dnote 1, mutedsnare3
 
-Music_Routes4_branch_a4a8:
+Music_Routes4_branch_a4a8::
 	dnote 4, mutedsnare2
 	dnote 1, mutedsnare4
 	dnote 1, mutedsnare4
--- a/music/safarizone.asm
+++ b/music/safarizone.asm
@@ -1,4 +1,4 @@
-Music_SafariZone_Ch1: ; bc2e (2:7c2e)
+Music_SafariZone_Ch1:: ; bc2e (2:7c2e)
 	tempo 0, 132
 	stereopanning 119
 	vibrato 6, 3, 4
@@ -17,7 +17,7 @@
 	rest 4
 	duty 3
 
-Music_SafariZone_branch_bc4f:
+Music_SafariZone_branch_bc4f::
 	callchannel Music_SafariZone_branch_bc5f
 	notetype 12, 10, 4
 	note F#, 4
@@ -26,7 +26,7 @@
 	note F#, 4
 	loopchannel 0, Music_SafariZone_branch_bc4f
 
-Music_SafariZone_branch_bc5f:
+Music_SafariZone_branch_bc5f::
 	notetype 12, 10, 2
 	octave 3
 	note C_, 4
@@ -39,7 +39,7 @@
 	endchannel
 
 
-Music_SafariZone_Ch2: ; bc6a (2:7c6a)
+Music_SafariZone_Ch2:: ; bc6a (2:7c6a)
 	duty 2
 	vibrato 8, 2, 5
 	notetype 12, 10, 2
@@ -51,7 +51,7 @@
 	rest 4
 	duty 3
 
-Music_SafariZone_branch_bc79:
+Music_SafariZone_branch_bc79::
 	callchannel Music_SafariZone_branch_bc89
 	notetype 12, 11, 5
 	note A_, 4
@@ -60,7 +60,7 @@
 	note B_, 4
 	loopchannel 0, Music_SafariZone_branch_bc79
 
-Music_SafariZone_branch_bc89:
+Music_SafariZone_branch_bc89::
 	notetype 12, 11, 2
 	octave 3
 	note G_, 4
@@ -73,11 +73,11 @@
 	endchannel
 
 
-Music_SafariZone_Ch3: ; bc94 (2:7c94)
+Music_SafariZone_Ch3:: ; bc94 (2:7c94)
 	notetype 12, 1, 0
 	rest 8
 
-Music_SafariZone_branch_bc97:
+Music_SafariZone_branch_bc97::
 	callchannel Music_SafariZone_branch_bca5
 	octave 4
 	note A_, 4
@@ -86,7 +86,7 @@
 	note B_, 4
 	loopchannel 0, Music_SafariZone_branch_bc97
 
-Music_SafariZone_branch_bca5:
+Music_SafariZone_branch_bca5::
 	octave 3
 	note A_, 2
 	rest 2
--- a/music/silphco.asm
+++ b/music/silphco.asm
@@ -1,4 +1,4 @@
-Music_SilphCo_Ch1: ; 7f243 (1f:7243)
+Music_SilphCo_Ch1:: ; 7f243 (1f:7243)
 	tempo 0, 160
 	stereopanning 119
 	duty 3
@@ -33,7 +33,7 @@
 	note B_, 2
 	rest 2
 
-Music_SilphCo_branch_7f26d:
+Music_SilphCo_branch_7f26d::
 	note G_, 2
 	rest 2
 	note B_, 2
@@ -367,7 +367,7 @@
 	rest 2
 	loopchannel 0, Music_SilphCo_branch_7f26d
 
-Music_SilphCo_branch_7f3f0:
+Music_SilphCo_branch_7f3f0::
 	octave 2
 	note B_, 2
 	note A#, 2
@@ -395,7 +395,7 @@
 	endchannel
 
 
-Music_SilphCo_Ch2: ; 7f409 (1f:7409)
+Music_SilphCo_Ch2:: ; 7f409 (1f:7409)
 	vibrato 10, 3, 2
 	duty 3
 	notetype 6, 12, 3
@@ -428,7 +428,7 @@
 	note G#, 2
 	rest 2
 
-Music_SilphCo_branch_7f42e:
+Music_SilphCo_branch_7f42e::
 	note E_, 2
 	rest 2
 	note G_, 2
@@ -780,7 +780,7 @@
 	loopchannel 0, Music_SilphCo_branch_7f42e
 
 
-Music_SilphCo_Ch3: ; 7f5be (1f:75be)
+Music_SilphCo_Ch3:: ; 7f5be (1f:75be)
 	vibrato 8, 1, 1
 	notetype 12, 1, 1
 	rest 12
@@ -790,7 +790,7 @@
 	note E_, 4
 	note F_, 4
 
-Music_SilphCo_branch_7f5c9:
+Music_SilphCo_branch_7f5c9::
 	note E_, 4
 	note D#, 4
 	note D_, 4
--- a/music/ssanne.asm
+++ b/music/ssanne.asm
@@ -1,4 +1,4 @@
-Music_SSAnne_Ch1: ; b3a7 (2:73a7)
+Music_SSAnne_Ch1:: ; b3a7 (2:73a7)
 	tempo 0, 128
 	stereopanning 119
 	duty 1
@@ -5,7 +5,7 @@
 	vibrato 8, 3, 4
 	togglecall
 
-Music_SSAnne_branch_b3b2:
+Music_SSAnne_branch_b3b2::
 	notetype 12, 10, 4
 	rest 12
 	octave 3
@@ -107,11 +107,11 @@
 	loopchannel 0, Music_SSAnne_branch_b3b2
 
 
-Music_SSAnne_Ch2: ; b419 (2:7419)
+Music_SSAnne_Ch2:: ; b419 (2:7419)
 	duty 0
 	vibrato 12, 2, 4
 
-Music_SSAnne_branch_b41e:
+Music_SSAnne_branch_b41e::
 	notetype 12, 12, 5
 	octave 3
 	note A_, 2
@@ -282,7 +282,7 @@
 	loopchannel 0, Music_SSAnne_branch_b41e
 
 
-Music_SSAnne_Ch3: ; b4cb (2:74cb)
+Music_SSAnne_Ch3:: ; b4cb (2:74cb)
 	notetype 12, 1, 3
 	rest 16
 	rest 12
--- a/music/surfing.asm
+++ b/music/surfing.asm
@@ -1,4 +1,4 @@
-Music_Surfing_Ch1: ; 7fa19 (1f:7a19)
+Music_Surfing_Ch1:: ; 7fa19 (1f:7a19)
 	tempo 0, 160
 	stereopanning 119
 	duty 3
@@ -16,7 +16,7 @@
 	note F#, 2
 	note G#, 4
 
-Music_Surfing_branch_7fa30:
+Music_Surfing_branch_7fa30::
 	notetype 12, 11, 2
 	note E_, 2
 	note E_, 4
@@ -116,7 +116,7 @@
 	loopchannel 0, Music_Surfing_branch_7fa30
 
 
-Music_Surfing_Ch2: ; 7fa9c (1f:7a9c)
+Music_Surfing_Ch2:: ; 7fa9c (1f:7a9c)
 	duty 3
 	vibrato 16, 2, 5
 	notetype 12, 12, 6
@@ -132,7 +132,7 @@
 	octave 3
 	note B_, 2
 
-Music_Surfing_branch_7faae:
+Music_Surfing_branch_7faae::
 	notetype 12, 12, 6
 	octave 4
 	note E_, 6
@@ -203,7 +203,7 @@
 	loopchannel 0, Music_Surfing_branch_7faae
 
 
-Music_Surfing_Ch3: ; 7fafa (1f:7afa)
+Music_Surfing_Ch3:: ; 7fafa (1f:7afa)
 	notetype 12, 1, 0
 	rest 12
 	octave 5
@@ -213,7 +213,7 @@
 	note F#, 2
 	note G#, 2
 
-Music_Surfing_branch_7fb03:
+Music_Surfing_branch_7fb03::
 	octave 3
 	note A_, 2
 	octave 4
--- a/music/titlescreen.asm
+++ b/music/titlescreen.asm
@@ -1,4 +1,4 @@
-Music_TitleScreen_Ch1: ; 7e4c0 (1f:64c0)
+Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0)
 	tempo 0, 144
 	stereopanning 119
 	vibrato 9, 3, 4
@@ -26,7 +26,7 @@
 	note A_, 2
 	note F#, 2
 
-Music_TitleScreen_branch_7e4e2:
+Music_TitleScreen_branch_7e4e2::
 	callchannel Music_TitleScreen_branch_7e541
 	callchannel Music_TitleScreen_branch_7e54a
 	callchannel Music_TitleScreen_branch_7e541
@@ -96,7 +96,7 @@
 	note C#, 4
 	loopchannel 0, Music_TitleScreen_branch_7e4e2
 
-Music_TitleScreen_branch_7e541:
+Music_TitleScreen_branch_7e541::
 	notetype 12, 12, 6
 	octave 3
 	note D_, 6
@@ -106,7 +106,7 @@
 	note D_, 8
 	endchannel
 
-Music_TitleScreen_branch_7e54a:
+Music_TitleScreen_branch_7e54a::
 	note C_, 6
 	note F_, 6
 	note C_, 4
@@ -124,7 +124,7 @@
 	note C_, 4
 	endchannel
 
-Music_TitleScreen_branch_7e55c:
+Music_TitleScreen_branch_7e55c::
 	notetype 12, 12, 1
 	note D_, 1
 	rest 1
@@ -154,7 +154,7 @@
 	endchannel
 
 
-Music_TitleScreen_Ch2: ; 7e578 (1f:6578)
+Music_TitleScreen_Ch2:: ; 7e578 (1f:6578)
 	vibrato 16, 4, 6
 	duty 1
 	notetype 12, 14, 1
@@ -179,7 +179,7 @@
 	note F_, 2
 	note F#, 2
 
-Music_TitleScreen_branch_7e594:
+Music_TitleScreen_branch_7e594::
 	vibrato 16, 4, 6
 	callchannel Music_TitleScreen_branch_7e622
 	octave 2
@@ -286,7 +286,7 @@
 	note B_, 4
 	loopchannel 0, Music_TitleScreen_branch_7e594
 
-Music_TitleScreen_branch_7e622:
+Music_TitleScreen_branch_7e622::
 	notetype 12, 14, 7
 	octave 3
 	note G_, 6
@@ -296,7 +296,7 @@
 	notetype 12, 9, 5
 	endchannel
 
-Music_TitleScreen_branch_7e62c:
+Music_TitleScreen_branch_7e62c::
 	notetype 12, 14, 7
 	octave 4
 	note F_, 6
@@ -306,7 +306,7 @@
 	notetype 12, 9, 5
 	endchannel
 
-Music_TitleScreen_branch_7e636:
+Music_TitleScreen_branch_7e636::
 	notetype 12, 14, 1
 	note D_, 1
 	rest 2
@@ -321,7 +321,7 @@
 	endchannel
 
 
-Music_TitleScreen_Ch3: ; 7e643 (1f:6643)
+Music_TitleScreen_Ch3:: ; 7e643 (1f:6643)
 	notetype 12, 1, 0
 	octave 3
 	note G_, 1
@@ -348,11 +348,11 @@
 	note F_, 2
 	note A_, 2
 
-Music_TitleScreen_branch_7e65e:
+Music_TitleScreen_branch_7e65e::
 	callchannel Music_TitleScreen_branch_7e6c9
 	callchannel Music_TitleScreen_branch_7e6d0
 
-Music_TitleScreen_branch_7e664:
+Music_TitleScreen_branch_7e664::
 	callchannel Music_TitleScreen_branch_7e6c9
 	callchannel Music_TitleScreen_branch_7e6c9
 	callchannel Music_TitleScreen_branch_7e6c9
@@ -415,7 +415,7 @@
 	note B_, 4
 	loopchannel 0, Music_TitleScreen_branch_7e65e
 
-Music_TitleScreen_branch_7e6c9:
+Music_TitleScreen_branch_7e6c9::
 	note G_, 6
 	note D_, 3
 	note G_, 6
@@ -424,7 +424,7 @@
 	note D_, 3
 	endchannel
 
-Music_TitleScreen_branch_7e6d0:
+Music_TitleScreen_branch_7e6d0::
 	note F_, 6
 	note C_, 3
 	note F_, 6
@@ -433,7 +433,7 @@
 	note C_, 3
 	endchannel
 
-Music_TitleScreen_branch_7e6d7:
+Music_TitleScreen_branch_7e6d7::
 	note A#, 6
 	note F_, 3
 	note A#, 6
@@ -440,7 +440,7 @@
 	note F_, 3
 	endchannel
 
-Music_TitleScreen_branch_7e6dc:
+Music_TitleScreen_branch_7e6dc::
 	octave 4
 	note C_, 6
 	octave 3
@@ -451,7 +451,7 @@
 	note G_, 3
 	endchannel
 
-Music_TitleScreen_branch_7e6e5:
+Music_TitleScreen_branch_7e6e5::
 	notetype 12, 1, 0
 	octave 4
 	note D_, 1
@@ -459,7 +459,7 @@
 	endchannel
 
 
-Music_TitleScreen_Ch4: ; 7e6eb (1f:66eb)
+Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb)
 	dspeed 6
 	rest 4
 	dnote 1, snare3
@@ -487,7 +487,7 @@
 	dnote 2, snare2
 	dnote 2, snare1
 
-Music_TitleScreen_branch_7e716:
+Music_TitleScreen_branch_7e716::
 	dspeed 12
 	dnote 1, snare2
 	rest 3
@@ -654,7 +654,7 @@
 	dnote 4, snare2
 	loopchannel 0, Music_TitleScreen_branch_7e716
 
-Music_TitleScreen_branch_7e834:
+Music_TitleScreen_branch_7e834::
 	dnote 1, snare2
 	rest 3
 	dnote 1, snare2
@@ -665,7 +665,7 @@
 	rest 3
 	endchannel
 
-Music_TitleScreen_branch_7e842:
+Music_TitleScreen_branch_7e842::
 	dnote 1, snare2
 	rest 3
 	dnote 1, snare2
--- a/music/trainerbattle.asm
+++ b/music/trainerbattle.asm
@@ -1,4 +1,4 @@
-Music_TrainerBattle_Ch1: ; 22919 (8:6919)
+Music_TrainerBattle_Ch1:: ; 22919 (8:6919)
 	tempo 0, 112
 	stereopanning 119
 	duty 3
@@ -66,7 +66,7 @@
 	note C_, 2
 	note C#, 2
 
-Music_TrainerBattle_branch_22962:
+Music_TrainerBattle_branch_22962::
 	notetype 12, 11, 5
 	note D_, 2
 	note E_, 4
@@ -649,7 +649,7 @@
 	loopchannel 0, Music_TrainerBattle_branch_22962
 
 
-Music_TrainerBattle_Ch2: ; 22bae (8:6bae)
+Music_TrainerBattle_Ch2:: ; 22bae (8:6bae)
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 2
@@ -722,7 +722,7 @@
 	octave 4
 	note A_, 4
 
-Music_TrainerBattle_branch_22bfc:
+Music_TrainerBattle_branch_22bfc::
 	notetype 12, 12, 7
 	octave 3
 	note B_, 6
@@ -953,7 +953,7 @@
 	loopchannel 0, Music_TrainerBattle_branch_22bfc
 
 
-Music_TrainerBattle_Ch3: ; 22d10 (8:6d10)
+Music_TrainerBattle_Ch3:: ; 22d10 (8:6d10)
 	vibrato 0, 2, 0
 	notetype 12, 1, 4
 	octave 3
@@ -1092,7 +1092,7 @@
 	octave 3
 	note C_, 2
 
-Music_TrainerBattle_branch_22d9c:
+Music_TrainerBattle_branch_22d9c::
 	octave 2
 	note A#, 1
 	note B_, 1
--- a/music/unusedsong.asm
+++ b/music/unusedsong.asm
@@ -1,9 +1,9 @@
-Music_UnusedSong_Ch1: ; a913 (2:6913)
+Music_UnusedSong_Ch1:: ; a913 (2:6913)
 	tempo 0, 144
 	stereopanning 119
 	vibrato 5, 1, 6
 
-Music_UnusedSong_branch_a91b:
+Music_UnusedSong_branch_a91b::
 	notetype 12, 1, 0
 	octave 6
 	note E_, 1
@@ -182,13 +182,13 @@
 	endchannel
 
 
-Music_UnusedSong_Ch2: ; a9cf (2:69cf)
+Music_UnusedSong_Ch2:: ; a9cf (2:69cf)
 	tempo 0, 144
 	stereopanning 119
 	togglecall
 	vibrato 6, 1, 5
 
-Music_UnusedSong_branch_a9d8:
+Music_UnusedSong_branch_a9d8::
 	notetype 12, 1, 0
 	octave 6
 	note E_, 1
--- a/music/vermilion.asm
+++ b/music/vermilion.asm
@@ -1,4 +1,4 @@
-Music_Vermilion_Ch1: ; b9eb (2:79eb)
+Music_Vermilion_Ch1:: ; b9eb (2:79eb)
 	tempo 0, 156
 	stereopanning 119
 	duty 3
@@ -5,7 +5,7 @@
 	vibrato 12, 3, 4
 	togglecall
 
-Music_Vermilion_branch_b9f6:
+Music_Vermilion_branch_b9f6::
 	notetype 12, 11, 5
 	octave 3
 	note E_, 4
@@ -111,11 +111,11 @@
 	loopchannel 0, Music_Vermilion_branch_b9f6
 
 
-Music_Vermilion_Ch2: ; ba61 (2:7a61)
+Music_Vermilion_Ch2:: ; ba61 (2:7a61)
 	duty 3
 	vibrato 10, 2, 3
 
-Music_Vermilion_branch_ba66:
+Music_Vermilion_branch_ba66::
 	notetype 12, 12, 7
 	octave 3
 	note A_, 8
@@ -178,10 +178,10 @@
 	loopchannel 0, Music_Vermilion_branch_ba66
 
 
-Music_Vermilion_Ch3: ; baa6 (2:7aa6)
+Music_Vermilion_Ch3:: ; baa6 (2:7aa6)
 	notetype 12, 1, 0
 
-Music_Vermilion_branch_baa8:
+Music_Vermilion_branch_baa8::
 	octave 4
 	note A_, 2
 	note E_, 2
@@ -282,10 +282,10 @@
 	loopchannel 0, Music_Vermilion_branch_baa8
 
 
-Music_Vermilion_Ch4: ; bb0d (2:7b0d)
+Music_Vermilion_Ch4:: ; bb0d (2:7b0d)
 	dspeed 12
 
-Music_Vermilion_branch_bb0e:
+Music_Vermilion_branch_bb0e::
 	callchannel Music_Vermilion_branch_bb3f
 	dnote 2, triangle1
 	dnote 1, triangle1
@@ -307,7 +307,7 @@
 	callchannel Music_Vermilion_branch_bb3f
 	loopchannel 0, Music_Vermilion_branch_bb0e
 
-Music_Vermilion_branch_bb3f:
+Music_Vermilion_branch_bb3f::
 	dnote 2, triangle1
 	dnote 1, triangle1
 	dnote 1, triangle1
--- a/music/wildbattle.asm
+++ b/music/wildbattle.asm
@@ -1,4 +1,4 @@
-Music_WildBattle_Ch1: ; 23099 (8:7099)
+Music_WildBattle_Ch1:: ; 23099 (8:7099)
 	tempo 0, 104
 	stereopanning 119
 	duty 3
@@ -61,7 +61,7 @@
 	note D#, 10
 	note C#, 10
 
-Music_WildBattle_branch_230e0:
+Music_WildBattle_branch_230e0::
 	notetype 12, 11, 3
 	note C#, 1
 	note D_, 1
@@ -300,7 +300,7 @@
 	loopchannel 0, Music_WildBattle_branch_230e0
 
 
-Music_WildBattle_Ch2: ; 231d8 (8:71d8)
+Music_WildBattle_Ch2:: ; 231d8 (8:71d8)
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
@@ -372,7 +372,7 @@
 	note G_, 10
 	note G_, 10
 
-Music_WildBattle_branch_23225:
+Music_WildBattle_branch_23225::
 	notetype 12, 12, 5
 	note G_, 6
 	note F#, 6
@@ -462,7 +462,7 @@
 	loopchannel 0, Music_WildBattle_branch_23225
 
 
-Music_WildBattle_Ch3: ; 23290 (8:7290)
+Music_WildBattle_Ch3:: ; 23290 (8:7290)
 	vibrato 0, 2, 0
 	notetype 12, 1, 1
 	octave 4
@@ -498,7 +498,7 @@
 	note A#, 2
 	note B_, 2
 
-Music_WildBattle_branch_232b5:
+Music_WildBattle_branch_232b5::
 	octave 4
 	note C_, 2
 	note G_, 2
@@ -532,7 +532,7 @@
 	note F_, 2
 	loopchannel 2, Music_WildBattle_branch_232b5
 
-Music_WildBattle_branch_232d8:
+Music_WildBattle_branch_232d8::
 	note C_, 2
 	note G_, 2
 	note C_, 2
--- a/pokeblue.asm
+++ b/pokeblue.asm
@@ -1,4 +1,3 @@
 INCLUDE "blue.asm"
-INCLUDE "globals.asm"
 INCLUDE "wram.asm"
 INCLUDE "main.asm"
--- a/pokered.asm
+++ b/pokered.asm
@@ -1,4 +1,3 @@
 INCLUDE "red.asm"
-INCLUDE "globals.asm"
 INCLUDE "wram.asm"
 INCLUDE "main.asm"
--- a/preprocessor.py
+++ b/preprocessor.py
@@ -280,7 +280,6 @@
 def main():
     processor = setup_processor()
     output = processor.preprocess()
-    processor.update_globals()
     return output
 
 if __name__ == '__main__':
--- a/prequeue.py
+++ b/prequeue.py
@@ -23,8 +23,6 @@
         sys.stdout = open(dest, 'w')
         processor.preprocess()
 
-    processor.update_globals()
-
     sys.stdin  = stdin
     sys.stdout = stdout
 
--- a/text.asm
+++ b/text.asm
@@ -1,4 +1,3 @@
-INCLUDE "globals.asm"
 
 TEXT_1  EQU $20
 TEXT_2  EQU $21
@@ -21,75 +20,75 @@
 
 SECTION "Text 1", ROMX, BANK[TEXT_1]
 
-_CardKeySuccessText1: ; 80000 (20:4000)
+_CardKeySuccessText1:: ; 80000 (20:4000)
 	text "Bingo!@@"
 
-_CardKeySuccessText2: ; 80009 (20:4009)
+_CardKeySuccessText2:: ; 80009 (20:4009)
 	db $0
 	line "The CARD KEY"
 	cont "opened the door!"
 	done
 
-_CardKeyFailText: ; 80029 (20:4029)
+_CardKeyFailText:: ; 80029 (20:4029)
 	text "Darn! It needs a"
 	line "CARD KEY!"
 	done
 
-_UnnamedText_33cf: ; 80045 (20:4045)
+_UnnamedText_33cf:: ; 80045 (20:4045)
 	TX_RAM $cd6d
 	text ": @@"
 
-_UnnamedText_70847: ; 8004d (20:404d)
+_UnnamedText_70847:: ; 8004d (20:404d)
 	text "Not even a nibble!"
 	prompt
 
-_UnnamedText_7084c: ; 80061 (20:4061)
+_UnnamedText_7084c:: ; 80061 (20:4061)
 	text "Looks like there's"
 	line "nothing here."
 	prompt
 
-_UnnamedText_70851: ; 80082 (20:4082)
+_UnnamedText_70851:: ; 80082 (20:4082)
 	text "Oh!"
 	line "It's a bite!"
 	prompt
 
-_UnnamedText_24db: ; 80093 (20:4093)
+_UnnamedText_24db:: ; 80093 (20:4093)
 	text "!"
 	done
 
-_UnnamedText_24e0: ; 80096 (20:4096)
+_UnnamedText_24e0:: ; 80096 (20:4096)
 	text "Ground rose up"
 	line "somewhere!"
 	done
 
-_BoulderText: ; 800b1 (20:40b1)
+_BoulderText:: ; 800b1 (20:40b1)
 	text "This requires"
 	line "STRENGTH to move!"
 	done
 
-_MartSignText: ; 800d2 (20:40d2)
+_MartSignText:: ; 800d2 (20:40d2)
 	text "All your item"
 	line "needs fulfilled!"
 	cont "#MON MART"
 	done
 
-_PokeCenterSignText: ; 800fc (20:40fc)
+_PokeCenterSignText:: ; 800fc (20:40fc)
 	text "Heal Your #MON!"
 	line "#MON CENTER"
 	done
 
-_FoundItemText: ; 80119 (20:4119)
+_FoundItemText:: ; 80119 (20:4119)
 	text $52, " found"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_NoMoreRoomForItemText: ; 8012a (20:412a)
+_NoMoreRoomForItemText:: ; 8012a (20:412a)
 	text "No more room for"
 	line "items!"
 	done
 
-_UnnamedText_59091: ; 80143 (20:4143)
+_UnnamedText_59091:: ; 80143 (20:4143)
 	text "Hi! Remember me?"
 	line "I'm PROF.OAK's"
 	cont "AIDE!"
@@ -112,7 +111,7 @@
 	cont "#MON?"
 	done
 
-_UnnamedText_59096: ; 801e4 (20:41e4)
+_UnnamedText_59096:: ; 801e4 (20:41e4)
 	text "Let's see..."
 	line "Uh-oh! You have"
 	cont "caught only @"
@@ -129,7 +128,7 @@
 	text "."
 	done
 
-_UnnamedText_5909b: ; 80250 (20:4250)
+_UnnamedText_5909b:: ; 80250 (20:4250)
 	text "Oh. I see."
 
 	para "When you get @"
@@ -141,7 +140,7 @@
 	text "."
 	done
 
-_UnnamedText_590a0: ; 8028c (20:428c)
+_UnnamedText_590a0:: ; 8028c (20:428c)
 	text "Great! You have"
 	line "caught @"
 	TX_NUM $ffdd, 1, 3
@@ -152,13 +151,13 @@
 	para "Here you go!"
 	prompt
 
-_UnnamedText_590a5: ; 802d9 (20:42d9)
+_UnnamedText_590a5:: ; 802d9 (20:42d9)
 	text $52, " got the"
 	line "@"
 	TX_RAM $cc5b
 	text "!@@"
 
-_UnnamedText_590ab: ; 802ec (20:42ec)
+_UnnamedText_590ab:: ; 802ec (20:42ec)
 	text "Oh! I see you"
 	line "don't have any"
 	cont "room for the"
@@ -236,7 +235,7 @@
 INCLUDE "text/maps/seafoam_islands_b3f.asm"
 INCLUDE "text/maps/seafoam_islands_b4f.asm"
 
-_AIBattleWithdrawText: ; 880be (22:40be)
+_AIBattleWithdrawText:: ; 880be (22:40be)
 	TX_RAM W_TRAINERNAME
 	text " with-"
 	line "drew @"
@@ -244,7 +243,7 @@
 	text "!"
 	prompt
 
-_AIBattleUseItemText: ; 880d5 (22:40d5)
+_AIBattleUseItemText:: ; 880d5 (22:40d5)
 	TX_RAM W_TRAINERNAME
 	db $0
 	line "used @"
@@ -255,7 +254,7 @@
 	text "!"
 	prompt
 
-_UnnamedText_4160c: ; 880ef (22:40ef)
+_UnnamedText_4160c:: ; 880ef (22:40ef)
 	TX_RAM $cf4b
 	text " went"
 	line "to @"
@@ -263,7 +262,7 @@
 	text "."
 	done
 
-_UnnamedText_41623: ; 88103 (22:4103)
+_UnnamedText_41623:: ; 88103 (22:4103)
 	text "For ", $52, "'s"
 	line "@"
 	TX_RAM $cf4b
@@ -270,7 +269,7 @@
 	text ","
 	done
 
-_UnnamedText_41628: ; 88112 (22:4112)
+_UnnamedText_41628:: ; 88112 (22:4112)
 	TX_RAM $d887
 	text " sends"
 	line "@"
@@ -278,19 +277,19 @@
 	text "."
 	done
 
-_UnnamedText_41642: ; 88124 (22:4124)
+_UnnamedText_41642:: ; 88124 (22:4124)
 	TX_RAM $d887
 	text " waves"
 	line "farewell as"
 	done
 
-_UnnamedText_41647: ; 8813b (22:413b)
+_UnnamedText_41647:: ; 8813b (22:413b)
 	TX_RAM $cd6d
 	text " is"
 	line "transferred."
 	done
 
-_UnnamedText_41655: ; 88150 (22:4150)
+_UnnamedText_41655:: ; 88150 (22:4150)
 	text "Take good care of"
 	line "@"
 	TX_RAM $cd6d
@@ -297,7 +296,7 @@
 	text "."
 	done
 
-_UnnamedText_4166c: ; 8816a (22:416a)
+_UnnamedText_4166c:: ; 8816a (22:416a)
 	TX_RAM $d887
 	text " will"
 	line "trade @"
@@ -305,7 +304,7 @@
 	db $0
 	done
 
-_UnnamedText_41671: ; 88180 (22:4180)
+_UnnamedText_41671:: ; 88180 (22:4180)
 	text "for ", $52, "'s"
 	line "@"
 	TX_RAM $cf4b
@@ -312,36 +311,36 @@
 	text "."
 	done
 
-_PlaySlotMachineText: ; 8818f (22:418f)
+_PlaySlotMachineText:: ; 8818f (22:418f)
 	text "A slot machine!"
 	line "Want to play?"
 	done
 
-_OutOfCoinsSlotMachineText: ; 881ae (22:41ae)
+_OutOfCoinsSlotMachineText:: ; 881ae (22:41ae)
 	text "Darn!"
 	line "Ran out of coins!"
 	done
 
-_BetHowManySlotMachineText: ; 881c7 (22:41c7)
+_BetHowManySlotMachineText:: ; 881c7 (22:41c7)
 	text "Bet how many"
 	line "coins?"
 	done
 
-_StartSlotMachineText: ; 881dc (22:41dc)
+_StartSlotMachineText:: ; 881dc (22:41dc)
 	text "Start!"
 	done
 
-_NotEnoughCoinsSlotMachineText: ; 881e4 (22:41e4)
+_NotEnoughCoinsSlotMachineText:: ; 881e4 (22:41e4)
 	text "Not enough"
 	line "coins!"
 	prompt
 
-_OneMoreGoSlotMachineText: ; 881f7 (22:41f7)
+_OneMoreGoSlotMachineText:: ; 881f7 (22:41f7)
 	text "One more "
 	line "go?"
 	done
 
-_UnnamedText_37673: ; 88206 (22:4206)
+_UnnamedText_37673:: ; 88206 (22:4206)
 	text " lined up!"
 	line "Scored @"
 	TX_RAM $cf4b
@@ -348,14 +347,14 @@
 	text " coins!"
 	done
 
-_UnnamedText_3769d: ; 88226 (22:4226)
+_UnnamedText_3769d:: ; 88226 (22:4226)
 	text "Not this time!"
 	prompt
 
-_UnnamedText_37722: ; 88236 (22:4236)
+_UnnamedText_37722:: ; 88236 (22:4236)
 	text "Yeah!@@"
 
-_UnnamedText_703fa: ; 8823e (22:423e)
+_UnnamedText_703fa:: ; 8823e (22:423e)
 	text "#DEX   Seen:@"
 	TX_NUM $cc5b, 1, 3
 	db $0
@@ -363,11 +362,11 @@
 	TX_NUM $cc5c, 1, 3
 	db "@"
 
-_UnnamedText_703ff: ; 88267 (22:4267)
+_UnnamedText_703ff:: ; 88267 (22:4267)
 	text "#DEX Rating", $6d
 	done
 
-_GymStatueText1: ; 88275 (22:4275)
+_GymStatueText1:: ; 88275 (22:4275)
 	TX_RAM wGymCityName
 	db $0
 	line "#MON GYM"
@@ -379,7 +378,7 @@
 	line $53
 	done
 
-_GymStatueText2: ; 882a5 (22:42a5)
+_GymStatueText2:: ; 882a5 (22:42a5)
 	TX_RAM wGymCityName
 	db $0
 	line "#MON GYM"
@@ -392,7 +391,7 @@
 	cont $52
 	done
 
-_ViridianCityPokecenterGuyText: ; 882d7 (22:42d7)
+_ViridianCityPokecenterGuyText:: ; 882d7 (22:42d7)
 	text "#MON CENTERs"
 	line "heal your tired,"
 	cont "hurt or fainted"
@@ -399,7 +398,7 @@
 	cont "#MON!"
 	done
 
-_PewterCityPokecenterGuyText: ; 8830c (22:430c)
+_PewterCityPokecenterGuyText:: ; 8830c (22:430c)
 	text "Yawn!"
 
 	para "When JIGGLYPUFF"
@@ -410,7 +409,7 @@
 	line "Snore..."
 	done
 
-_CeruleanPokecenterGuyText: ; 88353 (22:4353)
+_CeruleanPokecenterGuyText:: ; 88353 (22:4353)
 	text "BILL has lots of"
 	line "#MON!"
 
@@ -418,7 +417,7 @@
 	line "ones too!"
 	done
 
-_LavenderPokecenterGuyText: ; 88386 (22:4386)
+_LavenderPokecenterGuyText:: ; 88386 (22:4386)
 	text "CUBONEs wear"
 	line "skulls, right?"
 
@@ -426,7 +425,7 @@
 	line "lot for one!"
 	done
 
-_MtMoonPokecenterBenchGuyText: ; 883c2 (22:43c2)
+_MtMoonPokecenterBenchGuyText:: ; 883c2 (22:43c2)
 	text "If you have too"
 	line "many #MON, you"
 	cont "should store them"
@@ -433,29 +432,29 @@
 	cont "via PC!"
 	done
 
-_RockTunnelPokecenterGuyText: ; 883fc (22:43fc)
+_RockTunnelPokecenterGuyText:: ; 883fc (22:43fc)
 	text "I heard that"
 	line "GHOSTs haunt"
 	cont "LAVENDER TOWN!"
 	done
 
-_UnnamedText_624c1: ; 88426 (22:4426)
+_UnnamedText_624c1:: ; 88426 (22:4426)
 	text "I wish I could"
 	line "catch #MON."
 	done
 
-_UnnamedText_624c6: ; 88442 (22:4442)
+_UnnamedText_624c6:: ; 88442 (22:4442)
 	text "I'm tired from"
 	line "all the fun..."
 	done
 
-_UnnamedText_624cb: ; 88460 (22:4460)
+_UnnamedText_624cb:: ; 88460 (22:4460)
 	text "SILPH's manager"
 	line "is hiding in the"
 	cont "SAFARI ZONE."
 	done
 
-_VermilionPokecenterGuyText: ; 8848e (22:448e)
+_VermilionPokecenterGuyText:: ; 8848e (22:448e)
 	text "It is true that a"
 	line "higher level"
 	cont "#MON will be"
@@ -471,13 +470,13 @@
 	cont "strong #MON."
 	done
 
-_CeladonCityPokecenterGuyText: ; 88531 (22:4531)
+_CeladonCityPokecenterGuyText:: ; 88531 (22:4531)
 	text "If I had a BIKE,"
 	line "I would go to"
 	cont "CYCLING ROAD!"
 	done
 
-_FuchsiaCityPokecenterGuyText: ; 8855f (22:455f)
+_FuchsiaCityPokecenterGuyText:: ; 8855f (22:455f)
 	text "If you're studying "
 	line "#MON, visit"
 	cont "the SAFARI ZONE."
@@ -486,7 +485,7 @@
 	line "of rare #MON."
 	done
 
-_CinnabarPokecenterGuyText: ; 885af (22:45af)
+_CinnabarPokecenterGuyText:: ; 885af (22:45af)
 	text "#MON can still"
 	line "learn techniques"
 	cont "after canceling"
@@ -497,7 +496,7 @@
 	cont "have been learned."
 	done
 
-_SaffronCityPokecenterGuyText1: ; 88621 (22:4621)
+_SaffronCityPokecenterGuyText1:: ; 88621 (22:4621)
 	text "It would be great"
 	line "if the ELITE FOUR"
 	cont "came and stomped"
@@ -504,7 +503,7 @@
 	cont "TEAM ROCKET!"
 	done
 
-_SaffronCityPokecenterGuyText2: ; 88664 (22:4664)
+_SaffronCityPokecenterGuyText2:: ; 88664 (22:4664)
 	text "TEAM ROCKET took"
 	line "off! We can go"
 	cont "out safely again!"
@@ -511,33 +510,33 @@
 	cont "That's great!"
 	done
 
-_CeladonCityHotelText: ; 886a4 (22:46a4)
+_CeladonCityHotelText:: ; 886a4 (22:46a4)
 	text "My sis brought me"
 	line "on this vacation!"
 	done
 
-_BookcaseText: ; 886c9 (22:46c9)
+_BookcaseText:: ; 886c9 (22:46c9)
 	text "Crammed full of"
 	line "#MON books!"
 	done
 
-_NewBicycleText: ; 886e6 (22:46e6)
+_NewBicycleText:: ; 886e6 (22:46e6)
 	text "A shiny new"
 	line "BICYCLE!"
 	done
 
-_UnnamedText_1e960: ; 886fc (22:46fc)
+_UnnamedText_1e960:: ; 886fc (22:46fc)
 	text "Push START to"
 	line "open the MENU!"
 	done
 
-_UnnamedText_1e97e: ; 8871a (22:471a)
+_UnnamedText_1e97e:: ; 8871a (22:471a)
 	text "The SAVE option is"
 	line "on the MENU"
 	cont "screen."
 	done
 
-_UnnamedText_1e983: ; 88742 (22:4742)
+_UnnamedText_1e983:: ; 88742 (22:4742)
 	text "All #MON types"
 	line "have strong and"
 	cont "weak points"
@@ -544,18 +543,18 @@
 	cont "against others."
 	done
 
-_UnnamedText_1ea0d: ; 8877e (22:477e)
+_UnnamedText_1ea0d:: ; 8877e (22:477e)
 	text "PA: Ding-dong!"
 
 	para "Time's up!"
 	prompt
 
-_UnnamedText_1ea12: ; 88798 (22:4798)
+_UnnamedText_1ea12:: ; 88798 (22:4798)
 	text "PA: Your SAFARI"
 	line "GAME is over!"
 	done
 
-_CinnabarGymQuizIntroText: ; 887b7 (22:47b7)
+_CinnabarGymQuizIntroText:: ; 887b7 (22:47b7)
 	text "#MON Quiz!"
 
 	para "Get it right and"
@@ -574,23 +573,23 @@
 	line "Here we go!"
 	prompt
 
-_CinnabarQuizQuestionsText1: ; 8886d (22:486d)
+_CinnabarQuizQuestionsText1:: ; 8886d (22:486d)
 	text "CATERPIE evolves"
 	line "into BUTTERFREE?"
 	done
 
-_CinnabarQuizQuestionsText2: ; 88890 (22:4890)
+_CinnabarQuizQuestionsText2:: ; 88890 (22:4890)
 	text "There are 9"
 	line "certified #MON"
 	cont "LEAGUE BADGEs?"
 	done
 
-_CinnabarQuizQuestionsText3: ; 888bb (22:48bb)
+_CinnabarQuizQuestionsText3:: ; 888bb (22:48bb)
 	text "POLIWAG evolves 3"
 	line "times?"
 	done
 
-_CinnabarQuizQuestionsText4: ; 888d5 (22:48d5)
+_CinnabarQuizQuestionsText4:: ; 888d5 (22:48d5)
 	text "Are thunder moves"
 	line "effective against"
 	cont "ground element-"
@@ -597,7 +596,7 @@
 	cont "type #MON?"
 	done
 
-_CinnabarQuizQuestionsText5: ; 88915 (22:4915)
+_CinnabarQuizQuestionsText5:: ; 88915 (22:4915)
 	text "#MON of the"
 	line "same kind and"
 	cont "level are not"
@@ -604,22 +603,22 @@
 	cont "identical?"
 	done
 
-_CinnabarQuizQuestionsText6: ; 88949 (22:4949)
+_CinnabarQuizQuestionsText6:: ; 88949 (22:4949)
 	text "TM28 contains"
 	line "TOMBSTONER?"
 	done
 
-_CinnabarGymQuizCorrectText: ; 88964 (22:4964)
+_CinnabarGymQuizCorrectText:: ; 88964 (22:4964)
 	text "You're absolutely"
 	line "correct!"
 
 	para "Go on through!@@"
 
-_CinnabarGymQuizIncorrectText: ; 8898f (22:498f)
+_CinnabarGymQuizIncorrectText:: ; 8898f (22:498f)
 	text "Sorry! Bad call!"
 	prompt
 
-_UnnamedText_1eb69: ; 889a1 (22:49a1)
+_UnnamedText_1eb69:: ; 889a1 (22:49a1)
 	text "#MON magazines!"
 
 	para "#MON notebooks!"
@@ -627,28 +626,28 @@
 	para "#MON graphs!"
 	done
 
-_BillsHouseMonitorText: ; 889cf (22:49cf)
+_BillsHouseMonitorText:: ; 889cf (22:49cf)
 	text "TELEPORTER is"
 	line "displayed on the"
 	cont "PC monitor."
 	done
 
-_BillsHouseInitiatedText: ; 889fb (22:49fb)
+_BillsHouseInitiatedText:: ; 889fb (22:49fb)
 	text $52, " initiated"
 	line "TELEPORTER's Cell"
 	cont "Separator!@@"
 
-_BillsHousePokemonListText1: ; 88a25 (22:4a25)
+_BillsHousePokemonListText1:: ; 88a25 (22:4a25)
 	text "BILL's favorite"
 	line "#MON list!"
 	prompt
 
-_BillsHousePokemonListText2: ; 88a40 (22:4a40)
+_BillsHousePokemonListText2:: ; 88a40 (22:4a40)
 	text "Which #MON do"
 	line "you want to see?"
 	done
 
-_OakLabEmailText: ; 88a60 (22:4a60)
+_OakLabEmailText:: ; 88a60 (22:4a60)
 	text "There's an e-mail"
 	line "message here!"
 
@@ -675,36 +674,36 @@
 	cont "..."
 	done
 
-_GameCornerCoinCaseText: ; 88b5b (22:4b5b)
+_GameCornerCoinCaseText:: ; 88b5b (22:4b5b)
 	text "A COIN CASE is"
 	line "required!"
 	done
 
-_GameCornerNoCoinsText: ; 88b75 (22:4b75)
+_GameCornerNoCoinsText:: ; 88b75 (22:4b75)
 	text "You don't have"
 	line "any coins!"
 	done
 
-_GameCornerOutOfOrderText: ; 88b8f (22:4b8f)
+_GameCornerOutOfOrderText:: ; 88b8f (22:4b8f)
 	text "OUT OF ORDER"
 	line "This is broken."
 	done
 
-_GameCornerOutToLunchText: ; 88bad (22:4bad)
+_GameCornerOutToLunchText:: ; 88bad (22:4bad)
 	text "OUT TO LUNCH"
 	line "This is reserved."
 	done
 
-_GameCornerSomeonesKeysText: ; 88bcd (22:4bcd)
+_GameCornerSomeonesKeysText:: ; 88bcd (22:4bcd)
 	text "Someone's keys!"
 	line "They'll be back."
 	done
 
-_UnnamedText_21865: ; 88bed (22:4bed)
+_UnnamedText_21865:: ; 88bed (22:4bed)
 	text "Just a moment."
 	done
 
-TMNotebookText: ; 88bfd (22:4bfd)
+TMNotebookText:: ; 88bfd (22:4bfd)
 	text "It's a pamphlet"
 	line "on TMs."
 
@@ -719,15 +718,15 @@
 
 	para "SILPH CO.@@"
 
-_TurnPageText: ; 88c6f (22:4c6f)
+_TurnPageText:: ; 88c6f (22:4c6f)
 	text "Turn the page?"
 	done
 
-_ViridianSchoolNotebookText5: ; 88c7f (22:4c7f)
+_ViridianSchoolNotebookText5:: ; 88c7f (22:4c7f)
 	text "GIRL: Hey! Don't"
 	line "look at my notes!@@"
 
-_ViridianSchoolNotebookText1: ; 88ca3 (22:4ca3)
+_ViridianSchoolNotebookText1:: ; 88ca3 (22:4ca3)
 	text "Looked at the"
 	line "notebook!"
 
@@ -746,7 +745,7 @@
 	cont "#MON trainers."
 	prompt
 
-_ViridianSchoolNotebookText2: ; 88d46 (22:4d46)
+_ViridianSchoolNotebookText2:: ; 88d46 (22:4d46)
 	text "Second page..."
 
 	para "A healthy #MON"
@@ -759,7 +758,7 @@
 	cont "effective!"
 	prompt
 
-_ViridianSchoolNotebookText3: ; 88dbd (22:4dbd)
+_ViridianSchoolNotebookText3:: ; 88dbd (22:4dbd)
 	text "Third page..."
 
 	para "#MON trainers"
@@ -772,7 +771,7 @@
 	cont "at #MON GYMs."
 	prompt
 
-_ViridianSchoolNotebookText4: ; 88e2c (22:4e2c)
+_ViridianSchoolNotebookText4:: ; 88e2c (22:4e2c)
 	text "Fourth page..."
 
 	para "The goal for"
@@ -788,26 +787,26 @@
 	line "#MON LEAGUE!"
 	prompt
 
-_UnnamedText_52a10: ; 88ec1 (22:4ec1)
+_UnnamedText_52a10:: ; 88ec1 (22:4ec1)
 	text "Enemies on every"
 	line "side!"
 	done
 
-_UnnamedText_52a1d: ; 88ed9 (22:4ed9)
+_UnnamedText_52a1d:: ; 88ed9 (22:4ed9)
 	text "What goes around"
 	line "comes around!"
 	done
 
-_FightingDojoText: ; 88ef9 (22:4ef9)
+_FightingDojoText:: ; 88ef9 (22:4ef9)
 	text "FIGHTING DOJO"
 	done
 
-_IndigoPlateauHQText: ; 88f08 (22:4f08)
+_IndigoPlateauHQText:: ; 88f08 (22:4f08)
 	text "INDIGO PLATEAU"
 	line "#MON LEAGUE HQ"
 	done
 
-_RedBedroomSNESText: ; 88f27 (22:4f27)
+_RedBedroomSNESText:: ; 88f27 (22:4f27)
 	text $52, " is"
 	line "playing the SNES!"
 	cont "...Okay!"
@@ -814,7 +813,7 @@
 	cont "It's time to go!"
 	done
 
-_Route15UpstairsBinocularsText: ; 88f58 (22:4f58)
+_Route15UpstairsBinocularsText:: ; 88f58 (22:4f58)
 	text "Looked into the"
 	line "binoculars..."
 
@@ -823,19 +822,19 @@
 	cont "toward the sea."
 	done
 
-_AerodactylFossilText: ; 88fa7 (22:4fa7)
+_AerodactylFossilText:: ; 88fa7 (22:4fa7)
 	text "AERODACTYL Fossil"
 	line "A primitive and"
 	cont "rare #MON."
 	done
 
-_KabutopsFossilText: ; 88fd5 (22:4fd5)
+_KabutopsFossilText:: ; 88fd5 (22:4fd5)
 	text "KABUTOPS Fossil"
 	line "A primitive and"
 	cont "rare #MON."
 	done
 
-_LinkCableHelpText1: ; 89001 (22:5001)
+_LinkCableHelpText1:: ; 89001 (22:5001)
 	text "TRAINER TIPS"
 
 	para "Using a Game Link"
@@ -842,12 +841,12 @@
 	line "Cable"
 	prompt
 
-_LinkCableHelpText2: ; 89027 (22:5027)
+_LinkCableHelpText2:: ; 89027 (22:5027)
 	text "Which heading do"
 	line "you want to read?"
 	done
 
-_LinkCableInfoText1: ; 8904b (22:504b)
+_LinkCableInfoText1:: ; 8904b (22:504b)
 	text "When you have"
 	line "linked your GAME"
 	cont "BOY with another"
@@ -857,19 +856,19 @@
 	cont "#MON CENTER."
 	prompt
 
-_LinkCableInfoText2: ; 890bd (22:50bd)
+_LinkCableInfoText2:: ; 890bd (22:50bd)
 	text "COLOSSEUM lets"
 	line "you play against"
 	cont "a friend."
 	prompt
 
-_LinkCableInfoText3: ; 890e8 (22:50e8)
+_LinkCableInfoText3:: ; 890e8 (22:50e8)
 	text "TRADE CENTER is"
 	line "used for trading"
 	cont "#MON."
 	prompt
 
-_ViridianSchoolBlackboardText1: ; 89110 (22:5110)
+_ViridianSchoolBlackboardText1:: ; 89110 (22:5110)
 	text "The blackboard"
 	line "describes #MON"
 	cont "STATUS changes"
@@ -876,12 +875,12 @@
 	cont "during battles."
 	prompt
 
-_ViridianSchoolBlackboardText2: ; 8914e (22:514e)
+_ViridianSchoolBlackboardText2:: ; 8914e (22:514e)
 	text "Which heading do"
 	line "you want to read?"
 	done
 
-_ViridianBlackboardSleepText: ; 89172 (22:5172)
+_ViridianBlackboardSleepText:: ; 89172 (22:5172)
 	text "A #MON can't"
 	line "attack if it's"
 	cont "asleep!"
@@ -894,7 +893,7 @@
 	line "wake them up!"
 	prompt
 
-_ViridianBlackboardPoisonText: ; 891de (22:51de)
+_ViridianBlackboardPoisonText:: ; 891de (22:51de)
 	text "When poisoned, a"
 	line "#MON's health"
 	cont "steadily drops."
@@ -906,7 +905,7 @@
 	line "to cure poison!"
 	prompt
 
-_ViridianBlackbaordPrlzText: ; 8924b (22:524b)
+_ViridianBlackbaordPrlzText:: ; 8924b (22:524b)
 	text "Paralysis could"
 	line "make #MON"
 	cont "moves misfire!"
@@ -918,7 +917,7 @@
 	line "for treatment!"
 	prompt
 
-_ViridianBlackboardBurnText: ; 892b5 (22:52b5)
+_ViridianBlackboardBurnText:: ; 892b5 (22:52b5)
 	text "A burn reduces"
 	line "power and speed."
 	cont "It also causes"
@@ -931,7 +930,7 @@
 	line "cure a burn!"
 	prompt
 
-_ViridianBlackboardFrozenText: ; 8932f (22:532f)
+_ViridianBlackboardFrozenText:: ; 8932f (22:532f)
 	text "If frozen, a"
 	line "#MON becomes"
 	cont "totally immobile!"
@@ -944,12 +943,12 @@
 	line "thaw out #MON!"
 	prompt
 
-_VermilionGymTrashText: ; 893a7 (22:53a7)
+_VermilionGymTrashText:: ; 893a7 (22:53a7)
 	text "Nope, there's"
 	line "only trash here."
 	done
 
-_VermilionGymTrashSuccesText1: ; 893c6 (22:53c6)
+_VermilionGymTrashSuccesText1:: ; 893c6 (22:53c6)
 	text "Hey! There's a"
 	line "switch under the"
 	cont "trash!"
@@ -958,7 +957,7 @@
 	para "The 1st electric"
 	line "lock opened!@@"
 
-_VermilionGymTrashSuccesText2: ; 89418 (22:5418)
+_VermilionGymTrashSuccesText2:: ; 89418 (22:5418)
 	text "Hey! There's"
 	line "another switch"
 	cont "under the trash!"
@@ -965,7 +964,7 @@
 	cont "Turn it on!"
 	prompt
 
-_VermilionGymTrashSuccesText3: ; 89451 (22:5451)
+_VermilionGymTrashSuccesText3:: ; 89451 (22:5451)
 	text "The 2nd electric"
 	line "lock opened!"
 
@@ -972,82 +971,82 @@
 	para "The motorized door"
 	line "opened!@@"
 
-_VermilionGymTrashFailText: ; 8948c (22:548c)
+_VermilionGymTrashFailText:: ; 8948c (22:548c)
 	text "Nope! There's"
 	line "only trash here."
 	cont "Hey! The electric"
 	cont "locks were reset!@@"
 
-UnnamedText_894d0: ; 894d0 (22:54d0)
+UnnamedText_894d0:: ; 894d0 (22:54d0)
 	text $52, " found"
 	line "@"
 	TX_RAM $cd6d
 	text "!@@"
 
-_UnnamedText_76794: ; 894e1 (22:54e1)
+_UnnamedText_76794:: ; 894e1 (22:54e1)
 	text "But, ", $52, " has"
 	line "no more room for"
 	cont "other items!"
 	done
 
-_FoundHiddenCoinsText: ; 8950b (22:550b)
+_FoundHiddenCoinsText:: ; 8950b (22:550b)
 	text $52, " found"
 	line "@"
 	db $2, $a0, $ff, $c2 ; XXX $2
 	text " coins!@@"
 
-_FoundHiddenCoins2Text: ; 89523 (22:5523)
+_FoundHiddenCoins2Text:: ; 89523 (22:5523)
 	text $52, " found"
 	line "@"
 	db $2, $a0, $ff, $c2 ; XXX $2 probably coins
 	text " coins!@@"
 
-_DroppedHiddenCoinsText: ; 8953b (22:553b)
+_DroppedHiddenCoinsText:: ; 8953b (22:553b)
 	db $0
 	para "Oops! Dropped"
 	line "some coins!"
 	done
 
-_IndigoPlateauStatuesText1: ; 89557 (22:5557)
+_IndigoPlateauStatuesText1:: ; 89557 (22:5557)
 	text "INDIGO PLATEAU"
 	prompt
 
-_IndigoPlateauStatuesText2: ; 89567 (22:5567)
+_IndigoPlateauStatuesText2:: ; 89567 (22:5567)
 	text "The ultimate goal"
 	line "of trainers!"
 	cont "#MON LEAGUE HQ"
 	done
 
-_IndigoPlateauStatuesText3: ; 89596 (22:5596)
+_IndigoPlateauStatuesText3:: ; 89596 (22:5596)
 	text "The highest"
 	line "#MON authority"
 	cont "#MON LEAGUE HQ"
 	done
 
-_PokemonBooksText: ; 895c1 (22:55c1)
+_PokemonBooksText:: ; 895c1 (22:55c1)
 	text "Crammed full of"
 	line "#MON books!"
 	done
 
-_DiglettSculptureText: ; 895de (22:55de)
+_DiglettSculptureText:: ; 895de (22:55de)
 	text "It's a sculpture"
 	line "of DIGLETT."
 	done
 
-_ElevatorText: ; 895fb (22:55fb)
+_ElevatorText:: ; 895fb (22:55fb)
 	text "This is an"
 	line "elevator."
 	done
 
-_TownMapText: ; 89611 (22:5611)
+_TownMapText:: ; 89611 (22:5611)
 	text "A TOWN MAP.@@"
 
-_PokemonStuffText: ; 8961f (22:561f)
+_PokemonStuffText:: ; 8961f (22:561f)
 	text "Wow! Tons of"
 	line "#MON stuff!"
 	done
 
-_UnnamedText_3c1a8: ; 89639 (22:5639)
+_UnnamedText_3c1a8:: ; 89639 (22:5639)
 	text "PA: Ding-dong!"
 
 	para "You are out of"
@@ -1054,7 +1053,7 @@
 	line "SAFARI BALLs!"
 	prompt
 
-_UnnamedText_3c229: ; 89666 (22:5666)
+_UnnamedText_3c229:: ; 89666 (22:5666)
 	text "Wild @"
 	TX_RAM W_ENEMYMONNAME
 	db $0
@@ -1061,7 +1060,7 @@
 	line "ran!"
 	prompt
 
-_UnnamedText_3c22e: ; 89677 (22:5677)
+_UnnamedText_3c22e:: ; 89677 (22:5677)
 	text "Enemy @"
 	TX_RAM W_ENEMYMONNAME
 	db $0
@@ -1068,22 +1067,22 @@
 	line "ran!"
 	prompt
 
-_HurtByPoisonText: ; 89689 (22:5689)
+_HurtByPoisonText:: ; 89689 (22:5689)
 	text $5a, "'s"
 	line "hurt by poison!"
 	prompt
 
-_HurtByBurnText: ; 8969d (22:569d)
+_HurtByBurnText:: ; 8969d (22:569d)
 	text $5a, "'s"
 	line "hurt by the burn!"
 	prompt
 
-_HurtByLeechSeedText: ; 896b3 (22:56b3)
+_HurtByLeechSeedText:: ; 896b3 (22:56b3)
 	text "LEECH SEED saps"
 	line $5a, "!"
 	prompt
 
-_EnemyMonFainted: ; 0x896c7
+_EnemyMonFainted:: ; 0x896c7
 	text "Enemy @"
 	TX_RAM W_ENEMYMONNAME
 	db $0
@@ -1090,7 +1089,7 @@
 	line "fainted!"
 	prompt
 
-_MoneyForWinningText: ; 896dd (22:56dd)
+_MoneyForWinningText:: ; 896dd (22:56dd)
 	text $52, " got ¥@"
 	;XXX $2
 	db $2, $79, $d0, $c3
@@ -1098,7 +1097,7 @@
 	line "for winning!"
 	prompt
 
-_TrainerDefeatedText: ; 896f9 (22:56f9)
+_TrainerDefeatedText:: ; 896f9 (22:56f9)
 	text $52, " defeated"
 	line "@"
 	TX_RAM W_TRAINERNAME ; 0x89706
@@ -1105,22 +1104,22 @@
 	text "!"
 	prompt
 
-_PlayerMonFaintedText: ; 8970c (22:570c)
+_PlayerMonFaintedText:: ; 8970c (22:570c)
 	TX_RAM W_PLAYERMONNAME
 	db $0
 	line "fainted!"
 	prompt
 
-_UnnamedText_3c7d3: ; 8971a (22:571a)
+_UnnamedText_3c7d3:: ; 8971a (22:571a)
 	text "Use next #MON?"
 	done
 
-_Sony1WinText: ; 8972a (22:572a)
+_Sony1WinText:: ; 8972a (22:572a)
 	text $53, ": Yeah! Am"
 	line "I great or what?"
 	prompt
 
-_PlayerBlackedOutText2: ; 89748 (22:5748)
+_PlayerBlackedOutText2:: ; 89748 (22:5748)
 	text $52, " is out of"
 	line "useable #MON!"
 
@@ -1128,7 +1127,7 @@
 	line "out!"
 	prompt
 
-_LinkBattleLostText: ; 89772 (22:5772)
+_LinkBattleLostText:: ; 89772 (22:5772)
 	text $52, " lost to"
 	line "@"
 	TX_RAM W_TRAINERNAME ; 0x8977e
@@ -1135,7 +1134,7 @@
 	text "!"
 	prompt
 
-_TrainerAboutToUseText: ; 89784 (22:5784)
+_TrainerAboutToUseText:: ; 89784 (22:5784)
 	TX_RAM W_TRAINERNAME
 	text " is"
 	line "about to use"
@@ -1147,7 +1146,7 @@
 	line "change #MON?"
 	done
 
-_TrainerSentOutText: ; 897b4 (22:57b4)
+_TrainerSentOutText:: ; 897b4 (22:57b4)
 	TX_RAM W_TRAINERNAME
 	text " sent"
 	line "out @"
@@ -1155,53 +1154,53 @@
 	text "!"
 	done
 
-_UnnamedText_3cab4: ; 897c9 (22:57c9)
+_UnnamedText_3cab4:: ; 897c9 (22:57c9)
 	text "There's no will"
 	line "to fight!"
 	prompt
 
-_UnnamedText_3cb97: ; 897e3 (22:57e3)
+_UnnamedText_3cb97:: ; 897e3 (22:57e3)
 	text "Can't escape!"
 	prompt
 
-_UnnamedText_3cb9c: ; 897f1 (22:57f1)
+_UnnamedText_3cb9c:: ; 897f1 (22:57f1)
 	text "No! There's no"
 	line "running from a"
 	cont "trainer battle!"
 	prompt
 
-_UnnamedText_3cba1: ; 8981f (22:581f)
+_UnnamedText_3cba1:: ; 8981f (22:581f)
 	text "Got away safely!"
 	prompt
 
-ItemsCantBeUsedHere_: ; 89831 (22:5831)
+ItemsCantBeUsedHere_:: ; 89831 (22:5831)
 	text "Items can't be"
 	line "used here."
 	prompt
 
-_UnnamedText_3d1f5: ; 8984b (22:584b)
+_UnnamedText_3d1f5:: ; 8984b (22:584b)
 	TX_RAM W_PLAYERMONNAME
 	text " is"
 	line "already out!"
 	prompt
 
-_MoveNoPPText: ; 89860 (22:5860)
+_MoveNoPPText:: ; 89860 (22:5860)
 	text "No PP left for"
 	line "this move!"
 	prompt
 
-_MoveDisabledText: ; 8987b (22:587b)
+_MoveDisabledText:: ; 8987b (22:587b)
 	text "The move is"
 	line "disabled!"
 	prompt
 
-_UnnamedText_3d430: ; 89892 (22:5892)
+_UnnamedText_3d430:: ; 89892 (22:5892)
 	TX_RAM W_PLAYERMONNAME
 	text " has no"
 	line "moves left!"
 	done
 
-_MultiHitText: ; 898aa (22:58aa)
+_MultiHitText:: ; 898aa (22:58aa)
 	text "Hit the enemy"
 	line "@"
 	TX_NUM W_NUMHITS,1,1
@@ -1208,93 +1207,93 @@
 	text " times!"
 	prompt
 
-_ScaredText: ; 898c7 (22:58c7)
+_ScaredText:: ; 898c7 (22:58c7)
 	TX_RAM W_PLAYERMONNAME
 	text " is too"
 	line "scared to move!"
 	prompt
 
-_GetOutText: ; 898e3 (22:58e3)
+_GetOutText:: ; 898e3 (22:58e3)
 	text "GHOST: Get out..."
 	line "Get out..."
 	prompt
 
-_FastAsleepText: ; 89901 (22:5901)
+_FastAsleepText:: ; 89901 (22:5901)
 	text $5A
 	line "is fast asleep!"
 	prompt
 
-_WokeUpText: ; 89914 (22:5914)
+_WokeUpText:: ; 89914 (22:5914)
 	text $5A
 	line "woke up!"
 	prompt
 
-_FrozenText: ; 89920 (22:5920)
+_FrozenText:: ; 89920 (22:5920)
 	text $5A
 	line "is frozen solid!"
 	prompt
 
-_FullyParalyzedText: ; 89934 (22:5934)
+_FullyParalyzedText:: ; 89934 (22:5934)
 	text $5A,"'s"
 	line "fully paralyzed!"
 	prompt
 
-_FlinchedText: ; 89949 (22:5949)
+_FlinchedText:: ; 89949 (22:5949)
 	text $5A
 	line "flinched!"
 	prompt
 
-_MustRechargeText: ; 89956 (22:5956)
+_MustRechargeText:: ; 89956 (22:5956)
 	text $5A
 	line "must recharge!"
 	prompt
 
-_DisabledNoMoreText: ; 89968 (22:5968)
+_DisabledNoMoreText:: ; 89968 (22:5968)
 	text $5A,"'s"
 	line "disabled no more!"
 	prompt
 
-_IsConfusedText: ; 8997e (22:597e)
+_IsConfusedText:: ; 8997e (22:597e)
 	text $5A
 	line "is confused!"
 	prompt
 
-_HurtItselfText: ; 8998e (22:598e)
+_HurtItselfText:: ; 8998e (22:598e)
 	text "It hurt itself in"
 	line "its confusion!"
 	prompt
 
-_ConfusedNoMoreText: ; 899b0 (22:59b0)
+_ConfusedNoMoreText:: ; 899b0 (22:59b0)
 	text $5A,"'s"
 	line "confused no more!"
 	prompt
 
-_SavingEnergyText: ; 899c6 (22:59c6)
+_SavingEnergyText:: ; 899c6 (22:59c6)
 	text $5A
 	line "is saving energy!"
 	prompt
 
-_UnleashedEnergyText: ; 899db (22:59db)
+_UnleashedEnergyText:: ; 899db (22:59db)
 	text $5A
 	line "unleashed energy!"
 	prompt
 
-_ThrashingAboutText: ; 899f0 (22:59f0)
+_ThrashingAboutText:: ; 899f0 (22:59f0)
 	text $5A,"'s"
 	line "thrashing about!"
 	done
 
-_AttackContinuesText: ; 89a05 (22:5a05)
+_AttackContinuesText:: ; 89a05 (22:5a05)
 	text $5A,"'s"
 	line "attack continues!"
 	done
 
-_CantMoveText: ; 89a1b (22:5a1b)
+_CantMoveText:: ; 89a1b (22:5a1b)
 	text $5A
 	line "can't move!"
 	prompt
 
-_UnnamedText_3daa8: ; 89a29 (22:5a29)
+_UnnamedText_3daa8:: ; 89a29 (22:5a29)
 	text $5a, "'s"
 	line "@"
 	TX_RAM $cd6d
@@ -1302,149 +1301,149 @@
 	cont "disabled!"
 	prompt
 
-_UnnamedText_3dafb: ; 89a40 (22:5a40)
+_UnnamedText_3dafb:: ; 89a40 (22:5a40)
 	text $5a, "@@"
 
-_UnnamedText_3db2d: ; 89a44 (22:5a44)
+_UnnamedText_3db2d:: ; 89a44 (22:5a44)
 	db $0
 	line "used @@"
 
-_UnnamedText_3db34: ; 89a4d (22:5a4d)
+_UnnamedText_3db34:: ; 89a4d (22:5a4d)
 	db $0
 	line "used @@"
 
-_UnnamedText_3db43: ; 89a56 (22:5a56)
+_UnnamedText_3db43:: ; 89a56 (22:5a56)
 	text "instead,"
 	cont "@@"
 
-_UnnamedText_3db4c: ; 89a62 (22:5a62)
+_UnnamedText_3db4c:: ; 89a62 (22:5a62)
 	TX_RAM $cf4b
 	text "@"
 
-_UnnamedText_3db6c: ; 89a67 (22:5a67)
+_UnnamedText_3db6c:: ; 89a67 (22:5a67)
 	text "!"
 	done
 
-_UnnamedText_3db71: ; 89a6a (22:5a6a)
+_UnnamedText_3db71:: ; 89a6a (22:5a6a)
 	text "!"
 	done
 
-_UnnamedText_3db76: ; 89a6d (22:5a6d)
+_UnnamedText_3db76:: ; 89a6d (22:5a6d)
 	text "!"
 	done
 
-_UnnamedText_3db7b: ; 89a70 (22:5a70)
+_UnnamedText_3db7b:: ; 89a70 (22:5a70)
 	text "!"
 	done
 
-_UnnamedText_3db80: ; 89a73 (22:5a73)
+_UnnamedText_3db80:: ; 89a73 (22:5a73)
 	text "!"
 	done
 
-_UnnamedText_3dc42: ; 89a76 (22:5a76)
+_UnnamedText_3dc42:: ; 89a76 (22:5a76)
 	text $5a, "'s"
 	line "attack missed!"
 	prompt
 
-_UnnamedText_3dc47: ; 89a89 (22:5a89)
+_UnnamedText_3dc47:: ; 89a89 (22:5a89)
 	text $5a
 	line "kept going and"
 	cont "crashed!"
 	prompt
 
-_UnnamedText_3dc4c: ; 89aa4 (22:5aa4)
+_UnnamedText_3dc4c:: ; 89aa4 (22:5aa4)
 	text $59, "'s"
 	line "unaffected!"
 	prompt
 
-_UnnamedText_3dc57: ; 89ab4 (22:5ab4)
+_UnnamedText_3dc57:: ; 89ab4 (22:5ab4)
 	text "It doesn't affect"
 	line $59, "!"
 	prompt
 
-_UnnamedText_3dc7e: ; 89ac9 (22:5ac9)
+_UnnamedText_3dc7e:: ; 89ac9 (22:5ac9)
 	text "Critical hit!"
 	prompt
 
-_UnnamedText_3dc83: ; 89ad8 (22:5ad8)
+_UnnamedText_3dc83:: ; 89ad8 (22:5ad8)
 	text "One-hit KO!"
 	prompt
 
-_UnnamedText_3ddb6: ; 89ae5 (22:5ae5)
+_UnnamedText_3ddb6:: ; 89ae5 (22:5ae5)
 	TX_RAM W_PLAYERMONNAME
 	text " is"
 	line "loafing around."
 	prompt
 
-_UnnamedText_3ddbb: ; 89afd (22:5afd)
+_UnnamedText_3ddbb:: ; 89afd (22:5afd)
 	TX_RAM W_PLAYERMONNAME
 	text " began"
 	line "to nap!"
 	prompt
 
-_UnnamedText_3ddc0: ; 89b10 (22:5b10)
+_UnnamedText_3ddc0:: ; 89b10 (22:5b10)
 	TX_RAM W_PLAYERMONNAME
 	text " won't"
 	line "obey!"
 	prompt
 
-_UnnamedText_3ddc5: ; 89b20 (22:5b20)
+_UnnamedText_3ddc5:: ; 89b20 (22:5b20)
 	TX_RAM W_PLAYERMONNAME
 	text " turned"
 	line "away!"
 	prompt
 
-_UnnamedText_3ddca: ; 89b32 (22:5b32)
+_UnnamedText_3ddca:: ; 89b32 (22:5b32)
 	TX_RAM W_PLAYERMONNAME
 	db $0
 	line "ignored orders!"
 	prompt
 
-_SubstituteTookDamageText: ; 89b47 (22:5b47)
+_SubstituteTookDamageText:: ; 89b47 (22:5b47)
 	text "The SUBSTITUTE"
 	line "took damage for"
 	cont $59, "!"
 	prompt
 
-_SubstituteBrokeText: ; 89b6a (22:5b6a)
+_SubstituteBrokeText:: ; 89b6a (22:5b6a)
 	text $59, "'s"
 	line "SUBSTITUTE broke!"
 	prompt
 
-_BuildingRageText: ; 89b80 (22:5b80)
+_BuildingRageText:: ; 89b80 (22:5b80)
 	text $5a, "'s"
 	line "RAGE is building!"
 	prompt
 
-_MirrorMoveFailedText: ; 89b96 (22:5b96)
+_MirrorMoveFailedText:: ; 89b96 (22:5b96)
 	text "The MIRROR MOVE"
 	next "failed!"
 	prompt
 
-_UnnamedText_3e887: ; 89baf (22:5baf)
+_UnnamedText_3e887:: ; 89baf (22:5baf)
 	text "Hit @"
 	TX_NUM $cd05, 1, 1
 	text " times!"
 	prompt
 
-_UnnamedText_554b2: ; 89bc2 (22:5bc2)
+_UnnamedText_554b2:: ; 89bc2 (22:5bc2)
 	TX_RAM $cd6d
 	text " gained"
 	line "@@"
 
-_UnnamedText_554cb: ; 89bd0 (22:5bd0)
+_UnnamedText_554cb:: ; 89bd0 (22:5bd0)
 	text "with EXP.ALL,"
 	cont "@@"
 
-_UnnamedText_554d4: ; 89be1 (22:5be1)
+_UnnamedText_554d4:: ; 89be1 (22:5be1)
 	text "a boosted"
 	cont "@@"
-_UnnamedText_554d8: ; 89bee (22:5bee)
+_UnnamedText_554d8:: ; 89bee (22:5bee)
 	TX_NUM $cf4b, 2, 4
 	text " EXP. Points!"
 	prompt
 
-UnnamedText_89c01: ; 89c01 (22:5c01)
+UnnamedText_89c01:: ; 89c01 (22:5c01)
 	TX_RAM $cd6d
 	text " grew"
 	line "to level @"
@@ -1451,7 +1450,7 @@
 	TX_NUM $d127, 1, 3
 	text "!@@"
 
-_UnnamedText_58e3b: ; 89c1d (22:5c1d)
+_UnnamedText_58e3b:: ; 89c1d (22:5c1d)
 	text "Wild @"
 	TX_RAM W_ENEMYMONNAME
 	db $0
@@ -1458,7 +1457,7 @@
 	line "appeared!"
 	prompt
 
-_UnnamedText_58e40: ; 89c33 (22:5c33)
+_UnnamedText_58e40:: ; 89c33 (22:5c33)
 	text "The hooked"
 	line "@"
 	TX_RAM W_ENEMYMONNAME
@@ -1466,76 +1465,76 @@
 	cont "attacked!"
 	prompt
 
-_UnnamedText_58e45: ; 89c4f (22:5c4f)
+_UnnamedText_58e45:: ; 89c4f (22:5c4f)
 	TX_RAM W_ENEMYMONNAME
 	db $0
 	line "appeared!"
 	prompt
 
-_UnnamedText_58e4a: ; 89c5e (22:5c5e)
+_UnnamedText_58e4a:: ; 89c5e (22:5c5e)
 	TX_RAM W_TRAINERNAME
 	text " wants"
 	line "to fight!"
 	prompt
 
-_UnnamedText_58e4f: ; 89c73 (22:5c73)
+_UnnamedText_58e4f:: ; 89c73 (22:5c73)
 	text "SILPH SCOPE"
 	line "unveiled the"
 	cont "GHOST's identity!"
 	prompt
 
-_UnnamedText_58e54: ; 89c9e (22:5c9e)
+_UnnamedText_58e54:: ; 89c9e (22:5c9e)
 	text "Darn! The GHOST"
 	line "can't be ID'd!"
 	prompt
 
-_UnnamedText_58eae: ; 89cbc (22:5cbc)
+_UnnamedText_58eae:: ; 89cbc (22:5cbc)
 	text "Go! @@"
 
-_UnnamedText_58eb5: ; 89cc3 (22:5cc3)
+_UnnamedText_58eb5:: ; 89cc3 (22:5cc3)
 	text "Do it! @@"
 
-_UnnamedText_58ebc: ; 89ccd (22:5ccd)
+_UnnamedText_58ebc:: ; 89ccd (22:5ccd)
 	text "Get'm! @@"
 
-_UnnamedText_58ec3: ; 89cd6 (22:5cd6)
+_UnnamedText_58ec3:: ; 89cd6 (22:5cd6)
 	text "The enemy's weak!"
 	line "Get'm! @@"
 
-_UnnamedText_58ecc: ; 89cf0 (22:5cf0)
+_UnnamedText_58ecc:: ; 89cf0 (22:5cf0)
 	TX_RAM W_PLAYERMONNAME
 	text "!"
 	done
 
-_UnnamedText_58ed7: ; 89cf6 (22:5cf6)
+_UnnamedText_58ed7:: ; 89cf6 (22:5cf6)
 	TX_RAM W_PLAYERMONNAME
 	text " @@"
 
-_UnnamedText_58f25: ; 89cfd (22:5cfd)
+_UnnamedText_58f25:: ; 89cfd (22:5cfd)
 	text "enough!@@"
 
-_UnnamedText_58f2c: ; 89d07 (22:5d07)
+_UnnamedText_58f2c:: ; 89d07 (22:5d07)
 	text "OK!@@"
 
-_UnnamedText_58f33: ; 89d0d (22:5d0d)
+_UnnamedText_58f33:: ; 89d0d (22:5d0d)
 	text "good!@@"
 
-_UnnamedText_58f3e: ; 89d15 (22:5d15)
+_UnnamedText_58f3e:: ; 89d15 (22:5d15)
 	db $0
 	line "Come back!"
 	done
 
-_UnnamedText_2fb8e: ; 89d22 (22:5d22)
+_UnnamedText_2fb8e:: ; 89d22 (22:5d22)
 	text "It's super"
 	line "effective!"
 	prompt
 
-_UnnamedText_2fb93: ; 89d38 (22:5d38)
+_UnnamedText_2fb93:: ; 89d38 (22:5d38)
 	text "It's not very"
 	line "effective..."
 	prompt
 
-SafariZoneEatingText: ; 89d53 (22:5d53)
+SafariZoneEatingText:: ; 89d53 (22:5d53)
 	text "Wild @"
 	TX_RAM W_ENEMYMONNAME
 	db $0
@@ -1542,7 +1541,7 @@
 	line "is eating!"
 	prompt
 
-SafariZoneAngryText: ; 89d6a (22:5d6a)
+SafariZoneAngryText:: ; 89d6a (22:5d6a)
 	text "Wild @"
 	TX_RAM W_ENEMYMONNAME
 	db $0
@@ -1552,7 +1551,7 @@
 ; money related
 ; XXX $2 BCD macro
 ; $2, pointer, byte
-_UnnamedText_1386b: ; 89d80 (22:5d80)
+_UnnamedText_1386b:: ; 89d80 (22:5d80)
 	text $52, " picked up"
 	line "¥@"
 	db $2, $e5, $cc, $c3
@@ -1559,41 +1558,41 @@
 	text "!"
 	prompt
 
-_UnnamedText_1c9c1: ; 89d96 (22:5d96)
+_UnnamedText_1c9c1:: ; 89d96 (22:5d96)
 	text "Clear all saved"
 	line "data?"
 	done
 
-_UnnamedText_1ca14: ; 89dad (22:5dad)
+_UnnamedText_1ca14:: ; 89dad (22:5dad)
 	text "Which floor do"
 	line "you want? "
 	done
 
-_PartyMenuNormalText: ; 89dc8 (22:5dc8)
+_PartyMenuNormalText:: ; 89dc8 (22:5dc8)
 	text "Choose a #MON."
 	done
 
-_PartyMenuItemUseText: ; 89dd8 (22:5dd8)
+_PartyMenuItemUseText:: ; 89dd8 (22:5dd8)
 	text "Use item on which"
 	line "#MON?"
 	done
 
-_PartyMenuBattleText: ; 89df1 (22:5df1)
+_PartyMenuBattleText:: ; 89df1 (22:5df1)
 	text "Bring out which"
 	line "#MON?"
 	done
 
-_PartyMenuUseTMText: ; 89e08 (22:5e08)
+_PartyMenuUseTMText:: ; 89e08 (22:5e08)
 	text "Use TM on which"
 	line "#MON?"
 	done
 
-_PartyMenuSwapMonText: ; 89e1f (22:5e1f)
+_PartyMenuSwapMonText:: ; 89e1f (22:5e1f)
 	text "Move #MON"
 	line "where?"
 	done
 
-_PotionText: ; 89e31 (22:5e31)
+_PotionText:: ; 89e31 (22:5e31)
 	TX_RAM $cd6d
 	db $0
 	line "recovered by @"
@@ -1601,49 +1600,49 @@
 	text "!"
 	done
 
-_AntidoteText: ; 89e4b (22:5e4b)
+_AntidoteText:: ; 89e4b (22:5e4b)
 	TX_RAM $cd6d
 	text " was"
 	line "cured of poison!"
 	done
 
-_ParlyzHealText: ; 89e65 (22:5e65)
+_ParlyzHealText:: ; 89e65 (22:5e65)
 	TX_RAM $cd6d
 	text "'s"
 	line "rid of paralysis!"
 	done
 
-_BurnHealText: ; 89e7d (22:5e7d)
+_BurnHealText:: ; 89e7d (22:5e7d)
 	TX_RAM $cd6d
 	text "'s"
 	line "burn was healed!"
 	done
 
-_IceHealText: ; 89e94 (22:5e94)
+_IceHealText:: ; 89e94 (22:5e94)
 	TX_RAM $cd6d
 	text " was"
 	line "defrosted!"
 	done
 
-_AwakeningText: ; 89ea8 (22:5ea8)
+_AwakeningText:: ; 89ea8 (22:5ea8)
 	TX_RAM $cd6d
 	db $0
 	line "woke up!"
 	done
 
-_FullHealText: ; 89eb6 (22:5eb6)
+_FullHealText:: ; 89eb6 (22:5eb6)
 	TX_RAM $cd6d
 	text "'s"
 	line "health returned!"
 	done
 
-_ReviveText: ; 89ecd (22:5ecd)
+_ReviveText:: ; 89ecd (22:5ecd)
 	TX_RAM $cd6d
 	db $0
 	line "is revitalized!"
 	done
 
-_RareCandyText: ; 89ee2 (22:5ee2)
+_RareCandyText:: ; 89ee2 (22:5ee2)
 	TX_RAM $cd6d
 	text " grew"
 	line "to level @"
@@ -1650,12 +1649,12 @@
 	TX_NUM $d127, $1,$3
 	text "!@@"
 
-_UnnamedText_17f23: ; 89efe (22:5efe)
+_UnnamedText_17f23:: ; 89efe (22:5efe)
 	text $52, " turned on"
 	line "the PC."
 	prompt
 
-_UnnamedText_17f28: ; 89f13 (22:5f13)
+_UnnamedText_17f28:: ; 89f13 (22:5f13)
 	text "Accessed BILL's"
 	line "PC."
 
@@ -1663,7 +1662,7 @@
 	line "Storage System."
 	prompt
 
-_UnnamedText_17f2d: ; 89f45 (22:5f45)
+_UnnamedText_17f2d:: ; 89f45 (22:5f45)
 	text "Accessed someone's"
 	line "PC."
 
@@ -1671,7 +1670,7 @@
 	line "Storage System."
 	prompt
 
-_UnnamedText_17f32: ; 89f7a (22:5f7a)
+_UnnamedText_17f32:: ; 89f7a (22:5f7a)
 	text "Accessed my PC."
 
 	para "Accessed Item"
@@ -1678,51 +1677,51 @@
 	line "Storage System."
 	prompt
 
-_UnnamedText_7b22: ; 89fa9 (22:5fa9)
+_UnnamedText_7b22:: ; 89fa9 (22:5fa9)
 	text $52, " turned on"
 	line "the PC."
 	prompt
 
-_UnnamedText_7b27: ; 89fbe (22:5fbe)
+_UnnamedText_7b27:: ; 89fbe (22:5fbe)
 	text "What do you want"
 	line "to do?"
 	done
 
-_UnnamedText_7b2c: ; 89fd7 (22:5fd7)
+_UnnamedText_7b2c:: ; 89fd7 (22:5fd7)
 	text "What do you want"
 	line "to deposit?"
 	done
 
-_UnnamedText_7b31: ; 89ff5 (22:5ff5)
+_UnnamedText_7b31:: ; 89ff5 (22:5ff5)
 	text "How many?"
 	done
 
-_UnnamedText_7b36: ; 8a000 (22:6000)
+_UnnamedText_7b36:: ; 8a000 (22:6000)
 	TX_RAM $cd6d
 	text " was"
 	line "stored via PC."
 	prompt
 
-_UnnamedText_7b3b: ; 8a018 (22:6018)
+_UnnamedText_7b3b:: ; 8a018 (22:6018)
 	text "You have nothing"
 	line "to deposit."
 	prompt
 
-_UnnamedText_7b40: ; 8a036 (22:6036)
+_UnnamedText_7b40:: ; 8a036 (22:6036)
 	text "No room left to"
 	line "store items."
 	prompt
 
-_UnnamedText_7b45: ; 8a054 (22:6054)
+_UnnamedText_7b45:: ; 8a054 (22:6054)
 	text "What do you want"
 	line "to withdraw?"
 	done
 
-_UnnamedText_7b4a: ; 8a073 (22:6073)
+_UnnamedText_7b4a:: ; 8a073 (22:6073)
 	text "How many?"
 	done
 
-_UnnamedText_7b4f: ; 8a07e (22:607e)
+_UnnamedText_7b4f:: ; 8a07e (22:607e)
 	text "Withdrew"
 	line "@"
 	TX_RAM $cd6d
@@ -1729,26 +1728,26 @@
 	text "."
 	prompt
 
-_UnnamedText_7b54: ; 8a08f (22:608f)
+_UnnamedText_7b54:: ; 8a08f (22:608f)
 	text "There is nothing"
 	line "stored."
 	prompt
 
-_UnnamedText_7b59: ; 8a0a9 (22:60a9)
+_UnnamedText_7b59:: ; 8a0a9 (22:60a9)
 	text "You can't carry"
 	line "any more items."
 	prompt
 
-_UnnamedText_7b5e: ; 8a0c9 (22:60c9)
+_UnnamedText_7b5e:: ; 8a0c9 (22:60c9)
 	text "What do you want"
 	line "to toss away?"
 	done
 
-_UnnamedText_7b63: ; 8a0e9 (22:60e9)
+_UnnamedText_7b63:: ; 8a0e9 (22:60e9)
 	text "How many?"
 	done
 
-_UnnamedText_76683: ; 8a0f4 (22:60f4)
+_UnnamedText_76683:: ; 8a0f4 (22:60f4)
 	text "Accessed #MON"
 	line "LEAGUE's site."
 
@@ -1756,20 +1755,20 @@
 	line "OF FAME List."
 	prompt
 
-_SwitchOnText: ; 0x8a131
+_SwitchOnText:: ; 0x8a131
 	text "Switch on!"
 	prompt
 
-_WhatText: ; 0x8a13d
+_WhatText:: ; 0x8a13d
 	text "What?"
 	done
 
-_DepositWhichMonText: ; 0x8a144
+_DepositWhichMonText:: ; 0x8a144
 	text "Deposit which"
 	line "#MON?"
 	done
 
-_MonWasStoredText: ; 0x8a159
+_MonWasStoredText:: ; 0x8a159
 	TX_RAM $cf4b
 	text " was"
 	line "stored in Box @"
@@ -1777,17 +1776,17 @@
 	text "."
 	prompt
 
-_CantDepositLastMonText: ; 0x8a177
+_CantDepositLastMonText:: ; 0x8a177
 	text "You can't deposit"
 	line "the last #MON!"
 	prompt
 
-_BoxFullText: ; 0x8a198
+_BoxFullText:: ; 0x8a198
 	text "Oops! This Box is"
 	line "full of #MON."
 	prompt
 
-_MonIsTakenOutText: ; 0x8a1b9
+_MonIsTakenOutText:: ; 0x8a1b9
 	TX_RAM $cf4b
 	text " is"
 	line "taken out."
@@ -1796,12 +1795,12 @@
 	text "."
 	prompt
 
-_NoMonText: ; 0x8a1d7
+_NoMonText:: ; 0x8a1d7
 	text "What? There are"
 	line "no #MON here!"
 	prompt
 
-_CantTakeMonText: ; 0x8a1f6
+_CantTakeMonText:: ; 0x8a1f6
 	text "You can't take"
 	line "any more #MON."
 
@@ -1809,12 +1808,12 @@
 	line "first."
 	prompt
 
-_ReleaseWhichMonText: ; 0x8a228
+_ReleaseWhichMonText:: ; 0x8a228
 	text "Release which"
 	line "#MON?"
 	done
 
-_OnceReleasedText: ; 0x8a23d
+_OnceReleasedText:: ; 0x8a23d
 	text "Once released,"
 	line "@"
 	TX_RAM $cf4b
@@ -1822,35 +1821,35 @@
 	cont "gone forever. OK?"
 	done
 
-_MonWasReleasedText: ; 0x8a268
+_MonWasReleasedText:: ; 0x8a268
 	TX_RAM $cf4b
 	text " was"
 	line "released outside."
 	cont "Bye @"
 
-_UnnamedText_8a288: ; 8a288 (22:6288)
+_UnnamedText_8a288:: ; 8a288 (22:6288)
 	TX_RAM $cf4b
 	text "!"
 	prompt
 
-_RequireCoinCaseText: ; 8a28e (22:628e)
+_RequireCoinCaseText:: ; 8a28e (22:628e)
 	text "A COIN CASE is"
 	line "required!@@"
 
-_ExchangeCoinsForPrizesText: ; 8a2a9 (22:62a9)
+_ExchangeCoinsForPrizesText:: ; 8a2a9 (22:62a9)
 	text "We exchange your"
 	line "coins for prizes."
 	prompt
 
-_WhichPrizeText: ; 8a2cd (22:62cd)
+_WhichPrizeText:: ; 8a2cd (22:62cd)
 	text "Which prize do"
 	line "you want?"
 	done
 
-_HereYouGoText: ; 8a2e7 (22:62e7)
+_HereYouGoText:: ; 8a2e7 (22:62e7)
 	text "Here you go!@@"
 
-_SoYouWantPrizeText: ; 8a2f6 (22:62f6)
+_SoYouWantPrizeText:: ; 8a2f6 (22:62f6)
 	text "So, you want"
 	line "@"
 	TX_RAM $CD6D
@@ -1857,27 +1856,27 @@
 	text "?"
 	done
 
-_SorryNeedMoreCoins: ; 8a30b (22:630b)
+_SorryNeedMoreCoins:: ; 8a30b (22:630b)
 	text "Sorry, you need"
 	line "more coins.@@"
 
-_OopsYouDontHaveEnoughRoomText: ; 8a329 (22:6329)
+_OopsYouDontHaveEnoughRoomText:: ; 8a329 (22:6329)
 	text "Oops! You don't"
 	line "have enough room.@@"
 
-_OhFineThenText: ; 8a34c (22:634c)
+_OhFineThenText:: ; 8a34c (22:634c)
 	text "Oh, fine then.@@"
 
-_UnnamedText_1e93b: ; 8a35d (22:635d)
+_UnnamedText_1e93b:: ; 8a35d (22:635d)
 	text "Want to get your"
 	line "#DEX rated?"
 	done
 
-_UnnamedText_1e940: ; 8a37b (22:637b)
+_UnnamedText_1e940:: ; 8a37b (22:637b)
 	text "Closed link to"
 	line "PROF.OAK's PC.@@"
 
-_UnnamedText_1e946: ; 8a39a (22:639a)
+_UnnamedText_1e946:: ; 8a39a (22:639a)
 	text "Accessed PROF."
 	line "OAK's PC."
 
@@ -1885,17 +1884,17 @@
 	line "Rating System."
 	prompt
 
-_UnnamedText_5d43: ; 8a3d0 (22:63d0)
+_UnnamedText_5d43:: ; 8a3d0 (22:63d0)
 	text "Where would you"
 	line "like to go?"
 	done
 
-_UnnamedText_5d48: ; 8a3ed (22:63ed)
+_UnnamedText_5d48:: ; 8a3ed (22:63ed)
 	text "OK, please wait"
 	line "just a moment."
 	done
 
-_UnnamedText_5d4d: ; 8a40d (22:640d)
+_UnnamedText_5d4d:: ; 8a40d (22:640d)
 	text "The link was"
 	line "canceled."
 	done
@@ -1902,7 +1901,7 @@
 
 INCLUDE "text/oakspeech.asm"
 
-_DoYouWantToNicknameText: ; 0x8a605
+_DoYouWantToNicknameText:: ; 0x8a605
 	text "Do you want to"
 	line "give a nickname"
 	cont "to @"
@@ -1910,18 +1909,18 @@
 	text "?"
 	done
 
-_UnnamedText_699f: ; 8a62f (22:662f)
+_UnnamedText_699f:: ; 8a62f (22:662f)
 	text "Right! So your"
 	line "name is ", $52, "!"
 	prompt
 
-_UnnamedText_69e7: ; 8a64a (22:664a)
+_UnnamedText_69e7:: ; 8a64a (22:664a)
 	text "That's right! I"
 	line "remember now! His"
 	cont "name is ", $53, "!"
 	prompt
 
-_SSAnne8AfterBattleText2: ; 8a677 (22:6677)
+_SSAnne8AfterBattleText2:: ; 8a677 (22:6677)
 	TX_RAM $cd3f
 	text " and"
 	line "@"
@@ -1930,12 +1929,12 @@
 	cont "be traded."
 	done
 
-_Char00Text: ; 8a696 (22:6696)
+_Char00Text:: ; 8a696 (22:6696)
 	TX_NUM $FF8C,1,2
 	text " ERROR."
 	done
 
-_Char55Text: ; 8a6a3 (22:66a3)
+_Char55Text:: ; 8a6a3 (22:66a3)
 	text $4B,"@@"
 
 INCLUDE "text/maps/digletts_cave_route_2_entrance.asm"
@@ -2011,28 +2010,28 @@
 INCLUDE "text/maps/route_24_2.asm"
 INCLUDE "text/maps/route_25.asm"
 
-_FileDataDestroyedText: ; 945f1 (25:45f1)
+_FileDataDestroyedText:: ; 945f1 (25:45f1)
 	text "The file data is"
 	line "destroyed!"
 	prompt
 
-_WouldYouLikeToSaveText: ; 9460e (25:460e)
+_WouldYouLikeToSaveText:: ; 9460e (25:460e)
 	text "Would you like to"
 	line "SAVE the game?"
 	done
 
-_GameSavedText: ; 94630 (25:4630)
+_GameSavedText:: ; 94630 (25:4630)
 	text $52, " saved"
 	line "the game!"
 	done
 
-_OlderFileWillBeErasedText: ; 94643 (25:4643)
+_OlderFileWillBeErasedText:: ; 94643 (25:4643)
 	text "The older file"
 	line "will be erased to"
 	cont "save. Okay?"
 	done
 
-_UnnamedText_73909: ; 94671 (25:4671)
+_UnnamedText_73909:: ; 94671 (25:4671)
 	text "When you change a"
 	line "#MON BOX, data"
 	cont "will be saved."
@@ -2040,16 +2039,16 @@
 	para "Is that okay?"
 	done
 
-_UnnamedText_739d4: ; 946b0 (25:46b0)
+_UnnamedText_739d4:: ; 946b0 (25:46b0)
 	text "Choose a"
 	line $4a, " BOX.@@"
 
-_UnnamedText_3af3e: ; 946c2 (25:46c2)
+_UnnamedText_3af3e:: ; 946c2 (25:46c2)
 	TX_RAM $cf4b
 	text " evolved"
 	done
 
-_UnnamedText_3af43: ; 946cf (25:46cf)
+_UnnamedText_3af43:: ; 946cf (25:46cf)
 	db $0
 	line "into @"
 	TX_RAM $cd6d
@@ -2056,7 +2055,7 @@
 	text "!"
 	done
 
-_UnnamedText_3af48: ; 946dd (25:46dd)
+_UnnamedText_3af48:: ; 946dd (25:46dd)
 	text "Huh? @"
 	TX_RAM $cf4b
 	db $0
@@ -2063,7 +2062,7 @@
 	line "stopped evolving!"
 	prompt
 
-_UnnamedText_3af4d: ; 946fb (25:46fb)
+_UnnamedText_3af4d:: ; 946fb (25:46fb)
 	text "What? @"
 	TX_RAM $cf4b
 	db $0
@@ -2070,121 +2069,121 @@
 	line "is evolving!"
 	done
 
-_UnnamedText_3f245: ; 94715 (25:4715)
+_UnnamedText_3f245:: ; 94715 (25:4715)
 	text $59
 	line "fell asleep!"
 	prompt
 
-_UnnamedText_3f24a: ; 94725 (25:4725)
+_UnnamedText_3f24a:: ; 94725 (25:4725)
 	text $59, "'s"
 	line "already asleep!"
 	prompt
 
-_UnnamedText_3f2df: ; 94739 (25:4739)
+_UnnamedText_3f2df:: ; 94739 (25:4739)
 	text $59
 	line "was poisoned!"
 	prompt
 
-_UnnamedText_3f2e4: ; 9474a (25:474a)
+_UnnamedText_3f2e4:: ; 9474a (25:474a)
 	text $59, "'s"
 	line "badly poisoned!"
 	prompt
 
-_UnnamedText_3f3d8: ; 9475e (25:475e)
+_UnnamedText_3f3d8:: ; 9475e (25:475e)
 	text $59
 	line "was burned!"
 	prompt
 
-_UnnamedText_3f3dd: ; 9476d (25:476d)
+_UnnamedText_3f3dd:: ; 9476d (25:476d)
 	text $59
 	line "was frozen solid!"
 	prompt
 
-_UnnamedText_3f423: ; 94782 (25:4782)
+_UnnamedText_3f423:: ; 94782 (25:4782)
 	text "Fire defrosted"
 	line $59, "!"
 	prompt
 
-_UnnamedText_3f528: ; 94795 (25:4795)
+_UnnamedText_3f528:: ; 94795 (25:4795)
 	text $5a, "'s"
 	line "@"
 	TX_RAM $cf4b
 	text "@@"
 
-_UnnamedText_3f542: ; 947a0 (25:47a0)
+_UnnamedText_3f542:: ; 947a0 (25:47a0)
 	text $4c, "greatly@@"
 
-_UnnamedText_3f547: ; 947ab (25:47ab)
+_UnnamedText_3f547:: ; 947ab (25:47ab)
 	text " rose!"
 	prompt
 
-_UnnamedText_3f661: ; 947b3 (25:47b3)
+_UnnamedText_3f661:: ; 947b3 (25:47b3)
 	text $59, "'s"
 	line "@"
 	TX_RAM $cf4b
 	text "@@"
 
-_UnnamedText_3f67e: ; 947be (25:47be)
+_UnnamedText_3f67e:: ; 947be (25:47be)
 	text $4c, "greatly@@"
 
-_UnnamedText_3f683: ; 947c9 (25:47c9)
+_UnnamedText_3f683:: ; 947c9 (25:47c9)
 	text " fell!"
 	prompt
 
-_UnnamedText_3f802: ; 947d1 (25:47d1)
+_UnnamedText_3f802:: ; 947d1 (25:47d1)
 	text $5a
 	line "ran from battle!"
 	prompt
 
-_UnnamedText_3f807: ; 947e5 (25:47e5)
+_UnnamedText_3f807:: ; 947e5 (25:47e5)
 	text $59
 	line "ran away scared!"
 	prompt
 
-_UnnamedText_3f80c: ; 947f9 (25:47f9)
+_UnnamedText_3f80c:: ; 947f9 (25:47f9)
 	text $59
 	line "was blown away!"
 	prompt
 
-_UnnamedText_3f8c8: ; 9480c (25:480c)
+_UnnamedText_3f8c8:: ; 9480c (25:480c)
 	text $5a, "@@"
 
-_UnnamedText_3f8f9: ; 94810 (25:4810)
+_UnnamedText_3f8f9:: ; 94810 (25:4810)
 	db $0
 	line "made a whirlwind!"
 	prompt
 
-_UnnamedText_3f8fe: ; 94824 (25:4824)
+_UnnamedText_3f8fe:: ; 94824 (25:4824)
 	db $0
 	line "took in sunlight!"
 	prompt
 
-_UnnamedText_3f903: ; 94838 (25:4838)
+_UnnamedText_3f903:: ; 94838 (25:4838)
 	db $0
 	line "lowered its head!"
 	prompt
 
-_UnnamedText_3f908: ; 9484c (25:484c)
+_UnnamedText_3f908:: ; 9484c (25:484c)
 	db $0
 	line "is glowing!"
 	prompt
 
-_UnnamedText_3f90d: ; 9485a (25:485a)
+_UnnamedText_3f90d:: ; 9485a (25:485a)
 	db $0
 	line "flew up high!"
 	prompt
 
-_UnnamedText_3f912: ; 9486a (25:486a)
+_UnnamedText_3f912:: ; 9486a (25:486a)
 	db $0
 	line "dug a hole!"
 	prompt
 
-_UnnamedText_3f9a1: ; 94878 (25:4878)
+_UnnamedText_3f9a1:: ; 94878 (25:4878)
 	text $59
 	line "became confused!"
 	prompt
 
-_UnnamedText_3fa77: ; 9488c (25:488c)
+_UnnamedText_3fa77:: ; 9488c (25:488c)
 	text $5a
 	line "learned"
 	cont "@"
@@ -2192,7 +2191,7 @@
 	text "!"
 	prompt
 
-_UnnamedText_3fb09: ; 9489e (25:489e)
+_UnnamedText_3fb09:: ; 9489e (25:489e)
 	text $59, "'s"
 	line "@"
 	TX_RAM $cd6d
@@ -2200,101 +2199,101 @@
 	cont "disabled!"
 	prompt
 
-_UnnamedText_3fb3e: ; 948b6 (25:48b6)
+_UnnamedText_3fb3e:: ; 948b6 (25:48b6)
 	text "Nothing happened!"
 	prompt
 
-_UnnamedText_3fb49: ; 948c9 (25:48c9)
+_UnnamedText_3fb49:: ; 948c9 (25:48c9)
 	text "No effect!"
 	prompt
 
-_UnnamedText_3fb59: ; 948d5 (25:48d5)
+_UnnamedText_3fb59:: ; 948d5 (25:48d5)
 	text "But, it failed! "
 	prompt
 
-_UnnamedText_3fb64: ; 948e7 (25:48e7)
+_UnnamedText_3fb64:: ; 948e7 (25:48e7)
 	text "It didn't affect"
 	line $59, "!"
 	prompt
 
-_UnnamedText_3fb69: ; 948fb (25:48fb)
+_UnnamedText_3fb69:: ; 948fb (25:48fb)
 	text $59
 	line "is unaffected!"
 	prompt
 
-_UnnamedText_3fb74: ; 9490d (25:490d)
+_UnnamedText_3fb74:: ; 9490d (25:490d)
 	text $59, "'s"
 	line "paralyzed! It may"
 	cont "not attack!"
 	prompt
 
-_UnnamedText_17e1d: ; 9492f (25:492f)
+_UnnamedText_17e1d:: ; 9492f (25:492f)
 	text "It created a"
 	line "SUBSTITUTE!"
 	prompt
 
-_UnnamedText_17e22: ; 94949 (25:4949)
+_UnnamedText_17e22:: ; 94949 (25:4949)
 	text $5a
 	line "has a SUBSTITUTE!"
 	prompt
 
-_UnnamedText_17e27: ; 9495e (25:495e)
+_UnnamedText_17e27:: ; 9495e (25:495e)
 	text "Too weak to make"
 	line "a SUBSTITUTE!"
 	prompt
 
-_UnnamedText_2ff04: ; 9497e (25:497e)
+_UnnamedText_2ff04:: ; 9497e (25:497e)
 	text "Coins scattered"
 	line "everywhere!"
 	prompt
 
-_UnnamedText_27fb3: ; 9499b (25:499b)
+_UnnamedText_27fb3:: ; 9499b (25:499b)
 	text $5a, "'s"
 	line "getting pumped!"
 	prompt
 
-_UnnamedText_2bef2: ; 949af (25:49af)
+_UnnamedText_2bef2:: ; 949af (25:49af)
 	text $59
 	line "was seeded!"
 	prompt
 
-_UnnamedText_2bef7: ; 949be (25:49be)
+_UnnamedText_2bef7:: ; 949be (25:49be)
 	text $59
 	line "evaded attack!"
 	prompt
 
-_UnnamedText_1399e: ; 949d0 (25:49d0)
+_UnnamedText_1399e:: ; 949d0 (25:49d0)
 	text $5a, "'s"
 	line "hit with recoil!"
 	prompt
 
-_UnnamedText_139cd: ; 949e5 (25:49e5)
+_UnnamedText_139cd:: ; 949e5 (25:49e5)
 	text "Converted type to"
 	line $59, "'s!"
 	prompt
 
-_UnnamedText_13a53: ; 949fc (25:49fc)
+_UnnamedText_13a53:: ; 949fc (25:49fc)
 	text "All STATUS changes"
 	line "are eliminated!"
 	prompt
 
-_UnnamedText_3baa2: ; 94a20 (25:4a20)
+_UnnamedText_3baa2:: ; 94a20 (25:4a20)
 	text $5a
 	line "started sleeping!"
 	done
 
-_UnnamedText_3baa7: ; 94a35 (25:4a35)
+_UnnamedText_3baa7:: ; 94a35 (25:4a35)
 	text $5a
 	line "fell asleep and"
 	cont "became healthy!"
 	done
 
-_UnnamedText_3baac: ; 94a58 (25:4a58)
+_UnnamedText_3baac:: ; 94a58 (25:4a58)
 	text $5a
 	line "regained health!"
 	prompt
 
-_UnnamedText_3bb92: ; 94a6c (25:4a6c)
+_UnnamedText_3bb92:: ; 94a6c (25:4a6c)
 	text $5a
 	line "transformed into"
 	cont "@"
@@ -2302,37 +2301,37 @@
 	text "!"
 	prompt
 
-_UnnamedText_3bbd7: ; 94a87 (25:4a87)
+_UnnamedText_3bbd7:: ; 94a87 (25:4a87)
 	text $5a, "'s"
 	line "protected against"
 	cont "special attacks!"
 	prompt
 
-_UnnamedText_3bbdc: ; 94aae (25:4aae)
+_UnnamedText_3bbdc:: ; 94aae (25:4aae)
 	text $5a
 	line "gained armor!"
 	prompt
 
-_UnnamedText_33f52: ; 94abf (25:4abf)
+_UnnamedText_33f52:: ; 94abf (25:4abf)
 	text $5a, "'s"
 	line "shrouded in mist!"
 	prompt
 
-_UnnamedText_78dc: ; 94ad5 (25:4ad5)
+_UnnamedText_78dc:: ; 94ad5 (25:4ad5)
 	text "Sucked health from"
 	line $59, "!"
 	prompt
 
-_UnnamedText_78e1: ; 94aec (25:4aec)
+_UnnamedText_78e1:: ; 94aec (25:4aec)
 	text $59, "'s"
 	line "dream was eaten!"
 	prompt
 
-_BattleCenterMText1: ; 94b01 (25:4b01)
+_BattleCenterMText1:: ; 94b01 (25:4b01)
 	text "!"
 	done
 
-_TradeCenterMText1: ; 94b04 (25:4b04)
+_TradeCenterMText1:: ; 94b04 (25:4b04)
 	text "!"
 	done
 
@@ -2436,18 +2435,18 @@
 INCLUDE "text/maps/saffron_pokecenter.asm"
 INCLUDE "text/maps/mr_psychics_house.asm"
 
-_PokemartGreetingText: ; a259c (28:659c)
+_PokemartGreetingText:: ; a259c (28:659c)
 	text "Hi there!"
 	next "May I help you?"
 	done
 
-_PokemonFaintedText: ; a25b7 (28:65b7)
+_PokemonFaintedText:: ; a25b7 (28:65b7)
 	TX_RAM $cd6d
 	db $0
 	line "fainted!"
 	done
 
-_PlayerBlackedOutText: ; a25c5 (28:65c5)
+_PlayerBlackedOutText:: ; a25c5 (28:65c5)
 	text $52, " is out of"
 	line "useable #MON!"
 
@@ -2455,16 +2454,16 @@
 	line "out!"
 	prompt
 
-_RepelWoreOffText: ; a25ef (28:65ef)
+_RepelWoreOffText:: ; a25ef (28:65ef)
 	text "REPEL's effect"
 	line "wore off."
 	done
 
-_PokemartBuyingGreetingText: ; a2608 (28:6608)
+_PokemartBuyingGreetingText:: ; a2608 (28:6608)
 	text "Take your time."
 	done
 
-_PokemartTellBuyPrice: ; a2619 (28:6619)
+_PokemartTellBuyPrice:: ; a2619 (28:6619)
 	TX_RAM $cf4b
 	text "?"
 	line "That will be"
@@ -2473,27 +2472,27 @@
 	text ". OK?"
 	done
 
-_PokemartBoughtItemText: ; a2639 (28:6639)
+_PokemartBoughtItemText:: ; a2639 (28:6639)
 	text "Here you are!"
 	line "Thank you!"
 	prompt
 
-_PokemartNotEnoughMoneyText: ; a2653 (28:6653)
+_PokemartNotEnoughMoneyText:: ; a2653 (28:6653)
 	text "You don't have"
 	line "enough money."
 	prompt
 
-_PokemartItemBagFullText: ; a2670 (28:6670)
+_PokemartItemBagFullText:: ; a2670 (28:6670)
 	text "You can't carry"
 	line "any more items."
 	prompt
 
-_PokemonSellingGreetingText: ; a2690 (28:6690)
+_PokemonSellingGreetingText:: ; a2690 (28:6690)
 	text "What would you"
 	line "like to sell?"
 	done
 
-_PokemartTellSellPrice: ; a26ae (28:66ae)
+_PokemartTellSellPrice:: ; a26ae (28:66ae)
 	text "I can pay you"
 	line "¥@"
 	db $2, $9f, $ff, $c3 ; XXX
@@ -2500,26 +2499,26 @@
 	text " for that."
 	done
 
-_PokemartItemBagEmptyText: ; a26cf (28:66cf)
+_PokemartItemBagEmptyText:: ; a26cf (28:66cf)
 	text "You don't have"
 	line "anything to sell."
 	prompt
 
-_PokemartUnsellableItemText: ; a26f0 (28:66f0)
+_PokemartUnsellableItemText:: ; a26f0 (28:66f0)
 	text "I can't put a"
 	line "price on that."
 	prompt
 
-_PokemartThankYouText: ; a270d (28:670d)
+_PokemartThankYouText:: ; a270d (28:670d)
 	text "Thank you!"
 	done
 
-_PokemartAnythingElseText: ; a2719 (28:6719)
+_PokemartAnythingElseText:: ; a2719 (28:6719)
 	text "Is there anything"
 	line "else I can do?"
 	done
 
-UnnamedText_a273b: ; a273b (28:673b)
+UnnamedText_a273b:: ; a273b (28:673b)
 	TX_RAM $d036
 	text " learned"
 	line "@"
@@ -2526,12 +2525,12 @@
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_6fb4: ; a2750 (28:6750)
+_UnnamedText_6fb4:: ; a2750 (28:6750)
 	text "Which move should"
 	next "be forgotten?"
 	done
 
-_UnnamedText_6fb9: ; a2771 (28:6771)
+_UnnamedText_6fb9:: ; a2771 (28:6771)
 	text "Abandon learning"
 	line "@"
 	TX_RAM $cf4b
@@ -2538,7 +2537,7 @@
 	text "?"
 	done
 
-_UnnamedText_6fbe: ; a278a (28:678a)
+_UnnamedText_6fbe:: ; a278a (28:678a)
 	TX_RAM $d036
 	db $0
 	line "did not learn"
@@ -2547,7 +2546,7 @@
 	text "!"
 	prompt
 
-_UnnamedText_6fc3: ; a27a4 (28:67a4)
+_UnnamedText_6fc3:: ; a27a4 (28:67a4)
 	TX_RAM $d036
 	text " is"
 	line "trying to learn"
@@ -2568,13 +2567,13 @@
 	text "?"
 	done
 
-_UnnamedText_6fc8: ; a2819 (28:6819)
+_UnnamedText_6fc8:: ; a2819 (28:6819)
 	text "1, 2 and...@@"
 
-_UnnamedText_6fd7: ; a2827 (28:6827)
+_UnnamedText_6fd7:: ; a2827 (28:6827)
 	text " Poof!@@"
 
-_UnnamedText_6fdc: ; a2830 (28:6830)
+_UnnamedText_6fdc:: ; a2830 (28:6830)
 	db $0
 	para "@"
 	TX_RAM $d036
@@ -2586,12 +2585,12 @@
 	para "And..."
 	prompt
 
-_UnnamedText_6fe1: ; a284d (28:684d)
+_UnnamedText_6fe1:: ; a284d (28:684d)
 	text "HM techniques"
 	line "can't be deleted!"
 	prompt
 
-_PokemonCenterWelcomeText: ; a286d (28:686d)
+_PokemonCenterWelcomeText:: ; a286d (28:686d)
 	text "Welcome to our"
 	line "#MON CENTER!"
 
@@ -2600,28 +2599,28 @@
 	cont "perfect health!"
 	prompt
 
-_ShallWeHealYourPokemonText: ; a28b4 (28:68b4)
+_ShallWeHealYourPokemonText:: ; a28b4 (28:68b4)
 	text "Shall we heal your"
 	line "#MON?"
 	done
 
-_NeedYourPokemonText: ; a28ce (28:68ce)
+_NeedYourPokemonText:: ; a28ce (28:68ce)
 	text "OK. We'll need"
 	line "your #MON."
 	done
 
-_PokemonFightingFitText: ; a28e8 (28:68e8)
+_PokemonFightingFitText:: ; a28e8 (28:68e8)
 	text "Thank you!"
 	line "Your #MON are"
 	cont "fighting fit!"
 	prompt
 
-_PokemonCenterFarewellText: ; a2910 (28:6910)
+_PokemonCenterFarewellText:: ; a2910 (28:6910)
 	text "We hope to see"
 	line "you again!"
 	done
 
-_CableClubNPCText7: ; a292b (28:692b)
+_CableClubNPCText7:: ; a292b (28:692b)
 	text "This area is"
 	line "reserved for 2"
 	cont "friends who are"
@@ -2628,12 +2627,12 @@
 	cont "linked by cable."
 	done
 
-_CableClubNPCText1: ; a2969 (28:6969)
+_CableClubNPCText1:: ; a2969 (28:6969)
 	text "Welcome to the"
 	line "Cable Club!"
 	done
 
-_CableClubNPCText2: ; a2985 (28:6985)
+_CableClubNPCText2:: ; a2985 (28:6985)
 	text "Please apply here."
 
 	para "Before opening"
@@ -2641,10 +2640,10 @@
 	cont "to save the game."
 	done
 
-_CableClubNPCText3: ; a29cc (28:69cc)
+_CableClubNPCText3:: ; a29cc (28:69cc)
 	text "Please wait.@@"
 
-_CableClubNPCText4: ; a29db (28:69db)
+_CableClubNPCText4:: ; a29db (28:69db)
 	text "The link has been"
 	line "closed because of"
 	cont "inactivity."
@@ -2657,86 +2656,86 @@
 
 SECTION "Text 10", ROMX, BANK[TEXT_10]
 
-_CableClubNPCText5: ; a4000 (29:4000)
+_CableClubNPCText5:: ; a4000 (29:4000)
 	text "Please come again!"
 	done
 
-_CableClubNPCText6: ; a4014 (29:4014)
+_CableClubNPCText6:: ; a4014 (29:4014)
 	text "We're making"
 	line "preparations."
 	cont "Please wait."
 	done
 
-_UsedStrengthText: ; a403c (29:403c)
+_UsedStrengthText:: ; a403c (29:403c)
 	TX_RAM $cd6d
 	text " used"
 	line "STRENGTH.@@"
 
-_UnnamedText_cdbb: ; a4051 (29:4051)
+_UnnamedText_cdbb:: ; a4051 (29:4051)
 	TX_RAM $cd6d
 	text " can"
 	line "move boulders."
 	prompt
 
-_UnnamedText_cdfa: ; a4069 (29:4069)
+_UnnamedText_cdfa:: ; a4069 (29:4069)
 	text "The current is"
 	line "much too fast!"
 	prompt
 
-_UnnamedText_cdff: ; a4088 (29:4088)
+_UnnamedText_cdff:: ; a4088 (29:4088)
 	text "Cycling is fun!"
 	line "Forget SURFing!"
 	prompt
 
-_FlashLightsAreaText: ; a40a9 (29:40a9)
+_FlashLightsAreaText:: ; a40a9 (29:40a9)
 	text "A blinding FLASH"
 	line "lights the area!"
 	prompt
 
-_WarpToLastPokemonCenterText: ; a40cc (29:40cc)
+_WarpToLastPokemonCenterText:: ; a40cc (29:40cc)
 	text "Warp to the last"
 	line "#MON CENTER."
 	done
 
-_CannotUseTeleportNowText: ; a40eb (29:40eb)
+_CannotUseTeleportNowText:: ; a40eb (29:40eb)
 	TX_RAM $cd6d
 	text " can't"
 	line "use TELEPORT now."
 	prompt
 
-_CannotFlyHereText: ; a4107 (29:4107)
+_CannotFlyHereText:: ; a4107 (29:4107)
 	TX_RAM $cd6d
 	text " can't"
 	line "FLY here."
 	prompt
 
-_NotHealthyEnoughText: ; a411b (29:411b)
+_NotHealthyEnoughText:: ; a411b (29:411b)
 	text "Not healthy"
 	line "enough."
 	prompt
 
-_NewBadgeRequiredText: ; a4130 (29:4130)
+_NewBadgeRequiredText:: ; a4130 (29:4130)
 	text "No! A new BADGE"
 	line "is required."
 	prompt
 
-_CannotUseItemsHereText: ; a414e (29:414e)
+_CannotUseItemsHereText:: ; a414e (29:414e)
 	text "You can't use items"
 	line "here."
 	prompt
 
-_CannotGetOffHereText: ; a4168 (29:4168)
+_CannotGetOffHereText:: ; a4168 (29:4168)
 	text "You can't get off"
 	line "here."
 	prompt
 
-_UnnamedText_4fe39: ; a4180 (29:4180)
+_UnnamedText_4fe39:: ; a4180 (29:4180)
 	text $52, " got"
 	line "@"
 	TX_RAM $cd6d
 	text "!@@"
 
-_UnnamedText_4fe3f: ; a418f (29:418f)
+_UnnamedText_4fe3f:: ; a418f (29:418f)
 	text "There's no more"
 	line "room for #MON!"
 	cont "@"
@@ -2748,7 +2747,7 @@
 	text " on PC!"
 	done
 
-_UnnamedText_4fe44: ; a41d6 (29:41d6)
+_UnnamedText_4fe44:: ; a41d6 (29:41d6)
 	text "There's no more"
 	line "room for #MON!"
 
@@ -2771,7 +2770,7 @@
 INCLUDE "text/maps/cinnabar_island.asm"
 INCLUDE "text/maps/saffron_city.asm"
 
-_ItemUseBallText00: ; a6729 (29:6729)
+_ItemUseBallText00:: ; a6729 (29:6729)
 	text "It dodged the"
 	line "thrown BALL!"
 
@@ -2779,27 +2778,27 @@
 	line "can't be caught!"
 	prompt
 
-_ItemUseBallText01: ; a675f (29:675f)
+_ItemUseBallText01:: ; a675f (29:675f)
 	text "You missed the"
 	line "#MON!"
 	prompt
 
-_ItemUseBallText02: ; a6775 (29:6775)
+_ItemUseBallText02:: ; a6775 (29:6775)
 	text "Darn! The #MON"
 	line "broke free!"
 	prompt
 
-_ItemUseBallText03: ; a6791 (29:6791)
+_ItemUseBallText03:: ; a6791 (29:6791)
 	text "Aww! It appeared"
 	line "to be caught! "
 	prompt
 
-_ItemUseBallText04: ; a67b2 (29:67b2)
+_ItemUseBallText04:: ; a67b2 (29:67b2)
 	text "Shoot! It was so"
 	line "close too!"
 	prompt
 
-_ItemUseBallText05: ; a67cf (29:67cf)
+_ItemUseBallText05:: ; a67cf (29:67cf)
 	text "All right!"
 	line "@"
 	TX_RAM W_ENEMYMONNAME
@@ -2806,7 +2805,7 @@
 	text " was"
 	cont "caught!@@"
 
-_ItemUseBallText07: ; a67ee (29:67ee)
+_ItemUseBallText07:: ; a67ee (29:67ee)
 	TX_RAM W_BOXMON1NAME
 	text " was"
 	line "transferred to"
@@ -2813,7 +2812,7 @@
 	cont "BILL's PC!"
 	prompt
 
-_ItemUseBallText08: ; a6810 (29:6810)
+_ItemUseBallText08:: ; a6810 (29:6810)
 	TX_RAM W_BOXMON1NAME
 	text " was"
 	line "transferred to"
@@ -2820,7 +2819,7 @@
 	cont "someone's PC!"
 	prompt
 
-_ItemUseBallText06: ; a6835 (29:6835)
+_ItemUseBallText06:: ; a6835 (29:6835)
 	text "New #DEX data"
 	line "will be added for"
 	cont "@"
@@ -2827,7 +2826,7 @@
 	TX_RAM W_ENEMYMONNAME
 	text "!@@"
 
-_SurfingGotOnText: ; a685e (29:685e)
+_SurfingGotOnText:: ; a685e (29:685e)
 	text $52, " got on"
 	line "@"
 	TX_RAM $cd6d
@@ -2834,12 +2833,12 @@
 	text "!"
 	prompt
 
-_SurfingNoPlaceToGetOffText: ; a686f (29:686f)
+_SurfingNoPlaceToGetOffText:: ; a686f (29:686f)
 	text "There's no place"
 	line "to get off!"
 	prompt
 
-_VitaminStatRoseText: ; a688c (29:688c)
+_VitaminStatRoseText:: ; a688c (29:688c)
 	TX_RAM $cd6d
 	text "'s"
 	line "@"
@@ -2847,22 +2846,22 @@
 	text " rose."
 	prompt
 
-_VitaminNoEffectText: ; a689e (29:689e)
+_VitaminNoEffectText:: ; a689e (29:689e)
 	text "It won't have any"
 	line "effect."
 	prompt
 
-_ThrewBaitText: ; a68b8 (29:68b8)
+_ThrewBaitText:: ; a68b8 (29:68b8)
 	text $52, " threw"
 	line "some BAIT."
 	done
 
-_ThrewRockText: ; a68cc (29:68cc)
+_ThrewRockText:: ; a68cc (29:68cc)
 	text $52, " threw a"
 	line "ROCK."
 	done
 
-_PlayedFluteNoEffectText: ; a68dd (29:68dd)
+_PlayedFluteNoEffectText:: ; a68dd (29:68dd)
 	text "Played the #"
 	line "FLUTE."
 
@@ -2870,16 +2869,16 @@
 	line "catchy tune!"
 	prompt
 
-_FluteWokeUpText: ; a690c (29:690c)
+_FluteWokeUpText:: ; a690c (29:690c)
 	text "All sleeping"
 	line "#MON woke up."
 	prompt
 
-_PlayedFluteHadEffectText: ; a6928 (29:6928)
+_PlayedFluteHadEffectText:: ; a6928 (29:6928)
 	text $52, " played the"
 	line "# FLUTE.@@"
 
-_CoinCaseNumCoinsText: ; a6940 (29:6940)
+_CoinCaseNumCoinsText:: ; a6940 (29:6940)
 	text "Coins"
 	line "@"
 	db $2, $a4, $d5, $c2 ; print BCD number
@@ -2886,52 +2885,52 @@
 	text " "
 	prompt
 
-_ItemfinderFoundItemText: ; a694f (29:694f)
+_ItemfinderFoundItemText:: ; a694f (29:694f)
 	text "Yes! ITEMFINDER"
 	line "indicates there's"
 	cont "an item nearby."
 	prompt
 
-_ItemfinderFoundNothingText: ; a6981 (29:6981)
+_ItemfinderFoundNothingText:: ; a6981 (29:6981)
 	text "Nope! ITEMFINDER"
 	line "isn't responding."
 	prompt
 
-_RaisePPWhichTechniqueText: ; a69a4 (29:69a4)
+_RaisePPWhichTechniqueText:: ; a69a4 (29:69a4)
 	text "Raise PP of which"
 	line "technique?"
 	done
 
-_RestorePPWhichTechniqueText: ; a69c2 (29:69c2)
+_RestorePPWhichTechniqueText:: ; a69c2 (29:69c2)
 	text "Restore PP of"
 	line "which technique?"
 	done
 
-_PPMaxedOutText: ; a69e2 (29:69e2)
+_PPMaxedOutText:: ; a69e2 (29:69e2)
 	TX_RAM $cf4b
 	text "'s PP"
 	line "is maxed out."
 	prompt
 
-_PPIncreasedText: ; a69f9 (29:69f9)
+_PPIncreasedText:: ; a69f9 (29:69f9)
 	TX_RAM $cf4b
 	text "'s PP"
 	line "increased."
 	prompt
 
-_PPRestoredText: ; a6a0d (29:6a0d)
+_PPRestoredText:: ; a6a0d (29:6a0d)
 	text "PP was restored."
 	prompt
 
-_BootedUpTMText: ; a6a1f (29:6a1f)
+_BootedUpTMText:: ; a6a1f (29:6a1f)
 	text "Booted up a TM!"
 	prompt
 
-_BootedUpHMText: ; a6a30 (29:6a30)
+_BootedUpHMText:: ; a6a30 (29:6a30)
 	text "Booted up an HM!"
 	prompt
 
-_TeachMachineMoveText: ; a6a42 (29:6a42)
+_TeachMachineMoveText:: ; a6a42 (29:6a42)
 	text "It contained"
 	line "@"
 	TX_RAM $cf4b
@@ -2943,7 +2942,7 @@
 	line "to a #MON?"
 	done
 
-_MonCannotLearnMachineMoveText: ; a6a6e (29:6a6e)
+_MonCannotLearnMachineMoveText:: ; a6a6e (29:6a6e)
 	TX_RAM $cd6d
 	text " is not"
 	line "compatible with"
@@ -2957,37 +2956,37 @@
 	text "."
 	prompt
 
-_ItemUseNotTimeText: ; a6aa6 (29:6aa6)
+_ItemUseNotTimeText:: ; a6aa6 (29:6aa6)
 	text "OAK: ", $52, "!"
 	line "This isn't the"
 	cont "time to use that! "
 	prompt
 
-_ItemUseNotYoursToUseText: ; a6ad0 (29:6ad0)
+_ItemUseNotYoursToUseText:: ; a6ad0 (29:6ad0)
 	text "This isn't yours"
 	line "to use!"
 	prompt
 
-_ItemUseNoEffectText: ; a6ae9 (29:6ae9)
+_ItemUseNoEffectText:: ; a6ae9 (29:6ae9)
 	text "It won't have any"
 	line "effect."
 	prompt
 
-_ThrowBallAtTrainerMonText1: ; a6b03 (29:6b03)
+_ThrowBallAtTrainerMonText1:: ; a6b03 (29:6b03)
 	text "The trainer"
 	line "blocked the BALL!"
 	prompt
 
-_ThrowBallAtTrainerMonText2: ; a6b22 (29:6b22)
+_ThrowBallAtTrainerMonText2:: ; a6b22 (29:6b22)
 	text "Don't be a thief!"
 	prompt
 
-_NoCyclingAllowedHereText: ; a6b34 (29:6b34)
+_NoCyclingAllowedHereText:: ; a6b34 (29:6b34)
 	text "No cycling"
 	next "allowed here."
 	prompt
 
-_NoSurfingHereText: ; a6b4e (29:6b4e)
+_NoSurfingHereText:: ; a6b4e (29:6b4e)
 	text "No SURFing on"
 	line "@"
 	TX_RAM $cd6d
@@ -2994,7 +2993,7 @@
 	text " here!"
 	prompt
 
-_BoxFullCannotThrowBallText: ; a6b69 (29:6b69)
+_BoxFullCannotThrowBallText:: ; a6b69 (29:6b69)
 	text "The #MON BOX"
 	line "is full! Can't"
 	cont "use that item!"
@@ -3003,32 +3002,32 @@
 
 SECTION "Text 11", ROMX, BANK[TEXT_11]
 
-_ItemUseText001: ; a8000 (2a:4000)
+_ItemUseText001:: ; a8000 (2a:4000)
 	text $52," used@@"
 
-_ItemUseText002: ; a8009 (2a:4009)
+_ItemUseText002:: ; a8009 (2a:4009)
 	TX_RAM $cf4b
 	text "!"
 	done
 
-_GotOnBicycleText1: ; a800f (2a:400f)
+_GotOnBicycleText1:: ; a800f (2a:400f)
 	text $52, " got on the@@"
 
-_GotOnBicycleText2: ; a801e (2a:401e)
+_GotOnBicycleText2:: ; a801e (2a:401e)
 	TX_RAM $cf4b
 	text "!"
 	prompt
 
-_GotOffBicycleText1: ; a8024 (2a:4024)
+_GotOffBicycleText1:: ; a8024 (2a:4024)
 	text $52, " got off@@"
 
-_GotOffBicycleText2: ; a8030 (2a:4030)
+_GotOffBicycleText2:: ; a8030 (2a:4030)
 	text "the @"
 	TX_RAM $cf4b
 	text "."
 	prompt
 
-_ThrewAwayItemText: ; a803c (2a:403c)
+_ThrewAwayItemText:: ; a803c (2a:403c)
 	text "Threw away"
 	line "@"
 	TX_RAM $cd6d
@@ -3035,7 +3034,7 @@
 	text "."
 	prompt
 
-_IsItOKToTossItemText: ; a804f (2a:404f)
+_IsItOKToTossItemText:: ; a804f (2a:404f)
 	text "Is it OK to toss"
 	line "@"
 	TX_RAM $cf4b
@@ -3042,12 +3041,12 @@
 	text "?"
 	prompt
 
-_TooImportantToTossText: ; a8068 (2a:4068)
+_TooImportantToTossText:: ; a8068 (2a:4068)
 	text "That's too impor-"
 	line "tant to toss!"
 	prompt
 
-_UnnamedText_2fe3b: ; a8088 (2a:4088)
+_UnnamedText_2fe3b:: ; a8088 (2a:4088)
 	TX_RAM $cd6d
 	text " knows"
 	line "@"
@@ -3055,12 +3054,12 @@
 	text "!"
 	prompt
 
-_UnnamedText_71d88: ; a809a (2a:409a)
+_UnnamedText_71d88:: ; a809a (2a:409a)
 	text "Okay, connect the"
 	line "cable like so!"
 	prompt
 
-_UnnamedText_71d8d: ; a80bc (2a:40bc)
+_UnnamedText_71d8d:: ; a80bc (2a:40bc)
 	text $52, " traded"
 	line "@"
 	TX_RAM $cd13
@@ -3069,7 +3068,7 @@
 	TX_RAM $cd1e
 	text "!@@"
 
-_UnnamedText_71d94: ; a80d8 (2a:40d8)
+_UnnamedText_71d94:: ; a80d8 (2a:40d8)
 	text "I'm looking for"
 	line "@"
 	TX_RAM $cd13
@@ -3081,12 +3080,12 @@
 	text "? "
 	done
 
-_UnnamedText_71d99: ; a810b (2a:410b)
+_UnnamedText_71d99:: ; a810b (2a:410b)
 	text "Awww!"
 	line "Oh well..."
 	done
 
-_UnnamedText_71d9e: ; a811d (2a:411d)
+_UnnamedText_71d9e:: ; a811d (2a:411d)
 	text "What? That's not"
 	line "@"
 	TX_RAM $cd13
@@ -3096,11 +3095,11 @@
 	line "come back here!"
 	done
 
-_UnnamedText_71da3: ; a8155 (2a:4155)
+_UnnamedText_71da3:: ; a8155 (2a:4155)
 	text "Hey thanks!"
 	done
 
-_UnnamedText_71da8: ; a8162 (2a:4162)
+_UnnamedText_71da8:: ; a8162 (2a:4162)
 	text "Isn't my old"
 	line "@"
 	TX_RAM $cd1e
@@ -3107,7 +3106,7 @@
 	text " great?"
 	done
 
-_UnnamedText_71dad: ; a817c (2a:417c)
+_UnnamedText_71dad:: ; a817c (2a:417c)
 	text "Hello there! Do"
 	line "you want to trade"
 
@@ -3119,12 +3118,12 @@
 	text "?"
 	done
 
-_UnnamedText_71db2: ; a81b5 (2a:41b5)
+_UnnamedText_71db2:: ; a81b5 (2a:41b5)
 	text "Well, if you"
 	line "don't want to..."
 	done
 
-_UnnamedText_71db7: ; a81d3 (2a:41d3)
+_UnnamedText_71db7:: ; a81d3 (2a:41d3)
 	text "Hmmm? This isn't"
 	line "@"
 	TX_RAM $cd13
@@ -3134,11 +3133,11 @@
 	line "you get one."
 	done
 
-_UnnamedText_71dbc: ; a8209 (2a:4209)
+_UnnamedText_71dbc:: ; a8209 (2a:4209)
 	text "Thanks!"
 	done
 
-_UnnamedText_71dc1: ; a8212 (2a:4212)
+_UnnamedText_71dc1:: ; a8212 (2a:4212)
 	text "The @"
 	TX_RAM $cd13
 	text " you"
@@ -3147,7 +3146,7 @@
 	para "went and evolved!"
 	done
 
-_UnnamedText_71dc6: ; a8240 (2a:4240)
+_UnnamedText_71dc6:: ; a8240 (2a:4240)
 	text "Hi! Do you have"
 	line "@"
 	TX_RAM $cd13
@@ -3159,11 +3158,11 @@
 	text "?"
 	done
 
-_UnnamedText_71dcb: ; a8274 (2a:4274)
+_UnnamedText_71dcb:: ; a8274 (2a:4274)
 	text "That's too bad."
 	done
 
-_UnnamedText_71dd0: ; a8284 (2a:4284)
+_UnnamedText_71dd0:: ; a8284 (2a:4284)
 	text "...This is no"
 	line "@"
 	TX_RAM $cd13
@@ -3173,11 +3172,11 @@
 	line "trade it with me!"
 	done
 
-_UnnamedText_71dd5: ; a82bc (2a:42bc)
+_UnnamedText_71dd5:: ; a82bc (2a:42bc)
 	text "Thanks pal!"
 	done
 
-_UnnamedText_71dda: ; a82c9 (2a:42c9)
+_UnnamedText_71dda:: ; a82c9 (2a:42c9)
 	text "How is my old"
 	line "@"
 	TX_RAM $cd1e
@@ -3189,12 +3188,12 @@
 	line "doing great!"
 	done
 
-_UnnamedText_ef7d: ; a82f8 (2a:42f8)
+_UnnamedText_ef7d:: ; a82f8 (2a:42f8)
 	text "There isn't"
 	line "anything to CUT!"
 	prompt
 
-_UsedCutText: ; a8315 (2a:4315)
+_UsedCutText:: ; a8315 (2a:4315)
 	TX_RAM $cd6d
 	text " hacked"
 	line "away with CUT!"
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -1,4 +1,4 @@
-_AgathaBeforeBattleText: ; 8686b (21:686b)
+_AgathaBeforeBattleText:: ; 8686b (21:686b)
 	text "I am AGATHA of"
 	line "the ELITE FOUR!"
 
@@ -22,13 +22,13 @@
 	cont "trainer fights!"
 	done
 
-_AgathaEndBattleText: ; 86970 (21:6970)
+_AgathaEndBattleText:: ; 86970 (21:6970)
 	text "Oh ho!"
 	line "You're something"
 	cont "special, child!"
 	prompt
 
-_AgathaAfterBattleText: ; 86998 (21:6998)
+_AgathaAfterBattleText:: ; 86998 (21:6998)
 	text "You win! I see"
 	line "what the old duff"
 	cont "sees in you now!"
@@ -38,7 +38,7 @@
 	cont "along now, child!"
 	done
 
-_AgathaText2: ; 869fd (21:69fd)
+_AgathaText2:: ; 869fd (21:69fd)
 	text "Someone's voice:"
 	line "Don't run away!"
 	done
--- a/text/maps/bike_shop.asm
+++ b/text/maps/bike_shop.asm
@@ -1,4 +1,4 @@
-_UnnamedText_1d810: ; 98e03 (26:4e03)
+_UnnamedText_1d810:: ; 98e03 (26:4e03)
 	text "Hi! Welcome to"
 	line "our BIKE SHOP."
 
@@ -6,17 +6,17 @@
 	line "the BIKE for you!"
 	prompt
 
-_UnnamedText_1d815: ; 98e45 (26:4e45)
+_UnnamedText_1d815:: ; 98e45 (26:4e45)
 	text "It's a cool BIKE!"
 	line "Do you want it?"
 	done
 
-_UnnamedText_1d81a: ; 98e67 (26:4e67)
+_UnnamedText_1d81a:: ; 98e67 (26:4e67)
 	text "Sorry! You can't"
 	line "afford it!"
 	prompt
 
-_UnnamedText_1d81f: ; 98e83 (26:4e83)
+_UnnamedText_1d81f:: ; 98e83 (26:4e83)
 	text "Oh, that's..."
 
 	para "A BIKE VOUCHER!"
@@ -24,17 +24,17 @@
 	para "OK! Here you go!"
 	prompt
 
-_UnnamedText_1d824: ; 98eb2 (26:4eb2)
+_UnnamedText_1d824:: ; 98eb2 (26:4eb2)
 	text $52, " exchanged"
 	line "the BIKE VOUCHER"
 	cont "for a BICYCLE.@@"
 
-_UnnamedText_1d82a: ; 98ee0 (26:4ee0)
+_UnnamedText_1d82a:: ; 98ee0 (26:4ee0)
 	text "Come back again"
 	line "some time!"
 	done
 
-_UnnamedText_1d82f: ; 98efc (26:4efc)
+_UnnamedText_1d82f:: ; 98efc (26:4efc)
 	text "How do you like"
 	line "your new BICYCLE?"
 
@@ -43,12 +43,12 @@
 	cont "and in caves!"
 	done
 
-_UnnamedText_1d834: ; 98f4d (26:4f4d)
+_UnnamedText_1d834:: ; 98f4d (26:4f4d)
 	text "You better make"
 	line "room for this!"
 	done
 
-_UnnamedText_1d843: ; 98f6d (26:4f6d)
+_UnnamedText_1d843:: ; 98f6d (26:4f6d)
 	text "A plain city BIKE"
 	line "is good enough"
 	cont "for me!"
@@ -58,13 +58,13 @@
 	cont "on an MTB!"
 	done
 
-_UnnamedText_1d85c: ; 98fc1 (26:4fc1)
+_UnnamedText_1d85c:: ; 98fc1 (26:4fc1)
 	text "These BIKEs are"
 	line "cool, but they're"
 	cont "way expensive!"
 	done
 
-_UnnamedText_1d861: ; 98ff2 (26:4ff2)
+_UnnamedText_1d861:: ; 98ff2 (26:4ff2)
 	text "Wow. Your BIKE is"
 	line "really cool!"
 	done
--- a/text/maps/bills_house.asm
+++ b/text/maps/bills_house.asm
@@ -1,4 +1,4 @@
-_UnnamedText_1e865: ; 8d267 (23:5267)
+_UnnamedText_1e865:: ; 8d267 (23:5267)
 	text "Hiya! I'm a"
 	line "#MON..."
 	cont "...No I'm not!"
@@ -19,7 +19,7 @@
 	line "Help me out here!"
 	done
 
-_UnnamedText_1e86a: ; 8d345 (23:5345)
+_UnnamedText_1e86a:: ; 8d345 (23:5345)
 	text "When I'm in the"
 	line "TELEPORTER, go to"
 	cont "my PC and run the"
@@ -27,7 +27,7 @@
 	cont "System!"
 	done
 
-_UnnamedText_1e86f: ; 8d391 (23:5391)
+_UnnamedText_1e86f:: ; 8d391 (23:5391)
 	text "No!? Come on, you"
 	line "gotta help a guy"
 	cont "in deep trouble!"
@@ -37,7 +37,7 @@
 	cont "OK? All right!"
 	prompt
 
-_BillThankYouText: ; 8d3f5 (23:53f5)
+_BillThankYouText:: ; 8d3f5 (23:53f5)
 	text "BILL: Yeehah!"
 	line "Thanks, bud! I"
 	cont "owe you one!"
@@ -53,18 +53,18 @@
 	cont "maybe this'll do."
 	prompt
 
-_SSTicketReceivedText: ; 8d499 (23:5499)
+_SSTicketReceivedText:: ; 8d499 (23:5499)
 	text $52, " received"
 	line "an @"
 	TX_RAM $cf4b
 	text "!@@"
 
-_SSTicketNoRoomText: ; 8d4b0 (23:54b0)
+_SSTicketNoRoomText:: ; 8d4b0 (23:54b0)
 	text "You've got too"
 	line "much stuff, bud!"
 	done
 
-_UnnamedText_1e8cb: ; 8d4d0 (23:54d0)
+_UnnamedText_1e8cb:: ; 8d4d0 (23:54d0)
 	text "That cruise ship,"
 	line "S.S.ANNE, is in"
 	cont "VERMILION CITY."
@@ -79,7 +79,7 @@
 	cont "instead of me?"
 	done
 
-_UnnamedText_1e8da: ; 8d57f (23:557f)
+_UnnamedText_1e8da:: ; 8d57f (23:557f)
 	text "BILL: Look, bud,"
 	line "just check out"
 	cont "some of my rare"
--- a/text/maps/blues_house.asm
+++ b/text/maps/blues_house.asm
@@ -1,10 +1,10 @@
-_DaisyInitialText:
+_DaisyInitialText::
 	text "Hi ",$52,"!"
 	line $53," is out at"
 	cont "Grandpa's lab."
 	done
 
-_DaisyOfferMapText:
+_DaisyOfferMapText::
 	text "Grandpa asked you"
 	line "to run an errand?"
 	cont "Here, this will"
@@ -11,24 +11,24 @@
 	cont "help you!"
 	prompt
 
-_GotMapText:
+_GotMapText::
 	text $52," got a"
 	line "@"
 	TX_RAM $CF4B
 	text "!@@"
 
-_DaisyBagFullText:
+_DaisyBagFullText::
 	text "You have too much"
 	line "stuff with you."
 	done
 
-_DaisyUseMapText:
+_DaisyUseMapText::
 	text "Use the TOWN MAP"
 	line "to find out where"
 	cont "you are."
 	done
 
-_BluesHouseText2:
+_BluesHouseText2::
 	text "#MON are living"
 	line "things! If they"
 	cont "get tired, give"
@@ -35,7 +35,7 @@
 	cont "them a rest!"
 	done
 
-_BluesHouseText3:
+_BluesHouseText3::
 	text "It's a big map!"
 	line "This is useful!"
 	done
--- a/text/maps/bruno.asm
+++ b/text/maps/bruno.asm
@@ -1,4 +1,4 @@
-_BrunoBeforeBattleText: ; 86749 (21:6749)
+_BrunoBeforeBattleText:: ; 86749 (21:6749)
 	text "I am BRUNO of"
 	line "the ELITE FOUR!"
 
@@ -20,18 +20,18 @@
 	para "Hoo hah!"
 	done
 
-_BrunoEndBattleText: ; 86805 (21:6805)
+_BrunoEndBattleText:: ; 86805 (21:6805)
 	text "Why?"
 	line "How could I lose?"
 	prompt
 
-_BrunoAfterBattleText: ; 8681d (21:681d)
+_BrunoAfterBattleText:: ; 8681d (21:681d)
 	text "My job is done!"
 	line "Go face your next"
 	cont "challenge!"
 	done
 
-_UnnamedText_763d2: ; 8684b (21:684b)
+_UnnamedText_763d2:: ; 8684b (21:684b)
 	text "Someone's voice:"
 	line "Don't run away!"
 	done
--- a/text/maps/celadon_city.asm
+++ b/text/maps/celadon_city.asm
@@ -1,4 +1,4 @@
-_CeladonCityText1: ; a59fb (29:59fb)
+_CeladonCityText1:: ; a59fb (29:59fb)
 	text "I got my KOFFING"
 	line "in CINNABAR!"
 
@@ -7,19 +7,19 @@
 	cont "when it's angry!"
 	done
 
-_CeladonCityText2: ; a5a4b (29:5a4b)
+_CeladonCityText2:: ; a5a4b (29:5a4b)
 	text "Heheh! This GYM"
 	line "is great! It's"
 	cont "full of women!"
 	done
 
-_CeladonCityText3: ; a5a79 (29:5a79)
+_CeladonCityText3:: ; a5a79 (29:5a79)
 	text "The GAME CORNER"
 	line "is bad for our"
 	cont "city's image!"
 	done
 
-_CeladonCityText4: ; a5aa6 (29:5aa6)
+_CeladonCityText4:: ; a5aa6 (29:5aa6)
 	text "Moan! I blew it"
 	line "all at the slots!"
 
@@ -28,7 +28,7 @@
 	cont "coins for prizes!"
 	done
 
-_TM41PreText: ; a5afd (29:5afd)
+_TM41PreText:: ; a5afd (29:5afd)
 	text "Hello, there!"
 
 	para "I've seen you,"
@@ -39,13 +39,13 @@
 	line "dropping by!"
 	prompt
 
-_ReceivedTM41Text: ; a5b5a (29:5b5a)
+_ReceivedTM41Text:: ; a5b5a (29:5b5a)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_TM41ExplanationText: ; a5b6e (29:5b6e)
+_TM41ExplanationText:: ; a5b6e (29:5b6e)
 	text "TM41 teaches"
 	line "SOFTBOILED!"
 
@@ -56,12 +56,12 @@
 	line "CHANSEY!"
 	done
 
-_TM41NoRoomText: ; a5bb8 (29:5bb8)
+_TM41NoRoomText:: ; a5bb8 (29:5bb8)
 	text "Oh, your pack is"
 	line "full of items!"
 	done
 
-_CeladonCityText6: ; a5bd9 (29:5bd9)
+_CeladonCityText6:: ; a5bd9 (29:5bd9)
 	text "This is my trusted"
 	line "pal, POLIWRATH!"
 
@@ -70,21 +70,21 @@
 	cont "used WATER STONE!"
 	done
 
-_CeladonCityText7: ; a5c30 (29:5c30)
+_CeladonCityText7:: ; a5c30 (29:5c30)
 	text "POLIWRATH: Ribi"
 	line "ribit!@@"
 
-_CeladonCityText8: ; a5c49 (29:5c49)
+_CeladonCityText8:: ; a5c49 (29:5c49)
 	text "What are you"
 	line "staring at?"
 	done
 
-_CeladonCityText9: ; a5c63 (29:5c63)
+_CeladonCityText9:: ; a5c63 (29:5c63)
 	text "Keep out of TEAM"
 	line "ROCKET's way!"
 	done
 
-_CeladonCityText10: ; a5c82 (29:5c82)
+_CeladonCityText10:: ; a5c82 (29:5c82)
 	text "TRAINER TIPS"
 
 	para "X ACCURACY boosts"
@@ -100,13 +100,13 @@
 	cont "STORE!"
 	done
 
-_CeladonCityText11: ; a5d18 (29:5d18)
+_CeladonCityText11:: ; a5d18 (29:5d18)
 	text "CELADON CITY"
 	line "The City of"
 	cont "Rainbow Dreams"
 	done
 
-_CeladonCityText13: ; a5d41 (29:5d41)
+_CeladonCityText13:: ; a5d41 (29:5d41)
 	text "CELADON CITY"
 	line "#MON GYM"
 	cont "LEADER: ERIKA"
@@ -115,17 +115,17 @@
 	line "Princess!"
 	done
 
-_CeladonCityText14: ; a5d82 (29:5d82)
+_CeladonCityText14:: ; a5d82 (29:5d82)
 	text "CELADON MANSION"
 	done
 
-_CeladonCityText15: ; a5d93 (29:5d93)
+_CeladonCityText15:: ; a5d93 (29:5d93)
 	text "Find what you"
 	line "need at CELADON"
 	cont "DEPT. STORE!"
 	done
 
-_CeladonCityText16: ; a5dbf (29:5dbf)
+_CeladonCityText16:: ; a5dbf (29:5dbf)
 	text "TRAINER TIPS"
 
 	para "GUARD SPEC."
@@ -139,13 +139,13 @@
 	cont "STORE!"
 	done
 
-_CeladonCityText17: ; a5e3e (29:5e3e)
+_CeladonCityText17:: ; a5e3e (29:5e3e)
 	text "Coins exchanged"
 	line "for prizes!"
 	cont "PRIZE EXCHANGE"
 	done
 
-_CeladonCityText18: ; a5e6a (29:5e6a)
+_CeladonCityText18:: ; a5e6a (29:5e6a)
 	text "ROCKET GAME CORNER"
 	line "The playground"
 	cont "for grown-ups!"
--- a/text/maps/celadon_dept_store_1f.asm
+++ b/text/maps/celadon_dept_store_1f.asm
@@ -1,4 +1,4 @@
-_CeladonMart1Text1: ; 9c672 (27:4672)
+_CeladonMart1Text1:: ; 9c672 (27:4672)
 	text "Hello! Welcome to"
 	line "CELADON DEPT."
 	cont "STORE."
@@ -8,7 +8,7 @@
 	cont "the store layout."
 	done
 
-_CeladonMart1Text2: ; 9c6cd (27:46cd)
+_CeladonMart1Text2:: ; 9c6cd (27:46cd)
 	text "1F: SERVICE"
 	line "    COUNTER"
 
@@ -25,7 +25,7 @@
 	line "VENDING MACHINES"
 	done
 
-_CeladonMart1Text3: ; 9c752 (27:4752)
+_CeladonMart1Text3:: ; 9c752 (27:4752)
 	text "1F: SERVICE"
 	line "    COUNTER"
 	done
--- a/text/maps/celadon_dept_store_2f.asm
+++ b/text/maps/celadon_dept_store_2f.asm
@@ -1,4 +1,4 @@
-_CeladonMart2Text3: ; 9c76b (27:476b)
+_CeladonMart2Text3:: ; 9c76b (27:476b)
 	text "SUPER REPEL keeps"
 	line "weak #MON at"
 	cont "bay..."
@@ -7,13 +7,13 @@
 	line "powerful REPEL!"
 	done
 
-_CeladonMart2Text4: ; 9c7b2 (27:47b2)
+_CeladonMart2Text4:: ; 9c7b2 (27:47b2)
 	text "For long outings,"
 	line "you should buy"
 	cont "REVIVE."
 	done
 
-_CeladonMart2Text5: ; 9c7dc (27:47dc)
+_CeladonMart2Text5:: ; 9c7dc (27:47dc)
 	text "Top Grade Items"
 	line "for Trainers!"
 
--- a/text/maps/celadon_dept_store_3f.asm
+++ b/text/maps/celadon_dept_store_3f.asm
@@ -1,4 +1,4 @@
-_TM18PreReceiveText: ; 9c814 (27:4814)
+_TM18PreReceiveText:: ; 9c814 (27:4814)
 	text "Oh, hi! I finally"
 	line "finished #MON!"
 
@@ -7,13 +7,13 @@
 	cont "useful!"
 	prompt
 
-_ReceivedTM18Text: ; 9c85a (27:485a)
+_ReceivedTM18Text:: ; 9c85a (27:485a)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_TM18ExplanationText: ; 9c86e (27:486e)
+_TM18ExplanationText:: ; 9c86e (27:486e)
 	text "TM18 is COUNTER!"
 	line "Not like the one"
 	cont "I'm leaning on,"
@@ -20,12 +20,12 @@
 	cont "mind you!"
 	done
 
-_TM18NoRoomText: ; 9c8aa (27:48aa)
+_TM18NoRoomText:: ; 9c8aa (27:48aa)
 	text "Your pack is full"
 	line "of items!"
 	done
 
-_CeladonMart3Text2: ; 9c8c7 (27:48c7)
+_CeladonMart3Text2:: ; 9c8c7 (27:48c7)
 	text "Captured #MON"
 	line "are registered"
 	cont "with an ID No."
@@ -35,7 +35,7 @@
 	cont "caught it!"
 	done
 
-_CeladonMart3Text3: ; 9c92d (27:492d)
+_CeladonMart3Text3:: ; 9c92d (27:492d)
 	text "All right!"
 
 	para "My buddy's going"
@@ -44,7 +44,7 @@
 	cont "GRAVELER!"
 	done
 
-_CeladonMart3Text4: ; 9c975 (27:4975)
+_CeladonMart3Text4:: ; 9c975 (27:4975)
 	text "Come on GRAVELER!"
 
 	para "I love GRAVELER!"
@@ -57,7 +57,7 @@
 	cont "#MON!"
 	done
 
-_CeladonMart3Text5: ; 9c9d5 (27:49d5)
+_CeladonMart3Text5:: ; 9c9d5 (27:49d5)
 	text "You can identify"
 	line "#MON you got"
 	cont "in trades by"
@@ -64,35 +64,35 @@
 	cont "their ID Numbers!"
 	done
 
-_CeladonMart3Text6: ; 9ca13 (27:4a13)
+_CeladonMart3Text6:: ; 9ca13 (27:4a13)
 	text "It's an SNES!"
 	done
 
-_CeladonMart3Text7: ; 9ca21 (27:4a21)
+_CeladonMart3Text7:: ; 9ca21 (27:4a21)
 	text "An RPG! There's"
 	line "no time for that!"
 	done
 
-_CeladonMart3Text9: ; 9ca43 (27:4a43)
+_CeladonMart3Text9:: ; 9ca43 (27:4a43)
 	text "A sports game!"
 	line "Dad'll like that!"
 	done
 
-_CeladonMart3Text11: ; 9ca64 (27:4a64)
+_CeladonMart3Text11:: ; 9ca64 (27:4a64)
 	text "A puzzle game!"
 	line "Looks addictive!"
 	done
 
-_CeladonMart3Text13: ; 9ca85 (27:4a85)
+_CeladonMart3Text13:: ; 9ca85 (27:4a85)
 	text "A fighting game!"
 	line "Looks tough!"
 	done
 
-_CeladonMart3Text14: ; 9caa4 (27:4aa4)
+_CeladonMart3Text14:: ; 9caa4 (27:4aa4)
 	text "3F: TV GAME SHOP"
 	done
 
-_CeladonMart3Text15: ; 9cab6 (27:4ab6)
+_CeladonMart3Text15:: ; 9cab6 (27:4ab6)
 	text "Red and Blue!"
 	line "Both are #MON!"
 	done
--- a/text/maps/celadon_dept_store_4f.asm
+++ b/text/maps/celadon_dept_store_4f.asm
@@ -1,10 +1,10 @@
-_CeladonMart4Text2: ; 9cad4 (27:4ad4)
+_CeladonMart4Text2:: ; 9cad4 (27:4ad4)
 	text "I'm getting a"
 	line "# DOLL for my"
 	cont "girl friend!"
 	done
 
-_CeladonMart4Text3: ; 9cafd (27:4afd)
+_CeladonMart4Text3:: ; 9cafd (27:4afd)
 	text "I heard something"
 	line "useful."
 
@@ -14,7 +14,7 @@
 	cont "with a # DOLL!"
 	done
 
-_CeladonMart4Text4: ; 9cb56 (27:4b56)
+_CeladonMart4Text4:: ; 9cb56 (27:4b56)
 	text "Express yourself"
 	line "with gifts!"
 
--- a/text/maps/celadon_dept_store_5f.asm
+++ b/text/maps/celadon_dept_store_5f.asm
@@ -1,4 +1,4 @@
-_CeladonMart5Text1: ; 9ddff (27:5dff)
+_CeladonMart5Text1:: ; 9ddff (27:5dff)
 	text "#MON ability"
 	line "enhancers can be"
 	cont "bought only here."
@@ -11,7 +11,7 @@
 	line "increase SPEED."
 	done
 
-_CeladonMart5Text2: ; 9de79 (27:5e79)
+_CeladonMart5Text2:: ; 9de79 (27:5e79)
 	text "I'm here for"
 	line "#MON ability"
 	cont "enhancers."
@@ -23,7 +23,7 @@
 	line "DEFENSE!"
 	done
 
-_CeladonMart5Text5: ; 9ded6 (27:5ed6)
+_CeladonMart5Text5:: ; 9ded6 (27:5ed6)
 	text "5F: DRUG STORE"
 	done
 
--- a/text/maps/celadon_dept_store_roof.asm
+++ b/text/maps/celadon_dept_store_roof.asm
@@ -1,9 +1,9 @@
-_UnnamedText_484ee: ; 9cbb5 (27:4bb5)
+_UnnamedText_484ee:: ; 9cbb5 (27:4bb5)
 	text "Give her which"
 	line "drink?"
 	done
 
-_UnnamedText_484f3: ; 9cbcc (27:4bcc)
+_UnnamedText_484f3:: ; 9cbcc (27:4bcc)
 	text "Yay!"
 
 	para "FRESH WATER!"
@@ -13,13 +13,13 @@
 	para "You can have this"
 	line "from me!@@"
 
-_UnnamedText_484f9: ; 9cc06 (27:4c06)
+_UnnamedText_484f9:: ; 9cc06 (27:4c06)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_484fe: ; 9cc1a (27:4c1a)
+_UnnamedText_484fe:: ; 9cc1a (27:4c1a)
 	db $0
 	para "@"
 	TX_RAM $cf4b
@@ -29,7 +29,7 @@
 	para "It can freeze the"
 	line "target sometimes!@@"
 
-_UnnamedText_48504: ; 9cc5a (27:4c5a)
+_UnnamedText_48504:: ; 9cc5a (27:4c5a)
 	text "Yay!"
 
 	para "SODA POP!"
@@ -39,13 +39,13 @@
 	para "You can have this"
 	line "from me!@@"
 
-_UnnamedText_4850a: ; 9cc91 (27:4c91)
+_UnnamedText_4850a:: ; 9cc91 (27:4c91)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_4850f: ; 9cca5 (27:4ca5)
+_UnnamedText_4850f:: ; 9cca5 (27:4ca5)
 	db $0
 	para "@"
 	TX_RAM $cf4b
@@ -55,7 +55,7 @@
 	para "It can spook the"
 	line "target sometimes!@@"
 
-_UnnamedText_48515: ; 9cce6 (27:4ce6)
+_UnnamedText_48515:: ; 9cce6 (27:4ce6)
 	text "Yay!"
 
 	para "LEMONADE!"
@@ -65,25 +65,25 @@
 	para "You can have this"
 	line "from me!@@"
 
-_ReceivedTM49Text: ; 9cd1d (27:4d1d)
+_ReceivedTM49Text:: ; 9cd1d (27:4d1d)
 	text $52, " received"
 	line "TM49!@@"
 
-_UnnamedText_48520: ; 9cd30 (27:4d30)
+_UnnamedText_48520:: ; 9cd30 (27:4d30)
 	db $0
 	para "TM49 contains"
 	line "TRI ATTACK!@@"
 
-_UnnamedText_48526: ; 9cd4d (27:4d4d)
+_UnnamedText_48526:: ; 9cd4d (27:4d4d)
 	text "You don't have"
 	line "space for this!@@"
 
-_UnnamedText_4852c: ; 9cd6d (27:4d6d)
+_UnnamedText_4852c:: ; 9cd6d (27:4d6d)
 	text "No thank you!"
 	line "I'm not thirsty"
 	cont "after all!@@"
 
-_CeladonMartRoofText1: ; 9cd97 (27:4d97)
+_CeladonMartRoofText1:: ; 9cd97 (27:4d97)
 	text "My sister is a"
 	line "trainer, believe"
 	cont "it or not."
@@ -93,13 +93,13 @@
 	cont "drives me nuts!"
 	done
 
-_UnnamedText_48598: ; 9cdee (27:4dee)
+_UnnamedText_48598:: ; 9cdee (27:4dee)
 	text "I'm thirsty!"
 	line "I want something"
 	cont "to drink!"
 	done
 
-_CeladonMartRoofText4: ; 9ce16 (27:4e16)
+_CeladonMartRoofText4:: ; 9ce16 (27:4e16)
 	text "I'm thirsty!"
 	line "I want something"
 	cont "to drink!"
@@ -107,33 +107,33 @@
 	para "Give her a drink?"
 	done
 
-_CeladonMartRoofText6: ; 9ce50 (27:4e50)
+_CeladonMartRoofText6:: ; 9ce50 (27:4e50)
 	text "ROOFTOP SQUARE:"
 	line "VENDING MACHINES"
 	done
 
-_VendingMachineText1: ; 9ce72 (27:4e72)
+_VendingMachineText1:: ; 9ce72 (27:4e72)
 	text "A vending machine!"
 	line "Here's the menu!"
 	prompt
 
-_VendingMachineText4: ; 9ce96 (27:4e96)
+_VendingMachineText4:: ; 9ce96 (27:4e96)
 	text "Oops, not enough"
 	line "money!"
 	done
 
-_VendingMachineText5: ; 9ceaf (27:4eaf)
+_VendingMachineText5:: ; 9ceaf (27:4eaf)
 	TX_RAM $cf4b
 	db $0
 	line "popped out!"
 	done
 
-_VendingMachineText6: ; 9cec0 (27:4ec0)
+_VendingMachineText6:: ; 9cec0 (27:4ec0)
 	text "There's no more"
 	line "room for stuff!"
 	done
 
-_VendingMachineText7: ; 9cee0 (27:4ee0)
+_VendingMachineText7:: ; 9cee0 (27:4ee0)
 	text "Not thirsty!"
 	done
 
--- a/text/maps/celadon_diner.asm
+++ b/text/maps/celadon_diner.asm
@@ -1,4 +1,4 @@
-_CeladonDinerText1: ; 9df3f (27:5f3f)
+_CeladonDinerText1:: ; 9df3f (27:5f3f)
 	text "Hi!"
 
 	para "We're taking a"
@@ -5,7 +5,7 @@
 	line "break now."
 	done
 
-_CeladonDinerText2: ; 9df5d (27:5f5d)
+_CeladonDinerText2:: ; 9df5d (27:5f5d)
 	text "My #MON are"
 	line "weak, so I often"
 	cont "have to go to the"
@@ -12,13 +12,13 @@
 	cont "DRUG STORE."
 	done
 
-_CeladonDinerText3: ; 9df99 (27:5f99)
+_CeladonDinerText3:: ; 9df99 (27:5f99)
 	text "Psst! There's a"
 	line "basement under"
 	cont "the GAME CORNER."
 	done
 
-_CeladonDinerText4: ; 9dfc9 (27:5fc9)
+_CeladonDinerText4:: ; 9dfc9 (27:5fc9)
 	text "Munch..."
 
 	para "The man at that"
@@ -26,7 +26,7 @@
 	cont "at the slots."
 	done
 
-_UnnamedText_491a7: ; 9e003 (27:6003)
+_UnnamedText_491a7:: ; 9e003 (27:6003)
 	text "Go ahead! Laugh!"
 
 	para "I'm flat out"
@@ -41,18 +41,18 @@
 	cont "more!"
 	prompt
 
-_ReceivedCoinCaseText: ; 9e07a (27:607a)
+_ReceivedCoinCaseText:: ; 9e07a (27:607a)
 	text $52, " received"
 	line "a @"
 	TX_RAM $cf4b
 	text "!@@"
 
-_CoinCaseNoRoomText: ; 9e090 (27:6090)
+_CoinCaseNoRoomText:: ; 9e090 (27:6090)
 	text "Make room for"
 	line "this!"
 	done
 
-_UnnamedText_491b7: ; 9e0a5 (27:60a5)
+_UnnamedText_491b7:: ; 9e0a5 (27:60a5)
 	text "I always thought"
 	line "I was going to"
 	cont "win it back..."
--- a/text/maps/celadon_game_corner.asm
+++ b/text/maps/celadon_game_corner.asm
@@ -1,4 +1,4 @@
-_CeladonGameCornerText1: ; 9d8d5 (27:58d5)
+_CeladonGameCornerText1:: ; 9d8d5 (27:58d5)
 	text "Welcome!"
 
 	para "You can exchange"
@@ -7,7 +7,7 @@
 	cont "next door."
 	done
 
-_UnnamedText_48d22: ; 9d91a (27:591a)
+_UnnamedText_48d22:: ; 9d91a (27:591a)
 	text "Welcome to ROCKET"
 	line "GAME CORNER!"
 
@@ -19,32 +19,32 @@
 	cont "like some?"
 	done
 
-_UnnamedText_48d27: ; 9d984 (27:5984)
+_UnnamedText_48d27:: ; 9d984 (27:5984)
 	text "Thanks! Here are"
 	line "your 50 coins!"
 	done
 
-_UnnamedText_48d2c: ; 9d9a5 (27:59a5)
+_UnnamedText_48d2c:: ; 9d9a5 (27:59a5)
 	text "No? Please come"
 	line "play sometime!"
 	done
 
-_UnnamedText_48d31: ; 9d9c5 (27:59c5)
+_UnnamedText_48d31:: ; 9d9c5 (27:59c5)
 	text "You can't afford"
 	line "the coins!"
 	done
 
-_UnnamedText_48d36: ; 9d9e1 (27:59e1)
+_UnnamedText_48d36:: ; 9d9e1 (27:59e1)
 	text "Oops! Your COIN"
 	line "CASE is full."
 	done
 
-_UnnamedText_48d3b: ; 9da00 (27:5a00)
+_UnnamedText_48d3b:: ; 9da00 (27:5a00)
 	text "You don't have a"
 	line "COIN CASE!"
 	done
 
-_CeladonGameCornerText3: ; 9da1c (27:5a1c)
+_CeladonGameCornerText3:: ; 9da1c (27:5a1c)
 	text "Keep this quiet."
 
 	para "It's rumored that"
@@ -52,37 +52,37 @@
 	cont "by TEAM ROCKET."
 	done
 
-_CeladonGameCornerText4: ; 9da61 (27:5a61)
+_CeladonGameCornerText4:: ; 9da61 (27:5a61)
 	text "I think these"
 	line "machines have"
 	cont "different odds."
 	done
 
-_UnnamedText_48d9c: ; 9da8e (27:5a8e)
+_UnnamedText_48d9c:: ; 9da8e (27:5a8e)
 	text "Kid, do you want"
 	line "to play?"
 	prompt
 
-_Received10CoinsText: ; 9daa9 (27:5aa9)
+_Received10CoinsText:: ; 9daa9 (27:5aa9)
 	text $52, " received"
 	line "10 coins!@@"
 
-_UnnamedText_48da7: ; 9dac0 (27:5ac0)
+_UnnamedText_48da7:: ; 9dac0 (27:5ac0)
 	text "You don't need my"
 	line "coins!"
 	done
 
-_UnnamedText_48dac: ; 9dad9 (27:5ad9)
+_UnnamedText_48dac:: ; 9dad9 (27:5ad9)
 	text "Wins seem to come"
 	line "and go."
 	done
 
-_CeladonGameCornerText6: ; 9daf4 (27:5af4)
+_CeladonGameCornerText6:: ; 9daf4 (27:5af4)
 	text "I'm having a"
 	line "wonderful time!"
 	done
 
-_UnnamedText_48dca: ; 9db11 (27:5b11)
+_UnnamedText_48dca:: ; 9db11 (27:5b11)
 	text "Hey!"
 
 	para "You have better"
@@ -99,7 +99,7 @@
 	cont "be fooled!"
 	done
 
-_UnnamedText_48dcf: ; 9dbac (27:5bac)
+_UnnamedText_48dcf:: ; 9dbac (27:5bac)
 	text "They offer rare"
 	line "#MON that can"
 	cont "be exchanged for"
@@ -109,33 +109,33 @@
 	line "seem to win!"
 	done
 
-_CeladonGameCornerText8: ; 9dc06 (27:5c06)
+_CeladonGameCornerText8:: ; 9dc06 (27:5c06)
 	text "Games are scary!"
 	line "It's so easy to"
 	cont "get hooked!"
 	done
 
-_UnnamedText_48e26: ; 9dc33 (27:5c33)
+_UnnamedText_48e26:: ; 9dc33 (27:5c33)
 	text "What's up? Want"
 	line "some coins?"
 	prompt
 
-_Received20CoinsText: ; 9dc4f (27:5c4f)
+_Received20CoinsText:: ; 9dc4f (27:5c4f)
 	text $52, " received"
 	line "20 coins!@@"
 
-_UnnamedText_48e31: ; 9dc66 (27:5c66)
+_UnnamedText_48e31:: ; 9dc66 (27:5c66)
 	text "You have lots of"
 	line "coins!"
 	done
 
-_UnnamedText_48e36: ; 9dc7f (27:5c7f)
+_UnnamedText_48e36:: ; 9dc7f (27:5c7f)
 	text "Darn! I need more"
 	line "coins for the"
 	cont "#MON I want!"
 	done
 
-_UnnamedText_48e88: ; 9dcad (27:5cad)
+_UnnamedText_48e88:: ; 9dcad (27:5cad)
 	text "Hey, what? You're"
 	line "throwing me off!"
 	cont "Here are some"
@@ -142,38 +142,38 @@
 	cont "coins, shoo!"
 	prompt
 
-_UnnamedText_48e8d: ; 9dceb (27:5ceb)
+_UnnamedText_48e8d:: ; 9dceb (27:5ceb)
 	text $52, " received"
 	line "20 coins!@@"
 
-_UnnamedText_48e93: ; 9dd02 (27:5d02)
+_UnnamedText_48e93:: ; 9dd02 (27:5d02)
 	text "You've got your"
 	line "own coins!"
 	done
 
-_UnnamedText_48e98: ; 9dd1d (27:5d1d)
+_UnnamedText_48e98:: ; 9dd1d (27:5d1d)
 	text "The trick is to"
 	line "watch the reels"
 	cont "closely!"
 	done
 
-_UnnamedText_48ece: ; 9dd47 (27:5d47)
+_UnnamedText_48ece:: ; 9dd47 (27:5d47)
 	text "I'm guarding this"
 	line "poster!"
 	cont "Go away, or else!"
 	done
 
-_UnnamedText_48ed3: ; 9dd73 (27:5d73)
+_UnnamedText_48ed3:: ; 9dd73 (27:5d73)
 	text "Dang!"
 	prompt
 
-_UnnamedText_48ed8: ; 9dd7a (27:5d7a)
+_UnnamedText_48ed8:: ; 9dd7a (27:5d7a)
 	text "Our hideout might"
 	line "be discovered! I"
 	cont "better tell BOSS!"
 	done
 
-_UnnamedText_48f09: ; 9ddb0 (27:5db0)
+_UnnamedText_48f09:: ; 9ddb0 (27:5db0)
 	text "Hey!"
 
 	para "A switch behind"
@@ -180,7 +180,7 @@
 	line "the poster!?"
 	cont "Let's push it!@@"
 
-_UnnamedText_48f19: ; 9dde2 (27:5de2)
+_UnnamedText_48f19:: ; 9dde2 (27:5de2)
 	text "Oops! Forgot the"
 	line "COIN CASE!"
 	done
--- a/text/maps/celadon_gym.asm
+++ b/text/maps/celadon_gym.asm
@@ -1,4 +1,4 @@
-_UnnamedText_48a5e: ; 9d28f (27:528f)
+_UnnamedText_48a5e:: ; 9d28f (27:528f)
 	text "Hello. Lovely"
 	line "weather isn't it?"
 	cont "It's so pleasant."
@@ -25,7 +25,7 @@
 	line "shall not lose."
 	done
 
-_UnnamedText_48a63: ; 9d3c2 (27:53c2)
+_UnnamedText_48a63:: ; 9d3c2 (27:53c2)
 	text "Oh!"
 	line "I concede defeat."
 
@@ -36,7 +36,7 @@
 	line "the RAINBOWBADGE."
 	prompt
 
-_UnnamedText_48a68: ; 9d418 (27:5418)
+_UnnamedText_48a68:: ; 9d418 (27:5418)
 	text "You are cataloging"
 	line "#MON? I must"
 	cont "say I'm impressed."
@@ -47,7 +47,7 @@
 	cont "unattractive."
 	done
 
-_UnnamedText_48a6d: ; 9d481 (27:5481)
+_UnnamedText_48a6d:: ; 9d481 (27:5481)
 	text "The RAINBOWBADGE"
 	line "will make #MON"
 	cont "up to L50 obey."
@@ -61,13 +61,13 @@
 	line "this with you."
 	done
 
-_ReceivedTM21Text: ; 9d50c (27:550c)
+_ReceivedTM21Text:: ; 9d50c (27:550c)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_TM21ExplanationText: ; 9d520 (27:5520)
+_TM21ExplanationText:: ; 9d520 (27:5520)
 	db $0
 	para "TM21 contains"
 	line "MEGA DRAIN."
@@ -78,12 +78,12 @@
 	cont "your #MON!"
 	done
 
-_TM21NoRoomText: ; 9d576 (27:5576)
+_TM21NoRoomText:: ; 9d576 (27:5576)
 	text "You should make"
 	line "room for this."
 	done
 
-_CeladonGymBattleText2: ; 9d596 (27:5596)
+_CeladonGymBattleText2:: ; 9d596 (27:5596)
 	text "Hey!"
 
 	para "You are not"
@@ -90,28 +90,28 @@
 	line "allowed in here!"
 	done
 
-_CeladonGymEndBattleText2: ; 9d5b9 (27:55b9)
+_CeladonGymEndBattleText2:: ; 9d5b9 (27:55b9)
 	text "You're"
 	line "too rough!"
 	prompt
 
-_CeladonGymAfterBattleText2: ; 9d5cb (27:55cb)
+_CeladonGymAfterBattleText2:: ; 9d5cb (27:55cb)
 	text "Bleaah!"
 	line "I hope ERIKA"
 	cont "wipes you out!"
 	done
 
-_CeladonGymBattleText3: ; 9d5f0 (27:55f0)
+_CeladonGymBattleText3:: ; 9d5f0 (27:55f0)
 	text "I was getting"
 	line "bored."
 	done
 
-_CeladonGymEndBattleText3: ; 9d606 (27:5606)
+_CeladonGymEndBattleText3:: ; 9d606 (27:5606)
 	text "My"
 	line "makeup!"
 	prompt
 
-_CeladonGymAfterBattleText3: ; 9d612 (27:5612)
+_CeladonGymAfterBattleText3:: ; 9d612 (27:5612)
 	text "Grass-type #MON"
 	line "are tough against"
 	cont "the water-type!"
@@ -121,23 +121,23 @@
 	cont "ground #MON!"
 	done
 
-_CeladonGymBattleText4: ; 9d675 (27:5675)
+_CeladonGymBattleText4:: ; 9d675 (27:5675)
 	text "Aren't you the"
 	line "peeping Tom?"
 	done
 
-_CeladonGymEndBattleText4: ; 9d691 (27:5691)
+_CeladonGymEndBattleText4:: ; 9d691 (27:5691)
 	text "I'm"
 	line "in shock!"
 	prompt
 
-_CeladonGymAfterBattleText4: ; 9d69f (27:569f)
+_CeladonGymAfterBattleText4:: ; 9d69f (27:569f)
 	text "Oh, you weren't"
 	line "peeping? We get a"
 	cont "lot of gawkers!"
 	done
 
-_CeladonGymBattleText5: ; 9d6d1 (27:56d1)
+_CeladonGymBattleText5:: ; 9d6d1 (27:56d1)
 	text "Look at my grass"
 	line "#MON!"
 
@@ -145,11 +145,11 @@
 	line "to raise!"
 	done
 
-_CeladonGymEndBattleText5: ; 9d702 (27:5702)
+_CeladonGymEndBattleText5:: ; 9d702 (27:5702)
 	text "No!"
 	prompt
 
-_CeladonGymAfterBattleText5: ; 9d707 (27:5707)
+_CeladonGymAfterBattleText5:: ; 9d707 (27:5707)
 	text "We only use grass-"
 	line "type #MON at"
 	cont "our GYM!"
@@ -159,18 +159,18 @@
 	cont "arrangements!"
 	done
 
-_CeladonGymBattleText6: ; 9d762 (27:5762)
+_CeladonGymBattleText6:: ; 9d762 (27:5762)
 	text "Don't bring any"
 	line "bugs or fire"
 	cont "#MON in here!"
 	done
 
-_CeladonGymEndBattleText6: ; 9d78d (27:578d)
+_CeladonGymEndBattleText6:: ; 9d78d (27:578d)
 	text "Oh!"
 	line "You!"
 	prompt
 
-_CeladonGymAfterBattleText6: ; 9d797 (27:5797)
+_CeladonGymAfterBattleText6:: ; 9d797 (27:5797)
 	text "Our LEADER, ERIKA,"
 	line "might be quiet,"
 	cont "but she's also"
@@ -177,18 +177,18 @@
 	cont "very skilled!"
 	done
 
-_CeladonGymBattleText7: ; 9d7d7 (27:57d7)
+_CeladonGymBattleText7:: ; 9d7d7 (27:57d7)
 	text "Pleased to meet"
 	line "you. My hobby is"
 	cont "#MON training."
 	done
 
-_CeladonGymEndBattleText7: ; 9d808 (27:5808)
+_CeladonGymEndBattleText7:: ; 9d808 (27:5808)
 	text "Oh!"
 	line "Splendid!"
 	prompt
 
-_CeladonGymAfterBattleText7: ; 9d817 (27:5817)
+_CeladonGymAfterBattleText7:: ; 9d817 (27:5817)
 	text "I have a blind"
 	line "date coming up."
 	cont "I have to learn"
@@ -195,7 +195,7 @@
 	cont "to be polite."
 	done
 
-_CeladonGymBattleText8: ; 9d855 (27:5855)
+_CeladonGymBattleText8:: ; 9d855 (27:5855)
 	text "Welcome to"
 	line "CELADON GYM!"
 
@@ -204,12 +204,12 @@
 	cont "girl power!"
 	done
 
-_CeladonGymEndBattleText8: ; 9d897 (27:5897)
+_CeladonGymEndBattleText8:: ; 9d897 (27:5897)
 	text "Oh!"
 	line "Beaten!"
 	prompt
 
-_CeladonGymAfterBattleText8: ; 9d8a4 (27:58a4)
+_CeladonGymAfterBattleText8:: ; 9d8a4 (27:58a4)
 	text "I didn't bring my"
 	line "best #MON!"
 
--- a/text/maps/celadon_hotel.asm
+++ b/text/maps/celadon_hotel.asm
@@ -1,4 +1,4 @@
-_CeladonHotelText1: ; 9e18a (27:618a)
+_CeladonHotelText1:: ; 9e18a (27:618a)
 	text "#MON? No, this"
 	line "is a hotel for"
 	cont "people."
@@ -6,7 +6,7 @@
 	para "We're full up."
 	done
 
-_CeladonHotelText2: ; 9e1bf (27:61bf)
+_CeladonHotelText2:: ; 9e1bf (27:61bf)
 	text "I'm on vacation"
 	line "with my brother"
 	cont "and boy friend."
@@ -15,7 +15,7 @@
 	line "pretty city!"
 	done
 
-_CeladonHotelText3: ; 9e20e (27:620e)
+_CeladonHotelText3:: ; 9e20e (27:620e)
 	text "Why did she bring"
 	line "her brother?"
 	done
--- a/text/maps/celadon_house.asm
+++ b/text/maps/celadon_house.asm
@@ -1,10 +1,10 @@
-_CeladonHouseText1: ; 9e0d5 (27:60d5)
+_CeladonHouseText1:: ; 9e0d5 (27:60d5)
 	text "Hehehe! The slots"
 	line "just reel in the"
 	cont "dough, big time!"
 	done
 
-_CeladonHouseText2: ; 9e10a (27:610a)
+_CeladonHouseText2:: ; 9e10a (27:610a)
 	text "CHIEF!"
 
 	para "We just shipped"
@@ -12,7 +12,7 @@
 	cont "slot prizes!"
 	done
 
-_CeladonHouseText3: ; 9e13c (27:613c)
+_CeladonHouseText3:: ; 9e13c (27:613c)
 	text "Don't touch the"
 	line "poster at the"
 	cont "GAME CORNER!"
--- a/text/maps/celadon_mansion_1f.asm
+++ b/text/maps/celadon_mansion_1f.asm
@@ -1,7 +1,7 @@
-_CeladonMansion1Text1: ; 9ceee (27:4eee)
+_CeladonMansion1Text1:: ; 9ceee (27:4eee)
 	text "MEOWTH: Meow!@@"
 
-_CeladonMansion1Text2: ; 9cefe (27:4efe)
+_CeladonMansion1Text2:: ; 9cefe (27:4efe)
 	text "My dear #MON"
 	line "keep me company."
 
@@ -9,15 +9,15 @@
 	line "money home!"
 	done
 
-_CeladonMansion1Text3: ; 9cf3c (27:4f3c)
+_CeladonMansion1Text3:: ; 9cf3c (27:4f3c)
 	text "CLEFAIRY: Pi"
 	line "pippippi!@@"
 
-_CeladonMansion1Text4: ; 9cf55 (27:4f55)
+_CeladonMansion1Text4:: ; 9cf55 (27:4f55)
 	text "NIDORAN: Kya"
 	line "kyaoo!@@"
 
-_CeladonMansion1Text5: ; 9cf6b (27:4f6b)
+_CeladonMansion1Text5:: ; 9cf6b (27:4f6b)
 	text "CELADON MANSION"
 	line "Manager's Suite"
 	done
--- a/text/maps/celadon_mansion_2f.asm
+++ b/text/maps/celadon_mansion_2f.asm
@@ -1,4 +1,4 @@
-_CeladonMansion2Text1: ; 9cf8b (27:4f8b)
+_CeladonMansion2Text1:: ; 9cf8b (27:4f8b)
 	text "GAME FREAK"
 	line "Meeting Room"
 	done
--- a/text/maps/celadon_mansion_3f.asm
+++ b/text/maps/celadon_mansion_3f.asm
@@ -1,15 +1,15 @@
-_ProgrammerText: ; 9cfa4 (27:4fa4)
+_ProgrammerText:: ; 9cfa4 (27:4fa4)
 	text "Me? I'm the"
 	line "programmer!"
 	done
 
-_GraphicArtistText: ; 9cfbc (27:4fbc)
+_GraphicArtistText:: ; 9cfbc (27:4fbc)
 	text "I'm the graphic"
 	line "artist!"
 	cont "I drew you!"
 	done
 
-_WriterText: ; 9cfe0 (27:4fe0)
+_WriterText:: ; 9cfe0 (27:4fe0)
 	text "I wrote the story!"
 	line "Isn't ERIKA cute?"
 
@@ -20,7 +20,7 @@
 	line "I like her!"
 	done
 
-_GameDesignerText: ; 9d03a (27:503a)
+_GameDesignerText:: ; 9d03a (27:503a)
 	text "Is that right?"
 
 	para "I'm the game"
@@ -34,7 +34,7 @@
 	line "come tell me!"
 	done
 
-_CompletedDexText: ; 9d0ad (27:50ad)
+_CompletedDexText:: ; 9d0ad (27:50ad)
 	text "Wow! Excellent!"
 	line "You completed"
 	cont "your #DEX!"
@@ -41,7 +41,7 @@
 	cont "Congratulations!"
 	cont "...@@"
 
-_CeladonMansion3Text5: ; 9d0ed (27:50ed)
+_CeladonMansion3Text5:: ; 9d0ed (27:50ed)
 	text "It's the game"
 	line "program! Messing"
 	cont "with it could bug"
@@ -48,19 +48,19 @@
 	cont "out the game!"
 	done
 
-_CeladonMansion3Text6: ; 9d12c (27:512c)
+_CeladonMansion3Text6:: ; 9d12c (27:512c)
 	text "Someone's playing"
 	line "a game instead of"
 	cont "working!"
 	done
 
-_CeladonMansion3Text7: ; 9d159 (27:5159)
+_CeladonMansion3Text7:: ; 9d159 (27:5159)
 	text "It's the script!"
 	line "Better not look"
 	cont "at the ending!"
 	done
 
-_CeladonMansion3Text8: ; 9d189 (27:5189)
+_CeladonMansion3Text8:: ; 9d189 (27:5189)
 	text "GAME FREAK"
 	line "Development Room"
 	done
--- a/text/maps/celadon_mansion_4f_inside.asm
+++ b/text/maps/celadon_mansion_4f_inside.asm
@@ -1,4 +1,4 @@
-_CeladonMansion5Text1: ; 9d1ba (27:51ba)
+_CeladonMansion5Text1:: ; 9d1ba (27:51ba)
 	text "I know everything"
 	line "about the world"
 	cont "of #MON in"
--- a/text/maps/celadon_mansion_4f_outside.asm
+++ b/text/maps/celadon_mansion_4f_outside.asm
@@ -1,4 +1,4 @@
-_CeladonMansion4Text1: ; 9d1a6 (27:51a6)
+_CeladonMansion4Text1:: ; 9d1a6 (27:51a6)
 	text "I KNOW EVERYTHING!"
 	done
 
--- a/text/maps/celadon_pokecenter.asm
+++ b/text/maps/celadon_pokecenter.asm
@@ -1,4 +1,4 @@
-_CeladonPokecenterText2: ; 9d226 (27:5226)
+_CeladonPokecenterText2:: ; 9d226 (27:5226)
 	text "# FLUTE awakens"
 	line "#MON with a"
 	cont "sound that only"
@@ -5,7 +5,7 @@
 	cont "they can hear!"
 	done
 
-_CeladonPokecenterText3: ; 9d262 (27:5262)
+_CeladonPokecenterText3:: ; 9d262 (27:5262)
 	text "I rode uphill on"
 	line "CYCLING ROAD from"
 	cont "FUCHSIA!"
--- a/text/maps/celadon_prize_room.asm
+++ b/text/maps/celadon_prize_room.asm
@@ -1,4 +1,4 @@
-_CeladonPrizeRoomText1: ; 9dee6 (27:5ee6)
+_CeladonPrizeRoomText1:: ; 9dee6 (27:5ee6)
 	text "I sure do fancy"
 	line "that PORYGON!"
 
@@ -6,7 +6,7 @@
 	line "win at slots!"
 	done
 
-_CeladonPrizeRoomText2: ; 9df24 (27:5f24)
+_CeladonPrizeRoomText2:: ; 9df24 (27:5f24)
 	text "I had a major"
 	line "haul today!"
 	done
--- a/text/maps/cerulean_badge_house.asm
+++ b/text/maps/cerulean_badge_house.asm
@@ -1,4 +1,4 @@
-_UnnamedText_74e77: ; 990c9 (26:50c9)
+_UnnamedText_74e77:: ; 990c9 (26:50c9)
 	text "#MON BADGEs"
 	line "are owned only by"
 	cont "skilled trainers."
@@ -10,7 +10,7 @@
 	line "amazing secrets!"
 	prompt
 
-_UnnamedText_74e7c: ; 9913a (26:513a)
+_UnnamedText_74e7c:: ; 9913a (26:513a)
 	text "Now then..."
 
 	para "Which of the 8"
@@ -18,12 +18,12 @@
 	cont "describe?"
 	done
 
-_UnnamedText_74e81: ; 99170 (26:5170)
+_UnnamedText_74e81:: ; 99170 (26:5170)
 	text "Come visit me any"
 	line "time you wish."
 	done
 
-_UnnamedText_74e96: ; 99192 (26:5192)
+_UnnamedText_74e96:: ; 99192 (26:5192)
 	text "The ATTACK of all"
 	line "#MON increases"
 	cont "a little bit."
@@ -33,7 +33,7 @@
 	cont "time you desire."
 	prompt
 
-_UnnamedText_74e9b: ; 991f2 (26:51f2)
+_UnnamedText_74e9b:: ; 991f2 (26:51f2)
 	text "#MON up to L30"
 	line "will obey you."
 
@@ -45,7 +45,7 @@
 	cont "of battle."
 	prompt
 
-_UnnamedText_74ea0: ; 9925d (26:525d)
+_UnnamedText_74ea0:: ; 9925d (26:525d)
 	text "The SPEED of all"
 	line "#MON increases"
 	cont "a little bit."
@@ -55,7 +55,7 @@
 	cont "of battle."
 	prompt
 
-_UnnamedText_74ea5: ; 992b8 (26:52b8)
+_UnnamedText_74ea5:: ; 992b8 (26:52b8)
 	text "#MON up to L50"
 	line "will obey you."
 
@@ -67,7 +67,7 @@
 	cont "side of battle."
 	prompt
 
-_UnnamedText_74eaa: ; 9932a (26:532a)
+_UnnamedText_74eaa:: ; 9932a (26:532a)
 	text "The DEFENSE of all"
 	line "#MON increases"
 	cont "a little bit."
@@ -77,7 +77,7 @@
 	cont "of battle."
 	prompt
 
-_UnnamedText_74eaf: ; 99388 (26:5388)
+_UnnamedText_74eaf:: ; 99388 (26:5388)
 	text "#MON up to L70"
 	line "will obey you."
 
@@ -85,13 +85,13 @@
 	line "become unruly!"
 	prompt
 
-_UnnamedText_74eb4: ; 993c7 (26:53c7)
+_UnnamedText_74eb4:: ; 993c7 (26:53c7)
 	text "Your #MON's"
 	line "SPECIAL abilities"
 	cont "increase a bit."
 	prompt
 
-_UnnamedText_74eb9: ; 993f5 (26:53f5)
+_UnnamedText_74eb9:: ; 993f5 (26:53f5)
 	text "All #MON will"
 	line "obey you!"
 	prompt
--- a/text/maps/cerulean_city.asm
+++ b/text/maps/cerulean_city.asm
@@ -1,4 +1,4 @@
-_UnnamedText_19668: ; a4d2b (29:4d2b)
+_UnnamedText_19668:: ; a4d2b (29:4d2b)
 	text $53, ": Yo!"
 	line $52, "!"
 
@@ -16,19 +16,19 @@
 	cont $52, "!"
 	done
 
-_UnnamedText_1966d: ; a4dbe (29:4dbe)
+_UnnamedText_1966d:: ; a4dbe (29:4dbe)
 	text "Hey!"
 	line "Take it easy!"
 	cont "You won already!"
 	prompt
 
-_UnnamedText_19672: ; a4de3 (29:4de3)
+_UnnamedText_19672:: ; a4de3 (29:4de3)
 	text "Heh!"
 	line "You're no match"
 	cont "for my genius!"
 	prompt
 
-_UnnamedText_19677: ; a4e07 (29:4e07)
+_UnnamedText_19677:: ; a4e07 (29:4e07)
 	text $53, ": Hey,"
 	line "guess what?"
 
@@ -58,7 +58,7 @@
 	cont "Smell ya later!"
 	done
 
-_UnnamedText_196d9: ; a4f27 (29:4f27)
+_UnnamedText_196d9:: ; a4f27 (29:4f27)
 	text "Hey! Stay out!"
 	line "It's not your"
 	cont "yard! Huh? Me?"
@@ -68,16 +68,16 @@
 	cont "you believe me?"
 	done
 
-_ReceivedTM28Text: ; a4f82 (29:4f82)
+_ReceivedTM28Text:: ; a4f82 (29:4f82)
 	text $52, " recovered"
 	line "TM28!@@"
 
-_ReceivedTM28Text2: ; a4f96 (29:4f96)
+_ReceivedTM28Text2:: ; a4f96 (29:4f96)
 	db $0
 	para "I better get"
 	line "moving! Bye!@@"
 
-_TM28NoRoomText: ; a4fb3 (29:4fb3)
+_TM28NoRoomText:: ; a4fb3 (29:4fb3)
 	text "Make room for"
 	line "this!"
 
@@ -85,18 +85,18 @@
 	line "I give it to you!"
 	done
 
-_UnnamedText_196ee: ; a4feb (29:4feb)
+_UnnamedText_196ee:: ; a4feb (29:4feb)
 	text "Stop!"
 	line "I give up! I'll"
 	cont "leave quietly!"
 	prompt
 
-_UnnamedText_196f3: ; a5010 (29:5010)
+_UnnamedText_196f3:: ; a5010 (29:5010)
 	text "OK! I'll return"
 	line "the TM I stole!"
 	prompt
 
-_CeruleanCityText3: ; a5030 (29:5030)
+_CeruleanCityText3:: ; a5030 (29:5030)
 	text "You're a trainer"
 	line "too? Collecting,"
 	cont "fighting, it's a"
@@ -103,7 +103,7 @@
 	cont "tough life."
 	done
 
-_CeruleanCityText4: ; a506e (29:506e)
+_CeruleanCityText4:: ; a506e (29:506e)
 	text "That bush in"
 	line "front of the shop"
 	cont "is in the way."
@@ -112,7 +112,7 @@
 	line "way around."
 	done
 
-_CeruleanCityText5: ; a50ba (29:50ba)
+_CeruleanCityText5:: ; a50ba (29:50ba)
 	text "You're making an"
 	line "encyclopedia on"
 	cont "#MON? That"
@@ -119,7 +119,7 @@
 	cont "sounds amusing."
 	done
 
-_CeruleanCityText6: ; a50f6 (29:50f6)
+_CeruleanCityText6:: ; a50f6 (29:50f6)
 	text "The people here"
 	line "were robbed."
 
@@ -133,7 +133,7 @@
 	cont "with the ROCKETs!"
 	done
 
-_UnnamedText_19730: ; a5188 (29:5188)
+_UnnamedText_19730:: ; a5188 (29:5188)
 	text "OK! SLOWBRO!"
 	line "Use SONICBOOM!"
 	cont "Come on, SLOWBRO"
@@ -140,13 +140,13 @@
 	cont "pay attention!"
 	done
 
-_UnnamedText_19735: ; a51c5 (29:51c5)
+_UnnamedText_19735:: ; a51c5 (29:51c5)
 	text "SLOWBRO punch!"
 	line "No! You blew it"
 	cont "again!"
 	done
 
-_UnnamedText_1973a: ; a51ec (29:51ec)
+_UnnamedText_1973a:: ; a51ec (29:51ec)
 	text "SLOWBRO, WITHDRAW!"
 	line "No! That's wrong!"
 
@@ -159,27 +159,27 @@
 	cont "as a trainer!"
 	done
 
-_UnnamedText_1976f: ; a526b (29:526b)
+_UnnamedText_1976f:: ; a526b (29:526b)
 	text "SLOWBRO took a"
 	line "snooze..."
 	done
 
-_UnnamedText_19774: ; a5285 (29:5285)
+_UnnamedText_19774:: ; a5285 (29:5285)
 	text "SLOWBRO is"
 	line "loafing around..."
 	done
 
-_UnnamedText_19779: ; a52a3 (29:52a3)
+_UnnamedText_19779:: ; a52a3 (29:52a3)
 	text "SLOWBRO turned"
 	line "away..."
 	done
 
-_UnnamedText_1977e: ; a52bb (29:52bb)
+_UnnamedText_1977e:: ; a52bb (29:52bb)
 	text "SLOWBRO"
 	line "ignored orders..."
 	done
 
-_CeruleanCityText9: ; a52d6 (29:52d6)
+_CeruleanCityText9:: ; a52d6 (29:52d6)
 	text "I want a bright"
 	line "red BICYCLE!"
 
@@ -188,7 +188,7 @@
 	cont "get dirty!"
 	done
 
-_CeruleanCityText10: ; a531f (29:531f)
+_CeruleanCityText10:: ; a531f (29:531f)
 	text "This is CERULEAN"
 	line "CAVE! Horribly"
 	cont "strong #MON"
@@ -200,7 +200,7 @@
 	cont "is allowed in!"
 	done
 
-_CeruleanCityText12: ; a539a (29:539a)
+_CeruleanCityText12:: ; a539a (29:539a)
 	text "CERULEAN CITY"
 	line "A Mysterious,"
 	cont "Blue Aura"
@@ -207,7 +207,7 @@
 	cont "Surrounds It"
 	done
 
-_CeruleanCityText13: ; a53ce (29:53ce)
+_CeruleanCityText13:: ; a53ce (29:53ce)
 	text "TRAINER TIPS"
 
 	para "Pressing B Button"
@@ -216,13 +216,13 @@
 	cont "process."
 	done
 
-_CeruleanCityText16: ; a541a (29:541a)
+_CeruleanCityText16:: ; a541a (29:541a)
 	text "Grass and caves"
 	line "handled easily!"
 	cont "BIKE SHOP"
 	done
 
-_CeruleanCityText17: ; a5445 (29:5445)
+_CeruleanCityText17:: ; a5445 (29:5445)
 	text "CERULEAN CITY"
 	line "#MON GYM"
 	cont "LEADER: MISTY"
--- a/text/maps/cerulean_gym.asm
+++ b/text/maps/cerulean_gym.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5c7be: ; 989c1 (26:49c1)
+_UnnamedText_5c7be:: ; 989c1 (26:49c1)
 	text "Hi, you're a new"
 	line "face!"
 
@@ -17,7 +17,7 @@
 	cont "#MON!"
 	done
 
-_UnnamedText_5c7c3: ; 98a7b (26:4a7b)
+_UnnamedText_5c7c3:: ; 98a7b (26:4a7b)
 	text "TM11 teaches"
 	line "BUBBLEBEAM!"
 
@@ -25,7 +25,7 @@
 	line "aquatic #MON!"
 	done
 
-_UnnamedText_5c7c8: ; 98ab0 (26:4ab0)
+_UnnamedText_5c7c8:: ; 98ab0 (26:4ab0)
 	text "The CASCADEBADGE"
 	line "makes all #MON"
 	cont "up to L30 obey!"
@@ -45,16 +45,16 @@
 	line "my favorite TM!"
 	done
 
-_ReceivedTM11Text: ; 98b7d (26:4b7d)
+_ReceivedTM11Text:: ; 98b7d (26:4b7d)
 	text $52, " received"
 	line "TM11!@@"
 
-_UnnamedText_5c7d3: ; 98b90 (26:4b90)
+_UnnamedText_5c7d3:: ; 98b90 (26:4b90)
 	text "You better make"
 	line "room for this!"
 	done
 
-_UnnamedText_5c7d8: ; 98bb0 (26:4bb0)
+_UnnamedText_5c7d8:: ; 98bb0 (26:4bb0)
 	text "Wow!"
 	line "You're too much!"
 
@@ -64,7 +64,7 @@
 	line "CASCADEBADGE to"
 	cont "show you beat me!@@"
 
-_CeruleanGymBattleText1: ; 98c05 (26:4c05)
+_CeruleanGymBattleText1:: ; 98c05 (26:4c05)
 	text "I'm more than good"
 	line "enough for you!"
 
@@ -71,12 +71,12 @@
 	para "MISTY can wait!"
 	done
 
-_CeruleanGymEndBattleText1: ; 98c38 (26:4c38)
+_CeruleanGymEndBattleText1:: ; 98c38 (26:4c38)
 	text "You"
 	line "overwhelmed me!"
 	prompt
 
-_CeruleanGymAfterBattleText1: ; 98c4d (26:4c4d)
+_CeruleanGymAfterBattleText1:: ; 98c4d (26:4c4d)
 	text "You have to face"
 	line "other trainers to"
 	cont "find out how good"
@@ -83,7 +83,7 @@
 	cont "you really are."
 	done
 
-_CeruleanGymBattleText2: ; 98c93 (26:4c93)
+_CeruleanGymBattleText2:: ; 98c93 (26:4c93)
 	text "Splash!"
 
 	para "I'm first up!"
@@ -90,12 +90,12 @@
 	line "Let's do it!"
 	done
 
-_CeruleanGymEndBattleText2: ; 98cb5 (26:4cb5)
+_CeruleanGymEndBattleText2:: ; 98cb5 (26:4cb5)
 	text "That"
 	line "can't be!"
 	prompt
 
-_CeruleanGymAfterBattleText2: ; 98cc4 (26:4cc4)
+_CeruleanGymAfterBattleText2:: ; 98cc4 (26:4cc4)
 	text "MISTY is going to"
 	line "keep improving!"
 
@@ -103,7 +103,7 @@
 	line "someone like you!"
 	done
 
-_UnnamedText_5c82a: ; 98d0a (26:4d0a)
+_UnnamedText_5c82a:: ; 98d0a (26:4d0a)
 	text "Yo! Champ in"
 	line "making!"
 
@@ -121,7 +121,7 @@
 	line "electricity!"
 	done
 
-_UnnamedText_5c82f: ; 98db0 (26:4db0)
+_UnnamedText_5c82f:: ; 98db0 (26:4db0)
 	text "You beat MISTY!"
 	line "What'd I tell ya?"
 
--- a/text/maps/cerulean_mart.asm
+++ b/text/maps/cerulean_mart.asm
@@ -1,4 +1,4 @@
-_CeruleanMartText2: ; 99012 (26:5012)
+_CeruleanMartText2:: ; 99012 (26:5012)
 	text "Use REPEL to keep"
 	line "bugs and weak"
 	cont "#MON away."
@@ -9,7 +9,7 @@
 	cont "for best results!"
 	done
 
-_CeruleanMartText3: ; 9907f (26:507f)
+_CeruleanMartText3:: ; 9907f (26:507f)
 	text "Have you seen any"
 	line "RARE CANDY?"
 
--- a/text/maps/cerulean_pokecenter.asm
+++ b/text/maps/cerulean_pokecenter.asm
@@ -1,4 +1,4 @@
-_CeruleanPokecenterText1: ; 988e5 (26:48e5)
+_CeruleanPokecenterText1:: ; 988e5 (26:48e5)
 	text "That BILL!"
 
 	para "I heard that"
@@ -7,7 +7,7 @@
 	cont "rare #MON!"
 	done
 
-_CeruleanPokecenterText3: ; 9892a (26:492a)
+_CeruleanPokecenterText3:: ; 9892a (26:492a)
 	text "Have you heard"
 	line "about BILL?"
 
--- a/text/maps/cerulean_trade_house.asm
+++ b/text/maps/cerulean_trade_house.asm
@@ -1,4 +1,4 @@
-_CeruleanHouseText1: ; 9888c (26:488c)
+_CeruleanHouseText1:: ; 9888c (26:488c)
 	text "My husband likes"
 	line "trading #MON."
 
--- a/text/maps/cerulean_trashed_house.asm
+++ b/text/maps/cerulean_trashed_house.asm
@@ -1,4 +1,4 @@
-_UnnamedText_1d6ab: ; 9875c (26:475c)
+_UnnamedText_1d6ab:: ; 9875c (26:475c)
 	text "Those miserable"
 	line "ROCKETs!"
 
@@ -14,7 +14,7 @@
 	line "bundle, it did!"
 	done
 
-_UnnamedText_1d6b0: ; 987e2 (26:47e2)
+_UnnamedText_1d6b0:: ; 987e2 (26:47e2)
 	text "I figure what's"
 	line "lost is lost!"
 
@@ -23,7 +23,7 @@
 	cont "DIG without a TM!"
 	done
 
-_CeruleanHouseTrashedText2: ; 98834 (26:4834)
+_CeruleanHouseTrashedText2:: ; 98834 (26:4834)
 	text "TEAM ROCKET must"
 	line "be trying to DIG"
 	cont "their way into no"
@@ -30,7 +30,7 @@
 	cont "good!"
 	done
 
-_CeruleanHouseTrashedText3: ; 9886f (26:486f)
+_CeruleanHouseTrashedText3:: ; 9886f (26:486f)
 	text "TEAM ROCKET left"
 	line "a way out!"
 	done
--- a/text/maps/champion.asm
+++ b/text/maps/champion.asm
@@ -1,4 +1,4 @@
-_UnnamedText_760f4: ; 860e1 (21:60e1)
+_UnnamedText_760f4:: ; 860e1 (21:60e1)
 	text $53, ": Hey!"
 
 	para "I was looking"
@@ -35,7 +35,7 @@
 	cont "in the world!"
 	done
 
-_UnnamedText_760f9: ; 8623b (21:623b)
+_UnnamedText_760f9:: ; 8623b (21:623b)
 	text "NO!"
 	line "That can't be!"
 	cont "You beat my best!"
@@ -49,7 +49,7 @@
 	cont "It's not fair!"
 	prompt
 
-_UnnamedText_760fe: ; 862b4 (21:62b4)
+_UnnamedText_760fe:: ; 862b4 (21:62b4)
 	text "Hahaha!"
 	line "I won, I won!"
 
@@ -65,7 +65,7 @@
 	line "Hahaha!"
 	prompt
 
-_UnnamedText_76103: ; 8632f (21:632f)
+_UnnamedText_76103:: ; 8632f (21:632f)
 	text "Why?"
 	line "Why did I lose?"
 
@@ -81,11 +81,11 @@
 	line "like to admit it."
 	done
 
-_GaryText2: ; 863c1 (21:63c1)
+_GaryText2:: ; 863c1 (21:63c1)
 	text "OAK: ", $52, "!"
 	done
 
-_UnnamedText_76120: ; 863ca (21:63ca)
+_UnnamedText_76120:: ; 863ca (21:63ca)
 	text "OAK: So, you won!"
 	line "Congratulations!"
 	cont "You're the new"
@@ -103,7 +103,7 @@
 	line "come of age!"
 	done
 
-_UnnamedText_76125: ; 86463 (21:6463)
+_UnnamedText_76125:: ; 86463 (21:6463)
 	text "OAK: ", $53, "! I'm"
 	line "disappointed!"
 
@@ -129,7 +129,7 @@
 	cont "a champ again!"
 	done
 
-_UnnamedText_7612a: ; 86567 (21:6567)
+_UnnamedText_7612a:: ; 86567 (21:6567)
 	text "OAK: ", $52, "!"
 
 	para "You understand"
--- a/text/maps/cinnabar_gym.asm
+++ b/text/maps/cinnabar_gym.asm
@@ -1,4 +1,4 @@
-_BlaineBattleText: ; a0844 (28:4844)
+_BlaineBattleText:: ; a0844 (28:4844)
 	text "Hah!"
 
 	para "I am BLAINE! I"
@@ -13,7 +13,7 @@
 	line "have BURN HEAL!"
 	done
 
-_BlaineEndBattleText: ; a08c7 (28:48c7)
+_BlaineEndBattleText:: ; a08c7 (28:48c7)
 	text "I have"
 	line "burnt out!"
 
@@ -20,7 +20,7 @@
 	para "You have earned"
 	line "the VOLCANOBADGE!@@"
 
-_BlaineFireBlastText: ; a08fd (28:48fd)
+_BlaineFireBlastText:: ; a08fd (28:48fd)
 	text "FIRE BLAST is the"
 	line "ultimate fire"
 	cont "technique!"
@@ -29,7 +29,7 @@
 	line "water #MON!"
 	done
 
-_BlaineBadgeText: ; a0946 (28:4946)
+_BlaineBadgeText:: ; a0946 (28:4946)
 	text "Hah!"
 
 	para "The VOLCANOBADGE"
@@ -41,13 +41,13 @@
 	line "have this too!"
 	done
 
-_ReceivedTM38Text: ; a09a8 (28:49a8)
+_ReceivedTM38Text:: ; a09a8 (28:49a8)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_TM38ExplanationText: ; a09bc (28:49bc)
+_TM38ExplanationText:: ; a09bc (28:49bc)
 	db $0
 	para "TM38 contains"
 	line "FIRE BLAST!"
@@ -60,23 +60,23 @@
 	cont "good bets!"
 	done
 
-_TM38NoRoomText: ; a0a1e (28:4a1e)
+_TM38NoRoomText:: ; a0a1e (28:4a1e)
 	text "Make room for my"
 	line "gift!"
 	done
 
-_UnnamedText_7595f: ; a0a36 (28:4a36)
+_UnnamedText_7595f:: ; a0a36 (28:4a36)
 	text "Do you know how"
 	line "hot #MON fire"
 	cont "breath can get?"
 	done
 
-_UnnamedText_75964: ; a0a65 (28:4a65)
+_UnnamedText_75964:: ; a0a65 (28:4a65)
 	text "Yow!"
 	line "Hot, hot, hot!"
 	prompt
 
-_UnnamedText_75969: ; a0a7a (28:4a7a)
+_UnnamedText_75969:: ; a0a7a (28:4a7a)
 	text "Fire, or to be"
 	line "more precise,"
 	cont "combustion..."
@@ -85,66 +85,66 @@
 	line "blah..."
 	done
 
-_UnnamedText_75994: ; a0ac0 (28:4ac0)
+_UnnamedText_75994:: ; a0ac0 (28:4ac0)
 	text "I was a thief, but"
 	line "I became straight"
 	cont "as a trainer!"
 	done
 
-_UnnamedText_75999: ; a0af4 (28:4af4)
+_UnnamedText_75999:: ; a0af4 (28:4af4)
 	text "I"
 	line "surrender!"
 	prompt
 
-_UnnamedText_7599e: ; a0b02 (28:4b02)
+_UnnamedText_7599e:: ; a0b02 (28:4b02)
 	text "I can't help"
 	line "stealing other"
 	cont "people's #MON!"
 	done
 
-_UnnamedText_759c9: ; a0b2c (28:4b2c)
+_UnnamedText_759c9:: ; a0b2c (28:4b2c)
 	text "You can't win!"
 	line "I have studied"
 	cont "#MON totally!"
 	done
 
-_UnnamedText_759ce: ; a0b58 (28:4b58)
+_UnnamedText_759ce:: ; a0b58 (28:4b58)
 	text "Waah!"
 	line "My studies!"
 	prompt
 
-_UnnamedText_759d3: ; a0b6b (28:4b6b)
+_UnnamedText_759d3:: ; a0b6b (28:4b6b)
 	text "My theories are"
 	line "too complicated"
 	cont "for you!"
 	done
 
-_UnnamedText_759fe: ; a0b95 (28:4b95)
+_UnnamedText_759fe:: ; a0b95 (28:4b95)
 	text "I just like using"
 	line "fire #MON!"
 	done
 
-_UnnamedText_75a03: ; a0bb3 (28:4bb3)
+_UnnamedText_75a03:: ; a0bb3 (28:4bb3)
 	text "Too hot"
 	line "to handle!"
 	prompt
 
-_UnnamedText_75a08: ; a0bc7 (28:4bc7)
+_UnnamedText_75a08:: ; a0bc7 (28:4bc7)
 	text "I wish there was"
 	line "a thief #MON!"
 	cont "I'd use that!"
 	done
 
-_UnnamedText_75a33: ; a0bf4 (28:4bf4)
+_UnnamedText_75a33:: ; a0bf4 (28:4bf4)
 	text "I know why BLAINE"
 	line "became a trainer!"
 	done
 
-_UnnamedText_75a38: ; a0c19 (28:4c19)
+_UnnamedText_75a38:: ; a0c19 (28:4c19)
 	text "Ow!"
 	prompt
 
-_UnnamedText_75a3d: ; a0c1e (28:4c1e)
+_UnnamedText_75a3d:: ; a0c1e (28:4c1e)
 	text "BLAINE was lost"
 	line "in the mountains"
 	cont "when a fiery bird"
@@ -155,40 +155,40 @@
 	cont "his way down!"
 	done
 
-_UnnamedText_75a68: ; a0c90 (28:4c90)
+_UnnamedText_75a68:: ; a0c90 (28:4c90)
 	text "I've been to many"
 	line "GYMs, but this is"
 	cont "my favorite!"
 	done
 
-_UnnamedText_75a6d: ; a0cc1 (28:4cc1)
+_UnnamedText_75a6d:: ; a0cc1 (28:4cc1)
 	text "Yowza!"
 	line "Too hot!"
 	prompt
 
-_UnnamedText_75a72: ; a0cd2 (28:4cd2)
+_UnnamedText_75a72:: ; a0cd2 (28:4cd2)
 	text "Us fire #MON"
 	line "fans like PONYTA"
 	cont "and NINETALES!"
 	done
 
-_UnnamedText_75a9d: ; a0d00 (28:4d00)
+_UnnamedText_75a9d:: ; a0d00 (28:4d00)
 	text "Fire is weak"
 	line "against H2O!"
 	done
 
-_UnnamedText_75aa2: ; a0d1b (28:4d1b)
+_UnnamedText_75aa2:: ; a0d1b (28:4d1b)
 	text "Oh!"
 	line "Snuffed out!"
 	prompt
 
-_UnnamedText_75aa7: ; a0d2d (28:4d2d)
+_UnnamedText_75aa7:: ; a0d2d (28:4d2d)
 	text "Water beats fire!"
 	line "But, fire melts"
 	cont "ice #MON!"
 	done
 
-_UnnamedText_75ac2: ; a0d5a (28:4d5a)
+_UnnamedText_75ac2:: ; a0d5a (28:4d5a)
 	text "Yo! Champ in"
 	line "making!"
 
@@ -203,7 +203,7 @@
 	line "some BURN HEALs!"
 	done
 
-_UnnamedText_75ac7: ; a0dd9 (28:4dd9)
+_UnnamedText_75ac7:: ; a0dd9 (28:4dd9)
 	text $52, "! You beat"
 	line "that fire brand!"
 	done
--- a/text/maps/cinnabar_island.asm
+++ b/text/maps/cinnabar_island.asm
@@ -1,9 +1,9 @@
-_CinnabarIslandText8: ; a61cf (29:61cf)
+_CinnabarIslandText8:: ; a61cf (29:61cf)
 	text "The door is"
 	line "locked..."
 	done
 
-_CinnabarIslandText1: ; a61e6 (29:61e6)
+_CinnabarIslandText1:: ; a61e6 (29:61e6)
 	text "CINNABAR GYM's"
 	line "BLAINE is an odd"
 	cont "man who has lived"
@@ -10,7 +10,7 @@
 	cont "here for decades."
 	done
 
-_CinnabarIslandText2: ; a622a (29:622a)
+_CinnabarIslandText2:: ; a622a (29:622a)
 	text "Scientists conduct"
 	line "experiments in"
 	cont "the burned out"
@@ -17,17 +17,17 @@
 	cont "building."
 	done
 
-_CinnabarIslandText3: ; a6266 (29:6266)
+_CinnabarIslandText3:: ; a6266 (29:6266)
 	text "CINNABAR ISLAND"
 	line "The Fiery Town of"
 	cont "Burning Desire"
 	done
 
-_CinnabarIslandText6: ; a6298 (29:6298)
+_CinnabarIslandText6:: ; a6298 (29:6298)
 	text "#MON LAB"
 	done
 
-_CinnabarIslandText7: ; a62a2 (29:62a2)
+_CinnabarIslandText7:: ; a62a2 (29:62a2)
 	text "CINNABAR ISLAND"
 	line "#MON GYM"
 	cont "LEADER: BLAINE"
--- a/text/maps/cinnabar_lab.asm
+++ b/text/maps/cinnabar_lab.asm
@@ -1,4 +1,4 @@
-_Lab1Text1: ; a0df7 (28:4df7)
+_Lab1Text1:: ; a0df7 (28:4df7)
 	text "We study #MON"
 	line "extensively here."
 
@@ -7,23 +7,23 @@
 	cont "for examination."
 	done
 
-_Lab1Text2: ; a0e49 (28:4e49)
+_Lab1Text2:: ; a0e49 (28:4e49)
 	text "A photo of the"
 	line "LAB's founder,"
 	cont "DR.FUJI!"
 	done
 
-_Lab1Text3: ; a0e70 (28:4e70)
+_Lab1Text3:: ; a0e70 (28:4e70)
 	text "#MON LAB"
 	line "Meeting Room"
 	done
 
-_Lab1Text4: ; a0e87 (28:4e87)
+_Lab1Text4:: ; a0e87 (28:4e87)
 	text "#MON LAB"
 	line "R-and-D Room"
 	done
 
-_Lab1Text5: ; a0e9e (28:4e9e)
+_Lab1Text5:: ; a0e9e (28:4e9e)
 	text "#MON LAB"
 	line "Testing Room"
 	done
--- a/text/maps/cinnabar_lab_fossil_room.asm
+++ b/text/maps/cinnabar_lab_fossil_room.asm
@@ -1,4 +1,4 @@
-_UnnamedText_75dc6: ; a10e8 (28:50e8)
+_UnnamedText_75dc6:: ; a10e8 (28:50e8)
 	text "Hiya!"
 
 	para "I am important"
@@ -11,11 +11,11 @@
 	line "fossil for me?"
 	prompt
 
-_UnnamedText_75dcb: ; a1145 (28:5145)
+_UnnamedText_75dcb:: ; a1145 (28:5145)
 	text "No! Is too bad!"
 	done
 
-_UnnamedText_75dd0: ; a1156 (28:5156)
+_UnnamedText_75dd0:: ; a1156 (28:5156)
 	text "I take a little"
 	line "time!"
 
@@ -23,7 +23,7 @@
 	line "little while!"
 	done
 
-_UnnamedText_75dd5: ; a118d (28:518d)
+_UnnamedText_75dd5:: ; a118d (28:518d)
 	text "Where were you?"
 
 	para "Your fossil is"
@@ -35,7 +35,7 @@
 	line "like I think!"
 	prompt
 
-_UnnamedText_610ae: ; a11d6 (28:51d6)
+_UnnamedText_610ae:: ; a11d6 (28:51d6)
 	text "Oh! That is"
 	line "@"
 	TX_RAM $cd6d
@@ -54,7 +54,7 @@
 	cont "again!"
 	done
 
-_UnnamedText_610b3: ; a1259 (28:5259)
+_UnnamedText_610b3:: ; a1259 (28:5259)
 	text "So! You hurry and"
 	line "give me that!"
 
@@ -64,7 +64,7 @@
 	text "!"
 	prompt
 
-_UnnamedText_610b8: ; a128f (28:528f)
+_UnnamedText_610b8:: ; a128f (28:528f)
 	text "I take a little"
 	line "time!"
 
@@ -72,7 +72,7 @@
 	line "little while!"
 	done
 
-_UnnamedText_610bd: ; a12c6 (28:52c6)
+_UnnamedText_610bd:: ; a12c6 (28:52c6)
 	text "Aiyah! You come"
 	line "again!"
 	done
--- a/text/maps/cinnabar_lab_metronome_room.asm
+++ b/text/maps/cinnabar_lab_metronome_room.asm
@@ -1,4 +1,4 @@
-_TM35PreReceiveText: ; a0f09 (28:4f09)
+_TM35PreReceiveText:: ; a0f09 (28:4f09)
 	text "Tch-tch-tch!"
 	line "I made a cool TM!"
 
@@ -6,13 +6,13 @@
 	line "kinds of fun!"
 	prompt
 
-_ReceivedTM35Text: ; a0f48 (28:4f48)
+_ReceivedTM35Text:: ; a0f48 (28:4f48)
 	text $52, " received "
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_TM35ExplanationText: ; a0f5d (28:4f5d)
+_TM35ExplanationText:: ; a0f5d (28:4f5d)
 	text "Tch-tch-tch!"
 	line "That's the sound"
 	cont "of a METRONOME!"
@@ -23,18 +23,18 @@
 	cont "it doesn't know!"
 	done
 
-_TM35NoRoomText: ; a0fc7 (28:4fc7)
+_TM35NoRoomText:: ; a0fc7 (28:4fc7)
 	text "Your pack is"
 	line "crammed full!"
 	done
 
-_Lab3Text2: ; a0fe3 (28:4fe3)
+_Lab3Text2:: ; a0fe3 (28:4fe3)
 	text "EEVEE can evolve"
 	line "into 1 of 3 kinds"
 	cont "of #MON."
 	done
 
-_Lab3Text3: ; a1010 (28:5010)
+_Lab3Text3:: ; a1010 (28:5010)
 	text "There's an e-mail"
 	line "message!"
 
@@ -58,7 +58,7 @@
 	para "..."
 	done
 
-_Lab3Text5: ; a10d8 (28:50d8)
+_Lab3Text5:: ; a10d8 (28:50d8)
 	text "An amber pipe!"
 	done
 
--- a/text/maps/cinnabar_lab_trade_room.asm
+++ b/text/maps/cinnabar_lab_trade_room.asm
@@ -1,4 +1,4 @@
-_Lab2Text1: ; a0eb5 (28:4eb5)
+_Lab2Text1:: ; a0eb5 (28:4eb5)
 	text "I found this very"
 	line "strange fossil in"
 	cont "MT.MOON!"
--- a/text/maps/cinnabar_mart.asm
+++ b/text/maps/cinnabar_mart.asm
@@ -1,10 +1,10 @@
-_CinnabarMartText2: ; a139b (28:539b)
+_CinnabarMartText2:: ; a139b (28:539b)
 	text "Don't they have X"
 	line "ATTACK? It's good"
 	cont "for battles!"
 	done
 
-_CinnabarMartText3: ; a13cb (28:53cb)
+_CinnabarMartText3:: ; a13cb (28:53cb)
 	text "It never hurts to"
 	line "have extra items!"
 	done
--- a/text/maps/cinnabar_pokecenter.asm
+++ b/text/maps/cinnabar_pokecenter.asm
@@ -1,5 +1,5 @@
-_CinnabarPokecenterText2: ; a12de (28:52de)
-_CinnabarPokecenterText1: ; a12de (28:52de)
+_CinnabarPokecenterText2:: ; a12de (28:52de)
+_CinnabarPokecenterText1:: ; a12de (28:52de)
 	text "You can cancel"
 	line "evolution."
 
@@ -9,7 +9,7 @@
 	cont "it the way it is."
 	done
 
-_CinnabarPokecenterText3: ; a133e (28:533e)
+_CinnabarPokecenterText3:: ; a133e (28:533e)
 	text "Do you have any"
 	line "friends?"
 
--- a/text/maps/copycats_house_1f.asm
+++ b/text/maps/copycats_house_1f.asm
@@ -1,4 +1,4 @@
-_CopycatsHouseF1Text1: ; a14f7 (28:54f7)
+_CopycatsHouseF1Text1:: ; a14f7 (28:54f7)
 	text "My daughter is so"
 	line "self-centered."
 	cont "She only has a"
@@ -5,7 +5,7 @@
 	cont "few friends."
 	done
 
-_CopycatsHouseF1Text2: ; a1535 (28:5535)
+_CopycatsHouseF1Text2:: ; a1535 (28:5535)
 	text "My daughter likes"
 	line "to mimic people."
 
@@ -15,7 +15,7 @@
 	cont "around here!"
 	done
 
-_CopycatsHouseF1Text3: ; a1596 (28:5596)
+_CopycatsHouseF1Text3:: ; a1596 (28:5596)
 	text "CHANSEY: Chaan!"
 	line "Sii!@@"
 
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/copycats_house_2f.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5ccd4: ; a15ad (28:55ad)
+_UnnamedText_5ccd4:: ; a15ad (28:55ad)
 	text $52, ": Hi! Do"
 	line "you like #MON?"
 
@@ -15,7 +15,7 @@
 	line "favorite hobby!"
 	prompt
 
-_TM31PreReceiveText: ; a1636 (28:5636)
+_TM31PreReceiveText:: ; a1636 (28:5636)
 	text "Oh wow!"
 	line "A # DOLL!"
 
@@ -26,13 +26,13 @@
 	line "this, then!"
 	prompt
 
-_ReceivedTM31Text: ; a1675 (28:5675)
+_ReceivedTM31Text:: ; a1675 (28:5675)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_TM31ExplanationText1: ; a1689 (28:5689)
+_TM31ExplanationText1:: ; a1689 (28:5689)
 	db $0
 	para "TM31 contains my"
 	line "favorite, MIMIC!"
@@ -40,7 +40,7 @@
 	para "Use it on a good"
 	line "#MON!@@"
 
-_TM31ExplanationText2: ; a16c5 (28:56c5)
+_TM31ExplanationText2:: ; a16c5 (28:56c5)
 	text $52, ": Hi!"
 	line "Thanks for TM31!"
 
@@ -54,11 +54,11 @@
 	line "It's a scream!"
 	done
 
-_TM31NoRoomText: ; a1733 (28:5733)
+_TM31NoRoomText:: ; a1733 (28:5733)
 	text "Don't you want"
 	line "this?@@"
 
-_CopycatsHouseF2Text2: ; a1749 (28:5749)
+_CopycatsHouseF2Text2:: ; a1749 (28:5749)
 	text "DODUO: Giiih!"
 
 	para "MIRROR MIRROR ON"
@@ -67,19 +67,19 @@
 	cont "OF ALL?"
 	done
 
-_CopycatsHouseF2Text3: ; a1792 (28:5792)
+_CopycatsHouseF2Text3:: ; a1792 (28:5792)
 	text "This is a rare"
 	line "#MON! Huh?"
 	cont "It's only a doll!"
 	done
 
-_CopycatsHouseF2Text6: ; a17be (28:57be)
+_CopycatsHouseF2Text6:: ; a17be (28:57be)
 	text "A game with MARIO"
 	line "wearing a bucket"
 	cont "on his head!"
 	done
 
-_UnnamedText_5cd17: ; a17ef (28:57ef)
+_UnnamedText_5cd17:: ; a17ef (28:57ef)
 	text "..."
 
 	para "My Secrets!"
@@ -91,7 +91,7 @@
 	cont "CLEFAIRY!"
 	done
 
-_UnnamedText_5cd1c: ; a1842 (28:5842)
+_UnnamedText_5cd1c:: ; a1842 (28:5842)
 	text "Huh? Can't see!"
 	done
 
--- a/text/maps/daycare_1.asm
+++ b/text/maps/daycare_1.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5640f: ; 8ab95 (22:6b95)
+_UnnamedText_5640f:: ; 8ab95 (22:6b95)
 	text "I run a DAYCARE."
 	line "Would you like me"
 	cont "to raise one of"
@@ -5,12 +5,12 @@
 	cont "your #MON?"
 	done
 
-_UnnamedText_56414: ; 8abd4 (22:6bd4)
+_UnnamedText_56414:: ; 8abd4 (22:6bd4)
 	text "Which #MON"
 	line "should I raise?"
 	prompt
 
-_UnnamedText_56419: ; 8abf0 (22:6bf0)
+_UnnamedText_56419:: ; 8abf0 (22:6bf0)
 	text "Fine, I'll look"
 	line "after @"
 	TX_RAM $cd6d
@@ -18,12 +18,12 @@
 	cont "for a while."
 	prompt
 
-_UnnamedText_5641e: ; 8ac19 (22:6c19)
+_UnnamedText_5641e:: ; 8ac19 (22:6c19)
 	text "Come see me in"
 	line "a while."
 	done
 
-_UnnamedText_56423: ; 8ac32 (22:6c32)
+_UnnamedText_56423:: ; 8ac32 (22:6c32)
 	text "Your @"
 	TX_RAM $cd6d
 	db $0
@@ -32,7 +32,7 @@
 	para "By level, it's"
 	line "grown by @"
 
-UnnamedText_8ac67: ; 8ac67 (22:6c67)
+UnnamedText_8ac67:: ; 8ac67 (22:6c67)
 	TX_NUM $cd3e,$1,$3
 	text "!"
 
@@ -39,7 +39,7 @@
 	para "Aren't I great?"
 	prompt
 
-_UnnamedText_56428: ; 8ac7d (22:6c7d)
+_UnnamedText_56428:: ; 8ac7d (22:6c7d)
 	text "You owe me ¥@"
 	db $2, $3f, $cd, $c2
 	db $0
@@ -47,7 +47,7 @@
 	cont "of this #MON."
 	done
 
-_UnnamedText_5642d: ; 8acae (22:6cae)
+_UnnamedText_5642d:: ; 8acae (22:6cae)
 	text $52, " got"
 	line "@"
 	TX_RAM W_DAYCAREMONNAME
@@ -54,7 +54,7 @@
 	text " back!"
 	done
 
-_UnnamedText_56432: ; 8acc1 (22:6cc1)
+_UnnamedText_56432:: ; 8acc1 (22:6cc1)
 	text "Back already?"
 	line "Your @"
 	TX_RAM $cd6d
--- a/text/maps/daycare_2.asm
+++ b/text/maps/daycare_2.asm
@@ -1,33 +1,33 @@
-_UnnamedText_56437: ; 8c000 (23:4000)
+_UnnamedText_56437:: ; 8c000 (23:4000)
 	text "All right then,"
 	line "@@"
 
-_UnnamedText_5643b: ; 8c013 (23:4013)
+_UnnamedText_5643b:: ; 8c013 (23:4013)
 	text "come again."
 	done
 
-_UnnamedText_56440: ; 8c020 (23:4020)
+_UnnamedText_56440:: ; 8c020 (23:4020)
 	text "You have no room"
 	line "for this #MON!"
 	done
 
-_UnnamedText_56445: ; 8c041 (23:4041)
+_UnnamedText_56445:: ; 8c041 (23:4041)
 	text "You only have one"
 	line "#MON with you."
 	done
 
-_UnnamedText_5644a: ; 8c063 (23:4063)
+_UnnamedText_5644a:: ; 8c063 (23:4063)
 	text "I can't accept a"
 	line "#MON that"
 	cont "knows an HM move."
 	done
 
-_UnnamedText_5644f: ; 8c090 (23:4090)
+_UnnamedText_5644f:: ; 8c090 (23:4090)
 	text "Thank you! Here's"
 	line "your #MON!"
 	prompt
 
-_UnnamedText_56454: ; 8c0ad (23:40ad)
+_UnnamedText_56454:: ; 8c0ad (23:40ad)
 	text "Hey, you don't"
 	line "have enough ¥!"
 	done
--- a/text/maps/digletts_cave_route_11_entrance.asm
+++ b/text/maps/digletts_cave_route_11_entrance.asm
@@ -1,4 +1,4 @@
-_DiglettsCaveEntRoute11Text1: ; 8c7f9 (23:47f9)
+_DiglettsCaveEntRoute11Text1:: ; 8c7f9 (23:47f9)
 	text "What a surprise!"
 	line "DIGLETTs dug this"
 	cont "long tunnel!"
--- a/text/maps/digletts_cave_route_2_entrance.asm
+++ b/text/maps/digletts_cave_route_2_entrance.asm
@@ -1,4 +1,4 @@
-_DiglettsCaveRoute2Text1: ; 8a6a7 (22:66a7)
+_DiglettsCaveRoute2Text1:: ; 8a6a7 (22:66a7)
 	text "I went to ROCK"
 	line "TUNNEL, but it's"
 	cont "dark and scary."
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -1,16 +1,16 @@
-_UnnamedText_59bb7: ; 9a572 (26:6572)
+_UnnamedText_59bb7:: ; 9a572 (26:6572)
 	text "Won't you admire"
 	line "my PIKACHU's"
 	cont "adorable tail?"
 	done
 
-_UnnamedText_59bbc: ; 9a59e (26:659e)
+_UnnamedText_59bbc:: ; 9a59e (26:659e)
 	text "Humph! My PIKACHU"
 	line "is twice as cute"
 	cont "as that one!"
 	done
 
-_UnnamedText_59be4: ; 9a5cf (26:65cf)
+_UnnamedText_59be4:: ; 9a5cf (26:65cf)
 	text "I just love my"
 	line "SEEL!"
 
@@ -18,7 +18,7 @@
 	line "hug it!"
 	done
 
-_UnnamedText_59be9: ; 9a5ff (26:65ff)
+_UnnamedText_59be9:: ; 9a5ff (26:65ff)
 	text "Oh dear!"
 
 	para "My SEEL is far"
@@ -25,16 +25,16 @@
 	line "more attractive!"
 	done
 
-_UnnamedText_59c00: ; 9a629 (26:6629)
+_UnnamedText_59c00:: ; 9a629 (26:6629)
 	text "PIKACHU: Chu!"
 	line "Pikachu!"
 	done
 
-_UnnamedText_59c17: ; 9a641 (26:6641)
+_UnnamedText_59c17:: ; 9a641 (26:6641)
 	text "SEEL: Kyuoo!"
 	done
 
-_UnnamedText_59c65: ; 9a64f (26:664f)
+_UnnamedText_59c65:: ; 9a64f (26:664f)
 	text "I chair the"
 	line "#MON Fan Club!"
 
@@ -52,7 +52,7 @@
 	cont "about my #MON?"
 	done
 
-_UnnamedText_59c6a: ; 9a6e0 (26:66e0)
+_UnnamedText_59c6a:: ; 9a6e0 (26:66e0)
 	text "Good!"
 	line "Then listen up!"
 
@@ -82,13 +82,13 @@
 	cont "you to have this!"
 	prompt
 
-_ReceivedBikeVoucherText: ; 9a82e (26:682e)
+_ReceivedBikeVoucherText:: ; 9a82e (26:682e)
 	text $52, " received"
 	line "a @"
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_59c74: ; 9a844 (26:6844)
+_UnnamedText_59c74:: ; 9a844 (26:6844)
 	db $0
 	para "Exchange that for"
 	line "a BICYCLE!"
@@ -104,13 +104,13 @@
 	line "cycling!"
 	done
 
-_UnnamedText_59c79: ; 9a8c3 (26:68c3)
+_UnnamedText_59c79:: ; 9a8c3 (26:68c3)
 	text "Oh. Come back"
 	line "when you want to"
 	cont "hear my story!"
 	done
 
-_UnnamedText_59c7e: ; 9a8f2 (26:68f2)
+_UnnamedText_59c7e:: ; 9a8f2 (26:68f2)
 	text "Hello, ", $52, "!"
 
 	para "Did you come see"
@@ -120,24 +120,24 @@
 	para "No? Too bad!"
 	done
 
-_UnnamedText_59c83: ; 9a933 (26:6933)
+_UnnamedText_59c83:: ; 9a933 (26:6933)
 	text "Make room for"
 	line "this!"
 	done
 
-_FanClubText6: ; 9a948 (26:6948)
+_FanClubText6:: ; 9a948 (26:6948)
 	text "Our Chairman is"
 	line "very vocal about"
 	cont "#MON."
 	done
 
-_FanClubText7: ; 9a970 (26:6970)
+_FanClubText7:: ; 9a970 (26:6970)
 	text "Let's all listen"
 	line "politely to other"
 	cont "trainers!"
 	done
 
-_FanClubText8: ; 9a99d (26:699d)
+_FanClubText8:: ; 9a99d (26:699d)
 	text "If someone brags,"
 	line "brag right back!"
 	done
--- a/text/maps/fighting_dojo.asm
+++ b/text/maps/fighting_dojo.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5ce8e: ; a1852 (28:5852)
+_UnnamedText_5ce8e:: ; a1852 (28:5852)
 	text "Grunt!"
 
 	para "I am the KARATE"
@@ -12,12 +12,12 @@
 	para "Fwaaa!"
 	done
 
-_UnnamedText_5ce93: ; a18ba (28:58ba)
+_UnnamedText_5ce93:: ; a18ba (28:58ba)
 	text "Hwa!"
 	line "Arrgh! Beaten!"
 	prompt
 
-_UnnamedText_5ce98: ; a18cf (28:58cf)
+_UnnamedText_5ce98:: ; a18cf (28:58cf)
 	text "Indeed, I have"
 	line "lost!"
 
@@ -34,7 +34,7 @@
 	line "one you like!"
 	done
 
-_UnnamedText_5ce9d: ; a1972 (28:5972)
+_UnnamedText_5ce9d:: ; a1972 (28:5972)
 	text "Ho!"
 
 	para "Stay and train at"
@@ -41,17 +41,17 @@
 	line "Karate with us!"
 	done
 
-_FightingDojoBattleText1: ; a1999 (28:5999)
+_FightingDojoBattleText1:: ; a1999 (28:5999)
 	text "Hoargh! Take your"
 	line "shoes off!"
 	done
 
-_FightingDojoEndBattleText1: ; a19b7 (28:59b7)
+_FightingDojoEndBattleText1:: ; a19b7 (28:59b7)
 	text "I give"
 	line "up!"
 	prompt
 
-_FightingDojoAfterBattleText1: ; a19c3 (28:59c3)
+_FightingDojoAfterBattleText1:: ; a19c3 (28:59c3)
 	text "You wait 'til you"
 	line "see our Master!"
 
@@ -59,22 +59,22 @@
 	line "compared to him!"
 	done
 
-_FightingDojoBattleText2: ; a1a05 (28:5a05)
+_FightingDojoBattleText2:: ; a1a05 (28:5a05)
 	text "I hear you're"
 	line "good! Show me!"
 	done
 
-_FightingDojoEndBattleText2: ; a1a22 (28:5a22)
+_FightingDojoEndBattleText2:: ; a1a22 (28:5a22)
 	text "Judge!"
 	line "1 point!"
 	prompt
 
-_FightingDojoAfterBattleText2: ; a1a33 (28:5a33)
+_FightingDojoAfterBattleText2:: ; a1a33 (28:5a33)
 	text "Our Master is a"
 	line "pro fighter!"
 	done
 
-_FightingDojoBattleText3: ; a1a51 (28:5a51)
+_FightingDojoBattleText3:: ; a1a51 (28:5a51)
 	text "Nothing tough"
 	line "frightens me!"
 
@@ -82,18 +82,18 @@
 	line "for training!"
 	done
 
-_FightingDojoEndBattleText3: ; a1a8d (28:5a8d)
+_FightingDojoEndBattleText3:: ; a1a8d (28:5a8d)
 	text "Yow!"
 	line "Stubbed fingers!"
 	prompt
 
-_FightingDojoAfterBattleText3: ; a1aa4 (28:5aa4)
+_FightingDojoAfterBattleText3:: ; a1aa4 (28:5aa4)
 	text "The only thing"
 	line "that frightens us"
 	cont "is psychic power!"
 	done
 
-_FightingDojoBattleText4: ; a1ad8 (28:5ad8)
+_FightingDojoBattleText4:: ; a1ad8 (28:5ad8)
 	text "Hoohah!"
 
 	para "You're trespassing"
@@ -101,30 +101,30 @@
 	cont "DOJO!"
 	done
 
-_FightingDojoEndBattleText4: ; a1b09 (28:5b09)
+_FightingDojoEndBattleText4:: ; a1b09 (28:5b09)
 	text "Oof!"
 	line "I give up!"
 	prompt
 
-_FightingDojoAfterBattleText4: ; a1b1a (28:5b1a)
+_FightingDojoAfterBattleText4:: ; a1b1a (28:5b1a)
 	text "The prime fighters"
 	line "across the land"
 	cont "train here."
 	done
 
-_WantHitmonleeText: ; a1b4a (28:5b4a)
+_WantHitmonleeText:: ; a1b4a (28:5b4a)
 	text "You want the"
 	line "hard kicking"
 	cont "HITMONLEE?"
 	done
 
-_WantHitmonchanText: ; a1b70 (28:5b70)
+_WantHitmonchanText:: ; a1b70 (28:5b70)
 	text "You want the"
 	line "piston punching"
 	cont "HITMONCHAN?"
 	done
 
-_OtherHitmonText: ; a1b9a (28:5b9a)
+_OtherHitmonText:: ; a1b9a (28:5b9a)
 	text "Better not get"
 	line "greedy..."
 	done
--- a/text/maps/fuchsia_city.asm
+++ b/text/maps/fuchsia_city.asm
@@ -1,4 +1,4 @@
-_FuchsiaCityText1: ; a5e9c (29:5e9c)
+_FuchsiaCityText1:: ; a5e9c (29:5e9c)
 	text "Did you try the"
 	line "SAFARI GAME? Some"
 	cont "#MON can only"
@@ -5,7 +5,7 @@
 	cont "be caught there."
 	done
 
-_FuchsiaCityText2: ; a5ede (29:5ede)
+_FuchsiaCityText2:: ; a5ede (29:5ede)
 	text "SAFARI ZONE has a"
 	line "zoo in front of"
 	cont "the entrance."
@@ -15,44 +15,44 @@
 	cont "catching #MON."
 	done
 
-_FuchsiaCityText3: ; a5f3e (29:5f3e)
+_FuchsiaCityText3:: ; a5f3e (29:5f3e)
 	text "ERIK: Where's"
 	line "SARA? I said I'd"
 	cont "meet her here."
 	done
 
-_FuchsiaCityText4: ; a5f6b (29:5f6b)
+_FuchsiaCityText4:: ; a5f6b (29:5f6b)
 	text "That item ball in"
 	line "there is really a"
 	cont "#MON."
 	done
 
-_FuchsiaCityText5: ; a5f96 (29:5f96)
+_FuchsiaCityText5:: ; a5f96 (29:5f96)
 	text "!"
 	done
 
-_FuchsiaCityText11: ; a5f99 (29:5f99)
+_FuchsiaCityText11:: ; a5f99 (29:5f99)
 	text "FUCHSIA CITY"
 	line "Behold! It's"
 	cont "Passion Pink!"
 	done
 
-_FuchsiaCityText13: ; a5fc1 (29:5fc1)
+_FuchsiaCityText13:: ; a5fc1 (29:5fc1)
 	text "SAFARI GAME"
 	line "#MON-U-CATCH!"
 	done
 
-_FuchsiaCityText16: ; a5fdc (29:5fdc)
+_FuchsiaCityText16:: ; a5fdc (29:5fdc)
 	text "SAFARI ZONE"
 	line "WARDEN's HOME"
 	done
 
-_FuchsiaCityText17: ; a5ff6 (29:5ff6)
+_FuchsiaCityText17:: ; a5ff6 (29:5ff6)
 	text "#MON PARADISE"
 	line "SAFARI ZONE"
 	done
 
-_FuchsiaCityText18: ; a6011 (29:6011)
+_FuchsiaCityText18:: ; a6011 (29:6011)
 	text "FUCHSIA CITY"
 	line "#MON GYM"
 	cont "LEADER: KOGA"
@@ -61,7 +61,7 @@
 	line "Ninja Master"
 	done
 
-_FuchsiaCityChanseyText: ; a6050 (29:6050)
+_FuchsiaCityChanseyText:: ; a6050 (29:6050)
 	text "Name: CHANSEY"
 
 	para "Catching one is"
@@ -68,7 +68,7 @@
 	line "all up to chance."
 	prompt
 
-_FuchsiaCityVoltorbText: ; a6081 (29:6081)
+_FuchsiaCityVoltorbText:: ; a6081 (29:6081)
 	text "Name: VOLTORB"
 
 	para "The very image of"
@@ -75,7 +75,7 @@
 	line "a # BALL."
 	prompt
 
-_FuchsiaCityKangaskhanText: ; a60ac (29:60ac)
+_FuchsiaCityKangaskhanText:: ; a60ac (29:60ac)
 	text "Name: KANGASKHAN"
 
 	para "A maternal #MON"
@@ -84,7 +84,7 @@
 	cont "on its belly."
 	prompt
 
-_FuchsiaCitySlowpokeText: ; a60fd (29:60fd)
+_FuchsiaCitySlowpokeText:: ; a60fd (29:60fd)
 	text "Name: SLOWPOKE"
 
 	para "Friendly and very"
@@ -91,7 +91,7 @@
 	line "slow moving."
 	prompt
 
-_FuchsiaCityLaprasText: ; a612c (29:612c)
+_FuchsiaCityLaprasText:: ; a612c (29:612c)
 	text "Name: LAPRAS"
 
 	para "A.K.A. the king"
@@ -98,7 +98,7 @@
 	line "of the seas."
 	prompt
 
-_FuchsiaCityOmanyteText: ; a6157 (29:6157)
+_FuchsiaCityOmanyteText:: ; a6157 (29:6157)
 	text "Name: OMANYTE"
 
 	para "A #MON that"
@@ -106,7 +106,7 @@
 	cont "from a fossil."
 	prompt
 
-_FuchsiaCityKabutoText: ; a6191 (29:6191)
+_FuchsiaCityKabutoText:: ; a6191 (29:6191)
 	text "Name: KABUTO"
 
 	para "A #MON that"
@@ -114,7 +114,7 @@
 	cont "from a fossil."
 	prompt
 
-_UnnamedText_19b2a: ; a61ca (29:61ca)
+_UnnamedText_19b2a:: ; a61ca (29:61ca)
 	text "..."
 	done
 
--- a/text/maps/fuchsia_fishing_house.asm
+++ b/text/maps/fuchsia_fishing_house.asm
@@ -1,4 +1,4 @@
-_UnnamedText_561bd: ; a0695 (28:4695)
+_UnnamedText_561bd:: ; a0695 (28:4695)
 	text "I'm the FISHING"
 	line "GURU's older"
 	cont "brother!"
@@ -10,7 +10,7 @@
 	line "fish?"
 	done
 
-_UnnamedText_561c2: ; a06e8 (28:46e8)
+_UnnamedText_561c2:: ; a06e8 (28:46e8)
 	text "Grand! I like"
 	line "your style!"
 
@@ -22,12 +22,12 @@
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_56212: ; a0737 (28:4737)
+_UnnamedText_56212:: ; a0737 (28:4737)
 	text "Oh... That's so"
 	line "disappointing..."
 	done
 
-_UnnamedText_56217: ; a0758 (28:4758)
+_UnnamedText_56217:: ; a0758 (28:4758)
 	text "Hello there,"
 	line $52, "!"
 
@@ -35,7 +35,7 @@
 	line "biting?"
 	done
 
-_UnnamedText_5621c: ; a0782 (28:4782)
+_UnnamedText_5621c:: ; a0782 (28:4782)
 	text "Oh no!"
 
 	para "You have no room"
--- a/text/maps/fuchsia_gym_1.asm
+++ b/text/maps/fuchsia_gym_1.asm
@@ -1,4 +1,4 @@
-_UnnamedText_75581: ; 9e9b1 (27:69b1)
+_UnnamedText_75581:: ; 9e9b1 (27:69b1)
 	text "KOGA: Fwahahaha!"
 
 	para "A mere child like"
@@ -16,7 +16,7 @@
 	cont "techniques!"
 	done
 
-_UnnamedText_75586: ; 9ea66 (27:6a66)
+_UnnamedText_75586:: ; 9ea66 (27:6a66)
 	text "Humph!"
 	line "You have proven"
 	cont "your worth!"
--- a/text/maps/fuchsia_gym_2.asm
+++ b/text/maps/fuchsia_gym_2.asm
@@ -1,4 +1,4 @@
-_UnnamedText_7558b: ; a0000 (28:4000)
+_UnnamedText_7558b:: ; a0000 (28:4000)
 	text "When afflicted by"
 	line "TOXIC, #MON"
 	cont "suffer more and"
@@ -9,7 +9,7 @@
 	line "terrorize foes!"
 	done
 
-_UnnamedText_75590: ; a0069 (28:4069)
+_UnnamedText_75590:: ; a0069 (28:4069)
 	text "Now that you have"
 	line "the SOULBADGE,"
 	cont "the DEFENSE of"
@@ -24,13 +24,13 @@
 	line "too!"
 	done
 
-_ReceivedTM06Text: ; a00eb (28:40eb)
+_ReceivedTM06Text:: ; a00eb (28:40eb)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_TM06ExplanationText: ; a00ff (28:40ff)
+_TM06ExplanationText:: ; a00ff (28:40ff)
 	db $0
 	para "TM06 contains"
 	line "TOXIC!"
@@ -40,12 +40,12 @@
 	cont "400 years old!"
 	done
 
-_TM06NoRoomText: ; a0143 (28:4143)
+_TM06NoRoomText:: ; a0143 (28:4143)
 	text "Make space for"
 	line "this, child!"
 	done
 
-_FuchsiaGymBattleText1: ; a0160 (28:4160)
+_FuchsiaGymBattleText1:: ; a0160 (28:4160)
 	text "Strength isn't"
 	line "the key for"
 	cont "#MON!"
@@ -57,29 +57,29 @@
 	cont "brute strength!"
 	done
 
-_FuchsiaGymEndBattleText1: ; a01c2 (28:41c2)
+_FuchsiaGymEndBattleText1:: ; a01c2 (28:41c2)
 	text "What?"
 	line "Extraordinary!"
 	prompt
 
-_FuchsiaGymAfterBattleText1: ; a01d8 (28:41d8)
+_FuchsiaGymAfterBattleText1:: ; a01d8 (28:41d8)
 	text "So, you mix brawn"
 	line "with brains?"
 	cont "Good strategy!"
 	done
 
-_FuchsiaGymBattleText2: ; a0207 (28:4207)
+_FuchsiaGymBattleText2:: ; a0207 (28:4207)
 	text "I wanted to become"
 	line "a ninja, so I"
 	cont "joined this GYM!"
 	done
 
-_FuchsiaGymEndBattleText2: ; a023a (28:423a)
+_FuchsiaGymEndBattleText2:: ; a023a (28:423a)
 	text "I'm done"
 	line "for!"
 	prompt
 
-_FuchsiaGymAfterBattleText2: ; a0248 (28:4248)
+_FuchsiaGymAfterBattleText2:: ; a0248 (28:4248)
 	text "I will keep on"
 	line "training under"
 	cont "KOGA, my ninja"
@@ -86,18 +86,18 @@
 	cont "master!"
 	done
 
-_FuchsiaGymBattleText3: ; a027e (28:427e)
+_FuchsiaGymBattleText3:: ; a027e (28:427e)
 	text "Let's see you"
 	line "beat my special"
 	cont "techniques!"
 	done
 
-_FuchsiaGymEndBattleText3: ; a02a8 (28:42a8)
+_FuchsiaGymEndBattleText3:: ; a02a8 (28:42a8)
 	text "You"
 	line "had me fooled!"
 	prompt
 
-_FuchsiaGymAfterBattleText3: ; a02bc (28:42bc)
+_FuchsiaGymAfterBattleText3:: ; a02bc (28:42bc)
 	text "I like poison and"
 	line "sleep techniques,"
 	cont "as they linger"
@@ -104,7 +104,7 @@
 	cont "after battle!"
 	done
 
-_FuchsiaGymBattleText4: ; a02fe (28:42fe)
+_FuchsiaGymBattleText4:: ; a02fe (28:42fe)
 	text "Stop right there!"
 
 	para "Our invisible"
@@ -112,12 +112,12 @@
 	cont "frustrated?"
 	done
 
-_FuchsiaGymEndBattleText4: ; a033a (28:433a)
+_FuchsiaGymEndBattleText4:: ; a033a (28:433a)
 	text "Whoa!"
 	line "He's got it!"
 	prompt
 
-_FuchsiaGymAfterBattleText4: ; a034d (28:434d)
+_FuchsiaGymAfterBattleText4:: ; a034d (28:434d)
 	text "You impressed me!"
 	line "Here's a hint!"
 
@@ -126,7 +126,7 @@
 	cont "invisible walls!"
 	done
 
-_FuchsiaGymBattleText5: ; a03a1 (28:43a1)
+_FuchsiaGymBattleText5:: ; a03a1 (28:43a1)
 	text "I also study the"
 	line "way of the ninja"
 	cont "with master KOGA!"
@@ -136,16 +136,16 @@
 	cont "animals!"
 	done
 
-_FuchsiaGymEndBattleText5: ; a0402 (28:4402)
+_FuchsiaGymEndBattleText5:: ; a0402 (28:4402)
 	text "Awoo!"
 	prompt
 
-_FuchsiaGymAfterBattleText5: ; a0409 (28:4409)
+_FuchsiaGymAfterBattleText5:: ; a0409 (28:4409)
 	text "I still have much"
 	line "to learn!"
 	done
 
-_FuchsiaGymBattleText6: ; a0426 (28:4426)
+_FuchsiaGymBattleText6:: ; a0426 (28:4426)
 	text "Master KOGA comes"
 	line "from a long line"
 	cont "of ninjas!"
@@ -154,12 +154,12 @@
 	line "descend from?"
 	done
 
-_FuchsiaGymEndBattleText6: ; a0470 (28:4470)
+_FuchsiaGymEndBattleText6:: ; a0470 (28:4470)
 	text "Dropped"
 	line "my balls!"
 	prompt
 
-_FuchsiaGymAfterBattleText6: ; a0483 (28:4483)
+_FuchsiaGymAfterBattleText6:: ; a0483 (28:4483)
 	text "Where there is"
 	line "light, there is"
 	cont "shadow!"
@@ -169,7 +169,7 @@
 	cont "choose?"
 	done
 
-_UnnamedText_7564e: ; a04d2 (28:44d2)
+_UnnamedText_7564e:: ; a04d2 (28:44d2)
 	text "Yo! Champ in"
 	line "making!"
 
@@ -186,7 +186,7 @@
 	cont "to reach him!"
 	done
 
-_UnnamedText_75653: ; a0574 (28:4574)
+_UnnamedText_75653:: ; a0574 (28:4574)
 	text "It's amazing how"
 	line "ninja can terrify"
 	cont "even now!"
--- a/text/maps/fuchsia_house.asm
+++ b/text/maps/fuchsia_house.asm
@@ -1,4 +1,4 @@
-_FuchsiaHouse1Text1: ; 9e2a3 (27:62a3)
+_FuchsiaHouse1Text1:: ; 9e2a3 (27:62a3)
 	text "SAFARI ZONE's"
 	line "WARDEN is old,"
 	cont "but still active!"
@@ -7,7 +7,7 @@
 	line "false, though."
 	done
 
-_FuchsiaHouse1Text2: ; 9e2f3 (27:62f3)
+_FuchsiaHouse1Text2:: ; 9e2f3 (27:62f3)
 	text "Hmm? You've met"
 	line "BILL?"
 
@@ -18,7 +18,7 @@
 	cont "even as a child!"
 	done
 
-_FuchsiaHouse1Text3: ; 9e34d (27:634d)
+_FuchsiaHouse1Text3:: ; 9e34d (27:634d)
 	text "BILL files his"
 	line "own #MON data"
 	cont "on his PC!"
--- a/text/maps/fuchsia_mart.asm
+++ b/text/maps/fuchsia_mart.asm
@@ -1,4 +1,4 @@
-_FuchsiaMartText2: ; 9e22e (27:622e)
+_FuchsiaMartText2:: ; 9e22e (27:622e)
 	text "Do you have a"
 	line "SAFARI ZONE flag?"
 
@@ -6,7 +6,7 @@
 	line "or calendars?"
 	done
 
-_FuchsiaMartText3: ; 9e26e (27:626e)
+_FuchsiaMartText3:: ; 9e26e (27:626e)
 	text "Did you try X"
 	line "SPEED? It speeds"
 	cont "up a #MON in"
--- a/text/maps/fuchsia_meeting_room.asm
+++ b/text/maps/fuchsia_meeting_room.asm
@@ -1,4 +1,4 @@
-_FuchsiaMeetingRoomText1: ; a05a1 (28:45a1)
+_FuchsiaMeetingRoomText1:: ; a05a1 (28:45a1)
 	text "We nicknamed the"
 	line "WARDEN SLOWPOKE."
 
@@ -6,7 +6,7 @@
 	line "both look vacant!"
 	done
 
-_FuchsiaMeetingRoomText2: ; a05e6 (28:45e6)
+_FuchsiaMeetingRoomText2:: ; a05e6 (28:45e6)
 	text "SLOWPOKE is very"
 	line "knowledgeable"
 	cont "about #MON!"
@@ -16,7 +16,7 @@
 	cont "extinct #MON!"
 	done
 
-_FuchsiaMeetingRoomText3: ; a0642 (28:4642)
+_FuchsiaMeetingRoomText3:: ; a0642 (28:4642)
 	text "SLOWPOKE came in,"
 	line "but I couldn't"
 	cont "understand him."
--- a/text/maps/fuchsia_pokecenter.asm
+++ b/text/maps/fuchsia_pokecenter.asm
@@ -1,4 +1,4 @@
-_FuchsiaPokecenterText1: ; 9e387 (27:6387)
+_FuchsiaPokecenterText1:: ; 9e387 (27:6387)
 	text "You can't win"
 	line "with just one"
 	cont "strong #MON."
@@ -8,7 +8,7 @@
 	cont "them evenly."
 	done
 
-_FuchsiaPokecenterText3: ; 9e3de (27:63de)
+_FuchsiaPokecenterText3:: ; 9e3de (27:63de)
 	text "There's a narrow"
 	line "trail west of"
 	cont "VIRIDIAN CITY."
--- a/text/maps/fujis_house.asm
+++ b/text/maps/fujis_house.asm
@@ -1,16 +1,16 @@
-_UnnamedText_1d8d1: ; 99e8d (26:5e8d)
+_UnnamedText_1d8d1:: ; 99e8d (26:5e8d)
 	text "That's odd, MR.FUJI"
 	line "isn't here."
 	cont "Where'd he go?"
 	done
 
-_UnnamedText_1d8d6: ; 99eba (26:5eba)
+_UnnamedText_1d8d6:: ; 99eba (26:5eba)
 	text "MR.FUJI had been"
 	line "praying alone for"
 	cont "CUBONE's mother."
 	done
 
-_UnnamedText_1d8f4: ; 99eee (26:5eee)
+_UnnamedText_1d8f4:: ; 99eee (26:5eee)
 	text "This is really"
 	line "MR.FUJI's house."
 
@@ -21,19 +21,19 @@
 	cont "orphaned #MON!"
 	done
 
-_UnnamedText_1d8f9: ; 99f4b (26:5f4b)
+_UnnamedText_1d8f9:: ; 99f4b (26:5f4b)
 	text "It's so warm!"
 	line "#MON are so"
 	cont "nice to hug!"
 	done
 
-_LavenderHouse1Text3: ; 99f72 (26:5f72)
+_LavenderHouse1Text3:: ; 99f72 (26:5f72)
 	text "PSYDUCK: Gwappa!@@"
 
-_LavenderHouse1Text4: ; 99f85 (26:5f85)
+_LavenderHouse1Text4:: ; 99f85 (26:5f85)
 	text "NIDORINO: Gaoo!@@"
 
-_UnnamedText_1d94c: ; 99f97 (26:5f97)
+_UnnamedText_1d94c:: ; 99f97 (26:5f97)
 	text "MR.FUJI: ", $52, "."
 
 	para "Your #DEX quest"
@@ -45,13 +45,13 @@
 	line "help your quest."
 	prompt
 
-_ReceivedFluteText: ; 99ffb (26:5ffb)
+_ReceivedFluteText:: ; 99ffb (26:5ffb)
 	text $52, " received"
 	line "a @"
 	TX_RAM $cf4b
 	text "!@@"
 
-_FluteExplanationText: ; 9a011 (26:6011)
+_FluteExplanationText:: ; 9a011 (26:6011)
 	db $0
 	para "Upon hearing #"
 	line "FLUTE, sleeping"
@@ -62,17 +62,17 @@
 	line "sleeping #MON."
 	done
 
-_FluteNoRoomText: ; 9a069 (26:6069)
+_FluteNoRoomText:: ; 9a069 (26:6069)
 	text "You must make"
 	line "room for this!"
 	done
 
-_MrFujiAfterFluteText: ; 9a087 (26:6087)
+_MrFujiAfterFluteText:: ; 9a087 (26:6087)
 	text "MR.FUJI: Has my"
 	line "FLUTE helped you?"
 	done
 
-_LavenderHouse1Text6: ; 9a0aa (26:60aa)
+_LavenderHouse1Text6:: ; 9a0aa (26:60aa)
 	text "#MON Monthly"
 	line "Grand Prize"
 	cont "Drawing!"
--- a/text/maps/hall_of_fame.asm
+++ b/text/maps/hall_of_fame.asm
@@ -1,4 +1,4 @@
-_HallofFameRoomText1: ; 85fb5 (21:5fb5)
+_HallofFameRoomText1:: ; 85fb5 (21:5fb5)
 	text "OAK: Er-hem!"
 	line "Congratulations"
 	cont $52, "!"
--- a/text/maps/indigo_plateau_lobby.asm
+++ b/text/maps/indigo_plateau_lobby.asm
@@ -1,4 +1,4 @@
-_IndigoPlateauLobbyText1: ; a13f0 (28:53f0)
+_IndigoPlateauLobbyText1:: ; a13f0 (28:53f0)
 	text "Yo! Champ in"
 	line "making!"
 
@@ -13,7 +13,7 @@
 	cont "is it! Go for it!"
 	done
 
-_IndigoPlateauLobbyText3: ; a148b (28:548b)
+_IndigoPlateauLobbyText3:: ; a148b (28:548b)
 	text "From here on, you"
 	line "face the ELITE"
 	cont "FOUR one by one!"
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -1,4 +1,4 @@
-_LanceBeforeBattleText: ; 85d3c (21:5d3c)
+_LanceBeforeBattleText:: ; 85d3c (21:5d3c)
 	text "Ah! I heard about"
 	line "you ", $52, "!"
 
@@ -27,7 +27,7 @@
 	cont "with me, ", $52, "!"
 	done
 
-_LanceEndBattleText: ; 85e64 (21:5e64)
+_LanceEndBattleText:: ; 85e64 (21:5e64)
 	text "That's it!"
 
 	para "I hate to admit"
@@ -35,7 +35,7 @@
 	cont "#MON master!"
 	prompt
 
-_LanceAfterBattleText: ; 85e9e (21:5e9e)
+_LanceAfterBattleText:: ; 85e9e (21:5e9e)
 	text "I still can't"
 	line "believe my"
 	cont "dragons lost to"
--- a/text/maps/lavender_house.asm
+++ b/text/maps/lavender_house.asm
@@ -1,7 +1,7 @@
-_LavenderHouse2Text1: ; 9a238 (26:6238)
+_LavenderHouse2Text1:: ; 9a238 (26:6238)
 	text "CUBONE: Kyarugoo!@@"
 
-_UnnamedText_1d9dc: ; 9a24c (26:624c)
+_UnnamedText_1d9dc:: ; 9a24c (26:624c)
 	text "I hate those"
 	line "horrible ROCKETs!"
 
@@ -13,7 +13,7 @@
 	cont "from TEAM ROCKET!"
 	done
 
-_UnnamedText_1d9e1: ; 9a2b9 (26:62b9)
+_UnnamedText_1d9e1:: ; 9a2b9 (26:62b9)
 	text "The GHOST of"
 	line "#MON TOWER is"
 	cont "gone!"
--- a/text/maps/lavender_mart.asm
+++ b/text/maps/lavender_mart.asm
@@ -1,4 +1,4 @@
-_LavenderMartText2: ; 9a104 (26:6104)
+_LavenderMartText2:: ; 9a104 (26:6104)
 	text "I'm searching for"
 	line "items that raise"
 	cont "the abilities of"
@@ -14,13 +14,13 @@
 	line "I can get them?"
 	done
 
-_UnnamedText_5c953: ; 9a1b4 (26:61b4)
+_UnnamedText_5c953:: ; 9a1b4 (26:61b4)
 	text "You know REVIVE?"
 	line "It revives any"
 	cont "fainted #MON!"
 	done
 
-_UnnamedText_5c958: ; 9a1e3 (26:61e3)
+_UnnamedText_5c958:: ; 9a1e3 (26:61e3)
 	text "I found a NUGGET"
 	line "in the mountains."
 
--- a/text/maps/lavender_pokecenter.asm
+++ b/text/maps/lavender_pokecenter.asm
@@ -1,12 +1,12 @@
-_LavenderPokecenterText4: ; 9940e (26:540e)
-_LavenderPokecenterText2: ; 9940e (26:540e)
-_LavenderPokecenterText1: ; 9940e (26:540e)
+_LavenderPokecenterText4:: ; 9940e (26:540e)
+_LavenderPokecenterText2:: ; 9940e (26:540e)
+_LavenderPokecenterText1:: ; 9940e (26:540e)
 	text "TEAM ROCKET will"
 	line "do anything for"
 	cont "the sake of gold!"
 	done
 
-_LavenderPokecenterText3: ; 99442 (26:5442)
+_LavenderPokecenterText3:: ; 99442 (26:5442)
 	text "I saw CUBONE's"
 	line "mother die trying"
 	cont "to escape from"
--- a/text/maps/lavender_town.asm
+++ b/text/maps/lavender_town.asm
@@ -1,14 +1,14 @@
-_UnnamedText_4413c: ; a5482 (29:5482)
+_UnnamedText_4413c:: ; a5482 (29:5482)
 	text "Do you believe in"
 	line "GHOSTs?"
 	done
 
-_UnnamedText_44141: ; a549d (29:549d)
+_UnnamedText_44141:: ; a549d (29:549d)
 	text "Really? So there"
 	line "are believers..."
 	done
 
-_UnnamedText_44146: ; a54c0 (29:54c0)
+_UnnamedText_44146:: ; a54c0 (29:54c0)
 	text "Hahaha, I guess"
 	line "not."
 
@@ -17,7 +17,7 @@
 	cont "it's not real."
 	done
 
-_LavenderTownText2: ; a5506 (29:5506)
+_LavenderTownText2:: ; a5506 (29:5506)
 	text "This town is known"
 	line "as the grave site"
 	cont "of #MON."
@@ -27,7 +27,7 @@
 	cont "#MON TOWER."
 	done
 
-_LavenderTownText3: ; a555f (29:555f)
+_LavenderTownText3:: ; a555f (29:555f)
 	text "GHOSTs appeared"
 	line "in #MON TOWER."
 
@@ -37,13 +37,13 @@
 	cont "ROCKETs killed."
 	done
 
-_LavenderTownText4: ; a55bb (29:55bb)
+_LavenderTownText4:: ; a55bb (29:55bb)
 	text "LAVENDER TOWN"
 	line "The Noble Purple"
 	cont "Town"
 	done
 
-_LavenderTownText5: ; a55e0 (29:55e0)
+_LavenderTownText5:: ; a55e0 (29:55e0)
 	text "New SILPH SCOPE!"
 
 	para "Make the Invisible"
@@ -52,12 +52,12 @@
 	para "SILPH CO."
 	done
 
-_LavenderTownText8: ; a561d (29:561d)
+_LavenderTownText8:: ; a561d (29:561d)
 	text "LAVENDER VOLUNTEER"
 	line "#MON HOUSE"
 	done
 
-_LavenderTownText9: ; a563c (29:563c)
+_LavenderTownText9:: ; a563c (29:563c)
 	text "May the Souls of"
 	line "#MON Rest Easy"
 	cont "#MON TOWER"
--- a/text/maps/lorelei.asm
+++ b/text/maps/lorelei.asm
@@ -1,4 +1,4 @@
-_LoreleiBeforeBattleText: ; 865ef (21:65ef)
+_LoreleiBeforeBattleText:: ; 865ef (21:65ef)
 	text "Welcome to"
 	line "#MON LEAGUE!"
 
@@ -21,12 +21,12 @@
 	line "Are you ready?"
 	done
 
-_LoreleiEndBattleText: ; 866c4 (21:66c4)
+_LoreleiEndBattleText:: ; 866c4 (21:66c4)
 	text "How"
 	line "dare you!"
 	prompt
 
-_LoreleiAfterBattleText: ; 866d3 (21:66d3)
+_LoreleiAfterBattleText:: ; 866d3 (21:66d3)
 	text "You're better"
 	line "than I thought!"
 	cont "Go on ahead!"
@@ -36,7 +36,7 @@
 	cont "LEAGUE power!"
 	done
 
-_UnnamedText_7627b: ; 86729 (21:6729)
+_UnnamedText_7627b:: ; 86729 (21:6729)
 	text "Someone's voice:"
 	line "Don't run away!"
 	done
--- a/text/maps/mansion_1f.asm
+++ b/text/maps/mansion_1f.asm
@@ -1,30 +1,30 @@
-_Mansion1BattleText2: ; a07a8 (28:47a8)
+_Mansion1BattleText2:: ; a07a8 (28:47a8)
 	text "Who are you? There"
 	line "shouldn't be"
 	cont "anyone here."
 	done
 
-_Mansion1EndBattleText2: ; a07d5 (28:47d5)
+_Mansion1EndBattleText2:: ; a07d5 (28:47d5)
 	text "Ouch!"
 	prompt
 
-_Mansion1AfterBattleText2: ; a07dc (28:47dc)
+_Mansion1AfterBattleText2:: ; a07dc (28:47dc)
 	text "A key? I don't"
 	line "know what you're"
 	cont "talking about."
 	done
 
-_MansionSwitchText: ; a080a (28:480a)
+_MansionSwitchText:: ; a080a (28:480a)
 	text "A secret switch!"
 
 	para "Press it?"
 	done
 
-_MansionSwitchPressedText: ; a0826 (28:4826)
+_MansionSwitchPressedText:: ; a0826 (28:4826)
 	text "Who wouldn't?"
 	prompt
 
-_MansionSwitchNotPressedText: ; a0834 (28:4834)
+_MansionSwitchNotPressedText:: ; a0834 (28:4834)
 	text "Not quite yet!"
 	done
 
--- a/text/maps/mansion_2f.asm
+++ b/text/maps/mansion_2f.asm
@@ -1,21 +1,21 @@
-_Mansion2BattleText1: ; 852b7 (21:52b7)
+_Mansion2BattleText1:: ; 852b7 (21:52b7)
 	text "I can't get out!"
 	line "This old place is"
 	cont "one big puzzle!"
 	done
 
-_Mansion2EndBattleText1: ; 852ea (21:52ea)
+_Mansion2EndBattleText1:: ; 852ea (21:52ea)
 	text "Oh no!"
 	line "My bag of loot!"
 	prompt
 
-_Mansion2AfterBattleText1: ; 85302 (21:5302)
+_Mansion2AfterBattleText1:: ; 85302 (21:5302)
 	text "Switches open and"
 	line "close alternating"
 	cont "sets of doors!"
 	done
 
-_Mansion2Text3: ; 85336 (21:5336)
+_Mansion2Text3:: ; 85336 (21:5336)
 	text "Diary: July 5"
 	line "Guyana,"
 	cont "South America"
@@ -25,7 +25,7 @@
 	cont "in the jungle."
 	done
 
-_Mansion2Text4: ; 85389 (21:5389)
+_Mansion2Text4:: ; 85389 (21:5389)
 	text "Diary: July 10"
 	line "We christened the"
 	cont "newly discovered"
@@ -32,17 +32,17 @@
 	cont "#MON, MEW."
 	done
 
-_UnnamedText_520c2: ; 853c7 (21:53c7)
+_UnnamedText_520c2:: ; 853c7 (21:53c7)
 	text "A secret switch!"
 
 	para "Press it?"
 	done
 
-_UnnamedText_520c7: ; 853e3 (21:53e3)
+_UnnamedText_520c7:: ; 853e3 (21:53e3)
 	text "Who wouldn't?"
 	prompt
 
-_UnnamedText_520cc: ; 853f1 (21:53f1)
+_UnnamedText_520cc:: ; 853f1 (21:53f1)
 	text "Not quite yet!"
 	done
 
--- a/text/maps/mansion_3f.asm
+++ b/text/maps/mansion_3f.asm
@@ -1,34 +1,34 @@
-_Mansion3BattleText1: ; 85401 (21:5401)
+_Mansion3BattleText1:: ; 85401 (21:5401)
 	text "This place is"
 	line "like, huge!"
 	done
 
-_Mansion3EndBattleText1: ; 8541c (21:541c)
+_Mansion3EndBattleText1:: ; 8541c (21:541c)
 	text "Ayah!"
 	prompt
 
-_Mansion3AfterBattleText1: ; 85423 (21:5423)
+_Mansion3AfterBattleText1:: ; 85423 (21:5423)
 	text "I wonder where"
 	line "my partner went."
 	done
 
-_Mansion3BattleText2: ; 85444 (21:5444)
+_Mansion3BattleText2:: ; 85444 (21:5444)
 	text "My mentor once"
 	line "lived here."
 	done
 
-_Mansion3EndBattleText2: ; 85460 (21:5460)
+_Mansion3EndBattleText2:: ; 85460 (21:5460)
 	text "Whew!"
 	line "Overwhelming!"
 	prompt
 
-_Mansion3AfterBattleText2: ; 85475 (21:5475)
+_Mansion3AfterBattleText2:: ; 85475 (21:5475)
 	text "So, you're stuck?"
 	line "Try jumping off"
 	cont "over there!"
 	done
 
-_Mansion3Text5: ; 854a3 (21:54a3)
+_Mansion3Text5:: ; 854a3 (21:54a3)
 	text "Diary: Feb. 6"
 	line "MEW gave birth."
 
--- a/text/maps/mansion_b1f.asm
+++ b/text/maps/mansion_b1f.asm
@@ -1,34 +1,34 @@
-_Mansion4BattleText1: ; 854df (21:54df)
+_Mansion4BattleText1:: ; 854df (21:54df)
 	text "Uh-oh. Where am"
 	line "I now?"
 	done
 
-_Mansion4EndBattleText1: ; 854f7 (21:54f7)
+_Mansion4EndBattleText1:: ; 854f7 (21:54f7)
 	text "Awooh!"
 	prompt
 
-_Mansion4AfterBattleText1: ; 854ff (21:54ff)
+_Mansion4AfterBattleText1:: ; 854ff (21:54ff)
 	text "You can find stuff"
 	line "lying around."
 	done
 
-_Mansion4BattleText2: ; 85521 (21:5521)
+_Mansion4BattleText2:: ; 85521 (21:5521)
 	text "This place is"
 	line "ideal for a lab."
 	done
 
-_Mansion4EndBattleText2: ; 85541 (21:5541)
+_Mansion4EndBattleText2:: ; 85541 (21:5541)
 	text "What"
 	line "was that for?"
 	prompt
 
-_Mansion4AfterBattleText2: ; 85555 (21:5555)
+_Mansion4AfterBattleText2:: ; 85555 (21:5555)
 	text "I like it here!"
 	line "It's conducive to"
 	cont "my studies!"
 	done
 
-_Mansion4Text7: ; 85583 (21:5583)
+_Mansion4Text7:: ; 85583 (21:5583)
 	text "Diary; Sept. 1"
 	line "MEWTWO is far too"
 	cont "powerful."
--- a/text/maps/mr_psychics_house.asm
+++ b/text/maps/mr_psychics_house.asm
@@ -1,4 +1,4 @@
-_TM29PreReceiveText: ; a24fe (28:64fe)
+_TM29PreReceiveText:: ; a24fe (28:64fe)
 	text "...Wait! Don't"
 	line "say a word!"
 
@@ -5,13 +5,13 @@
 	para "You wanted this!"
 	prompt
 
-_ReceivedTM29Text: ; a252a (28:652a)
+_ReceivedTM29Text:: ; a252a (28:652a)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_TM29ExplanationText: ; a253e (28:653e)
+_TM29ExplanationText:: ; a253e (28:653e)
 	text "TM29 is PSYCHIC!"
 
 	para "It can lower the"
@@ -19,7 +19,7 @@
 	cont "abilities."
 	done
 
-_TM29NoRoomText: ; a257c (28:657c)
+_TM29NoRoomText:: ; a257c (28:657c)
 	text "Where do you plan"
 	line "to put this?"
 	done
--- a/text/maps/mt_moon_1f.asm
+++ b/text/maps/mt_moon_1f.asm
@@ -1,112 +1,112 @@
-_MtMoon1BattleText2: ; 80692 (20:4692)
+_MtMoon1BattleText2:: ; 80692 (20:4692)
 	text "WHOA! You shocked"
 	line "me! Oh, you're"
 	cont "just a kid!"
 	done
 
-_MtMoon1EndBattleText2: ; 806bf (20:46bf)
+_MtMoon1EndBattleText2:: ; 806bf (20:46bf)
 	text "Wow!"
 	line "Shocked again!"
 	prompt
 
-_MtMoon1AfterBattleText2: ; 806d4 (20:46d4)
+_MtMoon1AfterBattleText2:: ; 806d4 (20:46d4)
 	text "Kids like you"
 	line "shouldn't be"
 	cont "here!"
 	done
 
-_MtMoon1BattleText3: ; 806f5 (20:46f5)
+_MtMoon1BattleText3:: ; 806f5 (20:46f5)
 	text "Did you come to"
 	line "explore too?"
 	done
 
-_MtMoon1EndBattleText3: ; 80713 (20:4713)
+_MtMoon1EndBattleText3:: ; 80713 (20:4713)
 	text "Losing"
 	line "stinks!"
 	prompt
 
-_MtMoon1AfterBattleText3: ; 80723 (20:4723)
+_MtMoon1AfterBattleText3:: ; 80723 (20:4723)
 	text "I came down here"
 	line "to show off to"
 	cont "girls."
 	done
 
-_MtMoon1BattleText4: ; 8074b (20:474b)
+_MtMoon1BattleText4:: ; 8074b (20:474b)
 	text "Wow! It's way"
 	line "bigger in here"
 	cont "than I thought!"
 	done
 
-_MtMoon1EndBattleText4: ; 80778 (20:4778)
+_MtMoon1EndBattleText4:: ; 80778 (20:4778)
 	text "Oh!"
 	line "I lost it!"
 	prompt
 
-_MtMoon1AfterBattleText4: ; 80788 (20:4788)
+_MtMoon1AfterBattleText4:: ; 80788 (20:4788)
 	text "How do you get"
 	line "out of here?"
 	done
 
-_MtMoon1BattleText5: ; 807a5 (20:47a5)
+_MtMoon1BattleText5:: ; 807a5 (20:47a5)
 	text "What! Don't sneak"
 	line "up on me!"
 	done
 
-_MtMoon1EndBattleText5: ; 807c1 (20:47c1)
+_MtMoon1EndBattleText5:: ; 807c1 (20:47c1)
 	text "My"
 	line "#MON won't do!"
 	prompt
 
-_MtMoon1AfterBattleText5: ; 807d3 (20:47d3)
+_MtMoon1AfterBattleText5:: ; 807d3 (20:47d3)
 	text "I have to find"
 	line "stronger #MON."
 	done
 
-_MtMoon1BattleText6: ; 807f2 (20:47f2)
+_MtMoon1BattleText6:: ; 807f2 (20:47f2)
 	text "What? I'm waiting"
 	line "for my friends to"
 	cont "find me here."
 	done
 
-_MtMoon1EndBattleText6: ; 80824 (20:4824)
+_MtMoon1EndBattleText6:: ; 80824 (20:4824)
 	text "I lost?"
 	prompt
 
-_MtMoon1AfterBattleText6: ; 8082d (20:482d)
+_MtMoon1AfterBattleText6:: ; 8082d (20:482d)
 	text "I heard there are"
 	line "some very rare"
 	cont "fossils here."
 	done
 
-_MtMoon1BattleText7: ; 8085d (20:485d)
+_MtMoon1BattleText7:: ; 8085d (20:485d)
 	text "Suspicious men"
 	line "are in the cave."
 	cont "What about you?"
 	done
 
-_MtMoon1EndBattleText7: ; 8088e (20:488e)
+_MtMoon1EndBattleText7:: ; 8088e (20:488e)
 	text "You"
 	line "got me!"
 	prompt
 
-_MtMoon1AfterBattleText7: ; 8089b (20:489b)
+_MtMoon1AfterBattleText7:: ; 8089b (20:489b)
 	text "I saw them! I'm"
 	line "sure they're from"
 	cont "TEAM ROCKET!"
 	done
 
-_MtMoon1BattleText8: ; 808c9 (20:48c9)
+_MtMoon1BattleText8:: ; 808c9 (20:48c9)
 	text "Go through this"
 	line "cave to get to"
 	cont "CERULEAN CITY!"
 	done
 
-_MtMoon1EndBattleText8: ; 808f8 (20:48f8)
+_MtMoon1EndBattleText8:: ; 808f8 (20:48f8)
 	text "I"
 	line "lost."
 	prompt
 
-_MtMoon1AfterBattleText8: ; 80901 (20:4901)
+_MtMoon1AfterBattleText8:: ; 80901 (20:4901)
 	text "ZUBAT is tough!"
 	line "But, it can be"
 	cont "useful if you"
@@ -113,7 +113,7 @@
 	cont "catch one."
 	done
 
-_MtMoon1Text14: ; 8093a (20:493a)
+_MtMoon1Text14:: ; 8093a (20:493a)
 	text "Beware! ZUBAT is"
 	line "a blood sucker!"
 	done
--- a/text/maps/mt_moon_b1f.asm
+++ b/text/maps/mt_moon_b1f.asm
@@ -1,4 +1,4 @@
-_UnnamedText_51a48: ; 8095c (20:495c)
+_UnnamedText_51a48:: ; 8095c (20:495c)
 	db $0
 	done
 
--- a/text/maps/mt_moon_b2f.asm
+++ b/text/maps/mt_moon_b2f.asm
@@ -1,24 +1,24 @@
-_UnnamedText_49f24: ; 8095e (20:495e)
+_UnnamedText_49f24:: ; 8095e (20:495e)
 	text "You want the"
 	line "DOME FOSSIL?"
 	done
 
-_UnnamedText_49f64: ; 80979 (20:4979)
+_UnnamedText_49f64:: ; 80979 (20:4979)
 	text "You want the"
 	line "HELIX FOSSIL?"
 	done
 
-_UnnamedText_49f6f: ; 80995 (20:4995)
+_UnnamedText_49f6f:: ; 80995 (20:4995)
 	text $52, " got the"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_49f7f: ; 809a8 (20:49a8)
+_UnnamedText_49f7f:: ; 809a8 (20:49a8)
 	text "Look, you've got"
 	line "no room for this.@@"
 
-_UnnamedText_49f85: ; 809cc (20:49cc)
+_UnnamedText_49f85:: ; 809cc (20:49cc)
 	text "Hey, stop!"
 
 	para "I found these"
@@ -26,18 +26,18 @@
 	cont "both mine!"
 	done
 
-_UnnamedText_49f8a: ; 80a01 (20:4a01)
+_UnnamedText_49f8a:: ; 80a01 (20:4a01)
 	text "OK!"
 	line "I'll share!"
 	prompt
 
-_UnnamedText_49f8f: ; 80a11 (20:4a11)
+_UnnamedText_49f8f:: ; 80a11 (20:4a11)
 	text "We'll each take"
 	line "one!"
 	cont "No being greedy!"
 	done
 
-_UnnamedText_49f94: ; 80a37 (20:4a37)
+_UnnamedText_49f94:: ; 80a37 (20:4a37)
 	text "Far away, on"
 	line "CINNABAR ISLAND,"
 	cont "there's a #MON"
@@ -48,11 +48,11 @@
 	cont "fossils."
 	done
 
-_UnnamedText_49f99: ; 80a93 (20:4a93)
+_UnnamedText_49f99:: ; 80a93 (20:4a93)
 	text "All right. Then"
 	line "this is mine!@@"
 
-_MtMoon3BattleText2: ; 80ab3 (20:4ab3)
+_MtMoon3BattleText2:: ; 80ab3 (20:4ab3)
 	text "TEAM ROCKET will"
 	line "find the fossils,"
 	cont "revive and sell"
@@ -59,63 +59,63 @@
 	cont "them for cash!"
 	done
 
-_MtMoon3EndBattleText2: ; 80af6 (20:4af6)
+_MtMoon3EndBattleText2:: ; 80af6 (20:4af6)
 	text "Urgh!"
 	line "Now I'm mad!"
 	prompt
 
-_MtMoon3AfterBattleText2: ; 80b09 (20:4b09)
+_MtMoon3AfterBattleText2:: ; 80b09 (20:4b09)
 	text "You made me mad!"
 	line "TEAM ROCKET will"
 	cont "blacklist you!"
 	done
 
-_MtMoon3BattleText3: ; 80b3b (20:4b3b)
+_MtMoon3BattleText3:: ; 80b3b (20:4b3b)
 	text "We, TEAM ROCKET,"
 	line "are #MON"
 	cont "gangsters!"
 	done
 
-_MtMoon3EndBattleText3: ; 80b61 (20:4b61)
+_MtMoon3EndBattleText3:: ; 80b61 (20:4b61)
 	text "I blew"
 	line "it!"
 	prompt
 
-_MtMoon3AfterBattleText3: ; 80b6d (20:4b6d)
+_MtMoon3AfterBattleText3:: ; 80b6d (20:4b6d)
 	text "Darn it all! My"
 	line "associates won't"
 	cont "stand for this!"
 	done
 
-_MtMoon3BattleText4: ; 80b9e (20:4b9e)
+_MtMoon3BattleText4:: ; 80b9e (20:4b9e)
 	text "We're pulling a"
 	line "big job here!"
 	cont "Get lost, kid!"
 	done
 
-_MtMoon3EndBattleText4: ; 80bcb (20:4bcb)
+_MtMoon3EndBattleText4:: ; 80bcb (20:4bcb)
 	text "So, you"
 	line "are good."
 	prompt
 
-_MtMoon3AfterBattleText4: ; 80bde (20:4bde)
+_MtMoon3AfterBattleText4:: ; 80bde (20:4bde)
 	text "If you find a"
 	line "fossil, give it"
 	cont "to me and scram!"
 	done
 
-_MtMoon3BattleText5: ; 80c0e (20:4c0e)
+_MtMoon3BattleText5:: ; 80c0e (20:4c0e)
 	text "Little kids"
 	line "should leave"
 	cont "grown-ups alone!"
 	done
 
-_MtMoon3EndBattleText5: ; 80c39 (20:4c39)
+_MtMoon3EndBattleText5:: ; 80c39 (20:4c39)
 	text "I'm"
 	line "steamed!"
 	prompt
 
-_MtMoon3AfterBattleText5: ; 80c46 (20:4c46)
+_MtMoon3AfterBattleText5:: ; 80c46 (20:4c46)
 	text "#MON lived"
 	line "here long before"
 	cont "people came."
--- a/text/maps/mt_moon_pokecenter.asm
+++ b/text/maps/mt_moon_pokecenter.asm
@@ -1,4 +1,4 @@
-_MtMoonPokecenterText1: ; 8a8eb (22:68eb)
+_MtMoonPokecenterText1:: ; 8a8eb (22:68eb)
 	text "I've 6 # BALLs"
 	line "set in my belt."
 
@@ -6,7 +6,7 @@
 	line "carry 6 #MON."
 	done
 
-_MtMoonPokecenterText3: ; 8a929 (22:6929)
+_MtMoonPokecenterText3:: ; 8a929 (22:6929)
 	text "TEAM ROCKET"
 	line "attacks CERULEAN"
 	cont "citizens..."
@@ -16,7 +16,7 @@
 	cont "news!"
 	done
 
-_UnnamedText_4935c: ; 8a976 (22:6976)
+_UnnamedText_4935c:: ; 8a976 (22:6976)
 	text "MAN: Hello, there!"
 	line "Have I got a deal"
 	cont "just for you!"
@@ -27,23 +27,23 @@
 	cont "What do you say?"
 	done
 
-_UnnamedText_49361: ; 8a9ec (22:69ec)
+_UnnamedText_49361:: ; 8a9ec (22:69ec)
 	text "No? I'm only"
 	line "doing this as a"
 	cont "favor to you!"
 	done
 
-_UnnamedText_49366: ; 8aa17 (22:6a17)
+_UnnamedText_49366:: ; 8aa17 (22:6a17)
 	text "You'll need more"
 	line "money than that!"
 	done
 
-_UnnamedText_4936b: ; 8aa39 (22:6a39)
+_UnnamedText_4936b:: ; 8aa39 (22:6a39)
 	text "MAN: Well, I don't"
 	line "give refunds!"
 	done
 
-_MtMoonPokecenterText5: ; 8aa5a (22:6a5a)
+_MtMoonPokecenterText5:: ; 8aa5a (22:6a5a)
 	db $0
 	done
 
--- a/text/maps/museum_1f.asm
+++ b/text/maps/museum_1f.asm
@@ -1,8 +1,8 @@
-_UnnamedText_5c21a: ; 9652c (25:652c)
+_UnnamedText_5c21a:: ; 9652c (25:652c)
 	text "Come again!"
 	done
 
-_UnnamedText_5c21f: ; 96539 (25:6539)
+_UnnamedText_5c21f:: ; 96539 (25:6539)
 	text "It's ¥50 for a"
 	line "child's ticket."
 
@@ -10,17 +10,17 @@
 	line "come in?"
 	done
 
-_UnnamedText_5c224: ; 96572 (25:6572)
+_UnnamedText_5c224:: ; 96572 (25:6572)
 	text "Right, ¥50!"
 	line "Thank you!"
 	done
 
-_UnnamedText_5c229: ; 9658a (25:658a)
+_UnnamedText_5c229:: ; 9658a (25:658a)
 	text "You don't have"
 	line "enough money."
 	prompt
 
-_UnnamedText_5c22e: ; 965a7 (25:65a7)
+_UnnamedText_5c22e:: ; 965a7 (25:65a7)
 	text "You can't sneak"
 	line "in the back way!"
 
@@ -29,7 +29,7 @@
 	cont "AMBER is?"
 	done
 
-_UnnamedText_5c233: ; 965f1 (25:65f1)
+_UnnamedText_5c233:: ; 965f1 (25:65f1)
 	text "There's a lab"
 	line "somewhere trying"
 	cont "to resurrect"
@@ -37,28 +37,28 @@
 	cont "from AMBER."
 	done
 
-_UnnamedText_5c238: ; 96636 (25:6636)
+_UnnamedText_5c238:: ; 96636 (25:6636)
 	text "AMBER is fossil-"
 	line "ized tree sap."
 	done
 
-_UnnamedText_5c23d: ; 96657 (25:6657)
+_UnnamedText_5c23d:: ; 96657 (25:6657)
 	text "Please go to the"
 	line "other side!"
 	done
 
-_UnnamedText_5c242: ; 96675 (25:6675)
+_UnnamedText_5c242:: ; 96675 (25:6675)
 	text "Take plenty of"
 	line "time to look!"
 	done
 
-_UnnamedText_5c251: ; 96693 (25:6693)
+_UnnamedText_5c251:: ; 96693 (25:6693)
 	text "That is one"
 	line "magnificent"
 	cont "fossil!"
 	done
 
-_UnnamedText_5c28e: ; 966b4 (25:66b4)
+_UnnamedText_5c28e:: ; 966b4 (25:66b4)
 	text "Ssh! I think that"
 	line "this chunk of"
 	cont "AMBER contains"
@@ -80,21 +80,21 @@
 	cont "get it examined!"
 	prompt
 
-_ReceivedOldAmberText: ; 96790 (25:6790)
+_ReceivedOldAmberText:: ; 96790 (25:6790)
 	text $52, " received"
 	line "OLD AMBER!@@"
 
-_UnnamedText_5c299: ; 967a8 (25:67a8)
+_UnnamedText_5c299:: ; 967a8 (25:67a8)
 	text "Ssh! Get the OLD"
 	line "AMBER checked!"
 	done
 
-_UnnamedText_5c29e: ; 967c9 (25:67c9)
+_UnnamedText_5c29e:: ; 967c9 (25:67c9)
 	text "You don't have"
 	line "space for this!"
 	done
 
-_UnnamedText_5c2ad: ; 967e8 (25:67e8)
+_UnnamedText_5c2ad:: ; 967e8 (25:67e8)
 	text "We are proud of 2"
 	line "fossils of very"
 	cont "rare, prehistoric"
@@ -101,7 +101,7 @@
 	cont "#MON!"
 	done
 
-_UnnamedText_5c2bc: ; 96823 (25:6823)
+_UnnamedText_5c2bc:: ; 96823 (25:6823)
 	text "The AMBER is"
 	line "clear and gold!"
 	done
--- a/text/maps/museum_2f.asm
+++ b/text/maps/museum_2f.asm
@@ -1,4 +1,4 @@
-_MuseumF2Text1: ; 96841 (25:6841)
+_MuseumF2Text1:: ; 96841 (25:6841)
 	text "MOON STONE?"
 
 	para "What's so special"
@@ -5,7 +5,7 @@
 	line "about it?"
 	done
 
-_MuseumF2Text2: ; 96869 (25:6869)
+_MuseumF2Text2:: ; 96869 (25:6869)
 	text "July 20, 1969!"
 
 	para "The 1st lunar"
@@ -15,12 +15,12 @@
 	line "TV to watch it!"
 	done
 
-_MuseumF2Text3: ; 968b1 (25:68b1)
+_MuseumF2Text3:: ; 968b1 (25:68b1)
 	text "We have a space"
 	line "exhibit now."
 	done
 
-_MuseumF2Text4: ; 968cf (25:68cf)
+_MuseumF2Text4:: ; 968cf (25:68cf)
 	text "I want a PIKACHU!"
 	line "It's so cute!"
 
@@ -28,17 +28,17 @@
 	line "to catch me one!"
 	done
 
-_MuseumF2Text5: ; 96911 (25:6911)
+_MuseumF2Text5:: ; 96911 (25:6911)
 	text "Yeah, a PIKACHU"
 	line "soon, I promise!"
 	done
 
-_MuseumF2Text6: ; 96933 (25:6933)
+_MuseumF2Text6:: ; 96933 (25:6933)
 	text "SPACE SHUTTLE"
 	line "COLUMBIA"
 	done
 
-_MuseumF2Text7: ; 9694b (25:694b)
+_MuseumF2Text7:: ; 9694b (25:694b)
 	text "Meteorite that"
 	line "fell on MT.MOON."
 	cont "(MOON STONE?)"
--- a/text/maps/name_rater.asm
+++ b/text/maps/name_rater.asm
@@ -1,4 +1,4 @@
-_UnnamedText_1dab3: ; 9a308 (26:6308)
+_UnnamedText_1dab3:: ; 9a308 (26:6308)
 	text "Hello, hello!"
 	line "I am the official"
 	cont "NAME RATER!"
@@ -8,12 +8,12 @@
 	cont "your #MON?"
 	done
 
-_UnnamedText_1dab8: ; 9a361 (26:6361)
+_UnnamedText_1dab8:: ; 9a361 (26:6361)
 	text "Which #MON"
 	line "should I look at?"
 	prompt
 
-_UnnamedText_1dabd: ; 9a37f (26:637f)
+_UnnamedText_1dabd:: ; 9a37f (26:637f)
 	TX_RAM $cd6d
 	text ", is it?"
 	line "That is a decent"
@@ -26,12 +26,12 @@
 	para "How about it?"
 	done
 
-_UnnamedText_1dac2: ; 9a3e5 (26:63e5)
+_UnnamedText_1dac2:: ; 9a3e5 (26:63e5)
 	text "Fine! What should"
 	line "we name it?"
 	prompt
 
-_UnnamedText_1dac7: ; 9a404 (26:6404)
+_UnnamedText_1dac7:: ; 9a404 (26:6404)
 	text "OK! This #MON"
 	line "has been renamed"
 	cont "@"
@@ -42,12 +42,12 @@
 	line "name than before!"
 	done
 
-_UnnamedText_1dacc: ; 9a44c (26:644c)
+_UnnamedText_1dacc:: ; 9a44c (26:644c)
 	text "Fine! Come any"
 	line "time you like!"
 	done
 
-_UnnamedText_1dad1: ; 9a46b (26:646b)
+_UnnamedText_1dad1:: ; 9a46b (26:646b)
 	TX_RAM $cd6d
 	text ", is it?"
 	line "That is a truly"
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -1,10 +1,10 @@
-_OaksLabGaryText1: ; 94d5b (25:4d5b)
+_OaksLabGaryText1:: ; 94d5b (25:4d5b)
 	text $53, ": Yo"
 	line $52, "! Gramps"
 	cont "isn't around!"
 	done
 
-_OaksLabText40: ; 94d79 (25:4d79)
+_OaksLabText40:: ; 94d79 (25:4d79)
 	text $53, ": Heh, I"
 	line "don't need to be"
 	cont "greedy like you!"
@@ -13,59 +13,59 @@
 	line "choose, ", $52, "!"
 	done
 
-_OaksLabText41: ; 94dbd (25:4dbd)
+_OaksLabText41:: ; 94dbd (25:4dbd)
 	text $53, ": My"
 	line "#MON looks a"
 	cont "lot stronger."
 	done
 
-_OaksLabText39: ; 94ddf (25:4ddf)
+_OaksLabText39:: ; 94ddf (25:4ddf)
 	text "Those are #"
 	line "BALLs. They"
 	cont "contain #MON!"
 	done
 
-_OaksLabCharmanderText: ; 94e06 (25:4e06)
+_OaksLabCharmanderText:: ; 94e06 (25:4e06)
 	text "So! You want the"
 	line "fire #MON,"
 	cont "CHARMANDER?"
 	done
 
-_OaksLabSquirtleText: ; 94e2f (25:4e2f)
+_OaksLabSquirtleText:: ; 94e2f (25:4e2f)
 	text "So! You want the"
 	line "water #MON,"
 	cont "SQUIRTLE?"
 	done
 
-_OaksLabBulbasaurText: ; 94e57 (25:4e57)
+_OaksLabBulbasaurText:: ; 94e57 (25:4e57)
 	text "So! You want the"
 	line "plant #MON,"
 	cont "BULBASAUR?"
 	done
 
-_OaksLabMonEnergeticText: ; 94e80 (25:4e80)
+_OaksLabMonEnergeticText:: ; 94e80 (25:4e80)
 	text "This #MON is"
 	line "really energetic!"
 	prompt
 
-_OaksLabReceivedMonText: ; 94ea0 (25:4ea0)
+_OaksLabReceivedMonText:: ; 94ea0 (25:4ea0)
 	text $52, " received"
 	line "a @"
 	TX_RAM $cd6d
 	text "!@@"
 
-_OaksLabLastMonText: ; 94eb6 (25:4eb6)
+_OaksLabLastMonText:: ; 94eb6 (25:4eb6)
 	text "That's PROF.OAK's"
 	line "last #MON!"
 	done
 
-_UnnamedText_1d2f0: ; 94ed2 (25:4ed2)
+_UnnamedText_1d2f0:: ; 94ed2 (25:4ed2)
 	text "OAK: Now, ", $52, ","
 	line "which #MON do"
 	cont "you want?"
 	done
 
-_UnnamedText_1d2f5: ; 94ef8 (25:4ef8)
+_UnnamedText_1d2f5:: ; 94ef8 (25:4ef8)
 	text "OAK: If a wild"
 	line "#MON appears,"
 	cont "your #MON can"
@@ -72,7 +72,7 @@
 	cont "fight against it!"
 	done
 
-_UnnamedText_1d2fa: ; 94f36 (25:4f36)
+_UnnamedText_1d2fa:: ; 94f36 (25:4f36)
 	text "OAK: ", $52, ","
 	line "raise your young"
 	cont "#MON by making"
@@ -79,7 +79,7 @@
 	cont "it fight!"
 	done
 
-_OaksLabDeliverParcelText1: ; 94f69 (25:4f69)
+_OaksLabDeliverParcelText1:: ; 94f69 (25:4f69)
 	text "OAK: Oh, ", $52, "!"
 
 	para "How is my old"
@@ -98,7 +98,7 @@
 	para $52, " delivered"
 	line "OAK's PARCEL.@@"
 
-_OaksLabDeliverParcelText2: ; 9500f (25:500f)
+_OaksLabDeliverParcelText2:: ; 9500f (25:500f)
 	db $0
 	para "Ah! This is the"
 	line "custom # BALL"
@@ -106,13 +106,13 @@
 	cont "Thank you!"
 	done
 
-_OaksLabAroundWorldText: ; 95045 (25:5045)
+_OaksLabAroundWorldText:: ; 95045 (25:5045)
 	text "#MON around the"
 	line "world wait for"
 	cont "you, ", $52, "!"
 	done
 
-_OaksLabGivePokeballsText1: ; 9506d (25:506d)
+_OaksLabGivePokeballsText1:: ; 9506d (25:506d)
 	text "OAK: You can't get"
 	line "detailed data on"
 	cont "#MON by just"
@@ -126,7 +126,7 @@
 	para $52, " got 5"
 	line "# BALLs!@@"
 
-_OaksLabGivePokeballsText2: ; 950f2 (25:50f2)
+_OaksLabGivePokeballsText2:: ; 950f2 (25:50f2)
 	db $0
 	para "When a wild"
 	line "#MON appears,"
@@ -144,7 +144,7 @@
 	cont "have to be lucky!"
 	done
 
-_OaksLabPleaseVisitText: ; 9519e (25:519e)
+_OaksLabPleaseVisitText:: ; 9519e (25:519e)
 	text "OAK: Come see me"
 	line "sometimes."
 
@@ -153,7 +153,7 @@
 	cont "coming along."
 	done
 
-_UnnamedText_1d31d: ; 951e9 (25:51e9)
+_UnnamedText_1d31d:: ; 951e9 (25:51e9)
 	text "OAK: Good to see "
 	line "you! How is your "
 	cont "#DEX coming? "
@@ -161,17 +161,17 @@
 	cont "a look!"
 	prompt
 
-_UnnamedText_1d32c: ; 95236 (25:5236)
+_UnnamedText_1d32c:: ; 95236 (25:5236)
 	text "It's encyclopedia-"
 	line "like, but the"
 	cont "pages are blank!"
 	done
 
-_OaksLabText8: ; 95268 (25:5268)
+_OaksLabText8:: ; 95268 (25:5268)
 	text "?"
 	done
 
-_UnnamedText_1d340: ; 9526b (25:526b)
+_UnnamedText_1d340:: ; 9526b (25:526b)
 	text "PROF.OAK is the"
 	line "authority on"
 	cont "#MON!"
@@ -181,13 +181,13 @@
 	cont "in high regard!"
 	done
 
-_OaksLabRivalWaitingText: ; 952bb (25:52bb)
+_OaksLabRivalWaitingText:: ; 952bb (25:52bb)
 	text $53, ": Gramps!"
 	line "I'm fed up with"
 	cont "waiting!"
 	done
 
-_OaksLabChooseMonText: ; 952df (25:52df)
+_OaksLabChooseMonText:: ; 952df (25:52df)
 	text "OAK: ", $53, "?"
 	line "Let me think..."
 
@@ -215,35 +215,35 @@
 	cont "one! Choose!"
 	done
 
-_OaksLabRivalInterjectionText: ; 953dc (25:53dc)
+_OaksLabRivalInterjectionText:: ; 953dc (25:53dc)
 	text $53, ": Hey!"
 	line "Gramps! What"
 	cont "about me?"
 	done
 
-_OaksLabBePatientText: ; 953fc (25:53fc)
+_OaksLabBePatientText:: ; 953fc (25:53fc)
 	text "OAK: Be patient!"
 	line $53, ", you can"
 	cont "have one too!"
 	done
 
-_OaksLabLeavingText: ; 95427 (25:5427)
+_OaksLabLeavingText:: ; 95427 (25:5427)
 	text "OAK: Hey! Don't go"
 	line "away yet!"
 	done
 
-_OaksLabRivalPickingMonText: ; 95444 (25:5444)
+_OaksLabRivalPickingMonText:: ; 95444 (25:5444)
 	text $53, ": I'll take"
 	line "this one, then!"
 	done
 
-_OaksLabRivalReceivedMonText: ; 95461 (25:5461)
+_OaksLabRivalReceivedMonText:: ; 95461 (25:5461)
 	text $53, " received"
 	line "a @"
 	TX_RAM $cd6d
 	text "!@@"
 
-_OaksLabRivalChallengeText: ; 95477 (25:5477)
+_OaksLabRivalChallengeText:: ; 95477 (25:5477)
 	text $53, ": Wait"
 	line $52, "!"
 	cont "Let's check out"
@@ -253,7 +253,7 @@
 	line "you on!"
 	done
 
-_UnnamedText_1d3be: ; 954b6 (25:54b6)
+_UnnamedText_1d3be:: ; 954b6 (25:54b6)
 	text "WHAT?"
 	line "Unbelievable!"
 	cont "I picked the"
@@ -260,12 +260,12 @@
 	cont "wrong #MON!"
 	prompt
 
-_UnnamedText_1d3c3: ; 954e4 (25:54e4)
+_UnnamedText_1d3c3:: ; 954e4 (25:54e4)
 	text $53, ": Yeah! Am"
 	line "I great or what?"
 	prompt
 
-_OaksLabRivalToughenUpText: ; 95502 (25:5502)
+_OaksLabRivalToughenUpText:: ; 95502 (25:5502)
 	text $53, ": Okay!"
 	line "I'll make my"
 	cont "#MON fight to"
@@ -275,22 +275,22 @@
 	line "Smell you later!"
 	done
 
-_OaksLabText21: ; 95551 (25:5551)
+_OaksLabText21:: ; 95551 (25:5551)
 	text $53, ": Gramps!"
 	done
 
-_OaksLabText22: ; 9555d (25:555d)
+_OaksLabText22:: ; 9555d (25:555d)
 	text $53, ": What did"
 	line "you call me for?"
 	done
 
-_OaksLabText23: ; 9557b (25:557b)
+_OaksLabText23:: ; 9557b (25:557b)
 	text "OAK: Oh right! I"
 	line "have a request"
 	cont "of you two."
 	done
 
-_OaksLabText24: ; 955a8 (25:55a8)
+_OaksLabText24:: ; 955a8 (25:55a8)
 	text "On the desk there"
 	line "is my invention,"
 	cont "#DEX!"
@@ -304,7 +304,7 @@
 	line "encyclopedia!"
 	done
 
-_OaksLabText25: ; 9562a (25:562a)
+_OaksLabText25:: ; 9562a (25:562a)
 	text "OAK: ", $52, " and"
 	line $53, "! Take"
 	cont "these with you!"
@@ -312,7 +312,7 @@
 	para $52, " got"
 	line "#DEX from OAK!@@"
 
-_OaksLabText26: ; 95664 (25:5664)
+_OaksLabText26:: ; 95664 (25:5664)
 	text "To make a complete"
 	line "guide on all the"
 	cont "#MON in the"
@@ -335,7 +335,7 @@
 	cont "#MON history!"
 	done
 
-_OaksLabText27: ; 95741 (25:5741)
+_OaksLabText27:: ; 95741 (25:5741)
 	text $53, ": Alright"
 	line "Gramps! Leave it"
 	cont "all to me!"
@@ -353,12 +353,12 @@
 	cont $52, "! Hahaha!"
 	done
 
-_UnnamedText_1d405: ; 957eb (25:57eb)
+_UnnamedText_1d405:: ; 957eb (25:57eb)
 	text "I study #MON as"
 	line "PROF.OAK's AIDE."
 	done
 
-_UnnamedText_441cc: ; 9580c (25:580c)
+_UnnamedText_441cc:: ; 9580c (25:580c)
 	text "#DEX comp-"
 	line "letion is:"
 
@@ -373,7 +373,7 @@
 	line "Rating:"
 	prompt
 
-_UnnamedText_44201: ; 95858 (25:5858)
+_UnnamedText_44201:: ; 95858 (25:5858)
 	text "You still have"
 	line "lots to do."
 	cont "Look for #MON"
@@ -380,7 +380,7 @@
 	cont "in grassy areas!"
 	done
 
-_UnnamedText_44206: ; 95893 (25:5893)
+_UnnamedText_44206:: ; 95893 (25:5893)
 	text "You're on the"
 	line "right track! "
 	cont "Get a FLASH HM"
@@ -387,7 +387,7 @@
 	cont "from my AIDE!"
 	done
 
-_UnnamedText_4420b: ; 958cc (25:58cc)
+_UnnamedText_4420b:: ; 958cc (25:58cc)
 	text "You still need"
 	line "more #MON!"
 	cont "Try to catch"
@@ -394,7 +394,7 @@
 	cont "other species!"
 	done
 
-_UnnamedText_44210: ; 95903 (25:5903)
+_UnnamedText_44210:: ; 95903 (25:5903)
 	text "Good, you're"
 	line "trying hard!"
 	cont "Get an ITEMFINDER"
@@ -401,13 +401,13 @@
 	cont "from my AIDE!"
 	done
 
-_UnnamedText_44215: ; 9593d (25:593d)
+_UnnamedText_44215:: ; 9593d (25:593d)
 	text "Looking good!"
 	line "Go find my AIDE"
 	cont "when you get 50!"
 	done
 
-_UnnamedText_4421a: ; 9596d (25:596d)
+_UnnamedText_4421a:: ; 9596d (25:596d)
 	text "You finally got at"
 	line "least 50 species!"
 	cont "Be sure to get"
@@ -415,30 +415,30 @@
 	cont "AIDE!"
 	done
 
-_UnnamedText_4421f: ; 959b8 (25:59b8)
+_UnnamedText_4421f:: ; 959b8 (25:59b8)
 	text "Ho! This is geting"
 	line "even better!"
 	done
 
-_UnnamedText_44224: ; 959d9 (25:59d9)
+_UnnamedText_44224:: ; 959d9 (25:59d9)
 	text "Very good!"
 	line "Go fish for some"
 	cont "marine #MON!"
 	done
 
-_UnnamedText_44229: ; 95a03 (25:5a03)
+_UnnamedText_44229:: ; 95a03 (25:5a03)
 	text "Wonderful!"
 	line "Do you like to"
 	cont "collect things?"
 	done
 
-_UnnamedText_4422e: ; 95a2e (25:5a2e)
+_UnnamedText_4422e:: ; 95a2e (25:5a2e)
 	text "I'm impressed!"
 	line "It must have been"
 	cont "difficult to do!"
 	done
 
-_UnnamedText_44233: ; 95a60 (25:5a60)
+_UnnamedText_44233:: ; 95a60 (25:5a60)
 	text "You finally got at"
 	line "least 100 species!"
 	cont "I can't believe"
@@ -445,25 +445,25 @@
 	cont "how good you are!"
 	done
 
-_UnnamedText_44238: ; 95aa8 (25:5aa8)
+_UnnamedText_44238:: ; 95aa8 (25:5aa8)
 	text "You even have the"
 	line "evolved forms of"
 	cont "#MON! Super!"
 	done
 
-_UnnamedText_4423d: ; 95ad9 (25:5ad9)
+_UnnamedText_4423d:: ; 95ad9 (25:5ad9)
 	text "Excellent! Trade"
 	line "with friends to"
 	cont "get some more!"
 	done
 
-_UnnamedText_44242: ; 95b0a (25:5b0a)
+_UnnamedText_44242:: ; 95b0a (25:5b0a)
 	text "Outstanding!"
 	line "You've become a"
 	cont "real pro at this!"
 	done
 
-_UnnamedText_44247: ; 95b39 (25:5b39)
+_UnnamedText_44247:: ; 95b39 (25:5b39)
 	text "I have nothing"
 	line "left to say!"
 	cont "You're the"
@@ -470,7 +470,7 @@
 	cont "authority now!"
 	done
 
-_UnnamedText_4424c: ; 95b6f (25:5b6f)
+_UnnamedText_4424c:: ; 95b6f (25:5b6f)
 	text "Your #DEX is"
 	line "entirely complete!"
 	cont "Congratulations!"
--- a/text/maps/pallet_town.asm
+++ b/text/maps/pallet_town.asm
@@ -1,8 +1,8 @@
-_OakAppearsText:
+_OakAppearsText::
 	text "OAK: Hey! Wait!"
 	line "Don't go out!@@"
 
-_OakWalksUpText:
+_OakWalksUpText::
 	text "OAK: It's unsafe!"
 	line "Wild #MON live"
 	cont "in tall grass!"
@@ -16,7 +16,7 @@
 	line "me!"
 	done
 
-_PalletTownText2:
+_PalletTownText2::
 	text "I'm raising"
 	line "#MON too!"
 
@@ -25,7 +25,7 @@
 	cont "protect me!"
 	done
 
-_PalletTownText3:
+_PalletTownText3::
 	text "Technology is"
 	line "incredible!"
 
@@ -35,22 +35,22 @@
 	cont "data via PC!"
 	done
 
-_PalletTownText4:
+_PalletTownText4::
 	text "OAK #MON"
 	line "RESEARCH LAB"
 	done
 
-_PalletTownText5:
+_PalletTownText5::
 	text "PALLET TOWN"
 	line "Shades of your"
 	cont "journey await!"
 	done
 
-_PalletTownText6:
+_PalletTownText6::
 	text $52,"'s house "
 	done
 
-_PalletTownText7:
+_PalletTownText7::
 	text $53,"'s house "
 	done
 
--- a/text/maps/pewter_city.asm
+++ b/text/maps/pewter_city.asm
@@ -1,4 +1,4 @@
-_PewterCityText1: ; a497f (29:497f)
+_PewterCityText1:: ; a497f (29:497f)
 	text "It's rumored that"
 	line "CLEFAIRYs came"
 	cont "from the moon!"
@@ -8,7 +8,7 @@
 	cont "fell on MT.MOON."
 	done
 
-_PewterCityText2: ; a49e0 (29:49e0)
+_PewterCityText2:: ; a49e0 (29:49e0)
 	text "There aren't many"
 	line "serious #MON"
 	cont "trainers here!"
@@ -20,24 +20,24 @@
 	cont "into it!"
 	done
 
-_UnnamedText_193f1: ; a4a56 (29:4a56)
+_UnnamedText_193f1:: ; a4a56 (29:4a56)
 	text "Did you check out"
 	line "the MUSEUM?"
 	done
 
-_UnnamedText_193f6: ; a4a75 (29:4a75)
+_UnnamedText_193f6:: ; a4a75 (29:4a75)
 	text "Weren't those"
 	line "fossils from MT."
 	cont "MOON amazing?"
 	done
 
-_UnnamedText_193fb: ; a4aa2 (29:4aa2)
+_UnnamedText_193fb:: ; a4aa2 (29:4aa2)
 	text "Really?"
 	line "You absolutely"
 	cont "have to go!"
 	done
 
-_PewterCityText13: ; a4ac6 (29:4ac6)
+_PewterCityText13:: ; a4ac6 (29:4ac6)
 	text "It's right here!"
 	line "You have to pay"
 	cont "to get in, but"
@@ -45,24 +45,24 @@
 	cont "See you around!"
 	done
 
-_UnnamedText_19427: ; a4b14 (29:4b14)
+_UnnamedText_19427:: ; a4b14 (29:4b14)
 	text "Psssst!"
 	line "Do you know what"
 	cont "I'm doing?"
 	done
 
-_UnnamedText_1942c: ; a4b38 (29:4b38)
+_UnnamedText_1942c:: ; a4b38 (29:4b38)
 	text "That's right!"
 	line "It's hard work!"
 	done
 
-_UnnamedText_19431: ; a4b55 (29:4b55)
+_UnnamedText_19431:: ; a4b55 (29:4b55)
 	text "I'm spraying REPEL"
 	line "to keep #MON"
 	cont "out of my garden!"
 	done
 
-_UnnamedText_1945d: ; a4b87 (29:4b87)
+_UnnamedText_1945d:: ; a4b87 (29:4b87)
 	text "You're a trainer"
 	line "right? BROCK's"
 	cont "looking for new"
@@ -70,13 +70,13 @@
 	cont "Follow me!"
 	done
 
-_UnnamedText_19462: ; a4bce (29:4bce)
+_UnnamedText_19462:: ; a4bce (29:4bce)
 	text "If you have the"
 	line "right stuff, go"
 	cont "take on BROCK!"
 	done
 
-_PewterCityText6: ; a4bfe (29:4bfe)
+_PewterCityText6:: ; a4bfe (29:4bfe)
 	text "TRAINER TIPS"
 
 	para "Any #MON that"
@@ -85,7 +85,7 @@
 	cont "short, earns EXP!"
 	done
 
-_PewterCityText7: ; a4c4a (29:4c4a)
+_PewterCityText7:: ; a4c4a (29:4c4a)
 	text "NOTICE!"
 
 	para "Thieves have been"
@@ -96,12 +96,12 @@
 	cont "with any info!"
 	done
 
-_PewterCityText10: ; a4cb1 (29:4cb1)
+_PewterCityText10:: ; a4cb1 (29:4cb1)
 	text "PEWTER MUSEUM"
 	line "OF SCIENCE"
 	done
 
-_PewterCityText11: ; a4ccb (29:4ccb)
+_PewterCityText11:: ; a4ccb (29:4ccb)
 	text "PEWTER CITY"
 	line "#MON GYM"
 	cont "LEADER: BROCK"
@@ -110,7 +110,7 @@
 	line "#MON Trainer!"
 	done
 
-_PewterCityText12: ; a4d0c (29:4d0c)
+_PewterCityText12:: ; a4d0c (29:4d0c)
 	text "PEWTER CITY"
 	line "A Stone Gray"
 	cont "City"
--- a/text/maps/pewter_gym_1.asm
+++ b/text/maps/pewter_gym_1.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5c49e: ; 9697a (25:697a)
+_UnnamedText_5c49e:: ; 9697a (25:697a)
 	text "I'm BROCK!"
 	line "I'm PEWTER's GYM"
 	cont "LEADER!"
--- a/text/maps/pewter_gym_2.asm
+++ b/text/maps/pewter_gym_2.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5c4a3: ; 98000 (26:4000)
+_UnnamedText_5c4a3:: ; 98000 (26:4000)
 	text "There are all"
 	line "kinds of trainers"
 	cont "in the world!"
@@ -12,16 +12,16 @@
 	cont "your abilities!"
 	done
 
-_TM34PreReceiveText: ; 98092 (26:4092)
+_TM34PreReceiveText:: ; 98092 (26:4092)
 	text "Wait! Take this"
 	line "with you!"
 	done
 
-_ReceivedTM34Text: ; 980ad (26:40ad)
+_ReceivedTM34Text:: ; 980ad (26:40ad)
 	text $52, " received"
 	line "TM34!@@"
 
-_TM34ExplanationText: ; 980c0 (26:40c0)
+_TM34ExplanationText:: ; 980c0 (26:40c0)
 	db $0
 	para "A TM contains a"
 	line "technique that"
@@ -44,12 +44,12 @@
 	cont "it back double!"
 	done
 
-_TM34NoRoomText: ; 981ab (26:41ab)
+_TM34NoRoomText:: ; 981ab (26:41ab)
 	text "You don't have"
 	line "room for this!"
 	done
 
-_UnnamedText_5c4bc: ; 981c9 (26:41c9)
+_UnnamedText_5c4bc:: ; 981c9 (26:41c9)
 	text "I took"
 	line "you for granted."
 
@@ -60,7 +60,7 @@
 	para $52, " received"
 	line "the BOULDERBADGE!@@"
 
-_UnnamedText_5c4c1: ; 98232 (26:4232)
+_UnnamedText_5c4c1:: ; 98232 (26:4232)
 	db $0
 	para "That's an official"
 	line "#MON LEAGUE"
@@ -75,7 +75,7 @@
 	cont "used any time!"
 	prompt
 
-_PewterGymBattleText1: ; 982ae (26:42ae)
+_PewterGymBattleText1:: ; 982ae (26:42ae)
 	text "Stop right there,"
 	line "kid!"
 
@@ -84,7 +84,7 @@
 	cont "BROCK!"
 	done
 
-_PewterGymEndBattleText1: ; 982f1 (26:42f1)
+_PewterGymEndBattleText1:: ; 982f1 (26:42f1)
 	text "Darn!"
 
 	para "Light years isn't"
@@ -92,13 +92,13 @@
 	cont "distance!"
 	prompt
 
-_PewterGymAfterBattleText1: ; 98325 (26:4325)
+_PewterGymAfterBattleText1:: ; 98325 (26:4325)
 	text "You're pretty hot,"
 	line "but not as hot"
 	cont "as BROCK!"
 	done
 
-_UnnamedText_5c515: ; 98351 (26:4351)
+_UnnamedText_5c515:: ; 98351 (26:4351)
 	text "Hiya! I can tell"
 	line "you have what it"
 	cont "takes to become a"
@@ -112,12 +112,12 @@
 	line "to the top!"
 	done
 
-_UnnamedText_5c51a: ; 983dc (26:43dc)
+_UnnamedText_5c51a:: ; 983dc (26:43dc)
 	text "All right! Let's"
 	line "get happening!"
 	prompt
 
-_UnnamedText_5c51f: ; 983fc (26:43fc)
+_UnnamedText_5c51f:: ; 983fc (26:43fc)
 	text "The 1st #MON"
 	line "out in a match is"
 	cont "at the top of the"
@@ -129,13 +129,13 @@
 	cont "made easier!"
 	done
 
-_UnnamedText_5c524: ; 98476 (26:4476)
+_UnnamedText_5c524:: ; 98476 (26:4476)
 	text "It's a free"
 	line "service! Let's"
 	cont "get happening!"
 	prompt
 
-_UnnamedText_5c529: ; 9849f (26:449f)
+_UnnamedText_5c529:: ; 9849f (26:449f)
 	text "Just as I thought!"
 	line "You're #MON"
 	cont "champ material!"
--- a/text/maps/pewter_house_1.asm
+++ b/text/maps/pewter_house_1.asm
@@ -1,11 +1,11 @@
-_PewterHouse1Text1: ; 984ce (26:44ce)
+_PewterHouse1Text1:: ; 984ce (26:44ce)
 	text "NIDORAN: Bowbow!@@"
 
-_PewterHouse1Text2: ; 984e1 (26:44e1)
+_PewterHouse1Text2:: ; 984e1 (26:44e1)
 	text "NIDORAN sit!"
 	done
 
-_PewterHouse1Text3: ; 984ef (26:44ef)
+_PewterHouse1Text3:: ; 984ef (26:44ef)
 	text "Our #MON's an"
 	line "outsider, so it's"
 	cont "hard to handle."
--- a/text/maps/pewter_house_2.asm
+++ b/text/maps/pewter_house_2.asm
@@ -1,4 +1,4 @@
-_PewterHouse2Text1: ; 98656 (26:4656)
+_PewterHouse2Text1:: ; 98656 (26:4656)
 	text "#MON learn new"
 	line "techniques as"
 	cont "they grow!"
@@ -8,7 +8,7 @@
 	cont "the trainer!"
 	done
 
-_PewterHouse2Text2: ; 986ae (26:46ae)
+_PewterHouse2Text2:: ; 986ae (26:46ae)
 	text "#MON become"
 	line "easier to catch"
 	cont "when they are"
--- a/text/maps/pewter_mart.asm
+++ b/text/maps/pewter_mart.asm
@@ -1,4 +1,4 @@
-_UnnamedText_74cc6: ; 985ac (26:45ac)
+_UnnamedText_74cc6:: ; 985ac (26:45ac)
 	text "A shady, old man"
 	line "got me to buy"
 	cont "this really weird"
@@ -8,7 +8,7 @@
 	line "and it cost ¥500!"
 	done
 
-_UnnamedText_74cd5: ; 9860c (26:460c)
+_UnnamedText_74cd5:: ; 9860c (26:460c)
 	text "Good things can"
 	line "happen if you"
 	cont "raise #MON"
--- a/text/maps/pewter_pokecenter.asm
+++ b/text/maps/pewter_pokecenter.asm
@@ -1,4 +1,4 @@
-_PewterPokecenterText1: ; 98704 (26:4704)
+_PewterPokecenterText1:: ; 98704 (26:4704)
 	text "What!?"
 
 	para "TEAM ROCKET is"
@@ -8,7 +8,7 @@
 	para "Scram!"
 	done
 
-_PewterPokecenterText5: ; 98744 (26:4744)
+_PewterPokecenterText5:: ; 98744 (26:4744)
 	text "JIGGLYPUFF: Puu"
 	line "pupuu!"
 	done
--- a/text/maps/pokemon_league_gate.asm
+++ b/text/maps/pokemon_league_gate.asm
@@ -1,4 +1,4 @@
-_UnnamedText_1e704: ; 8cfbb (23:4fbb)
+_UnnamedText_1e704:: ; 8cfbb (23:4fbb)
 	text "Only truly skilled"
 	line "trainers are"
 	cont "allowed through."
@@ -6,7 +6,7 @@
 	para "You don't have the"
 	line "BOULDERBADGE yet!@@"
 
-_UnnamedText_1e715: ; 8d012 (23:5012)
+_UnnamedText_1e715:: ; 8d012 (23:5012)
 	db $0
 	para "The rules are"
 	line "rules. I can't"
@@ -13,7 +13,7 @@
 	cont "let you pass."
 	done
 
-_UnnamedText_1e71a: ; 8d03e (23:503e)
+_UnnamedText_1e71a:: ; 8d03e (23:503e)
 	text "Oh! That is the"
 	line "BOULDERBADGE!"
 	cont "Go right ahead!@@"
--- a/text/maps/pokemon_tower_1f.asm
+++ b/text/maps/pokemon_tower_1f.asm
@@ -1,4 +1,4 @@
-_PokemonTower1Text1: ; 9947f (26:547f)
+_PokemonTower1Text1:: ; 9947f (26:547f)
 	text "#MON TOWER was"
 	line "erected in the"
 	cont "memory of #MON"
@@ -5,13 +5,13 @@
 	cont "that had died."
 	done
 
-_PokemonTower1Text2: ; 994bc (26:54bc)
+_PokemonTower1Text2:: ; 994bc (26:54bc)
 	text "Did you come to"
 	line "pay respects?"
 	cont "Bless you!"
 	done
 
-_PokemonTower1Text3: ; 994e6 (26:54e6)
+_PokemonTower1Text3:: ; 994e6 (26:54e6)
 	text "I came to pray"
 	line "for my CLEFAIRY."
 
@@ -19,12 +19,12 @@
 	line "stop crying..."
 	done
 
-_PokemonTower1Text4: ; 99524 (26:5524)
+_PokemonTower1Text4:: ; 99524 (26:5524)
 	text "My GROWLITHE..."
 	line "Why did you die?"
 	done
 
-_PokemonTower1Text5: ; 99546 (26:5546)
+_PokemonTower1Text5:: ; 99546 (26:5546)
 	text "I am a CHANNELER!"
 	line "There are spirits"
 	cont "up to mischief!"
--- a/text/maps/pokemon_tower_2f.asm
+++ b/text/maps/pokemon_tower_2f.asm
@@ -1,4 +1,4 @@
-_UnnamedText_6062d: ; 9957b (26:557b)
+_UnnamedText_6062d:: ; 9957b (26:557b)
 	text $53, ": Hey,"
 	line $52, "! What"
 	cont "brings you here?"
@@ -10,7 +10,7 @@
 	cont "Let's go, pal!"
 	done
 
-_UnnamedText_60632: ; 995e5 (26:55e5)
+_UnnamedText_60632:: ; 995e5 (26:55e5)
 	text "What?"
 	line "You stinker!"
 
@@ -18,7 +18,7 @@
 	line "you too!"
 	prompt
 
-_UnnamedText_60637: ; 99614 (26:5614)
+_UnnamedText_60637:: ; 99614 (26:5614)
 	text $53, ": Well,"
 	line "look at all your"
 	cont "wimpy #MON!"
@@ -27,7 +27,7 @@
 	line "bit more!"
 	prompt
 
-_UnnamedText_6063c: ; 99657 (26:5657)
+_UnnamedText_6063c:: ; 99657 (26:5657)
 	text "How's your #DEX"
 	line "coming, pal?"
 	cont "I just caught a"
@@ -46,7 +46,7 @@
 	para "Smell ya later!"
 	done
 
-_PokemonTower2Text2: ; 9971a (26:571a)
+_PokemonTower2Text2:: ; 9971a (26:571a)
 	text "Even we could not"
 	line "identify the"
 	cont "wayward GHOSTs!"
--- a/text/maps/pokemon_tower_3f.asm
+++ b/text/maps/pokemon_tower_3f.asm
@@ -1,45 +1,45 @@
-_PokemonTower3BattleText1: ; 99776 (26:5776)
+_PokemonTower3BattleText1:: ; 99776 (26:5776)
 	text "Urrg...Awaa..."
 	line "Huhu...graa.."
 	done
 
-_PokemonTower3EndBattleText1: ; 99794 (26:5794)
+_PokemonTower3EndBattleText1:: ; 99794 (26:5794)
 	text "Hwa!"
 	line "I'm saved!"
 	prompt
 
-_PokemonTower3AfterBattleText1: ; 997a4 (26:57a4)
+_PokemonTower3AfterBattleText1:: ; 997a4 (26:57a4)
 	text "The GHOSTs can be"
 	line "identified by the"
 	cont "SILPH SCOPE."
 	done
 
-_PokemonTower3BattleText2: ; 997d6 (26:57d6)
+_PokemonTower3BattleText2:: ; 997d6 (26:57d6)
 	text "Kekeke...."
 	line "Kwaaah!"
 	done
 
-_PokemonTower3EndBattleText2: ; 997ea (26:57ea)
+_PokemonTower3EndBattleText2:: ; 997ea (26:57ea)
 	text "Hmm?"
 	line "What am I doing?"
 	prompt
 
-_PokemonTower3AfterBattleText2: ; 99801 (26:5801)
+_PokemonTower3AfterBattleText2:: ; 99801 (26:5801)
 	text "Sorry! I was"
 	line "possessed!"
 	done
 
-_PokemonTower3BattleText3: ; 9981a (26:581a)
+_PokemonTower3BattleText3:: ; 9981a (26:581a)
 	text "Be gone!"
 	line "Evil spirit!"
 	done
 
-_PokemonTower3EndBattleText3: ; 99831 (26:5831)
+_PokemonTower3EndBattleText3:: ; 99831 (26:5831)
 	text "Whew!"
 	line "The spirit left!"
 	prompt
 
-_PokemonTower3AfterBattleText3: ; 99849 (26:5849)
+_PokemonTower3AfterBattleText3:: ; 99849 (26:5849)
 	text "My friends were"
 	line "possessed too!"
 	done
--- a/text/maps/pokemon_tower_4f.asm
+++ b/text/maps/pokemon_tower_4f.asm
@@ -1,44 +1,44 @@
-_PokemonTower4BattleText1: ; 99869 (26:5869)
+_PokemonTower4BattleText1:: ; 99869 (26:5869)
 	text "GHOST! No!"
 	line "Kwaaah!"
 	done
 
-_PokemonTower4EndBattleText1: ; 9987d (26:587d)
+_PokemonTower4EndBattleText1:: ; 9987d (26:587d)
 	text "Where"
 	line "is the GHOST?"
 	prompt
 
-_PokemonTower4AfterBattleText1: ; 99892 (26:5892)
+_PokemonTower4AfterBattleText1:: ; 99892 (26:5892)
 	text "I must have been"
 	line "dreaming..."
 	done
 
-_PokemonTower4BattleText2: ; 998b0 (26:58b0)
+_PokemonTower4BattleText2:: ; 998b0 (26:58b0)
 	text "Be cursed with"
 	line "me! Kwaaah!"
 	done
 
-_PokemonTower4EndBattleText2: ; 998cc (26:58cc)
+_PokemonTower4EndBattleText2:: ; 998cc (26:58cc)
 	text "What!"
 	prompt
 
-_PokemonTower4AfterBattleText2: ; 998d3 (26:58d3)
+_PokemonTower4AfterBattleText2:: ; 998d3 (26:58d3)
 	text "We can't crack"
 	line "the identity of"
 	cont "the GHOSTs."
 	done
 
-_PokemonTower4BattleText3: ; 998fe (26:58fe)
+_PokemonTower4BattleText3:: ; 998fe (26:58fe)
 	text "Huhuhu..."
 	line "Beat me not!"
 	done
 
-_PokemonTower4EndBattleText3: ; 99916 (26:5916)
+_PokemonTower4EndBattleText3:: ; 99916 (26:5916)
 	text "Huh?"
 	line "Who? What?"
 	prompt
 
-_PokemonTower4AfterBattleText3: ; 99927 (26:5927)
+_PokemonTower4AfterBattleText3:: ; 99927 (26:5927)
 	text "May the departed"
 	line "souls of #MON"
 	cont "rest in peace..."
--- a/text/maps/pokemon_tower_5f.asm
+++ b/text/maps/pokemon_tower_5f.asm
@@ -1,4 +1,4 @@
-_PokemonTower5Text1: ; 99958 (26:5958)
+_PokemonTower5Text1:: ; 99958 (26:5958)
 	text "Come, child! I"
 	line "sealed this space"
 	cont "with white magic!"
@@ -6,63 +6,63 @@
 	para "You can rest here!"
 	done
 
-_PokemonTower5BattleText1: ; 9999f (26:599f)
+_PokemonTower5BattleText1:: ; 9999f (26:599f)
 	text "Give...me..."
 	line "your...soul..."
 	done
 
-_PokemonTower5EndBattleText1: ; 999bc (26:59bc)
+_PokemonTower5EndBattleText1:: ; 999bc (26:59bc)
 	text "Gasp!"
 	prompt
 
-_PokemonTower5AfterBattleText1: ; 999c3 (26:59c3)
+_PokemonTower5AfterBattleText1:: ; 999c3 (26:59c3)
 	text "I was under"
 	line "possession!"
 	done
 
-_PokemonTower5BattleText2: ; 999dc (26:59dc)
+_PokemonTower5BattleText2:: ; 999dc (26:59dc)
 	text "You...shall..."
 	line "join...us..."
 	done
 
-_PokemonTower5EndBattleText2: ; 999f9 (26:59f9)
+_PokemonTower5EndBattleText2:: ; 999f9 (26:59f9)
 	text "What"
 	line "a nightmare!"
 	prompt
 
-_PokemonTower5AfterBattleText2: ; 99a0c (26:5a0c)
+_PokemonTower5AfterBattleText2:: ; 99a0c (26:5a0c)
 	text "I was possessed!"
 	done
 
-_PokemonTower5BattleText3: ; 99a1e (26:5a1e)
+_PokemonTower5BattleText3:: ; 99a1e (26:5a1e)
 	text "Zombies!"
 	done
 
-_PokemonTower5EndBattleText3: ; 99a28 (26:5a28)
+_PokemonTower5EndBattleText3:: ; 99a28 (26:5a28)
 	text "Ha?"
 	prompt
 
-_PokemonTower5AfterBattleText3: ; 99a2d (26:5a2d)
+_PokemonTower5AfterBattleText3:: ; 99a2d (26:5a2d)
 	text "I regained my"
 	line "senses!"
 	done
 
-_PokemonTower5BattleText4: ; 99a44 (26:5a44)
+_PokemonTower5BattleText4:: ; 99a44 (26:5a44)
 	text "Urgah..."
 	line "Urff...."
 	done
 
-_PokemonTower5EndBattleText4: ; 99a57 (26:5a57)
+_PokemonTower5EndBattleText4:: ; 99a57 (26:5a57)
 	text "Whoo!"
 	prompt
 
-_PokemonTower5AfterBattleText4: ; 99a5e (26:5a5e)
+_PokemonTower5AfterBattleText4:: ; 99a5e (26:5a5e)
 	text "I fell to evil"
 	line "spirits despite"
 	cont "my training!"
 	done
 
-_UnnamedText_60a43: ; 99a8b (26:5a8b)
+_UnnamedText_60a43:: ; 99a8b (26:5a8b)
 	text "Entered purified,"
 	line "protected zone!"
 
--- a/text/maps/pokemon_tower_6f.asm
+++ b/text/maps/pokemon_tower_6f.asm
@@ -1,10 +1,10 @@
-_UnnamedText_60c1f: ; 99ac8 (26:5ac8)
+_UnnamedText_60c1f:: ; 99ac8 (26:5ac8)
 	text "The GHOST was the"
 	line "restless soul of"
 	cont "CUBONE's mother!"
 	done
 
-_UnnamedText_60c24: ; 99afc (26:5afc)
+_UnnamedText_60c24:: ; 99afc (26:5afc)
 	text "The mother's soul"
 	line "was calmed."
 
@@ -12,50 +12,50 @@
 	line "the afterlife!"
 	done
 
-_PokemonTower6BattleText1: ; 99b38 (26:5b38)
+_PokemonTower6BattleText1:: ; 99b38 (26:5b38)
 	text "Give...me..."
 	line "blood..."
 	done
 
-_PokemonTower6EndBattleText1: ; 99b4f (26:5b4f)
+_PokemonTower6EndBattleText1:: ; 99b4f (26:5b4f)
 	text "Groan!"
 	prompt
 
-_PokemonTower6AfterBattleText1: ; 99b57 (26:5b57)
+_PokemonTower6AfterBattleText1:: ; 99b57 (26:5b57)
 	text "I feel anemic and"
 	line "weak..."
 	done
 
-_PokemonTower6BattleText2: ; 99b72 (26:5b72)
+_PokemonTower6BattleText2:: ; 99b72 (26:5b72)
 	text "Urff... Kwaah!"
 	done
 
-_PokemonTower6EndBattleText2: ; 99b82 (26:5b82)
+_PokemonTower6EndBattleText2:: ; 99b82 (26:5b82)
 	text "Some-"
 	line "thing fell out!"
 	prompt
 
-_PokemonTower6AfterBattleText2: ; 99b99 (26:5b99)
+_PokemonTower6AfterBattleText2:: ; 99b99 (26:5b99)
 	text "Hair didn't fall"
 	line "out! It was an"
 	cont "evil spirit!"
 	done
 
-_PokemonTower6BattleText3: ; 99bc6 (26:5bc6)
+_PokemonTower6BattleText3:: ; 99bc6 (26:5bc6)
 	text "Ke..ke...ke..."
 	line "ke..ke...ke!!"
 	done
 
-_PokemonTower6EndBattleText3: ; 99be4 (26:5be4)
+_PokemonTower6EndBattleText3:: ; 99be4 (26:5be4)
 	text "Keee!"
 	prompt
 
-_PokemonTower6AfterBattleText3: ; 99beb (26:5beb)
+_PokemonTower6AfterBattleText3:: ; 99beb (26:5beb)
 	text "What's going on"
 	line "here?"
 	done
 
-_UnnamedText_60c56: ; 99c01 (26:5c01)
+_UnnamedText_60c56:: ; 99c01 (26:5c01)
 	text "Be gone..."
 	line "Intruders..."
 	done
--- a/text/maps/pokemon_tower_7f.asm
+++ b/text/maps/pokemon_tower_7f.asm
@@ -1,4 +1,4 @@
-_UnnamedText_60ec4: ; 99c1a (26:5c1a)
+_UnnamedText_60ec4:: ; 99c1a (26:5c1a)
 	text "MR.FUJI: Heh? You"
 	line "came to save me?"
 
@@ -24,21 +24,21 @@
 	cont "of this tower."
 	done
 
-_PokemonTower7BattleText1: ; 99d31 (26:5d31)
+_PokemonTower7BattleText1:: ; 99d31 (26:5d31)
 	text "What do you want?"
 	line "Why are you here?"
 	done
 
-_PokemonTower7EndBattleText1: ; 99d56 (26:5d56)
+_PokemonTower7EndBattleText1:: ; 99d56 (26:5d56)
 	text "I give up!"
 	prompt
 
-_PokemonTower7AfterBattleText1: ; 99d62 (26:5d62)
+_PokemonTower7AfterBattleText1:: ; 99d62 (26:5d62)
 	text "I'm not going to"
 	line "forget this!"
 	done
 
-_PokemonTower7BattleText2: ; 99d80 (26:5d80)
+_PokemonTower7BattleText2:: ; 99d80 (26:5d80)
 	text "This old guy came"
 	line "and complained"
 	cont "about us harming"
@@ -48,12 +48,12 @@
 	line "over as adults!"
 	done
 
-_PokemonTower7EndBattleText2: ; 99de1 (26:5de1)
+_PokemonTower7EndBattleText2:: ; 99de1 (26:5de1)
 	text "Please!"
 	line "No more!"
 	prompt
 
-_PokemonTower7AfterBattleText2: ; 99df3 (26:5df3)
+_PokemonTower7AfterBattleText2:: ; 99df3 (26:5df3)
 	text "#MON are only"
 	line "good for making"
 	cont "money!"
@@ -62,17 +62,17 @@
 	line "business!"
 	done
 
-_PokemonTower7BattleText3: ; 99e33 (26:5e33)
+_PokemonTower7BattleText3:: ; 99e33 (26:5e33)
 	text "You're not saving"
 	line "anyone, kid!"
 	done
 
-_PokemonTower7EndBattleText3: ; 99e52 (26:5e52)
+_PokemonTower7EndBattleText3:: ; 99e52 (26:5e52)
 	text "Don't"
 	line "fight us ROCKETs!"
 	prompt
 
-_PokemonTower7AfterBattleText3: ; 99e6a (26:5e6a)
+_PokemonTower7AfterBattleText3:: ; 99e6a (26:5e6a)
 	text "You're not getting"
 	line "away with this!"
 	done
--- a/text/maps/power_plant.asm
+++ b/text/maps/power_plant.asm
@@ -1,7 +1,7 @@
-_VoltorbBattleText: ; 8c5e2 (23:45e2)
+_VoltorbBattleText:: ; 8c5e2 (23:45e2)
 	text "Bzzzt!"
 	done
 
-_ZapdosBattleText: ; 8c5ea (23:45ea)
+_ZapdosBattleText:: ; 8c5ea (23:45ea)
 	text "Gyaoo!@@"
 
--- a/text/maps/reds_house_1f.asm
+++ b/text/maps/reds_house_1f.asm
@@ -1,4 +1,4 @@
-_MomWakeUpText:
+_MomWakeUpText::
 	text "MOM: Right."
 	line "All boys leave"
 	cont "home some day."
@@ -9,13 +9,13 @@
 	cont "for you."
 	done
 
-_MomHealText1:
+_MomHealText1::
 	text "MOM: ",$52,"!"
 	line "You should take a"
 	cont "quick rest."
 	prompt
 
-_MomHealText2:
+_MomHealText2::
 	text "MOM: Oh good!"
 	line "You and your"
 	cont "#MON are"
@@ -23,7 +23,7 @@
 	cont "Take care now!"
 	done
 
-_StandByMeText:
+_StandByMeText::
 	text "There's a movie"
 	line "on TV. Four boys"
 	cont "are walking on"
@@ -32,7 +32,7 @@
 	para "I better go too."
 	done
 
-_TVWrongSideText:
+_TVWrongSideText::
 	text "Oops, wrong side."
 	done
 
--- a/text/maps/rock_tunnel_b1f.asm
+++ b/text/maps/rock_tunnel_b1f.asm
@@ -1,31 +1,31 @@
-_RockTunnel1BattleText1: ; 8c33a (23:433a)
+_RockTunnel1BattleText1:: ; 8c33a (23:433a)
 	text "This tunnel goes"
 	line "a long way, kid!"
 	done
 
-_RockTunnel1EndBattleText1: ; 8c35d (23:435d)
+_RockTunnel1EndBattleText1:: ; 8c35d (23:435d)
 	text "Doh!"
 	line "You win!"
 	prompt
 
-_RockTunnel1AfterBattleText1: ; 8c36c (23:436c)
+_RockTunnel1AfterBattleText1:: ; 8c36c (23:436c)
 	text "Watch for ONIX!"
 	line "It can put the"
 	cont "squeeze on you!"
 	done
 
-_RockTunnel1BattleText2: ; 8c39c (23:439c)
+_RockTunnel1BattleText2:: ; 8c39c (23:439c)
 	text "Hmm. Maybe I'm"
 	line "lost in here..."
 	done
 
-_RockTunnel1EndBattleText2: ; 8c3bb (23:43bb)
+_RockTunnel1EndBattleText2:: ; 8c3bb (23:43bb)
 	text "Ease up!"
 	line "What am I doing?"
 	cont "Which way is out?"
 	prompt
 
-_RockTunnel1AfterBattleText2: ; 8c3e8 (23:43e8)
+_RockTunnel1AfterBattleText2:: ; 8c3e8 (23:43e8)
 	text "That sleeping"
 	line "#MON on ROUTE"
 	cont "12 forced me to"
@@ -32,83 +32,83 @@
 	cont "take this detour."
 	done
 
-_RockTunnel1BattleText3: ; 8c427 (23:4427)
+_RockTunnel1BattleText3:: ; 8c427 (23:4427)
 	text "Outsiders like"
 	line "you need to show"
 	cont "me some respect!"
 	done
 
-_RockTunnel1EndBattleText3: ; 8c459 (23:4459)
+_RockTunnel1EndBattleText3:: ; 8c459 (23:4459)
 	text "I give!"
 	prompt
 
-_RockTunnel1AfterBattleText3: ; 8c462 (23:4462)
+_RockTunnel1AfterBattleText3:: ; 8c462 (23:4462)
 	text "You're talented"
 	line "enough to hike!"
 	done
 
-_RockTunnel1BattleText4: ; 8c482 (23:4482)
+_RockTunnel1BattleText4:: ; 8c482 (23:4482)
 	text "#MON fight!"
 	line "Ready, go!"
 	done
 
-_RockTunnel1EndBattleText4: ; 8c49a (23:449a)
+_RockTunnel1EndBattleText4:: ; 8c49a (23:449a)
 	text "Game"
 	line "over!"
 	prompt
 
-_RockTunnel1AfterBattleText4: ; 8c4a6 (23:44a6)
+_RockTunnel1AfterBattleText4:: ; 8c4a6 (23:44a6)
 	text "Oh well, I'll get"
 	line "a ZUBAT as I go!"
 	done
 
-_RockTunnel1BattleText5: ; 8c4c9 (23:44c9)
+_RockTunnel1BattleText5:: ; 8c4c9 (23:44c9)
 	text "Eek! Don't try"
 	line "anything funny in"
 	cont "the dark!"
 	done
 
-_RockTunnel1EndBattleText5: ; 8c4f4 (23:44f4)
+_RockTunnel1EndBattleText5:: ; 8c4f4 (23:44f4)
 	text "It"
 	line "was too dark!"
 	prompt
 
-_RockTunnel1AfterBattleText5: ; 8c506 (23:4506)
+_RockTunnel1AfterBattleText5:: ; 8c506 (23:4506)
 	text "I saw a MACHOP"
 	line "in this tunnel!"
 	done
 
-_RockTunnel1BattleText6: ; 8c526 (23:4526)
+_RockTunnel1BattleText6:: ; 8c526 (23:4526)
 	text "I came this far"
 	line "for #MON!"
 	done
 
-_RockTunnel1EndBattleText6: ; 8c541 (23:4541)
+_RockTunnel1EndBattleText6:: ; 8c541 (23:4541)
 	text "I'm"
 	line "out of #MON!"
 	prompt
 
-_RockTunnel1AfterBattleText6: ; 8c552 (23:4552)
+_RockTunnel1AfterBattleText6:: ; 8c552 (23:4552)
 	text "You looked cute"
 	line "and harmless!"
 	done
 
-_RockTunnel1BattleText7: ; 8c571 (23:4571)
+_RockTunnel1BattleText7:: ; 8c571 (23:4571)
 	text "You have #MON!"
 	line "Let's start!"
 	done
 
-_RockTunnel1EndBattleText7: ; 8c58d (23:458d)
+_RockTunnel1EndBattleText7:: ; 8c58d (23:458d)
 	text "You"
 	line "play hard!"
 	prompt
 
-_RockTunnel1AfterBattleText7: ; 8c59d (23:459d)
+_RockTunnel1AfterBattleText7:: ; 8c59d (23:459d)
 	text "Whew! I'm all"
 	line "sweaty now!"
 	done
 
-_RockTunnel1Text8: ; 8c5b7 (23:45b7)
+_RockTunnel1Text8:: ; 8c5b7 (23:45b7)
 	text "ROCK TUNNEL"
 	line "CERULEAN CITY -"
 	cont "LAVENDER TOWN"
--- a/text/maps/rock_tunnel_b2f_1.asm
+++ b/text/maps/rock_tunnel_b2f_1.asm
@@ -1,108 +1,108 @@
-_RockTunnel2BattleText2: ; 86a1d (21:6a1d)
+_RockTunnel2BattleText2:: ; 86a1d (21:6a1d)
 	text "Hikers leave twigs"
 	line "as trail markers."
 	done
 
-_RockTunnel2EndBattleText2: ; 86a43 (21:6a43)
+_RockTunnel2EndBattleText2:: ; 86a43 (21:6a43)
 	text "Ohhh!"
 	line "I did my best!"
 	prompt
 
-_RockTunnel2AfterBattleText2: ; 86a59 (21:6a59)
+_RockTunnel2AfterBattleText2:: ; 86a59 (21:6a59)
 	text "I want to go "
 	line "home!"
 	done
 
-_RockTunnel2BattleText3: ; 86a6e (21:6a6e)
+_RockTunnel2BattleText3:: ; 86a6e (21:6a6e)
 	text "Hahaha! Can you"
 	line "beat my power?"
 	done
 
-_RockTunnel2EndBattleText3: ; 86a8e (21:6a8e)
+_RockTunnel2EndBattleText3:: ; 86a8e (21:6a8e)
 	text "Oops!"
 	line "Out-muscled!"
 	prompt
 
-_RockTunnel2AfterBattleText3: ; 86aa2 (21:6aa2)
+_RockTunnel2AfterBattleText3:: ; 86aa2 (21:6aa2)
 	text "I go for power"
 	line "because I hate"
 	cont "thinking!"
 	done
 
-_RockTunnel2BattleText4: ; 86acb (21:6acb)
+_RockTunnel2BattleText4:: ; 86acb (21:6acb)
 	text "You have a"
 	line "#DEX?"
 	cont "I want one too!"
 	done
 
-_RockTunnel2EndBattleText4: ; 86aed (21:6aed)
+_RockTunnel2EndBattleText4:: ; 86aed (21:6aed)
 	text "Shoot!"
 	line "I'm so jealous!"
 	prompt
 
-_RockTunnel2AfterBattleText4: ; 86b04 (21:6b04)
+_RockTunnel2AfterBattleText4:: ; 86b04 (21:6b04)
 	text "When you finish"
 	line "your #DEX, can"
 	cont "I have it?"
 	done
 
-_RockTunnel2BattleText5: ; 86b2f (21:6b2f)
+_RockTunnel2BattleText5:: ; 86b2f (21:6b2f)
 	text "Do you know about"
 	line "costume players?"
 	done
 
-_RockTunnel2EndBattleText5: ; 86b53 (21:6b53)
+_RockTunnel2EndBattleText5:: ; 86b53 (21:6b53)
 	text "Well,"
 	line "that's that."
 	prompt
 
-_RockTunnel2AfterBattleText5: ; 86b66 (21:6b66)
+_RockTunnel2AfterBattleText5:: ; 86b66 (21:6b66)
 	text "Costume players"
 	line "dress up as"
 	cont "#MON for fun."
 	done
 
-_RockTunnel2BattleText6: ; 86b91 (21:6b91)
+_RockTunnel2BattleText6:: ; 86b91 (21:6b91)
 	text "My #MON"
 	line "techniques will"
 	cont "leave you crying!"
 	done
 
-_RockTunnel2EndBattleText6: ; 86bbc (21:6bbc)
+_RockTunnel2EndBattleText6:: ; 86bbc (21:6bbc)
 	text "I give!"
 	line "You're a better"
 	cont "technician!"
 	prompt
 
-_RockTunnel2AfterBattleText6: ; 86be0 (21:6be0)
+_RockTunnel2AfterBattleText6:: ; 86be0 (21:6be0)
 	text "In mountains,"
 	line "you'll often find"
 	cont "rock-type #MON."
 	done
 
-_RockTunnel2BattleText7: ; 86c10 (21:6c10)
+_RockTunnel2BattleText7:: ; 86c10 (21:6c10)
 	text "I don't often"
 	line "come here, but I"
 	cont "will fight you."
 	done
 
-_RockTunnel2EndBattleText7: ; 86c3f (21:6c3f)
+_RockTunnel2EndBattleText7:: ; 86c3f (21:6c3f)
 	text "Oh!"
 	line "I lost!"
 	prompt
 
-_RockTunnel2AfterBattleText7: ; 86c4c (21:6c4c)
+_RockTunnel2AfterBattleText7:: ; 86c4c (21:6c4c)
 	text "I like tiny"
 	line "#MON, big ones"
 	cont "are too scary!"
 	done
 
-_RockTunnel2BattleText8: ; 86c77 (21:6c77)
+_RockTunnel2BattleText8:: ; 86c77 (21:6c77)
 	text "Hit me with your"
 	line "best shot!"
 	done
 
-_RockTunnel2EndBattleText8: ; 86c94 (21:6c94)
+_RockTunnel2EndBattleText8:: ; 86c94 (21:6c94)
 	text "Fired"
 	line "away!"
 	prompt
--- a/text/maps/rock_tunnel_b2f_2.asm
+++ b/text/maps/rock_tunnel_b2f_2.asm
@@ -1,20 +1,20 @@
-_RockTunnel2AfterBattleText8: ; 88000 (22:4000)
+_RockTunnel2AfterBattleText8:: ; 88000 (22:4000)
 	text "I'll raise my"
 	line "#MON to beat"
 	cont "yours, kid!"
 	done
 
-_RockTunnel2BattleText9: ; 88027 (22:4027)
+_RockTunnel2BattleText9:: ; 88027 (22:4027)
 	text "I draw #MON"
 	line "when I'm home."
 	done
 
-_RockTunnel2EndBattleText9: ; 88042 (22:4042)
+_RockTunnel2EndBattleText9:: ; 88042 (22:4042)
 	text "Whew!"
 	line "I'm exhausted!"
 	prompt
 
-_RockTunnel2AfterBattleText9: ; 88057 (22:4057)
+_RockTunnel2AfterBattleText9:: ; 88057 (22:4057)
 	text "I'm an artist,"
 	line "not a fighter."
 	done
--- a/text/maps/rock_tunnel_pokecenter.asm
+++ b/text/maps/rock_tunnel_pokecenter.asm
@@ -1,4 +1,4 @@
-_RockTunnelPokecenterText1: ; 8c2c0 (23:42c0)
+_RockTunnelPokecenterText1:: ; 8c2c0 (23:42c0)
 	text "The element types"
 	line "of #MON make"
 	cont "them stronger"
@@ -7,7 +7,7 @@
 	cont "others!"
 	done
 
-_RockTunnelPokecenterText3: ; 8c316 (23:4316)
+_RockTunnelPokecenterText3:: ; 8c316 (23:4316)
 	text "I sold a useless"
 	line "NUGGET for ¥5000!"
 	done
--- a/text/maps/rocket_hideout_b1f.asm
+++ b/text/maps/rocket_hideout_b1f.asm
@@ -1,73 +1,73 @@
-_RocketHideout1EndBattleText6: ; 81f2a (20:5f2a)
+_RocketHideout1EndBattleText6:: ; 81f2a (20:5f2a)
 	text "Why...?@@"
 
-_RocketHideout1BattleText2: ; 81f34 (20:5f34)
+_RocketHideout1BattleText2:: ; 81f34 (20:5f34)
 	text "Who are you? How"
 	line "did you get here?"
 	done
 
-_RocketHideout1EndBattleText2: ; 81f58 (20:5f58)
+_RocketHideout1EndBattleText2:: ; 81f58 (20:5f58)
 	text "Oww!"
 	line "Beaten!"
 	prompt
 
-_RocketHideout1AfterBattleTxt2: ; 81f66 (20:5f66)
+_RocketHideout1AfterBattleTxt2:: ; 81f66 (20:5f66)
 	text "Are you dissing"
 	line "TEAM ROCKET?"
 	done
 
-_RocketHideout1BattleText3: ; 81f84 (20:5f84)
+_RocketHideout1BattleText3:: ; 81f84 (20:5f84)
 	text "You broke into"
 	line "our operation?"
 	done
 
-_RocketHideout1EndBattleText3: ; 81fa3 (20:5fa3)
+_RocketHideout1EndBattleText3:: ; 81fa3 (20:5fa3)
 	text "Burnt!"
 	prompt
 
-_RocketHideout1AfterBattleTxt3: ; 81fab (20:5fab)
+_RocketHideout1AfterBattleTxt3:: ; 81fab (20:5fab)
 	text "You're not going"
 	line "to get away with"
 	cont "this, brat!"
 	done
 
-_RocketHideout1BattleText4: ; 81fd9 (20:5fd9)
+_RocketHideout1BattleText4:: ; 81fd9 (20:5fd9)
 	text "Intruder alert!"
 	done
 
-_RocketHideout1EndBattleText4: ; 81fea (20:5fea)
+_RocketHideout1EndBattleText4:: ; 81fea (20:5fea)
 	text "I"
 	line "can't do it!"
 	prompt
 
-_RocketHideout1AfterBattleTxt4: ; 81ff9 (20:5ff9)
+_RocketHideout1AfterBattleTxt4:: ; 81ff9 (20:5ff9)
 	text "SILPH SCOPE?"
 	line "I don't know"
 	cont "where it is!"
 	done
 
-_RocketHideout1BattleText5: ; 82020 (20:6020)
+_RocketHideout1BattleText5:: ; 82020 (20:6020)
 	text "Why did you come"
 	line "here?"
 	done
 
-_RocketHideout1EndBattleText5: ; 82038 (20:6038)
+_RocketHideout1EndBattleText5:: ; 82038 (20:6038)
 	text "This"
 	line "won't do!"
 	prompt
 
-_RocketHideout1AfterBattleTxt5: ; 82047 (20:6047)
+_RocketHideout1AfterBattleTxt5:: ; 82047 (20:6047)
 	text "OK, I'll talk!"
 	line "Take the elevator"
 	cont "to see my BOSS!"
 	done
 
-_RocketHideout1BattleText6: ; 82078 (20:6078)
+_RocketHideout1BattleText6:: ; 82078 (20:6078)
 	text "Are you lost, you"
 	line "little rat?"
 	done
 
-_RocketHideout1AfterBattleTxt6: ; 82097 (20:6097)
+_RocketHideout1AfterBattleTxt6:: ; 82097 (20:6097)
 	text "Uh-oh, that fight"
 	line "opened the door!"
 	done
--- a/text/maps/rocket_hideout_b2f.asm
+++ b/text/maps/rocket_hideout_b2f.asm
@@ -1,15 +1,15 @@
-_RocketHideout2BattleText2: ; 820bb (20:60bb)
+_RocketHideout2BattleText2:: ; 820bb (20:60bb)
 	text "BOSS said you can"
 	line "see GHOSTs with"
 	cont "the SILPH SCOPE!"
 	done
 
-_RocketHideout2EndBattleText2: ; 820ef (20:60ef)
+_RocketHideout2EndBattleText2:: ; 820ef (20:60ef)
 	text "I"
 	line "surrender!"
 	prompt
 
-_RocketHideout2AfterBattleTxt2: ; 820fd (20:60fd)
+_RocketHideout2AfterBattleTxt2:: ; 820fd (20:60fd)
 	text "The TEAM ROCKET"
 	line "HQ has 4 basement"
 	cont "floors. Can you"
--- a/text/maps/rocket_hideout_b3f.asm
+++ b/text/maps/rocket_hideout_b3f.asm
@@ -1,15 +1,15 @@
-_RocketHideout3BattleText2: ; 82140 (20:6140)
+_RocketHideout3BattleText2:: ; 82140 (20:6140)
 	text "Stop meddling in"
 	line "TEAM ROCKET's"
 	cont "affairs!"
 	done
 
-_RocketHideout3EndBattleText2: ; 82168 (20:6168)
+_RocketHideout3EndBattleText2:: ; 82168 (20:6168)
 	text "Oof!"
 	line "Taken down!"
 	prompt
 
-_RocketHideout3AfterBattleTxt2: ; 8217a (20:617a)
+_RocketHideout3AfterBattleTxt2:: ; 8217a (20:617a)
 	text "SILPH SCOPE?"
 	line "The machine the"
 	cont "BOSS stole. It's"
@@ -16,18 +16,18 @@
 	cont "here somewhere."
 	done
 
-_RocketHideout3BattleTxt: ; 821b8 (20:61b8)
+_RocketHideout3BattleTxt:: ; 821b8 (20:61b8)
 	text "We got word from"
 	line "upstairs that you"
 	cont "were coming!"
 	done
 
-_RocketHideout3EndBattleText3: ; 821e9 (20:61e9)
+_RocketHideout3EndBattleText3:: ; 821e9 (20:61e9)
 	text "What?"
 	line "I lost? No!"
 	prompt
 
-_RocketHide3AfterBattleText3: ; 821fc (20:61fc)
+_RocketHide3AfterBattleText3:: ; 821fc (20:61fc)
 	text "Go ahead and go!"
 	line "But, you need the"
 	cont "LIFT KEY to run"
--- a/text/maps/rocket_hideout_b4f.asm
+++ b/text/maps/rocket_hideout_b4f.asm
@@ -1,15 +1,15 @@
-_UnnamedText_4557a: ; 8223e (20:623e)
+_UnnamedText_4557a:: ; 8223e (20:623e)
 	text "So! I must say, I"
 	line "am impressed you"
 	cont "got here!"
 	done
 
-_UnnamedText_4557f: ; 8226c (20:626c)
+_UnnamedText_4557f:: ; 8226c (20:626c)
 	text "WHAT!"
 	line "This cannot be!"
 	prompt
 
-_UnnamedText_45584: ; 82283 (20:6283)
+_UnnamedText_45584:: ; 82283 (20:6283)
 	text "I see that you"
 	line "raise #MON"
 	cont "with utmost care."
@@ -26,49 +26,49 @@
 	line "again..."
 	done
 
-_RocketHideout4BattleText2: ; 82326 (20:6326)
+_RocketHideout4BattleText2:: ; 82326 (20:6326)
 	text "I know you! You"
 	line "ruined our plans"
 	cont "at MT.MOON!"
 	done
 
-_RocketHideout4EndBattleText2: ; 82354 (20:6354)
+_RocketHideout4EndBattleText2:: ; 82354 (20:6354)
 	text "Burned"
 	line "again!"
 	prompt
 
-_RocketHide4AfterBattleText2: ; 82363 (20:6363)
+_RocketHide4AfterBattleText2:: ; 82363 (20:6363)
 	text "Do you have"
 	line "something against"
 	cont "TEAM ROCKET?"
 	done
 
-_RocketHideout4BattleText3: ; 8238f (20:638f)
+_RocketHideout4BattleText3:: ; 8238f (20:638f)
 	text "How can you not"
 	line "see the beauty of"
 	cont "our evil?"
 	done
 
-_RocketHideout4EndBattleText3: ; 823bc (20:63bc)
+_RocketHideout4EndBattleText3:: ; 823bc (20:63bc)
 	text "Ayaya!"
 	prompt
 
-_RocketHide4AfterBattleText3: ; 823c4 (20:63c4)
+_RocketHide4AfterBattleText3:: ; 823c4 (20:63c4)
 	text "BOSS! I'm sorry I"
 	line "failed you!"
 	done
 
-_RocketHideout4BattleText4: ; 823e2 (20:63e2)
+_RocketHideout4BattleText4:: ; 823e2 (20:63e2)
 	text "The elevator"
 	line "doesn't work? Who"
 	cont "has the LIFT KEY?"
 	done
 
-_RocketHideout4EndBattleText4: ; 82413 (20:6413)
+_RocketHideout4EndBattleText4:: ; 82413 (20:6413)
 	text "No!"
 	prompt
 
-_UnnamedText_455ec: ; 82418 (20:6418)
+_UnnamedText_455ec:: ; 82418 (20:6418)
 	text "Oh no! I dropped"
 	line "the LIFT KEY!"
 	done
--- a/text/maps/rocket_hideout_elevator.asm
+++ b/text/maps/rocket_hideout_elevator.asm
@@ -1,4 +1,4 @@
-_UnnamedText_4578b: ; 82438 (20:6438)
+_UnnamedText_4578b:: ; 82438 (20:6438)
 	text "It appears to"
 	line "need a key.@@"
 
--- a/text/maps/route_1.asm
+++ b/text/maps/route_1.asm
@@ -1,4 +1,4 @@
-_Route1ViridianMartSampleText: ; 8d5bf (23:55bf)
+_Route1ViridianMartSampleText:: ; 8d5bf (23:55bf)
 	text "Hi! I work at a"
 	line "#MON MART."
 
@@ -12,24 +12,24 @@
 	cont "Here you go!"
 	prompt
 
-_UnnamedText_1cae8: ; 8d643 (23:5643)
+_UnnamedText_1cae8:: ; 8d643 (23:5643)
 	text $52, " got"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_1caee: ; 8d652 (23:5652)
+_UnnamedText_1caee:: ; 8d652 (23:5652)
 	text "We also carry"
 	line "# BALLs for"
 	cont "catching #MON!"
 	done
 
-_UnnamedText_1caf3: ; 8d67c (23:567c)
+_UnnamedText_1caf3:: ; 8d67c (23:567c)
 	text "You have too much"
 	line "stuff with you!"
 	done
 
-_Route1Text2: ; 8d69f (23:569f)
+_Route1Text2:: ; 8d69f (23:569f)
 	text "See those ledges"
 	line "along the road?"
 
@@ -42,7 +42,7 @@
 	cont "quicker that way."
 	done
 
-_Route1Text3: ; 8d720 (23:5720)
+_Route1Text3:: ; 8d720 (23:5720)
 	text "ROUTE 1"
 	line "PALLET TOWN -"
 	cont "VIRIDIAN CITY"
--- a/text/maps/route_10.asm
+++ b/text/maps/route_10.asm
@@ -1,4 +1,4 @@
-_Route10BattleText1: ; 8e642 (23:6642)
+_Route10BattleText1:: ; 8e642 (23:6642)
 	text "Wow, are you a"
 	line "#MANIAC too?"
 	cont "Want to see my"
@@ -5,21 +5,21 @@
 	cont "collection?"
 	done
 
-_Route10EndBattleText1: ; 8e67a (23:667a)
+_Route10EndBattleText1:: ; 8e67a (23:667a)
 	text "Humph."
 	line "I'm not angry!"
 	prompt
 
-_Route10AfterBattleText1: ; 8e690 (23:6690)
+_Route10AfterBattleText1:: ; 8e690 (23:6690)
 	text "I have more rare"
 	line "#MON at home!"
 	done
 
-_Route10BattleText2: ; 8e6b0 (23:66b0)
+_Route10BattleText2:: ; 8e6b0 (23:66b0)
 	text "Ha-hahah-ah-ha!"
 	done
 
-_Route10EndBattleText2: ; 8e6c1 (23:66c1)
+_Route10EndBattleText2:: ; 8e6c1 (23:66c1)
 	text "Ha-haha!"
 	line "Not laughing!"
 	cont "Ha-hay fever!"
@@ -26,28 +26,28 @@
 	cont "Haha-ha-choo!"
 	prompt
 
-_Route10AfterBattleText2: ; 8e6f5 (23:66f5)
+_Route10AfterBattleText2:: ; 8e6f5 (23:66f5)
 	text "Haha-ha-choo!"
 	line "Ha-choo!"
 	cont "Snort! Snivel!"
 	done
 
-_Route10BattleText3: ; 8e71c (23:671c)
+_Route10BattleText3:: ; 8e71c (23:671c)
 	text "Hi kid, want to"
 	line "see my #MON?"
 	done
 
-_Route10EndBattleText3: ; 8e73a (23:673a)
+_Route10EndBattleText3:: ; 8e73a (23:673a)
 	text "Oh no!"
 	line "My #MON!"
 	prompt
 
-_Route10AfterBattleText3: ; 8e74b (23:674b)
+_Route10AfterBattleText3:: ; 8e74b (23:674b)
 	text "I don't like you"
 	line "for beating me!"
 	done
 
-_Route10BattleText4: ; 8e76c (23:676c)
+_Route10BattleText4:: ; 8e76c (23:676c)
 	text "I've been to a"
 	line "#MON GYM a few"
 	cont "times. But, I"
@@ -54,44 +54,44 @@
 	cont "lost each time."
 	done
 
-_Route10EndBattleText4: ; 8e7a8 (23:67a8)
+_Route10EndBattleText4:: ; 8e7a8 (23:67a8)
 	text "Ohh!"
 	line "Blew it again!"
 	prompt
 
-_Route10AfterBattleText4: ; 8e7bd (23:67bd)
+_Route10AfterBattleText4:: ; 8e7bd (23:67bd)
 	text "I noticed some"
 	line "#MANIACs"
 	cont "prowling around."
 	done
 
-_Route10BattleText5: ; 8e7e7 (23:67e7)
+_Route10BattleText5:: ; 8e7e7 (23:67e7)
 	text "Ah! This mountain"
 	line "air is delicious!"
 	done
 
-_Route10EndBattleText5: ; 8e80c (23:680c)
+_Route10EndBattleText5:: ; 8e80c (23:680c)
 	text "That"
 	line "cleared my head!"
 	prompt
 
-_Route10AfterBattleText5: ; 8e823 (23:6823)
+_Route10AfterBattleText5:: ; 8e823 (23:6823)
 	text "I feel bloated on"
 	line "mountain air!"
 	done
 
-_Route10BattleText6: ; 8e844 (23:6844)
+_Route10BattleText6:: ; 8e844 (23:6844)
 	text "I'm feeling a bit"
 	line "faint from this"
 	cont "tough hike."
 	done
 
-_Route10EndBattleText6: ; 8e872 (23:6872)
+_Route10EndBattleText6:: ; 8e872 (23:6872)
 	text "I'm"
 	line "not up to it!"
 	prompt
 
-_Route10AfterBattleText6: ; 8e884 (23:6884)
+_Route10AfterBattleText6:: ; 8e884 (23:6884)
 	text "The #MON here"
 	line "are so chunky!"
 	cont "There should be a"
@@ -99,12 +99,12 @@
 	cont "floral pattern!"
 	done
 
-_Route10Text9: ; 8e8d4 (23:68d4)
-_Route10Text7: ; 8e8d4 (23:68d4)
+_Route10Text9:: ; 8e8d4 (23:68d4)
+_Route10Text7:: ; 8e8d4 (23:68d4)
 	text "ROCK TUNNEL"
 	done
 
-_Route10Text10: ; 8e8e1 (23:68e1)
+_Route10Text10:: ; 8e8e1 (23:68e1)
 	text "POWER PLANT"
 	done
 
--- a/text/maps/route_11_1.asm
+++ b/text/maps/route_11_1.asm
@@ -1,123 +1,123 @@
-_Route11BattleText1: ; 8e8ee (23:68ee)
+_Route11BattleText1:: ; 8e8ee (23:68ee)
 	text "Win, lose or draw!"
 	done
 
-_Route11EndBattleText1: ; 8e902 (23:6902)
+_Route11EndBattleText1:: ; 8e902 (23:6902)
 	text "Atcha!"
 	line "Didn't go my way!"
 	prompt
 
-_Route11AfterBattleText1: ; 8e91b (23:691b)
+_Route11AfterBattleText1:: ; 8e91b (23:691b)
 	text "#MON is life!"
 	line "And to live is to"
 	cont "gamble!"
 	done
 
-_Route11BattleText2: ; 8e944 (23:6944)
+_Route11BattleText2:: ; 8e944 (23:6944)
 	text "Competition! I"
 	line "can't get enough!"
 	done
 
-_Route11EndBattleText2: ; 8e965 (23:6965)
+_Route11EndBattleText2:: ; 8e965 (23:6965)
 	text "I had"
 	line "a chance!"
 	prompt
 
-_Route11AfterBattleText2: ; 8e976 (23:6976)
+_Route11AfterBattleText2:: ; 8e976 (23:6976)
 	text "You can't be a"
 	line "coward in the"
 	cont "world of #MON!"
 	done
 
-_Route11BattleText3: ; 8e9a2 (23:69a2)
+_Route11BattleText3:: ; 8e9a2 (23:69a2)
 	text "Let's go, but"
 	line "don't cheat!"
 	done
 
-_Route11EndBattleText3: ; 8e9bc (23:69bc)
+_Route11EndBattleText3:: ; 8e9bc (23:69bc)
 	text "Huh?"
 	line "That's not right!"
 	prompt
 
-_Route11AfterBattleText3: ; 8e9d3 (23:69d3)
+_Route11AfterBattleText3:: ; 8e9d3 (23:69d3)
 	text "I did my best! I"
 	line "have no regrets!"
 	done
 
-_Route11BattleText4: ; 8e9f6 (23:69f6)
+_Route11BattleText4:: ; 8e9f6 (23:69f6)
 	text "Careful!"
 	line "I'm laying down"
 	cont "some cables!"
 	done
 
-_Route11EndBattleText4: ; 8ea1c (23:6a1c)
+_Route11EndBattleText4:: ; 8ea1c (23:6a1c)
 	text "That"
 	line "was electric!"
 	prompt
 
-_Route11AfterBattleText4: ; 8ea30 (23:6a30)
+_Route11AfterBattleText4:: ; 8ea30 (23:6a30)
 	text "Spread the word"
 	line "to save energy!"
 	done
 
-_Route11BattleText5: ; 8ea51 (23:6a51)
+_Route11BattleText5:: ; 8ea51 (23:6a51)
 	text "I just became a"
 	line "trainer! But, I"
 	cont "think I can win!"
 	done
 
-_Route11EndBattleText5: ; 8ea83 (23:6a83)
+_Route11EndBattleText5:: ; 8ea83 (23:6a83)
 	text "My"
 	line "#MON couldn't!"
 	prompt
 
-_Route11AfterBattleText5: ; 8ea95 (23:6a95)
+_Route11AfterBattleText5:: ; 8ea95 (23:6a95)
 	text "What do you want?"
 	line "Leave me alone!"
 	done
 
-_Route11BattleText6: ; 8eab8 (23:6ab8)
+_Route11BattleText6:: ; 8eab8 (23:6ab8)
 	text "Fwahaha! I have"
 	line "never lost!"
 	done
 
-_Route11EndBattleText6: ; 8ead5 (23:6ad5)
+_Route11EndBattleText6:: ; 8ead5 (23:6ad5)
 	text "My"
 	line "first loss!"
 	prompt
 
-_Route11AfterBattleText6: ; 8eae5 (23:6ae5)
+_Route11AfterBattleText6:: ; 8eae5 (23:6ae5)
 	text "Luck of the draw!"
 	line "Just luck!"
 	done
 
-_Route11BattleText7: ; 8eb03 (23:6b03)
+_Route11BattleText7:: ; 8eb03 (23:6b03)
 	text "I have never won"
 	line "before..."
 	done
 
-_Route11EndBattleText7: ; 8eb1f (23:6b1f)
+_Route11EndBattleText7:: ; 8eb1f (23:6b1f)
 	text "I saw"
 	line "this coming..."
 	prompt
 
-_Route11AfterBattleText7: ; 8eb35 (23:6b35)
+_Route11AfterBattleText7:: ; 8eb35 (23:6b35)
 	text "It's just luck."
 	line "Luck of the draw."
 	done
 
-_Route11BattleText8: ; 8eb57 (23:6b57)
+_Route11BattleText8:: ; 8eb57 (23:6b57)
 	text "I'm the best in"
 	line "my class!"
 	done
 
-_Route11EndBattleText8: ; 8eb71 (23:6b71)
+_Route11EndBattleText8:: ; 8eb71 (23:6b71)
 	text "Darn!"
 	line "I need to make my"
 	cont "#MON stronger!"
 	prompt
 
-_Route11AfterBattleText8: ; 8eb99 (23:6b99)
+_Route11AfterBattleText8:: ; 8eb99 (23:6b99)
 	text "There's a fat"
 	line "#MON that"
 	cont "comes down from"
@@ -127,7 +127,7 @@
 	line "you can get it."
 	done
 
-_Route11BattleText9: ; 8ebee (23:6bee)
+_Route11BattleText9:: ; 8ebee (23:6bee)
 	text "Watch out for"
 	line "live wires!"
 	done
--- a/text/maps/route_11_2.asm
+++ b/text/maps/route_11_2.asm
@@ -1,29 +1,29 @@
-_Route11EndBattleText9: ; 90000 (24:4000)
+_Route11EndBattleText9:: ; 90000 (24:4000)
 	text "Whoa!"
 	line "You spark plug!"
 	prompt
 
-_Route11AfterBattleText9: ; 90017 (24:4017)
+_Route11AfterBattleText9:: ; 90017 (24:4017)
 	text "Well, better get"
 	line "back to work."
 	done
 
-_Route11BattleText10: ; 90037 (24:4037)
+_Route11BattleText10:: ; 90037 (24:4037)
 	text "My #MON should"
 	line "be ready by now!"
 	done
 
-_Route11EndBattleText10: ; 90058 (24:4058)
+_Route11EndBattleText10:: ; 90058 (24:4058)
 	text "Too"
 	line "much, too young!"
 	prompt
 
-_Route11AfterBattleText10: ; 9006e (24:406e)
+_Route11AfterBattleText10:: ; 9006e (24:406e)
 	text "I better go find"
 	line "stronger ones!"
 	done
 
-_Route11Text11: ; 9008f (24:408f)
+_Route11Text11:: ; 9008f (24:408f)
 	text "DIGLETT's CAVE"
 	done
 
--- a/text/maps/route_11_gate.asm
+++ b/text/maps/route_11_gate.asm
@@ -1,4 +1,4 @@
-_Route11GateText1: ; 8c5f3 (23:45f3)
+_Route11GateText1:: ; 8c5f3 (23:45f3)
 	text "When you catch"
 	line "lots of #MON,"
 	cont "isn't it hard to"
--- a/text/maps/route_11_gate_upstairs.asm
+++ b/text/maps/route_11_gate_upstairs.asm
@@ -1,4 +1,4 @@
-_UnnamedText_494a3: ; 8c689 (23:4689)
+_UnnamedText_494a3:: ; 8c689 (23:4689)
 	text "There are items on"
 	line "the ground that"
 	cont "can't be seen."
@@ -12,7 +12,7 @@
 	cont "to look yourself!"
 	done
 
-_UnnamedText_494c4: ; 8c71b (23:471b)
+_UnnamedText_494c4:: ; 8c71b (23:471b)
 	text "Looked into the"
 	line "binoculars."
 
@@ -20,7 +20,7 @@
 	line "asleep on a road!"
 	done
 
-_UnnamedText_494c9: ; 8c758 (23:4758)
+_UnnamedText_494c9:: ; 8c758 (23:4758)
 	text "Looked into the"
 	line "binoculars."
 
@@ -28,7 +28,7 @@
 	line "view!"
 	done
 
-_UnnamedText_494d5: ; 8c78b (23:478b)
+_UnnamedText_494d5:: ; 8c78b (23:478b)
 	text "Looked into the"
 	line "binoculars."
 
--- a/text/maps/route_12.asm
+++ b/text/maps/route_12.asm
@@ -1,9 +1,9 @@
-_Route12Text1: ; 9009e (24:409e)
+_Route12Text1:: ; 9009e (24:409e)
 	text "A sleeping #MON"
 	line "blocks the way!"
 	done
 
-_UnnamedText_596eb: ; 900bf (24:40bf)
+_UnnamedText_596eb:: ; 900bf (24:40bf)
 	text "SNORLAX woke up!"
 
 	para "It attacked in a"
@@ -10,7 +10,7 @@
 	line "grumpy rage!"
 	done
 
-_UnnamedText_596f0: ; 900ef (24:40ef)
+_UnnamedText_596f0:: ; 900ef (24:40ef)
 	text "SNORLAX calmed"
 	line "down! With a big"
 	cont "yawn, it returned"
@@ -17,63 +17,63 @@
 	cont "to the mountains!"
 	done
 
-_Route12BattleText1: ; 90134 (24:4134)
+_Route12BattleText1:: ; 90134 (24:4134)
 	text "Yeah! I got a"
 	line "bite, here!"
 	done
 
-_Route12EndBattleText1: ; 9014f (24:414f)
+_Route12EndBattleText1:: ; 9014f (24:414f)
 	text "Tch!"
 	line "Just a small fry!"
 	prompt
 
-_Route12AfterBattleText1: ; 90167 (24:4167)
+_Route12AfterBattleText1:: ; 90167 (24:4167)
 	text "Hang on! My line's"
 	line "snagged!"
 	done
 
-_Route12BattleText2: ; 90183 (24:4183)
+_Route12BattleText2:: ; 90183 (24:4183)
 	text "Be patient!"
 	line "Fishing is a"
 	cont "waiting game!"
 	done
 
-_Route12EndBattleText2: ; 901ab (24:41ab)
+_Route12EndBattleText2:: ; 901ab (24:41ab)
 	text "That"
 	line "one got away!"
 	prompt
 
-_Route12AfterBattleText2: ; 901bf (24:41bf)
+_Route12AfterBattleText2:: ; 901bf (24:41bf)
 	text "With a better ROD,"
 	line "I could catch"
 	cont "better #MON!"
 	done
 
-_Route12BattleText3: ; 901ee (24:41ee)
+_Route12BattleText3:: ; 901ee (24:41ee)
 	text "Have you found a"
 	line "MOON STONE?"
 	done
 
-_Route12EndBattleText3: ; 9020c (24:420c)
+_Route12EndBattleText3:: ; 9020c (24:420c)
 	text "Oww!"
 	prompt
 
-_Route12AfterBattleText3: ; 90212 (24:4212)
+_Route12AfterBattleText3:: ; 90212 (24:4212)
 	text "I could have made"
 	line "my #MON evolve"
 	cont "with MOON STONE!"
 	done
 
-_Route12BattleText4: ; 90245 (24:4245)
+_Route12BattleText4:: ; 90245 (24:4245)
 	text "Electricity is my"
 	line "specialty!"
 	done
 
-_Route12EndBattleText4: ; 90263 (24:4263)
+_Route12EndBattleText4:: ; 90263 (24:4263)
 	text "Unplugged!"
 	prompt
 
-_Route12AfterBattleText4: ; 9026f (24:426f)
+_Route12AfterBattleText4:: ; 9026f (24:426f)
 	text "Water conducts"
 	line "electricity, so"
 	cont "you should zap"
@@ -80,61 +80,61 @@
 	cont "sea #MON!"
 	done
 
-_Route12BattleText5: ; 902a8 (24:42a8)
+_Route12BattleText5:: ; 902a8 (24:42a8)
 	text "The FISHING FOOL"
 	line "vs. #MON KID!"
 	done
 
-_Route12EndBattleText5: ; 902c8 (24:42c8)
+_Route12EndBattleText5:: ; 902c8 (24:42c8)
 	text "Too"
 	line "much!"
 	prompt
 
-_Route12AfterBattleText5: ; 902d3 (24:42d3)
+_Route12AfterBattleText5:: ; 902d3 (24:42d3)
 	text "You beat me at"
 	line "#MON, but I'm"
 	cont "good at fishing!"
 	done
 
-_Route12BattleText6: ; 90301 (24:4301)
+_Route12BattleText6:: ; 90301 (24:4301)
 	text "I'd rather be"
 	line "working!"
 	done
 
-_Route12EndBattleText6: ; 90318 (24:4318)
+_Route12EndBattleText6:: ; 90318 (24:4318)
 	text "It's"
 	line "not easy..."
 	prompt
 
-_Route12AfterBattleText6: ; 90329 (24:4329)
+_Route12AfterBattleText6:: ; 90329 (24:4329)
 	text "It's all right."
 	line "Losing doesn't"
 	cont "bug me any more."
 	done
 
-_Route12BattleText7: ; 90358 (24:4358)
+_Route12BattleText7:: ; 90358 (24:4358)
 	text "You never know"
 	line "what you could"
 	cont "catch!"
 	done
 
-_Route12EndBattleText7: ; 9037e (24:437e)
+_Route12EndBattleText7:: ; 9037e (24:437e)
 	text "Lost"
 	line "it!"
 	prompt
 
-_Route12AfterBattleText7: ; 90388 (24:4388)
+_Route12AfterBattleText7:: ; 90388 (24:4388)
 	text "I catch MAGIKARP"
 	line "all the time, but"
 	cont "they're so weak!"
 	done
 
-_Route12Text11: ; 903bc (24:43bc)
+_Route12Text11:: ; 903bc (24:43bc)
 	text "ROUTE 12 "
 	line "North to LAVENDER"
 	done
 
-_Route12Text12: ; 903d9 (24:43d9)
+_Route12Text12:: ; 903d9 (24:43d9)
 	text "SPORT FISHING AREA"
 	done
 
--- a/text/maps/route_12_gate.asm
+++ b/text/maps/route_12_gate.asm
@@ -1,4 +1,4 @@
-_Route12GateText1: ; 8c84a (23:484a)
+_Route12GateText1:: ; 8c84a (23:484a)
 	text "There's a lookout"
 	line "spot upstairs."
 	done
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/route_12_gate_upstairs.asm
@@ -1,4 +1,4 @@
-_TM39PreReceiveText: ; 8c86b (23:486b)
+_TM39PreReceiveText:: ; 8c86b (23:486b)
 	text "My #MON's"
 	line "ashes are stored"
 	cont "in #MON TOWER."
@@ -8,11 +8,11 @@
 	cont "it any more..."
 	prompt
 
-_ReceivedTM39Text: ; 8c8c6 (23:48c6)
+_ReceivedTM39Text:: ; 8c8c6 (23:48c6)
 	text $52, " received"
 	line "TM39!@@"
 
-_TM39ExplanationText: ; 8c8d9 (23:48d9)
+_TM39ExplanationText:: ; 8c8d9 (23:48d9)
 	text "TM39 is a move"
 	line "called SWIFT."
 
@@ -22,12 +22,12 @@
 	cont "afford to lose."
 	done
 
-_TM39NoRoomText: ; 8c93c (23:493c)
+_TM39NoRoomText:: ; 8c93c (23:493c)
 	text "You don't have"
 	line "room for this."
 	done
 
-_UnnamedText_495b8: ; 8c95a (23:495a)
+_UnnamedText_495b8:: ; 8c95a (23:495a)
 	text "Looked into the"
 	line "binoculars."
 
@@ -34,7 +34,7 @@
 	para "A man fishing!"
 	done
 
-_UnnamedText_495c4: ; 8c986 (23:4986)
+_UnnamedText_495c4:: ; 8c986 (23:4986)
 	text "Looked into the"
 	line "binoculars."
 
--- a/text/maps/route_12_house.asm
+++ b/text/maps/route_12_house.asm
@@ -1,4 +1,4 @@
-_UnnamedText_564c0: ; 8c9b3 (23:49b3)
+_UnnamedText_564c0:: ; 8c9b3 (23:49b3)
 	text "I'm the FISHING"
 	line "GURU's brother!"
 
@@ -9,7 +9,7 @@
 	line "fish?"
 	done
 
-_UnnamedText_564c5: ; 8ca00 (23:4a00)
+_UnnamedText_564c5:: ; 8ca00 (23:4a00)
 	text "Grand! I like"
 	line "your style!"
 
@@ -21,7 +21,7 @@
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_564ca: ; 8ca4f (23:4a4f)
+_UnnamedText_564ca:: ; 8ca4f (23:4a4f)
 	db $0
 	para "Fishing is a way"
 	line "of life!"
@@ -32,12 +32,12 @@
 	cont "one!"
 	done
 
-_UnnamedText_564cf: ; 8caa1 (23:4aa1)
+_UnnamedText_564cf:: ; 8caa1 (23:4aa1)
 	text "Oh... That's so"
 	line "disappointing..."
 	done
 
-_UnnamedText_564d4: ; 8cac2 (23:4ac2)
+_UnnamedText_564d4:: ; 8cac2 (23:4ac2)
 	text "Hello there,"
 	line $52, "!"
 
@@ -51,7 +51,7 @@
 	line "wherever you can!"
 	done
 
-_UnnamedText_564d9: ; 8cb38 (23:4b38)
+_UnnamedText_564d9:: ; 8cb38 (23:4b38)
 	text "Oh no!"
 
 	para "I had a gift for"
--- a/text/maps/route_13.asm
+++ b/text/maps/route_13.asm
@@ -1,126 +1,126 @@
-_Route13BattleText2: ; 903ed (24:43ed)
+_Route13BattleText2:: ; 903ed (24:43ed)
 	text "My bird #MON"
 	line "want to scrap!"
 	done
 
-_Route13EndBattleText2: ; 9040a (24:440a)
+_Route13EndBattleText2:: ; 9040a (24:440a)
 	text "My"
 	line "bird combo lost?"
 	prompt
 
-_Route13AfterBattleText2: ; 9041f (24:441f)
+_Route13AfterBattleText2:: ; 9041f (24:441f)
 	text "My #MON look"
 	line "happy even though"
 	cont "they lost."
 	done
 
-_Route13BattleText3: ; 9044a (24:444a)
+_Route13BattleText3:: ; 9044a (24:444a)
 	text "I'm told I'm good"
 	line "for a kid!"
 	done
 
-_Route13EndBattleText3: ; 90466 (24:4466)
+_Route13EndBattleText3:: ; 90466 (24:4466)
 	text "Ohh!"
 	line "I lost!"
 	prompt
 
-_Route13AfterBattleText3: ; 90474 (24:4474)
+_Route13AfterBattleText3:: ; 90474 (24:4474)
 	text "I want to become"
 	line "a good trainer."
 	cont "I'll train hard."
 	done
 
-_Route13BattleText4: ; 904a6 (24:44a6)
+_Route13BattleText4:: ; 904a6 (24:44a6)
 	text "Wow! Your BADGEs"
 	line "are too cool!"
 	done
 
-_Route13EndBattleText4: ; 904c6 (24:44c6)
+_Route13EndBattleText4:: ; 904c6 (24:44c6)
 	text "Not"
 	line "enough!"
 	prompt
 
-_Route13AfterBattleText4: ; 904d3 (24:44d3)
+_Route13AfterBattleText4:: ; 904d3 (24:44d3)
 	text "You got those"
 	line "BADGEs from GYM"
 	cont "LEADERs. I know!"
 	done
 
-_Route13BattleText5: ; 90503 (24:4503)
+_Route13BattleText5:: ; 90503 (24:4503)
 	text "My cute #MON"
 	line "wish to make your"
 	cont "acquaintance."
 	done
 
-_Route13EndBattleText5: ; 90531 (24:4531)
+_Route13EndBattleText5:: ; 90531 (24:4531)
 	text "Wow!"
 	line "You totally won!"
 	prompt
 
-_Route13AfterBattleText5: ; 90548 (24:4548)
+_Route13AfterBattleText5:: ; 90548 (24:4548)
 	text "You have to make"
 	line "#MON fight to"
 	cont "toughen them up!"
 	done
 
-_Route13BattleText6: ; 90579 (24:4579)
+_Route13BattleText6:: ; 90579 (24:4579)
 	text "I found CARBOS in"
 	line "a cave once."
 	done
 
-_Route13EndBattleText6: ; 90599 (24:4599)
+_Route13EndBattleText6:: ; 90599 (24:4599)
 	text "Just"
 	line "messed up!"
 	prompt
 
-_Route13AfterBattleText6: ; 905aa (24:45aa)
+_Route13AfterBattleText6:: ; 905aa (24:45aa)
 	text "CARBOS boosted"
 	line "the SPEED of my"
 	cont "#MON."
 	done
 
-_Route13BattleText7: ; 905d0 (24:45d0)
+_Route13BattleText7:: ; 905d0 (24:45d0)
 	text "The wind's blowing"
 	line "my way!"
 	done
 
-_Route13EndBattleText7: ; 905eb (24:45eb)
+_Route13EndBattleText7:: ; 905eb (24:45eb)
 	text "The"
 	line "wind turned!"
 	prompt
 
-_Route13AfterBattleText7: ; 905fd (24:45fd)
+_Route13AfterBattleText7:: ; 905fd (24:45fd)
 	text "I'm beat. I guess"
 	line "I'll FLY home."
 	done
 
-_Route13BattleText8: ; 9061d (24:461d)
+_Route13BattleText8:: ; 9061d (24:461d)
 	text "Sure, I'll play"
 	line "with you!"
 	done
 
-_Route13EndBattleText8: ; 90637 (24:4637)
+_Route13EndBattleText8:: ; 90637 (24:4637)
 	text "Oh!"
 	line "You little brute!"
 	prompt
 
-_Route13AfterBattleText8: ; 9064e (24:464e)
+_Route13AfterBattleText8:: ; 9064e (24:464e)
 	text "I wonder which is"
 	line "stronger, male or"
 	cont "female #MON?"
 	done
 
-_Route13BattleText9: ; 90680 (24:4680)
+_Route13BattleText9:: ; 90680 (24:4680)
 	text "Do you want to"
 	line "#MON with me?"
 	done
 
-_Route13EndBattleText9: ; 9069e (24:469e)
+_Route13EndBattleText9:: ; 9069e (24:469e)
 	text "It's over"
 	line "already?"
 	prompt
 
-_Route13AfterBattleText9: ; 906b1 (24:46b1)
+_Route13AfterBattleText9:: ; 906b1 (24:46b1)
 	text "I don't know"
 	line "anything about"
 	cont "#MON. I just"
@@ -127,37 +127,37 @@
 	cont "like cool ones!"
 	done
 
-_Route13BattleText10: ; 906ea (24:46ea)
+_Route13BattleText10:: ; 906ea (24:46ea)
 	text "What're you"
 	line "lookin' at?"
 	done
 
-_Route13EndBattleText10: ; 90702 (24:4702)
+_Route13EndBattleText10:: ; 90702 (24:4702)
 	text "Dang!"
 	line "Stripped gears!"
 	prompt
 
-_Route13AfterBattleText10: ; 90719 (24:4719)
+_Route13AfterBattleText10:: ; 90719 (24:4719)
 	text "Get lost!"
 	done
 
-_Route13BattleText11: ; 90724 (24:4724)
+_Route13BattleText11:: ; 90724 (24:4724)
 	text "I always go with"
 	line "bird #MON!"
 	done
 
-_Route13EndBattleText11: ; 90741 (24:4741)
+_Route13EndBattleText11:: ; 90741 (24:4741)
 	text "Out"
 	line "of power!"
 	prompt
 
-_Route13AfterBattleText11: ; 90750 (24:4750)
+_Route13AfterBattleText11:: ; 90750 (24:4750)
 	text "I wish I could"
 	line "fly like PIDGEY"
 	cont "and PIDGEOTTO..."
 	done
 
-_Route13Text11: ; 90781 (24:4781)
+_Route13Text11:: ; 90781 (24:4781)
 	text "TRAINER TIPS"
 
 	para "Look to the left"
@@ -164,7 +164,7 @@
 	line "of that post!"
 	done
 
-_Route13Text12: ; 907ae (24:47ae)
+_Route13Text12:: ; 907ae (24:47ae)
 	text "TRAINER TIPS"
 
 	para "Use SELECT to"
@@ -172,7 +172,7 @@
 	cont "the ITEM window!"
 	done
 
-_Route13Text13: ; 907eb (24:47eb)
+_Route13Text13:: ; 907eb (24:47eb)
 	text "ROUTE 13"
 	line "North to SILENCE"
 	cont "BRIDGE"
--- a/text/maps/route_14.asm
+++ b/text/maps/route_14.asm
@@ -1,15 +1,15 @@
-_Route14BattleText1: ; 9080d (24:480d)
+_Route14BattleText1:: ; 9080d (24:480d)
 	text "You need to use"
 	line "TMs to teach good"
 	cont "moves to #MON!"
 	done
 
-_Route14EndBattleText1: ; 9083f (24:483f)
+_Route14EndBattleText1:: ; 9083f (24:483f)
 	text "Not"
 	line "good enough!"
 	prompt
 
-_Route14AfterBattleText1: ; 90851 (24:4851)
+_Route14AfterBattleText1:: ; 90851 (24:4851)
 	text "You have some HMs"
 	line "right? #MON"
 	cont "can't ever forget"
@@ -16,23 +16,23 @@
 	cont "those moves."
 	done
 
-_Route14BattleText2: ; 9088e (24:488e)
+_Route14BattleText2:: ; 9088e (24:488e)
 	text "My bird #MON"
 	line "should be ready"
 	cont "for battle."
 	done
 
-_Route14EndBattleText2: ; 908b8 (24:48b8)
+_Route14EndBattleText2:: ; 908b8 (24:48b8)
 	text "Not"
 	line "ready yet!"
 	prompt
 
-_Route14AfterBattleText2: ; 908c8 (24:48c8)
+_Route14AfterBattleText2:: ; 908c8 (24:48c8)
 	text "They need to learn"
 	line "better moves."
 	done
 
-_Route14BattleText3: ; 908ea (24:48ea)
+_Route14BattleText3:: ; 908ea (24:48ea)
 	text "TMs are on sale"
 	line "in CELADON!"
 	cont "But, only a few"
@@ -39,12 +39,12 @@
 	cont "people have HMs!"
 	done
 
-_Route14EndBattleText3: ; 90928 (24:4928)
+_Route14EndBattleText3:: ; 90928 (24:4928)
 	text "Aww,"
 	line "bummer!"
 	prompt
 
-_Route14AfterBattleText3: ; 90936 (24:4936)
+_Route14AfterBattleText3:: ; 90936 (24:4936)
 	text "Teach #MON"
 	line "moves of the same"
 	cont "element type for"
@@ -51,97 +51,97 @@
 	cont "more power."
 	done
 
-_Route14BattleText4: ; 90971 (24:4971)
+_Route14BattleText4:: ; 90971 (24:4971)
 	text "Have you taught"
 	line "your bird #MON"
 	cont "how to FLY?"
 	done
 
-_Route14EndBattleText4: ; 9099d (24:499d)
+_Route14EndBattleText4:: ; 9099d (24:499d)
 	text "Shot"
 	line "down in flames!"
 	prompt
 
-_Route14AfterBattleText4: ; 909b3 (24:49b3)
+_Route14AfterBattleText4:: ; 909b3 (24:49b3)
 	text "Bird #MON are"
 	line "my true love!"
 	done
 
-_Route14BattleText5: ; 909d0 (24:49d0)
+_Route14BattleText5:: ; 909d0 (24:49d0)
 	text "Have you heard of"
 	line "the legendary"
 	cont "#MON?"
 	done
 
-_Route14EndBattleText5: ; 909f7 (24:49f7)
+_Route14EndBattleText5:: ; 909f7 (24:49f7)
 	text "Why?"
 	line "Why'd I lose?"
 	prompt
 
-_Route14AfterBattleText5: ; 90a0a (24:4a0a)
+_Route14AfterBattleText5:: ; 90a0a (24:4a0a)
 	text "The 3 legendary"
 	line "#MON are all"
 	cont "birds of prey."
 	done
 
-_Route14BattleText6: ; 90a37 (24:4a37)
+_Route14BattleText6:: ; 90a37 (24:4a37)
 	text "I'm not into it,"
 	line "but OK! Let's go!"
 	done
 
-_Route14EndBattleText6: ; 90a59 (24:4a59)
+_Route14EndBattleText6:: ; 90a59 (24:4a59)
 	text "I"
 	line "knew it!"
 	prompt
 
-_Route14AfterBattleText6: ; 90a65 (24:4a65)
+_Route14AfterBattleText6:: ; 90a65 (24:4a65)
 	text "Winning, losing,"
 	line "it doesn't matter"
 	cont "in the long run!"
 	done
 
-_Route14BattleText7: ; 90a99 (24:4a99)
+_Route14BattleText7:: ; 90a99 (24:4a99)
 	text "C'mon, c'mon."
 	line "Let's go, let's"
 	cont "go, let's go!"
 	done
 
-_Route14EndBattleText7: ; 90ac1 (24:4ac1)
+_Route14EndBattleText7:: ; 90ac1 (24:4ac1)
 	text "Arrg!"
 	line "Lost! Get lost!"
 	prompt
 
-_Route14AfterBattleText7: ; 90ad8 (24:4ad8)
+_Route14AfterBattleText7:: ; 90ad8 (24:4ad8)
 	text "What, what, what?"
 	line "What do you want?"
 	done
 
-_Route14BattleText8: ; 90afd (24:4afd)
+_Route14BattleText8:: ; 90afd (24:4afd)
 	text "Perfect! I need to"
 	line "burn some time!"
 	done
 
-_Route14EndBattleText8: ; 90b21 (24:4b21)
+_Route14EndBattleText8:: ; 90b21 (24:4b21)
 	text "What?"
 	line "You!?"
 	prompt
 
-_Route14AfterBattleText8: ; 90b2e (24:4b2e)
+_Route14AfterBattleText8:: ; 90b2e (24:4b2e)
 	text "Raising #MON"
 	line "is a drag, man."
 	done
 
-_Route14BattleText9: ; 90b4c (24:4b4c)
+_Route14BattleText9:: ; 90b4c (24:4b4c)
 	text "We ride out here"
 	line "because there's"
 	cont "more room!"
 	done
 
-_Route14EndBattleText9: ; 90b78 (24:4b78)
+_Route14EndBattleText9:: ; 90b78 (24:4b78)
 	text "Wipe out!"
 	prompt
 
-_Route14AfterBattleText9: ; 90b83 (24:4b83)
+_Route14AfterBattleText9:: ; 90b83 (24:4b83)
 	text "It's cool you"
 	line "made your #MON"
 	cont "so strong!"
@@ -150,23 +150,23 @@
 	line "And you know it!"
 	done
 
-_Route14BattleText10: ; 90bcc (24:4bcc)
+_Route14BattleText10:: ; 90bcc (24:4bcc)
 	text "#MON fight?"
 	line "Cool! Rumble!"
 	done
 
-_Route14EndBattleText10: ; 90be7 (24:4be7)
+_Route14EndBattleText10:: ; 90be7 (24:4be7)
 	text "Blown"
 	line "away!"
 	prompt
 
-_Route14AfterBattleText10: ; 90bf4 (24:4bf4)
+_Route14AfterBattleText10:: ; 90bf4 (24:4bf4)
 	text "You know who'd"
 	line "win, you and me"
 	cont "one on one!"
 	done
 
-_Route14Text11: ; 90c1f (24:4c1f)
+_Route14Text11:: ; 90c1f (24:4c1f)
 	text "ROUTE 14"
 	line "West to FUCHSIA"
 	cont "CITY"
--- a/text/maps/route_15.asm
+++ b/text/maps/route_15.asm
@@ -1,15 +1,15 @@
-_Route15BattleText1: ; 90c3e (24:4c3e)
+_Route15BattleText1:: ; 90c3e (24:4c3e)
 	text "Let me try out the"
 	line "#MON I just"
 	cont "got in a trade!"
 	done
 
-_Route15EndBattleText1: ; 90c6e (24:4c6e)
+_Route15EndBattleText1:: ; 90c6e (24:4c6e)
 	text "Not"
 	line "good enough!"
 	prompt
 
-_Route15AfterBattleText1: ; 90c80 (24:4c80)
+_Route15AfterBattleText1:: ; 90c80 (24:4c80)
 	text "You can't change"
 	line "the nickname of"
 	cont "any #MON you"
@@ -19,51 +19,51 @@
 	line "Trainer can."
 	done
 
-_Route15BattleText2: ; 90cdd (24:4cdd)
+_Route15BattleText2:: ; 90cdd (24:4cdd)
 	text "You look gentle,"
 	line "so I think I can"
 	cont "beat you!"
 	done
 
-_Route15EndBattleText2: ; 90d0a (24:4d0a)
+_Route15EndBattleText2:: ; 90d0a (24:4d0a)
 	text "No,"
 	line "wrong!"
 	prompt
 
-_Route15AfterBattleText2: ; 90d16 (24:4d16)
+_Route15AfterBattleText2:: ; 90d16 (24:4d16)
 	text "I'm afraid of"
 	line "BIKERs, they look"
 	cont "so ugly and mean!"
 	done
 
-_Route15BattleText3: ; 90d48 (24:4d48)
+_Route15BattleText3:: ; 90d48 (24:4d48)
 	text "When I whistle, I"
 	line "can summon bird"
 	cont "#MON!"
 	done
 
-_Route15EndBattleText3: ; 90d71 (24:4d71)
+_Route15EndBattleText3:: ; 90d71 (24:4d71)
 	text "Ow!"
 	line "That's tragic!"
 	prompt
 
-_Route15AfterBattleText3: ; 90d84 (24:4d84)
+_Route15AfterBattleText3:: ; 90d84 (24:4d84)
 	text "Maybe I'm not cut"
 	line "out for battles."
 	done
 
-_Route15BattleText4: ; 90da7 (24:4da7)
+_Route15BattleText4:: ; 90da7 (24:4da7)
 	text "Hmm? My birds are"
 	line "shivering! You're"
 	cont "good, aren't you?"
 	done
 
-_Route15EndBattleText4: ; 90ddc (24:4ddc)
+_Route15EndBattleText4:: ; 90ddc (24:4ddc)
 	text "Just"
 	line "as I thought!"
 	prompt
 
-_Route15AfterBattleText4: ; 90df0 (24:4df0)
+_Route15AfterBattleText4:: ; 90df0 (24:4df0)
 	text "Did you know moves"
 	line "like EARTHQUAKE"
 	cont "don't have any"
@@ -70,49 +70,49 @@
 	cont "effect on birds?"
 	done
 
-_Route15BattleText5: ; 90e33 (24:4e33)
+_Route15BattleText5:: ; 90e33 (24:4e33)
 	text "Oh, you're a"
 	line "little cutie!"
 	done
 
-_Route15EndBattleText5: ; 90e4e (24:4e4e)
+_Route15EndBattleText5:: ; 90e4e (24:4e4e)
 	text "You looked"
 	line "so cute too!"
 	prompt
 
-_Route15AfterBattleText5: ; 90e67 (24:4e67)
+_Route15AfterBattleText5:: ; 90e67 (24:4e67)
 	text "I forgive you!"
 	line "I can take it!"
 	done
 
-_Route15BattleText6: ; 90e86 (24:4e86)
+_Route15BattleText6:: ; 90e86 (24:4e86)
 	text "I raise #MON"
 	line "because I live"
 	cont "alone!"
 	done
 
-_Route15EndBattleText6: ; 90eaa (24:4eaa)
+_Route15EndBattleText6:: ; 90eaa (24:4eaa)
 	text "I didn't"
 	line "ask for this!"
 	prompt
 
-_Route15AfterBattleText6: ; 90ec1 (24:4ec1)
+_Route15AfterBattleText6:: ; 90ec1 (24:4ec1)
 	text "I just like going"
 	line "home to be with"
 	cont "my #MON!"
 	done
 
-_Route15BattleText7: ; 90eed (24:4eed)
+_Route15BattleText7:: ; 90eed (24:4eed)
 	text "Hey kid! C'mon!"
 	line "I just got these!"
 	done
 
-_Route15EndBattleText7: ; 90f0f (24:4f0f)
+_Route15EndBattleText7:: ; 90f0f (24:4f0f)
 	text "Why"
 	line "not?"
 	prompt
 
-_Route15AfterBattleText7: ; 90f19 (24:4f19)
+_Route15AfterBattleText7:: ; 90f19 (24:4f19)
 	text "You only live"
 	line "once, so I live"
 	cont "as an outlaw!"
@@ -119,52 +119,52 @@
 	cont "TEAM ROCKET RULES!"
 	done
 
-_Route15BattleText8: ; 90f59 (24:4f59)
+_Route15BattleText8:: ; 90f59 (24:4f59)
 	text "Fork over all your"
 	line "cash when you"
 	cont "lose to me, kid!"
 	done
 
-_Route15EndBattleText8: ; 90f8c (24:4f8c)
+_Route15EndBattleText8:: ; 90f8c (24:4f8c)
 	text "That"
 	line "can't be true!"
 	prompt
 
-_Route15AfterBattleText8: ; 90fa0 (24:4fa0)
+_Route15AfterBattleText8:: ; 90fa0 (24:4fa0)
 	text "I was just joking"
 	line "about the money!"
 	done
 
-_Route15BattleText9: ; 90fc4 (24:4fc4)
+_Route15BattleText9:: ; 90fc4 (24:4fc4)
 	text "What's cool?"
 	line "Trading #MON!"
 	done
 
-_Route15EndBattleText9: ; 90fdf (24:4fdf)
+_Route15EndBattleText9:: ; 90fdf (24:4fdf)
 	text "I"
 	line "said trade!"
 	prompt
 
-_Route15AfterBattleText9: ; 90fee (24:4fee)
+_Route15AfterBattleText9:: ; 90fee (24:4fee)
 	text "I trade #MON"
 	line "with my friends!"
 	done
 
-_Route15BattleText10: ; 9100d (24:500d)
+_Route15BattleText10:: ; 9100d (24:500d)
 	text "Want to play with"
 	line "my #MON?"
 	done
 
-_Route15EndBattleText10: ; 91029 (24:5029)
+_Route15EndBattleText10:: ; 91029 (24:5029)
 	text "I was"
 	line "too impatient!"
 	prompt
 
-_Route15AfterBattleText10: ; 9103f (24:503f)
+_Route15AfterBattleText10:: ; 9103f (24:503f)
 	text "I'll go train with"
 	line "weaker people.@@"
 
-_Route15Text12: ; 91062 (24:5062)
+_Route15Text12:: ; 91062 (24:5062)
 	text "ROUTE 15"
 	line "West to FUCHSIA"
 	cont "CITY"
--- a/text/maps/route_15_gate.asm
+++ b/text/maps/route_15_gate.asm
@@ -1,4 +1,4 @@
-_Route15GateText1: ; 8cb73 (23:4b73)
+_Route15GateText1:: ; 8cb73 (23:4b73)
 	text "Are you working"
 	line "on a #DEX?"
 
--- a/text/maps/route_15_gate_upstairs.asm
+++ b/text/maps/route_15_gate_upstairs.asm
@@ -1,4 +1,4 @@
-_UnnamedText_4968c: ; 8cbac (23:4bac)
+_UnnamedText_4968c:: ; 8cbac (23:4bac)
 	text "EXP.ALL gives"
 	line "EXP points to all"
 	cont "the #MON with"
@@ -15,7 +15,7 @@
 	cont "store it via PC."
 	done
 
-_UnnamedText_49698: ; 8cc65 (23:4c65)
+_UnnamedText_49698:: ; 8cc65 (23:4c65)
 	text "Looked into the"
 	line "binoculars."
 
--- a/text/maps/route_16.asm
+++ b/text/maps/route_16.asm
@@ -1,58 +1,58 @@
-_Route16BattleText1: ; 91081 (24:5081)
+_Route16BattleText1:: ; 91081 (24:5081)
 	text "What do you want?"
 	done
 
-_Route16EndBattleText1: ; 91094 (24:5094)
+_Route16EndBattleText1:: ; 91094 (24:5094)
 	text "Don't you"
 	line "dare laugh!"
 	prompt
 
-_Route16AfterBattleText1: ; 910aa (24:50aa)
+_Route16AfterBattleText1:: ; 910aa (24:50aa)
 	text "We like just"
 	line "hanging here,"
 	cont "what's it to you?"
 	done
 
-_Route16BattleText2: ; 910d7 (24:50d7)
+_Route16BattleText2:: ; 910d7 (24:50d7)
 	text "Nice BIKE!"
 	line "Hand it over!"
 	done
 
-_Route16EndBattleText2: ; 910f1 (24:50f1)
+_Route16EndBattleText2:: ; 910f1 (24:50f1)
 	text "Knock"
 	line "out!"
 	prompt
 
-_Route16AfterBattleText2: ; 910fd (24:50fd)
+_Route16AfterBattleText2:: ; 910fd (24:50fd)
 	text "Forget it, who"
 	line "needs your BIKE!"
 	done
 
-_Route16BattleText3: ; 9111e (24:511e)
+_Route16BattleText3:: ; 9111e (24:511e)
 	text "Come out and play,"
 	line "little mouse!"
 	done
 
-_Route16EndBattleText3: ; 91140 (24:5140)
+_Route16EndBattleText3:: ; 91140 (24:5140)
 	text "You"
 	line "little rat!"
 	prompt
 
-_Route16AfterBattleText3: ; 91151 (24:5151)
+_Route16AfterBattleText3:: ; 91151 (24:5151)
 	text "I hate losing!"
 	line "Get away from me!"
 	done
 
-_Route16BattleText4: ; 91173 (24:5173)
+_Route16BattleText4:: ; 91173 (24:5173)
 	text "Hey, you just"
 	line "bumped me!"
 	done
 
-_Route16EndBattleText4: ; 9118d (24:518d)
+_Route16EndBattleText4:: ; 9118d (24:518d)
 	text "Kaboom!"
 	prompt
 
-_Route16AfterBattleText4: ; 91196 (24:5196)
+_Route16AfterBattleText4:: ; 91196 (24:5196)
 	text "You can also get"
 	line "to FUCHSIA from"
 	cont "VERMILION using a"
@@ -59,43 +59,43 @@
 	cont "coastal road."
 	done
 
-_Route16BattleText5: ; 911d8 (24:51d8)
+_Route16BattleText5:: ; 911d8 (24:51d8)
 	text "I'm feeling"
 	line "hungry and mean!"
 	done
 
-_Route16EndBattleText5: ; 911f5 (24:51f5)
+_Route16EndBattleText5:: ; 911f5 (24:51f5)
 	text "Bad,"
 	line "bad, bad!"
 	prompt
 
-_Route16AfterBattleText5: ; 91205 (24:5205)
+_Route16AfterBattleText5:: ; 91205 (24:5205)
 	text "I like my #MON"
 	line "ferocious! They"
 	cont "tear up enemies!"
 	done
 
-_Route16BattleText6: ; 91236 (24:5236)
+_Route16BattleText6:: ; 91236 (24:5236)
 	text "Sure, I'll go!"
 	done
 
-_Route16EndBattleText6: ; 91245 (24:5245)
+_Route16EndBattleText6:: ; 91245 (24:5245)
 	text "Don't make"
 	line "me mad!"
 	prompt
 
-_Route16AfterBattleText6: ; 91258 (24:5258)
+_Route16AfterBattleText6:: ; 91258 (24:5258)
 	text "I like harassing"
 	line "people with my"
 	cont "vicious #MON!"
 	done
 
-_Route16Text7: ; 91287 (24:5287)
+_Route16Text7:: ; 91287 (24:5287)
 	text "A sleeping #MON"
 	line "blocks the way!"
 	done
 
-_UnnamedText_59ab3: ; 912a8 (24:52a8)
+_UnnamedText_59ab3:: ; 912a8 (24:52a8)
 	text "SNORLAX woke up!"
 
 	para "It attacked in a"
@@ -102,18 +102,18 @@
 	line "grumpy rage!"
 	done
 
-_UnnamedText_59ab8: ; 912d8 (24:52d8)
+_UnnamedText_59ab8:: ; 912d8 (24:52d8)
 	text "With a big yawn,"
 	line "SNORLAX returned"
 	cont "to the mountains!"
 	done
 
-_Route16Text8: ; 9130d (24:530d)
+_Route16Text8:: ; 9130d (24:530d)
 	text "Enjoy the slope!"
 	line "CYCLING ROAD"
 	done
 
-_Route16Text9: ; 9132c (24:532c)
+_Route16Text9:: ; 9132c (24:532c)
 	text "ROUTE 16"
 	line "CELADON CITY -"
 	cont "FUCHSIA CITY"
--- a/text/maps/route_16_gate.asm
+++ b/text/maps/route_16_gate.asm
@@ -1,10 +1,10 @@
-_UnnamedText_49777: ; 8cca0 (23:4ca0)
+_UnnamedText_49777:: ; 8cca0 (23:4ca0)
 	text "No pedestrians"
 	line "are allowed on"
 	cont "CYCLING ROAD!"
 	done
 
-_UnnamedText_4977c: ; 8cccd (23:4ccd)
+_UnnamedText_4977c:: ; 8cccd (23:4ccd)
 	text "CYCLING ROAD is a"
 	line "downhill course"
 	cont "by the sea. It's"
@@ -11,12 +11,12 @@
 	cont "a great ride."
 	done
 
-_UnnamedText_49781: ; 8cd0e (23:4d0e)
+_UnnamedText_49781:: ; 8cd0e (23:4d0e)
 	text "Excuse me! Wait"
 	line "up please!"
 	done
 
-_Route16GateMapText2: ; 8cd2a (23:4d2a)
+_Route16GateMapText2:: ; 8cd2a (23:4d2a)
 	text "How'd you get in?"
 	line "Good effort!"
 	done
--- a/text/maps/route_16_gate_upstairs.asm
+++ b/text/maps/route_16_gate_upstairs.asm
@@ -1,15 +1,15 @@
-_UnnamedText_49820: ; 8cd49 (23:4d49)
+_UnnamedText_49820:: ; 8cd49 (23:4d49)
 	text "I'm going for a"
 	line "ride with my girl"
 	cont "friend!"
 	done
 
-_UnnamedText_4982f: ; 8cd73 (23:4d73)
+_UnnamedText_4982f:: ; 8cd73 (23:4d73)
 	text "We're going"
 	line "riding together!"
 	done
 
-_UnnamedText_4983b: ; 8cd90 (23:4d90)
+_UnnamedText_4983b:: ; 8cd90 (23:4d90)
 	text "Looked into the"
 	line "binoculars."
 
@@ -17,7 +17,7 @@
 	line "STORE!"
 	done
 
-_UnnamedText_49847: ; 8cdc6 (23:4dc6)
+_UnnamedText_49847:: ; 8cdc6 (23:4dc6)
 	text "Looked into the"
 	line "binoculars."
 
--- a/text/maps/route_16_house.asm
+++ b/text/maps/route_16_house.asm
@@ -1,4 +1,4 @@
-_Route16HouseText3: ; 8ce02 (23:4e02)
+_Route16HouseText3:: ; 8ce02 (23:4e02)
 	text "Oh, you found my"
 	line "secret retreat!"
 
@@ -8,11 +8,11 @@
 	cont "to you with this!"
 	prompt
 
-_ReceivedHM02Text: ; 8ce66 (23:4e66)
+_ReceivedHM02Text:: ; 8ce66 (23:4e66)
 	text $52, " received"
 	line "HM02!@@"
 
-_HM02ExplanationText: ; 8ce79 (23:4e79)
+_HM02ExplanationText:: ; 8ce79 (23:4e79)
 	text "HM02 is FLY."
 	line "It will take you"
 	cont "back to any town."
@@ -21,12 +21,12 @@
 	line "use!"
 	done
 
-_HM02NoRoomText: ; 8cebe (23:4ebe)
+_HM02NoRoomText:: ; 8cebe (23:4ebe)
 	text "You don't have any"
 	line "room for this."
 	done
 
-_UnnamedText_1e652: ; 8cee0 (23:4ee0)
+_UnnamedText_1e652:: ; 8cee0 (23:4ee0)
 	text "FEAROW: Kyueen!"
 	done
 
--- a/text/maps/route_17.asm
+++ b/text/maps/route_17.asm
@@ -1,153 +1,153 @@
-_Route17BattleText1: ; 91352 (24:5352)
+_Route17BattleText1:: ; 91352 (24:5352)
 	text "There's no money"
 	line "in fighting kids!"
 	done
 
-_Route17EndBattleText1: ; 91375 (24:5375)
+_Route17EndBattleText1:: ; 91375 (24:5375)
 	text "Burned"
 	line "out!"
 	prompt
 
-_Route17AfterBattleText1: ; 91382 (24:5382)
+_Route17AfterBattleText1:: ; 91382 (24:5382)
 	text "Good stuff is"
 	line "lying around on"
 	cont "CYCLING ROAD!"
 	done
 
-_Route17BattleText2: ; 913af (24:53af)
+_Route17BattleText2:: ; 913af (24:53af)
 	text "What do you want,"
 	line "kiddo?"
 	done
 
-_Route17EndBattleText2: ; 913c9 (24:53c9)
+_Route17EndBattleText2:: ; 913c9 (24:53c9)
 	text "Whoo!"
 	prompt
 
-_Route17AfterBattleText2: ; 913d0 (24:53d0)
+_Route17AfterBattleText2:: ; 913d0 (24:53d0)
 	text "I could belly-"
 	line "bump you outta"
 	cont "here!"
 	done
 
-_Route17BattleText3: ; 913f5 (24:53f5)
+_Route17BattleText3:: ; 913f5 (24:53f5)
 	text "You heading to"
 	line "FUCHSIA?"
 	done
 
-_Route17EndBattleText3: ; 9140e (24:540e)
+_Route17EndBattleText3:: ; 9140e (24:540e)
 	text "Crash and"
 	line "burn!"
 	prompt
 
-_Route17AfterBattleText3: ; 9141f (24:541f)
+_Route17AfterBattleText3:: ; 9141f (24:541f)
 	text "I love racing"
 	line "downhill!"
 	done
 
-_Route17BattleText4: ; 91438 (24:5438)
+_Route17BattleText4:: ; 91438 (24:5438)
 	text "We're BIKERs!"
 	line "Highway stars!"
 	done
 
-_Route17EndBattleText4: ; 91455 (24:5455)
+_Route17EndBattleText4:: ; 91455 (24:5455)
 	text "Smoked!"
 	prompt
 
-_Route17AfterBattleText4: ; 9145e (24:545e)
+_Route17AfterBattleText4:: ; 9145e (24:545e)
 	text "Are you looking"
 	line "for adventure?"
 	done
 
-_Route17BattleText5: ; 9147e (24:547e)
+_Route17BattleText5:: ; 9147e (24:547e)
 	text "Let VOLTORB"
 	line "electrify you!"
 	done
 
-_Route17EndBattleText5: ; 9149a (24:549a)
+_Route17EndBattleText5:: ; 9149a (24:549a)
 	text "Grounded"
 	line "out!"
 	prompt
 
-_Route17AfterBattleText5: ; 914a9 (24:54a9)
+_Route17AfterBattleText5:: ; 914a9 (24:54a9)
 	text "I got my VOLTORB"
 	line "at the abandoned"
 	cont "POWER PLANT."
 	done
 
-_Route17BattleText6: ; 914d9 (24:54d9)
+_Route17BattleText6:: ; 914d9 (24:54d9)
 	text "My #MON won't"
 	line "evolve! Why?"
 	done
 
-_Route17EndBattleText6: ; 914f4 (24:54f4)
+_Route17EndBattleText6:: ; 914f4 (24:54f4)
 	text "Why,"
 	line "you!"
 	prompt
 
-_Route17AfterBattleText6: ; 914ff (24:54ff)
+_Route17AfterBattleText6:: ; 914ff (24:54ff)
 	text "Maybe some #MON"
 	line "need element"
 	cont "STONEs to evolve."
 	done
 
-_Route17BattleText7: ; 9152f (24:552f)
+_Route17BattleText7:: ; 9152f (24:552f)
 	text "I need a little"
 	line "exercise!"
 	done
 
-_Route17EndBattleText7: ; 9154a (24:554a)
+_Route17EndBattleText7:: ; 9154a (24:554a)
 	text "Whew!"
 	line "Good workout!"
 	prompt
 
-_Route17AfterBattleText7: ; 9155f (24:555f)
+_Route17AfterBattleText7:: ; 9155f (24:555f)
 	text "I'm sure I lost"
 	line "weight there!"
 	done
 
-_Route17BattleText8: ; 9157d (24:557d)
+_Route17BattleText8:: ; 9157d (24:557d)
 	text "Be a rebel!"
 	done
 
-_Route17EndBattleText8: ; 9158a (24:558a)
+_Route17EndBattleText8:: ; 9158a (24:558a)
 	text "Aaaargh!"
 	prompt
 
-_Route17AfterBattleText8: ; 91594 (24:5594)
+_Route17AfterBattleText8:: ; 91594 (24:5594)
 	text "Be ready to fight"
 	line "for your beliefs!"
 	done
 
-_Route17BattleText9: ; 915b9 (24:55b9)
+_Route17BattleText9:: ; 915b9 (24:55b9)
 	text "Nice BIKE!"
 	line "How's it handle?"
 	done
 
-_Route17EndBattleText9: ; 915d5 (24:55d5)
+_Route17EndBattleText9:: ; 915d5 (24:55d5)
 	text "Shoot!"
 	prompt
 
-_Route17AfterBattleText9: ; 915dd (24:55dd)
+_Route17AfterBattleText9:: ; 915dd (24:55dd)
 	text "The slope makes"
 	line "it hard to steer!"
 	done
 
-_Route17BattleText10: ; 91600 (24:5600)
+_Route17BattleText10:: ; 91600 (24:5600)
 	text "Get lost kid!"
 	line "I'm bushed!"
 	done
 
-_Route17EndBattleText10: ; 9161a (24:561a)
+_Route17EndBattleText10:: ; 9161a (24:561a)
 	text "Are you"
 	line "satisfied?"
 	prompt
 
-_Route17AfterBattleText10: ; 9162e (24:562e)
+_Route17AfterBattleText10:: ; 9162e (24:562e)
 	text "I need to catch"
 	line "a few Zs!"
 	done
 
-_Route17Text11: ; 91649 (24:5649)
+_Route17Text11:: ; 91649 (24:5649)
 	text "It's a notice!"
 
 	para "Watch out for"
@@ -154,7 +154,7 @@
 	line "discarded items!"
 	done
 
-_Route17Text12: ; 91677 (24:5677)
+_Route17Text12:: ; 91677 (24:5677)
 	text "TRAINER TIPS"
 
 	para "All #MON are"
@@ -166,7 +166,7 @@
 	cont "different rates."
 	done
 
-_Route17Text13: ; 916d8 (24:56d8)
+_Route17Text13:: ; 916d8 (24:56d8)
 	text "TRAINER TIPS"
 
 	para "Press the A or B"
@@ -175,13 +175,13 @@
 	cont "slope."
 	done
 
-_Route17Text14: ; 91721 (24:5721)
+_Route17Text14:: ; 91721 (24:5721)
 	text "ROUTE 17"
 	line "CELADON CITY -"
 	cont "FUCHSIA CITY"
 	done
 
-_Route17Text15: ; 91747 (24:5747)
+_Route17Text15:: ; 91747 (24:5747)
 	text "It's a notice!"
 
 	para "Don't throw the"
@@ -189,7 +189,7 @@
 	cont "BALLs instead!"
 	done
 
-_Route17Text16: ; 91782 (24:5782)
+_Route17Text16:: ; 91782 (24:5782)
 	text "CYCLING ROAD"
 	line "Slope ends here!"
 	done
--- a/text/maps/route_18.asm
+++ b/text/maps/route_18.asm
@@ -1,57 +1,57 @@
-_Route18BattleText1: ; 917a1 (24:57a1)
+_Route18BattleText1:: ; 917a1 (24:57a1)
 	text "I always check"
 	line "every grassy area"
 	cont "for new #MON."
 	done
 
-_Route18EndBattleText1: ; 917d1 (24:57d1)
+_Route18EndBattleText1:: ; 917d1 (24:57d1)
 	text "Tch!"
 	prompt
 
-_Route18AfterBattleText1: ; 917d7 (24:57d7)
+_Route18AfterBattleText1:: ; 917d7 (24:57d7)
 	text "I wish I had a"
 	line "BIKE!"
 	done
 
-_Route18BattleText2: ; 917ed (24:57ed)
+_Route18BattleText2:: ; 917ed (24:57ed)
 	text "Kurukkoo!"
 	line "How do you like"
 	cont "my bird call?"
 	done
 
-_Route18EndBattleText2: ; 91816 (24:5816)
+_Route18EndBattleText2:: ; 91816 (24:5816)
 	text "I"
 	line "had to bug you!"
 	prompt
 
-_Route18AfterBattleText2: ; 91829 (24:5829)
+_Route18AfterBattleText2:: ; 91829 (24:5829)
 	text "I also collect sea"
 	line "#MON on"
 	cont "weekends!"
 	done
 
-_Route18BattleText3: ; 9184f (24:584f)
+_Route18BattleText3:: ; 9184f (24:584f)
 	text "This is my turf!"
 	line "Get out of here!"
 	done
 
-_Route18EndBattleText3: ; 91872 (24:5872)
+_Route18EndBattleText3:: ; 91872 (24:5872)
 	text "Darn!"
 	prompt
 
-_Route18AfterBattleText3: ; 91879 (24:5879)
+_Route18AfterBattleText3:: ; 91879 (24:5879)
 	text "This is my fave"
 	line "#MON hunting"
 	cont "area!"
 	done
 
-_Route18Text4: ; 9189d (24:589d)
+_Route18Text4:: ; 9189d (24:589d)
 	text "ROUTE 18"
 	line "CELADON CITY -"
 	cont "FUCHSIA CITY"
 	done
 
-_Route18Text5: ; 918c3 (24:58c3)
+_Route18Text5:: ; 918c3 (24:58c3)
 	text "CYCLING ROAD"
 	line "No pedestrians"
 	cont "permitted!"
--- a/text/maps/route_18_gate.asm
+++ b/text/maps/route_18_gate.asm
@@ -1,15 +1,15 @@
-_UnnamedText_49928: ; 8cef1 (23:4ef1)
+_UnnamedText_49928:: ; 8cef1 (23:4ef1)
 	text "You need a BICYCLE"
 	line "for CYCLING ROAD!"
 	done
 
-_UnnamedText_4992d: ; 8cf17 (23:4f17)
+_UnnamedText_4992d:: ; 8cf17 (23:4f17)
 	text "CYCLING ROAD is"
 	line "all uphill from"
 	cont "here."
 	done
 
-_UnnamedText_49932: ; 8cf3e (23:4f3e)
+_UnnamedText_49932:: ; 8cf3e (23:4f3e)
 	text "Excuse me!"
 	done
 
--- a/text/maps/route_18_gate_upstairs.asm
+++ b/text/maps/route_18_gate_upstairs.asm
@@ -1,4 +1,4 @@
-_UnnamedText_49993: ; 8cf4a (23:4f4a)
+_UnnamedText_49993:: ; 8cf4a (23:4f4a)
 	text "Looked into the"
 	line "binoculars."
 
@@ -6,7 +6,7 @@
 	line "the west!"
 	done
 
-_UnnamedText_4999f: ; 8cf83 (23:4f83)
+_UnnamedText_4999f:: ; 8cf83 (23:4f83)
 	text "Looked into the"
 	line "binoculars."
 
--- a/text/maps/route_19.asm
+++ b/text/maps/route_19.asm
@@ -1,156 +1,156 @@
-_Route19BattleText1: ; 918eb (24:58eb)
+_Route19BattleText1:: ; 918eb (24:58eb)
 	text "Have to warm up"
 	line "before my swim!"
 	done
 
-_Route19EndBattleText1: ; 9190c (24:590c)
+_Route19EndBattleText1:: ; 9190c (24:590c)
 	text "All"
 	line "warmed up!"
 	prompt
 
-_Route19AfterBattleText1: ; 9191c (24:591c)
+_Route19AfterBattleText1:: ; 9191c (24:591c)
 	text "Thanks, kid! I'm"
 	line "ready for a swim!"
 	done
 
-_Route19BattleText2: ; 9193f (24:593f)
+_Route19BattleText2:: ; 9193f (24:593f)
 	text "Wait! You'll have"
 	line "a heart attack!"
 	done
 
-_Route19EndBattleText2: ; 91961 (24:5961)
+_Route19EndBattleText2:: ; 91961 (24:5961)
 	text "Ooh!"
 	line "That's chilly!"
 	prompt
 
-_Route19AfterBattleText2: ; 91975 (24:5975)
+_Route19AfterBattleText2:: ; 91975 (24:5975)
 	text "Watch out for"
 	line "TENTACOOL!"
 	done
 
-_Route19BattleText3: ; 9198f (24:598f)
+_Route19BattleText3:: ; 9198f (24:598f)
 	text "I love swimming!"
 	line "What about you?"
 	done
 
-_Route19EndBattleText3: ; 919b1 (24:59b1)
+_Route19EndBattleText3:: ; 919b1 (24:59b1)
 	text "Belly"
 	line "flop!"
 	prompt
 
-_Route19AfterBattleText3: ; 919be (24:59be)
+_Route19AfterBattleText3:: ; 919be (24:59be)
 	text "I can beat #MON"
 	line "at swimming!"
 	done
 
-_Route19BattleText4: ; 919dc (24:59dc)
+_Route19BattleText4:: ; 919dc (24:59dc)
 	text "What's beyond the"
 	line "horizon?"
 	done
 
-_Route19EndBattleText4: ; 919f7 (24:59f7)
+_Route19EndBattleText4:: ; 919f7 (24:59f7)
 	text "Glub!"
 	prompt
 
-_Route19AfterBattleText4: ; 919fe (24:59fe)
+_Route19AfterBattleText4:: ; 919fe (24:59fe)
 	text "I see a couple of"
 	line "islands!"
 	done
 
-_Route19BattleText5: ; 91a1a (24:5a1a)
+_Route19BattleText5:: ; 91a1a (24:5a1a)
 	text "I tried diving"
 	line "for #MON, but"
 	cont "it was a no go!"
 	done
 
-_Route19EndBattleText5: ; 91a48 (24:5a48)
+_Route19EndBattleText5:: ; 91a48 (24:5a48)
 	text "Help!"
 	prompt
 
-_Route19AfterBattleText5: ; 91a4f (24:5a4f)
+_Route19AfterBattleText5:: ; 91a4f (24:5a4f)
 	text "You have to fish"
 	line "for sea #MON!"
 	done
 
-_Route19BattleText6: ; 91a6f (24:5a6f)
+_Route19BattleText6:: ; 91a6f (24:5a6f)
 	text "I look at the"
 	line "sea to forget!"
 	done
 
-_Route19EndBattleText6: ; 91a8d (24:5a8d)
+_Route19EndBattleText6:: ; 91a8d (24:5a8d)
 	text "Ooh!"
 	line "Traumatic!"
 	prompt
 
-_Route19AfterBattleText6: ; 91a9e (24:5a9e)
+_Route19AfterBattleText6:: ; 91a9e (24:5a9e)
 	text "I'm looking at the"
 	line "sea to forget!"
 	done
 
-_Route19BattleText7: ; 91ac0 (24:5ac0)
+_Route19BattleText7:: ; 91ac0 (24:5ac0)
 	text "Oh, I just love"
 	line "your ride! Can I"
 	cont "have it if I win?"
 	done
 
-_Route19EndBattleText7: ; 91af4 (24:5af4)
+_Route19EndBattleText7:: ; 91af4 (24:5af4)
 	text "Oh!"
 	line "I lost!"
 	prompt
 
-_Route19AfterBattleText7: ; 91b01 (24:5b01)
+_Route19AfterBattleText7:: ; 91b01 (24:5b01)
 	text "It's still a long"
 	line "way to go to"
 	cont "SEAFOAM ISLANDS."
 	done
 
-_Route19BattleText8: ; 91b31 (24:5b31)
+_Route19BattleText8:: ; 91b31 (24:5b31)
 	text "Swimming's great!"
 	line "Sunburns aren't!"
 	done
 
-_Route19EndBattleText8: ; 91b53 (24:5b53)
+_Route19EndBattleText8:: ; 91b53 (24:5b53)
 	text "Shocker!"
 	prompt
 
-_Route19AfterBattleText8: ; 91b5d (24:5b5d)
+_Route19AfterBattleText8:: ; 91b5d (24:5b5d)
 	text "My boy friend"
 	line "wanted to swim to"
 	cont "SEAFOAM ISLANDS."
 	done
 
-_Route19BattleText9: ; 91b8f (24:5b8f)
+_Route19BattleText9:: ; 91b8f (24:5b8f)
 	text "These waters are"
 	line "treacherous!"
 	done
 
-_Route19EndBattleText9: ; 91bae (24:5bae)
+_Route19EndBattleText9:: ; 91bae (24:5bae)
 	text "Ooh!"
 	line "Dangerous!"
 	prompt
 
-_Route19AfterBattleText9: ; 91bbf (24:5bbf)
+_Route19AfterBattleText9:: ; 91bbf (24:5bbf)
 	text "I got a cramp!"
 	line "Glub, glub..."
 	done
 
-_Route19BattleText10: ; 91bdd (24:5bdd)
+_Route19BattleText10:: ; 91bdd (24:5bdd)
 	text "I swam here, but"
 	line "I'm tired."
 	done
 
-_Route19EndBattleText10: ; 91bf9 (24:5bf9)
+_Route19EndBattleText10:: ; 91bf9 (24:5bf9)
 	text "I'm"
 	line "exhausted..."
 	prompt
 
-_Route19AfterBattleText10: ; 91c0a (24:5c0a)
+_Route19AfterBattleText10:: ; 91c0a (24:5c0a)
 	text "LAPRAS is so big,"
 	line "it must keep you"
 	cont "dry on water."
 	done
 
-_Route19Text11: ; 91c3c (24:5c3c)
+_Route19Text11:: ; 91c3c (24:5c3c)
 	text "SEA ROUTE 19"
 	line "FUCHSIA CITY -"
 	cont "SEAFOAM ISLANDS"
--- a/text/maps/route_2.asm
+++ b/text/maps/route_2.asm
@@ -1,10 +1,10 @@
-_Route2Text3: ; 8d745 (23:5745)
+_Route2Text3:: ; 8d745 (23:5745)
 	text "ROUTE 2"
 	line "VIRIDIAN CITY -"
 	cont "PEWTER CITY"
 	done
 
-_Route2Text4: ; 8d76a (23:576a)
+_Route2Text4:: ; 8d76a (23:576a)
 	text "DIGLETT's CAVE"
 	done
 
--- a/text/maps/route_20.asm
+++ b/text/maps/route_20.asm
@@ -1,134 +1,134 @@
-_Route20BattleText1: ; 91c69 (24:5c69)
+_Route20BattleText1:: ; 91c69 (24:5c69)
 	text "The water is"
 	line "shallow here."
 	done
 
-_Route20EndBattleText1: ; 91c85 (24:5c85)
+_Route20EndBattleText1:: ; 91c85 (24:5c85)
 	text "Splash!"
 	prompt
 
-_Route20AfterBattleText1: ; 91c8e (24:5c8e)
+_Route20AfterBattleText1:: ; 91c8e (24:5c8e)
 	text "I wish I could"
 	line "ride my #MON."
 	done
 
-_Route20BattleText2: ; 91cac (24:5cac)
+_Route20BattleText2:: ; 91cac (24:5cac)
 	text "SEAFOAM is a"
 	line "quiet getaway!"
 	done
 
-_Route20EndBattleText2: ; 91cc9 (24:5cc9)
+_Route20EndBattleText2:: ; 91cc9 (24:5cc9)
 	text "Quit it!"
 	prompt
 
-_Route20AfterBattleText2: ; 91cd3 (24:5cd3)
+_Route20AfterBattleText2:: ; 91cd3 (24:5cd3)
 	text "There's a huge"
 	line "cavern underneath"
 	cont "this island."
 	done
 
-_Route20BattleText3: ; 91d01 (24:5d01)
+_Route20BattleText3:: ; 91d01 (24:5d01)
 	text "I love floating"
 	line "with the fishes!"
 	done
 
-_Route20EndBattleText3: ; 91d23 (24:5d23)
+_Route20EndBattleText3:: ; 91d23 (24:5d23)
 	text "Yowch!"
 	prompt
 
-_Route20AfterBattleText3: ; 91d2b (24:5d2b)
+_Route20AfterBattleText3:: ; 91d2b (24:5d2b)
 	text "Want to float"
 	line "with me?"
 	done
 
-_Route20BattleText4: ; 91d43 (24:5d43)
+_Route20BattleText4:: ; 91d43 (24:5d43)
 	text "Are you on"
 	line "vacation too?"
 	done
 
-_Route20EndBattleText4: ; 91d5d (24:5d5d)
+_Route20EndBattleText4:: ; 91d5d (24:5d5d)
 	text "No"
 	line "mercy at all!"
 	prompt
 
-_Route20AfterBattleText4: ; 91d6f (24:5d6f)
+_Route20AfterBattleText4:: ; 91d6f (24:5d6f)
 	text "SEAFOAM used to"
 	line "be one island!"
 	done
 
-_Route20BattleText5: ; 91d8f (24:5d8f)
+_Route20BattleText5:: ; 91d8f (24:5d8f)
 	text "Check out my buff"
 	line "physique!"
 	done
 
-_Route20EndBattleText5: ; 91dac (24:5dac)
+_Route20EndBattleText5:: ; 91dac (24:5dac)
 	text "Wimpy!"
 	prompt
 
-_Route20AfterBattleText5: ; 91db4 (24:5db4)
+_Route20AfterBattleText5:: ; 91db4 (24:5db4)
 	text "I should've been"
 	line "buffing up my"
 	cont "#MON, not me!"
 	done
 
-_Route20BattleText6: ; 91de1 (24:5de1)
+_Route20BattleText6:: ; 91de1 (24:5de1)
 	text "Why are you"
 	line "riding a #MON?"
 	cont "Can't you swim?"
 	done
 
-_Route20EndBattleText6: ; 91e0c (24:5e0c)
+_Route20EndBattleText6:: ; 91e0c (24:5e0c)
 	text "Ouch!"
 	line "Torpedoed!"
 	prompt
 
-_Route20AfterBattleText6: ; 91e1e (24:5e1e)
+_Route20AfterBattleText6:: ; 91e1e (24:5e1e)
 	text "Riding a #MON"
 	line "sure looks fun!"
 	done
 
-_Route20BattleText7: ; 91e3d (24:5e3d)
+_Route20BattleText7:: ; 91e3d (24:5e3d)
 	text "I rode my bird"
 	line "#MON here!"
 	done
 
-_Route20EndBattleText7: ; 91e58 (24:5e58)
+_Route20EndBattleText7:: ; 91e58 (24:5e58)
 	text "Oh"
 	line "no!"
 	prompt
 
-_Route20AfterBattleText7: ; 91e60 (24:5e60)
+_Route20AfterBattleText7:: ; 91e60 (24:5e60)
 	text "My birds can't"
 	line "FLY me back!"
 	done
 
-_Route20BattleText8: ; 91e7c (24:5e7c)
+_Route20BattleText8:: ; 91e7c (24:5e7c)
 	text "My boy friend gave"
 	line "me big pearls!"
 	done
 
-_Route20EndBattleText8: ; 91e9f (24:5e9f)
+_Route20EndBattleText8:: ; 91e9f (24:5e9f)
 	text "Don't"
 	line "touch my pearls!"
 	prompt
 
-_Route20AfterBattleText8: ; 91eb6 (24:5eb6)
+_Route20AfterBattleText8:: ; 91eb6 (24:5eb6)
 	text "Will my pearls"
 	line "grow bigger"
 	cont "inside CLOYSTER?"
 	done
 
-_Route20BattleText9: ; 91ee3 (24:5ee3)
+_Route20BattleText9:: ; 91ee3 (24:5ee3)
 	text "I swam here from"
 	line "CINNABAR ISLAND!"
 	done
 
-_Route20EndBattleText9: ; 91f06 (24:5f06)
+_Route20EndBattleText9:: ; 91f06 (24:5f06)
 	text "I'm"
 	line "so disappointed!"
 	prompt
 
-_Route20AfterBattleText9: ; 91f1b (24:5f1b)
+_Route20AfterBattleText9:: ; 91f1b (24:5f1b)
 	text "#MON have"
 	line "taken over an"
 	cont "abandoned mansion"
@@ -135,23 +135,23 @@
 	cont "on CINNABAR!"
 	done
 
-_Route20BattleText10: ; 91f53 (24:5f53)
+_Route20BattleText10:: ; 91f53 (24:5f53)
 	text "CINNABAR, in the"
 	line "west, has a LAB"
 	cont "for #MON."
 	done
 
-_Route20EndBattleText10: ; 91f7f (24:5f7f)
+_Route20EndBattleText10:: ; 91f7f (24:5f7f)
 	text "Wait!"
 	prompt
 
-_Route20AfterBattleText10: ; 91f86 (24:5f86)
+_Route20AfterBattleText10:: ; 91f86 (24:5f86)
 	text "CINNABAR is a "
 	line "volcanic island!"
 	done
 
-_Route20Text12: ; 91fa7 (24:5fa7)
-_Route20Text11: ; 91fa7 (24:5fa7)
+_Route20Text12:: ; 91fa7 (24:5fa7)
+_Route20Text11:: ; 91fa7 (24:5fa7)
 	text "SEAFOAM ISLANDS"
 	done
 
--- a/text/maps/route_21.asm
+++ b/text/maps/route_21.asm
@@ -1,89 +1,89 @@
-_Route21BattleText1: ; 91fb8 (24:5fb8)
+_Route21BattleText1:: ; 91fb8 (24:5fb8)
 	text "You want to know"
 	line "if the fish are"
 	cont "biting?"
 	done
 
-_Route21EndBattleText1: ; 91fe2 (24:5fe2)
+_Route21EndBattleText1:: ; 91fe2 (24:5fe2)
 	text "Dang!"
 	prompt
 
-_Route21AfterBattleText1: ; 91fe9 (24:5fe9)
+_Route21AfterBattleText1:: ; 91fe9 (24:5fe9)
 	text "I can't catch"
 	line "anything good!"
 	done
 
-_Route21BattleText2: ; 92006 (24:6006)
+_Route21BattleText2:: ; 92006 (24:6006)
 	text "I got a big haul!"
 	line "Wanna go for it?"
 	done
 
-_Route21EndBattleText2: ; 9202a (24:602a)
+_Route21EndBattleText2:: ; 9202a (24:602a)
 	text "Darn"
 	line "MAGIKARP!"
 	prompt
 
-_Route21AfterBattleText2: ; 9203a (24:603a)
+_Route21AfterBattleText2:: ; 9203a (24:603a)
 	text "I seem to only"
 	line "catch MAGIKARP!"
 	done
 
-_Route21BattleText3: ; 9205a (24:605a)
+_Route21BattleText3:: ; 9205a (24:605a)
 	text "The sea cleanses"
 	line "my body and soul!"
 	done
 
-_Route21EndBattleText3: ; 9207e (24:607e)
+_Route21EndBattleText3:: ; 9207e (24:607e)
 	text "Ayah!"
 	prompt
 
-_Route21AfterBattleText3: ; 92085 (24:6085)
+_Route21AfterBattleText3:: ; 92085 (24:6085)
 	text "I like the"
 	line "mountains too!"
 	done
 
-_Route21BattleText4: ; 920a0 (24:60a0)
+_Route21BattleText4:: ; 920a0 (24:60a0)
 	text "What's wrong with"
 	line "me swimming?"
 	done
 
-_Route21EndBattleText4: ; 920bf (24:60bf)
+_Route21EndBattleText4:: ; 920bf (24:60bf)
 	text "Cheap"
 	line "shot!"
 	prompt
 
-_Route21AfterBattleText4: ; 920cc (24:60cc)
+_Route21AfterBattleText4:: ; 920cc (24:60cc)
 	text "I look like what?"
 	line "A studded inner"
 	cont "tube? Get lost!"
 	done
 
-_Route21BattleText5: ; 920ff (24:60ff)
+_Route21BattleText5:: ; 920ff (24:60ff)
 	text "I caught all my"
 	line "#MON at sea!"
 	done
 
-_Route21EndBattleText5: ; 9211d (24:611d)
+_Route21EndBattleText5:: ; 9211d (24:611d)
 	text "Diver!!"
 	line "Down!!"
 	prompt
 
-_Route21AfterBattleText5: ; 9212d (24:612d)
+_Route21AfterBattleText5:: ; 9212d (24:612d)
 	text "Where'd you catch"
 	line "your #MON?"
 	done
 
-_Route21BattleText6: ; 9214a (24:614a)
+_Route21BattleText6:: ; 9214a (24:614a)
 	text "Right now, I'm in"
 	line "a triathlon meet!"
 	done
 
-_Route21EndBattleText6: ; 9216e (24:616e)
+_Route21EndBattleText6:: ; 9216e (24:616e)
 	text "Pant..."
 	line "pant...pant..."
 	prompt
 
-_Route21AfterBattleText6: ; 92186 (24:6186)
+_Route21AfterBattleText6:: ; 92186 (24:6186)
 	text "I'm beat!"
 	line "But, I still have"
 	cont "the bike race and"
@@ -90,48 +90,48 @@
 	cont "marathon left!"
 	done
 
-_Route21BattleText7: ; 921c3 (24:61c3)
+_Route21BattleText7:: ; 921c3 (24:61c3)
 	text "Ahh! Feel the sun"
 	line "and the wind!"
 	done
 
-_Route21EndBattleText7: ; 921e4 (24:61e4)
+_Route21EndBattleText7:: ; 921e4 (24:61e4)
 	text "Yow!"
 	line "I lost!"
 	prompt
 
-_Route21AfterBattleText7: ; 921f2 (24:61f2)
+_Route21AfterBattleText7:: ; 921f2 (24:61f2)
 	text "I'm sunburnt to a"
 	line "crisp!"
 	done
 
-_Route21BattleText8: ; 9220b (24:620b)
+_Route21BattleText8:: ; 9220b (24:620b)
 	text "Hey, don't scare"
 	line "away the fish!"
 	done
 
-_Route21EndBattleText8: ; 9222b (24:622b)
+_Route21EndBattleText8:: ; 9222b (24:622b)
 	text "Sorry!"
 	line "I didn't mean it!"
 	prompt
 
-_Route21AfterBattleText8: ; 92244 (24:6244)
+_Route21AfterBattleText8:: ; 92244 (24:6244)
 	text "I was just angry"
 	line "that I couldn't"
 	cont "catch anything."
 	done
 
-_Route21BattleText9: ; 92275 (24:6275)
+_Route21BattleText9:: ; 92275 (24:6275)
 	text "Keep me company"
 	line "'til I get a hit!"
 	done
 
-_Route21EndBattleText9: ; 92297 (24:6297)
+_Route21EndBattleText9:: ; 92297 (24:6297)
 	text "That"
 	line "burned some time."
 	prompt
 
-_Route21AfterBattleText9: ; 922af (24:62af)
+_Route21AfterBattleText9:: ; 922af (24:62af)
 	text "Oh wait! I got a"
 	line "bite! Yeah!"
 	done
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -1,4 +1,4 @@
-_UnnamedText_511ad: ; 922cd (24:62cd)
+_UnnamedText_511ad:: ; 922cd (24:62cd)
 	text $53, ": Hey!"
 	line $52, "!"
 
@@ -17,7 +17,7 @@
 	cont "get any stronger?"
 	done
 
-_UnnamedText_511b2: ; 9236f (24:636f)
+_UnnamedText_511b2:: ; 9236f (24:636f)
 	text "I heard #MON"
 	line "LEAGUE has many"
 	cont "tough trainers!"
@@ -31,13 +31,13 @@
 	cont "a move on!"
 	done
 
-_UnnamedText_511b7: ; 923f4 (24:63f4)
+_UnnamedText_511b7:: ; 923f4 (24:63f4)
 	text "Awww!"
 	line "You just lucked"
 	cont "out!"
 	prompt
 
-_UnnamedText_511bc: ; 92410 (24:6410)
+_UnnamedText_511bc:: ; 92410 (24:6410)
 	text $53, ": What?"
 	line "Why do I have 2"
 	cont "#MON?"
@@ -46,7 +46,7 @@
 	cont "some more too!"
 	prompt
 
-_UnnamedText_511c1: ; 92450 (24:6450)
+_UnnamedText_511c1:: ; 92450 (24:6450)
 	text $53, ": What?"
 	line $52, "! What a"
 	cont "surprise to see"
@@ -67,7 +67,7 @@
 	para "Come on!"
 	done
 
-_UnnamedText_511c6: ; 92506 (24:6506)
+_UnnamedText_511c6:: ; 92506 (24:6506)
 	text "That loosened me"
 	line "up! I'm ready for"
 	cont "#MON LEAGUE!"
@@ -80,7 +80,7 @@
 	cont "here. Smell ya!"
 	done
 
-_UnnamedText_511cb: ; 92583 (24:6583)
+_UnnamedText_511cb:: ; 92583 (24:6583)
 	text "What!?"
 
 	para "I was just"
@@ -87,7 +87,7 @@
 	line "careless!"
 	prompt
 
-_UnnamedText_511d0: ; 925a0 (24:65a0)
+_UnnamedText_511d0:: ; 925a0 (24:65a0)
 	text $53, ": Hahaha!"
 	line $52, "! That's"
 	cont "your best? You're"
@@ -98,7 +98,7 @@
 	line "more! You loser!"
 	prompt
 
-_Route22Text3: ; 92606 (24:6606)
+_Route22Text3:: ; 92606 (24:6606)
 	text "#MON LEAGUE"
 	line "Front Gate"
 	done
--- a/text/maps/route_23.asm
+++ b/text/maps/route_23.asm
@@ -1,4 +1,4 @@
-_VictoryRoadGuardText1: ; 9261e (24:661e)
+_VictoryRoadGuardText1:: ; 9261e (24:661e)
 	text "You can pass here"
 	line "only if you have"
 	cont "the @"
@@ -14,7 +14,7 @@
 	line "it to get to"
 	cont "#MON LEAGUE!@@"
 
-_VictoryRoadGuardText2: ; 92696 (24:6696)
+_VictoryRoadGuardText2:: ; 92696 (24:6696)
 	text "You can pass here"
 	line "only if you have"
 	cont "the @"
@@ -26,13 +26,13 @@
 	TX_RAM $cd6d
 	text "!@@"
 
-_UnnamedText_513a3: ; 926dd (24:66dd)
+_UnnamedText_513a3:: ; 926dd (24:66dd)
 	db $0
 	para "OK then! Please,"
 	line "go right ahead!"
 	done
 
-_Route23Text8: ; 92700 (24:6700)
+_Route23Text8:: ; 92700 (24:6700)
 	text "VICTORY ROAD GATE"
 	line "- #MON LEAGUE"
 	done
--- a/text/maps/route_24_1.asm
+++ b/text/maps/route_24_1.asm
@@ -1,26 +1,26 @@
-_UnnamedText_51510: ; 92721 (24:6721)
+_UnnamedText_51510:: ; 92721 (24:6721)
 	text "Congratulations!"
 	line "You beat our 5"
 	cont "contest trainers!@@"
 
-_UnnamedText_51515: ; 92755 (24:6755)
+_UnnamedText_51515:: ; 92755 (24:6755)
 	db $0
 	para "You just earned a"
 	line "fabulous prize!"
 	prompt
 
-_UnnamedText_5151a: ; 92779 (24:6779)
+_UnnamedText_5151a:: ; 92779 (24:6779)
 	text $52, " received"
 	line "a @"
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_51521: ; 9278f (24:678f)
+_UnnamedText_51521:: ; 9278f (24:678f)
 	text "You don't have"
 	line "any room!"
 	done
 
-_UnnamedText_51526: ; 927a8 (24:67a8)
+_UnnamedText_51526:: ; 927a8 (24:67a8)
 	text "By the way, would"
 	line "you like to join"
 	cont "TEAM ROCKET?"
@@ -46,12 +46,12 @@
 	cont "refuse!"
 	done
 
-_UnnamedText_5152b: ; 9288a (24:688a)
+_UnnamedText_5152b:: ; 9288a (24:688a)
 	text "Arrgh!"
 	line "You are good!"
 	prompt
 
-_UnnamedText_51530: ; 928a0 (24:68a0)
+_UnnamedText_51530:: ; 928a0 (24:68a0)
 	text "With your ability,"
 	line "you could become"
 	cont "a top leader in"
@@ -58,7 +58,7 @@
 	cont "TEAM ROCKET!"
 	done
 
-_Route24BattleText1: ; 928e2 (24:68e2)
+_Route24BattleText1:: ; 928e2 (24:68e2)
 	text "I saw your feat"
 	line "from the grass!"
 	done
--- a/text/maps/route_24_2.asm
+++ b/text/maps/route_24_2.asm
@@ -1,75 +1,75 @@
-_Route24EndBattleText1: ; 94000 (25:4000)
+_Route24EndBattleText1:: ; 94000 (25:4000)
 	text "I"
 	line "thought not!"
 	prompt
 
-_Route24AfterBattleText1: ; 94010 (25:4010)
+_Route24AfterBattleText1:: ; 94010 (25:4010)
 	text "I hid because the"
 	line "people on the"
 	cont "bridge scared me!"
 	done
 
-_Route24BattleText2: ; 94043 (25:4043)
+_Route24BattleText2:: ; 94043 (25:4043)
 	text "OK! I'm No. 5!"
 	line "I'll stomp you!"
 	done
 
-_Route24EndBattleText2: ; 94061 (25:4061)
+_Route24EndBattleText2:: ; 94061 (25:4061)
 	text "Whoa!"
 	line "Too much!"
 	prompt
 
-_Route24AfterBattleText2: ; 94072 (25:4072)
+_Route24AfterBattleText2:: ; 94072 (25:4072)
 	text "I did my best, I"
 	line "have no regrets!"
 	done
 
-_Route24BattleText3: ; 94095 (25:4095)
+_Route24BattleText3:: ; 94095 (25:4095)
 	text "I'm No. 4!"
 	line "Getting tired?"
 	done
 
-_Route24EndBattleText3: ; 940af (25:40af)
+_Route24EndBattleText3:: ; 940af (25:40af)
 	text "I lost"
 	line "too!"
 	prompt
 
-_Route24AfterBattleText3: ; 940bc (25:40bc)
+_Route24AfterBattleText3:: ; 940bc (25:40bc)
 	text "I did my best, so"
 	line "I've no regrets!"
 	done
 
-_Route24BattleText4: ; 940df (25:40df)
+_Route24BattleText4:: ; 940df (25:40df)
 	text "Here's No. 3!"
 	line "I won't be easy!"
 	done
 
-_Route24EndBattleText4: ; 940fd (25:40fd)
+_Route24EndBattleText4:: ; 940fd (25:40fd)
 	text "Ow!"
 	line "Stomped flat!"
 	prompt
 
-_Route24AfterBattleText4: ; 94110 (25:4110)
+_Route24AfterBattleText4:: ; 94110 (25:4110)
 	text "I did my best, I"
 	line "have no regrets!"
 	done
 
-_Route24BattleText5: ; 94133 (25:4133)
+_Route24BattleText5:: ; 94133 (25:4133)
 	text "I'm second!"
 	line "Now it's serious!"
 	done
 
-_Route24EndBattleText5: ; 94150 (25:4150)
+_Route24EndBattleText5:: ; 94150 (25:4150)
 	text "How could I"
 	line "lose?"
 	prompt
 
-_Route24AfterBattleText5: ; 94163 (25:4163)
+_Route24AfterBattleText5:: ; 94163 (25:4163)
 	text "I did my best, I"
 	line "have no regrets!"
 	done
 
-_Route24BattleText6: ; 94186 (25:4186)
+_Route24BattleText6:: ; 94186 (25:4186)
 	text "This is NUGGET"
 	line "BRIDGE! Beat us 5"
 	cont "trainers and win"
@@ -79,12 +79,12 @@
 	line "what it takes?"
 	done
 
-_Route24EndBattleText6: ; 941e8 (25:41e8)
+_Route24EndBattleText6:: ; 941e8 (25:41e8)
 	text "Whoo!"
 	line "Good stuff!"
 	prompt
 
-_Route24AfterBattleText6: ; 941fb (25:41fb)
+_Route24AfterBattleText6:: ; 941fb (25:41fb)
 	text "I did my best, I"
 	line "have no regrets!"
 	done
--- a/text/maps/route_25.asm
+++ b/text/maps/route_25.asm
@@ -1,15 +1,15 @@
-_Route25BattleText1: ; 9421e (25:421e)
+_Route25BattleText1:: ; 9421e (25:421e)
 	text "Local trainers"
 	line "come here to"
 	cont "practice!"
 	done
 
-_Route25EndBattleText1: ; 94245 (25:4245)
+_Route25EndBattleText1:: ; 94245 (25:4245)
 	text "You're"
 	line "decent."
 	prompt
 
-_Route25AfterBattleText1: ; 94254 (25:4254)
+_Route25AfterBattleText1:: ; 94254 (25:4254)
 	text "All #MON have"
 	line "weaknesses. It's"
 	cont "best to raise"
@@ -16,7 +16,7 @@
 	cont "different kinds."
 	done
 
-_Route25BattleText2: ; 94292 (25:4292)
+_Route25BattleText2:: ; 94292 (25:4292)
 	text "Dad took me to a"
 	line "great party on"
 	cont "S.S.ANNE at"
@@ -23,59 +23,59 @@
 	cont "VERMILION CITY!"
 	done
 
-_Route25EndBattleText2: ; 942cf (25:42cf)
+_Route25EndBattleText2:: ; 942cf (25:42cf)
 	text "I'm"
 	line "not mad!"
 	prompt
 
-_Route25AfterBattleText2: ; 942dc (25:42dc)
+_Route25AfterBattleText2:: ; 942dc (25:42dc)
 	text "On S.S.ANNE, I"
 	line "saw trainers from"
 	cont "around the world."
 	done
 
-_Route25BattleText3: ; 94310 (25:4310)
+_Route25BattleText3:: ; 94310 (25:4310)
 	text "I'm a cool guy."
 	line "I've got a girl"
 	cont "friend!"
 	done
 
-_Route25EndBattleText3: ; 94337 (25:4337)
+_Route25EndBattleText3:: ; 94337 (25:4337)
 	text "Aww,"
 	line "darn..."
 	prompt
 
-_Route25AfterBattleText3: ; 94345 (25:4345)
+_Route25AfterBattleText3:: ; 94345 (25:4345)
 	text "Oh well. My girl"
 	line "will cheer me up."
 	done
 
-_Route25BattleText4: ; 94369 (25:4369)
+_Route25BattleText4:: ; 94369 (25:4369)
 	text "Hi! My boy"
 	line "friend is cool!"
 	done
 
-_Route25EndBattleText4: ; 94385 (25:4385)
+_Route25EndBattleText4:: ; 94385 (25:4385)
 	text "I was in"
 	line "bad condition!"
 	prompt
 
-_Route25AfterBattleText4: ; 9439e (25:439e)
+_Route25AfterBattleText4:: ; 9439e (25:439e)
 	text "I wish my guy was"
 	line "as good as you!"
 	done
 
-_Route25BattleText5: ; 943c1 (25:43c1)
+_Route25BattleText5:: ; 943c1 (25:43c1)
 	text "I knew I had to"
 	line "fight you!"
 	done
 
-_Route25EndBattleText5: ; 943dd (25:43dd)
+_Route25EndBattleText5:: ; 943dd (25:43dd)
 	text "I knew"
 	line "I'd lose too!"
 	prompt
 
-_Route25AfterBattleText5: ; 943f2 (25:43f2)
+_Route25AfterBattleText5:: ; 943f2 (25:43f2)
 	text "If your #MON"
 	line "gets confused or"
 	cont "falls asleep,"
@@ -82,75 +82,75 @@
 	cont "switch it!"
 	done
 
-_Route25BattleText6: ; 9442a (25:442a)
+_Route25BattleText6:: ; 9442a (25:442a)
 	text "My friend has a"
 	line "cute #MON."
 	cont "I'm so jealous!"
 	done
 
-_Route25EndBattleText6: ; 94455 (25:4455)
+_Route25EndBattleText6:: ; 94455 (25:4455)
 	text "I'm"
 	line "not so jealous!"
 	prompt
 
-_Route25AfterBattleText6: ; 94469 (25:4469)
+_Route25AfterBattleText6:: ; 94469 (25:4469)
 	text "You came from MT."
 	line "MOON? May I have"
 	cont "a CLEFAIRY?"
 	done
 
-_Route25BattleText7: ; 94499 (25:4499)
+_Route25BattleText7:: ; 94499 (25:4499)
 	text "I just got down"
 	line "from MT.MOON,"
 	cont "but I'm ready!"
 	done
 
-_Route25EndBattleText7: ; 944c6 (25:44c6)
+_Route25EndBattleText7:: ; 944c6 (25:44c6)
 	text "You"
 	line "worked hard!"
 	prompt
 
-_Route25AfterBattleText7: ; 944d8 (25:44d8)
+_Route25AfterBattleText7:: ; 944d8 (25:44d8)
 	text "Drat!"
 	line "A ZUBAT bit me"
 	cont "back in there."
 	done
 
-_Route25BattleText8: ; 944fd (25:44fd)
+_Route25BattleText8:: ; 944fd (25:44fd)
 	text "I'm off to see a"
 	line "#MON collector"
 	cont "at the cape!"
 	done
 
-_Route25EndBattleText8: ; 9452a (25:452a)
+_Route25EndBattleText8:: ; 9452a (25:452a)
 	text "You"
 	line "got me."
 	prompt
 
-_Route25AfterBattleText8: ; 94537 (25:4537)
+_Route25AfterBattleText8:: ; 94537 (25:4537)
 	text "The collector has"
 	line "many rare kinds"
 	cont "of #MON."
 	done
 
-_Route25BattleText9: ; 94563 (25:4563)
+_Route25BattleText9:: ; 94563 (25:4563)
 	text "You're going to"
 	line "see BILL? First,"
 	cont "let's fight!"
 	done
 
-_Route25EndBattleText9: ; 94590 (25:4590)
+_Route25EndBattleText9:: ; 94590 (25:4590)
 	text "You're"
 	line "something."
 	prompt
 
-_Route25AfterBattleText9: ; 945a2 (25:45a2)
+_Route25AfterBattleText9:: ; 945a2 (25:45a2)
 	text "The trail below"
 	line "is a shortcut to"
 	cont "CERULEAN CITY."
 	done
 
-_Route25Text11: ; 945d3 (25:45d3)
+_Route25Text11:: ; 945d3 (25:45d3)
 	text "SEA COTTAGE"
 	line "BILL lives here!"
 	done
--- a/text/maps/route_2_gate.asm
+++ b/text/maps/route_2_gate.asm
@@ -1,10 +1,10 @@
-_UnnamedText_5d616: ; 8a7fc (22:67fc)
+_UnnamedText_5d616:: ; 8a7fc (22:67fc)
 	text "The HM FLASH"
 	line "lights even the"
 	cont "darkest dungeons."
 	done
 
-_Route2GateText2: ; 8a82c (22:682c)
+_Route2GateText2:: ; 8a82c (22:682c)
 	text "Once a #MON"
 	line "learns FLASH, you"
 	cont "can get through"
--- a/text/maps/route_2_house.asm
+++ b/text/maps/route_2_house.asm
@@ -1,4 +1,4 @@
-_Route2HouseText1: ; 8a7b8 (22:67b8)
+_Route2HouseText1:: ; 8a7b8 (22:67b8)
 	text "A fainted #MON"
 	line "can't fight. But, "
 	cont "it can still use "
--- a/text/maps/route_3.asm
+++ b/text/maps/route_3.asm
@@ -1,4 +1,4 @@
-_Route3Text1: ; 8d779 (23:5779)
+_Route3Text1:: ; 8d779 (23:5779)
 	text "Whew... I better"
 	line "take a rest..."
 	cont "Groan..."
@@ -8,17 +8,17 @@
 	cont "lot out of you!"
 	done
 
-_Route3BattleText1: ; 8d7d5 (23:57d5)
+_Route3BattleText1:: ; 8d7d5 (23:57d5)
 	text "Hey! I met you in"
 	line "VIRIDIAN FOREST!"
 	done
 
-_Route3EndBattleText1: ; 8d7f9 (23:57f9)
+_Route3EndBattleText1:: ; 8d7f9 (23:57f9)
 	text "You"
 	line "beat me again!"
 	prompt
 
-_Route3AfterBattleText1: ; 8d80d (23:580d)
+_Route3AfterBattleText1:: ; 8d80d (23:580d)
 	text "There are other"
 	line "kinds of #MON"
 	cont "than those found"
@@ -25,18 +25,18 @@
 	cont "in the forest!"
 	done
 
-_Route3BattleText2: ; 8d84c (23:584c)
+_Route3BattleText2:: ; 8d84c (23:584c)
 	text "Hi! I like shorts!"
 	line "They're comfy and"
 	cont "easy to wear!"
 	done
 
-_Route3EndBattleText2: ; 8d87f (23:587f)
+_Route3EndBattleText2:: ; 8d87f (23:587f)
 	text "I don't"
 	line "believe it!"
 	prompt
 
-_Route3AfterBattleText2: ; 8d893 (23:5893)
+_Route3AfterBattleText2:: ; 8d893 (23:5893)
 	text "Are you storing"
 	line "your #MON on"
 	cont "PC? Each BOX can"
@@ -43,34 +43,34 @@
 	cont "hold 20 #MON!"
 	done
 
-_Route3BattleText3: ; 8d8d0 (23:58d0)
+_Route3BattleText3:: ; 8d8d0 (23:58d0)
 	text "You looked at me,"
 	line "didn't you?"
 	done
 
-_Route3EndBattleText3: ; 8d8ee (23:58ee)
+_Route3EndBattleText3:: ; 8d8ee (23:58ee)
 	text "You're"
 	line "mean!"
 	prompt
 
-_Route3AfterBattleText3: ; 8d8fb (23:58fb)
+_Route3AfterBattleText3:: ; 8d8fb (23:58fb)
 	text "Quit staring if"
 	line "you don't want to"
 	cont "fight!"
 	done
 
-_Route3BattleText4: ; 8d924 (23:5924)
+_Route3BattleText4:: ; 8d924 (23:5924)
 	text "Are you a trainer?"
 	line "Let's fight!"
 	done
 
-_Route3EndBattleText4: ; 8d944 (23:5944)
+_Route3EndBattleText4:: ; 8d944 (23:5944)
 	text "If I"
 	line "had new #MON I"
 	cont "would've won!"
 	prompt
 
-_Route3AfterBattleText4: ; 8d966 (23:5966)
+_Route3AfterBattleText4:: ; 8d966 (23:5966)
 	text "If a #MON BOX"
 	line "on the PC gets"
 	cont "full, just switch"
@@ -77,69 +77,69 @@
 	cont "to another BOX!"
 	done
 
-_Route3BattleText5: ; 8d9a6 (23:59a6)
+_Route3BattleText5:: ; 8d9a6 (23:59a6)
 	text "That look you"
 	line "gave me, it's so"
 	cont "intriguing!"
 	done
 
-_Route3EndBattleText5: ; 8d9d1 (23:59d1)
+_Route3EndBattleText5:: ; 8d9d1 (23:59d1)
 	text "Be nice!"
 	prompt
 
-_Route3AfterBattleText5: ; 8d9db (23:59db)
+_Route3AfterBattleText5:: ; 8d9db (23:59db)
 	text "Avoid fights by"
 	line "not letting"
 	cont "people see you!"
 	done
 
-_Route3BattleText6: ; 8da08 (23:5a08)
+_Route3BattleText6:: ; 8da08 (23:5a08)
 	text "Hey! You're not"
 	line "wearing shorts!"
 	done
 
-_Route3EndBattleText6: ; 8da28 (23:5a28)
+_Route3EndBattleText6:: ; 8da28 (23:5a28)
 	text "Lost!"
 	line "Lost! Lost!"
 	prompt
 
-_Route3AfterBattleText6: ; 8da3b (23:5a3b)
+_Route3AfterBattleText6:: ; 8da3b (23:5a3b)
 	text "I always wear"
 	line "shorts, even in"
 	cont "winter!"
 	done
 
-_Route3BattleText7: ; 8da62 (23:5a62)
+_Route3BattleText7:: ; 8da62 (23:5a62)
 	text "You can fight my"
 	line "new #MON!"
 	done
 
-_Route3EndBattleText7: ; 8da7e (23:5a7e)
+_Route3EndBattleText7:: ; 8da7e (23:5a7e)
 	text "Done"
 	line "like dinner!"
 	prompt
 
-_Route3AfterBattleText7: ; 8da91 (23:5a91)
+_Route3AfterBattleText7:: ; 8da91 (23:5a91)
 	text "Trained #MON"
 	line "are stronger than"
 	cont "the wild ones!"
 	done
 
-_Route3BattleText8: ; 8dac0 (23:5ac0)
+_Route3BattleText8:: ; 8dac0 (23:5ac0)
 	text "Eek! Did you"
 	line "touch me?"
 	done
 
-_Route3EndBattleText8: ; 8dad8 (23:5ad8)
+_Route3EndBattleText8:: ; 8dad8 (23:5ad8)
 	text "That's it?"
 	prompt
 
-_Route3AfterBattleText8: ; 8dae3 (23:5ae3)
+_Route3AfterBattleText8:: ; 8dae3 (23:5ae3)
 	text "ROUTE 4 is at the"
 	line "foot of MT.MOON."
 	done
 
-_Route3Text10: ; 8db07 (23:5b07)
+_Route3Text10:: ; 8db07 (23:5b07)
 	text "ROUTE 3"
 	line "MT.MOON AHEAD"
 	done
--- a/text/maps/route_4.asm
+++ b/text/maps/route_4.asm
@@ -1,20 +1,20 @@
-_Route4Text1: ; 8db1e (23:5b1e)
+_Route4Text1:: ; 8db1e (23:5b1e)
 	text "Ouch! I tripped"
 	line "over a rocky"
 	cont "#MON, GEODUDE!"
 	done
 
-_Route4BattleText1: ; 8db4b (23:5b4b)
+_Route4BattleText1:: ; 8db4b (23:5b4b)
 	text "I came to get my"
 	line "mushroom #MON!"
 	done
 
-_Route4EndBattleText1: ; 8db6c (23:5b6c)
+_Route4EndBattleText1:: ; 8db6c (23:5b6c)
 	text "Oh! My cute"
 	line "mushroom #MON!"
 	prompt
 
-_Route4AfterBattleText1: ; 8db88 (23:5b88)
+_Route4AfterBattleText1:: ; 8db88 (23:5b88)
 	text "There might not"
 	line "be any more"
 	cont "mushrooms here."
@@ -23,12 +23,12 @@
 	line "them all."
 	done
 
-_Route4Text5: ; 8dbcd (23:5bcd)
+_Route4Text5:: ; 8dbcd (23:5bcd)
 	text "MT.MOON"
 	line "Tunnel Entrance"
 	done
 
-_Route4Text6: ; 8dbe6 (23:5be6)
+_Route4Text6:: ; 8dbe6 (23:5be6)
 	text "ROUTE 4"
 	line "MT.MOON -"
 	cont "CERULEAN CITY"
--- a/text/maps/route_5.asm
+++ b/text/maps/route_5.asm
@@ -1,4 +1,4 @@
-_Route5Text1: ; 8dc07 (23:5c07)
+_Route5Text1:: ; 8dc07 (23:5c07)
 	text "UNDERGROUND PATH"
 	line "CERULEAN CITY -"
 	cont "VERMILION CITY"
--- a/text/maps/route_6.asm
+++ b/text/maps/route_6.asm
@@ -1,96 +1,96 @@
-_Route6BattleText1: ; 8dc38 (23:5c38)
+_Route6BattleText1:: ; 8dc38 (23:5c38)
 	text "Who's there?"
 	line "Quit listening in"
 	cont "on us!"
 	done
 
-_Route6EndBattleText1: ; 8dc5e (23:5c5e)
+_Route6EndBattleText1:: ; 8dc5e (23:5c5e)
 	text "I"
 	line "just can't win!"
 	prompt
 
-_Route6AfterBattleText1: ; 8dc70 (23:5c70)
+_Route6AfterBattleText1:: ; 8dc70 (23:5c70)
 	text "Whisper..."
 	line "whisper..."
 	done
 
-_Route6BattleText2: ; 8dc87 (23:5c87)
+_Route6BattleText2:: ; 8dc87 (23:5c87)
 	text "Excuse me! This"
 	line "is a private"
 	cont "conversation!"
 	done
 
-_Route6EndBattleText2: ; 8dcb3 (23:5cb3)
+_Route6EndBattleText2:: ; 8dcb3 (23:5cb3)
 	text "Ugh!"
 	line "I hate losing!"
 	prompt
 
-_Route6BattleText3: ; 8dcc8 (23:5cc8)
+_Route6BattleText3:: ; 8dcc8 (23:5cc8)
 	text "There aren't many"
 	line "bugs out here."
 	done
 
-_Route6EndBattleText3: ; 8dce9 (23:5ce9)
+_Route6EndBattleText3:: ; 8dce9 (23:5ce9)
 	text "No!"
 	line "You're kidding!"
 	prompt
 
-_Route6AfterBattleText3: ; 8dcfd (23:5cfd)
+_Route6AfterBattleText3:: ; 8dcfd (23:5cfd)
 	text "I like bugs, so"
 	line "I'm going back to"
 	cont "VIRIDIAN FOREST."
 	done
 
-_Route6BattleText4: ; 8dd30 (23:5d30)
+_Route6BattleText4:: ; 8dd30 (23:5d30)
 	text "Huh? You want"
 	line "to talk to me?"
 	done
 
-_Route6EndBattleText4: ; 8dd4e (23:5d4e)
+_Route6EndBattleText4:: ; 8dd4e (23:5d4e)
 	text "I"
 	line "didn't start it!"
 	prompt
 
-_Route6AfterBattleText4: ; 8dd61 (23:5d61)
+_Route6AfterBattleText4:: ; 8dd61 (23:5d61)
 	text "I should carry"
 	line "more #MON with"
 	cont "me for safety."
 	done
 
-_Route6BattleText5: ; 8dd8f (23:5d8f)
+_Route6BattleText5:: ; 8dd8f (23:5d8f)
 	text "Me? Well, OK."
 	line "I'll play!"
 	done
 
-_Route6EndBattleText5: ; 8dda8 (23:5da8)
+_Route6EndBattleText5:: ; 8dda8 (23:5da8)
 	text "Just"
 	line "didn't work!"
 	prompt
 
-_Route6AfterBattleText5: ; 8ddba (23:5dba)
+_Route6AfterBattleText5:: ; 8ddba (23:5dba)
 	text "I want to get"
 	line "stronger! What's"
 	cont "your secret?"
 	done
 
-_Route6BattleText6: ; 8dde6 (23:5de6)
+_Route6BattleText6:: ; 8dde6 (23:5de6)
 	text "I've never seen"
 	line "you around!"
 	cont "Are you good?"
 	done
 
-_Route6EndBattleText6: ; 8de10 (23:5e10)
+_Route6EndBattleText6:: ; 8de10 (23:5e10)
 	text "You"
 	line "are too good!"
 	prompt
 
-_Route6AfterBattleText6: ; 8de23 (23:5e23)
+_Route6AfterBattleText6:: ; 8de23 (23:5e23)
 	text "Are my #MON"
 	line "weak? Or, am I"
 	cont "just bad?"
 	done
 
-_Route6Text7: ; 8de49 (23:5e49)
+_Route6Text7:: ; 8de49 (23:5e49)
 	text "UNDERGROUND PATH"
 	line "CERULEAN CITY -"
 	cont "VERMILION CITY"
--- a/text/maps/route_7.asm
+++ b/text/maps/route_7.asm
@@ -1,4 +1,4 @@
-_Route7Text1: ; 8de7a (23:5e7a)
+_Route7Text1:: ; 8de7a (23:5e7a)
 	text "UNDERGROUND PATH"
 	line "CELADON CITY -"
 	cont "LAVENDER TOWN"
--- a/text/maps/route_8.asm
+++ b/text/maps/route_8.asm
@@ -1,60 +1,60 @@
-_Route8BattleText1: ; 8dea9 (23:5ea9)
+_Route8BattleText1:: ; 8dea9 (23:5ea9)
 	text "You look good at"
 	line "#MON, but"
 	cont "how's your chem?"
 	done
 
-_Route8EndBattleText1: ; 8ded5 (23:5ed5)
+_Route8EndBattleText1:: ; 8ded5 (23:5ed5)
 	text "Ow!"
 	line "Meltdown!"
 	prompt
 
-_Route8AfterBattleText1: ; 8dee4 (23:5ee4)
+_Route8AfterBattleText1:: ; 8dee4 (23:5ee4)
 	text "I am better at"
 	line "school than this!"
 	done
 
-_Route8BattleText2: ; 8df06 (23:5f06)
+_Route8BattleText2:: ; 8df06 (23:5f06)
 	text "All right! Let's"
 	line "roll the dice!"
 	done
 
-_Route8EndBattleText2: ; 8df26 (23:5f26)
+_Route8EndBattleText2:: ; 8df26 (23:5f26)
 	text "Drat!"
 	line "Came up short!"
 	prompt
 
-_Route8AfterBattleText2: ; 8df3c (23:5f3c)
+_Route8AfterBattleText2:: ; 8df3c (23:5f3c)
 	text "Lady Luck's not"
 	line "with me today!"
 	done
 
-_Route8BattleText3: ; 8df5b (23:5f5b)
+_Route8BattleText3:: ; 8df5b (23:5f5b)
 	text "You need strategy"
 	line "to win at this!"
 	done
 
-_Route8EndBattleText3: ; 8df7e (23:5f7e)
+_Route8EndBattleText3:: ; 8df7e (23:5f7e)
 	text "It's"
 	line "not logical!"
 	prompt
 
-_Route8AfterBattleText3: ; 8df90 (23:5f90)
+_Route8AfterBattleText3:: ; 8df90 (23:5f90)
 	text "Go with GRIMER"
 	line "first...and..."
 	cont "...and...then..."
 	done
 
-_Route8BattleText4: ; 8dfc0 (23:5fc0)
+_Route8BattleText4:: ; 8dfc0 (23:5fc0)
 	text "I like NIDORAN, so"
 	line "I collect them!"
 	done
 
-_Route8EndBattleText4: ; 8dfe4 (23:5fe4)
+_Route8EndBattleText4:: ; 8dfe4 (23:5fe4)
 	text "Why? Why??"
 	prompt
 
-_Route8AfterBattleText4: ; 8dff0 (23:5ff0)
+_Route8AfterBattleText4:: ; 8dff0 (23:5ff0)
 	text "When #MON grow"
 	line "up they get ugly!"
 	cont "They shouldn't"
@@ -61,49 +61,49 @@
 	cont "evolve!"
 	done
 
-_Route8BattleText5: ; 8e028 (23:6028)
+_Route8BattleText5:: ; 8e028 (23:6028)
 	text "School is fun, but"
 	line "so are #MON."
 	done
 
-_Route8EndBattleText5: ; 8e049 (23:6049)
+_Route8EndBattleText5:: ; 8e049 (23:6049)
 	text "I'll"
 	line "stay with school."
 	prompt
 
-_Route8AfterBattleText5: ; 8e060 (23:6060)
+_Route8AfterBattleText5:: ; 8e060 (23:6060)
 	text "We're stuck here"
 	line "because of the"
 	cont "gates at SAFFRON."
 	done
 
-_Route8BattleText6: ; 8e092 (23:6092)
+_Route8BattleText6:: ; 8e092 (23:6092)
 	text "MEOWTH is so cute,"
 	line "meow, meow, meow!"
 	done
 
-_Route8EndBattleText6: ; 8e0b8 (23:60b8)
+_Route8EndBattleText6:: ; 8e0b8 (23:60b8)
 	text "Meow!"
 	prompt
 
-_Route8AfterBattleText6: ; 8e0bf (23:60bf)
+_Route8AfterBattleText6:: ; 8e0bf (23:60bf)
 	text "I think PIDGEY"
 	line "and RATTATA"
 	cont "are cute too!"
 	done
 
-_Route8BattleText7: ; 8e0e9 (23:60e9)
+_Route8BattleText7:: ; 8e0e9 (23:60e9)
 	text "We must look"
 	line "silly standing"
 	cont "here like this!"
 	done
 
-_Route8EndBattleText7: ; 8e116 (23:6116)
+_Route8EndBattleText7:: ; 8e116 (23:6116)
 	text "Look what"
 	line "you did!"
 	prompt
 
-_Route8AfterBattleText7: ; 8e12a (23:612a)
+_Route8AfterBattleText7:: ; 8e12a (23:612a)
 	text "SAFFRON's gate"
 	line "keeper won't let"
 	cont "us through."
@@ -110,17 +110,17 @@
 	cont "He's so mean!"
 	done
 
-_Route8BattleText8: ; 8e162 (23:6162)
+_Route8BattleText8:: ; 8e162 (23:6162)
 	text "I'm a rambling,"
 	line "gambling dude!"
 	done
 
-_Route8EndBattleText8: ; 8e181 (23:6181)
+_Route8EndBattleText8:: ; 8e181 (23:6181)
 	text "Missed"
 	line "the big score!"
 	prompt
 
-_Route8AfterBattleText8: ; 8e198 (23:6198)
+_Route8AfterBattleText8:: ; 8e198 (23:6198)
 	text "Gambling and"
 	line "#MON are like"
 	cont "eating peanuts!"
@@ -127,13 +127,13 @@
 	cont "Just can't stop!"
 	done
 
-_Route8BattleText9: ; 8e1d4 (23:61d4)
+_Route8BattleText9:: ; 8e1d4 (23:61d4)
 	text "What's a cute,"
 	line "round and fluffy"
 	cont "#MON?"
 	done
 
-_Route8EndBattleText9: ; 8e1fa (23:61fa)
+_Route8EndBattleText9:: ; 8e1fa (23:61fa)
 	text "Stop!"
 
 	para "Don't be so mean"
@@ -140,7 +140,7 @@
 	line "to my CLEFAIRY!"
 	prompt
 
-_Route8AfterBattleText9: ; 8e221 (23:6221)
+_Route8AfterBattleText9:: ; 8e221 (23:6221)
 	text "I heard that"
 	line "CLEFAIRY evolves"
 	cont "when it's exposed"
@@ -147,7 +147,7 @@
 	cont "to a MOON STONE."
 	done
 
-_Route8Text10: ; 8e262 (23:6262)
+_Route8Text10:: ; 8e262 (23:6262)
 	text "UNDERGROUND PATH"
 	line "CELADON CITY -"
 	cont "LAVENDER TOWN"
--- a/text/maps/route_9.asm
+++ b/text/maps/route_9.asm
@@ -1,74 +1,74 @@
-_Route9BattleText1: ; 8e291 (23:6291)
+_Route9BattleText1:: ; 8e291 (23:6291)
 	text "You have #MON"
 	line "with you!"
 	cont "You're mine!"
 	done
 
-_Route9EndBattleText1: ; 8e2b6 (23:62b6)
+_Route9EndBattleText1:: ; 8e2b6 (23:62b6)
 	text "You"
 	line "deceived me!"
 	prompt
 
-_Route9AfterBattleText1: ; 8e2c8 (23:62c8)
+_Route9AfterBattleText1:: ; 8e2c8 (23:62c8)
 	text "You need light to"
 	line "get through that"
 	cont "dark tunnel ahead."
 	done
 
-_Route9BattleText2: ; 8e2ff (23:62ff)
+_Route9BattleText2:: ; 8e2ff (23:62ff)
 	text "Who's that walking"
 	line "with those good"
 	cont "looking #MON?"
 	done
 
-_Route9EndBattleText2: ; 8e330 (23:6330)
+_Route9EndBattleText2:: ; 8e330 (23:6330)
 	text "Out"
 	line "like a light!"
 	prompt
 
-_Route9AfterBattleText2: ; 8e343 (23:6343)
+_Route9AfterBattleText2:: ; 8e343 (23:6343)
 	text "Keep walking!"
 	done
 
-_Route9BattleText3: ; 8e352 (23:6352)
+_Route9BattleText3:: ; 8e352 (23:6352)
 	text "I'm taking ROCK"
 	line "TUNNEL to go to"
 	cont "LAVENDER..."
 	done
 
-_Route9EndBattleText3: ; 8e37e (23:637e)
+_Route9EndBattleText3:: ; 8e37e (23:637e)
 	text "Can't"
 	line "measure up!"
 	prompt
 
-_Route9AfterBattleText3: ; 8e390 (23:6390)
+_Route9AfterBattleText3:: ; 8e390 (23:6390)
 	text "Are you off to"
 	line "ROCK TUNNEL too?"
 	done
 
-_Route9BattleText4: ; 8e3b1 (23:63b1)
+_Route9BattleText4:: ; 8e3b1 (23:63b1)
 	text "Don't you dare"
 	line "condescend me!"
 	done
 
-_Route9EndBattleText4: ; 8e3cf (23:63cf)
+_Route9EndBattleText4:: ; 8e3cf (23:63cf)
 	text "No!"
 	line "You're too much!"
 	prompt
 
-_Route9AfterBattleText4: ; 8e3e4 (23:63e4)
+_Route9AfterBattleText4:: ; 8e3e4 (23:63e4)
 	text "You're obviously"
 	line "talented! Good"
 	cont "luck to you!"
 	done
 
-_Route9BattleText5: ; 8e411 (23:6411)
+_Route9BattleText5:: ; 8e411 (23:6411)
 	text "Bwahaha!"
 	line "Great! I was"
 	cont "bored, eh!"
 	done
 
-_Route9EndBattleText5: ; 8e433 (23:6433)
+_Route9EndBattleText5:: ; 8e433 (23:6433)
 	text "Keep it"
 	line "coming, eh!"
 
@@ -76,29 +76,29 @@
 	line "of #MON!"
 	prompt
 
-_Route9AfterBattleText5: ; 8e461 (23:6461)
+_Route9AfterBattleText5:: ; 8e461 (23:6461)
 	text "You sure had guts"
 	line "standing up to me"
 	cont "there, eh?"
 	done
 
-_Route9BattleText6: ; 8e491 (23:6491)
+_Route9BattleText6:: ; 8e491 (23:6491)
 	text "Hahaha!"
 	line "Aren't you a"
 	cont "little toughie!"
 	done
 
-_Route9EndBattleText6: ; 8e4b6 (23:64b6)
+_Route9EndBattleText6:: ; 8e4b6 (23:64b6)
 	text "What's"
 	line "that?"
 	prompt
 
-_Route9AfterBattleText6: ; 8e4c3 (23:64c3)
+_Route9AfterBattleText6:: ; 8e4c3 (23:64c3)
 	text "Hahaha! Kids"
 	line "should be tough!"
 	done
 
-_Route9BattleText7: ; 8e4e2 (23:64e2)
+_Route9BattleText7:: ; 8e4e2 (23:64e2)
 	text "I got up early"
 	line "every day to"
 	cont "raise my #MON"
@@ -105,7 +105,7 @@
 	cont "from cocoons!"
 	done
 
-_Route9EndBattleText7: ; 8e51b (23:651b)
+_Route9EndBattleText7:: ; 8e51b (23:651b)
 	text "WHAT?"
 
 	para "What a total"
@@ -112,45 +112,45 @@
 	line "waste of time!"
 	prompt
 
-_Route9AfterBattleText7: ; 8e53e (23:653e)
+_Route9AfterBattleText7:: ; 8e53e (23:653e)
 	text "I have to collect"
 	line "more than bugs to"
 	cont "get stronger..."
 	done
 
-_Route9BattleText8: ; 8e573 (23:6573)
+_Route9BattleText8:: ; 8e573 (23:6573)
 	text "Hahahaha!"
 	line "Come on, dude!"
 	done
 
-_Route9EndBattleText8: ; 8e58d (23:658d)
+_Route9EndBattleText8:: ; 8e58d (23:658d)
 	text "Hahahaha!"
 	line "You beat me fair!"
 	prompt
 
-_Route9AfterBattleText8: ; 8e5aa (23:65aa)
+_Route9AfterBattleText8:: ; 8e5aa (23:65aa)
 	text "Hahahaha!"
 	line "Us hearty guys"
 	cont "always laugh!"
 	done
 
-_Route9BattleText9: ; 8e5d2 (23:65d2)
+_Route9BattleText9:: ; 8e5d2 (23:65d2)
 	text "Go, my super bug"
 	line "#MON!"
 	done
 
-_Route9EndBattleText9: ; 8e5ea (23:65ea)
+_Route9EndBattleText9:: ; 8e5ea (23:65ea)
 	text "My"
 	line "bugs..."
 	prompt
 
-_Route9AfterBattleText9: ; 8e5f6 (23:65f6)
+_Route9AfterBattleText9:: ; 8e5f6 (23:65f6)
 	text "If you don't like"
 	line "bug #MON, you"
 	cont "bug me!"
 	done
 
-_Route9Text11: ; 8e61e (23:661e)
+_Route9Text11:: ; 8e61e (23:661e)
 	text "ROUTE 9"
 	line "CERULEAN CITY-"
 	cont "ROCK TUNNEL"
--- a/text/maps/safari_zone_center.asm
+++ b/text/maps/safari_zone_center.asm
@@ -1,8 +1,8 @@
-_SafariZoneCenterText2: ; 85807 (21:5807)
+_SafariZoneCenterText2:: ; 85807 (21:5807)
 	text "REST HOUSE"
 	done
 
-_SafariZoneCenterText3: ; 85813 (21:5813)
+_SafariZoneCenterText3:: ; 85813 (21:5813)
 	text "TRAINER TIPS"
 
 	para "Press the START"
--- a/text/maps/safari_zone_east.asm
+++ b/text/maps/safari_zone_east.asm
@@ -1,8 +1,8 @@
-_SafariZoneEastText5: ; 855e0 (21:55e0)
+_SafariZoneEastText5:: ; 855e0 (21:55e0)
 	text "REST HOUSE"
 	done
 
-_SafariZoneEastText6: ; 855ec (21:55ec)
+_SafariZoneEastText6:: ; 855ec (21:55ec)
 	text "TRAINER TIPS"
 
 	para "The remaining time"
@@ -10,7 +10,7 @@
 	cont "while you walk!"
 	done
 
-_SafariZoneEastText7: ; 8562b (21:562b)
+_SafariZoneEastText7:: ; 8562b (21:562b)
 	text "CENTER AREA"
 	line "NORTH: AREA 2"
 	done
--- a/text/maps/safari_zone_entrance.asm
+++ b/text/maps/safari_zone_entrance.asm
@@ -1,9 +1,9 @@
-_SafariZoneEntranceText1: ; 9e6c7 (27:66c7)
+_SafariZoneEntranceText1:: ; 9e6c7 (27:66c7)
 	text "Welcome to the"
 	line "SAFARI ZONE!"
 	done
 
-UnnamedText_9e6e4: ; 9e6e4 (27:66e4)
+UnnamedText_9e6e4:: ; 9e6e4 (27:66e4)
 	text "For just ¥500,"
 	line "you can catch all"
 	cont "the #MON you"
@@ -12,7 +12,7 @@
 	para "Would you like to"
 	line "join the hunt?@@"
 
-UnnamedText_9e747: ; 9e747 (27:6747)
+UnnamedText_9e747:: ; 9e747 (27:6747)
 	text "That'll be ¥500"
 	line "please!"
 
@@ -23,7 +23,7 @@
 	para $52, " received"
 	line "30 SAFARI BALLs!@@"
 
-_UnnamedText_75360: ; 9e79f (27:679f)
+_UnnamedText_75360:: ; 9e79f (27:679f)
 	db $0
 	para "We'll call you on"
 	line "the PA when you"
@@ -31,41 +31,41 @@
 	cont "or SAFARI BALLs!"
 	done
 
-_UnnamedText_75365: ; 9e7e3 (27:67e3)
+_UnnamedText_75365:: ; 9e7e3 (27:67e3)
 	text "OK! Please come"
 	line "again!"
 	done
 
-_UnnamedText_7536a: ; 9e7fb (27:67fb)
+_UnnamedText_7536a:: ; 9e7fb (27:67fb)
 	text "Oops! Not enough"
 	line "money!"
 	done
 
-UnnamedText_9e814: ; 9e814 (27:6814)
+UnnamedText_9e814:: ; 9e814 (27:6814)
 	text "Leaving early?@@"
 
-_UnnamedText_753bb: ; 9e825 (27:6825)
+_UnnamedText_753bb:: ; 9e825 (27:6825)
 	text "Please return any"
 	line "SAFARI BALLs you"
 	cont "have left."
 	done
 
-_UnnamedText_753c0: ; 9e854 (27:6854)
+_UnnamedText_753c0:: ; 9e854 (27:6854)
 	text "Good Luck!"
 	done
 
-_UnnamedText_753c5: ; 9e860 (27:6860)
+_UnnamedText_753c5:: ; 9e860 (27:6860)
 	text "Did you get a"
 	line "good haul?"
 	cont "Come again!"
 	done
 
-_UnnamedText_753e6: ; 9e886 (27:6886)
+_UnnamedText_753e6:: ; 9e886 (27:6886)
 	text "Hi! Is it your"
 	line "first time here?"
 	done
 
-_UnnamedText_753eb: ; 9e8a7 (27:68a7)
+_UnnamedText_753eb:: ; 9e8a7 (27:68a7)
 	text "SAFARI ZONE has 4"
 	line "zones in it."
 
@@ -87,7 +87,7 @@
 	cont "new #MON!"
 	done
 
-_UnnamedText_753f0: ; 9e993 (27:6993)
+_UnnamedText_753f0:: ; 9e993 (27:6993)
 	text "Sorry, you're a"
 	line "regular here!"
 	done
--- a/text/maps/safari_zone_north.asm
+++ b/text/maps/safari_zone_north.asm
@@ -1,8 +1,8 @@
-_SafariZoneNorthText3: ; 85646 (21:5646)
+_SafariZoneNorthText3:: ; 85646 (21:5646)
 	text "REST HOUSE"
 	done
 
-_SafariZoneNorthText4: ; 85652 (21:5652)
+_SafariZoneNorthText4:: ; 85652 (21:5652)
 	text "TRAINER TIPS"
 
 	para "The SECRET HOUSE"
@@ -9,11 +9,11 @@
 	line "is still ahead!"
 	done
 
-_SafariZoneNorthText5: ; 85681 (21:5681)
+_SafariZoneNorthText5:: ; 85681 (21:5681)
 	text "AREA 2"
 	done
 
-_SafariZoneNorthText6: ; 85689 (21:5689)
+_SafariZoneNorthText6:: ; 85689 (21:5689)
 	text "TRAINER TIPS"
 
 	para "#MON hide in"
@@ -24,7 +24,7 @@
 	cont "flush them out."
 	done
 
-_SafariZoneNorthText7: ; 856df (21:56df)
+_SafariZoneNorthText7:: ; 856df (21:56df)
 	text "TRAINER TIPS"
 
 	para "Win a free HM for"
--- a/text/maps/safari_zone_rest_house_1.asm
+++ b/text/maps/safari_zone_rest_house_1.asm
@@ -1,10 +1,10 @@
-_SafariZoneRestHouse1Text1: ; 85851 (21:5851)
+_SafariZoneRestHouse1Text1:: ; 85851 (21:5851)
 	text "SARA: Where did"
 	line "my boy friend,"
 	cont "ERIK, go?"
 	done
 
-_SafariZoneRestHouse1Text2: ; 8587b (21:587b)
+_SafariZoneRestHouse1Text2:: ; 8587b (21:587b)
 	text "I'm catching"
 	line "#MON to take"
 	cont "home as gifts!"
--- a/text/maps/safari_zone_rest_house_2.asm
+++ b/text/maps/safari_zone_rest_house_2.asm
@@ -1,4 +1,4 @@
-_SafariZoneRestHouse2Text1: ; 85a2f (21:5a2f)
+_SafariZoneRestHouse2Text1:: ; 85a2f (21:5a2f)
 	text "Tossing ROCKs at"
 	line "#MON might"
 	cont "make them run,"
@@ -6,13 +6,13 @@
 	cont "easier to catch."
 	done
 
-_SafariZoneRestHouse2Text2: ; 85a7a (21:5a7a)
+_SafariZoneRestHouse2Text2:: ; 85a7a (21:5a7a)
 	text "Using BAIT will"
 	line "make #MON"
 	cont "easier to catch."
 	done
 
-_SafariZoneRestHouse2Text3: ; 85aa6 (21:5aa6)
+_SafariZoneRestHouse2Text3:: ; 85aa6 (21:5aa6)
 	text "I hiked a lot, but"
 	line "I didn't see any"
 	cont "#MON I wanted."
--- a/text/maps/safari_zone_rest_house_3.asm
+++ b/text/maps/safari_zone_rest_house_3.asm
@@ -1,10 +1,10 @@
-_SafariZoneRestHouse3Text1: ; 85ad9 (21:5ad9)
+_SafariZoneRestHouse3Text1:: ; 85ad9 (21:5ad9)
 	text "How many did you"
 	line "catch? I'm bushed"
 	cont "from the work!"
 	done
 
-_SafariZoneRestHouse3Text2: ; 85b0b (21:5b0b)
+_SafariZoneRestHouse3Text2:: ; 85b0b (21:5b0b)
 	text "I caught a"
 	line "CHANSEY!"
 
@@ -12,7 +12,7 @@
 	line "all worthwhile!"
 	done
 
-_SafariZoneRestHouse3Text3: ; 85b40 (21:5b40)
+_SafariZoneRestHouse3Text3:: ; 85b40 (21:5b40)
 	text "Whew! I'm tired"
 	line "from all the fun!"
 	done
--- a/text/maps/safari_zone_rest_house_4.asm
+++ b/text/maps/safari_zone_rest_house_4.asm
@@ -1,4 +1,4 @@
-_SafariZoneRestHouse4Text1: ; 85b62 (21:5b62)
+_SafariZoneRestHouse4Text1:: ; 85b62 (21:5b62)
 	text "You can keep any"
 	line "item you find on"
 	cont "the ground here."
@@ -9,7 +9,7 @@
 	cont "of them at once!"
 	done
 
-_SafariZoneRestHouse4Text2: ; 85bd5 (21:5bd5)
+_SafariZoneRestHouse4Text2:: ; 85bd5 (21:5bd5)
 	text "Go to the deepest"
 	line "part of the"
 	cont "SAFARI ZONE. You"
@@ -16,7 +16,7 @@
 	cont "will win a prize!"
 	done
 
-_SafariZoneRestHouse4Text3: ; 85c17 (21:5c17)
+_SafariZoneRestHouse4Text3:: ; 85c17 (21:5c17)
 	text "My EEVEE evolved"
 	line "into FLAREON!"
 
--- a/text/maps/safari_zone_secret_house.asm
+++ b/text/maps/safari_zone_secret_house.asm
@@ -1,4 +1,4 @@
-_UnnamedText_4a350: ; 858a4 (21:58a4)
+_UnnamedText_4a350:: ; 858a4 (21:58a4)
 	text "Ah! Finally!"
 
 	para "You're the first"
@@ -14,13 +14,13 @@
 	line "You have won!"
 	prompt
 
-_ReceivedHM03Text: ; 85943 (21:5943)
+_ReceivedHM03Text:: ; 85943 (21:5943)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_HM03ExplanationText: ; 85957 (21:5957)
+_HM03ExplanationText:: ; 85957 (21:5957)
 	text "HM03 is SURF!"
 
 	para "#MON will be"
@@ -37,7 +37,7 @@
 	cont "fabulous prize!"
 	done
 
-_HM03NoRoomText: ; 85a02 (21:5a02)
+_HM03NoRoomText:: ; 85a02 (21:5a02)
 	text "You don't have"
 	line "room for this"
 	cont "fabulous prize!"
--- a/text/maps/safari_zone_west.asm
+++ b/text/maps/safari_zone_west.asm
@@ -1,8 +1,8 @@
-_SafariZoneWestText5: ; 85719 (21:5719)
+_SafariZoneWestText5:: ; 85719 (21:5719)
 	text "REST HOUSE"
 	done
 
-_SafariZoneWestText6: ; 85725 (21:5725)
+_SafariZoneWestText6:: ; 85725 (21:5725)
 	text "REQUEST NOTICE"
 
 	para "Please find the"
@@ -15,7 +15,7 @@
 	line "Contact: WARDEN"
 	done
 
-_SafariZoneWestText7: ; 857a3 (21:57a3)
+_SafariZoneWestText7:: ; 857a3 (21:57a3)
 	text "TRAINER TIPS"
 
 	para "Zone Exploration"
@@ -25,7 +25,7 @@
 	line "the SECRET HOUSE!"
 	done
 
-_SafariZoneWestText8: ; 857ed (21:57ed)
+_SafariZoneWestText8:: ; 857ed (21:57ed)
 	text "AREA 3"
 	line "EAST: CENTER AREA"
 	done
--- a/text/maps/saffron_city.asm
+++ b/text/maps/saffron_city.asm
@@ -1,34 +1,34 @@
-_SaffronCityText1: ; a62e7 (29:62e7)
+_SaffronCityText1:: ; a62e7 (29:62e7)
 	text "What do you want?"
 	line "Get lost!"
 	done
 
-_SaffronCityText2: ; a6304 (29:6304)
+_SaffronCityText2:: ; a6304 (29:6304)
 	text "BOSS said he'll"
 	line "take this town!"
 	done
 
-_SaffronCityText3: ; a6324 (29:6324)
+_SaffronCityText3:: ; a6324 (29:6324)
 	text "Get out of the"
 	line "way!"
 	done
 
-_SaffronCityText4: ; a6339 (29:6339)
+_SaffronCityText4:: ; a6339 (29:6339)
 	text "SAFFRON belongs"
 	line "to TEAM ROCKET!"
 	done
 
-_SaffronCityText5: ; a635a (29:635a)
+_SaffronCityText5:: ; a635a (29:635a)
 	text "Being evil makes"
 	line "me feel so alive!"
 	done
 
-_SaffronCityText6: ; a637e (29:637e)
+_SaffronCityText6:: ; a637e (29:637e)
 	text "Ow! Watch where"
 	line "you're walking!"
 	done
 
-_SaffronCityText7: ; a639e (29:639e)
+_SaffronCityText7:: ; a639e (29:639e)
 	text "With SILPH under"
 	line "control, we can"
 	cont "exploit #MON"
@@ -35,13 +35,13 @@
 	cont "around the world!"
 	done
 
-_SaffronCityText8: ; a63df (29:63df)
+_SaffronCityText8:: ; a63df (29:63df)
 	text "You beat TEAM"
 	line "ROCKET all alone?"
 	cont "That's amazing!"
 	done
 
-_SaffronCityText9: ; a640f (29:640f)
+_SaffronCityText9:: ; a640f (29:640f)
 	text "Yeah! TEAM ROCKET"
 	line "is gone!"
 	cont "It's safe to go"
@@ -48,13 +48,13 @@
 	cont "out again!"
 	done
 
-_SaffronCityText10: ; a6445 (29:6445)
+_SaffronCityText10:: ; a6445 (29:6445)
 	text "People should be"
 	line "flocking back to"
 	cont "SAFFRON now."
 	done
 
-_SaffronCityText11: ; a6475 (29:6475)
+_SaffronCityText11:: ; a6475 (29:6475)
 	text "I flew here on my"
 	line "PIDGEOT when I"
 	cont "read about SILPH."
@@ -64,16 +64,16 @@
 	cont "media action."
 	done
 
-_SaffronCityText12: ; a64d6 (29:64d6)
+_SaffronCityText12:: ; a64d6 (29:64d6)
 	text "PIDGEOT: Bi bibii!@@"
 
-_SaffronCityText13: ; a64eb (29:64eb)
+_SaffronCityText13:: ; a64eb (29:64eb)
 	text "I saw ROCKET"
 	line "BOSS escaping"
 	cont "SILPH's building."
 	done
 
-_SaffronCityText14: ; a6518 (29:6518)
+_SaffronCityText14:: ; a6518 (29:6518)
 	text "I'm a security"
 	line "guard."
 
@@ -81,7 +81,7 @@
 	line "don't allow in!"
 	done
 
-_SaffronCityText15: ; a654f (29:654f)
+_SaffronCityText15:: ; a654f (29:654f)
 	text "..."
 	line "Snore..."
 
@@ -89,17 +89,17 @@
 	line "a snooze!"
 	done
 
-_SaffronCityText16: ; a6577 (29:6577)
+_SaffronCityText16:: ; a6577 (29:6577)
 	text "SAFFRON CITY"
 	line "Shining, Golden"
 	cont "Land of Commerce"
 	done
 
-_SaffronCityText17: ; a65a6 (29:65a6)
+_SaffronCityText17:: ; a65a6 (29:65a6)
 	text "FIGHTING DOJO"
 	done
 
-_SaffronCityText18: ; a65b5 (29:65b5)
+_SaffronCityText18:: ; a65b5 (29:65b5)
 	text "SAFFRON CITY"
 	line "#MON GYM"
 	cont "LEADER: SABRINA"
@@ -108,7 +108,7 @@
 	line "Psychic #MON!"
 	done
 
-_SaffronCityText20: ; a65f8 (29:65f8)
+_SaffronCityText20:: ; a65f8 (29:65f8)
 	text "TRAINER TIPS"
 
 	para "FULL HEAL cures"
@@ -120,7 +120,7 @@
 	cont "more convenient."
 	done
 
-_SaffronCityText21: ; a6667 (29:6667)
+_SaffronCityText21:: ; a6667 (29:6667)
 	text "TRAINER TIPS"
 
 	para "New GREAT BALL"
@@ -132,17 +132,17 @@
 	cont "#MON."
 	done
 
-_SaffronCityText22: ; a66c7 (29:66c7)
+_SaffronCityText22:: ; a66c7 (29:66c7)
 	text "SILPH CO."
 	line "OFFICE BUILDING"
 	done
 
-_SaffronCityText24: ; a66e2 (29:66e2)
+_SaffronCityText24:: ; a66e2 (29:66e2)
 	text "MR.PSYCHIC's"
 	line "HOUSE"
 	done
 
-_SaffronCityText25: ; a66f5 (29:66f5)
+_SaffronCityText25:: ; a66f5 (29:66f5)
 	text "SILPH's latest"
 	line "product!"
 
--- a/text/maps/saffron_gates.asm
+++ b/text/maps/saffron_gates.asm
@@ -1,4 +1,4 @@
-_UnnamedText_1dfe7: ; 8aa5c (22:6a5c)
+_UnnamedText_1dfe7:: ; 8aa5c (22:6a5c)
 	text "I'm on guard duty."
 	line "Gee, I'm thirsty,"
 	cont "though!"
@@ -7,7 +7,7 @@
 	line "the road's closed."
 	done
 
-_UnnamedText_8aaa9: ; 8aaa9 (22:6aa9)
+_UnnamedText_8aaa9:: ; 8aaa9 (22:6aa9)
 	text "Whoa, boy!"
 	line "I'm parched!"
 	cont "..."
@@ -15,7 +15,7 @@
 	cont "this drink?"
 	cont "Gee, thanks!@@"
 
-_UnnamedText_1dff1: ; 8aaef (22:6aef)
+_UnnamedText_1dff1:: ; 8aaef (22:6aef)
 	db $0
 	para "..."
 	line "Glug glug..."
@@ -30,7 +30,7 @@
 	cont "the other guards!"
 	done
 
-_UnnamedText_1dff6: ; 8ab74 (22:6b74)
+_UnnamedText_1dff6:: ; 8ab74 (22:6b74)
 	text "Hi, thanks for"
 	line "the cool drinks!"
 	done
--- a/text/maps/saffron_gym.asm
+++ b/text/maps/saffron_gym.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5d162: ; a1bb4 (28:5bb4)
+_UnnamedText_5d162:: ; a1bb4 (28:5bb4)
 	text "I had a vision of"
 	line "your arrival!"
 
@@ -16,7 +16,7 @@
 	cont "you my powers!"
 	done
 
-_UnnamedText_5d167: ; a1c73 (28:5c73)
+_UnnamedText_5d167:: ; a1c73 (28:5c73)
 	text "I'm"
 	line "shocked!"
 	cont "But, a loss is a"
@@ -29,7 +29,7 @@
 	para "You earned the"
 	line "MARSHBADGE!@@"
 
-_UnnamedText_5d16e: ; a1cdc (28:5cdc)
+_UnnamedText_5d16e:: ; a1cdc (28:5cdc)
 	text "Everyone has"
 	line "psychic power!"
 	cont "People just don't"
@@ -36,7 +36,7 @@
 	cont "realize it!"
 	done
 
-_UnnamedText_5d173: ; a1d16 (28:5d16)
+_UnnamedText_5d173:: ; a1d16 (28:5d16)
 	text "The MARSHBADGE"
 	line "makes #MON up"
 	cont "to L70 obey you!"
@@ -54,11 +54,11 @@
 	line "this TM with you!"
 	done
 
-ReceivedTM46Text: ; a1dcd (28:5dcd)
+ReceivedTM46Text:: ; a1dcd (28:5dcd)
 	text $52, " received"
 	line "TM46!@@"
 
-_TM46ExplanationText: ; a1de0 (28:5de0)
+_TM46ExplanationText:: ; a1de0 (28:5de0)
 	db $0
 	para "TM46 is PSYWAVE!"
 	line "It uses powerful"
@@ -66,12 +66,12 @@
 	cont "inflict damage!"
 	done
 
-_TM46NoRoomText: ; a1e25 (28:5e25)
+_TM46NoRoomText:: ; a1e25 (28:5e25)
 	text "Your pack is full"
 	line "of other items!"
 	done
 
-_UnnamedText_5d1e6: ; a1e48 (28:5e48)
+_UnnamedText_5d1e6:: ; a1e48 (28:5e48)
 	text "Yo! Champ in"
 	line "making!"
 
@@ -88,7 +88,7 @@
 	cont "even aim a punch!"
 	done
 
-_UnnamedText_5d1eb: ; a1ef0 (28:5ef0)
+_UnnamedText_5d1eb:: ; a1ef0 (28:5ef0)
 	text "Psychic power,"
 	line "huh?"
 
@@ -97,18 +97,18 @@
 	cont "at the slots!"
 	done
 
-_SaffronGymBattleText1: ; a1f33 (28:5f33)
+_SaffronGymBattleText1:: ; a1f33 (28:5f33)
 	text "SABRINA is younger"
 	line "than I, but I"
 	cont "respect her!"
 	done
 
-_SaffronGymEndBattleText1: ; a1f62 (28:5f62)
+_SaffronGymEndBattleText1:: ; a1f62 (28:5f62)
 	text "Not"
 	line "good enough!"
 	prompt
 
-_SaffronGymAfterBattleText1: ; a1f74 (28:5f74)
+_SaffronGymAfterBattleText1:: ; a1f74 (28:5f74)
 	text "In a battle of"
 	line "equals, the one"
 	cont "with the stronger"
@@ -119,23 +119,23 @@
 	cont "focus on winning!"
 	done
 
-_SaffronGymBattleText2: ; a1fe0 (28:5fe0)
+_SaffronGymBattleText2:: ; a1fe0 (28:5fe0)
 	text "Does our unseen"
 	line "power scare you?"
 	done
 
-_SaffronGymEndBattleText2: ; a2002 (28:6002)
+_SaffronGymEndBattleText2:: ; a2002 (28:6002)
 	text "I never"
 	line "foresaw this!"
 	prompt
 
-_SaffronGymAfterBattleText2: ; a2019 (28:6019)
+_SaffronGymAfterBattleText2:: ; a2019 (28:6019)
 	text "Psychic #MON"
 	line "fear only ghosts"
 	cont "and bugs!"
 	done
 
-_SaffronGymBattleText3: ; a2042 (28:6042)
+_SaffronGymBattleText3:: ; a2042 (28:6042)
 	text "#MON take on"
 	line "the appearance of"
 	cont "their trainers."
@@ -144,52 +144,52 @@
 	line "be tough, then!"
 	done
 
-_SaffronGymEndBattleText3: ; a2091 (28:6091)
+_SaffronGymEndBattleText3:: ; a2091 (28:6091)
 	text "I knew"
 	line "it!"
 	prompt
 
-_SaffronGymAfterBattleText3: ; a209d (28:609d)
+_SaffronGymAfterBattleText3:: ; a209d (28:609d)
 	text "I must teach"
 	line "better techniques"
 	cont "to my #MON!"
 	done
 
-_SaffronGymBattleText4: ; a20c9 (28:60c9)
+_SaffronGymBattleText4:: ; a20c9 (28:60c9)
 	text "You know that"
 	line "power alone isn't"
 	cont "enough!"
 	done
 
-_SaffronGymEndBattleText4: ; a20f1 (28:60f1)
+_SaffronGymEndBattleText4:: ; a20f1 (28:60f1)
 	text "I don't"
 	line "believe this!"
 	prompt
 
-_SaffronGymAfterBattleText4: ; a2107 (28:6107)
+_SaffronGymAfterBattleText4:: ; a2107 (28:6107)
 	text "SABRINA just wiped"
 	line "out the KARATE"
 	cont "MASTER next door!"
 	done
 
-_SaffronGymBattleText5: ; a213c (28:613c)
+_SaffronGymBattleText5:: ; a213c (28:613c)
 	text "You and I, our"
 	line "#MON shall"
 	cont "fight!"
 	done
 
-_SaffronGymEndBattleText5: ; a215e (28:615e)
+_SaffronGymEndBattleText5:: ; a215e (28:615e)
 	text "I lost"
 	line "after all!"
 	prompt
 
-_SaffronGymAfterBattleText5: ; a2171 (28:6171)
+_SaffronGymAfterBattleText5:: ; a2171 (28:6171)
 	text "I knew that this"
 	line "was going to take"
 	cont "place."
 	done
 
-_SaffronGymBattleText6: ; a219c (28:619c)
+_SaffronGymBattleText6:: ; a219c (28:619c)
 	text "SABRINA is young,"
 	line "but she's also"
 	cont "our LEADER!"
@@ -198,12 +198,12 @@
 	line "her easily!"
 	done
 
-_SaffronGymEndBattleText6: ; a21e4 (28:61e4)
+_SaffronGymEndBattleText6:: ; a21e4 (28:61e4)
 	text "I lost"
 	line "my concentration!"
 	prompt
 
-_SaffronGymAfterBattleText6: ; a21fe (28:61fe)
+_SaffronGymAfterBattleText6:: ; a21fe (28:61fe)
 	text "There used to be"
 	line "2 #MON GYMs in"
 	cont "SAFFRON."
@@ -215,7 +215,7 @@
 	cont "creamed them!"
 	done
 
-_SaffronGymBattleText7: ; a2277 (28:6277)
+_SaffronGymBattleText7:: ; a2277 (28:6277)
 	text "SAFFRON #MON"
 	line "GYM is famous for"
 	cont "its psychics!"
@@ -225,11 +225,11 @@
 	cont "I can tell!"
 	done
 
-_SaffronGymEndBattleText7: ; a22ca (28:62ca)
+_SaffronGymEndBattleText7:: ; a22ca (28:62ca)
 	text "Arrrgh!"
 	prompt
 
-_SaffronGymAfterBattleText7: ; a22d3 (28:62d3)
+_SaffronGymAfterBattleText7:: ; a22d3 (28:62d3)
 	text "That's right! I"
 	line "used telepathy to"
 	cont "read your mind!"
--- a/text/maps/saffron_house.asm
+++ b/text/maps/saffron_house.asm
@@ -1,4 +1,4 @@
-_SaffronHouse1Text1: ; a2305 (28:6305)
+_SaffronHouse1Text1:: ; a2305 (28:6305)
 	text "Thank you for"
 	line "writing. I hope"
 	cont "to see you soon!"
@@ -7,16 +7,16 @@
 	line "at my letter!"
 	done
 
-_SaffronHouse1Text2: ; a2352 (28:6352)
+_SaffronHouse1Text2:: ; a2352 (28:6352)
 	text "PIDGEY: Kurukkoo!@@"
 
-_SaffronHouse1Text3: ; a2366 (28:6366)
+_SaffronHouse1Text3:: ; a2366 (28:6366)
 	text "The COPYCAT is"
 	line "cute! I'm getting"
 	cont "her a # DOLL!"
 	done
 
-_SaffronHouse1Text4: ; a2395 (28:6395)
+_SaffronHouse1Text4:: ; a2395 (28:6395)
 	text "I was given a PP"
 	line "UP as a gift."
 
--- a/text/maps/saffron_mart.asm
+++ b/text/maps/saffron_mart.asm
@@ -1,4 +1,4 @@
-_SaffronMartText2: ; a23e3 (28:63e3)
+_SaffronMartText2:: ; a23e3 (28:63e3)
 	text "MAX REPEL lasts"
 	line "longer than SUPER"
 	cont "REPEL for keeping"
@@ -6,7 +6,7 @@
 	cont "away!"
 	done
 
-_SaffronMartText3: ; a242a (28:642a)
+_SaffronMartText3:: ; a242a (28:642a)
 	text "REVIVE is costly,"
 	line "but it revives"
 	cont "fainted #MON!"
--- a/text/maps/saffron_pokecenter.asm
+++ b/text/maps/saffron_pokecenter.asm
@@ -1,10 +1,10 @@
-_SaffronPokecenterText1: ; a248e (28:648e)
+_SaffronPokecenterText1:: ; a248e (28:648e)
 	text "#MON growth"
 	line "rates differ from"
 	cont "specie to specie."
 	done
 
-_SaffronPokecenterText3: ; a24bf (28:64bf)
+_SaffronPokecenterText3:: ; a24bf (28:64bf)
 	text "SILPH CO. is very"
 	line "famous. That's"
 	cont "why it attracted"
--- a/text/maps/school.asm
+++ b/text/maps/school.asm
@@ -1,10 +1,10 @@
-_SchoolText1: ; 95d15 (25:5d15)
+_SchoolText1:: ; 95d15 (25:5d15)
 	text "Whew! I'm trying"
 	line "to memorize all"
 	cont "my notes."
 	done
 
-_SchoolText2: ; 95d40 (25:5d40)
+_SchoolText2:: ; 95d40 (25:5d40)
 	text "Okay!"
 
 	para "Be sure to read"
--- a/text/maps/seafoam_islands_b4f.asm
+++ b/text/maps/seafoam_islands_b4f.asm
@@ -1,13 +1,13 @@
-_SeafoamIslands5BattleText2: ; 88075 (22:4075)
+_SeafoamIslands5BattleText2:: ; 88075 (22:4075)
 	text "Gyaoo!@@"
 
-_SeafoamIslands5Text4: ; 8807e (22:407e)
+_SeafoamIslands5Text4:: ; 8807e (22:407e)
 	text "Boulders might"
 	line "change the flow"
 	cont "of water!"
 	done
 
-_SeafoamIslands5Text5: ; 880a8 (22:40a8)
+_SeafoamIslands5Text5:: ; 880a8 (22:40a8)
 	text "DANGER"
 	line "Fast current!"
 	done
--- a/text/maps/silph_co_10f.asm
+++ b/text/maps/silph_co_10f.asm
@@ -1,41 +1,41 @@
-_UnnamedText_5a1d3: ; 84d8d (21:4d8d)
+_UnnamedText_5a1d3:: ; 84d8d (21:4d8d)
 	text "Waaaaa!"
 	cont "I'm scared!"
 	done
 
-_UnnamedText_5a1d8: ; 84da1 (21:4da1)
+_UnnamedText_5a1d8:: ; 84da1 (21:4da1)
 	text "Please keep quiet"
 	line "about my crying!"
 	done
 
-_SilphCo10BattleText1: ; 84dc5 (21:4dc5)
+_SilphCo10BattleText1:: ; 84dc5 (21:4dc5)
 	text "Welcome to the"
 	line "10F! So good of"
 	cont "you to join me!"
 	done
 
-_SilphCo10EndBattleText1: ; 84df5 (21:4df5)
+_SilphCo10EndBattleText1:: ; 84df5 (21:4df5)
 	text "I'm"
 	line "stunned!"
 	prompt
 
-_SilphCo10AfterBattleText1: ; 84e02 (21:4e02)
+_SilphCo10AfterBattleText1:: ; 84e02 (21:4e02)
 	text "Nice try, but the"
 	line "boardroom is up"
 	cont "one more floor!"
 	done
 
-_SilphCo10BattleText2: ; 84e35 (21:4e35)
+_SilphCo10BattleText2:: ; 84e35 (21:4e35)
 	text "Enough of your"
 	line "silly games!"
 	done
 
-_SilphCo10EndBattleText2: ; 84e52 (21:4e52)
+_SilphCo10EndBattleText2:: ; 84e52 (21:4e52)
 	text "No"
 	line "continues left!"
 	prompt
 
-_SilphCo10AfterBattleText2: ; 84e66 (21:4e66)
+_SilphCo10AfterBattleText2:: ; 84e66 (21:4e66)
 	text "Are you satisfied"
 	line "with beating me?"
 	cont "Then go on home!"
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -1,4 +1,4 @@
-_SilphCoPresidentText: ; 84e9b (21:4e9b)
+_SilphCoPresidentText:: ; 84e9b (21:4e9b)
 	text "PRESIDENT: Thank"
 	line "you for saving"
 	cont "SILPH!"
@@ -19,13 +19,13 @@
 	line "will do!"
 	prompt
 
-_ReceivedSilphCoMasterBallText: ; 84f63 (21:4f63)
+_ReceivedSilphCoMasterBallText:: ; 84f63 (21:4f63)
 	text $52, " got a"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_6231c: ; 84f74 (21:4f74)
+_UnnamedText_6231c:: ; 84f74 (21:4f74)
 	text "PRESIDENT: You"
 	line "can't buy that"
 	cont "anywhere!"
@@ -43,12 +43,12 @@
 	cont "it, though."
 	done
 
-_SilphCoMasterBallNoRoomText: ; 85013 (21:5013)
+_SilphCoMasterBallNoRoomText:: ; 85013 (21:5013)
 	text "You have no"
 	line "room for this."
 	done
 
-_SilphCo11Text2: ; 8502f (21:502f)
+_SilphCo11Text2:: ; 8502f (21:502f)
 	text "SECRETARY: Thank"
 	line "you for rescuing"
 	cont "all of us!"
@@ -57,7 +57,7 @@
 	line "courage."
 	done
 
-_SilphCo11Text3: ; 85075 (21:5075)
+_SilphCo11Text3:: ; 85075 (21:5075)
 	text "Ah ", $52, "!"
 	line "So we meet again!"
 
@@ -74,12 +74,12 @@
 	line "world of pain!"
 	done
 
-_UnnamedText_62330: ; 85119 (21:5119)
+_UnnamedText_62330:: ; 85119 (21:5119)
 	text "Arrgh!!"
 	line "I lost again!?"
 	prompt
 
-_UnnamedText_62335: ; 85131 (21:5131)
+_UnnamedText_62335:: ; 85131 (21:5131)
 	text "Blast it all!"
 	line "You ruined our"
 	cont "plans for SILPH!"
@@ -96,39 +96,39 @@
 	line "shall return!"
 	done
 
-_SilphCo11BattleText1: ; 851d6 (21:51d6)
+_SilphCo11BattleText1:: ; 851d6 (21:51d6)
 	text "Stop right there!"
 	line "Don't you move!"
 	done
 
-_SilphCo11EndBattleText1: ; 851f8 (21:51f8)
+_SilphCo11EndBattleText1:: ; 851f8 (21:51f8)
 	text "Don't..."
 	line "Please!"
 	prompt
 
-_SilphCo11AfterBattleText1: ; 85209 (21:5209)
+_SilphCo11AfterBattleText1:: ; 85209 (21:5209)
 	text "So, you want to"
 	line "see my BOSS?"
 	done
 
-_SilphCo11BattleText2: ; 85227 (21:5227)
+_SilphCo11BattleText2:: ; 85227 (21:5227)
 	text "Halt! Do you have"
 	line "an appointment"
 	cont "with my BOSS?"
 	done
 
-_SilphCo11EndBattleText2: ; 85257 (21:5257)
+_SilphCo11EndBattleText2:: ; 85257 (21:5257)
 	text "Gaah!"
 	line "Demolished!"
 	prompt
 
-_SilphCo11AfterBattleText2: ; 8526a (21:526a)
+_SilphCo11AfterBattleText2:: ; 8526a (21:526a)
 	text "Watch your step,"
 	line "my BOSS likes his"
 	cont "#MON tough!"
 	done
 
-_UnnamedText_6237b: ; 8529a (21:529a)
+_UnnamedText_6237b:: ; 8529a (21:529a)
 	text "The monitor has"
 	line "#MON on it!"
 	done
--- a/text/maps/silph_co_1f.asm
+++ b/text/maps/silph_co_1f.asm
@@ -1,4 +1,4 @@
-_SilphCo1Text1: ; a245a (28:645a)
+_SilphCo1Text1:: ; a245a (28:645a)
 	text "Welcome!"
 
 	para "The PRESIDENT is"
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.asm
@@ -1,4 +1,4 @@
-_UnnamedText_59ded: ; 82454 (20:6454)
+_UnnamedText_59ded:: ; 82454 (20:6454)
 	text "Eeek!"
 	line "No! Stop! Help!"
 
@@ -9,13 +9,13 @@
 	cont "please take this!"
 	prompt
 
-_ReceivedTM36Text: ; 824ba (20:64ba)
+_ReceivedTM36Text:: ; 824ba (20:64ba)
 	text $52, " got"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_TM36ExplanationText: ; 824c9 (20:64c9)
+_TM36ExplanationText:: ; 824c9 (20:64c9)
 	text "TM36 is"
 	line "SELFDESTRUCT!"
 
@@ -25,53 +25,53 @@
 	cont "Be careful."
 	done
 
-_TM36NoRoomText: ; 8251c (20:651c)
+_TM36NoRoomText:: ; 8251c (20:651c)
 	text "You don't have any"
 	line "room for this."
 	done
 
-_SilphCo2BattleText1: ; 8253e (20:653e)
+_SilphCo2BattleText1:: ; 8253e (20:653e)
 	text "Help! I'm a SILPH"
 	line "employee."
 	done
 
-_SilphCo2EndBattleText1: ; 8255a (20:655a)
+_SilphCo2EndBattleText1:: ; 8255a (20:655a)
 	text "How"
 	line "did you know I"
 	cont "was a ROCKET?"
 	prompt
 
-_SilphCo2AfterBattleText1: ; 8257c (20:657c)
+_SilphCo2AfterBattleText1:: ; 8257c (20:657c)
 	text "I work for both"
 	line "SILPH and TEAM"
 	cont "ROCKET!"
 	done
 
-_SilphCo2BattleText2: ; 825a4 (20:65a4)
+_SilphCo2BattleText2:: ; 825a4 (20:65a4)
 	text "It's off limits"
 	line "here! Go home!"
 	done
 
-_SilphCo2EndBattleText2: ; 825c3 (20:65c3)
+_SilphCo2EndBattleText2:: ; 825c3 (20:65c3)
 	text "You're"
 	line "good."
 	prompt
 
-_SilphCo2AfterBattleText2: ; 825d0 (20:65d0)
+_SilphCo2AfterBattleText2:: ; 825d0 (20:65d0)
 	text "Can you solve the"
 	line "maze in here?"
 	done
 
-_SilphCo2BattleText3: ; 825f1 (20:65f1)
+_SilphCo2BattleText3:: ; 825f1 (20:65f1)
 	text "No kids are"
 	line "allowed in here!"
 	done
 
-_SilphCo2EndBattleText3: ; 8260f (20:660f)
+_SilphCo2EndBattleText3:: ; 8260f (20:660f)
 	text "Tough!"
 	prompt
 
-_SilphCo2AfterBattleText3: ; 82617 (20:6617)
+_SilphCo2AfterBattleText3:: ; 82617 (20:6617)
 	text "Diamond shaped"
 	line "tiles are"
 	cont "teleport blocks!"
@@ -80,16 +80,16 @@
 	line "transporters!"
 	done
 
-_SilphCo2BattleText4: ; 8265f (20:665f)
+_SilphCo2BattleText4:: ; 8265f (20:665f)
 	text "Hey kid! What are"
 	line "you doing here?"
 	done
 
-_SilphCo2EndBattleText4: ; 82682 (20:6682)
+_SilphCo2EndBattleText4:: ; 82682 (20:6682)
 	text "I goofed!"
 	prompt
 
-_SilphCo2AfterBattleText4: ; 8268d (20:668d)
+_SilphCo2AfterBattleText4:: ; 8268d (20:668d)
 	text "SILPH CO. will"
 	line "be merged with"
 	cont "TEAM ROCKET!"
--- a/text/maps/silph_co_3f.asm
+++ b/text/maps/silph_co_3f.asm
@@ -1,42 +1,42 @@
-_UnnamedText_59ff9: ; 826b9 (20:66b9)
+_UnnamedText_59ff9:: ; 826b9 (20:66b9)
 	text "I work for SILPH."
 	line "What should I do?"
 	done
 
-_UnnamedText_59ffe: ; 826de (20:66de)
+_UnnamedText_59ffe:: ; 826de (20:66de)
 	text $52, "! You and"
 	line "your #MON"
 	cont "saved us!"
 	done
 
-_SilphCo3BattleText1: ; 826fe (20:66fe)
+_SilphCo3BattleText1:: ; 826fe (20:66fe)
 	text "Quit messing with"
 	line "us, kid!"
 	done
 
-_SilphCo3EndBattleText1: ; 8271a (20:671a)
+_SilphCo3EndBattleText1:: ; 8271a (20:671a)
 	text "I give"
 	line "up!"
 	prompt
 
-_SilphCo3AfterBattleText1: ; 82726 (20:6726)
+_SilphCo3AfterBattleText1:: ; 82726 (20:6726)
 	text "A hint? You can"
 	line "open doors with a"
 	cont "CARD KEY!"
 	done
 
-_SilphCo3BattleText2: ; 82753 (20:6753)
+_SilphCo3BattleText2:: ; 82753 (20:6753)
 	text "I support TEAM"
 	line "ROCKET more than"
 	cont "I support SILPH!"
 	done
 
-_SilphCo3EndBattleText2: ; 82785 (20:6785)
+_SilphCo3EndBattleText2:: ; 82785 (20:6785)
 	text "You"
 	line "really got me!"
 	prompt
 
-_SilphCo3AfterBattleText2: ; 82799 (20:6799)
+_SilphCo3AfterBattleText2:: ; 82799 (20:6799)
 	text "Humph..."
 
 	para "TEAM ROCKET said"
--- a/text/maps/silph_co_4f.asm
+++ b/text/maps/silph_co_4f.asm
@@ -1,40 +1,40 @@
-_UnnamedText_19de0: ; 827e4 (20:67e4)
+_UnnamedText_19de0:: ; 827e4 (20:67e4)
 	text "Sssh! Can't you"
 	line "see I'm hiding?"
 	done
 
-_UnnamedText_19de5: ; 82803 (20:6803)
+_UnnamedText_19de5:: ; 82803 (20:6803)
 	text "Huh? TEAM ROCKET"
 	line "is gone?"
 	done
 
-_SilphCo4BattleText2: ; 8281e (20:681e)
+_SilphCo4BattleText2:: ; 8281e (20:681e)
 	text "TEAM ROCKET has"
 	line "taken command of"
 	cont "SILPH CO.!"
 	done
 
-_SilphCo4EndBattleText2: ; 8284b (20:684b)
+_SilphCo4EndBattleText2:: ; 8284b (20:684b)
 	text "Arrgh!"
 	prompt
 
-_SilphCo4AfterBattleText2: ; 82853 (20:6853)
+_SilphCo4AfterBattleText2:: ; 82853 (20:6853)
 	text "Fwahahaha!"
 	line "My BOSS has been"
 	cont "after this place!"
 	done
 
-_SilphCo4BattleText3: ; 82882 (20:6882)
+_SilphCo4BattleText3:: ; 82882 (20:6882)
 	text "My #MON are my"
 	line "loyal soldiers!"
 	done
 
-_SilphCo4EndBattleText3: ; 828a2 (20:68a2)
+_SilphCo4EndBattleText3:: ; 828a2 (20:68a2)
 	text "Darn!"
 	line "You weak #MON!"
 	prompt
 
-_SilphCo4AfterBattleText3: ; 828b8 (20:68b8)
+_SilphCo4AfterBattleText3:: ; 828b8 (20:68b8)
 	text "The doors are"
 	line "electronically"
 	cont "locked! A CARD"
@@ -41,16 +41,16 @@
 	cont "KEY opens them!"
 	done
 
-_SilphCo4BattleText4: ; 828f5 (20:68f5)
+_SilphCo4BattleText4:: ; 828f5 (20:68f5)
 	text "Intruder spotted!"
 	done
 
-_SilphCo4EndBattleText4: ; 82908 (20:6908)
+_SilphCo4EndBattleText4:: ; 82908 (20:6908)
 	text "Who"
 	line "are you?"
 	prompt
 
-_SilphCo4AfterBattleText4: ; 82916 (20:6916)
+_SilphCo4AfterBattleText4:: ; 82916 (20:6916)
 	text "I better tell the"
 	line "BOSS on 11F!"
 	done
--- a/text/maps/silph_co_5f_1.asm
+++ b/text/maps/silph_co_5f_1.asm
@@ -1,4 +1,4 @@
-_UnnamedText_1a010: ; 82936 (20:6936)
+_UnnamedText_1a010:: ; 82936 (20:6936)
 	text "TEAM ROCKET is"
 	line "in an uproar over"
 	cont "some intruder."
@@ -5,39 +5,39 @@
 	cont "That's you right?"
 	done
 
-_UnnamedText_1a015: ; 82978 (20:6978)
+_UnnamedText_1a015:: ; 82978 (20:6978)
 	text "TEAM ROCKET took"
 	line "off! You're our"
 	cont "hero! Thank you!"
 	done
 
-_SilphCo5BattleText2: ; 829aa (20:69aa)
+_SilphCo5BattleText2:: ; 829aa (20:69aa)
 	text "I heard a kid was"
 	line "wandering around."
 	done
 
-_SilphCo5EndBattleText2: ; 829cf (20:69cf)
+_SilphCo5EndBattleText2:: ; 829cf (20:69cf)
 	text "Boom!"
 	prompt
 
-_SilphCo5AfterBattleText2: ; 829d6 (20:69d6)
+_SilphCo5AfterBattleText2:: ; 829d6 (20:69d6)
 	text "It's not smart"
 	line "to pick a fight"
 	cont "with TEAM ROCKET!"
 	done
 
-_SilphCo5BattleText3: ; 82a07 (20:6a07)
+_SilphCo5BattleText3:: ; 82a07 (20:6a07)
 	text "We study #"
 	line "BALL technology"
 	cont "on this floor!"
 	done
 
-_SilphCo5EndBattleText3: ; 82a32 (20:6a32)
+_SilphCo5EndBattleText3:: ; 82a32 (20:6a32)
 	text "Dang!"
 	line "Blast it!"
 	prompt
 
-_SilphCo5AfterBattleText3: ; 82a43 (20:6a43)
+_SilphCo5AfterBattleText3:: ; 82a43 (20:6a43)
 	text "We worked on the"
 	line "ultimate #"
 	cont "BALL which would"
@@ -44,7 +44,7 @@
 	cont "catch anything!"
 	done
 
-_SilphCo5BattleText4: ; 82a81 (20:6a81)
+_SilphCo5BattleText4:: ; 82a81 (20:6a81)
 	text "Whaaat? There"
 	line "shouldn't be any"
 	cont "children here?"
--- a/text/maps/silph_co_5f_2.asm
+++ b/text/maps/silph_co_5f_2.asm
@@ -1,25 +1,25 @@
-_SilphCo5EndBattleText4: ; 84000 (21:4000)
+_SilphCo5EndBattleText4:: ; 84000 (21:4000)
 	text "Oh"
 	line "goodness!"
 	prompt
 
-_SilphCo5AfterBattleText4: ; 8400e (21:400e)
+_SilphCo5AfterBattleText4:: ; 8400e (21:400e)
 	text "You're only on 5F."
 	line "It's a long way"
 	cont "to my BOSS!"
 	done
 
-_SilphCo5BattleText5: ; 8403c (21:403c)
+_SilphCo5BattleText5:: ; 8403c (21:403c)
 	text "Show TEAM ROCKET"
 	line "a little respect!"
 	done
 
-_SilphCo5EndBattleText5: ; 84060 (21:4060)
+_SilphCo5EndBattleText5:: ; 84060 (21:4060)
 	text "Cough..."
 	line "Cough..."
 	prompt
 
-_SilphCo5AfterBattleText5: ; 84073 (21:4073)
+_SilphCo5AfterBattleText5:: ; 84073 (21:4073)
 	text "Which reminds me."
 
 	para "KOFFING evolves"
@@ -26,7 +26,7 @@
 	line "into WEEZING!"
 	done
 
-_SilphCo5Text9: ; 840a4 (21:40a4)
+_SilphCo5Text9:: ; 840a4 (21:40a4)
 	text "It's a #MON"
 	line "REPORT!"
 
@@ -36,7 +36,7 @@
 	cont "reality #MON."
 	done
 
-_SilphCo5Text10: ; 840f2 (21:40f2)
+_SilphCo5Text10:: ; 840f2 (21:40f2)
 	text "It's a #MON"
 	line "REPORT!"
 
@@ -45,7 +45,7 @@
 	cont "been confirmed."
 	done
 
-_SilphCo5Text11: ; 84134 (21:4134)
+_SilphCo5Text11:: ; 84134 (21:4134)
 	text "It's a #MON"
 	line "REPORT!"
 
--- a/text/maps/silph_co_6f.asm
+++ b/text/maps/silph_co_6f.asm
@@ -1,36 +1,36 @@
-_UnnamedText_1a24a: ; 84176 (21:4176)
+_UnnamedText_1a24a:: ; 84176 (21:4176)
 	text "The ROCKETs came"
 	line "and took over the"
 	cont "building!"
 	done
 
-_UnnamedText_1a24f: ; 841a4 (21:41a4)
+_UnnamedText_1a24f:: ; 841a4 (21:41a4)
 	text "Well, better get"
 	line "back to work!"
 	done
 
-_UnnamedText_1a261: ; 841c4 (21:41c4)
+_UnnamedText_1a261:: ; 841c4 (21:41c4)
 	text "Oh dear, oh dear."
 	line "Help me please!"
 	done
 
-_UnnamedText_1a266: ; 841e7 (21:41e7)
+_UnnamedText_1a266:: ; 841e7 (21:41e7)
 	text "We got engaged!"
 	line "Heheh!"
 	done
 
-_UnnamedText_1a278: ; 841ff (21:41ff)
+_UnnamedText_1a278:: ; 841ff (21:41ff)
 	text "Look at him! He's"
 	line "such a coward!"
 	done
 
-_UnnamedText_1a27d: ; 84220 (21:4220)
+_UnnamedText_1a27d:: ; 84220 (21:4220)
 	text "I feel so sorry"
 	line "for him, I have"
 	cont "to marry him!"
 	done
 
-_UnnamedText_1a28f: ; 8424f (21:424f)
+_UnnamedText_1a28f:: ; 8424f (21:424f)
 	text "TEAM ROCKET is"
 	line "trying to conquer"
 	cont "the world with"
@@ -37,12 +37,12 @@
 	cont "#MON!"
 	done
 
-_UnnamedText_1a294: ; 84286 (21:4286)
+_UnnamedText_1a294:: ; 84286 (21:4286)
 	text "TEAM ROCKET ran"
 	line "because of you!"
 	done
 
-_UnnamedText_1a2a6: ; 842a7 (21:42a7)
+_UnnamedText_1a2a6:: ; 842a7 (21:42a7)
 	text "They must have"
 	line "targeted SILPH"
 	cont "for our #MON"
@@ -49,29 +49,29 @@
 	cont "products."
 	done
 
-_UnnamedText_1a2ab: ; 842dd (21:42dd)
+_UnnamedText_1a2ab:: ; 842dd (21:42dd)
 	text "Come work for"
 	line "SILPH when you"
 	cont "get older!"
 	done
 
-_SilphCo6BattleText2: ; 84306 (21:4306)
+_SilphCo6BattleText2:: ; 84306 (21:4306)
 	text "I am one of the 4"
 	line "ROCKET BROTHERS!"
 	done
 
-_SilphCo6EndBattleText2: ; 8432a (21:432a)
+_SilphCo6EndBattleText2:: ; 8432a (21:432a)
 	text "Flame"
 	line "out!"
 	prompt
 
-_SilphCo6AfterBattleText2: ; 84336 (21:4336)
+_SilphCo6AfterBattleText2:: ; 84336 (21:4336)
 	text "No matter!"
 	line "My brothers will"
 	cont "avenge me!"
 	done
 
-_SilphCo6BattleText3: ; 8435e (21:435e)
+_SilphCo6BattleText3:: ; 8435e (21:435e)
 	text "That rotten"
 	line "PRESIDENT!"
 
@@ -80,27 +80,27 @@
 	cont "TIKSI BRANCH!"
 	done
 
-_SilphCo6EndBattleText3: ; 843a4 (21:43a4)
+_SilphCo6EndBattleText3:: ; 843a4 (21:43a4)
 	text "Shoot!"
 	prompt
 
-_SilphCo6AfterBattleText3: ; 843ac (21:43ac)
+_SilphCo6AfterBattleText3:: ; 843ac (21:43ac)
 	text "TIKSI BRANCH?"
 	line "It's in Russian"
 	cont "no man's land!"
 	done
 
-_SilphCo6BattleText4: ; 843d8 (21:43d8)
+_SilphCo6BattleText4:: ; 843d8 (21:43d8)
 	text "You dare betray"
 	line "TEAM ROCKET?"
 	done
 
-_SilphCo6EndBattleText4: ; 843f6 (21:43f6)
+_SilphCo6EndBattleText4:: ; 843f6 (21:43f6)
 	text "You"
 	line "traitor!"
 	prompt
 
-_SilphCo6AfterBattleText4: ; 84404 (21:4404)
+_SilphCo6AfterBattleText4:: ; 84404 (21:4404)
 	text "If you stand for"
 	line "justice, you"
 	cont "betray evil!"
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/silph_co_7f.asm
@@ -1,4 +1,4 @@
-_UnnamedText_51dd3: ; 84430 (21:4430)
+_UnnamedText_51dd3:: ; 84430 (21:4430)
 	text "Oh! Hi! You're"
 	line "not a ROCKET! You"
 	cont "came to save us?"
@@ -9,7 +9,7 @@
 	cont "for saving us."
 	prompt
 
-_UnnamedText_51dd8: ; 8449e (21:449e)
+_UnnamedText_51dd8:: ; 8449e (21:449e)
 	text "It's LAPRAS. It's"
 	line "very intelligent."
 
@@ -27,7 +27,7 @@
 	cont "give you a lift!"
 	done
 
-_UnnamedText_51ddd: ; 8455a (21:455a)
+_UnnamedText_51ddd:: ; 8455a (21:455a)
 	text "TEAM ROCKET's"
 	line "BOSS went to the"
 	cont "boardroom! Is our"
@@ -34,12 +34,12 @@
 	cont "PRESIDENT OK?"
 	done
 
-_UnnamedText_51de2: ; 84599 (21:4599)
+_UnnamedText_51de2:: ; 84599 (21:4599)
 	text "Saved at last!"
 	line "Thank you!"
 	done
 
-_UnnamedText_51e00: ; 845b4 (21:45b4)
+_UnnamedText_51e00:: ; 845b4 (21:45b4)
 	text "TEAM ROCKET was"
 	line "after the MASTER"
 	cont "BALL which will"
@@ -46,7 +46,7 @@
 	cont "catch any #MON!"
 	done
 
-_UnnamedText_51e05: ; 845f6 (21:45f6)
+_UnnamedText_51e05:: ; 845f6 (21:45f6)
 	text "We canceled the"
 	line "MASTER BALL"
 	cont "project because"
@@ -53,7 +53,7 @@
 	cont "of TEAM ROCKET."
 	done
 
-_UnnamedText_51e23: ; 84633 (21:4633)
+_UnnamedText_51e23:: ; 84633 (21:4633)
 	text "It would be bad"
 	line "if TEAM ROCKET"
 	cont "took over SILPH"
@@ -60,13 +60,13 @@
 	cont "or our #MON!"
 	done
 
-_UnnamedText_51e28: ; 84670 (21:4670)
+_UnnamedText_51e28:: ; 84670 (21:4670)
 	text "Wow! You chased"
 	line "off TEAM ROCKET"
 	cont "all by yourself?"
 	done
 
-_UnnamedText_51e46: ; 846a2 (21:46a2)
+_UnnamedText_51e46:: ; 846a2 (21:46a2)
 	text "You! It's really"
 	line "dangerous here!"
 	cont "You came to save"
@@ -73,28 +73,28 @@
 	cont "me? You can't!"
 	done
 
-_UnnamedText_51e4b: ; 846e2 (21:46e2)
+_UnnamedText_51e4b:: ; 846e2 (21:46e2)
 	text "Safe at last!"
 	line "Oh thank you!"
 	done
 
-_SilphCo7BattleText1: ; 846ff (21:46ff)
+_SilphCo7BattleText1:: ; 846ff (21:46ff)
 	text "Oh ho! I smell a"
 	line "little rat!"
 	done
 
-_SilphCo7EndBattleText1: ; 8471d (21:471d)
+_SilphCo7EndBattleText1:: ; 8471d (21:471d)
 	text "Lights"
 	line "out!"
 	prompt
 
-_SilphCo7AfterBattleText1: ; 8472a (21:472a)
+_SilphCo7AfterBattleText1:: ; 8472a (21:472a)
 	text "You won't find my"
 	line "BOSS by just"
 	cont "scurrying around!"
 	done
 
-_SilphCo7BattleText2: ; 8475b (21:475b)
+_SilphCo7BattleText2:: ; 8475b (21:475b)
 	text "Heheh!"
 
 	para "You mistook me for"
@@ -101,44 +101,44 @@
 	line "a SILPH worker?"
 	done
 
-_SilphCo7EndBattleText2: ; 84786 (21:4786)
+_SilphCo7EndBattleText2:: ; 84786 (21:4786)
 	text "I'm"
 	line "done!"
 	prompt
 
-_SilphCo7AfterBattleText2: ; 84790 (21:4790)
+_SilphCo7AfterBattleText2:: ; 84790 (21:4790)
 	text "Despite your age,"
 	line "you are a skilled"
 	cont "trainer!"
 	done
 
-_SilphCo7BattleText3: ; 847be (21:47be)
+_SilphCo7BattleText3:: ; 847be (21:47be)
 	text "I am one of the 4"
 	line "ROCKET BROTHERS!"
 	done
 
-_SilphCo7EndBattleText3: ; 847e2 (21:47e2)
+_SilphCo7EndBattleText3:: ; 847e2 (21:47e2)
 	text "Aack!"
 	line "Brothers, I lost!"
 	prompt
 
-_SilphCo7AfterBattleText3: ; 847fb (21:47fb)
+_SilphCo7AfterBattleText3:: ; 847fb (21:47fb)
 	text "Doesn't matter."
 	line "My brothers will"
 	cont "repay the favor!"
 	done
 
-_SilphCo7BattleText4: ; 8482d (21:482d)
+_SilphCo7BattleText4:: ; 8482d (21:482d)
 	text "A child intruder?"
 	line "That must be you!"
 	done
 
-_SilphCo7EndBattleText4: ; 84852 (21:4852)
+_SilphCo7EndBattleText4:: ; 84852 (21:4852)
 	text "Fine!"
 	line "I lost!"
 	prompt
 
-_SilphCo7AfterBattleText4: ; 84861 (21:4861)
+_SilphCo7AfterBattleText4:: ; 84861 (21:4861)
 	text "Go on home"
 	line "before my BOSS"
 	cont "gets ticked off!"
--- a/text/maps/silph_co_8f.asm
+++ b/text/maps/silph_co_8f.asm
@@ -1,9 +1,9 @@
-_UnnamedText_51ebe: ; 8488d (21:488d)
+_UnnamedText_51ebe:: ; 8488d (21:488d)
 	text $53, ": What"
 	line "kept you ", $52, "?"
 	done
 
-_UnnamedText_51ec3: ; 848a2 (21:48a2)
+_UnnamedText_51ec3:: ; 848a2 (21:48a2)
 	text $53, ": Hahaha!"
 	line "I thought you'd"
 	cont "turn up if I"
@@ -20,13 +20,13 @@
 	cont "you got better!"
 	done
 
-_UnnamedText_51ec8: ; 8494a (21:494a)
+_UnnamedText_51ec8:: ; 8494a (21:494a)
 	text "Oh ho!"
 	line "So, you are ready"
 	cont "for BOSS ROCKET!"
 	prompt
 
-_UnnamedText_51ecd: ; 84975 (21:4975)
+_UnnamedText_51ecd:: ; 84975 (21:4975)
 	text $53, ": How can"
 	line "I put this?"
 
@@ -35,7 +35,7 @@
 	cont "with us big boys!"
 	prompt
 
-_UnnamedText_51ed2: ; 849bd (21:49bd)
+_UnnamedText_51ed2:: ; 849bd (21:49bd)
 	text "Well, ", $52, "!"
 
 	para "I'm moving on up"
@@ -62,59 +62,59 @@
 	cont "Smell ya!"
 	done
 
-_UnnamedText_565be: ; 84ac4 (21:4ac4)
+_UnnamedText_565be:: ; 84ac4 (21:4ac4)
 	text "I wonder if SILPH"
 	line "is finished..."
 	done
 
-_UnnamedText_565c3: ; 84ae6 (21:4ae6)
+_UnnamedText_565c3:: ; 84ae6 (21:4ae6)
 	text "Thanks for saving"
 	line "us!"
 	done
 
-_SilphCo8BattleText1: ; 84afd (21:4afd)
+_SilphCo8BattleText1:: ; 84afd (21:4afd)
 	text "That's as far as"
 	line "you'll go!"
 	done
 
-_SilphCo8EndBattleText1: ; 84b18 (21:4b18)
+_SilphCo8EndBattleText1:: ; 84b18 (21:4b18)
 	text "Not"
 	line "enough grit!"
 	prompt
 
-_SilphCo8AfterBattleText1: ; 84b2a (21:4b2a)
+_SilphCo8AfterBattleText1:: ; 84b2a (21:4b2a)
 	text "If you don't turn"
 	line "back, I'll call"
 	cont "for backup!"
 	done
 
-_SilphCo8BattleText2: ; 84b57 (21:4b57)
+_SilphCo8BattleText2:: ; 84b57 (21:4b57)
 	text "You're causing us"
 	line "problems!"
 	done
 
-_SilphCo8EndBattleText2: ; 84b73 (21:4b73)
+_SilphCo8EndBattleText2:: ; 84b73 (21:4b73)
 	text "Huh?"
 	line "I lost?"
 	prompt
 
-_SilphCo8AfterBattleText2: ; 84b81 (21:4b81)
+_SilphCo8AfterBattleText2:: ; 84b81 (21:4b81)
 	text "So, what do you"
 	line "think of SILPH"
 	cont "BUILDING's maze?"
 	done
 
-_SilphCo8BattleText3: ; 84bb1 (21:4bb1)
+_SilphCo8BattleText3:: ; 84bb1 (21:4bb1)
 	text "I am one of the 4"
 	line "ROCKET BROTHERS!"
 	done
 
-_SilphCo8EndBattleText3: ; 84bd5 (21:4bd5)
+_SilphCo8EndBattleText3:: ; 84bd5 (21:4bd5)
 	text "Whoo!"
 	line "Oh brothers!"
 	prompt
 
-_SilphCo8AfterBattleText3: ; 84be9 (21:4be9)
+_SilphCo8AfterBattleText3:: ; 84be9 (21:4be9)
 	text "I'll leave you up"
 	line "to my brothers!"
 	done
--- a/text/maps/silph_co_9f.asm
+++ b/text/maps/silph_co_9f.asm
@@ -1,45 +1,45 @@
-_UnnamedText_5d8e5: ; 84c0b (21:4c0b)
+_UnnamedText_5d8e5:: ; 84c0b (21:4c0b)
 	text "You look tired!"
 	line "You should take a"
 	cont "quick nap!"
 	prompt
 
-_UnnamedText_5d8ea: ; 84c39 (21:4c39)
+_UnnamedText_5d8ea:: ; 84c39 (21:4c39)
 	text "Don't give up!"
 	done
 
-_UnnamedText_5d8ef: ; 84c48 (21:4c48)
+_UnnamedText_5d8ef:: ; 84c48 (21:4c48)
 	text "Thank you so"
 	line "much!"
 	done
 
-_SilphCo9BattleText1: ; 84c5c (21:4c5c)
+_SilphCo9BattleText1:: ; 84c5c (21:4c5c)
 	text "Your #MON seem"
 	line "to adore you, kid!"
 	done
 
-_SilphCo9EndBattleText1: ; 84c7f (21:4c7f)
+_SilphCo9EndBattleText1:: ; 84c7f (21:4c7f)
 	text "Ghaaah!"
 	prompt
 
-_SilphCo9AfterBattleText1: ; 84c88 (21:4c88)
+_SilphCo9AfterBattleText1:: ; 84c88 (21:4c88)
 	text "If I had started"
 	line "as a trainer at"
 	cont "your age..."
 	done
 
-_SilphCo9BattleText2: ; 84cb6 (21:4cb6)
+_SilphCo9BattleText2:: ; 84cb6 (21:4cb6)
 	text "Your #MON have"
 	line "weak points! I"
 	cont "can nail them!"
 	done
 
-_SilphCo9EndBattleText2: ; 84ce4 (21:4ce4)
+_SilphCo9EndBattleText2:: ; 84ce4 (21:4ce4)
 	text "You"
 	line "hammered me!"
 	prompt
 
-_SilphCo9AfterBattleText2: ; 84cf6 (21:4cf6)
+_SilphCo9AfterBattleText2:: ; 84cf6 (21:4cf6)
 	text "Exploiting weak"
 	line "spots does work!"
 	cont "Think about"
@@ -46,17 +46,17 @@
 	cont "element types!"
 	done
 
-_SilphCo9BattleText3: ; 84d33 (21:4d33)
+_SilphCo9BattleText3:: ; 84d33 (21:4d33)
 	text "I am one of the 4"
 	line "ROCKET BROTHERS!"
 	done
 
-_SilphCo9EndBattleText3: ; 84d57 (21:4d57)
+_SilphCo9EndBattleText3:: ; 84d57 (21:4d57)
 	text "Warg!"
 	line "Brothers, I lost!"
 	prompt
 
-_SilphCo9AfterBattleText3: ; 84d70 (21:4d70)
+_SilphCo9AfterBattleText3:: ; 84d70 (21:4d70)
 	text "My brothers will"
 	line "avenge me!"
 	done
--- a/text/maps/ss_anne_1.asm
+++ b/text/maps/ss_anne_1.asm
@@ -1,4 +1,4 @@
-_SSAnne1Text1: ; 80c70 (20:4c70)
+_SSAnne1Text1:: ; 80c70 (20:4c70)
 	text "Bonjour!"
 	line "I am le waiter on"
 	cont "this ship!"
@@ -11,7 +11,7 @@
 	line "silent type!"
 	done
 
-_SSAnne1Text2: ; 80ce6 (20:4ce6)
+_SSAnne1Text2:: ; 80ce6 (20:4ce6)
 	text "The passengers"
 	line "are restless!"
 
--- a/text/maps/ss_anne_10.asm
+++ b/text/maps/ss_anne_10.asm
@@ -1,88 +1,88 @@
-_SSAnne10Text8: ; 81aaa (20:5aaa)
+_SSAnne10Text8:: ; 81aaa (20:5aaa)
 	text "MACHOKE: Gwoh!"
 	line "Goggoh!@@"
 
-_SSAnne10BattleText1: ; 81ac3 (20:5ac3)
+_SSAnne10BattleText1:: ; 81ac3 (20:5ac3)
 	text "You know what they"
 	line "say about sailors"
 	cont "and fighting!"
 	done
 
-_SSAnne10EndBattleText1: ; 81af7 (20:5af7)
+_SSAnne10EndBattleText1:: ; 81af7 (20:5af7)
 	text "Right!"
 	line "Good fight, mate!"
 	prompt
 
-_SSAnne10AfterBattleText1: ; 81b11 (20:5b11)
+_SSAnne10AfterBattleText1:: ; 81b11 (20:5b11)
 	text "Haha! Want to be"
 	line "a sailor, mate?"
 	done
 
-_SSAnne10BattleText2: ; 81b33 (20:5b33)
+_SSAnne10BattleText2:: ; 81b33 (20:5b33)
 	text "My sailor's pride"
 	line "is at stake!"
 	done
 
-_SSAnne10EndBattleText2: ; 81b52 (20:5b52)
+_SSAnne10EndBattleText2:: ; 81b52 (20:5b52)
 	text "Your"
 	line "spirit sank me!"
 	prompt
 
-_SSAnne10AfterBattleText2: ; 81b68 (20:5b68)
+_SSAnne10AfterBattleText2:: ; 81b68 (20:5b68)
 	text "Did you see the"
 	line "FISHING GURU in"
 	cont "VERMILION CITY?"
 	done
 
-_SSAnne10BattleText3: ; 81b99 (20:5b99)
+_SSAnne10BattleText3:: ; 81b99 (20:5b99)
 	text "Us sailors have"
 	line "#MON too!"
 	done
 
-_SSAnne10EndBattleText3: ; 81bb4 (20:5bb4)
+_SSAnne10EndBattleText3:: ; 81bb4 (20:5bb4)
 	text "OK, "
 	line "you're not bad."
 	prompt
 
-_SSAnne10AfterBattleText3: ; 81bc9 (20:5bc9)
+_SSAnne10AfterBattleText3:: ; 81bc9 (20:5bc9)
 	text "We caught all our"
 	line "#MON while"
 	cont "out at sea!"
 	done
 
-_SSAnne10BattleText4: ; 81bf3 (20:5bf3)
+_SSAnne10BattleText4:: ; 81bf3 (20:5bf3)
 	text "I like feisty"
 	line "kids like you!@@"
 
-_SSAnne10EndBattleText4: ; 81c12 (20:5c12)
+_SSAnne10EndBattleText4:: ; 81c12 (20:5c12)
 	text "Argh!"
 	line "Lost it!"
 	prompt
 
-_SSAnne10AfterBattleText4: ; 81c22 (20:5c22)
+_SSAnne10AfterBattleText4:: ; 81c22 (20:5c22)
 	text "Sea #MON live"
 	line "in deep water."
 	cont "You'll need a ROD!"
 	done
 
-_SSAnne10BattleText5: ; 81c52 (20:5c52)
+_SSAnne10BattleText5:: ; 81c52 (20:5c52)
 	text "Matey, you're"
 	line "walking the plank"
 	cont "if you lose!"
 	done
 
-_SSAnne10EndBattleText5: ; 81c7f (20:5c7f)
+_SSAnne10EndBattleText5:: ; 81c7f (20:5c7f)
 	text "Argh!"
 	line "Beaten by a kid!"
 	prompt
 
-_SSAnne10AfterBattleText5: ; 81c97 (20:5c97)
+_SSAnne10AfterBattleText5:: ; 81c97 (20:5c97)
 	text "Jellyfish some-"
 	line "times drift into"
 	cont "the ship."
 	done
 
-_SSAnne10BattleText6: ; 81cc3 (20:5cc3)
+_SSAnne10BattleText6:: ; 81cc3 (20:5cc3)
 	text "Hello stranger!"
 	line "Stop and chat!"
 
@@ -90,19 +90,19 @@
 	line "are from the sea!"
 	done
 
-_SSAnne10EndBattleText6: ; 81d01 (20:5d01)
+_SSAnne10EndBattleText6:: ; 81d01 (20:5d01)
 	text "Darn!"
 	line "I let that one"
 	cont "get away!"
 	prompt
 
-_SSAnne10AfterBattleText6: ; 81d21 (20:5d21)
+_SSAnne10AfterBattleText6:: ; 81d21 (20:5d21)
 	text "I was going to"
 	line "make you my"
 	cont "assistant too!"
 	done
 
-_SSAnne10Text7: ; 81d4c (20:5d4c)
+_SSAnne10Text7:: ; 81d4c (20:5d4c)
 	text "My buddy, MACHOKE,"
 	line "is super strong!"
 
--- a/text/maps/ss_anne_2.asm
+++ b/text/maps/ss_anne_2.asm
@@ -1,4 +1,4 @@
-_SSAnne2Text1: ; 80d34 (20:4d34)
+_SSAnne2Text1:: ; 80d34 (20:4d34)
 	text "This ship, she is"
 	line "a luxury liner"
 	cont "for trainers!"
@@ -8,7 +8,7 @@
 	cont "invited trainers!"
 	done
 
-_SSAnneRivalBeforeBattleText: ; 80d9a (20:4d9a)
+_SSAnneRivalBeforeBattleText:: ; 80d9a (20:4d9a)
 	text $53, ": Bonjour!"
 	line $52, "!"
 
@@ -31,7 +31,7 @@
 	line "grassy areas!"
 	done
 
-_SSAnneRivalDefeatedText: ; 80e57 (20:4e57)
+_SSAnneRivalDefeatedText:: ; 80e57 (20:4e57)
 	text "Humph!"
 
 	para "At least you're"
@@ -39,7 +39,7 @@
 	cont "#MON!"
 	prompt
 
-_SSAnneRivalWonText: ; 80e81 (20:4e81)
+_SSAnneRivalWonText:: ; 80e81 (20:4e81)
 	text $52, "! What are"
 	line "you, seasick?"
 
@@ -47,7 +47,7 @@
 	line "up, pal!"
 	prompt
 
-_SSAnneRivalCaptainText: ; 80eb6 (20:4eb6)
+_SSAnneRivalCaptainText:: ; 80eb6 (20:4eb6)
 	text $53, ": I heard"
 	line "there was a CUT"
 	cont "master on board."
--- a/text/maps/ss_anne_3.asm
+++ b/text/maps/ss_anne_3.asm
@@ -1,4 +1,4 @@
-_SSAnne3Text1: ; 80f4b (20:4f4b)
+_SSAnne3Text1:: ; 80f4b (20:4f4b)
 	text "Our CAPTAIN is a"
 	line "sword master!"
 
--- a/text/maps/ss_anne_5.asm
+++ b/text/maps/ss_anne_5.asm
@@ -1,15 +1,15 @@
-_SSAnne5Text1: ; 80f88 (20:4f88)
+_SSAnne5Text1:: ; 80f88 (20:4f88)
 	text "The party's over."
 	line "The ship will be"
 	cont "departing soon."
 	done
 
-_SSAnne5Text2: ; 80fbb (20:4fbb)
+_SSAnne5Text2:: ; 80fbb (20:4fbb)
 	text "Scrubbing decks"
 	line "is hard work!"
 	done
 
-_SSAnne5Text3: ; 80fda (20:4fda)
+_SSAnne5Text3:: ; 80fda (20:4fda)
 	text "Urf. I feel ill."
 
 	para "I stepped out to"
@@ -16,7 +16,7 @@
 	line "get some air."
 	done
 
-_SSAnneBattleText1: ; 8100b (20:500b)
+_SSAnneBattleText1:: ; 8100b (20:500b)
 	text "Hey matey!"
 
 	para "Let's do a little"
@@ -23,28 +23,28 @@
 	line "jig!"
 	done
 
-_SSAnneEndBattleText1: ; 8102d (20:502d)
+_SSAnneEndBattleText1:: ; 8102d (20:502d)
 	text "You're"
 	line "impressive!"
 	prompt
 
-_SSAnneAfterBattleText1: ; 81040 (20:5040)
+_SSAnneAfterBattleText1:: ; 81040 (20:5040)
 	text "How many kinds of"
 	line "#MON do you"
 	cont "think there are?"
 	done
 
-_SSAnneBattleText2: ; 81070 (20:5070)
+_SSAnneBattleText2:: ; 81070 (20:5070)
 	text "Ahoy there!"
 	line "Are you seasick?"
 	done
 
-_SSAnneEndBattleText2: ; 8108e (20:508e)
+_SSAnneEndBattleText2:: ; 8108e (20:508e)
 	text "I was"
 	line "just careless!"
 	prompt
 
-_SSAnneAfterBattleText2: ; 810a4 (20:50a4)
+_SSAnneAfterBattleText2:: ; 810a4 (20:50a4)
 	text "My Pa said there"
 	line "are 100 kinds of"
 	cont "#MON. I think"
--- a/text/maps/ss_anne_6.asm
+++ b/text/maps/ss_anne_6.asm
@@ -1,20 +1,20 @@
-_SSAnne6Text1: ; 810e5 (20:50e5)
+_SSAnne6Text1:: ; 810e5 (20:50e5)
 	text "You, mon petit!"
 	line "We're busy here!"
 	cont "Out of the way!"
 	done
 
-_SSAnne6Text2: ; 81116 (20:5116)
+_SSAnne6Text2:: ; 81116 (20:5116)
 	text "I saw an odd ball"
 	line "in the trash."
 	done
 
-_SSAnne6Text3: ; 81137 (20:5137)
+_SSAnne6Text3:: ; 81137 (20:5137)
 	text "I'm so busy I'm"
 	line "getting dizzy!"
 	done
 
-_SSAnne6Text4: ; 81155 (20:5155)
+_SSAnne6Text4:: ; 81155 (20:5155)
 	text "Hum-de-hum-de-"
 	line "ho..."
 
@@ -23,7 +23,7 @@
 	cont "Hum-hum..."
 	done
 
-_SSAnne6Text5: ; 8118e (20:518e)
+_SSAnne6Text5:: ; 8118e (20:518e)
 	text "Did you hear about"
 	line "SNORLAX?"
 
@@ -31,7 +31,7 @@
 	line "eat and sleep!"
 	done
 
-_SSAnne6Text6: ; 811c9 (20:51c9)
+_SSAnne6Text6:: ; 811c9 (20:51c9)
 	text "Snivel...Sniff..."
 
 	para "I only get to"
@@ -39,7 +39,7 @@
 	cont "Snivel..."
 	done
 
-_UnnamedText_61807: ; 81203 (20:5203)
+_UnnamedText_61807:: ; 81203 (20:5203)
 	text "Er-hem! Indeed I"
 	line "am le CHEF!"
 
@@ -46,7 +46,7 @@
 	para "Le main course is"
 	prompt
 
-_UnnamedText_6180c: ; 81233 (20:5233)
+_UnnamedText_6180c:: ; 81233 (20:5233)
 	text "Salmon du Salad!"
 
 	para "Les guests may"
@@ -54,7 +54,7 @@
 	cont "again, however!"
 	done
 
-_UnnamedText_61811: ; 81273 (20:5273)
+_UnnamedText_61811:: ; 81273 (20:5273)
 	text "Eels au Barbecue!"
 
 	para "Les guests will"
@@ -61,7 +61,7 @@
 	line "mutiny, I fear."
 	done
 
-_UnnamedText_61816: ; 812a6 (20:52a6)
+_UnnamedText_61816:: ; 812a6 (20:52a6)
 	text "Prime Beef Steak!"
 
 	para "But, have I enough"
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.asm
@@ -1,4 +1,4 @@
-_SSAnne7RubText: ; 812dd (20:52dd)
+_SSAnne7RubText:: ; 812dd (20:52dd)
 	text "CAPTAIN: Ooargh..."
 	line "I feel hideous..."
 	cont "Urrp! Seasick..."
@@ -10,7 +10,7 @@
 	para "Rub-rub..."
 	line "Rub-rub...@@"
 
-_ReceivingHM01Text: ; 81347 (20:5347)
+_ReceivingHM01Text:: ; 81347 (20:5347)
 	text "CAPTAIN: Whew!"
 	line "Thank you! I"
 	cont "feel much better!"
@@ -30,13 +30,13 @@
 	cont "any time!"
 	prompt
 
-_ReceivedHM01Text: ; 8140d (20:540d)
+_ReceivedHM01Text:: ; 8140d (20:540d)
 	text $52, " got"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_61932: ; 8141c (20:541c)
+_UnnamedText_61932:: ; 8141c (20:541c)
 	text "CAPTAIN: Whew!"
 
 	para "Now that I'm not"
@@ -44,17 +44,17 @@
 	cont "guess it's time."
 	done
 
-_HM01NoRoomText: ; 8145d (20:545d)
+_HM01NoRoomText:: ; 8145d (20:545d)
 	text "Oh no! You have"
 	line "no room for this!"
 	done
 
-_SSAnne7Text2: ; 81480 (20:5480)
+_SSAnne7Text2:: ; 81480 (20:5480)
 	text "Yuck! Shouldn't"
 	line "have looked!"
 	done
 
-_SSAnne7Text3: ; 8149d (20:549d)
+_SSAnne7Text3:: ; 8149d (20:549d)
 	text "How to Conquer"
 	line "Seasickness..."
 	cont "The CAPTAIN's"
--- a/text/maps/ss_anne_8.asm
+++ b/text/maps/ss_anne_8.asm
@@ -1,8 +1,8 @@
-_SSAnne8Text8: ; 814d7 (20:54d7)
+_SSAnne8Text8:: ; 814d7 (20:54d7)
 	text "WIGGLYTUFF: Puup"
 	line "pupuu!@@"
 
-_SSAnne8BattleText1: ; 814f1 (20:54f1)
+_SSAnne8BattleText1:: ; 814f1 (20:54f1)
 	text "I travel alone"
 	line "on my journeys!"
 
@@ -10,42 +10,42 @@
 	line "only friends!"
 	done
 
-_SSAnne8EndBattleText1: ; 8152e (20:552e)
+_SSAnne8EndBattleText1:: ; 8152e (20:552e)
 	text "My, my"
 	line "friends..."
 	prompt
 
-_SSAnne8AfterBattleText1: ; 81541 (20:5541)
+_SSAnne8AfterBattleText1:: ; 81541 (20:5541)
 	text "You should be"
 	line "nice to friends!"
 	done
 
-_SSAnne8BattleText2: ; 81561 (20:5561)
+_SSAnne8BattleText2:: ; 81561 (20:5561)
 	text "You pup! How dare"
 	line "you barge in!"
 	done
 
-_SSAnne8EndBattleText2: ; 81582 (20:5582)
+_SSAnne8EndBattleText2:: ; 81582 (20:5582)
 	text "Humph!"
 	line "You rude child!"
 	prompt
 
-_UnnamedText_61a24: ; 8159a (20:559a)
+_UnnamedText_61a24:: ; 8159a (20:559a)
 	text "I wish to be left"
 	line "alone! Get out!"
 	done
 
-_SSAnne8BattleText3: ; 815bd (20:55bd)
+_SSAnne8BattleText3:: ; 815bd (20:55bd)
 	text "I love #MON!"
 	line "Do you?"
 	done
 
-_SSAnne8EndBattleText3: ; 815d3 (20:55d3)
+_SSAnne8EndBattleText3:: ; 815d3 (20:55d3)
 	text "Wow! "
 	line "You're great!"
 	prompt
 
-_SSAnne8AfterBattleText3: ; 815e7 (20:55e7)
+_SSAnne8AfterBattleText3:: ; 815e7 (20:55e7)
 	text "Let me be your"
 	line "friend, OK?"
 
@@ -53,19 +53,19 @@
 	line "#MON!"
 	done
 
-_SSAnne8BattleText4: ; 8161b (20:561b)
+_SSAnne8BattleText4:: ; 8161b (20:561b)
 	text "I collected these"
 	line "#MON from all"
 	cont "around the world!"
 	done
 
-_SSAnne8EndBattleText4: ; 8164e (20:564e)
+_SSAnne8EndBattleText4:: ; 8164e (20:564e)
 	text "Oh no!"
 	line "I went around the"
 	cont "world for these!"
 	prompt
 
-_SSAnne8AfterBattleText4: ; 81679 (20:5679)
+_SSAnne8AfterBattleText4:: ; 81679 (20:5679)
 	text "You hurt my poor"
 	line "worldly #MON!"
 
@@ -74,28 +74,28 @@
 	cont "#MON CENTER!"
 	done
 
-_SSAnne8Text5: ; 816c7 (20:56c7)
+_SSAnne8Text5:: ; 816c7 (20:56c7)
 	text "Waiter, I would"
 	line "like a cherry pie"
 	cont "please!"
 	done
 
-_SSAnne8Text6: ; 816f2 (20:56f2)
+_SSAnne8Text6:: ; 816f2 (20:56f2)
 	text "A cruise is so"
 	line "elegant yet cozy!"
 	done
 
-_SSAnne8Text7: ; 81714 (20:5714)
+_SSAnne8Text7:: ; 81714 (20:5714)
 	text "I always travel"
 	line "with WIGGLYTUFF!"
 	done
 
-_SSAnne8Text9: ; 81736 (20:5736)
+_SSAnne8Text9:: ; 81736 (20:5736)
 	text "We are cruising"
 	line "around the world."
 	done
 
-_SSAnne8Text11: ; 81759 (20:5759)
+_SSAnne8Text11:: ; 81759 (20:5759)
 	text "Ssh! I'm a GLOBAL"
 	line "POLICE agent!"
 
--- a/text/maps/ss_anne_9.asm
+++ b/text/maps/ss_anne_9.asm
@@ -1,4 +1,4 @@
-_UnnamedText_61bf2: ; 81799 (20:5799)
+_UnnamedText_61bf2:: ; 81799 (20:5799)
 	text "In all my travels"
 	line "I've never seen"
 	cont "any #MON sleep"
@@ -8,7 +8,7 @@
 	line "like this!"
 	prompt
 
-_UnnamedText_61c01: ; 817f5 (20:57f5)
+_UnnamedText_61c01:: ; 817f5 (20:57f5)
 	text "Ah yes, I have"
 	line "seen some #MON"
 	cont "ferry people"
@@ -15,12 +15,12 @@
 	cont "across the water!"
 	done
 
-_UnnamedText_61c10: ; 81833 (20:5833)
+_UnnamedText_61c10:: ; 81833 (20:5833)
 	text "#MON can CUT"
 	line "down small bushes."
 	done
 
-_UnnamedText_61c1f: ; 81854 (20:5854)
+_UnnamedText_61c1f:: ; 81854 (20:5854)
 	text "Have you gone to"
 	line "the SAFARI ZONE"
 	cont "in FUCHSIA CITY?"
@@ -29,51 +29,51 @@
 	line "kinds of #MON!!"
 	done
 
-_UnnamedText_61c2e: ; 818a8 (20:58a8)
+_UnnamedText_61c2e:: ; 818a8 (20:58a8)
 	text "Me and my Daddy"
 	line "think the SAFARI"
 	cont "ZONE is awesome!"
 	done
 
-_UnnamedText_61c3d: ; 818db (20:58db)
+_UnnamedText_61c3d:: ; 818db (20:58db)
 	text "The CAPTAIN looked"
 	line "really sick and"
 	cont "pale!"
 	done
 
-_UnnamedText_61c4c: ; 81905 (20:5905)
+_UnnamedText_61c4c:: ; 81905 (20:5905)
 	text "I hear many people"
 	line "get seasick!"
 	done
 
-_SSAnne9BattleText1: ; 81926 (20:5926)
+_SSAnne9BattleText1:: ; 81926 (20:5926)
 	text "Competing against"
 	line "the young keeps"
 	cont "me youthful."
 	done
 
-_SSAnne9EndBattleText1: ; 81956 (20:5956)
+_SSAnne9EndBattleText1:: ; 81956 (20:5956)
 	text "Good"
 	line "fight! Ah, I feel"
 	cont "young again!"
 	prompt
 
-_SSAnne9AfterBattleText1: ; 8197b (20:597b)
+_SSAnne9AfterBattleText1:: ; 8197b (20:597b)
 	text "15 years ago, I"
 	line "would have won!"
 	done
 
-_SSAnne9BattleText2: ; 8199c (20:599c)
+_SSAnne9BattleText2:: ; 8199c (20:599c)
 	text "Check out what I"
 	line "fished up!"
 	done
 
-_SSAnne9EndBattleText2: ; 819b9 (20:59b9)
+_SSAnne9EndBattleText2:: ; 819b9 (20:59b9)
 	text "I'm"
 	line "all out!"
 	prompt
 
-_SSAnne9AfterBattleText2: ; 819c6 (20:59c6)
+_SSAnne9AfterBattleText2:: ; 819c6 (20:59c6)
 	text "Party?"
 
 	para "The cruise ship's"
@@ -81,33 +81,33 @@
 	cont "over by now."
 	done
 
-_SSAnne9BattleText3: ; 819fc (20:59fc)
+_SSAnne9BattleText3:: ; 819fc (20:59fc)
 	text "Which do you like,"
 	line "a strong or a"
 	cont "rare #MON?"
 	done
 
-_SSAnne9EndBattleText3: ; 81a29 (20:5a29)
+_SSAnne9EndBattleText3:: ; 81a29 (20:5a29)
 	text "I must"
 	line "salute you!"
 	prompt
 
-_SSAnne9AfterBattleText3: ; 81a3d (20:5a3d)
+_SSAnne9AfterBattleText3:: ; 81a3d (20:5a3d)
 	text "I prefer strong"
 	line "and rare #MON."
 	done
 
-_SSAnne9BattleText4: ; 81a5d (20:5a5d)
+_SSAnne9BattleText4:: ; 81a5d (20:5a5d)
 	text "I never saw you"
 	line "at the party."
 	done
 
-_SSAnne9EndBattleText4: ; 81a7c (20:5a7c)
+_SSAnne9EndBattleText4:: ; 81a7c (20:5a7c)
 	text "Take"
 	line "it easy!"
 	prompt
 
-_SSAnne9AfterBattleText4: ; 81a8b (20:5a8b)
+_SSAnne9AfterBattleText4:: ; 81a8b (20:5a8b)
 	text "Oh, I adore your"
 	line "strong #MON!"
 	done
--- a/text/maps/underground_path_route_6_entrance.asm
+++ b/text/maps/underground_path_route_6_entrance.asm
@@ -1,4 +1,4 @@
-_UndergrdTunnelEntRoute6Text1: ; 8c0cb (23:40cb)
+_UndergrdTunnelEntRoute6Text1:: ; 8c0cb (23:40cb)
 	text "People often lose"
 	line "things in that"
 	cont "UNDERGROUND PATH."
--- a/text/maps/underground_path_route_7_entrance.asm
+++ b/text/maps/underground_path_route_7_entrance.asm
@@ -1,4 +1,4 @@
-_UndergroundPathEntRoute7Text1: ; 8c0ff (23:40ff)
+_UndergroundPathEntRoute7Text1:: ; 8c0ff (23:40ff)
 	text "I heard a sleepy"
 	line "#MON appeared"
 	cont "near CELADON CITY."
--- a/text/maps/underground_path_route_7_entrance_unused.asm
+++ b/text/maps/underground_path_route_7_entrance_unused.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5d773: ; 8c132 (23:4132)
+_UnnamedText_5d773:: ; 8c132 (23:4132)
 	text "I want to shop at"
 	line "the dept. store"
 	cont "in CELADON but..."
@@ -8,13 +8,13 @@
 	cont "people there."
 	done
 
-_UnnamedText_5d778: ; 8c195 (23:4195)
+_UnnamedText_5d778:: ; 8c195 (23:4195)
 	text "TEAM ROCKET had a"
 	line "secret hideout in"
 	cont "CELADON CITY?"
 	done
 
-_UnnamedText_5d77d: ; 8c1c8 (23:41c8)
+_UnnamedText_5d77d:: ; 8c1c8 (23:41c8)
 	text "You're here to"
 	line "shop in CELADON?"
 
@@ -22,7 +22,7 @@
 	line "and head west!"
 	done
 
-_UnnamedText_5d782: ; 8c209 (23:4209)
+_UnnamedText_5d782:: ; 8c209 (23:4209)
 	text "The UNDERGROUND"
 	line "PATH goes beneath"
 	cont "SAFFRON and leads"
--- a/text/maps/underground_path_route_8_entrance.asm
+++ b/text/maps/underground_path_route_8_entrance.asm
@@ -1,4 +1,4 @@
-_UndergroundPathEntRoute8Text1: ; 8c28d (23:428d)
+_UndergroundPathEntRoute8Text1:: ; 8c28d (23:428d)
 	text "The dept. store"
 	line "in CELADON has a"
 	cont "great selection!"
--- a/text/maps/unknown_dungeon_b1f.asm
+++ b/text/maps/unknown_dungeon_b1f.asm
@@ -1,3 +1,3 @@
-_UnknownDungeon3MewtwoText: ; 85c72 (21:5c72)
+_UnknownDungeon3MewtwoText:: ; 85c72 (21:5c72)
 	text "Mew!@@"
 
--- a/text/maps/vermilion_city.asm
+++ b/text/maps/vermilion_city.asm
@@ -1,4 +1,4 @@
-_VermilionCityText1: ; a5668 (29:5668)
+_VermilionCityText1:: ; a5668 (29:5668)
 	text "We're careful"
 	line "about pollution!"
 
@@ -7,13 +7,13 @@
 	cont "toxic sludge!"
 	done
 
-_UnnamedText_198a7: ; a56b5 (29:56b5)
+_UnnamedText_198a7:: ; a56b5 (29:56b5)
 	text "Did you see S.S."
 	line "ANNE moored in"
 	cont "the harbor?"
 	done
 
-_UnnamedText_198ac: ; a56e2 (29:56e2)
+_UnnamedText_198ac:: ; a56e2 (29:56e2)
 	text "So, S.S.ANNE has"
 	line "departed!"
 
@@ -21,12 +21,12 @@
 	line "about a year."
 	done
 
-_SSAnneWelcomeText4: ; a571d (29:571d)
+_SSAnneWelcomeText4:: ; a571d (29:571d)
 	text "Welcome to S.S."
 	line "ANNE!"
 	done
 
-_SSAnneWelcomeText9: ; a5734 (29:5734)
+_SSAnneWelcomeText9:: ; a5734 (29:5734)
 	text "Welcome to S.S."
 	line "ANNE!"
 
@@ -34,7 +34,7 @@
 	line "have a ticket?"
 	prompt
 
-_SSAnneFlashedTicketText: ; a576c (29:576c)
+_SSAnneFlashedTicketText:: ; a576c (29:576c)
 	text $52, " flashed"
 	line "the S.S.TICKET!"
 
@@ -42,7 +42,7 @@
 	line "S.S.ANNE!"
 	done
 
-_SSAnneNoTicketText: ; a57a3 (29:57a3)
+_SSAnneNoTicketText:: ; a57a3 (29:57a3)
 	text $52, " doesn't"
 	line "have the needed"
 	cont "S.S.TICKET."
@@ -53,11 +53,11 @@
 	line "to get aboard."
 	done
 
-_SSAnneNotHereText: ; a57f1 (29:57f1)
+_SSAnneNotHereText:: ; a57f1 (29:57f1)
 	text "The ship set sail."
 	done
 
-_VermilionCityText4: ; a5805 (29:5805)
+_VermilionCityText4:: ; a5805 (29:5805)
 	text "I'm putting up a"
 	line "building on this"
 	cont "plot of land."
@@ -66,11 +66,11 @@
 	line "tamping the land."
 	done
 
-_VermilionCityText5: ; a5852 (29:5852)
+_VermilionCityText5:: ; a5852 (29:5852)
 	text "MACHOP: Guoh!"
 	line "Gogogoh!@@"
 
-_VermilionCityText14: ; a586b (29:586b)
+_VermilionCityText14:: ; a586b (29:586b)
 	db $0
 	para "A MACHOP is"
 	line "stomping the land"
@@ -77,7 +77,7 @@
 	cont "flat."
 	done
 
-_VermilionCityText6: ; a5891 (29:5891)
+_VermilionCityText6:: ; a5891 (29:5891)
 	text "S.S.ANNE is a"
 	line "famous luxury"
 	cont "cruise ship."
@@ -86,13 +86,13 @@
 	line "once a year."
 	done
 
-_VermilionCityText7: ; a58db (29:58db)
+_VermilionCityText7:: ; a58db (29:58db)
 	text "VERMILION CITY"
 	line "The Port of"
 	cont "Exquisite Sunsets"
 	done
 
-_VermilionCityText8: ; a5909 (29:5909)
+_VermilionCityText8:: ; a5909 (29:5909)
 	text "NOTICE!"
 
 	para "ROUTE 12 may be"
@@ -106,13 +106,13 @@
 	para "VERMILION POLICE"
 	done
 
-_VermilionCityText11: ; a5980 (29:5980)
+_VermilionCityText11:: ; a5980 (29:5980)
 	text "#MON FAN CLUB"
 	line "All #MON fans"
 	cont "welcome!"
 	done
 
-_VermilionCityText12: ; a59a6 (29:59a6)
+_VermilionCityText12:: ; a59a6 (29:59a6)
 	text "VERMILION CITY"
 	line "#MON GYM"
 	cont "LEADER: LT.SURGE"
@@ -121,7 +121,7 @@
 	line "American!"
 	done
 
-_VermilionCityText13: ; a59e9 (29:59e9)
+_VermilionCityText13:: ; a59e9 (29:59e9)
 	text "VERMILION HARBOR"
 	done
 
--- a/text/maps/vermilion_dock.asm
+++ b/text/maps/vermilion_dock.asm
@@ -1,3 +1,3 @@
-_VermilionDockText1: ; 9c50e (27:450e)
+_VermilionDockText1:: ; 9c50e (27:450e)
 	db $0, $57
 
--- a/text/maps/vermilion_fishing_house.asm
+++ b/text/maps/vermilion_fishing_house.asm
@@ -1,4 +1,4 @@
-_UnnamedText_560b1: ; 9c510 (27:4510)
+_UnnamedText_560b1:: ; 9c510 (27:4510)
 	text "I'm the FISHING"
 	line "GURU!"
 
@@ -9,7 +9,7 @@
 	line "fish?"
 	done
 
-_UnnamedText_560b6: ; 9c554 (27:4554)
+_UnnamedText_560b6:: ; 9c554 (27:4554)
 	text "Grand! I like"
 	line "your style!"
 
@@ -21,7 +21,7 @@
 	TX_RAM $cf4b
 	text "!@@"
 
-_UnnamedText_560bb: ; 9c5a4 (27:45a4)
+_UnnamedText_560bb:: ; 9c5a4 (27:45a4)
 	db $0
 	para "Fishing is a way"
 	line "of life!"
@@ -32,12 +32,12 @@
 	cont "one, young one!"
 	done
 
-_UnnamedText_560c0: ; 9c601 (27:4601)
+_UnnamedText_560c0:: ; 9c601 (27:4601)
 	text "Oh... That's so"
 	line "disappointing..."
 	done
 
-_UnnamedText_560c5: ; 9c622 (27:4622)
+_UnnamedText_560c5:: ; 9c622 (27:4622)
 	text "Hello there,"
 	line $52, "!"
 
@@ -45,7 +45,7 @@
 	line "biting?"
 	done
 
-_UnnamedText_560ca: ; 9c64c (27:464c)
+_UnnamedText_560ca:: ; 9c64c (27:464c)
 	text "Oh no!"
 
 	para "You have no room"
--- a/text/maps/vermilion_gym_1.asm
+++ b/text/maps/vermilion_gym_1.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5cb6d: ; 9aaa5 (26:6aa5)
+_UnnamedText_5cb6d:: ; 9aaa5 (26:6aa5)
 	text "Hey, kid! What do"
 	line "you think you're"
 	cont "doing here?"
--- a/text/maps/vermilion_gym_2.asm
+++ b/text/maps/vermilion_gym_2.asm
@@ -1,4 +1,4 @@
-_UnnamedText_5cb72: ; 9c000 (27:4000)
+_UnnamedText_5cb72:: ; 9c000 (27:4000)
 	text "A little word of"
 	line "advice, kid!"
 
@@ -10,7 +10,7 @@
 	cont "type #MON!"
 	done
 
-_UnnamedText_5cb77: ; 9c069 (27:4069)
+_UnnamedText_5cb77:: ; 9c069 (27:4069)
 	text "The THUNDERBADGE"
 	line "cranks up your"
 	cont "#MON's SPEED!"
@@ -23,13 +23,13 @@
 	line "kid! Take this!"
 	done
 
-_ReceivedTM24Text: ; 9c0e0 (27:40e0)
+_ReceivedTM24Text:: ; 9c0e0 (27:40e0)
 	text $52, " received "
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_TM24ExplanationText: ; 9c0f5 (27:40f5)
+_TM24ExplanationText:: ; 9c0f5 (27:40f5)
 	db $0
 	para "TM24 contains"
 	line "THUNDERBOLT!"
@@ -38,12 +38,12 @@
 	line "electric #MON!"
 	done
 
-_TM24NoRoomText: ; 9c130 (27:4130)
+_TM24NoRoomText:: ; 9c130 (27:4130)
 	text "Yo kid, make room"
 	line "in your pack!"
 	done
 
-_ReceivedThunderbadgeText: ; 9c151 (27:4151)
+_ReceivedThunderbadgeText:: ; 9c151 (27:4151)
 	text "Whoa!"
 
 	para "You're the real"
@@ -53,18 +53,18 @@
 	line "the THUNDERBADGE!"
 	prompt
 
-_VermilionGymBattleText1: ; 9c194 (27:4194)
+_VermilionGymBattleText1:: ; 9c194 (27:4194)
 	text "When I was in the"
 	line "Army, LT.SURGE"
 	cont "was my strict CO!"
 	done
 
-_VermilionGymEndBattleText1: ; 9c1c8 (27:41c8)
+_VermilionGymEndBattleText1:: ; 9c1c8 (27:41c8)
 	text "Stop!"
 	line "You're very good!"
 	prompt
 
-_VermilionGymAfterBattleText1: ; 9c1e0 (27:41e0)
+_VermilionGymAfterBattleText1:: ; 9c1e0 (27:41e0)
 	text "The door won't"
 	line "open?"
 
@@ -72,17 +72,17 @@
 	line "was cautious!"
 	done
 
-_VermilionGymBattleText2: ; 9c213 (27:4213)
+_VermilionGymBattleText2:: ; 9c213 (27:4213)
 	text "I'm a lightweight,"
 	line "but I'm good with"
 	cont "electricity!"
 	done
 
-_VermilionGymEndBattleText2: ; 9c244 (27:4244)
+_VermilionGymEndBattleText2:: ; 9c244 (27:4244)
 	text "Fried!"
 	prompt
 
-_VermilionGymAfterBattleText2: ; 9c24c (27:424c)
+_VermilionGymAfterBattleText2:: ; 9c24c (27:424c)
 	text "OK, I'll talk!"
 
 	para "LT.SURGE said he"
@@ -90,17 +90,17 @@
 	cont "inside something!"
 	done
 
-_VermilionGymBattleText3: ; 9c290 (27:4290)
+_VermilionGymBattleText3:: ; 9c290 (27:4290)
 	text "This is no place"
 	line "for kids!"
 	done
 
-_VermilionGymEndBattleText3: ; 9c2ac (27:42ac)
+_VermilionGymEndBattleText3:: ; 9c2ac (27:42ac)
 	text "Wow!"
 	line "Surprised me!"
 	prompt
 
-_VermilionGymAfterBattleText3: ; 9c2c0 (27:42c0)
+_VermilionGymAfterBattleText3:: ; 9c2c0 (27:42c0)
 	text "LT.SURGE set up"
 	line "double locks!"
 	cont "Here's a hint!"
@@ -111,7 +111,7 @@
 	cont "next to it!"
 	done
 
-_UnnamedText_5cbf4: ; 9c32b (27:432b)
+_UnnamedText_5cbf4:: ; 9c32b (27:432b)
 	text "Yo! Champ in"
 	line "making!"
 
@@ -137,7 +137,7 @@
 	cont "get to him!"
 	done
 
-_UnnamedText_5cbf9: ; 9c429 (27:4429)
+_UnnamedText_5cbf9:: ; 9c429 (27:4429)
 	text "Whew! That match"
 	line "was electric!"
 	done
--- a/text/maps/vermilion_house.asm
+++ b/text/maps/vermilion_house.asm
@@ -1,4 +1,4 @@
-_VermilionHouse1Text1: ; 9c449 (27:4449)
+_VermilionHouse1Text1:: ; 9c449 (27:4449)
 	text "I'm getting my"
 	line "PIDGEY to fly a"
 	cont "letter to SAFFRON"
@@ -5,10 +5,10 @@
 	cont "in the north!"
 	done
 
-_VermilionHouse1Text2: ; 9c488 (27:4488)
+_VermilionHouse1Text2:: ; 9c488 (27:4488)
 	text "PIDGEY: Kurukkoo!@@"
 
-_VermilionHouse1Text3: ; 9c49c (27:449c)
+_VermilionHouse1Text3:: ; 9c49c (27:449c)
 	text "Dear PIPPI, I hope"
 	line "to see you soon."
 
--- a/text/maps/vermilion_mart.asm
+++ b/text/maps/vermilion_mart.asm
@@ -1,4 +1,4 @@
-_VermilionMartText2: ; 9a9c1 (26:69c1)
+_VermilionMartText2:: ; 9a9c1 (26:69c1)
 	text "There are evil"
 	line "people who will"
 	cont "use #MON for"
@@ -15,7 +15,7 @@
 	cont "useful."
 	done
 
-_VermilionMartText3: ; 9aa67 (26:6a67)
+_VermilionMartText3:: ; 9aa67 (26:6a67)
 	text "I think #MON"
 	line "can be good or"
 	cont "evil. It depends"
--- a/text/maps/vermilion_pokecenter.asm
+++ b/text/maps/vermilion_pokecenter.asm
@@ -1,5 +1,5 @@
-_VermilionPokecenterText2: ; 9a4b2 (26:64b2)
-_VermilionPokecenterText1: ; 9a4b2 (26:64b2)
+_VermilionPokecenterText2:: ; 9a4b2 (26:64b2)
+_VermilionPokecenterText1:: ; 9a4b2 (26:64b2)
 	text "Even if they are"
 	line "the same level,"
 	cont "#MON can have"
@@ -12,7 +12,7 @@
 	cont "in the wild."
 	done
 
-_VermilionPokecenterText3: ; 9a539 (26:6539)
+_VermilionPokecenterText3:: ; 9a539 (26:6539)
 	text "My #MON was"
 	line "poisoned! It"
 	cont "fainted while we"
--- a/text/maps/victory_road_1f.asm
+++ b/text/maps/victory_road_1f.asm
@@ -1,31 +1,31 @@
-_VictoryRoad1BattleText1: ; 85c79 (21:5c79)
+_VictoryRoad1BattleText1:: ; 85c79 (21:5c79)
 	text "I wonder if you"
 	line "are good enough"
 	cont "for me!"
 	done
 
-_VictoryRoad1EndBattleText1: ; 85ca2 (21:5ca2)
+_VictoryRoad1EndBattleText1:: ; 85ca2 (21:5ca2)
 	text "I"
 	line "lost out!"
 	prompt
 
-_VictoryRoad1AfterBattleText1: ; 85caf (21:5caf)
+_VictoryRoad1AfterBattleText1:: ; 85caf (21:5caf)
 	text "I never wanted to"
 	line "lose to anybody!"
 	done
 
-_VictoryRoad1BattleText2: ; 85cd3 (21:5cd3)
+_VictoryRoad1BattleText2:: ; 85cd3 (21:5cd3)
 	text "I can see you're"
 	line "good! Let me see"
 	cont "exactly how good!"
 	done
 
-_VictoryRoad1EndBattleText2: ; 85d07 (21:5d07)
+_VictoryRoad1EndBattleText2:: ; 85d07 (21:5d07)
 	text "I"
 	line "had a chance..."
 	prompt
 
-_VictoryRoad1AfterBattleText2: ; 85d1a (21:5d1a)
+_VictoryRoad1AfterBattleText2:: ; 85d1a (21:5d1a)
 	text "I concede, you're"
 	line "better than me!"
 	done
--- a/text/maps/victory_road_2f.asm
+++ b/text/maps/victory_road_2f.asm
@@ -1,55 +1,55 @@
-_VictoryRoad2BattleText6: ; 8d06e (23:506e)
+_VictoryRoad2BattleText6:: ; 8d06e (23:506e)
 	text "Gyaoo!@@"
 
-_VictoryRoad2BattleText1: ; 8d077 (23:5077)
+_VictoryRoad2BattleText1:: ; 8d077 (23:5077)
 	text "VICTORY ROAD is"
 	line "the final test"
 	cont "for trainers!"
 	done
 
-_VictoryRoad2EndBattleText1: ; 8d0a5 (23:50a5)
+_VictoryRoad2EndBattleText1:: ; 8d0a5 (23:50a5)
 	text "Aiyah!"
 	prompt
 
-_VictoryRoad2AfterBattleText1: ; 8d0ad (23:50ad)
+_VictoryRoad2AfterBattleText1:: ; 8d0ad (23:50ad)
 	text "If you get stuck,"
 	line "try moving some"
 	cont "boulders around!"
 	done
 
-_VictoryRoad2BattleText2: ; 8d0e1 (23:50e1)
+_VictoryRoad2BattleText2:: ; 8d0e1 (23:50e1)
 	text "Ah, so you wish"
 	line "to challenge the"
 	cont "ELITE FOUR?"
 	done
 
-_VictoryRoad2EndBattleText2: ; 8d10f (23:510f)
+_VictoryRoad2EndBattleText2:: ; 8d10f (23:510f)
 	text "You"
 	line "got me!"
 	prompt
 
-_VictoryRoad2AfterBattleText2: ; 8d11c (23:511c)
+_VictoryRoad2AfterBattleText2:: ; 8d11c (23:511c)
 	text $53, " also came"
 	line "through here!"
 	done
 
-_VictoryRoad2BattleText3: ; 8d137 (23:5137)
+_VictoryRoad2BattleText3:: ; 8d137 (23:5137)
 	text "Come on!"
 	line "I'll whip you!"
 	done
 
-_VictoryRoad2EndBattleText3: ; 8d14f (23:514f)
+_VictoryRoad2EndBattleText3:: ; 8d14f (23:514f)
 	text "I got"
 	line "whipped!"
 	prompt
 
-_VictoryRoad2AfterBattleText3: ; 8d15f (23:515f)
+_VictoryRoad2AfterBattleText3:: ; 8d15f (23:515f)
 	text "You earned the"
 	line "right to be on"
 	cont "VICTORY ROAD!"
 	done
 
-_VictoryRoad2BattleText4: ; 8d18c (23:518c)
+_VictoryRoad2BattleText4:: ; 8d18c (23:518c)
 	text "If you can get"
 	line "through here, you"
 	cont "can go meet the"
@@ -56,12 +56,12 @@
 	cont "ELITE FOUR!"
 	done
 
-_VictoryRoad2EndBattleText4: ; 8d1ca (23:51ca)
+_VictoryRoad2EndBattleText4:: ; 8d1ca (23:51ca)
 	text "No!"
 	line "Unbelievable!"
 	prompt
 
-_VictoryRoad2AfterBattleText4: ; 8d1dd (23:51dd)
+_VictoryRoad2AfterBattleText4:: ; 8d1dd (23:51dd)
 	text "I can beat you"
 	line "when it comes to"
 	cont "knowledge about"
@@ -68,17 +68,17 @@
 	cont "#MON!"
 	done
 
-_VictoryRoad2BattleText5: ; 8d214 (23:5214)
+_VictoryRoad2BattleText5:: ; 8d214 (23:5214)
 	text "Is VICTORY ROAD"
 	line "too tough?"
 	done
 
-_VictoryRoad2EndBattleText5: ; 8d230 (23:5230)
+_VictoryRoad2EndBattleText5:: ; 8d230 (23:5230)
 	text "Well"
 	line "done!"
 	prompt
 
-_VictoryRoad2AfterBattleText5: ; 8d23c (23:523c)
+_VictoryRoad2AfterBattleText5:: ; 8d23c (23:523c)
 	text "Many trainers give"
 	line "up the challenge"
 	cont "here."
--- a/text/maps/victory_road_3f.asm
+++ b/text/maps/victory_road_3f.asm
@@ -1,44 +1,44 @@
-_VictoryRoad3BattleText2: ; 81d9b (20:5d9b)
+_VictoryRoad3BattleText2:: ; 81d9b (20:5d9b)
 	text "I heard rumors of"
 	line "a child prodigy!"
 	done
 
-_VictoryRoad3EndBattleText2: ; 81dbf (20:5dbf)
+_VictoryRoad3EndBattleText2:: ; 81dbf (20:5dbf)
 	text "The"
 	line "rumors were true!"
 	prompt
 
-_VictoryRoad3AfterBattleText2: ; 81dd6 (20:5dd6)
+_VictoryRoad3AfterBattleText2:: ; 81dd6 (20:5dd6)
 	text "You beat GIOVANNI"
 	line "of TEAM ROCKET?"
 	done
 
-_VictoryRoad3BattleText3: ; 81df9 (20:5df9)
+_VictoryRoad3BattleText3:: ; 81df9 (20:5df9)
 	text "I'll show you just"
 	line "how good you are!"
 	done
 
-_VictoryRoad3EndBattleText3: ; 81e1e (20:5e1e)
+_VictoryRoad3EndBattleText3:: ; 81e1e (20:5e1e)
 	text "I'm"
 	line "furious!"
 	prompt
 
-_VictoryRoad3AfterBattleText3: ; 81e2b (20:5e2b)
+_VictoryRoad3AfterBattleText3:: ; 81e2b (20:5e2b)
 	text "You showed me just"
 	line "how good I was!"
 	done
 
-_VictoryRoad3BattleText4: ; 81e4f (20:5e4f)
+_VictoryRoad3BattleText4:: ; 81e4f (20:5e4f)
 	text "Only the chosen"
 	line "can pass here!"
 	done
 
-_VictoryRoad3EndBattleText4: ; 81e6f (20:5e6f)
+_VictoryRoad3EndBattleText4:: ; 81e6f (20:5e6f)
 	text "I"
 	line "don't believe it!"
 	prompt
 
-_VictoryRoad3AfterBattleText4: ; 81e83 (20:5e83)
+_VictoryRoad3AfterBattleText4:: ; 81e83 (20:5e83)
 	text "All trainers here"
 	line "are headed to the"
 	cont "#MON LEAGUE!"
@@ -45,18 +45,18 @@
 	cont "Be careful!"
 	done
 
-_VictoryRoad3BattleText5: ; 81ec1 (20:5ec1)
+_VictoryRoad3BattleText5:: ; 81ec1 (20:5ec1)
 	text "Trainers live to"
 	line "seek stronger"
 	cont "opponents!"
 	done
 
-_VictoryRoad3EndBattleText5: ; 81eec (20:5eec)
+_VictoryRoad3EndBattleText5:: ; 81eec (20:5eec)
 	text "Oh!"
 	line "So strong!"
 	prompt
 
-_VictoryRoad3AfterBattleText5: ; 81efc (20:5efc)
+_VictoryRoad3AfterBattleText5:: ; 81efc (20:5efc)
 	text "By fighting tough"
 	line "battles, you get"
 	cont "stronger!"
--- a/text/maps/viridian_city.asm
+++ b/text/maps/viridian_city.asm
@@ -1,4 +1,4 @@
-_ViridianCityText1: ; a43cc (29:43cc)
+_ViridianCityText1:: ; a43cc (29:43cc)
 	text "Those # BALLs"
 	line "at your waist!"
 	cont "You have #MON!"
@@ -9,7 +9,7 @@
 	cont "time, anywhere!"
 	done
 
-_UnnamedText_19122: ; a4437 (29:4437)
+_UnnamedText_19122:: ; a4437 (29:4437)
 	text "This #MON GYM"
 	line "is always closed."
 
@@ -17,12 +17,12 @@
 	line "LEADER is?"
 	done
 
-_UnnamedText_19127: ; a4474 (29:4474)
+_UnnamedText_19127:: ; a4474 (29:4474)
 	text "VIRIDIAN GYM's"
 	line "LEADER returned!"
 	done
 
-_UnnamedText_1914d: ; a4494 (29:4494)
+_UnnamedText_1914d:: ; a4494 (29:4494)
 	text "You want to know"
 	line "about the 2 kinds"
 	cont "of caterpillar"
@@ -29,11 +29,11 @@
 	cont "#MON?"
 	done
 
-_UnnamedText_19152: ; a44cd (29:44cd)
+_UnnamedText_19152:: ; a44cd (29:44cd)
 	text "Oh, OK then!"
 	done
 
-_UnnamedText_19157: ; a44db (29:44db)
+_UnnamedText_19157:: ; a44db (29:44db)
 	text "CATERPIE has no"
 	line "poison, but"
 	cont "WEEDLE does."
@@ -42,7 +42,7 @@
 	line "POISON STING!"
 	done
 
-_UnnamedText_19175: ; a4525 (29:4525)
+_UnnamedText_19175:: ; a4525 (29:4525)
 	text "Oh Grandpa! Don't"
 	line "be so mean!"
 	cont "He hasn't had his"
@@ -49,7 +49,7 @@
 	cont "coffee yet."
 	done
 
-_UnnamedText_1917a: ; a4560 (29:4560)
+_UnnamedText_1917a:: ; a4560 (29:4560)
 	text "When I go shop in"
 	line "PEWTER CITY, I"
 	cont "have to take the"
@@ -57,7 +57,7 @@
 	cont "VIRIDIAN FOREST."
 	done
 
-_UnnamedText_19191: ; a45b5 (29:45b5)
+_UnnamedText_19191:: ; a45b5 (29:45b5)
 	text "You can't go"
 	line "through here!"
 
@@ -65,7 +65,7 @@
 	line "property!"
 	done
 
-_UnnamedText_191ca: ; a45ea (29:45ea)
+_UnnamedText_191ca:: ; a45ea (29:45ea)
 	text "Yawn!"
 	line "I must have dozed"
 	cont "off in the sun."
@@ -82,22 +82,22 @@
 	cont "have this TM."
 	prompt
 
-_ReceivedTM42Text: ; a469a (29:469a)
+_ReceivedTM42Text:: ; a469a (29:469a)
 	text $52, " received"
 	line "TM42!@@"
 
-_TM42Explanation: ; a46ad (29:46ad)
+_TM42Explanation:: ; a46ad (29:46ad)
 	text "TM42 contains"
 	line "DREAM EATER..."
 	cont "...Snore..."
 	done
 
-_TM42NoRoomText: ; a46d7 (29:46d7)
+_TM42NoRoomText:: ; a46d7 (29:46d7)
 	text "You have too much"
 	line "stuff already."
 	done
 
-_UnnamedText_1920a: ; a46f9 (29:46f9)
+_UnnamedText_1920a:: ; a46f9 (29:46f9)
 	text "Ahh, I've had my"
 	line "coffee now and I"
 	cont "feel great!"
@@ -109,7 +109,7 @@
 	line "hurry?"
 	done
 
-_UnnamedText_1920f: ; a4754 (29:4754)
+_UnnamedText_1920f:: ; a4754 (29:4754)
 	text "I see you're using"
 	line "a #DEX."
 
@@ -126,24 +126,24 @@
 	line "how to then."
 	done
 
-_UnnamedText_19214: ; a47e6 (29:47e6)
+_UnnamedText_19214:: ; a47e6 (29:47e6)
 	text "Time is money..."
 	line "Go along then."
 	done
 
-_UnnamedText_19219: ; a4807 (29:4807)
+_UnnamedText_19219:: ; a4807 (29:4807)
 	text "First, you need"
 	line "to weaken the"
 	cont "target #MON."
 	done
 
-_ViridianCityText8: ; a4833 (29:4833)
+_ViridianCityText8:: ; a4833 (29:4833)
 	text "VIRIDIAN CITY "
 	line "The Eternally"
 	cont "Green Paradise"
 	done
 
-_ViridianCityText9: ; a4860 (29:4860)
+_ViridianCityText9:: ; a4860 (29:4860)
 	text "TRAINER TIPS"
 
 	para "Catch #MON"
@@ -155,7 +155,7 @@
 	cont "to fight!"
 	done
 
-_ViridianCityText10: ; a48c3 (29:48c3)
+_ViridianCityText10:: ; a48c3 (29:48c3)
 	text "TRAINER TIPS"
 
 	para "The battle moves"
@@ -169,12 +169,12 @@
 	cont "#MON CENTER!"
 	done
 
-_ViridianCityText13: ; a4949 (29:4949)
+_ViridianCityText13:: ; a4949 (29:4949)
 	text "VIRIDIAN CITY"
 	line "#MON GYM"
 	done
 
-_ViridianCityText14: ; a4961 (29:4961)
+_ViridianCityText14:: ; a4961 (29:4961)
 	text "The GYM's doors"
 	line "are locked..."
 	done
--- a/text/maps/viridian_forest.asm
+++ b/text/maps/viridian_forest.asm
@@ -1,4 +1,4 @@
-_ViridianForestText1: ; 8031d (20:431d)
+_ViridianForestText1:: ; 8031d (20:431d)
 	text "I came here with"
 	line "some friends!"
 
@@ -6,53 +6,53 @@
 	line "#MON fights!"
 	done
 
-_ViridianForestBattleText1: ; 80359 (20:4359)
+_ViridianForestBattleText1:: ; 80359 (20:4359)
 	text "Hey! You have"
 	line "#MON! Come on!"
 	cont "Let's battle'em!"
 	done
 
-_ViridianForestEndBattleText1: ; 80387 (20:4387)
+_ViridianForestEndBattleText1:: ; 80387 (20:4387)
 	text "No!"
 	line "CATERPIE can't"
 	cont "cut it!"
 	prompt
 
-_ViridianFrstAfterBattleText1: ; 803a2 (20:43a2)
+_ViridianFrstAfterBattleText1:: ; 803a2 (20:43a2)
 	text "Ssh! You'll scare"
 	line "the bugs away!"
 	done
 
-_ViridianForestBattleText2: ; 803c3 (20:43c3)
+_ViridianForestBattleText2:: ; 803c3 (20:43c3)
 	text "Yo! You can't jam"
 	line "out if you're a"
 	cont "#MON trainer!"
 	done
 
-_ViridianForestEndBattleText2: ; 803f2 (20:43f2)
+_ViridianForestEndBattleText2:: ; 803f2 (20:43f2)
 	text "Huh?"
 	line "I ran out of"
 	cont "#MON!"
 	prompt
 
-_ViridianFrstAfterBattleText2: ; 8040b (20:440b)
+_ViridianFrstAfterBattleText2:: ; 8040b (20:440b)
 	text "Darn! I'm going"
 	line "to catch some"
 	cont "stronger ones!"
 	done
 
-_ViridianForestBattleText3: ; 80438 (20:4438)
+_ViridianForestBattleText3:: ; 80438 (20:4438)
 	text "Hey, wait up!"
 	line "What's the hurry?"
 	done
 
-_ViridianForestEndBattleText3: ; 80458 (20:4458)
+_ViridianForestEndBattleText3:: ; 80458 (20:4458)
 	text "I"
 	line "give! You're good"
 	cont "at this!"
 	prompt
 
-_ViridianFrstAfterBattleText3: ; 80475 (20:4475)
+_ViridianFrstAfterBattleText3:: ; 80475 (20:4475)
 	text "Sometimes, you"
 	line "can find stuff on"
 	cont "the ground!"
@@ -62,7 +62,7 @@
 	cont "dropped!"
 	done
 
-_ViridianForestText8: ; 804c7 (20:44c7)
+_ViridianForestText8:: ; 804c7 (20:44c7)
 	text "I ran out of #"
 	line "BALLs to catch"
 	cont "#MON with!"
@@ -71,7 +71,7 @@
 	line "extras!"
 	done
 
-_ViridianForestText9: ; 8050a (20:450a)
+_ViridianForestText9:: ; 8050a (20:450a)
 	text "TRAINER TIPS"
 
 	para "If you want to"
@@ -80,13 +80,13 @@
 	cont "grassy areas!"
 	done
 
-_ViridianForestText10: ; 80553 (20:4553)
+_ViridianForestText10:: ; 80553 (20:4553)
 	text "For poison, use"
 	line "ANTIDOTE! Get it"
 	cont "at #MON MARTs!"
 	done
 
-_ViridianForestText11: ; 80584 (20:4584)
+_ViridianForestText11:: ; 80584 (20:4584)
 	text "TRAINER TIPS"
 
 	para "Contact PROF.OAK"
@@ -95,7 +95,7 @@
 	cont "evaluated!"
 	done
 
-_ViridianForestText12: ; 805c6 (20:45c6)
+_ViridianForestText12:: ; 805c6 (20:45c6)
 	text "TRAINER TIPS"
 
 	para "No stealing of"
@@ -105,7 +105,7 @@
 	cont "#MON!"
 	done
 
-_ViridianForestText13: ; 80613 (20:4613)
+_ViridianForestText13:: ; 80613 (20:4613)
 	text "TRAINER TIPS"
 
 	para "Weaken #MON"
@@ -116,7 +116,7 @@
 	line "they may escape!"
 	done
 
-_ViridianForestText14: ; 80667 (20:4667)
+_ViridianForestText14:: ; 80667 (20:4667)
 	text "LEAVING"
 	line "VIRIDIAN FOREST"
 	cont "PEWTER CITY AHEAD"
--- a/text/maps/viridian_forest_entrance.asm
+++ b/text/maps/viridian_forest_entrance.asm
@@ -1,4 +1,4 @@
-_ViridianForestEntranceText1: ; 8a868 (22:6868)
+_ViridianForestEntranceText1:: ; 8a868 (22:6868)
 	text "Are you going to"
 	line "VIRIDIAN FOREST?"
 	cont "Be careful, it's"
@@ -5,7 +5,7 @@
 	cont "a natural maze!"
 	done
 
-_ViridianForestEntranceText2: ; 8a8ab (22:68ab)
+_ViridianForestEntranceText2:: ; 8a8ab (22:68ab)
 	text "RATTATA may be"
 	line "small, but its"
 	cont "bite is wicked!"
--- a/text/maps/viridian_forest_exit.asm
+++ b/text/maps/viridian_forest_exit.asm
@@ -1,4 +1,4 @@
-_ViridianForestexitText1: ; 8a6fd (22:66fd)
+_ViridianForestexitText1:: ; 8a6fd (22:66fd)
 	text "Many #MON live"
 	line "only in forests "
 	cont "and caves."
@@ -8,7 +8,7 @@
 	cont "different kinds!"
 	done
 
-_ViridianForestexitText2: ; 8a75d (22:675d)
+_ViridianForestexitText2:: ; 8a75d (22:675d)
 	text "Have you noticed"
 	line "the bushes on the"
 	cont "roadside?"
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/viridian_gym.asm
@@ -1,4 +1,4 @@
-_UnnamedText_74ace: ; 95e09 (25:5e09)
+_UnnamedText_74ace:: ; 95e09 (25:5e09)
 	text "Fwahahaha! This is"
 	line "my hideout!"
 
@@ -18,7 +18,7 @@
 	cont "greatest trainer!"
 	done
 
-_UnnamedText_74ad3: ; 95ed5 (25:5ed5)
+_UnnamedText_74ad3:: ; 95ed5 (25:5ed5)
 	text "Ha!"
 	line "That was a truly"
 	cont "intense fight!"
@@ -26,7 +26,7 @@
 	cont "As proof, here is"
 	cont "the EARTHBADGE!@@"
 
-_UnnamedText_74ad9: ; 95f2b (25:5f2b)
+_UnnamedText_74ad9:: ; 95f2b (25:5f2b)
 	text "Having lost, I"
 	line "cannot face my"
 	cont "underlings!"
@@ -41,7 +41,7 @@
 	line "some day!"
 	cont "Farewell!@@"
 
-_ViridianGymText12: ; 95fcc (25:5fcc)
+_ViridianGymText12:: ; 95fcc (25:5fcc)
 	text "The EARTHBADGE"
 	line "makes #MON of"
 	cont "any level obey!"
@@ -59,11 +59,11 @@
 	cont "LEAGUE challenge!"
 	done
 
-_ReceivedTM27Text: ; 96082 (25:6082)
+_ReceivedTM27Text:: ; 96082 (25:6082)
 	text $52, " received"
 	line "TM27!@@"
 
-_TM27ExplanationText: ; 96095 (25:6095)
+_TM27ExplanationText:: ; 96095 (25:6095)
 	db $0
 	para "TM27 is FISSURE!"
 	line "It will take out"
@@ -75,124 +75,124 @@
 	cont "too long ago..."
 	done
 
-_TM27NoRoomText: ; 96104 (25:6104)
+_TM27NoRoomText:: ; 96104 (25:6104)
 	text "You do not have"
 	line "space for this!"
 	done
 
-_ViridianGymBattleText1: ; 96125 (25:6125)
+_ViridianGymBattleText1:: ; 96125 (25:6125)
 	text "Heh! You must be"
 	line "running out of"
 	cont "steam by now!"
 	done
 
-_ViridianGymEndBattleText1: ; 96154 (25:6154)
+_ViridianGymEndBattleText1:: ; 96154 (25:6154)
 	text "I"
 	line "ran out of gas!"
 	prompt
 
-_ViridianGymAfterBattleText1: ; 96167 (25:6167)
+_ViridianGymAfterBattleText1:: ; 96167 (25:6167)
 	text "You need power to"
 	line "keep up with our"
 	cont "GYM LEADER!"
 	done
 
-_ViridianGymBattleText2: ; 96197 (25:6197)
+_ViridianGymBattleText2:: ; 96197 (25:6197)
 	text "Rrrroar! I'm"
 	line "working myself"
 	cont "into a rage!"
 	done
 
-_ViridianGymEndBattleText2: ; 961c0 (25:61c0)
+_ViridianGymEndBattleText2:: ; 961c0 (25:61c0)
 	text "Wargh!"
 	prompt
 
-_ViridianGymAfterBattleText2: ; 961c8 (25:61c8)
+_ViridianGymAfterBattleText2:: ; 961c8 (25:61c8)
 	text "I'm still not"
 	line "worthy!"
 	done
 
-_ViridianGymBattleText3: ; 961de (25:61de)
+_ViridianGymBattleText3:: ; 961de (25:61de)
 	text "#MON and I, we"
 	line "make wonderful"
 	cont "music together!"
 	done
 
-_ViridianGymEndBattleText3: ; 9620d (25:620d)
+_ViridianGymEndBattleText3:: ; 9620d (25:620d)
 	text "You are in"
 	line "perfect harmony!"
 	prompt
 
-_ViridianGymAfterBattleText3: ; 9622a (25:622a)
+_ViridianGymAfterBattleText3:: ; 9622a (25:622a)
 	text "Do you know the"
 	line "identity of our"
 	cont "GYM LEADER?"
 	done
 
-_ViridianGymBattleText4: ; 96257 (25:6257)
+_ViridianGymBattleText4:: ; 96257 (25:6257)
 	text "Karate is the"
 	line "ultimate form of"
 	cont "martial arts!"
 	done
 
-_ViridianGymEndBattleText4: ; 96285 (25:6285)
+_ViridianGymEndBattleText4:: ; 96285 (25:6285)
 	text "Atcho!"
 	prompt
 
-_ViridianGymAfterBattleText4: ; 9628d (25:628d)
+_ViridianGymAfterBattleText4:: ; 9628d (25:628d)
 	text "If my #MON"
 	line "were as good at"
 	cont "Karate as I..."
 	done
 
-_ViridianGymBattleText5: ; 962b8 (25:62b8)
+_ViridianGymBattleText5:: ; 962b8 (25:62b8)
 	text "The truly talented"
 	line "win with style!"
 	done
 
-_ViridianGymEndBattleText5: ; 962dc (25:62dc)
+_ViridianGymEndBattleText5:: ; 962dc (25:62dc)
 	text "I"
 	line "lost my grip!"
 	prompt
 
-_ViridianGymAfterBattleText5: ; 962ed (25:62ed)
+_ViridianGymAfterBattleText5:: ; 962ed (25:62ed)
 	text "The LEADER will"
 	line "scold me!"
 	done
 
-_ViridianGymBattleText6: ; 96308 (25:6308)
+_ViridianGymBattleText6:: ; 96308 (25:6308)
 	text "I'm the KARATE"
 	line "KING! Your fate"
 	cont "rests with me!"
 	done
 
-_ViridianGymEndBattleText6: ; 96336 (25:6336)
+_ViridianGymEndBattleText6:: ; 96336 (25:6336)
 	text "Ayah!"
 	prompt
 
-_ViridianGymAfterBattleText6: ; 9633d (25:633d)
+_ViridianGymAfterBattleText6:: ; 9633d (25:633d)
 	text "#MON LEAGUE?"
 	line "You? Don't get"
 	cont "cocky!"
 	done
 
-_ViridianGymBattleText7: ; 96360 (25:6360)
+_ViridianGymBattleText7:: ; 96360 (25:6360)
 	text "Your #MON will"
 	line "cower at the"
 	cont "crack of my whip!"
 	done
 
-_ViridianGymEndBattleText7: ; 9638f (25:638f)
+_ViridianGymEndBattleText7:: ; 9638f (25:638f)
 	text "Yowch!"
 	line "Whiplash!"
 	prompt
 
-_ViridianGymAfterBattleText7: ; 963a1 (25:63a1)
+_ViridianGymAfterBattleText7:: ; 963a1 (25:63a1)
 	text "Wait! I was just"
 	line "careless!"
 	done
 
-_ViridianGymBattleText8: ; 963bd (25:63bd)
+_ViridianGymBattleText8:: ; 963bd (25:63bd)
 	text "VIRIDIAN GYM was"
 	line "closed for a long"
 	cont "time, but now our"
@@ -199,12 +199,12 @@
 	cont "LEADER is back!"
 	done
 
-_ViridianGymEndBattleText8: ; 96403 (25:6403)
+_ViridianGymEndBattleText8:: ; 96403 (25:6403)
 	text "I"
 	line "was beaten?"
 	prompt
 
-_ViridianGymAfterBattleText8: ; 96412 (25:6412)
+_ViridianGymAfterBattleText8:: ; 96412 (25:6412)
 	text "You can go onto"
 	line "#MON LEAGUE"
 	cont "only by defeating"
@@ -211,7 +211,7 @@
 	cont "our GYM LEADER!"
 	done
 
-_UnnamedText_74bd4: ; 96451 (25:6451)
+_UnnamedText_74bd4:: ; 96451 (25:6451)
 	text "Yo! Champ in"
 	line "making!"
 
@@ -229,7 +229,7 @@
 	cont "#MON!"
 	done
 
-_UnnamedText_74bd9: ; 964fb (25:64fb)
+_UnnamedText_74bd9:: ; 964fb (25:64fb)
 	text "Blow me away!"
 	line "GIOVANNI was the"
 	cont "GYM LEADER here?"
--- a/text/maps/viridian_house.asm
+++ b/text/maps/viridian_house.asm
@@ -1,4 +1,4 @@
-_ViridianHouseText1: ; 95d71 (25:5d71)
+_ViridianHouseText1:: ; 95d71 (25:5d71)
 	text "Coming up with"
 	line "nicknames is fun,"
 	cont "but hard."
@@ -8,16 +8,16 @@
 	cont "remember."
 	done
 
-_ViridianHouseText2: ; 95dc7 (25:5dc7)
+_ViridianHouseText2:: ; 95dc7 (25:5dc7)
 	text "My Daddy loves"
 	line "#MON too."
 	done
 
-_UnnamedText_1d5b1: ; 95de1 (25:5de1)
+_UnnamedText_1d5b1:: ; 95de1 (25:5de1)
 	text "SPEARY: Tetweet!"
 	done
 
-_ViridianHouseText4: ; 95df3 (25:5df3)
+_ViridianHouseText4:: ; 95df3 (25:5df3)
 	text "SPEAROW"
 	line "Name: SPEARY"
 	done
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/viridian_mart.asm
@@ -1,5 +1,5 @@
-_ViridianPokeCenterText2: ; 95ba1 (25:5ba1)
-_ViridianPokeCenterText1: ; 95ba1 (25:5ba1)
+_ViridianPokeCenterText2:: ; 95ba1 (25:5ba1)
+_ViridianPokeCenterText1:: ; 95ba1 (25:5ba1)
 	text "You can use that"
 	line "PC in the corner."
 
@@ -7,7 +7,7 @@
 	line "told me. So kind!"
 	done
 
-_ViridianPokeCenterText3: ; 95be8 (25:5be8)
+_ViridianPokeCenterText3:: ; 95be8 (25:5be8)
 	text "There's a #MON"
 	line "CENTER in every"
 	cont "town ahead."
@@ -16,17 +16,17 @@
 	line "any money either!"
 	done
 
-_ViridianMartText1: ; 95c36 (25:5c36)
+_ViridianMartText1:: ; 95c36 (25:5c36)
 	text "Okay! Say hi to"
 	line "PROF.OAK for me!"
 	done
 
-_ViridianMartText4: ; 95c58 (25:5c58)
+_ViridianMartText4:: ; 95c58 (25:5c58)
 	text "Hey! You came from"
 	line "PALLET TOWN?"
 	done
 
-ViridianMartParcelQuestText: ; 95c79 (25:5c79)
+ViridianMartParcelQuestText:: ; 95c79 (25:5c79)
 	text "You know PROF."
 	line "OAK, right?"
 
@@ -37,12 +37,12 @@
 	para $52, " got"
 	line "OAK's PARCEL!@@"
 
-_ViridianMartText2: ; 95cd5 (25:5cd5)
+_ViridianMartText2:: ; 95cd5 (25:5cd5)
 	text "This shop sells"
 	line "many ANTIDOTEs."
 	done
 
-_ViridianMartText3: ; 95cf6 (25:5cf6)
+_ViridianMartText3:: ; 95cf6 (25:5cf6)
 	text "No! POTIONs are"
 	line "all sold out."
 	done
--- a/text/maps/wardens_house.asm
+++ b/text/maps/wardens_house.asm
@@ -1,4 +1,4 @@
-_WardenGibberishText1: ; 9e444 (27:6444)
+_WardenGibberishText1:: ; 9e444 (27:6444)
 	text "WARDEN: Hif fuff"
 	line "hefifoo!"
 
@@ -7,28 +7,28 @@
 	cont "hee fwee!"
 	done
 
-_WardenGibberishText2: ; 9e48b (27:648b)
+_WardenGibberishText2:: ; 9e48b (27:648b)
 	text "Ah howhee ho hoo!"
 	line "Eef ee hafahi ho!"
 	done
 
-_WardenGibberishText3: ; 9e4b0 (27:64b0)
+_WardenGibberishText3:: ; 9e4b0 (27:64b0)
 	text "Ha? He ohay heh"
 	line "ha hoo ee haheh!"
 	done
 
-_WardenTeethText1: ; 9e4d2 (27:64d2)
+_WardenTeethText1:: ; 9e4d2 (27:64d2)
 	text $52, " gave the"
 	line "GOLD TEETH to the"
 	cont "WARDEN!@@"
 
-_WardenTeethText2: ; 9e4f9 (27:64f9)
+_WardenTeethText2:: ; 9e4f9 (27:64f9)
 	db $0
 	para "The WARDEN popped"
 	line "in his teeth!"
 	prompt
 
-_WardenThankYouText: ; 9e51b (27:651b)
+_WardenThankYouText:: ; 9e51b (27:651b)
 	text "WARDEN: Thanks,"
 	line "kid! No one could"
 	cont "understand a word"
@@ -41,13 +41,13 @@
 	cont "your trouble."
 	prompt
 
-_ReceivedHM04Text: ; 9e5a2 (27:65a2)
+_ReceivedHM04Text:: ; 9e5a2 (27:65a2)
 	text $52, " received"
 	line "@"
 	TX_RAM $cf4b
 	text "!@@"
 
-_HM04ExplanationText: ; 9e5b6 (27:65b6)
+_HM04ExplanationText:: ; 9e5b6 (27:65b6)
 	text "WARDEN: HM04"
 	line "teaches STRENGTH!"
 
@@ -67,17 +67,17 @@
 	line "rare SURF HM."
 	done
 
-_HM04NoRoomText: ; 9e67a (27:667a)
+_HM04NoRoomText:: ; 9e67a (27:667a)
 	text "Your pack is"
 	line "stuffed full!"
 	done
 
-_UnnamedText_75176: ; 9e696 (27:6696)
+_UnnamedText_75176:: ; 9e696 (27:6696)
 	text "#MON photos"
 	line "and fossils."
 	done
 
-_UnnamedText_7517b: ; 9e6b0 (27:66b0)
+_UnnamedText_7517b:: ; 9e6b0 (27:66b0)
 	text "Old #MON"
 	line "merchandise."
 	done
--- a/text/move_names.asm
+++ b/text/move_names.asm
@@ -1,4 +1,4 @@
-MoveNames: ; b0000 (2c:4000)
+MoveNames:: ; b0000 (2c:4000)
 	db "POUND@"
 	db "KARATE CHOP@"
 	db "DOUBLESLAP@"
--- a/text/oakspeech.asm
+++ b/text/oakspeech.asm
@@ -1,4 +1,4 @@
-_OakSpeechText1:
+_OakSpeechText1::
 	text "Hello there!"
 	line "Welcome to the"
 	cont "world of #MON!"
@@ -8,13 +8,13 @@
 	cont "the #MON PROF!"
 	prompt
 
-_OakSpeechText2A:
+_OakSpeechText2A::
 	text "This world is"
 	line "inhabited by"
 	cont "creatures called"
 	cont "#MON!@@"
 
-_OakSpeechText2B:
+_OakSpeechText2B::
 	text $51,"For some people,"
 	line "#MON are"
 	cont "pets. Others use"
@@ -26,12 +26,12 @@
 	line "as a profession."
 	prompt
 
-_IntroducePlayerText:
+_IntroducePlayerText::
 	text "First, what is"
 	line "your name?"
 	prompt
 
-_IntroduceRivalText:
+_IntroduceRivalText::
 	text "This is my grand-"
 	line "son. He's been"
 	cont "your rival since"
@@ -41,7 +41,7 @@
 	line "his name again?"
 	prompt
 
-_OakSpeechText3:
+_OakSpeechText3::
 	text $52,"!"
 
 	para "Your very own"
--- a/text/pokedex.asm
+++ b/text/pokedex.asm
@@ -1,4 +1,4 @@
-_RhydonDexEntry:
+_RhydonDexEntry::
 	text "Protected by an"
 	next "armor-like hide,"
 	next "it is capable of"
@@ -8,7 +8,7 @@
 	next "degrees"
 	dex
 
-_KangaskhanDexEntry:
+_KangaskhanDexEntry::
 	text "The infant rarely"
 	next "ventures out of"
 	next "its mother's"
@@ -18,7 +18,7 @@
 	next "years old"
 	dex
 
-_NidoranMDexEntry:
+_NidoranMDexEntry::
 	text "Stiffens its ears"
 	next "to sense danger."
 	next "The larger its"
@@ -28,7 +28,7 @@
 	next "secreted venom"
 	dex
 
-_ClefairyDexEntry:
+_ClefairyDexEntry::
 	text "Its magical and"
 	next "cute appeal has"
 	next "many admirers."
@@ -38,7 +38,7 @@
 	next "certain areas"
 	dex
 
-_SpearowDexEntry:
+_SpearowDexEntry::
 	text "Eats bugs in"
 	next "grassy areas. It"
 	next "has to flap its"
@@ -48,7 +48,7 @@
 	next "stay airborne"
 	dex
 
-_VoltorbDexEntry:
+_VoltorbDexEntry::
 	text "Usually found in"
 	next "power plants."
 	next "Easily mistaken"
@@ -58,7 +58,7 @@
 	next "many people"
 	dex
 
-_NidokingDexEntry:
+_NidokingDexEntry::
 	text "It uses its"
 	next "powerful tail in"
 	next "battle to smash,"
@@ -68,7 +68,7 @@
 	next "bones"
 	dex
 
-_SlowbroDexEntry:
+_SlowbroDexEntry::
 	text "The SHELLDER that"
 	next "is latched onto"
 	next "SLOWPOKE's tail"
@@ -78,7 +78,7 @@
 	next "over scraps"
 	dex
 
-_IvysaurDexEntry:
+_IvysaurDexEntry::
 	text "When the bulb on"
 	next "its back grows"
 	next "large, it appears"
@@ -88,7 +88,7 @@
 	next "on its hind legs"
 	dex
 
-_ExeggutorDexEntry:
+_ExeggutorDexEntry::
 	text "Legend has it that"
 	next "on rare occasions,"
 	next "one of its heads"
@@ -98,7 +98,7 @@
 	next "EXEGGCUTE"
 	dex
 
-_LickitungDexEntry:
+_LickitungDexEntry::
 	text "Its tongue can be"
 	next "extended like a"
 	next "chameleon's. It"
@@ -108,7 +108,7 @@
 	next "licks enemies"
 	dex
 
-_ExeggcuteDexEntry:
+_ExeggcuteDexEntry::
 	text "Often mistaken"
 	next "for eggs."
 	next "When disturbed,"
@@ -118,7 +118,7 @@
 	next "in swarms"
 	dex
 
-_GrimerDexEntry:
+_GrimerDexEntry::
 	text "Appears in filthy"
 	next "areas. Thrives by"
 	next "sucking up"
@@ -128,7 +128,7 @@
 	next "out of factories"
 	dex
 
-_GengarDexEntry:
+_GengarDexEntry::
 	text "Under a full moon,"
 	next "this #MON"
 	next "likes to mimic"
@@ -138,7 +138,7 @@
 	next "at their fright"
 	dex
 
-_NidoranFDexEntry:
+_NidoranFDexEntry::
 	text "Although small,"
 	next "its venomous"
 	next "barbs render this"
@@ -148,7 +148,7 @@
 	next "smaller horns"
 	dex
 
-_NidoqueenDexEntry:
+_NidoqueenDexEntry::
 	text "Its hard scales"
 	next "provide strong"
 	next "protection. It"
@@ -158,7 +158,7 @@
 	next "powerful moves"
 	dex
 
-_CuboneDexEntry:
+_CuboneDexEntry::
 	text "Because it never"
 	next "removes its skull"
 	next "helmet, no one"
@@ -168,7 +168,7 @@
 	next "real face"
 	dex
 
-_RhyhornDexEntry:
+_RhyhornDexEntry::
 	text "Its massive bones"
 	next "are 1000 times"
 	next "harder than human"
@@ -178,7 +178,7 @@
 	next "trailer flying"
 	dex
 
-_LaprasDexEntry:
+_LaprasDexEntry::
 	text "A #MON that"
 	next "has been over-"
 	next "hunted almost to"
@@ -188,7 +188,7 @@
 	next "across the water"
 	dex
 
-_ArcanineDexEntry:
+_ArcanineDexEntry::
 	text "A #MON that"
 	next "has been admired"
 	next "since the past"
@@ -198,7 +198,7 @@
 	next "as if on wings"
 	dex
 
-_MewDexEntry:
+_MewDexEntry::
 	text "So rare that it"
 	next "is still said to"
 	next "be a mirage by"
@@ -208,7 +208,7 @@
 	next "seen it worldwide"
 	dex
 
-_GyaradosDexEntry:
+_GyaradosDexEntry::
 	text "Rarely seen in"
 	next "the wild. Huge"
 	next "and vicious, it"
@@ -218,7 +218,7 @@
 	next "cities in a rage"
 	dex
 
-_ShellderDexEntry:
+_ShellderDexEntry::
 	text "Its hard shell"
 	next "repels any kind"
 	next "of attack."
@@ -228,7 +228,7 @@
 	next "shell is open"
 	dex
 
-_TentacoolDexEntry:
+_TentacoolDexEntry::
 	text "Drifts in shallow"
 	next "seas. Anglers who"
 	next "hook them by"
@@ -238,7 +238,7 @@
 	next "its stinging acid"
 	dex
 
-_GastlyDexEntry:
+_GastlyDexEntry::
 	text "Almost invisible,"
 	next "this gaseous"
 	next "#MON cloaks"
@@ -248,7 +248,7 @@
 	next "without notice"
 	dex
 
-_ScytherDexEntry:
+_ScytherDexEntry::
 	text "With ninja-like"
 	next "agility and speed,"
 	next "it can create the"
@@ -258,7 +258,7 @@
 	next "than one"
 	dex
 
-_StaryuDexEntry:
+_StaryuDexEntry::
 	text "An enigmatic"
 	next "#MON that can"
 	next "effortlessly"
@@ -268,7 +268,7 @@
 	next "loses in battle"
 	dex
 
-_BlastoiseDexEntry:
+_BlastoiseDexEntry::
 	text "A brutal #MON"
 	next "with pressurized"
 	next "water jets on its"
@@ -278,7 +278,7 @@
 	next "speed tackles"
 	dex
 
-_PinsirDexEntry:
+_PinsirDexEntry::
 	text "If it fails to"
 	next "crush the victim"
 	next "in its pincers,"
@@ -288,7 +288,7 @@
 	next "it hard"
 	dex
 
-_TangelaDexEntry:
+_TangelaDexEntry::
 	text "The whole body is"
 	next "swathed with wide"
 	next "vines that are"
@@ -298,7 +298,7 @@
 	next "shake as it walks"
 	dex
 
-_GrowlitheDexEntry:
+_GrowlitheDexEntry::
 	text "Very protective"
 	next "of its territory."
 	next "It will bark and"
@@ -308,7 +308,7 @@
 	next "its space"
 	dex
 
-_OnixDexEntry:
+_OnixDexEntry::
 	text "As it grows, the"
 	next "stone portions of"
 	next "its body harden"
@@ -318,7 +318,7 @@
 	next "colored black"
 	dex
 
-_FearowDexEntry:
+_FearowDexEntry::
 	text "With its huge and"
 	next "magnificent wings,"
 	next "it can keep aloft"
@@ -328,7 +328,7 @@
 	next "for rest"
 	dex
 
-_PidgeyDexEntry:
+_PidgeyDexEntry::
 	text "A common sight in"
 	next "forests and woods."
 	next "It flaps its"
@@ -338,7 +338,7 @@
 	next "blinding sand"
 	dex
 
-_SlowpokeDexEntry:
+_SlowpokeDexEntry::
 	text "Incredibly slow"
 	next "and dopey. It"
 	next "takes 5 seconds"
@@ -348,7 +348,7 @@
 	next "attack"
 	dex
 
-_KadabraDexEntry:
+_KadabraDexEntry::
 	text "It emits special"
 	next "alpha waves from"
 	next "its body that"
@@ -358,7 +358,7 @@
 	next "close by"
 	dex
 
-_GravelerDexEntry:
+_GravelerDexEntry::
 	text "Rolls down slopes"
 	next "to move. It rolls"
 	next "over any obstacle"
@@ -368,7 +368,7 @@
 	next "direction"
 	dex
 
-_ChanseyDexEntry:
+_ChanseyDexEntry::
 	text "A rare and elusive"
 	next "#MON that is"
 	next "said to bring"
@@ -378,7 +378,7 @@
 	next "it"
 	dex
 
-_MachokeDexEntry:
+_MachokeDexEntry::
 	text "Its muscular body"
 	next "is so powerful, it"
 	next "must wear a power"
@@ -388,7 +388,7 @@
 	next "its motions"
 	dex
 
-_MrMimeDexEntry:
+_MrMimeDexEntry::
 	text "If interrupted"
 	next "while it is"
 	next "miming, it will"
@@ -398,7 +398,7 @@
 	next "broad hands"
 	dex
 
-_HitmonleeDexEntry:
+_HitmonleeDexEntry::
 	text "When in a hurry,"
 	next "its legs lengthen"
 	next "progressively."
@@ -408,7 +408,7 @@
 	next "loping strides"
 	dex
 
-_HitmonchanDexEntry:
+_HitmonchanDexEntry::
 	text "While apparently"
 	next "doing nothing, it"
 	next "fires punches in"
@@ -418,7 +418,7 @@
 	next "impossible to see"
 	dex
 
-_ArbokDexEntry:
+_ArbokDexEntry::
 	text "It is rumored that"
 	next "the ferocious"
 	next "warning markings"
@@ -428,7 +428,7 @@
 	next "to area"
 	dex
 
-_ParasectDexEntry:
+_ParasectDexEntry::
 	text "A host-parasite"
 	next "pair in which the"
 	next "parasite mushroom"
@@ -438,7 +438,7 @@
 	next "damp places"
 	dex
 
-_PsyduckDexEntry:
+_PsyduckDexEntry::
 	text "While lulling its"
 	next "enemies with its"
 	next "vacant look, this"
@@ -448,7 +448,7 @@
 	next "powers"
 	dex
 
-_DrowzeeDexEntry:
+_DrowzeeDexEntry::
 	text "Puts enemies to"
 	next "sleep then eats"
 	next "their dreams."
@@ -458,7 +458,7 @@
 	next "bad dreams"
 	dex
 
-_GolemDexEntry:
+_GolemDexEntry::
 	text "Its boulder-like"
 	next "body is extremely"
 	next "hard. It can"
@@ -468,7 +468,7 @@
 	next "without damage"
 	dex
 
-_MagmarDexEntry:
+_MagmarDexEntry::
 	text "Its body always"
 	next "burns with an"
 	next "orange glow that"
@@ -478,7 +478,7 @@
 	next "among flames"
 	dex
 
-_ElectabuzzDexEntry:
+_ElectabuzzDexEntry::
 	text "Normally found"
 	next "near power plants,"
 	next "they can wander"
@@ -488,7 +488,7 @@
 	next "in cities"
 	dex
 
-_MagnetonDexEntry:
+_MagnetonDexEntry::
 	text "Formed by several"
 	next "MAGNEMITEs linked"
 	next "together. They"
@@ -498,7 +498,7 @@
 	next "flare up"
 	dex
 
-_KoffingDexEntry:
+_KoffingDexEntry::
 	text "Because it stores"
 	next "several kinds of"
 	next "toxic gases in"
@@ -508,7 +508,7 @@
 	next "without warning"
 	dex
 
-_MankeyDexEntry:
+_MankeyDexEntry::
 	text "Extremely quick to"
 	next "anger. It could"
 	next "be docile one"
@@ -518,7 +518,7 @@
 	next "the next instant"
 	dex
 
-_SeelDexEntry:
+_SeelDexEntry::
 	text "The protruding"
 	next "horn on its head"
 	next "is very hard."
@@ -528,7 +528,7 @@
 	next "thick ice"
 	dex
 
-_DiglettDexEntry:
+_DiglettDexEntry::
 	text "Lives about one"
 	next "yard underground"
 	next "where it feeds on"
@@ -538,7 +538,7 @@
 	next "above ground"
 	dex
 
-_TaurosDexEntry:
+_TaurosDexEntry::
 	text "When it targets"
 	next "an enemy, it"
 	next "charges furiously"
@@ -548,7 +548,7 @@
 	next "long tails"
 	dex
 
-_FarfetchdDexEntry:
+_FarfetchdDexEntry::
 	text "The sprig of"
 	next "green onions it"
 	next "holds is its"
@@ -558,7 +558,7 @@
 	next "metal sword"
 	dex
 
-_VenonatDexEntry:
+_VenonatDexEntry::
 	text "Lives in the"
 	next "shadows of tall"
 	next "trees where it"
@@ -568,7 +568,7 @@
 	next "light at night"
 	dex
 
-_DragoniteDexEntry:
+_DragoniteDexEntry::
 	text "An extremely"
 	next "rarely seen"
 	next "marine #MON."
@@ -578,7 +578,7 @@
 	next "that of humans"
 	dex
 
-_DoduoDexEntry:
+_DoduoDexEntry::
 	text "A bird that makes"
 	next "up for its poor"
 	next "flying with its"
@@ -588,7 +588,7 @@
 	next "footprints"
 	dex
 
-_PoliwagDexEntry:
+_PoliwagDexEntry::
 	text "Its newly grown"
 	next "legs prevent it"
 	next "from running. It"
@@ -598,7 +598,7 @@
 	next "trying to stand"
 	dex
 
-_JynxDexEntry:
+_JynxDexEntry::
 	text "It seductively"
 	next "wiggles its hips"
 	next "as it walks. It"
@@ -608,7 +608,7 @@
 	next "unison with it"
 	dex
 
-_MoltresDexEntry:
+_MoltresDexEntry::
 	text "Known as the"
 	next "legendary bird of"
 	next "fire. Every flap"
@@ -618,7 +618,7 @@
 	next "flash of flames"
 	dex
 
-_ArticunoDexEntry:
+_ArticunoDexEntry::
 	text "A legendary bird"
 	next "#MON that is"
 	next "said to appear to"
@@ -628,7 +628,7 @@
 	next "mountains"
 	dex
 
-_ZapdosDexEntry:
+_ZapdosDexEntry::
 	text "A legendary bird"
 	next "#MON that is"
 	next "said to appear"
@@ -638,7 +638,7 @@
 	next "lightning bolts"
 	dex
 
-_DittoDexEntry:
+_DittoDexEntry::
 	text "Capable of copying"
 	next "an enemy's genetic"
 	next "code to instantly"
@@ -648,7 +648,7 @@
 	next "of the enemy"
 	dex
 
-_MeowthDexEntry:
+_MeowthDexEntry::
 	text "Adores circular"
 	next "objects. Wanders"
 	next "the streets on a"
@@ -658,7 +658,7 @@
 	next "loose change"
 	dex
 
-_KrabbyDexEntry:
+_KrabbyDexEntry::
 	text "Its pincers are"
 	next "not only powerful"
 	next "weapons, they are"
@@ -668,7 +668,7 @@
 	next "sideways"
 	dex
 
-_VulpixDexEntry:
+_VulpixDexEntry::
 	text "At the time of"
 	next "birth, it has"
 	next "just one tail."
@@ -678,7 +678,7 @@
 	next "it grows older"
 	dex
 
-_NinetalesDexEntry:
+_NinetalesDexEntry::
 	text "Very smart and"
 	next "very vengeful."
 	next "Grabbing one of"
@@ -688,7 +688,7 @@
 	next "1000-year curse"
 	dex
 
-_PikachuDexEntry:
+_PikachuDexEntry::
 	text "When several of"
 	next "these #MON"
 	next "gather, their"
@@ -698,7 +698,7 @@
 	next "lightning storms"
 	dex
 
-_RaichuDexEntry:
+_RaichuDexEntry::
 	text "Its long tail"
 	next "serves as a"
 	next "ground to protect"
@@ -708,7 +708,7 @@
 	next "power"
 	dex
 
-_DratiniDexEntry:
+_DratiniDexEntry::
 	text "Long considered a"
 	next "mythical #MON"
 	next "until recently"
@@ -718,7 +718,7 @@
 	next "living underwater"
 	dex
 
-_DragonairDexEntry:
+_DragonairDexEntry::
 	text "A mystical #MON"
 	next "that exudes a"
 	next "gentle aura."
@@ -728,7 +728,7 @@
 	next "conditions"
 	dex
 
-_KabutoDexEntry:
+_KabutoDexEntry::
 	text "A #MON that"
 	next "was resurrected"
 	next "from a fossil"
@@ -738,7 +738,7 @@
 	next "floor eons ago"
 	dex
 
-_KabutopsDexEntry:
+_KabutopsDexEntry::
 	text "Its sleek shape is"
 	next "perfect for swim-"
 	next "ming. It slashes"
@@ -748,7 +748,7 @@
 	next "the body fluids"
 	dex
 
-_HorseaDexEntry:
+_HorseaDexEntry::
 	text "Known to shoot"
 	next "down flying bugs"
 	next "with precision"
@@ -758,7 +758,7 @@
 	next "of the water"
 	dex
 
-_SeadraDexEntry:
+_SeadraDexEntry::
 	text "Capable of swim-"
 	next "ming backwards by"
 	next "rapidly flapping"
@@ -768,7 +768,7 @@
 	next "stout tail"
 	dex
 
-_SandshrewDexEntry:
+_SandshrewDexEntry::
 	text "Burrows deep"
 	next "underground in"
 	next "arid locations"
@@ -778,7 +778,7 @@
 	next "to hunt for food"
 	dex
 
-_SandslashDexEntry:
+_SandslashDexEntry::
 	text "Curls up into a"
 	next "spiny ball when"
 	next "threatened. It"
@@ -788,7 +788,7 @@
 	next "attack or escape"
 	dex
 
-_OmanyteDexEntry:
+_OmanyteDexEntry::
 	text "Although long"
 	next "extinct, in rare"
 	next "cases, it can be"
@@ -798,7 +798,7 @@
 	next "fossils"
 	dex
 
-_OmastarDexEntry:
+_OmastarDexEntry::
 	text "A prehistoric"
 	next "#MON that died"
 	next "out when its"
@@ -808,7 +808,7 @@
 	next "catch prey"
 	dex
 
-_JigglypuffDexEntry:
+_JigglypuffDexEntry::
 	text "When its huge eyes"
 	next "light up, it sings"
 	next "a mysteriously"
@@ -818,7 +818,7 @@
 	next "enemies to sleep"
 	dex
 
-_WigglytuffDexEntry:
+_WigglytuffDexEntry::
 	text "The body is soft"
 	next "and rubbery. When"
 	next "angered, it will"
@@ -828,7 +828,7 @@
 	next "an enormous size"
 	dex
 
-_EeveeDexEntry:
+_EeveeDexEntry::
 	text "Its genetic code"
 	next "is irregular."
 	next "It may mutate if"
@@ -838,7 +838,7 @@
 	next "element STONEs"
 	dex
 
-_FlareonDexEntry:
+_FlareonDexEntry::
 	text "When storing"
 	next "thermal energy in"
 	next "its body, its"
@@ -848,7 +848,7 @@
 	next "degrees"
 	dex
 
-_JolteonDexEntry:
+_JolteonDexEntry::
 	text "It accumulates"
 	next "negative ions in"
 	next "the atmosphere to"
@@ -858,7 +858,7 @@
 	next "bolts"
 	dex
 
-_VaporeonDexEntry:
+_VaporeonDexEntry::
 	text "Lives close to"
 	next "water. Its long"
 	next "tail is ridged"
@@ -868,7 +868,7 @@
 	next "for a mermaid's"
 	dex
 
-_MachopDexEntry:
+_MachopDexEntry::
 	text "Loves to build"
 	next "its muscles."
 	next "It trains in all"
@@ -878,7 +878,7 @@
 	next "even stronger"
 	dex
 
-_ZubatDexEntry:
+_ZubatDexEntry::
 	text "Forms colonies in"
 	next "perpetually dark"
 	next "places. Uses"
@@ -888,7 +888,7 @@
 	next "approach targets"
 	dex
 
-_EkansDexEntry:
+_EkansDexEntry::
 	text "Moves silently"
 	next "and stealthily."
 	next "Eats the eggs of"
@@ -898,7 +898,7 @@
 	next "SPEAROW, whole"
 	dex
 
-_ParasDexEntry:
+_ParasDexEntry::
 	text "Burrows to suck"
 	next "tree roots. The"
 	next "mushrooms on its"
@@ -908,7 +908,7 @@
 	next "the bug host"
 	dex
 
-_PoliwhirlDexEntry:
+_PoliwhirlDexEntry::
 	text "Capable of living"
 	next "in or out of"
 	next "water. When out"
@@ -918,7 +918,7 @@
 	next "its body slimy"
 	dex
 
-_PoliwrathDexEntry:
+_PoliwrathDexEntry::
 	text "An adept swimmer"
 	next "at both the front"
 	next "crawl and breast"
@@ -928,7 +928,7 @@
 	next "human swimmers"
 	dex
 
-_WeedleDexEntry:
+_WeedleDexEntry::
 	text "Often found in"
 	next "forests, eating"
 	next "leaves."
@@ -938,7 +938,7 @@
 	next "on its head"
 	dex
 
-_KakunaDexEntry:
+_KakunaDexEntry::
 	text "Almost incapable"
 	next "of moving, this"
 	next "#MON can only"
@@ -948,7 +948,7 @@
 	next "from predators"
 	dex
 
-_BeedrillDexEntry:
+_BeedrillDexEntry::
 	text "Flies at high"
 	next "speed and attacks"
 	next "using its large"
@@ -958,7 +958,7 @@
 	next "and tail"
 	dex
 
-_DodrioDexEntry:
+_DodrioDexEntry::
 	text "Uses its three"
 	next "brains to execute"
 	next "complex plans."
@@ -968,7 +968,7 @@
 	next "stays awake"
 	dex
 
-_PrimeapeDexEntry:
+_PrimeapeDexEntry::
 	text "Always furious"
 	next "and tenacious to"
 	next "boot. It will not"
@@ -978,7 +978,7 @@
 	next "it is caught"
 	dex
 
-_DugtrioDexEntry:
+_DugtrioDexEntry::
 	text "A team of DIGLETT"
 	next "triplets."
 	next "It triggers huge"
@@ -988,7 +988,7 @@
 	next "underground"
 	dex
 
-_VenomothDexEntry:
+_VenomothDexEntry::
 	text "The dust-like"
 	next "scales covering"
 	next "its wings are"
@@ -998,7 +998,7 @@
 	next "of poison it has"
 	dex
 
-_DewgongDexEntry:
+_DewgongDexEntry::
 	text "Stores thermal"
 	next "energy in its"
 	next "body. Swims at a"
@@ -1008,7 +1008,7 @@
 	next "cold waters"
 	dex
 
-_CaterpieDexEntry:
+_CaterpieDexEntry::
 	text "Its short feet"
 	next "are tipped with"
 	next "suction pads that"
@@ -1018,7 +1018,7 @@
 	next "slopes and walls"
 	dex
 
-_MetapodDexEntry:
+_MetapodDexEntry::
 	text "This #MON is"
 	next "vulnerable to"
 	next "attack while its"
@@ -1028,7 +1028,7 @@
 	next "and tender body"
 	dex
 
-_ButterfreeDexEntry:
+_ButterfreeDexEntry::
 	text "In battle, it"
 	next "flaps its wings"
 	next "at high speed to"
@@ -1038,7 +1038,7 @@
 	next "the air"
 	dex
 
-_MachampDexEntry:
+_MachampDexEntry::
 	text "Using its heavy"
 	next "muscles, it throws"
 	next "powerful punches"
@@ -1048,7 +1048,7 @@
 	next "the horizon"
 	dex
 
-_GolduckDexEntry:
+_GolduckDexEntry::
 	text "Often seen swim-"
 	next "ming elegantly by"
 	next "lake shores. It"
@@ -1058,7 +1058,7 @@
 	next "monster, Kappa"
 	dex
 
-_HypnoDexEntry:
+_HypnoDexEntry::
 	text "When it locks eyes"
 	next "with an enemy, it"
 	next "will use a mix of"
@@ -1068,7 +1068,7 @@
 	next "CONFUSION"
 	dex
 
-_GolbatDexEntry:
+_GolbatDexEntry::
 	text "Once it strikes,"
 	next "it will not stop"
 	next "draining energy"
@@ -1078,7 +1078,7 @@
 	next "too heavy to fly"
 	dex
 
-_MewtwoDexEntry:
+_MewtwoDexEntry::
 	text "It was created by"
 	next "a scientist after"
 	next "years of horrific"
@@ -1088,7 +1088,7 @@
 	next "experiments"
 	dex
 
-_SnorlaxDexEntry:
+_SnorlaxDexEntry::
 	text "Very lazy. Just"
 	next "eats and sleeps."
 	next "As its rotund"
@@ -1098,7 +1098,7 @@
 	next "more slothful"
 	dex
 
-_MagikarpDexEntry:
+_MagikarpDexEntry::
 	text "In the distant"
 	next "past, it was"
 	next "somewhat stronger"
@@ -1108,7 +1108,7 @@
 	next "that exist today"
 	dex
 
-_MukDexEntry:
+_MukDexEntry::
 	text "Thickly covered"
 	next "with a filthy,"
 	next "vile sludge. It"
@@ -1118,7 +1118,7 @@
 	next "contain poison"
 	dex
 
-_KinglerDexEntry:
+_KinglerDexEntry::
 	text "The large pincer"
 	next "has 10000 hp of"
 	next "crushing power."
@@ -1128,7 +1128,7 @@
 	next "unwieldy to use"
 	dex
 
-_CloysterDexEntry:
+_CloysterDexEntry::
 	text "When attacked, it"
 	next "launches its"
 	next "horns in quick"
@@ -1138,7 +1138,7 @@
 	next "never been seen"
 	dex
 
-_ElectrodeDexEntry:
+_ElectrodeDexEntry::
 	text "It stores electric"
 	next "energy under very"
 	next "high pressure."
@@ -1148,7 +1148,7 @@
 	next "provocation"
 	dex
 
-_ClefableDexEntry:
+_ClefableDexEntry::
 	text "A timid fairy"
 	next "#MON that is"
 	next "rarely seen. It"
@@ -1158,7 +1158,7 @@
 	next "senses people"
 	dex
 
-_WeezingDexEntry:
+_WeezingDexEntry::
 	text "Where two kinds"
 	next "of poison gases"
 	next "meet, 2 KOFFINGs"
@@ -1168,7 +1168,7 @@
 	next "years"
 	dex
 
-_PersianDexEntry:
+_PersianDexEntry::
 	text "Although its fur"
 	next "has many admirers,"
 	next "it is tough to"
@@ -1178,7 +1178,7 @@
 	next "fickle meanness"
 	dex
 
-_MarowakDexEntry:
+_MarowakDexEntry::
 	text "The bone it holds"
 	next "is its key weapon."
 	next "It throws the"
@@ -1188,7 +1188,7 @@
 	next "to KO targets"
 	dex
 
-_HaunterDexEntry:
+_HaunterDexEntry::
 	text "Because of its"
 	next "ability to slip"
 	next "through block"
@@ -1198,7 +1198,7 @@
 	next "other dimension"
 	dex
 
-_AbraDexEntry:
+_AbraDexEntry::
 	text "Using its ability"
 	next "to read minds, it"
 	next "will identify"
@@ -1208,7 +1208,7 @@
 	next "safety"
 	dex
 
-_AlakazamDexEntry:
+_AlakazamDexEntry::
 	text "Its brain can out-"
 	next "perform a super-"
 	next "computer."
@@ -1218,7 +1218,7 @@
 	next "to be 5,000"
 	dex
 
-_PidgeottoDexEntry:
+_PidgeottoDexEntry::
 	text "Very protective"
 	next "of its sprawling"
 	next "territorial area,"
@@ -1228,7 +1228,7 @@
 	next "any intruder"
 	dex
 
-_PidgeotDexEntry:
+_PidgeotDexEntry::
 	text "When hunting, it"
 	next "skims the surface"
 	next "of water at high"
@@ -1238,7 +1238,7 @@
 	next "as MAGIKARP"
 	dex
 
-_StarmieDexEntry:
+_StarmieDexEntry::
 	text "Its central core"
 	next "glows with the"
 	next "seven colors of"
@@ -1248,7 +1248,7 @@
 	next "core as a gem"
 	dex
 
-_BulbasaurDexEntry:
+_BulbasaurDexEntry::
 	text "A strange seed was"
 	next "planted on its"
 	next "back at birth."
@@ -1258,7 +1258,7 @@
 	next "this #MON"
 	dex
 
-_VenusaurDexEntry:
+_VenusaurDexEntry::
 	text "The plant blooms"
 	next "when it is"
 	next "absorbing solar"
@@ -1268,7 +1268,7 @@
 	next "seek sunlight"
 	dex
 
-_TentacruelDexEntry:
+_TentacruelDexEntry::
 	text "The tentacles are"
 	next "normally kept"
 	next "short. On hunts,"
@@ -1278,7 +1278,7 @@
 	next "immobilize prey"
 	dex
 
-_GoldeenDexEntry:
+_GoldeenDexEntry::
 	text "Its tail fin"
 	next "billows like an"
 	next "elegant ballroom"
@@ -1288,7 +1288,7 @@
 	next "the Water Queen"
 	dex
 
-_SeakingDexEntry:
+_SeakingDexEntry::
 	text "In the autumn"
 	next "spawning season,"
 	next "they can be seen"
@@ -1298,7 +1298,7 @@
 	next "and creeks"
 	dex
 
-_PonytaDexEntry:
+_PonytaDexEntry::
 	text "Its hooves are 10"
 	next "times harder than"
 	next "diamonds. It can"
@@ -1308,7 +1308,7 @@
 	next "in little time"
 	dex
 
-_RapidashDexEntry:
+_RapidashDexEntry::
 	text "Very competitive,"
 	next "this #MON will"
 	next "chase anything"
@@ -1318,7 +1318,7 @@
 	next "racing it"
 	dex
 
-_RattataDexEntry:
+_RattataDexEntry::
 	text "Bites anything"
 	next "when it attacks."
 	next "Small and very"
@@ -1328,7 +1328,7 @@
 	next "many places"
 	dex
 
-_RaticateDexEntry:
+_RaticateDexEntry::
 	text "It uses its whis-"
 	next "kers to maintain"
 	next "its balance."
@@ -1338,7 +1338,7 @@
 	next "they are cut off"
 	dex
 
-_NidorinoDexEntry:
+_NidorinoDexEntry::
 	text "An aggressive"
 	next "#MON that is"
 	next "quick to attack."
@@ -1348,7 +1348,7 @@
 	next "powerful venom"
 	dex
 
-_NidorinaDexEntry:
+_NidorinaDexEntry::
 	text "The female's horn"
 	next "develops slowly."
 	next "Prefers physical"
@@ -1358,7 +1358,7 @@
 	next "biting"
 	dex
 
-_GeodudeDexEntry:
+_GeodudeDexEntry::
 	text "Found in fields"
 	next "and mountains."
 	next "Mistaking them"
@@ -1368,7 +1368,7 @@
 	next "or trip on them"
 	dex
 
-_PorygonDexEntry:
+_PorygonDexEntry::
 	text "A #MON that"
 	next "consists entirely"
 	next "of programming"
@@ -1378,7 +1378,7 @@
 	next "cyberspace"
 	dex
 
-_AerodactylDexEntry:
+_AerodactylDexEntry::
 	text "A ferocious, pre-"
 	next "historic #MON"
 	next "that goes for the"
@@ -1388,7 +1388,7 @@
 	next "saw-like fangs"
 	dex
 
-_MagnemiteDexEntry:
+_MagnemiteDexEntry::
 	text "Uses anti-gravity"
 	next "to stay suspended."
 	next "Appears without"
@@ -1398,7 +1398,7 @@
 	next "similar moves"
 	dex
 
-_CharmanderDexEntry:
+_CharmanderDexEntry::
 	text "Obviously prefers"
 	next "hot places. When"
 	next "it rains, steam"
@@ -1408,7 +1408,7 @@
 	next "its tail"
 	dex
 
-_SquirtleDexEntry:
+_SquirtleDexEntry::
 	text "After birth, its"
 	next "back swells and"
 	next "hardens into a"
@@ -1418,7 +1418,7 @@
 	next "its mouth"
 	dex
 
-_CharmeleonDexEntry:
+_CharmeleonDexEntry::
 	text "When it swings"
 	next "its burning tail,"
 	next "it elevates the"
@@ -1428,7 +1428,7 @@
 	next "levels"
 	dex
 
-_WartortleDexEntry:
+_WartortleDexEntry::
 	text "Often hides in"
 	next "water to stalk"
 	next "unwary prey. For"
@@ -1438,7 +1438,7 @@
 	next "maintain balance"
 	dex
 
-_CharizardDexEntry:
+_CharizardDexEntry::
 	text "Spits fire that"
 	next "is hot enough to"
 	next "melt boulders."
@@ -1448,7 +1448,7 @@
 	next "unintentionally"
 	dex
 
-_OddishDexEntry:
+_OddishDexEntry::
 	text "During the day,"
 	next "it keeps its face"
 	next "buried in the"
@@ -1458,7 +1458,7 @@
 	next "sowing its seeds"
 	dex
 
-_GloomDexEntry:
+_GloomDexEntry::
 	text "The fluid that"
 	next "oozes from its"
 	next "mouth isn't drool."
@@ -1468,7 +1468,7 @@
 	next "attract prey"
 	dex
 
-_VileplumeDexEntry:
+_VileplumeDexEntry::
 	text "The larger its"
 	next "petals, the more"
 	next "toxic pollen it"
@@ -1478,7 +1478,7 @@
 	next "hard to hold up"
 	dex
 
-_BellsproutDexEntry:
+_BellsproutDexEntry::
 	text "A carnivorous"
 	next "#MON that traps"
 	next "and eats bugs."
@@ -1488,7 +1488,7 @@
 	next "needed moisture"
 	dex
 
-_WeepinbellDexEntry:
+_WeepinbellDexEntry::
 	text "It spits out"
 	next "POISONPOWDER to"
 	next "immobilize the"
@@ -1498,7 +1498,7 @@
 	next "a spray of ACID"
 	dex
 
-_VictreebelDexEntry:
+_VictreebelDexEntry::
 	text "Said to live in"
 	next "huge colonies"
 	next "deep in jungles,"
--- a/wram.asm
+++ b/wram.asm
@@ -5,7 +5,7 @@
 
 SECTION "Sprite State Data", WRAM0[$c100]
 
-wSpriteStateData1: ; c100
+wSpriteStateData1:: ; c100
 ; data for all sprites on the current map
 ; holds info for 16 sprites with $10 bytes each
 ; player sprite is always sprite 0
@@ -27,7 +27,7 @@
 ; C1xF
 	ds $10 * $10
 
-wSpriteStateData2: ; c200
+wSpriteStateData2:: ; c200
 ; more data for all sprites on the current map
 ; holds info for 16 sprites with $10 bytes each
 ; player sprite is always sprite 0
@@ -50,7 +50,7 @@
 	ds $10 * $10
 
 
-wOAMBuffer: ; c300
+wOAMBuffer:: ; c300
 ; buffer for OAM data. Copied to OAM by DMA
 	ds 4 * 40
 
@@ -57,11 +57,11 @@
 
 SECTION "Tile Map", WRAM0[$c3a0]
 
-wTileMap: ; c3a0
+wTileMap:: ; c3a0
 ; buffer for tiles that are visible on screen (20 columns by 18 rows)
 	ds 20 * 18
 
-wTileMapBackup: ; c508
+wTileMapBackup:: ; c508
 ; buffer for temporarily saving and restoring current screen's tiles
 ; (e.g. if menus are drawn on top)
 	ds 20 * 18
@@ -71,17 +71,17 @@
 
 SECTION "Screen Edge Tiles", WRAM0[$cbfc]
 
-wScreenEdgeTiles: ; cbfc
+wScreenEdgeTiles:: ; cbfc
 ; the tiles of the row or column to be redrawn by RedrawExposedScreenEdge
 	ds 20 * 2
 
 ; coordinates of the position of the cursor for the top menu item (id 0)
-wTopMenuItemY: ; cc24
+wTopMenuItemY:: ; cc24
 	ds 1
-wTopMenuItemX: ; cc25
+wTopMenuItemX:: ; cc25
 	ds 1
 
-wCurrentMenuItem: ; cc26
+wCurrentMenuItem:: ; cc26
 ; the id of the currently selected menu item
 ; the top item has id 0, the one below that has id 1, etc.
 ; note that the "top item" means the top item currently visible on the screen
@@ -88,19 +88,19 @@
 ; add this value to [wListScrollOffset] to get the item's position within the list
 	ds 1
 
-wTileBehindCursor: ; cc27
+wTileBehindCursor:: ; cc27
 ; the tile that was behind the menu cursor's current location
 	ds 1
 
-wMaxMenuItem: ; cc28
+wMaxMenuItem:: ; cc28
 ; id of the bottom menu item
 	ds 1
 
-wMenuWatchedKeys: ; cc29
+wMenuWatchedKeys:: ; cc29
 ; bit mask of keys that the menu will respond to
 	ds 1
 
-wLastMenuItem: ; cc2a
+wLastMenuItem:: ; cc2a
 ; id of previously selected menu item
 	ds 1
 
@@ -108,25 +108,25 @@
 
 	ds 3
 
-wPlayerMoveListIndex: ; cc2e
+wPlayerMoveListIndex:: ; cc2e
 	ds 1
 
-wPlayerMonNumber: ; cc2f
+wPlayerMonNumber:: ; cc2f
 	ds 1
 
-wMenuCursorLocation: ; cc30
+wMenuCursorLocation:: ; cc30
 ; the address of the menu cursor's current location within wTileMap
 	ds 2
 
 	ds 2
 
-wMenuJoypadPollCount: ; cc34
+wMenuJoypadPollCount:: ; cc34
 ; how many times should HandleMenuInput poll the joypad state before it returns?
 	ds 1
 
 	ds 1
 
-wListScrollOffset: ; cc36
+wListScrollOffset:: ; cc36
 ; offset of the current top menu item from the beginning of the list
 ; keeps track of what section of the list is on screen
 	ds 1
@@ -133,7 +133,7 @@
 
 	ds 19
 
-wMenuWrappingEnabled: ; cc4a
+wMenuWrappingEnabled:: ; cc4a
 ; set to 1 if you can go from the bottom to the top or top to bottom of a menu
 ; set to 0 if you can't go past the top or bottom of the menu
 	ds 1
@@ -140,7 +140,7 @@
 
 	ds 10
 
-wTrainerHeaderFlagBit: ; cc55
+wTrainerHeaderFlagBit:: ; cc55
 	ds 1
 
 ; cc56
@@ -147,37 +147,37 @@
 
 
 SECTION "RLE", WRAM0[$ccd2]
-wRLEByteCount: ; ccd2
+wRLEByteCount:: ; ccd2
 	ds 1
 
 	ds 4
 
 ; current HP of player and enemy substitutes
-wPlayerSubstituteHP: ; ccd7
+wPlayerSubstituteHP:: ; ccd7
 	ds 1
-wEnemySubstituteHP: ; ccd8
+wEnemySubstituteHP:: ; ccd8
 	ds 1
 
 	ds 2
 
-wMoveMenuType: ; ccdb
+wMoveMenuType:: ; ccdb
 ; 0=regular, 1=mimic, 2=above message box (relearn, heal pp..)
 	ds 1
 
-wPlayerSelectedMove: ; ccdc
+wPlayerSelectedMove:: ; ccdc
 	ds 1
-wEnemySelectedMove: ; ccdd
+wEnemySelectedMove:: ; ccdd
 	ds 1
 
 	ds 1
 
-wAICount: ; ccdf
+wAICount:: ; ccdf
 ; number of times remaining that AI action can occur
 	ds 1
 
 	ds 2
 
-wEnemyMoveListIndex: ; cce2
+wEnemyMoveListIndex:: ; cce2
 	ds 1
 
 ; cce3
@@ -190,24 +190,24 @@
 ; 7 is normal
 
 wPlayerMonStatMods:
-wPlayerMonAttackMod: ; cd1a
+wPlayerMonAttackMod:: ; cd1a
 	ds 1
-wPlayerMonDefenseMod: ; cd1b
+wPlayerMonDefenseMod:: ; cd1b
 	ds 1
-wPlayerMonSpeedMod: ; cd1c
+wPlayerMonSpeedMod:: ; cd1c
 	ds 1
-wPlayerMonSpecialMod: ; cd1d
+wPlayerMonSpecialMod:: ; cd1d
 	ds 1
-wPlayerMonAccuracyMod: ; cd1e
+wPlayerMonAccuracyMod:: ; cd1e
 	ds 1
-wPlayerMonEvasionMod: ; cd1f
+wPlayerMonEvasionMod:: ; cd1f
 	ds 1
 
 	ds 13
 
-wEngagedTrainerClass: ; cd2d
+wEngagedTrainerClass:: ; cd2d
 	ds 1
-wEngagedTrainerSet: ; cd2e
+wEngagedTrainerSet:: ; cd2e
 ;	ds 1
 
 ; stat modifiers for the enemy's current pokemon
@@ -215,188 +215,188 @@
 ; 7 is normal
 
 wEnemyMonStatMods:
-wEnemyMonAttackMod: ; cd2e
+wEnemyMonAttackMod:: ; cd2e
 	ds 1
-wEnemyMonDefenseMod: ; cd2f
+wEnemyMonDefenseMod:: ; cd2f
 	ds 1
-wEnemyMonSpeedMod: ; cd30
+wEnemyMonSpeedMod:: ; cd30
 	ds 1
-wEnemyMonSpecialMod: ; cd31
+wEnemyMonSpecialMod:: ; cd31
 	ds 1
-wEnemyMonAccuracyMod: ; cd32
+wEnemyMonAccuracyMod:: ; cd32
 	ds 1
-wEnemyMonEvasionMod: ; cd33
+wEnemyMonEvasionMod:: ; cd33
 	ds 1
 
 	ds 9
 
-wWhichTrade: ; cd3d
+wWhichTrade:: ; cd3d
 ; which entry from TradeMons to select
 ;	ds 1
 
-wTrainerSpriteOffset: ; cd3d
+wTrainerSpriteOffset:: ; cd3d
 	ds 1
-wTrainerEngageDistance: ; cd3e
+wTrainerEngageDistance:: ; cd3e
 	ds 1
-wTrainerFacingDirection: ; cd3f
+wTrainerFacingDirection:: ; cd3f
 	ds 1
-wTrainerScreenY: ; cd40
+wTrainerScreenY:: ; cd40
 	ds 1
-wTrainerScreenX: ; cd41
+wTrainerScreenX:: ; cd41
 	ds 1
 
 	ds 30
 
-wFlags_0xcd60: ; cd60
+wFlags_0xcd60:: ; cd60
 ; bit 0: is player engaged by trainer (to avoid being engaged by multiple trainers simultaniously)
 	ds 1
 
 	ds 10
 
-wJoypadForbiddenButtonsMask: ; cd6b
+wJoypadForbiddenButtonsMask:: ; cd6b
 ; bit 1 means button presses will be ignored for that button
 	ds 1
 
 	ds 21
 
-wTileMapBackup2: ; cd81
+wTileMapBackup2:: ; cd81
 ; second buffer for temporarily saving and restoring current screen's tiles (e.g. if menus are drawn on top)
 	ds 20 * 18
 
-wBuffer: ; cee9
+wBuffer:: ; cee9
 ; used for temporary things
 
-wHPBarMaxHP: ; cee9
+wHPBarMaxHP:: ; cee9
 	ds 2
-wHPBarOldHP: ; ceeb
+wHPBarOldHP:: ; ceeb
 	ds 2
-wHPBarNewHP: ; ceed
+wHPBarNewHP:: ; ceed
 	ds 2
-wHPBarDelta: ; ceef
+wHPBarDelta:: ; ceef
 	ds 1
 
 	ds 13
 
-wHPBarHPDifference: ; cefd
+wHPBarHPDifference:: ; cefd
 	ds 1
 
 	ds 9
 
-wAnimSoundID: ; cf07
+wAnimSoundID:: ; cf07
 ; sound ID during battle animations
 	ds 1
 
 	ds 12
 
-wCurSpriteMovement2: ; cf14
+wCurSpriteMovement2:: ; cf14
 ; movement byte 2 of current sprite
 	ds 1
 
 	ds 74
 
-wGymCityName: ; cf5f
-wStringBuffer1: ; cf5f
+wGymCityName:: ; cf5f
+wStringBuffer1:: ; cf5f
 	ds 16 + 1
-wGymLeaderName: ; cf70
-wStringBuffer2: ; cf70
+wGymLeaderName:: ; cf70
+wStringBuffer2:: ; cf70
 	ds 16 + 1
-wStringBuffer3: ; cf81
+wStringBuffer3:: ; cf81
 	ds 16 + 1
 
-wWhichPokemon: ; cf92
+wWhichPokemon:: ; cf92
 ; which pokemon you selected
 	ds 1
 
 	ds 1
 
-wListMenuID: ; cf94
+wListMenuID:: ; cf94
 ; ID used by DisplayListMenuID
 	ds 1
 
 	ds 48
 
-wWalkCounter: ; cfc5
+wWalkCounter:: ; cfc5
 ; walk animation counter
 	ds 1
 
 	ds 1
 
-wMusicHeaderPointer: ; cfc7
+wMusicHeaderPointer:: ; cfc7
 ; (the current music channel address - $4000) / 3
 	ds 1
 
 	ds 4
 
-W_ENEMYMOVENUM: ; cfcc
+W_ENEMYMOVENUM:: ; cfcc
 	ds 1
-W_ENEMYMOVEEFFECT: ; cfcd
+W_ENEMYMOVEEFFECT:: ; cfcd
 	ds 1
-W_ENEMYMOVEPOWER: ; cfce
+W_ENEMYMOVEPOWER:: ; cfce
 	ds 1
-W_ENEMYMOVETYPE: ; cfcf
+W_ENEMYMOVETYPE:: ; cfcf
 	ds 1
-W_ENEMYMOVEACCURACY: ; cfd0
+W_ENEMYMOVEACCURACY:: ; cfd0
 	ds 1
-W_ENEMYMOVEMAXPP: ; cfd1
+W_ENEMYMOVEMAXPP:: ; cfd1
 	ds 1
-W_PLAYERMOVENUM: ; cfd2
+W_PLAYERMOVENUM:: ; cfd2
 	ds 1
-W_PLAYERMOVEEFFECT: ; cfd3
+W_PLAYERMOVEEFFECT:: ; cfd3
 	ds 1
-W_PLAYERMOVEPOWER: ; cfd4
+W_PLAYERMOVEPOWER:: ; cfd4
 	ds 1
-W_PLAYERMOVETYPE: ; cfd5
+W_PLAYERMOVETYPE:: ; cfd5
 	ds 1
-W_PLAYERMOVEACCURACY: ; cfd6
+W_PLAYERMOVEACCURACY:: ; cfd6
 	ds 1
-W_PLAYERMOVEMAXPP: ; cfd7
+W_PLAYERMOVEMAXPP:: ; cfd7
 	ds 1
 
-W_ENEMYMONID: ; cfd8
+W_ENEMYMONID:: ; cfd8
 	ds 1
 
 	ds 1
 
-W_ENEMYMONNAME: ; cfda
+W_ENEMYMONNAME:: ; cfda
 	ds 11
 
 	ds 1
 
-W_ENEMYMONCURHP: ; cfe6
+W_ENEMYMONCURHP:: ; cfe6
 ; active opponent's hp (16 bits)
 	ds 2
-W_ENEMYMONNUMBER: ; cfe8
+W_ENEMYMONNUMBER:: ; cfe8
 ; active opponent's position in team (0 to 5)
 	ds 1
-W_ENEMYMONSTATUS: ; cfe9
+W_ENEMYMONSTATUS:: ; cfe9
 ; active opponent's status condition
 	ds 1
-W_ENEMYMONTYPES: ; cfea
-W_ENEMYMONTYPE1: ; cfea
+W_ENEMYMONTYPES:: ; cfea
+W_ENEMYMONTYPE1:: ; cfea
 	ds 1
-W_ENEMYMONTYPE2: ; cfeb
+W_ENEMYMONTYPE2:: ; cfeb
 	ds 1
 	ds 1
-W_ENEMYMONMOVES: ; cfed
+W_ENEMYMONMOVES:: ; cfed
 	ds 4
-W_ENEMYMONATKDEFIV: ; cff1
+W_ENEMYMONATKDEFIV:: ; cff1
 	ds 1
-W_ENEMYMONSPDSPCIV: ; cff2
+W_ENEMYMONSPDSPCIV:: ; cff2
 	ds 1
-W_ENEMYMONLEVEL: ; cff3
+W_ENEMYMONLEVEL:: ; cff3
 	ds 1
-W_ENEMYMONMAXHP: ; cff4
+W_ENEMYMONMAXHP:: ; cff4
 	ds 2
-W_ENEMYMONATTACK: ; cff6
+W_ENEMYMONATTACK:: ; cff6
 	ds 2
-W_ENEMYMONDEFENSE: ; cff8
+W_ENEMYMONDEFENSE:: ; cff8
 	ds 2
-W_ENEMYMONSPEED: ; cffa
+W_ENEMYMONSPEED:: ; cffa
 	ds 2
-W_ENEMYMONSPECIAL: ; cffc
+W_ENEMYMONSPECIAL:: ; cffc
 	ds 2
 
-W_ENEMYMONPP: ; cffe
+W_ENEMYMONPP:: ; cffe
 ; four moves (extends past $cfff)
 	ds 2
 
@@ -407,73 +407,73 @@
 
 	ds 7
 
-W_PLAYERMONNAME: ; d009
+W_PLAYERMONNAME:: ; d009
 	ds 11
 
-W_PLAYERMONID: ; d014
+W_PLAYERMONID:: ; d014
 	ds 1
 
-W_PLAYERMONCURHP: ; d015
+W_PLAYERMONCURHP:: ; d015
 	ds 2
 	ds 1
-W_PLAYERMONSTATUS: ; d018
+W_PLAYERMONSTATUS:: ; d018
 ; the status of the player’s current monster
 	ds 1
-W_PLAYERMONTYPES: ; d019
-W_PLAYERMONTYPE1: ; d019
+W_PLAYERMONTYPES:: ; d019
+W_PLAYERMONTYPE1:: ; d019
 	ds 1
-W_PLAYERMONTYPE2: ; d01a
+W_PLAYERMONTYPE2:: ; d01a
 	ds 1
 	ds 1
-W_PLAYERMONMOVES: ; d01c
+W_PLAYERMONMOVES:: ; d01c
 	ds 4
-W_PLAYERMONIVS: ; d020
+W_PLAYERMONIVS:: ; d020
 ; 4x 4 bit: atk, def, spd, spc
 	ds 2
-W_PLAYERMONLEVEL: ; d022
+W_PLAYERMONLEVEL:: ; d022
 	ds 1
-W_PLAYERMONMAXHP: ; d023
+W_PLAYERMONMAXHP:: ; d023
 	ds 2
-W_PLAYERMONATK: ; d025
+W_PLAYERMONATK:: ; d025
 	ds 2
-W_PLAYERMONDEF: ; d027
+W_PLAYERMONDEF:: ; d027
 	ds 2
-W_PLAYERMONSPEED: ; d029
+W_PLAYERMONSPEED:: ; d029
 	ds 2
-W_PLAYERMONSPECIAL: ; d02b
+W_PLAYERMONSPECIAL:: ; d02b
 	ds 2
-W_PLAYERMONPP: ; d02d
+W_PLAYERMONPP:: ; d02d
 	ds 4
 
 
 
-W_TRAINERCLASS: ; d031
+W_TRAINERCLASS:: ; d031
 	ds 1
 
 	ds 24
 
-W_TRAINERNAME: ; d04a
+W_TRAINERNAME:: ; d04a
 ; 13 bytes for the letters of the opposing trainer
 ; the name is terminated with $50 with possible
 ; unused trailing letters
 	ds 13
 
-W_ISINBATTLE: ; d057
+W_ISINBATTLE:: ; d057
 ; no battle, this is 0
 ; wild battle, this is 1
 ; trainer battle, this is 2
 	ds 1
 
-W_PLAYERMONSALIVEFLAGS: ; d058
+W_PLAYERMONSALIVEFLAGS:: ; d058
 ; 6 bit array, 1 if player mon is alive
 	ds 1
 
-W_CUROPPONENT: ; d059
+W_CUROPPONENT:: ; d059
 ; in a wild battle, this is the species of pokemon
 ; in a trainer battle, this is the trainer class + $C8
 	ds 1
 
-W_BATTLETYPE: ; d05a
+W_BATTLETYPE:: ; d05a
 ; in normal battle, this is 0
 ; in old man battle, this is 1
 ; in safari battle, this is 2
@@ -481,23 +481,23 @@
 
 	ds 1
 
-W_LONEATTACKNO: ; d05c
+W_LONEATTACKNO:: ; d05c
 ; which entry in LoneAttacks to use
-W_GYMLEADERNO: ; d05c
+W_GYMLEADERNO:: ; d05c
 ; it's actually the same thing as ^
 	ds 1
-W_TRAINERNO: ; d05d
+W_TRAINERNO:: ; d05d
 ; which instance of [youngster, lass, etc] is this?
 	ds 1
 
 	ds 1
 
-W_MOVEMISSED: ; d05f
+W_MOVEMISSED:: ; d05f
 	ds 1
 
 	ds 2
 
-W_PLAYERBATTSTATUS1: ; d062
+W_PLAYERBATTSTATUS1:: ; d062
 ; bit 0 - bide
 ; bit 1 - thrash / petal dance
 ; bit 2 - attacking multiple times (e.g. double kick)
@@ -508,7 +508,7 @@
 ; bit 7 - confusion
 	ds 1
 
-W_PLAYERBATTSTATUS2: ; d063
+W_PLAYERBATTSTATUS2:: ; d063
 ; bit 0 - X Accuracy effect
 ; bit 1 - protected by "mist"
 ; bit 2 - focus energy effect
@@ -518,7 +518,7 @@
 ; bit 7 - leech seeded
 	ds 1
 
-W_PLAYERBATTSTATUS3: ; d064
+W_PLAYERBATTSTATUS3:: ; d064
 ; bit 0 - toxic
 ; bit 1 - light screen
 ; bit 2 - reflect
@@ -527,36 +527,36 @@
 
 	ds 2
 
-W_ENEMYBATTSTATUS1: ; d067
+W_ENEMYBATTSTATUS1:: ; d067
 	ds 1
-W_ENEMYBATTSTATUS2: ; d068
+W_ENEMYBATTSTATUS2:: ; d068
 	ds 1
-W_ENEMYBATTSTATUS3: ; d069
+W_ENEMYBATTSTATUS3:: ; d069
 	ds 1
 
 	ds 2
 
-W_PLAYERTOXICCOUNTER: ; d06c
+W_PLAYERTOXICCOUNTER:: ; d06c
 	ds 1
-W_PLAYERDISABLEDMOVE: ; d06d
+W_PLAYERDISABLEDMOVE:: ; d06d
 	ds 1
 
 	ds 3
 
-W_ENEMYTOXICCOUNTER: ; d071
+W_ENEMYTOXICCOUNTER:: ; d071
 	ds 1
-W_ENEMYDISABLEDMOVE: ; d072
+W_ENEMYDISABLEDMOVE:: ; d072
 	ds 1
 
 	ds 1
 
-W_NUMHITS: ; d074
+W_NUMHITS:: ; d074
 ; number of hits in attacks like Doubleslap, etc.
 	ds 1
 
 	ds 7
 
-W_ANIMATIONID: ; d07c
+W_ANIMATIONID:: ; d07c
 ; ID number of the current battle animation
 	ds 1
 
@@ -563,35 +563,35 @@
 	ds 4
 
 ; base coordinates of frame block
-W_BASECOORDX: ; d081
+W_BASECOORDX:: ; d081
 	ds 1
-W_BASECOORDY: ; d082
+W_BASECOORDY:: ; d082
 	ds 1
 
 	ds 1
 
-W_FBTILECOUNTER: ; d084
+W_FBTILECOUNTER:: ; d084
 ; counts how many tiles of the current frame block have been drawn
 	ds 1
 
 	ds 1
 
-W_SUBANIMFRAMEDELAY: ; d086
+W_SUBANIMFRAMEDELAY:: ; d086
 ; duration of each frame of the current subanimation in terms of screen refreshes
 	ds 1
-W_SUBANIMCOUNTER: ; d087
+W_SUBANIMCOUNTER:: ; d087
 ; counts the number of subentries left in the current subanimation
 	ds 1
 
 	ds 1
 
-W_NUMFBTILES: ; d089
+W_NUMFBTILES:: ; d089
 ; number of tiles in current battle animation frame block
 	ds 1
 
 	ds 1
 
-W_SUBANIMTRANSFORM: ; d08b
+W_SUBANIMTRANSFORM:: ; d08b
 ; controls what transformations are applied to the subanimation
 ; 01: flip horizontally and vertically
 ; 02: flip horizontally and translate downwards 40 pixels
@@ -599,36 +599,36 @@
 ; 04: reverse the subanimation
 	ds 1
 
-W_PBSTOREDREGISTERH: ; d08c
+W_PBSTOREDREGISTERH:: ; d08c
 	ds 1
-W_PBSTOREDREGISTERL: ; d08d
+W_PBSTOREDREGISTERL:: ; d08d
 	ds 1
-W_PBSTOREDREGISTERD: ; d08e
+W_PBSTOREDREGISTERD:: ; d08e
 	ds 1
-W_PBSTOREDREGISTERE: ; d08f
+W_PBSTOREDREGISTERE:: ; d08f
 	ds 1
 
 	ds 2
 
-W_PBSTOREDROMBANK: ; d092
+W_PBSTOREDROMBANK:: ; d092
 	ds 1
 
 	ds 1
 
-W_SUBANIMADDRPTR: ; d094
+W_SUBANIMADDRPTR:: ; d094
 ; the address _of the address_ of the current subanimation entry
 	ds 2
-W_SUBANIMSUBENTRYADDR: ; d096
+W_SUBANIMSUBENTRYADDR:: ; d096
 ; the address of the current subentry of the current subanimation
 	ds 2
 
 	ds 4
 
-W_FBDESTADDR: ; d09c
+W_FBDESTADDR:: ; d09c
 ; current destination address in OAM for frame blocks (big endian)
 	ds 2
 
-W_FBMODE: ; d09e
+W_FBMODE:: ; d09e
 ; controls how the frame blocks are put together to form frames
 ; specifically, after finishing drawing the frame block, the frame block's mode determines what happens
 ; 00: clean OAM buffer and delay
@@ -645,32 +645,32 @@
 
 SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
 
-S_SPRITEBUFFER0: ; a000
+S_SPRITEBUFFER0:: ; a000
 	ds SPRITEBUFFERSIZE
-S_SPRITEBUFFER1: ; a188
+S_SPRITEBUFFER1:: ; a188
 	ds SPRITEBUFFERSIZE
-S_SPRITEBUFFER2: ; a310
+S_SPRITEBUFFER2:: ; a310
 	ds SPRITEBUFFERSIZE
 
 
 SECTION "Sprites", WRAMX[$d0a1], BANK[1]
 
-W_SPRITECURPOSX: ; d0a1
+W_SPRITECURPOSX:: ; d0a1
 	ds 1
-W_SPRITECURPOSY: ; d0a2
+W_SPRITECURPOSY:: ; d0a2
 	ds 1
-W_SPRITEWITDH: ; d0a3
+W_SPRITEWITDH:: ; d0a3
 	ds 1
-W_SPRITEHEIGHT: ; d0a4
+W_SPRITEHEIGHT:: ; d0a4
 	ds 1
-W_SPRITEINPUTCURBYTE: ; d0a5
+W_SPRITEINPUTCURBYTE:: ; d0a5
 ; current input byte
 	ds 1
-W_SPRITEINPUTBITCOUNTER: ; d0a6
+W_SPRITEINPUTBITCOUNTER:: ; d0a6
 ; bit offset of last read input bit
 	ds 1
 
-W_SPRITEOUTPUTBITOFFSET: ; d0a7; determines where in the output byte the two bits are placed. Each byte contains four columns (2bpp data)
+W_SPRITEOUTPUTBITOFFSET:: ; d0a7; determines where in the output byte the two bits are placed. Each byte contains four columns (2bpp data)
 ; 3 -> XX000000   1st column
 ; 2 -> 00XX0000   2nd column
 ; 1 -> 0000XX00   3rd column
@@ -677,254 +677,254 @@
 ; 0 -> 000000XX   4th column
 	ds 1
 
-W_SPRITELOADFLAGS: ; d0a8
+W_SPRITELOADFLAGS:: ; d0a8
 ; bit 0 determines used buffer (0 -> $a188, 1 -> $a310)
 ; bit 1 loading last sprite chunk? (there are at most 2 chunks per load operation)
 	ds 1
-W_SPRITEUNPACKMODE: ; d0a9
+W_SPRITEUNPACKMODE:: ; d0a9
 	ds 1
-W_SPRITEFLIPPED: ; d0aa
+W_SPRITEFLIPPED:: ; d0aa
 	ds 1
 
-W_SPRITEINPUTPTR: ; d0ab
+W_SPRITEINPUTPTR:: ; d0ab
 ; pointer to next input byte
 	ds 2
-W_SPRITEOUTPUTPTR: ; d0ad
+W_SPRITEOUTPUTPTR:: ; d0ad
 ; pointer to current output byte
 	ds 2
-W_SPRITEOUTPUTPTRCACHED: ; d0af
+W_SPRITEOUTPUTPTRCACHED:: ; d0af
 ; used to revert pointer for different bit offsets
 	ds 2
-W_SPRITEDECODETABLE0PTR: ; d0b1
+W_SPRITEDECODETABLE0PTR:: ; d0b1
 ; pointer to differential decoding table (assuming initial value 0)
 	ds 2
-W_SPRITEDECODETABLE1PTR: ; d0b3
+W_SPRITEDECODETABLE1PTR:: ; d0b3
 ; pointer to differential decoding table (assuming initial value 1)
 	ds 2
 
 	ds 1
 
-W_LISTTYPE: ; d0b6
+W_LISTTYPE:: ; d0b6
 	ds 1
 
 	ds 1
 
-W_MONHEADER: ; d0b8
-W_MONHDEXNUM: ; d0b8
+W_MONHEADER:: ; d0b8
+W_MONHDEXNUM:: ; d0b8
 	ds 1
 
-W_MONHBASESTATS: ; d0b9
-W_MONHBASEHP: ; d0b9
+W_MONHBASESTATS:: ; d0b9
+W_MONHBASEHP:: ; d0b9
 	ds 1
-W_MONHBASEATTACK: ; d0ba
+W_MONHBASEATTACK:: ; d0ba
 	ds 1
-W_MONHBASEDEFENSE: ; d0bb
+W_MONHBASEDEFENSE:: ; d0bb
 	ds 1
-W_MONHBASESPEED: ; d0bc
+W_MONHBASESPEED:: ; d0bc
 	ds 1
-W_MONHBASESPECIAL: ; d0bd
+W_MONHBASESPECIAL:: ; d0bd
 	ds 1
 
-W_MONHTYPES: ; d0be
-W_MONHTYPE1: ; d0be
+W_MONHTYPES:: ; d0be
+W_MONHTYPE1:: ; d0be
 	ds 1
-W_MONHTYPE2: ; d0bf
+W_MONHTYPE2:: ; d0bf
 	ds 1
 
-W_MONHCATCHRATE: ; d0c0
+W_MONHCATCHRATE:: ; d0c0
 	ds 1
-W_MONHBASEXP: ; d0c1
+W_MONHBASEXP:: ; d0c1
 	ds 1
-W_MONHSPRITEDIM: ; d0c2
+W_MONHSPRITEDIM:: ; d0c2
 	ds 1
-W_MONHFRONTSPRITE: ; d0c3
+W_MONHFRONTSPRITE:: ; d0c3
 	ds 2
-W_MONHBACKSPRITE: ; d0c5
+W_MONHBACKSPRITE:: ; d0c5
 	ds 2
 
-W_MONHMOVES: ; d0c7
+W_MONHMOVES:: ; d0c7
 	ds 4
 
-W_MONHGROWTHRATE: ; d0cb
+W_MONHGROWTHRATE:: ; d0cb
 	ds 1
 
-W_MONHLEARNSET: ; d0cc
+W_MONHLEARNSET:: ; d0cc
 ; bit field
 	ds 7
 
 	ds 4
 
-W_MONHPADDING: ; d0d7
+W_MONHPADDING:: ; d0d7
 
 
-W_DAMAGE: ; d0d7
+W_DAMAGE:: ; d0d7
 	ds 1
 
 	ds 79
 
-W_CURENEMYLVL: ; d127
+W_CURENEMYLVL:: ; d127
 	ds 1
 
 	ds 3
 
-W_ISLINKBATTLE: ; d12b
+W_ISLINKBATTLE:: ; d12b
 	ds 1
 
 	ds 17
 
-W_PRIZE1: ; d13d
+W_PRIZE1:: ; d13d
 	ds 1
-W_PRIZE2: ; d13e
+W_PRIZE2:: ; d13e
 	ds 1
-W_PRIZE3: ; d13f
+W_PRIZE3:: ; d13f
 	ds 1
 
 	ds 24
 
-W_PLAYERNAME: ; d158
+W_PLAYERNAME:: ; d158
 	ds 11
 
-W_NUMINPARTY: ; d163
+W_NUMINPARTY:: ; d163
 	ds 1
-W_PARTYMON1: ; d164
+W_PARTYMON1:: ; d164
 	ds 1
-W_PARTYMON2: ; d165
+W_PARTYMON2:: ; d165
 	ds 1
-W_PARTYMON3: ; d166
+W_PARTYMON3:: ; d166
 	ds 1
-W_PARTYMON4: ; d167
+W_PARTYMON4:: ; d167
 	ds 1
-W_PARTYMON5: ; d168
+W_PARTYMON5:: ; d168
 	ds 1
-W_PARTYMON6: ; d169
+W_PARTYMON6:: ; d169
 	ds 1
-W_PARTYMONEND: ; d16a
+W_PARTYMONEND:: ; d16a
 	ds 1
 
-W_PARTYMON1DATA: ; d16b
-W_PARTYMON1_NUM: ; d16b
+W_PARTYMON1DATA:: ; d16b
+W_PARTYMON1_NUM:: ; d16b
 	ds 1
-W_PARTYMON1_HP: ; d16c
+W_PARTYMON1_HP:: ; d16c
 	ds 2
-W_PARTYMON1_BOXLEVEL: ; d16e
+W_PARTYMON1_BOXLEVEL:: ; d16e
 	ds 1
-W_PARTYMON1_STATUS: ; d16f
+W_PARTYMON1_STATUS:: ; d16f
 	ds 1
-W_PARTYMON1_TYPE1: ; d170
+W_PARTYMON1_TYPE1:: ; d170
 	ds 1
-W_PARTYMON1_TYPE2: ; d171
+W_PARTYMON1_TYPE2:: ; d171
 	ds 1
-W_PARTYMON1_CRATE: ; d172
+W_PARTYMON1_CRATE:: ; d172
 	ds 1
-W_PARTYMON1_MOVE1: ; d173
+W_PARTYMON1_MOVE1:: ; d173
 	ds 1
-W_PARTYMON1_MOVE2: ; d174
+W_PARTYMON1_MOVE2:: ; d174
 	ds 1
-W_PARTYMON1_MOVE3: ; d175
+W_PARTYMON1_MOVE3:: ; d175
 	ds 1
-W_PARTYMON1_MOVE4: ; d176
+W_PARTYMON1_MOVE4:: ; d176
 	ds 1
-W_PARTYMON1_OTID: ; d177
+W_PARTYMON1_OTID:: ; d177
 	ds 2
-W_PARTYMON1_EXP: ; d179
+W_PARTYMON1_EXP:: ; d179
 	ds 3
-W_PARTYMON1_EVHP: ; d17c
+W_PARTYMON1_EVHP:: ; d17c
 	ds 2
-W_PARTYMON1_EVATTACK: ; d17e
+W_PARTYMON1_EVATTACK:: ; d17e
 	ds 2
-W_PARTYMON1_EVDEFENSE: ; d180
+W_PARTYMON1_EVDEFENSE:: ; d180
 	ds 2
-W_PARTYMON1_EVSPEED: ; d182
+W_PARTYMON1_EVSPEED:: ; d182
 	ds 2
-W_PARTYMON1_EVSECIAL: ; d184
+W_PARTYMON1_EVSECIAL:: ; d184
 	ds 2
-W_PARTYMON1_IV: ; d186
+W_PARTYMON1_IV:: ; d186
 	ds 2
-W_PARTYMON1_MOVE1PP: ; d188
+W_PARTYMON1_MOVE1PP:: ; d188
 	ds 1
-W_PARTYMON1_MOVE2PP: ; d189
+W_PARTYMON1_MOVE2PP:: ; d189
 	ds 1
-W_PARTYMON1_MOVE3PP: ; d18a
+W_PARTYMON1_MOVE3PP:: ; d18a
 	ds 1
-W_PARTYMON1_MOVE4PP: ; d18b
+W_PARTYMON1_MOVE4PP:: ; d18b
 	ds 1
-W_PARTYMON1_LEVEL: ; d18c
+W_PARTYMON1_LEVEL:: ; d18c
 	ds 1
-W_PARTYMON1_MAXHP: ; d18d
+W_PARTYMON1_MAXHP:: ; d18d
 	ds 2
-W_PARTYMON1_ATACK: ; d18f
+W_PARTYMON1_ATACK:: ; d18f
 	ds 2
-W_PARTYMON1_DEFENSE: ; d191
+W_PARTYMON1_DEFENSE:: ; d191
 	ds 2
-W_PARTYMON1_SPEED: ; d193
+W_PARTYMON1_SPEED:: ; d193
 	ds 2
-W_PARTYMON1_SPECIAL: ; d195
+W_PARTYMON1_SPECIAL:: ; d195
 	ds 2
 
-W_PARTYMON2DATA: ; d197
+W_PARTYMON2DATA:: ; d197
 	ds 44
-W_PARTYMON3DATA: ; d1c3
+W_PARTYMON3DATA:: ; d1c3
 	ds 44
-W_PARTYMON4DATA: ; d1ef
+W_PARTYMON4DATA:: ; d1ef
 	ds 44
-W_PARTYMON5DATA: ; d21b
+W_PARTYMON5DATA:: ; d21b
 	ds 44
-W_PARTYMON6DATA: ; d247
+W_PARTYMON6DATA:: ; d247
 	ds 44
 
-W_PARTYMON1OT: ; d273
+W_PARTYMON1OT:: ; d273
 	ds 11
-W_PARTYMON2OT: ; d27e
+W_PARTYMON2OT:: ; d27e
 	ds 11
-W_PARTYMON3OT: ; d289
+W_PARTYMON3OT:: ; d289
 	ds 11
-W_PARTYMON4OT: ; d294
+W_PARTYMON4OT:: ; d294
 	ds 11
-W_PARTYMON5OT: ; d29f
+W_PARTYMON5OT:: ; d29f
 	ds 11
-W_PARTYMON6OT: ; d2aa
+W_PARTYMON6OT:: ; d2aa
 	ds 11
 
-W_PARTYMON1NAME: ; d2b5
+W_PARTYMON1NAME:: ; d2b5
 	ds 11
-W_PARTYMON2NAME: ; d2c0
+W_PARTYMON2NAME:: ; d2c0
 	ds 11
-W_PARTYMON3NAME: ; d2cb
+W_PARTYMON3NAME:: ; d2cb
 	ds 11
-W_PARTYMON4NAME: ; d2d6
+W_PARTYMON4NAME:: ; d2d6
 	ds 11
-W_PARTYMON5NAME: ; d2e1
+W_PARTYMON5NAME:: ; d2e1
 	ds 11
-W_PARTYMON6NAME: ; d2ec
+W_PARTYMON6NAME:: ; d2ec
 	ds 11
 
 
 SECTION "Pokedex", WRAMX[$d2f7], BANK[1]
 
-wPokedexOwned: ; d2f7
+wPokedexOwned:: ; d2f7
 	ds (150 / 8) + 1
 wPokedexOwnedEnd:
 
-wPokedexSeen: ; d30a
+wPokedexSeen:: ; d30a
 	ds (150 / 8) + 1
 wPokedexSeenEnd:
 
 
-wNumBagItems: ; d31d
+wNumBagItems:: ; d31d
 	ds 1
-wBagItems: ; d31e
+wBagItems:: ; d31e
 ; item, quantity
 	ds 20 * 2
 	ds 1 ; end
 
 ; money is in decimal
-wPlayerMoney: ; d347
+wPlayerMoney:: ; d347
 	ds 3
 
-W_RIVALNAME: ; d34a
+W_RIVALNAME:: ; d34a
 	ds 11
 
-W_OPTIONS: ; d355
+W_OPTIONS:: ; d355
 ; bit 7 = battle animation
 ; 0: On
 ; 1: Off
@@ -937,123 +937,123 @@
 ; 5: Slow
 	ds 1
 
-W_OBTAINEDBADGES: ; d356
+W_OBTAINEDBADGES:: ; d356
 	ds 1
 
 	ds 2
 
-wPlayerID: ; d359
+wPlayerID:: ; d359
 	ds 2
 
 	ds 3
 
-W_CURMAP: ; d35e
+W_CURMAP:: ; d35e
 	ds 1
 
 	ds 2
 
-W_YCOORD: ; d361
+W_YCOORD:: ; d361
 ; player’s position on the current map
 	ds 1
 
-W_XCOORD: ; d362
+W_XCOORD:: ; d362
 	ds 1
 
-W_YBLOCKCOORD: ; d363
+W_YBLOCKCOORD:: ; d363
 ; player's y position (by block)
 	ds 1
 
-W_XBLOCKCOORD: ; d364
+W_XBLOCKCOORD:: ; d364
 	ds 3
 
-W_CURMAPTILESET: ; d367
+W_CURMAPTILESET:: ; d367
 	ds 1
 
-W_CURMAPHEIGHT: ; d368
+W_CURMAPHEIGHT:: ; d368
 ; blocks
 	ds 1
 
-W_CURMAPWIDTH: ; d369
+W_CURMAPWIDTH:: ; d369
 ; blocks
 	ds 1
 
-W_MAPDATAPTR: ; d36a
+W_MAPDATAPTR:: ; d36a
 	ds 2
 
-W_MAPTEXTPTR: ; d36c
+W_MAPTEXTPTR:: ; d36c
 	ds 2
 
-W_MAPSCRIPTPTR: ; d36e
+W_MAPSCRIPTPTR:: ; d36e
 	ds 2
 
-W_MAPCONNECTIONS: ; d370
+W_MAPCONNECTIONS:: ; d370
 ; connection byte
 	ds 1
 
-W_MAPCONN1PTR: ; d371
+W_MAPCONN1PTR:: ; d371
 	ds 2
 	ds 9
 
-W_MAPCONN2PTR: ; d37c
+W_MAPCONN2PTR:: ; d37c
 	ds 2
 	ds 9
 
-W_MAPCONN3PTR: ; d387
+W_MAPCONN3PTR:: ; d387
 	ds 2
 	ds 9
 
-W_MAPCONN4PTR: ; d392
+W_MAPCONN4PTR:: ; d392
 	ds 2
 	ds 9
 
-W_SPRITESET: ; d39d
+W_SPRITESET:: ; d39d
 ; sprite set for the current map (11 sprite picture ID's)
 	ds 11
 
-W_SPRITESETID: ; d3a8
+W_SPRITESETID:: ; d3a8
 ; sprite set ID for the current map
 	ds 1
 
 	ds 312
 
-W_NUMSPRITES: ; d4e1
+W_NUMSPRITES:: ; d4e1
 ; number of sprites on the current map
 ; two bytes per sprite (movement byte 2 , text ID)
 	ds 3
 
-W_MAPSPRITEDATA: ; d4e4
+W_MAPSPRITEDATA:: ; d4e4
 ; two bytes per sprite (trainer class/item ID , trainer set ID)
 	ds 32
 
-W_MAPSPRITEEXTRADATA: ; d504
+W_MAPSPRITEEXTRADATA:: ; d504
 	ds 39
 
-W_TILESETBANK: ; d52b
+W_TILESETBANK:: ; d52b
 	ds 1
 
-W_TILESETBLOCKSPTR: ; d52c
+W_TILESETBLOCKSPTR:: ; d52c
 ; maps blocks (4x4 tiles) to tiles
 	ds 2
 
-W_TILESETGFXPTR: ; d52e
+W_TILESETGFXPTR:: ; d52e
 	ds 2
 
-W_TILESETCOLLISIONPTR: ; d530
+W_TILESETCOLLISIONPTR:: ; d530
 ; list of all walkable tiles
 	ds 2
 
-W_TILESETTALKINGOVERTILES: ; d532
+W_TILESETTALKINGOVERTILES:: ; d532
 	ds 3
 
-W_GRASSTILE: ; d535
+W_GRASSTILE:: ; d535
 	ds 1
 
 
 SECTION "Items", WRAMX[$d53a], BANK[1]
 
-wNumBoxItems: ; d53a
+wNumBoxItems:: ; d53a
 	ds 1
-wBoxItems: ; d53b
+wBoxItems:: ; d53b
 ; item, quantity
 	ds 50 * 2
 	ds 1 ; end
@@ -1061,14 +1061,14 @@
 	ds 4
 
 ; coins are in decimal
-wPlayerCoins: ; d5a4
+wPlayerCoins:: ; d5a4
 	ds 2
 
-W_MISSABLEOBJECTFLAGS: ; d5a6
+W_MISSABLEOBJECTFLAGS:: ; d5a6
 ; bit array of missable objects. set = removed
 	ds 40
 
-W_MISSABLEOBJECTLIST: ; d5ce
+W_MISSABLEOBJECTLIST:: ; d5ce
 ; each entry consists of 2 bytes
 ; * the sprite ID (depending on the current map)
 ; * the missable object index (global, used for W_MISSABLEOBJECTFLAGS)
@@ -1075,270 +1075,270 @@
 ; terminated with $FF
 	ds 17 * 2
 
-W_GAMEPROGRESSFLAGS: ; d5f0
+W_GAMEPROGRESSFLAGS:: ; d5f0
 ; $c8 bytes
 	ds 0
 
-W_OAKSLABCURSCRIPT: ; d5f0
+W_OAKSLABCURSCRIPT:: ; d5f0
 	ds 1
-W_PALLETTOWNCURSCRIPT: ; d5f1
+W_PALLETTOWNCURSCRIPT:: ; d5f1
 	ds 1
 	ds 1
-W_BLUESHOUSECURSCRIPT: ; d5f3
+W_BLUESHOUSECURSCRIPT:: ; d5f3
 	ds 1
-W_VIRIDIANCITYCURSCRIPT: ; d5f4
+W_VIRIDIANCITYCURSCRIPT:: ; d5f4
 	ds 1
 	ds 2
-W_PEWTERCITYCURSCRIPT: ; d5f7
+W_PEWTERCITYCURSCRIPT:: ; d5f7
 	ds 1
-W_ROUTE3CURSCRIPT: ; d5f8
+W_ROUTE3CURSCRIPT:: ; d5f8
 	ds 1
-W_ROUTE4CURSCRIPT: ; d5f9
+W_ROUTE4CURSCRIPT:: ; d5f9
 	ds 1
 	ds 1
-W_VIRIDIANGYMCURSCRIPT: ; d5fb
+W_VIRIDIANGYMCURSCRIPT:: ; d5fb
 	ds 1
-W_PEWTERGYMCURSCRIPT: ; d5fc
+W_PEWTERGYMCURSCRIPT:: ; d5fc
 	ds 1
-W_CERULEANGYMCURSCRIPT: ; d5fd
+W_CERULEANGYMCURSCRIPT:: ; d5fd
 	ds 1
-W_VERMILIONGYMCURSCRIPT: ; d5fe
+W_VERMILIONGYMCURSCRIPT:: ; d5fe
 	ds 1
-W_CELADONGYMCURSCRIPT: ; d5ff
+W_CELADONGYMCURSCRIPT:: ; d5ff
 	ds 1
-W_ROUTE6CURSCRIPT: ; d600
+W_ROUTE6CURSCRIPT:: ; d600
 	ds 1
-W_ROUTE8CURSCRIPT: ; d601
+W_ROUTE8CURSCRIPT:: ; d601
 	ds 1
-W_ROUTE24CURSCRIPT: ; d602
+W_ROUTE24CURSCRIPT:: ; d602
 	ds 1
-W_ROUTE25CURSCRIPT: ; d603
+W_ROUTE25CURSCRIPT:: ; d603
 	ds 1
-W_ROUTE9CURSCRIPT: ; d604
+W_ROUTE9CURSCRIPT:: ; d604
 	ds 1
-W_ROUTE10CURSCRIPT: ; d605
+W_ROUTE10CURSCRIPT:: ; d605
 	ds 1
-W_MTMOON1CURSCRIPT: ; d606
+W_MTMOON1CURSCRIPT:: ; d606
 	ds 1
-W_MTMOON3CURSCRIPT: ; d607
+W_MTMOON3CURSCRIPT:: ; d607
 	ds 1
-W_SSANNE8CURSCRIPT: ; d608
+W_SSANNE8CURSCRIPT:: ; d608
 	ds 1
-W_SSANNE9CURSCRIPT: ; d609
+W_SSANNE9CURSCRIPT:: ; d609
 	ds 1
-W_ROUTE22CURSCRIPT: ; d60a
+W_ROUTE22CURSCRIPT:: ; d60a
 	ds 1
 	ds 1
-W_REDSHOUSE2CURSCRIPT: ; d60c
+W_REDSHOUSE2CURSCRIPT:: ; d60c
 	ds 1
-W_VIRIDIANMARKETCURSCRIPT: ; d60d
+W_VIRIDIANMARKETCURSCRIPT:: ; d60d
 	ds 1
-W_ROUTE22GATECURSCRIPT: ; d60e
+W_ROUTE22GATECURSCRIPT:: ; d60e
 	ds 1
-W_CERULEANCITYCURSCRIPT: ; d60f
+W_CERULEANCITYCURSCRIPT:: ; d60f
 	ds 1
 	ds 7
-W_SSANNE5CURSCRIPT: ; d617
+W_SSANNE5CURSCRIPT:: ; d617
 	ds 1
-W_VIRIDIANFORESTCURSCRIPT: ; d618
+W_VIRIDIANFORESTCURSCRIPT:: ; d618
 	ds 1
-W_MUSEUMF1CURSCRIPT: ; d619
+W_MUSEUMF1CURSCRIPT:: ; d619
 	ds 1
-W_ROUTE13CURSCRIPT: ; d61a
+W_ROUTE13CURSCRIPT:: ; d61a
 	ds 1
-W_ROUTE14CURSCRIPT: ; d61b
+W_ROUTE14CURSCRIPT:: ; d61b
 	ds 1
-W_ROUTE17CURSCRIPT: ; d61c
+W_ROUTE17CURSCRIPT:: ; d61c
 	ds 1
-W_ROUTE19CURSCRIPT: ; d61d
+W_ROUTE19CURSCRIPT:: ; d61d
 	ds 1
-W_ROUTE21CURSCRIPT: ; d61e
+W_ROUTE21CURSCRIPT:: ; d61e
 	ds 1
-W_SAFARIZONEENTRANCECURSCRIPT: ; d61f
+W_SAFARIZONEENTRANCECURSCRIPT:: ; d61f
 	ds 1
-W_ROCKTUNNEL2CURSCRIPT: ; d620
+W_ROCKTUNNEL2CURSCRIPT:: ; d620
 	ds 1
-W_ROCKTUNNEL1CURSCRIPT: ; d621
+W_ROCKTUNNEL1CURSCRIPT:: ; d621
 	ds 1
 	ds 1
-W_ROUTE11CURSCRIPT: ; d623
+W_ROUTE11CURSCRIPT:: ; d623
 	ds 1
-W_ROUTE12CURSCRIPT: ; d624
+W_ROUTE12CURSCRIPT:: ; d624
 	ds 1
-W_ROUTE15CURSCRIPT: ; d625
+W_ROUTE15CURSCRIPT:: ; d625
 	ds 1
-W_ROUTE16CURSCRIPT: ; d626
+W_ROUTE16CURSCRIPT:: ; d626
 	ds 1
-W_ROUTE18CURSCRIPT: ; d627
+W_ROUTE18CURSCRIPT:: ; d627
 	ds 1
-W_ROUTE20CURSCRIPT: ; d628
+W_ROUTE20CURSCRIPT:: ; d628
 	ds 1
-W_SSANNE10CURSCRIPT: ; d629
+W_SSANNE10CURSCRIPT:: ; d629
 	ds 1
-W_VERMILIONCITYCURSCRIPT: ; d62a
+W_VERMILIONCITYCURSCRIPT:: ; d62a
 	ds 1
-W_POKEMONTOWER2CURSCRIPT: ; d62b
+W_POKEMONTOWER2CURSCRIPT:: ; d62b
 	ds 1
-W_POKEMONTOWER3CURSCRIPT: ; d62c
+W_POKEMONTOWER3CURSCRIPT:: ; d62c
 	ds 1
-W_POKEMONTOWER4CURSCRIPT: ; d62d
+W_POKEMONTOWER4CURSCRIPT:: ; d62d
 	ds 1
-W_POKEMONTOWER5CURSCRIPT: ; d62e
+W_POKEMONTOWER5CURSCRIPT:: ; d62e
 	ds 1
-W_POKEMONTOWER6CURSCRIPT: ; d62f
+W_POKEMONTOWER6CURSCRIPT:: ; d62f
 	ds 1
-W_POKEMONTOWER7CURSCRIPT: ; d630
+W_POKEMONTOWER7CURSCRIPT:: ; d630
 	ds 1
-W_ROCKETHIDEOUT1CURSCRIPT: ; d631
+W_ROCKETHIDEOUT1CURSCRIPT:: ; d631
 	ds 1
-W_ROCKETHIDEOUT2CURSCRIPT: ; d632
+W_ROCKETHIDEOUT2CURSCRIPT:: ; d632
 	ds 1
-W_ROCKETHIDEOUT3CURSCRIPT: ; d633
+W_ROCKETHIDEOUT3CURSCRIPT:: ; d633
 	ds 1
-W_ROCKETHIDEOUT4CURSCRIPT: ; d634
+W_ROCKETHIDEOUT4CURSCRIPT:: ; d634
 	ds 2
-W_ROUTE6GATECURSCRIPT: ; d636
+W_ROUTE6GATECURSCRIPT:: ; d636
 	ds 1
-W_ROUTE8GATECURSCRIPT: ; d637
+W_ROUTE8GATECURSCRIPT:: ; d637
 	ds 2
-W_CINNABARISLANDCURSCRIPT: ; d639
+W_CINNABARISLANDCURSCRIPT:: ; d639
 	ds 1
-W_MANSION1CURSCRIPT: ; d63a
+W_MANSION1CURSCRIPT:: ; d63a
 	ds 2
-W_MANSION2CURSCRIPT: ; d63c
+W_MANSION2CURSCRIPT:: ; d63c
 	ds 1
-W_MANSION3CURSCRIPT: ; d63d
+W_MANSION3CURSCRIPT:: ; d63d
 	ds 1
-W_MANSION4CURSCRIPT: ; d63e
+W_MANSION4CURSCRIPT:: ; d63e
 	ds 1
-W_VICTORYROAD2CURSCRIPT: ; d63f
+W_VICTORYROAD2CURSCRIPT:: ; d63f
 	ds 1
-W_VICTORYROAD3CURSCRIPT: ; d640
+W_VICTORYROAD3CURSCRIPT:: ; d640
 	ds 2
-W_FIGHTINGDOJOCURSCRIPT: ; d642
+W_FIGHTINGDOJOCURSCRIPT:: ; d642
 	ds 1
-W_SILPHCO2CURSCRIPT: ; d643
+W_SILPHCO2CURSCRIPT:: ; d643
 	ds 1
-W_SILPHCO3CURSCRIPT: ; d644
+W_SILPHCO3CURSCRIPT:: ; d644
 	ds 1
-W_SILPHCO4CURSCRIPT: ; d645
+W_SILPHCO4CURSCRIPT:: ; d645
 	ds 1
-W_SILPHCO5CURSCRIPT: ; d646
+W_SILPHCO5CURSCRIPT:: ; d646
 	ds 1
-W_SILPHCO6CURSCRIPT: ; d647
+W_SILPHCO6CURSCRIPT:: ; d647
 	ds 1
-W_SILPHCO7CURSCRIPT: ; d648
+W_SILPHCO7CURSCRIPT:: ; d648
 	ds 1
-W_SILPHCO8CURSCRIPT: ; d649
+W_SILPHCO8CURSCRIPT:: ; d649
 	ds 1
-W_SILPHCO9CURSCRIPT: ; d64a
+W_SILPHCO9CURSCRIPT:: ; d64a
 	ds 1
-W_HALLOFFAMEROOMCURSCRIPT: ; d64b
+W_HALLOFFAMEROOMCURSCRIPT:: ; d64b
 	ds 1
-W_GARYCURSCRIPT: ; d64c
+W_GARYCURSCRIPT:: ; d64c
 	ds 1
-W_LORELEICURSCRIPT: ; d64d
+W_LORELEICURSCRIPT:: ; d64d
 	ds 1
-W_BRUNOCURSCRIPT: ; d64e
+W_BRUNOCURSCRIPT:: ; d64e
 	ds 1
-W_AGATHACURSCRIPT: ; d64f
+W_AGATHACURSCRIPT:: ; d64f
 	ds 1
-W_UNKNOWNDUNGEON3CURSCRIPT: ; d650
+W_UNKNOWNDUNGEON3CURSCRIPT:: ; d650
 	ds 1
-W_VICTORYROAD1CURSCRIPT: ; d651
+W_VICTORYROAD1CURSCRIPT:: ; d651
 	ds 1
 	ds 1
-W_LANCECURSCRIPT: ; d653
+W_LANCECURSCRIPT:: ; d653
 	ds 1
 	ds 4
-W_SILPHCO10CURSCRIPT: ; d658
+W_SILPHCO10CURSCRIPT:: ; d658
 	ds 1
-W_SILPHCO11CURSCRIPT: ; d659
+W_SILPHCO11CURSCRIPT:: ; d659
 	ds 1
 	ds 1
-W_FUCHSIAGYMCURSCRIPT: ; d65b
+W_FUCHSIAGYMCURSCRIPT:: ; d65b
 	ds 1
-W_SAFFRONGYMCURSCRIPT: ; d65c
+W_SAFFRONGYMCURSCRIPT:: ; d65c
 	ds 1
 	ds 1
-W_CINNABARGYMCURSCRIPT: ; d65e
+W_CINNABARGYMCURSCRIPT:: ; d65e
 	ds 1
-W_CELADONGAMECORNERCURSCRIPT: ; d65f
+W_CELADONGAMECORNERCURSCRIPT:: ; d65f
 	ds 1
-W_ROUTE16GATECURSCRIPT: ; d660
+W_ROUTE16GATECURSCRIPT:: ; d660
 	ds 1
-W_BILLSHOUSECURSCRIPT: ; d661
+W_BILLSHOUSECURSCRIPT:: ; d661
 	ds 1
-W_ROUTE5GATECURSCRIPT: ; d662
+W_ROUTE5GATECURSCRIPT:: ; d662
 	ds 1
-W_POWERPLANTCURSCRIPT: ; d663
+W_POWERPLANTCURSCRIPT:: ; d663
 ; overload
 	ds 0
-W_ROUTE7GATECURSCRIPT: ; d663
+W_ROUTE7GATECURSCRIPT:: ; d663
 ; overload
 	ds 1
 	ds 1
-W_SSANNE2CURSCRIPT: ; d665
+W_SSANNE2CURSCRIPT:: ; d665
 	ds 1
-W_SEAFOAMISLANDS4CURSCRIPT: ; d666
+W_SEAFOAMISLANDS4CURSCRIPT:: ; d666
 	ds 1
-W_ROUTE23CURSCRIPT: ; d667
+W_ROUTE23CURSCRIPT:: ; d667
 	ds 1
-W_SEAFOAMISLANDS5CURSCRIPT: ; d668
+W_SEAFOAMISLANDS5CURSCRIPT:: ; d668
 	ds 1
-W_ROUTE18GATECURSCRIPT: ; d669
+W_ROUTE18GATECURSCRIPT:: ; d669
 	ds 1
 
 	ds 161
 
-W_TOWNVISITEDFLAG: ; d70b
+W_TOWNVISITEDFLAG:: ; d70b
 ; 2 bytes bit array, 1 means visited
 	ds 2
 
-wSafariSteps: ; d70d
+wSafariSteps:: ; d70d
 ; starts at 502
 	ds 2
 
-W_FOSSILITEM: ; d70f
+W_FOSSILITEM:: ; d70f
 ; item given to cinnabar lab
 	ds 1
 
-W_FOSSILMON: ; d710
+W_FOSSILMON:: ; d710
 ; mon that will result from the item
 	ds 1
 
 	ds 2
 
-W_ENEMYMONORTRAINERCLASS: ; d713
+W_ENEMYMONORTRAINERCLASS:: ; d713
 ; trainer classes start at $c8
 	ds 1
 
 	ds 1
 
-W_RIVALSTARTER: ; d715
+W_RIVALSTARTER:: ; d715
 	ds 1
 
 	ds 1
 
-W_PLAYERSTARTER: ; d717
+W_PLAYERSTARTER:: ; d717
 	ds 1
 
 	ds 27
 
 
-W_FLAGS_D733: ; d733
+W_FLAGS_D733:: ; d733
 ; bit 4: use variable [W_CURMAPSCRIPT] instead of the provided index for next frame's map script (used to start battle when talking to trainers)
 	ds 340
 
-W_GRASSRATE: ; d887
+W_GRASSRATE:: ; d887
 	ds 1
 
-W_GRASSMONS: ; d888
+W_GRASSMONS:: ; d888
 	ds 20
 
-wEnemyPartyCount: ; d89c
+wEnemyPartyCount:: ; d89c
 	ds 1
-wEnemyPartyMons: ; d89d
+wEnemyPartyMons:: ; d89d
 	ds 6
 	ds 1 ; end
 
@@ -1348,59 +1348,59 @@
 
 wEnemyMons:
 
-wEnemyMon1: ; d8a4
-wEnemyMon1Species: ; d8a4
+wEnemyMon1:: ; d8a4
+wEnemyMon1Species:: ; d8a4
 	ds 1
-W_ENEMYMON1HP: ; d8a5
+W_ENEMYMON1HP:: ; d8a5
 	ds 2
 
 	ds 7
 
-W_ENEMYMON1MOVE3: ; d8ae
+W_ENEMYMON1MOVE3:: ; d8ae
 	ds 44
-W_ENEMYMON2MOVE3: ; d8da
+W_ENEMYMON2MOVE3:: ; d8da
 	ds 44
-W_ENEMYMON3MOVE3: ; d906
+W_ENEMYMON3MOVE3:: ; d906
 	ds 44
-W_ENEMYMON4MOVE3: ; d932
+W_ENEMYMON4MOVE3:: ; d932
 	ds 44
-W_ENEMYMON5MOVE3: ; d95e
+W_ENEMYMON5MOVE3:: ; d95e
 	ds 44
-W_ENEMYMON6MOVE3: ; d98a
+W_ENEMYMON6MOVE3:: ; d98a
 	ds 34
 
-W_ENEMYMON1OT: ; d9ac
+W_ENEMYMON1OT:: ; d9ac
 	ds 11
-W_ENEMYMON2OT: ; d9b7
+W_ENEMYMON2OT:: ; d9b7
 	ds 11
-W_ENEMYMON3OT: ; d9c2
+W_ENEMYMON3OT:: ; d9c2
 	ds 11
-W_ENEMYMON4OT: ; d9cd
+W_ENEMYMON4OT:: ; d9cd
 	ds 11
-W_ENEMYMON5OT: ; d9d8
+W_ENEMYMON5OT:: ; d9d8
 	ds 11
-W_ENEMYMON6OT: ; d9e3
+W_ENEMYMON6OT:: ; d9e3
 	ds 11
 
-W_ENEMYMON1NAME: ; d9ee
+W_ENEMYMON1NAME:: ; d9ee
 	ds 11
-W_ENEMYMON2NAME: ; d9f9
+W_ENEMYMON2NAME:: ; d9f9
 	ds 11
-W_ENEMYMON3NAME: ; da04
+W_ENEMYMON3NAME:: ; da04
 	ds 11
-W_ENEMYMON4NAME: ; da0f
+W_ENEMYMON4NAME:: ; da0f
 	ds 11
-W_ENEMYMON5NAME: ; da1a
+W_ENEMYMON5NAME:: ; da1a
 	ds 11
-W_ENEMYMON6NAME: ; da25
+W_ENEMYMON6NAME:: ; da25
 	ds 11
 
-W_TRAINERHEADERPTR: ; da30
+W_TRAINERHEADERPTR:: ; da30
 	ds 2
 
 	ds 7
 
-W_CURMAPSCRIPT: ; da39
+W_CURMAPSCRIPT:: ; da39
 ; index of current map script, mostly used as index for function pointer array
 ; mostly copied from map-specific map script pointer and wirtten back later
 	ds 1
@@ -1407,51 +1407,51 @@
 
 	ds 6
 
-W_PLAYTIMEHOURS: ; da40
+W_PLAYTIMEHOURS:: ; da40
 	ds 2
-W_PLAYTIMEMINUTES: ; da42
+W_PLAYTIMEMINUTES:: ; da42
 	ds 2
-W_PLAYTIMESECONDS: ; da44
+W_PLAYTIMESECONDS:: ; da44
 	ds 1
-W_PLAYTIMEFRAMES: ; da45
+W_PLAYTIMEFRAMES:: ; da45
 	ds 1
 
 	ds 1
 
-W_NUMSAFARIBALLS: ; da47
+W_NUMSAFARIBALLS:: ; da47
 	ds 1
 
-W_DAYCARE_IN_USE: ; da48
+W_DAYCARE_IN_USE:: ; da48
 ; 0 if no pokemon is in the daycare
 ; 1 if pokemon is in the daycare
 	ds 1
 
-W_DAYCAREMONNAME: ; da49
+W_DAYCAREMONNAME:: ; da49
 	ds 11
 
-W_DAYCAREMONOT: ; da54
+W_DAYCAREMONOT:: ; da54
 	ds 11
 
-W_DAYCAREMONDATA: ; da5f
+W_DAYCAREMONDATA:: ; da5f
 	ds 33
 
-W_NUMINBOX: ; da80
+W_NUMINBOX:: ; da80
 ; number of mons in current box
 	ds 22
 
-W_BOXMON1DATA: ; da96
+W_BOXMON1DATA:: ; da96
 	ds 33
-W_BOXMON2DATA: ; dab7
+W_BOXMON2DATA:: ; dab7
 	ds 33 * 19
 
-W_BOXMON1OT: ; dd2a
+W_BOXMON1OT:: ; dd2a
 	ds 11
-W_BOXMON2OT: ; dd35
+W_BOXMON2OT:: ; dd35
 	ds 11 * 19
 
-W_BOXMON1NAME: ; de06
+W_BOXMON1NAME:: ; de06
 	ds 11
-W_BOXMON2NAME: ; de11
+W_BOXMON2NAME:: ; de11
 	ds 11 * 19
 
 ; dee2