diff --git a/text.asm b/text.asm
index 866d4a7f..fc075e19 100644
--- a/text.asm
+++ b/text.asm
@@ -2239,7 +2239,7 @@ _CoinsScatteredText::
 	prompt
 
 _GettingPumpedText::
-	text $5a, "'s"
+	text "<USER>'s"
 	line "getting pumped!"
 	prompt
 
diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm
index 4957f4d4..9ef5059a 100644
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.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/bills_house.asm b/text/maps/bills_house.asm
index 463b13e6..5ece48d7 100644
--- a/text/maps/bills_house.asm
+++ b/text/maps/bills_house.asm
@@ -54,7 +54,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/blues_house.asm
index b676ea69..1898636a 100644
--- a/text/maps/blues_house.asm
+++ b/text/maps/blues_house.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/bruno.asm
index 39898eb5..9c493c4a 100644
--- a/text/maps/bruno.asm
+++ b/text/maps/bruno.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_city.asm b/text/maps/celadon_city.asm
index e2470ec1..1dbd5cdf 100644
--- a/text/maps/celadon_city.asm
+++ b/text/maps/celadon_city.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_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm
index 4689b023..5d104cf5 100644
--- a/text/maps/celadon_dept_store_roof.asm
+++ b/text/maps/celadon_dept_store_roof.asm
@@ -14,7 +14,7 @@ _CeladonMartRoofText_484f3::
 	line "from me!@@"
 
 _CeladonMartRoofText_484f9::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
@@ -40,7 +40,7 @@ _CeladonMartRoofText_48504::
 	line "from me!@@"
 
 _CeladonMartRoofText_4850a::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
@@ -66,7 +66,7 @@ _CeladonMartRoofText_48515::
 	line "from me!@@"
 
 _ReceivedTM49Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM49!@@"
 
 _CeladonMartRoofText_48520::
diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm
index fd31eb20..dc5e9350 100644
--- a/text/maps/celadon_diner.asm
+++ b/text/maps/celadon_diner.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_game_corner.asm b/text/maps/celadon_game_corner.asm
index 2d263e80..1e59f83e 100644
--- a/text/maps/celadon_game_corner.asm
+++ b/text/maps/celadon_game_corner.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_gym.asm b/text/maps/celadon_gym.asm
index 99833ee1..d8f9394c 100644
--- a/text/maps/celadon_gym.asm
+++ b/text/maps/celadon_gym.asm
@@ -62,7 +62,7 @@ _CeladonGymText9::
 	done
 
 _ReceivedTM21Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm
index 48d97e05..b5319d04 100644
--- a/text/maps/cerulean_city.asm
+++ b/text/maps/cerulean_city.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,7 +69,7 @@ _CeruleanCityText_196d9::
 	done
 
 _ReceivedTM28Text::
-	text $52, " recovered"
+	text "<PLAYER> recovered"
 	line "TM28!@@"
 
 _ReceivedTM28Text2::
diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm
index dd6baaff..1d1d6d1c 100644
--- a/text/maps/cerulean_gym.asm
+++ b/text/maps/cerulean_gym.asm
@@ -46,7 +46,7 @@ _CeruleanGymText_5c7c8::
 	done
 
 _ReceivedTM11Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM11!@@"
 
 _CeruleanGymText_5c7d3::
diff --git a/text/maps/champion.asm b/text/maps/champion.asm
index 3ca7aadf..61050565 100644
--- a/text/maps/champion.asm
+++ b/text/maps/champion.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/cinnabar_gym.asm
index b14f6f60..173f94d2 100644
--- a/text/maps/cinnabar_gym.asm
+++ b/text/maps/cinnabar_gym.asm
@@ -42,7 +42,7 @@ _BlaineBadgeText::
 	done
 
 _ReceivedTM38Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
@@ -204,6 +204,6 @@ _CinnabarGymText_75ac2::
 	done
 
 _CinnabarGymText_75ac7::
-	text $52, "! You beat"
+	text "<PLAYER>! You beat"
 	line "that fire brand!"
 	done
diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/cinnabar_lab_fossil_room.asm
index 565104b3..3978814e 100644
--- a/text/maps/cinnabar_lab_fossil_room.asm
+++ b/text/maps/cinnabar_lab_fossil_room.asm
@@ -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/cinnabar_lab_metronome_room.asm
index e2fbb558..fa04677f 100644
--- a/text/maps/cinnabar_lab_metronome_room.asm
+++ b/text/maps/cinnabar_lab_metronome_room.asm
@@ -7,7 +7,7 @@ _TM35PreReceiveText::
 	prompt
 
 _ReceivedTM35Text::
-	text $52, " received "
+	text "<PLAYER> received "
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm
index 90833127..44988e58 100644
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/copycats_house_2f.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,7 +27,7 @@ _TM31PreReceiveText::
 	prompt
 
 _ReceivedTM31Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
@@ -41,12 +41,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_1.asm b/text/maps/daycare_1.asm
index 6e3c5737..f4cec10e 100644
--- a/text/maps/daycare_1.asm
+++ b/text/maps/daycare_1.asm
@@ -46,7 +46,7 @@ _DayCareOweMoneyText::
 	done
 
 _DayCareGotMonBackText::
-	text $52, " got"
+	text "<PLAYER> got"
 	line "@"
 	TX_RAM wDayCareMonName
 	text " back!"
diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm
index 195dc8ef..b1b8b2f2 100644
--- a/text/maps/fuchsia_fishing_house.asm
+++ b/text/maps/fuchsia_fishing_house.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_2.asm b/text/maps/fuchsia_gym_2.asm
index ba1970e6..2913fb8f 100644
--- a/text/maps/fuchsia_gym_2.asm
+++ b/text/maps/fuchsia_gym_2.asm
@@ -25,7 +25,7 @@ _FuchsiaGymText9::
 	done
 
 _ReceivedTM06Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm
index 7c61d1ed..86cade68 100644
--- a/text/maps/fujis_house.asm
+++ b/text/maps/fujis_house.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,7 +46,7 @@ _LavenderHouse1Text_1d94c::
 	prompt
 
 _ReceivedFluteText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/lance.asm b/text/maps/lance.asm
index 0313b158..ed3dcada 100644
--- a/text/maps/lance.asm
+++ b/text/maps/lance.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/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm
index 8c37383d..7be2e11e 100644
--- a/text/maps/mr_psychics_house.asm
+++ b/text/maps/mr_psychics_house.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_b2f.asm b/text/maps/mt_moon_b2f.asm
index 462c9d3c..472649b9 100644
--- a/text/maps/mt_moon_b2f.asm
+++ b/text/maps/mt_moon_b2f.asm
@@ -9,7 +9,7 @@ _MtMoon3Text_49f64::
 	done
 
 _MtMoon3Text_49f6f::
-	text $52, " got the"
+	text "<PLAYER> got the"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm
index 1f02c355..7a6f57b7 100644
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -10,7 +10,7 @@ _OaksLabText40::
 	cont "greedy like you!"
 
 	para "Go ahead and"
-	line "choose, ", $52, "!"
+	line "choose, <PLAYER>!"
 	done
 
 _OaksLabText41::
@@ -49,7 +49,7 @@ _OaksLabMonEnergeticText::
 	prompt
 
 _OaksLabReceivedMonText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "a @"
 	TX_RAM wcd6d
 	text "!@@"
diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm
index 64b3325b..d5eda74f 100644
--- a/text/maps/pallet_town.asm
+++ b/text/maps/pallet_town.asm
@@ -47,9 +47,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_gym_2.asm b/text/maps/pewter_gym_2.asm
index ff5f7242..86b97018 100644
--- a/text/maps/pewter_gym_2.asm
+++ b/text/maps/pewter_gym_2.asm
@@ -18,7 +18,7 @@ _TM34PreReceiveText::
 	done
 
 _ReceivedTM34Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM34!@@"
 
 _TM34ExplanationText::
@@ -57,7 +57,7 @@ _PewterGymText_5c4bc::
 	line "victory, here's"
 	cont "the BOULDERBADGE!"
 
-	para $52, " received"
+	para "<PLAYER> received"
 	line "the BOULDERBADGE!@@"
 
 _PewterGymText_5c4c1::
diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/pokemon_tower_2f.asm
index ec2281fd..79323001 100644
--- a/text/maps/pokemon_tower_2f.asm
+++ b/text/maps/pokemon_tower_2f.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_5f.asm b/text/maps/pokemon_tower_5f.asm
index f2cadfcb..b329118d 100644
--- a/text/maps/pokemon_tower_5f.asm
+++ b/text/maps/pokemon_tower_5f.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/route_1.asm b/text/maps/route_1.asm
index adffd705..73188f09 100644
--- a/text/maps/route_1.asm
+++ b/text/maps/route_1.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_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm
index 1f2af788..95a89527 100644
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/route_12_gate_upstairs.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/route_12_house.asm
index 4cb4beee..e04ce5fb 100644
--- a/text/maps/route_12_house.asm
+++ b/text/maps/route_12_house.asm
@@ -16,7 +16,7 @@ _Route12HouseText_564c5::
 	para "Take this and"
 	line "fish, young one!"
 
-	para $52, " received"
+	para "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
@@ -39,7 +39,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_16_house.asm b/text/maps/route_16_house.asm
index 534cee08..77efde87 100644
--- a/text/maps/route_16_house.asm
+++ b/text/maps/route_16_house.asm
@@ -9,7 +9,7 @@ _Route16HouseText3::
 	prompt
 
 _ReceivedHM02Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "HM02!@@"
 
 _HM02ExplanationText::
diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm
index ac4141eb..3a1d28f0 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -1,6 +1,6 @@
 _Route22RivalBeforeBattleText1::
-	text $53, ": Hey!"
-	line $52, "!"
+	text "<RIVAL>: Hey!"
+	line "<PLAYER>!"
 
 	para "You're going to"
 	line "#MON LEAGUE?"
@@ -38,7 +38,7 @@ _Route22RivalDefeatedText1::
 	prompt
 
 _Route22Text_511bc::
-	text $53, ": What?"
+	text "<RIVAL>: What?"
 	line "Why do I have 2"
 	cont "#MON?"
 
@@ -47,8 +47,8 @@ _Route22Text_511bc::
 	prompt
 
 _Route22RivalBeforeBattleText2::
-	text $53, ": What?"
-	line $52, "! What a"
+	text "<RIVAL>: What?"
+	line "<PLAYER>! What a"
 	cont "surprise to see"
 	cont "you here!"
 
@@ -72,7 +72,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/route_24_1.asm b/text/maps/route_24_1.asm
index 25079b2f..ae861eda 100644
--- a/text/maps/route_24_1.asm
+++ b/text/maps/route_24_1.asm
@@ -10,7 +10,7 @@ _Route24Text_51515::
 	prompt
 
 _Route24Text_5151a::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm
index 8a018b2d..dcc1fd9b 100644
--- a/text/maps/safari_zone_entrance.asm
+++ b/text/maps/safari_zone_entrance.asm
@@ -20,7 +20,7 @@ SafariZoneEntranceText_9e747::
 	line "special # BALL"
 	cont "here."
 
-	para $52, " received"
+	para "<PLAYER> received"
 	line "30 SAFARI BALLs!@@"
 
 _SafariZoneEntranceText_75360::
diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm
index 1bbe89fd..3df79d90 100644
--- a/text/maps/safari_zone_secret_house.asm
+++ b/text/maps/safari_zone_secret_house.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/saffron_gym.asm b/text/maps/saffron_gym.asm
index ba57e35d..419b56ac 100644
--- a/text/maps/saffron_gym.asm
+++ b/text/maps/saffron_gym.asm
@@ -55,7 +55,7 @@ _SaffronGymText_5d173::
 	done
 
 ReceivedTM46Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM46!@@"
 
 _TM46ExplanationText::
diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm
index 8e7a3848..fbaa6086 100644
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.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_2f.asm b/text/maps/silph_co_2f.asm
index a48ebd23..bd87630a 100644
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.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/silph_co_3f.asm
index a514d3ef..b6a023f9 100644
--- a/text/maps/silph_co_3f.asm
+++ b/text/maps/silph_co_3f.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_7f.asm b/text/maps/silph_co_7f.asm
index e6ad11c1..1cc2bc30 100644
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/silph_co_7f.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/ss_anne_2.asm b/text/maps/ss_anne_2.asm
index ba231ac5..58d804ba 100644
--- a/text/maps/ss_anne_2.asm
+++ b/text/maps/ss_anne_2.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_7.asm b/text/maps/ss_anne_7.asm
index bb8ca042..7bf004da 100644
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.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/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm
index 0fa28cae..6857bb5b 100644
--- a/text/maps/vermilion_fishing_house.asm
+++ b/text/maps/vermilion_fishing_house.asm
@@ -16,7 +16,7 @@ _VermilionHouse2Text_560b6::
 	para "Take this and"
 	line "fish, young one!"
 
-	para $52, " received"
+	para "<PLAYER> received"
 	line "an @"
 	TX_RAM wcf4b
 	text "!@@"
@@ -39,7 +39,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_gym_2.asm b/text/maps/vermilion_gym_2.asm
index 4fd5e159..d0a01932 100644
--- a/text/maps/vermilion_gym_2.asm
+++ b/text/maps/vermilion_gym_2.asm
@@ -24,7 +24,7 @@ _VermilionGymText_5cb77::
 	done
 
 _ReceivedTM24Text::
-	text $52, " received "
+	text "<PLAYER> received "
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm
index cdcf6e36..ec9dcf4f 100644
--- a/text/maps/victory_road_2f.asm
+++ b/text/maps/victory_road_2f.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/viridian_city.asm b/text/maps/viridian_city.asm
index 17b2ec91..67ab5c40 100644
--- a/text/maps/viridian_city.asm
+++ b/text/maps/viridian_city.asm
@@ -83,7 +83,7 @@ _ViridianCityText_191ca::
 	prompt
 
 _ReceivedTM42Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM42!@@"
 
 _TM42Explanation::
diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm
index df04e6d6..f87d8d58 100644
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/viridian_gym.asm
@@ -60,7 +60,7 @@ _ViridianGymText12::
 	done
 
 _ReceivedTM27Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "TM27!@@"
 
 _TM27ExplanationText::
diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm
index aa199335..61750afe 100644
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/viridian_mart.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/wardens_house.asm b/text/maps/wardens_house.asm
index d4da3781..9d40cace 100644
--- a/text/maps/wardens_house.asm
+++ b/text/maps/wardens_house.asm
@@ -18,7 +18,7 @@ _WardenGibberishText3::
 	done
 
 _WardenTeethText1::
-	text $52, " gave the"
+	text "<PLAYER> gave the"
 	line "GOLD TEETH to the"
 	cont "WARDEN!@@"
 
@@ -42,7 +42,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"