diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-07-27 11:21:31 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-07-27 11:24:59 +0200 |
| commit | 9aa6b55d7b1fdb97426305c0ed07fc14012f1293 (patch) | |
| tree | b1123bc6dc8d5f29577ad7518f49042f210571d2 /engine/link | |
| parent | a91b59ab5dd2468e3f48079d45f90a9625a29fe3 (diff) | |
| parent | 748d4249805c19399b3c72c0f60d0f1a6ffe43ad (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine/link')
| -rw-r--r-- | engine/link/link.asm | 2 | ||||
| -rw-r--r-- | engine/link/link_trade.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm index e5f354f57..5be738b23 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -1971,7 +1971,7 @@ LoadTradeScreenBorder: ret SetTradeRoomBGPals: - farcall LoadTradeRoomBGPals_ ; just a nested farcall; so wasteful + farcall LoadTradeRoomBGPals ; just a nested farcall; so wasteful call SetPalettes ret diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm index a3c596bfe..a250e84fa 100644 --- a/engine/link/link_trade.asm +++ b/engine/link/link_trade.asm @@ -133,8 +133,8 @@ LinkComms_LoadPleaseWaitTextboxBorderGFX: call Get2bpp ret -LoadTradeRoomBGPals_: - farcall LoadTradeRoomBGPals +LoadTradeRoomBGPals: + farcall _LoadTradeRoomBGPals ret Function16d6ae: |