Port pokecrystal's formatting of text commands and special characters

24 files changed, 181 insertions, 179 deletions

diff --git a/engine/events/hidden_objects/bench_guys.asm b/engine/events/hidden_objects/bench_guys.asm
index 995b5929..a6db73b9 100644
--- a/engine/events/hidden_objects/bench_guys.asm
+++ b/engine/events/hidden_objects/bench_guys.asm
@@ -50,59 +50,59 @@ BenchGuyTextPointers:
 	db $FF
 
 ViridianCityPokecenterBenchGuyText::
-	TX_FAR _ViridianCityPokecenterGuyText
-	db "@"
+	text_far _ViridianCityPokecenterGuyText
+	text_end
 
 PewterCityPokecenterBenchGuyText::
-	TX_FAR _PewterCityPokecenterGuyText
-	db "@"
+	text_far _PewterCityPokecenterGuyText
+	text_end
 
 CeruleanCityPokecenterBenchGuyText::
-	TX_FAR _CeruleanPokecenterGuyText
-	db "@"
+	text_far _CeruleanPokecenterGuyText
+	text_end
 
 LavenderCityPokecenterBenchGuyText::
-	TX_FAR _LavenderPokecenterGuyText
-	db "@"
+	text_far _LavenderPokecenterGuyText
+	text_end
 
 MtMoonPokecenterBenchGuyText::
-	TX_FAR _MtMoonPokecenterBenchGuyText
-	db "@"
+	text_far _MtMoonPokecenterBenchGuyText
+	text_end
 
 RockTunnelPokecenterBenchGuyText::
-	TX_FAR _RockTunnelPokecenterGuyText
-	db "@"
+	text_far _RockTunnelPokecenterGuyText
+	text_end
 
 UnusedBenchGuyText1::
-	TX_FAR _UnusedBenchGuyText1
-	db "@"
+	text_far _UnusedBenchGuyText1
+	text_end
 
 UnusedBenchGuyText2::
-	TX_FAR _UnusedBenchGuyText2
-	db "@"
+	text_far _UnusedBenchGuyText2
+	text_end
 
 UnusedBenchGuyText3::
-	TX_FAR _UnusedBenchGuyText3
-	db "@"
+	text_far _UnusedBenchGuyText3
+	text_end
 
 VermilionCityPokecenterBenchGuyText::
-	TX_FAR _VermilionPokecenterGuyText
-	db "@"
+	text_far _VermilionPokecenterGuyText
+	text_end
 
 CeladonCityPokecenterBenchGuyText::
-	TX_FAR _CeladonCityPokecenterGuyText
-	db "@"
+	text_far _CeladonCityPokecenterGuyText
+	text_end
 
 FuchsiaCityPokecenterBenchGuyText::
-	TX_FAR _FuchsiaCityPokecenterGuyText
-	db "@"
+	text_far _FuchsiaCityPokecenterGuyText
+	text_end
 
 CinnabarIslandPokecenterBenchGuyText::
-	TX_FAR _CinnabarPokecenterGuyText
-	db "@"
+	text_far _CinnabarPokecenterGuyText
+	text_end
 
 SaffronCityPokecenterBenchGuyText::
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ld hl, SaffronCityPokecenterBenchGuyText2
 	jr nz, .asm_624f2
@@ -112,13 +112,13 @@ SaffronCityPokecenterBenchGuyText::
 	jp TextScriptEnd
 
 SaffronCityPokecenterBenchGuyText1:
-	TX_FAR _SaffronCityPokecenterGuyText1
-	db "@"
+	text_far _SaffronCityPokecenterGuyText1
+	text_end
 
 SaffronCityPokecenterBenchGuyText2:
-	TX_FAR _SaffronCityPokecenterGuyText2
-	db "@"
+	text_far _SaffronCityPokecenterGuyText2
+	text_end
 
 CeladonCityHotelText::
-	TX_FAR _CeladonCityHotelText
-	db "@"
+	text_far _CeladonCityHotelText
+	text_end
diff --git a/engine/events/hidden_objects/bills_house_pc.asm b/engine/events/hidden_objects/bills_house_pc.asm
index 836aace0..d6e9c19a 100644
--- a/engine/events/hidden_objects/bills_house_pc.asm
+++ b/engine/events/hidden_objects/bills_house_pc.asm
@@ -45,13 +45,13 @@ BillsHousePC:
 	ret
 
 BillsHouseMonitorText::
-	TX_FAR _BillsHouseMonitorText
-	db "@"
+	text_far _BillsHouseMonitorText
+	text_end
 
 BillsHouseInitiatedText::
-	TX_FAR _BillsHouseInitiatedText
-	TX_BLINK
-	TX_ASM
+	text_far _BillsHouseInitiatedText
+	text_promptbutton
+	text_asm
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
@@ -65,7 +65,7 @@ BillsHouseInitiatedText::
 	jp TextScriptEnd
 
 BillsHousePokemonList::
-	TX_ASM
+	text_asm
 	call SaveScreenTilesToBuffer1
 	ld hl, BillsHousePokemonListText1
 	call PrintText
@@ -119,8 +119,8 @@ BillsHousePokemonList::
 	jp TextScriptEnd
 
 BillsHousePokemonListText1:
-	TX_FAR _BillsHousePokemonListText1
-	db "@"
+	text_far _BillsHousePokemonListText1
+	text_end
 
 BillsMonListText:
 	db   "EEVEE"
@@ -130,5 +130,5 @@ BillsMonListText:
 	next "CANCEL@"
 
 BillsHousePokemonListText2:
-	TX_FAR _BillsHousePokemonListText2
-	db "@"
+	text_far _BillsHousePokemonListText2
+	text_end
diff --git a/engine/events/hidden_objects/blues_room.asm b/engine/events/hidden_objects/blues_room.asm
index 879a7ac8..bcbad556 100644
--- a/engine/events/hidden_objects/blues_room.asm
+++ b/engine/events/hidden_objects/blues_room.asm
@@ -9,5 +9,5 @@ PrintBookcaseText:
 	tx_pre_jump BookcaseText
 
 BookcaseText::
-	TX_FAR _BookcaseText
-	db "@"
+	text_far _BookcaseText
+	text_end
diff --git a/engine/events/hidden_objects/book_or_sculpture.asm b/engine/events/hidden_objects/book_or_sculpture.asm
index 2d6f278a..2f3334b8 100644
--- a/engine/events/hidden_objects/book_or_sculpture.asm
+++ b/engine/events/hidden_objects/book_or_sculpture.asm
@@ -1,5 +1,5 @@
 BookOrSculptureText::
-	TX_ASM
+	text_asm
 	ld hl, PokemonBooksText
 	ld a, [wCurMapTileset]
 	cp MANSION ; Celadon Mansion tileset
@@ -13,9 +13,9 @@ BookOrSculptureText::
 	jp TextScriptEnd
 
 PokemonBooksText:
-	TX_FAR _PokemonBooksText
-	db "@"
+	text_far _PokemonBooksText
+	text_end
 
 DiglettSculptureText:
-	TX_FAR _DiglettSculptureText
-	db "@"
+	text_far _DiglettSculptureText
+	text_end
diff --git a/engine/events/hidden_objects/cinnabar_gym_quiz.asm b/engine/events/hidden_objects/cinnabar_gym_quiz.asm
index 6404717e..9412ee45 100644
--- a/engine/events/hidden_objects/cinnabar_gym_quiz.asm
+++ b/engine/events/hidden_objects/cinnabar_gym_quiz.asm
@@ -6,7 +6,7 @@ PrintCinnabarQuiz:
 	tx_pre_jump CinnabarGymQuiz
 
 CinnabarGymQuiz::
-	TX_ASM
+	text_asm
 	xor a
 	ld [wOpponentAfterWrongAnswer], a
 	ld a, [wHiddenObjectFunctionArgument]
@@ -36,8 +36,8 @@ CinnabarGymQuiz::
 	jp TextScriptEnd
 
 CinnabarGymQuizIntroText:
-	TX_FAR _CinnabarGymQuizIntroText
-	db "@"
+	text_far _CinnabarGymQuizIntroText
+	text_end
 
 CinnabarQuizQuestions:
 	dw CinnabarQuizQuestionsText1
@@ -48,28 +48,28 @@ CinnabarQuizQuestions:
 	dw CinnabarQuizQuestionsText6
 
 CinnabarQuizQuestionsText1:
-	TX_FAR _CinnabarQuizQuestionsText1
-	db "@"
+	text_far _CinnabarQuizQuestionsText1
+	text_end
 
 CinnabarQuizQuestionsText2:
-	TX_FAR _CinnabarQuizQuestionsText2
-	db "@"
+	text_far _CinnabarQuizQuestionsText2
+	text_end
 
 CinnabarQuizQuestionsText3:
-	TX_FAR _CinnabarQuizQuestionsText3
-	db "@"
+	text_far _CinnabarQuizQuestionsText3
+	text_end
 
 CinnabarQuizQuestionsText4:
-	TX_FAR _CinnabarQuizQuestionsText4
-	db "@"
+	text_far _CinnabarQuizQuestionsText4
+	text_end
 
 CinnabarQuizQuestionsText5:
-	TX_FAR _CinnabarQuizQuestionsText5
-	db "@"
+	text_far _CinnabarQuizQuestionsText5
+	text_end
 
 CinnabarQuizQuestionsText6:
-	TX_FAR _CinnabarQuizQuestionsText6
-	db "@"
+	text_far _CinnabarQuizQuestionsText6
+	text_end
 
 CinnabarGymGateFlagAction:
 	EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
@@ -117,10 +117,10 @@ CinnabarGymQuiz_1ea92:
 	ret
 
 CinnabarGymQuizCorrectText:
-	TX_SFX_ITEM_1
-	TX_FAR _CinnabarGymQuizCorrectText
-	TX_BLINK
-	TX_ASM
+	sound_get_item_1
+	text_far _CinnabarGymQuizCorrectText
+	text_promptbutton
+	text_asm
 
 	ld a, [hBackupGymGateIndex]
 	AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0
@@ -137,8 +137,8 @@ CinnabarGymQuizCorrectText:
 	jp TextScriptEnd
 
 CinnabarGymQuizIncorrectText:
-	TX_FAR _CinnabarGymQuizIncorrectText
-	db "@"
+	text_far _CinnabarGymQuizIncorrectText
+	text_end
 
 UpdateCinnabarGymGateTileBlocks_::
 ; Update the overworld map with open floor blocks or locked gate blocks
diff --git a/engine/events/hidden_objects/elevator.asm b/engine/events/hidden_objects/elevator.asm
index e72ca44b..ab0f731f 100644
--- a/engine/events/hidden_objects/elevator.asm
+++ b/engine/events/hidden_objects/elevator.asm
@@ -1,3 +1,3 @@
 ElevatorText::
-	TX_FAR _ElevatorText
-	db "@"
+	text_far _ElevatorText
+	text_end
diff --git a/engine/events/hidden_objects/fighting_dojo.asm b/engine/events/hidden_objects/fighting_dojo.asm
index 94d4871d..b4f89985 100644
--- a/engine/events/hidden_objects/fighting_dojo.asm
+++ b/engine/events/hidden_objects/fighting_dojo.asm
@@ -3,21 +3,21 @@ PrintFightingDojoText2:
 	tx_pre_jump EnemiesOnEverySideText
 
 EnemiesOnEverySideText::
-	TX_FAR _EnemiesOnEverySideText
-	db "@"
+	text_far _EnemiesOnEverySideText
+	text_end
 
 PrintFightingDojoText3:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump WhatGoesAroundComesAroundText
 
 WhatGoesAroundComesAroundText::
-	TX_FAR _WhatGoesAroundComesAroundText
-	db "@"
+	text_far _WhatGoesAroundComesAroundText
+	text_end
 
 PrintFightingDojoText:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump FightingDojoText
 
 FightingDojoText::
-	TX_FAR _FightingDojoText
-	db "@"
+	text_far _FightingDojoText
+	text_end
diff --git a/engine/events/hidden_objects/gym_statues.asm b/engine/events/hidden_objects/gym_statues.asm
index e9a407b2..3a17557f 100644
--- a/engine/events/hidden_objects/gym_statues.asm
+++ b/engine/events/hidden_objects/gym_statues.asm
@@ -40,9 +40,9 @@ GymStatues:
 	db $ff
 
 GymStatueText1::
-	TX_FAR _GymStatueText1
-	db "@"
+	text_far _GymStatueText1
+	text_end
 
 GymStatueText2::
-	TX_FAR _GymStatueText2
-	db "@"
+	text_far _GymStatueText2
+	text_end
diff --git a/engine/events/hidden_objects/indigo_plateau_hq.asm b/engine/events/hidden_objects/indigo_plateau_hq.asm
index d0d0b8c2..840c114d 100644
--- a/engine/events/hidden_objects/indigo_plateau_hq.asm
+++ b/engine/events/hidden_objects/indigo_plateau_hq.asm
@@ -6,5 +6,5 @@ PrintIndigoPlateauHQText:
 	tx_pre_jump IndigoPlateauHQText
 
 IndigoPlateauHQText::
-	TX_FAR _IndigoPlateauHQText
-	db "@"
+	text_far _IndigoPlateauHQText
+	text_end
diff --git a/engine/events/hidden_objects/indigo_plateau_statues.asm b/engine/events/hidden_objects/indigo_plateau_statues.asm
index 62b31e0a..23e94fcf 100644
--- a/engine/events/hidden_objects/indigo_plateau_statues.asm
+++ b/engine/events/hidden_objects/indigo_plateau_statues.asm
@@ -1,5 +1,5 @@
 IndigoPlateauStatues::
-	TX_ASM
+	text_asm
 	ld hl, IndigoPlateauStatuesText1
 	call PrintText
 	ld a, [wXCoord]
@@ -12,13 +12,13 @@ IndigoPlateauStatues::
 	jp TextScriptEnd
 
 IndigoPlateauStatuesText1:
-	TX_FAR _IndigoPlateauStatuesText1
-	db "@"
+	text_far _IndigoPlateauStatuesText1
+	text_end
 
 IndigoPlateauStatuesText2:
-	TX_FAR _IndigoPlateauStatuesText2
-	db "@"
+	text_far _IndigoPlateauStatuesText2
+	text_end
 
 IndigoPlateauStatuesText3:
-	TX_FAR _IndigoPlateauStatuesText3
-	db "@"
+	text_far _IndigoPlateauStatuesText3
+	text_end
diff --git a/engine/events/hidden_objects/magazines.asm b/engine/events/hidden_objects/magazines.asm
index af31b317..b58636ff 100644
--- a/engine/events/hidden_objects/magazines.asm
+++ b/engine/events/hidden_objects/magazines.asm
@@ -4,5 +4,5 @@ PrintMagazinesText:
 	ret
 
 MagazinesText::
-	TX_FAR _MagazinesText
-	db "@"
+	text_far _MagazinesText
+	text_end
diff --git a/engine/events/hidden_objects/museum_fossils.asm b/engine/events/hidden_objects/museum_fossils.asm
index 8636418c..36fb2556 100644
--- a/engine/events/hidden_objects/museum_fossils.asm
+++ b/engine/events/hidden_objects/museum_fossils.asm
@@ -7,8 +7,8 @@ AerodactylFossil:
 	ret
 
 AerodactylFossilText::
-	TX_FAR _AerodactylFossilText
-	db "@"
+	text_far _AerodactylFossilText
+	text_end
 
 KabutopsFossil:
 	ld a, FOSSIL_KABUTOPS
@@ -19,8 +19,8 @@ KabutopsFossil:
 	ret
 
 KabutopsFossilText::
-	TX_FAR _KabutopsFossilText
-	db "@"
+	text_far _KabutopsFossilText
+	text_end
 
 DisplayMonFrontSpriteInBox:
 ; Displays a pokemon's front sprite in a pop-up window.
diff --git a/engine/events/hidden_objects/new_bike.asm b/engine/events/hidden_objects/new_bike.asm
index 7836262e..5bce5937 100644
--- a/engine/events/hidden_objects/new_bike.asm
+++ b/engine/events/hidden_objects/new_bike.asm
@@ -3,5 +3,5 @@ PrintNewBikeText:
 	tx_pre_jump NewBicycleText
 
 NewBicycleText::
-	TX_FAR _NewBicycleText
-	db "@"
+	text_far _NewBicycleText
+	text_end
diff --git a/engine/events/hidden_objects/oaks_lab_email.asm b/engine/events/hidden_objects/oaks_lab_email.asm
index c59ff9ac..cf3b2c9e 100644
--- a/engine/events/hidden_objects/oaks_lab_email.asm
+++ b/engine/events/hidden_objects/oaks_lab_email.asm
@@ -6,5 +6,5 @@ DisplayOakLabEmailText:
 	tx_pre_jump OakLabEmailText
 
 OakLabEmailText::
-	TX_FAR _OakLabEmailText
-	db "@"
+	text_far _OakLabEmailText
+	text_end
diff --git a/engine/events/hidden_objects/oaks_lab_posters.asm b/engine/events/hidden_objects/oaks_lab_posters.asm
index 0fe21cf3..502cf951 100644
--- a/engine/events/hidden_objects/oaks_lab_posters.asm
+++ b/engine/events/hidden_objects/oaks_lab_posters.asm
@@ -3,8 +3,8 @@ DisplayOakLabLeftPoster:
 	tx_pre_jump PushStartText
 
 PushStartText::
-	TX_FAR _PushStartText
-	db "@"
+	text_far _PushStartText
+	text_end
 
 DisplayOakLabRightPoster:
 	call EnableAutoTextBoxDrawing
@@ -21,9 +21,9 @@ DisplayOakLabRightPoster:
 	jp PrintPredefTextID
 
 SaveOptionText::
-	TX_FAR _SaveOptionText
-	db "@"
+	text_far _SaveOptionText
+	text_end
 
 StrengthsAndWeaknessesText::
-	TX_FAR _StrengthsAndWeaknessesText
-	db "@"
+	text_far _StrengthsAndWeaknessesText
+	text_end
diff --git a/engine/events/hidden_objects/pokecenter_pc.asm b/engine/events/hidden_objects/pokecenter_pc.asm
index c1225d3a..9a2ab064 100644
--- a/engine/events/hidden_objects/pokecenter_pc.asm
+++ b/engine/events/hidden_objects/pokecenter_pc.asm
@@ -8,4 +8,4 @@ OpenPokemonCenterPC:
 	tx_pre_jump PokemonCenterPCText
 
 PokemonCenterPCText::
-	TX_POKECENTER_PC
+	script_pokecenter_pc
diff --git a/engine/events/hidden_objects/pokemon_stuff.asm b/engine/events/hidden_objects/pokemon_stuff.asm
index b78b2500..267a191a 100644
--- a/engine/events/hidden_objects/pokemon_stuff.asm
+++ b/engine/events/hidden_objects/pokemon_stuff.asm
@@ -1,3 +1,3 @@
 PokemonStuffText::
-	TX_FAR _PokemonStuffText
-	db "@"
+	text_far _PokemonStuffText
+	text_end
diff --git a/engine/events/hidden_objects/reds_room.asm b/engine/events/hidden_objects/reds_room.asm
index b124f9c6..7b8d51a0 100644
--- a/engine/events/hidden_objects/reds_room.asm
+++ b/engine/events/hidden_objects/reds_room.asm
@@ -3,12 +3,12 @@ PrintRedSNESText:
 	tx_pre_jump RedBedroomSNESText
 
 RedBedroomSNESText::
-	TX_FAR _RedBedroomSNESText
-	db "@"
+	text_far _RedBedroomSNESText
+	text_end
 
 OpenRedsPC:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump RedBedroomPCText
 
 RedBedroomPCText::
-	TX_PLAYERS_PC
+	script_players_pc
diff --git a/engine/events/hidden_objects/route_15_binoculars.asm b/engine/events/hidden_objects/route_15_binoculars.asm
index b380bb33..028ea30d 100644
--- a/engine/events/hidden_objects/route_15_binoculars.asm
+++ b/engine/events/hidden_objects/route_15_binoculars.asm
@@ -10,5 +10,5 @@ Route15GateLeftBinoculars:
 	jp DisplayMonFrontSpriteInBox
 
 Route15UpstairsBinocularsText::
-	TX_FAR _Route15UpstairsBinocularsText
-	db "@"
+	text_far _Route15UpstairsBinocularsText
+	text_end
diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_objects/safari_game.asm
index 68fc943f..656e872a 100644
--- a/engine/events/hidden_objects/safari_game.asm
+++ b/engine/events/hidden_objects/safari_game.asm
@@ -59,7 +59,7 @@ PrintSafariGameOverText::
 	jp PrintText
 
 SafariGameOverText:
-	TX_ASM
+	text_asm
 	ld a, [wNumSafariBalls]
 	and a
 	jr z, .noMoreSafariBalls
@@ -71,9 +71,9 @@ SafariGameOverText:
 	jp TextScriptEnd
 
 TimesUpText:
-	TX_FAR _TimesUpText
-	db "@"
+	text_far _TimesUpText
+	text_end
 
 GameOverText:
-	TX_FAR _GameOverText
-	db "@"
+	text_far _GameOverText
+	text_end
diff --git a/engine/events/hidden_objects/school_blackboard.asm b/engine/events/hidden_objects/school_blackboard.asm
index 4cd48d23..48b97d73 100644
--- a/engine/events/hidden_objects/school_blackboard.asm
+++ b/engine/events/hidden_objects/school_blackboard.asm
@@ -7,7 +7,7 @@ PrintBlackboardLinkCableText:
 	ret
 
 LinkCableHelp::
-	TX_ASM
+	text_asm
 	call SaveScreenTilesToBuffer1
 	ld hl, LinkCableHelpText1
 	call PrintText
@@ -60,12 +60,12 @@ LinkCableHelp::
 	jp TextScriptEnd
 
 LinkCableHelpText1:
-	TX_FAR _LinkCableHelpText1
-	db "@"
+	text_far _LinkCableHelpText1
+	text_end
 
 LinkCableHelpText2:
-	TX_FAR _LinkCableHelpText2
-	db "@"
+	text_far _LinkCableHelpText2
+	text_end
 
 HowToLinkText:
 	db   "HOW TO LINK"
@@ -79,19 +79,19 @@ LinkCableInfoTexts:
 	dw LinkCableInfoText3
 
 LinkCableInfoText1:
-	TX_FAR _LinkCableInfoText1
-	db "@"
+	text_far _LinkCableInfoText1
+	text_end
 
 LinkCableInfoText2:
-	TX_FAR _LinkCableInfoText2
-	db "@"
+	text_far _LinkCableInfoText2
+	text_end
 
 LinkCableInfoText3:
-	TX_FAR _LinkCableInfoText3
-	db "@"
+	text_far _LinkCableInfoText3
+	text_end
 
 ViridianSchoolBlackboard::
-	TX_ASM
+	text_asm
 	call SaveScreenTilesToBuffer1
 	ld hl, ViridianSchoolBlackboardText1
 	call PrintText
@@ -177,12 +177,12 @@ ViridianSchoolBlackboard::
 	jp TextScriptEnd
 
 ViridianSchoolBlackboardText1:
-	TX_FAR _ViridianSchoolBlackboardText1
-	db "@"
+	text_far _ViridianSchoolBlackboardText1
+	text_end
 
 ViridianSchoolBlackboardText2:
-	TX_FAR _ViridianSchoolBlackboardText2
-	db "@"
+	text_far _ViridianSchoolBlackboardText2
+	text_end
 
 StatusAilmentText1:
 	db   " SLP"
@@ -192,7 +192,9 @@ StatusAilmentText1:
 StatusAilmentText2:
 	db   " BRN"
 	next " FRZ"
-	next " QUIT@@"
+	next " QUIT@"
+
+	db "@" ; unused
 
 ViridianBlackboardStatusPointers:
 	dw ViridianBlackboardSleepText
@@ -202,21 +204,21 @@ ViridianBlackboardStatusPointers:
 	dw ViridianBlackboardFrozenText
 
 ViridianBlackboardSleepText:
-	TX_FAR _ViridianBlackboardSleepText
-	db "@"
+	text_far _ViridianBlackboardSleepText
+	text_end
 
 ViridianBlackboardPoisonText:
-	TX_FAR _ViridianBlackboardPoisonText
-	db "@"
+	text_far _ViridianBlackboardPoisonText
+	text_end
 
 ViridianBlackboardPrlzText:
-	TX_FAR _ViridianBlackboardPrlzText
-	db "@"
+	text_far _ViridianBlackboardPrlzText
+	text_end
 
 ViridianBlackboardBurnText:
-	TX_FAR _ViridianBlackboardBurnText
-	db "@"
+	text_far _ViridianBlackboardBurnText
+	text_end
 
 ViridianBlackboardFrozenText:
-	TX_FAR _ViridianBlackboardFrozenText
-	db "@"
+	text_far _ViridianBlackboardFrozenText
+	text_end
diff --git a/engine/events/hidden_objects/school_notebooks.asm b/engine/events/hidden_objects/school_notebooks.asm
index f5cc1341..9fccf6c0 100644
--- a/engine/events/hidden_objects/school_notebooks.asm
+++ b/engine/events/hidden_objects/school_notebooks.asm
@@ -6,12 +6,12 @@ PrintNotebookText:
 	jp PrintPredefTextID
 
 TMNotebook::
-	TX_FAR TMNotebookText
-	TX_WAIT
-	db "@"
+	text_far TMNotebookText
+	text_linkpromptbutton
+	text_end
 
 ViridianSchoolNotebook::
-	TX_ASM
+	text_asm
 	ld hl, ViridianSchoolNotebookText1
 	call PrintText
 	call TurnPageSchoolNotebook
@@ -40,26 +40,26 @@ TurnPageSchoolNotebook:
 	ret
 
 TurnPageText:
-	TX_FAR _TurnPageText
-	db "@"
+	text_far _TurnPageText
+	text_end
 
 ViridianSchoolNotebookText5:
-	TX_FAR _ViridianSchoolNotebookText5
-	TX_WAIT
-	db "@"
+	text_far _ViridianSchoolNotebookText5
+	text_linkpromptbutton
+	text_end
 
 ViridianSchoolNotebookText1:
-	TX_FAR _ViridianSchoolNotebookText1
-	db "@"
+	text_far _ViridianSchoolNotebookText1
+	text_end
 
 ViridianSchoolNotebookText2:
-	TX_FAR _ViridianSchoolNotebookText2
-	db "@"
+	text_far _ViridianSchoolNotebookText2
+	text_end
 
 ViridianSchoolNotebookText3:
-	TX_FAR _ViridianSchoolNotebookText3
-	db "@"
+	text_far _ViridianSchoolNotebookText3
+	text_end
 
 ViridianSchoolNotebookText4:
-	TX_FAR _ViridianSchoolNotebookText4
-	db "@"
+	text_far _ViridianSchoolNotebookText4
+	text_end
diff --git a/engine/events/hidden_objects/town_map.asm b/engine/events/hidden_objects/town_map.asm
index 31e75d0d..9481b902 100644
--- a/engine/events/hidden_objects/town_map.asm
+++ b/engine/events/hidden_objects/town_map.asm
@@ -1,7 +1,7 @@
 TownMapText::
-	TX_FAR _TownMapText
-	TX_BLINK
-	TX_ASM
+	text_far _TownMapText
+	text_promptbutton
+	text_asm
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, wd730
diff --git a/engine/events/hidden_objects/vermilion_gym_trash.asm b/engine/events/hidden_objects/vermilion_gym_trash.asm
index c2d22cd5..f46b53c2 100644
--- a/engine/events/hidden_objects/vermilion_gym_trash.asm
+++ b/engine/events/hidden_objects/vermilion_gym_trash.asm
@@ -3,8 +3,8 @@ PrintTrashText:
 	tx_pre_jump VermilionGymTrashText
 
 VermilionGymTrashText::
-	TX_FAR _VermilionGymTrashText
-	db "@"
+	text_far _VermilionGymTrashText
+	text_end
 
 GymTrashScript:
 	call EnableAutoTextBoxDrawing
@@ -128,8 +128,8 @@ GymTrashCans:
 	db 2, 11, 13,  0,  0 ; 14
 
 VermilionGymTrashSuccessText1::
-	TX_FAR _VermilionGymTrashSuccessText1
-	TX_ASM
+	text_far _VermilionGymTrashSuccessText1
+	text_asm
 	call WaitForSoundToFinish
 	ld a, SFX_SWITCH
 	call PlaySound
@@ -138,12 +138,12 @@ VermilionGymTrashSuccessText1::
 
 ; unused
 VermilionGymTrashSuccessText2::
-	TX_FAR _VermilionGymTrashSuccessText2
-	db "@"
+	text_far _VermilionGymTrashSuccessText2
+	text_end
 
 ; unused
 VermilionGymTrashSuccesPlaySfx:
-	TX_ASM
+	text_asm
 	call WaitForSoundToFinish
 	ld a, SFX_SWITCH
 	call PlaySound
@@ -151,8 +151,8 @@ VermilionGymTrashSuccesPlaySfx:
 	jp TextScriptEnd
 
 VermilionGymTrashSuccessText3::
-	TX_FAR _VermilionGymTrashSuccessText3
-	TX_ASM
+	text_far _VermilionGymTrashSuccessText3
+	text_asm
 	call WaitForSoundToFinish
 	ld a, SFX_GO_INSIDE
 	call PlaySound
@@ -160,8 +160,8 @@ VermilionGymTrashSuccessText3::
 	jp TextScriptEnd
 
 VermilionGymTrashFailText::
-	TX_FAR _VermilionGymTrashFailText
-	TX_ASM
+	text_far _VermilionGymTrashFailText
+	text_asm
 	call WaitForSoundToFinish
 	ld a, SFX_DENIED
 	call PlaySound