summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-11-29 15:33:58 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-11-29 15:33:58 -0500
commit159f242e32532f14496abaa8d2f96e9c3d30d720 (patch)
treeeccf840b6ff7bf468518315649686540fbbbb5fe /include/global.h
parentdfb6bcb6acdebfb3b7fe024148889361e9309dc4 (diff)
through sub_8144018
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h36
1 files changed, 32 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h
index 456f2c083..df2926d0b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -264,7 +264,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,22 +593,48 @@ 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;
+ u16 filler_04[220];
+};
+
struct MEventBuffer_3120
{
u32 crc;
- u16 data[222];
+ struct MEventBuffer_3120_Sub data;
+};
+
+struct MEventBuffer_32E0_Sub
+{
+ u16 unk_00;
+ u16 unk_02;
+ u8 filler_04[4];
+ u8 unk_08_0:2;
+ u8 unk_08_2:4;
+ u8 unk_08_6:2;
+ u8 unk_09;
+ u8 filler_0A[322];
};
struct MEventBuffer_32E0
{
u32 crc;
- u16 data[166];
+ struct MEventBuffer_32E0_Sub data;
+};
+
+struct MEventBuffer_3430_Sub
+{
+ u8 filler_00[6];
+ u16 unk_06;
+ u8 filler_08[28];
};
struct MEventBuffer_3430
{
u32 crc;
- u16 data[18];
+ struct MEventBuffer_3430_Sub data;
};
struct MEventBuffers