summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-11-04 20:52:41 -0500
committerGitHub <noreply@github.com>2019-11-04 20:52:41 -0500
commit9b7d57bb6b654996df7a107c145ec49b78b33c1a (patch)
tree050d0a76f4c8a7c780ab6a951f22c77bd5d12744 /include/global.h
parent7bfa6d20587ed14cfa26b9fa81f45837abfafb26 (diff)
parent876a139ba385036ef34fde899b1caba0d7cc1f29 (diff)
Merge pull request #142 from PikalaxALT/dism_more_data
Dism more data still
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/include/global.h b/include/global.h
index 22faa7b1c..874717784 100644
--- a/include/global.h
+++ b/include/global.h
@@ -636,7 +636,7 @@ 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
+struct MEWonderNewsData
{
u16 unk_00;
u8 unk_02;
@@ -645,13 +645,13 @@ struct MEventBuffer_3120_Sub
u8 unk_2C[10][40];
};
-struct MEventBuffer_3120
+struct MEWonderNewsStruct
{
u32 crc;
- struct MEventBuffer_3120_Sub data;
+ struct MEWonderNewsData data;
};
-struct MEventBuffer_32E0_Sub
+struct MEWonderCardData
{
u16 unk_00;
u16 unk_02;
@@ -667,10 +667,10 @@ struct MEventBuffer_32E0_Sub
u8 unk_122[40];
};
-struct MEventBuffer_32E0
+struct MEWonderCardStruct
{
u32 crc;
- struct MEventBuffer_32E0_Sub data;
+ struct MEWonderCardData data;
};
struct MEventBuffer_3430_Sub
@@ -690,11 +690,11 @@ struct MEventBuffer_3430
struct MEventBuffers
{
- /*0x000 0x3120*/ struct MEventBuffer_3120 buffer_000;
- /*0x1c0 0x32e0*/ struct MEventBuffer_32E0 buffer_1c0;
+ /*0x000 0x3120*/ struct MEWonderNewsStruct menews;
+ /*0x1c0 0x32e0*/ struct MEWonderCardStruct mecard;
/*0x310 0x3430*/ struct MEventBuffer_3430 buffer_310;
- /*0x338 0x3458*/ u16 unk_338[4];
- /*0x340 0x3460*/ struct MENewsJisanStruct unk_340;
+ /*0x338 0x3458*/ u16 ec_profile_maybe[4];
+ /*0x340 0x3460*/ struct MENewsJisanStruct me_jisan;
/*0x344 0x3464*/ u32 unk_344[2][5];
}; // 0x36C 0x348C
@@ -766,7 +766,7 @@ struct SaveBlock1
/*0x309C*/ u8 giftRibbons[52];
/*0x30D0*/ struct Roamer roamer;
/*0x30EC*/ struct EnigmaBerry enigmaBerry;
- /*0x3120*/ struct MEventBuffers unk_3120;
+ /*0x3120*/ struct MEventBuffers mysteryEventBuffers;
/*0x348C*/ u8 filler_348C[400];
/*0x361C*/ struct RamScript ramScript;
/*0x3A08*/ u8 filler3A08[12];