Merge branch 'master' into doc-overworld

This commit is contained in:
GriffinR authored and GitHub committed 2020-07-15 00:40:47 -04:00
commit e129d04b93
88 files changed
+1413 -1248

No files matched your search

+2
View File
@@ -17,6 +17,8 @@
#define ITEM_LUXURY_BALL 11
#define ITEM_PREMIER_BALL 12
#define LAST_BALL ITEM_PREMIER_BALL
// Pokemon Items
#define ITEM_POTION 13
#define ITEM_ANTIDOTE 14