Merge branch 'master' into doc-link

2020-06-13 16:15:11 -04:00
parent a9a427c6f2 46f4a4bbf7
commit c2a07276ae
64 changed files with 886 additions and 803 deletions
--- a/include/constants/item.h
+++ b/include/constants/item.h
@@ -16,5 +16,9 @@
 #define KEYITEMS_POCKET    4
 #define POCKETS_COUNT      5

+// The TM/HM pocket is the largest pocket, so the maximum amount of items
+// in a pocket is its count + 1 for the cancel option
+#define MAX_POCKET_ITEMS   (BAG_TMHM_COUNT + 1)
+

 #endif // GUARD_ITEM_CONSTANTS_H