callba/callab → farcall/callfar

1 files changed, 44 insertions, 44 deletions

diff --git a/engine/item_effects.asm b/engine/item_effects.asm
index e881f6338..2d7aa4c69 100644
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -358,7 +358,7 @@ ParkBall: ; e8a2
 	ld d, a
 	push de
 
-	; BUG: callba overwrites a,
+	; BUG: farcall overwrites a,
 	; and GetItemHeldEffect takes b anyway.
 
 	; This is probably the reason
@@ -369,7 +369,7 @@ ParkBall: ; e8a2
 
 	ld a, [BattleMonItem]
 ;	ld b, a
-	callba GetItemHeldEffect
+	farcall GetItemHeldEffect
 	ld a, b
 	cp HELD_CATCH_CHANCE
 
@@ -478,7 +478,7 @@ ParkBall: ; e8a2
 	ld [CurPartySpecies], a
 	ld a, [EnemyMonLevel]
 	ld [CurPartyLevel], a
-	callba LoadEnemyMon
+	farcall LoadEnemyMon
 
 	pop af
 	ld [EnemySubStatus5], a
@@ -517,7 +517,7 @@ ParkBall: ; e8a2
 	cp BATTLETYPE_TUTORIAL
 	jp z, .FinishTutorial
 
-	callba TrainerRankings_WildMonsCaught
+	farcall TrainerRankings_WildMonsCaught
 
 	ld hl, Text_GotchaMonWasCaught
 	call PrintText
@@ -569,7 +569,7 @@ ParkBall: ; e8a2
 
 	predef TryAddMonToParty
 
-	callba SetCaughtData
+	farcall SetCaughtData
 
 	ld a, [CurItem]
 	cp FRIEND_BALL
@@ -608,7 +608,7 @@ ParkBall: ; e8a2
 	xor a ; PARTYMON
 	ld [MonType], a
 	ld b, 0
-	callba NamingScreen
+	farcall NamingScreen
 
 	call RotateThreePalettesRight
 
@@ -625,7 +625,7 @@ ParkBall: ; e8a2
 
 	predef SentPkmnIntoBox
 
-	callba SetBoxMonCaughtData
+	farcall SetBoxMonCaughtData
 
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
@@ -661,7 +661,7 @@ ParkBall: ; e8a2
 	ld [MonType], a
 	ld de, wMonOrItemNameBuffer
 	ld b, $0
-	callba NamingScreen
+	farcall NamingScreen
 
 	ld a, BANK(sBoxMonNicknames)
 	call GetSRAMBank
@@ -696,7 +696,7 @@ ParkBall: ; e8a2
 	jr .return_from_capture
 
 .catch_bug_contest_mon
-	callba BugContest_SetCaughtContestMon
+	farcall BugContest_SetCaughtContestMon
 	jr .return_from_capture
 
 .FinishTutorial:
@@ -985,7 +985,7 @@ LoveBallMultiplier:
 	ld [MonType], a
 	ld a, [CurBattleMon]
 	ld [CurPartyMon], a
-	callba GetGender
+	farcall GetGender
 	jr c, .done1 ; no effect on genderless
 
 	ld d, 0 ; male
@@ -999,7 +999,7 @@ LoveBallMultiplier:
 	ld [CurPartySpecies], a
 	ld a, WILDMON
 	ld [MonType], a
-	callba GetGender
+	farcall GetGender
 	jr c, .done2 ; no effect on genderless
 
 	ld d, 0 ; male
@@ -1173,17 +1173,17 @@ Text_AskNicknameNewlyCaughtMon: ; 0xedf5
 ; 0xedfa
 
 ReturnToBattle_UseBall: ; edfa (3:6dfa)
-	callba _ReturnToBattle_UseBall
+	farcall _ReturnToBattle_UseBall
 	ret
 
 TownMap: ; ee01
-	callba PokegearMap
+	farcall PokegearMap
 	ret
 ; ee08
 
 
 Bicycle: ; ee08
-	callba BikeFunction
+	farcall BikeFunction
 	ret
 ; ee0f
 
@@ -1208,7 +1208,7 @@ SunStone: ; ee0f
 
 	ld a, $1
 	ld [wForceEvolution], a
-	callba EvolvePokemon
+	farcall EvolvePokemon
 
 	ld a, [wMonTriedToEvolve]
 	and a
@@ -1269,7 +1269,7 @@ Calcium: ; ee3d
 	call PrintText
 
 	ld c, HAPPINESS_USEDITEM
-	callba ChangeHappiness
+	farcall ChangeHappiness
 
 	jp UseDisposableItem
 
@@ -1383,7 +1383,7 @@ RareCandy: ; ef14
 	ld [CurPartyLevel], a
 	push de
 	ld d, a
-	callba CalcExpAtLevel
+	farcall CalcExpAtLevel
 
 	pop de
 	ld a, MON_EXP
@@ -1421,7 +1421,7 @@ RareCandy: ; ef14
 	ld a, [hl]
 	adc b
 	ld [hl], a
-	callba LevelUpHappinessMod
+	farcall LevelUpHappinessMod
 
 	ld a, PARTYMENUTEXT_LEVEL_UP
 	call ItemActionText
@@ -1449,7 +1449,7 @@ RareCandy: ; ef14
 
 	xor a
 	ld [wForceEvolution], a
-	callba EvolvePokemon
+	farcall EvolvePokemon
 
 	jp UseDisposableItem
 ; efad
@@ -1466,7 +1466,7 @@ HealPowder: ; efad
 	cp $0
 	jr nz, .asm_efc9
 	ld c, HAPPINESS_BITTERPOWDER
-	callba ChangeHappiness
+	farcall ChangeHappiness
 
 	call LooksBitterMessage
 
@@ -1569,7 +1569,7 @@ HealStatus: ; f030 (3:7030)
 	res SUBSTATUS_CONFUSED, [hl]
 .not_full_heal
 	push bc
-	callba CalcPlayerStats
+	farcall CalcPlayerStats
 	pop bc
 	ret
 
@@ -1635,7 +1635,7 @@ RevivalHerb: ; f0a9
 	jr nz, .asm_f0c5
 
 	ld c, HAPPINESS_REVIVALHERB
-	callba ChangeHappiness
+	farcall ChangeHappiness
 	call LooksBitterMessage
 	ld a, 0
 
@@ -1797,7 +1797,7 @@ EnergypowderEnergyRootCommon: ; f192
 	cp 0
 	jr nz, .skip_happiness
 
-	callba ChangeHappiness
+	farcall ChangeHappiness
 	call LooksBitterMessage
 	ld a, 0
 
@@ -1876,15 +1876,15 @@ UseItem_SelectMon: ; f1f9 (3:71f9)
 	ret
 
 ChoosePkmnToUseItemOn: ; f21c (3:721c)
-	callba LoadPartyMenuGFX
-	callba InitPartyMenuWithCancel
-	callba InitPartyMenuGFX
-	callba WritePartyMenuTilemap
-	callba PrintPartyMenuText
+	farcall LoadPartyMenuGFX
+	farcall InitPartyMenuWithCancel
+	farcall InitPartyMenuGFX
+	farcall WritePartyMenuTilemap
+	farcall PrintPartyMenuText
 	call WaitBGMap
 	call SetPalettes
 	call DelayFrame
-	callba PartyMenuSelect
+	farcall PartyMenuSelect
 	ret
 
 ItemActionText: ; f24a (3:724a)
@@ -1896,8 +1896,8 @@ ItemActionText: ; f24a (3:724a)
 	push hl
 	push de
 	push bc
-	callba WritePartyMenuTilemap
-	callba PrintPartyMenuActionText
+	farcall WritePartyMenuTilemap
+	farcall PrintPartyMenuActionText
 	call WaitBGMap
 	call SetPalettes
 	call DelayFrame
@@ -2234,7 +2234,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df)
 EscapeRope: ; f44f
 	xor a
 	ld [wItemEffectSucceeded], a
-	callba EscapeRopeFunction
+	farcall EscapeRopeFunction
 
 	ld a, [wItemEffectSucceeded]
 	cp 1
@@ -2344,16 +2344,16 @@ XSpecial: ; f4c5
 	ld [hBattleTurn], a
 	ld [AttackMissed], a
 	ld [EffectFailed], a
-	callba CheckIfStatCanBeRaised
+	farcall CheckIfStatCanBeRaised
 	call WaitSFX
 
-	callba BattleCommand_StatUpMessage
-	callba BattleCommand_StatUpFailText
+	farcall BattleCommand_StatUpMessage
+	farcall BattleCommand_StatUpFailText
 
 	ld a, [CurBattleMon]
 	ld [CurPartyMon], a
 	ld c, HAPPINESS_USEDXITEM
-	callba ChangeHappiness
+	farcall ChangeHappiness
 	ret
 ; f504
 
@@ -2499,13 +2499,13 @@ SuperRod: ; f5ad
 ; f5b1
 
 UseRod: ; f5b1
-	callba FishFunction
+	farcall FishFunction
 	ret
 ; f5b8
 
 
 Itemfinder: ; f5b8
-	callba ItemFinder
+	farcall ItemFinder
 	ret
 ; f5bf
 
@@ -2547,7 +2547,7 @@ Mysteryberry: ; f5bf
 	ld [CurMoveNum], a
 	ld a, $2
 	ld [wMoveSelectionMenuType], a
-	callba MoveSelectionScreen
+	farcall MoveSelectionScreen
 	pop bc
 
 	ld a, b
@@ -2782,25 +2782,25 @@ UnknownText_0xf739: ; 0xf739
 
 
 Squirtbottle: ; f73e
-	callba _Squirtbottle
+	farcall _Squirtbottle
 	ret
 ; f745
 
 
 CardKey: ; f745
-	callba _CardKey
+	farcall _CardKey
 	ret
 ; f74c
 
 
 BasementKey: ; f74c
-	callba _BasementKey
+	farcall _BasementKey
 	ret
 ; f753
 
 
 SacredAsh: ; f753
-	callba _SacredAsh
+	farcall _SacredAsh
 	ld a, [wItemEffectSucceeded]
 	cp $1
 	ret nz
@@ -2817,7 +2817,7 @@ NormalBox: ; f763
 GorgeousBox: ; f767
 	ld c, DECOFLAG_GOLD_TROPHY_DOLL
 OpenBox: ; f769
-	callba SetSpecificDecorationFlag
+	farcall SetSpecificDecorationFlag
 
 	ld hl, .text
 	call PrintText