callba/callab → farcall/callfar

engine/npctrade.asm

@@ -24,7 +24,7 @@ NPCTrade:: ; fcba8
 
 ; Select givemon from party
 	ld b, PARTYMENUACTION_GIVE_MON
-	callba SelectTradeOrDayCareMon
+	farcall SelectTradeOrDayCareMon
 	ld a, TRADE_CANCEL
 	jr c, .done
 
@@ -88,12 +88,12 @@ CheckTradeGender: ; fcc23
 	cp 1
 	jr z, .check_male
 
-	callba GetGender
+	farcall GetGender
 	jr nz, .not_matching
 	jr .matching
 
 .check_male
-	callba GetGender
+	farcall GetGender
 	jr z, .not_matching
 
 .matching
@@ -171,7 +171,7 @@ DoNPCTrade: ; fcc63
 	call Trade_GetAttributeOfCurrentPartymon
 	ld b, h
 	ld c, l
-	callba GetCaughtGender
+	farcall GetCaughtGender
 	ld a, c
 	ld [wPlayerTrademonCaughtData], a
 
@@ -195,7 +195,7 @@ DoNPCTrade: ; fcc63
 	xor a
 	ld [MonType], a
 	ld [wPokemonWithdrawDepositParameter], a
-	callab RemoveMonFromPartyOrBox
+	callfar RemoveMonFromPartyOrBox
 	predef TryAddMonToParty
 
 	ld e, TRADE_DIALOG
@@ -206,7 +206,7 @@ DoNPCTrade: ; fcc63
 	jr c, .incomplete
 	ld b, SET_FLAG
 .incomplete
-	callba SetGiftPartyMonCaughtData
+	farcall SetGiftPartyMonCaughtData
 
 	ld e, TRADE_NICK
 	call GetTradeAttribute
@@ -275,7 +275,7 @@ DoNPCTrade: ; fcc63
 	ld a, [PartyCount]
 	dec a
 	ld [CurPartyMon], a
-	callba ComputeNPCTrademonStats
+	farcall ComputeNPCTrademonStats
 	pop af
 	ld [CurPartyMon], a
 	pop hl