Merge remote-tracking branch 'upstream/master' into misc_docs

# Conflicts:
#	src/field_weather_effect.c

1 files changed, 9 insertions, 9 deletions

diff --git a/include/mevent.h b/include/mevent.h
index 7f12f3501..9c5d559bf 100755
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -32,23 +32,23 @@ struct MEventStruct_Unk1442CC
 };
 
 void sub_801AFD8(void);
-struct MEventBuffer_3120_Sub *sub_801B00C(void);
+struct MEventBuffer_3120_Sub *sav1_get_mevent_buffer_0(void);
 struct MEventBuffer_32E0_Sub *sav1_get_mevent_buffer_1(void);
 struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void);
 struct MysteryEventStruct *sub_801B044(void);
 u16 *sub_801B058(void);
-void sub_801B06C(void);
+void DestroyWonderNews(void);
 bool32 sub_801B078(const struct MEventBuffer_3120_Sub *src);
-bool32 sub_801B0CC(void);
-bool32 sub_801B128(void);
+bool32 ValidateReceivedWonderNews(void);
+bool32 WonderNews_Test_Unk_02(void);
 bool32 sub_801B1A4(const u8 *src);
-void sub_801B1E8(void);
+void DestroyWonderCard(void);
 bool32 sub_801B21C(const struct MEventBuffer_32E0_Sub *data);
-bool32 sub_801B27C(void);
-bool32 sub_801B308(void);
-u16 sub_801B39C(void);
+bool32 ValidateReceivedWonderCard(void);
+bool32 WonderCard_Test_Unk_08_6(void);
+u16 GetWonderCardFlagID(void);
 void sub_801B3C0(struct MEventBuffer_32E0_Sub *buffer);
-bool32 sub_801B3F8(void);
+bool32 CheckReceivedGiftFromWonderCard(void);
 bool32 sub_801B508(const u16 *data);
 void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1);
 bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1);