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

9 files changed, 52 insertions, 52 deletions

diff --git a/home.asm b/home.asm
index 779a2e0c..62594b43 100644
--- a/home.asm
+++ b/home.asm
@@ -206,7 +206,7 @@ CountSetBits::
 ; subtracts the amount the player paid from their money
 ; OUTPUT: carry = 0(success) or 1(fail because there is not enough money)
 SubtractAmountPaidFromMoney::
-	jpba SubtractAmountPaidFromMoney_
+	farjp SubtractAmountPaidFromMoney_
 
 ; adds the amount the player sold to their money
 AddAmountSoldToMoney::
@@ -296,7 +296,7 @@ ReloadTilesetTilePatterns::
 ChooseFlyDestination::
 	ld hl, wd72e
 	res 4, [hl]
-	jpba LoadTownMap_Fly
+	farjp LoadTownMap_Fly
 
 ; causes the text box to close without waiting for a button press after displaying text
 DisableWaitingAfterTextDisplay::
@@ -314,7 +314,7 @@ DisableWaitingAfterTextDisplay::
 ; 01: successful
 ; 02: not able to be used right now, no extra menu displayed (only certain items use this)
 UseItem::
-	jpba UseItem_
+	farjp UseItem_
 
 ; confirms the item toss and then tosses the item
 ; INPUT:
@@ -348,7 +348,7 @@ IsKeyItem::
 	push hl
 	push de
 	push bc
-	callba IsKeyItem_
+	farcall IsKeyItem_
 	pop bc
 	pop de
 	pop hl
@@ -418,10 +418,10 @@ RunNPCMovementScript::
 	dw PewterMuseumGuyMovementScriptPointerTable
 	dw PewterGymGuyMovementScriptPointerTable
 .playerStepOutFromDoor
-	jpba PlayerStepOutFromDoor
+	farjp PlayerStepOutFromDoor
 
 EndNPCMovementScript::
-	jpba _EndNPCMovementScript
+	farjp _EndNPCMovementScript
 
 EmptyFunc2::
 	ret
@@ -502,7 +502,7 @@ IsItemInBag::
 
 DisplayPokedex::
 	ld [wd11e], a
-	jpba _DisplayPokedex
+	farjp _DisplayPokedex
 
 SetSpriteFacingDirectionAndDelay::
 	call SetSpriteFacingDirection
@@ -711,7 +711,7 @@ GetTrainerInformation::
 	ret
 
 GetTrainerName::
-	jpba GetTrainerName_
+	farjp GetTrainerName_
 
 HasEnoughMoney::
 ; Check if the player has at least as much
@@ -1107,7 +1107,7 @@ ManualTextScroll::
 Multiply::
 	push hl
 	push bc
-	callab _Multiply
+	callfar _Multiply
 	pop bc
 	pop hl
 	ret
@@ -1296,7 +1296,7 @@ HandleMenuInput_::
 	ld a, [wPartyMenuAnimMonEnabled]
 	and a ; is it a pokemon selection menu?
 	jr z, .getJoypadState
-	callba AnimatePartyMon ; shake mini sprite of selected pokemon
+	farcall AnimatePartyMon ; shake mini sprite of selected pokemon
 .getJoypadState
 	pop hl
 	call JoypadLowSensitivity
@@ -1687,7 +1687,7 @@ ReloadMapSpriteTilePatterns::
 	xor a
 	ld [wSpriteSetID], a
 	call DisableLCD
-	callba InitMapSprites
+	farcall InitMapSprites
 	call EnableLCD
 	pop hl
 	pop af
@@ -1721,7 +1721,7 @@ GivePokemon::
 	ld [wCurEnemyLVL], a
 	xor a ; PLAYER_PARTY_DATA
 	ld [wMonDataLocation], a
-	jpba _GivePokemon
+	farjp _GivePokemon
 
 Random::
 ; Return a random number in a.
@@ -1729,7 +1729,7 @@ Random::
 	push hl
 	push de
 	push bc
-	callba Random_
+	farcall Random_
 	ldh a, [hRandomAdd]
 	pop bc
 	pop de
@@ -1739,7 +1739,7 @@ Random::
 INCLUDE "home/predef.asm"
 
 UpdateCinnabarGymGateTileBlocks::
-	jpba UpdateCinnabarGymGateTileBlocks_
+	farjp UpdateCinnabarGymGateTileBlocks_
 
 CheckForHiddenObjectOrBookshelfOrCardKeyDoor::
 	ldh a, [hLoadedROMBank]
@@ -1765,7 +1765,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor::
 	xor a
 	jr .done
 .hiddenObjectNotFound
-	callba PrintBookshelfText
+	farcall PrintBookshelfText
 	ldh a, [hFFDB]
 	and a
 	jr z, .done
diff --git a/home/move_mon.asm b/home/move_mon.asm
index 7be8eaf5..9fe7b067 100644
--- a/home/move_mon.asm
+++ b/home/move_mon.asm
@@ -3,13 +3,13 @@
 ; [wRemoveMonFromBox] == 0 specifies the party.
 ; [wRemoveMonFromBox] != 0 specifies the current box.
 RemovePokemon::
-	jpab _RemovePokemon
+	jpfar _RemovePokemon
 
 AddPartyMon::
 	push hl
 	push de
 	push bc
-	callba _AddPartyMon
+	farcall _AddPartyMon
 	pop bc
 	pop de
 	pop hl
diff --git a/home/overworld.asm b/home/overworld.asm
index 18c7977e..557efa2d 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1,14 +1,14 @@
 HandleMidJump::
 ; Handle the player jumping down
 ; a ledge in the overworld.
-	jpba _HandleMidJump
+	farjp _HandleMidJump
 
 EnterMap::
 ; Load a new map.
 	ld a, $ff
 	ld [wJoyIgnore], a
 	call LoadMapData
-	callba ClearVariablesOnEnterMap
+	farcall ClearVariablesOnEnterMap
 	ld hl, wd72c
 	bit 0, [hl] ; has the player already made 3 steps since the last battle?
 	jr z, .skipGivingThreeStepsOfNoRandomBattles
@@ -25,10 +25,10 @@ EnterMap::
 	and 1 << 4 | 1 << 3 ; fly warp or dungeon warp
 	jr z, .didNotEnterUsingFlyWarpOrDungeonWarp
 	res 3, [hl]
-	callba EnterMapAnim
+	farcall EnterMapAnim
 	call UpdateSprites
 .didNotEnterUsingFlyWarpOrDungeonWarp
-	callba CheckForceBikeOrSurf ; handle currents in SF islands and forced bike riding in cycling road
+	farcall CheckForceBikeOrSurf ; handle currents in SF islands and forced bike riding in cycling road
 	ld hl, wd72d
 	res 5, [hl]
 	call UpdateSprites
@@ -50,7 +50,7 @@ OverworldLoopLessDelay::
 	and a
 	jp nz, .moveAhead ; if the player sprite has not yet completed the walking animation
 	call JoypadOverworld ; get joypad state (which is possibly simulated)
-	callba SafariZoneCheck
+	farcall SafariZoneCheck
 	ld a, [wSafariZoneGameOver]
 	and a
 	jp nz, WarpFound2
@@ -269,7 +269,7 @@ OverworldLoopLessDelay::
 	ld a, [wd736]
 	bit 7, a
 	jr z, .noSpinning
-	callba LoadSpinnerArrowTiles
+	farcall LoadSpinnerArrowTiles
 .noSpinning
 	call UpdateSprites
 
@@ -306,7 +306,7 @@ OverworldLoopLessDelay::
 .doneStepCounting
 	CheckEvent EVENT_IN_SAFARI_ZONE
 	jr z, .notSafariZone
-	callba SafariZoneCheckSteps
+	farcall SafariZoneCheckSteps
 	ld a, [wSafariZoneGameOver]
 	and a
 	jp nz, WarpFound2
@@ -343,7 +343,7 @@ OverworldLoopLessDelay::
 	ld a, [wCurMap]
 	cp OAKS_LAB
 	jp z, .noFaintCheck ; no blacking out if the player lost to the rival in Oak's lab
-	callab AnyPartyAlive
+	callfar AnyPartyAlive
 	ld a, d
 	and a
 	jr z, .allPokemonFainted
@@ -368,7 +368,7 @@ NewBattle::
 	ld a, [wd72e]
 	bit 4, a
 	jr nz, .noBattle
-	jpba InitBattle
+	farjp InitBattle
 .noBattle
 	and a
 	ret
@@ -412,7 +412,7 @@ CheckWarpsNoCollisionLoop::
 	push bc
 	ld hl, wd736
 	set 2, [hl] ; standing on warp flag
-	callba IsPlayerStandingOnDoorTileOrWarpTile
+	farcall IsPlayerStandingOnDoorTileOrWarpTile
 	pop bc
 	pop hl
 	jr c, WarpFound1 ; jump if standing on door or warp
@@ -511,7 +511,7 @@ WarpFound2::
 	jr z, .goBackOutside
 ; if not going back to the previous map
 	ld [wCurMap], a
-	callba IsPlayerStandingOnWarpPadOrHole
+	farcall IsPlayerStandingOnWarpPadOrHole
 	ld a, [wStandingOnWarpPadOrHole]
 	dec a ; is the player on a warp pad?
 	jr nz, .notWarpPad
@@ -679,7 +679,7 @@ CheckMapConnections::
 	call RunPaletteCommand
 ; Since the sprite set shouldn't change, this will just update VRAM slots at
 ; $C2XE without loading any tile patterns.
-	callba InitMapSprites
+	farcall InitMapSprites
 	call LoadTileBlockMap
 	jp OverworldLoopLessDelay
 
@@ -747,7 +747,7 @@ ExtraWarpCheck::
 	jp Bankswitch
 
 MapEntryAfterBattle::
-	callba IsPlayerStandingOnWarp ; for enabling warp testing after collisions
+	farcall IsPlayerStandingOnWarp ; for enabling warp testing after collisions
 	ld a, [wMapPalOffset]
 	and a
 	jp z, GBFadeInFromWhite
@@ -800,7 +800,7 @@ HandleFlyWarpOrDungeonWarp::
 	jp SpecialEnterMap
 
 LeaveMapAnim::
-	jpba _LeaveMapAnim
+	farjp _LeaveMapAnim
 
 LoadPlayerSpriteGraphics::
 ; Load sprite graphics based on whether the player is standing, biking, or surfing.
@@ -1286,7 +1286,7 @@ CheckForJumpingAndTilePairCollisions::
 	predef GetTileAndCoordsInFrontOfPlayer ; get the tile in front of the player
 	push de
 	push bc
-	callba HandleLedges ; check if the player is trying to jump a ledge
+	farcall HandleLedges ; check if the player is trying to jump a ledge
 	pop bc
 	pop de
 	pop hl
@@ -1977,11 +1977,11 @@ RunMapScript::
 	push hl
 	push de
 	push bc
-	callba TryPushingBoulder
+	farcall TryPushingBoulder
 	ld a, [wFlags_0xcd60]
 	bit 1, a ; play boulder dust animation
 	jr z, .afterBoulderEffect
-	callba DoBoulderDustAnimation
+	farcall DoBoulderDustAnimation
 .afterBoulderEffect
 	pop bc
 	pop de
@@ -2032,7 +2032,7 @@ LoadPlayerSpriteGraphicsCommon::
 
 ; function to load data from the map header
 LoadMapHeader::
-	callba MarkTownVisitedAndLoadMissableObjects
+	farcall MarkTownVisitedAndLoadMissableObjects
 	ld a, [wCurMapTileset]
 	ld [wUnusedD119], a
 	ld a, [wCurMap]
@@ -2280,7 +2280,7 @@ LoadMapHeader::
 	jp nz, .loadSpriteLoop
 .finishUp
 	predef LoadTilesetHeader
-	callab LoadWildData
+	callfar LoadWildData
 	pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose)
 	ld a, [wCurMapHeight] ; map height in 4x4 tile blocks
 	add a ; double it
@@ -2337,7 +2337,7 @@ LoadMapData::
 	ld [wSpriteSetID], a
 	call LoadTextBoxTilePatterns
 	call LoadMapHeader
-	callba InitMapSprites ; load tile pattern data for sprites
+	farcall InitMapSprites ; load tile pattern data for sprites
 	call LoadTileBlockMap
 	call LoadTilesetTilePatternData
 	call LoadCurrentMapView
diff --git a/home/pokemon.asm b/home/pokemon.asm
index 6c5442c4..d018843e 100644
--- a/home/pokemon.asm
+++ b/home/pokemon.asm
@@ -81,7 +81,7 @@ DrawHPBar::
 ; wLoadedMon = base address of pokemon data
 ; wMonHeader = base address of base stats
 LoadMonData::
-	jpab LoadMonData_
+	jpfar LoadMonData_
 
 OverwritewMoves::
 ; Write c to [wMoves + b]. Unused.
@@ -277,7 +277,7 @@ HandlePartyMenuInput::
 	bit 1, b ; was the B button pressed?
 	jr z, .handleSwap ; if not, handle swapping the pokemon
 .cancelSwap ; if the B button was pressed
-	callba ErasePartyMenuCursors
+	farcall ErasePartyMenuCursors
 	xor a
 	ld [wMenuItemToSwap], a
 	ld [wPartyMenuTypeOrMessageID], a
@@ -286,7 +286,7 @@ HandlePartyMenuInput::
 .handleSwap
 	ld a, [wCurrentMenuItem]
 	ld [wWhichPokemon], a
-	callba SwitchPartyMon
+	farcall SwitchPartyMon
 	jr HandlePartyMenuInput
 
 DrawPartyMenu::
diff --git a/home/serial.asm b/home/serial.asm
index 27ac97d4..bd984d4f 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -225,7 +225,7 @@ Serial_ExchangeLinkMenuSelection::
 
 Serial_PrintWaitingTextAndSyncAndExchangeNybble::
 	call SaveScreenTilesToBuffer1
-	callab PrintWaitingText
+	callfar PrintWaitingText
 	call Serial_SyncAndExchangeNybble
 	jp LoadScreenTilesFromBuffer1
 
diff --git a/home/start_menu.asm b/home/start_menu.asm
index a692f007..5b29f67a 100755
--- a/home/start_menu.asm
+++ b/home/start_menu.asm
@@ -8,8 +8,8 @@ DisplayStartMenu::
 	call PlaySound
 
 RedisplayStartMenu::
-	callba DrawStartMenu
-	callba PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone
+	farcall DrawStartMenu
+	farcall PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone
 	call UpdateSprites
 .loop
 	call HandleMenuInput
diff --git a/home/text_script.asm b/home/text_script.asm
index 89f4d286..1baa3d64 100644
--- a/home/text_script.asm
+++ b/home/text_script.asm
@@ -3,7 +3,7 @@
 DisplayTextID::
 	ldh a, [hLoadedROMBank]
 	push af
-	callba DisplayTextIDInit ; initialization
+	farcall DisplayTextIDInit ; initialization
 	ld hl, wTextPredefFlag
 	bit 0, [hl]
 	res 0, [hl]
@@ -38,7 +38,7 @@ DisplayTextID::
 	push hl
 	push de
 	push bc
-	callba UpdateSpriteFacingOffsetAndDelayMovement ; update the graphics of the sprite the player is talking to (to face the right direction)
+	farcall UpdateSpriteFacingOffsetAndDelayMovement ; update the graphics of the sprite the player is talking to (to face the right direction)
 	pop bc
 	pop de
 	ld hl, wMapSpriteData ; NPC text entries
@@ -79,9 +79,9 @@ ENDM
 	dict  TX_SCRIPT_PLAYERS_PC,              TextScript_ItemStoragePC
 	dict  TX_SCRIPT_BILLS_PC,                TextScript_BillsPC
 	dict  TX_SCRIPT_POKECENTER_PC,           TextScript_PokemonCenterPC
-	dict2 TX_SCRIPT_VENDING_MACHINE,         callba VendingMachineMenu
+	dict2 TX_SCRIPT_VENDING_MACHINE,         farcall VendingMachineMenu
 	dict  TX_SCRIPT_PRIZE_VENDOR,            TextScript_GameCornerPrizeMenu
-	dict2 TX_SCRIPT_CABLE_CLUB_RECEPTIONIST, callab CableClubNPC
+	dict2 TX_SCRIPT_CABLE_CLUB_RECEPTIONIST, callfar CableClubNPC
 
 	call PrintText_NoCreatingTextBox ; display the text
 	ld a, [wDoNotWaitForButtonPressAfterDisplayingText]
@@ -197,7 +197,7 @@ DisplayPokemonCenterDialogue::
 	jp AfterDisplayingTextID
 
 DisplaySafariGameOverText::
-	callab PrintSafariGameOverText
+	callfar PrintSafariGameOverText
 	jp AfterDisplayingTextID
 
 DisplayPokemonFaintedText::
diff --git a/home/trainers.asm b/home/trainers.asm
index 66108af6..039c4ec8 100644
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -219,7 +219,7 @@ ResetButtonPressedAndMapScript::
 
 ; calls TrainerWalkUpToPlayer
 TrainerWalkUpToPlayer_Bank0::
-	jpba TrainerWalkUpToPlayer
+	farjp TrainerWalkUpToPlayer
 
 ; sets opponent type and mon set/lvl based on the engaging trainer data
 InitBattleEnemyParameters::
@@ -343,14 +343,14 @@ PrintEndBattleText::
 	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
 	push hl
-	callba SaveTrainerName
+	farcall SaveTrainerName
 	ld hl, TrainerEndBattleText
 	call PrintText
 	pop hl
 	pop af
 	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
-	callba FreezeEnemyTrainerSprite
+	farcall FreezeEnemyTrainerSprite
 	jp WaitForSoundToFinish
 
 GetSavedEndBattleTextPointer::
diff --git a/home/vblank.asm b/home/vblank.asm
index 06b45b82..4c7abc20 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -72,7 +72,7 @@ VBlank::
 	call Audio3_UpdateMusic
 .afterMusic
 
-	callba TrackPlayTime ; keep track of time played
+	farcall TrackPlayTime ; keep track of time played
 
 	ldh a, [hDisableJoypadPolling]
 	and a