Merge branch 'master' into doc-overworld

2020-07-15 00:40:47 -04:00
parent ebb6c4ee66 3c356a1d7a
commit e129d04b93
88 changed files with 1413 additions and 1248 deletions
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -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