Merge pull request #577 from Rangi42/master

Resolve issue #575: Rename text commands

5 files changed, 49 insertions, 43 deletions

diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm
index 2bc92c719..b7a6de644 100644
--- a/engine/battle/ai/items.asm
+++ b/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
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index cb2c7e330..8d9e9b512 100644
--- a/engine/battle/core.asm
+++ b/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
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index 2dafc04ba..9adf90c82 100644
--- a/engine/battle/effect_commands.asm
+++ b/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.
diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm
index 147430030..12d65476b 100644
--- a/engine/battle/menu.asm
+++ b/engine/battle/menu.asm
@@ -88,7 +88,7 @@ MenuData_0x24f91:
 
 Strings24f9a:
 	db "FIGHT@"
-	db "<PKMN>", "@"
+	db "<PKMN>@"
 	db "PARKBALL×  @"
 	db "RUN@"
 
diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm
index 11e004a21..88522ee32 100644
--- a/engine/battle/used_move_text.asm
+++ b/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