Merge pull request #668 from Kurausukun/pockets

Add Constant for 3 Main Bag Pockets

include/constants/global.h

@@ -47,12 +47,13 @@
 #define UNION_ROOM_KB_ROW_COUNT 10
 #define GIFT_RIBBONS_COUNT 11
 
-#define POCKET_ITEMS        1
-#define POCKET_KEY_ITEMS    2
-#define POCKET_POKE_BALLS   3
-#define POCKET_TM_CASE      4
-#define POCKET_BERRY_POUCH  5
-#define NUM_BAG_POCKETS 5
+#define POCKET_ITEMS             1
+#define POCKET_KEY_ITEMS         2
+#define POCKET_POKE_BALLS        3
+#define POCKET_TM_CASE           4
+#define POCKET_BERRY_POUCH       5
+#define NUM_BAG_POCKETS          5
+#define NUM_BAG_POCKETS_NO_CASES 3 // number of pockets without considering TM case or berry pouch
 
 // Contests
 #define CONTEST_CATEGORIES_COUNT  5

include/item_menu.h

@@ -15,8 +15,8 @@ struct BagStruct
     u8 location;
     bool8 bagOpen;
     u16 pocket;
-    u16 itemsAbove[3];
-    u16 cursorPos[3];
+    u16 itemsAbove[NUM_BAG_POCKETS_NO_CASES];
+    u16 cursorPos[NUM_BAG_POCKETS_NO_CASES];
 };
 
 extern struct BagStruct gBagMenuState;