12 files changed, 127 insertions, 123 deletions
diff --git a/engine/menus/display_text_id_init.asm b/engine/menus/display_text_id_init.asm
index 45c76f9c..c02e5bbc 100644
--- a/engine/menus/display_text_id_init.asm
+++ b/engine/menus/display_text_id_init.asm
@@ -41,7 +41,7 @@ DisplayTextIDInit::
 ; loop to copy C1X9 (direction the sprite is facing) to C2X9 for each sprite
 ; this is done because when you talk to an NPC, they turn to look your way
 ; the original direction they were facing must be restored after the dialogue is over
-	ld hl, wSpriteStateData1 + $19
+	ld hl, wSprite01StateData1FacingDirection
 	ld c, $0f
 	ld de, $10
 .spriteFacingDirectionCopyLoop
@@ -54,7 +54,7 @@ DisplayTextIDInit::
 	jr nz, .spriteFacingDirectionCopyLoop
 ; loop to force all the sprites in the middle of animation to stand still
 ; (so that they don't like they're frozen mid-step during the dialogue)
-	ld hl, wSpriteStateData1 + 2
+	ld hl, wSpritePlayerStateData1ImageIndex
 	ld de, $10
 	ld c, e
 .spriteStandStillLoop
diff --git a/engine/menus/league_pc.asm b/engine/menus/league_pc.asm
index 170c0ef3..c07c6bc1 100755
--- a/engine/menus/league_pc.asm
+++ b/engine/menus/league_pc.asm
@@ -116,5 +116,5 @@ HallOfFameNoText:
 	db "HALL OF FAME No   @"
 
 AccessedHoFPCText:
-	TX_FAR _AccessedHoFPCText
-	db "@"
+	text_far _AccessedHoFPCText
+	text_end
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index fe82ec4a..43289ce8 100755
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -136,7 +136,7 @@ LinkMenu:
 	ld [wLetterPrintingDelayFlags], a
 	ld hl, wd72e
 	set 6, [hl]
-	ld hl, TextTerminator_6b20
+	ld hl, LinkMenuEmptyText
 	call PrintText
 	call SaveScreenTilesToBuffer1
 	ld hl, WhereWouldYouLikeText
@@ -293,16 +293,16 @@ LinkMenu:
 	ret
 
 WhereWouldYouLikeText:
-	TX_FAR _WhereWouldYouLikeText
-	db "@"
+	text_far _WhereWouldYouLikeText
+	text_end
 
 PleaseWaitText:
-	TX_FAR _PleaseWaitText
-	db "@"
+	text_far _PleaseWaitText
+	text_end
 
 LinkCanceledText:
-	TX_FAR _LinkCanceledText
-	db "@"
+	text_far _LinkCanceledText
+	text_end
 
 StartNewGame:
 	ld hl, wd732
@@ -329,7 +329,9 @@ SpecialEnterMap::
 	jp EnterMap
 
 ContinueText:
-	db "CONTINUE", $4e
+	db "CONTINUE"
+	next ""
+	; fallthrough
 
 NewGameText:
 	db   "NEW GAME"
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index efeab4c3..a84609c9 100755
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -50,8 +50,8 @@ AskName:
 	jp CopyData
 
 DoYouWantToNicknameText:
-	TX_FAR _DoYouWantToNicknameText
-	db "@"
+	text_far _DoYouWantToNicknameText
+	text_end
 
 DisplayNameRaterScreen::
 	ld hl, wBuffer
diff --git a/engine/menus/oaks_pc.asm b/engine/menus/oaks_pc.asm
index 03c9b8f1..cdb97aca 100755
--- a/engine/menus/oaks_pc.asm
+++ b/engine/menus/oaks_pc.asm
@@ -15,14 +15,14 @@ OpenOaksPC:
 	jp LoadScreenTilesFromBuffer2
 
 GetDexRatedText:
-	TX_FAR _GetDexRatedText
-	db "@"
+	text_far _GetDexRatedText
+	text_end
 
 ClosedOaksPCText:
-	TX_FAR _ClosedOaksPCText
-	TX_WAIT
-	db "@"
+	text_far _ClosedOaksPCText
+	text_linkpromptbutton
+	text_end
 
 AccessedOaksPCText:
-	TX_FAR _AccessedOaksPCText
-	db "@"
+	text_far _AccessedOaksPCText
+	text_end
diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm
index 9ae5706e..f63a3cf0 100755
--- a/engine/menus/party_menu.asm
+++ b/engine/menus/party_menu.asm
@@ -254,62 +254,62 @@ PartyMenuMessagePointers:
 	dw PartyMenuItemUseText
 
 PartyMenuNormalText:
-	TX_FAR _PartyMenuNormalText
-	db "@"
+	text_far _PartyMenuNormalText
+	text_end
 
 PartyMenuItemUseText:
-	TX_FAR _PartyMenuItemUseText
-	db "@"
+	text_far _PartyMenuItemUseText
+	text_end
 
 PartyMenuBattleText:
-	TX_FAR _PartyMenuBattleText
-	db "@"
+	text_far _PartyMenuBattleText
+	text_end
 
 PartyMenuUseTMText:
-	TX_FAR _PartyMenuUseTMText
-	db "@"
+	text_far _PartyMenuUseTMText
+	text_end
 
 PartyMenuSwapMonText:
-	TX_FAR _PartyMenuSwapMonText
-	db "@"
+	text_far _PartyMenuSwapMonText
+	text_end
 
 PotionText:
-	TX_FAR _PotionText
-	db "@"
+	text_far _PotionText
+	text_end
 
 AntidoteText:
-	TX_FAR _AntidoteText
-	db "@"
+	text_far _AntidoteText
+	text_end
 
 ParlyzHealText:
-	TX_FAR _ParlyzHealText
-	db "@"
+	text_far _ParlyzHealText
+	text_end
 
 BurnHealText:
-	TX_FAR _BurnHealText
-	db "@"
+	text_far _BurnHealText
+	text_end
 
 IceHealText:
-	TX_FAR _IceHealText
-	db "@"
+	text_far _IceHealText
+	text_end
 
 AwakeningText:
-	TX_FAR _AwakeningText
-	db "@"
+	text_far _AwakeningText
+	text_end
 
 FullHealText:
-	TX_FAR _FullHealText
-	db "@"
+	text_far _FullHealText
+	text_end
 
 ReviveText:
-	TX_FAR _ReviveText
-	db "@"
+	text_far _ReviveText
+	text_end
 
 RareCandyText:
-	TX_FAR _RareCandyText
-	TX_SFX_ITEM_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
-	TX_BLINK
-	db "@"
+	text_far _RareCandyText
+	sound_get_item_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
+	text_promptbutton
+	text_end
 
 SetPartyMenuHPBarColor:
 	ld hl, wPartyMenuHPBarColors
diff --git a/engine/menus/pc.asm b/engine/menus/pc.asm
index 6ec45f2e..f296ad61 100755
--- a/engine/menus/pc.asm
+++ b/engine/menus/pc.asm
@@ -99,20 +99,20 @@ LogOff:
 	ret
 
 TurnedOnPC1Text:
-	TX_FAR _TurnedOnPC1Text
-	db "@"
+	text_far _TurnedOnPC1Text
+	text_end
 
 AccessedBillsPCText:
-	TX_FAR _AccessedBillsPCText
-	db "@"
+	text_far _AccessedBillsPCText
+	text_end
 
 AccessedSomeonesPCText:
-	TX_FAR _AccessedSomeonesPCText
-	db "@"
+	text_far _AccessedSomeonesPCText
+	text_end
 
 AccessedMyPCText:
-	TX_FAR _AccessedMyPCText
-	db "@"
+	text_far _AccessedMyPCText
+	text_end
 
 ; removes one of the specified item ID [hItemToRemoveID] from bag (if existent)
 RemoveItemByID::
diff --git a/engine/menus/players_pc.asm b/engine/menus/players_pc.asm
index 403632fa..ebaacd52 100755
--- a/engine/menus/players_pc.asm
+++ b/engine/menus/players_pc.asm
@@ -247,57 +247,57 @@ PlayersPCMenuEntries:
 	next "LOG OFF@"
 
 TurnedOnPC2Text:
-	TX_FAR _TurnedOnPC2Text
-	db "@"
+	text_far _TurnedOnPC2Text
+	text_end
 
 WhatDoYouWantText:
-	TX_FAR _WhatDoYouWantText
-	db "@"
+	text_far _WhatDoYouWantText
+	text_end
 
 WhatToDepositText:
-	TX_FAR _WhatToDepositText
-	db "@"
+	text_far _WhatToDepositText
+	text_end
 
 DepositHowManyText:
-	TX_FAR _DepositHowManyText
-	db "@"
+	text_far _DepositHowManyText
+	text_end
 
 ItemWasStoredText:
-	TX_FAR _ItemWasStoredText
-	db "@"
+	text_far _ItemWasStoredText
+	text_end
 
 NothingToDepositText:
-	TX_FAR _NothingToDepositText
-	db "@"
+	text_far _NothingToDepositText
+	text_end
 
 NoRoomToStoreText:
-	TX_FAR _NoRoomToStoreText
-	db "@"
+	text_far _NoRoomToStoreText
+	text_end
 
 WhatToWithdrawText:
-	TX_FAR _WhatToWithdrawText
-	db "@"
+	text_far _WhatToWithdrawText
+	text_end
 
 WithdrawHowManyText:
-	TX_FAR _WithdrawHowManyText
-	db "@"
+	text_far _WithdrawHowManyText
+	text_end
 
 WithdrewItemText:
-	TX_FAR _WithdrewItemText
-	db "@"
+	text_far _WithdrewItemText
+	text_end
 
 NothingStoredText:
-	TX_FAR _NothingStoredText
-	db "@"
+	text_far _NothingStoredText
+	text_end
 
 CantCarryMoreText:
-	TX_FAR _CantCarryMoreText
-	db "@"
+	text_far _CantCarryMoreText
+	text_end
 
 WhatToTossText:
-	TX_FAR _WhatToTossText
-	db "@"
+	text_far _WhatToTossText
+	text_end
 
 TossHowManyText:
-	TX_FAR _TossHowManyText
-	db "@"
+	text_far _TossHowManyText
+	text_end
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index baf656b6..542ef873 100755
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -478,7 +478,7 @@ ShowPokedexDataInternal:
 	coord hl, 2, 8
 	ld a, "№"
 	ld [hli], a
-	ld a, "⠄"
+	ld a, "<DOT>"
 	ld [hli], a
 	ld de, wd11e
 	lb bc, LEADING_ZEROES | 1, 3
@@ -518,14 +518,14 @@ ShowPokedexDataInternal:
 	coord hl, 12, 6
 	lb bc, 1, 2
 	call PrintNumber ; print feet (height)
-	ld a, $60 ; feet symbol tile (one tick)
+	ld a, "′"
 	ld [hl], a
 	inc de
 	inc de ; de = address of inches (height)
 	coord hl, 15, 6
 	lb bc, LEADING_ZEROES | 1, 2
 	call PrintNumber ; print inches (height)
-	ld a, $61 ; inches symbol tile (two ticks)
+	ld a, "″"
 	ld [hl], a
 ; now print the weight (note that weight is stored in tenths of pounds internally)
 	inc de
@@ -558,7 +558,7 @@ ShowPokedexDataInternal:
 	inc hl
 	ld a, [hli]
 	ld [hld], a ; make space for the decimal point by moving the last digit forward one tile
-	ld [hl], "⠄" ; decimal point tile
+	ld [hl], "<DOT>" ; decimal point tile
 	pop af
 	ld [hDexWeight + 1], a ; restore original value of [hDexWeight + 1]
 	pop af
@@ -590,7 +590,7 @@ ShowPokedexDataInternal:
 	ret
 
 HeightWeightText:
-	db   "HT  ?",$60,"??",$61
+	db   "HT  ?′??″"
 	next "WT   ???lb@"
 
 ; XXX does anything point to this?
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index ee73c850..462e0eea 100755
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -28,8 +28,8 @@ LoadSAV:
 	ret
 
 FileDataDestroyedText:
-	TX_FAR _FileDataDestroyedText
-	db "@"
+	text_far _FileDataDestroyedText
+	text_end
 
 LoadSAV0:
 	ld a, SRAM_ENABLE
@@ -184,16 +184,16 @@ SaveSAVConfirm:
 	ret
 
 WouldYouLikeToSaveText:
-	TX_FAR _WouldYouLikeToSaveText
-	db "@"
+	text_far _WouldYouLikeToSaveText
+	text_end
 
 GameSavedText:
-	TX_FAR _GameSavedText
-	db "@"
+	text_far _GameSavedText
+	text_end
 
 OlderFileWillBeErasedText:
-	TX_FAR _OlderFileWillBeErasedText
-	db "@"
+	text_far _OlderFileWillBeErasedText
+	text_end
 
 SaveSAVtoSRAM0:
 	ld a, SRAM_ENABLE
@@ -386,8 +386,8 @@ ChangeBox::
 	ret
 
 WhenYouChangeBoxText:
-	TX_FAR _WhenYouChangeBoxText
-	db "@"
+	text_far _WhenYouChangeBoxText
+	text_end
 
 CopyBoxToOrFromSRAM:
 ; copy an entire box from hl to de with b as the SRAM bank
@@ -490,8 +490,8 @@ DisplayChangeBoxMenu:
 	ret
 
 ChooseABoxText:
-	TX_FAR _ChooseABoxText
-	db "@"
+	text_far _ChooseABoxText
+	text_end
 
 BoxNames:
 	db   "BOX 1"
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index 526540df..9ec06556 100755
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -190,8 +190,8 @@ StartMenu_Pokemon::
 	call GBPalWhiteOutWithDelay3
 	jp .goBackToMap
 .flashLightsAreaText
-	TX_FAR _FlashLightsAreaText
-	db "@"
+	text_far _FlashLightsAreaText
+	text_end
 .dig
 	ld a, ESCAPE_ROPE
 	ld [wcf91], a
@@ -225,14 +225,14 @@ StartMenu_Pokemon::
 	call GBPalWhiteOutWithDelay3
 	jp .goBackToMap
 .warpToLastPokemonCenterText
-	TX_FAR _WarpToLastPokemonCenterText
-	db "@"
+	text_far _WarpToLastPokemonCenterText
+	text_end
 .cannotUseTeleportNowText
-	TX_FAR _CannotUseTeleportNowText
-	db "@"
+	text_far _CannotUseTeleportNowText
+	text_end
 .cannotFlyHereText
-	TX_FAR _CannotFlyHereText
-	db "@"
+	text_far _CannotFlyHereText
+	text_end
 .softboiled
 	ld hl, wPartyMon1MaxHP
 	ld a, [wWhichPokemon]
@@ -270,8 +270,8 @@ StartMenu_Pokemon::
 	call PrintText
 	jp .loop
 .notHealthyEnoughText
-	TX_FAR _NotHealthyEnoughText
-	db "@"
+	text_far _NotHealthyEnoughText
+	text_end
 .goBackToMap
 	call RestoreScreenTilesAndReloadTilePatterns
 	jp CloseTextDisplay
@@ -280,8 +280,8 @@ StartMenu_Pokemon::
 	call PrintText
 	jp .loop
 .newBadgeRequiredText
-	TX_FAR _NewBadgeRequiredText
-	db "@"
+	text_far _NewBadgeRequiredText
+	text_end
 
 ; writes a blank tile to all possible menu cursor positions on the party menu
 ErasePartyMenuCursors::
@@ -439,12 +439,12 @@ StartMenu_Item::
 	jp ItemMenuLoop
 
 CannotUseItemsHereText:
-	TX_FAR _CannotUseItemsHereText
-	db "@"
+	text_far _CannotUseItemsHereText
+	text_end
 
 CannotGetOffHereText:
-	TX_FAR _CannotGetOffHereText
-	db "@"
+	text_far _CannotGetOffHereText
+	text_end
 
 INCLUDE "data/items/use_party.asm"
 
diff --git a/engine/menus/text_box.asm b/engine/menus/text_box.asm
index 00045959..e3de41b4 100644
--- a/engine/menus/text_box.asm
+++ b/engine/menus/text_box.asm
@@ -220,7 +220,9 @@ TextBoxTextAndCoordTable:
 BuySellQuitText:
 	db   "BUY"
 	next "SELL"
-	next "QUIT@@"
+	next "QUIT@"
+
+	db "@" ; unused
 
 UseTossText:
 	db   "USE"
@@ -245,7 +247,7 @@ JapaneseMainMenuText:
 	next "さいしょから@"
 
 BattleMenuText:
-	db   "FIGHT ",$E1,$E2
+	db   "FIGHT <PK><MN>"
 	next "ITEM  RUN@"
 
 SafariZoneBattleMenuText:
@@ -258,7 +260,7 @@ SwitchStatsCancelText:
 	next "CANCEL@"
 
 JapaneseAhText:
-	db "アッ!@"
+	db "アッ！@"
 
 JapanesePokedexMenu:
 	db   "データをみる"