diff options
Diffstat (limited to 'engine/link')
| -rw-r--r-- | engine/link/link.asm | 14 | ||||
| -rw-r--r-- | engine/link/mystery_gift.asm | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm index f6f37619f..e0b7f7972 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -84,9 +84,9 @@ Gen2ToGen1LinkComms: ; 2805d call Serial_ExchangeBytes ld a, SERIAL_NO_DATA_BYTE ld [de], a - ld hl, wMisc - ld de, wPlayerTrademonSpecies - ld bc, wPlayerTrademonSpecies - wMisc + ld hl, wLink_c608 + ld de, wTrademons + ld bc, wTrademons - wLink_c608 call Serial_ExchangeBytes xor a ld [rIF], a @@ -229,9 +229,9 @@ Gen2ToGen2LinkComms: ; 28177 call Serial_ExchangeBytes ld a, SERIAL_NO_DATA_BYTE ld [de], a - ld hl, wMisc - ld de, wPlayerTrademonSpecies - ld bc, $c8 + ld hl, wLink_c608 + ld de, wTrademons + ld bc, wTrademons - wLink_c608 call Serial_ExchangeBytes ld a, [wLinkMode] cp LINK_TRADECENTER @@ -581,7 +581,7 @@ FixDataForLinkTransfer: ; 28434 ld [hli], a dec b jr nz, .loop2 - ld hl, wMisc + ld hl, wLink_c608 ld a, SERIAL_PREAMBLE_BYTE ld [hli], a ld [hli], a diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index c73e4246e..4aed9ee70 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -394,7 +394,7 @@ Function104b88: ; 104b88 (41:4b88) jp nz, Function104d32 call Function104d38 ret nz - ld hl, wOverworldMap + ld hl, wLinkData ld a, [wca02] ld b, a call Function104d4e @@ -551,7 +551,7 @@ Function104cd2: ; 104cd2 (41:4cd2) jp nz, Function104d32 call Function104d38 ret nz - ld hl, wOverworldMap + ld hl, wLinkData ld a, [wca02] ld b, a call Function104d4e @@ -1543,7 +1543,7 @@ Function105777: ; 105777 (41:5777) ret Function10578c: ; 10578c (41:578c) - ld de, wOverworldMap + ld de, wLinkData ld a, BANK(sPlayerData) call GetSRAMBank ld hl, sPlayerData + wPlayerName - wPlayerData |