Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly

1 files changed, 45 insertions, 13 deletions

diff --git a/include/global.h b/include/global.h
index 3dab84a3a..027065481 100644
--- a/include/global.h
+++ b/include/global.h
@@ -176,12 +176,14 @@ enum
     OPTIONS_BATTLE_STYLE_SET
 };
 
-struct Coords8 {
+struct Coords8
+{
     s8 x;
     s8 y;
 };
 
-struct UCoords8 {
+struct UCoords8
+{
     u8 x;
     u8 y;
 };
@@ -293,11 +295,25 @@ struct UnknownSaveBlock2Struct
     u8 field_EB;
 }; // sizeof = 0xEC
 
-struct UnkRecordMixingStruct
+struct ApprenticeMon
 {
-    u8 field_0[0x34];
+    u16 species;
+    u16 moves[4];
+    u16 item;
+};
+
+struct Apprentice
+{
+    u8 id:5;
+    u8 lvlMode:2; // + 1
+    u8 field_1;
+    u8 number;
+    struct ApprenticeMon monData[3];
+    u16 easyChatWords[6];
     u8 playerId[4];
-    u8 field_38[10];
+    u8 playerName[PLAYER_NAME_LENGTH];
+    u8 language;
+    u32 unk40;
 };
 
 struct UnknownPokemonStruct
@@ -464,6 +480,28 @@ 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 PlayersApprentice
+{
+    /*0xB0*/ u8 id;
+    /*0xB1*/ u8 activeLvlMode:2; // +1, 0 means not active
+    /*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 monIds[3];
+    /*0xB8*/ struct Sav2_B8 field_B8[9];
+};
+
 struct SaveBlock2
 {
     /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
@@ -487,14 +525,8 @@ struct SaveBlock2
     /*0xA0*/ struct Time lastBerryTreeUpdate;
     /*0xA8*/ u32 field_A8;
     /*0xAC*/ u32 encryptionKey;
-
-        // TODO: fix and verify labels
-    /*0xB0*/ u8 field_B0;
-    /*0xB1*/ u8 field_B1;
-    /*0xB2*/ u8 field_B2_0:3;
-    /*0xB2*/ u8 field_B2_1:2;
-    /*0xB3*/ u8 field_B3[0x29];
-    /*0xDC*/ struct UnkRecordMixingStruct field_DC[4];
+    /*0xB0*/ struct PlayersApprentice playerApprentice;
+    /*0xDC*/ struct Apprentice apprentices[4];
     /*0x1EC*/ struct BerryCrush berryCrush;
     /*0x1FC*/ struct PokemonJumpResults pokeJump;
     /*0x20C*/ struct BerryPickingResults berryPick;