Merge pull request #577 from Rangi42/master

Resolve issue #575: Rename text commands

data/phone/text/bill.asm

@@ -44,7 +44,7 @@ BillPhoneNotFullText:
 
 	para "<PLAY_G>, your BOX"
 	line "has room for @"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text_start
 	cont "more #MON."
 
@@ -59,7 +59,7 @@ BillPhoneNearlyFullText:
 	para "<PLAY_G>, your BOX"
 	line "has room for only"
 	cont "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text " more #MON."
 
 	para "Maybe you should"

data/phone/text/gaven_overworld.asm

@@ -12,7 +12,7 @@ GavenAskNumber1Text:
 	line "again when I heal"
 
 	para "@"
-	text_from_ram wStringBuffer4
+	text_ram wStringBuffer4
 	text " and the"
 	line "rest of my team."
 	done
@@ -25,7 +25,7 @@ GavenAskNumber2Text:
 	line "again when I heal"
 
 	para "@"
-	text_from_ram wStringBuffer4
+	text_ram wStringBuffer4
 	text " and the"
 	line "rest of my team."
 	done

data/phone/text/jose_overworld.asm

@@ -1,6 +1,6 @@
 JoseAskNumber1Text:
 	text "If my @"
-	text_from_ram wStringBuffer4
+	text_ram wStringBuffer4
 	text_start
 	line "sees anything"
 

data/phone/text/mom.asm

@@ -8,12 +8,12 @@ MomPhoneGreetingText:
 MomPhoneLandmarkText:
 	text "Oh, so you're in"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "…"
 
 	para "Isn't that where"
 	line "@"
-	text_from_ram wStringBuffer4
+	text_ram wStringBuffer4
 	text_start
 	para "is? Did you go"
 	line "take a look?"
@@ -22,7 +22,7 @@ MomPhoneLandmarkText:
 MomPhoneGenericAreaText:
 	text "Really, you're in"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "?"
 
 	para "I've never gone"
@@ -33,7 +33,7 @@ MomPhoneGenericAreaText:
 MomPhoneNewBarkText:
 	text "What? You're in"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "?"
 
 	para "Come see your MOM"
@@ -43,7 +43,7 @@ MomPhoneNewBarkText:
 MomPhoneCherrygroveText:
 	text "You're visiting"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "?"
 
 	para "How about coming"
@@ -53,7 +53,7 @@ MomPhoneCherrygroveText:
 MomOtherAreaText:
 	text "Wow, you're in"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "?"
 
 	para "Good luck on your"
@@ -74,7 +74,7 @@ MomDeterminedText:
 MomCheckBalanceText:
 	text "By the way, you've"
 	line "saved up ¥@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "."
 
 	para "Do you want to"
@@ -97,7 +97,7 @@ MomYoureNotSavingText:
 MomYouveSavedText:
 	text "By the way, you've"
 	line "saved up ¥@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "."
 
 	para "Want to start"

data/text/battle.asm

@@ -3,13 +3,13 @@ BattleText:: ; used only for BANK(BattleText)
 BattleText_PlayerPickedUpPayDayMoney:
 	text "<PLAYER> picked up"
 	line "¥@"
-	deciram wPayDayMoney, 3, 6
+	text_decimal wPayDayMoney, 3, 6
 	text "!"
 	prompt
 
 WildPokemonAppearedText:
 	text "Wild @"
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text_start
 	line "appeared!"
 	prompt
@@ -17,20 +17,20 @@ WildPokemonAppearedText:
 HookedPokemonAttackedText:
 	text "The hooked"
 	line "@"
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text_start
 	cont "attacked!"
 	prompt
 
 PokemonFellFromTreeText:
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text " fell"
 	line "out of the tree!"
 	prompt
 
 WildCelebiAppearedText:
 	text "Wild @"
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text_start
 	line "appeared!"
 	prompt
@@ -42,14 +42,14 @@ WantsToBattleText::
 
 BattleText_WildFled:
 	text "Wild @"
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text_start
 	line "fled!"
 	prompt
 
 BattleText_EnemyFled:
 	text "Enemy @"
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text_start
 	line "fled!"
 	prompt
@@ -87,7 +87,7 @@ SandstormHitsText:
 PerishCountText:
 	text "<USER>'s"
 	line "PERISH count is @"
-	deciram wDeciramBuffer, 1, 1
+	text_decimal wDeciramBuffer, 1, 1
 	text "!"
 	prompt
 
@@ -95,7 +95,7 @@ BattleText_TargetRecoveredWithItem:
 	text "<TARGET>"
 	line "recovered with"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "."
 	prompt
 
@@ -103,7 +103,7 @@ BattleText_UserRecoveredPPUsing:
 	text "<USER>"
 	line "recovered PP using"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "."
 	prompt
 
@@ -119,13 +119,13 @@ BattleText_SafeguardFaded:
 	prompt
 
 BattleText_MonsLightScreenFell:
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text " #MON's"
 	line "LIGHT SCREEN fell!"
 	prompt
 
 BattleText_MonsReflectFaded:
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text " #MON's"
 	line "REFLECT faded!"
 	prompt
@@ -161,14 +161,14 @@ BattleText_TheSandstormSubsided:
 
 BattleText_EnemyMonFainted:
 	text "Enemy @"
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text_start
 	line "fainted!"
 	prompt
 
 GotMoneyForWinningText:
 	text "<PLAYER> got ¥@"
-	deciram wBattleReward, 3, 6
+	text_decimal wBattleReward, 3, 6
 	text_start
 	line "for winning!"
 	prompt
@@ -185,7 +185,7 @@ TiedAgainstText:
 
 SentSomeToMomText:
 	text "<PLAYER> got ¥@"
-	deciram wBattleReward, 3, 6
+	text_decimal wBattleReward, 3, 6
 	text_start
 	line "for winning!"
 	cont "Sent some to MOM!"
@@ -206,7 +206,7 @@ BattleText_0x80a4f:
 	prompt
 
 BattleText_MonFainted:
-	text_from_ram wBattleMonNick
+	text_ram wBattleMonNick
 	text_start
 	line "fainted!"
 	prompt
@@ -230,7 +230,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
 	text "<ENEMY>"
 	line "is about to use"
 	cont "@"
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text "."
 
 	para "Will <PLAYER>"
@@ -241,7 +241,7 @@ BattleText_EnemySentOut:
 	text "<ENEMY>"
 	line "sent out"
 	cont "@"
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text "!"
 	done
 
@@ -273,7 +273,7 @@ BattleText_UserFledUsingAStringBuffer1:
 	text "<USER>"
 	line "fled using a"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "!"
 	prompt
 
@@ -290,14 +290,14 @@ RecoveredUsingText:
 	text "<TARGET>"
 	line "recovered using a"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "!"
 	prompt
 
 BattleText_UsersStringBuffer1Activated:
 	text "<USER>'s"
 	line "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text_start
 	cont "activated!"
 	prompt
@@ -308,13 +308,13 @@ BattleText_ItemsCantBeUsedHere:
 	prompt
 
 BattleText_MonIsAlreadyOut:
-	text_from_ram wBattleMonNick
+	text_ram wBattleMonNick
 	text_start
 	line "is already out."
 	prompt
 
 BattleText_MonCantBeRecalled:
-	text_from_ram wBattleMonNick
+	text_ram wBattleMonNick
 	text_start
 	line "can't be recalled!"
 	prompt
@@ -330,7 +330,7 @@ BattleText_TheMoveIsDisabled:
 	prompt
 
 BattleText_MonHasNoMovesLeft:
-	text_from_ram wBattleMonNick
+	text_ram wBattleMonNick
 	text_start
 	line "has no moves left!"
 	done
@@ -341,24 +341,26 @@ BattleText_TargetsEncoreEnded:
 	prompt
 
 BattleText_StringBuffer1GrewToLevel:
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text " grew to"
 	line "level @"
-	deciram wCurPartyLevel, 1, 3
+	text_decimal wCurPartyLevel, 1, 3
 	text "!@"
 	sound_dex_fanfare_50_79
-	db "@@"
+	text_end
+
+	text_end ; unused
 
 BattleText_WildMonIsEating:
 	text "Wild @"
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text_start
 	line "is eating!"
 	prompt
 
 BattleText_WildMonIsAngry:
 	text "Wild @"
-	text_from_ram wEnemyMonNick
+	text_ram wEnemyMonNick
 	text_start
 	line "is angry!"
 	prompt
@@ -416,7 +418,7 @@ BecameConfusedText:
 
 BattleText_ItemHealedConfusion: ; ItemHealedConfusion
 	text "A @"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text " rid"
 	line "<TARGET>"
 	cont "of its confusion."
@@ -431,7 +433,7 @@ BattleText_UsersHurtByStringBuffer1:
 	text "<USER>'s"
 	line "hurt by"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "!"
 	prompt
 
@@ -439,7 +441,7 @@ BattleText_UserWasReleasedFromStringBuffer1:
 	text "<USER>"
 	line "was released from"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "!"
 	prompt
 
@@ -485,7 +487,7 @@ HungOnText:
 	text "<TARGET>"
 	line "hung on with"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "!"
 	prompt
 
@@ -509,43 +511,43 @@ InfatuationText:
 DisabledMoveText:
 	text "<USER>'s"
 	line "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text " is"
 	cont "DISABLED!"
 	prompt
 
 LoafingAroundText:
-	text_from_ram wBattleMonNick
+	text_ram wBattleMonNick
 	text " is"
 	line "loafing around."
 	prompt
 
 BeganToNapText:
-	text_from_ram wBattleMonNick
+	text_ram wBattleMonNick
 	text " began"
 	line "to nap!"
 	prompt
 
 WontObeyText:
-	text_from_ram wBattleMonNick
+	text_ram wBattleMonNick
 	text " won't"
 	line "obey!"
 	prompt
 
 TurnedAwayText:
-	text_from_ram wBattleMonNick
+	text_ram wBattleMonNick
 	text " turned"
 	line "away!"
 	prompt
 
 IgnoredOrdersText:
-	text_from_ram wBattleMonNick
+	text_ram wBattleMonNick
 	text " ignored"
 	line "orders!"
 	prompt
 
 IgnoredSleepingText:
-	text_from_ram wBattleMonNick
+	text_ram wBattleMonNick
 	text " ignored"
 	line "orders…sleeping!"
 	prompt
@@ -559,7 +561,7 @@ HasNoPPLeftText:
 	text "<USER>"
 	line "has no PP left for"
 	cont "@"
-	text_from_ram wStringBuffer2
+	text_ram wStringBuffer2
 	text "!"
 	prompt
 
@@ -653,7 +655,7 @@ SketchedText:
 	text "<USER>"
 	line "SKETCHED"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "!"
 	prompt
 
@@ -666,10 +668,10 @@ DestinyBondEffectText:
 SpiteEffectText:
 	text "<TARGET>'s"
 	line "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text " was"
 	cont "reduced by @"
-	deciram wDeciramBuffer, 1, 1
+	text_decimal wDeciramBuffer, 1, 1
 	text "!"
 	prompt
 
@@ -731,7 +733,7 @@ WasFrozenText:
 WontRiseAnymoreText:
 	text "<USER>'s"
 	line "@"
-	text_from_ram wStringBuffer2
+	text_ram wStringBuffer2
 	text " won't"
 	cont "rise anymore!"
 	prompt
@@ -739,7 +741,7 @@ WontRiseAnymoreText:
 WontDropAnymoreText:
 	text "<TARGET>'s"
 	line "@"
-	text_from_ram wStringBuffer2
+	text_ram wStringBuffer2
 	text " won't"
 	cont "drop anymore!"
 	prompt
@@ -761,13 +763,13 @@ BlownAwayText:
 
 PlayerHitTimesText:
 	text "Hit @"
-	deciram wPlayerDamageTaken, 1, 1
+	text_decimal wPlayerDamageTaken, 1, 1
 	text " times!"
 	prompt
 
 EnemyHitTimesText:
 	text "Hit @"
-	deciram wEnemyDamageTaken, 1, 1
+	text_decimal wEnemyDamageTaken, 1, 1
 	text " times!"
 	prompt
 
@@ -782,7 +784,7 @@ ProtectedByMistText:
 	prompt
 
 GettingPumpedText:
-	interpret_data
+	text_pause
 	text "<USER>'s"
 	line "getting pumped!"
 	prompt
@@ -822,7 +824,7 @@ LearnedMoveText:
 	text "<USER>"
 	line "learned"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "!"
 	prompt
 
@@ -839,7 +841,7 @@ EvadedText:
 WasDisabledText:
 	text "<TARGET>'s"
 	line "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text " was"
 	cont "DISABLED!"
 	prompt
@@ -853,7 +855,7 @@ TransformedTypeText:
 	text "<USER>"
 	line "transformed into"
 	cont "the @"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "-type!"
 	prompt
 
@@ -866,7 +868,7 @@ TransformedText:
 	text "<USER>"
 	line "TRANSFORMED into"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "!"
 	prompt
 
@@ -933,7 +935,7 @@ ProtectedByText:
 	text "<TARGET>'s"
 	line "protected by"
 	cont "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "!"
 	prompt
 
@@ -945,7 +947,7 @@ MirrorMoveFailedText:
 StoleText:
 	text "<USER>"
 	line "stole @"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text_start
 	cont "from its foe!"
 	prompt
@@ -1029,7 +1031,7 @@ SafeguardProtectText:
 
 MagnitudeText:
 	text "Magnitude @"
-	deciram wDeciramBuffer, 1, 1
+	text_decimal wDeciramBuffer, 1, 1
 	text "!"
 	prompt
 
@@ -1079,7 +1081,7 @@ ForesawAttackText:
 	prompt
 
 BeatUpAttackText:
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text "'s"
 	line "attack!"
 	done

data/text/std_text.asm

@@ -231,18 +231,18 @@ ContestResults_ReadyToJudgeText:
 
 ContestResults_PlayerWonAPrizeText:
 	text "<PLAYER>, the No.@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text_start
 	line "finisher, wins"
 	cont "@"
-	text_from_ram wStringBuffer4
+	text_ram wStringBuffer4
 	text "!"
 	done
 
 ReceivedItemText:
 	text "<PLAYER> received"
 	line "@"
-	text_from_ram wStringBuffer4
+	text_ram wStringBuffer4
 	text "."
 	done
 
@@ -279,14 +279,14 @@ ContestResults_PartyFullText:
 	done
 
 GymStatue_CityGymText:
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text_start
 	line "#MON GYM"
 	done
 
 GymStatue_WinningTrainersText:
 	text "LEADER: @"
-	text_from_ram wStringBuffer4
+	text_ram wStringBuffer4
 	text_start
 	para "WINNING TRAINERS:"
 	line "<PLAYER>"
@@ -376,13 +376,13 @@ HappinessText1:
 RegisteredNumber1Text:
 	text "<PLAYER> registered"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "'s number."
 	done
 
 RegisteredNumber2Text:
 	text "<PLAYER> registered"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "'s number."
 	done

docs/bugs_and_glitches.md

@@ -632,16 +632,16 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper
  	text_start
  	line "a boosted"
  	cont "@"
--	deciram wStringBuffer2, 2, 4
-+	deciram wStringBuffer2, 2, 5
+-	text_decimal wStringBuffer2, 2, 4
++	text_decimal wStringBuffer2, 2, 5
  	text " EXP. Points!"
  	prompt
 
  Text_StringBuffer2ExpPoints::
  	text_start
  	line "@"
--	deciram wStringBuffer2, 2, 4
-+	deciram wStringBuffer2, 2, 5
+-	text_decimal wStringBuffer2, 2, 4
++	text_decimal wStringBuffer2, 2, 5
  	text " EXP. Points!"
  	prompt
 ```

docs/text_commands.md

@@ -3,47 +3,12 @@
 Defined in [macros/scripts/text.asm](/macros/scripts/text.asm) and [home/text.asm:TextCommands](/home/text.asm).
 
 
-## `$00`: <code>text <i>text</i></code>
+## `$00`: `text_start`
 
-Start writing text until `"@"`.
+Start writing text until `"@"`. The text can use [control characters](#control-characters).
 
 
-## `$4E`: <code>next <i>text</i></code>
-
-Move a line down.
-
-
-## `$4F`: <code>line <i>text</i></code>
-
-Start writing at the bottom line.
-
-
-## `$50`: <code>page <i>text</i></code>
-
-Start a new Pokédex page.
-
-
-## `$51`: <code>para <i>text</i></code>
-
-Start a new paragraph.
-
-
-## `$55`: <code>cont <i>text</i></code>
-
-Scroll to the next line.
-
-
-## `$57`: `done`
-
-End a text box.
-
-
-## `$58`: `prompt`
-
-Prompt the player to end a text box (initiating some other event).
-
-
-## `$01`: <code>text_from_ram <i>address</i></code>
+## `$01`: <code>text_ram <i>address</i></code>
 
 Write text from a RAM address.
 
@@ -81,19 +46,19 @@ Pushes text up two lines and sets the `bc` cursor to the border tile below the
 first character column of the text box.
 
 
-## `$08`: `start_asm`
+## `$08`: `text_asm`
 
 Start interpreting assembly code.
 
 
-## `$09`: <code>deciram <i>address</i>, <i>bytes</i>, <i>digits</i></code>
+## `$09`: <code>text_decimal <i>address</i>, <i>bytes</i>, <i>digits</i></code>
 
 Read *bytes* bytes from *address* and print them as a *digits*-digit number.
 
 
-## `$0A`: `interpret_data`
+## `$0A`: `text_pause`
 
-Exit.
+Pause for 30 frames unless A or B is pressed.
 
 
 ## `$0B`: `sound_dex_fanfare_50_79`
@@ -101,12 +66,12 @@ Exit.
 Play `SFX_DEX_FANFARE_50_79`.
 
 
-## `$0C`: <code>limited_interpret_data <i>n</i></code>
+## `$0C`: <code>text_dots <i>n</i></code>
 
-Print *n* `"…"`s.
+Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed.
 
 
-## `$0D`: `link_wait_button`
+## `$0D`: `text_linkwaitbutton`
 
 Wait for button press; show arrow.
 
@@ -154,7 +119,7 @@ Write text from one of the following addresses (listed in [data/text_buffers.asm
 6. `BattleMonNick`
 
 
-## `$15`: `current_day`
+## `$15`: `text_today`
 
 Print the weekday.
 
@@ -164,6 +129,51 @@ Print the weekday.
 Write text from a different bank.
 
 
-## `$00`: `text_start`
+## `$50`: `text_end`
 
-Start writing regular text again after a special command.
+Stops processing text commands.
+
+
+# Control characters
+
+These get interpreted in the context of printing regular text. Macros exist to conveniently place the control characters.
+
+
+## `$00`: <code>text <i>text</i></code>
+
+Start writing text until `"@"`. (Not actually a control character, but shorter than `text_start` followed by `db`.)
+
+
+## `$4E`, `"<NEXT>"`: <code>next <i>text</i></code>
+
+Move a line down.
+
+
+## `$4F`, `"<LINE>"`: <code>line <i>text</i></code>
+
+Start writing at the bottom line.
+
+
+## `$50`, `"@"`: <code>page <i>text</i></code>
+
+Start a new Pokédex page.
+
+
+## `$51`, `"<PARA>"`: <code>para <i>text</i></code>
+
+Start a new paragraph.
+
+
+## `$55`, `"<CONT>"`: <code>cont <i>text</i></code>
+
+Scroll to the next line.
+
+
+## `$57`, `"<DONE>"`: `done`
+
+End a text box.
+
+
+## `$58`, `"<PROMPT>"`: `prompt`
+
+Prompt the player to end a text box (initiating some other event).

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