Clean up text commands

engine/menu/main_menu.asm

@@ -332,13 +332,13 @@ ContinueText:
 	db "CONTINUE", $4e
 
 NewGameText:
-	db "NEW GAME", $4e
-	db "OPTION@"
+	db   "NEW GAME"
+	next "OPTION@"
 
 CableClubOptionsText:
-	db "TRADE CENTER", $4e
-	db "COLOSSEUM",    $4e
-	db "CANCEL@"
+	db   "TRADE CENTER"
+	next "COLOSSEUM"
+	next "CANCEL@"
 
 DisplayContinueGameInfo:
 	xor a

engine/menu/oaks_pc.asm

@@ -20,7 +20,8 @@ GetDexRatedText:
 
 ClosedOaksPCText:
 	TX_FAR _ClosedOaksPCText
-	db $0d,"@"
+	TX_WAIT
+	db "@"
 
 AccessedOaksPCText:
 	TX_FAR _AccessedOaksPCText

engine/menu/party_menu.asm

@@ -70,7 +70,7 @@ RedrawPartyMenu_:
 	dec hl
 	dec hl
 	dec hl
-	ld a,$EC ; unfilled right arrow menu cursor
+	ld a,"▷" ; unfilled right arrow menu cursor
 	ld [hli],a ; place the cursor
 	inc hl
 	inc hl
@@ -87,7 +87,7 @@ RedrawPartyMenu_:
 	call PrintStatusCondition
 	pop hl
 	push hl
-	ld bc,20 + 1 ; down 1 row and right 1 column
+	ld bc,SCREEN_WIDTH + 1 ; down 1 row and right 1 column
 	ld a,[hFlags_0xFFF6]
 	set 0,a
 	ld [hFlags_0xFFF6],a
@@ -307,8 +307,8 @@ ReviveText:
 
 RareCandyText:
 	TX_FAR _RareCandyText
-	db $0B
-	db $06
+	TX_SFX_ITEM_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
+	TX_BLINK
 	db "@"
 
 SetPartyMenuHPBarColor:

engine/menu/pokedex.asm

@@ -155,7 +155,7 @@ HandlePokedexListMenu:
 	ld [H_AUTOBGTRANSFERENABLED],a
 ; draw the horizontal line separating the seen and owned amounts from the menu
 	coord hl, 15, 8
-	ld a,$7a ; horizontal line tile
+	ld a,"─"
 	ld [hli],a
 	ld [hli],a
 	ld [hli],a
@@ -267,7 +267,7 @@ HandlePokedexListMenu:
 	inc hl
 	call PlaceString
 	pop hl
-	ld bc,2 * 20
+	ld bc,2 * SCREEN_WIDTH
 	add hl,bc
 	pop de
 	pop af
@@ -344,7 +344,7 @@ HandlePokedexListMenu:
 
 DrawPokedexVerticalLine:
 	ld c,9 ; height of line
-	ld de,20 ; width of screen
+	ld de,SCREEN_WIDTH
 	ld a,$71 ; vertical line tile
 .loop
 	ld [hl],a
@@ -568,7 +568,8 @@ ShowPokedexDataInternal:
 	ret
 
 HeightWeightText:
-	db "HT  ?",$60,"??",$61,$4E,"WT   ???lb@"
+	db   "HT  ?",$60,"??",$61
+	next "WT   ???lb@"
 
 ; XXX does anything point to this?
 PokeText:
@@ -580,7 +581,7 @@ PokedexDataDividerLine:
 	db $69,$6B,$69,$6B,$6B
 	db $6B,$6B,$69,$6B,$69
 	db $6B,$69,$6B,$69,$6A
-	db $50
+	db "@"
 
 ; draws a line of tiles
 ; INPUT:

engine/menu/prize_menu.asm

@@ -44,7 +44,7 @@ CeladonPrizeMenu:
 
 RequireCoinCaseTextPtr:
 	TX_FAR _RequireCoinCaseText
-	db $0D
+	TX_WAIT
 	db "@"
 
 ExchangeCoinsForPrizesTextPtr:
@@ -266,7 +266,7 @@ UnknownData52951:
 
 HereYouGoTextPtr:
 	TX_FAR _HereYouGoText
-	db $0D
+	TX_WAIT
 	db "@"
 
 SoYouWantPrizeTextPtr:
@@ -275,17 +275,17 @@ SoYouWantPrizeTextPtr:
 
 SorryNeedMoreCoinsText:
 	TX_FAR _SorryNeedMoreCoinsText
-	db $0D
+	TX_WAIT
 	db "@"
 
 PrizeRoomBagIsFullTextPtr:
 	TX_FAR _OopsYouDontHaveEnoughRoomText
-	db $0D
+	TX_WAIT
 	db "@"
 
 OhFineThenTextPtr:
 	TX_FAR _OhFineThenText
-	db $0D ; wait keypress (A/B) without blink
+	TX_WAIT
 	db "@"
 
 GetPrizeMonLevel:

engine/menu/start_sub_menus.asm

@@ -675,7 +675,7 @@ TrainerInfo_NextTextBoxRow:
 ; hl = address of top tile in the line
 ; a = tile ID
 TrainerInfo_DrawVerticalLine:
-	ld de,20
+	ld de,SCREEN_WIDTH
 	ld c,8
 .loop
 	ld [hl],a

engine/menu/status_screen.asm

@@ -211,10 +211,11 @@ Type2Text:
 	db "TYPE2/", $4e
 
 IDNoText:
-	db $73, "№", "/", $4e
+	db $73, "№/", $4e
 
 OTText:
-	db "OT/", $4e, "@"
+	db   "OT/"
+	next "@"
 
 StatusText:
 	db "STATUS/@"

engine/menu/vending_machine.asm

@@ -93,7 +93,8 @@ DrinkText:
 DrinkPriceText:
 	db   "¥200"
 	next "¥300"
-	next "¥350",$4E,"@"
+	next "¥350"
+	next "@"
 
 VendingMachineText4:
 	TX_FAR _VendingMachineText4