Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6

2025-05-14 11:52:22 -04:00
parent 7722e7a92c d61f959453
commit 82d2283108
15 changed files with 37 additions and 37 deletions
@@ -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