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

engine/events/cinnabar_lab.asm

@@ -62,7 +62,7 @@ GiveFossilToCinnabarLab::
 	call PrintText
 	ld a, [wFossilItem]
 	ldh [hItemToRemoveID], a
-	callba RemoveItemByID
+	farcall RemoveItemByID
 	ld hl, LabFossil_610b8
 	call PrintText
 	SetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL

engine/events/diploma.asm

@@ -38,7 +38,7 @@ DisplayDiploma::
 	coord hl, 10, 4
 	ld de, wPlayerName
 	call PlaceString
-	callba DrawPlayerCharacter
+	farcall DrawPlayerCharacter
 
 ; Move the player 33 pixels right and set the priority bit so he appears
 ; behind the background layer.
@@ -56,7 +56,7 @@ DisplayDiploma::
 	jr nz, .adjustPlayerGfxLoop
 
 	call EnableLCD
-	callba LoadTrainerInfoTextBoxTiles
+	farcall LoadTrainerInfoTextBoxTiles
 	ld b, SET_PAL_GENERIC
 	call RunPaletteCommand
 	call Delay3

engine/events/evolve_trade.asm

@@ -38,7 +38,7 @@ EvolveTradeMon:
 	ld [wForceEvolution], a
 	ld a, LINK_STATE_TRADING
 	ld [wLinkState], a
-	callab TryEvolvingMon
+	callfar TryEvolvingMon
 	xor a ; LINK_STATE_NONE
 	ld [wLinkState], a
 	jp PlayDefaultMusic

engine/events/give_pokemon.asm

@@ -15,9 +15,9 @@ _GivePokemon::
 	ld [wEnemyBattleStatus3], a
 	ld a, [wcf91]
 	ld [wEnemyMonSpecies2], a
-	callab LoadEnemyMonData
+	callfar LoadEnemyMonData
 	call SetPokedexOwnedFlag
-	callab SendNewMonToBox
+	callfar SendNewMonToBox
 	ld hl, wcf4b
 	ld a, [wCurrentBoxNum]
 	and $7f

engine/events/hidden_objects/bookshelves.asm

@@ -34,6 +34,6 @@ PrintBookshelfText::
 .noMatch
 	ld a, $ff
 	ldh [hFFDB], a
-	jpba PrintCardKeyText
+	farjp PrintCardKeyText
 
 INCLUDE "data/tilesets/bookshelf_tile_ids.asm"

engine/events/hidden_objects/town_map.asm

@@ -12,7 +12,7 @@ TownMapText::
 	inc a
 	ldh [hAutoBGTransferEnabled], a
 	call LoadFontTilePatterns
-	callba DisplayTownMap
+	farcall DisplayTownMap
 	ld hl, wd730
 	res 6, [hl]
 	ld de, TextScriptEnd

engine/events/in_game_trades.asm

@@ -137,10 +137,10 @@ InGameTrade_DoTrade:
 	ld [wMonDataLocation], a
 	call AddPartyMon
 	call InGameTrade_CopyDataToReceivedMon
-	callab EvolveTradeMon
+	callfar EvolveTradeMon
 	call ClearScreen
 	call InGameTrade_RestoreScreen
-	callba RedrawMapView
+	farcall RedrawMapView
 	and a
 	ld a, $3
 	jr .tradeSucceeded
@@ -159,7 +159,7 @@ InGameTrade_RestoreScreen:
 	call LoadGBPal
 	ld c, 10
 	call DelayFrames
-	jpba LoadWildData
+	farjp LoadWildData
 
 InGameTrade_PrepareTradeData:
 	ld hl, wTradedPlayerMonSpecies

engine/events/pokecenter.asm

@@ -22,7 +22,7 @@ DisplayPokemonCenterDialogue_::
 	ld [wSprite01StateData1ImageIndex], a ; make the nurse turn to face the machine
 	call Delay3
 	predef HealParty
-	callba AnimateHealingMachine ; do the healing machine animation
+	farcall AnimateHealingMachine ; do the healing machine animation
 	xor a
 	ld [wAudioFadeOutControl], a
 	ld a, [wAudioSavedROMBank]

engine/events/pokedex_rating.asm

@@ -30,7 +30,7 @@ DisplayDexRating:
 	call PrintText
 	pop hl
 	call PrintText
-	callba PlayPokedexRatingSfx
+	farcall PlayPokedexRatingSfx
 	jp WaitForTextScrollButtonPress
 .hallOfFame
 	ld de, wDexRatingNumMonsSeen

engine/events/pokemart.asm

@@ -42,7 +42,7 @@ DisplayPokemartDialogue_::
 	ld [wPrintItemPrices], a
 	ld a, INIT_BAG_ITEM_LIST
 	ld [wInitListType], a
-	callab InitList
+	callfar InitList
 
 	ld a, [wNumBagItems]
 	and a
@@ -126,7 +126,7 @@ DisplayPokemartDialogue_::
 	ld [wPrintItemPrices], a
 	ld a, INIT_OTHER_ITEM_LIST
 	ld [wInitListType], a
-	callab InitList
+	callfar InitList
 
 	ld hl, PokemartBuyingGreetingText
 	call PrintText

engine/events/saffron_guards.asm

@@ -10,6 +10,6 @@ RemoveGuardDrink::
 	call IsItemInBag
 	pop hl
 	jr z, .drinkLoop
-	jpba RemoveItemByID
+	farjp RemoveItemByID
 
 INCLUDE "data/items/guard_drink_items.asm"