Clean up text commands

charmap.asm

@@ -150,6 +150,7 @@ charmap "ー", $E3
 charmap "@", $50
 charmap "#", $54
 ;charmap "POKé", $54
+charmap "№", $74
 charmap "…", $75
 
 charmap "┌", $79
@@ -159,8 +160,6 @@ charmap "│", $7C
 charmap "└", $7D
 charmap "┘", $7E
 
-charmap "№", $74
-
 charmap " ", $7F
 charmap "A", $80
 charmap "B", $81
@@ -226,17 +225,24 @@ charmap "'l", $BC
 charmap "'s", $BD
 charmap "'t", $BE
 charmap "'v", $BF
+
 charmap "'", $E0
+
 charmap "-", $E3
 charmap "'r", $E4
 charmap "'m", $E5
 charmap "?", $E6
 charmap "!", $E7
 charmap ".", $E8
+
+charmap "▷", $EC
 charmap "▶", $ED
+charmap "▲", $ED
+charmap "▼", $EE
 charmap "♂", $EF
 charmap "¥", $F0
 charmap "×", $F1
+charmap "⠄", $F2
 charmap "/", $F3
 charmap ",", $F4
 charmap "♀", $F5

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   "NEW GAME"
-	db "OPTION@"
+	next "OPTION@"
 
 CableClubOptionsText:
-	db "TRADE CENTER", $4e
+	db   "TRADE CENTER"
-	db "COLOSSEUM",    $4e
+	next "COLOSSEUM"
-	db "CANCEL@"
+	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
+	TX_SFX_ITEM_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
-	db $06
+	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 $4E
+	next "OT/"
-	db "OT/",$4E
+	next $73,"№⠄","@"
-	db $73,"№",$F2,"@"

home.asm

@@ -968,7 +968,6 @@ PokeCenterSignText::
 	db "@"
 
 PickUpItemText::
-; XXX better label (what does predef $5C do?)
 	TX_ASM
 	predef PickUpItem
 	jp TextScriptEnd
@@ -1885,7 +1884,7 @@ PrintListMenuEntries::
 	jp nz,.loop
 	ld bc,-8
 	add hl,bc
-	ld a,$ee ; down arrow
+	ld a,"▼"
 	ld [hl],a
 	ret
 .printCancelMenuItem
@@ -4123,7 +4122,7 @@ EraseMenuCursor::
 HandleDownArrowBlinkTiming::
 	ld a,[hl]
 	ld b,a
-	ld a,$ee ; down arrow
+	ld a,"▼"
 	cp b
 	jr nz,.downArrowOff
 .downArrowOn
@@ -4157,7 +4156,7 @@ HandleDownArrowBlinkTiming::
 	ret nz
 	ld a,$06
 	ld [H_DOWNARROWBLINKCNT2],a
-	ld a,$ee ; down arrow
+	ld a,"▼"
 	ld [hl],a
 	ret
 

home/text.asm

@@ -11,7 +11,7 @@ TextBoxBorder::
 	ld [hl], a
 	pop hl
 
-	ld de, 20
+	ld de, SCREEN_WIDTH
 	add hl, de
 
 	; middle rows
@@ -24,7 +24,7 @@ TextBoxBorder::
 	ld [hl], "│"
 	pop hl
 
-	ld de, 20
+	ld de, SCREEN_WIDTH
 	add hl, de
 	dec b
 	jr nz, .next
@@ -268,7 +268,7 @@ Char58::
 	ld a,[wLinkState]
 	cp LINK_STATE_BATTLING
 	jp z,Next1AA2
-	ld a,$EE
+	ld a,"▼"
 	Coorda 18, 16
 Next1AA2::
 	call ProtectedDelay3
@@ -286,7 +286,7 @@ Char58Text::
 
 Char51::
 	push de
-	ld a,$EE
+	ld a,"▼"
 	Coorda 18, 16
 	call ProtectedDelay3
 	call ManualTextScroll
@@ -301,7 +301,7 @@ Char51::
 
 Char49::
 	push de
-	ld a,$EE
+	ld a,"▼"
 	Coorda 18, 16
 	call ProtectedDelay3
 	call ManualTextScroll
@@ -317,7 +317,7 @@ Char49::
 	jp PlaceNextChar_inc
 
 Char4B::
-	ld a,$EE
+	ld a,"▼"
 	Coorda 18, 16
 	call ProtectedDelay3
 	push de
@@ -328,29 +328,33 @@ Char4B::
 	;fall through
 Char4C::
 	push de
-	call Next1B18
+	call ScrollTextUp
-	call Next1B18
+	call ScrollTextUp
 	coord hl, 1, 16
 	pop de
 	jp PlaceNextChar_inc
 
-Next1B18::
+; move both rows of text in the normal text box up one row
-	coord hl, 0, 14
+; always called twice in a row
-	coord de, 0, 13
+; first time, copy the two rows of text to the "in between" rows that are usually emtpy
-	ld b,60
+; second time, copy the bottom row of text into the top row of text
-.next
+ScrollTextUp::
+	coord hl, 0, 14 ; top row of text
+	coord de, 0, 13 ; empty line above text
+	ld b, SCREEN_WIDTH * 3
+.copyText
 	ld a,[hli]
 	ld [de],a
 	inc de
 	dec b
-	jr nz,.next
+	jr nz,.copyText
 	coord hl, 1, 16
 	ld a, " "
 	ld b,SCREEN_WIDTH - 2
-.next2
+.clearText
 	ld [hli],a
 	dec b
-	jr nz,.next2
+	jr nz,.clearText
 
 	; wait five frames
 	ld b,5
@@ -509,7 +513,7 @@ TextCommand06::
 	ld a,[wLinkState]
 	cp a,LINK_STATE_BATTLING
 	jp z,TextCommand0D
-	ld a,$ee ; down arrow
+	ld a,"▼"
 	Coorda 18, 16 ; place down arrow in lower right corner of dialogue text box
 	push bc
 	call ManualTextScroll ; blink arrow and wait for A or B to be pressed
@@ -525,8 +529,8 @@ TextCommand06::
 TextCommand07::
 	ld a," "
 	Coorda 18, 16 ; place blank space in lower right corner of dialogue text box
-	call Next1B18 ; scroll up text
+	call ScrollTextUp
-	call Next1B18
+	call ScrollTextUp
 	pop hl
 	coord bc, 1, 16 ; address of second line of dialogue text box
 	jp NextTextCommand
@@ -626,10 +630,10 @@ TextCommand0B::
 
 ; format: text command ID, sound ID or cry ID
 TextCommandSounds::
-	db $0B,SFX_GET_ITEM_1
+	db $0B,SFX_GET_ITEM_1 ; actually plays SFX_LEVEL_UP when the battle music engine is loaded
 	db $12,SFX_CAUGHT_MON
-	db $0E,SFX_POKEDEX_RATING
+	db $0E,SFX_POKEDEX_RATING ; unused?
-	db $0F,SFX_GET_ITEM_1
+	db $0F,SFX_GET_ITEM_1 ; unused?
 	db $10,SFX_GET_ITEM_2
 	db $11,SFX_GET_KEY_ITEM
 	db $13,SFX_DEX_PAGE_ADDED
@@ -648,7 +652,7 @@ TextCommand0C::
 	ld h,b
 	ld l,c
 .loop
-	ld a,$75 ; ellipsis
+	ld a,"…"
 	ld [hli],a
 	push de
 	call Joypad

macros.asm

@@ -1,16 +1,4 @@
 
-text   EQUS "db $00," ; Start writing text.
-next   EQUS "db $4e," ; Move a line down.
-line   EQUS "db $4f," ; Start writing at the bottom line.
-para   EQUS "db $51," ; Start a new paragraph.
-cont   EQUS "db $55," ; Scroll to the next line.
-done   EQUS "db $57"  ; End a text box.
-prompt EQUS "db $58"  ; Prompt the player to end a text box (initiating some other event).
-
-page   EQUS "db $49,"     ; Start a new Pokedex page.
-dex    EQUS "db $5f, $50" ; End a Pokedex entry.
-
-
 percent EQUS "* $ff / 100"
 
 lb: MACRO ; r, hi, lo
@@ -180,23 +168,17 @@ RGB: MACRO
 	ENDM
 
 ; text macros
-TX_NUM: MACRO
+text   EQUS "db $00," ; Start writing text.
-; print a big-endian decimal number.
+next   EQUS "db $4e," ; Move a line down.
-; \1: address to read from
+line   EQUS "db $4f," ; Start writing at the bottom line.
-; \2: number of bytes to read
+para   EQUS "db $51," ; Start a new paragraph.
-; \3: number of digits to display
+cont   EQUS "db $55," ; Scroll to the next line.
-	db $09
+done   EQUS "db $57"  ; End a text box.
-	dw \1
+prompt EQUS "db $58"  ; Prompt the player to end a text box (initiating some other event).
-	db \2 << 4 | \3
-	ENDM
 
-TX_FAR: MACRO
+page   EQUS "db $49,"     ; Start a new Pokedex page.
-	db $17
+dex    EQUS "db $5f, $50" ; End a Pokedex entry.
-	dw \1
-	db BANK(\1)
-	ENDM
 
-; text engine command $1
 TX_RAM: MACRO
 ; prints text to screen
 ; \1: RAM address to read from
@@ -212,6 +194,48 @@ TX_BCD: MACRO
 	db \2
 	ENDM
 
+TX_LINE    EQUS "db $05"
+TX_BLINK   EQUS "db $06"
+;TX_SCROLL EQUS "db $07"
+TX_ASM     EQUS "db $08"
+
+TX_NUM: MACRO
+; print a big-endian decimal number.
+; \1: address to read from
+; \2: number of bytes to read
+; \3: number of digits to display
+	db $09
+	dw \1
+	db \2 << 4 | \3
+	ENDM
+
+TX_DELAY              EQUS "db $0a"
+TX_SFX_ITEM_1         EQUS "db $0b"
+TX_SFX_LEVEL_UP       EQUS "db $0b"
+;TX_ELLIPSES          EQUS "db $0c"
+TX_WAIT               EQUS "db $0d"
+;TX_SFX_DEX_RATING    EQUS "db $0e"
+TX_SFX_ITEM_2         EQUS "db $10"
+TX_SFX_KEY_ITEM       EQUS "db $11"
+TX_SFX_CAUGHT_MON     EQUS "db $12"
+TX_SFX_DEX_PAGE_ADDED EQUS "db $13"
+TX_CRY_NIDORINA       EQUS "db $14"
+TX_CRY_PIDGEOT        EQUS "db $15"
+;TX_CRY_DEWGONG       EQUS "db $16"
+
+TX_FAR: MACRO
+	db $17
+	dw \1
+	db BANK(\1)
+	ENDM
+
+TX_VENDING_MACHINE         EQUS "db $f5"
+TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6"
+TX_PRIZE_VENDOR            EQUS "db $f7"
+TX_POKECENTER_PC           EQUS "db $f9"
+TX_PLAYERS_PC              EQUS "db $fc"
+TX_BILLS_PC                EQUS "db $fd"
+
 TX_MART: MACRO
 	db $FE, _NARG
 	rept _NARG
@@ -221,20 +245,6 @@ TX_MART: MACRO
 	db $FF
 	ENDM
 
-TX_LINE EQUS "db $05"
-TX_BUTTON_SOUND EQUS "db $06"
-TX_ASM EQUS "db $08"
-TX_SFX_ITEM EQUS "db $0b"
-TX_WAIT_BUTTON EQUS "db $0d"
-TX_SFX_CONGRATS EQUS "db $10"
-TX_SFX_KEY_ITEM EQUS "db $11"
-
-TX_VENDING_MACHINE         EQUS "db $f5"
-TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6"
-TX_PRIZE_VENDOR            EQUS "db $f7"
-TX_POKECENTER_PC           EQUS "db $f9"
-TX_PLAYERS_PC              EQUS "db $fc"
-TX_BILLS_PC                EQUS "db $fd"
 TX_POKECENTER_NURSE        EQUS "db $ff"
 
 ; Predef macro.

main.asm

@@ -1702,19 +1702,26 @@ TwoOptionMenuStrings:
 	dw .NoYesMenu
 
 .NoYesMenu
-	db "NO",$4E,"YES@"
+	db   "NO"
+	next "YES@"
 .YesNoMenu
-	db "YES",$4E,"NO@"
+	db   "YES"
+	next "NO@"
 .NorthWestMenu
-	db "NORTH",$4E,"WEST@"
+	db   "NORTH"
+	next "WEST@"
 .SouthEastMenu
-	db "SOUTH",$4E,"EAST@"
+	db   "SOUTH"
+	next "EAST@"
 .NorthEastMenu
-	db "NORTH",$4E,"EAST@"
+	db   "NORTH"
+	next "EAST@"
 .TradeCancelMenu
-	db "TRADE",$4E,"CANCEL@"
+	db   "TRADE"
+	next "CANCEL@"
 .HealCancelMenu
-	db "HEAL",$4E,"CANCEL@"
+	db   "HEAL"
+	next "CANCEL@"
 
 DisplayFieldMoveMonMenu:
 	xor a

scripts/bikeshop.asm

@@ -103,7 +103,8 @@ BikeShopText_1d81f:
 
 BikeShopText_1d824:
 	TX_FAR _BikeShopText_1d824
-	db $11, "@"
+	TX_SFX_KEY_ITEM
+	db "@"
 
 BikeShopComeAgainText:
 	TX_FAR _BikeShopComeAgainText

scripts/billshouse.asm

@@ -192,7 +192,7 @@ BillThankYouText:
 SSTicketReceivedText:
 	TX_FAR _SSTicketReceivedText
 	TX_SFX_KEY_ITEM
-	TX_BUTTON_SOUND
+	TX_BLINK
 	db "@"
 
 SSTicketNoRoomText:

scripts/celadoncity.asm

@@ -69,7 +69,8 @@ TM41PreText:
 
 ReceivedTM41Text:
 	TX_FAR _ReceivedTM41Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM41ExplanationText:
 	TX_FAR _TM41ExplanationText

scripts/celadondiner.asm

@@ -54,7 +54,8 @@ CeladonDinerText_491a7:
 
 ReceivedCoinCaseText:
 	TX_FAR _ReceivedCoinCaseText
-	db $11, "@"
+	TX_SFX_KEY_ITEM
+	db "@"
 
 CoinCaseNoRoomText:
 	TX_FAR _CoinCaseNoRoomText

scripts/celadongamecorner.asm

@@ -267,7 +267,7 @@ CeladonGameCornerText_48d9c:
 
 Received10CoinsText:
 	TX_FAR _Received10CoinsText
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	db "@"
 
 CeladonGameCornerText_48da7:
@@ -345,7 +345,7 @@ CeladonGameCornerText_48e26:
 
 Received20CoinsText:
 	TX_FAR _Received20CoinsText
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	db "@"
 
 CeladonGameCornerText_48e31:
@@ -397,7 +397,7 @@ CeladonGameCornerText_48e88:
 
 CeladonGameCornerText_48e8d:
 	TX_FAR _CeladonGameCornerText_48e8d
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	db "@"
 
 CeladonGameCornerText_48e93:

scripts/celadongym.asm

@@ -201,7 +201,7 @@ CeladonGymText9:
 
 TM21Text:
 	TX_FAR _ReceivedTM21Text
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _TM21ExplanationText
 	db "@"
 

scripts/celadonmansion3.asm

@@ -47,7 +47,7 @@ DirectorText:
 
 .CompletedDexText
 	TX_FAR _CompletedDexText
-	db $6
+	TX_BLINK
 	TX_ASM
 	callab DisplayDiploma
 	ld a, $1

scripts/celadonmart3.asm

@@ -47,7 +47,8 @@ TM18PreReceiveText:
 
 ReceivedTM18Text:
 	TX_FAR _ReceivedTM18Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM18ExplanationText:
 	TX_FAR _TM18ExplanationText

scripts/celadonmartroof.asm

@@ -139,48 +139,48 @@ CeladonMartRoofText_484ee:
 
 CeladonMartRoofText_484f3:
 	TX_FAR _CeladonMartRoofText_484f3
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_484f9:
 	TX_FAR _CeladonMartRoofText_484f9
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	TX_FAR _CeladonMartRoofText_484fe
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_48504:
 	TX_FAR _CeladonMartRoofText_48504
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_4850a:
 	TX_FAR _CeladonMartRoofText_4850a
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	TX_FAR _CeladonMartRoofText_4850f
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_48515:
 	TX_FAR _CeladonMartRoofText_48515
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 ReceivedTM49Text:
 	TX_FAR _ReceivedTM49Text
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	TX_FAR _CeladonMartRoofText_48520
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_48526:
 	TX_FAR _CeladonMartRoofText_48526
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_4852c:
 	TX_FAR _CeladonMartRoofText_4852c
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofScript_PrintDrinksInBag:

scripts/ceruleancity.asm

@@ -320,9 +320,10 @@ CeruleanCityText_196d9:
 
 ReceivedTM28Text:
 	TX_FAR _ReceivedTM28Text
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _ReceivedTM28Text2
-	db $0D, "@"
+	TX_WAIT
+	db "@"
 
 TM28NoRoomText:
 	TX_FAR _TM28NoRoomText
@@ -356,13 +357,13 @@ CeruleanCityText6:
 CeruleanCityText7:
 	TX_ASM
 	ld a, [hRandomAdd]
-	cp $b4
+	cp 180
 	jr c, .asm_e9fc9
 	ld hl, CeruleanCityText_19730
 	call PrintText
 	jr .asm_d486e
 .asm_e9fc9
-	cp $64
+	cp 100
 	jr c, .asm_df99b
 	ld hl, CeruleanCityText_19735
 	call PrintText
@@ -388,19 +389,19 @@ CeruleanCityText_1973a:
 CeruleanCityText8:
 	TX_ASM
 	ld a, [hRandomAdd]
-	cp $b4
+	cp 180
 	jr c, .asm_e28da
 	ld hl, CeruleanCityText_1976f
 	call PrintText
 	jr .asm_f2f38
 .asm_e28da
-	cp $78
+	cp 120
 	jr c, .asm_15d08
 	ld hl, CeruleanCityText_19774
 	call PrintText
 	jr .asm_f2f38
 .asm_15d08
-	cp $3c
+	cp 60
 	jr c, .asm_d7fea
 	ld hl, CeruleanCityText_19779
 	call PrintText

scripts/ceruleangym.asm

@@ -150,7 +150,8 @@ CeruleanGymText5:
 CeruleanGymText6:
 ReceivedTM11Text:
 	TX_FAR _ReceivedTM11Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 CeruleanGymText7:
 	TX_FAR _CeruleanGymText_5c7d3
@@ -158,7 +159,9 @@ CeruleanGymText7:
 
 CeruleanGymText_5c7d8:
 	TX_FAR _CeruleanGymText_5c7d8
-	db $11, $6, "@"
+	TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
+	TX_BLINK
+	db "@"
 
 CeruleanGymText2:
 	TX_ASM

scripts/cinnabargym.asm

@@ -233,8 +233,8 @@ BlaineBattleText:
 
 BlaineEndBattleText:
 	TX_FAR _BlaineEndBattleText
-	db $11
+	TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
-	db $d
+	TX_WAIT
 	db "@"
 
 BlaineFireBlastText:
@@ -247,7 +247,7 @@ BlaineBadgeText:
 
 ReceivedTM38Text:
 	TX_FAR _ReceivedTM38Text
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _TM38ExplanationText
 	db "@"
 

scripts/copycatshouse2f.asm

@@ -53,10 +53,11 @@ TM31PreReceiveText:
 
 ReceivedTM31Text:
 	TX_FAR _ReceivedTM31Text
-	db $0B
+	TX_SFX_ITEM_1
 TM31ExplanationText1:
 	TX_FAR _TM31ExplanationText1
-	db $d, "@"
+	TX_WAIT
+	db "@"
 
 TM31ExplanationText2:
 	TX_FAR _TM31ExplanationText2
@@ -64,7 +65,8 @@ TM31ExplanationText2:
 
 TM31NoRoomText:
 	TX_FAR _TM31NoRoomText
-	db $d, "@"
+	TX_WAIT
+	db "@"
 
 CopycatsHouse2FText2:
 	TX_FAR _CopycatsHouse2FText2

scripts/fanclub.asm

@@ -144,7 +144,7 @@ FanClubText5:
 
 .receivedvouchertext
 	TX_FAR ReceivedBikeVoucherText
-	db $11
+	TX_SFX_KEY_ITEM
 	TX_FAR ExplainBikeVoucherText
 	db "@"
 

scripts/fuchsiagym.asm

@@ -193,7 +193,7 @@ FuchsiaGymText9:
 
 FuchsiaGymText10:
 	TX_FAR _ReceivedTM06Text
-	db $11
+	TX_SFX_KEY_ITEM
 
 TM06ExplanationText:
 	TX_FAR _TM06ExplanationText

scripts/fuchsiahouse2.asm

@@ -69,7 +69,7 @@ WardenGibberishText3:
 
 WardenTeethText1:
 	TX_FAR _WardenTeethText1
-	db $0b
+	TX_SFX_ITEM_1
 
 WardenTeethText2:
 	TX_FAR _WardenTeethText2
@@ -81,7 +81,8 @@ WardenThankYouText:
 
 ReceivedHM04Text:
 	TX_FAR _ReceivedHM04Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 HM04ExplanationText:
 	TX_FAR _HM04ExplanationText

scripts/fuchsiahouse3.asm

@@ -49,7 +49,7 @@ FuchsiaHouse3Text_561bd:
 
 FuchsiaHouse3Text_561c2:
 	TX_FAR _FuchsiaHouse3Text_561c2
-	db $0B
+	TX_SFX_ITEM_1
 	db "@"
 
 UnusedText_561c8:

scripts/lab3.asm

@@ -37,7 +37,8 @@ TM35PreReceiveText:
 
 ReceivedTM35Text:
 	TX_FAR _ReceivedTM35Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM35ExplanationText:
 	TX_FAR _TM35ExplanationText

scripts/lavenderhouse1.asm

@@ -95,7 +95,7 @@ LavenderHouse1Text_1d94c:
 
 ReceivedFluteText:
 	TX_FAR _ReceivedFluteText
-	db $11
+	TX_SFX_KEY_ITEM
 	TX_FAR _FluteExplanationText
 	db "@"
 

scripts/mtmoon3.asm

@@ -323,7 +323,9 @@ MtMoon3Script_49f69:
 
 MtMoon3Text_49f6f:
 	TX_FAR _MtMoon3Text_49f6f
-	db $11, $d, "@"
+	TX_SFX_KEY_ITEM
+	TX_WAIT
+	db "@"
 
 MtMoon3Script_49f76:
 	ld hl, MtMoon3Text_49f7f
@@ -332,7 +334,8 @@ MtMoon3Script_49f76:
 
 MtMoon3Text_49f7f:
 	TX_FAR _MtMoon3Text_49f7f
-	db $d, "@"
+	TX_WAIT
+	db "@"
 
 MtMoon3Text_49f85:
 	TX_FAR _MtMoon3Text_49f85
@@ -352,7 +355,8 @@ MtMoon3Text_49f94:
 
 MtMoon3Text_49f99:
 	TX_FAR _MtMoon3Text_49f99
-	db $11, "@"
+	TX_SFX_KEY_ITEM
+	db "@"
 
 MtMoon3BattleText2:
 	TX_FAR _MtMoon3BattleText2

scripts/museum1f.asm

@@ -215,7 +215,8 @@ Museum1FText_5c28e:
 
 ReceivedOldAmberText:
 	TX_FAR _ReceivedOldAmberText
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 Museum1FText_5c299:
 	TX_FAR _Museum1FText_5c299

scripts/pewtergym.asm

@@ -149,7 +149,7 @@ PewterGymText4:
 
 PewterGymText5:
 	TX_FAR _ReceivedTM34Text
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _TM34ExplanationText
 	db "@"
 
@@ -159,7 +159,7 @@ PewterGymText6:
 
 PewterGymText_5c4bc:
 	TX_FAR _PewterGymText_5c4bc
-	db $0B
+	TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
 	TX_FAR _PewterGymText_5c4c1
 	db "@"
 

scripts/rockethideout1.asm

@@ -130,7 +130,8 @@ RocketHideout1EndBattleText6:
 	ret
 
 RocketHideout1Text_44c9f:
-	db $6, "@"
+	TX_BLINK
+	db "@"
 
 RocketHideout1BattleText2:
 	TX_FAR _RocketHideout1BattleText2

scripts/rockethideoutelevator.asm

@@ -81,4 +81,5 @@ RocketHideoutElevatorText1:
 
 RocketHideoutElevatorText_4578b:
 	TX_FAR _RocketElevatorText_4578b
-	db $d, "@"
+	TX_WAIT
+	db "@"

scripts/route1.asm

@@ -32,7 +32,8 @@ Route1ViridianMartSampleText:
 
 Route1Text_1cae8:
 	TX_FAR _Route1Text_1cae8
-	db $0b,"@"
+	TX_SFX_ITEM_1
+	db "@"
 
 Route1Text_1caee:
 	TX_FAR _Route1Text_1caee

scripts/route12gateupstairs.asm

@@ -35,7 +35,8 @@ TM39PreReceiveText:
 
 ReceivedTM39Text:
 	TX_FAR _ReceivedTM39Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM39ExplanationText:
 	TX_FAR _TM39ExplanationText

scripts/route12house.asm

@@ -40,7 +40,7 @@ Route12HouseText_564c0:
 
 Route12HouseText_564c5:
 	TX_FAR _Route12HouseText_564c5
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _Route12HouseText_564ca
 	db "@"
 

scripts/route16house.asm

@@ -30,7 +30,8 @@ Route16HouseText3:
 
 ReceivedHM02Text:
 	TX_FAR _ReceivedHM02Text
-	db $11, "@"
+	TX_SFX_KEY_ITEM
+	db "@"
 
 HM02ExplanationText:
 	TX_FAR _HM02ExplanationText

scripts/route22gate.asm

@@ -89,4 +89,5 @@ Route22GateText_1e715:
 
 Route22GateText_1e71a:
 	TX_FAR _Route22GateText_1e71a
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"

scripts/route23.asm

@@ -227,7 +227,7 @@ VictoryRoadGuardText1:
 
 VictoryRoadGuardText2:
 	TX_FAR _VictoryRoadGuardText2
-	db $b
+	TX_SFX_ITEM_1
 	TX_FAR _VictoryRoadGuardText_513a3
 	db "@"
 

scripts/route24.asm

@@ -185,13 +185,15 @@ Route24Text1:
 
 Route24Text_51510:
 	TX_FAR _Route24Text_51510
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _Route24Text_51515
 	db "@"
 
 Route24Text_5151a:
 	TX_FAR _Route24Text_5151a
-	db $0B, $6, "@"
+	TX_SFX_ITEM_1
+	TX_BLINK
+	db "@"
 
 Route24Text_51521:
 	TX_FAR _Route24Text_51521

scripts/route5gate.asm

@@ -106,7 +106,7 @@ Route7GateText3:
 Route6GateText3:
 Route5GateText3:
 	TX_FAR _SaffronGateText_8aaa9
-	db $11
+	TX_SFX_KEY_ITEM
 	TX_FAR _SaffronGateText_1dff1
 	db "@"
 

scripts/safarizoneentrance.asm

@@ -209,7 +209,7 @@ SafariZoneEntranceTextPointers:
 
 .MakePaymentText
 	TX_FAR SafariZoneEntranceText_9e747
-	db $b
+	TX_SFX_ITEM_1
 	TX_FAR _SafariZoneEntranceText_75360
 	db "@"
 

scripts/safarizonesecrethouse.asm

@@ -33,7 +33,8 @@ SafariZoneSecretHouseText_4a350:
 
 ReceivedHM03Text:
 	TX_FAR _ReceivedHM03Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 HM03ExplanationText:
 	TX_FAR _HM03ExplanationText

scripts/saffroncity.asm

@@ -74,7 +74,8 @@ SaffronCityText11:
 
 SaffronCityText12:
 	TX_FAR _SaffronCityText12
-	db $15, "@" ; play PIDGEOT cry from TextCommandSounds
+	TX_CRY_PIDGEOT
+	db "@"
 
 SaffronCityText13:
 	TX_FAR _SaffronCityText13

scripts/saffrongym.asm

@@ -189,8 +189,8 @@ SaffronGymText_5d162:
 
 SaffronGymText_5d167:
 	TX_FAR _SaffronGymText_5d167
-	db $11 ; play same sound as red giving oak parcel
+	TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
-	db $6 ; wait for keypress
+	TX_BLINK
 	db "@"
 
 SaffronGymText_5d16e:
@@ -203,7 +203,7 @@ SaffronGymText10:
 
 SaffronGymText11:
 	TX_FAR ReceivedTM46Text
-	db $b
+	TX_SFX_ITEM_1
 	TX_FAR _TM46ExplanationText
 	db "@"
 

scripts/saffronhouse2.asm

@@ -33,7 +33,8 @@ TM29PreReceiveText:
 
 ReceivedTM29Text:
 	TX_FAR _ReceivedTM29Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM29ExplanationText:
 	TX_FAR _TM29ExplanationText

scripts/silphco11.asm

@@ -330,7 +330,8 @@ SilphCoPresidentText:
 
 ReceivedSilphCoMasterBallText:
 	TX_FAR _ReceivedSilphCoMasterBallText
-	db $11, "@"
+	TX_SFX_KEY_ITEM
+	db "@"
 
 SilphCo10Text_6231c:
 	TX_FAR _SilphCo10Text_6231c

scripts/silphco2.asm

@@ -162,7 +162,8 @@ SilphCo2Text_59ded:
 
 ReceivedTM36Text:
 	TX_FAR _ReceivedTM36Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM36ExplanationText:
 	TX_FAR _TM36ExplanationText

scripts/ssanne7.asm

@@ -73,7 +73,8 @@ ReceivingHM01Text:
 
 ReceivedHM01Text:
 	TX_FAR _ReceivedHM01Text
-	db $11, "@"
+	TX_SFX_KEY_ITEM
+	db "@"
 
 SSAnne7Text_61932:
 	TX_FAR _SSAnne7Text_61932

scripts/vermiliongym.asm

@@ -179,7 +179,7 @@ VermilionGymText6:
 
 VermilionGymText7:
 	TX_FAR _ReceivedTM24Text
-	db $11
+	TX_SFX_KEY_ITEM
 	TX_FAR _TM24ExplanationText
 	db "@"
 

scripts/vermilionhouse2.asm

@@ -40,7 +40,7 @@ VermilionHouse2Text_560b1:
 
 VermilionHouse2Text_560b6:
 	TX_FAR _VermilionHouse2Text_560b6
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _VermilionHouse2Text_560bb
 	db "@"
 

scripts/viridiancity.asm

@@ -258,7 +258,8 @@ ViridianCityText_191ca:
 
 ReceivedTM42Text:
 	TX_FAR _ReceivedTM42Text
-	db $10, "@"
+	TX_SFX_ITEM_2
+	db "@"
 
 TM42Explanation:
 	TX_FAR _TM42Explanation

scripts/viridiangym.asm

@@ -307,11 +307,13 @@ ViridianGymText_74ace:
 
 ViridianGymText_74ad3:
 	TX_FAR _ViridianGymText_74ad3
-	db $0b, "@"
+	TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
+	db "@"
 
 ViridianGymText_74ad9:
 	TX_FAR _ViridianGymText_74ad9
-	db $0d, "@"
+	TX_WAIT
+	db "@"
 
 ViridianGymText12:
 	TX_FAR _ViridianGymText12
@@ -319,7 +321,7 @@ ViridianGymText12:
 
 ViridianGymText13:
 	TX_FAR _ReceivedTM27Text
-	db $0b
+	TX_SFX_ITEM_1
 
 TM27ExplanationText:
 	TX_FAR _TM27ExplanationText

scripts/viridianmart.asm

@@ -81,7 +81,7 @@ ViridianMartText4:
 
 ViridianMartText5:
 	TX_FAR ViridianMartParcelQuestText
-	db $11
+	TX_SFX_KEY_ITEM
 	db "@"
 
 ViridianMartText2: