diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-10-28 17:16:55 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-11-05 22:26:18 +0100 |
| commit | 940256569b84e71c5a448709d67964735ff4a5c9 (patch) | |
| tree | 33e78661f5317aa93b54e501272bb5c5040a0574 /engine/events/bug_contest | |
| parent | 0af682d38ae9e60095dc2a0e11830fc8fec15d02 (diff) | |
text_jump → text_far
The previous name for this was rather misleading. It isn't an actual
jump like you'd expect the `jp` instruction to behave as. Instead, it
behaves more like a `farcall`.
This also makes it consistent with its current command ID name of
`TX_FAR`.
Diffstat (limited to 'engine/events/bug_contest')
| -rw-r--r-- | engine/events/bug_contest/caught_mon.asm | 2 | ||||
| -rw-r--r-- | engine/events/bug_contest/contest.asm | 4 | ||||
| -rw-r--r-- | engine/events/bug_contest/display_stats.asm | 4 | ||||
| -rw-r--r-- | engine/events/bug_contest/judging.asm | 12 |
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 fc170cf28..4d62f189e 100644 --- a/engine/events/bug_contest/caught_mon.asm +++ b/engine/events/bug_contest/caught_mon.asm @@ -34,5 +34,5 @@ BugContest_SetCaughtContestMon: .caughttext ; Caught @ ! - text_jump UnknownText_0x1c10c0 + text_far UnknownText_0x1c10c0 db "@" diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 4cf4f949a..8937d024f 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -34,10 +34,10 @@ BugCatchingContestReturnToGateScript: BugCatchingContestText_BeeepTimesUp: ; ANNOUNCER: BEEEP! Time's up! - text_jump UnknownText_0x1bd2ca + text_far UnknownText_0x1bd2ca db "@" BugCatchingContestText_ContestIsOver: ; ANNOUNCER: The Contest is over! - text_jump UnknownText_0x1bd2e7 + text_far UnknownText_0x1bd2e7 db "@" diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 9d92f8fe3..3232b3f37 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -88,7 +88,7 @@ DisplayCaughtContestMonStats: SwitchMonText: ; Switch #MON? - text_jump UnknownText_0x1c10cf + text_far UnknownText_0x1c10cf db "@" DisplayAlreadyCaughtText: @@ -98,7 +98,7 @@ DisplayAlreadyCaughtText: .AlreadyCaughtText: ; You already caught a @ . - text_jump UnknownText_0x1c10dd + text_far UnknownText_0x1c10dd db "@" DummyPredef2F: diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index a23535998..276104788 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -26,7 +26,7 @@ _BugContestJudging: jp BugContest_GetPlayersResult BugContest_FirstPlaceText: - text_jump ContestJudging_FirstPlaceText + text_far ContestJudging_FirstPlaceText start_asm ld de, SFX_1ST_PLACE call PlaySFX @@ -36,12 +36,12 @@ BugContest_FirstPlaceText: BugContest_FirstPlaceScoreText: ; The winning score was @ points! - text_jump ContestJudging_FirstPlaceScoreText + text_far ContestJudging_FirstPlaceScoreText db "@" BugContest_SecondPlaceText: ; Placing second was @ , who caught a @ !@ @ - text_jump ContestJudging_SecondPlaceText + text_far ContestJudging_SecondPlaceText start_asm ld de, SFX_2ND_PLACE call PlaySFX @@ -51,12 +51,12 @@ BugContest_SecondPlaceText: BugContest_SecondPlaceScoreText: ; The score was @ points! - text_jump ContestJudging_SecondPlaceScoreText + text_far ContestJudging_SecondPlaceScoreText db "@" BugContest_ThirdPlaceText: ; Placing third was @ , who caught a @ !@ @ - text_jump ContestJudging_ThirdPlaceText + text_far ContestJudging_ThirdPlaceText start_asm ld de, SFX_3RD_PLACE call PlaySFX @@ -66,7 +66,7 @@ BugContest_ThirdPlaceText: BugContest_ThirdPlaceScoreText: ; The score was @ points! - text_jump ContestJudging_ThirdPlaceScoreText + text_far ContestJudging_ThirdPlaceScoreText db "@" LoadContestantName: |