19 files changed, 78 insertions, 73 deletions
diff --git a/text/credits_text.asm b/text/credits_text.asm
index 54b52c97..0010b93a 100755
--- a/text/credits_text.asm
+++ b/text/credits_text.asm
@@ -1,4 +1,4 @@
-CreditsTextPointers: ; 742c3 (1d:42c3)
+CreditsTextPointers:
 	dw CreditsText_Version
 	dw CreditsText_Tajiri
 	dw CreditsText_Oota
diff --git a/text/item_names.asm b/text/item_names.asm
index 6a401597..e436d74d 100755
--- a/text/item_names.asm
+++ b/text/item_names.asm
@@ -1,4 +1,4 @@
-ItemNames: ; 45b7 (1:45b7)
+ItemNames:
 	db "MASTER BALL@"
 	db "ULTRA BALL@"
 	db "GREAT BALL@"
diff --git a/text/map_names.asm b/text/map_names.asm
index 0338cba3..c2642942 100755
--- a/text/map_names.asm
+++ b/text/map_names.asm
@@ -1,107 +1,107 @@
-MapNames: ; 71473 (1c:5473)
-PalletTownName: ; 71473 (1c:5473)
+MapNames:
+PalletTownName:
 	db "PALLET TOWN@"
-ViridianCityName: ; 7147f (1c:547f)
+ViridianCityName:
 	db "VIRIDIAN CITY@"
-PewterCityName: ; 7148d (1c:548d)
+PewterCityName:
 	db "PEWTER CITY@"
-CeruleanCityName: ; 71499 (1c:5499)
+CeruleanCityName:
 	db "CERULEAN CITY@"
-LavenderTownName: ; 714a7 (1c:54a7)
+LavenderTownName:
 	db "LAVENDER TOWN@"
-VermilionCityName: ; 714b5 (1c:54b5)
+VermilionCityName:
 	db "VERMILION CITY@"
-CeladonCityName: ; 714c4 (1c:54c4)
+CeladonCityName:
 	db "CELADON CITY@"
-FuchsiaCityName: ; 714d1 (1c:54d1)
+FuchsiaCityName:
 	db "FUCHSIA CITY@"
-CinnabarIslandName: ; 714de (1c:54de)
+CinnabarIslandName:
 	db "CINNABAR ISLAND@"
-IndigoPlateauName: ; 714ee (1c:54ee)
+IndigoPlateauName:
 	db "INDIGO PLATEAU@"
-SaffronCityName: ; 714fd (1c:54fd)
+SaffronCityName:
 	db "SAFFRON CITY@"
-Route1Name: ; 7150a (1c:550a)
+Route1Name:
 	db "ROUTE 1@"
-Route2Name: ; 71512 (1c:5512)
+Route2Name:
 	db "ROUTE 2@"
-Route3Name: ; 7151a (1c:551a)
+Route3Name:
 	db "ROUTE 3@"
-Route4Name: ; 71522 (1c:5522)
+Route4Name:
 	db "ROUTE 4@"
-Route5Name: ; 7152a (1c:552a)
+Route5Name:
 	db "ROUTE 5@"
-Route6Name: ; 71532 (1c:5532)
+Route6Name:
 	db "ROUTE 6@"
-Route7Name: ; 7153a (1c:553a)
+Route7Name:
 	db "ROUTE 7@"
-Route8Name: ; 71542 (1c:5542)
+Route8Name:
 	db "ROUTE 8@"
-Route9Name: ; 7154a (1c:554a)
+Route9Name:
 	db "ROUTE 9@"
-Route10Name: ; 71552 (1c:5552)
+Route10Name:
 	db "ROUTE 10@"
-Route11Name: ; 7155b (1c:555b)
+Route11Name:
 	db "ROUTE 11@"
-Route12Name: ; 71564 (1c:5564)
+Route12Name:
 	db "ROUTE 12@"
-Route13Name: ; 7156d (1c:556d)
+Route13Name:
 	db "ROUTE 13@"
-Route14Name: ; 71576 (1c:5576)
+Route14Name:
 	db "ROUTE 14@"
-Route15Name: ; 7157f (1c:557f)
+Route15Name:
 	db "ROUTE 15@"
-Route16Name: ; 71588 (1c:5588)
+Route16Name:
 	db "ROUTE 16@"
-Route17Name: ; 71591 (1c:5591)
+Route17Name:
 	db "ROUTE 17@"
-Route18Name: ; 7159a (1c:559a)
+Route18Name:
 	db "ROUTE 18@"
-Route19Name: ; 715a3 (1c:55a3)
+Route19Name:
 	db "SEA ROUTE 19@"
-Route20Name: ; 715b0 (1c:55b0)
+Route20Name:
 	db "SEA ROUTE 20@"
-Route21Name: ; 715bd (1c:55bd)
+Route21Name:
 	db "SEA ROUTE 21@"
-Route22Name: ; 715ca (1c:55ca)
+Route22Name:
 	db "ROUTE 22@"
-Route23Name: ; 715d3 (1c:55d3)
+Route23Name:
 	db "ROUTE 23@"
-Route24Name: ; 715dc (1c:55dc)
+Route24Name:
 	db "ROUTE 24@"
-Route25Name: ; 715e5 (1c:55e5)
+Route25Name:
 	db "ROUTE 25@"
-ViridianForestName: ; 715ee (1c:55ee)
+ViridianForestName:
 	db "VIRIDIAN FOREST@"
-MountMoonName: ; 715fe (1c:55fe)
+MountMoonName:
 	db "MT.MOON@"
-RockTunnelName: ; 71606 (1c:5606)
+RockTunnelName:
 	db "ROCK TUNNEL@"
-SeaCottageName: ; 71612 (1c:5612)
+SeaCottageName:
 	db "SEA COTTAGE@"
-SSAnneName: ; 7161e (1c:561e)
+SSAnneName:
 	db "S.S.ANNE@"
-PokemonLeagueName: ; 71627 (1c:5627)
+PokemonLeagueName:
 	db "#MON LEAGUE@"
-UndergroundPathName: ; 71633 (1c:5633)
+UndergroundPathName:
 	db "UNDERGROUND PATH@"
-PokemonTowerName: ; 71644 (1c:5644)
+PokemonTowerName:
 	db "#MON TOWER@"
-SeafoamIslandsName: ; 7164f (1c:564f)
+SeafoamIslandsName:
 	db "SEAFOAM ISLANDS@"
-VictoryRoadName: ; 7165f (1c:565f)
+VictoryRoadName:
 	db "VICTORY ROAD@"
-DiglettsCaveName: ; 7166c (1c:566c)
+DiglettsCaveName:
 	db "DIGLETT's CAVE@"
-RocketHQName: ; 7167a (1c:567a)
+RocketHQName:
 	db "ROCKET HQ@"
-SilphCoName: ; 71684 (1c:5684)
+SilphCoName:
 	db "SILPH CO.@"
-PokemonMansionName: ; 7168e (1c:568e)
+PokemonMansionName:
 	db "<pkmn> MANSION@"
-SafariZoneName: ; 71698 (1c:5698)
+SafariZoneName:
 	db "SAFARI ZONE@"
-CeruleanCaveName: ; 716a4 (1c:56a4)
+CeruleanCaveName:
 	db "CERULEAN CAVE@"
-PowerPlantName: ; 716b2 (1c:56b2)
+PowerPlantName:
 	db "POWER PLANT@"
diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm
index 4006a3bb..7de4a826 100644
--- a/text/maps/celadon_dept_store_3f.asm
+++ b/text/maps/celadon_dept_store_3f.asm
@@ -80,7 +80,7 @@ _TM18PreReceiveText::
 	prompt
 
 _ReceivedTM18Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/daycare.asm b/text/maps/daycare.asm
index dbca93d6..8375ead0 100644
--- a/text/maps/daycare.asm
+++ b/text/maps/daycare.asm
@@ -89,4 +89,4 @@ _DayCareHeresYourMonText::
 _DayCareNotEnoughMoneyText::
 	text "Hey, you don't"
 	line "have enough ¥!"
-	done
-\ No newline at end of file
+	done
diff --git a/text/maps/fuchsia_gym.asm b/text/maps/fuchsia_gym.asm
index f2bb8c9c..6beebc69 100644
--- a/text/maps/fuchsia_gym.asm
+++ b/text/maps/fuchsia_gym.asm
@@ -211,4 +211,4 @@ _FuchsiaGymText_75653::
 	text "It's amazing how"
 	line "ninja can terrify"
 	cont "even now!"
-	done
-\ No newline at end of file
+	done
diff --git a/text/maps/lance.asm b/text/maps/lance.asm
index 9c7bd677..22cc0dcd 100644
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -1,6 +1,6 @@
 _LanceBeforeBattleText::
 	text "Ah! I heard about"
-	line "you, ", $52, "!"
+	line "you, <PLAYER>!"
 
 	para "I lead the ELITE"
 	line "FOUR! You can"
diff --git a/text/maps/lorelei.asm b/text/maps/lorelei.asm
index db032c78..fdbb55b4 100644
--- a/text/maps/lorelei.asm
+++ b/text/maps/lorelei.asm
@@ -30,6 +30,7 @@ _LoreleiAfterBattleText::
 	text "You're better"
 	line "than I thought!"
 	cont "Go on ahead!"
+
 	para "You only got a"
 	line "taste of #MON"
 	cont "LEAGUE power!"
@@ -38,4 +39,4 @@ _LoreleiAfterBattleText::
 _LoreleiDontRunAwayText::
 	text "Someone's voice:"
 	line "Don't run away!"
-	done
-\ No newline at end of file
+	done
diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm
index e93450da..633075bb 100644
--- a/text/maps/reds_house_1f.asm
+++ b/text/maps/reds_house_1f.asm
@@ -10,7 +10,7 @@ _MomWakeUpText::
 	done
 
 _MomHealText1::
-	text "MOM: ",$52,", if"
+	text "MOM: <PLAYER>, if"
 	line "you drive your"
 	cont "#MON too hard,"
 	cont "they'll dislike"
diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm
index 52d1a4c7..342d5015 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -78,7 +78,7 @@ _Route22RivalBeforeBattleText2::
 	cont "That's cool!"
 
 	para "Then I'll whip"
-	line "you, ", $52, ", as"
+	line "you, <PLAYER>, as"
 	cont "a warmup for"
 	cont "#MON LEAGUE!"
 
diff --git a/text/maps/school.asm b/text/maps/school.asm
index 2bd526f9..3c5f6379 100644
--- a/text/maps/school.asm
+++ b/text/maps/school.asm
@@ -17,4 +17,4 @@ _SchoolText2::
 	para "Be sure to read"
 	line "the blackboard"
 	cont "carefully!"
-	done
-\ No newline at end of file
+	done
diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm
index 6be83c5d..2fb84f17 100644
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -58,7 +58,7 @@ _SilphCo11Text2::
 	done
 
 _SilphCo11Text3::
-	text "Ah, ", $52, "!"
+	text "Ah, <PLAYER>!"
 	line "So we meet again!"
 
 	para "The PRESIDENT and"
diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/underground_path_route_7_entrance_unused.asm
index 1a66e8b1..4e0dc3ca 100644
--- a/text/maps/underground_path_route_7_entrance_unused.asm
+++ b/text/maps/underground_path_route_7_entrance_unused.asm
@@ -17,16 +17,19 @@ _UGPathRoute7EntranceUnusedText_5d778::
 _UGPathRoute7EntranceUnusedText_5d77d::
 	text "You're here to"
 	line "shop in CELADON?"
+
 	para "Just step outside"
 	line "and head west!"
 	done
+
 _UGPathRoute7EntranceUnusedText_5d782::
 	text "The UNDERGROUND"
 	line "PATH goes beneath"
 	cont "SAFFRON and leads"
 	cont "to LAVENDER."
+
 	para "If you're heading"
 	line "to CERULEAN, go"
 	cont "to the building"
 	cont "across the road."
-	done
-\ No newline at end of file
+	done
diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm
index 034de399..5d998e82 100644
--- a/text/maps/vermilion_dock.asm
+++ b/text/maps/vermilion_dock.asm
@@ -1,2 +1,3 @@
 _VermilionDockText1::
-	db $0, $57
+	text ""
+	done
diff --git a/text/monster_names.asm b/text/monster_names.asm
index 3262ec02..a62b1bd9 100755
--- a/text/monster_names.asm
+++ b/text/monster_names.asm
@@ -1,4 +1,4 @@
-MonsterNames: ; e8000 (3a:4000)
+MonsterNames:
 	db "RHYDON@@@@"
 	db "KANGASKHAN"
 	db "NIDORAN♂@@"
diff --git a/text/move_names.asm b/text/move_names.asm
index a9265f51..cbb1a322 100644
--- a/text/move_names.asm
+++ b/text/move_names.asm
@@ -1,4 +1,4 @@
-MoveNames:: ; b0000 (2c:4000)
+MoveNames::
 	db "POUND@"
 	db "KARATE CHOP@"
 	db "DOUBLESLAP@"
diff --git a/text/trainer_names.asm b/text/trainer_names.asm
index 087d79ef..7736738b 100755
--- a/text/trainer_names.asm
+++ b/text/trainer_names.asm
@@ -1,4 +1,4 @@
-TrainerNames: ; 3997e (e:597e)
+TrainerNames:
 	db "YOUNGSTER@"
 	db "BUG CATCHER@"
 	db "LASS@"
diff --git a/text/type_names.asm b/text/type_names.asm
index 5658b683..d94675b8 100755
--- a/text/type_names.asm
+++ b/text/type_names.asm
@@ -1,4 +1,4 @@
-TypeNames: ; 27d63 (9:7d63)
+TypeNames:
 
 	dw .Normal
 	dw .Fighting
diff --git a/text/unused_names.asm b/text/unused_names.asm
index 27752b63..dd4c9a12 100644
--- a/text/unused_names.asm
+++ b/text/unused_names.asm
@@ -1,4 +1,4 @@
-UnusedNames: ; 491e (1:491e)
+UnusedNames:
 	db "かみなりバッヂ@"
 	db "かいがらバッヂ@"
 	db "おじぞうバッヂ@"
@@ -17,4 +17,4 @@ UnusedNames: ; 491e (1:491e)
 	db "キャプテン@"
 	db "プチマスター@"
 	db "マスター@"
-	db "エクセレント" ; note the lack of a terminator
-\ No newline at end of file
+	db "エクセレント" ; note the lack of a terminator