diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-09 21:30:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 21:30:24 -0400 |
| commit | 40b537d45b4b8937038126f7e5d2d21ccee460c0 (patch) | |
| tree | 881a090b80b2c22985fc6d1231b03c6721a83462 /engine/link/link.asm | |
| parent | e4b41fad4fd3787ca2e61adb5377ba8f68fca7ef (diff) | |
| parent | 53ff57ca663dc5bf9c3731022b0eb0dc73f2207f (diff) | |
Merge pull request #503 from Rangi42/master
Factor wMisc into meaningful parts; move most code out of home.asm
Diffstat (limited to 'engine/link/link.asm')
| -rw-r--r-- | engine/link/link.asm | 14 |
1 files changed, 7 insertions, 7 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 |