1 files changed, 69 insertions, 4 deletions

diff --git a/include/global.h b/include/global.h
index d5bfc5241..775b3115e 100644
--- a/include/global.h
+++ b/include/global.h
@@ -28,6 +28,8 @@
 #endif // __APPLE__
 
 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
+// GF's lingo
+#define NELEMS ARRAY_COUNT
 
 // useful math macros
 
@@ -264,7 +266,9 @@ struct SaveBlock2
     /*0x098*/ struct Time localTimeOffset;
     /*0x0A0*/ struct Time lastBerryTreeUpdate;
     /*0x0A8*/ u32 field_A8;
-    /*0x0AC*/ u8 filler_AC[0x9ec];
+    /*0x0AC*/ u8 filler_AC[0x3F4];
+    /*0x4A0*/ u32 unk_4A0[0x2F];
+    /*0x55c*/ u8 filler_55C[0x53C];
     /*0xA98*/ u8 unk_A98[2][16];
     /*0xAB8*/ u8 filler_AB8[0x468];
     /*0xF20*/ u32 encryptionKey;
@@ -591,6 +595,68 @@ struct FameCheckerSaveData
 #define NUM_EASY_CHAT_EXTRA_PHRASES 33
 #define EASY_CHAT_EXTRA_PHRASES_SIZE ((NUM_EASY_CHAT_EXTRA_PHRASES >> 3) + (NUM_EASY_CHAT_EXTRA_PHRASES % 8 ? 1 : 0))
 
+struct MEventBuffer_3120_Sub
+{
+	u16 unk_00;
+	u8 unk_02;
+	u8 unk_03;
+	u8 unk_04[40];
+	u8 unk_2C[10][40];
+};
+
+struct MEventBuffer_3120
+{
+	u32 crc;
+	struct MEventBuffer_3120_Sub data;
+};
+
+struct MEventBuffer_32E0_Sub
+{
+	u16 unk_00;
+	u16 unk_02;
+	u32 unk_04;
+	u8 unk_08_0:2;
+	u8 unk_08_2:4;
+	u8 unk_08_6:2;
+	u8 unk_09;
+	u8 unk_0A[40];
+	u8 unk_32[40];
+	u8 unk_5A[4][40];
+	u8 unk_FA[40];
+	u8 unk_122[40];
+};
+
+struct MEventBuffer_32E0
+{
+	u32 crc;
+	struct MEventBuffer_32E0_Sub data;
+};
+
+struct MEventBuffer_3430_Sub
+{
+	u16 unk_00;
+	u16 unk_02;
+	u16 unk_04;
+	u16 unk_06;
+	u16 unk_08[2][7];
+};
+
+struct MEventBuffer_3430
+{
+	u32 crc;
+	struct MEventBuffer_3430_Sub data;
+};
+
+struct MEventBuffers
+{
+	/*0x000 0x3120*/ struct MEventBuffer_3120 buffer_000;
+	/*0x1c0 0x32e0*/ struct MEventBuffer_32E0 buffer_1c0;
+	/*0x310 0x3430*/ struct MEventBuffer_3430 buffer_310;
+	/*0x338 0x3458*/ u16 unk_338[4];
+	/*0x340 0x3460*/ struct MysteryEventStruct unk_340;
+	/*0x344 0x3464*/ u32 unk_344[2][5];
+}; // 0x36C 0x348C
+
 struct SaveBlock1
 {
     /*0x0000*/ struct Coords16 pos;
@@ -638,9 +704,8 @@ struct SaveBlock1
     /*0x309C*/ u8 giftRibbons[52];
     /*0x30D0*/ struct Roamer roamer;
     /*0x30EC*/ struct EnigmaBerry enigmaBerry;
-    /*0x3120*/ u8 filler3120[0x340];
-    /*0x3460*/ struct MysteryEventStruct unk_3460;
-    /*0x3464*/ u8 filler_3464[0x1b8];
+    /*0x3120*/ struct MEventBuffers unk_3120;
+    /*0x348C*/ u8 filler_348C[0x190];
     /*0x361C*/ struct RamScript ramScript;
     /*0x3A08*/ u8 filler3A08[12];
     /*0x3A14*/ u8 seen2[DEX_FLAGS_NO];