Rename some labels
- Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -123,7 +123,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
|
||||
@@ -1602,7 +1602,7 @@ DoNameCardSwap:
|
||||
ld de, wNameCardData
|
||||
farcall Function8ac70
|
||||
ld a, c
|
||||
ld [wDeciramBuffer], a
|
||||
ld [wTextDecimalByte], a
|
||||
ld hl, .NameCardNotRegisteredCardText
|
||||
jr c, .PrintTextAndExit
|
||||
ld hl, .NameCardListedCardText
|
||||
|
@@ -122,7 +122,7 @@ PlaceTradePartnerNamesAndParty:
|
||||
ld a, [de]
|
||||
cp -1
|
||||
ret z
|
||||
ld [wNamedObjectIndexBuffer], a
|
||||
ld [wNamedObjectIndex], a
|
||||
push bc
|
||||
push hl
|
||||
push de
|
||||
|
Reference in New Issue
Block a user