summaryrefslogtreecommitdiff
path: root/engine/link_trade.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/link_trade.asm')
-rwxr-xr-xengine/link_trade.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/link_trade.asm b/engine/link_trade.asm
index 3983dfd1d..bb2765b50 100755
--- a/engine/link_trade.asm
+++ b/engine/link_trade.asm
@@ -23,8 +23,8 @@ Function16d43b: ; 16d43b
call ClearBGPalettes
call ClearTileMap
call ClearSprites
- callba __LoadTradeScreenBorder ; useless to farcall
- callba Function16d42e ; useless to farcall
+ farcall __LoadTradeScreenBorder ; useless to farcall
+ farcall Function16d42e ; useless to farcall
ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
@@ -119,8 +119,8 @@ _LinkTextbox: ; 16d61d
InitTradeSpeciesList: ; 16d673
call _LoadTradeScreenBorder
call Function16d6ae
- callba InitMG_Mobile_LinkTradePalMap
- callba PlaceTradePartnerNamesAndParty
+ farcall InitMG_Mobile_LinkTradePalMap
+ farcall PlaceTradePartnerNamesAndParty
hlcoord 10, 17
ld de, .CANCEL
call PlaceString
@@ -146,7 +146,7 @@ LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a
; 16d6a7
LoadTradeRoomBGPals_: ; 16d6a7
- callba LoadTradeRoomBGPals
+ farcall LoadTradeRoomBGPals
ret
; 16d6ae
@@ -171,7 +171,7 @@ LinkTextbox: ; 16d6ca
Function16d6ce: ; 16d6ce
call LoadStandardMenuDataHeader
call Function16d6e1
- callba WaitLinkTransfer
+ farcall WaitLinkTransfer
call Call_ExitMenu
call WaitBGMap2
ret
@@ -233,7 +233,7 @@ LinkTradeMenu: ; 16d70c
call .UpdateBGMapAndOAM
call .loop2
jr nc, .done
- callba _2DMenuInterpretJoypad
+ farcall _2DMenuInterpretJoypad
jr c, .done
ld a, [w2DMenuFlags1]
bit 7, a
@@ -352,7 +352,7 @@ LinkTradeMenu: ; 16d70c
ld a, [w2DMenuFlags1]
bit 6, a
jr z, .skip_anims
- callba PlaySpriteAnimationsAndDelayFrame
+ farcall PlaySpriteAnimationsAndDelayFrame
.skip_anims
call JoyTextDelay
call .GetJoypad