callba/callab -> farcall/callfar; jpba/jpab -> farjp/jpfar

25 files changed, 34 insertions, 34 deletions

diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm
index 338381e9..8ff581a3 100755
--- a/scripts/BikeShop.asm
+++ b/scripts/BikeShop.asm
@@ -24,7 +24,7 @@ BikeShopText1:
 	jr nc, .BagFull
 	ld a, BIKE_VOUCHER
 	ldh [hItemToRemoveID], a
-	callba RemoveItemByID
+	farcall RemoveItemByID
 	SetEvent EVENT_GOT_BICYCLE
 	ld hl, BikeShopText_1d824
 	call PrintText
diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm
index c9085b32..b2d40b44 100755
--- a/scripts/CeladonMansion3F.asm
+++ b/scripts/CeladonMansion3F.asm
@@ -49,7 +49,7 @@ DirectorText:
 	text_far _CompletedDexText
 	text_promptbutton
 	text_asm
-	callab DisplayDiploma
+	callfar DisplayDiploma
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	jp TextScriptEnd
diff --git a/scripts/CeladonMartElevator.asm b/scripts/CeladonMartElevator.asm
index bcac0d14..e58c88f0 100755
--- a/scripts/CeladonMartElevator.asm
+++ b/scripts/CeladonMartElevator.asm
@@ -60,7 +60,7 @@ CeladonMartElevatorWarpMaps:
 CeladonMartElevatorWarpMapsEnd:
 
 CeladonMartElevatorScript_48654:
-	jpba ShakeElevator
+	farjp ShakeElevator
 
 CeladonMartElevator_TextPointers:
 	dw CeladonMartElevatorText1
diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm
index 06a8390a..e880211b 100755
--- a/scripts/CeladonMartRoof.asm
+++ b/scripts/CeladonMartRoof.asm
@@ -131,7 +131,7 @@ CeladonMartRoofScript_GiveDrinkToGirl:
 	jp PrintText
 
 RemoveItemByIDBank12:
-	jpba RemoveItemByID
+	farjp RemoveItemByID
 
 CeladonMartRoofText_484ee:
 	text_far _CeladonMartRoofText_484ee
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index 656c3a4d..070120b7 100755
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -174,7 +174,7 @@ CeruleanCityScript2:
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
-	callba Music_RivalAlternateStart
+	farcall Music_RivalAlternateStart
 	ld a, $1
 	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
@@ -310,7 +310,7 @@ CeruleanCityText2:
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, ReceivedTM28Text
 	call PrintText
-	callba CeruleanHideRocket
+	farcall CeruleanHideRocket
 .Done
 	jp TextScriptEnd
 
diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm
index 53dd9d4e..e57048c5 100755
--- a/scripts/ChampionsRoom.asm
+++ b/scripts/ChampionsRoom.asm
@@ -108,7 +108,7 @@ GaryScript3:
 	ret
 
 GaryScript4:
-	callba Music_Cities1AlternateTempo
+	farcall Music_Cities1AlternateTempo
 	ld a, $2
 	ldh [hSpriteIndexOrTextID], a
 	call GaryScript_760c8
diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm
index ac33e6ee..4bdb8a36 100755
--- a/scripts/CinnabarLabFossilRoom.asm
+++ b/scripts/CinnabarLabFossilRoom.asm
@@ -56,7 +56,7 @@ Lab4Text1:
 	ld a, [wFilteredBagItemsCount]
 	and a
 	jr z, .asm_75d8d
-	callba GiveFossilToCinnabarLab
+	farcall GiveFossilToCinnabarLab
 	jr .asm_75d93
 .asm_75d8d
 	ld hl, Lab4Text_75dcb
@@ -106,4 +106,4 @@ Lab4Text2:
 	jp TextScriptEnd
 
 LoadFossilItemAndMonNameBank1D:
-	jpba LoadFossilItemAndMonName
+	farjp LoadFossilItemAndMonName
diff --git a/scripts/CopycatsHouse2F.asm b/scripts/CopycatsHouse2F.asm
index b885baab..c27043e6 100755
--- a/scripts/CopycatsHouse2F.asm
+++ b/scripts/CopycatsHouse2F.asm
@@ -30,7 +30,7 @@ CopycatsHouse2FText1:
 	call PrintText
 	ld a, POKE_DOLL
 	ldh [hItemToRemoveID], a
-	callba RemoveItemByID
+	farcall RemoveItemByID
 	SetEvent EVENT_GOT_TM31
 	jr .asm_62ecd
 .BagFull
diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm
index 9fc8f3c4..481d7e14 100755
--- a/scripts/Daycare.asm
+++ b/scripts/Daycare.asm
@@ -35,7 +35,7 @@ DayCareMText1:
 	pop af
 	ld hl, DayCareAllRightThenText
 	jp c, .done
-	callab KnowsHMMove
+	callfar KnowsHMMove
 	ld hl, DayCareCantAcceptMonWithHMText
 	jp c, .done
 	xor a
@@ -65,13 +65,13 @@ DayCareMText1:
 	ld a, DAYCARE_DATA
 	ld [wMonDataLocation], a
 	call LoadMonData
-	callab CalcLevelFromExperience
+	callfar CalcLevelFromExperience
 	ld a, d
 	cp MAX_LEVEL
 	jr c, .skipCalcExp
 
 	ld d, MAX_LEVEL
-	callab CalcExperience
+	callfar CalcExperience
 	ld hl, wDayCareMonExp
 	ldh a, [hExperience]
 	ld [hli], a
diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm
index cdfb2f17..35ad9fd8 100755
--- a/scripts/HallOfFame.asm
+++ b/scripts/HallOfFame.asm
@@ -45,7 +45,7 @@ HallofFameRoomScript2:
 	ld [wHallOfFameCurScript], a
 	ld a, PALLET_TOWN
 	ld [wLastBlackoutMap], a
-	callba SaveSAVtoSRAM
+	farcall SaveSAVtoSRAM
 	ld b, 5
 .delayLoop
 	ld c, 600 / 5
diff --git a/scripts/NameRatersHouse.asm b/scripts/NameRatersHouse.asm
index 7694e92b..cecf97e7 100755
--- a/scripts/NameRatersHouse.asm
+++ b/scripts/NameRatersHouse.asm
@@ -68,7 +68,7 @@ NameRaterText1:
 	jr nz, .asm_1daae
 	ld hl, NameRaterText_1dac2
 	call PrintText
-	callba DisplayNameRaterScreen
+	farcall DisplayNameRaterScreen
 	jr c, .asm_1daae
 	ld hl, NameRaterText_1dac7
 .asm_1daa8
diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm
index 49017440..a2e0bfe8 100755
--- a/scripts/OaksLab.asm
+++ b/scripts/OaksLab.asm
@@ -441,7 +441,7 @@ OaksLabScript13:
 	ld a, $10
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	callba Music_RivalAlternateStart
+	farcall Music_RivalAlternateStart
 	ld a, $1
 	ldh [hSpriteIndex], a
 	ld de, .RivalExitMovement
@@ -513,7 +513,7 @@ OaksLabScript15:
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
-	callba Music_RivalAlternateStart
+	farcall Music_RivalAlternateStart
 	ld a, $15
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -614,7 +614,7 @@ OaksLabScript16:
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
-	callba Music_RivalAlternateStart
+	farcall Music_RivalAlternateStart
 	ld a, $1
 	ldh [hSpriteIndex], a
 	ld de, wNPCMovementDirections2
diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm
index 86a60579..cddebfa8 100755
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@@ -79,7 +79,7 @@ PokemonTower2Script1:
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
-	callba Music_RivalAlternateStart
+	farcall Music_RivalAlternateStart
 	ld a, $2
 	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm
index 6b1294b3..45b27e3b 100755
--- a/scripts/RocketHideoutElevator.asm
+++ b/scripts/RocketHideoutElevator.asm
@@ -58,7 +58,7 @@ RocketHideoutElevatorWarpMapsEnd:
 
 RocketHideoutElevatorScript_4575f:
 	call Delay3
-	callba ShakeElevator
+	farcall ShakeElevator
 	ret
 
 RocketHideoutElevator_TextPointers:
diff --git a/scripts/Route22.asm b/scripts/Route22.asm
index fd566ff0..57dc934e 100755
--- a/scripts/Route22.asm
+++ b/scripts/Route22.asm
@@ -170,7 +170,7 @@ Route22Script2:
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
-	callba Music_RivalAlternateStart
+	farcall Music_RivalAlternateStart
 	ld a, [wcf0d]
 	cp $1
 	jr nz, .asm_50fff
@@ -248,7 +248,7 @@ Route22Script_5104e:
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
-	callba Music_RivalAlternateTempo
+	farcall Music_RivalAlternateTempo
 	ld a, $2
 	ldh [hSpriteIndex], a
 	call Route22MoveRivalSprite
@@ -329,7 +329,7 @@ Route22Script5:
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
-	callba Music_RivalAlternateStartAndTempo
+	farcall Music_RivalAlternateStartAndTempo
 	ld a, [wcf0d]
 	cp $1
 	jr nz, .asm_51134
diff --git a/scripts/Route5Gate.asm b/scripts/Route5Gate.asm
index 0b66efa6..f2d45112 100755
--- a/scripts/Route5Gate.asm
+++ b/scripts/Route5Gate.asm
@@ -26,7 +26,7 @@ Route5GateScript0:
 	ld [wPlayerMovingDirection], a
 	xor a
 	ldh [hJoyHeld], a
-	callba RemoveGuardDrink
+	farcall RemoveGuardDrink
 	ldh a, [hItemToRemoveID]
 	and a
 	jr nz, .asm_1df82
@@ -73,7 +73,7 @@ Route5GateText1:
 	ld a, [wd728]
 	bit 6, a
 	jr nz, .asm_88856
-	callba RemoveGuardDrink
+	farcall RemoveGuardDrink
 	ldh a, [hItemToRemoveID]
 	and a
 	jr nz, .asm_768a2
diff --git a/scripts/Route6Gate.asm b/scripts/Route6Gate.asm
index 7d135498..22d40fd3 100755
--- a/scripts/Route6Gate.asm
+++ b/scripts/Route6Gate.asm
@@ -20,7 +20,7 @@ Route6GateScript0:
 	ld [wPlayerMovingDirection], a
 	xor a
 	ldh [hJoyHeld], a
-	callba RemoveGuardDrink
+	farcall RemoveGuardDrink
 	ldh a, [hItemToRemoveID]
 	and a
 	jr nz, .asm_1e080
diff --git a/scripts/Route7Gate.asm b/scripts/Route7Gate.asm
index 041d6c6a..182dedab 100755
--- a/scripts/Route7Gate.asm
+++ b/scripts/Route7Gate.asm
@@ -32,7 +32,7 @@ Route7GateScript0:
 	ld [wPlayerMovingDirection], a
 	xor a
 	ldh [hJoyHeld], a
-	callba RemoveGuardDrink
+	farcall RemoveGuardDrink
 	ldh a, [hItemToRemoveID]
 	and a
 	jr nz, .asm_1e15a
diff --git a/scripts/Route8Gate.asm b/scripts/Route8Gate.asm
index 3bdd6070..9ddaf601 100755
--- a/scripts/Route8Gate.asm
+++ b/scripts/Route8Gate.asm
@@ -31,7 +31,7 @@ Route8GateScript0:
 	ld [wPlayerMovingDirection], a
 	xor a
 	ldh [hJoyHeld], a
-	callba RemoveGuardDrink
+	farcall RemoveGuardDrink
 	ldh a, [hItemToRemoveID]
 	and a
 	jr nz, .asm_1e220
diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm
index 45e8f283..5060f1e1 100755
--- a/scripts/SSAnne2F.asm
+++ b/scripts/SSAnne2F.asm
@@ -148,7 +148,7 @@ SSAnne2Script2:
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
-	callba Music_RivalAlternateStart
+	farcall Music_RivalAlternateStart
 	ld a, $3
 	ld [wSSAnne2FCurScript], a
 	ret
diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm
index e7032760..dae0f96b 100755
--- a/scripts/SilphCo7F.asm
+++ b/scripts/SilphCo7F.asm
@@ -222,7 +222,7 @@ SilphCo7Script4:
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
-	callba Music_RivalAlternateStart
+	farcall Music_RivalAlternateStart
 	ld de, MovementData_51d1d
 	ld a, [wcf0d]
 	cp $1
diff --git a/scripts/SilphCoElevator.asm b/scripts/SilphCoElevator.asm
index 3ff507c7..e660cd0f 100755
--- a/scripts/SilphCoElevator.asm
+++ b/scripts/SilphCoElevator.asm
@@ -74,7 +74,7 @@ SilphCoElevatorWarpMapsEnd:
 
 SilphCoElevatorScript_45827:
 	call Delay3
-	callba ShakeElevator
+	farcall ShakeElevator
 	ret
 
 SilphCoElevator_TextPointers:
diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm
index d1a60988..5af5e5a2 100755
--- a/scripts/VermilionDock.asm
+++ b/scripts/VermilionDock.asm
@@ -45,7 +45,7 @@ VermilionDock_1db9b:
 	ld c, BANK(Music_Surfing)
 	ld a, MUSIC_SURFING
 	call PlayMusic
-	callba LoadSmokeTileFourTimes
+	farcall LoadSmokeTileFourTimes
 	xor a
 	ld [wSpritePlayerStateData1ImageIndex], a
 	ld c, 120
diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm
index fafc6388..80f19f3a 100755
--- a/scripts/ViridianGym.asm
+++ b/scripts/ViridianGym.asm
@@ -128,7 +128,7 @@ ViridianGymScript4:
 	ld [wCurMapScript], a
 	ret
 .asm_74980
-	jpba LoadSpinnerArrowTiles
+	farjp LoadSpinnerArrowTiles
 
 ViridianGymScript3:
 	ld a, [wIsInBattle]
diff --git a/scripts/WardensHouse.asm b/scripts/WardensHouse.asm
index 1cb68cf9..6705a450 100755
--- a/scripts/WardensHouse.asm
+++ b/scripts/WardensHouse.asm
@@ -33,7 +33,7 @@ FuchsiaHouse2Text1:
 	call PrintText
 	ld a, GOLD_TEETH
 	ldh [hItemToRemoveID], a
-	callba RemoveItemByID
+	farcall RemoveItemByID
 	SetEvent EVENT_GAVE_GOLD_TEETH
 .asm_60cba
 	ld hl, WardenThankYouText