diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /engine/events/bug_contest/contest.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/events/bug_contest/contest.asm')
| -rw-r--r-- | engine/events/bug_contest/contest.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index c25da1658..4cf4f949a 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -1,4 +1,4 @@ -GiveParkBalls: ; 135db +GiveParkBalls: xor a ld [wContestMon], a ld a, 20 @@ -6,7 +6,7 @@ GiveParkBalls: ; 135db farcall StartBugContestTimer ret -BugCatchingContestBattleScript:: ; 0x135eb +BugCatchingContestBattleScript:: writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST randomwildmon startbattle @@ -15,29 +15,29 @@ BugCatchingContestBattleScript:: ; 0x135eb iffalse BugCatchingContestOutOfBallsScript end -BugCatchingContestOverScript:: ; 0x135f8 +BugCatchingContestOverScript:: playsound SFX_ELEVATOR_END opentext writetext BugCatchingContestText_BeeepTimesUp waitbutton jump BugCatchingContestReturnToGateScript -BugCatchingContestOutOfBallsScript: ; 0x13603 +BugCatchingContestOutOfBallsScript: playsound SFX_ELEVATOR_END opentext writetext BugCatchingContestText_ContestIsOver waitbutton -BugCatchingContestReturnToGateScript: ; 0x1360b +BugCatchingContestReturnToGateScript: closetext jumpstd bugcontestresultswarp -BugCatchingContestText_BeeepTimesUp: ; 0x1360f +BugCatchingContestText_BeeepTimesUp: ; ANNOUNCER: BEEEP! Time's up! text_jump UnknownText_0x1bd2ca db "@" -BugCatchingContestText_ContestIsOver: ; 0x13614 +BugCatchingContestText_ContestIsOver: ; ANNOUNCER: The Contest is over! text_jump UnknownText_0x1bd2e7 db "@" |