6 files changed, 33 insertions, 33 deletions
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 6c3947ea9..765758035 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -34,7 +34,7 @@ void InitEasyChatPhrases(void);
 u8 *CopyEasyChatWord(u8 *dest, u16 word);
 u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
 bool8 EC_DoesEasyChatStringFitOnLine(const u16 *easyChatWords, u8 columns, u8 rows, u16 maxLength);
-void ResetSomeMEventECBuffer_3120_338(void);
+void EC_ResetMEventProfileMaybe(void);
 void InitEasyChatPhrases(void);
 void EnableRareWord(u8);
 bool8 InitEasyChatSelection(void);
diff --git a/include/global.h b/include/global.h
index 22faa7b1c..2852ef9a4 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 mejisan;
     /*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];
diff --git a/include/mevent.h b/include/mevent.h
index 88e779fbf..81caeb42f 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-struct MEventStruct_Unk1442CC
+struct MEventClientHeaderStruct
 {
     u32 unk_00;
     u16 unk_04;
@@ -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
diff --git a/include/mevent_server.h b/include/mevent_server.h
index 3dafdff94..ddc00b978 100644
--- a/include/mevent_server.h
+++ b/include/mevent_server.h
@@ -66,9 +66,9 @@ struct mevent_srv_common
     u32 cmdidx;
     const struct mevent_server_cmd * cmdBuffer;
     void * recvBuffer;
-    struct MEventBuffer_32E0_Sub * card;
-    struct MEventBuffer_3120_Sub * news;
-    struct MEventStruct_Unk1442CC * mevent_unk1442cc;
+    struct MEWonderCardData * card;
+    struct MEWonderNewsData * news;
+    struct MEventClientHeaderStruct * mevent_unk1442cc;
     void * sendBuffer1;
     u32 sendBuffer1Size;
     void * sendBuffer2;
diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h
index be64663ed..8c59136c1 100644
--- a/include/mystery_event_script.h
+++ b/include/mystery_event_script.h
@@ -7,7 +7,7 @@ u32 RunMysteryEventScript(u8 *);
 void SetMysteryEventScriptStatus(u32 val);
 u16 GetRecordMixingGift(void);
 
-void sub_80DA89C(u8 *);
-bool32 sub_80DA8B0(u32 *);
+void MEventScript_InitContext(u8 *);
+bool32 MEventScript_Run(u32 *);
 
 #endif // GUARD_MYSTERY_EVENT_SCRIPT_H
diff --git a/include/script.h b/include/script.h
index 4e8b8c305..c0b23e248 100644
--- a/include/script.h
+++ b/include/script.h
@@ -63,7 +63,7 @@ bool32 sub_80991F8(void);
 u8 *sub_8099244(void);
 void sub_80992A0(u8 *script, u16 scriptSize);
 bool32 sub_8069DFC(void);
-void sub_8069EA4(u8 * script, u16 scriptSize);
+void MEventSetRamScript(u8 * script, u16 scriptSize);
 u8 * sub_8069E48(void);
 void sub_8069998(u8 var);
 void sub_80699F8(void);