diff options
Diffstat (limited to 'engine/link')
| -rw-r--r-- | engine/link/init_list.asm | 6 | ||||
| -rw-r--r-- | engine/link/link.asm | 20 | ||||
| -rw-r--r-- | engine/link/mystery_gift.asm | 2 | ||||
| -rw-r--r-- | engine/link/time_capsule.asm | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/engine/link/init_list.asm b/engine/link/init_list.asm index 3e16d349..8f578476 100644 --- a/engine/link/init_list.asm +++ b/engine/link/init_list.asm @@ -38,7 +38,7 @@ InitList: ld de, ItemNames ld a, ITEM_NAME .done - ld [wNamedObjectTypeBuffer], a + ld [wNamedObjectType], a ld a, l ld [wListPointer], a ld a, h @@ -49,7 +49,7 @@ InitList: ld [wUnusedNamesPointer + 1], a ld bc, ItemAttributes ld a, c - ld [wItemAttributesPtr], a + ld [wItemAttributesPointer], a ld a, b - ld [wItemAttributesPtr + 1], a + ld [wItemAttributesPointer + 1], a ret diff --git a/engine/link/link.asm b/engine/link/link.asm index 90dda4b9..3dc46e50 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -898,7 +898,7 @@ Link_ConvertPartyStruct1to2: ld d, h ld e, l ld bc, wLinkOTPartyMonTypes - ld hl, wCurLinkOTPartyMonTypePtr + ld hl, wCurLinkOTPartyMonTypePointer ld a, c ld [hli], a ld [hl], b @@ -948,7 +948,7 @@ Link_ConvertPartyStruct1to2: ld a, [de] inc de ld [hl], a - ld hl, wCurLinkOTPartyMonTypePtr + ld hl, wCurLinkOTPartyMonTypePointer ld a, [hli] ld h, [hl] ld l, a @@ -959,9 +959,9 @@ Link_ConvertPartyStruct1to2: ld [hli], a inc de ld a, l - ld [wCurLinkOTPartyMonTypePtr], a + ld [wCurLinkOTPartyMonTypePointer], a ld a, h - ld [wCurLinkOTPartyMonTypePtr + 1], a + ld [wCurLinkOTPartyMonTypePointer + 1], a push bc ld hl, MON_ITEM add hl, bc @@ -1382,7 +1382,7 @@ LinkTrade_TradeStatsMenu: ld b, 0 add hl, bc ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName hlcoord 0, 12 ld b, 4 @@ -1525,7 +1525,7 @@ LinkTrade: ld b, 0 add hl, bc ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, wStringBuffer1 ld de, wBufferTrademonNick @@ -1537,7 +1537,7 @@ LinkTrade: ld b, 0 add hl, bc ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld hl, LinkAskTradeForText bccoord 1, 14 @@ -1989,14 +1989,14 @@ CheckTimeCapsuleCompatibility: jr .done .mon_too_new - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld a, $1 jr .done .move_too_new push bc - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetMoveName call CopyName1 pop bc @@ -2022,7 +2022,7 @@ GetIncompatibleMonName: ld hl, wPartyCount add hl, bc ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ret diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index e3fef8dd..c4cf3613 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -118,7 +118,7 @@ DoMysteryGift: farcall MysteryGiftGetItem ld a, c ld [sBackupMysteryGiftItem], a - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call CloseSRAM call GetItemName ld hl, .MysteryGiftSentText ; sent item/decoration diff --git a/engine/link/time_capsule.asm b/engine/link/time_capsule.asm index 3c1cfb5f..e7285a5e 100644 --- a/engine/link/time_capsule.asm +++ b/engine/link/time_capsule.asm @@ -118,7 +118,7 @@ PlaceTradePartnerNamesAndParty: ld a, [de] cp -1 ret z - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a push bc push hl push de |