summaryrefslogtreecommitdiff
path: root/engine/events/bug_contest
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-11-17 13:33:03 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-11-18 12:41:11 -0500
commit3202c4f3dfeac64d815e3b5ee3ee8e891c2b1ba2 (patch)
treef71e627c4af610124b7f77cc4a9c2dad2adf02f6 /engine/events/bug_contest
parentc05a2d255befc2d3b7fdf3c5375fa9a015c13632 (diff)
Resolve issue #575: Rename text commands
Diffstat (limited to 'engine/events/bug_contest')
-rw-r--r--engine/events/bug_contest/caught_mon.asm2
-rw-r--r--engine/events/bug_contest/contest.asm4
-rw-r--r--engine/events/bug_contest/display_stats.asm4
-rw-r--r--engine/events/bug_contest/judging.asm12
4 files changed, 11 insertions, 11 deletions
diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm
index 4d62f189e..71e6f1f62 100644
--- a/engine/events/bug_contest/caught_mon.asm
+++ b/engine/events/bug_contest/caught_mon.asm
@@ -35,4 +35,4 @@ BugContest_SetCaughtContestMon:
.caughttext
; Caught @ !
text_far UnknownText_0x1c10c0
- db "@"
+ text_end
diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm
index 8937d024f..7a5d0885a 100644
--- a/engine/events/bug_contest/contest.asm
+++ b/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
diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm
index 3232b3f37..0e9ba5fd0 100644
--- a/engine/events/bug_contest/display_stats.asm
+++ b/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:
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index 276104788..a166269d5 100644
--- a/engine/events/bug_contest/judging.asm
+++ b/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.