summaryrefslogtreecommitdiff
path: root/engine/items.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-01-25 22:19:24 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-01-25 22:19:24 -0500
commit6ebe45e41fa4d939f5a9f44e05eaf64512b59018 (patch)
treeeb77ceca4fe585001858cff5cb1157e205685e00 /engine/items.asm
parent87514598bedf66be222d85ebbc7565c14d79e0f4 (diff)
Move event data to data/events/
Diffstat (limited to 'engine/items.asm')
-rwxr-xr-xengine/items.asm7
1 files changed, 5 insertions, 2 deletions
diff --git a/engine/items.asm b/engine/items.asm
index 503a76c6b..120756764 100755
--- a/engine/items.asm
+++ b/engine/items.asm
@@ -11,6 +11,7 @@ _ReceiveItem:: ; d1d5
ret
.Pockets: ; d1e9
+; entries correspond to item types
dw .Item
dw .KeyItem
dw .Ball
@@ -51,6 +52,7 @@ _TossItem:: ; d20d
ret
.Pockets:
+; entries correspond to item types
dw .Item
dw .KeyItem
dw .Ball
@@ -93,6 +95,7 @@ _CheckItem:: ; d244
ret
.Pockets:
+; entries correspond to item types
dw .Item
dw .KeyItem
dw .Ball
@@ -492,7 +495,7 @@ _CheckTossableItem:: ; d427
; Return 1 in wItemAttributeParamBuffer and carry if CurItem can't be removed from the bag.
ld a, ITEMATTR_PERMISSIONS
call GetItemAttr
- bit 7, a
+ bit CANT_TOSS_F, a
jr nz, ItemAttr_ReturnCarry
and a
ret
@@ -501,7 +504,7 @@ CheckSelectableItem: ; d432
; Return 1 in wItemAttributeParamBuffer and carry if CurItem can't be selected.
ld a, ITEMATTR_PERMISSIONS
call GetItemAttr
- bit 6, a
+ bit CANT_SELECT_F, a
jr nz, ItemAttr_ReturnCarry
and a
ret