From cf85e77d06e3f1cc7bf670f48c599ea8aae64519 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sat, 4 Nov 2023 21:11:13 -0500
Subject: [PATCH] Combine textfw macros

---
 src/constants/charmaps.asm      | 602 ++++++++++++++++----------------
 src/engine/input_name.asm       |   6 +-
 src/engine/menus/card_album.asm |   2 +-
 src/engine/menus/naming.asm     |   2 +-
 src/macros/text.asm             | 149 +++-----
 src/text/text1.asm              |  33 +-
 src/text/text2.asm              | 109 ++----
 src/text/text3.asm              |  12 +-
 src/text/text4.asm              |   4 +-
 src/text/text9.asm              |  28 +-
 10 files changed, 438 insertions(+), 509 deletions(-)

diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm
index 14c4f0d..eaf9619 100644
--- a/src/constants/charmaps.asm
+++ b/src/constants/charmaps.asm
@@ -103,316 +103,316 @@
 	charmap "‾", $7f
 
 MACRO fwcharmap
-	charmap STRCAT("FW\1_", \2), \3
+	charmap STRCAT("FW{x:\1}_", \2), \3
 ENDM
 
 ; 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, "℃", $58
-	fwcharmap 3, "゛", $59
-	fwcharmap 3, "°", $5a
-	fwcharmap 3, "゜", $5b
-	fwcharmap 3, "ˍ", $5c
-	fwcharmap 3, "&", $5d
-	fwcharmap 3, ":", $5e
-	fwcharmap 3, "○", $5f
-	fwcharmap 3, "※", $60
-	fwcharmap 3, "о", $61
-	fwcharmap 3, "^", $62
-	fwcharmap 3, "♪", $63
-	fwcharmap 3, "a", $64
-	fwcharmap 3, "b", $65
-	fwcharmap 3, "d", $66
-	fwcharmap 3, "e", $67
-	fwcharmap 3, "f", $68
-	fwcharmap 3, "h", $69
-	fwcharmap 3, "i", $6a
-	fwcharmap 3, "j", $6b
-	fwcharmap 3, "k", $6c
-	fwcharmap 3, "l", $6d
-	fwcharmap 3, "n", $6e
-	fwcharmap 3, "o", $6f
-	fwcharmap 3, "p", $70
-	fwcharmap 3, "q", $71
-	fwcharmap 3, "s", $72
-	fwcharmap 3, "t", $73
-	fwcharmap 3, "u", $74
-	fwcharmap 3, "v", $75
-	fwcharmap 3, "w", $76
-	fwcharmap 3, "x", $77
-	fwcharmap 3, "y", $78
-	fwcharmap 3, "z", $79
-	fwcharmap 3, "'", $7a
-	fwcharmap 3, "”", $7b
-	fwcharmap 3, "■", $7c
-	fwcharmap 3, "r", $8e
-	fwcharmap 3, "「", $97
-	fwcharmap 3, "＼", $98
-	fwcharmap 3, "」", $99
-	fwcharmap 3, "|", $9a
-	fwcharmap 3, "ˉ", $9b
-	fwcharmap 3, " ", $9c
-	fwcharmap 3, "!", $9d
-	fwcharmap 3, "#", $9f
-	fwcharmap 3, "$", $a0
-	fwcharmap 3, "%", $a1
-	fwcharmap 3, "(", $a4
-	fwcharmap 3, ")", $a5
-	fwcharmap 3, "*", $a6
-	fwcharmap 3, "+", $a7
-	fwcharmap 3, "、", $a8
-	fwcharmap 3, "-", $a9
-	fwcharmap 3, "/", $ab
-	fwcharmap 3, "0", $ac
-	fwcharmap 3, "1", $ad
-	fwcharmap 3, "2", $ae
-	fwcharmap 3, "3", $af
-	fwcharmap 3, "4", $b0
-	fwcharmap 3, "5", $b1
-	fwcharmap 3, "6", $b2
-	fwcharmap 3, "7", $b3
-	fwcharmap 3, "8", $b4
-	fwcharmap 3, "9", $b5
-	fwcharmap 3, ";", $b7
-	fwcharmap 3, "<", $b8
-	fwcharmap 3, "=", $b9
-	fwcharmap 3, ">", $ba
-	fwcharmap 3, "?", $bb
-	fwcharmap 3, "@", $bc
-	fwcharmap 3, "[", $d7
-	fwcharmap 3, "¥", $d8
-	fwcharmap 3, "]", $d9
+	fwcharmap TX_FULLWIDTH3, "A", $30
+	fwcharmap TX_FULLWIDTH3, "B", $31
+	fwcharmap TX_FULLWIDTH3, "C", $32
+	fwcharmap TX_FULLWIDTH3, "D", $33
+	fwcharmap TX_FULLWIDTH3, "E", $34
+	fwcharmap TX_FULLWIDTH3, "F", $35
+	fwcharmap TX_FULLWIDTH3, "G", $36
+	fwcharmap TX_FULLWIDTH3, "H", $37
+	fwcharmap TX_FULLWIDTH3, "I", $38
+	fwcharmap TX_FULLWIDTH3, "J", $39
+	fwcharmap TX_FULLWIDTH3, "K", $3a
+	fwcharmap TX_FULLWIDTH3, "L", $3b
+	fwcharmap TX_FULLWIDTH3, "M", $3c
+	fwcharmap TX_FULLWIDTH3, "N", $3d
+	fwcharmap TX_FULLWIDTH3, "O", $3e
+	fwcharmap TX_FULLWIDTH3, "P", $3f
+	fwcharmap TX_FULLWIDTH3, "Q", $40
+	fwcharmap TX_FULLWIDTH3, "R", $41
+	fwcharmap TX_FULLWIDTH3, "S", $42
+	fwcharmap TX_FULLWIDTH3, "T", $43
+	fwcharmap TX_FULLWIDTH3, "U", $44
+	fwcharmap TX_FULLWIDTH3, "V", $45
+	fwcharmap TX_FULLWIDTH3, "W", $46
+	fwcharmap TX_FULLWIDTH3, "X", $47
+	fwcharmap TX_FULLWIDTH3, "Y", $48
+	fwcharmap TX_FULLWIDTH3, "Z", $49
+	fwcharmap TX_FULLWIDTH3, "g", $4a
+	fwcharmap TX_FULLWIDTH3, "c", $4b
+	fwcharmap TX_FULLWIDTH3, "m", $4c
+	fwcharmap TX_FULLWIDTH3, "r.", $4d
+	fwcharmap TX_FULLWIDTH3, "♀", $4e
+	fwcharmap TX_FULLWIDTH3, "♂", $4f
+	fwcharmap TX_FULLWIDTH3, "【", $50
+	fwcharmap TX_FULLWIDTH3, "】", $51
+	fwcharmap TX_FULLWIDTH3, "●", $52
+	fwcharmap TX_FULLWIDTH3, "◆", $53
+	fwcharmap TX_FULLWIDTH3, "★", $54
+	fwcharmap TX_FULLWIDTH3, "☆", $55
+	fwcharmap TX_FULLWIDTH3, "_", $56
+	fwcharmap TX_FULLWIDTH3, "▪", $57
+	fwcharmap TX_FULLWIDTH3, "℃", $58
+	fwcharmap TX_FULLWIDTH3, "゛", $59
+	fwcharmap TX_FULLWIDTH3, "°", $5a
+	fwcharmap TX_FULLWIDTH3, "゜", $5b
+	fwcharmap TX_FULLWIDTH3, "ˍ", $5c
+	fwcharmap TX_FULLWIDTH3, "&", $5d
+	fwcharmap TX_FULLWIDTH3, ":", $5e
+	fwcharmap TX_FULLWIDTH3, "○", $5f
+	fwcharmap TX_FULLWIDTH3, "※", $60
+	fwcharmap TX_FULLWIDTH3, "о", $61
+	fwcharmap TX_FULLWIDTH3, "^", $62
+	fwcharmap TX_FULLWIDTH3, "♪", $63
+	fwcharmap TX_FULLWIDTH3, "a", $64
+	fwcharmap TX_FULLWIDTH3, "b", $65
+	fwcharmap TX_FULLWIDTH3, "d", $66
+	fwcharmap TX_FULLWIDTH3, "e", $67
+	fwcharmap TX_FULLWIDTH3, "f", $68
+	fwcharmap TX_FULLWIDTH3, "h", $69
+	fwcharmap TX_FULLWIDTH3, "i", $6a
+	fwcharmap TX_FULLWIDTH3, "j", $6b
+	fwcharmap TX_FULLWIDTH3, "k", $6c
+	fwcharmap TX_FULLWIDTH3, "l", $6d
+	fwcharmap TX_FULLWIDTH3, "n", $6e
+	fwcharmap TX_FULLWIDTH3, "o", $6f
+	fwcharmap TX_FULLWIDTH3, "p", $70
+	fwcharmap TX_FULLWIDTH3, "q", $71
+	fwcharmap TX_FULLWIDTH3, "s", $72
+	fwcharmap TX_FULLWIDTH3, "t", $73
+	fwcharmap TX_FULLWIDTH3, "u", $74
+	fwcharmap TX_FULLWIDTH3, "v", $75
+	fwcharmap TX_FULLWIDTH3, "w", $76
+	fwcharmap TX_FULLWIDTH3, "x", $77
+	fwcharmap TX_FULLWIDTH3, "y", $78
+	fwcharmap TX_FULLWIDTH3, "z", $79
+	fwcharmap TX_FULLWIDTH3, "'", $7a
+	fwcharmap TX_FULLWIDTH3, "”", $7b
+	fwcharmap TX_FULLWIDTH3, "■", $7c
+	fwcharmap TX_FULLWIDTH3, "r", $8e
+	fwcharmap TX_FULLWIDTH3, "「", $97
+	fwcharmap TX_FULLWIDTH3, "＼", $98
+	fwcharmap TX_FULLWIDTH3, "」", $99
+	fwcharmap TX_FULLWIDTH3, "|", $9a
+	fwcharmap TX_FULLWIDTH3, "ˉ", $9b
+	fwcharmap TX_FULLWIDTH3, " ", $9c
+	fwcharmap TX_FULLWIDTH3, "!", $9d
+	fwcharmap TX_FULLWIDTH3, "#", $9f
+	fwcharmap TX_FULLWIDTH3, "$", $a0
+	fwcharmap TX_FULLWIDTH3, "%", $a1
+	fwcharmap TX_FULLWIDTH3, "(", $a4
+	fwcharmap TX_FULLWIDTH3, ")", $a5
+	fwcharmap TX_FULLWIDTH3, "*", $a6
+	fwcharmap TX_FULLWIDTH3, "+", $a7
+	fwcharmap TX_FULLWIDTH3, "、", $a8
+	fwcharmap TX_FULLWIDTH3, "-", $a9
+	fwcharmap TX_FULLWIDTH3, "/", $ab
+	fwcharmap TX_FULLWIDTH3, "0", $ac
+	fwcharmap TX_FULLWIDTH3, "1", $ad
+	fwcharmap TX_FULLWIDTH3, "2", $ae
+	fwcharmap TX_FULLWIDTH3, "3", $af
+	fwcharmap TX_FULLWIDTH3, "4", $b0
+	fwcharmap TX_FULLWIDTH3, "5", $b1
+	fwcharmap TX_FULLWIDTH3, "6", $b2
+	fwcharmap TX_FULLWIDTH3, "7", $b3
+	fwcharmap TX_FULLWIDTH3, "8", $b4
+	fwcharmap TX_FULLWIDTH3, "9", $b5
+	fwcharmap TX_FULLWIDTH3, ";", $b7
+	fwcharmap TX_FULLWIDTH3, "<", $b8
+	fwcharmap TX_FULLWIDTH3, "=", $b9
+	fwcharmap TX_FULLWIDTH3, ">", $ba
+	fwcharmap TX_FULLWIDTH3, "?", $bb
+	fwcharmap TX_FULLWIDTH3, "@", $bc
+	fwcharmap TX_FULLWIDTH3, "[", $d7
+	fwcharmap TX_FULLWIDTH3, "¥", $d8
+	fwcharmap TX_FULLWIDTH3, "]", $d9
 
 ; 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
-	fwcharmap 0, "ギ", $3f
-	fwcharmap 0, "グ", $40
-	fwcharmap 0, "ゲ", $41
-	fwcharmap 0, "ゴ", $42
-	fwcharmap 0, "ザ", $43
-	fwcharmap 0, "ジ", $44
-	fwcharmap 0, "ズ", $45
-	fwcharmap 0, "ゼ", $46
-	fwcharmap 0, "ゾ", $47
-	fwcharmap 0, "ダ", $48
-	fwcharmap 0, "ヂ", $49
-	fwcharmap 0, "ヅ", $4a
-	fwcharmap 0, "デ", $4b
-	fwcharmap 0, "ド", $4c
-	fwcharmap 0, "バ", $4d
-	fwcharmap 0, "ビ", $4e
-	fwcharmap 0, "ブ", $4f
-	fwcharmap 0, "ベ", $50
-	fwcharmap 0, "ボ", $51
-	fwcharmap 0, "パ", $52
-	fwcharmap 0, "ピ", $53
-	fwcharmap 0, "プ", $54
-	fwcharmap 0, "ペ", $55
-	fwcharmap 0, "ポ", $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
+	fwcharmap TX_KATAKANA, "ヲ", $10
+	fwcharmap TX_KATAKANA, "ア", $11
+	fwcharmap TX_KATAKANA, "イ", $12
+	fwcharmap TX_KATAKANA, "ウ", $13
+	fwcharmap TX_KATAKANA, "エ", $14
+	fwcharmap TX_KATAKANA, "オ", $15
+	fwcharmap TX_KATAKANA, "カ", $16
+	fwcharmap TX_KATAKANA, "キ", $17
+	fwcharmap TX_KATAKANA, "ク", $18
+	fwcharmap TX_KATAKANA, "ケ", $19
+	fwcharmap TX_KATAKANA, "コ", $1a
+	fwcharmap TX_KATAKANA, "サ", $1b
+	fwcharmap TX_KATAKANA, "シ", $1c
+	fwcharmap TX_KATAKANA, "ス", $1d
+	fwcharmap TX_KATAKANA, "セ", $1e
+	fwcharmap TX_KATAKANA, "ソ", $1f
+	fwcharmap TX_KATAKANA, "タ", $20
+	fwcharmap TX_KATAKANA, "チ", $21
+	fwcharmap TX_KATAKANA, "ツ", $22
+	fwcharmap TX_KATAKANA, "テ", $23
+	fwcharmap TX_KATAKANA, "ト", $24
+	fwcharmap TX_KATAKANA, "ナ", $25
+	fwcharmap TX_KATAKANA, "ニ", $26
+	fwcharmap TX_KATAKANA, "ヌ", $27
+	fwcharmap TX_KATAKANA, "ネ", $28
+	fwcharmap TX_KATAKANA, "ノ", $29
+	fwcharmap TX_KATAKANA, "ハ", $2a
+	fwcharmap TX_KATAKANA, "ヒ", $2b
+	fwcharmap TX_KATAKANA, "フ", $2c
+	fwcharmap TX_KATAKANA, "ヘ", $2d
+	fwcharmap TX_KATAKANA, "ホ", $2e
+	fwcharmap TX_KATAKANA, "マ", $2f
+	fwcharmap TX_KATAKANA, "ミ", $30
+	fwcharmap TX_KATAKANA, "ム", $31
+	fwcharmap TX_KATAKANA, "メ", $32
+	fwcharmap TX_KATAKANA, "モ", $33
+	fwcharmap TX_KATAKANA, "ヤ", $34
+	fwcharmap TX_KATAKANA, "ユ", $35
+	fwcharmap TX_KATAKANA, "ヨ", $36
+	fwcharmap TX_KATAKANA, "ラ", $37
+	fwcharmap TX_KATAKANA, "リ", $38
+	fwcharmap TX_KATAKANA, "ル", $39
+	fwcharmap TX_KATAKANA, "レ", $3a
+	fwcharmap TX_KATAKANA, "ロ", $3b
+	fwcharmap TX_KATAKANA, "ワ", $3c
+	fwcharmap TX_KATAKANA, "ン", $3d
+	fwcharmap TX_KATAKANA, "ガ", $3e
+	fwcharmap TX_KATAKANA, "ギ", $3f
+	fwcharmap TX_KATAKANA, "グ", $40
+	fwcharmap TX_KATAKANA, "ゲ", $41
+	fwcharmap TX_KATAKANA, "ゴ", $42
+	fwcharmap TX_KATAKANA, "ザ", $43
+	fwcharmap TX_KATAKANA, "ジ", $44
+	fwcharmap TX_KATAKANA, "ズ", $45
+	fwcharmap TX_KATAKANA, "ゼ", $46
+	fwcharmap TX_KATAKANA, "ゾ", $47
+	fwcharmap TX_KATAKANA, "ダ", $48
+	fwcharmap TX_KATAKANA, "ヂ", $49
+	fwcharmap TX_KATAKANA, "ヅ", $4a
+	fwcharmap TX_KATAKANA, "デ", $4b
+	fwcharmap TX_KATAKANA, "ド", $4c
+	fwcharmap TX_KATAKANA, "バ", $4d
+	fwcharmap TX_KATAKANA, "ビ", $4e
+	fwcharmap TX_KATAKANA, "ブ", $4f
+	fwcharmap TX_KATAKANA, "ベ", $50
+	fwcharmap TX_KATAKANA, "ボ", $51
+	fwcharmap TX_KATAKANA, "パ", $52
+	fwcharmap TX_KATAKANA, "ピ", $53
+	fwcharmap TX_KATAKANA, "プ", $54
+	fwcharmap TX_KATAKANA, "ペ", $55
+	fwcharmap TX_KATAKANA, "ポ", $56
+	fwcharmap TX_KATAKANA, "ァ", $57
+	fwcharmap TX_KATAKANA, "ィ", $58
+	fwcharmap TX_KATAKANA, "ゥ", $59
+	fwcharmap TX_KATAKANA, "ェ", $5a
+	fwcharmap TX_KATAKANA, "ォ", $5b
+	fwcharmap TX_KATAKANA, "ャ", $5c
+	fwcharmap TX_KATAKANA, "ュ", $5d
+	fwcharmap TX_KATAKANA, "ョ", $5e
+	fwcharmap TX_KATAKANA, "ッ", $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
-	fwcharmap 0, "ぎ", $3f
-	fwcharmap 0, "ぐ", $40
-	fwcharmap 0, "げ", $41
-	fwcharmap 0, "ご", $42
-	fwcharmap 0, "ざ", $43
-	fwcharmap 0, "じ", $44
-	fwcharmap 0, "ず", $45
-	fwcharmap 0, "ぜ", $46
-	fwcharmap 0, "ぞ", $47
-	fwcharmap 0, "だ", $48
-	fwcharmap 0, "ぢ", $49
-	fwcharmap 0, "づ", $4a
-	fwcharmap 0, "で", $4b
-	fwcharmap 0, "ど", $4c
-	fwcharmap 0, "ば", $4d
-	fwcharmap 0, "び", $4e
-	fwcharmap 0, "ぶ", $4f
-	fwcharmap 0, "べ", $50
-	fwcharmap 0, "ぼ", $51
-	fwcharmap 0, "ぱ", $52
-	fwcharmap 0, "ぴ", $53
-	fwcharmap 0, "ぷ", $54
-	fwcharmap 0, "ぺ", $55
-	fwcharmap 0, "ぽ", $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
+	fwcharmap TX_HIRAGANA, "を", $10
+	fwcharmap TX_HIRAGANA, "あ", $11
+	fwcharmap TX_HIRAGANA, "い", $12
+	fwcharmap TX_HIRAGANA, "う", $13
+	fwcharmap TX_HIRAGANA, "え", $14
+	fwcharmap TX_HIRAGANA, "お", $15
+	fwcharmap TX_HIRAGANA, "か", $16
+	fwcharmap TX_HIRAGANA, "き", $17
+	fwcharmap TX_HIRAGANA, "く", $18
+	fwcharmap TX_HIRAGANA, "け", $19
+	fwcharmap TX_HIRAGANA, "こ", $1a
+	fwcharmap TX_HIRAGANA, "さ", $1b
+	fwcharmap TX_HIRAGANA, "し", $1c
+	fwcharmap TX_HIRAGANA, "す", $1d
+	fwcharmap TX_HIRAGANA, "せ", $1e
+	fwcharmap TX_HIRAGANA, "そ", $1f
+	fwcharmap TX_HIRAGANA, "た", $20
+	fwcharmap TX_HIRAGANA, "ち", $21
+	fwcharmap TX_HIRAGANA, "つ", $22
+	fwcharmap TX_HIRAGANA, "て", $23
+	fwcharmap TX_HIRAGANA, "と", $24
+	fwcharmap TX_HIRAGANA, "な", $25
+	fwcharmap TX_HIRAGANA, "に", $26
+	fwcharmap TX_HIRAGANA, "ぬ", $27
+	fwcharmap TX_HIRAGANA, "ね", $28
+	fwcharmap TX_HIRAGANA, "の", $29
+	fwcharmap TX_HIRAGANA, "は", $2a
+	fwcharmap TX_HIRAGANA, "ひ", $2b
+	fwcharmap TX_HIRAGANA, "ふ", $2c
+	fwcharmap TX_HIRAGANA, "へ", $2d
+	fwcharmap TX_HIRAGANA, "ほ", $2e
+	fwcharmap TX_HIRAGANA, "ま", $2f
+	fwcharmap TX_HIRAGANA, "み", $30
+	fwcharmap TX_HIRAGANA, "む", $31
+	fwcharmap TX_HIRAGANA, "め", $32
+	fwcharmap TX_HIRAGANA, "も", $33
+	fwcharmap TX_HIRAGANA, "や", $34
+	fwcharmap TX_HIRAGANA, "ゆ", $35
+	fwcharmap TX_HIRAGANA, "よ", $36
+	fwcharmap TX_HIRAGANA, "ら", $37
+	fwcharmap TX_HIRAGANA, "り", $38
+	fwcharmap TX_HIRAGANA, "る", $39
+	fwcharmap TX_HIRAGANA, "れ", $3a
+	fwcharmap TX_HIRAGANA, "ろ", $3b
+	fwcharmap TX_HIRAGANA, "わ", $3c
+	fwcharmap TX_HIRAGANA, "ん", $3d
+	fwcharmap TX_HIRAGANA, "が", $3e
+	fwcharmap TX_HIRAGANA, "ぎ", $3f
+	fwcharmap TX_HIRAGANA, "ぐ", $40
+	fwcharmap TX_HIRAGANA, "げ", $41
+	fwcharmap TX_HIRAGANA, "ご", $42
+	fwcharmap TX_HIRAGANA, "ざ", $43
+	fwcharmap TX_HIRAGANA, "じ", $44
+	fwcharmap TX_HIRAGANA, "ず", $45
+	fwcharmap TX_HIRAGANA, "ぜ", $46
+	fwcharmap TX_HIRAGANA, "ぞ", $47
+	fwcharmap TX_HIRAGANA, "だ", $48
+	fwcharmap TX_HIRAGANA, "ぢ", $49
+	fwcharmap TX_HIRAGANA, "づ", $4a
+	fwcharmap TX_HIRAGANA, "で", $4b
+	fwcharmap TX_HIRAGANA, "ど", $4c
+	fwcharmap TX_HIRAGANA, "ば", $4d
+	fwcharmap TX_HIRAGANA, "び", $4e
+	fwcharmap TX_HIRAGANA, "ぶ", $4f
+	fwcharmap TX_HIRAGANA, "べ", $50
+	fwcharmap TX_HIRAGANA, "ぼ", $51
+	fwcharmap TX_HIRAGANA, "ぱ", $52
+	fwcharmap TX_HIRAGANA, "ぴ", $53
+	fwcharmap TX_HIRAGANA, "ぷ", $54
+	fwcharmap TX_HIRAGANA, "ぺ", $55
+	fwcharmap TX_HIRAGANA, "ぽ", $56
+	fwcharmap TX_HIRAGANA, "ぁ", $57
+	fwcharmap TX_HIRAGANA, "ぃ", $58
+	fwcharmap TX_HIRAGANA, "ぅ", $59
+	fwcharmap TX_HIRAGANA, "ぇ", $5a
+	fwcharmap TX_HIRAGANA, "ぉ", $5b
+	fwcharmap TX_HIRAGANA, "ゃ", $5c
+	fwcharmap TX_HIRAGANA, "ゅ", $5d
+	fwcharmap TX_HIRAGANA, "ょ", $5e
+	fwcharmap TX_HIRAGANA, "っ", $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, "「", $73
-	fwcharmap 0, "」", $74
-	fwcharmap 0, "、", $75
-	fwcharmap 0, "。", $76
-	fwcharmap 0, "・", $77
-	fwcharmap 0, "—", $78
-	fwcharmap 0, "~", $79
+	fwcharmap TX_FULLWIDTH0, "0", $60
+	fwcharmap TX_FULLWIDTH0, "1", $61
+	fwcharmap TX_FULLWIDTH0, "2", $62
+	fwcharmap TX_FULLWIDTH0, "3", $63
+	fwcharmap TX_FULLWIDTH0, "4", $64
+	fwcharmap TX_FULLWIDTH0, "5", $65
+	fwcharmap TX_FULLWIDTH0, "6", $66
+	fwcharmap TX_FULLWIDTH0, "7", $67
+	fwcharmap TX_FULLWIDTH0, "8", $68
+	fwcharmap TX_FULLWIDTH0, "9", $69
+	fwcharmap TX_FULLWIDTH0, "+", $6a
+	fwcharmap TX_FULLWIDTH0, "-", $6b
+	fwcharmap TX_FULLWIDTH0, "×", $6c
+	fwcharmap TX_FULLWIDTH0, "/", $6d
+	fwcharmap TX_FULLWIDTH0, "!", $6e
+	fwcharmap TX_FULLWIDTH0, "?", $6f
+	fwcharmap TX_FULLWIDTH0, " ", $70
+	fwcharmap TX_FULLWIDTH0, "(", $71
+	fwcharmap TX_FULLWIDTH0, ")", $72
+	fwcharmap TX_FULLWIDTH0, "「", $73
+	fwcharmap TX_FULLWIDTH0, "」", $74
+	fwcharmap TX_FULLWIDTH0, "、", $75
+	fwcharmap TX_FULLWIDTH0, "。", $76
+	fwcharmap TX_FULLWIDTH0, "・", $77
+	fwcharmap TX_FULLWIDTH0, "—", $78
+	fwcharmap TX_FULLWIDTH0, "~", $79
 
 DEF FW_SPACE EQU $70
 
diff --git a/src/engine/input_name.asm b/src/engine/input_name.asm
index df53cf8..7b322d0 100644
--- a/src/engine/input_name.asm
+++ b/src/engine/input_name.asm
@@ -260,7 +260,7 @@ PrintPlayerNameFromInput:
 .char_underbar
 	db $56
 REPT 10
-	textfw3 "_"
+	textfw "_"
 ENDR
 	done
 
@@ -590,7 +590,7 @@ NamingScreen_ProcessInput:
 	ld a, [wd009]
 	cp $02
 	jr z, .read_char
-	ldfw3 bc, "゛"
+	lb bc, TX_FULLWIDTH3, "FW3_゛"
 	ld a, d
 	cp b
 	jr nz, .asm_6af4
@@ -604,7 +604,7 @@ NamingScreen_ProcessInput:
 	jr c, .nothing
 	jr .asm_6b09
 .asm_6af4
-	ldfw3 bc, "゜"
+	lb bc, TX_FULLWIDTH3, "FW3_゜"
 	ld a, d
 	cp b
 	jr nz, .asm_6b1d
diff --git a/src/engine/menus/card_album.asm b/src/engine/menus/card_album.asm
index e5d0734..717292d 100644
--- a/src/engine/menus/card_album.asm
+++ b/src/engine/menus/card_album.asm
@@ -376,7 +376,7 @@ PrintCardSetListEntries:
 	ret
 
 .EmptySlotText
-	textfw0 "-------------"
+	textfw "-------------"
 	done
 
 ; gets the index in the card list and adds it to wCurDeckName
diff --git a/src/engine/menus/naming.asm b/src/engine/menus/naming.asm
index 1166cb8..d215ce3 100644
--- a/src/engine/menus/naming.asm
+++ b/src/engine/menus/naming.asm
@@ -36,7 +36,7 @@ DisplayPlayerNamingScreen:
 
 .default_name
 	; "MARK": default player name.
-	textfw3 "MARK"
+	textfw "MARK"
 	db TX_END, TX_END, TX_END, TX_END
 
 Unknown_128f7:
diff --git a/src/macros/text.asm b/src/macros/text.asm
index 1d2df8f..7144cb9 100644
--- a/src/macros/text.asm
+++ b/src/macros/text.asm
@@ -4,101 +4,66 @@ DEF done EQUS "db TX_END"
 
 DEF half2full EQUS "db TX_HALF2FULL"
 
-MACRO katakana
-	db TX_KATAKANA
-	FOR i, STRLEN(\1)
-		db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
+MACRO _textfw
+	PUSHO
+	OPT Wno-unmapped-char
+	REPT _NARG
+		IF STRLEN(\1) > 0
+			IF STRCMP(STRSUB(\1, 1, 1), "<") == 0 && STRLEN(\1) > 1
+				db \1
+			ELSE
+				FOR i, STRLEN(\1)
+					IF CHARLEN(STRCAT("FW{x:TX_KATAKANA}_", STRSUB(\1, i + 1, 1))) == 1
+						IF cur_set != TX_KATAKANA
+							DEF cur_set = TX_KATAKANA
+							db cur_set
+						ENDC
+						db STRCAT("FW{x:TX_KATAKANA}_", STRSUB(\1, i + 1, 1))
+					ELIF CHARLEN(STRCAT("FW{x:TX_HIRAGANA}_", STRSUB(\1, i + 1, 1))) == 1
+						IF cur_set != TX_HIRAGANA
+							DEF cur_set = TX_HIRAGANA
+							db cur_set
+						ENDC
+						db STRCAT("FW{x:TX_HIRAGANA}_", STRSUB(\1, i + 1, 1))
+					ELIF CHARLEN(STRCAT("FW0_", STRSUB(\1, i + 1, 1))) == 1
+						db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
+					ELIF CHARLEN(STRCAT("FW1_", STRSUB(\1, i + 1, 1))) == 1
+						db TX_FULLWIDTH1, STRCAT("FW1_", STRSUB(\1, i + 1, 1))
+					ELIF CHARLEN(STRCAT("FW2_", STRSUB(\1, i + 1, 1))) == 1
+						db TX_FULLWIDTH2, STRCAT("FW2_", STRSUB(\1, i + 1, 1))
+					ELIF CHARLEN(STRCAT("FW3_", STRSUB(\1, i + 1, 1))) == 1
+						db TX_FULLWIDTH3, STRCAT("FW3_", STRSUB(\1, i + 1, 1))
+					ELIF CHARLEN(STRCAT("FW4_", STRSUB(\1, i + 1, 1))) == 1
+						db TX_FULLWIDTH4, STRCAT("FW4_", STRSUB(\1, i + 1, 1))
+					ELSE
+						FAIL STRCAT("Unmapped fullwidth character: ", STRSUB(\1, i + 1, 1))
+					ENDC
+				ENDR
+			ENDC
+		ENDC
+		SHIFT
 	ENDR
+	POPO
+ENDM
+
+MACRO textfw
+	DEF cur_set = TX_KATAKANA
+	_textfw \#
+ENDM
+
+MACRO linefw
+	db TX_LINE
+	_textfw \#
+ENDM
+
+MACRO katakana
+	DEF cur_set = TX_KATAKANA
+	db TX_KATAKANA
+	_textfw \#
 ENDM
 
 MACRO hiragana
+	DEF cur_set = TX_HIRAGANA
 	db TX_HIRAGANA
-	FOR i, STRLEN(\1)
-		db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
-	ENDR
-ENDM
-
-MACRO textfw0
-	REPT _NARG
-		IF STRCMP(STRSUB(\1, 1, 1), "<") == 0 && STRLEN(\1) > 1
-			db \1
-		ELSE
-			FOR i, STRLEN(\1)
-				db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
-			ENDR
-		ENDC
-		SHIFT
-	ENDR
-ENDM
-
-MACRO textfw1
-	REPT _NARG
-		IF STRCMP(STRSUB(\1, 1, 1), "<") == 0 && STRLEN(\1) > 1
-			db \1
-		ELSE
-			FOR i, STRLEN(\1)
-				IF STRCMP(STRSUB(\1, i + 1, 1), " ") == 0
-					db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
-				ELSE
-					db TX_FULLWIDTH1, STRCAT("FW1_", STRSUB(\1, i + 1, 1))
-				ENDC
-			ENDR
-		ENDC
-		SHIFT
-	ENDR
-ENDM
-
-MACRO textfw2
-	REPT _NARG
-		IF STRCMP(STRSUB(\1, 1, 1), "<") == 0 && STRLEN(\1) > 1
-			db \1
-		ELSE
-			FOR i, STRLEN(\1)
-				IF STRCMP(STRSUB(\1, i + 1, 1), " ") == 0
-					db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
-				ELSE
-					db TX_FULLWIDTH2, STRCAT("FW2_", STRSUB(\1, i + 1, 1))
-				ENDC
-			ENDR
-		ENDC
-		SHIFT
-	ENDR
-ENDM
-
-MACRO textfw3
-	REPT _NARG
-		IF STRCMP(STRSUB(\1, 1, 1), "<") == 0 && STRLEN(\1) > 1
-			db \1
-		ELSE
-			FOR i, STRLEN(\1)
-				IF STRCMP(STRSUB(\1, i + 1, 1), " ") == 0
-					db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
-				ELSE
-					db TX_FULLWIDTH3, STRCAT("FW3_", STRSUB(\1, i + 1, 1))
-				ENDC
-			ENDR
-		ENDC
-		SHIFT
-	ENDR
-ENDM
-
-MACRO textfw4
-	REPT _NARG
-		IF STRCMP(STRSUB(\1, 1, 1), "<") == 0 && STRLEN(\1) > 1
-			db \1
-		ELSE
-			FOR i, STRLEN(\1)
-				IF STRCMP(STRSUB(\1, i + 1, 1), " ") == 0
-					db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
-				ELSE
-					db TX_FULLWIDTH4, STRCAT("FW4_", STRSUB(\1, i + 1, 1))
-				ENDC
-			ENDR
-		ENDC
-		SHIFT
-	ENDR
-ENDM
-
-MACRO ldfw3
-	ld \1, (TX_FULLWIDTH3 << 8) | STRCAT("FW3_", \2)
+	_textfw \#
 ENDM
diff --git a/src/text/text1.asm b/src/text/text1.asm
index b0980a9..fb0dcab 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -39,7 +39,7 @@ PKMNPWRText:
 	done
 
 UnusedText000b: ; Unused (Pokemon Card)
-	textfw0 "ポケモンカ—ド"
+	textfw "ポケモンカ—ド"
 	done
 
 LengthText:
@@ -55,7 +55,7 @@ PokemonText:
 	done
 
 MetresText:
-	textfw3 "m"
+	textfw "m"
 	done
 
 LbsText:
@@ -63,19 +63,19 @@ LbsText:
 	done
 
 PromostarRarityText:
-	textfw0 " "
+	textfw " "
 	done
 
 CircleRarityText:
-	textfw3 "●"
+	textfw "●"
 	done
 
 DiamondRarityText:
-	textfw3 "◆"
+	textfw "◆"
 	done
 
 StarRarityText:
-	textfw3 "★"
+	textfw "★"
 	done
 
 AllCardsOwnedText:
@@ -304,27 +304,27 @@ ColorListText:
 	done
 
 GrassSymbolText:
-	textfw0 "<GRASS>"
+	textfw "<GRASS>"
 	done
 
 FireSymbolText:
-	textfw0 "<FIRE>"
+	textfw "<FIRE>"
 	done
 
 WaterSymbolText:
-	textfw0 "<WATER>"
+	textfw "<WATER>"
 	done
 
 LightningSymbolText:
-	textfw0 "<LIGHTNING>"
+	textfw "<LIGHTNING>"
 	done
 
 FightingSymbolText:
-	textfw0 "<FIGHTING>"
+	textfw "<FIGHTING>"
 	done
 
 PsychicSymbolText:
-	textfw0 "<PSYCHIC>"
+	textfw "<PSYCHIC>"
 	done
 
 BenchText:
@@ -602,10 +602,7 @@ SelectCheckText:
 	done
 
 UnusedText0087: ; Unused
-	textfw3 "B"
-	textfw0 "<RAMNUM>"
-	textfw3 "S"
-	textfw0 "<RAMNUM>"
+	textfw "B", "<RAMNUM>", "S", "<RAMNUM>"
 	done
 
 DuelistIsThinkingText:
@@ -613,7 +610,7 @@ DuelistIsThinkingText:
 	done
 
 ClearOpponentNameText:
-	textfw0 "          "
+	textfw "          "
 	done
 
 SelectComputerOpponentText:
@@ -708,7 +705,7 @@ UnusedText0099: ; Unused
 	text "Load File"
 	line "  "
 	half2full
-	textfw0 "0"
+	textfw "0"
 	text "  Last Saved File"
 	done
 
diff --git a/src/text/text2.asm b/src/text/text2.asm
index 9b6ee8a..8b5a238 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -1484,19 +1484,19 @@ RetreatCostText:
 	done
 
 UnusedText0213: ; Unused
-	textfw3 "SWITCH TO UPPER"
+	textfw "SWITCH TO UPPER"
 	done
 
 UnusedText0214: ; Unused
-	textfw3 "SWITCH TO LOWER"
+	textfw "SWITCH TO LOWER"
 	done
 
 FeetText:
-	textfw3 "'"
+	textfw "'"
 	done
 
 InchesText:
-	textfw3 "”"
+	textfw "”"
 	done
 
 YourDiscardPileText:
@@ -1512,15 +1512,15 @@ DeckText:
 	done
 
 UnusedText021a: ; Unused (Hiragana)
-	hiragana "ひらがナ"
+	textfw "ひらがな"
 	done
 
 UnusedText021b: ; Unused (Katakana)
-	textfw0 "カタカナ"
+	textfw "カタカナ"
 	done
 
 UnusedText021c: ; Unused
-	textfw3 "ABC"
+	textfw "ABC"
 	done
 
 EndText:
@@ -1532,71 +1532,39 @@ WhatIsYourNameText:
 	done
 
 UnusedText021f: ; Unused
-	hiragana "あ か さ た な は ま や ら"
-	line ""
-	textfw0 "い き し ち に ひ み ゆ り"
-	line ""
-	textfw0 "う く す つ ぬ ふ む よ る"
-	line ""
-	textfw0 "え け せ て ね へ め わ れ"
-	line ""
-	textfw0 "お こ そ と の ほ も ん ろ"
-	line ""
-	textfw0 "ゃ ゅ ょ っ を "
-	textfw3 "゛ ゜ "
-	textfw0 "—"
+	textfw "あ か さ た な は ま や ら"
+	linefw "い き し ち に ひ み ゆ り"
+	linefw "う く す つ ぬ ふ む よ る"
+	linefw "え け せ て ね へ め わ れ"
+	linefw "お こ そ と の ほ も ん ろ"
+	linefw "ゃ ゅ ょ っ を ゛ ゜ —"
 	done
 
 UnusedText0220: ; Unused
-	textfw0 "ア カ サ タ ナ ハ マ ヤ ラ"
-	line ""
-	textfw0 "イ キ シ チ ニ ヒ ミ ユ リ"
-	line ""
-	textfw0 "ウ ク ス ツ ヌ フ ム ヨ ル"
-	line ""
-	textfw0 "エ ケ セ テ ネ ヘ メ ワ レ"
-	line ""
-	textfw0 "オ コ ソ ト ノ ホ モ ン ロ"
-	line ""
-	textfw0 "ャ ュ ョ ッ ヲ "
-	textfw3 "゛ ゜ "
-	textfw0 "—"
+	textfw "ア カ サ タ ナ ハ マ ヤ ラ"
+	linefw "イ キ シ チ ニ ヒ ミ ユ リ"
+	linefw "ウ ク ス ツ ヌ フ ム ヨ ル"
+	linefw "エ ケ セ テ ネ ヘ メ ワ レ"
+	linefw "オ コ ソ ト ノ ホ モ ン ロ"
+	linefw "ャ ュ ョ ッ ヲ ゛ ゜ —"
 	done
 
 PlayerNameKeyboardText:
-	textfw3 "A B C D E F G H I"
-	line ""
-	textfw3 "J K L M N O P Q R"
-	line ""
-	textfw3 "S T U V W X Y Z "
-	textfw0 "!"
-	line ""
-	textfw0 "? "
-	textfw3 "& "
-	textfw0 "+ - ・ 0 1 2 3"
-	line ""
-	textfw0 "4 5 6 7 8 9 ", "<No>", " ", "<Lv>", "  "
-	line ""
-	textfw0 "                 "
+	textfw "A B C D E F G H I"
+	linefw "J K L M N O P Q R"
+	linefw "S T U V W X Y Z !"
+	linefw "? & + - ・ 0 1 2 3"
+	linefw "4 5 6 7 8 9 ", "<No>", " ", "<Lv>", "  "
+	linefw "                 "
 	done
 
 DeckNameKeyboardText:
-	textfw3 "A B C D E F G H I"
-	line ""
-	textfw3 "J K L M N O P Q R"
-	line ""
-	textfw3 "S T U V W X Y Z "
-	textfw0 "!"
-	line ""
-	textfw0 "? "
-	textfw3 "& "
-	textfw0 "+ - "
-	textfw3 "'"
-	textfw0 " 0 1 2 3"
-	line ""
-	textfw0 "4 5 6 7 8 9      "
-	line ""
-	textfw0 "                 "
+	textfw "A B C D E F G H I"
+	linefw "J K L M N O P Q R"
+	linefw "S T U V W X Y Z !"
+	linefw "? & + - ' 0 1 2 3"
+	linefw "4 5 6 7 8 9      "
+	linefw "                 "
 	done
 
 NewDeckText:
@@ -1633,19 +1601,19 @@ ChosenAsDuelingDeckText:
 	done
 
 Deck1Text:
-	textfw0 "1・"
+	textfw "1・"
 	done
 
 Deck2Text:
-	textfw0 "2・"
+	textfw "2・"
 	done
 
 Deck3Text:
-	textfw0 "3・"
+	textfw "3・"
 	done
 
 Deck4Text:
-	textfw0 "4・"
+	textfw "4・"
 	done
 
 ThereIsNoDeckHereText:
@@ -1788,8 +1756,7 @@ DuelistDiscardPileText:
 	done
 
 EmptyLineText:
-	textfw0 "         "
-	textfw0 "         "
+	textfw "                  "
 	done
 
 BoosterPackTitleText:
@@ -1821,7 +1788,7 @@ ViewWhichCardFileText:
 	done
 
 EmptyPromotionalCardText:
-	textfw0 "----------"
+	textfw "----------"
 	done
 
 SCardsText:
@@ -1829,7 +1796,7 @@ SCardsText:
 	done
 
 EmptyDeckNameText:
-	textfw0 "--------------"
+	textfw "--------------"
 	done
 
 DeckSaveMachineText:
diff --git a/src/text/text3.asm b/src/text/text3.asm
index c087a45..3afd5d2 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -1072,13 +1072,13 @@ PlayerStatusNameText:
 PlayerStatusAlbumText:
 	text "Album           "
 	half2full
-	textfw0 "/"
+	textfw "/"
 	done
 
 PlayerStatusPlayTimeText:
 	text "Play time         "
 	half2full
-	textfw3 ":"
+	textfw ":"
 	done
 
 PlayerDiaryTitleText:
@@ -1206,7 +1206,7 @@ MailNumbersText:
 	done
 
 EmptyMailNameText:
-	textfw0 "     "
+	textfw "     "
 	done
 
 Mail1Text:
@@ -1295,15 +1295,15 @@ ContinueFromDiarySummaryText:
 	text "  <RAMNAME>  <RAMTEXT>"
 	line "      Master Medals Won "
 	half2full
-	textfw0 "<RAMNUM>"
+	textfw "<RAMNUM>"
 	text ""
 	line "      Album           "
 	half2full
-	textfw0 "/"
+	textfw "/"
 	text ""
 	line "      Play time         "
 	half2full
-	textfw3 ":"
+	textfw ":"
 	text ""
 	done
 
diff --git a/src/text/text4.asm b/src/text/text4.asm
index c907a09..dac3bd1 100644
--- a/src/text/text4.asm
+++ b/src/text/text4.asm
@@ -819,7 +819,7 @@ ImakuniWouldLikeToDuelInitialText:
 	line "I'll sing the PokéRap - You dance!"
 	line ""
 	half2full
-	textfw3 "♪"
+	textfw "♪"
 	text "La di da la di da"
 	line "  La di da la di da..."
 	line "Hey!"
@@ -885,7 +885,7 @@ ImakuniPlayerLostText:
 	line "Come on, shake it!!!"
 	line ""
 	half2full
-	textfw3 "♪"
+	textfw "♪"
 	text "La di da la di da"
 	line "  La di da la di da..."
 	line "... You dance weird!"
diff --git a/src/text/text9.asm b/src/text/text9.asm
index 9496c9f..2babc43 100644
--- a/src/text/text9.asm
+++ b/src/text/text9.asm
@@ -1123,59 +1123,59 @@ GrandMasterText:
 	done
 
 ChallengeMachineOpponent1Text:
-	textfw0 "1"
+	textfw "1"
 	done
 
 ChallengeMachineOpponent2Text:
-	textfw0 "2"
+	textfw "2"
 	done
 
 ChallengeMachineOpponent3Text:
-	textfw0 "3"
+	textfw "3"
 	done
 
 ChallengeMachineOpponent4Text:
-	textfw0 "4"
+	textfw "4"
 	done
 
 ChallengeMachineOpponent5Text:
-	textfw0 "5"
+	textfw "5"
 	done
 
 ChallengeMachineNotDuelledIconText:
-	textfw0 " "
+	textfw " "
 	done
 
 ChallengeMachineDuelWonIconText:
-	textfw3 "☆"
+	textfw "☆"
 	done
 
 ChallengeMachineDuelLostIconText:
-	textfw3 "★"
+	textfw "★"
 	done
 
 ChallengeMachineFireIconText:
-	textfw3 "【", "<FIRE>", "】"
+	textfw "【", "<FIRE>", "】"
 	done
 
 ChallengeMachineLightningIconText:
-	textfw3 "【", "<LIGHTNING>", "】"
+	textfw "【", "<LIGHTNING>", "】"
 	done
 
 ChallengeMachineWaterIconText:
-	textfw3 "【", "<WATER>", "】"
+	textfw "【", "<WATER>", "】"
 	done
 
 ChallengeMachineFightingIconText:
-	textfw3 "【", "<FIGHTING>", "】"
+	textfw "【", "<FIGHTING>", "】"
 	done
 
 ChallengeMachinePsychicIconText:
-	textfw3 "【", "<PSYCHIC>", "】"
+	textfw "【", "<PSYCHIC>", "】"
 	done
 
 ChallengeMachineGrassIconText:
-	textfw3 "【", "<GRASS>", "】"
+	textfw "【", "<GRASS>", "】"
 	done
 
 GrassEnergyName: