Clean up charmaps

and text macros

10 files changed, 152 insertions, 171 deletions

diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm
index 2b8eb40..51474ca 100644
--- a/src/constants/charmaps.asm
+++ b/src/constants/charmaps.asm
@@ -4,10 +4,11 @@
 	charmap "<RAMNUM>",  TX_RAM3
 
 ; ascii half-width font
-	charmap "é", "`"
+	charmap "”", "\""
 	charmap "♂", "$"
 	charmap "♀", "%"
-	charmap "”", "\""
+	charmap "É", "@"
+	charmap "é", "`"
 
 fwcharmap: MACRO
 	charmap STRCAT("FW\1_", \2), \3
@@ -53,16 +54,17 @@ ENDM
 	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, "▪", $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, "※", $60
+	fwcharmap 3, "о", $61
 	fwcharmap 3, "^", $62
 	fwcharmap 3, "♪", $63
 	fwcharmap 3, "a", $64
@@ -89,11 +91,13 @@ ENDM
 	fwcharmap 3, "z", $79
 	fwcharmap 3, "'", $7a
 	fwcharmap 3, "”", $7b
+	fwcharmap 3, "■", $7c
 	fwcharmap 3, "r", $8e
-	fwcharmap 3, "┌", $97
+	fwcharmap 3, "「", $97
 	fwcharmap 3, "＼", $98
-	fwcharmap 3, "┐", $99
+	fwcharmap 3, "」", $99
 	fwcharmap 3, "|", $9a
+	fwcharmap 3, "ˉ", $9b
 	fwcharmap 3, " ", $9c
 	fwcharmap 3, "!", $9d
 	fwcharmap 3, "#", $9f
@@ -103,7 +107,7 @@ ENDM
 	fwcharmap 3, ")", $a5
 	fwcharmap 3, "*", $a6
 	fwcharmap 3, "+", $a7
-	fwcharmap 3, "､", $a8
+	fwcharmap 3, "、", $a8
 	fwcharmap 3, "-", $a9
 	fwcharmap 3, "/", $ab
 	fwcharmap 3, "0", $ac
@@ -280,11 +284,11 @@ ENDM
 	fwcharmap 0, "ぷ", $54
 	fwcharmap 0, "ぺ", $55
 	fwcharmap 0, "ぽ", $56
-	fwcharmap 0, "あ(2)", $57
-	fwcharmap 0, "い(2)", $58
-	fwcharmap 0, "う(2)", $59
-	fwcharmap 0, "え(2)", $5a
-	fwcharmap 0, "お(2)", $5b
+	fwcharmap 0, "ぁ", $57
+	fwcharmap 0, "ぃ", $58
+	fwcharmap 0, "ぅ", $59
+	fwcharmap 0, "ぇ", $5a
+	fwcharmap 0, "ぉ", $5b
 	fwcharmap 0, "ゃ", $5c
 	fwcharmap 0, "ゅ", $5d
 	fwcharmap 0, "ょ", $5e
@@ -303,15 +307,20 @@ ENDM
 	fwcharmap 0, "9", $69
 	fwcharmap 0, "+", $6a
 	fwcharmap 0, "-", $6b
-	fwcharmap 0, "✕", $6c
+	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
+	fwcharmap 0, "「", $73
+	fwcharmap 0, "」", $74
+	fwcharmap 0, "、", $75
+	fwcharmap 0, "。", $76
+	fwcharmap 0, "・", $77
+	fwcharmap 0, "—", $78
+	fwcharmap 0, "~", $79
 
 FW_SPACE EQU $70
 
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index 745bc04..0dfe388 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -4076,7 +4076,7 @@ DisplayPlayerNamingScreen:: ; 128a9 (4:68a9)
 
 .default_name
 	; "MARK": default player name.
-	textfw3 "M", "A", "R", "K"
+	textfw3 "MARK"
 	db TX_END, TX_END, TX_END, TX_END
 
 Unknown_128f7: ; 128f7 (4:68f7)
diff --git a/src/engine/input_name.asm b/src/engine/input_name.asm
index edcac4c..472aba3 100644
--- a/src/engine/input_name.asm
+++ b/src/engine/input_name.asm
@@ -590,7 +590,7 @@ NamingScreen_ProcessInput:
 	ld a, [wd009]
 	cp $02
 	jr z, .read_char
-	ldfw3 bc, "“"
+	ldfw3 bc, "゛"
 	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, "º(2)"
+	ldfw3 bc, "゜"
 	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 87462fe..4459169 100644
--- a/src/engine/menus/card_album.asm
+++ b/src/engine/menus/card_album.asm
@@ -376,7 +376,7 @@ PrintCardSetListEntries:
 	ret
 
 .EmptySlotText
-	textfw0 "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-"
+	textfw0 "-------------"
 	done
 
 ; gets the index in the card list and adds it to wCurDeckName
@@ -456,11 +456,11 @@ PrintCardSetListEntries:
 	ret
 
 .phantom_card
-; phantom cards get only "✕✕" in their index number
+; phantom cards get only "××" in their index number
 	ld hl, wCurDeckName + 2
-	ld [hl], "FW0_✕"
+	ld [hl], "FW0_×"
 	inc hl
-	ld [hl], "FW0_✕"
+	ld [hl], "FW0_×"
 	inc hl
 	ld [hl], TX_SYMBOL
 	inc hl
diff --git a/src/engine/menus/deck_configuration.asm b/src/engine/menus/deck_configuration.asm
index e309de2..71267fb 100644
--- a/src/engine/menus/deck_configuration.asm
+++ b/src/engine/menus/deck_configuration.asm
@@ -1603,66 +1603,27 @@ PrintDeckBuildingCardList:
 	ret
 
 Text_9a30:
-	db TX_SYMBOL, TX_END
-
-Text_9a32:
-	db TX_SYMBOL, TX_END
-
-Text_9a34:
-	db TX_SYMBOL, TX_END
-
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
 Text_9a36:
-	db TX_SYMBOL, TX_END
-
-Text_9a38:
-	db TX_SYMBOL, TX_END
-
-Text_9a3a:
-	db TX_SYMBOL, TX_END
-
-Text_9a3c:
-	db TX_SYMBOL, TX_END
-
-Text_9a3e:
-	db TX_SYMBOL, TX_END
-
-Text_9a40:
-	db TX_SYMBOL, TX_END
-
-Text_9a42:
-	db TX_SYMBOL, TX_END
-
-Text_9a44:
-	db TX_SYMBOL, TX_END
-
-Text_9a46:
-	db TX_SYMBOL, TX_END
-
-Text_9a48:
-	db TX_SYMBOL, TX_END
-
-Text_9a4a:
-	db TX_SYMBOL, TX_END
-
-Text_9a4c:
-	db TX_SYMBOL, TX_END
-
-Text_9a4e:
-	db TX_SYMBOL, TX_END
-
-Text_9a50:
-	db TX_SYMBOL, TX_END
-
-Text_9a52:
-	db TX_SYMBOL, TX_END
-
-Text_9a54:
-	db TX_SYMBOL, TX_END
-
-Text_9a56:
-	db TX_SYMBOL, TX_END
-
-Text_9a58:
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
+	db "<SPACE>"
 	done
 
 ; writes the card ID in register e to wVisibleListCardIDs
@@ -2650,7 +2611,7 @@ ShowDeckInfoHeader:
 	ret
 
 ; prints the name of wCurDeck in the form
-; "X· <deck name> deck", where X is the number
+; "X・ <deck name> deck", where X is the number
 ; of the deck in the given menu
 ; if no current deck, print blank line
 PrintCurDeckNumberAndName:
@@ -2659,7 +2620,7 @@ PrintCurDeckNumberAndName:
 	jr z, .skip_deck_numeral
 
 ; print the deck number in the menu
-; in the form "X·"
+; in the form "X・"
 	lb de, 3, 2
 	call InitTextPrinting
 	ld a, [wCurDeck]
@@ -2672,7 +2633,7 @@ PrintCurDeckNumberAndName:
 .got_deck_numeral
 	ld hl, wDefaultText
 	call ConvertToNumericalDigits
-	ld [hl], "FW0_·"
+	ld [hl], "FW0_・"
 	inc hl
 	ld [hl], TX_END
 	ld hl, wDefaultText
diff --git a/src/engine/menus/deck_machine.asm b/src/engine/menus/deck_machine.asm
index 5b76dca..90f90db 100644
--- a/src/engine/menus/deck_machine.asm
+++ b/src/engine/menus/deck_machine.asm
@@ -140,7 +140,7 @@ HandleDeckMissingCardsList:
 	inc a
 	ld hl, wDefaultText
 	call ConvertToNumericalDigits
-	ld [hl], "FW0_·"
+	ld [hl], "FW0_・"
 	inc hl
 	ld [hl], TX_END
 	ld hl, wDefaultText
@@ -898,7 +898,7 @@ PrintDeckMachineEntry:
 	ld hl, wDefaultText
 	inc a
 	call ConvertToNumericalDigits
-	ld [hl], "FW0_·"
+	ld [hl], "FW0_・"
 	inc hl
 	ld [hl], TX_END
 	call InitTextPrinting
@@ -960,11 +960,11 @@ PrintDeckMachineEntry:
 	call CheckIfCanBuildSavedDeck
 	jr c, .cannot_build_at_all
 	pop bc
-	lb de, 3, "FW3_❄" ; can build by dismantling
+	lb de, 3, "FW3_※" ; can build by dismantling
 	jr .asm_b4c2
 
 .cannot_build_at_all
-	lb de, 0, "FW0_✕" ; cannot build even by dismantling
+	lb de, 0, "FW0_×" ; cannot build even by dismantling
 	call Func_22ca
 	pop bc
 	pop de
@@ -1008,12 +1008,7 @@ PrintDeckMachineEntry:
 	ret
 
 .text
-	db TX_SYMBOL, TX_END
-	db TX_SYMBOL, TX_END
-	db TX_SYMBOL, TX_END
-	db TX_SYMBOL, TX_END
-	db TX_SYMBOL, TX_END
-	db TX_SYMBOL, TX_END
+	db "<SPACE><SPACE><SPACE><SPACE><SPACE><SPACE>"
 	done
 
 ; outputs in a the number of cards that the player does not own
diff --git a/src/macros/text.asm b/src/macros/text.asm
index bd33833..cc76451 100644
--- a/src/macros/text.asm
+++ b/src/macros/text.asm
@@ -6,17 +6,15 @@ half2full EQUS "db TX_HALF2FULL"
 
 katakana: MACRO
 	db TX_KATAKANA
-	rept _NARG
-	db STRCAT("FW0_", \1)
-	shift
+	for i, STRLEN(\1)
+		db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
 	endr
 ENDM
 
 hiragana: MACRO
 	db TX_HIRAGANA
-	rept _NARG
-	db STRCAT("FW0_", \1)
-	shift
+	for i, STRLEN(\1)
+		db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
 	endr
 ENDM
 
@@ -25,7 +23,9 @@ textfw0: MACRO
 if STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
 	db \1
 else
-	db STRCAT("FW0_", \1)
+	for i, STRLEN(\1)
+		db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
+	endr
 endc
 	shift
 	endr
@@ -33,12 +33,16 @@ ENDM
 
 textfw1: MACRO
 	rept _NARG
-if (\1) == " "
-	db STRCAT("FW0_", \1)
-elif STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
+if STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
 	db \1
 else
-	db TX_FULLWIDTH1, STRCAT("FW1_", \1)
+	for i, STRLEN(\1)
+		if (STRSUB(\1, i + 1, 1)) == " "
+			db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
+		else
+			db TX_FULLWIDTH1, STRCAT("FW1_", STRSUB(\1, i + 1, 1))
+		endc
+	endr
 endc
 	shift
 	endr
@@ -46,12 +50,16 @@ ENDM
 
 textfw2: MACRO
 	rept _NARG
-if (\1) == " "
-	db STRCAT("FW0_", \1)
-elif STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
+if STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
 	db \1
 else
-	db TX_FULLWIDTH2, STRCAT("FW2_", \1)
+	for i, STRLEN(\1)
+		if (STRSUB(\1, i + 1, 1)) == " "
+			db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
+		else
+			db TX_FULLWIDTH2, STRCAT("FW2_", STRSUB(\1, i + 1, 1))
+		endc
+	endr
 endc
 	shift
 	endr
@@ -59,12 +67,16 @@ ENDM
 
 textfw3: MACRO
 	rept _NARG
-if (\1) == " "
-	db STRCAT("FW0_", \1)
-elif STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
+if STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
 	db \1
 else
-	db TX_FULLWIDTH3, STRCAT("FW3_", \1)
+	for i, STRLEN(\1)
+		if (STRSUB(\1, i + 1, 1)) == " "
+			db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
+		else
+			db TX_FULLWIDTH3, STRCAT("FW3_", STRSUB(\1, i + 1, 1))
+		endc
+	endr
 endc
 	shift
 	endr
@@ -72,12 +84,16 @@ ENDM
 
 textfw4: MACRO
 	rept _NARG
-if (\1) == " "
-	db STRCAT("FW0_", \1)
-elif STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
+if STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
 	db \1
 else
-	db TX_FULLWIDTH4, STRCAT("FW4_", \1)
+	for i, STRLEN(\1)
+		if (STRSUB(\1, i + 1, 1)) == " "
+			db STRCAT("FW0_", STRSUB(\1, i + 1, 1))
+		else
+			db TX_FULLWIDTH4, STRCAT("FW4_", STRSUB(\1, i + 1, 1))
+		endc
+	endr
 endc
 	shift
 	endr
diff --git a/src/text/text1.asm b/src/text/text1.asm
index 39bd82d..580ff69 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -39,7 +39,7 @@ PKMNPWRText: ; 36356 (d:6356)
 	done
 
 Text000b: ; 36360 (d:6360)
-	textfw0 "ポ", "ケ", "モ", "ン", "カ", "-(2)", "ド"
+	textfw0 "ポケモンカ—ド"
 	done
 
 LengthText: ; 36368 (d:6368)
@@ -613,7 +613,7 @@ DuelistIsThinkingText: ; 36f4a (d:6f4a)
 	done
 
 ClearOpponentNameText: ; 36f5a (d:6f5a)
-	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
+	textfw0 "          "
 	done
 
 SelectComputerOpponentText: ; 36f65 (d:6f65)
diff --git a/src/text/text2.asm b/src/text/text2.asm
index c06bc51..f26af15 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -1484,11 +1484,11 @@ RetreatCostText: ; 3b76e (e:776e)
 	done
 
 Text0213: ; 3b77c (e:777c)
-	textfw3 "S", "W", "I", "T", "C", "H", " ", "T", "O", " ", "U", "P", "P", "E", "R"
+	textfw3 "SWITCH TO UPPER"
 	done
 
 Text0214: ; 3b799 (e:7799)
-	textfw3 "S", "W", "I", "T", "C", "H", " ", "T", "O", " ", "L", "O", "W", "E", "R"
+	textfw3 "SWITCH TO LOWER"
 	done
 
 FeetText: ; 3b7b6 (e:77b6)
@@ -1512,15 +1512,15 @@ DeckText: ; 3b7e8 (e:77e8)
 	done
 
 Text021a: ; 3b7ee (e:77ee)
-	hiragana "ひ", "ら", "が", "ナ"
+	hiragana "ひらがナ"
 	done
 
 Text021b: ; 3b7f4 (e:77f4)
-	textfw0 "カ", "タ", "カ", "ナ"
+	textfw0 "カタカナ"
 	done
 
 Text021c: ; 3b7f9 (e:77f9)
-	textfw3 "A", "B", "C"
+	textfw3 "ABC"
 	done
 
 EndText: ; 3b800 (e:7800)
@@ -1532,71 +1532,71 @@ WhatIsYourNameText: ; 3b805 (e:7805)
 	done
 
 Text021f: ; 3b819 (e:7819)
-	hiragana "あ", " ", "か", " ", "さ", " ", "た", " ", "な", " ", "は", " ", "ま", " ", "や", " ", "ら"
+	hiragana "あ か さ た な は ま や ら"
 	line ""
-	textfw0 "い", " ", "き", " ", "し", " ", "ち", " ", "に", " ", "ひ", " ", "み", " ", "ゆ", " ", "り"
+	textfw0 "い き し ち に ひ み ゆ り"
 	line ""
-	textfw0 "う", " ", "く", " ", "す", " ", "つ", " ", "ぬ", " ", "ふ", " ", "む", " ", "よ", " ", "る"
+	textfw0 "う く す つ ぬ ふ む よ る"
 	line ""
-	textfw0 "え", " ", "け", " ", "せ", " ", "て", " ", "ね", " ", "へ", " ", "め", " ", "わ", " ", "れ"
+	textfw0 "え け せ て ね へ め わ れ"
 	line ""
-	textfw0 "お", " ", "こ", " ", "そ", " ", "と", " ", "の", " ", "ほ", " ", "も", " ", "ん", " ", "ろ"
+	textfw0 "お こ そ と の ほ も ん ろ"
 	line ""
-	textfw0 "ゃ", " ", "ゅ", " ", "ょ", " ", "っ", " ", "を", " "
-	textfw3 "“", " ", "º(2)", " "
-	textfw0 "-(2)"
+	textfw0 "ゃ ゅ ょ っ を "
+	textfw3 "゛ ゜ "
+	textfw0 "—"
 	done
 
 Text0220: ; 3b886 (e:7886)
-	textfw0 "ア", " ", "カ", " ", "サ", " ", "タ", " ", "ナ", " ", "ハ", " ", "マ", " ", "ヤ", " ", "ラ"
+	textfw0 "ア カ サ タ ナ ハ マ ヤ ラ"
 	line ""
-	textfw0 "イ", " ", "キ", " ", "シ", " ", "チ", " ", "ニ", " ", "ヒ", " ", "ミ", " ", "ユ", " ", "リ"
+	textfw0 "イ キ シ チ ニ ヒ ミ ユ リ"
 	line ""
-	textfw0 "ウ", " ", "ク", " ", "ス", " ", "ツ", " ", "ヌ", " ", "フ", " ", "ム", " ", "ヨ", " ", "ル"
+	textfw0 "ウ ク ス ツ ヌ フ ム ヨ ル"
 	line ""
-	textfw0 "エ", " ", "ケ", " ", "セ", " ", "テ", " ", "ネ", " ", "ヘ", " ", "メ", " ", "ワ", " ", "レ"
+	textfw0 "エ ケ セ テ ネ ヘ メ ワ レ"
 	line ""
-	textfw0 "オ", " ", "コ", " ", "ソ", " ", "ト", " ", "ノ", " ", "ホ", " ", "モ", " ", "ン", " ", "ロ"
+	textfw0 "オ コ ソ ト ノ ホ モ ン ロ"
 	line ""
-	textfw0 "ャ", " ", "ュ", " ", "ョ", " ", "ッ", " ", "ヲ", " "
-	textfw3 "“", " ", "º(2)", " "
-	textfw0 "-(2)"
+	textfw0 "ャ ュ ョ ッ ヲ "
+	textfw3 "゛ ゜ "
+	textfw0 "—"
 	done
 
 PlayerNameKeyboardText: ; 3b8f2 (e:78f2)
-	textfw3 "A", " ", "B", " ", "C", " ", "D", " ", "E", " ", "F", " ", "G", " ", "H", " ", "I"
+	textfw3 "A B C D E F G H I"
 	line ""
-	textfw3 "J", " ", "K", " ", "L", " ", "M", " ", "N", " ", "O", " ", "P", " ", "Q", " ", "R"
+	textfw3 "J K L M N O P Q R"
 	line ""
-	textfw3 "S", " ", "T", " ", "U", " ", "V", " ", "W", " ", "X", " ", "Y", " ", "Z", " "
+	textfw3 "S T U V W X Y Z "
 	textfw0 "!"
 	line ""
-	textfw0 "?", " "
-	textfw3 "&", " "
-	textfw0 "+", " ", "-", " ", "·", " ", "0", " ", "1", " ", "2", " ", "3"
+	textfw0 "? "
+	textfw3 "& "
+	textfw0 "+ - ・ 0 1 2 3"
 	line ""
-	textfw0 "4", " ", "5", " ", "6", " ", "7", " ", "8", " ", "9", " ", "<No>", " ", "<Lv>", " ", " "
+	textfw0 "4 5 6 7 8 9 ", "<No>", " ", "<Lv>", "  "
 	line ""
-	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
+	textfw0 "                 "
 	done
 
 DeckNameKeyboardText: ; 3b97b (e:797b)
-	textfw3 "A", " ", "B", " ", "C", " ", "D", " ", "E", " ", "F", " ", "G", " ", "H", " ", "I"
+	textfw3 "A B C D E F G H I"
 	line ""
-	textfw3 "J", " ", "K", " ", "L", " ", "M", " ", "N", " ", "O", " ", "P", " ", "Q", " ", "R"
+	textfw3 "J K L M N O P Q R"
 	line ""
-	textfw3 "S", " ", "T", " ", "U", " ", "V", " ", "W", " ", "X", " ", "Y", " ", "Z", " "
+	textfw3 "S T U V W X Y Z "
 	textfw0 "!"
 	line ""
-	textfw0 "?", " "
-	textfw3 "&", " "
-	textfw0 "+", " ", "-", " "
+	textfw0 "? "
+	textfw3 "& "
+	textfw0 "+ - "
 	textfw3 "'"
-	textfw0 " ", "0", " ", "1", " ", "2", " ", "3"
+	textfw0 " 0 1 2 3"
 	line ""
-	textfw0 "4", " ", "5", " ", "6", " ", "7", " ", "8", " ", "9", " ", " ", " ", " ", " ", " "
+	textfw0 "4 5 6 7 8 9      "
 	line ""
-	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
+	textfw0 "                 "
 	done
 
 NewDeckText: ; 3ba03 (e:7a03)
@@ -1633,19 +1633,19 @@ ChosenAsDuelingDeckText: ; 3ba55 (e:7a55)
 	done
 
 Deck1Text: ; 3ba78 (e:7a78)
-	textfw0 "1", "·"
+	textfw0 "1・"
 	done
 
 Deck2Text: ; 3ba7b (e:7a7b)
-	textfw0 "2", "·"
+	textfw0 "2・"
 	done
 
 Deck3Text: ; 3ba7e (e:7a7e)
-	textfw0 "3", "·"
+	textfw0 "3・"
 	done
 
 Deck4Text: ; 3ba81 (e:7a81)
-	textfw0 "4", "·"
+	textfw0 "4・"
 	done
 
 ThereIsNoDeckHereText: ; 3ba84 (e:7a84)
@@ -1788,8 +1788,8 @@ DuelistDiscardPileText: ; 3bd30 (e:7d30)
 	done
 
 EmptyLineText: ; 3bd42 (e:7d42)
-	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " "
-	textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " "
+	textfw0 "         "
+	textfw0 "         "
 	done
 
 BoosterPackTitleText: ; 3bd55 (e:7d55)
@@ -1821,7 +1821,7 @@ ViewWhichCardFileText: ; 3bdaf (e:7daf)
 	done
 
 EmptyPromotionalCardText: ; 3bdc6 (e:7dc6)
-	textfw0 "-", "-", "-", "-", "-", "-", "-", "-", "-", "-"
+	textfw0 "----------"
 	done
 
 SCardsText: ; 3bdd1 (e:7dd1)
@@ -1829,7 +1829,7 @@ SCardsText: ; 3bdd1 (e:7dd1)
 	done
 
 EmptyDeckNameText: ; 3bddb (e:7ddb)
-	textfw0 "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-"
+	textfw0 "--------------"
 	done
 
 DeckSaveMachineText: ; 3bdea (e:7dea)
diff --git a/src/text/text3.asm b/src/text/text3.asm
index 88556d8..8800a18 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -1206,7 +1206,7 @@ Text035b: ; 3eb62 (f:6b62)
 	done
 
 Text035c: ; 3eb88 (f:6b88)
-	textfw0 " ", " ", " ", " ", " "
+	textfw0 "     "
 	done
 
 Text035d: ; 3eb8e (f:6b8e)