Sync with pokered

207 files changed, 176 insertions, 143 deletions

diff --git a/text/maps/agatha.asm b/text/maps/AgathasRoom.asm
index 45a4692d..82cbcd81 100644
--- a/text/maps/agatha.asm
+++ b/text/maps/AgathasRoom.asm
@@ -17,7 +17,7 @@ _AgathaBeforeBattleText::
 	cont "wrong! #MON"
 	cont "are for fighting!"
 
-	para $52, "! I'll show"
+	para "<PLAYER>! I'll show"
 	line "you how a real"
 	cont "trainer fights!"
 	done
diff --git a/text/maps/beach_house.asm b/text/maps/BeachHouse.asm
index bc50b837..bc50b837 100644
--- a/text/maps/beach_house.asm
+++ b/text/maps/BeachHouse.asm
diff --git a/text/maps/bike_shop.asm b/text/maps/BikeShop.asm
index 1717c552..1717c552 100644
--- a/text/maps/bike_shop.asm
+++ b/text/maps/BikeShop.asm
diff --git a/text/maps/bills_house.asm b/text/maps/BillsHouse.asm
index dd556a7b..858dfe80 100644
--- a/text/maps/bills_house.asm
+++ b/text/maps/BillsHouse.asm
@@ -59,7 +59,7 @@ _BillThankYouText::
 	prompt
 
 _SSTicketReceivedText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "an @"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/blues_house.asm b/text/maps/BluesHouse.asm
index c7db0b2c..8f1d8ecf 100644
--- a/text/maps/blues_house.asm
+++ b/text/maps/BluesHouse.asm
@@ -1,6 +1,6 @@
 _DaisyInitialText::
-	text "Hi ",$52,"!"
-	line $53," is out at"
+	text "Hi <PLAYER>!"
+	line "<RIVAL> is out at"
 	cont "Grandpa's lab."
 	done
 
@@ -12,7 +12,7 @@ _DaisyOfferMapText::
 	prompt
 
 _GotMapText::
-	text $52," got a"
+	text "<PLAYER> got a"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/bruno.asm b/text/maps/BrunosRoom.asm
index 39898eb5..9c493c4a 100644
--- a/text/maps/bruno.asm
+++ b/text/maps/BrunosRoom.asm
@@ -11,7 +11,7 @@ _BrunoBeforeBattleText::
 	line "trained with"
 	cont "my #MON!"
 
-	para $52, "!"
+	para "<PLAYER>!"
 
 	para "We will grind you"
 	line "down with our"
diff --git a/text/maps/celadon_house.asm b/text/maps/CeladonChiefHouse.asm
index 19e59bd6..19e59bd6 100644
--- a/text/maps/celadon_house.asm
+++ b/text/maps/CeladonChiefHouse.asm
diff --git a/text/maps/celadon_city.asm b/text/maps/CeladonCity.asm
index 908fcbb4..1bf76470 100644
--- a/text/maps/celadon_city.asm
+++ b/text/maps/CeladonCity.asm
@@ -40,7 +40,7 @@ _TM41PreText::
 	prompt
 
 _ReceivedTM41Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/celadon_diner.asm b/text/maps/CeladonDiner.asm
index fd31eb20..dc5e9350 100644
--- a/text/maps/celadon_diner.asm
+++ b/text/maps/CeladonDiner.asm
@@ -42,7 +42,7 @@ _CeladonDinerText_491a7::
 	prompt
 
 _ReceivedCoinCaseText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/celadon_gym.asm b/text/maps/CeladonGym.asm
index 99833ee1..d6586035 100644
--- a/text/maps/celadon_gym.asm
+++ b/text/maps/CeladonGym.asm
@@ -62,13 +62,14 @@ _CeladonGymText9::
 	done
 
 _ReceivedTM21Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
 _TM21ExplanationText::
-	db $0
+	text ""
+
 	para "TM21 contains"
 	line "MEGA DRAIN."
 
diff --git a/text/maps/celadon_hotel.asm b/text/maps/CeladonHotel.asm
index f2eb059e..f2eb059e 100644
--- a/text/maps/celadon_hotel.asm
+++ b/text/maps/CeladonHotel.asm
diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/CeladonMansion1F.asm
index 23123892..23123892 100644
--- a/text/maps/celadon_mansion_1f.asm
+++ b/text/maps/CeladonMansion1F.asm
diff --git a/text/maps/celadon_mansion_2f.asm b/text/maps/CeladonMansion2F.asm
index b2ecb4fa..b2ecb4fa 100644
--- a/text/maps/celadon_mansion_2f.asm
+++ b/text/maps/CeladonMansion2F.asm
diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/CeladonMansion3F.asm
index baf86186..baf86186 100644
--- a/text/maps/celadon_mansion_3f.asm
+++ b/text/maps/CeladonMansion3F.asm
diff --git a/text/maps/celadon_mansion_4f_outside.asm b/text/maps/CeladonMansionRoof.asm
index c8fd7ec8..c8fd7ec8 100644
--- a/text/maps/celadon_mansion_4f_outside.asm
+++ b/text/maps/CeladonMansionRoof.asm
diff --git a/text/maps/celadon_mansion_4f_inside.asm b/text/maps/CeladonMansionRoofHouse.asm
index dab81a8d..dab81a8d 100644
--- a/text/maps/celadon_mansion_4f_inside.asm
+++ b/text/maps/CeladonMansionRoofHouse.asm
diff --git a/text/maps/celadon_dept_store_1f.asm b/text/maps/CeladonMart1F.asm
index 8d805edc..8d805edc 100644
--- a/text/maps/celadon_dept_store_1f.asm
+++ b/text/maps/CeladonMart1F.asm
diff --git a/text/maps/celadon_dept_store_2f.asm b/text/maps/CeladonMart2F.asm
index 74869902..74869902 100644
--- a/text/maps/celadon_dept_store_2f.asm
+++ b/text/maps/CeladonMart2F.asm
diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/CeladonMart3F.asm
index 7de4a826..7de4a826 100644
--- a/text/maps/celadon_dept_store_3f.asm
+++ b/text/maps/CeladonMart3F.asm
diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/CeladonMart4F.asm
index c17483c1..c17483c1 100644
--- a/text/maps/celadon_dept_store_4f.asm
+++ b/text/maps/CeladonMart4F.asm
diff --git a/text/maps/celadon_dept_store_5f.asm b/text/maps/CeladonMart5F.asm
index 1871194b..1871194b 100644
--- a/text/maps/celadon_dept_store_5f.asm
+++ b/text/maps/CeladonMart5F.asm
diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/CeladonMartRoof.asm
index 319ca3f0..cfeddaf6 100644
--- a/text/maps/celadon_dept_store_roof.asm
+++ b/text/maps/CeladonMartRoof.asm
@@ -14,13 +14,14 @@ _CeladonMartRoofText_484f3::
 	line "from me!@@"
 
 _CeladonMartRoofText_484f9::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
 _CeladonMartRoofText_484fe::
-	db $0
+	text ""
+
 	para "@"
 	TX_RAM wcf4b
 	text " contains"
@@ -40,13 +41,14 @@ _CeladonMartRoofText_48504::
 	line "from me!@@"
 
 _CeladonMartRoofText_4850a::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
 _CeladonMartRoofText_4850f::
-	db $0
+	text ""
+
 	para "@"
 	TX_RAM wcf4b
 	text " contains"
@@ -63,11 +65,12 @@ _CeladonMartRoofText_48515::
 	line "from me!@@"
 
 _ReceivedTM49Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM49!@@"
 
 _CeladonMartRoofText_48520::
-	db $0
+	text ""
+
 	para "TM49 contains"
 	line "TRI ATTACK!@@"
 
@@ -121,7 +124,7 @@ _VendingMachineText4::
 
 _VendingMachineText5::
 	TX_RAM wcf4b
-	db $0
+	text ""
 	line "popped out!"
 	done
 
diff --git a/text/maps/celadon_pokecenter.asm b/text/maps/CeladonPokecenter.asm
index a04f51c9..a04f51c9 100644
--- a/text/maps/celadon_pokecenter.asm
+++ b/text/maps/CeladonPokecenter.asm
diff --git a/text/maps/cerulean_badge_house_1.asm b/text/maps/CeruleanBadgeHouse.asm
index 4bba10cd..4bba10cd 100644
--- a/text/maps/cerulean_badge_house_1.asm
+++ b/text/maps/CeruleanBadgeHouse.asm
diff --git a/text/maps/cerulean_badge_house_2.asm b/text/maps/CeruleanBadgeHouse_2.asm
index e5da0622..e5da0622 100755
--- a/text/maps/cerulean_badge_house_2.asm
+++ b/text/maps/CeruleanBadgeHouse_2.asm
diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/CeruleanCaveB1F.asm
index 0918a3ce..0918a3ce 100644
--- a/text/maps/unknown_dungeon_b1f.asm
+++ b/text/maps/CeruleanCaveB1F.asm
diff --git a/text/maps/cerulean_city.asm b/text/maps/CeruleanCity.asm
index 4c51c5e0..4bc16e7d 100644
--- a/text/maps/cerulean_city.asm
+++ b/text/maps/CeruleanCity.asm
@@ -1,6 +1,6 @@
 _CeruleanCityText_19668::
-	text $53, ": Yo!"
-	line $52, "!"
+	text "<RIVAL>: Yo!"
+	line "<PLAYER>!"
 
 	para "You're still"
 	line "struggling along"
@@ -13,7 +13,7 @@ _CeruleanCityText_19668::
 
 	para "Here, let me see"
 	line "what you caught,"
-	cont $52, "!"
+	cont "<PLAYER>!"
 	done
 
 _CeruleanCityText_1966d::
@@ -29,7 +29,7 @@ _CeruleanCityText_19672::
 	prompt
 
 _CeruleanCityText_19677::
-	text $53, ": Hey,"
+	text "<RIVAL>: Hey,"
 	line "guess what?"
 
 	para "I went to BILL's"
@@ -69,11 +69,12 @@ _CeruleanCityText_196d9::
 	done
 
 _ReceivedTM28Text::
-	text $52, " recovered"
+	text "<PLAYER> recovered"
 	line "TM28!@@"
 
 _ReceivedTM28Text2::
-	db $0
+	text ""
+
 	para "I better get"
 	line "moving! Bye!@@"
 
diff --git a/text/maps/cerulean_gym.asm b/text/maps/CeruleanGym.asm
index 70cbdf0d..9f2c4694 100644
--- a/text/maps/cerulean_gym.asm
+++ b/text/maps/CeruleanGym.asm
@@ -48,7 +48,7 @@ _CeruleanGymText_5c7c8::
 	done
 
 _ReceivedTM11Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM11!@@"
 
 _CeruleanGymText_5c7d3::
diff --git a/text/maps/cerulean_mart.asm b/text/maps/CeruleanMart.asm
index 86a74588..86a74588 100644
--- a/text/maps/cerulean_mart.asm
+++ b/text/maps/CeruleanMart.asm
diff --git a/text/maps/cerulean_pokecenter.asm b/text/maps/CeruleanPokecenter.asm
index 497fbce3..497fbce3 100644
--- a/text/maps/cerulean_pokecenter.asm
+++ b/text/maps/CeruleanPokecenter.asm
diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/CeruleanTradeHouse.asm
index 791c11d5..791c11d5 100644
--- a/text/maps/cerulean_trade_house.asm
+++ b/text/maps/CeruleanTradeHouse.asm
diff --git a/text/maps/cerulean_trashed_house.asm b/text/maps/CeruleanTrashedHouse.asm
index f79540ae..f79540ae 100644
--- a/text/maps/cerulean_trashed_house.asm
+++ b/text/maps/CeruleanTrashedHouse.asm
diff --git a/text/maps/champion.asm b/text/maps/ChampionsRoom.asm
index 3ca7aadf..61050565 100644
--- a/text/maps/champion.asm
+++ b/text/maps/ChampionsRoom.asm
@@ -1,9 +1,9 @@
 _GaryChampionIntroText::
-	text $53, ": Hey!"
+	text "<RIVAL>: Hey!"
 
 	para "I was looking"
 	line "forward to seeing"
-	cont "you, ", $52, "!"
+	cont "you, <PLAYER>!"
 
 	para "My rival should"
 	line "be strong to keep"
@@ -24,7 +24,7 @@ _GaryChampionIntroText::
 	para "I'm the #MON"
 	line "LEAGUE champion!"
 
-	para $52, "! Do you"
+	para "<PLAYER>! Do you"
 	line "know what that"
 	cont "means?"
 
@@ -54,11 +54,11 @@ _GaryVictoryText::
 	line "I won, I won!"
 
 	para "I'm too good for"
-	line "you, ", $52, "!"
+	line "you, <PLAYER>!"
 
 	para "You did well to"
 	line "even reach me,"
-	cont $53, ", the"
+	cont "<RIVAL>, the"
 	cont "#MON genius!"
 
 	para "Nice try, loser!"
@@ -82,7 +82,7 @@ _GaryText_76103::
 	done
 
 _GaryText2::
-	text "OAK: ", $52, "!"
+	text "OAK: <PLAYER>!"
 	done
 
 _GaryText_76120::
@@ -99,12 +99,12 @@ _GaryText_76120::
 	TX_RAM wcd6d
 	text "!"
 
-	para $52, ", you have"
+	para "<PLAYER>, you have"
 	line "come of age!"
 	done
 
 _GaryText_76125::
-	text "OAK: ", $53, "! I'm"
+	text "OAK: <RIVAL>! I'm"
 	line "disappointed!"
 
 	para "I came when I"
@@ -115,7 +115,7 @@ _GaryText_76125::
 	line "here, you had"
 	cont "already lost!"
 
-	para $53, "! Do you"
+	para "<RIVAL>! Do you"
 	line "understand why"
 	cont "you lost?"
 
@@ -130,7 +130,7 @@ _GaryText_76125::
 	done
 
 _GaryText_7612a::
-	text "OAK: ", $52, "!"
+	text "OAK: <PLAYER>!"
 
 	para "You understand"
 	line "that your victory"
@@ -141,6 +141,6 @@ _GaryText_7612a::
 	line "with your #MON"
 	cont "is marvelous!"
 
-	para $52, "!"
+	para "<PLAYER>!"
 	line "Come with me!"
 	done
diff --git a/text/maps/cinnabar_gym.asm b/text/maps/CinnabarGym.asm
index 58873c2a..ee1fc31a 100644
--- a/text/maps/cinnabar_gym.asm
+++ b/text/maps/CinnabarGym.asm
@@ -42,13 +42,14 @@ _BlaineBadgeText::
 	done
 
 _ReceivedTM38Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
 _TM38ExplanationText::
-	db $0
+	text ""
+
 	para "TM38 contains"
 	line "FIRE BLAST!"
 
@@ -204,7 +205,7 @@ _CinnabarGymText_75ac2::
 	done
 
 _CinnabarGymText_75ac7::
-	text $52, "! You beat"
+	text "<PLAYER>! You beat"
 	line "that fire brand!"
 	done
 
diff --git a/text/maps/cinnabar_island.asm b/text/maps/CinnabarIsland.asm
index 54552a46..54552a46 100644
--- a/text/maps/cinnabar_island.asm
+++ b/text/maps/CinnabarIsland.asm
diff --git a/text/maps/cinnabar_lab.asm b/text/maps/CinnabarLab.asm
index a93a484d..a93a484d 100644
--- a/text/maps/cinnabar_lab.asm
+++ b/text/maps/CinnabarLab.asm
diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/CinnabarLabFossilRoom.asm
index 565104b3..95bde685 100644
--- a/text/maps/cinnabar_lab_fossil_room.asm
+++ b/text/maps/CinnabarLabFossilRoom.asm
@@ -31,7 +31,7 @@ _Lab4Text_75dd5::
 
 	para "It was @"
 	TX_RAM wcf4b
-	db $0
+	text ""
 	line "like I think!"
 	prompt
 
@@ -58,7 +58,7 @@ _Lab4Text_610b3::
 	text "So! You hurry and"
 	line "give me that!"
 
-	para $52, " handed"
+	para "<PLAYER> handed"
 	line "over @"
 	TX_RAM wcd6d
 	text "!"
diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/CinnabarLabMetronomeRoom.asm
index e2fbb558..fa04677f 100644
--- a/text/maps/cinnabar_lab_metronome_room.asm
+++ b/text/maps/CinnabarLabMetronomeRoom.asm
@@ -7,7 +7,7 @@ _TM35PreReceiveText::
 	prompt
 
 _ReceivedTM35Text::
-	text $52, " received "
+	text "<PLAYER> received "
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/cinnabar_lab_trade_room.asm b/text/maps/CinnabarLabTradeRoom.asm
index 196124e7..196124e7 100644
--- a/text/maps/cinnabar_lab_trade_room.asm
+++ b/text/maps/CinnabarLabTradeRoom.asm
diff --git a/text/maps/cinnabar_mart.asm b/text/maps/CinnabarMart.asm
index 42a41d06..42a41d06 100644
--- a/text/maps/cinnabar_mart.asm
+++ b/text/maps/CinnabarMart.asm
diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/CinnabarPokecenter.asm
index cf481764..cf481764 100644
--- a/text/maps/cinnabar_pokecenter.asm
+++ b/text/maps/CinnabarPokecenter.asm
diff --git a/text/maps/copycats_house_1f.asm b/text/maps/CopycatsHouse1F.asm
index bd3029fd..bd3029fd 100644
--- a/text/maps/copycats_house_1f.asm
+++ b/text/maps/CopycatsHouse1F.asm
diff --git a/text/maps/copycats_house_2f.asm b/text/maps/CopycatsHouse2F.asm
index 90833127..561b2ac5 100644
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/CopycatsHouse2F.asm
@@ -1,11 +1,11 @@
 _CopycatsHouse2FText_5ccd4::
-	text $52, ": Hi! Do"
+	text "<PLAYER>: Hi! Do"
 	line "you like #MON?"
 
-	para $52, ": Uh no, I"
+	para "<PLAYER>: Uh no, I"
 	line "just asked you."
 
-	para $52, ": Huh?"
+	para "<PLAYER>: Huh?"
 	line "You're strange!"
 
 	para "COPYCAT: Hmm?"
@@ -27,13 +27,14 @@ _TM31PreReceiveText::
 	prompt
 
 _ReceivedTM31Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
 _TM31ExplanationText1::
-	db $0
+	text ""
+
 	para "TM31 contains my"
 	line "favorite, MIMIC!"
 
@@ -41,12 +42,12 @@ _TM31ExplanationText1::
 	line "#MON!@@"
 
 _TM31ExplanationText2::
-	text $52, ": Hi!"
+	text "<PLAYER>: Hi!"
 	line "Thanks for TM31!"
 
-	para $52, ": Pardon?"
+	para "<PLAYER>: Pardon?"
 
-	para $52, ": Is it"
+	para "<PLAYER>: Is it"
 	line "that fun to mimic"
 	cont "my every move?"
 
diff --git a/text/maps/daycare.asm b/text/maps/Daycare.asm
index 8375ead0..479898c8 100644
--- a/text/maps/daycare.asm
+++ b/text/maps/Daycare.asm
@@ -14,18 +14,21 @@ _DayCareWillLookAfterMonText::
 	text "Fine, I'll look"
 	line "after @"
 	TX_RAM wcd6d
-	db $0
+	text ""
 	cont "for a while."
 	prompt
+
 _DayCareComeSeeMeInAWhileText::
 	text "Come see me in"
 	line "a while."
 	done
+
 _DayCareMonHasGrownText::
 	text "Your @"
 	TX_RAM wcd6d
-	db $0
+	text ""
 	line "has grown a lot!"
+
 	para "By level, it's"
 	line "grown by @"
 	TX_NUM wDayCareNumLevelsGrown,$1,$3
@@ -33,16 +36,17 @@ _DayCareMonHasGrownText::
 
 	para "Aren't I great?"
 	prompt
+
 _DayCareOweMoneyText::
 	text "You owe me ¥@"
 	TX_BCD wDayCareTotalCost, $c2
-	db $0
+	text ""
 	line "for the return"
 	cont "of this #MON."
 	done
 
 _DayCareGotMonBackText::
-	text $52, " got"
+	text "<PLAYER> got"
 	line "@"
 	TX_RAM wDayCareMonName
 	text " back!"
@@ -52,7 +56,7 @@ _DayCareMonNeedsMoreTimeText::
 	text "Back already?"
 	line "Your @"
 	TX_RAM wcd6d
-	db $0
+	text ""
 	cont "needs some more"
 	cont "time with me."
 	prompt
diff --git a/text/maps/digletts_cave_route_11_entrance.asm b/text/maps/DiglettsCaveRoute11.asm
index ecd3225e..ecd3225e 100644
--- a/text/maps/digletts_cave_route_11_entrance.asm
+++ b/text/maps/DiglettsCaveRoute11.asm
diff --git a/text/maps/digletts_cave_route_2_entrance.asm b/text/maps/DiglettsCaveRoute2.asm
index a04bbef7..a04bbef7 100644
--- a/text/maps/digletts_cave_route_2_entrance.asm
+++ b/text/maps/DiglettsCaveRoute2.asm
diff --git a/text/maps/fighting_dojo.asm b/text/maps/FightingDojo.asm
index a6ccc8c3..a6ccc8c3 100644
--- a/text/maps/fighting_dojo.asm
+++ b/text/maps/FightingDojo.asm
diff --git a/text/maps/fuchsia_house.asm b/text/maps/FuchsiaBillsGrandpasHouse.asm
index 7b6556b1..7b6556b1 100644
--- a/text/maps/fuchsia_house.asm
+++ b/text/maps/FuchsiaBillsGrandpasHouse.asm
diff --git a/text/maps/fuchsia_city.asm b/text/maps/FuchsiaCity.asm
index 0392a1ed..0392a1ed 100644
--- a/text/maps/fuchsia_city.asm
+++ b/text/maps/FuchsiaCity.asm
diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/FuchsiaGoodRodHouse.asm
index 195dc8ef..b1b8b2f2 100644
--- a/text/maps/fuchsia_fishing_house.asm
+++ b/text/maps/FuchsiaGoodRodHouse.asm
@@ -17,7 +17,7 @@ _FuchsiaHouse3Text_561c2::
 	para "Take this and"
 	line "fish, young one!"
 
-	para $52, " received"
+	para "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
@@ -29,7 +29,7 @@ _FuchsiaHouse3Text_56212::
 
 _FuchsiaHouse3Text_56217::
 	text "Hello there,"
-	line $52, "!"
+	line "<PLAYER>!"
 
 	para "How are the fish"
 	line "biting?"
diff --git a/text/maps/fuchsia_gym.asm b/text/maps/FuchsiaGym.asm
index 6beebc69..fc4e8f59 100644
--- a/text/maps/fuchsia_gym.asm
+++ b/text/maps/FuchsiaGym.asm
@@ -52,13 +52,13 @@ _FuchsiaGymText9::
 	done
 
 _ReceivedTM06Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
 _TM06ExplanationText::
-	db $0
+	text ""
 	para "TM06 contains"
 	line "TOXIC!"
 
@@ -78,6 +78,7 @@ _FuchsiaGymBattleText1::
 	cont "#MON!"
 
 	para "It's strategy!"
+
 	para "I'll show you how"
 	line "strategy can beat"
 	cont "brute strength!"
@@ -104,12 +105,14 @@ _FuchsiaGymEndBattleText2::
 	text "I'm done"
 	line "for!"
 	prompt
+
 _FuchsiaGymAfterBattleText2::
 	text "I will keep on"
 	line "training under"
 	cont "KOGA, my ninja"
 	cont "master!"
 	done
+
 _FuchsiaGymBattleText3::
 	text "Let's see you"
 	line "beat my special"
@@ -140,6 +143,7 @@ _FuchsiaGymEndBattleText4::
 	text "Whoa!"
 	line "He's got it!"
 	prompt
+
 _FuchsiaGymAfterBattleText4::
 	text "You impressed me!"
 	line "Here's a hint!"
@@ -203,10 +207,12 @@ _FuchsiaGymText_7564e::
 	para "KOGA might appear"
 	line "close, but he's"
 	cont "blocked off!"
+
 	para "You have to find"
 	line "gaps in the walls"
 	cont "to reach him!"
 	done
+
 _FuchsiaGymText_75653::
 	text "It's amazing how"
 	line "ninja can terrify"
diff --git a/text/maps/fuchsia_mart.asm b/text/maps/FuchsiaMart.asm
index 574898ce..574898ce 100644
--- a/text/maps/fuchsia_mart.asm
+++ b/text/maps/FuchsiaMart.asm
diff --git a/text/maps/fuchsia_meeting_room.asm b/text/maps/FuchsiaMeetingRoom.asm
index 10675ead..10675ead 100644
--- a/text/maps/fuchsia_meeting_room.asm
+++ b/text/maps/FuchsiaMeetingRoom.asm
diff --git a/text/maps/fuchsia_pokecenter.asm b/text/maps/FuchsiaPokecenter.asm
index a0def7eb..a0def7eb 100644
--- a/text/maps/fuchsia_pokecenter.asm
+++ b/text/maps/FuchsiaPokecenter.asm
diff --git a/text/maps/celadon_game_corner_1.asm b/text/maps/GameCorner.asm
index ad8a82b2..c3e4f88e 100644
--- a/text/maps/celadon_game_corner_1.asm
+++ b/text/maps/GameCorner.asm
@@ -64,7 +64,7 @@ _CeladonGameCornerText_48d9c::
 	prompt
 
 _Received10CoinsText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "10 coins!@@"
 
 _CeladonGameCornerText_48da7::
@@ -121,7 +121,7 @@ _CeladonGameCornerText_48e26::
 	prompt
 
 _Received20CoinsText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "20 coins!@@"
 
 _CeladonGameCornerText_48e31::
@@ -143,7 +143,7 @@ _CeladonGameCornerText_48e88::
 	prompt
 
 _CeladonGameCornerText_48e8d::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "20 coins!@@"
 
 _CeladonGameCornerText_48e93::
diff --git a/text/maps/celadon_prize_room.asm b/text/maps/GameCornerPrizeRoom.asm
index 6b2bb537..6b2bb537 100644
--- a/text/maps/celadon_prize_room.asm
+++ b/text/maps/GameCornerPrizeRoom.asm
diff --git a/text/maps/celadon_game_corner_2.asm b/text/maps/GameCorner_2.asm
index c288464d..c288464d 100755
--- a/text/maps/celadon_game_corner_2.asm
+++ b/text/maps/GameCorner_2.asm
diff --git a/text/maps/hall_of_fame.asm b/text/maps/HallOfFame.asm
index 8faefd3f..8faefd3f 100644
--- a/text/maps/hall_of_fame.asm
+++ b/text/maps/HallOfFame.asm
diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/IndigoPlateauLobby.asm
index 8487e29a..8487e29a 100644
--- a/text/maps/indigo_plateau_lobby.asm
+++ b/text/maps/IndigoPlateauLobby.asm
diff --git a/text/maps/lance.asm b/text/maps/LancesRoom.asm
index 22cc0dcd..e47b006e 100644
--- a/text/maps/lance.asm
+++ b/text/maps/LancesRoom.asm
@@ -24,7 +24,7 @@ _LanceBeforeBattleText::
 
 	para "Your LEAGUE"
 	line "challenge ends"
-	cont "with me, ", $52, "!"
+	cont "with me, <PLAYER>!"
 	done
 
 _LanceEndBattleText::
@@ -39,7 +39,7 @@ _LanceAfterBattleText::
 	text "I still can't"
 	line "believe my"
 	cont "dragons lost to"
-	cont "you, ", $52, "!"
+	cont "you, <PLAYER>!"
 
 	para "You are now the"
 	line "#MON LEAGUE"
@@ -54,7 +54,7 @@ _LanceAfterBattleText::
 	line "another trainer!"
 	cont "His name is..."
 
-	para $53, "!"
+	para "<RIVAL>!"
 	line "He beat the ELITE"
 	cont "FOUR before you!"
 
diff --git a/text/maps/lavender_house.asm b/text/maps/LavenderCuboneHouse.asm
index 66cc85a5..66cc85a5 100644
--- a/text/maps/lavender_house.asm
+++ b/text/maps/LavenderCuboneHouse.asm
diff --git a/text/maps/lavender_mart.asm b/text/maps/LavenderMart.asm
index 222712c6..222712c6 100644
--- a/text/maps/lavender_mart.asm
+++ b/text/maps/LavenderMart.asm
diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/LavenderPokecenter.asm
index 3aa7b67d..3aa7b67d 100644
--- a/text/maps/lavender_pokecenter.asm
+++ b/text/maps/LavenderPokecenter.asm
diff --git a/text/maps/lavender_town.asm b/text/maps/LavenderTown.asm
index 19b6c8c8..19b6c8c8 100644
--- a/text/maps/lavender_town.asm
+++ b/text/maps/LavenderTown.asm
diff --git a/text/maps/lorelei.asm b/text/maps/LoreleisRoom.asm
index fdbb55b4..fdbb55b4 100644
--- a/text/maps/lorelei.asm
+++ b/text/maps/LoreleisRoom.asm
diff --git a/text/maps/fujis_house.asm b/text/maps/MrFujisHouse.asm
index 7c61d1ed..f903eb6a 100644
--- a/text/maps/fujis_house.asm
+++ b/text/maps/MrFujisHouse.asm
@@ -34,7 +34,7 @@ _LavenderHouse1Text4::
 	text "NIDORINO: Gaoo!@@"
 
 _LavenderHouse1Text_1d94c::
-	text "MR.FUJI: ", $52, "."
+	text "MR.FUJI: <PLAYER>."
 
 	para "Your #DEX quest"
 	line "may fail without"
@@ -46,13 +46,14 @@ _LavenderHouse1Text_1d94c::
 	prompt
 
 _ReceivedFluteText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
 
 _FluteExplanationText::
-	db $0
+	text ""
+
 	para "Upon hearing #"
 	line "FLUTE, sleeping"
 	cont "#MON will"
diff --git a/text/maps/mr_psychics_house.asm b/text/maps/MrPsychicsHouse.asm
index 8c37383d..7be2e11e 100644
--- a/text/maps/mr_psychics_house.asm
+++ b/text/maps/MrPsychicsHouse.asm
@@ -6,7 +6,7 @@ _TM29PreReceiveText::
 	prompt
 
 _ReceivedTM29Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/mt_moon_1f.asm b/text/maps/MtMoon1F.asm
index 2e8c960e..2e8c960e 100644
--- a/text/maps/mt_moon_1f.asm
+++ b/text/maps/MtMoon1F.asm
diff --git a/text/maps/mt_moon_b1f.asm b/text/maps/MtMoonB1F.asm
index cd995ed5..755fa583 100644
--- a/text/maps/mt_moon_b1f.asm
+++ b/text/maps/MtMoonB1F.asm
@@ -1,3 +1,3 @@
 _MtMoonText1::
-	db $0
+	text ""
 	done
diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/MtMoonB2F.asm
index 9ad1d706..ab5da5a6 100644
--- a/text/maps/mt_moon_b2f.asm
+++ b/text/maps/MtMoonB2F.asm
@@ -30,7 +30,7 @@ _MtMoon3Text_49f64::
 	done
 
 _MtMoon3Text_49f6f::
-	text $52, " got the"
+	text "<PLAYER> got the"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/MtMoonPokecenter.asm
index ebcada87..ab3cf6ed 100644
--- a/text/maps/mt_moon_pokecenter.asm
+++ b/text/maps/MtMoonPokecenter.asm
@@ -17,7 +17,7 @@ _MtMoonPokecenterText3::
 	done
 
 _MtMoonPokecenterText5::
-	db $0
+	text ""
 	done
 
 _MagikarpSalesmanText1::
diff --git a/text/maps/museum_1f.asm b/text/maps/Museum1F.asm
index ecb511aa..ecb511aa 100644
--- a/text/maps/museum_1f.asm
+++ b/text/maps/Museum1F.asm
diff --git a/text/maps/museum_2f.asm b/text/maps/Museum2F.asm
index 12cfe8b2..12cfe8b2 100644
--- a/text/maps/museum_2f.asm
+++ b/text/maps/Museum2F.asm
diff --git a/text/maps/name_rater.asm b/text/maps/NameRatersHouse.asm
index 7194a927..7194a927 100644
--- a/text/maps/name_rater.asm
+++ b/text/maps/NameRatersHouse.asm
diff --git a/text/maps/oaks_lab.asm b/text/maps/OaksLab.asm
index 097fa931..097fa931 100644
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/OaksLab.asm
diff --git a/text/maps/pallet_town.asm b/text/maps/PalletTown.asm
index 741ad529..9ca8dc93 100644
--- a/text/maps/pallet_town.asm
+++ b/text/maps/PalletTown.asm
@@ -59,9 +59,9 @@ _PalletTownText5::
 	done
 
 _PalletTownText6::
-	text $52,"'s house "
+	text "<PLAYER>'s house "
 	done
 
 _PalletTownText7::
-	text $53,"'s house "
+	text "<RIVAL>'s house "
 	done
diff --git a/text/maps/pewter_city.asm b/text/maps/PewterCity.asm
index 03dfcc91..14240c9e 100644
--- a/text/maps/pewter_city.asm
+++ b/text/maps/PewterCity.asm
@@ -70,7 +70,7 @@ _PewterCityText_1945d::
 	cont "Follow me!"
 	done
 
-_PewterCityText_19462::
+_PewterCityText14::
 	text "If you have the"
 	line "right stuff, go"
 	cont "take on BROCK!"
diff --git a/text/maps/pewter_gym.asm b/text/maps/PewterGym.asm
index a8781b4d..0e156577 100644
--- a/text/maps/pewter_gym.asm
+++ b/text/maps/PewterGym.asm
@@ -44,11 +44,12 @@ _TM34PreReceiveText::
 	done
 
 _ReceivedTM34Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM34!@@"
 
 _TM34ExplanationText::
-	db $0
+	text ""
+
 	para "A TM contains a"
 	line "technique that"
 	cont "can be taught to"
@@ -83,11 +84,12 @@ _PewterGymText_5c4bc::
 	line "victory, here's"
 	cont "the BOULDERBADGE!"
 
-	para $52, " received"
+	para "<PLAYER> received"
 	line "the BOULDERBADGE!@@"
 
 _PewterGymText_5c4c1::
-	db $0
+	text ""
+
 	para "That's an official"
 	line "#MON LEAGUE"
 	cont "BADGE!"
diff --git a/text/maps/pewter_mart.asm b/text/maps/PewterMart.asm
index 4dbc3c02..4dbc3c02 100644
--- a/text/maps/pewter_mart.asm
+++ b/text/maps/PewterMart.asm
diff --git a/text/maps/pewter_house_1.asm b/text/maps/PewterNidoranHouse.asm
index 450e8372..450e8372 100644
--- a/text/maps/pewter_house_1.asm
+++ b/text/maps/PewterNidoranHouse.asm
diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/PewterPokecenter.asm
index 968f6af0..968f6af0 100644
--- a/text/maps/pewter_pokecenter.asm
+++ b/text/maps/PewterPokecenter.asm
diff --git a/text/maps/pewter_house_2.asm b/text/maps/PewterSpeechHouse.asm
index 615536f7..615536f7 100644
--- a/text/maps/pewter_house_2.asm
+++ b/text/maps/PewterSpeechHouse.asm
diff --git a/text/maps/fan_club.asm b/text/maps/PokemonFanClub.asm
index 5fcd469d..5fcd469d 100644
--- a/text/maps/fan_club.asm
+++ b/text/maps/PokemonFanClub.asm
diff --git a/text/maps/mansion_1f.asm b/text/maps/PokemonMansion1F.asm
index a3c517fb..a3c517fb 100644
--- a/text/maps/mansion_1f.asm
+++ b/text/maps/PokemonMansion1F.asm
diff --git a/text/maps/mansion_2f.asm b/text/maps/PokemonMansion2F.asm
index 378efb30..378efb30 100644
--- a/text/maps/mansion_2f.asm
+++ b/text/maps/PokemonMansion2F.asm
diff --git a/text/maps/mansion_3f.asm b/text/maps/PokemonMansion3F.asm
index 70331fdf..70331fdf 100644
--- a/text/maps/mansion_3f.asm
+++ b/text/maps/PokemonMansion3F.asm
diff --git a/text/maps/mansion_b1f.asm b/text/maps/PokemonMansionB1F.asm
index 1bc1ef89..1bc1ef89 100644
--- a/text/maps/mansion_b1f.asm
+++ b/text/maps/PokemonMansionB1F.asm
diff --git a/text/maps/pokemon_tower_1f.asm b/text/maps/PokemonTower1F.asm
index 50a2cd29..50a2cd29 100644
--- a/text/maps/pokemon_tower_1f.asm
+++ b/text/maps/PokemonTower1F.asm
diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/PokemonTower2F.asm
index ec2281fd..79323001 100644
--- a/text/maps/pokemon_tower_2f.asm
+++ b/text/maps/PokemonTower2F.asm
@@ -1,6 +1,6 @@
 _PokemonTower2Text_6062d::
-	text $53, ": Hey,"
-	line $52, "! What"
+	text "<RIVAL>: Hey,"
+	line "<PLAYER>! What"
 	cont "brings you here?"
 	cont "Your #MON"
 	cont "don't look dead!"
@@ -19,7 +19,7 @@ _PokemonTower2Text_60632::
 	prompt
 
 _PokemonTower2Text_60637::
-	text $53, ": Well,"
+	text "<RIVAL>: Well,"
 	line "look at all your"
 	cont "wimpy #MON!"
 
diff --git a/text/maps/pokemon_tower_3f.asm b/text/maps/PokemonTower3F.asm
index 67098e6b..67098e6b 100644
--- a/text/maps/pokemon_tower_3f.asm
+++ b/text/maps/PokemonTower3F.asm
diff --git a/text/maps/pokemon_tower_4f.asm b/text/maps/PokemonTower4F.asm
index 771325a0..771325a0 100644
--- a/text/maps/pokemon_tower_4f.asm
+++ b/text/maps/PokemonTower4F.asm
diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/PokemonTower5F.asm
index f2cadfcb..b329118d 100644
--- a/text/maps/pokemon_tower_5f.asm
+++ b/text/maps/PokemonTower5F.asm
@@ -66,6 +66,6 @@ _PokemonTower5Text7::
 	text "Entered purified,"
 	line "protected zone!"
 
-	para $52, "'s #MON"
+	para "<PLAYER>'s #MON"
 	line "are fully healed!"
 	done
diff --git a/text/maps/pokemon_tower_6f.asm b/text/maps/PokemonTower6F.asm
index 7532d56d..7532d56d 100644
--- a/text/maps/pokemon_tower_6f.asm
+++ b/text/maps/PokemonTower6F.asm
diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/PokemonTower7F.asm
index 652cf37a..652cf37a 100644
--- a/text/maps/pokemon_tower_7f.asm
+++ b/text/maps/PokemonTower7F.asm
diff --git a/text/maps/power_plant.asm b/text/maps/PowerPlant.asm
index e5df6674..e5df6674 100644
--- a/text/maps/power_plant.asm
+++ b/text/maps/PowerPlant.asm
diff --git a/text/maps/reds_house_1f.asm b/text/maps/RedsHouse1F.asm
index 633075bb..633075bb 100644
--- a/text/maps/reds_house_1f.asm
+++ b/text/maps/RedsHouse1F.asm
diff --git a/text/maps/rock_tunnel_b1f.asm b/text/maps/RockTunnel1F.asm
index 472c52f8..472c52f8 100644
--- a/text/maps/rock_tunnel_b1f.asm
+++ b/text/maps/RockTunnel1F.asm
diff --git a/text/maps/rock_tunnel_b2f.asm b/text/maps/RockTunnelB1F.asm
index d0437de7..d0437de7 100644
--- a/text/maps/rock_tunnel_b2f.asm
+++ b/text/maps/RockTunnelB1F.asm
diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/RockTunnelPokecenter.asm
index 0fc249ff..0fc249ff 100644
--- a/text/maps/rock_tunnel_pokecenter.asm
+++ b/text/maps/RockTunnelPokecenter.asm
diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/RocketHideoutB1F.asm
index 36117804..36117804 100644
--- a/text/maps/rocket_hideout_b1f.asm
+++ b/text/maps/RocketHideoutB1F.asm
diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/RocketHideoutB2F.asm
index c13c3593..c13c3593 100644
--- a/text/maps/rocket_hideout_b2f.asm
+++ b/text/maps/RocketHideoutB2F.asm
diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/RocketHideoutB3F.asm
index a146a383..a146a383 100644
--- a/text/maps/rocket_hideout_b3f.asm
+++ b/text/maps/RocketHideoutB3F.asm
diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/RocketHideoutB4F.asm
index d9e13457..d9e13457 100644
--- a/text/maps/rocket_hideout_b4f.asm
+++ b/text/maps/RocketHideoutB4F.asm
diff --git a/text/maps/rocket_hideout_elevator.asm b/text/maps/RocketHideoutElevator.asm
index 6f2aa638..6f2aa638 100644
--- a/text/maps/rocket_hideout_elevator.asm
+++ b/text/maps/RocketHideoutElevator.asm
diff --git a/text/maps/route_1.asm b/text/maps/Route1.asm
index adffd705..73188f09 100644
--- a/text/maps/route_1.asm
+++ b/text/maps/Route1.asm
@@ -13,7 +13,7 @@ _Route1ViridianMartSampleText::
 	prompt
 
 _Route1Text_1cae8::
-	text $52, " got"
+	text "<PLAYER> got"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/route_10.asm b/text/maps/Route10.asm
index a56018f0..a56018f0 100644
--- a/text/maps/route_10.asm
+++ b/text/maps/Route10.asm
diff --git a/text/maps/route_11.asm b/text/maps/Route11.asm
index 451d2bec..451d2bec 100644
--- a/text/maps/route_11.asm
+++ b/text/maps/Route11.asm
diff --git a/text/maps/route_11_gate.asm b/text/maps/Route11Gate1F.asm
index ef371d06..ef371d06 100644
--- a/text/maps/route_11_gate.asm
+++ b/text/maps/Route11Gate1F.asm
diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/Route11Gate2F.asm
index 10236081..10236081 100644
--- a/text/maps/route_11_gate_upstairs.asm
+++ b/text/maps/Route11Gate2F.asm
diff --git a/text/maps/route_12.asm b/text/maps/Route12.asm
index 27befda5..27befda5 100644
--- a/text/maps/route_12.asm
+++ b/text/maps/Route12.asm
diff --git a/text/maps/route_12_gate.asm b/text/maps/Route12Gate1F.asm
index 51d75539..51d75539 100644
--- a/text/maps/route_12_gate.asm
+++ b/text/maps/Route12Gate1F.asm
diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/Route12Gate2F.asm
index a18e3d57..5994b5ff 100644
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/Route12Gate2F.asm
@@ -9,7 +9,7 @@ _TM39PreReceiveText::
 	prompt
 
 _ReceivedTM39Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM39!@@"
 
 _TM39ExplanationText::
diff --git a/text/maps/route_12_house.asm b/text/maps/Route12SuperRodHouse.asm
index 4cb4beee..7dfaa74f 100644
--- a/text/maps/route_12_house.asm
+++ b/text/maps/Route12SuperRodHouse.asm
@@ -16,13 +16,14 @@ _Route12HouseText_564c5::
 	para "Take this and"
 	line "fish, young one!"
 
-	para $52, " received"
+	para "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
 
 _Route12HouseText_564ca::
-	db $0
+	text ""
+
 	para "Fishing is a way"
 	line "of life!"
 
@@ -39,7 +40,7 @@ _Route12HouseText_564cf::
 
 _Route12HouseText_564d4::
 	text "Hello there,"
-	line $52, "!"
+	line "<PLAYER>!"
 
 	para "Use the SUPER ROD"
 	line "in any water!"
diff --git a/text/maps/route_13.asm b/text/maps/Route13.asm
index e2718919..e2718919 100644
--- a/text/maps/route_13.asm
+++ b/text/maps/Route13.asm
diff --git a/text/maps/route_14.asm b/text/maps/Route14.asm
index 9a9de78c..9a9de78c 100644
--- a/text/maps/route_14.asm
+++ b/text/maps/Route14.asm
diff --git a/text/maps/route_15.asm b/text/maps/Route15.asm
index a23b8500..a23b8500 100644
--- a/text/maps/route_15.asm
+++ b/text/maps/Route15.asm
diff --git a/text/maps/route_15_gate.asm b/text/maps/Route15Gate1F.asm
index 0a526142..0a526142 100644
--- a/text/maps/route_15_gate.asm
+++ b/text/maps/Route15Gate1F.asm
diff --git a/text/maps/route_15_gate_upstairs.asm b/text/maps/Route15Gate2F.asm
index ade4a358..ade4a358 100644
--- a/text/maps/route_15_gate_upstairs.asm
+++ b/text/maps/Route15Gate2F.asm
diff --git a/text/maps/route_16.asm b/text/maps/Route16.asm
index 2ef6b02a..2ef6b02a 100644
--- a/text/maps/route_16.asm
+++ b/text/maps/Route16.asm
diff --git a/text/maps/route_16_house.asm b/text/maps/Route16FlyHouse.asm
index 534cee08..77efde87 100644
--- a/text/maps/route_16_house.asm
+++ b/text/maps/Route16FlyHouse.asm
@@ -9,7 +9,7 @@ _Route16HouseText3::
 	prompt
 
 _ReceivedHM02Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "HM02!@@"
 
 _HM02ExplanationText::
diff --git a/text/maps/route_16_gate.asm b/text/maps/Route16Gate1F.asm
index f548977f..f548977f 100644
--- a/text/maps/route_16_gate.asm
+++ b/text/maps/Route16Gate1F.asm
diff --git a/text/maps/route_16_gate_upstairs.asm b/text/maps/Route16Gate2F.asm
index d76b70ca..d76b70ca 100644
--- a/text/maps/route_16_gate_upstairs.asm
+++ b/text/maps/Route16Gate2F.asm
diff --git a/text/maps/route_17.asm b/text/maps/Route17.asm
index f7f59683..f7f59683 100644
--- a/text/maps/route_17.asm
+++ b/text/maps/Route17.asm
diff --git a/text/maps/route_18.asm b/text/maps/Route18.asm
index d09caf82..d09caf82 100644
--- a/text/maps/route_18.asm
+++ b/text/maps/Route18.asm
diff --git a/text/maps/route_18_gate.asm b/text/maps/Route18Gate1F.asm
index f2f51039..f2f51039 100644
--- a/text/maps/route_18_gate.asm
+++ b/text/maps/Route18Gate1F.asm
diff --git a/text/maps/route_18_gate_upstairs.asm b/text/maps/Route18Gate2F.asm
index 0fd2de09..0fd2de09 100644
--- a/text/maps/route_18_gate_upstairs.asm
+++ b/text/maps/Route18Gate2F.asm
diff --git a/text/maps/route_19.asm b/text/maps/Route19.asm
index 244e31d0..244e31d0 100644
--- a/text/maps/route_19.asm
+++ b/text/maps/Route19.asm
diff --git a/text/maps/route_2.asm b/text/maps/Route2.asm
index dd7becc0..dd7becc0 100644
--- a/text/maps/route_2.asm
+++ b/text/maps/Route2.asm
diff --git a/text/maps/route_20.asm b/text/maps/Route20.asm
index 1ccf0b6c..1ccf0b6c 100644
--- a/text/maps/route_20.asm
+++ b/text/maps/Route20.asm
diff --git a/text/maps/route_21.asm b/text/maps/Route21.asm
index 3451953f..3451953f 100644
--- a/text/maps/route_21.asm
+++ b/text/maps/Route21.asm
diff --git a/text/maps/route_22.asm b/text/maps/Route22.asm
index 342d5015..1754627f 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/Route22.asm
@@ -5,7 +5,7 @@ _Route22RivalDefeatedText1::
 	prompt
 
 _Route22Text_511bc::
-	text $53, ": What?"
+	text "<RIVAL>: What?"
 	line "Why do I have 2"
 	cont "#MON?"
 
@@ -21,8 +21,8 @@ _Route22RivalDefeatedText2::
 	prompt
 
 _Route22Text_511d0::
-	text $53, ": Hahaha!"
-	line $52, "! That's"
+	text "<RIVAL>: Hahaha!"
+	line "<PLAYER>! That's"
 	cont "your best? You're"
 	cont "nowhere near as"
 	cont "good as me, pal!"
@@ -32,8 +32,8 @@ _Route22Text_511d0::
 	prompt
 
 _Route22RivalBeforeBattleText1::
-	text $53, ": Hey!"
-	line $52, "!"
+	text "<RIVAL>: Hey!"
+	line "<PLAYER>!"
 
 	para "You're going to"
 	line "#MON LEAGUE?"
@@ -65,8 +65,8 @@ _Route22RivalAfterBattleText1::
 	done
 
 _Route22RivalBeforeBattleText2::
-	text $53, ": What?"
-	line $52, "! What a"
+	text "<RIVAL>: What?"
+	line "<PLAYER>! What a"
 	cont "surprise to see"
 	cont "you here!"
 
@@ -90,7 +90,7 @@ _Route22RivalAfterBattleText2::
 	line "up! I'm ready for"
 	cont "#MON LEAGUE!"
 
-	para $52, ", you need"
+	para "<PLAYER>, you need"
 	line "more practice!"
 
 	para "But hey, you know"
diff --git a/text/maps/pokemon_league_gate.asm b/text/maps/Route22Gate.asm
index ac92f4b0..ce3f6824 100644
--- a/text/maps/pokemon_league_gate.asm
+++ b/text/maps/Route22Gate.asm
@@ -7,7 +7,8 @@ _Route22GateText_1e704::
 	line "BOULDERBADGE yet!@@"
 
 _Route22GateText_1e715::
-	db $0
+	text ""
+
 	para "The rules are"
 	line "rules. I can't"
 	cont "let you pass."
diff --git a/text/maps/route_23.asm b/text/maps/Route23.asm
index 2ecb020e..a7e534de 100644
--- a/text/maps/route_23.asm
+++ b/text/maps/Route23.asm
@@ -27,7 +27,8 @@ _VictoryRoadGuardText2::
 	text "!@@"
 
 _VictoryRoadGuardText_513a3::
-	db $0
+	text ""
+
 	para "OK then! Please,"
 	line "go right ahead!"
 	done
diff --git a/text/maps/route_24.asm b/text/maps/Route24.asm
index 475a2602..0771aea3 100644
--- a/text/maps/route_24.asm
+++ b/text/maps/Route24.asm
@@ -5,6 +5,7 @@ _Route24Text_51510::
 
 _Route24Text_51515::
 	text ""
+
 	para "You just earned a"
 	line "fabulous prize!"
 	prompt
diff --git a/text/maps/route_25.asm b/text/maps/Route25.asm
index 4786d830..4786d830 100644
--- a/text/maps/route_25.asm
+++ b/text/maps/Route25.asm
diff --git a/text/maps/route_2_gate.asm b/text/maps/Route2Gate.asm
index 566830f8..566830f8 100644
--- a/text/maps/route_2_gate.asm
+++ b/text/maps/Route2Gate.asm
diff --git a/text/maps/route_2_house.asm b/text/maps/Route2TradeHouse.asm
index 46fc1062..46fc1062 100644
--- a/text/maps/route_2_house.asm
+++ b/text/maps/Route2TradeHouse.asm
diff --git a/text/maps/route_3.asm b/text/maps/Route3.asm
index 14d44e64..14d44e64 100644
--- a/text/maps/route_3.asm
+++ b/text/maps/Route3.asm
diff --git a/text/maps/route_4.asm b/text/maps/Route4.asm
index 0a36f4cd..0a36f4cd 100644
--- a/text/maps/route_4.asm
+++ b/text/maps/Route4.asm
diff --git a/text/maps/route_5.asm b/text/maps/Route5.asm
index 54ff0f84..54ff0f84 100644
--- a/text/maps/route_5.asm
+++ b/text/maps/Route5.asm
diff --git a/text/maps/route_6.asm b/text/maps/Route6.asm
index 71760449..71760449 100644
--- a/text/maps/route_6.asm
+++ b/text/maps/Route6.asm
diff --git a/text/maps/route_7.asm b/text/maps/Route7.asm
index 6500be96..6500be96 100644
--- a/text/maps/route_7.asm
+++ b/text/maps/Route7.asm
diff --git a/text/maps/route_8.asm b/text/maps/Route8.asm
index c0988d70..c0988d70 100644
--- a/text/maps/route_8.asm
+++ b/text/maps/Route8.asm
diff --git a/text/maps/route_9_1.asm b/text/maps/Route9.asm
index 741c990c..741c990c 100644
--- a/text/maps/route_9_1.asm
+++ b/text/maps/Route9.asm
diff --git a/text/maps/route_9_2.asm b/text/maps/Route9_2.asm
index f3803618..f3803618 100755
--- a/text/maps/route_9_2.asm
+++ b/text/maps/Route9_2.asm
diff --git a/text/maps/ss_anne_1.asm b/text/maps/SSAnne1F.asm
index 2bbdcbac..2bbdcbac 100644
--- a/text/maps/ss_anne_1.asm
+++ b/text/maps/SSAnne1F.asm
diff --git a/text/maps/ss_anne_8.asm b/text/maps/SSAnne1FRooms.asm
index 7a09303e..7a09303e 100644
--- a/text/maps/ss_anne_8.asm
+++ b/text/maps/SSAnne1FRooms.asm
diff --git a/text/maps/ss_anne_2.asm b/text/maps/SSAnne2F.asm
index ba231ac5..58d804ba 100644
--- a/text/maps/ss_anne_2.asm
+++ b/text/maps/SSAnne2F.asm
@@ -9,13 +9,13 @@ _SSAnne2Text1::
 	done
 
 _SSAnneRivalBeforeBattleText::
-	text $53, ": Bonjour!"
-	line $52, "!"
+	text "<RIVAL>: Bonjour!"
+	line "<PLAYER>!"
 
 	para "Imagine seeing"
 	line "you here!"
 
-	para $52, ", were you"
+	para "<PLAYER>, were you"
 	line "really invited?"
 
 	para "So how's your"
@@ -40,7 +40,7 @@ _SSAnneRivalDefeatedText::
 	prompt
 
 _SSAnneRivalWonText::
-	text $52, "! What are"
+	text "<PLAYER>! What are"
 	line "you, seasick?"
 
 	para "You should shape"
@@ -48,7 +48,7 @@ _SSAnneRivalWonText::
 	prompt
 
 _SSAnneRivalCaptainText::
-	text $53, ": I heard"
+	text "<RIVAL>: I heard"
 	line "there was a CUT"
 	cont "master on board."
 
diff --git a/text/maps/ss_anne_9.asm b/text/maps/SSAnne2FRooms.asm
index c9b29119..c9b29119 100644
--- a/text/maps/ss_anne_9.asm
+++ b/text/maps/SSAnne2FRooms.asm
diff --git a/text/maps/ss_anne_3.asm b/text/maps/SSAnne3F.asm
index 76490594..76490594 100644
--- a/text/maps/ss_anne_3.asm
+++ b/text/maps/SSAnne3F.asm
diff --git a/text/maps/ss_anne_10.asm b/text/maps/SSAnneB1FRooms.asm
index 7df629b5..7df629b5 100644
--- a/text/maps/ss_anne_10.asm
+++ b/text/maps/SSAnneB1FRooms.asm
diff --git a/text/maps/ss_anne_5.asm b/text/maps/SSAnneBow.asm
index 76cd5631..76cd5631 100644
--- a/text/maps/ss_anne_5.asm
+++ b/text/maps/SSAnneBow.asm
diff --git a/text/maps/ss_anne_7.asm b/text/maps/SSAnneCaptainsRoom.asm
index a046e600..bbc52bd7 100644
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/SSAnneCaptainsRoom.asm
@@ -3,7 +3,7 @@ _SSAnne7RubText::
 	line "I feel hideous..."
 	cont "Urrp! Seasick..."
 
-	para $52, " rubbed"
+	para "<PLAYER> rubbed"
 	line "the CAPTAIN's"
 	cont "back!"
 
@@ -31,7 +31,7 @@ _ReceivingHM01Text::
 	prompt
 
 _ReceivedHM01Text::
-	text $52, " got"
+	text "<PLAYER> got"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/ss_anne_6.asm b/text/maps/SSAnneKitchen.asm
index b7784019..b7784019 100644
--- a/text/maps/ss_anne_6.asm
+++ b/text/maps/SSAnneKitchen.asm
diff --git a/text/maps/safari_zone_center.asm b/text/maps/SafariZoneCenter.asm
index 09918f93..09918f93 100644
--- a/text/maps/safari_zone_center.asm
+++ b/text/maps/SafariZoneCenter.asm
diff --git a/text/maps/safari_zone_rest_house_1.asm b/text/maps/SafariZoneCenterRestHouse.asm
index b6c87818..b6c87818 100644
--- a/text/maps/safari_zone_rest_house_1.asm
+++ b/text/maps/SafariZoneCenterRestHouse.asm
diff --git a/text/maps/safari_zone_east.asm b/text/maps/SafariZoneEast.asm
index eebe5de7..eebe5de7 100644
--- a/text/maps/safari_zone_east.asm
+++ b/text/maps/SafariZoneEast.asm
diff --git a/text/maps/safari_zone_rest_house_3.asm b/text/maps/SafariZoneEastRestHouse.asm
index d5f7abc8..d5f7abc8 100644
--- a/text/maps/safari_zone_rest_house_3.asm
+++ b/text/maps/SafariZoneEastRestHouse.asm
diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/SafariZoneGate.asm
index 065de6a9..a426d132 100644
--- a/text/maps/safari_zone_entrance.asm
+++ b/text/maps/SafariZoneGate.asm
@@ -41,11 +41,12 @@ SafariZoneEntranceText_9e747::
 	line "special # BALL"
 	cont "here."
 
-	para $52, " received"
+	para "<PLAYER> received"
 	line "30 SAFARI BALLs!@@"
 
 _SafariZoneEntranceText_75360::
-	db $0
+	text ""
+
 	para "We'll call you on"
 	line "the PA when you"
 	cont "run out of time"
@@ -95,7 +96,8 @@ _SafariZoneEntranceText_753f0::
 	done
 
 _SafariZoneLowCostText1::
-	db 0
+	text ""
+
 	para "Oh, all right, pay"
 	line "me what you have."
 	prompt
@@ -106,7 +108,8 @@ _SafariZoneLowCostText2::
 	done
 
 _SafariZoneLowCostText3::
-	db 0
+	text ""
+
 	para "You're persistent,"
 	line "aren't you?"
 
@@ -115,7 +118,7 @@ _SafariZoneLowCostText3::
 	cont "just this once!@@"
 
 _SafariZoneLowCostText4::
-	db 0
+	text ""
 	done
 
 _SafariZoneLowCostText5::
diff --git a/text/maps/safari_zone_north.asm b/text/maps/SafariZoneNorth.asm
index 1e148f0b..1e148f0b 100644
--- a/text/maps/safari_zone_north.asm
+++ b/text/maps/SafariZoneNorth.asm
diff --git a/text/maps/safari_zone_rest_house_4.asm b/text/maps/SafariZoneNorthRestHouse.asm
index 93f02c8f..93f02c8f 100644
--- a/text/maps/safari_zone_rest_house_4.asm
+++ b/text/maps/SafariZoneNorthRestHouse.asm
diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/SafariZoneSecretHouse.asm
index 1bbe89fd..3df79d90 100644
--- a/text/maps/safari_zone_secret_house.asm
+++ b/text/maps/SafariZoneSecretHouse.asm
@@ -15,7 +15,7 @@ _SecretHouseText_4a350::
 	prompt
 
 _ReceivedHM03Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/safari_zone_west.asm b/text/maps/SafariZoneWest.asm
index dcb2fe6c..dcb2fe6c 100644
--- a/text/maps/safari_zone_west.asm
+++ b/text/maps/SafariZoneWest.asm
diff --git a/text/maps/safari_zone_rest_house_2.asm b/text/maps/SafariZoneWestRestHouse.asm
index 94802b13..94802b13 100644
--- a/text/maps/safari_zone_rest_house_2.asm
+++ b/text/maps/SafariZoneWestRestHouse.asm
diff --git a/text/maps/saffron_city.asm b/text/maps/SaffronCity.asm
index a0422c8c..a0422c8c 100644
--- a/text/maps/saffron_city.asm
+++ b/text/maps/SaffronCity.asm
diff --git a/text/maps/saffron_gates.asm b/text/maps/SaffronGates.asm
index 0fd11d88..35bcadbb 100644
--- a/text/maps/saffron_gates.asm
+++ b/text/maps/SaffronGates.asm
@@ -16,7 +16,8 @@ _SaffronGateText_8aaa9::
 	cont "Gee, thanks!@@"
 
 _SaffronGateText_1dff1::
-	db $0
+	text ""
+
 	para "..."
 	line "Glug, glug..."
 	cont "..."
diff --git a/text/maps/saffron_gym.asm b/text/maps/SaffronGym.asm
index 23cc211b..52ea321b 100644
--- a/text/maps/saffron_gym.asm
+++ b/text/maps/SaffronGym.asm
@@ -55,11 +55,12 @@ _SaffronGymText_5d173::
 	done
 
 ReceivedTM46Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM46!@@"
 
 _TM46ExplanationText::
-	db $0
+	text ""
+
 	para "TM46 is PSYWAVE!"
 	line "It uses powerful"
 	cont "psychic waves to"
diff --git a/text/maps/saffron_mart.asm b/text/maps/SaffronMart.asm
index a43b0d94..a43b0d94 100644
--- a/text/maps/saffron_mart.asm
+++ b/text/maps/SaffronMart.asm
diff --git a/text/maps/saffron_house.asm b/text/maps/SaffronPidgeyHouse.asm
index 214bf089..214bf089 100644
--- a/text/maps/saffron_house.asm
+++ b/text/maps/SaffronPidgeyHouse.asm
diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/SaffronPokecenter.asm
index 6548aff8..6548aff8 100644
--- a/text/maps/saffron_pokecenter.asm
+++ b/text/maps/SaffronPokecenter.asm
diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/SeafoamIslandsB4F.asm
index 608d165f..608d165f 100644
--- a/text/maps/seafoam_islands_b4f.asm
+++ b/text/maps/SeafoamIslandsB4F.asm
diff --git a/text/maps/silph_co_10f.asm b/text/maps/SilphCo10F.asm
index 09894764..09894764 100644
--- a/text/maps/silph_co_10f.asm
+++ b/text/maps/SilphCo10F.asm
diff --git a/text/maps/silph_co_11f.asm b/text/maps/SilphCo11F.asm
index 2fb84f17..d2bbde7d 100644
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/SilphCo11F.asm
@@ -20,7 +20,7 @@ _SilphCoPresidentText::
 	prompt
 
 _ReceivedSilphCoMasterBallText::
-	text $52, " got a"
+	text "<PLAYER> got a"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
@@ -87,7 +87,7 @@ _SilphCo10Text_62335::
 	para "But, TEAM ROCKET"
 	line "will never fall!"
 
-	para $52, "! Never"
+	para "<PLAYER>! Never"
 	line "forget that all"
 	cont "#MON exist"
 	cont "for TEAM ROCKET!"
diff --git a/text/maps/silph_co_1f.asm b/text/maps/SilphCo1F.asm
index 1ef80189..1ef80189 100644
--- a/text/maps/silph_co_1f.asm
+++ b/text/maps/SilphCo1F.asm
diff --git a/text/maps/silph_co_2f.asm b/text/maps/SilphCo2F.asm
index 5ef349d5..912bdef9 100644
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/SilphCo2F.asm
@@ -10,7 +10,7 @@ _SilphCo2Text_59ded::
 	prompt
 
 _ReceivedTM36Text::
-	text $52, " got"
+	text "<PLAYER> got"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/silph_co_3f.asm b/text/maps/SilphCo3F.asm
index a514d3ef..b6a023f9 100644
--- a/text/maps/silph_co_3f.asm
+++ b/text/maps/SilphCo3F.asm
@@ -4,7 +4,7 @@ _SilphCo3Text_59ff9::
 	done
 
 _SilphCo3Text_59ffe::
-	text $52, "! You and"
+	text "<PLAYER>! You and"
 	line "your #MON"
 	cont "saved us!"
 	done
diff --git a/text/maps/silph_co_4f.asm b/text/maps/SilphCo4F.asm
index 5b484ec7..5b484ec7 100644
--- a/text/maps/silph_co_4f.asm
+++ b/text/maps/SilphCo4F.asm
diff --git a/text/maps/silph_co_5f.asm b/text/maps/SilphCo5F.asm
index 9c8bfd41..9c8bfd41 100644
--- a/text/maps/silph_co_5f.asm
+++ b/text/maps/SilphCo5F.asm
diff --git a/text/maps/silph_co_6f.asm b/text/maps/SilphCo6F.asm
index 90456b5c..90456b5c 100644
--- a/text/maps/silph_co_6f.asm
+++ b/text/maps/SilphCo6F.asm
diff --git a/text/maps/silph_co_7f.asm b/text/maps/SilphCo7F.asm
index 0373355a..8f7b6ca2 100644
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/SilphCo7F.asm
@@ -145,12 +145,12 @@ _SilphCo7AfterBattleText4::
 	done
 
 _SilphCo7Text_51ebe::
-	text $53, ": What"
-	line "kept you ", $52, "?"
+	text "<RIVAL>: What"
+	line "kept you <PLAYER>?"
 	done
 
 _SilphCo7Text_51ec3::
-	text $53, ": Hahaha!"
+	text "<RIVAL>: Hahaha!"
 	line "I thought you'd"
 	cont "turn up if I"
 	cont "waited here!"
@@ -173,7 +173,7 @@ _SilphCo7Text_51ec8::
 	prompt
 
 _SilphCo7Text_51ecd::
-	text $53, ": How can"
+	text "<RIVAL>: How can"
 	line "I put this?"
 
 	para "You're not good"
@@ -182,7 +182,7 @@ _SilphCo7Text_51ecd::
 	prompt
 
 _SilphCo7Text_51ed2::
-	text "Well, ", $52, "!"
+	text "Well, <PLAYER>!"
 
 	para "I'm moving on up"
 	line "and ahead!"
@@ -202,7 +202,7 @@ _SilphCo7Text_51ed2::
 	line "world's most"
 	cont "powerful trainer!"
 
-	para $52, ", well"
+	para "<PLAYER>, well"
 	line "good luck to you!"
 	cont "Don't sweat it!"
 	cont "Smell ya!"
diff --git a/text/maps/silph_co_8f.asm b/text/maps/SilphCo8F.asm
index fabae5e6..fabae5e6 100644
--- a/text/maps/silph_co_8f.asm
+++ b/text/maps/SilphCo8F.asm
diff --git a/text/maps/silph_co_9f.asm b/text/maps/SilphCo9F.asm
index fd1aa91c..fd1aa91c 100644
--- a/text/maps/silph_co_9f.asm
+++ b/text/maps/SilphCo9F.asm
diff --git a/text/maps/underground_path_route_6_entrance.asm b/text/maps/UndergroundPathRoute6.asm
index dacc44f7..dacc44f7 100644
--- a/text/maps/underground_path_route_6_entrance.asm
+++ b/text/maps/UndergroundPathRoute6.asm
diff --git a/text/maps/underground_path_route_7_entrance.asm b/text/maps/UndergroundPathRoute7.asm
index 5cde3614..5cde3614 100644
--- a/text/maps/underground_path_route_7_entrance.asm
+++ b/text/maps/UndergroundPathRoute7.asm
diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/UndergroundPathRoute7Copy.asm
index 4e0dc3ca..4e0dc3ca 100644
--- a/text/maps/underground_path_route_7_entrance_unused.asm
+++ b/text/maps/UndergroundPathRoute7Copy.asm
diff --git a/text/maps/underground_path_route_8_entrance.asm b/text/maps/UndergroundPathRoute8.asm
index da785c8e..da785c8e 100644
--- a/text/maps/underground_path_route_8_entrance.asm
+++ b/text/maps/UndergroundPathRoute8.asm
diff --git a/text/maps/vermilion_city.asm b/text/maps/VermilionCity.asm
index 742d0c5d..742d0c5d 100644
--- a/text/maps/vermilion_city.asm
+++ b/text/maps/VermilionCity.asm
diff --git a/text/maps/vermilion_dock.asm b/text/maps/VermilionDock.asm
index 5d998e82..5d998e82 100644
--- a/text/maps/vermilion_dock.asm
+++ b/text/maps/VermilionDock.asm
diff --git a/text/maps/vermilion_gym.asm b/text/maps/VermilionGym.asm
index a7cce733..2d9654c8 100644
--- a/text/maps/vermilion_gym.asm
+++ b/text/maps/VermilionGym.asm
@@ -1,4 +1,4 @@
-_VermilionGymText_5cb6d::
+_LTSurgePreBattleText::
 	text "Ten-hut! Welcome"
 	line "to VERMILION GYM!"
 
@@ -20,7 +20,7 @@ _VermilionGymText_5cb6d::
 	line "into surrender!"
 	done
 
-_VermilionGymText_5cb72::
+_LTSurgePostBattleAdviceText::
 	text "A little word of"
 	line "advice, kid!"
 
@@ -32,7 +32,7 @@ _VermilionGymText_5cb72::
 	cont "type #MON!"
 	done
 
-_VermilionGymText_5cb77::
+_LTSurgeThunderbadgeInfoText::
 	text "The THUNDERBADGE"
 	line "cranks up your"
 	cont "#MON's SPEED!"
@@ -46,13 +46,14 @@ _VermilionGymText_5cb77::
 	done
 
 _ReceivedTM24Text::
-	text $52, " received "
+	text "<PLAYER> received "
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
 _TM24ExplanationText::
-	db $0
+	text ""
+
 	para "TM24 contains"
 	line "THUNDERBOLT!"
 
@@ -133,7 +134,7 @@ _VermilionGymAfterBattleText3::
 	cont "next to it!"
 	done
 
-_VermilionGymText_5cbf4::
+_VermilionGymFanPreBattleText::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -159,7 +160,7 @@ _VermilionGymText_5cbf4::
 	cont "get to him!"
 	done
 
-_VermilionGymText_5cbf9::
+_VermilionGymFanPostBattleText::
 	text "Whew! That match"
 	line "was electric!"
 	done
diff --git a/text/maps/vermilion_mart.asm b/text/maps/VermilionMart.asm
index 10743989..10743989 100644
--- a/text/maps/vermilion_mart.asm
+++ b/text/maps/VermilionMart.asm
diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/VermilionOldRodHouse.asm
index 0fa28cae..32526e36 100644
--- a/text/maps/vermilion_fishing_house.asm
+++ b/text/maps/VermilionOldRodHouse.asm
@@ -16,13 +16,14 @@ _VermilionHouse2Text_560b6::
 	para "Take this and"
 	line "fish, young one!"
 
-	para $52, " received"
+	para "<PLAYER> received"
 	line "an @"
 	TX_RAM wcf4b
 	text "!@@"
 
 _VermilionHouse2Text_560bb::
-	db $0
+	text ""
+
 	para "Fishing is a way"
 	line "of life!"
 
@@ -39,7 +40,7 @@ _VermilionHouse2Text_560c0::
 
 _VermilionHouse2Text_560c5::
 	text "Hello there,"
-	line $52, "!"
+	line "<PLAYER>!"
 
 	para "How are the fish"
 	line "biting?"
diff --git a/text/maps/vermilion_house.asm b/text/maps/VermilionPidgeyHouse.asm
index 91c18708..91c18708 100644
--- a/text/maps/vermilion_house.asm
+++ b/text/maps/VermilionPidgeyHouse.asm
diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/VermilionPokecenter.asm
index c9e9a581..c9e9a581 100644
--- a/text/maps/vermilion_pokecenter.asm
+++ b/text/maps/VermilionPokecenter.asm
diff --git a/text/maps/victory_road_1f.asm b/text/maps/VictoryRoad1F.asm
index 1523db88..1523db88 100644
--- a/text/maps/victory_road_1f.asm
+++ b/text/maps/VictoryRoad1F.asm
diff --git a/text/maps/victory_road_2f.asm b/text/maps/VictoryRoad2F.asm
index cdcf6e36..ec9dcf4f 100644
--- a/text/maps/victory_road_2f.asm
+++ b/text/maps/VictoryRoad2F.asm
@@ -29,7 +29,7 @@ _VictoryRoad2EndBattleText2::
 	prompt
 
 _VictoryRoad2AfterBattleText2::
-	text $53, " also came"
+	text "<RIVAL> also came"
 	line "through here!"
 	done
 
diff --git a/text/maps/victory_road_3f.asm b/text/maps/VictoryRoad3F.asm
index 07e0be70..07e0be70 100644
--- a/text/maps/victory_road_3f.asm
+++ b/text/maps/VictoryRoad3F.asm
diff --git a/text/maps/viridian_city.asm b/text/maps/ViridianCity.asm
index 46c01fc8..22d5d7ba 100644
--- a/text/maps/viridian_city.asm
+++ b/text/maps/ViridianCity.asm
@@ -120,7 +120,7 @@ _ViridianCityText_191ca::
 	prompt
 
 _ReceivedTM42Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM42!@@"
 
 _TM42Explanation::
diff --git a/text/maps/viridian_forest.asm b/text/maps/ViridianForest.asm
index f88a484c..f88a484c 100644
--- a/text/maps/viridian_forest.asm
+++ b/text/maps/ViridianForest.asm
diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/ViridianForestNorthGate.asm
index ab6a5a1d..ab6a5a1d 100644
--- a/text/maps/viridian_forest_exit.asm
+++ b/text/maps/ViridianForestNorthGate.asm
diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/ViridianForestSouthGate.asm
index a5278742..a5278742 100644
--- a/text/maps/viridian_forest_entrance.asm
+++ b/text/maps/ViridianForestSouthGate.asm
diff --git a/text/maps/viridian_gym.asm b/text/maps/ViridianGym.asm
index 795447a5..53b78a0f 100644
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/ViridianGym.asm
@@ -60,11 +60,12 @@ _ViridianGymText12::
 	done
 
 _ReceivedTM27Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM27!@@"
 
 _TM27ExplanationText::
-	db $0
+	text ""
+
 	para "TM27 is FISSURE!"
 	line "It will take out"
 	cont "#MON with just"
diff --git a/text/maps/viridian_mart.asm b/text/maps/ViridianMart.asm
index 5f4e147c..31a843ae 100644
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/ViridianMart.asm
@@ -16,7 +16,7 @@ ViridianMartParcelQuestText::
 	line "Will you take it"
 	cont "to him?"
 
-	para $52, " got"
+	para "<PLAYER> got"
 	line "OAK's PARCEL!@@"
 
 _ViridianMartText2::
diff --git a/text/maps/viridian_house.asm b/text/maps/ViridianNicknameHouse.asm
index 757f597a..757f597a 100644
--- a/text/maps/viridian_house.asm
+++ b/text/maps/ViridianNicknameHouse.asm
diff --git a/text/maps/viridian_pokecenter.asm b/text/maps/ViridianPokecenter.asm
index 4ac18bf6..4ac18bf6 100755
--- a/text/maps/viridian_pokecenter.asm
+++ b/text/maps/ViridianPokecenter.asm
diff --git a/text/maps/school.asm b/text/maps/ViridianSchoolHouse.asm
index 3c5f6379..3c5f6379 100644
--- a/text/maps/school.asm
+++ b/text/maps/ViridianSchoolHouse.asm
diff --git a/text/maps/wardens_house.asm b/text/maps/WardensHouse.asm
index d4da3781..7efddb90 100644
--- a/text/maps/wardens_house.asm
+++ b/text/maps/WardensHouse.asm
@@ -18,12 +18,13 @@ _WardenGibberishText3::
 	done
 
 _WardenTeethText1::
-	text $52, " gave the"
+	text "<PLAYER> gave the"
 	line "GOLD TEETH to the"
 	cont "WARDEN!@@"
 
 _WardenTeethText2::
-	db $0
+	text ""
+
 	para "The WARDEN popped"
 	line "in his teeth!"
 	prompt
@@ -42,7 +43,7 @@ _WardenThankYouText::
 	prompt
 
 _ReceivedHM04Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/oakspeech.asm b/text/oakspeech.asm
index 5911092c..e006d16f 100644
--- a/text/oakspeech.asm
+++ b/text/oakspeech.asm
@@ -42,7 +42,7 @@ _IntroduceRivalText::
 	prompt
 
 _OakSpeechText3::
-	text $52,"!"
+	text "<PLAYER>!"
 
 	para "Your very own"
 	line "#MON legend is"