Clean up text commands

engine/battle/core.asm

@@ -2127,7 +2127,7 @@ DisplayBattleMenu:
 	ld [hl], "▶"
 	ld c, 50
 	call DelayFrames
-	ld [hl], $ec
+	ld [hl], "▷"
 	ld a, $2 ; select the "ITEM" menu
 	jp .upperLeftMenuItemWasNotSelected
 .oldManName
@@ -2680,7 +2680,7 @@ SelectMenuItem:
 	dec a
 	ld bc, SCREEN_WIDTH
 	call AddNTimes
-	ld [hl], $ec
+	ld [hl], "▷"
 .select
 	ld hl, hFlags_0xFFF6
 	set 1, [hl]
@@ -7726,7 +7726,7 @@ MonsStatsRoseText:
 	ret
 
 GreatlyRoseText:
-	db $0a
+	TX_DELAY
 	TX_FAR _GreatlyRoseText
 
 RoseText:
@@ -7930,7 +7930,7 @@ MonsStatsFellText:
 	ret
 
 GreatlyFellText:
-	db $0a
+	TX_DELAY
 	TX_FAR _GreatlyFellText
 
 FellText:

engine/battle/experience.asm

@@ -368,5 +368,5 @@ ExpPointsText:
 
 GrewLevelText:
 	TX_FAR _GrewLevelText
-	db $0b
+	TX_SFX_LEVEL_UP
 	db "@"

engine/battle/moveEffects/focus_energy_effect.asm

@@ -17,6 +17,6 @@ FocusEnergyEffect_:
 	jpab PrintButItFailedText_
 
 GettingPumpedText:
-	db $0a
+	TX_DELAY
 	TX_FAR _GettingPumpedText
 	db "@"

engine/cable_club.asm

@@ -547,7 +547,7 @@ TradeCenter_SelectMon:
 	ld a, " "
 	ld [hl], a
 .cancelMenuItem_Loop
-	ld a, $ed ; filled arrow cursor
+	ld a, "▶" ; filled arrow cursor
 	Coorda 1, 16
 .cancelMenuItem_JoypadLoop
 	call JoypadLowSensitivity
@@ -566,7 +566,7 @@ TradeCenter_SelectMon:
 	ld [wCurrentMenuItem], a
 	jp .playerMonMenu
 .cancelMenuItem_APressed
-	ld a, $ec ; unfilled arrow cursor
+	ld a, "▷" ; unfilled arrow cursor
 	Coorda 1, 16
 	ld a, $f
 	ld [wSerialExchangeNybbleSendData], a
@@ -616,7 +616,7 @@ TradeCenter_PlaceSelectedEnemyMonMenuCursor:
 	coord hl, 1, 9
 	ld bc, SCREEN_WIDTH
 	call AddNTimes
-	ld [hl], $ec ; cursor
+	ld [hl], "▷" ; cursor
 	ret
 
 TradeCenter_DisplayStats:

engine/give_pokemon.asm

@@ -70,7 +70,7 @@ SetPokedexOwnedFlag:
 
 GotMonText:
 	TX_FAR _GotMonText
-	db $0b
+	TX_SFX_ITEM_1
 	db "@"
 
 SetToBoxText:

engine/hidden_object_functions14.asm

@@ -7,7 +7,7 @@ PrintNotebookText:
 
 TMNotebook:
 	TX_FAR TMNotebookText
-	db $0d
+	TX_WAIT
 	db "@"
 
 ViridianSchoolNotebook:
@@ -45,7 +45,7 @@ TurnPageText:
 
 ViridianSchoolNotebookText5:
 	TX_FAR _ViridianSchoolNotebookText5
-	db $0d
+	TX_WAIT
 	db "@"
 
 ViridianSchoolNotebookText1:

engine/hidden_object_functions3.asm

@@ -127,7 +127,7 @@ ElevatorText:
 
 TownMapText:
 	TX_FAR _TownMapText
-	db $06
+	TX_BLINK
 	TX_ASM
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a

engine/hidden_object_functions7.asm

@@ -235,9 +235,9 @@ CinnabarGymQuiz_1ea92:
 	ret
 
 CinnabarGymQuizCorrectText:
-	db $0b
+	TX_SFX_ITEM_1
 	TX_FAR _CinnabarGymQuizCorrectText
-	db $06
+	TX_BLINK
 	TX_ASM
 
 	ld a, [$ffe0]
@@ -372,7 +372,7 @@ BillsHouseMonitorText:
 
 BillsHouseInitiatedText:
 	TX_FAR _BillsHouseInitiatedText
-	db $06
+	TX_BLINK
 	TX_ASM
 	ld a, $ff
 	ld [wNewSoundID], a

engine/in_game_trades.asm

@@ -265,7 +265,9 @@ ConnectCableText:
 
 TradedForText:
 	TX_FAR _TradedForText
-	db $11, $a, "@"
+	TX_SFX_KEY_ITEM
+	TX_DELAY
+	db "@"
 
 WannaTrade1Text:
 	TX_FAR _WannaTrade1Text

engine/items/items.asm

@@ -608,7 +608,8 @@ ItemUseBallText05:
 ;"All right! {MonName} was caught!"
 ;play sound
 	TX_FAR _ItemUseBallText05
-	db $12,$06
+	TX_SFX_CAUGHT_MON
+	TX_BLINK
 	db "@"
 ItemUseBallText07:
 ;"X was transferred to Bill's PC"
@@ -623,7 +624,8 @@ ItemUseBallText06:
 ;"New DEX data will be added..."
 ;play sound
 	TX_FAR _ItemUseBallText06
-	db $13,$06
+	TX_SFX_DEX_PAGE_ADDED
+	TX_BLINK
 	db "@"
 
 ItemUseTownMap:
@@ -1836,7 +1838,7 @@ FluteWokeUpText:
 
 PlayedFluteHadEffectText:
 	TX_FAR _PlayedFluteHadEffectText
-	db $06
+	TX_BLINK
 	TX_ASM
 	ld a,[wIsInBattle]
 	and a
@@ -2395,19 +2397,19 @@ BoxFullCannotThrowBallText:
 
 ItemUseText00:
 	TX_FAR _ItemUseText001
-	db $05
+	TX_LINE
 	TX_FAR _ItemUseText002
 	db "@"
 
 GotOnBicycleText:
 	TX_FAR _GotOnBicycleText1
-	db $05
+	TX_LINE
 	TX_FAR _GotOnBicycleText2
 	db "@"
 
 GotOffBicycleText:
 	TX_FAR _GotOffBicycleText1
-	db $05
+	TX_LINE
 	TX_FAR _GotOffBicycleText2
 	db "@"
 

engine/learn_move.asm

@@ -185,7 +185,9 @@ TryingToLearn:
 
 LearnedMove1Text:
 	TX_FAR _LearnedMove1Text
-	db $b,6,"@"
+	TX_SFX_ITEM_1 ; plays SFX_GET_ITEM_1 in the pary menu (rare candy) and plays SFX_LEVEL_UP in battle
+	TX_BLINK
+	db "@"
 
 WhichMoveToForgetText:
 	TX_FAR _WhichMoveToForgetText
@@ -205,7 +207,7 @@ TryingToLearnText:
 
 OneTwoAndText:
 	TX_FAR _OneTwoAndText
-	db $a
+	TX_DELAY
 	TX_ASM
 	ld a, SFX_SWAP
 	call PlaySoundWaitForCurrent
@@ -214,7 +216,7 @@ OneTwoAndText:
 
 PoofText:
 	TX_FAR _PoofText
-	db $a
+	TX_DELAY
 ForgotAndText:
 	TX_FAR _ForgotAndText
 	db "@"

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

engine/oak_speech.asm

@@ -157,7 +157,7 @@ OakSpeechText1:
 	db "@"
 OakSpeechText2:
 	TX_FAR _OakSpeechText2A
-	db $14 ; play NIDORINA cry from TextCommandSounds
+	TX_CRY_NIDORINA
 	TX_FAR _OakSpeechText2B
 	db "@"
 IntroducePlayerText:

engine/overworld/cable_club_npc.asm

@@ -123,7 +123,8 @@ CableClubNPCPleaseApplyHereHaveToSaveText:
 
 CableClubNPCPleaseWaitText:
 	TX_FAR _CableClubNPCPleaseWaitText
-	db $a, "@"
+	TX_DELAY
+	db "@"
 
 CableClubNPCLinkClosedBecauseOfInactivityText:
 	TX_FAR _CableClubNPCLinkClosedBecauseOfInactivityText

engine/overworld/card_key.asm

@@ -73,7 +73,7 @@ SilphCoMapList:
 
 CardKeySuccessText:
 	TX_FAR _CardKeySuccessText1
-	db $0b
+	TX_SFX_ITEM_1
 	TX_FAR _CardKeySuccessText2
 	db "@"
 

engine/overworld/hidden_items.asm

@@ -122,11 +122,12 @@ INCLUDE "data/hidden_coins.asm"
 
 FoundHiddenCoinsText:
 	TX_FAR _FoundHiddenCoinsText
-	db $10,"@"
+	TX_SFX_ITEM_2
+	db "@"
 
 DroppedHiddenCoinsText:
 	TX_FAR _FoundHiddenCoins2Text
-	db $10
+	TX_SFX_ITEM_2
 	TX_FAR _DroppedHiddenCoinsText
 	db "@"
 

engine/overworld/item.asm

@@ -46,7 +46,7 @@ PickUpItem:
 
 FoundItemText:
 	TX_FAR _FoundItemText
-	db $0B
+	TX_SFX_ITEM_1
 	db "@"
 
 NoMoreRoomForItemText:

engine/overworld/oaks_aide.asm

@@ -63,7 +63,7 @@ OaksAideHereYouGoText:
 
 OaksAideGotItemText:
 	TX_FAR _OaksAideGotItemText
-	db $0b
+	TX_SFX_ITEM_1
 	db "@"
 
 OaksAideNoRoomText:

engine/overworld/pokecenter.asm

@@ -50,7 +50,7 @@ PokemonCenterWelcomeText:
 	db "@"
 
 ShallWeHealYourPokemonText:
-	db $a
+	TX_DELAY
 	TX_FAR _ShallWeHealYourPokemonText
 	db "@"
 
@@ -63,6 +63,6 @@ PokemonFightingFitText:
 	db "@"
 
 PokemonCenterFarewellText:
-	db $a
+	TX_DELAY
 	TX_FAR _PokemonCenterFarewellText
 	db "@"

engine/slot_machine.asm

@@ -610,7 +610,8 @@ SlotReward300Func:
 
 YeahText:
 	TX_FAR _YeahText
-	db $0a, "@"
+	TX_DELAY
+	db "@"
 
 SlotMachine_PrintWinningSymbol:
 ; prints winning symbol and down arrow in text box
@@ -627,7 +628,7 @@ SlotMachine_PrintWinningSymbol:
 	inc a
 	ld [hl], a
 	coord hl, 18, 16
-	ld [hl], $ee ; down arrow
+	ld [hl], "▼"
 	ret
 
 SlotMachine_SubtractBetFromPlayerCoins:

engine/town_map.asm

@@ -179,9 +179,9 @@ LoadTownMap_Fly:
 	ld c, 15
 	call DelayFrames
 	coord hl, 18, 0
-	ld [hl], $ed
+	ld [hl], "▲"
 	coord hl, 19, 0
-	ld [hl], $ee
+	ld [hl], "▼"
 	pop hl
 .inputLoop
 	push hl

engine/trade2.asm

@@ -43,7 +43,6 @@ Trade_PrintEnemyMonInfoText:
 	jp PrintNumber
 
 Trade_MonInfoText:
-	db "──",$74,$F2,$4E
-	db $4E
-	db "OT/",$4E
-	db $73,"№",$F2,"@"
+	db "──№⠄",$4E
+	next "OT/"
+	next $73,"№⠄","@"