summaryrefslogtreecommitdiff
path: root/data/items/attributes.asm
diff options
context:
space:
mode:
authorThomas Winwood <twwinwood@gmail.com>2018-07-21 02:06:31 +0100
committerGitHub <noreply@github.com>2018-07-21 02:06:31 +0100
commit23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch)
tree63c20c67efbdf8334c6e273f78065b83135e3886 /data/items/attributes.asm
parent17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff)
parent2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff)
Merge branch 'master' into the-diffening
Diffstat (limited to 'data/items/attributes.asm')
-rw-r--r--data/items/attributes.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/items/attributes.asm b/data/items/attributes.asm
index e0198e3ad..806a2ef28 100644
--- a/data/items/attributes.asm
+++ b/data/items/attributes.asm
@@ -5,7 +5,7 @@ item_attribute: MACRO
dn \6, \7
ENDM
-ItemAttributes: ; 67c1
+ItemAttributes:
; entries correspond to item ids
; MASTER_BALL
item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE