diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-24 11:17:05 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-24 11:17:05 -0500 |
| commit | d719d318e8b2de51e818485423ac878d20dd295a (patch) | |
| tree | d351a653914ee5dab13947b21a16552719c2a8c9 /engine/events/bug_contest | |
| parent | 132fe4692581891802c38420bdd4744d58bf78d5 (diff) | |
Remove Special_ prefix from special routines (close #478)
Diffstat (limited to 'engine/events/bug_contest')
| -rw-r--r-- | engine/events/bug_contest/contest.asm | 2 | ||||
| -rwxr-xr-x | engine/events/bug_contest/contest_2.asm | 8 | ||||
| -rwxr-xr-x | engine/events/bug_contest/judging.asm | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index ba561abf2..c25da1658 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -1,4 +1,4 @@ -Special_GiveParkBalls: ; 135db +GiveParkBalls: ; 135db xor a ld [wContestMon], a ld a, 20 diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm index 7ade44815..80f0bda97 100755 --- a/engine/events/bug_contest/contest_2.asm +++ b/engine/events/bug_contest/contest_2.asm @@ -1,4 +1,4 @@ -Special_SelectRandomBugContestContestants: ; 139a8 +SelectRandomBugContestContestants: ; 139a8 ; Select five random people to participate in the current contest. ; First we have to make sure that any old data is cleared away. @@ -56,7 +56,7 @@ Special_SelectRandomBugContestContestants: ; 139a8 ret ; 139ed -Special_CheckBugContestContestantFlag: ; 139ed +CheckBugContestContestantFlag: ; 139ed ; Checks the flag of the Bug Catching Contestant whose index is loaded in a. ; Bug: If a >= NUM_BUG_CONTESTANTS when this is called, it will read beyond the table. @@ -76,7 +76,7 @@ Special_CheckBugContestContestantFlag: ; 139ed INCLUDE "data/bug_contest_flags.asm" -Special_ContestDropOffMons: ; 13a12 +ContestDropOffMons: ; 13a12 ld hl, PartyMon1HP ld a, [hli] or [hl] @@ -101,7 +101,7 @@ Special_ContestDropOffMons: ; 13a12 ret ; 13a31 -Special_ContestReturnMons: ; 13a31 +ContestReturnMons: ; 13a31 ; Restore the species of the second mon. ld hl, PartySpecies + 1 ld a, [wBugContestSecondPartySpecies] diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index a8cb80efe..e9659707b 100755 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -244,7 +244,7 @@ ComputeAIContestantScores: ; 138b0 ld e, 0 .loop push de - call Special_CheckBugContestContestantFlag + call CheckBugContestContestantFlag pop de jr nz, .done ld a, e |