13 files changed, 47 insertions, 47 deletions

diff --git a/include/ereader_screen.h b/include/ereader_screen.h
index 0e3e51c76..1daea4be0 100755
--- a/include/ereader_screen.h
+++ b/include/ereader_screen.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_EREADER_SCREEN_H
 #define GUARD_EREADER_SCREEN_H
 
-void sub_81D5014(void);
+void task_add_00_ereader(void);
 
 #endif // GUARD_EREADER_SCREEN_H
diff --git a/include/international_string_util.h b/include/international_string_util.h
index 2d5b1c871..911cd6935 100644
--- a/include/international_string_util.h
+++ b/include/international_string_util.h
@@ -12,7 +12,7 @@ int GetStringCenterAlignXOffsetWithLetterSpacing(int fontId, const u8 *str, int
 int GetStringWidthDifference(int fontId, const u8 *str, int totalWidth, int letterSpacing);
 int GetMaxWidthInMenuTable(const struct MenuAction *str, int arg1);
 int sub_81DB3D8(const struct MenuAction *str, const u8* arg1, int arg2);
-int sub_81DB41C(const struct ListMenuTemplate *listMenu);
+int Intl_GetListMenuWidth(const struct ListMenuTemplate *listMenu);
 void CopyMonCategoryText(int dexNum, u8 *dest);
 u8 *sub_81DB494(u8 *str, int fontId, u8 *str2, int totalStringWidth);
 void PadNameString(u8 *dest, u8 padChar);
diff --git a/include/link.h b/include/link.h
index 719b0f067..62ae7761c 100644
--- a/include/link.h
+++ b/include/link.h
@@ -200,8 +200,6 @@ extern bool8 gLinkVSyncDisabled;
 extern u32 gLinkStatus;
 
 
-void c2_mystery_gift(void);
-void sub_801867C(void);
 bool8 IsWirelessAdapterConnected(void);
 void Task_DestroySelf(u8 taskId);
 void OpenLink(void);
diff --git a/include/link_rfu.h b/include/link_rfu.h
index d8f374ff9..b8ba1a927 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -260,7 +260,7 @@ u32 sub_8010714(u16 a0, const u8 *a1);
 void sub_8011DC0(const u8 *a0, u16 a1);
 bool8 sub_800EF1C(void);
 bool32 sub_800EF58(bool32 a0);
-void sub_800E084(void);
+void DestroyWirelessStatusIndicatorSprite(void);
 void sub_801103C(void);
 void sub_8011C5C(void);
 void sub_80106D4(void);
diff --git a/include/menu.h b/include/menu.h
index b4c3cb2b5..4f3c4a3cc 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -35,7 +35,7 @@ void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram);
 void DisplayYesNoMenuDefaultYes(void);
 u32 GetPlayerTextSpeed(void);
 u8 GetPlayerTextSpeedDelay(void);
-void sub_81978B0(u16 arg0);
+void Menu_LoadStdPalAt(u16 arg0);
 void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16));
 void sub_8199DF0(u32 bg, u8 a1, int a2, int a3);
 void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str);
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);
diff --git a/include/mevent_801BAAC.h b/include/mevent_801BAAC.h
index 2259d3b6d..547d5237b 100644
--- a/include/mevent_801BAAC.h
+++ b/include/mevent_801BAAC.h
@@ -1,16 +1,16 @@
 #ifndef GUARD_MEVENT_801BAAC_H
 #define GUARD_MEVENT_801BAAC_H
 
-bool32 sub_801BAAC(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6);
-bool32 sub_801C6C8(const struct MEventBuffer_3120_Sub * a0);
-s32 sub_801BB74(void);
-s32 sub_801C758(void);
-s32 sub_801BDA4(bool32 flag);
-void sub_801BB48(void);
-s32 sub_801CA50(bool32 flag);
-void sub_801C72C(void);
-u32 sub_801CCD0(u16 input);
-void sub_801CC80(void);
-void sub_801CC38(void);
+bool32 InitWonderCardResources(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6);
+bool32 InitWonderNewsResources(const struct MEventBuffer_3120_Sub * a0);
+s32 FadeToWonderCardMenu(void);
+s32 FadeToWonderNewsMenu(void);
+s32 FadeOutFromWonderCard(bool32 flag);
+void DestroyWonderCardResources(void);
+s32 FadeOutFromWonderNews(bool32 flag);
+void DestroyWonderNewsResources(void);
+u32 MENews_GetInput(u16 input);
+void MENews_AddScrollIndicatorArrowPair(void);
+void MENews_RemoveScrollIndicatorArrowPair(void);
 
 #endif //GUARD_MEVENT_801BAAC_H
diff --git a/include/mevent_news.h b/include/mevent_news.h
index 4632edd38..5fa009499 100755
--- a/include/mevent_news.h
+++ b/include/mevent_news.h
@@ -2,6 +2,6 @@
 #define GUARD_MEVENT_NEWS_H
 
 void sub_801DBC0(void);
-void sub_801DB68(u32 a0);
+void GenerateRandomNews(u32 a0);
 
 #endif //GUARD_MEVENT_NEWS_H
diff --git a/include/mevent_server.h b/include/mevent_server.h
index ca3b7091b..d7657b270 100644
--- a/include/mevent_server.h
+++ b/include/mevent_server.h
@@ -3,6 +3,6 @@
 
 void mevent_srv_new_wcard();
 void mevent_srv_init_wnews();
-u32 sub_801D0C4(u16 * a0);
+u32 mevent_srv_common_do_exec(u16 * a0);
 
 #endif //GUARD_MEVENT_SERVER_H
diff --git a/include/mevent_server_ish.h b/include/mevent_server_ish.h
index 76f5080dc..31f98ed52 100644
--- a/include/mevent_server_ish.h
+++ b/include/mevent_server_ish.h
@@ -1,10 +1,10 @@
 #ifndef GUARD_MEVENT_SERVER_ISH_H
 #define GUARD_MEVENT_SERVER_ISH_H
 
-void sub_801D484(u32 arg);
-u32 sub_801D4A8(u16 * a0);
-void sub_801D4E4(void);
-void * sub_801D4F4(void);
-void sub_801D500(u32 a0);
+void mevent_srv_ish_do_init(u32 arg);
+u32 mevent_srv_ish_do_exec(u16 * a0);
+void mevent_srv_ish_inc_flag(void);
+void * mevent_srv_ish_get_buffer(void);
+void mevent_srv_ish_set_param(u32 a0);
 
 #endif //GUARD_MEVENT_SERVER_ISH_H
diff --git a/include/mystery_gift.h b/include/mystery_gift.h
index b43fbe9a9..243895a67 100644
--- a/include/mystery_gift.h
+++ b/include/mystery_gift.h
@@ -1,8 +1,16 @@
 #ifndef GUARD_MYSTERY_GIFT_H
 #define GUARD_MYSTERY_GIFT_H
 
-void sub_8018438(void);
-void sub_80186EC(bool8 isJapanese, bool32 usePickOkCancel);
-void sub_8018798(u32 bg);
+extern bool8 gGiftIsFromEReader;
+
+u16 GetMysteryGiftBaseBlock(void);
+void c2_mystery_gift_e_reader_run(void);
+void PrintMysteryGiftOrEReaderTopMenu(bool8 isJapanese, bool32 usePickOkCancel);
+void MG_DrawCheckerboardPattern(u32 bg);
+void MainCB_FreeAllBuffersAndReturnToInitTitleScreen(void);
+bool32 MG_PrintTextOnWindow1AndWaitButton(u8 *textState, const u8 *str);
+void AddTextPrinterToWindow1(const u8 *src);
+void c2_ereader(void);
+void c2_mystery_gift(void);
 
 #endif //GUARD_MYSTERY_GIFT_H
diff --git a/include/text_window.h b/include/text_window.h
index 53a6df2e9..501597aa2 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -17,8 +17,8 @@ void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset);
 void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palOffset);
 void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset);
 void LoadUserWindowBorderGfx_(u8 windowId, u16 destOffset, u8 palOffset);
-void sub_8098858(u8 windowId, u16 tileNum, u8 palNum);
-void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum);
+void DrawTextBorderOuter(u8 windowId, u16 tileNum, u8 palNum);
+void DrawTextBorderInner(u8 windowId, u16 tileNum, u8 palNum);
 void rbox_fill_rectangle(u8 windowId);
 const u16 *stdpal_get(u8 id);
 const u16 *GetOverworldTextboxPalettePtr(void);
diff --git a/include/union_room.h b/include/union_room.h
index 3d60e1432..ca3c87ab1 100644
--- a/include/union_room.h
+++ b/include/union_room.h
@@ -165,14 +165,8 @@ u8 sub_8013F78(void);
 bool32 sub_802C908(u16);
 void nullsub_89(u8 taskId);
 void var_800D_set_xB(void);
-
-bool32 mevent_0814257C(u8 *textState, const u8 *str);
-void sub_8018884(const u8 *src);
-void sub_80186A4(void);
-void sub_8014EFC(u32 arg0);
-void sub_80152A8(u32 arg0);
-void sub_8014A00(u32 arg0);
-
-extern bool8 gUnknown_02022C60;
+void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0);
+void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0);
+void MEvent_CreateTask_Leader(u32 arg0);
 
 #endif //GUARD_UNION_ROOM_H