Resolve issue #575: Rename text commands

4 files changed, 90 insertions, 90 deletions

diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index f31f7c319..fe5ec5663 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1064,37 +1064,37 @@ LevelBallMultiplier:
 Text_RBY_CatchMarowak:
 	; It dodged the thrown BALL! This #MON can't be caught!
 	text_far UnknownText_0x1c5a5a
-	db "@"
+	text_end
 
 Text_RBY_NoShake:
 	; You missed the #MON!
 	text_far UnknownText_0x1c5a90
-	db "@"
+	text_end
 
 Text_NoShake:
 	; Oh no! The #MON broke free!
 	text_far UnknownText_0x1c5aa6
-	db "@"
+	text_end
 
 Text_OneShake:
 	; Aww! It appeared to be caught!
 	text_far UnknownText_0x1c5ac3
-	db "@"
+	text_end
 
 Text_TwoShakes:
 	; Aargh! Almost had it!
 	text_far UnknownText_0x1c5ae3
-	db "@"
+	text_end
 
 Text_ThreeShakes:
 	; Shoot! It was so close too!
 	text_far UnknownText_0x1c5afa
-	db "@"
+	text_end
 
 Text_GotchaMonWasCaught:
 	; Gotcha! @ was caught!@ @
 	text_far UnknownText_0x1c5b17
-	start_asm
+	text_asm
 	call WaitSFX
 	push bc
 	ld de, MUSIC_NONE
@@ -1109,22 +1109,22 @@ Text_GotchaMonWasCaught:
 TextJump_Waitbutton:
 	; @
 	text_far Text_Waitbutton_2
-	db "@"
+	text_end
 
 Text_SentToBillsPC:
 	; was sent to BILL's PC.
 	text_far UnknownText_0x1c5b38
-	db "@"
+	text_end
 
 Text_AddedToPokedex:
 	; 's data was newly added to the #DEX.@ @
 	text_far UnknownText_0x1c5b53
-	db "@"
+	text_end
 
 Text_AskNicknameNewlyCaughtMon:
 	; Give a nickname to @ ?
 	text_far UnknownText_0x1c5b7f
-	db "@"
+	text_end
 
 ReturnToBattle_UseBall:
 	farcall _ReturnToBattle_UseBall
@@ -1235,7 +1235,7 @@ RareCandy_StatBooster_ExitMenu:
 Text_StatRose:
 	; 's @  rose.
 	text_far UnknownText_0x1c5b9a
-	db "@"
+	text_end
 
 StatStrings:
 	dw .health
@@ -2063,7 +2063,7 @@ Softboiled_MilkDrinkFunction:
 .Text_CantBeUsed:
 	; That can't be used on this #MON.
 	text_far UnknownText_0x1c5bac
-	db "@"
+	text_end
 
 EscapeRopeEffect:
 	xor a
@@ -2099,7 +2099,7 @@ UseRepel:
 TextJump_RepelUsedEarlierIsStillInEffect:
 	; The REPEL used earlier is still in effect.
 	text_far Text_RepelUsedEarlierIsStillInEffect
-	db "@"
+	text_end
 
 XAccuracyEffect:
 	ld hl, wPlayerSubStatus4
@@ -2240,17 +2240,17 @@ PokeFluteEffect:
 .CatchyTune:
 	; Played the # FLUTE. Now, that's a catchy tune!
 	text_far UnknownText_0x1c5bf9
-	db "@"
+	text_end
 
 .AllSleepingMonWokeUp:
 	; All sleeping #MON woke up.
 	text_far UnknownText_0x1c5c28
-	db "@"
+	text_end
 
 .PlayedTheFlute:
 	; played the # FLUTE.@ @
 	text_far UnknownText_0x1c5c44
-	start_asm
+	text_asm
 	ld a, [wBattleMode]
 	and a
 	jr nz, .battle
@@ -2270,7 +2270,7 @@ BlueCardEffect:
 
 .bluecardtext
 	text_far UnknownText_0x1c5c5e
-	db "@"
+	text_end
 
 CoinCaseEffect:
 	ld hl, .coincasetext
@@ -2278,7 +2278,7 @@ CoinCaseEffect:
 
 .coincasetext
 	text_far UnknownText_0x1c5c7b
-	db "@"
+	text_end
 
 OldRodEffect:
 	ld e, $0
@@ -2533,27 +2533,27 @@ RestorePP:
 TextJump_RaiseThePPOfWhichMove:
 	; Raise the PP of which move?
 	text_far Text_RaiseThePPOfWhichMove
-	db "@"
+	text_end
 
 TextJump_RestoreThePPOfWhichMove:
 	; Restore the PP of which move?
 	text_far Text_RestoreThePPOfWhichMove
-	db "@"
+	text_end
 
 TextJump_PPIsMaxedOut:
 	; 's PP is maxed out.
 	text_far Text_PPIsMaxedOut
-	db "@"
+	text_end
 
 TextJump_PPsIncreased:
 	; 's PP increased.
 	text_far Text_PPsIncreased
-	db "@"
+	text_end
 
 UnknownText_0xf739:
 	; PP was restored.
 	text_far UnknownText_0x1c5cf1
-	db "@"
+	text_end
 
 SquirtbottleEffect:
 	farcall _Squirtbottle
@@ -2592,7 +2592,7 @@ OpenBox:
 .text
 	; There was a trophy inside!
 	text_far UnknownText_0x1c5d03
-	db "@"
+	text_end
 
 NoEffect:
 	jp IsntTheTimeMessage
@@ -2687,67 +2687,67 @@ CantUseItemMessage:
 LooksBitterText:
 	; It looks bitter…
 	text_far UnknownText_0x1c5d3e
-	db "@"
+	text_end
 
 CantUseOnEggText:
 	; That can't be used on an EGG.
 	text_far UnknownText_0x1c5d50
-	db "@"
+	text_end
 
 IsntTheTimeText:
 	; OAK:  ! This isn't the time to use that!
 	text_far UnknownText_0x1c5d6e
-	db "@"
+	text_end
 
 BelongsToSomeoneElseText:
 	; That belongs to someone else!
 	text_far UnknownText_0x1c5d97
-	db "@"
+	text_end
 
 WontHaveAnyEffectText:
 	; It won't have any effect.
 	text_far UnknownText_0x1c5db6
-	db "@"
+	text_end
 
 BlockedTheBallText:
 	; The trainer blocked the BALL!
 	text_far UnknownText_0x1c5dd0
-	db "@"
+	text_end
 
 DontBeAThiefText:
 	; Don't be a thief!
 	text_far UnknownText_0x1c5def
-	db "@"
+	text_end
 
 CyclingIsntAllowedText:
 	; Cycling isn't allowed here.
 	text_far UnknownText_0x1c5e01
-	db "@"
+	text_end
 
 CantGetOnYourBikeText:
 	; Can't get on your @  now.
 	text_far UnknownText_0x1c5e1d
-	db "@"
+	text_end
 
 Ball_BoxIsFullText:
 	; The #MON BOX is full. That can't be used now.
 	text_far UnknownText_0x1c5e3a
-	db "@"
+	text_end
 
 UsedItemText:
 	; used the@ .
 	text_far UnknownText_0x1c5e68
-	db "@"
+	text_end
 
 GotOnTheItemText:
 	; got on the@ .
 	text_far UnknownText_0x1c5e7b
-	db "@"
+	text_end
 
 GotOffTheItemText:
 	; got off@ the @ .
 	text_far UnknownText_0x1c5e90
-	db "@"
+	text_end
 
 ApplyPPUp:
 	ld a, MON_MOVES
diff --git a/engine/items/mart.asm b/engine/items/mart.asm
index d7abf1eb4..59fe89dc9 100644
--- a/engine/items/mart.asm
+++ b/engine/items/mart.asm
@@ -582,12 +582,12 @@ RooftopSaleAskPurchaseQuantity:
 Text_Mart_HowMany:
 	; How many?
 	text_far UnknownText_0x1c4bfd
-	db "@"
+	text_end
 
 Text_Mart_CostsThisMuch:
 	; @ (S) will be ¥@ .
 	text_far UnknownText_0x1c4c08
-	db "@"
+	text_end
 
 MenuHeader_Buy:
 	db MENU_BACKUP_TILES ; flags
@@ -625,107 +625,107 @@ MenuHeader_Buy:
 Text_HerbShop_Intro:
 	; Hello, dear. I sell inexpensive herbal medicine. They're good, but a trifle bitter. Your #MON may not like them. Hehehehe…
 	text_far UnknownText_0x1c4c28
-	db "@"
+	text_end
 
 Text_HerbShop_HowMany:
 	; How many?
 	text_far UnknownText_0x1c4ca3
-	db "@"
+	text_end
 
 Text_HerbShop_CostsThisMuch:
 	; @ (S) will be ¥@ .
 	text_far UnknownText_0x1c4cae
-	db "@"
+	text_end
 
 Text_HerbShop_HereYouGo:
 	; Thank you, dear. Hehehehe…
 	text_far UnknownText_0x1c4cce
-	db "@"
+	text_end
 
 Text_HerbShop_BagFull:
 	; Oh? Your PACK is full, dear.
 	text_far UnknownText_0x1c4cea
-	db "@"
+	text_end
 
 Text_HerbShop_InsufficientFunds:
 	; Hehehe… You don't have the money.
 	text_far UnknownText_0x1c4d08
-	db "@"
+	text_end
 
 Text_HerbShop_ComeAgain:
 	; Come again, dear. Hehehehe…
 	text_far UnknownText_0x1c4d2a
-	db "@"
+	text_end
 
 Text_BargainShop_Intro:
 	; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item.
 	text_far UnknownText_0x1c4d47
-	db "@"
+	text_end
 
 Text_BargainShop_CostsThisMuch:
 	; costs ¥@ . Want it?
 	text_far UnknownText_0x1c4db0
-	db "@"
+	text_end
 
 Text_BargainShop_HereYouGo:
 	; Thanks.
 	text_far UnknownText_0x1c4dcd
-	db "@"
+	text_end
 
 Text_BargainShop_BagFull:
 	; Uh-oh, your PACK is chock-full.
 	text_far UnknownText_0x1c4dd6
-	db "@"
+	text_end
 
 Text_BargainShop_SoldOut:
 	; You bought that already. I'm all sold out of it.
 	text_far UnknownText_0x1c4df7
-	db "@"
+	text_end
 
 Text_BargainShop_InsufficientFunds:
 	; Uh-oh, you're short on funds.
 	text_far UnknownText_0x1c4e28
-	db "@"
+	text_end
 
 Text_BargainShop_ComeAgain:
 	; Come by again sometime.
 	text_far UnknownText_0x1c4e46
-	db "@"
+	text_end
 
 Text_Pharmacist_Intro:
 	; What's up? Need some medicine?
 	text_far UnknownText_0x1c4e5f
-	db "@"
+	text_end
 
 Text_Pharmacy_HowMany:
 	; How many?
 	text_far UnknownText_0x1c4e7e
-	db "@"
+	text_end
 
 Text_Pharmacy_CostsThisMuch:
 	; @ (S) will cost ¥@ .
 	text_far UnknownText_0x1c4e89
-	db "@"
+	text_end
 
 Text_Pharmacy_HereYouGo:
 	; Thanks much!
 	text_far UnknownText_0x1c4eab
-	db "@"
+	text_end
 
 Text_Pharmacy_BagFull:
 	; You don't have any more space.
 	text_far UnknownText_0x1c4eb9
-	db "@"
+	text_end
 
 Text_Pharmacy_InsufficientFunds:
 	; Huh? That's not enough money.
 	text_far UnknownText_0x1c4ed8
-	db "@"
+	text_end
 
 Text_Pharmacist_ComeAgain:
 	; All right. See you around.
 	text_far UnknownText_0x1c4ef6
-	db "@"
+	text_end
 
 SellMenu:
 	call DisableSpriteUpdates
@@ -752,7 +752,7 @@ SellMenu:
 .NothingToSellText:
 	; You don't have anything to sell.
 	text_far UnknownText_0x1c4f12
-	db "@"
+	text_end
 
 .TryToSellItem:
 	farcall CheckItemMenu
@@ -821,12 +821,12 @@ SellMenu:
 Text_Mart_SellHowMany:
 	; How many?
 	text_far UnknownText_0x1c4f33
-	db "@"
+	text_end
 
 Text_Mart_ICanPayThisMuch:
 	; I can pay you ¥@ . Is that OK?
 	text_far UnknownText_0x1c4f3e
-	db "@"
+	text_end
 
 .UnusedString15f7d:
 	db "！ダミー！@"
@@ -834,7 +834,7 @@ Text_Mart_ICanPayThisMuch:
 Text_Mart_HowMayIHelpYou:
 	; Welcome! How may I help you?
 	text_far UnknownText_0x1c4f62
-	db "@"
+	text_end
 
 MenuHeader_BuySell:
 	db MENU_BACKUP_TILES ; flags
@@ -852,35 +852,35 @@ MenuHeader_BuySell:
 Text_Mart_HereYouGo:
 	; Here you are. Thank you!
 	text_far UnknownText_0x1c4f80
-	db "@"
+	text_end
 
 Text_Mart_InsufficientFunds:
 	; You don't have enough money.
 	text_far UnknownText_0x1c4f9a
-	db "@"
+	text_end
 
 Text_Mart_BagFull:
 	; You can't carry any more items.
 	text_far UnknownText_0x1c4fb7
-	db "@"
+	text_end
 
 TextMart_CantBuyFromYou:
 	; Sorry, I can't buy that from you.
 	text_far UnknownText_0x1c4fd7
-	db "@"
+	text_end
 
 Text_Mart_ComeAgain:
 	; Please come again!
 	text_far UnknownText_0x1c4ff9
-	db "@"
+	text_end
 
 Text_Mart_AnythingElse:
 	text_far UnknownText_0x1c500d
-	db "@"
+	text_end
 
 Text_Mart_SoldForAmount:
 	text_far UnknownText_0x1c502e
-	db "@"
+	text_end
 
 PlayTransactionSound:
 	call WaitSFX
diff --git a/engine/items/pack.asm b/engine/items/pack.asm
index 6d7fc7e10..97f04f604 100644
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@@ -617,7 +617,7 @@ GiveItem:
 .Egg:
 	; An EGG can't hold an item.
 	text_far Text_AnEGGCantHoldAnItem
-	db "@"
+	text_end
 
 QuitItemSubmenu:
 	ret
@@ -1549,58 +1549,58 @@ PC_Mart_BallsPocketMenuHeader:
 Text_PackNoItems:
 	; No items.
 	text_far UnknownText_0x1c0b9a
-	db "@"
+	text_end
 
 Text_ThrowAwayHowMany:
 	; Throw away how many?
 	text_far UnknownText_0x1c0ba5
-	db "@"
+	text_end
 
 Text_ConfirmThrowAway:
 	; Throw away @ @ (S)?
 	text_far UnknownText_0x1c0bbb
-	db "@"
+	text_end
 
 Text_ThrewAway:
 	; Threw away @ (S).
 	text_far UnknownText_0x1c0bd8
-	db "@"
+	text_end
 
 Text_ThisIsntTheTime:
 	; OAK:  ! This isn't the time to use that!
 	text_far UnknownText_0x1c0bee
-	db "@"
+	text_end
 
 TextJump_YouDontHaveAMon:
 	; You don't have a #MON!
 	text_far Text_YouDontHaveAMon
-	db "@"
+	text_end
 
 Text_RegisteredItem:
 	; Registered the @ .
 	text_far UnknownText_0x1c0c2e
-	db "@"
+	text_end
 
 Text_CantRegister:
 	; You can't register that item.
 	text_far UnknownText_0x1c0c45
-	db "@"
+	text_end
 
 Text_MoveItemWhere:
 	; Where should this be moved to?
 	text_far UnknownText_0x1c0c63
-	db "@"
+	text_end
 
 Text_PackEmptyString:
 	;
 	text_far UnknownText_0x1c0c83
-	db "@"
+	text_end
 
 TextJump_YouCantUseItInABattle:
 	; Doesn't seem to be used anywhere
 	; "You can't use it in a battle."
 	text_far Text_YouCantUseItInABattle
-	db "@"
+	text_end
 
 PackMenuGFX:
 INCBIN "gfx/pack/pack_menu.2bpp"
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm
index cf71d8467..98222e4b6 100644
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -169,22 +169,22 @@ TeachTMHM:
 Text_BootedTM:
 	; Booted up a TM.
 	text_far UnknownText_0x1c0373
-	db "@"
+	text_end
 
 Text_BootedHM:
 	; Booted up an HM.
 	text_far UnknownText_0x1c0384
-	db "@"
+	text_end
 
 Text_ItContained:
 	; It contained @ . Teach @ to a #MON?
 	text_far UnknownText_0x1c0396
-	db "@"
+	text_end
 
 Text_TMHMNotCompatible:
 	; is not compatible with @ . It can't learn @ .
 	text_far UnknownText_0x1c03c2
-	db "@"
+	text_end
 
 TMHM_PocketLoop:
 	xor a
@@ -500,12 +500,12 @@ Unreferenced_Function2cadf:
 .NoRoomText:
 	; You have no room for any more @ S.
 	text_far UnknownText_0x1c03fa
-	db "@"
+	text_end
 
 .ReceivedText:
 	; You received @ !
 	text_far UnknownText_0x1c0421
-	db "@"
+	text_end
 
 .CheckHaveRoomForTMHM:
 	ld a, [wTempTMHM]