Merge record mixing, pokemon and global with apprentice

include/global.h

@@ -295,13 +295,21 @@ struct UnknownSaveBlock2Struct
     u8 field_EB;
 }; // sizeof = 0xEC
 
-struct UnkRecordMixingStruct
+struct ApprenticeMon
+{
+    u16 species;
+    u16 moves[4];
+    u16 item;
+};
+
+struct Apprentice
 {
     u8 field_0_0:5;
     u8 field_0_1:2;
     u8 field_1;
     u8 field_2;
-    u8 field_3[37];
+    u8 field_3;
+    struct ApprenticeMon monData[3];
     u16 unk28[6];
     u8 playerId[4];
     u8 playerName[PLAYER_NAME_LENGTH];
@@ -473,6 +481,15 @@ struct BattleFrontier
     /*0xEFC*/ struct FrontierMonData field_EFC[3];
 };
 
+struct Sav2_B8
+{
+    u8 unk0_0:2;
+    u8 unk0_1:2;
+    u8 unk0_2:2;
+    u8 unk0_3:2;
+    u16 unk2;
+};
+
 struct SaveBlock2
 {
     /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
@@ -500,12 +517,14 @@ struct SaveBlock2
         // TODO: fix and verify labels
     /*0xB0*/ u8 field_B0;
     /*0xB1*/ u8 field_B1_0:2;
-    /*0xB1*/ u8 field_B1_1:6;
+    /*0xB1*/ u8 field_B1_1:4;
+    /*0xB1*/ u8 field_B1_2:2;
     /*0xB2*/ u8 field_B2_0:3;
     /*0xB2*/ u8 field_B2_1:2;
     /*0xB3*/ u8 field_B3;
-    /*0xB4*/ u8 field_B4[0x28];
-    /*0xDC*/ struct UnkRecordMixingStruct field_DC[4];
+    /*0xB4*/ u8 field_B4[3];
+    /*0xB8*/ struct Sav2_B8 field_B8[9];
+    /*0xDC*/ struct Apprentice field_DC[4];
     /*0x1EC*/ struct BerryCrush berryCrush;
     /*0x1FC*/ struct PokemonJumpResults pokeJump;
     /*0x20C*/ struct BerryPickingResults berryPick;