Rename some labels

- Remove "Buffer" suffix from some byte and word quantities
- Change "Ptr" to "Pointer"

Fixes #789
This commit is contained in:
Rangi
2020-12-23 16:29:30 -05:00
parent 1a054661ec
commit 99e66c2557
106 changed files with 584 additions and 578 deletions

View File

@@ -269,7 +269,7 @@ ReadBTTrainerParty:
jr nc, .skip_mon_1
ld a, [wBT_OTTempMon1]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
ld l, e
ld h, d
@@ -283,7 +283,7 @@ ReadBTTrainerParty:
farcall CheckStringForErrors
jr nc, .skip_mon_2
ld a, [wBT_OTTempMon2]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
ld l, e
ld h, d
@@ -297,7 +297,7 @@ ReadBTTrainerParty:
farcall CheckStringForErrors
jr nc, .skip_mon_3
ld a, [wBT_OTTempMon3]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
ld l, e
ld h, d
@@ -1289,7 +1289,7 @@ endr
ld a, EGG_TICKET
ld [wCurItem], a
ld a, 1
ld [wItemQuantityChangeBuffer], a
ld [wItemQuantityChange], a
ld a, -1
ld [wCurItemQuantity], a
ld hl, wNumItems

View File

@@ -168,13 +168,13 @@ LoadRandomBattleTowerMon:
ld bc, NICKNAMED_MON_STRUCT_LENGTH
call CopyBytes
ld a, [wNamedObjectIndexBuffer]
ld a, [wNamedObjectIndex]
push af
push de
ld hl, -NICKNAMED_MON_STRUCT_LENGTH
add hl, de
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
ld bc, PARTYMON_STRUCT_LENGTH
add hl, bc
push hl
@@ -187,7 +187,7 @@ LoadRandomBattleTowerMon:
pop de
pop af
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
pop bc
dec c
jp nz, .loop