Merge branch 'master' into field_map_obj

include/global.h

@@ -190,7 +190,8 @@ struct SaveBlock2
         // All below could be a one giant struct
 
     /*0x64C*/ u8 field_64C[1629];
-    /*0xCA9*/ u8 frontierChosenLvl;
+    /*0xCA9*/ u8 frontierChosenLvl : 2;
+    /*0xCA9*/ u8 field_CA9_a : 6;
     /*0xCAA*/ u8 field_CAA[368];
     /*0xE1A*/ u16 battlePyramidFloor; // possibly?
     /*0xE1C*/ u8 field_E1C[16];
@@ -655,8 +656,10 @@ struct DaycareData
     u8 stepCounter;
 };
 
-#define FLAGS_NUMBER    300
-#define VARS_NUMBER     256
+#define MAP_OBJECTS_COUNT  16
+#define BERRY_TREES_COUNT  128
+#define FLAGS_COUNT        300
+#define VARS_COUNT         256
 
 struct SaveBlock1
 {
@@ -689,12 +692,12 @@ struct SaveBlock1
     /*0x9C2*/ u8 field_9C2[6];
     /*0x9C8*/ u16 trainerRematchStepCounter;
     /*0x9CA*/ u8 trainerRematches[100];
-    /*0xA30*/ struct MapObject mapObjects[16];
+    /*0xA30*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
     /*0xC70*/ struct MapObjectTemplate mapObjectTemplates[64];
-    /*0x1270*/ u8 flags[FLAGS_NUMBER];
-    /*0x139C*/ u16 vars[VARS_NUMBER];
+    /*0x1270*/ u8 flags[FLAGS_COUNT];
+    /*0x139C*/ u16 vars[VARS_COUNT];
     /*0x159C*/ u32 gameStats[NUM_GAME_STATS];
-    /*0x169C*/ struct BerryTree berryTrees[128];
+    /*0x169C*/ struct BerryTree berryTrees[BERRY_TREES_COUNT];
     /*0x1A9C*/ struct SecretBaseRecord secretBases[20];
     /*0x271C*/ u8 playerRoomDecor[12];
     /*0x2728*/ u8 playerRoomDecorPos[12];
@@ -737,6 +740,7 @@ struct SaveBlock1
     /*0x31A8*/ u8 giftRibbons[52];
     /*0x31DC*/ struct Roamer roamer;
     /*0x31F8*/ struct EnigmaBerry enigmaBerry;
+    /*0x322C*/ u8 field_322C[1276];
     /*0x3728*/ struct RamScript ramScript;
     /*0x3B14*/ struct RecordMixingGift recordMixingGift;
     /*0x3B24*/ u8 seen2[52];