Use charmaps for special string codepoints.

Also fix all the text. Also fix some unreferenced scripts that were interpreted as text.
2025-09-08 08:13:02 -07:00 · 2015-06-27 21:59:17 -07:00
parent c00949dddf
commit e2c2e20f93
113 changed files with 1068 additions and 951 deletions
--- a/text/battle.asm
+++ b/text/battle.asm
--- a/text/common.asm
+++ b/text/common.asm
@@ -247,9 +247,9 @@ UnknownText_0x1b05bf: ; 0x1b05bf
 ; 0x1b0621

 UnknownText_0x1b0621: ; 0x1b0621
-	text $52, ", the No.@"
+	text "<PLAYER>, the No.@"
 	text_from_ram StringBuffer3
-	db $0
+	text ""
 	line "finisher, wins"
 	cont "@"
 	text_from_ram StringBuffer4
@@ -258,7 +258,7 @@ UnknownText_0x1b0621: ; 0x1b0621
 ; 0x1b0648

 UnknownText_0x1b0648: ; 0x1b0648
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	text_from_ram StringBuffer4
 	text "."
@@ -304,7 +304,7 @@ UnknownText_0x1b070d: ; 0x1b070d

 UnknownText_0x1b074e: ; 0x1b074e
 	text_from_ram StringBuffer3
-	db $0
+	text ""
 	line "#MON GYM"
 	done
 ; 0x1b075c
@@ -312,9 +312,10 @@ UnknownText_0x1b074e: ; 0x1b074e
 UnknownText_0x1b075c: ; 0x1b075c
 	text "LEADER: @"
 	text_from_ram StringBuffer4
-	db $0, $51
-	db "WINNING TRAINERS:"
-	line $52, $57
+	text ""
+	para "WINNING TRAINERS:"
+	line "<PLAYER>"
+	done
 ; 0x1b077f

 UnknownText_0x1b077f: ; 0x1b077f
@@ -408,14 +409,14 @@ HappinessText1:
 	done

 RegisteredNumber1Text:
-	text $52, " registered"
+	text "<PLAYER> registered"
 	line "@"
 	text_from_ram StringBuffer3
 	text "'s number."
 	done

 RegisteredNumber2Text:
-	text $52, " registered"
+	text "<PLAYER> registered"
 	line "@"
 	text_from_ram StringBuffer3
 	text "'s number."
--- a/text/common_2.asm
+++ b/text/common_2.asm
@@ -144,27 +144,31 @@ UnknownText_0x1bc1cf: ; 0x1bc1cf

 UnknownText_0x1bc1eb: ; 0x1bc1eb
 	text "Your PASSCODE has"
-	line "been set.", $51
-	db "Enter this number"
-	line "next time to open", $55
-	db "the CARD FOLDER.", $51
-	db $57
+	line "been set."
+	para "Enter this number"
+	line "next time to open"
+	cont "the CARD FOLDER."
+	para ""
+	done
 ; 0x1bc23e

 UnknownText_0x1bc23e: ; 0x1bc23e
-	text "0000 is invalid!", $51
-	db $57
+	text "0000 is invalid!"
+	para ""
+	done
 ; 0x1bc251

 UnknownText_0x1bc251: ; 0x1bc251
-	text "Enter the CARD", $4e, "FOLDER PASSCODE."
+	text "Enter the CARD"
+	next "FOLDER PASSCODE."
 	done
 ; 0x1bc272

 UnknownText_0x1bc272: ; 0x1bc272
 	text "Incorrect"
-	line "PASSCODE!", $51
-	db $57
+	line "PASSCODE!"
+	para ""
+	done
 ; 0x1bc288

 UnknownText_0x1bc288: ; 0x1bc288
@@ -283,7 +287,8 @@ UnknownText_0x1bc404: ; 0x1bc404

 UnknownText_0x1bc42c: ; 0x1bc42c
 	text "The password is:"
-	line $57
+	line ""
+	done
 ; 0x1bc43f

 UnknownText_0x1bc43f: ; 0x1bc43f
@@ -347,8 +352,8 @@ UnknownText_0x1bc51c: ; 0x1bc51c
 	text "Put away the"
 	line "@"
 	text_from_ram StringBuffer3
-	text $51
-	db "and set up the"
+	text ""
+	para "and set up the"
 	line "@"
 	text_from_ram StringBuffer4
 	text "."
@@ -399,7 +404,7 @@ UnknownText_0x1bc5ef: ; 0x1bc5ef
 ; 0x1bc615

 UnknownText_0x1bc615: ; 0x1bc615
-	text "Hi, ", $52, "!"
+	text "Hi, <PLAYER>!"
 	line "How are you?"
 	prompt
 ; 0x1bc62a
@@ -1286,11 +1291,12 @@ UnknownText_0x1bcf96: ; 0x1bcf96

 UnknownText_0x1bcf99: ; 0x1bcf99
 	text ""
-	line $57
+	line ""
+	done
 ; 0x1bcf9c

 UnknownText_0x1bcf9c: ; 0x1bcf9c
-	text $3f
+	text "<ENEMY>"
 	line "withdrew"
 	cont "@"
 	text_from_ram EnemyMonNick
@@ -1299,11 +1305,11 @@ UnknownText_0x1bcf9c: ; 0x1bcf9c
 ; 0x1bcfaf

 UnknownText_0x1bcfaf: ; 0x1bcfaf
-	text $3f
+	text "<ENEMY>"
 	line "used @"
 	text_from_ram wd050
-	text $55
-	db "on @"
+	text ""
+	cont "on @"
 	text_from_ram EnemyMonNick
 	text "!"
 	prompt
@@ -1383,7 +1389,8 @@ UnknownText_0x1bd0d8: ; 0x1bd0d8

 UnknownText_0x1bd109: ; 0x1bd109
 	text "There is no EGG."
-	line $58
+	line ""
+	prompt
 ; 0x1bd11c

 UnknownText_0x1bd11c: ; 0x1bd11c
@@ -1528,7 +1535,7 @@ UnknownText_0x1bd308: ; 0x1bd308
 ; 0x1bd321

 UnknownText_0x1bd321: ; 0x1bd321
-	text $52, " found"
+	text "<PLAYER> found"
 	line "@"
 	text_from_ram StringBuffer3
 	text "!"
@@ -1536,7 +1543,7 @@ UnknownText_0x1bd321: ; 0x1bd321
 ; 0x1bd331

 UnknownText_0x1bd331: ; 0x1bd331
-	text "But ", $52, " has"
+	text "But <PLAYER> has"
 	line "no space left…"
 	done
 ; 0x1bd34b
@@ -1595,11 +1602,11 @@ UnknownText_0x1bd407: ; 0x1bd407
 ; 0x1bd429

 UnknownText_0x1bd429: ; 0x1bd429
-	text $52, " traded"
+	text "<PLAYER> traded"
 	line "@"
 	text_from_ram wd050
-	text " for", $55
-	db "@"
+	text " for"
+	cont "@"
 	text_from_ram StringBuffer2
 	text ".@"
 	db "@"
@@ -1815,8 +1822,9 @@ UnknownText_0x1bd77f: ; 0x1bd77f

 UnknownText_0x1bd868: ; 0x1bd868
 	text "OK, I'll take care"
-	line "of your money.", $51
-	db $56, $56, $56, $58
+	line "of your money."
+	para $56, $56, $56
+	prompt
 ; 0x1bd88e

 UnknownText_0x1bd88e: ; 0x1bd88e
@@ -1895,7 +1903,7 @@ UnknownText_0x1bda25: ; 0x1bda25
 	text "OK, I'll save your"
 	line "money. Trust me!"

-	para $52, ", stick"
+	para "<PLAYER>, stick"
 	line "with it!"
 	done
 ; 0x1bda5b
@@ -1907,7 +1915,7 @@ UnknownText_0x1bda5b: ; 0x1bda5b
 ; 0x1bda7e

 UnknownText_0x1bda7e: ; 0x1bda7e
-	text $52, ", don't"
+	text "<PLAYER>, don't"
 	line "give up!"
 	done
 ; 0x1bda90
@@ -2059,7 +2067,7 @@ UnknownText_0x1bde04: ; 0x1bde04
 ; 0x1bde1f

 UnknownText_0x1bde1f: ; 0x1bde1f
-	text $52, " got back"
+	text "<PLAYER> got back"
 	line "@"
 	text_from_ram StringBuffer1
 	text "."
@@ -2070,8 +2078,8 @@ UnknownText_0x1bde32: ; 0x1bde32
 	text "Huh? Back already?"
 	line "Your @"
 	text_from_ram StringBuffer1
-	text $51
-	db "needs a little"
+	text ""
+	para "needs a little"
 	line "more time with us."

 	para "If you want your"
@@ -2128,7 +2136,7 @@ UnknownText_0x1bdf00: ; 0x1bdf00
 ; 0x1bdfa5

 UnknownText_0x1bdfa5: ; 0x1bdfa5
-	text $52, " received"
+	text "<PLAYER> received"
 	line "the EGG!"
 	done
 ; 0x1bdfba
--- a/text/common_3.asm
+++ b/text/common_3.asm
@@ -292,8 +292,8 @@ UnknownText_0x1c04fa: ; 1c04fa
 	text " sent"
 	line "@"
 	text_from_ram StringBuffer1
-	text $55
-	db "to @"
+	text ""
+	cont "to @"
 	text_from_ram wc950 + 3
 	text "'s home."
 	prompt
@@ -422,7 +422,7 @@ UnknownText_0x1c06de: ; 1c06de
 ; 1c06ed

 UnknownText_0x1c06ed: ; 1c06ed
-	text $52, " used an"
+	text "<PLAYER> used an"
 	line "ESCAPE ROPE."
 	done
 ; 1c0705
@@ -441,8 +441,9 @@ UnknownText_0x1c071a: ; 1c071a

 UnknownText_0x1c073b: ; 1c073b
 	text "Can't use that"
-	line "here.", $51
-	db $57
+	line "here."
+	para ""
+	done
 ; 1c0751

 UnknownText_0x1c0751: ; 1c0751
@@ -578,7 +579,7 @@ UnknownText_0x1c099a: ; 1c099a
 ; 1c09b2

 UnknownText_0x1c09b2: ; 1c09b2
-	text $52, " got on the"
+	text "<PLAYER> got on the"
 	line "@"
 	text_from_ram StringBuffer2
 	text "."
@@ -586,7 +587,7 @@ UnknownText_0x1c09b2: ; 1c09b2
 ; 1c09c7

 UnknownText_0x1c09c7: ; 1c09c7
-	text $52, " got off"
+	text "<PLAYER> got off"
 	line "the @"
 	text_from_ram StringBuffer2
 	text "."
@@ -608,7 +609,7 @@ UnknownText_0x1c0a05: ; 1c0a05
 ; 1c0a1c

 UnknownText_0x1c0a1c: ; 1c0a1c
-	text $52, " found"
+	text "<PLAYER> found"
 	line "@"
 	text_from_ram StringBuffer3
 	text "!"
@@ -616,17 +617,17 @@ UnknownText_0x1c0a1c: ; 1c0a1c
 ; 1c0a2c

 UnknownText_0x1c0a2c: ; 1c0a2c
-	text "But ", $52, " can't"
+	text "But <PLAYER> can't"
 	line "carry any more"
 	cont "items."
 	done
 ; 1c0a4e

 UnknownText_0x1c0a4e: ; 1c0a4e
-	text $52, " is out of"
+	text "<PLAYER> is out of"
 	line "useable #MON!"

-	para $52, " whited"
+	para "<PLAYER> whited"
 	line "out!"
 	done
 ; 1c0a77
@@ -652,10 +653,10 @@ UnknownText_0x1c0acc: ; 1c0acc
 ; 1c0ada

 UnknownText_0x1c0ada: ; 1c0ada
-	text $52, " is out of"
+	text "<PLAYER> is out of"
 	line "useable #MON!"

-	para $52, " whited"
+	para "<PLAYER> whited"
 	line "out!"
 	prompt
 ; 1c0b03
@@ -674,7 +675,7 @@ UnknownText_0x1c0b1a: ; 1c0b1a
 ; 1c0b3b

 UnknownText_0x1c0b3b: ; 1c0b3b
-	text $52, " sprinkled"
+	text "<PLAYER> sprinkled"
 	line "water."

 	para "But nothing"
@@ -683,7 +684,7 @@ UnknownText_0x1c0b3b: ; 1c0b3b
 ; 1c0b65

 UnknownText_0x1c0b65: ; 1c0b65
-	text $52, "'s #MON"
+	text "<PLAYER>'s #MON"
 	line "were all healed!"
 	done
 ; 1c0b7f
@@ -724,7 +725,7 @@ UnknownText_0x1c0bd8: ; 1c0bd8
 ; 1c0bee

 UnknownText_0x1c0bee: ; 1c0bee
-	text "OAK: ", $52, "!"
+	text "OAK: <PLAYER>!"
 	line "This isn't the"
 	cont "time to use that!"
 	prompt
@@ -774,7 +775,7 @@ UnknownText_0x1c0ca3: ; 1c0ca3
 ; 1c0cc6

 UnknownText_0x1c0cc6: ; 1c0cc6
-	text $5a, "'s"
+	text "<USER>'s"
 	line "@"
 	text_from_ram StringBuffer2
 	db "@"
@@ -796,7 +797,7 @@ UnknownText_0x1c0ce0: ; 1c0ce0
 ; 1c0ceb

 UnknownText_0x1c0ceb: ; 1c0ceb
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "@"
 	text_from_ram StringBuffer2
 	db "@"
@@ -818,7 +819,7 @@ UnknownText_0x1c0d06: ; 1c0d06
 ; 1c0d0e

 UnknownText_0x1c0d0e: ; 1c0d0e
-	text $5a, "@"
+	text "<USER>@"
 	db "@"
 ; 1c0d12

@@ -859,7 +860,7 @@ UnknownText_0x1c0d6c: ; 1c0d6c
 ; 1c0d7a

 _ActorNameText: ; 1c0d7a
-	text $5a, "@"
+	text "<USER>@"
 	db "@"
 ; 1c0d7e

@@ -876,8 +877,8 @@ _UsedMove2Text: ; 1c0d87
 ; 1c0d90

 _UsedInsteadText: ; 1c0d90
-	text "instead,", $55
-	db "@"
+	text "instead,"
+	cont "@"
 	db "@"
 ; 1c0d9c

@@ -916,8 +917,8 @@ _EndUsedMove5Text: ; 1c0dad
 ; 1c0db0

 UnknownText_0x1c0db0: ; 1c0db0
-	text "Huh?", $51
-	db "@"
+	text "Huh?"
+	para "@"
 	db "@"
 ; 1c0db8

@@ -1142,20 +1143,20 @@ UnknownText_0x1c10fa: ; 1c10fa
 	text "This Bug-Catching"
 	line "Contest winner is@"
 	interpret_data
-	text "…", $51
-	db "@"
+	text "…"
+	para "@"
 	text_from_ram wd016
 	text ","
-	line "who caught a", $55
-	db "@"
+	line "who caught a"
+	cont "@"
 	text_from_ram StringBuffer1
 	text "!@"
 	db "@"
 ; 1c113f

 UnknownText_0x1c113f: ; 1c113f
-	text $51
-	db "The winning score"
+	text ""
+	para "The winning score"
 	line "was @"
 	deciram wd004, $23
 	text " points!"
@@ -1166,8 +1167,8 @@ UnknownText_0x1c1166: ; 1c1166
 	text "Placing second was"
 	line "@"
 	text_from_ram wd016
-	text ",", $51
-	db "who caught a"
+	text ","
+	para "who caught a"
 	line "@"
 	text_from_ram StringBuffer1
 	text "!@"
@@ -1175,8 +1176,8 @@ UnknownText_0x1c1166: ; 1c1166
 ; 1c1196

 UnknownText_0x1c1196: ; 1c1196
-	text $51
-	db "The score was"
+	text ""
+	para "The score was"
 	line "@"
 	deciram wd008, $23
 	text " points!"
@@ -1187,8 +1188,8 @@ UnknownText_0x1c11b5: ; 1c11b5
 	text "Placing third was"
 	line "@"
 	text_from_ram wd016
-	text ",", $51
-	db "who caught a"
+	text ","
+	para "who caught a"
 	line "@"
 	text_from_ram StringBuffer1
 	text "!@"
@@ -1196,8 +1197,8 @@ UnknownText_0x1c11b5: ; 1c11b5
 ; 1c11e4

 UnknownText_0x1c11e4: ; 1c11e4
-	text $51
-	db "The score was"
+	text ""
+	para "The score was"
 	line "@"
 	deciram wd00c, $23
 	text " points!"
@@ -1216,8 +1217,8 @@ UnknownText_0x1c1203: ; 1c1203
 ; 1c123a

 UnknownText_0x1c123a: ; 1c123a
-	text "CURRENT RECORD", $51
-	db "@"
+	text "CURRENT RECORD"
+	para "@"
 	text_from_ram StringBuffer1
 	text " caught by"
 	line "@"
@@ -1273,7 +1274,7 @@ UnknownText_0x1c1328: ; 1c1328
 ; 1c1353

 UnknownText_0x1c1353: ; 1c1353
-	text $52, " turned on"
+	text "<PLAYER> turned on"
 	line "the PC."
 	prompt
 ; 1c1368
@@ -1334,7 +1335,7 @@ _KrissPCNoRoomDepositText: ; 1c142d
 ; 1c144d

 UnknownText_0x1c144d: ; 1c144d
-	text $52, " turned on"
+	text "<PLAYER> turned on"
 	line "the PC."
 	prompt
 ; 1c1462
@@ -1566,19 +1567,21 @@ _OakPCText4: ; 1c19aa

 UnknownText_0x1c19cd: ; 1c19cd
 	text "Triple-theme"
-	line "trainer ranking!", $51
-	db "The SAVE file you"
-	line "just sent might", $55
-	db "make the rankings!", $51
-	db $57
+	line "trainer ranking!"
+	para "The SAVE file you"
+	line "just sent might"
+	cont "make the rankings!"
+	para ""
+	done
 ; 1c1a22

 UnknownText_0x1c1a22: ; 1c1a22
 	text "There is no"
-	line "ranking data.", $51
-	db "Link to obtain"
-	line "ranking data.", $51
-	db $57
+	line "ranking data."
+	para "Link to obtain"
+	line "ranking data."
+	para ""
+	done
 ; 1c1a5b

 UnknownText_0x1c1a5b: ; 1c1a5b
@@ -1630,7 +1633,7 @@ UnknownText_0x1c1adf: ; 1c1adf
 ; 1c1b03

 UnknownText_0x1c1b03: ; 1c1b03
-	text "OAK: ", $52, "!"
+	text "OAK: <PLAYER>!"
 	line "This isn't the"
 	cont "time to use that!"
 	done
@@ -1776,9 +1779,9 @@ _OakText1: ; 1c1d35

 _OakText2: ; 1c1da4
 	text "This world is in-"
-	line "habited by crea-", $55
-	db "tures that we call", $55
-	db "#MON.@"
+	line "habited by crea-"
+	cont "tures that we call"
+	cont "#MON.@"
 	db "@"
 ; 1c1de2

--- a/text/common_4.asm
+++ b/text/common_4.asm
@@ -5,7 +5,7 @@ _OakText6: ; 0x1c4000
 ; 0x1c4026

 _OakText7: ; 0x1c4026
-	text $52, ", are you"
+	text "<PLAYER>, are you"
 	line "ready?"

 	para "Your very own"
@@ -219,7 +219,7 @@ UnknownText_0x1c456d: ; 0x1c456d
 ; 0x1c4590

 UnknownText_0x1c4590: ; 0x1c4590
-	text $52, " saved"
+	text "<PLAYER> saved"
 	line "the game."
 	done
 ; 0x1c45a3
@@ -291,7 +291,7 @@ UnknownText_0x1c4706:: ; 0x1c4706
 ; 0x1c4719

 UnknownText_0x1c4719:: ; 0x1c4719
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	text_from_ram StringBuffer4
 	text "."
@@ -299,7 +299,7 @@ UnknownText_0x1c4719:: ; 0x1c4719
 ; 0x1c472c

 UnknownText_0x1c472c:: ; 0x1c472c
-	text $52, " put the"
+	text "<PLAYER> put the"
 	line "@"
 	text_from_ram StringBuffer1
 	text " in"
@@ -366,16 +366,16 @@ UnknownText_0x1c4837: ; 0x1c4837
 	text ""
 	line "came from @"
 	text_from_ram wd02a
-	text $55
-	db "in a trade?"
+	text ""
+	cont "in a trade?"

 	para "@"
 	text_from_ram wd00e
 	text ""
 	line "was where @"
 	text_from_ram wd02a
-	text $55
-	db "met @"
+	text ""
+	cont "met @"
 	text_from_ram wd003
 	text "!"
 	prompt
@@ -489,8 +489,8 @@ UnknownText_0x1c4ae5: ; 0x1c4ae5
 	para "I'm sure that"
 	line "seeing @"
 	text_from_ram wd003
-	text $51
-	db "in battle would"
+	text ""
+	para "in battle would"
 	line "excite anyone."
 	done
 ; 0x1c4b92
@@ -507,8 +507,8 @@ UnknownText_0x1c4bae: ; 0x1c4bae
 ; 0x1c4baf

 UnknownText_0x1c4baf: ; 0x1c4baf
-	text $51
-	db "evolved into"
+	text ""
+	para "evolved into"
 	line "@"
 	text_from_ram StringBuffer1
 	text "!"
@@ -826,12 +826,13 @@ _MobileStadiumEntryText: ; 0x1c50c2

 _MobileStadiumSuccessText: ; 0x1c5121
 	text "Data transfer is"
-	line "complete.", $51
-	db "We hope you enjoy"
-	line "MOBILE STADIUM", $51
-	db "battles in the N64"
-	line "#MON STADIUM 2.", $51
-	db $57
+	line "complete."
+	para "We hope you enjoy"
+	line "MOBILE STADIUM"
+	para "battles in the N64"
+	line "#MON STADIUM 2."
+	para ""
+	done
 ; 0x1c5182

 UnknownText_0x1c5182: ; 0x1c5182
@@ -879,45 +880,49 @@ UnknownText_0x1c521c: ; 0x1c521c

 UnknownText_0x1c5238: ; 0x1c5238
 	text "The CARD FOLDER"
-	line "stores your and", $51
-	db "your friends'"
-	line "CARDS.", $51
-	db "A CARD contains"
-	line "information like", $51
-	db "the person's name,"
-	line "phone number and", $55
-	db "profile.", $51
-	db $57
+	line "stores your and"
+	para "your friends'"
+	line "CARDS."
+	para "A CARD contains"
+	line "information like"
+	para "the person's name,"
+	line "phone number and"
+	cont "profile."
+	para ""
+	done
 ; 0x1c52bc

 UnknownText_0x1c52bc: ; 0x1c52bc
-	text "This is your CARD.", $51
-	db "Once you've"
-	line "entered your phone", $51
-	db "number, you can"
-	line "trade CARDS with", $55
-	db "your friends.", $51
-	db $57
+	text "This is your CARD."
+	para "Once you've"
+	line "entered your phone"
+	para "number, you can"
+	line "trade CARDS with"
+	cont "your friends."
+	para ""
+	done
 ; 0x1c531e

 UnknownText_0x1c531e: ; 0x1c531e
 	text "If you have your"
-	line "friend's CARD, you", $51
-	db "can use it to make"
-	line "a call from a", $51
-	db "mobile phone on"
-	line "the 2nd floor of a", $55
-	db "#MON CENTER.", $51
-	db $57
+	line "friend's CARD, you"
+	para "can use it to make"
+	line "a call from a"
+	para "mobile phone on"
+	line "the 2nd floor of a"
+	cont "#MON CENTER."
+	para ""
+	done
 ; 0x1c5394

 UnknownText_0x1c5394: ; 0x1c5394
 	text "To safely store"
-	line "your collection of", $51
-	db "CARDS, you must"
-	line "set a PASSCODE for", $55
-	db "your CARD FOLDER.", $51
-	db $57
+	line "your collection of"
+	para "CARDS, you must"
+	line "set a PASSCODE for"
+	cont "your CARD FOLDER."
+	para ""
+	done
 ; 0x1c53ee

 UnknownText_0x1c53ee: ; 0x1c53ee
@@ -945,8 +950,9 @@ UnknownText_0x1c5494: ; 0x1c5494

 UnknownText_0x1c54b9: ; 0x1c54b9
 	text "The CARD FOLDER"
-	line "has been deleted.", $51
-	db $57
+	line "has been deleted."
+	para ""
+	done
 ; 0x1c54dd

 UnknownText_0x1c54dd: ; 0x1c54dd
@@ -983,7 +989,8 @@ UnknownText_0x1c5580: ; 0x1c5580
 ; 0x1c5588

 UnknownText_0x1c5588: ; 0x1c5588
-	text "", $56, $57
+	text $56
+	done
 ; 0x1c558b

 UnknownText_0x1c558b: ; 0x1c558b
@@ -1053,7 +1060,8 @@ UnknownText_0x1c5677: ; 0x1c5677
 ; 0x1c5678

 UnknownText_0x1c5678: ; 0x1c5678
-	text "Which move should", $4e, "be forgotten?"
+	text "Which move should"
+	next "be forgotten?"
 	done
 ; 0x1c5699

@@ -1110,8 +1118,8 @@ UnknownText_0x1c574d: ; 0x1c574d
 UnknownText_0x1c574e: ; 0x1c574e
 	text " Poof!@"
 	interpret_data
-	text $51
-	db "@"
+	text ""
+	para "@"
 	text_from_ram wd050
 	text " forgot"
 	line "@"
@@ -1181,7 +1189,8 @@ UnknownText_0x1c5823: ; 0x1c5823
 ; 0x1c5824

 UnknownText_0x1c5824: ; 0x1c5824
-	text "", $56, $57
+	text $56
+	done
 ; 0x1c5827

 UnknownText_0x1c5827: ; 0x1c5827
@@ -1222,20 +1231,23 @@ UnknownText_0x1c58bc: ; 0x1c58bc
 ; 0x1c58d1

 UnknownText_0x1c58d1: ; 0x1c58d1
-	text "Here you go!", $51
-	db $57
+	text "Here you go!"
+	para ""
+	done
 ; 0x1c58e0

 UnknownText_0x1c58e0: ; 0x1c58e0
 	text "You don't have"
-	line "enough points.", $51
-	db $57
+	line "enough points."
+	para ""
+	done
 ; 0x1c58ff

 UnknownText_0x1c58ff: ; 0x1c58ff
 	text "You have no room"
-	line "for it.", $51
-	db $57
+	line "for it."
+	para ""
+	done
 ; 0x1c591a

 UnknownText_0x1c591a: ; 0x1c591a
@@ -1245,14 +1257,16 @@ UnknownText_0x1c591a: ; 0x1c591a
 ; 0x1c5937

 UnknownText_0x1c5937: ; 0x1c5937
-	text "Excuse me!", $51
-	db $57
+	text "Excuse me!"
+	para ""
+	done
 ; 0x1c5944

 UnknownText_0x1c5944: ; 0x1c5944
 	text "Excuse me."
-	line "You're not ready.", $51
-	db $57
+	line "You're not ready."
+	para ""
+	done
 ; 0x1c5962

 UnknownText_0x1c5962: ; 0x1c5962
@@ -1263,44 +1277,50 @@ UnknownText_0x1c5962: ; 0x1c5962

 UnknownText_0x1c5983: ; 0x1c5983
 	text "You need at least"
-	line "three #MON.", $51
-	db $57
+	line "three #MON."
+	para ""
+	done
 ; 0x1c59a3

 UnknownText_0x1c59a3: ; 0x1c59a3
 	text "Sorry, an EGG"
-	line "doesn't qualify.", $51
-	db $57
+	line "doesn't qualify."
+	para ""
+	done
 ; 0x1c59c3

 UnknownText_0x1c59c3: ; 0x1c59c3
 	text "Only three #MON"
-	line "may be entered.", $51
-	db $57
+	line "may be entered."
+	para ""
+	done
 ; 0x1c59e5

 UnknownText_0x1c59e5: ; 0x1c59e5
 	text "The @"
 	text_from_ram StringBuffer2
 	text " #MON"
-	line "must all be", $55
-	db "different kinds.", $51
-	db $57
+	line "must all be"
+	cont "different kinds."
+	para ""
+	done
 ; 0x1c5a13

 UnknownText_0x1c5a13: ; 0x1c5a13
 	text "The @"
 	text_from_ram StringBuffer2
 	text " #MON"
-	line "must not hold the", $55
-	db "same items.", $51
-	db $57
+	line "must not hold the"
+	cont "same items."
+	para ""
+	done
 ; 0x1c5a42

 UnknownText_0x1c5a42: ; 0x1c5a42
 	text "You can't take an"
-	line "EGG!", $51
-	db $57
+	line "EGG!"
+	para ""
+	done
 ; 0x1c5a5a

 UnknownText_0x1c5a5a: ; 0x1c5a5a
@@ -1374,8 +1394,8 @@ UnknownText_0x1c5b38: ; 0x1c5b38
 UnknownText_0x1c5b53: ; 0x1c5b53
 	text_from_ram EnemyMonNick
 	text "'s data"
-	line "was newly added to", $55
-	db "the #DEX.@"
+	line "was newly added to"
+	cont "the #DEX.@"
 	sound0x2C
 	text_waitbutton
 	db "@"
@@ -1431,7 +1451,7 @@ UnknownText_0x1c5c28: ; 0x1c5c28
 ; 0x1c5c44

 UnknownText_0x1c5c44: ; 0x1c5c44
-	text $52, " played the"
+	text "<PLAYER> played the"
 	line "# FLUTE.@"
 	text_waitbutton
 	db "@"
@@ -1495,8 +1515,8 @@ UnknownText_0x1c5d03: ; 0x1c5d03
 	text "There was a trophy"
 	line "inside!@"
 	sound0
-	text $51
-	db "@"
+	text ""
+	para "@"
 	text_from_ram PlayerName
 	text " sent the"
 	line "trophy home."
@@ -1515,7 +1535,7 @@ UnknownText_0x1c5d50: ; 0x1c5d50
 ; 0x1c5d6e

 UnknownText_0x1c5d6e: ; 0x1c5d6e
-	text "OAK: ", $52, "!"
+	text "OAK: <PLAYER>!"
 	line "This isn't the"
 	cont "time to use that!"
 	prompt
@@ -1566,7 +1586,7 @@ UnknownText_0x1c5e3a: ; 0x1c5e3a
 ; 0x1c5e68

 UnknownText_0x1c5e68: ; 0x1c5e68
-	text $52, " used the@"
+	text "<PLAYER> used the@"
 	text_dunno1
 	text_from_ram StringBuffer2
 	text "."
@@ -1574,7 +1594,7 @@ UnknownText_0x1c5e68: ; 0x1c5e68
 ; 0x1c5e7b

 UnknownText_0x1c5e7b: ; 0x1c5e7b
-	text $52, " got on the@"
+	text "<PLAYER> got on the@"
 	text_dunno1
 	text_from_ram StringBuffer2
 	text "."
@@ -1582,7 +1602,7 @@ UnknownText_0x1c5e7b: ; 0x1c5e7b
 ; 0x1c5e90

 UnknownText_0x1c5e90: ; 0x1c5e90
-	text $52, " got off@"
+	text "<PLAYER> got off@"
 	text_dunno1
 	text "the @"
 	text_from_ram StringBuffer2
--- a/text/phone/beverly_overworld.asm
+++ b/text/phone/beverly_overworld.asm
@@ -44,7 +44,7 @@ BeverlyPhoneFullText:
 	done

 BeverlyGiftText:
-	text "Oh? ", $52, "? "
+	text "Oh? <PLAYER>? "
 	line "I waited here for"

 	para "you. I brought you"
--- a/text/phone/bill.asm
+++ b/text/phone/bill.asm
@@ -29,21 +29,24 @@ BillPhoneNiteGreetingText: ; 0x1b44b5
 	done

 BillPhoneGeneriText: ; 0x1b44fe
-	db $0, "Who's calling?", $51
-	db $14, ", is it?", $4f
-	db "Hang on a sec…", $51
-	db $56, $4f
-	db $56, $57
+	text "Who's calling?"
+
+	para "<PLAY_G>, is it?"
+	line "Hang on a sec…"
+
+	para $56
+	line $56
+	done

 BillPhoneNotFullText: ; 0x1b452a
 	text "Thanks for"
 	line "waiting!"

-	para $14, ", your BOX"
+	para "<PLAY_G>, your BOX"
 	line "has room for @"
 	TX_RAM StringBuffer3
-	text $55
-	db "more #MON."
+	text ""
+	cont "more #MON."

 	para "Get out there and"
 	line "fill it up!"
@@ -53,7 +56,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
 	text "Thanks for"
 	line "waiting!"

-	para $14, ", your BOX"
+	para "<PLAY_G>, your BOX"
 	line "has room for only"
 	cont "@"
 	TX_RAM StringBuffer3
@@ -67,7 +70,7 @@ BillPhoneFullText: ; 0x1b45ed
 	text "Thanks for"
 	line "waiting!"

-	para $14, ", your BOX"
+	para "<PLAY_G>, your BOX"
 	line "is full!"

 	para "You'll have to"
@@ -78,7 +81,7 @@ BillPhoneFullText: ; 0x1b45ed
 	done

 BillPhoneNewlyFullText: ; 0x1b4652
-	text "Hi, ", $14, "?"
+	text "Hi, <PLAY_G>?"
 	line "It's me, BILL!"

 	para "Thanks for using"
--- a/text/phone/buena.asm
+++ b/text/phone/buena.asm
@@ -2,7 +2,7 @@ UnknownText_0xa0c28: ; 0xa0c28
 	text "Hi, this is BUENA…"

 	para "Oh! Good morning,"
-	line $14, "!"
+	line "<PLAY_G>!"

 	para "I'm kind of foggy"
 	line "in the morning…"
@@ -11,7 +11,7 @@ UnknownText_0xa0c28: ; 0xa0c28

 UnknownText_0xa0c72: ; 0xa0c72
 	text "Hi, this is BUENA…"
-	line "Oh! Hi, ", $14, "!"
+	line "Oh! Hi, <PLAY_G>!"

 	para "Do you tune into"
 	line "BUENA's show?"
@@ -38,7 +38,7 @@ UnknownText_0xa0caf: ; 0xa0caf

 UnknownText_0xa0d42: ; 0xa0d42
 	text "Hi, this is BUENA…"
-	line "Oh! Hi, ", $14, "!"
+	line "Oh! Hi, <PLAY_G>!"

 	para "I just got off"
 	line "work. "
@@ -49,7 +49,7 @@ UnknownText_0xa0d42: ; 0xa0d42
 ; 0xa0d96

 UnknownText_0xa0d96: ; 0xa0d96
-	text $14, "!"
+	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"

 	para "I got up early, so"
@@ -58,7 +58,7 @@ UnknownText_0xa0d96: ; 0xa0d96
 ; 0xa0dcf

 UnknownText_0xa0dcf: ; 0xa0dcf
-	text $14, "!"
+	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"

 	para "I needed someone"
@@ -67,7 +67,7 @@ UnknownText_0xa0dcf: ; 0xa0dcf
 ; 0xa0e01

 UnknownText_0xa0e01: ; 0xa0e01
-	text $14, "!"
+	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"

 	para "I'm just on my"
@@ -76,7 +76,7 @@ UnknownText_0xa0e01: ; 0xa0e01
 ; 0xa0e29

 UnknownText_0xa0e29: ; 0xa0e29
-	text $14, "!"
+	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"

 	para "I couldn't sleep,"
@@ -85,7 +85,7 @@ UnknownText_0xa0e29: ; 0xa0e29
 ; 0xa0e5e

 UnknownText_0xa0e5e: ; 0xa0e5e
-	text "Oh. Hi, ", $14, "!"
+	text "Oh. Hi, <PLAY_G>!"

 	para "You are how?"

@@ -98,7 +98,7 @@ UnknownText_0xa0e5e: ; 0xa0e5e
 	para "The RADIO TOWER is"
 	line "in deep trouble!"

-	para $14, ", you'd"
+	para "<PLAY_G>, you'd"
 	line "better be careful!"
 	done
 ; 0xa0efb
@@ -152,7 +152,7 @@ UnknownText_0xa0fcf: ; 0xa0fcf
 ; 0xa109d

 UnknownText_0xa109d: ; 0xa109d
-	text "Tell me, ", $14, "."
+	text "Tell me, <PLAY_G>."
 	line "Have you ever won"

 	para "a prize on the"
@@ -245,7 +245,7 @@ UnknownText_0xa1318: ; 0xa1318
 ; 0xa13d8

 UnknownText_0xa13d8: ; 0xa13d8
-	text "Hey, ", $14, "."
+	text "Hey, <PLAY_G>."
 	line "You won that RADIO"

 	para "CARD by beating"
@@ -334,7 +334,7 @@ UnknownText_0xa15de: ; 0xa15de
 ; 0xa1717

 UnknownText_0xa1717: ; 0xa1717
-	text $14, ", tell me."
+	text "<PLAY_G>, tell me."

 	para "When do you relax"
 	line "the most?"
@@ -367,7 +367,7 @@ UnknownText_0xa1717: ; 0xa1717
 ; 0xa183d

 UnknownText_0xa183d: ; 0xa183d
-	text $14, ", what was"
+	text "<PLAY_G>, what was"
 	line "the first #MON"
 	cont "you ever caught?"

@@ -426,7 +426,7 @@ UnknownText_0xa19b1: ; 0xa19b1
 	para "I'd much rather go"
 	line "to the beach!"

-	para $14, ", I hope"
+	para "<PLAY_G>, I hope"
 	line "you have enough"

 	para "fun for both of us"
@@ -478,7 +478,7 @@ UnknownText_0xa1bed: ; 0xa1bed
 	para "STORE has a sale"
 	line "on when we go…"

-	para $14, ", maybe we"
+	para "<PLAY_G>, maybe we"
 	line "can hook up too!"

 	para "Catch you later!"
@@ -509,7 +509,7 @@ UnknownText_0xa1c88: ; 0xa1c88
 ; 0xa1d5f

 UnknownText_0xa1d5f: ; 0xa1d5f
-	text "Hey, ", $14, ". You"
+	text "Hey, <PLAY_G>. You"
 	line "use your #GEAR"

 	para "to listen to the"
--- a/text/phone/elm.asm
+++ b/text/phone/elm.asm
@@ -1,5 +1,5 @@
 ElmPhoneStartText: ; 0x1b46fc
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"

 	para "Try not to overdo"
 	line "it."
@@ -10,7 +10,7 @@ ElmPhoneStartText: ; 0x1b46fc
 	done

 ElmPhoneSawMrPokemonText: ; 0x1b4749
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"

 	para "Did you meet MR."
 	line "#MON? Great!"
@@ -18,7 +18,7 @@ ElmPhoneSawMrPokemonText: ; 0x1b4749
 	done

 ElmPhonePokemonStolenText: ; 0x1b4784
-	text $14, "? I'm very"
+	text "<PLAY_G>? I'm very"
 	line "upset now."

 	para "We had a #MON"
@@ -29,7 +29,7 @@ ElmPhonePokemonStolenText: ; 0x1b4784
 	done

 ElmPhoneCheckingEggText: ; 0x1b47d5
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"

 	para "We're checking the"
 	line "EGG now. It does"
@@ -39,7 +39,7 @@ ElmPhoneCheckingEggText: ; 0x1b47d5
 	done

 ElmPhoneAssistantText: ; 0x1b481c
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"

 	para "Did you see my"
 	line "assistant? He's at"
@@ -49,7 +49,7 @@ ElmPhoneAssistantText: ; 0x1b481c
 	done

 ElmPhoneEggUnhatchedText: ; 0x1b4868
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"

 	para "How's the EGG? Has"
 	line "anything changed?"
@@ -59,7 +59,7 @@ ElmPhoneEggUnhatchedText: ; 0x1b4868
 	done

 ElmPhoneEggHatchedText: ; 0x1b48bb
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"
 	line "How is the EGG?"

 	para "What? It hatched?"
@@ -71,7 +71,7 @@ ElmPhoneEggHatchedText: ; 0x1b48bb
 	done

 ElmPhoneDiscovery1Text: ; 0x1b491f
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"

 	para "I just made a new"
 	line "discovery."
@@ -84,7 +84,7 @@ ElmPhoneDiscovery1Text: ; 0x1b491f
 	done

 ElmPhoneDiscovery2Text: ; 0x1b4982
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"

 	para "It's still a"
 	line "mystery what kinds"
@@ -97,7 +97,7 @@ ElmPhoneDiscovery2Text: ; 0x1b4982
 	done

 ElmPhonePokerusText: ; 0x1b49e7
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"

 	para "I discovered an"
 	line "odd thing."
@@ -130,7 +130,7 @@ ElmPhonePokerusText: ; 0x1b49e7
 	done

 ElmPhoneDisasterText: ; 0x1b4b17
-	text "H-hello? ", $14, "?"
+	text "H-hello? <PLAY_G>?"
 	line "It's a disaster!"

 	para "Uh, um, it's just"
@@ -144,7 +144,7 @@ ElmPhoneDisasterText: ; 0x1b4b17
 	done

 ElmPhoneEggAssistantText: ; 0x1b4b87
-	text "Hello, ", $14, "? We"
+	text "Hello, <PLAY_G>? We"
 	line "discovered some-"

 	para "thing about the"
@@ -159,7 +159,7 @@ ElmPhoneEggAssistantText: ; 0x1b4b87
 	done

 ElmPhoneRocketText: ; 0x1b4c06
-	text $14, ", how are"
+	text "<PLAY_G>, how are"
 	line "things going?"

 	para "I called because"
@@ -171,7 +171,7 @@ ElmPhoneRocketText: ; 0x1b4c06
 	para "They were talking"
 	line "about TEAM ROCKET."

-	para $14, ", do you"
+	para "<PLAY_G>, do you"
 	line "know anything"
 	cont "about it?"

@@ -186,7 +186,7 @@ ElmPhoneRocketText: ; 0x1b4c06
 	done

 ElmPhoneGiftText: ; 0x1b4d09
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"

 	para "I have something"
 	line "here for you."
@@ -198,7 +198,7 @@ ElmPhoneGiftText: ; 0x1b4d09
 	done

 ElmPhoneUnusedText: ; 0x1b4d5d
-	text "Hello, ", $14, "?"
+	text "Hello, <PLAY_G>?"
 	line "How's it going?"

 	para "I got ahold of"
--- a/text/phone/extra.asm
+++ b/text/phone/extra.asm
@@ -8,7 +8,7 @@ UnknownText_0x64000: ; 0x64000
 ; 0x64032

 UnknownText_0x64032: ; 0x64032
-	text $14, ", have you"
+	text "<PLAY_G>, have you"
 	line "heard?"

 	para "GOLDENROD's RADIO"
@@ -23,7 +23,7 @@ UnknownText_0x64032: ; 0x64032
 ; 0x64099

 UnknownText_0x64099: ; 0x64099
-	text $14, ", I heard!"
+	text "<PLAY_G>, I heard!"

 	para "You defeated that"
 	line "WHITNEY?"
@@ -43,7 +43,7 @@ UnknownText_0x640e6: ; 0x640e6
 	para "LIGHTHOUSE, didn't"
 	line "you?"

-	para $14, ", I wish"
+	para "<PLAY_G>, I wish"
 	line "you'd come see me"

 	para "when I'm sick in"
@@ -100,7 +100,7 @@ UnknownText_0x642bb: ; 0x642bb
 	line "lady who looked a"

 	para "lot like you,"
-	line $14, "."
+	line "<PLAY_G>."

 	para "What? That lady"
 	line "was your mom?"
@@ -127,7 +127,7 @@ UnknownText_0x643d4: ; 0x643d4
 	line "I saw!"

 	para "You striding onto"
-	line "a ship, ", $14, "!"
+	line "a ship, <PLAY_G>!"

 	para "I can't get over"
 	line "how good you look"
@@ -192,7 +192,7 @@ UnknownText_0x645ff: ; 0x645ff
 	cont "the place."

 	para "It just makes me"
-	line "sigh, ", $14, "."
+	line "sigh, <PLAY_G>."

 	para "How did you get so"
 	line "strong?"
@@ -241,7 +241,7 @@ UnknownText_0x646df: ; 0x646df
 ; 0x647d8

 UnknownText_0x647d8: ; 0x647d8
-	text $14, ", I heard!"
+	text "<PLAY_G>, I heard!"

 	para "You're kicking up"
 	line "a mighty ruckus"
@@ -491,7 +491,7 @@ UnknownText_0x64e2f: ; 0x64e2f

 	para "to @"
 	text_from_ram StringBuffer5
-	db $0
+	text ""
 	line "and pick it up?"
 	done
 ; 0x64e90
@@ -561,8 +561,8 @@ UnknownText_0x6501c: ; 0x6501c
 	text "You know what?"
 	line "A wild @"
 	text_from_ram StringBuffer4
-	text $51
-	db "got away from me"
+	text ""
+	para "got away from me"
 	line "again."

 	para "It was so close!"
@@ -918,8 +918,8 @@ UnknownText_0x65ab2: ; 0x65ab2
 	text "Listen to this."
 	line "My @"
 	text_from_ram StringBuffer4
-	text $51
-	db "grins happily when"
+	text ""
+	para "grins happily when"
 	line "I pinch its cheek."

 	para "But it never grins"
@@ -1121,7 +1121,7 @@ UnknownText_0x65ff2: ; 0x65ff2
 UnknownText_0x66043: ; 0x66043
 	text "Yup, TULLY here…"

-	para $14, "? What?"
+	para "<PLAY_G>? What?"
 	line "You're lost?"

 	para "Our battle will be"
@@ -1401,7 +1401,7 @@ UnknownText_0x66796: ; 0x66796
 	para "It's awful."
 	line "My CLEFAIRY…"

-	para "Huh? ", $14, "?"
+	para "Huh? <PLAY_G>?"

 	para "Oh, sorry! I was"
 	line "in a hurry, and I…"
@@ -1497,8 +1497,8 @@ UnknownText_0x669ed: ; 0x669ed
 	text "But get this, a"
 	line "wild @"
 	text_from_ram StringBuffer4
-	text $51
-	db "just barely eluded"
+	text ""
+	para "just barely eluded"
 	line "us."

 	para "I wanted to FLY"
@@ -1533,7 +1533,7 @@ UnknownText_0x66aa5: ; 0x66aa5
 ; 0x66ad1

 UnknownText_0x66ad1: ; 0x66ad1
-	text "Oh, ", $14, "!"
+	text "Oh, <PLAY_G>!"
 	line "Hurry, hurry!"

 	para "@"
@@ -1808,7 +1808,7 @@ UnknownText_0x6717a: ; 0x6717a
 	text_from_ram StringBuffer3
 	text "'s @"
 	text_from_ram StringBuffer4
-	db $0
+	text ""
 	line "is much stronger"
 	cont "than before!"
 	done
@@ -1831,7 +1831,7 @@ UnknownText_0x671eb: ; 0x671eb

 	para "A wild @"
 	text_from_ram StringBuffer4
-	db $0
+	text ""
 	line "got away from me"

 	para "again. It's just"
@@ -1869,7 +1869,7 @@ UnknownText_0x67294: ; 0x67294
 ; 0x672d5

 UnknownText_0x672d5: ; 0x672d5
-	text "Oh, ", $14, "!"
+	text "Oh, <PLAY_G>!"
 	line "Come battle ERIN!"

 	para "I'll be waiting on"
--- a/text/phone/extra3.asm
+++ b/text/phone/extra3.asm
@@ -1,5 +1,5 @@
 UnknownText_0x174000: ; 0x174000
-	text "Hi, ", $14, "!"
+	text "Hi, <PLAY_G>!"
 	line "Our BICYCLE sales"

 	para "have gone through"
@@ -216,7 +216,7 @@ UnknownText_0x1745c2: ; 0x1745c2
 ; 0x174638

 UnknownText_0x174638: ; 0x174638
-	text "Hey, ", $14, "!"
+	text "Hey, <PLAY_G>!"

 	para "Do you remember"
 	line "your promise?"
@@ -316,7 +316,7 @@ UnknownText_0x174895: ; 0x174895

 	para "in @"
 	text_from_ram StringBuffer5
-	db $0
+	text ""
 	line "when you can."
 	done
 ; 0x1748ea
@@ -372,7 +372,7 @@ UnknownText_0x1749c7: ; 0x1749c7
 UnknownText_0x174a24: ; 0x174a24
 	text "My @"
 	text_from_ram StringBuffer4
-	db $0
+	text ""
 	line "might be greater"
 	cont "than I imagined."

@@ -452,7 +452,7 @@ UnknownText_0x174c29: ; 0x174c29
 ; 0x174c49

 UnknownText_0x174c49: ; 0x174c49
-	text $14, ", why"
+	text "<PLAY_G>, why"
 	line "aren't you here?"

 	para "I'll take you down"
@@ -485,8 +485,8 @@ UnknownText_0x174cf6: ; 0x174cf6
 	text "Oh, have you ever"
 	line "seen a @"
 	text_from_ram StringBuffer4
-	text $55
-	db "before?"
+	text ""
+	cont "before?"

 	para "I just battled"
 	line "one…"
@@ -553,7 +553,7 @@ UnknownText_0x174ec5: ; 0x174ec5
 ; 0x174ee2

 UnknownText_0x174ee2: ; 0x174ee2
-	text "Um… ", $14, "?"
+	text "Um… <PLAY_G>?"
 	line "What's wrong?"

 	para "Did you forget our"
@@ -671,7 +671,7 @@ UnknownText_0x17519b: ; 0x17519b
 ; 0x17520a

 UnknownText_0x17520a: ; 0x17520a
-	text $14, ", could you"
+	text "<PLAY_G>, could you"
 	line "hurry over?"

 	para "FARFETCH'D is"
@@ -823,8 +823,8 @@ UnknownText_0x175591: ; 0x175591
 	text "Oh yeah, I took"
 	line "down a @"
 	text_from_ram StringBuffer4
-	text $51
-	db "in the wild the"
+	text ""
+	para "in the wild the"
 	line "other day."

 	para "It was a cakewalk."
@@ -891,7 +891,7 @@ UnknownText_0x17571d: ; 0x17571d

 UnknownText_0x175786: ; 0x175786
 	text "What's keeping"
-	line "you, ", $52, "!"
+	line "you, <PLAYER>!"

 	para "Let's get down and"
 	line "battle already!"
@@ -927,8 +927,8 @@ UnknownText_0x175869: ; 0x175869
 	text "Oh yeah, we KO'd a"
 	line "wild @"
 	text_from_ram StringBuffer4
-	text $51
-	db "with one hit a"
+	text ""
+	para "with one hit a"
 	line "while back."

 	para "It went down so"
@@ -989,7 +989,7 @@ UnknownText_0x1759f7: ; 0x1759f7
 	line "today."

 	para "Are you going,"
-	line $14, "?"
+	line "<PLAY_G>?"

 	para "I'm trying to make"
 	line "up my mind."
@@ -1146,7 +1146,7 @@ UnknownText_0x175dd9: ; 0x175dd9
 	para "Heh, they're some"
 	line "kind of feisty!"

-	para $14, ", you have"
+	para "<PLAY_G>, you have"
 	line "to see this rare"

 	para "sight! Get ready"
@@ -1549,7 +1549,7 @@ UnknownText_0x176aef: ; 0x176aef

 	para "wild @"
 	text_from_ram StringBuffer4
-	db $0
+	text ""
 	line "quite often."

 	para "They're easily"
@@ -1599,27 +1599,27 @@ UnknownText_0x176c47: ; 0x176c47
 ; 0x176c61

 UnknownText_0x176c61: ; 0x176c61
-	text $52, "! It's"
+	text "<PLAYER>! It's"
 	line "mind-blowing!"

 	para "I took a hike in"
 	line "@"
 	text_from_ram StringBuffer5
-	text $55
-	db "yesterday, see?"
+	text ""
+	cont "yesterday, see?"

 	para "Well, there were"
 	line "tons of @"
 	text_from_ram StringBuffer4
-	text $51
-	db "around! You have"
+	text ""
+	para "around! You have"
 	line "to see it!"

 	para "I get this feeling"
 	line "that @"
 	text_from_ram StringBuffer4
-	text $51
-	db "may be timid."
+	text ""
+	para "may be timid."
 	line "I didn't see any"

 	para "where there are"
@@ -1899,7 +1899,7 @@ UnknownText_0x177465: ; 0x177465
 ; 0x1774c1

 UnknownText_0x1774c1: ; 0x1774c1
-	text "Oh, ", $14, "!"
+	text "Oh, <PLAY_G>!"
 	line "How soon can I"

 	para "expect to see you"
--- a/text/phone/huey_overworld.asm
+++ b/text/phone/huey_overworld.asm
@@ -57,7 +57,7 @@ HueyRematchGiftText:
 	para "I've battled you"
 	line "over and over, but"

-	para $52, ", I haven't"
+	para "<PLAYER>, I haven't"
 	line "won once."

 	para "I bought tons of"
@@ -73,7 +73,7 @@ HueyRematchGiftText:
 	line "it is…"

 	para "Here, take this,"
-	line $52, "."
+	line "<PLAYER>."

 	para "I won't be needing"
 	line "it anymore…"
--- a/text/phone/jose_overworld.asm
+++ b/text/phone/jose_overworld.asm
@@ -1,7 +1,7 @@
 JoseAskNumber1Text:
 	text "If my @"
 	text_from_ram StringBuffer4
-	db $0
+	text ""
 	line "sees anything"

 	para "pretty, it goes"
--- a/text/phone/kenji_overworld.asm
+++ b/text/phone/kenji_overworld.asm
@@ -43,7 +43,7 @@ KenjiPhoneFullText:

 KenjiGiftText:
 	text "I wish to thank"
-	line "you, ", $52, "!"
+	line "you, <PLAYER>!"

 	para "I've been training"
 	line "all alone…"
--- a/text/phone/mom.asm
+++ b/text/phone/mom.asm
@@ -1,7 +1,7 @@
 MomPhoneGreetingText: ; 0x1b4000
 	text "Hello?"

-	para "Oh, hi, ", $52, "!"
+	para "Oh, hi, <PLAYER>!"
 	line "Working hard?"
 	done

@@ -14,8 +14,8 @@ UnknownText_0x1b4021: ; 0x1b4021
 	para "Isn't that where"
 	line "@"
 	TX_RAM StringBuffer4
-	text $51
-	db "is? Did you go"
+	text ""
+	para "is? Did you go"
 	line "take a look?"
 	done

@@ -27,7 +27,7 @@ MomPhoneGenericAreaText: ; 0x1b406b

 	para "I've never gone"
 	line "there. That's kind"
-	cont "of neat, ", $52, "."
+	cont "of neat, <PLAYER>."
 	done

 MomPhoneNewBarkText: ; 0x1b40b1
@@ -64,7 +64,7 @@ UnknownText_0x1b4150: ; 0x1b4150
 	text "That sounds really"
 	line "tough."

-	para "But, ", $52, ", I"
+	para "But, <PLAYER>, I"
 	line "know you're really"

 	para "determined. You'll"
@@ -87,7 +87,7 @@ UnknownText_0x1b41ea: ; 0x1b41ea
 	done

 UnknownText_0x1b420d: ; 0x1b420d
-	text "Oh, ", $52, ","
+	text "Oh, <PLAYER>,"
 	line "you're not saving"

 	para "any money. Would"
@@ -115,7 +115,7 @@ MomPhoneWontSaveMoneyText: ; 0x1b42a3
 	done

 MomPhoneHangUpText: ; 0x1b42c0
-	text $52, ", keep it"
+	text "<PLAYER>, keep it"
 	line "up! I'm rooting"
 	cont "for you, baby!"
 	done
@@ -123,7 +123,7 @@ MomPhoneHangUpText: ; 0x1b42c0
 MomPhoneNoPokemonText: ; 0x1b42ea
 	text "Hello?"

-	para "Oh, hi, ", $52, "!"
+	para "Oh, hi, <PLAYER>!"
 	line "Wasn't PROF.ELM"
 	cont "waiting for you?"
 	done
@@ -131,7 +131,7 @@ MomPhoneNoPokemonText: ; 0x1b42ea
 MomPhoneNoPokedexText: ; 0x1b431d
 	text "Hello?"

-	para "Oh, hi, ", $52, "!"
+	para "Oh, hi, <PLAYER>!"
 	line "You're on a big"

 	para "mission for PROF."
@@ -141,7 +141,7 @@ MomPhoneNoPokedexText: ; 0x1b431d
 MomPhoneNoGymQuestText: ; 0x1b435f
 	text "Hello?"

-	para "Hi, ", $52, "! If"
+	para "Hi, <PLAYER>! If"
 	line "you're done with"

 	para "your errand come"
@@ -151,7 +151,7 @@ MomPhoneNoGymQuestText: ; 0x1b435f
 MomPhoneLectureText: ; 0x1b43a1
 	text "Hello?"

-	para "…… ", $52, "?"
+	para "…… <PLAYER>?"
 	line "I heard from PROF."

 	para "ELM that you went"
--- a/text/phone/trainers1.asm
+++ b/text/phone/trainers1.asm
--- a/text/sweethoney.asm
+++ b/text/sweethoney.asm
@@ -31,7 +31,7 @@ UnusedSweetHoneyGiveText: ; 0x55819
 	done

 UnusedGotSweetHoneyText: ; 0x5583e
-	text $52, " received"
+	text "<PLAYER> received"
 	line "SWEET HONEY."
 	done