summaryrefslogtreecommitdiff
path: root/include/berry.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-05-11 21:22:09 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-05-11 21:22:09 -0400
commit539d47279625a3d7a274726a02468bb5c1c56514 (patch)
tree08f68b473f37d1a74396ef2e28e1a0cecc60a9f1 /include/berry.h
parenta58d9a16dd7e4f263ebccda50e70103e7490886b (diff)
parentfc72b74e6ca6626dbaffa353eabf49429ff5e75f (diff)
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'include/berry.h')
-rw-r--r--include/berry.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/berry.h b/include/berry.h
index ee581b9c1..9ff18e198 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -34,12 +34,6 @@ enum
BERRY_STAGE_SPARKLING = 0xFF,
};
-#define NUM_BERRIES 44
-
-extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[];
-extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[];
-extern const u8 *const gBerryTreePaletteSlotTablePointers[];
-
void ClearEnigmaBerries(void);
void SetEnigmaBerry(u8 *src);
bool32 IsEnigmaBerryValid(void);