Rename some labels
- Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
This commit is contained in:
@@ -74,7 +74,7 @@ Pack:
|
||||
ld hl, ItemsPocketMenuHeader
|
||||
call CopyMenuHeader
|
||||
ld a, [wItemsPocketCursor]
|
||||
ld [wMenuCursorBuffer], a
|
||||
ld [wMenuCursorPosition], a
|
||||
ld a, [wItemsPocketScrollPosition]
|
||||
ld [wMenuScrollPosition], a
|
||||
call ScrollingMenu
|
||||
@@ -102,7 +102,7 @@ Pack:
|
||||
ld hl, KeyItemsPocketMenuHeader
|
||||
call CopyMenuHeader
|
||||
ld a, [wKeyItemsPocketCursor]
|
||||
ld [wMenuCursorBuffer], a
|
||||
ld [wMenuCursorPosition], a
|
||||
ld a, [wKeyItemsPocketScrollPosition]
|
||||
ld [wMenuScrollPosition], a
|
||||
call ScrollingMenu
|
||||
@@ -135,7 +135,7 @@ Pack:
|
||||
call Pack_InterpretJoypad
|
||||
ret c
|
||||
farcall _CheckTossableItem
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld a, [wItemAttributeValue]
|
||||
and a
|
||||
jr nz, .use_quit
|
||||
ld hl, .MenuHeader2
|
||||
@@ -224,7 +224,7 @@ Pack:
|
||||
ld hl, BallsPocketMenuHeader
|
||||
call CopyMenuHeader
|
||||
ld a, [wBallsPocketCursor]
|
||||
ld [wMenuCursorBuffer], a
|
||||
ld [wMenuCursorPosition], a
|
||||
ld a, [wBallsPocketScrollPosition]
|
||||
ld [wMenuScrollPosition], a
|
||||
call ScrollingMenu
|
||||
@@ -241,29 +241,29 @@ Pack:
|
||||
|
||||
.ItemBallsKey_LoadSubmenu:
|
||||
farcall _CheckTossableItem
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld a, [wItemAttributeValue]
|
||||
and a
|
||||
jr nz, .tossable
|
||||
farcall CheckSelectableItem
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld a, [wItemAttributeValue]
|
||||
and a
|
||||
jr nz, .selectable
|
||||
farcall CheckItemMenu
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld a, [wItemAttributeValue]
|
||||
and a
|
||||
jr nz, .usable
|
||||
jr .unusable
|
||||
|
||||
.selectable
|
||||
farcall CheckItemMenu
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld a, [wItemAttributeValue]
|
||||
and a
|
||||
jr nz, .selectable_usable
|
||||
jr .selectable_unusable
|
||||
|
||||
.tossable
|
||||
farcall CheckSelectableItem
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld a, [wItemAttributeValue]
|
||||
and a
|
||||
jr nz, .tossable_selectable
|
||||
jr .tossable_unselectable
|
||||
@@ -424,7 +424,7 @@ Jumptable_GiveTossQuit:
|
||||
|
||||
UseItem:
|
||||
farcall CheckItemMenu
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld a, [wItemAttributeValue]
|
||||
ld hl, .dw
|
||||
rst JumpTable
|
||||
ret
|
||||
@@ -529,7 +529,7 @@ ResetPocketCursorPositions: ; unreferenced
|
||||
|
||||
RegisterItem:
|
||||
farcall CheckSelectableItem
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld a, [wItemAttributeValue]
|
||||
and a
|
||||
jr nz, .cant_register
|
||||
ld a, [wCurPocket]
|
||||
@@ -683,7 +683,7 @@ BattlePack:
|
||||
ld hl, ItemsPocketMenuHeader
|
||||
call CopyMenuHeader
|
||||
ld a, [wItemsPocketCursor]
|
||||
ld [wMenuCursorBuffer], a
|
||||
ld [wMenuCursorPosition], a
|
||||
ld a, [wItemsPocketScrollPosition]
|
||||
ld [wMenuScrollPosition], a
|
||||
call ScrollingMenu
|
||||
@@ -711,7 +711,7 @@ BattlePack:
|
||||
ld hl, KeyItemsPocketMenuHeader
|
||||
call CopyMenuHeader
|
||||
ld a, [wKeyItemsPocketCursor]
|
||||
ld [wMenuCursorBuffer], a
|
||||
ld [wMenuCursorPosition], a
|
||||
ld a, [wKeyItemsPocketScrollPosition]
|
||||
ld [wMenuScrollPosition], a
|
||||
call ScrollingMenu
|
||||
@@ -762,7 +762,7 @@ BattlePack:
|
||||
ld hl, BallsPocketMenuHeader
|
||||
call CopyMenuHeader
|
||||
ld a, [wBallsPocketCursor]
|
||||
ld [wMenuCursorBuffer], a
|
||||
ld [wMenuCursorPosition], a
|
||||
ld a, [wBallsPocketScrollPosition]
|
||||
ld [wMenuScrollPosition], a
|
||||
call ScrollingMenu
|
||||
@@ -779,7 +779,7 @@ BattlePack:
|
||||
|
||||
ItemSubmenu:
|
||||
farcall CheckItemContext
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld a, [wItemAttributeValue]
|
||||
TMHMSubmenu:
|
||||
and a
|
||||
jr z, .NoUse
|
||||
@@ -834,7 +834,7 @@ TMHMSubmenu:
|
||||
|
||||
.Use:
|
||||
farcall CheckItemContext
|
||||
ld a, [wItemAttributeParamBuffer]
|
||||
ld a, [wItemAttributeValue]
|
||||
ld hl, .ItemFunctionJumptable
|
||||
rst JumpTable
|
||||
ret
|
||||
@@ -951,7 +951,7 @@ DepositSellPack:
|
||||
ld hl, PC_Mart_ItemsPocketMenuHeader
|
||||
call CopyMenuHeader
|
||||
ld a, [wItemsPocketCursor]
|
||||
ld [wMenuCursorBuffer], a
|
||||
ld [wMenuCursorPosition], a
|
||||
ld a, [wItemsPocketScrollPosition]
|
||||
ld [wMenuScrollPosition], a
|
||||
call ScrollingMenu
|
||||
@@ -967,7 +967,7 @@ DepositSellPack:
|
||||
ld hl, PC_Mart_KeyItemsPocketMenuHeader
|
||||
call CopyMenuHeader
|
||||
ld a, [wKeyItemsPocketCursor]
|
||||
ld [wMenuCursorBuffer], a
|
||||
ld [wMenuCursorPosition], a
|
||||
ld a, [wKeyItemsPocketScrollPosition]
|
||||
ld [wMenuScrollPosition], a
|
||||
call ScrollingMenu
|
||||
@@ -992,7 +992,7 @@ DepositSellPack:
|
||||
ld hl, PC_Mart_BallsPocketMenuHeader
|
||||
call CopyMenuHeader
|
||||
ld a, [wBallsPocketCursor]
|
||||
ld [wMenuCursorBuffer], a
|
||||
ld [wMenuCursorPosition], a
|
||||
ld a, [wBallsPocketScrollPosition]
|
||||
ld [wMenuScrollPosition], a
|
||||
call ScrollingMenu
|
||||
@@ -1415,7 +1415,7 @@ INCBIN "gfx/pack/pack_menu.tilemap"
|
||||
|
||||
Pack_GetItemName:
|
||||
ld a, [wCurItem]
|
||||
ld [wNamedObjectIndexBuffer], a
|
||||
ld [wNamedObjectIndex], a
|
||||
call GetItemName
|
||||
call CopyName1
|
||||
ret
|
||||
|
Reference in New Issue
Block a user