From 99e66c25577e367d6c7ca75fea8b466b54c3317a Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 23 Dec 2020 16:29:30 -0500 Subject: Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789 --- engine/link/link.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'engine/link/link.asm') diff --git a/engine/link/link.asm b/engine/link/link.asm index 5ea0e10fe..1d8294747 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -990,7 +990,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 @@ -1040,7 +1040,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 @@ -1051,9 +1051,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 @@ -1504,7 +1504,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 @@ -1669,7 +1669,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 @@ -1681,7 +1681,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 @@ -2123,14 +2123,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 @@ -2156,7 +2156,7 @@ GetIncompatibleMonName: ld hl, wPartyCount add hl, bc ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ret -- cgit v1.2.3