Create charmaps and update text/

14 files changed, 833 insertions, 390 deletions

diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm
index 4731f7d..8a36eb1 100644
--- a/src/constants/charmaps.asm
+++ b/src/constants/charmaps.asm
@@ -9,7 +9,197 @@
 	charmap "♀", "%"
 	charmap "”", "\""
 
-; TX_SYMBOL (full-tile icons/symbols loaded at the beginning of v0Tiles2)
+; TX_FULLWIDTH3
+	fwcharmap 3, "A", $30
+	fwcharmap 3, "B", $31
+	fwcharmap 3, "C", $32
+	fwcharmap 3, "D", $33
+	fwcharmap 3, "E", $34
+	fwcharmap 3, "F", $35
+	fwcharmap 3, "G", $36
+	fwcharmap 3, "H", $37
+	fwcharmap 3, "I", $38
+	fwcharmap 3, "J", $39
+	fwcharmap 3, "K", $3a
+	fwcharmap 3, "L", $3b
+	fwcharmap 3, "M", $3c
+	fwcharmap 3, "N", $3d
+	fwcharmap 3, "O", $3e
+	fwcharmap 3, "P", $3f
+	fwcharmap 3, "Q", $40
+	fwcharmap 3, "R", $41
+	fwcharmap 3, "S", $42
+	fwcharmap 3, "T", $43
+	fwcharmap 3, "U", $44
+	fwcharmap 3, "V", $45
+	fwcharmap 3, "W", $46
+	fwcharmap 3, "X", $47
+	fwcharmap 3, "Y", $48
+	fwcharmap 3, "Z", $49
+	fwcharmap 3, "g", $4a
+	fwcharmap 3, "c", $4b
+	fwcharmap 3, "m", $4c
+	fwcharmap 3, "r.", $4d
+	fwcharmap 3, "♀", $4e
+	fwcharmap 3, "♂", $4f
+	fwcharmap 3, "[", $50
+	fwcharmap 3, "]", $51
+	fwcharmap 3, "●", $52
+	fwcharmap 3, "◆", $53
+	fwcharmap 3, "★", $54
+	fwcharmap 3, "☆", $55
+	fwcharmap 3, "_", $56
+	fwcharmap 3, "■", $57
+	fwcharmap 3, "ºC", $58
+	fwcharmap 3, "“", $59
+	fwcharmap 3, "º", $5a
+	fwcharmap 3, "º(2)", $5b ; duplicate
+	fwcharmap 3, "̳ ", $5c
+	fwcharmap 3, "&", $5d
+	fwcharmap 3, ":", $5e
+	fwcharmap 3, "○", $5f
+	fwcharmap 3, "❄", $60
+	fwcharmap 3, "o", $61
+	fwcharmap 3, "^", $62
+	fwcharmap 3, "♪", $63
+	fwcharmap 3, "'", $7a
+	fwcharmap 3, "”", $7b
+
+; TX_KATAKANA
+	fwcharmap 0, "ヲ", $10
+	fwcharmap 0, "ア", $11
+	fwcharmap 0, "イ", $12
+	fwcharmap 0, "ウ", $13
+	fwcharmap 0, "エ", $14
+	fwcharmap 0, "オ", $15
+	fwcharmap 0, "カ", $16
+	fwcharmap 0, "キ", $17
+	fwcharmap 0, "ク", $18
+	fwcharmap 0, "ケ", $19
+	fwcharmap 0, "コ", $1a
+	fwcharmap 0, "サ", $1b
+	fwcharmap 0, "シ", $1c
+	fwcharmap 0, "ス", $1d
+	fwcharmap 0, "セ", $1e
+	fwcharmap 0, "ソ", $1f
+	fwcharmap 0, "タ", $20
+	fwcharmap 0, "チ", $21
+	fwcharmap 0, "ツ", $22
+	fwcharmap 0, "テ", $23
+	fwcharmap 0, "ト", $24
+	fwcharmap 0, "ナ", $25
+	fwcharmap 0, "ニ", $26
+	fwcharmap 0, "ヌ", $27
+	fwcharmap 0, "ネ", $28
+	fwcharmap 0, "ノ", $29
+	fwcharmap 0, "ハ", $2a
+	fwcharmap 0, "ヒ", $2b
+	fwcharmap 0, "フ", $2c
+;	fwcharmap 0, " ", $2d
+	fwcharmap 0, "ホ", $2e
+	fwcharmap 0, "マ", $2f
+	fwcharmap 0, "ミ", $30
+	fwcharmap 0, "ム", $31
+	fwcharmap 0, "メ", $32
+	fwcharmap 0, "モ", $33
+	fwcharmap 0, "ヤ", $34
+	fwcharmap 0, "ユ", $35
+	fwcharmap 0, "ヨ", $36
+	fwcharmap 0, "ラ", $37
+;	fwcharmap 0, " ", $38
+	fwcharmap 0, "ル", $39
+	fwcharmap 0, "レ", $3a
+	fwcharmap 0, "ロ", $3b
+	fwcharmap 0, "ワ", $3c
+	fwcharmap 0, "ン", $3d
+;	fwcharmap 0, " ", $3e-$56
+	fwcharmap 0, "ァ", $57
+	fwcharmap 0, "ィ", $58
+	fwcharmap 0, "ゥ", $59
+	fwcharmap 0, "ェ", $5a
+	fwcharmap 0, "ォ", $5b
+	fwcharmap 0, "ャ", $5c
+	fwcharmap 0, "ュ", $5d
+	fwcharmap 0, "ョ", $5e
+	fwcharmap 0, "ッ", $5f
+
+; TX_HIRAGANA
+	fwcharmap 0, "を", $10
+	fwcharmap 0, "あ", $11
+	fwcharmap 0, "い", $12
+	fwcharmap 0, "う", $13
+	fwcharmap 0, "え", $14
+	fwcharmap 0, "お", $15
+	fwcharmap 0, "か", $16
+	fwcharmap 0, "き", $17
+	fwcharmap 0, "く", $18
+	fwcharmap 0, "け", $19
+	fwcharmap 0, "こ", $1a
+	fwcharmap 0, "さ", $1b
+	fwcharmap 0, "し", $1c
+	fwcharmap 0, "す", $1d
+	fwcharmap 0, "せ", $1e
+	fwcharmap 0, "そ", $1f
+	fwcharmap 0, "た", $20
+	fwcharmap 0, "ち", $21
+	fwcharmap 0, "つ", $22
+	fwcharmap 0, "て", $23
+	fwcharmap 0, "と", $24
+	fwcharmap 0, "な", $25
+	fwcharmap 0, "に", $26
+	fwcharmap 0, "ぬ", $27
+	fwcharmap 0, "ね", $28
+	fwcharmap 0, "の", $29
+	fwcharmap 0, "は", $2a
+	fwcharmap 0, "ひ", $2b
+	fwcharmap 0, "ふ", $2c
+	fwcharmap 0, "へ", $2d
+	fwcharmap 0, "ほ", $2e
+	fwcharmap 0, "ま", $2f
+	fwcharmap 0, "み", $30
+	fwcharmap 0, "む", $31
+	fwcharmap 0, "め", $32
+	fwcharmap 0, "も", $33
+	fwcharmap 0, "や", $34
+	fwcharmap 0, "ゆ", $35
+	fwcharmap 0, "よ", $36
+	fwcharmap 0, "ら", $37
+	fwcharmap 0, "り", $38
+	fwcharmap 0, "る", $39
+	fwcharmap 0, "れ", $3a
+	fwcharmap 0, "ろ", $3b
+	fwcharmap 0, "わ", $3c
+	fwcharmap 0, "ん", $3d
+;	fwcharmap 0, " ", $3e-$5b
+	fwcharmap 0, "ゃ", $5c
+	fwcharmap 0, "ゅ", $5d
+	fwcharmap 0, "ょ", $5e
+	fwcharmap 0, "っ", $5f
+
+; TX_KATAKANA, TX_HIRAGANA, and default font
+	fwcharmap 0, "0", $60
+	fwcharmap 0, "1", $61
+	fwcharmap 0, "2", $62
+	fwcharmap 0, "3", $63
+	fwcharmap 0, "4", $64
+	fwcharmap 0, "5", $65
+	fwcharmap 0, "6", $66
+	fwcharmap 0, "7", $67
+	fwcharmap 0, "8", $68
+	fwcharmap 0, "9", $69
+	fwcharmap 0, "+", $6a
+	fwcharmap 0, "-", $6b
+	fwcharmap 0, "✕", $6c
+	fwcharmap 0, "/", $6d
+	fwcharmap 0, "!", $6e
+	fwcharmap 0, "?", $6f
+	fwcharmap 0, " ", $70
+	fwcharmap 0, "(", $71
+	fwcharmap 0, ")", $72
+	fwcharmap 0, "·", $77
+	fwcharmap 0, "-(2)", $78 ; duplicate
+
+; TX_SYMBOL
 ; TODO: If user-defined functions ever become a thing a symbol(*) syntax
 ;       would probably be preferred over SYM_*
 	charmap "<", TX_SYMBOL
@@ -59,7 +249,7 @@
 	txsymbol DOT        ; $2a
 	txsymbol PLUS       ; $2b
 	txsymbol MINUS      ; $2c
-	txsymbol x          ; $2d
+	txsymbol CROSS      ; $2d
 	txsymbol SLASH      ; $2e
 	txsymbol CURSOR_D   ; $2f
 	txsymbol PRIZE      ; $30
diff --git a/src/macros/data.asm b/src/macros/data.asm
index ddb7443..80c4ba2 100644
--- a/src/macros/data.asm
+++ b/src/macros/data.asm
@@ -90,6 +90,10 @@ txsymbol: MACRO
 	charmap "\1>", const_value + -1
 ENDM
 
+fwcharmap: MACRO
+	charmap STRCAT("FW\1_", \2), \3
+ENDM
+
 textitem: MACRO
 	db \1, \2
 	tx \3
diff --git a/src/macros/text.asm b/src/macros/text.asm
index 24c5987..4a4211a 100644
--- a/src/macros/text.asm
+++ b/src/macros/text.asm
@@ -1,4 +1,56 @@
 text   EQUS "db TX_HALFWIDTH, "
-textfw EQUS "db TX_FULLWIDTH3, "
 line   EQUS "db TX_LINE, "
 done   EQUS "db TX_END"
+
+half2full EQUS "db TX_HALF2FULL"
+
+katakana: MACRO
+	db TX_KATAKANA
+	rept _NARG
+	db STRCAT("FW0_", \1)
+	shift
+	endr
+ENDM
+
+hiragana: MACRO
+	db TX_HIRAGANA
+	rept _NARG
+	db STRCAT("FW0_", \1)
+	shift
+	endr
+ENDM
+
+textfw0: MACRO
+	rept _NARG
+	db STRCAT("FW0_", \1)
+	shift
+	endr
+ENDM
+
+textfw1: MACRO
+	rept _NARG
+	db TX_FULLWIDTH1, STRCAT("FW1_", \1)
+	shift
+	endr
+ENDM
+
+textfw2: MACRO
+	rept _NARG
+	db TX_FULLWIDTH2, STRCAT("FW2_", \1)
+	shift
+	endr
+ENDM
+
+textfw3: MACRO
+	rept _NARG
+	db TX_FULLWIDTH3, STRCAT("FW3_", \1)
+	shift
+	endr
+ENDM
+
+textfw4: MACRO
+	rept _NARG
+	db TX_FULLWIDTH2, STRCAT("FW4_", \1)
+	shift
+	endr
+ENDM
diff --git a/src/text/text1.asm b/src/text/text1.asm
index 50210fb..ce5da88 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -39,7 +39,9 @@ PKMNPWRText: ; 36356 (d:6356)
 	done
 
 Text000b: ; 36360 (d:6360)
-	db $56,$19,$33,$3d,$16,$78,$4c
+	db $56
+	textfw0 "ケ", "モ", "ン", "カ", "-(2)"
+	db $4c
 	done
 
 LengthText: ; 36368 (d:6368)
@@ -55,7 +57,7 @@ PokemonText: ; 36378 (d:6378)
 	done
 
 Text000f: ; 36382 (d:6382)
-	textfw $4c
+	textfw3 "m"
 	done
 
 LbsText: ; 36385 (d:6385)
@@ -63,19 +65,19 @@ LbsText: ; 36385 (d:6385)
 	done
 
 Text0011: ; 3638b (d:638b)
-	db $70
+	textfw0 " "
 	done
 
 Text0012: ; 3638d (d:638d)
-	textfw $52
+	textfw3 "●"
 	done
 
 Text0013: ; 36390 (d:6390)
-	textfw $53
+	textfw3 "◆"
 	done
 
 Text0014: ; 36393 (d:6393)
-	textfw $54
+	textfw3 "★"
 	done
 
 Text0015: ; 36396 (d:6396)
@@ -147,27 +149,27 @@ UnableDueToParalysisText: ; 364a1 (d:64a1)
 	done
 
 Received10DamageDueToPoisonText: ; 364be (d:64be)
-	text TX_RAM2, " received"
+	text "<RAMTEXT> received"
 	line "10 damage due to Poison."
 	done
 
 Received20DamageDueToPoisonText: ; 364e3 (d:64e3)
-	text TX_RAM2, " received"
+	text "<RAMTEXT> received"
 	line "20 damage due to Double Poison."
 	done
 
 IsStillAsleepText: ; 3650f (d:650f)
-	text TX_RAM2, " is"
+	text "<RAMTEXT> is"
 	line "still Asleep."
 	done
 
 IsCuredOfSleepText: ; 36523 (d:6523)
-	text TX_RAM2, " is"
+	text "<RAMTEXT> is"
 	line "cured of Sleep."
 	done
 
 IsCuredOfParalysisText: ; 36539 (d:6539)
-	text TX_RAM2, " is"
+	text "<RAMTEXT> is"
 	line "cured of Paralysis."
 	done
 
@@ -204,7 +206,7 @@ Text0032: ; 365b6 (d:65b6)
 	done
 
 UsedText: ; 365be (d:65be)
-	text "Used ", TX_RAM2, "."
+	text "Used <RAMTEXT>."
 	done
 
 Text0034: ; 365c7 (d:65c7)
@@ -212,38 +214,38 @@ Text0034: ; 365c7 (d:65c7)
 	done
 
 PokemonsAttackText: ; 365d8 (d:65d8)
-	text TX_RAM2, "'s"
+	text "<RAMTEXT>'s"
 	line ""
-	text TX_RAM2, "!"
+	text "<RAMTEXT>!"
 	done
 
 Text0036: ; 365e1 (d:65e1)
-	text TX_RAM2, " received"
-	line TX_RAM3, " damage due to Resistance!"
+	text "<RAMTEXT> received"
+	line "<RAMNUM> damage due to Resistance!"
 	done
 
 Text0037: ; 36609 (d:6609)
-	text TX_RAM2, " received"
-	line TX_RAM3, " damage due to Weakness!"
+	text "<RAMTEXT> received"
+	line "<RAMNUM> damage due to Weakness!"
 	done
 
 Text0038: ; 3662f (d:662f)
-	text TX_RAM2, " received"
-	line TX_RAM3, " damage due to Weakness!"
+	text "<RAMTEXT> received"
+	line "<RAMNUM> damage due to Weakness!"
 	done
 
 Text0039: ; 36655 (d:6655)
-	text TX_RAM2, " did not"
+	text "<RAMTEXT> did not"
 	line "receive damage due to Resistance."
 	done
 
 Text003a: ; 36682 (d:6682)
-	text TX_RAM2, " took"
-	line TX_RAM3, " damage."
+	text "<RAMTEXT> took"
+	line "<RAMNUM> damage."
 	done
 
 Text003b: ; 36694 (d:6694)
-	text TX_RAM2, " did not"
+	text "<RAMTEXT> did not"
 	line "receive damage!"
 	done
 
@@ -387,18 +389,18 @@ Text0059: ; 369dc (d:69dc)
 	done
 
 RetreatedToTheBenchText: ; 36a19 (d:6a19)
-	text TX_RAM2, ""
+	text "<RAMTEXT>"
 	line "Retreated to the Bench."
 	done
 
 RetreatWasUnsuccessfulText: ; 36a34 (d:6a34)
-	text TX_RAM2, "'s"
+	text "<RAMTEXT>'s"
 	line "Retreat was unsuccessful."
 	done
 
 WillUseThePokemonPowerText: ; 36a53 (d:6a53)
-	text TX_RAM2, " will use the"
-	line "Pokémon Power ", TX_RAM2, "."
+	text "<RAMTEXT> will use the"
+	line "Pokémon Power <RAMTEXT>."
 	done
 
 FinishedTurnWithoutAttackingText: ; 36a74 (d:6a74)
@@ -407,31 +409,31 @@ FinishedTurnWithoutAttackingText: ; 36a74 (d:6a74)
 	done
 
 Text005e: ; 36a9a (d:6a9a)
-	text TX_RAM1, "'s Turn."
+	text "<RAMNAME>'s Turn."
 	done
 
 Text005f: ; 36aa5 (d:6aa5)
-	text "Attached ", TX_RAM2, ""
-	line "to ", TX_RAM2, "."
+	text "Attached <RAMTEXT>"
+	line "to <RAMTEXT>."
 	done
 
 Text0060: ; 36ab7 (d:6ab7)
-	text TX_RAM2, " evolved"
-	line "into ", TX_RAM2, "."
+	text "<RAMTEXT> evolved"
+	line "into <RAMTEXT>."
 	done
 
 PlacedOnTheBenchText: ; 36aca (d:6aca)
-	text "Placed ", TX_RAM2, ""
+	text "Placed <RAMTEXT>"
 	line "on the Bench."
 	done
 
 PlacedInTheArenaText: ; 36ae2 (d:6ae2)
-	text TX_RAM2, ""
+	text "<RAMTEXT>"
 	line "was placed in the Arena."
 	done
 
 ShufflesTheDeckText: ; 36afe (d:6afe)
-	text TX_RAM1, " shuffles the Deck."
+	text "<RAMNAME> shuffles the Deck."
 	done
 
 Text0064: ; 36b14 (d:6b14)
@@ -449,12 +451,12 @@ Text0066: ; 36b7a (d:6b7a)
 	done
 
 Text0067: ; 36b9a (d:6b9a)
-	text TX_RAM1, ""
+	text "<RAMNAME>"
 	line "drew 7 cards."
 	done
 
 DeckHasXCardsText: ; 36bab (d:6bab)
-	text TX_RAM1, "'s deck has ", TX_RAM3, " cards."
+	text "<RAMNAME>'s deck has <RAMNUM> cards."
 	done
 
 ChooseBasicPkmnToPlaceInArenaText: ; 36bc2 (d:6bc2)
@@ -464,7 +466,7 @@ ChooseBasicPkmnToPlaceInArenaText: ; 36bc2 (d:6bc2)
 
 Text006a: ; 36bf1 (d:6bf1)
 	text "There are no Basic Pokémon"
-	line "in ", TX_RAM1, "'s hand."
+	line "in <RAMNAME>'s hand."
 	done
 
 NeitherPlayerHasBasicPkmnText: ; 36c1a (d:6c1a)
@@ -493,7 +495,7 @@ Text006f: ; 36ce1 (d:6ce1)
 	done
 
 YouDrewText: ; 36cfd (d:6cfd)
-	text "You drew ", TX_RAM2, "."
+	text "You drew <RAMTEXT>."
 	done
 
 Text0071: ; 36d0a (d:6d0a)
@@ -506,13 +508,13 @@ PlacingThePrizesText: ; 36d28 (d:6d28)
 
 PleasePlacePrizesText: ; 36d3f (d:6d3f)
 	text "Please place"
-	line TX_RAM3, " Prizes."
+	line "<RAMNUM> Prizes."
 	done
 
 IfHeadPlayerPlaysFirstText: ; 36d57 (d:6d57)
 	text "If heads,"
 	line ""
-	text TX_RAM2, " plays first."
+	text "<RAMTEXT> plays first."
 	done
 
 CoinTossToDetermineWhoFirstText: ; 36d72 (d:6d72)
@@ -525,17 +527,17 @@ DecisionText: ; 36da4 (d:6da4)
 	done
 
 DuelWasADrawText: ; 36db1 (d:6db1)
-	text "The Duel with ", TX_RAM1, ""
+	text "The Duel with <RAMNAME>"
 	line "was a Draw!"
 	done
 
 WonDuelText: ; 36dce (d:6dce)
-	text "You won the Duel with ", TX_RAM1, "!"
+	text "You won the Duel with <RAMNAME>!"
 	done
 
 LostDuelText: ; 36de8 (d:6de8)
 	text "You lost the Duel"
-	line "with ", TX_RAM1, "..."
+	line "with <RAMNAME>..."
 	done
 
 StartSuddenDeathMatchText: ; 36e05 (d:6e05)
@@ -562,22 +564,22 @@ Text007e: ; 36e63 (d:6e63)
 	done
 
 Text007f: ; 36e6a (d:6e6a)
-	text TX_RAM1, " took"
+	text "<RAMNAME> took"
 	line "all the Prizes!"
 	done
 
 Text0080: ; 36e82 (d:6e82)
 	text "There are no Pokémon"
-	line "in ", TX_RAM1, "'s Play Area!"
+	line "in <RAMNAME>'s Play Area!"
 	done
 
 WasKnockedOutText: ; 36eaa (d:6eaa)
-	text TX_RAM2, " was"
+	text "<RAMTEXT> was"
 	line "Knocked Out!"
 	done
 
 HavePokemonPowerText: ; 36ebe (d:6ebe)
-	text TX_RAM2, " have"
+	text "<RAMTEXT> have"
 	line "Pokémon Power."
 	done
 
@@ -602,15 +604,18 @@ Text0086: ; 36f31 (d:6f31)
 	done
 
 Text0087: ; 36f43 (d:6f43)
-	db $03,$31,$0c,$03,$42,$0c
+	textfw3 "B"
+	db "<RAMNUM>"
+	textfw3 "S"
+	db "<RAMNUM>"
 	done
 
 DuelistIsThinkingText: ; 36f4a (d:6f4a)
-	text TX_RAM1, " is thinking."
+	text "<RAMNAME> is thinking."
 	done
 
 Text0089: ; 36f5a (d:6f5a)
-	db $70,$70,$70,$70,$70,$70,$70,$70,$70,$70
+	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
 	done
 
 Text008a: ; 36f65 (d:6f65)
@@ -703,7 +708,10 @@ Text0098: ; 37179 (d:7179)
 
 Text0099: ; 37184 (d:7184)
 	text "Load File"
-	line "  ",$07,$60,$06,"  Last Saved File"
+	line "  "
+	half2full
+	textfw0 "0"
+	text "  Last Saved File"
 	done
 
 Text009a: ; 371a6 (d:71a6)
@@ -780,15 +788,15 @@ Text00a6: ; 3737b (d:737b)
 	done
 
 DuelistHandText: ; 37392 (d:7392)
-	text TX_RAM1, "'s Hand"
+	text "<RAMNAME>'s Hand"
 	done
 
 DuelistPlayAreaText: ; 3739c (d:739c)
-	text TX_RAM1, "'s Play Area"
+	text "<RAMNAME>'s Play Area"
 	done
 
 DuelistDeckText: ; 373ab (d:73ab)
-	text TX_RAM1, "'s Deck"
+	text "<RAMNAME>'s Deck"
 	done
 
 PleaseSelectHandText: ; 373b5 (d:73b5)
@@ -892,7 +900,7 @@ Text00be: ; 37715 (d:7715)
 	done
 
 EnergyCardsRequiredToRetreatText: ; 37758 (d:7758)
-	text TX_RAM3, " Energy cards"
+	text "<RAMNUM> Energy cards"
 	line "are required to Retreat."
 	done
 
@@ -1108,7 +1116,7 @@ Text00ec: ; 37e73 (d:7e73)
 	done
 
 Text00ed: ; 37e92 (d:7e92)
-	text "If Tails, ", TX_RAM3, " damage"
+	text "If Tails, <RAMNUM> damage"
 	line "to yourself, too."
 	done
 
@@ -1138,10 +1146,10 @@ Text00f2: ; 37f9a (d:7f9a)
 
 Text00f3: ; 37fa8 (d:7fa8)
 	text "Damage check!"
-	line "If Heads, +", TX_RAM3, " damage!!"
+	line "If Heads, +<RAMNUM> damage!!"
 	done
 
 Text00f4: ; 37fcd (d:7fcd)
 	text "Damage check!"
-	line "If Heads, x ", TX_RAM3, " damage!!"
+	line "If Heads, x <RAMNUM> damage!!"
 	done
diff --git a/src/text/text12.asm b/src/text/text12.asm
index e3e7e12..cb4f50a 100644
--- a/src/text/text12.asm
+++ b/src/text/text12.asm
@@ -1249,7 +1249,7 @@ ImakuniDescription: ; 635cb (18:75cb)
 	line "Imakuni wants you to play him as a"
 	line "Basic Pokémon, but you can't."
 	line "A mysterious creature not listed in"
-	line "the Pok`dex. He asks kids around the"
+	line "the Pokédex. He asks kids around the"
 	line "world,”Who is cuter-Pikachu or me?”"
 	done
 
@@ -1318,7 +1318,7 @@ MysteriousFossilDescriptionCont: ; 63ad2 (18:7ad2)
 	line "Pokémon. (Discard it anyway.) At any"
 	line "time during your turn before your"
 	line "attack, you may discard Mysterious"
-	line "Fossil from play. (Use GameBoy Pok`-"
+	line "Fossil from play. (Use GameBoy Poké-"
 	line "mon Power menu option to do this.)"
 	done
 
@@ -1396,7 +1396,7 @@ PokemonCenterDescription: ; 63e9e (18:7e9e)
 	done
 
 PokeBallName: ; 63f2e (18:7f2e)
-	text "Pok` Ball"
+	text "Poké Ball"
 	done
 
 PokeBallDescription: ; 63f39 (18:7f39)
diff --git a/src/text/text13.asm b/src/text/text13.asm
index b3ba269..bb48917 100644
--- a/src/text/text13.asm
+++ b/src/text/text13.asm
@@ -18,7 +18,7 @@ ComputerSearchDescription: ; 6408e (19:408e)
 	done
 
 PokedexName: ; 6411d (19:411d)
-	text "Pok`dex"
+	text "Pokédex"
 	done
 
 PokedexDescription: ; 64126 (19:4126)
diff --git a/src/text/text2.asm b/src/text/text2.asm
index 2248bea..5705f38 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -19,7 +19,7 @@ ConfusionCheckRetreatText: ; 380ac (e:40ac)
 	done
 
 Text00f9: ; 380db (e:40db)
-	text TX_RAM2, "'s Sleep check."
+	text "<RAMTEXT>'s Sleep check."
 	done
 
 Text00fa: ; 380ed (e:40ed)
@@ -72,12 +72,12 @@ UnableToUseAttackDueToAmnesiaText: ; 382af (e:42af)
 	done
 
 KnockedOutDueToDestinyBondText: ; 382e9 (e:42e9)
-	text TX_RAM2, " was Knocked Out"
+	text "<RAMTEXT> was Knocked Out"
 	line "due to the effects of Destiny Bond."
 	done
 
 ReceivesDamageDueToStrikesBackText: ; 38320 (e:4320)
-	text TX_RAM2, " receives ", TX_RAM3, " damage"
+	text "<RAMTEXT> receives <RAMNUM> damage"
 	line "due to the effects of Strikes Back."
 	done
 
@@ -117,8 +117,8 @@ NoDamageOrEffectDueToTransparencyText: ; 384d8 (e:44d8)
 	done
 
 Text010d: ; 3851f (e:451f)
-	text TX_RAM2, ""
-	line "metamorphs to ", TX_RAM2, "."
+	text "<RAMTEXT>"
+	line "metamorphs to <RAMTEXT>."
 	done
 
 SelectPkmnOnBenchToSwitchWithActiveText: ; 38533 (e:4533)
@@ -132,7 +132,7 @@ Text010f: ; 38575 (e:4575)
 	done
 
 Text0110: ; 3859e (e:459e)
-	text TX_RAM1, " is selecting a Pokémon"
+	text "<RAMNAME> is selecting a Pokémon"
 	line "to place in the Arena."
 	done
 
@@ -154,19 +154,19 @@ Text0113: ; 38647 (e:4647)
 Text0114: ; 3868d (e:468d)
 	text "Changed the Weakness of"
 	line ""
-	text TX_RAM2, " to ", TX_RAM2, "."
+	text "<RAMTEXT> to <RAMTEXT>."
 	done
 
 Text0115: ; 386af (e:46af)
 	text "Changed the Resistance of"
 	line ""
-	text TX_RAM2, " to ", TX_RAM2, "."
+	text "<RAMTEXT> to <RAMTEXT>."
 	done
 
 Text0116: ; 386d3 (e:46d3)
 	text "Changed the color of"
 	line ""
-	text TX_RAM2, " to ", TX_RAM2, "."
+	text "<RAMTEXT> to <RAMTEXT>."
 	done
 
 Text0117: ; 386f2 (e:46f2)
@@ -174,7 +174,7 @@ Text0117: ; 386f2 (e:46f2)
 	done
 
 DrawCardsFromTheDeck: ; 3870e (e:470e)
-	text "Draw ", TX_RAM3, " card(s) from the Deck."
+	text "Draw <RAMNUM> card(s) from the Deck."
 	done
 
 NoCardsInDeckCannotDraw: ; 3872d (e:472d)
@@ -407,7 +407,7 @@ Text013a: ; 391dc (e:51dc)
 	done
 
 Text013b: ; 39215 (e:5215)
-	text "There is no ", TX_RAM2, ""
+	text "There is no <RAMTEXT>"
 	line "in the Deck."
 	done
 
@@ -451,7 +451,7 @@ Text0144: ; 3930a (e:530a)
 
 Text0145: ; 39318 (e:5318)
 	text "Peek was used to look at the"
-	line TX_RAM2, " in your Hand."
+	line "<RAMTEXT> in your Hand."
 	done
 
 Text0146: ; 39346 (e:5346)
@@ -459,12 +459,12 @@ Text0146: ; 39346 (e:5346)
 	done
 
 Text0147: ; 3935d (e:535d)
-	text TX_RAM2, " and all attached"
+	text "<RAMTEXT> and all attached"
 	line "cards were returned to the Hand."
 	done
 
 Text0148: ; 39392 (e:5392)
-	text TX_RAM2, " was chosen"
+	text "<RAMTEXT> was chosen"
 	line "for the effect of Amnesia."
 	done
 
@@ -474,27 +474,27 @@ Text0149: ; 393bb (e:53bb)
 	done
 
 WasUnsuccessfulText: ; 393e6 (e:53e6)
-	text TX_RAM2, "'s"
-	line TX_RAM2, " was unsuccessful."
+	text "<RAMTEXT>'s"
+	line "<RAMTEXT> was unsuccessful."
 	done
 
 Text014b: ; 393ff (e:53ff)
 	text "There was no effect"
-	line "from ", TX_RAM2, "."
+	line "from <RAMTEXT>."
 	done
 
 Text014c: ; 3941c (e:541c)
-	text "The Energy card from ", TX_RAM1, "'s"
+	text "The Energy card from <RAMNAME>'s"
 	line "Play Area was moved."
 	done
 
 Text014d: ; 3944b (e:544b)
-	text TX_RAM1, " drew"
-	line TX_RAM3, " Fire Energy from the Hand."
+	text "<RAMNAME> drew"
+	line "<RAMNUM> Fire Energy from the Hand."
 	done
 
 Text014e: ; 39470 (e:5470)
-	text "The Pokémon cards in ", TX_RAM1, "'s"
+	text "The Pokémon cards in <RAMNAME>'s"
 	line "Hand and Deck were shuffled"
 	done
 
@@ -549,7 +549,7 @@ Text0158: ; 3968b (e:568b)
 	done
 
 Text0159: ; 396b4 (e:56b4)
-	text "You can draw up to ", TX_RAM3, " cards."
+	text "You can draw up to <RAMNUM> cards."
 	line "A to Draw, B to End."
 	done
 
@@ -608,7 +608,7 @@ Text0164: ; 3985b (e:585b)
 	done
 
 Text0165: ; 3986b (e:586b)
-	text TX_RAM2, " was chosen."
+	text "<RAMTEXT> was chosen."
 	done
 
 Text0166: ; 3987a (e:587a)
@@ -637,27 +637,27 @@ Text016a: ; 39952 (e:5952)
 	done
 
 Text016b: ; 39987 (e:5987)
-	text TX_RAM2, " and all attached"
+	text "<RAMTEXT> and all attached"
 	line "cards were returned to the Deck."
 	done
 
 Text016c: ; 399bc (e:59bc)
-	text TX_RAM2, " was returned"
+	text "<RAMTEXT> was returned"
 	line "from the Arena to the Hand."
 	done
 
 Text016d: ; 399e8 (e:59e8)
-	text TX_RAM2, " was returned"
+	text "<RAMTEXT> was returned"
 	line "from the Bench to the Hand."
 	done
 
 Text016e: ; 39a14 (e:5a14)
-	text TX_RAM2, " was returned"
+	text "<RAMTEXT> was returned"
 	line "to the Deck."
 	done
 
 Text016f: ; 39a31 (e:5a31)
-	text TX_RAM2, " was placed"
+	text "<RAMTEXT> was placed"
 	line "in the Hand."
 	done
 
@@ -680,12 +680,12 @@ Text0173: ; 39a9c (e:5a9c)
 	done
 
 Text0174: ; 39ab9 (e:5ab9)
-	text "Discarded ", TX_RAM3, " cards"
-	line "from ", TX_RAM1, "'s Deck."
+	text "Discarded <RAMNUM> cards"
+	line "from <RAMNAME>'s Deck."
 	done
 
 Text0175: ; 39adb (e:5adb)
-	text "Discarded ", TX_RAM2, ""
+	text "Discarded <RAMTEXT>"
 	line "from the Hand."
 	done
 
@@ -694,23 +694,23 @@ Text0176: ; 39af7 (e:5af7)
 	done
 
 Text0177: ; 39b03 (e:5b03)
-	text TX_RAM2, ""
+	text "<RAMTEXT>"
 	line "came to the Bench!"
 	done
 
 Text0178: ; 39b19 (e:5b19)
-	text TX_RAM1, " has"
+	text "<RAMNAME> has"
 	line "no cards in Hand!"
 	done
 
 Text0179: ; 39b32 (e:5b32)
-	text TX_RAM2, " healed"
-	line TX_RAM3, " damage!"
+	text "<RAMTEXT> healed"
+	line "<RAMNUM> damage!"
 	done
 
 Text017a: ; 39b46 (e:5b46)
-	text TX_RAM2, " devolved"
-	line "to ", TX_RAM2, "!"
+	text "<RAMTEXT> devolved"
+	line "to <RAMTEXT>!"
 	done
 
 Text017b: ; 39b58 (e:5b58)
@@ -718,7 +718,7 @@ Text017b: ; 39b58 (e:5b58)
 	done
 
 Text017c: ; 39b73 (e:5b73)
-	text "You can select ", TX_RAM3, " more cards. Quit?"
+	text "You can select <RAMNUM> more cards. Quit?"
 	done
 
 Text017d: ; 39b97 (e:5b97)
@@ -757,7 +757,7 @@ Text0183: ; 39c5a (e:5c5a)
 
 Text0184: ; 39c86 (e:5c86)
 	text "Exchanged the cards"
-	line "in ", TX_RAM1, "'s Hand."
+	line "in <RAMNAME>'s Hand."
 	done
 
 Text0185: ; 39ca8 (e:5ca8)
@@ -780,8 +780,8 @@ Text0188: ; 39cea (e:5cea)
 	done
 
 Text0189: ; 39d1b (e:5d1b)
-	text "Begin a ", TX_RAM3, "-Prize Duel"
-	line "with ", TX_RAM1, "."
+	text "Begin a <RAMNUM>-Prize Duel"
+	line "with <RAMNAME>."
 	done
 
 Text018a: ; 39d39 (e:5d39)
@@ -805,32 +805,32 @@ Text018d: ; 39dcc (e:5dcc)
 	done
 
 Text018e: ; 39e02 (e:5e02)
-	text "Received ", TX_RAM2, ""
+	text "Received <RAMTEXT>"
 	line "through Card Pop!"
 	done
 
 ReceivedCardText: ; 39e20 (e:5e20)
-	text TX_RAM1, " received"
-	line "a ", TX_RAM2, "!"
+	text "<RAMNAME> received"
+	line "a <RAMTEXT>!"
 	done
 
 ReceivedPromotionalCardText: ; 39e31 (e:5e31)
-	text TX_RAM1, " received a Promotional"
-	line "card ", TX_RAM2, "!"
+	text "<RAMNAME> received a Promotional"
+	line "card <RAMTEXT>!"
 	done
 
 ReceivedLegendaryCardText: ; 39e53 (e:5e53)
-	text TX_RAM1, " received the Legendary"
-	line "card ", TX_RAM2, "!"
+	text "<RAMNAME> received the Legendary"
+	line "card <RAMTEXT>!"
 	done
 
 ReceivedPromotionalFlyingPikachuText: ; 39e75 (e:5e75)
-	text TX_RAM1, " received a Promotinal"
+	text "<RAMNAME> received a Promotinal"
 	line "card Flyin' Pikachu!"
 	done
 
 ReceivedPromotionalSurfingPikachuText: ; 39ea3 (e:5ea3)
-	text TX_RAM1, " received a Promotional"
+	text "<RAMNAME> received a Promotional"
 	line "card Surfin' Pikachu!"
 	done
 
@@ -853,11 +853,11 @@ Text0197: ; 39f2f (e:5f2f)
 	done
 
 Text0198: ; 39f4d (e:5f4d)
-	text "Sent to ", TX_RAM1, "."
+	text "Sent to <RAMNAME>."
 	done
 
 Text0199: ; 39f59 (e:5f59)
-	text "Received from ", TX_RAM1, "."
+	text "Received from <RAMNAME>."
 	done
 
 Text019a: ; 39f6b (e:5f6b)
@@ -988,7 +988,7 @@ Text01b0: ; 3a519 (e:6519)
 	done
 
 Text01b1: ; 3a559 (e:6559)
-	db TX_END
+	done
 
 Text01b2: ; 3a55a (e:655a)
 	text "1. Take Drowzee from your hand"
@@ -1213,14 +1213,15 @@ Text01d3: ; 3b196 (e:7196)
 	text "Now Machop has only 10 HP left."
 	line "Let's finish the battle!"
 	line "Attack with Starmie's Star Freeze."
-	line TX_END
+	line ""
+	done
 
 Text01d4: ; 3b1f4 (e:71f4)
 	text "You've Knocked Out your opponent!"
 	line ""
 	line "Pick up the last Prize."
 	line ""
-	text TX_RAM1, " is the winner!"
+	text "<RAMNAME> is the winner!"
 	done
 
 Text01d5: ; 3b242 (e:7242)
@@ -1259,7 +1260,7 @@ Text01da: ; 3b3bb (e:73bb)
 	done
 
 Text01db: ; 3b3fe (e:73fe)
-	text TX_RAM1, "'s turn ", TX_RAM3
+	text "<RAMNAME>'s turn ", TX_RAM3
 	done
 
 Text01dc: ; 3b40a (e:740a)
@@ -1483,19 +1484,27 @@ Text0212: ; 3b76e (e:776e)
 	done
 
 Text0213: ; 3b77c (e:777c)
-	db $03,$42,$03,$46,$03,$38,$03,$43,$03,$32,$03,$37,$70,$03,$43,$03,$3e,$70,$03,$44,$03,$3f,$03,$3f,$03,$34,$03,$41
+	textfw3 "S", "W", "I", "T", "C", "H"
+	textfw0 " "
+	textfw3 "T", "O",
+	textfw0 " "
+	textfw3 "U", "P", "P", "E", "R"
 	done
 
 Text0214: ; 3b799 (e:7799)
-	db $03,$42,$03,$46,$03,$38,$03,$43,$03,$32,$03,$37,$70,$03,$43,$03,$3e,$70,$03,$3b,$03,$3e,$03,$46,$03,$34,$03,$41
+	textfw3 "S", "W", "I", "T", "C", "H"
+	textfw0 " "
+	textfw3 "T", "O",
+	textfw0 " "
+	textfw3 "L", "O", "W", "E", "R"
 	done
 
 Text0215: ; 3b7b6 (e:77b6)
-	db $03,$7a
+	textfw3 "'"
 	done
 
 Text0216: ; 3b7b9 (e:77b9)
-	db $03,$7b
+	textfw3 "”"
 	done
 
 YourDiscardPileText: ; 3b7bc (e:77bc)
@@ -1511,15 +1520,17 @@ Text0219: ; 3b7e8 (e:77e8)
 	done
 
 Text021a: ; 3b7ee (e:77ee)
-	db $0e,$2b,$37,$3e,$25
+	hiragana "ひ", "ら"
+	db $3e
+	textfw0 "ナ"
 	done
 
 Text021b: ; 3b7f4 (e:77f4)
-	db $16,$20,$16,$25
+	textfw0 "カ", "タ", "カ", "ナ"
 	done
 
 Text021c: ; 3b7f9 (e:77f9)
-	db $03,$30,$03,$31,$03,$32
+	textfw3 "A", "B", "C"
 	done
 
 Text021d: ; 3b800 (e:7800)
@@ -1531,39 +1542,171 @@ Text021e: ; 3b805 (e:7805)
 	done
 
 Text021f: ; 3b819 (e:7819)
-	db $0e,$11,$70,$16,$70,$1b,$70,$20,$70,$25,$70,$2a,$70,$2f,$70,$34,$70,$37,""
-	line $12,$70,$17,$70,$1c,$70,$21,$70,$26,$70,$2b,$70,$30,$70,$35,$70,$38,""
-	line $13,$70,$18,$70,$1d,$70,$22,$70,$27,$70,$2c,$70,$31,$70,$36,$70,$39,""
-	line $14,$70,$19,$70,$1e,$70,$23,$70,$28,$70,$2d,$70,$32,$70,$3c,$70,$3a,""
-	line $15,$70,$1a,$70,$1f,$70,$24,$70,$29,$70,$2e,$70,$33,$70,$3d,$70,$3b,""
-	line $5c,$70,$5d,$70,$5e,$70,$5f,$70,$10,$70,$03,$59,$70,$03,$5b,$70,$78
+	hiragana "あ", " ", "か", " ", "さ", " ", "た", " ", "な", " ", "は", " ", "ま", " ", "や", " ", "ら"
+	line ""
+	textfw0 "い", " ", "き", " ", "し", " ", "ち", " ", "に", " ", "ひ", " ", "み", " ", "ゆ", " ", "り"
+	line ""
+	textfw0 "う", " ", "く", " ", "す", " ", "つ", " ", "ぬ", " ", "ふ", " ", "む", " ", "よ", " ", "る"
+	line ""
+	textfw0 "え", " ", "け", " ", "せ", " ", "て", " ", "ね", " ", "へ", " ", "め", " ", "わ", " ", "れ"
+	line ""
+	textfw0 "お", " ", "こ", " ", "そ", " ", "と", " ", "の", " ", "ほ", " ", "も", " ", "ん", " ", "ろ"
+	line ""
+	textfw0 "ゃ", " ", "ゅ", " ", "ょ", " ", "っ", " ", "を", " "
+	textfw3 "“"
+	textfw0 " "
+	textfw3 "º(2)"
+	textfw0 " ", "-(2)"
 	done
 
 Text0220: ; 3b886 (e:7886)
-	db $11,$70,$16,$70,$1b,$70,$20,$70,$25,$70,$2a,$70,$2f,$70,$34,$70,$37,""
-	line $12,$70,$17,$70,$1c,$70,$21,$70,$26,$70,$2b,$70,$30,$70,$35,$70,$38,""
-	line $13,$70,$18,$70,$1d,$70,$22,$70,$27,$70,$2c,$70,$31,$70,$36,$70,$39,""
-	line $14,$70,$19,$70,$1e,$70,$23,$70,$28,$70,$2d,$70,$32,$70,$3c,$70,$3a,""
-	line $15,$70,$1a,$70,$1f,$70,$24,$70,$29,$70,$2e,$70,$33,$70,$3d,$70,$3b,""
-	line $5c,$70,$5d,$70,$5e,$70,$5f,$70,$10,$70,$03,$59,$70,$03,$5b,$70,$78
+	textfw0 "ア", " ", "カ", " ", "サ", " ", "タ", " ", "ナ", " ", "ハ", " ", "マ", " ", "ヤ", " ", "ラ"
+	line ""
+	textfw0 "イ", " ", "キ", " ", "シ", " ", "チ", " ", "ニ", " ", "ヒ", " ", "ミ", " ", "ユ", " ", "り"
+	line ""
+	textfw0 "ウ", " ", "ク", " ", "ス", " ", "ツ", " ", "ヌ", " ", "フ", " ", "ム", " ", "ヨ", " ", "ル"
+	line ""
+	textfw0 "エ", " ", "ケ", " ", "セ", " ", "テ", " ", "ネ", " ", "へ", " ", "メ", " ", "ワ", " ", "レ"
+	line ""
+	textfw0 "オ", " ", "コ", " ", "ソ", " ", "ト", " ", "ノ", " ", "ホ", " ", "モ", " ", "ン", " ", "ロ"
+	line ""
+	textfw0 "ャ", " ", "ュ", " ", "ョ", " ", "ッ", " ", "ヲ", " "
+	textfw3 "“"
+	textfw0 " "
+	textfw3 "º(2)"
+	textfw0 " ", "-(2)"
 	done
 
 Text0221: ; 3b8f2 (e:78f2)
-	db $03,$30,$70,$03,$31,$70,$03,$32,$70,$03,$33,$70,$03,$34,$70,$03,$35,$70,$03,$36,$70,$03,$37,$70,$03,$38,""
-	line $03,$39,$70,$03,$3a,$70,$03,$3b,$70,$03,$3c,$70,$03,$3d,$70,$03,$3e,$70,$03,$3f,$70,$03,$40,$70,$03,$41,""
-	line $03,$42,$70,$03,$43,$70,$03,$44,$70,$03,$45,$70,$03,$46,$70,$03,$47,$70,$03,$48,$70,$03,$49,$70,$6e,""
-	line $6f,$70,$03,$5d,$70,$6a,$70,$6b,$70,$77,$70,$60,$70,$61,$70,$62,$70,$63,""
-	line $64,$70,$65,$70,$66,$70,$67,$70,$68,$70,$69,$70,$05,$13,$70,$05,$11,$70,$70,""
-	line $70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70
+	textfw3 "A"
+	textfw0 " "
+	textfw3 "B"
+	textfw0 " "
+	textfw3 "C"
+	textfw0 " "
+	textfw3 "D"
+	textfw0 " "
+	textfw3 "E"
+	textfw0 " "
+	textfw3 "F"
+	textfw0 " "
+	textfw3 "G"
+	textfw0 " "
+	textfw3 "H"
+	textfw0 " "
+	textfw3 "I"
+	line ""
+	textfw3 "J"
+	textfw0 " "
+	textfw3 "K"
+	textfw0 " "
+	textfw3 "L"
+	textfw0 " "
+	textfw3 "M"
+	textfw0 " "
+	textfw3 "N"
+	textfw0 " "
+	textfw3 "O"
+	textfw0 " "
+	textfw3 "P"
+	textfw0 " "
+	textfw3 "Q"
+	textfw0 " "
+	textfw3 "R"
+	line ""
+	textfw3 "S"
+	textfw0 " "
+	textfw3 "T"
+	textfw0 " "
+	textfw3 "U"
+	textfw0 " "
+	textfw3 "V"
+	textfw0 " "
+	textfw3 "W"
+	textfw0 " "
+	textfw3 "X"
+	textfw0 " "
+	textfw3 "Y"
+	textfw0 " "
+	textfw3 "Z"
+	textfw0 " ", "!"
+	line ""
+	textfw0 "?", " "
+	textfw3 "&"
+	textfw0 " ", "+", " ", "-", " ", "·", " ", "0", " ", "1", " ", "2", " ", "3"
+	line ""
+	textfw0 "4", " ", "5", " ", "6", " ", "7", " ", "8", " ", "9", " "
+	db "<No>"
+	textfw0 " "
+	db "<Lv>"
+	textfw0 " ", " "
+	line ""
+	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
 	done
 
 Text0222: ; 3b97b (e:797b)
-	db $03,$30,$70,$03,$31,$70,$03,$32,$70,$03,$33,$70,$03,$34,$70,$03,$35,$70,$03,$36,$70,$03,$37,$70,$03,$38,""
-	line $03,$39,$70,$03,$3a,$70,$03,$3b,$70,$03,$3c,$70,$03,$3d,$70,$03,$3e,$70,$03,$3f,$70,$03,$40,$70,$03,$41,""
-	line $03,$42,$70,$03,$43,$70,$03,$44,$70,$03,$45,$70,$03,$46,$70,$03,$47,$70,$03,$48,$70,$03,$49,$70,$6e,""
-	line $6f,$70,$03,$5d,$70,$6a,$70,$6b,$70,$03,$7a,$70,$60,$70,$61,$70,$62,$70,$63,""
-	line $64,$70,$65,$70,$66,$70,$67,$70,$68,$70,$69,$70,$70,$70,$70,$70,$70,""
-	line $70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70
+	textfw3 "A"
+	textfw0 " "
+	textfw3 "B"
+	textfw0 " "
+	textfw3 "C"
+	textfw0 " "
+	textfw3 "D"
+	textfw0 " "
+	textfw3 "E"
+	textfw0 " "
+	textfw3 "F"
+	textfw0 " "
+	textfw3 "G"
+	textfw0 " "
+	textfw3 "H"
+	textfw0 " "
+	textfw3 "I"
+	line ""
+	textfw3 "J"
+	textfw0 " "
+	textfw3 "K"
+	textfw0 " "
+	textfw3 "L"
+	textfw0 " "
+	textfw3 "M"
+	textfw0 " "
+	textfw3 "N"
+	textfw0 " "
+	textfw3 "O"
+	textfw0 " "
+	textfw3 "P"
+	textfw0 " "
+	textfw3 "Q"
+	textfw0 " "
+	textfw3 "R"
+	line ""
+	textfw3 "S"
+	textfw0 " "
+	textfw3 "T"
+	textfw0 " "
+	textfw3 "U"
+	textfw0 " "
+	textfw3 "V"
+	textfw0 " "
+	textfw3 "W"
+	textfw0 " "
+	textfw3 "X"
+	textfw0 " "
+	textfw3 "Y"
+	textfw0 " "
+	textfw3 "Z"
+	textfw0 " ", "!"
+	line ""
+	textfw0 "?", " "
+	textfw3 "&"
+	textfw0 " ", "+", " ", "-", " "
+	textfw3 "'"
+	textfw0 " ", "0", " ", "1", " ", "2", " ", "3"
+	line ""
+	textfw0 "4", " ", "5", " ", "6", " ", "7", " ", "8", " ", "9", " ", " ", " ", " ", " ", " "
+	line ""
+	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
 	done
 
 NewDeckText: ; 3ba03 (e:7a03)
@@ -1595,24 +1738,24 @@ Text0229: ; 3ba51 (e:7a51)
 	done
 
 ChosenAsDuelingDeckText: ; 3ba55 (e:7a55)
-	text TX_RAM2, " was"
+	text "<RAMTEXT> was"
 	line "chosen as the dueling deck!"
 	done
 
 Text022b: ; 3ba78 (e:7a78)
-	db $61,$77
+	textfw0 "1", "·"
 	done
 
 Text022c: ; 3ba7b (e:7a7b)
-	db $62,$77
+	textfw0 "2", "·"
 	done
 
 Text022d: ; 3ba7e (e:7a7e)
-	db $63,$77
+	textfw0 "3", "·"
 	done
 
 Text022e: ; 3ba81 (e:7a81)
-	db $64,$77
+	textfw0 "4", "·"
 	done
 
 ThereIsNoDeckHereText: ; 3ba84 (e:7a84)
@@ -1715,7 +1858,7 @@ Text0246: ; 3bc85 (e:7c85)
 	done
 
 Text0247: ; 3bc9e (e:7c9e)
-	text TX_RAM1, "'s Play Area"
+	text "<RAMNAME>'s Play Area"
 	done
 
 Text0248: ; 3bcad (e:7cad)
@@ -1747,15 +1890,16 @@ Text024e: ; 3bd20 (e:7d20)
 	done
 
 Text024f: ; 3bd26 (e:7d26)
-	text TX_RAM1, "'s Hand"
+	text "<RAMNAME>'s Hand"
 	done
 
 Text0250: ; 3bd30 (e:7d30)
-	text TX_RAM1, "'s Discard Pile"
+	text "<RAMNAME>'s Discard Pile"
 	done
 
 Text0251: ; 3bd42 (e:7d42)
-	db $70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70
+	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " "
+	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " "
 	done
 
 Text0252: ; 3bd55 (e:7d55)
@@ -1787,7 +1931,7 @@ Text0258: ; 3bdaf (e:7daf)
 	done
 
 Text0259: ; 3bdc6 (e:7dc6)
-	db $6b,$6b,$6b,$6b,$6b,$6b,$6b,$6b,$6b,$6b
+	textfw0 "-", "-", "-", "-", "-", "-", "-", "-", "-", "-"
 	done
 
 Text025a: ; 3bdd1 (e:7dd1)
@@ -1795,7 +1939,7 @@ Text025a: ; 3bdd1 (e:7dd1)
 	done
 
 Text025b: ; 3bddb (e:7ddb)
-	db $6b,$6b,$6b,$6b,$6b,$6b,$6b,$6b,$6b,$6b,$6b,$6b,$6b,$6b
+	textfw0 "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-"
 	done
 
 Text025c: ; 3bdea (e:7dea)
@@ -1830,7 +1974,7 @@ Text0262: ; 3be7d (e:7e7d)
 Text0263: ; 3be82 (e:7e82)
 	text "Saved the configuration for"
 	line ""
-	text TX_RAM2, "! "
+	text "<RAMTEXT>! "
 	done
 
 Text0264: ; 3bea4 (e:7ea4)
@@ -1849,7 +1993,7 @@ Text0266: ; 3bee7 (e:7ee7)
 Text0267: ; 3bf06 (e:7f06)
 	text "Deleted the configuration for"
 	line ""
-	text TX_RAM2, "."
+	text "<RAMTEXT>."
 	done
 
 Text0268: ; 3bf29 (e:7f29)
@@ -1863,7 +2007,7 @@ Text0269: ; 3bf46 (e:7f46)
 Text026a: ; 3bf63 (e:7f63)
 	text "Dismantled"
 	line ""
-	text TX_RAM2, "."
+	text "<RAMTEXT>."
 	done
 
 Text026b: ; 3bf73 (e:7f73)
diff --git a/src/text/text3.asm b/src/text/text3.asm
index 0617435..f705781 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -5,7 +5,7 @@ Text026d: ; 3c000 (f:4000)
 
 Text026e: ; 3c035 (f:4035)
 	text "Built"
-	line TX_RAM2
+	line "<RAMTEXT>"
 	done
 
 Text026f: ; 3c03e (f:403e)
@@ -108,7 +108,7 @@ Text0282: ; 3c357 (f:4357)
 
 Text0283: ; 3c36a (f:436a)
 	text "Received these cards"
-	line "from  ", TX_RAM2, "!"
+	line "from  <RAMTEXT>!"
 	done
 
 Text0284: ; 3c389 (f:4389)
@@ -126,7 +126,7 @@ Text0286: ; 3c3d3 (f:43d3)
 
 Text0287: ; 3c3eb (f:43eb)
 	text "Received a deck configuration"
-	line "from  ", TX_RAM2, "!"
+	line "from  <RAMTEXT>!"
 	done
 
 Text0288: ; 3c413 (f:4413)
@@ -939,7 +939,8 @@ Text0321: ; 3e63e (f:663e)
 
 Text0322: ; 3e64c (f:664c)
 	text "First Strike Deck"
-	line TX_END
+	line ""
+	done
 
 Text0323: ; 3e660 (f:6660)
 	text "  Mason Laboratory  "
@@ -1069,15 +1070,19 @@ Text033f: ; 3e85f (f:685f)
 	done
 
 Text0340: ; 3e867 (f:6867)
-	text "Album           ",$07,$6d
+	text "Album           "
+	half2full
+	textfw0 "/"
 	done
 
 Text0341: ; 3e87b (f:687b)
-	text "Play time         ",$07,$03,$5e
+	text "Play time         "
+	half2full
+	textfw3 ":"
 	done
 
 Text0342: ; 3e892 (f:6892)
-	text TX_RAM1, "'s diary"
+	text "<RAMNAME>'s diary"
 	done
 
 Text0343: ; 3e89d (f:689d)
@@ -1089,7 +1094,7 @@ Text0344: ; 3e8b1 (f:68b1)
 	done
 
 Text0345: ; 3e8d2 (f:68d2)
-	text TX_RAM1, ""
+	text "<RAMNAME>"
 	line "wrote in the diary."
 	done
 
@@ -1123,8 +1128,8 @@ Text034b: ; 3e9a0 (f:69a0)
 	done
 
 Text034c: ; 3e9b2 (f:69b2)
-	text "Duel           [", TX_RAM2, "]"
-	line "SELECT         [", TX_RAM2, "]"
+	text "Duel           [<RAMTEXT>]"
+	line "SELECT         [<RAMTEXT>]"
 	line "Receive many cards"
 	line "To Pokémon Dome 1"
 	line "To Pokémon Dome 2"
@@ -1155,12 +1160,12 @@ Text0351: ; 3ea3a (f:6a3a)
 	done
 
 TurnedPCOnText: ; 3ea69 (f:6a69)
-	text TX_RAM1, ""
+	text "<RAMNAME>"
 	line "turned the PC on!"
 	done
 
 TurnedPCOffText: ; 3ea7e (f:6a7e)
-	text TX_RAM1, ""
+	text "<RAMNAME>"
 	line "turned the PC off!"
 	done
 
@@ -1189,7 +1194,7 @@ Text0358: ; 3eb16 (f:6b16)
 	done
 
 Text0359: ; 3eb32 (f:6b32)
-	text "   Mail ", TX_RAM1, " "
+	text "   Mail <RAMNAME> "
 	done
 
 Text035a: ; 3eb3e (f:6b3e)
@@ -1201,7 +1206,7 @@ Text035b: ; 3eb62 (f:6b62)
 	done
 
 Text035c: ; 3eb88 (f:6b88)
-	db $70,$70,$70,$70,$70
+	textfw0 " ", " ", " ", " ", " "
 	done
 
 Text035d: ; 3eb8e (f:6b8e)
@@ -1287,15 +1292,25 @@ Text036f: ; 3ec74 (f:6c74)
 	done
 
 Text0370: ; 3ecb9 (f:6cb9)
-	text "  ", TX_RAM1, "  ", TX_RAM2, ""
-	line "      Master Medals Won ",$07,$0c,$06,""
-	line "      Album           ",$07,$6d,$06,""
-	line "      Play time         ",$07,$03,$5e,$06
+	text "  <RAMNAME>  <RAMTEXT>"
+	line "      Master Medals Won "
+	half2full
+	db "<RAMNUM>"
+	text ""
+	line "      Album           "
+	half2full
+	textfw0 "/"
+	text ""
+	line "      Play time         "
+	half2full
+	textfw3 ":"
+	text ""
 	done
 
 Text0371: ; 3ed14 (f:6d14)
 	text "Start a New Game."
-	line TX_END
+	line ""
+	done
 
 Text0372: ; 3ed28 (f:6d28)
 	text "The Game will continue from "
@@ -1343,10 +1358,10 @@ Text0378: ; 3ef66 (f:6f66)
 	done
 
 Text0379: ; 3efc3 (f:6fc3)
-	text TX_RAM1, " is crazy about Pokémon"
+	text "<RAMNAME> is crazy about Pokémon"
 	line "and Pokémon card collecting!"
 	line "One day,"
-	line TX_RAM1, " heard a rumor:"
+	line "<RAMNAME> heard a rumor:"
 	line " ”The Legendary Pokémon Cards..."
 	line "  the extremely rare and powerful "
 	line "  cards held by Pokémon Trading "
@@ -1355,7 +1370,7 @@ Text0379: ; 3efc3 (f:6fc3)
 	line "  for one to inherit the legend!”"
 	line "Dreaming of inheriting the"
 	line "Legendary Pokémon Cards,"
-	line TX_RAM1, " visits the Pokémon"
+	line "<RAMNAME> visits the Pokémon"
 	line "card researcher, Dr. Mason..."
 	done
 
@@ -1440,26 +1455,26 @@ Text0384: ; 3f2c0 (f:72c0)
 	done
 
 Text0385: ; 3f2c6 (f:72c6)
-	text "WIN      ", TX_RAM3, " Prizes Duel"
-	line "LOSE     with ", TX_RAM2, "(", TX_RAM3, ")"
+	text "WIN      <RAMNUM> Prizes Duel"
+	line "LOSE     with <RAMTEXT>(<RAMNUM>)"
 	done
 
 Text0386: ; 3f2f1 (f:72f1)
-	text "         Use ", TX_RAM3, "'s Deck"
+	text "         Use <RAMNUM>'s Deck"
 	done
 
 ReceivedBoosterPackText: ; 3f308 (f:7308)
-	text TX_RAM1, " received a Booster"
-	line "Pack: ", TX_RAM2, "."
+	text "<RAMNAME> received a Booster"
+	line "Pack: <RAMTEXT>."
 	done
 
 AndAnotherBoosterPackText: ; 3f327 (f:7327)
 	text "...And another Booster Pack:"
-	line TX_RAM2, "."
+	line "<RAMTEXT>."
 	done
 
 CheckedCardsInBoosterPackText: ; 3f348 (f:7348)
-	text TX_RAM1, " checked the cards"
+	text "<RAMNAME> checked the cards"
 	line "in the Booster Pack!!"
 	done
 
@@ -1469,8 +1484,8 @@ Text038a: ; 3f373 (f:7373)
 	done
 
 WonTheMedalText: ; 3f39b (f:739b)
-	text TX_RAM1, ""
-	line "Won the ", TX_RAM2, " Medal!"
+	text "<RAMNAME>"
+	line "Won the <RAMTEXT> Medal!"
 	done
 
 Text038c: ; 3f3af (f:73af)
@@ -1515,11 +1530,11 @@ Text0394: ; 3f4d6 (f:74d6)
 	done
 
 Text0395: ; 3f4f3 (f:74f3)
-	text TX_RAM2, "  ", TX_RAM2
+	text "<RAMTEXT>  ", TX_RAM2
 	done
 
 Text0396: ; 3f4f9 (f:74f9)
-	text TX_RAM2, " Deck"
+	text "<RAMTEXT> Deck"
 	done
 
 Text0397: ; 3f501 (f:7501)
@@ -1935,7 +1950,7 @@ Text03fd: ; 3f9d0 (f:79d0)
 	done
 
 Text03fe: ; 3f9f2 (f:79f2)
-	text "Hi, ", TX_RAM1, "."
+	text "Hi, <RAMNAME>."
 	line "How can I help you?"
 	done
 
@@ -1958,7 +1973,7 @@ Text0400: ; 3fa32 (f:7a32)
 	done
 
 Text0401: ; 3faaa (f:7aaa)
-	text TX_RAM1, ","
+	text "<RAMNAME>,"
 	line "It's me, Doctor Mason."
 	line "Are you getting the hang of"
 	line "the Pokémon Trading Card Game?"
@@ -1995,7 +2010,7 @@ Text0402: ; 3fd72 (f:7d72)
 	done
 
 Text0403: ; 3fe10 (f:7e10)
-	text TX_RAM1, ","
+	text "<RAMNAME>,"
 	line "It's me, Doctor Mason."
 	line "I have some information for you"
 	line "about Mitch's deck - he's "
@@ -2010,7 +2025,7 @@ Text0403: ; 3fe10 (f:7e10)
 	done
 
 Text0404: ; 3ff4d (f:7f4d)
-	text TX_RAM1, ", I know you can do it!"
+	text "<RAMNAME>, I know you can do it!"
 	line "Go win the Fighting Medal!"
 	line "Mason Laboratory"
 	line "      Doctor Mason ;)"
diff --git a/src/text/text4.asm b/src/text/text4.asm
index f2a432e..74bec46 100644
--- a/src/text/text4.asm
+++ b/src/text/text4.asm
@@ -1,5 +1,5 @@
 Text0405: ; 40000 (10:4000)
-	text TX_RAM1, ","
+	text "<RAMNAME>,"
 	line "It's me, Doctor Mason."
 	line "I have some information about"
 	line "Gene's deck - he's the Master "
@@ -14,14 +14,14 @@ Text0405: ; 40000 (10:4000)
 	done
 
 Text0406: ; 4014a (10:414a)
-	text TX_RAM1, "! Go defeat Gene,"
+	text "<RAMNAME>! Go defeat Gene,"
 	line "the Master of the Rock Club!"
 	line "Mason Laboratory"
 	line "      Doctor Mason  ;)"
 	done
 
 Text0407: ; 401a3 (10:41a3)
-	text TX_RAM1, ","
+	text "<RAMNAME>,"
 	line "It's me, Doctor Mason."
 	line "I have some information for you"
 	line "about Amy's deck - she's the "
@@ -41,14 +41,14 @@ Text0407: ; 401a3 (10:41a3)
 	done
 
 Text0408: ; 4033e (10:433e)
-	text TX_RAM1, "!"
+	text "<RAMNAME>!"
 	line "Keep at it, and don't give up!"
 	line "Mason Laboratory"
 	line "      Doctor Mason  ;)"
 	done
 
 Text0409: ; 40389 (10:4389)
-	text "How's it going, ", TX_RAM1, "?"
+	text "How's it going, <RAMNAME>?"
 	line "It's me, Doctor Mason."
 	line "I have some information for you"
 	line "about Isaac's deck - he's"
@@ -120,7 +120,8 @@ Text040d: ; 40819 (10:4819)
 	done
 
 Text040e: ; 409c6 (10:49c6)
-	text "Fight to the end, ", TX_HALFWIDTH,  TX_RAM1, ","
+	text "Fight to the end, "
+	text "<RAMNAME>,"
 	line "and don't give up!"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
@@ -128,7 +129,7 @@ Text040e: ; 409c6 (10:49c6)
 
 Text040f: ; 40a15 (10:4a15)
 	text "It's me, Dr. Mason."
-	line "How are you doing, ", TX_RAM1, "?"
+	line "How are you doing, <RAMNAME>?"
 	line "I have some information for you"
 	line "about Rick's deck - he's "
 	line "the Master of the Science Club."
@@ -148,7 +149,7 @@ Text040f: ; 40a15 (10:4a15)
 Text0410: ; 40bea (10:4bea)
 	text "Win all 8 Master Medals, "
 	line ""
-	text TX_RAM1, "!"
+	text "<RAMNAME>!"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
 	done
@@ -226,7 +227,7 @@ Text0414: ; 40fca (10:4fca)
 	done
 
 Text0415: ; 4123d (10:523d)
-	text TX_RAM1, ","
+	text "<RAMNAME>,"
 	line "It's me, Dr. Mason."
 	line "You're finally going to be dueling"
 	line "a Grand Master..."
@@ -247,7 +248,7 @@ Text0415: ; 4123d (10:523d)
 	done
 
 Text0416: ; 413f1 (10:53f1)
-	text TX_RAM1, ","
+	text "<RAMNAME>,"
 	line "It's me, Dr. Mason!"
 	line "Grand Master Steve uses"
 	line "the Legendary ZAPDOS."
@@ -264,7 +265,7 @@ Text0416: ; 413f1 (10:53f1)
 	line "using your Fighting Pokémon."
 	line "Defeat the Grand Masters,"
 	line ""
-	text TX_RAM1, "!!!"
+	text "<RAMNAME>!!!"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
 	line "p.s."
@@ -284,7 +285,7 @@ Text0417: ; 415cf (10:55cf)
 	line "His deck should be mostly"
 	line "Water Pokémon, so it will be"
 	line "weak against Lightning Pokémon!"
-	line "Go get 'em, ", TX_RAM1, "!"
+	line "Go get 'em, <RAMNAME>!"
 	line "You're almost there!"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
@@ -305,7 +306,7 @@ Text0418: ; 4174c (10:574c)
 	line "of striking early. This is the "
 	line "final test in inheriting "
 	line "the Legendary Pokémon Cards!"
-	line "Go, ", TX_RAM1, "!"
+	line "Go, <RAMNAME>!"
 	line "Be a part of the legend!"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
@@ -378,7 +379,8 @@ Text0422: ; 41c57 (10:5c57)
 	line "I'd feel guilty taking a card"
 	line "from your deck."
 	line "Maybe next time."
-	line TX_END
+	line ""
+	done
 
 Text0423: ; 41cf7 (10:5cf7)
 	text "OK then, let's trade your"
@@ -386,12 +388,12 @@ Text0423: ; 41cf7 (10:5cf7)
 	done
 
 Text0424: ; 41d2a (10:5d2a)
-	text TX_RAM1, " traded a Lapras"
+	text "<RAMNAME> traded a Lapras"
 	line "for an Arcanine!"
 	done
 
 Text0425: ; 41d4e (10:5d4e)
-	text "Thanks, ", TX_RAM1, "!"
+	text "Thanks, <RAMNAME>!"
 	line "I'll take good care"
 	line "of this Lapras."
 	done
@@ -642,14 +644,14 @@ Text044d: ; 4294b (10:694b)
 	done
 
 Text044e: ; 4296d (10:696d)
-	text "Was it ", TX_RAM1, "?"
+	text "Was it <RAMNAME>?"
 	line "I will be your next opponent."
 	line "I, Amy, the Master of the "
 	line "Water Club!"
 	done
 
 Text044f: ; 429bd (10:69bd)
-	text "Aren't you ", TX_RAM1, "?"
+	text "Aren't you <RAMNAME>?"
 	line "So you decided you want to"
 	line "duel me?"
 	done
@@ -698,7 +700,7 @@ Text0457: ; 42ba1 (10:6ba1)
 	done
 
 Text0458: ; 42be9 (10:6be9)
-	text "Hi, ", TX_RAM1, "."
+	text "Hi, <RAMNAME>."
 	line "Nice to see you again!!!"
 	line "Did you come to play the"
 	line "Pokémon Trading Card Game?"
@@ -724,7 +726,7 @@ Text045b: ; 42d1e (10:6d1e)
 	line "Card Game. I'm not into dueling."
 	line "I prefer collecting the cards."
 	line "By the way, would you happen to have"
-	line TX_RAM2, "?"
+	line "<RAMTEXT>?"
 	line "If you do, I was wondering if you"
 	line "might want to give it to me?"
 	line "How about it?"
@@ -734,20 +736,20 @@ Text045c: ; 42df7 (10:6df7)
 	text "Hi! It's you!"
 	line "What's up?"
 	line "Did you decide to give me"
-	line "your ", TX_RAM2, "?"
+	line "your <RAMTEXT>?"
 	done
 
 Text045d: ; 42e33 (10:6e33)
 	text "Hi! I see you're playing with"
 	line "the cards again."
 	line "By the way, I'm looking for"
-	line TX_RAM2, " this time."
+	line "<RAMTEXT> this time."
 	line "If you should happen to have one,"
 	line "would you mind giving it to me?"
 	done
 
 Text045e: ; 42ece (10:6ece)
-	text "Give away your ", TX_RAM2, "?"
+	text "Give away your <RAMTEXT>?"
 	done
 
 Text045f: ; 42ee1 (10:6ee1)
@@ -757,17 +759,17 @@ Text045f: ; 42ee1 (10:6ee1)
 	done
 
 Text0460: ; 42f2d (10:6f2d)
-	text "But you don't have ", TX_RAM2, "!"
+	text "But you don't have <RAMTEXT>!"
 	line "I appreciate your generosity, but "
 	line "you can't give me what you don't "
 	line "have. Come see me again after "
-	line "you get ", TX_RAM2, "."
+	line "you get <RAMTEXT>."
 	done
 
 Text0461: ; 42fb3 (10:6fb3)
 	text "You're going to give it to me?"
 	line "Thank you!"
-	line "But your ", TX_RAM2, ""
+	line "But your <RAMTEXT>"
 	line "is in your Deck."
 	line "I can't take a card that you're"
 	line "playing with!"
@@ -814,8 +816,11 @@ Text0467: ; 43221 (10:7221)
 	line "Who? Me? You don't know who I am?"
 	line "I am the super musical star,"
 	line "Imakuni?!"
-	line "I'll sing the Pok`Rap - You dance!"
-	line $07,$03,$63, TX_HALFWIDTH, "La di da la di da"
+	line "I'll sing the PokéRap - You dance!"
+	line ""
+	half2full
+	textfw3 "♪"
+	text "La di da la di da"
 	line "  La di da la di da..."
 	line "Hey!"
 	line "Move those feet!"
@@ -878,7 +883,10 @@ Text0471: ; 435a7 (10:75a7)
 	line "You weren't too bad, but since "
 	line "I won...Let's see you shake it!"
 	line "Come on, shake it!!!"
-	line $07,$03,$63, TX_HALFWIDTH, "La di da la di da"
+	line ""
+	half2full
+	textfw3 "♪"
+	text "La di da la di da"
 	line "  La di da la di da..."
 	line "... You dance weird!"
 	done
diff --git a/src/text/text5.asm b/src/text/text5.asm
index 706ab09..ba26ccb 100644
--- a/src/text/text5.asm
+++ b/src/text/text5.asm
@@ -344,7 +344,7 @@ Text04c2: ; 4548b (11:548b)
 	text "The Trainer card, Computer Search,"
 	line "is useful when you want to draw a"
 	line "certain card! Item Finder and"
-	line "Pok` Ball will also help!"
+	line "Poké Ball will also help!"
 	done
 
 Text04c3: ; 45509 (11:5509)
@@ -864,14 +864,14 @@ Text050c: ; 475ab (11:75ab)
 	done
 
 Text050d: ; 47644 (11:7644)
-	text "Most unfortunate, ", TX_RAM1, "."
+	text "Most unfortunate, <RAMNAME>."
 	line "Once you enter, you won't be able"
 	line "to re-enter for some time. "
 	line "Please try again another day."
 	done
 
 Text050e: ; 476b6 (11:76b6)
-	text "Congratulations, ", TX_RAM1, "!"
+	text "Congratulations, <RAMNAME>!"
 	line "You received a card!"
 	line "Please join us for the next "
 	line "Challenge Cup, too."
@@ -919,7 +919,7 @@ Text0514: ; 47913 (11:7913)
 	done
 
 Text0515: ; 47984 (11:7984)
-	text "Hi, ", TX_RAM1, "."
+	text "Hi, <RAMNAME>."
 	line "Are you competing, too?"
 	done
 
@@ -933,7 +933,7 @@ Text0516: ; 479a4 (11:79a4)
 	done
 
 Text0517: ; 47a3d (11:7a3d)
-	text "Hey, it's ", TX_RAM1, " - the loser"
+	text "Hey, it's <RAMNAME> - the loser"
 	line "of the Challenge Cup!"
 	done
 
@@ -947,7 +947,7 @@ Text0518: ; 47a6c (11:7a6c)
 	done
 
 Text0519: ; 47b25 (11:7b25)
-	text "Hey ", TX_RAM1, ", too bad "
+	text "Hey <RAMNAME>, too bad "
 	line "you're too late!"
 	done
 
@@ -959,7 +959,7 @@ Text051a: ; 47b47 (11:7b47)
 	done
 
 Text051b: ; 47bb6 (11:7bb6)
-	text "Hi, ", TX_RAM1, "."
+	text "Hi, <RAMNAME>."
 	line "What are you doing here?"
 	done
 
@@ -975,7 +975,7 @@ Text051c: ; 47bd7 (11:7bd7)
 	done
 
 Text051d: ; 47cb9 (11:7cb9)
-	text "Hey, ", TX_RAM1, "."
+	text "Hey, <RAMNAME>."
 	line "We meet again."
 	done
 
@@ -990,7 +990,7 @@ Text051e: ; 47cd1 (11:7cd1)
 	done
 
 Text051f: ; 47d82 (11:7d82)
-	text "Hey, it's ", TX_RAM1, " - the"
+	text "Hey, it's <RAMNAME> - the"
 	line "loser of the Challenge Cup!"
 	done
 
@@ -1003,7 +1003,7 @@ Text0520: ; 47db1 (11:7db1)
 	done
 
 Text0521: ; 47e4f (11:7e4f)
-	text "Hey, isn't that ", TX_RAM1, "?"
+	text "Hey, isn't that <RAMNAME>?"
 	line "Late as always!"
 	done
 
@@ -1017,6 +1017,6 @@ Text0522: ; 47e73 (11:7e73)
 	done
 
 Text0523: ; 47f08 (11:7f08)
-	text "Hey, ", TX_RAM1, "!"
+	text "Hey, <RAMNAME>!"
 	line "What are you doing here?"
 	done
diff --git a/src/text/text6.asm b/src/text/text6.asm
index b60447c..901e9fe 100644
--- a/src/text/text6.asm
+++ b/src/text/text6.asm
@@ -98,12 +98,12 @@ Text0532: ; 4856a (12:456a)
 	done
 
 Text0533: ; 485a2 (12:45a2)
-	text "Presently, ", TX_RAM1, " is still"
+	text "Presently, <RAMNAME> is still"
 	line "a contender!"
 	done
 
 Text0534: ; 485c6 (12:45c6)
-	text TX_RAM1, " is the new challenger!"
+	text "<RAMNAME> is the new challenger!"
 	done
 
 Text0535: ; 485e0 (12:45e0)
@@ -113,22 +113,22 @@ Text0535: ; 485e0 (12:45e0)
 	done
 
 Text0536: ; 48612 (12:4612)
-	text "The winner is ", TX_RAM2, "!!"
+	text "The winner is <RAMTEXT>!!"
 	line ""
-	text TX_RAM2, " has defeated 2 opponents!"
+	text "<RAMTEXT> has defeated 2 opponents!"
 	line "Just 1 more opponent to go"
 	line "before winning the prize!"
 	done
 
 Text0537: ; 48677 (12:4677)
-	text "Too bad, ", TX_RAM1, "."
+	text "Too bad, <RAMNAME>."
 	line "Have a safe trip home!"
 	done
 
 Text0538: ; 4869b (12:469b)
-	text "The Winner is ", TX_RAM2, "!!!"
+	text "The Winner is <RAMTEXT>!!!"
 	line ""
-	text TX_RAM2, " has defeated 1 opponent!"
+	text "<RAMTEXT> has defeated 1 opponent!"
 	line "2 more opponents to go"
 	line "before winning the prize!"
 	done
@@ -136,7 +136,7 @@ Text0538: ; 4869b (12:469b)
 Text0539: ; 486fc (12:46fc)
 	text "How unfortunate!"
 	line "Unable to defeat the last opponent!"
-	line "It was close, but ", TX_RAM1, " was "
+	line "It was close, but <RAMNAME> was "
 	line "defeated by the third opponent!"
 	done
 
@@ -155,21 +155,21 @@ Text053b: ; 487c0 (12:47c0)
 
 Text053c: ; 4881b (12:481b)
 	text "Congratulations!"
-	line "The Winner is ", TX_RAM1, "!"
+	line "The Winner is <RAMNAME>!"
 	line ""
-	text TX_RAM1, " has defeated"
+	text "<RAMNAME> has defeated"
 	line "1 opponent!!!"
 	done
 
 Text053d: ; 4885c (12:485c)
-	text "Way to go, ", TX_RAM1, "!"
+	text "Way to go, <RAMNAME>!"
 	line "That's 2 wins!!!"
 	line "One more opponent to go before"
 	line "winning the Challenge Cup!"
 	done
 
 Text053e: ; 488b6 (12:48b6)
-	text "Most unfortunate, ", TX_RAM2, "."
+	text "Most unfortunate, <RAMTEXT>."
 	line "Have a safe trip home!"
 	done
 
@@ -180,24 +180,24 @@ Text053f: ; 488e3 (12:48e3)
 Text0540: ; 48904 (12:4904)
 	text "Our new challenger is..."
 	line ""
-	text TX_RAM2, "!"
+	text "<RAMTEXT>!"
 	done
 
 Text0541: ; 48922 (12:4922)
 	text "The third opponent is"
 	line ""
-	text TX_RAM2, "!"
+	text "<RAMTEXT>!"
 	done
 
 Text0542: ; 4893d (12:493d)
-	text "Hey, ", TX_RAM1, "!"
+	text "Hey, <RAMNAME>!"
 	line "I'm not gonna lose to you!"
 	line ""
 	text "<Lv>60 Mewtwo belongs to me!!!"
 	done
 
 Text0543: ; 4897f (12:497f)
-	text TX_RAM1, "!"
+	text "<RAMNAME>!"
 	line "I'm going to defeat you!"
 	line ""
 	text "<Lv>8 Mew belongs to me!!!"
@@ -217,12 +217,12 @@ Text0546: ; 489f5 (12:49f5)
 	done
 
 Text0547: ; 48a09 (12:4a09)
-	text "Well then, ", TX_RAM1, "!"
+	text "Well then, <RAMNAME>!"
 	line "Let the second match begin!"
 	done
 
 Text0548: ; 48a34 (12:4a34)
-	text "Well, ", TX_RAM1, ", let the third,"
+	text "Well, <RAMNAME>, let the third,"
 	line "and final, match begin!"
 	done
 
@@ -237,7 +237,7 @@ Text054a: ; 48a90 (12:4a90)
 	done
 
 Text054b: ; 48abf (12:4abf)
-	text "Most unfortunate, ", TX_RAM2, "."
+	text "Most unfortunate, <RAMTEXT>."
 	line "Do try again in the next"
 	line "Challenge Cup."
 	done
@@ -252,31 +252,33 @@ Text054d: ; 48b25 (12:4b25)
 	done
 
 Text054e: ; 48b3f (12:4b3f)
-	text TX_RAM1, "!"
+	text "<RAMNAME>!"
 	line "I won't lose next time!"
 	done
 
 Text054f: ; 48b5b (12:4b5b)
-	text TX_RAM1, "!"
+	text "<RAMNAME>!"
 	line "I'll win next time!"
 	done
 
 Text0550: ; 48b73 (12:4b73)
 	text "The Winner of this Challenge Cup "
-	line "is ", TX_HALFWIDTH,  TX_RAM1, "!!!"
+	line "is "
+	text "<RAMNAME>!!!"
 	done
 
 Text0551: ; 48b9f (12:4b9f)
-	text TX_RAM1, ", your prize"
-	line "is ", TX_RAM2, "!"
+	text "<RAMNAME>, your prize"
+	line "is <RAMTEXT>!"
 	done
 
 Text0552: ; 48bb4 (12:4bb4)
-	text "Congratulations, ", TX_HALFWIDTH,  TX_RAM1, "!!!"
+	text "Congratulations, "
+	text "<RAMNAME>!!!"
 	done
 
 Text0553: ; 48bcc (12:4bcc)
-	text "Hi, ", TX_RAM1, "."
+	text "Hi, <RAMNAME>."
 	line "What are you doing here?"
 	done
 
@@ -296,9 +298,9 @@ Text0555: ; 48c87 (12:4c87)
 	done
 
 Text0556: ; 48cf5 (12:4cf5)
-	text "Hey, ", TX_RAM1, "!"
-	line "You only have ", TX_RAM3, " Medals!"
-	line "I've already collected ", TX_RAM3, "!"
+	text "Hey, <RAMNAME>!"
+	line "You only have <RAMNUM> Medals!"
+	line "I've already collected <RAMNUM>!"
 	line "Why don't you just give up? See ya!"
 	done
 
@@ -329,7 +331,7 @@ Text055a: ; 48eb8 (12:4eb8)
 	done
 
 Text055b: ; 48f10 (12:4f10)
-	text "You're very good, ", TX_RAM1, "."
+	text "You're very good, <RAMNAME>."
 	line "Please take care of my card."
 	done
 
@@ -352,7 +354,8 @@ Text055e: ; 48fcb (12:4fcb)
 
 Text055f: ; 48ff9 (12:4ff9)
 	text "You've really improved your "
-	line "game, ", TX_HALFWIDTH,  TX_RAM1, "."
+	line "game, "
+	text "<RAMNAME>."
 	line "Use my card to make it better!"
 	done
 
@@ -361,7 +364,7 @@ Text0560: ; 49040 (12:5040)
 	line "The Legendary Cards seem pleased"
 	line "to be passed on to you"
 	line ""
-	text TX_RAM1, ". Hurry and go through"
+	text "<RAMNAME>. Hurry and go through"
 	line "to the Hall of Honor!"
 	done
 
@@ -372,14 +375,15 @@ Text0561: ; 490c6 (12:50c6)
 	done
 
 Text0562: ; 4911e (12:511e)
-	text TX_RAM1, ", That is not the way"
+	text "<RAMNAME>, That is not the way"
 	line "to the Hall of Honor."
-	line "Hurry, ", TX_HALFWIDTH,  TX_RAM1, "! Go through to"
+	line "Hurry, "
+	text "<RAMNAME>! Go through to"
 	line "the Hall of Honor!"
 	done
 
 Text0563: ; 49178 (12:5178)
-	text TX_RAM1, ", if you leave the "
+	text "<RAMNAME>, if you leave the "
 	line "Grand Hall, you must defeat "
 	line "each of us again to enter"
 	line "the Hall of Honor."
@@ -460,7 +464,7 @@ Text0570: ; 49506 (12:5506)
 	done
 
 Text0571: ; 49570 (12:5570)
-	text TX_RAM1, ","
+	text "<RAMNAME>,"
 	line "take your place at the table."
 	done
 
@@ -521,12 +525,12 @@ Text057a: ; 49864 (12:5864)
 	done
 
 Text057b: ; 498b8 (12:58b8)
-	text "Very good, ", TX_RAM1, "!"
+	text "Very good, <RAMNAME>!"
 	line "Your second opponent is Steve!"
 	done
 
 Text057c: ; 498e6 (12:58e6)
-	text TX_RAM1, "! Next, you must duel "
+	text "<RAMNAME>! Next, you must duel "
 	line "Steve!"
 	done
 
@@ -538,12 +542,13 @@ Text057d: ; 49906 (12:5906)
 	done
 
 Text057e: ; 49980 (12:5980)
-	text "Hey, ", TX_RAM1, "!"
+	text "Hey, <RAMNAME>!"
 	line "Come battle Steve!"
 	done
 
 Text057f: ; 4999c (12:599c)
-	text "Is your Deck ready, ", TX_HALFWIDTH,  TX_RAM1, "?"
+	text "Is your Deck ready, "
+	text "<RAMNAME>?"
 	done
 
 Text0580: ; 499b5 (12:59b5)
@@ -587,12 +592,12 @@ Text0586: ; 49b27 (12:5b27)
 	done
 
 Text0587: ; 49b50 (12:5b50)
-	text "Very good, ", TX_RAM1, "."
+	text "Very good, <RAMNAME>."
 	line "Your next opponent is Jack!"
 	done
 
 Text0588: ; 49b7b (12:5b7b)
-	text "That's great, ", TX_RAM1, "!"
+	text "That's great, <RAMNAME>!"
 	line "Jack is your next opponent!"
 	done
 
@@ -609,7 +614,7 @@ Text058a: ; 49c1c (12:5c1c)
 	done
 
 Text058b: ; 49c5f (12:5c5f)
-	text TX_RAM1, ","
+	text "<RAMNAME>,"
 	line "have you readied your deck?"
 	done
 
@@ -682,7 +687,8 @@ Text0597: ; 49f7e (12:5f7e)
 	done
 
 Text0598: ; 49fb5 (12:5fb5)
-	text "Is your Deck ready, ", TX_HALFWIDTH,  TX_RAM1, "?"
+	text "Is your Deck ready, "
+	text "<RAMNAME>?"
 	done
 
 Text0599: ; 49fce (12:5fce)
@@ -719,7 +725,7 @@ Text059f: ; 4a11a (12:611a)
 	text "Wha-what on earth?  Even"
 	line "I, Rod, have been defeated?!?"
 	line "Wonderful! This is wonderful!!"
-	line "Congratulations, ", TX_RAM1, ". "
+	line "Congratulations, <RAMNAME>. "
 	line "You have proven yourself worthy"
 	line "enough to inherit the"
 	line "Legendary Pokémon Cards!!!"
@@ -727,7 +733,7 @@ Text059f: ; 4a11a (12:611a)
 	done
 
 Text05a0: ; 4a1e1 (12:61e1)
-	text "Congratulations, ", TX_RAM1, "!"
+	text "Congratulations, <RAMNAME>!"
 	line "You're a master duelist!!!"
 	line "But..."
 	done
@@ -744,7 +750,7 @@ Text05a2: ; 4a26c (12:626c)
 	done
 
 Text05a3: ; 4a289 (12:6289)
-	text "Congratulations, ", TX_RAM1, "!"
+	text "Congratulations, <RAMNAME>!"
 	line "You're a master duelist!"
 	done
 
@@ -767,7 +773,7 @@ Text05a6: ; 4a369 (12:6369)
 	line "allowed! He, too, has earned "
 	line "the right to inherit the "
 	line "Legendary Pokémon Cards!"
-	line "Ronald! ", TX_RAM1, "!"
+	line "Ronald! <RAMNAME>!"
 	line "You two must duel to determine who "
 	line "will inherit the Legendary Pokémon "
 	line "Cards. So say the Rules!"
@@ -782,11 +788,12 @@ Text05a8: ; 4a452 (12:6452)
 	line "Ronald!!!"
 	line "I'll take your challenge,"
 	line ""
-	text TX_RAM1, "!"
+	text "<RAMNAME>!"
 	done
 
 Text05a9: ; 4a49a (12:649a)
-	text "Is your Deck ready, ", TX_HALFWIDTH,  TX_RAM1, "?"
+	text "Is your Deck ready, "
+	text "<RAMNAME>?"
 	done
 
 Text05aa: ; 4a4b3 (12:64b3)
@@ -802,7 +809,8 @@ Text05ac: ; 4a4f5 (12:64f5)
 	text "I was here first! The Legendary"
 	line "Pokémon Cards belong to me!"
 	line "I'll make it all too clear to"
-	line "you, ", TX_HALFWIDTH,  TX_RAM1, "!"
+	line "you, "
+	text "<RAMNAME>!"
 	done
 
 Text05ad: ; 4a559 (12:6559)
@@ -827,7 +835,7 @@ Text05af: ; 4a65c (12:665c)
 
 Text05b0: ; 4a67f (12:667f)
 	text "I'm sorry, but the Legendary Pokémon"
-	line "Cards have chosen ", TX_RAM1, "."
+	line "Cards have chosen <RAMNAME>."
 	done
 
 Text05b1: ; 4a6ba (12:66ba)
@@ -843,7 +851,7 @@ Text05b2: ; 4a6f4 (12:66f4)
 	done
 
 Text05b3: ; 4a72d (12:672d)
-	text "Congratulations, ", TX_RAM1, "!"
+	text "Congratulations, <RAMNAME>!"
 	line "You are a Card Master"
 	line "worthy of inheriting"
 	line "the Legendary Pokémon Cards!"
@@ -961,7 +969,7 @@ Text05c0: ; 4af26 (12:6f26)
 	done
 
 Text05c1: ; 4afb0 (12:6fb0)
-	text TX_RAM1, " received some "
+	text "<RAMNAME> received some "
 	line "Energy cards!"
 	done
 
@@ -987,7 +995,7 @@ Text05c4: ; 4b129 (12:7129)
 	text "You finally inherited the"
 	line "Legendary Pokémon Cards!"
 	line "Amazing!"
-	line "Congratulations, ", TX_RAM1, "!!!"
+	line "Congratulations, <RAMNAME>!!!"
 	done
 
 Text05c5: ; 4b17c (12:717c)
@@ -1005,7 +1013,7 @@ Text05c6: ; 4b274 (12:7274)
 	text "Congratulations on inheriting "
 	line "the Legendary Pokémon Cards,"
 	line ""
-	text TX_RAM1, "! Now you should try"
+	text "<RAMNAME>! Now you should try"
 	line "dueling different people using the"
 	line "cards you inherited. I'm sure "
 	line "you'll have a good time!"
@@ -1048,7 +1056,7 @@ Text05ca: ; 4b4ea (12:74ea)
 	line "opponents, you win! You can also "
 	line "play to extend your winning "
 	line "streak! Build a deck and "
-	line "give it a try, ", TX_RAM1, "!"
+	line "give it a try, <RAMNAME>!"
 	done
 
 Text05cb: ; 4b63e (12:763e)
diff --git a/src/text/text7.asm b/src/text/text7.asm
index 56dddec..8c2e855 100644
--- a/src/text/text7.asm
+++ b/src/text/text7.asm
@@ -69,7 +69,7 @@ Text05e0: ; 4c5a1 (13:45a1)
 	done
 
 Text05e1: ; 4c66a (13:466a)
-	text "Congratulations, ", TX_RAM1, "!"
+	text "Congratulations, <RAMNAME>!"
 	line "I hear you have inherited the"
 	line "Legendary Pokémon Cards!"
 	line "The strength of a Deck does"
@@ -94,7 +94,7 @@ Text05e2: ; 4c786 (13:4786)
 	done
 
 Text05e3: ; 4c86f (13:486f)
-	text "Oh! Why the rush, ", TX_RAM1, "?"
+	text "Oh! Why the rush, <RAMNAME>?"
 	line "What? "
 	line "You want to learn how to play"
 	line "the Pokémon Trading Card Game?"
@@ -112,7 +112,7 @@ Text05e3: ; 4c86f (13:486f)
 
 Text05e4: ; 4c9d7 (13:49d7)
 	text "Yes, Dr. Mason."
-	line "Hello, ", TX_RAM1, "."
+	line "Hello, <RAMNAME>."
 	done
 
 Text05e5: ; 4c9f2 (13:49f2)
@@ -121,7 +121,7 @@ Text05e5: ; 4c9f2 (13:49f2)
 	done
 
 Text05e6: ; 4ca0c (13:4a0c)
-	text "Hey! ", TX_RAM1, "!"
+	text "Hey! <RAMNAME>!"
 	line "Hurry and come here!"
 	done
 
@@ -131,7 +131,7 @@ Text05e7: ; 4ca2a (13:4a2a)
 	done
 
 Text05e8: ; 4ca52 (13:4a52)
-	text "OK, ", TX_RAM1, "."
+	text "OK, <RAMNAME>."
 	line "What do you want to ask about?"
 	done
 
@@ -196,31 +196,31 @@ Text05f0: ; 4ce5a (13:4e5a)
 	done
 
 Text05f1: ; 4ce96 (13:4e96)
-	text TX_RAM1, " handed his cards to "
+	text "<RAMNAME> handed his cards to "
 	line "Dr. Mason."
 	done
 
 Text05f2: ; 4ceb9 (13:4eb9)
 	text "Hmm...let me add some of my own "
 	line "cards to yours!"
-	line "Now, ", TX_RAM1, ", what kind"
+	line "Now, <RAMNAME>, what kind"
 	line "of Deck do you want?"
 	done
 
 Text05f3: ; 4cf12 (13:4f12)
-	text "A ", TX_RAM2, "?"
+	text "A <RAMTEXT>?"
 	done
 
 Text05f4: ; 4cf18 (13:4f18)
-	text "OK, a ", TX_RAM2, "!"
+	text "OK, a <RAMTEXT>!"
 	line "Here are the remaining cards!"
 	done
 
 Text05f5: ; 4cf40 (13:4f40)
-	text TX_RAM1, " received"
-	line "a ", TX_RAM2, "!"
+	text "<RAMNAME> received"
+	line "a <RAMTEXT>!"
 	line ""
-	text TX_RAM1, " received"
+	text "<RAMNAME> received"
 	line "30 cards!"
 	done
 
@@ -284,7 +284,7 @@ Text05fb: ; 4d361 (13:5361)
 	done
 
 Text05fc: ; 4d423 (13:5423)
-	text TX_RAM1, ", thanks to you, all"
+	text "<RAMNAME>, thanks to you, all"
 	line "the Auto Deck Machines have"
 	line "been activated!"
 	done
@@ -312,7 +312,7 @@ Text0600: ; 4d531 (13:5531)
 	done
 
 Text0601: ; 4d56a (13:556a)
-	text "Is it ", TX_RAM2, "?"
+	text "Is it <RAMTEXT>?"
 	done
 
 Text0602: ; 4d574 (13:5574)
@@ -341,17 +341,17 @@ Text0606: ; 4d655 (13:5655)
 	done
 
 Text0607: ; 4d676 (13:5676)
-	text "It's a ", TX_RAM2, " Medal"
+	text "It's a <RAMTEXT> Medal"
 	line "Auto Deck Machine."
 	done
 
 Text0608: ; 4d699 (13:5699)
 	text "It isn't working since the "
-	line TX_RAM2, " Medal is not inserted."
+	line "<RAMTEXT> Medal is not inserted."
 	done
 
 Text0609: ; 4d6cf (13:56cf)
-	text "Insert the ", TX_RAM2, " Medal?"
+	text "Insert the <RAMTEXT> Medal?"
 	done
 
 Text060a: ; 4d6e4 (13:56e4)
@@ -465,7 +465,7 @@ Text0619: ; 4dbcb (13:5bcb)
 	done
 
 Text061a: ; 4dc30 (13:5c30)
-	text "Hey! ", TX_RAM1, "!"
+	text "Hey! <RAMNAME>!"
 	line "You beat the Grand Masters?"
 	line "Cool! Got all the Legendary "
 	line "Pokémon Cards? Yeah!"
@@ -710,14 +710,14 @@ Text0644: ; 4e774 (13:6774)
 	done
 
 Text0645: ; 4e7e1 (13:67e1)
-	text "Well, getting the ", TX_RAM2, " Medal "
+	text "Well, getting the <RAMTEXT> Medal "
 	line "wasn't that hard! If I keep "
 	line "this up, I should be able to get "
 	line "the Legendary Pokémon Cards!"
 	done
 
 Text0646: ; 4e859 (13:6859)
-	text "What? It's you, ", TX_RAM1, "!"
+	text "What? It's you, <RAMNAME>!"
 	line "What are you doing?"
 	line "Huh? That's a Deck!"
 	line "Are you... trying to get the"
@@ -752,12 +752,12 @@ Text0649: ; 4e991 (13:6991)
 	line "'Cause the Legendary Pokémon Cards"
 	line "are gonna be mine!"
 	line "I already won the first Medal!"
-	line "See ya, ", TX_RAM1, "!"
+	line "See ya, <RAMNAME>!"
 	line "Ha ha ha ha ha!!!"
 	done
 
 Text064a: ; 4eb39 (13:6b39)
-	text "Hi, ", TX_RAM1, "!"
+	text "Hi, <RAMNAME>!"
 	line "How ya doin'?"
 	done
 
@@ -793,7 +793,7 @@ Text064e: ; 4ec9a (13:6c9a)
 	done
 
 Text064f: ; 4ed1c (13:6d1c)
-	text "Hi, ", TX_RAM1, "!"
+	text "Hi, <RAMNAME>!"
 	line "Have you gotten any better?"
 	done
 
@@ -938,7 +938,7 @@ Text0663: ; 4f522 (13:7522)
 	done
 
 Text0664: ; 4f574 (13:7574)
-	text "Hi, ", TX_RAM1, "."
+	text "Hi, <RAMNAME>."
 	line "So you've finally come this far?"
 	line "I've already won 5 Medals!"
 	line "By the time you win your 8th Medal,"
diff --git a/src/text/text8.asm b/src/text/text8.asm
index 176964e..c76de49 100644
--- a/src/text/text8.asm
+++ b/src/text/text8.asm
@@ -13,7 +13,7 @@ Text0685: ; 5005b (14:405b)
 	done
 
 Text0686: ; 500df (14:40df)
-	text "Hello, ", TX_RAM1, "!"
+	text "Hello, <RAMNAME>!"
 	line "I just came up with a new card"
 	line "strategy and was looking for"
 	line "someone to test it on."
@@ -65,7 +65,7 @@ Text068d: ; 5037f (14:437f)
 	line "date. Why do I have to do it?"
 	line "Why me?"
 	line "I'm Jessica of the Fighting Club."
-	line "Oh! You must be ", TX_RAM1, "."
+	line "Oh! You must be <RAMNAME>."
 	line "I heard about you from Mitch."
 	line "Defeating you should be more"
 	line "fun than training!"
@@ -75,7 +75,7 @@ Text068e: ; 5044a (14:444a)
 	text "Training's so boring and out of "
 	line "date. Why do I have to do it?"
 	line ""
-	text TX_RAM1, ", it's you again!"
+	text "<RAMNAME>, it's you again!"
 	line "What a pain."
 	line "But defeating you should be more"
 	line "fun than training."
@@ -188,7 +188,7 @@ Text069f: ; 50988 (14:4988)
 	done
 
 Text06a0: ; 509d3 (14:49d3)
-	text TX_RAM1, " lost all "
+	text "<RAMNAME> lost all "
 	line "his Energy cards!"
 	done
 
@@ -206,10 +206,10 @@ Text06a1: ; 509f2 (14:49f2)
 	done
 
 Text06a2: ; 50a9e (14:4a9e)
-	text TX_RAM1, ""
+	text "<RAMNAME>"
 	line "checked the wall!"
 	line ""
-	text TX_RAM1, ""
+	text "<RAMNAME>"
 	line "found a <Lv>9 Slowpoke!"
 	done
 
@@ -472,7 +472,7 @@ Text06cd: ; 51720 (14:5720)
 
 Text06ce: ; 5175f (14:575f)
 	text "OK, "
-	line "To ", TX_RAM2, "."
+	line "To <RAMTEXT>."
 	line "Please write in your Diary before"
 	line "the transaction."
 	done
@@ -487,7 +487,7 @@ Text06d0: ; 517b4 (14:57b4)
 	done
 
 Text06d1: ; 517f7 (14:57f7)
-	text TX_RAM1, ""
+	text "<RAMNAME>"
 	line "wrote in the Diary."
 	done
 
@@ -498,21 +498,21 @@ Text06d2: ; 5180e (14:580e)
 
 Text06d3: ; 5182d (14:582d)
 	text "You sent a card to"
-	line TX_RAM2, "!"
+	line "<RAMTEXT>!"
 	line "Thank you."
 	line "Please come again."
 	done
 
 Text06d4: ; 51862 (14:5862)
 	text "You sent the configuration for"
-	line "the ", TX_RAM2, " Deck!"
+	line "the <RAMTEXT> Deck!"
 	line "Thank you."
 	line "Please come again."
 	done
 
 Text06d5: ; 518ac (14:58ac)
 	text "You received the configuration for"
-	line "the ", TX_RAM2, " Deck!"
+	line "the <RAMTEXT> Deck!"
 	line "Thank you."
 	line "Please come again."
 	done
@@ -544,14 +544,14 @@ Text06d8: ; 51a6f (14:5a6f)
 	line "are girls."
 	line "But I can't beat girls who"
 	line "are this tough!"
-	line "Huh? You must be ", TX_RAM1, "."
+	line "Huh? You must be <RAMNAME>."
 	line "Mitch told me all about you."
 	line "Beating you will be much better"
 	line "than losing to the girls!"
 	done
 
 Text06d9: ; 51b2e (14:5b2e)
-	text "Hi, ", TX_RAM1, "."
+	text "Hi, <RAMNAME>."
 	line "Would you duel me?"
 	done
 
@@ -697,7 +697,7 @@ Text06f1: ; 521a8 (14:61a8)
 	done
 
 Text06f2: ; 521d8 (14:61d8)
-	text TX_RAM1, " traded an Oddish"
+	text "<RAMNAME> traded an Oddish"
 	line "for a Vileplume!"
 	done
 
@@ -747,7 +747,7 @@ Text06f9: ; 523c4 (14:63c4)
 	done
 
 Text06fa: ; 523f0 (14:63f0)
-	text TX_RAM1, " traded a Clefairy"
+	text "<RAMNAME> traded a Clefairy"
 	line "for a Pikachu!"
 	done
 
@@ -792,7 +792,7 @@ Text0700: ; 525d9 (14:65d9)
 	done
 
 Text0701: ; 5260b (14:660b)
-	text TX_RAM1, " traded a Charizard"
+	text "<RAMNAME> traded a Charizard"
 	line "for a Blastoise!"
 	done
 
@@ -941,7 +941,7 @@ Text0718: ; 52cc3 (14:6cc3)
 	done
 
 Text0719: ; 52d1a (14:6d1a)
-	text "Hello, ", TX_RAM1, "."
+	text "Hello, <RAMNAME>."
 	line "Did you come for a Duel?"
 	done
 
@@ -1050,7 +1050,7 @@ Text0727: ; 53245 (14:7245)
 	done
 
 Text0728: ; 53368 (14:7368)
-	text "Hello, ", TX_RAM1, "."
+	text "Hello, <RAMNAME>."
 	line "Welcome."
 	line "There aren't any cards I want "
 	line "or can trade at the moment."
@@ -1061,7 +1061,7 @@ Text0728: ; 53368 (14:7368)
 	done
 
 Text0729: ; 53435 (14:7435)
-	text "Hello, ", TX_RAM1, "."
+	text "Hello, <RAMNAME>."
 	line "I guess you're here because you"
 	line "heard the rumor that I'm looking"
 	line "for a Clefable..."
@@ -1071,7 +1071,7 @@ Text0729: ; 53435 (14:7435)
 	done
 
 Text072a: ; 534e1 (14:74e1)
-	text "Hello, ", TX_RAM1, "."
+	text "Hello, <RAMNAME>."
 	line "Are you enjoying the "
 	line "Pokémon Trading Card Game?"
 	line "By the way, I'm looking for a "
@@ -1114,7 +1114,7 @@ Text072f: ; 536f6 (14:76f6)
 	done
 
 Text0730: ; 5371b (14:771b)
-	text TX_RAM1, " traded a Clefable"
+	text "<RAMNAME> traded a Clefable"
 	line "for a Surfing Pikachu!"
 	done
 
@@ -1124,7 +1124,7 @@ Text0731: ; 53747 (14:7747)
 	done
 
 Text0732: ; 5377f (14:777f)
-	text "Hello, ", TX_RAM1, "."
+	text "Hello, <RAMNAME>."
 	line "I suppose you're here because you"
 	line "heard that I was looking for"
 	line "a Ditto this time..."
@@ -1134,7 +1134,7 @@ Text0732: ; 5377f (14:777f)
 	done
 
 Text0733: ; 53829 (14:7829)
-	text "Hello, ", TX_RAM1, ". "
+	text "Hello, <RAMNAME>. "
 	line "Are you enjoying the"
 	line "Pokémon Trading Card Game?"
 	line "I'm looking for a Ditto"
@@ -1163,7 +1163,7 @@ Text0735: ; 5395a (14:795a)
 	done
 
 Text0736: ; 539ed (14:79ed)
-	text TX_RAM1, " traded a Ditto"
+	text "<RAMNAME> traded a Ditto"
 	line "for a Flying Pikachu!"
 	done
 
@@ -1173,7 +1173,7 @@ Text0737: ; 53a15 (14:7a15)
 	done
 
 Text0738: ; 53a4a (14:7a4a)
-	text "Hello, ", TX_RAM1, "."
+	text "Hello, <RAMNAME>."
 	line "You're really current on the news!"
 	line "I'm looking for a Chansey this "
 	line "time! I'm thinking about trading"
@@ -1184,7 +1184,7 @@ Text0738: ; 53a4a (14:7a4a)
 	done
 
 Text0739: ; 53b25 (14:7b25)
-	text "Hello, ", TX_RAM1, ". "
+	text "Hello, <RAMNAME>. "
 	line "Are you enjoying the"
 	line "Pokémon Trading Card Game?"
 	line "I'm looking for a Chansey"
@@ -1212,7 +1212,7 @@ Text073b: ; 53c6a (14:7c6a)
 	done
 
 Text073c: ; 53cf9 (14:7cf9)
-	text TX_RAM1, " traded a Chansey"
+	text "<RAMNAME> traded a Chansey"
 	line "for a Surfing Pikachu!"
 	done
 
@@ -1222,7 +1222,7 @@ Text073d: ; 53d24 (14:7d24)
 	done
 
 Text073e: ; 53d5b (14:7d5b)
-	text "Oh! Congratulations, ", TX_RAM1, "!"
+	text "Oh! Congratulations, <RAMNAME>!"
 	line "I heard the news! You've finally "
 	line "inherited the Legendary Pokémon "
 	line "Cards! Don't worry, I'm not going "
diff --git a/src/text/text9.asm b/src/text/text9.asm
index 6569d18..2088d0e 100644
--- a/src/text/text9.asm
+++ b/src/text/text9.asm
@@ -1,6 +1,6 @@
 Text073f: ; 54000 (15:4000)
 	text "Who?"
-	line "Oh! It's you, ", TX_RAM1,  "..."
+	line "Oh! It's you, <RAMNAME>..."
 	line "I couldn't believe that I could"
 	line "lose, but now..."
 	line "Now I understand."
@@ -16,14 +16,14 @@ Text073f: ; 54000 (15:4000)
 	line "the different cards to build "
 	line "different types of Decks, and"
 	line "to play against different people!"
-	line "So...", TX_RAM1,  "..."
+	line "So...<RAMNAME>..."
 	line "Will you play with me again?"
 	line "With all sorts of different Decks?"
 	line "And this time, I not gonna lose!"
 	done
 
 Text0740: ; 54223 (15:4223)
-	text "Oh, hi ", TX_RAM1,  "..."
+	text "Oh, hi <RAMNAME>..."
 	line "Do you want to Duel?"
 	done
 
@@ -115,7 +115,7 @@ Text074c: ; 546cf (15:46cf)
 	done
 
 Text074d: ; 5471b (15:471b)
-	text "If I use ", TX_RAM2,  " now,"
+	text "If I use <RAMTEXT> now,"
 	line "This will happen..."
 	done
 
@@ -420,7 +420,7 @@ Text0781: ; 5557a (15:557a)
 	done
 
 Text0782: ; 55621 (15:5621)
-	text "Hi, ", TX_RAM1,  "."
+	text "Hi, <RAMNAME>."
 	line "Would you like to duel?"
 	line "The Legendary Cards will eventually"
 	line "belong to me!"
@@ -429,7 +429,7 @@ Text0782: ; 55621 (15:5621)
 	done
 
 Text0783: ; 5569c (15:569c)
-	text "Hi, ", TX_RAM1,  "."
+	text "Hi, <RAMNAME>."
 	line "Would you like to duel?"
 	done
 
@@ -634,7 +634,7 @@ Text07a2: ; 56049 (15:6049)
 Text07a3: ; 5606c (15:606c)
 	text "I am Gene, the Master of the"
 	line "Rock Club! Rock is good..."
-	line "Isn't Rock good, ", TX_RAM1,  "...?"
+	line "Isn't Rock good, <RAMNAME>...?"
 	line "Rock is hard and strong!"
 	line "Doesn't crumble under pressure!"
 	line "After you Duel me, you'll know "
@@ -934,7 +934,8 @@ Text07cb: ; 56d53 (15:6d53)
 	line ""
 	line ""
 	line "             Satoshi Tajiri"
-	line TX_END
+	line ""
+	done
 
 Text07cc: ; 56d95 (15:6d95)
 	text ""
@@ -1010,7 +1011,7 @@ Text07d4: ; 5705e (15:705e)
 	done
 
 Text07d5: ; 57075 (15:7075)
-	text TX_RAM1,  "'s Score"
+	text "<RAMNAME>'s Score"
 	done
 
 Text07d6: ; 57080 (15:7080)
@@ -1023,7 +1024,7 @@ Text07d7: ; 570a4 (15:70a4)
 
 Text07d8: ; 570be (15:70be)
 	text "Maximum Consecutive Wins"
-	line "    [ ", TX_RAM2,  "  ]"
+	line "    [ <RAMTEXT>  ]"
 	done
 
 Text07d9: ; 570e3 (15:70e3)
@@ -1031,13 +1032,13 @@ Text07d9: ; 570e3 (15:70e3)
 	done
 
 Text07da: ; 570e9 (15:70e9)
-	text TX_RAM1,  " ", TX_RAM3,  " Consecutive Wins!"
+	text "<RAMNAME> <RAMNUM> Consecutive Wins!"
 	line ""
-	text TX_RAM3,  " opponent is ", TX_RAM2,  "."
+	text "<RAMNUM> opponent is <RAMTEXT>."
 	done
 
 Text07db: ; 57112 (15:7112)
-	text TX_RAM3,  " opponent is ", TX_RAM2,  "."
+	text "<RAMNUM> opponent is <RAMTEXT>."
 	done
 
 Text07dc: ; 57124 (15:7124)
@@ -1063,13 +1064,13 @@ Text07e0: ; 571bd (15:71bd)
 	done
 
 Text07e1: ; 571df (15:71df)
-	text "You lost to the ", TX_RAM3,  " opponent,"
-	line TX_RAM2,  "!"
+	text "You lost to the <RAMNUM> opponent,"
+	line "<RAMTEXT>!"
 	done
 
 Text07e2: ; 571ff (15:71ff)
-	text TX_RAM1,  "'s consecutive wins"
-	line "ended at ", TX_RAM3,  "."
+	text "<RAMNAME>'s consecutive wins"
+	line "ended at <RAMNUM>."
 	done
 
 Text07e3: ; 57221 (15:7221)
@@ -1082,7 +1083,7 @@ Text07e4: ; 57240 (15:7240)
 
 Text07e5: ; 5725f (15:725f)
 	text "Congratulations!"
-	line "You won against ", TX_RAM3,  " opponents!"
+	line "You won against <RAMNUM> opponents!"
 	done
 
 DefeatedFiveOpponentsText: ; 5728e (15:728e)
@@ -1091,13 +1092,14 @@ DefeatedFiveOpponentsText: ; 5728e (15:728e)
 	done
 
 Text07e7: ; 572ba (15:72ba)
-	text TX_RAM1,  " successfully defeated "
-	line "5 opponents ", TX_HALFWIDTH,   TX_RAM3,  " time(s)!!!"
+	text "<RAMNAME> successfully defeated "
+	line "5 opponents "
+	text "<RAMNUM> time(s)!!!"
 	done
 
 ConsecutiveWinRecordIncreasedText: ; 572ee (15:72ee)
-	text TX_RAM1,  "'s consecutive win"
-	line "record increased to ", TX_RAM3,  "!"
+	text "<RAMNAME>'s consecutive win"
+	line "record increased to <RAMNUM>!"
 	done
 
 Text07e9: ; 5731a (15:731a)
@@ -1121,59 +1123,71 @@ Text07ed: ; 5734d (15:734d)
 	done
 
 Text07ee: ; 5735b (15:735b)
-	db $61
+	textfw0 "1"
 	done
 
 Text07ef: ; 5735d (15:735d)
-	db $62
+	textfw0 "2"
 	done
 
 Text07f0: ; 5735f (15:735f)
-	db $63
+	textfw0 "3"
 	done
 
 Text07f1: ; 57361 (15:7361)
-	db $64
+	textfw0 "4"
 	done
 
 Text07f2: ; 57363 (15:7363)
-	db $65
+	textfw0 "5"
 	done
 
 Text07f3: ; 57365 (15:7365)
-	db $70
+	textfw0 " "
 	done
 
 Text07f4: ; 57367 (15:7367)
-	db $03,$55
+	textfw3 "☆"
 	done
 
 Text07f5: ; 5736a (15:736a)
-	db $03,$54
+	textfw3 "★"
 	done
 
 Text07f6: ; 5736d (15:736d)
-	db $03,$50, "<FIRE>", $03,$51
+	textfw3 "["
+	db "<FIRE>"
+	textfw3 "]"
 	done
 
 Text07f7: ; 57374 (15:7374)
-	db $03,$50, "<LIGHTNING>", $03,$51
+	textfw3 "["
+	db "<LIGHTNING>"
+	textfw3 "]"
 	done
 
 Text07f8: ; 5737b (15:737b)
-	db $03,$50, "<WATER>", $03,$51
+	textfw3 "["
+	db "<WATER>"
+	textfw3 "]"
 	done
 
 Text07f9: ; 57382 (15:7382)
-	db $03,$50, "<FIGHTING>", $03,$51
+	textfw3 "["
+	db "<FIGHTING>"
+	textfw3 "]"
 	done
 
 Text07fa: ; 57389 (15:7389)
-	db $03,$50, "<PSYCHIC>", $03,$51
+	textfw3 "["
+	db "<PSYCHIC>"
+	textfw3 "]"
 	done
 
 Text07fb: ; 57390 (15:7390)
-	db $03,$50, "<GRASS>", $03,$51
+	textfw3 "["
+	db "<GRASS>"
+	textfw3 "]"
 	done
 
 GrassEnergyName: ; 57397 (15:7397)