Resolve issue #575: Rename text commands

engine/battle/ai/items.asm

@@ -709,7 +709,7 @@ AI_Switch:
 
 TextJump_EnemyWithdrew:
 	text_far Text_EnemyWithdrew
-	db "@"
+	text_end
 
 Function384d5: ; This appears to be unused
 	call AIUsedItemSound
@@ -829,4 +829,4 @@ PrintText_UsedItemOn:
 
 TextJump_EnemyUsedOn:
 	text_far Text_EnemyUsedOn
-	db "@"
+	text_end

engine/battle/core.asm

@@ -6864,8 +6864,9 @@ Unreferenced_LoadHPExpBarGFX:
 EmptyBattleTextBox:
 	ld hl, .empty
 	jp BattleTextBox
-.empty
-	db "@"
+
+.empty:
+	text_end
 
 _BattleRandom::
 ; If the normal RNG is used in a link battle it'll desync.
@@ -7399,7 +7400,7 @@ BoostExp:
 
 Text_MonGainedExpPoint:
 	text_far Text_Gained
-	start_asm
+	text_asm
 	ld hl, TextJump_StringBuffer2ExpPoints
 	ld a, [wStringBuffer2 + 2] ; IsTradedMon
 	and a
@@ -7410,11 +7411,11 @@ Text_MonGainedExpPoint:
 
 TextJump_ABoostedStringBuffer2ExpPoints:
 	text_far Text_ABoostedStringBuffer2ExpPoints
-	db "@"
+	text_end
 
 TextJump_StringBuffer2ExpPoints:
 	text_far Text_StringBuffer2ExpPoints
-	db "@"
+	text_end
 
 AnimateExpBar:
 	push bc
@@ -7665,29 +7666,29 @@ SendOutMonText:
 
 JumpText_GoMon:
 	text_far Text_GoMon
-	start_asm
+	text_asm
 	jr Function_TextJump_BattleMonNick01
 
 JumpText_DoItMon:
 	text_far Text_DoItMon
-	start_asm
+	text_asm
 	jr Function_TextJump_BattleMonNick01
 
 JumpText_GoForItMon:
 	text_far Text_GoForItMon
-	start_asm
+	text_asm
 	jr Function_TextJump_BattleMonNick01
 
 JumpText_YourFoesWeakGetmMon:
 	text_far Text_YourFoesWeakGetmMon
-	start_asm
+	text_asm
 Function_TextJump_BattleMonNick01:
 	ld hl, TextJump_BattleMonNick01
 	ret
 
 TextJump_BattleMonNick01:
 	text_far Text_BattleMonNick01
-	db "@"
+	text_end
 
 WithdrawMonText:
 	ld hl, .WithdrawMonText
@@ -7695,7 +7696,7 @@ WithdrawMonText:
 
 .WithdrawMonText:
 	text_far Text_BattleMonNickComma
-	start_asm
+	text_asm
 ; Print text to withdraw mon
 ; depending on HP the message is different
 	push de
@@ -7746,15 +7747,15 @@ WithdrawMonText:
 
 TextJump_ThatsEnoughComeBack:
 	text_far Text_ThatsEnoughComeBack
-	db "@"
+	text_end
 
 TextJump_OKComeBack:
 	text_far Text_OKComeBack
-	db "@"
+	text_end
 
 TextJump_GoodComeBack:
 	text_far Text_GoodComeBack
-	db "@"
+	text_end
 
 Unreferenced_TextJump_ComeBack:
 ; this function doesn't seem to be used
@@ -7763,7 +7764,7 @@ Unreferenced_TextJump_ComeBack:
 
 TextJump_ComeBack:
 	text_far Text_ComeBack
-	db "@"
+	text_end
 
 Unreferenced_HandleSafariAngerEatingStatus:
 	ld hl, wSafariMonEating

engine/battle/effect_commands.asm

@@ -4543,7 +4543,7 @@ BattleCommand_StatUpMessage:
 
 .stat
 	text_far UnknownText_0x1c0cc6
-	start_asm
+	text_asm
 	ld hl, .up
 	ld a, [wLoweredStat]
 	and $f0
@@ -4553,11 +4553,11 @@ BattleCommand_StatUpMessage:
 
 .wayup
 	text_far UnknownText_0x1c0cd0
-	db "@"
+	text_end
 
 .up
 	text_far UnknownText_0x1c0ce0
-	db "@"
+	text_end
 
 BattleCommand_StatDownMessage:
 	ld a, [wFailedMessage]
@@ -4573,7 +4573,7 @@ BattleCommand_StatDownMessage:
 
 .stat
 	text_far UnknownText_0x1c0ceb
-	start_asm
+	text_asm
 	ld hl, .fell
 	ld a, [wLoweredStat]
 	and $f0
@@ -4583,10 +4583,11 @@ BattleCommand_StatDownMessage:
 
 .sharplyfell
 	text_far UnknownText_0x1c0cf5
-	db "@"
+	text_end
+
 .fell
 	text_far UnknownText_0x1c0d06
-	db "@"
+	text_end
 
 TryLowerStat:
 ; Lower stat c from stat struct hl (buffer de).
@@ -5637,7 +5638,7 @@ BattleCommand_Charge:
 
 .UsedText:
 	text_far UnknownText_0x1c0d0e ; "<USER>"
-	start_asm
+	text_asm
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 	cp RAZOR_WIND
@@ -5669,32 +5670,32 @@ BattleCommand_Charge:
 .RazorWind:
 ; 'made a whirlwind!'
 	text_far UnknownText_0x1c0d12
-	db "@"
+	text_end
 
 .Solarbeam:
 ; 'took in sunlight!'
 	text_far UnknownText_0x1c0d26
-	db "@"
+	text_end
 
 .SkullBash:
 ; 'lowered its head!'
 	text_far UnknownText_0x1c0d3a
-	db "@"
+	text_end
 
 .SkyAttack:
 ; 'is glowing!'
 	text_far UnknownText_0x1c0d4e
-	db "@"
+	text_end
 
 .Fly:
 ; 'flew up high!'
 	text_far UnknownText_0x1c0d5c
-	db "@"
+	text_end
 
 .Dig:
 ; 'dug a hole!'
 	text_far UnknownText_0x1c0d6c
-	db "@"
+	text_end
 
 BattleCommand3c:
 ; unused
@@ -6857,8 +6858,8 @@ BattleCommand_ClearText:
 	ld hl, .text
 	jp BattleTextBox
 
-.text
-	db "@"
+.text:
+	text_end
 
 SkipToBattleCommand:
 ; Skip over commands until reaching command b.

engine/battle/menu.asm

@@ -88,7 +88,7 @@ MenuData_0x24f91:
 
 Strings24f9a:
 	db "FIGHT@"
-	db "<PKMN>", "@"
+	db "<PKMN>@"
 	db "PARKBALL×  @"
 	db "RUN@"
 

engine/battle/used_move_text.asm

@@ -7,7 +7,7 @@ DisplayUsedMoveText:
 UsedMoveText:
 ; this is a stream of text and asm from 105db9 to 105ef6
 	text_far _ActorNameText
-	start_asm
+	text_asm
 	ldh a, [hBattleTurn]
 	and a
 	jr nz, .start
@@ -59,12 +59,12 @@ UsedMoveText:
 
 UsedMove1Text:
 	text_far _UsedMove1Text
-	start_asm
+	text_asm
 	jr UsedMoveText_CheckObedience
 
 UsedMove2Text:
 	text_far _UsedMove2Text
-	start_asm
+	text_asm
 UsedMoveText_CheckObedience:
 ; check obedience
 	ld a, [wAlreadyDisobeyed]
@@ -76,14 +76,14 @@ UsedMoveText_CheckObedience:
 
 .UsedInsteadText:
 	text_far _UsedInsteadText
-	start_asm
+	text_asm
 .GetMoveNameText:
 	ld hl, MoveNameText
 	ret
 
 MoveNameText:
 	text_far _MoveNameText
-	start_asm
+	text_asm
 ; get start address
 	ld hl, .endusedmovetexts
 
@@ -116,19 +116,23 @@ MoveNameText:
 
 EndUsedMove1Text:
 	text_far _EndUsedMove1Text
-	db "@"
+	text_end
+
 EndUsedMove2Text:
 	text_far _EndUsedMove2Text
-	db "@"
+	text_end
+
 EndUsedMove3Text:
 	text_far _EndUsedMove3Text
-	db "@"
+	text_end
+
 EndUsedMove4Text:
 	text_far _EndUsedMove4Text
-	db "@"
+	text_end
+
 EndUsedMove5Text:
 	text_far _EndUsedMove5Text
-	db "@"
+	text_end
 
 GetMoveGrammar:
 ; store move grammar type in wMoveGrammar

engine/events/battle_tower/rules.asm

@@ -23,7 +23,7 @@ CheckForMobileBattleRules:
 .ExcuseMeText:
 	; Excuse me!
 	text_far UnknownText_0x1c5937
-	db "@"
+	text_end
 
 _CheckForBattleTowerRules:
 	ld hl, wStringBuffer2
@@ -58,7 +58,7 @@ _CheckForBattleTowerRules:
 JumpText_ExcuseMeYoureNotReady:
 	; Excuse me. You're not ready.
 	text_far Text_ExcuseMeYoureNotReady
-	db "@"
+	text_end
 
 BattleTower_PleaseReturnWhenReady:
 	ld hl, .PleaseReturnWhenReady
@@ -68,37 +68,37 @@ BattleTower_PleaseReturnWhenReady:
 .PleaseReturnWhenReady:
 	; Please return when you're ready.
 	text_far UnknownText_0x1c5962
-	db "@"
+	text_end
 
 JumpText_NeedAtLeastThreeMon:
 	; You need at least three #MON.
 	text_far UnknownText_0x1c5983
-	db "@"
+	text_end
 
 JumpText_EggDoesNotQualify:
 	; Sorry, an EGG doesn't qualify.
 	text_far UnknownText_0x1c59a3
-	db "@"
+	text_end
 
 JumpText_OnlyThreeMonMayBeEntered:
 	; Only three #MON may be entered.
 	text_far Text_OnlyThreeMonMayBeEntered
-	db "@"
+	text_end
 
 JumpText_TheMonMustAllBeDifferentKinds:
 	; The @  #MON must all be different kinds.
 	text_far Text_TheMonMustAllBeDifferentKinds
-	db "@"
+	text_end
 
 JumpText_TheMonMustNotHoldTheSameItems:
 	; The @  #MON must not hold the same items.
 	text_far Text_TheMonMustNotHoldTheSameItems
-	db "@"
+	text_end
 
 JumpText_YouCantTakeAnEgg:
 	; You can't take an EGG!
 	text_far Text_YouCantTakeAnEgg
-	db "@"
+	text_end
 
 BattleTower_ExecuteJumptable:
 	ld bc, 0

engine/events/buena.asm

@@ -149,31 +149,32 @@ BuenaPrize:
 .Text_AskWhichPrize:
 	; Which prize would you like?
 	text_far UnknownText_0x1c589f
-	db "@"
+	text_end
 
 .Text_IsThatRight:
 	; ? Is that right?
 	text_far UnknownText_0x1c58bc
-	db "@"
+	text_end
 
-.Text_HereYouGo:	; Here you go!
+.Text_HereYouGo:
+	; Here you go!
 	text_far UnknownText_0x1c58d1
-	db "@"
+	text_end
 
 .Text_NotEnoughPoints:
 	; You don't have enough points.
 	text_far UnknownText_0x1c58e0
-	db "@"
+	text_end
 
 .Text_NoRoom:
 	; You have no room for it.
 	text_far UnknownText_0x1c58ff
-	db "@"
+	text_end
 
 .Text_PleaseComeBackAgain:
 	; Oh. Please come back again!
 	text_far UnknownText_0x1c591a
-	db "@"
+	text_end
 
 Buena_DisplayBlueCardBalance:
 	ld hl, BlueCardBalanceMenuHeader

engine/events/bug_contest/caught_mon.asm

@@ -35,4 +35,4 @@ BugContest_SetCaughtContestMon:
 .caughttext
 	; Caught @ !
 	text_far UnknownText_0x1c10c0
-	db "@"
+	text_end

engine/events/bug_contest/contest.asm

@@ -35,9 +35,9 @@ BugCatchingContestReturnToGateScript:
 BugCatchingContestText_BeeepTimesUp:
 	; ANNOUNCER: BEEEP! Time's up!
 	text_far UnknownText_0x1bd2ca
-	db "@"
+	text_end
 
 BugCatchingContestText_ContestIsOver:
 	; ANNOUNCER: The Contest is over!
 	text_far UnknownText_0x1bd2e7
-	db "@"
+	text_end

engine/events/bug_contest/display_stats.asm

@@ -89,7 +89,7 @@ DisplayCaughtContestMonStats:
 SwitchMonText:
 	; Switch #MON?
 	text_far UnknownText_0x1c10cf
-	db "@"
+	text_end
 
 DisplayAlreadyCaughtText:
 	call GetPokemonName
@@ -99,7 +99,7 @@ DisplayAlreadyCaughtText:
 .AlreadyCaughtText:
 	; You already caught a @ .
 	text_far UnknownText_0x1c10dd
-	db "@"
+	text_end
 
 DummyPredef2F:
 DummyPredef38:

engine/events/bug_contest/judging.asm

@@ -27,7 +27,7 @@ _BugContestJudging:
 
 BugContest_FirstPlaceText:
 	text_far ContestJudging_FirstPlaceText
-	start_asm
+	text_asm
 	ld de, SFX_1ST_PLACE
 	call PlaySFX
 	call WaitSFX
@@ -37,12 +37,12 @@ BugContest_FirstPlaceText:
 BugContest_FirstPlaceScoreText:
 	; The winning score was @  points!
 	text_far ContestJudging_FirstPlaceScoreText
-	db "@"
+	text_end
 
 BugContest_SecondPlaceText:
 	; Placing second was @ , who caught a @ !@ @
 	text_far ContestJudging_SecondPlaceText
-	start_asm
+	text_asm
 	ld de, SFX_2ND_PLACE
 	call PlaySFX
 	call WaitSFX
@@ -52,12 +52,12 @@ BugContest_SecondPlaceText:
 BugContest_SecondPlaceScoreText:
 	; The score was @  points!
 	text_far ContestJudging_SecondPlaceScoreText
-	db "@"
+	text_end
 
 BugContest_ThirdPlaceText:
 	; Placing third was @ , who caught a @ !@ @
 	text_far ContestJudging_ThirdPlaceText
-	start_asm
+	text_asm
 	ld de, SFX_3RD_PLACE
 	call PlaySFX
 	call WaitSFX
@@ -67,7 +67,7 @@ BugContest_ThirdPlaceText:
 BugContest_ThirdPlaceScoreText:
 	; The score was @  points!
 	text_far ContestJudging_ThirdPlaceScoreText
-	db "@"
+	text_end
 
 LoadContestantName:
 ; If a = 1, get your name.

engine/events/daycare.asm

@@ -169,7 +169,7 @@ DayCareAskDepositPokemon:
 .DummyText:
 	;
 	text_far UnknownText_0x1bdaa7
-	db "@"
+	text_end
 
 DayCare_DepositPokemonText:
 	ld a, DAYCARETEXT_DEPOSIT
@@ -298,102 +298,102 @@ PrintDayCareText:
 .DayCareManIntro:
 	; I'm the DAY-CARE MAN. Want me to raise a #MON?
 	text_far UnknownText_0x1bdaa9
-	db "@"
+	text_end
 
 .DayCareManOddEgg:
 	; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON?
 	text_far UnknownText_0x1bdad8
-	db "@"
+	text_end
 
 .DayCareLadyIntro:
 	; I'm the DAY-CARE LADY. Should I raise a #MON for you?
 	text_far UnknownText_0x1bdb85
-	db "@"
+	text_end
 
 .DayCareLadyOddEgg:
 	; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you?
 	text_far UnknownText_0x1bdbbb
-	db "@"
+	text_end
 
 .WhichOne:
 	; What should I raise for you?
 	text_far UnknownText_0x1bdc79
-	db "@"
+	text_end
 
 .JustOneMon:
 	; Oh? But you have just one #MON.
 	text_far UnknownText_0x1bdc97
-	db "@"
+	text_end
 
 .CantAcceptEgg:
 	; Sorry, but I can't accept an EGG.
 	text_far UnknownText_0x1bdcb8
-	db "@"
+	text_end
 
 .RemoveMail:
 	; Remove MAIL before you come see me.
 	text_far UnknownText_0x1bdcda
-	db "@"
+	text_end
 
 .LastHealthyMon:
 	; If you give me that, what will you battle with?
 	text_far UnknownText_0x1bdcff
-	db "@"
+	text_end
 
 .OkayIllRaiseYourMon:
 	; OK. I'll raise your @ .
 	text_far UnknownText_0x1bdd30
-	db "@"
+	text_end
 
 .ComeBackForItLater:
 	; Come back for it later.
 	text_far UnknownText_0x1bdd4b
-	db "@"
+	text_end
 
 .AreWeGeniusesOrWhat:
 	; Are we geniuses or what? Want to see your @ ?
 	text_far UnknownText_0x1bdd64
-	db "@"
+	text_end
 
 .AskRetrieveMon:
 	; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ .
 	text_far UnknownText_0x1bdd96
-	db "@"
+	text_end
 
 .PerfectHeresYourMon:
 	; Perfect! Here's your #MON.
 	text_far UnknownText_0x1bde04
-	db "@"
+	text_end
 
 .GotBackMon:
 	; got back @ .
 	text_far UnknownText_0x1bde1f
-	db "@"
+	text_end
 
 .ImmediatelyWithdrawMon:
 	; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100.
 	text_far UnknownText_0x1bde32
-	db "@"
+	text_end
 
 .PartyFull:
 	; You have no room for it.
 	text_far UnknownText_0x1bdea2
-	db "@"
+	text_end
 
 .NotEnoughMoney:
 	; You don't have enough money.
 	text_far UnknownText_0x1bdebc
-	db "@"
+	text_end
 
 .OhFineThen:
 	; Oh, fine then.
 	text_far UnknownText_0x1bded9
-	db "@"
+	text_end
 
 .ComeAgain:
 	; Come again.
 	text_far UnknownText_0x1bdee9
-	db "@"
+	text_end
 
 DayCareManOutside:
 	ld hl, wDayCareMan
@@ -406,7 +406,7 @@ DayCareManOutside:
 .NotYet:
 	; Not yet…
 	text_far UnknownText_0x1bdef6
-	db "@"
+	text_end
 
 .AskGiveEgg:
 	ld hl, .IntroText
@@ -448,27 +448,27 @@ DayCareManOutside:
 .IntroText:
 	; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it?
 	text_far UnknownText_0x1bdf00
-	db "@"
+	text_end
 
 .GotEggText:
 	; received the EGG!
 	text_far UnknownText_0x1bdfa5
-	db "@"
+	text_end
 
 .TakeGoodCareOfItText:
 	; Take good care of it.
 	text_far UnknownText_0x1bdfba
-	db "@"
+	text_end
 
 .IllKeepItThanksText:
 	; Well then, I'll keep it. Thanks!
 	text_far UnknownText_0x1bdfd1
-	db "@"
+	text_end
 
 .PartyFullText:
 	; You have no room in your party. Come back later.
 	text_far UnknownText_0x1bdff2
-	db "@"
+	text_end
 
 DayCare_GiveEgg:
 	ld a, [wEggMonLevel]

engine/events/elevator.asm

@@ -140,7 +140,7 @@ Elevator_AskWhichFloor:
 Elevator_WhichFloorText:
 	; Which floor?
 	text_far UnknownText_0x1bd2bc
-	db "@"
+	text_end
 
 Elevator_GetCurrentFloorText:
 	ld hl, wOptions

engine/events/fruit_trees.asm

@@ -98,20 +98,20 @@ INCLUDE "data/items/fruit_trees.asm"
 
 FruitBearingTreeText:
 	text_far _FruitBearingTreeText
-	db "@"
+	text_end
 
 HeyItsFruitText:
 	text_far _HeyItsFruitText
-	db "@"
+	text_end
 
 ObtainedFruitText:
 	text_far _ObtainedFruitText
-	db "@"
+	text_end
 
 FruitPackIsFullText:
 	text_far _FruitPackIsFullText
-	db "@"
+	text_end
 
 NothingHereText:
 	text_far _NothingHereText
-	db "@"
+	text_end

engine/events/itemfinder.asm

@@ -44,9 +44,9 @@ ItemFinder:
 .Text_FoundSomething:
 	; Yes! ITEMFINDER indicates there's an item nearby.
 	text_far UnknownText_0x1c0a77
-	db "@"
+	text_end
 
 .Text_FoundNothing:
 	; Nope! ITEMFINDER isn't responding.
 	text_far UnknownText_0x1c0aa9
-	db "@"
+	text_end

engine/events/kurt.asm

@@ -6,7 +6,7 @@ Kurt_PrintTextWhichApricorn:
 .Text:
 	; Which APRICORN should I use?
 	text_far UnknownText_0x1bc06b
-	db "@"
+	text_end
 
 Kurt_PrintTextHowMany:
 	ld hl, .Text
@@ -16,7 +16,7 @@ Kurt_PrintTextHowMany:
 .Text:
 	; How many should I make?
 	text_far UnknownText_0x1bc089
-	db "@"
+	text_end
 
 SelectApricornForKurt:
 	call LoadStandardMenuHeader

engine/events/lucky_number.asm

@@ -209,12 +209,12 @@ CheckForLuckyNumberWinners:
 .FoundPartymonText:
 	; Congratulations! We have a match with the ID number of @  in your party.
 	text_far UnknownText_0x1c1261
-	db "@"
+	text_end
 
 .FoundBoxmonText:
 	; Congratulations! We have a match with the ID number of @  in your PC BOX.
 	text_far UnknownText_0x1c12ae
-	db "@"
+	text_end
 
 PrintTodaysLuckyNumber:
 	ld hl, wStringBuffer3

engine/events/magikarp.asm

@@ -74,7 +74,7 @@ CheckMagikarpLength:
 .MeasureItText:
 	; Let me measure that MAGIKARP. …Hm, it measures @ .
 	text_far UnknownText_0x1c1203
-	db "@"
+	text_end
 
 Magikarp_LoadFeetInchesChars:
 	ld hl, vTiles2 tile "′" ; $6e
@@ -314,4 +314,4 @@ MagikarpHouseSign:
 .CurrentRecordtext:
 	; "CURRENT RECORD"
 	text_far UnknownText_0x1c123a
-	db "@"
+	text_end

engine/events/misc_scripts.asm

@@ -30,12 +30,12 @@ FindItemInBallScript::
 .text_found
 	; found @ !
 	text_far UnknownText_0x1c0a1c
-	db "@"
+	text_end
 
 .text_bag_full
 	; But   can't carry any more items.
 	text_far UnknownText_0x1c0a2c
-	db "@"
+	text_end
 
 .TryReceiveItem:
 	xor a