Update to latest pokered

51 files changed, 103 insertions, 104 deletions

diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm
index 639d45cc..9a273d80 100644
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -22,7 +22,7 @@ _AgathaBeforeBattleText::
 	cont "#MON servent"
 	cont "à combattre!"
 
-	para $52,"! Je vais"
+	para "<PLAYER>! Je vais"
 	line "te montrer"
 	cont "comment les"
 	cont "grands dresseurs"
diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm
index 10283bd7..730e542c 100644
--- a/text/maps/bills_house.asm
+++ b/text/maps/bills_house.asm
@@ -56,7 +56,7 @@ _BillThankYouText::
 	prompt
 
 _SSTicketReceivedText::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm
index 697f71ce..7e178b71 100644
--- a/text/maps/blues_house.asm
+++ b/text/maps/blues_house.asm
@@ -1,6 +1,6 @@
 _DaisyInitialText::
-	text "Salut ",$52,"!"
-	line $53," est dans"
+	text "Salut <PLAYER>!"
+	line "<RIVAL> est dans"
 	cont "le labo de pépé! "
 	done
 
@@ -12,7 +12,7 @@ _DaisyOfferMapText::
 	prompt
 
 _GotMapText::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm
index 2266c7f8..4829cbdd 100644
--- a/text/maps/bruno.asm
+++ b/text/maps/bruno.asm
@@ -12,7 +12,7 @@ _BrunoBeforeBattleText::
 	cont "rien de tel qu'un"
 	cont "corps de rêve!"
 
-	para $52,"!"
+	para "<PLAYER>!"
 
 	para "Ton équipe..."
 	line "J'vais en faire"
diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm
index f5634975..09724030 100644
--- a/text/maps/celadon_city.asm
+++ b/text/maps/celadon_city.asm
@@ -43,7 +43,7 @@ _TM41PreText::
 	prompt
 
 _ReceivedTM41Text::
-	text $52, " reçoit:"
+	text "<PLAYER> reçoit:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm
index bbd0145f..5efe04cb 100644
--- a/text/maps/celadon_dept_store_roof.asm
+++ b/text/maps/celadon_dept_store_roof.asm
@@ -14,7 +14,7 @@ _CeladonMartRoofText_484f3::
 	line "pour toi!@@"
 
 _CeladonMartRoofText_484f9::
-	text $52," reçoit"
+	text "<PLAYER> reçoit"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
@@ -41,7 +41,7 @@ _CeladonMartRoofText_48504::
 	para "Tiens, prends ça!@@"
 
 _CeladonMartRoofText_4850a::
-	text $52," reçoit"
+	text "<PLAYER> reçoit"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
@@ -68,7 +68,7 @@ _CeladonMartRoofText_48515::
 	para "V'là pour toi!@@"
 
 _ReceivedTM49Text::
-	text $52," reçoit:"
+	text "<PLAYER> reçoit:"
 	line "CT49!@@"
 
 _CeladonMartRoofText_48520::
diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm
index f76d37f8..cf2b5fb0 100644
--- a/text/maps/celadon_diner.asm
+++ b/text/maps/celadon_diner.asm
@@ -43,7 +43,7 @@ _CeladonDinerText_491a7::
 	prompt
 
 _ReceivedCoinCaseText::
-	text $52," reçoit"
+	text "<PLAYER> reçoit"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/celadon_game_corner.asm b/text/maps/celadon_game_corner.asm
index 6f321bfb..82c9d324 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," reçoit"
+	text "<PLAYER> reçoit"
 	line "10 jetons!@@"
 
 _CeladonGameCornerText_48da7::
@@ -126,7 +126,7 @@ _CeladonGameCornerText_48e26::
 	prompt
 
 _Received20CoinsText::
-	text $52," reçoit"
+	text "<PLAYER> reçoit"
 	line "20 jetons!@@"
 
 _CeladonGameCornerText_48e31::
@@ -150,7 +150,7 @@ _CeladonGameCornerText_48e88::
 	prompt
 
 _CeladonGameCornerText_48e8d::
-	text $52," reçoit"
+	text "<PLAYER> reçoit"
 	line "20 jetons!@@"
 
 _CeladonGameCornerText_48e93::
diff --git a/text/maps/celadon_gym.asm b/text/maps/celadon_gym.asm
index f0e2f5e7..c6abbe4a 100644
--- a/text/maps/celadon_gym.asm
+++ b/text/maps/celadon_gym.asm
@@ -68,7 +68,7 @@ _CeladonGymText9::
 	done
 
 _ReceivedTM21Text::
-	text $52," reçoit"
+	text "<PLAYER> reçoit"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm
index db232c1c..89ee1f26 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 "Alors tu t'en"
 	line "sors?"
@@ -29,7 +29,7 @@ _CeruleanCityText_19672::
 	prompt
 
 _CeruleanCityText_19677::
-	text $53, ": Hé!"
+	text "<RIVAL: Hé!"
 	line "Tu sais quoi?"
 
 	para "Chuis allé chez"
@@ -69,7 +69,7 @@ _CeruleanCityText_196d9::
 	done
 
 _ReceivedTM28Text::
-	text $52, " récupère"
+	text "<PLAYER> récupère"
 	line "CT28!@@"
 
 _ReceivedTM28Text2::
diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm
index 56bffff2..a5615280 100644
--- a/text/maps/cerulean_gym.asm
+++ b/text/maps/cerulean_gym.asm
@@ -52,7 +52,7 @@ _CeruleanGymText_5c7c8::
 	done
 
 _ReceivedTM11Text::
-	text $52," reçoit"
+	text "<PLAYER> reçoit"
 	line "la CT11!@@"
 
 _CeruleanGymText_5c7d3::
diff --git a/text/maps/champion.asm b/text/maps/champion.asm
index 55ce26c2..f3ac6639 100644
--- a/text/maps/champion.asm
+++ b/text/maps/champion.asm
@@ -1,10 +1,10 @@
 _GaryChampionIntroText::
-	text $53,":"
+	text "<RIVAL>:"
 	line "Bonjour minable."
 
 	para "Je t'attends"
 	line "depuis une bonne"
-	cont "plombe, ",$52,"!"
+	cont "plombe, <PLAYER>!"
 
 	para "Ton devoir en"
 	line "tant que rival"
@@ -91,7 +91,7 @@ _GaryText_76103::
 	done
 
 _GaryText2::
-	text "CHEN: ",$52,"!"
+	text "CHEN: <PLAYER>!"
 	done
 
 _GaryText_76120::
@@ -107,12 +107,12 @@ _GaryText_76120::
 	TX_RAM wcd6d
 	text "!"
 
-	para $52,", tu es"
+	para "<PLAYER>, tu es"
 	line "grand maintenant!"
 	done
 
 _GaryText_76125::
-	text "CHEN: ",$53,"!"
+	text "CHEN: <RIVAL>!"
 	line "Je suis... déçu!"
 
 	para "Apprenant que tu"
@@ -127,7 +127,7 @@ _GaryText_76125::
 	cont "déjà perdu..."
 	cont "C'est dingue!"
 
-	para $53,"! As-tu"
+	para "<RIVAL>! As-tu"
 	line "compris pourquoi"
 	cont "ton équipe s'est"
 	cont "fait moucher?"
@@ -144,7 +144,7 @@ _GaryText_76125::
 	done
 
 _GaryText_7612a::
-	text "CHEN: ",$52,"!"
+	text "CHEN: <PLAYER>!"
 
 	para "Cette victoire..."
 	line "Tu ne la dois pas"
@@ -157,6 +157,6 @@ _GaryText_7612a::
 
 	para "Et ça... "
 	line "C'est bien. "
-	cont $52,"!"
+	cont "<PLAYER>!"
 	cont "Suis-moi!"
 	done
diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm
index 35d23c70..5ace3daa 100644
--- a/text/maps/cinnabar_gym.asm
+++ b/text/maps/cinnabar_gym.asm
@@ -50,7 +50,7 @@ _BlaineBadgeText::
 	done
 
 _ReceivedTM38Text::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
@@ -244,6 +244,6 @@ _CinnabarGymText_75ac2::
 	done
 
 _CinnabarGymText_75ac7::
-	text $52,"! Tu as"
-	line "battu AUGUSTE!"
+	text $52, "! 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 637bc10f..5690530b 100644
--- a/text/maps/cinnabar_lab_fossil_room.asm
+++ b/text/maps/cinnabar_lab_fossil_room.asm
@@ -64,7 +64,7 @@ _Lab4Text_610b3::
 	text "Tu te grouilles,"
 	line "file-moi ça!"
 
-	para $52," donne:"
+	para "<PLAYER> donne:"
 	line "@"
 	TX_RAM wcd6d
 	text "!"
diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/cinnabar_lab_metronome_room.asm
index 3c01f449..79ed6068 100644
--- a/text/maps/cinnabar_lab_metronome_room.asm
+++ b/text/maps/cinnabar_lab_metronome_room.asm
@@ -8,7 +8,7 @@ _TM35PreReceiveText::
 	prompt
 
 _ReceivedTM35Text::
-	text $52," reçoit:"
+	text "<PLAYER> reçoit:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm
index 992b28df..b6ae8ca3 100644
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/copycats_house_2f.asm
@@ -1,13 +1,13 @@
 _CopycatsHouse2FText_5ccd4::
-	text $52,": Salut!"
+	text "<PLAYER>: Salut!"
 	line "tu aimes les"
 	cont "#MON?"
 
-	para $52,": Bwoarf!"
+	para "<PLAYER>: Bwoarf!"
 	line "J'disais ça comme"
 	cont "ça!"
 
-	para $52,": Hein?"
+	para "<PLAYER>: Hein?"
 	line "T'es bizarre toi!"
 
 	para "COPIEUSE: Hmm?"
@@ -29,7 +29,7 @@ _TM31PreReceiveText::
 	prompt
 
 _ReceivedTM31Text::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
@@ -43,13 +43,13 @@ _TM31ExplanationText1::
 	line "bon #MON!@@"
 
 _TM31ExplanationText2::
-	text $52,": Salut!"
+	text "<PLAYER>: Salut!"
 	line "Merci pour la"
 	cont "CT31!"
 
-	para $52,": Pardon?"
+	para "<PLAYER>: Pardon?"
 
-	para $52,": Heu..."
+	para "<PLAYER>: Heu..."
 	line "C'est aussi cool"
 	cont "que ça de"
 	cont "m'imiter?"
diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm
index 82edaf8c..55c63a57 100644
--- a/text/maps/daycare_1.asm
+++ b/text/maps/daycare_1.asm
@@ -47,7 +47,7 @@ _DayCareOweMoneyText::
 	done
 
 _DayCareGotMonBackText::
-	text $52," récupère"
+	text "<PLAYER> récupère"
 	line "@"
 	TX_RAM wDayCareMonName
 	text "!"
diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm
index 217648fb..5c6ec60d 100644
--- a/text/maps/fuchsia_fishing_house.asm
+++ b/text/maps/fuchsia_fishing_house.asm
@@ -19,7 +19,7 @@ _FuchsiaHouse3Text_561c2::
 	cont "Pêche soit avec"
 	cont "toi, p'tit!"
 
-	para $52," reçoit"
+	para "<PLAYER> reçoit"
 	line "une @"
 	TX_RAM wcf50
 	text "!@@"
@@ -31,7 +31,7 @@ _FuchsiaHouse3Text_56212::
 
 _FuchsiaHouse3Text_56217::
 	text "Salut,"
-	line $52,"!"
+	line "<PLAYER>!"
 
 	para "Ca mord?"
 	done
diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm
index fbb8982f..b51038fe 100644
--- a/text/maps/fuchsia_gym_2.asm
+++ b/text/maps/fuchsia_gym_2.asm
@@ -23,7 +23,7 @@ _FuchsiaGymText9::
 	done
 
 _ReceivedTM06Text::
-	text $52," reçoit:"
+	text "<PLAYER> reçoit:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm
index 65dd4c53..bb68e29f 100644
--- a/text/maps/fujis_house.asm
+++ b/text/maps/fujis_house.asm
@@ -38,7 +38,7 @@ _LavenderHouse1Text4::
 	text "NIDORINO: Nido!@@"
 
 _LavenderHouse1Text_1d94c::
-	text "MR.FUJI: ",$52,"."
+	text "MR.FUJI: <PLAYER>."
 
 	para "Ta quête pour"
 	line "compléter ton"
@@ -51,7 +51,7 @@ _LavenderHouse1Text_1d94c::
 	prompt
 
 _ReceivedFluteText::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/lance.asm b/text/maps/lance.asm
index 086dcfaa..7d68bad3 100644
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -44,7 +44,7 @@ _LanceAfterBattleText::
 	line "dragons ont-ils"
 	cont "pu succomber à"
 	cont "tes attaques,"
-	cont $52,"?"
+	cont "<PLAYER>?"
 
 	para "Tu es désormais"
 	line "champion de la"
@@ -60,7 +60,7 @@ _LanceAfterBattleText::
 	line "t'attend. Son nom"
 	cont "est..."
 
-	para $53,"!"
+	para "<RIVAL>!"
 	line "Il a vaincu le"
 	cont "CONSEIL des 4"
 	cont "avant toi!"
diff --git a/text/maps/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm
index 1ed93333..aed6e0fe 100644
--- a/text/maps/mr_psychics_house.asm
+++ b/text/maps/mr_psychics_house.asm
@@ -6,7 +6,7 @@ _TM29PreReceiveText::
 	prompt
 
 _ReceivedTM29Text::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm
index ef68032d..b5215af2 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, " obtient"
+	text "<PLAYER> obtient"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm
index fdcbe55d..8e948ab7 100644
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -10,7 +10,7 @@ _OaksLabText40::
 	cont "comme toi!"
 
 	para "Allez, choisis,"
-	line $52,"!"
+	line "<PLAYER>!"
 	done
 
 _OaksLabText41::
@@ -50,7 +50,7 @@ _OaksLabMonEnergeticText::
 	prompt
 
 _OaksLabReceivedMonText::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcd6d
 	text "!@@"
diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm
index 61a096c7..e69ebfe0 100644
--- a/text/maps/pallet_town.asm
+++ b/text/maps/pallet_town.asm
@@ -52,10 +52,10 @@ _PalletTownText5::
 
 _PalletTownText6::
 	text "Maison de"
-	line $52
+	line "<PLAYER>"
 	done
 
 _PalletTownText7::
 	text "Maison de"
-	line $53
+	line "<RIVAL>"
 	done
diff --git a/text/maps/pewter_gym_2.asm b/text/maps/pewter_gym_2.asm
index dcd86226..588aa27d 100644
--- a/text/maps/pewter_gym_2.asm
+++ b/text/maps/pewter_gym_2.asm
@@ -20,8 +20,8 @@ _TM34PreReceiveText::
 	done
 
 _ReceivedTM34Text::
-	text $52," reçoit"
-	line "la CT34!@@"
+	text "<PLAYER> received"
+	line "TM34!@@"
 
 _TM34ExplanationText::
 	text ""
@@ -62,7 +62,7 @@ _PewterGymText_5c4bc::
 	cont "voici le BADGE"
 	cont "ROCHE!"
 
-	para $52," reçoit"
+	para "<PLAYER> reçoit"
 	line "le BADGE ROCHE!@@"
 
 _PewterGymText_5c4c1::
diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/pokemon_tower_2f.asm
index a00fb655..0cbb6f34 100644
--- a/text/maps/pokemon_tower_2f.asm
+++ b/text/maps/pokemon_tower_2f.asm
@@ -1,6 +1,6 @@
 _PokemonTower2Text_6062d::
-	text $53,": Hé,"
-	line $52,"!"
+	text "<RIVAL>: Hé,"
+	line "<PLAYER>!"
 	cont "Kesstu fais là?"
 	cont "Tes #MON sont"
 	cont "pas morts!"
@@ -20,7 +20,7 @@ _PokemonTower2Text_60632::
 	prompt
 
 _PokemonTower2Text_60637::
-	text $53,": Haha,"
+	text "<RIVAL>: Haha,"
 	line "Tes #MON sont"
 	cont "minables..."
 	cont "Comme toi!"
diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/pokemon_tower_5f.asm
index db6a75a0..8b1926e6 100644
--- a/text/maps/pokemon_tower_5f.asm
+++ b/text/maps/pokemon_tower_5f.asm
@@ -76,6 +76,6 @@ _PokemonTower5Text7::
 	cont "sanctuaire!"
 
 	para "Les #MON de"
-	line $52," sont"
+	line "<PLAYER> sont"
 	cont "soignés!"
 	done
diff --git a/text/maps/route_1.asm b/text/maps/route_1.asm
index 4f4f0562..3f7127c9 100644
--- a/text/maps/route_1.asm
+++ b/text/maps/route_1.asm
@@ -14,7 +14,7 @@ _Route1ViridianMartSampleText::
 	prompt
 
 _Route1Text_1cae8::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm
index 130b30a9..4607102b 100644
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/route_12_gate_upstairs.asm
@@ -10,7 +10,7 @@ _TM39PreReceiveText::
 	prompt
 
 _ReceivedTM39Text::
-	text $52," obtient"
+	text "<PLAYER> obtient"
 	line "CT39!@@"
 
 _TM39ExplanationText::
diff --git a/text/maps/route_12_house.asm b/text/maps/route_12_house.asm
index 3ec95295..c6e2217c 100644
--- a/text/maps/route_12_house.asm
+++ b/text/maps/route_12_house.asm
@@ -18,7 +18,7 @@ _Route12HouseText_564c5::
 	line "canne à pêche,"
 	cont "mon frère!"
 
-	para $52," obtient:"
+	para "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
@@ -42,7 +42,7 @@ _Route12HouseText_564cf::
 
 _Route12HouseText_564d4::
 	text "Salut,"
-	line $52,"!"
+	line "<PLAYER>!"
 
 	para "Avec cette MEGA"
 	line "CANNE, tu vas"
diff --git a/text/maps/route_16_house.asm b/text/maps/route_16_house.asm
index 3adf948b..044e4e34 100644
--- a/text/maps/route_16_house.asm
+++ b/text/maps/route_16_house.asm
@@ -9,7 +9,7 @@ _Route16HouseText3::
 	prompt
 
 _ReceivedHM02Text::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "CS02!@@"
 
 _HM02ExplanationText::
diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm
index 81639998..ccb39133 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -1,6 +1,6 @@
 _Route22RivalBeforeBattleText1::
-	text $53,": Hé!"
-	line $52,"!"
+	text "<RIVAL>: Hé!"
+	line "<PLAYER>!"
 
 	para "Tu vas à la"
 	line "LIGUE #MON?"
@@ -45,7 +45,7 @@ _Route22RivalDefeatedText1::
 	prompt
 
 _Route22Text_511bc::
-	text $53,": Quoi?"
+	text "<RIVAL>: Quoi?"
 	line "Pourquoi j'ai 2"
 	cont "#MON?"
 
@@ -56,8 +56,8 @@ _Route22Text_511bc::
 	prompt
 
 _Route22RivalBeforeBattleText2::
-	text $53,": Tiens?"
-	line $52,"! Quelle"
+	text "<RIVAL>: Tiens?"
+	line "<PLAYER>! Quelle"
 	cont "bonne surprise,"
 	cont "tu es là aussi?!"
 
@@ -87,7 +87,7 @@ _Route22RivalAfterBattleText2::
 	cont "chaud pour la"
 	cont "LIGUE #MON!"
 
-	para $52,", t'es"
+	para "<PLAYER>, t'es"
 	line "vraiment un"
 	cont "minable!"
 
diff --git a/text/maps/route_24_1.asm b/text/maps/route_24_1.asm
index 46ead89d..5da8dbe3 100644
--- a/text/maps/route_24_1.asm
+++ b/text/maps/route_24_1.asm
@@ -11,7 +11,7 @@ _Route24Text_51515::
 	prompt
 
 _Route24Text_5151a::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm
index d5c6677b..71256382 100644
--- a/text/maps/safari_zone_entrance.asm
+++ b/text/maps/safari_zone_entrance.asm
@@ -20,7 +20,7 @@ SafariZoneEntranceText_9e747::
 	line "type de # BALL"
 	cont "est utilisé ici."
 
-	para $52," reçoit"
+	para "<PLAYER> reçoit"
 	line "30 SAFARI BALL!@@"
 
 _SafariZoneEntranceText_75360::
diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm
index 99c12f98..8a0c2a07 100644
--- a/text/maps/safari_zone_secret_house.asm
+++ b/text/maps/safari_zone_secret_house.asm
@@ -14,7 +14,7 @@ _SecretHouseText_4a350::
 	prompt
 
 _ReceivedHM03Text::
-	text $52, " obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm
index a8c9ad4c..8f8e379e 100644
--- a/text/maps/saffron_gym.asm
+++ b/text/maps/saffron_gym.asm
@@ -64,7 +64,7 @@ _SaffronGymText_5d173::
 	done
 
 ReceivedTM46Text::
-	text $52," obtient:"
+	text "<PLAYER> obtient:"
 	line "CT46!@@"
 
 _TM46ExplanationText::
diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm
index 2746032f..d321f70e 100644
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -19,7 +19,7 @@ _SilphCoPresidentText::
 	prompt
 
 _ReceivedSilphCoMasterBallText::
-	text $52, " obtient:"
+	text "<PLAYER> obtient:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
@@ -89,7 +89,7 @@ _SilphCo10Text_62335::
 	line "ROCKET est"
 	cont "invincible!"
 
-	para $52,"! N'oublie"
+	para "<PLAYER>! N'oublie"
 	line "jamais que tous"
 	cont "les #MON sont"
 	cont "pour la TEAM"
diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm
index f217917e..19ed7668 100644
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.asm
@@ -9,7 +9,7 @@ _SilphCo2Text_59ded::
 	prompt
 
 _ReceivedTM36Text::
-	text $52, " obtient"
+	text "<PLAYER> obtient"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/silph_co_3f.asm b/text/maps/silph_co_3f.asm
index 653b2eba..3b2e700a 100644
--- a/text/maps/silph_co_3f.asm
+++ b/text/maps/silph_co_3f.asm
@@ -5,7 +5,7 @@ _SilphCo3Text_59ff9::
 	done
 
 _SilphCo3Text_59ffe::
-	text $52, "! Toi et"
+	text "<PLAYER>! Toi et"
 	line "tes #MON,"
 	cont "vous nous avez"
 	cont "sauvés!"
diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm
index eee18137..ff386c49 100644
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/silph_co_7f.asm
@@ -153,12 +153,12 @@ _SilphCo7AfterBattleText4::
 	done
 
 _SilphCo7Text_51ebe::
-	text $53, ": C'que tu"
-	line "es lent, ",$52,"!"
+	text "<RIVAL>: C'que tu"
+	line "es lent, <PLAYER>!"
 	done
 
 _SilphCo7Text_51ec3::
-	text $53, ": Hahaha!"
+	text "<RIVAL>: Hahaha!"
 	line "J'étais sûr que"
 	cont "tu passerais par"
 	cont "là!"
@@ -182,7 +182,7 @@ _SilphCo7Text_51ec8::
 	prompt
 
 _SilphCo7Text_51ecd::
-	text $53, ": Quelle"
+	text "<RIVAL>: Quelle"
 	line "perte de temps!"
 
 	para "Va jouer dans ton"
@@ -190,7 +190,7 @@ _SilphCo7Text_51ecd::
 	prompt
 
 _SilphCo7Text_51ed2::
-	text "OK, ",$52,"!"
+	text "OK, <PLAYER>!"
 
 	para "Je décampe!"
 
@@ -212,7 +212,7 @@ _SilphCo7Text_51ed2::
 	cont "monde!"
 
 	para "Bonne chance,"
-	line $52,"!"
+	line "<PLAYER>!"
 	cont "Tu en auras"
 	cont "besoin, minable!"
 	done
diff --git a/text/maps/ss_anne_2.asm b/text/maps/ss_anne_2.asm
index be8d7d7f..2da39005 100644
--- a/text/maps/ss_anne_2.asm
+++ b/text/maps/ss_anne_2.asm
@@ -10,13 +10,13 @@ _SSAnne2Text1::
 	done
 
 _SSAnneRivalBeforeBattleText::
-	text $53, ": Salut!"
-	line $52, "!"
+	text "<RIVAL>: Salut!"
+	line "<PLAYER>!"
 
 	para "Toi! Ici!"
 	line "Sans blague!"
 
-	para $52, ", as-tu"
+	para "<PLAYER>, as-tu"
 	line "vraiment été"
 	cont "invité?"
 
@@ -43,7 +43,7 @@ _SSAnneRivalDefeatedText::
 	prompt
 
 _SSAnneRivalWonText::
-	text $52, "! Tu as"
+	text "<PLAYER>! Tu as"
 	line "le mal de mer?"
 
 	para "Tu devrais te"
@@ -52,7 +52,7 @@ _SSAnneRivalWonText::
 	prompt
 
 _SSAnneRivalCaptainText::
-	text $53, ": Il y"
+	text "<RIVAL>: Il y"
 	line "a le maître de la"
 	cont "technique COUPE"
 	cont "à bord."
diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm
index fa35124d..ac1c41dc 100644
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.asm
@@ -3,7 +3,7 @@ _SSAnne7RubText::
 	line "J'suis pas bien."
 	cont "Beurp..."
 
-	para $52, " masse"
+	para "<PLAYER> masse"
 	line "le dos du"
 	cont "CAPITAINE!"
 
@@ -35,7 +35,7 @@ _ReceivingHM01Text::
 	prompt
 
 _ReceivedHM01Text::
-	text $52, " obtient"
+	text "<PLAYER> obtient"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm
index 0cd073fe..b9bc928f 100644
--- a/text/maps/vermilion_fishing_house.asm
+++ b/text/maps/vermilion_fishing_house.asm
@@ -16,7 +16,7 @@ _VermilionHouse2Text_560b6::
 	para "Prends ça et..."
 	line "Pêche! Pêche!"
 
-	para $52," reçoit"
+	para "<PLAYER> reçoit"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
@@ -41,7 +41,7 @@ _VermilionHouse2Text_560c0::
 
 _VermilionHouse2Text_560c5::
 	text "B'jour à toi,"
-	line $52,"!"
+	line "<PLAYER>!"
 
 	para "Ca mord?"
 	line "Hein? Hein?"
diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym_2.asm
index 502904af..b7bd4864 100644
--- a/text/maps/vermilion_gym_2.asm
+++ b/text/maps/vermilion_gym_2.asm
@@ -27,7 +27,7 @@ _VermilionGymText_5cb77::
 	done
 
 _ReceivedTM24Text::
-	text $52," reçoit:"
+	text "<PLAYER> reçoit:"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm
index 072caef3..55b13c6b 100644
--- a/text/maps/victory_road_2f.asm
+++ b/text/maps/victory_road_2f.asm
@@ -30,7 +30,7 @@ _VictoryRoad2EndBattleText2::
 	prompt
 
 _VictoryRoad2AfterBattleText2::
-	text $53," est aussi"
+	text "<RIVAL> est aussi"
 	line "arrivé ici!"
 	done
 
diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm
index 97a07e8f..52e9c57b 100644
--- a/text/maps/viridian_city.asm
+++ b/text/maps/viridian_city.asm
@@ -85,7 +85,7 @@ _ViridianCityText_191ca::
 	prompt
 
 _ReceivedTM42Text::
-	text $52, " reçoit:"
+	text "<PLAYER> reçoit:"
 	line "CT42!@@"
 
 _TM42Explanation::
diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm
index 687a7a48..c2cfb170 100644
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/viridian_gym.asm
@@ -74,7 +74,7 @@ _ViridianGymText12::
 	done
 
 _ReceivedTM27Text::
-	text $52," reçoit"
+	text "<PLAYER> reçoit"
 	line "CT27!@@"
 
 _TM27ExplanationText::
diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm
index e57ea9be..d0b5324a 100644
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/viridian_mart.asm
@@ -18,7 +18,7 @@ ViridianMartParcelQuestText::
 	cont "Peux-tu la lui"
 	cont "apporter?"
 
-	para $52," obtient"
+	para "<PLAYER> obtient"
 	line "le COLIS DE CHEN!@@"
 
 _ViridianMartText2::
@@ -32,4 +32,3 @@ _ViridianMartText3::
 	line "Nous sommes en"
 	cont "rupture de stock."
 	done
-
diff --git a/text/maps/wardens_house.asm b/text/maps/wardens_house.asm
index 46719d2d..09ded152 100644
--- a/text/maps/wardens_house.asm
+++ b/text/maps/wardens_house.asm
@@ -18,7 +18,7 @@ _WardenGibberishText3::
 	done
 
 _WardenTeethText1::
-	text $52," donne la"
+	text "<PLAYER> donne la"
 	line "DENT D'OR au"
 	cont "GARDIEN!@@"
 
@@ -44,7 +44,7 @@ _WardenThankYouText::
 	prompt
 
 _ReceivedHM04Text::
-	text $52," reçoit"
+	text "<PLAYER> reçoit"
 	line "@"
 	TX_RAM wcf50
 	text "!@@"
diff --git a/text/oakspeech.asm b/text/oakspeech.asm
index 3fd86a0a..1096ed58 100644
--- a/text/oakspeech.asm
+++ b/text/oakspeech.asm
@@ -51,7 +51,7 @@ _IntroduceRivalText::
 	prompt
 
 _OakSpeechText3::
-	text $52,"!"
+	text "<PLAYER>!"
 
 	para "Ta quête des"
 	line "#MON est sur"