summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h24
1 files changed, 21 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h
index c11bddc2d..d6a57320d 100644
--- a/include/global.h
+++ b/include/global.h
@@ -378,7 +378,8 @@ struct BattleFrontier
/*0xEE0*/ u8 field_EE0;
/*0xEE1*/ u8 field_EE1[2][PLAYER_NAME_LENGTH + 1];
/*0xEF1*/ u8 field_EF1[2][4];
- /*0xEF9*/ u8 field_EF9;
+ /*0xEF9*/ u8 field_EF9_0:7;
+ /*0xEF9*/ u8 field_EF9_1:1;
/*0xEFA*/ u8 field_EFA;
/*0xEFB*/ u8 field_EFB;
/*0xEFC*/ struct FrontierMonData field_EFC[3];
@@ -792,6 +793,21 @@ struct UnkSaveSubstruct_3b98
u8 trainerName[PLAYER_NAME_LENGTH + 1];
};
+struct SaveTrainerHill
+{
+ /*0x3D64*/ u32 field_3D64;
+ /*0x3D68*/ u32 field_3D68;
+ /*0x3D6C*/ u8 field_3D6C;
+ /*0x3D6D*/ u8 unused;
+ /*0x3D6E*/ u16 field_3D6E_0a:1; // 1
+ /*0x3D6E*/ u16 field_3D6E_0b:1; // 2
+ /*0x3D6E*/ u16 field_3D6E_0c:1; // 4
+ /*0x3D6E*/ u16 field_3D6E_0d:1; // 8
+ /*0x3D6E*/ u16 field_3D6E_0e:1; // x10
+ /*0x3D6E*/ u16 field_3D6E_0f:1; // x20
+ /*0x3D6E*/ u16 field_3D6E_1:2; // x40, x80 = xC0
+};
+
struct SaveBlock1
{
/*0x00*/ struct Coords16 pos;
@@ -869,13 +885,15 @@ struct SaveBlock1
/*0x31A8*/ u8 giftRibbons[52];
/*0x31DC*/ struct Roamer roamer;
/*0x31F8*/ struct EnigmaBerry enigmaBerry;
- /*0x322C*/ u8 field_322C[1276];
+ /*0x322C*/ u8 field_322C[1260];
+ /*0x3718*/ u32 field_3718[4];
/*0x3728*/ struct RamScript ramScript;
/*0x3B14*/ struct RecordMixingGift recordMixingGift;
/*0x3B24*/ u8 seen2[DEX_FLAGS_NO];
/*0x3B58*/ LilycoveLady lilycoveLady;
/*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20];
- /*0x3C88*/ u8 filler_3C88[0xE8];
+ /*0x3C88*/ u8 filler_3C88[0xDC];
+ /*0x3D64*/ struct SaveTrainerHill trainerHill;
/*0x3D70*/ struct WaldaPhrase waldaPhrase;
// sizeof: 0x3D88
};