diff options
Diffstat (limited to 'event/bug_contest')
| -rw-r--r-- | event/bug_contest/caught_mon.asm | 4 | ||||
| -rw-r--r-- | event/bug_contest/contest.asm | 2 | ||||
| -rwxr-xr-x | event/bug_contest/judging.asm | 38 |
3 files changed, 22 insertions, 22 deletions
diff --git a/event/bug_contest/caught_mon.asm b/event/bug_contest/caught_mon.asm index 729033d8b..5d423f466 100644 --- a/event/bug_contest/caught_mon.asm +++ b/event/bug_contest/caught_mon.asm @@ -3,8 +3,8 @@ BugContest_SetCaughtContestMon: ; e6ce and a jr z, .firstcatch ld [wd265], a - callba DisplayAlreadyCaughtText - callba DisplayCaughtContestMonStats + farcall DisplayAlreadyCaughtText + farcall DisplayCaughtContestMonStats lb bc, 14, 7 call PlaceYesNoBox ret c diff --git a/event/bug_contest/contest.asm b/event/bug_contest/contest.asm index 2cb88ad30..ba561abf2 100644 --- a/event/bug_contest/contest.asm +++ b/event/bug_contest/contest.asm @@ -3,7 +3,7 @@ Special_GiveParkBalls: ; 135db ld [wContestMon], a ld a, 20 ld [wParkBallsRemaining], a - callba StartBugContestTimer + farcall StartBugContestTimer ret BugCatchingContestBattleScript:: ; 0x135eb diff --git a/event/bug_contest/judging.asm b/event/bug_contest/judging.asm index a7a9eb022..901ae88fa 100755 --- a/event/bug_contest/judging.asm +++ b/event/bug_contest/judging.asm @@ -1,22 +1,22 @@ _BugContestJudging: ; 1369d call ContestScore - callba TrainerRankings_BugContestScore + farcall TrainerRankings_BugContestScore call BugContest_JudgeContestants - ld a, [wBugContestThirdPlacePersonID] + ld a, [wBugContestThirdPlaceWinnerID] call LoadContestantName ld a, [wBugContestThirdPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, BugContest_ThirdPlaceText call PrintText - ld a, [wBugContestSecondPlacePersonID] + ld a, [wBugContestSecondPlaceWinnerID] call LoadContestantName ld a, [wBugContestSecondPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, BugContest_SecondPlaceText call PrintText - ld a, [wBugContestFirstPlacePersonID] + ld a, [wBugContestFirstPlaceWinnerID] call LoadContestantName ld a, [wBugContestFirstPlaceMon] ld [wNamedObjectIndexBuffer], a @@ -97,7 +97,7 @@ LoadContestantName: ; 13730 push hl push bc ; Get the Trainer Class name and copy it into wBugContestWinnerName. - callab GetTrainerClassName + callfar GetTrainerClassName ld hl, StringBuffer1 ld de, wBugContestWinnerName ld bc, TRAINER_CLASS_NAME_LENGTH @@ -120,7 +120,7 @@ LoadContestantName: ; 13730 ; Get the name of the trainer with class c and ID b. ld a, [hl] ld b, a - callab GetTrainerName + callfar GetTrainerName ; Append the name to wBugContestWinnerName. ld hl, StringBuffer1 pop de @@ -140,7 +140,7 @@ INCLUDE "data/bug_contest_winners.asm" BugContest_GetPlayersResult: ; 13807 - ld hl, wBugContestThirdPlacePersonID + ld hl, wBugContestThirdPlaceWinnerID ld de, -4 ld b, 3 .loop @@ -158,7 +158,7 @@ BugContest_GetPlayersResult: ; 13807 BugContest_JudgeContestants: ; 13819 call ClearContestResults call ComputeAIContestantScores - ld hl, wBugContestTempPersonID + ld hl, wBugContestTempWinnerID ld a, 1 ; Player ld [hli], a ld a, [wContestMon] @@ -188,15 +188,15 @@ DetermineContestWinners: ; 1383e ld c, 2 call StringCmp jr c, .not_first_place - ld hl, wBugContestSecondPlacePersonID - ld de, wBugContestThirdPlacePersonID + ld hl, wBugContestSecondPlaceWinnerID + ld de, wBugContestThirdPlaceWinnerID ld bc, 4 call CopyBytes - ld hl, wBugContestFirstPlacePersonID - ld de, wBugContestSecondPlacePersonID + ld hl, wBugContestFirstPlaceWinnerID + ld de, wBugContestSecondPlaceWinnerID ld bc, 4 call CopyBytes - ld hl, wBugContestFirstPlacePersonID + ld hl, wBugContestFirstPlaceWinnerID call CopyTempContestant jr .done @@ -206,11 +206,11 @@ DetermineContestWinners: ; 1383e ld c, 2 call StringCmp jr c, .not_second_place - ld hl, wBugContestSecondPlacePersonID - ld de, wBugContestThirdPlacePersonID + ld hl, wBugContestSecondPlaceWinnerID + ld de, wBugContestThirdPlaceWinnerID ld bc, 4 call CopyBytes - ld hl, wBugContestSecondPlacePersonID + ld hl, wBugContestSecondPlaceWinnerID call CopyTempContestant jr .done @@ -220,7 +220,7 @@ DetermineContestWinners: ; 1383e ld c, 2 call StringCmp jr c, .done - ld hl, wBugContestThirdPlacePersonID + ld hl, wBugContestThirdPlaceWinnerID call CopyTempContestant .done @@ -229,7 +229,7 @@ DetermineContestWinners: ; 1383e CopyTempContestant: ; 138a0 ; Could've just called CopyBytes. - ld de, wBugContestTempPersonID + ld de, wBugContestTempWinnerID rept 3 ld a, [de] inc de @@ -251,7 +251,7 @@ ComputeAIContestantScores: ; 138b0 ld a, e inc a inc a - ld [wBugContestTempPersonID], a + ld [wBugContestTempWinnerID], a dec a ld c, a ld b, 0 |