summaryrefslogtreecommitdiff
path: root/include/items.h
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-07-16 20:09:46 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-07-16 20:09:46 -0400
commit93f767e26de82d1d4133e719a758578ede98b306 (patch)
tree0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /include/items.h
parentdd7e19107879f74d8f962a6a47d619470eaefbcd (diff)
parente50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff)
resolve conflict
Diffstat (limited to 'include/items.h')
-rw-r--r--include/items.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/items.h b/include/items.h
index f3c506b43..69515f18e 100644
--- a/include/items.h
+++ b/include/items.h
@@ -1,7 +1,8 @@
#ifndef GUARD_ITEMS_H
#define GUARD_ITEMS_H
-enum {
+enum
+{
ITEM_NONE, // 0x000
ITEM_MASTER_BALL, // 0x001
ITEM_ULTRA_BALL, // 0x002