Clean up charmaps

and text macros

5 files changed, 35 insertions, 79 deletions

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