Resolve issue #575: Rename text commands

engine/events/overworld.asm

@@ -61,7 +61,7 @@ CheckBadge:
 	; Sorry! A new BADGE
 	; is required.
 	text_far _BadgeRequiredText
-	db "@"
+	text_end
 
 CheckPartyMove:
 ; Check if a monster in your party has move d.
@@ -115,7 +115,7 @@ FieldMoveFailed:
 .CantUseHere:
 	; Can't use that here.
 	text_far UnknownText_0x1c05c8
-	db "@"
+	text_end
 
 CutFunction:
 	call FieldMoveJumptableReset
@@ -164,12 +164,12 @@ CutFunction:
 Text_UsedCut:
 	; used CUT!
 	text_far UnknownText_0x1c05dd
-	db "@"
+	text_end
 
 Text_NothingToCut:
 	; There's nothing to CUT here.
 	text_far UnknownText_0x1c05ec
-	db "@"
+	text_end
 
 CheckMapForSomethingToCut:
 	; Does the collision data of the facing tile permit cutting?
@@ -324,7 +324,7 @@ Script_UseFlash:
 
 UnknownText_0xc8f3:
 	text_far UnknownText_0x1c0609
-	start_asm
+	text_asm
 	call WaitSFX
 	ld de, SFX_FLASH
 	call PlaySFX
@@ -333,7 +333,7 @@ UnknownText_0xc8f3:
 	ret
 
 .BlankText:
-	db "@"
+	text_end
 
 SurfFunction:
 	call FieldMoveJumptableReset
@@ -430,15 +430,15 @@ UsedSurfScript:
 
 UsedSurfText:
 	text_far _UsedSurfText
-	db "@"
+	text_end
 
 CantSurfText:
 	text_far _CantSurfText
-	db "@"
+	text_end
 
 AlreadySurfingText:
 	text_far _AlreadySurfingText
-	db "@"
+	text_end
 
 GetSurfType:
 ; Surfing on Pikachu uses an alternate sprite.
@@ -545,8 +545,9 @@ AskSurfScript:
 	end
 
 AskSurfText:
-	text_far _AskSurfText ; The water is calm.
-	db "@"              ; Want to SURF?
+	; The water is calm. Want to SURF?
+	text_far _AskSurfText
+	text_end
 
 FlyFunction:
 	call FieldMoveJumptableReset
@@ -710,7 +711,7 @@ Script_UsedWaterfall:
 .Text_UsedWaterfall:
 	; used WATERFALL!
 	text_far UnknownText_0x1c068e
-	db "@"
+	text_end
 
 TryWaterfallOW::
 	ld d, WATERFALL
@@ -740,7 +741,7 @@ Script_CantDoWaterfall:
 .Text_CantDoWaterfall:
 	; Wow, it's a huge waterfall.
 	text_far UnknownText_0x1c06a3
-	db "@"
+	text_end
 
 Script_AskWaterfall:
 	opentext
@@ -753,7 +754,7 @@ Script_AskWaterfall:
 .AskUseWaterfall:
 	; Do you want to use WATERFALL?
 	text_far UnknownText_0x1c06bf
-	db "@"
+	text_end
 
 EscapeRopeFunction:
 	call FieldMoveJumptableReset
@@ -840,17 +841,17 @@ dig_incave
 .Text_UsedDig:
 	; used DIG!
 	text_far UnknownText_0x1c06de
-	db "@"
+	text_end
 
 .Text_UsedEscapeRope:
 	; used an ESCAPE ROPE.
 	text_far UnknownText_0x1c06ed
-	db "@"
+	text_end
 
 .Text_CantUseHere:
 	; Can't use that here.
 	text_far UnknownText_0x1c0705
-	db "@"
+	text_end
 
 .UsedEscapeRopeScript:
 	reloadmappart
@@ -939,12 +940,12 @@ TeleportFunction:
 .Text_ReturnToLastMonCenter:
 	; Return to the last #MON CENTER.
 	text_far UnknownText_0x1c071a
-	db "@"
+	text_end
 
 .Text_CantUseHere:
 	; Can't use that here.
 	text_far UnknownText_0x1c073b
-	db "@"
+	text_end
 
 .TeleportScript:
 	reloadmappart
@@ -992,7 +993,7 @@ StrengthFunction:
 
 .JumpText:
 	text_far UnknownText_0x1c0751
-	db "@"
+	text_end
 
 .Failed:
 	ld a, $80
@@ -1033,11 +1034,11 @@ Script_UsedStrength:
 
 .UsedStrength:
 	text_far UnknownText_0x1c0774
-	db "@"
+	text_end
 
 .StrengthAllowedItToMoveBoulders:
 	text_far UnknownText_0x1c0788
-	db "@"
+	text_end
 
 AskStrengthScript:
 	callasm TryStrengthOW
@@ -1062,17 +1063,17 @@ AskStrengthScript:
 UnknownText_0xcd69:
 	; A #MON may be able to move this. Want to use STRENGTH?
 	text_far UnknownText_0x1c07a0
-	db "@"
+	text_end
 
 UnknownText_0xcd6e:
 	; Boulders may now be moved!
 	text_far UnknownText_0x1c07d8
-	db "@"
+	text_end
 
 UnknownText_0xcd73:
 	; A #MON may be able to move this.
 	text_far UnknownText_0x1c07f4
-	db "@"
+	text_end
 
 TryStrengthOW:
 	ld d, STRENGTH
@@ -1148,7 +1149,7 @@ Jumptable_cdae:
 Text_UsedWhirlpool:
 	; used WHIRLPOOL!
 	text_far UnknownText_0x1c0816
-	db "@"
+	text_end
 
 TryWhirlpoolMenu:
 	call GetFacingTileCoord
@@ -1235,7 +1236,7 @@ Script_MightyWhirlpool:
 
 .MightyWhirlpoolText:
 	text_far UnknownText_0x1c082b
-	db "@"
+	text_end
 
 Script_AskWhirlpoolOW:
 	opentext
@@ -1247,7 +1248,7 @@ Script_AskWhirlpoolOW:
 
 UnknownText_0xce78:
 	text_far UnknownText_0x1c0864
-	db "@"
+	text_end
 
 HeadbuttFunction:
 	call TryHeadbuttFromMenu
@@ -1273,12 +1274,12 @@ TryHeadbuttFromMenu:
 UnknownText_0xce9d:
 	; did a HEADBUTT!
 	text_far UnknownText_0x1c0897
-	db "@"
+	text_end
 
 UnknownText_0xcea2:
 	; Nope. Nothing…
 	text_far UnknownText_0x1c08ac
-	db "@"
+	text_end
 
 HeadbuttFromMenuScript:
 	reloadmappart
@@ -1331,7 +1332,7 @@ AskHeadbuttScript:
 UnknownText_0xcee6:
 	; A #MON could be in this tree. Want to HEADBUTT it?
 	text_far UnknownText_0x1c08bc
-	db "@"
+	text_end
 
 RockSmashFunction:
 	call TryRockSmashFromMenu
@@ -1407,7 +1408,7 @@ MovementData_0xcf55:
 
 UnknownText_0xcf58:
 	text_far UnknownText_0x1c08f0
-	db "@"
+	text_end
 
 AskRockSmashScript:
 	callasm HasRockSmash
@@ -1425,12 +1426,12 @@ AskRockSmashScript:
 UnknownText_0xcf72:
 	; Maybe a #MON can break this.
 	text_far UnknownText_0x1c0906
-	db "@"
+	text_end
 
 UnknownText_0xcf77:
 	; This rock looks breakable. Want to use ROCK SMASH?
 	text_far UnknownText_0x1c0924
-	db "@"
+	text_end
 
 HasRockSmash:
 	ld d, ROCK_SMASH
@@ -1633,17 +1634,17 @@ PutTheRodAway:
 UnknownText_0xd0a4:
 	; Oh! A bite!
 	text_far UnknownText_0x1c0958
-	db "@"
+	text_end
 
 UnknownText_0xd0a9:
 	; Not even a nibble!
 	text_far UnknownText_0x1c0965
-	db "@"
+	text_end
 
 UnknownText_0xd0ae: ; unused
 	; Looks like there's nothing here.
 	text_far UnknownText_0x1c0979
-	db "@"
+	text_end
 
 BikeFunction:
 	call .TryBike
@@ -1777,17 +1778,17 @@ Script_CantGetOffBike:
 .CantGetOffBikeText:
 	; You can't get off here!
 	text_far UnknownText_0x1c099a
-	db "@"
+	text_end
 
 GotOnTheBikeText:
 	; got on the @ .
 	text_far UnknownText_0x1c09b2
-	db "@"
+	text_end
 
 GotOffTheBikeText:
 	; got off the @ .
 	text_far UnknownText_0x1c09c7
-	db "@"
+	text_end
 
 TryCutOW::
 	ld d, CUT
@@ -1833,11 +1834,11 @@ AskCutScript:
 
 UnknownText_0xd1c8:
 	text_far UnknownText_0x1c09dd
-	db "@"
+	text_end
 
 CantCutScript:
 	jumptext UnknownText_0xd1d0
 
 UnknownText_0xd1d0:
 	text_far UnknownText_0x1c0a05
-	db "@"
+	text_end