Resolve issue #575: Rename text commands

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

engine/events/misc_scripts_2.asm

@@ -8,7 +8,7 @@ RepelWoreOffScript::
 .text
 	; REPEL's effect wore off.
 	text_far UnknownText_0x1bd308
-	db "@"
+	text_end
 
 HiddenItemScript::
 	opentext
@@ -34,12 +34,12 @@ HiddenItemScript::
 .found_text
 	; found @ !
 	text_far UnknownText_0x1bd321
-	db "@"
+	text_end
 
 .no_room_text
 	; But   has no space left…
 	text_far UnknownText_0x1bd331
-	db "@"
+	text_end
 
 SetMemEvent:
 	ld hl, wEngineBuffer1

engine/events/mom.asm

@@ -392,33 +392,33 @@ DSTChecks:
 .Text_AdjustClock:
 	; Do you want to adjust your clock for Daylight Saving Time?
 	text_far UnknownText_0x1c6095
-	db "@"
+	text_end
 
 .Text_LostInstructionBooklet:
 	; I lost the instruction booklet for the POKéGEAR.
 	; Come back again in a while.
 	text_far UnknownText_0x1c60d1
-	db "@"
+	text_end
 
 .Text_SwitchToDST:
 	; Do you want to switch to Daylight Saving Time?
 	text_far UnknownText_0x1c6000
-	db "@"
+	text_end
 
 .Text_SetClockForward:
 	; I set the clock forward by one hour.
 	text_far UnknownText_0x1c6030
-	db "@"
+	text_end
 
 .Text_IsDSTOver:
 	; Is Daylight Saving Time over?
 	text_far UnknownText_0x1c6056
-	db "@"
+	text_end
 
 .Text_SetClockBack:
 	; I put the clock back one hour.
 	text_far UnknownText_0x1c6075
-	db "@"
+	text_end
 
 Mom_SetUpWithdrawMenu:
 	ld de, Mon_WithdrawString
@@ -593,82 +593,82 @@ Mom_WithdrawDepositMenuJoypad:
 UnknownText_0x16649:
 	; Wow, that's a cute #MON. Where did you get it? … So, you're leaving on an adventure… OK! I'll help too. But what can I do for you? I know! I'll save money for you. On a long journey, money's important. Do you want me to save your money?
 	text_far UnknownText_0x1bd77f
-	db "@"
+	text_end
 
 UnknownText_0x1664e:
 	; OK, I'll take care of your money.
 	text_far UnknownText_0x1bd868
-	db "@"
+	text_end
 
 UnknownText_0x16653:
 	; Be careful. #MON are your friends. You need to work as a team. Now, go on!
 	text_far UnknownText_0x1bd88e
-	db "@"
+	text_end
 
 UnknownText_0x16658:
 	; Hi! Welcome home! You're trying very hard, I see. I've kept your room tidy. Or is this about your money?
 	text_far UnknownText_0x1bd8da
-	db "@"
+	text_end
 
 UnknownText_0x1665d:
 	; What do you want to do?
 	text_far UnknownText_0x1bd942
-	db "@"
+	text_end
 
 UnknownText_0x16662:
 	; How much do you want to save?
 	text_far UnknownText_0x1bd95b
-	db "@"
+	text_end
 
 UnknownText_0x16667:
 	; How much do you want to take?
 	text_far UnknownText_0x1bd97a
-	db "@"
+	text_end
 
 UnknownText_0x1666c:
 	; Do you want to save some money?
 	text_far UnknownText_0x1bd999
-	db "@"
+	text_end
 
 UnknownText_0x16671:
 	; You haven't saved that much.
 	text_far UnknownText_0x1bd9ba
-	db "@"
+	text_end
 
 UnknownText_0x16676:
 	; You can't take that much.
 	text_far UnknownText_0x1bd9d7
-	db "@"
+	text_end
 
 UnknownText_0x1667b:
 	; You don't have that much.
 	text_far UnknownText_0x1bd9f1
-	db "@"
+	text_end
 
 UnknownText_0x16680:
 	; You can't save that much.
 	text_far UnknownText_0x1bda0b
-	db "@"
+	text_end
 
 UnknownText_0x16685:
 	; OK, I'll save your money. Trust me! , stick with it!
 	text_far UnknownText_0x1bda25
-	db "@"
+	text_end
 
 UnknownText_0x1668a:
 	; Your money's safe here! Get going!
 	text_far UnknownText_0x1bda5b
-	db "@"
+	text_end
 
 UnknownText_0x1668f:
 	; , don't give up!
 	text_far UnknownText_0x1bda7e
-	db "@"
+	text_end
 
 UnknownText_0x16694:
 	; Just do what you can.
 	text_far UnknownText_0x1bda90
-	db "@"
+	text_end
 
 Mom_SavedString:
 	db "SAVED@"

engine/events/mom_phone.asm

@@ -209,32 +209,32 @@ INCLUDE "data/items/mom_phone.asm"
 _MomText_HiHowAreYou:
 	; Hi,  ! How are you?
 	text_far UnknownText_0x1bc615
-	db "@"
+	text_end
 
 _MomText_FoundAnItem:
 	; I found a useful item shopping, so
 	text_far UnknownText_0x1bc62a
-	db "@"
+	text_end
 
 _MomText_BoughtWithYourMoney:
 	; I bought it with your money. Sorry!
 	text_far UnknownText_0x1bc64e
-	db "@"
+	text_end
 
 _MomText_ItsInPC:
 	; It's in your PC. You'll like it!
 	text_far UnknownText_0x1bc673
-	db "@"
+	text_end
 
 _MomText_FoundADoll:
 	; While shopping today, I saw this adorable doll, so
 	text_far UnknownText_0x1bc693
-	db "@"
+	text_end
 
 _MomText_ItsInRoom:
 	; It's in your room. You'll love it!
 	text_far UnknownText_0x1bc6c7
-	db "@"
+	text_end
 
 	db 0 ; unused
 

engine/events/move_deleter.asm

@@ -62,42 +62,42 @@ MoveDeletion:
 .OnlyOneMoveText:
 	; That #MON knows only one move.
 	text_far UnknownText_0x1c5eba
-	db "@"
+	text_end
 
 .ConfirmDeleteText:
 	; Oh, make it forget @ ?
 	text_far UnknownText_0x1c5eda
-	db "@"
+	text_end
 
 .MoveDeletedText:
 	; Done! Your #MON forgot the move.
 	text_far UnknownText_0x1c5ef5
-	db "@"
+	text_end
 
 .EggText:
 	; An EGG doesn't know any moves!
 	text_far UnknownText_0x1c5f17
-	db "@"
+	text_end
 
 .DeclinedDeletionText:
 	; No? Come visit me again.
 	text_far UnknownText_0x1c5f36
-	db "@"
+	text_end
 
 .AskWhichMoveText:
 	; Which move should it forget, then?
 	text_far UnknownText_0x1c5f50
-	db "@"
+	text_end
 
 .IntroText:
 	; Um… Oh, yes, I'm the MOVE DELETER. I can make #MON forget moves. Shall I make a #MON forget?
 	text_far UnknownText_0x1c5f74
-	db "@"
+	text_end
 
 .AskWhichMonText:
 	; Which #MON?
 	text_far UnknownText_0x1c5fd1
-	db "@"
+	text_end
 
 .DeleteMove:
 	ld a, b

engine/events/name_rater.asm

@@ -183,53 +183,53 @@ NameRaterIntroText:
 	; I rate the names of #MON.
 	; Would you like me to rate names?
 	text_far UnknownText_0x1c0043
-	db "@"
+	text_end
 
 NameRaterWhichMonText:
 	; Which #MON's nickname should I rate for you?
 	text_far UnknownText_0x1c00a0
-	db "@"
+	text_end
 
 NameRaterIsGoodText:
 	; Hm… @ … That's a fairly decent name.
 	; But, how about a slightly better nickname?
 	; Want me to give it a better name?
 	text_far UnknownText_0x1c00cd
-	db "@"
+	text_end
 
 NameRaterWhichNameText:
 	; All right. What name should we give it, then?
 	text_far UnknownText_0x1c0142
-	db "@"
+	text_end
 
 NameRaterEvenBetterText:
 	; That's a better name than before! Well done!
 	text_far UnknownText_0x1c0171
-	db "@"
+	text_end
 
 NameRaterCancelText:
 	; OK, then. Come again sometime.
 	text_far UnknownText_0x1c019e
-	db "@"
+	text_end
 
 NameRaterTradedText:
 	; Hm… @ ? What a great name! It's perfect.
 	; Treat @ with loving care.
 	text_far UnknownText_0x1c01be
-	db "@"
+	text_end
 
 NameRaterEggText:
 	; Whoa… That's just an EGG.
 	text_far UnknownText_0x1c0208
-	db "@"
+	text_end
 
 NameRaterSameAsBeforeText:
 	; It might look the different as before,
 	; but this new name is much better! Well done!
 	text_far UnknownText_0x1c0222
-	db "@"
+	text_end
 
 NameRaterDoneText:
 	; All right. This #MON is now named @ .
 	text_far UnknownText_0x1c0272
-	db "@"
+	text_end