Merge pull request #142 from PikalaxALT/dism_more_data

Dism more data still

1 files changed, 21 insertions, 21 deletions

diff --git a/include/mevent.h b/include/mevent.h
index 31ab9e421..81caeb42f 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -3,22 +3,22 @@
 
 #include "global.h"
 
-struct MEventStruct_Unk1442CC
+struct MEventClientHeaderStruct
 {
     u32 unk_00;
     u16 unk_04;
     u32 unk_08;
     u16 unk_0C;
     u32 unk_10;
-    u16 unk_14;
+    u16 id;
     u16 unk_16[4];
     struct MEventBuffer_3430_Sub unk_20;
     u8 unk_44;
-    u8 unk_45[7];
-    u8 unk_4C[4];
-    u16 unk_50[6];
-    u8 unk_5C[4];
-    u8 unk_60;
+    u8 playerName[7];
+    u8 playerTrainerId[4];
+    u16 easyChatProfile[6];
+    u8 gameCode[4];
+    u8 version;
 };
 
 struct MEvent_Str_1
@@ -33,25 +33,25 @@ struct MEvent_Str_2
     u8 fill_00[0x40];
 };
 
-struct MEventBuffer_3120_Sub * GetSavedWonderNews(void);
-struct MEventBuffer_32E0_Sub * GetSavedWonderCard(void);
+struct MEWonderNewsData * GetSavedWonderNews(void);
+struct MEWonderCardData * GetSavedWonderCard(void);
 struct MEventBuffer_3430_Sub * sav1_get_mevent_buffer_2(void);
 struct MENewsJisanStruct * GetMENewsJisanStructPtr(void);
-bool32 sub_8143DC8(const struct MEventBuffer_3120_Sub * src);
+bool32 sub_8143DC8(const struct MEWonderNewsData * src);
 bool32 ValidateReceivedWonderNews(void);
 bool32 ValidateReceivedWonderCard(void);
 bool32 sub_8143EF4(const u8 * src);
-bool32 sub_8143F68(const struct MEventBuffer_32E0_Sub * data);
-void sub_814410C(struct MEventBuffer_32E0_Sub * buffer);
+bool32 sub_8143F68(const struct MEWonderCardData * data);
+void sub_814410C(struct MEWonderCardData * buffer);
 bool32 sub_8144254(const u16 * data);
-void sub_81442CC(struct MEventStruct_Unk1442CC * data);
-bool32 sub_81443D4(const struct MEventStruct_Unk1442CC * data);
-u32 sub_8144418(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void * unused);
-u32 sub_8144434(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void * unused);
-bool32 sub_8144474(const struct MEventStruct_Unk1442CC * a0, const u16 * a1);
-u16 sub_81444B0(const struct MEventStruct_Unk1442CC * a0, u32 command);
-bool32 InitWonderCardResources(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6);
-bool32 InitWonderNewsResources(const struct MEventBuffer_3120_Sub * a0);
+void BuildMEventClientHeader(struct MEventClientHeaderStruct * data);
+bool32 ValidateMEventClientHeader(const struct MEventClientHeaderStruct * data);
+u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused);
+u32 sub_8144434(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused);
+bool32 sub_8144474(const struct MEventClientHeaderStruct * a0, const u16 * a1);
+u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command);
+bool32 InitWonderCardResources(struct MEWonderCardData * r5, struct MEventBuffer_3430_Sub * r6);
+bool32 InitWonderNewsResources(const struct MEWonderNewsData * a0);
 s32 FadeToWonderCardMenu(void);
 s32 FadeToWonderNewsMenu(void);
 void DestroyWonderCard(void);
@@ -69,6 +69,6 @@ u32 MENews_GetInput(u16 input);
 void sub_8143D24(void);
 u16 sub_81445C0(u32 command);
 void sub_8144714(u32 a0, u32 a1);
-u16 *sub_8143DA8(void);
+u16 *GetMEventProfileECWordsMaybe(void);
 
 #endif //GUARD_MEVENT_H