diff options
Diffstat (limited to 'engine/link_trade.asm')
| -rwxr-xr-x | engine/link_trade.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/link_trade.asm b/engine/link_trade.asm index 96401f188..bb2765b50 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -1,5 +1,5 @@ LinkCommsBorderGFX: -INCBIN "gfx/unknown/16cfc1.2bpp" +INCBIN "gfx/trade/border_tiles.2bpp" ; 16d421 __LoadTradeScreenBorder: ; 16d421 @@ -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 @@ -35,13 +35,13 @@ Function16d43b: ; 16d43b ; 16d465 Tilemap_16d465: -INCBIN "gfx/unknown/16d465.tilemap" +INCBIN "gfx/trade/border_mobile_fullscreen.tilemap" Tilemap_16d5cd: -INCBIN "gfx/unknown/16d5cd.tilemap" +INCBIN "gfx/trade/border_cable_top.tilemap" Tilemap_16d5f5: -INCBIN "gfx/unknown/16d5f5.tilemap" +INCBIN "gfx/trade/border_cable_bottom.tilemap" _LinkTextbox: ; 16d61d ld h, d @@ -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 |