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

@@ -51,7 +51,7 @@ _InterpretMobileMenu::
ld c, a
ld a, [w2DMenuNumRows]
call SimpleMultiply
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
and a
ret
@@ -91,7 +91,7 @@ Mobile_GetMenuSelection:
ld c, a
ld a, [wMenuCursorX]
add c
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
and a
ret
@@ -172,7 +172,7 @@ Init2DMenuCursorPosition:
call .InitFlags_c
ld a, [w2DMenuNumCols]
ld e, a
ld a, [wMenuCursorBuffer]
ld a, [wMenuCursorPosition]
ld b, a
xor a
ld d, 0
@@ -780,7 +780,7 @@ _InitVerticalMenuCursor::
.skip_bit_1
ld [hli], a
; wMenuCursorY
ld a, [wMenuCursorBuffer]
ld a, [wMenuCursorPosition]
and a
jr z, .load_at_the_top
ld c, a

View File

@@ -1,7 +1,7 @@
PlaceMenuItemName:
push de
ld a, [wMenuSelection]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetItemName
pop hl
call PlaceString
@@ -12,7 +12,7 @@ PlaceMenuItemQuantity:
ld a, [wMenuSelection]
ld [wCurItem], a
farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
ld a, [wItemAttributeValue]
pop hl
and a
jr nz, .done
@@ -169,7 +169,7 @@ StartMenu_PrintBugContestStatus:
and a
ld de, .NoneString
jr z, .no_contest_mon
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
.no_contest_mon

View File

@@ -91,7 +91,7 @@ NamingScreen:
ld e, MONICON_NAMINGSCREEN
rst FarCall
ld a, [wCurPartySpecies]
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetPokemonName
hlcoord 5, 2
call PlaceString

View File

@@ -91,7 +91,7 @@ ScrollingMenuJoyAction:
ld a, [wMenuSelection]
ld [wCurItem], a
ld a, [wMenuSelectionQuantity]
ld [wItemQuantityBuffer], a
ld [wItemQuantity], a
call ScrollingMenu_GetCursorPosition
dec a
ld [wScrollingMenuCursorPosition], a
@@ -238,7 +238,7 @@ InitScrollingMenuCursor:
.skip
ld a, [wMenuScrollPosition]
ld c, a
ld a, [wMenuCursorBuffer]
ld a, [wMenuCursorPosition]
add c
ld b, a
ld a, [wScrollingMenuListSize]
@@ -251,7 +251,7 @@ InitScrollingMenuCursor:
xor a
ld [wMenuScrollPosition], a
ld a, $1
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
.done
ret
@@ -307,7 +307,7 @@ ScrollingMenu_InitFlags:
ld [wMenuJoypadFilter], a
ld a, [w2DMenuNumRows]
ld b, a
ld a, [wMenuCursorBuffer]
ld a, [wMenuCursorPosition]
and a
jr z, .reset_cursor
cp b

View File

@@ -27,8 +27,8 @@ StartMenu::
.GotMenuData:
call LoadMenuHeader
call .SetUpMenuItems
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
ld a, [wBattleMenuCursorPosition]
ld [wMenuCursorPosition], a
call .DrawMenuAccount
call DrawVariableLengthMenuBox
call .DrawBugContestStatusBox
@@ -43,15 +43,15 @@ StartMenu::
call UpdateSprites
call UpdateTimePals
call .SetUpMenuItems
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
ld a, [wBattleMenuCursorPosition]
ld [wMenuCursorPosition], a
.Select:
call .GetInput
jr c, .Exit
call ._DrawMenuAccount
ld a, [wMenuCursorBuffer]
ld [wBattleMenuCursorBuffer], a
ld a, [wMenuCursorPosition]
ld [wBattleMenuCursorPosition], a
call PlayClickSFX
call PlaceHollowCursor
call .OpenMenu