callba/callab → farcall/callfar

This commit is contained in:
Remy Oukaour
2017-12-24 12:47:30 -05:00
parent d787c66374
commit c66d195089
170 changed files with 1751 additions and 1751 deletions

View File

@@ -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

View File

@@ -3,7 +3,7 @@ Special_GiveParkBalls: ; 135db
ld [wContestMon], a
ld a, 20
ld [wParkBallsRemaining], a
callba StartBugContestTimer
farcall StartBugContestTimer
ret
BugCatchingContestBattleScript:: ; 0x135eb

View File

@@ -1,6 +1,6 @@
_BugContestJudging: ; 1369d
call ContestScore
callba TrainerRankings_BugContestScore
farcall TrainerRankings_BugContestScore
call BugContest_JudgeContestants
ld a, [wBugContestThirdPlacePersonID]
call LoadContestantName
@@ -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