diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 13:35:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 14:39:52 -0400 |
| commit | b47bfbd813cc7981ff3b99baa7913933f28d67b9 (patch) | |
| tree | 0fea9afdc675ac7381e661f6fd344c55dcb32374 /engine/link | |
| parent | 9483cf47dd62d3c513dade49747e868f49f0e374 (diff) | |
Identify more WRAM labels, and start a <X>_DummyFunction label convention
Diffstat (limited to 'engine/link')
| -rw-r--r-- | engine/link/init_list.asm | 4 | ||||
| -rw-r--r-- | engine/link/link.asm | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engine/link/init_list.asm b/engine/link/init_list.asm index b85cf001..3e16d349 100644 --- a/engine/link/init_list.asm +++ b/engine/link/init_list.asm @@ -44,9 +44,9 @@ InitList: ld a, h ld [wListPointer + 1], a ld a, e - ld [wUnusedCFFE], a + ld [wUnusedNamesPointer], a ld a, d - ld [wUnusedCFFE + 1], a + ld [wUnusedNamesPointer + 1], a ld bc, ItemAttributes ld a, c ld [wItemAttributesPtr], a diff --git a/engine/link/link.asm b/engine/link/link.asm index ba2ae115..f80bb86e 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -82,9 +82,9 @@ Gen2ToGen1LinkComms: call Serial_ExchangeBytes ld a, SERIAL_NO_DATA_BYTE ld [de], a - ld hl, wLink_c508 + ld hl, wc508 ld de, wTrademons - ld bc, wTrademons - wLink_c508 + ld bc, wTrademons - wc508 call Serial_ExchangeBytes xor a ldh [rIF], a @@ -163,9 +163,9 @@ Gen2ToGen1LinkComms: ld hl, wTimeCapsulePlayerData call Link_ConvertPartyStruct1to2 ld a, LOW(wOTPartyMonOT) - ld [wUnusedCFFE], a + ld [wUnusedNamesPointer], a ld a, HIGH(wOTPartyMonOT) - ld [wUnusedCFFE + 1], a + ld [wUnusedNamesPointer + 1], a ld de, MUSIC_NONE call PlayMusic ldh a, [hSerialConnectionStatus] @@ -226,9 +226,9 @@ Gen2ToGen2LinkComms: call Serial_ExchangeBytes ld a, SERIAL_NO_DATA_BYTE ld [de], a - ld hl, wLink_c508 + ld hl, wc508 ld de, wTrademons - ld bc, wTrademons - wLink_c508 + ld bc, wTrademons - wc508 call Serial_ExchangeBytes ld a, [wLinkMode] cp LINK_TRADECENTER @@ -377,9 +377,9 @@ Gen2ToGen2LinkComms: ld bc, wOTPartyDataEnd - wOTPartyMons call CopyBytes ld a, LOW(wOTPartyMonOT) - ld [wUnusedCFFE], a + ld [wUnusedNamesPointer], a ld a, HIGH(wOTPartyMonOT) - ld [wUnusedCFFE + 1], a + ld [wUnusedNamesPointer + 1], a ld de, MUSIC_NONE call PlayMusic ldh a, [hSerialConnectionStatus] @@ -514,7 +514,7 @@ FixDataForLinkTransfer: ld [hli], a dec b jr nz, .loop2 - ld hl, wLink_c508 + ld hl, wc508 ld a, SERIAL_PREAMBLE_BYTE ld [hli], a ld [hli], a |