From 9575eba4814cfa96ae863ea2716afecbf2565b71 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 25 Apr 2019 08:52:36 -0400
Subject: start to port mystery gift from emerald

---
 include/new_menu_helpers.h | 1 +
 include/text_window.h      | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index b17326667..fc9c1b9dc 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -30,5 +30,6 @@ void Menu_LoadStdPalAt(u16);
 void * malloc_and_decompress(const void * src, u32 * size);
 u16 sub_80F796C(void);
 void sub_80F6B08(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
+void sub_80F696C(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4);
 
 #endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/text_window.h b/include/text_window.h
index 8a4113c62..2afc52a08 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -23,5 +23,7 @@ void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
 void sub_814FEAC(u8 windowId, u16 tileStart, u8 palette);
 void sub_814FF2C(u8 windowId, u16 tileStart, u8 palette);
 void sub_815001C(u8 windowId, u16 tileStart, u8 palette);
+void sub_814FE40(u8 windowId, u16 tileStart, u8 palette);
+void sub_814FDA0(u8 windowId, u16 tileStart, u8 palette);
 
 #endif // GUARD_TEXT_WINDOW_H
-- 
cgit v1.2.3


From f95188d887ca8073347f13c56e5e7acf53a75ac2 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 25 Apr 2019 10:20:18 -0400
Subject: link_rfu_4 is part of mystery_gift_menu

---
 include/mystery_gift_menu.h | 6 +++---
 include/title_screen.h      | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 include/title_screen.h

(limited to 'include')

diff --git a/include/mystery_gift_menu.h b/include/mystery_gift_menu.h
index 24bf85a13..c7b047f56 100644
--- a/include/mystery_gift_menu.h
+++ b/include/mystery_gift_menu.h
@@ -1,9 +1,9 @@
 #ifndef GUARD_MYSTERY_GIFT_MENU_H
 #define GUARD_MYSTERY_GIFT_MENU_H
 
-extern bool8 gUnknown_203F3B8;
+extern bool8 gGiftIsFromEReader;
 
-void sub_81422FC(void);
-void sub_8142344(bool8, bool32);
+void MainCB_FreeAllBuffersAndReturnToInitTitleScreen(void);
+void PrintMysteryGiftOrEReaderTopMenu(bool8, bool32);
 
 #endif //GUARD_MYSTERY_GIFT_MENU_H
diff --git a/include/title_screen.h b/include/title_screen.h
new file mode 100644
index 000000000..8e7a6a275
--- /dev/null
+++ b/include/title_screen.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_TITLE_SCREEN_H
+#define GUARD_TITLE_SCREEN_H
+
+void CB2_InitTitleScreen(void);
+
+#endif //GUARD_TITLE_SCREEN_H
-- 
cgit v1.2.3


From 6cebd1f85311b1aa7321eb141521686d21bd091c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 25 Apr 2019 16:52:29 -0400
Subject: through MysteryGift_HandleThreeOptionMenu

---
 include/link_rfu.h    | 6 +++---
 include/list_menu.h   | 1 +
 include/text_window.h | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/link_rfu.h b/include/link_rfu.h
index 6e54fcc6c..9ce6f04bb 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -1,9 +1,9 @@
 #ifndef GUARD_LINK_RFU_H
 #define GUARD_LINK_RFU_H
 
-void sub_8142504(const u8 *str);
-bool32 mevent_0814257C(u8 * cmdPtr, const u8 * src);
+void AddTextPrinterToWindow1(const u8 *str);
+bool32 MG_PrintTextOnWindow1AndWaitButton(u8 * cmdPtr, const u8 * src);
 void sub_80FA190(void);
-void sub_8142420(void);
+void MG_DrawCheckerboardPattern(void);
 
 #endif //GUARD_LINK_RFU_H
diff --git a/include/list_menu.h b/include/list_menu.h
index 3fd54d0d1..393872017 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -59,5 +59,6 @@ void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2);
 void DestroyListMenu(u8, u16 *, u16 *);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8);
 void sub_8107D38(u8, u8);
+s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum);
 
 #endif //GUARD_LIST_MENU_H
diff --git a/include/text_window.h b/include/text_window.h
index 2afc52a08..9fbc90799 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -25,5 +25,6 @@ void sub_814FF2C(u8 windowId, u16 tileStart, u8 palette);
 void sub_815001C(u8 windowId, u16 tileStart, u8 palette);
 void sub_814FE40(u8 windowId, u16 tileStart, u8 palette);
 void sub_814FDA0(u8 windowId, u16 tileStart, u8 palette);
+void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette);
 
 #endif // GUARD_TEXT_WINDOW_H
-- 
cgit v1.2.3


From d3057e7ae686750f561a6b23552a072f53dd8f63 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 25 Apr 2019 17:44:25 -0400
Subject: through HandleLoadWonderCardOrNews

---
 include/mevent.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/mevent.h b/include/mevent.h
index d940b212c..7f5206359 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -33,12 +33,13 @@ struct MEvent_Str_2
     u8 fill_00[0x40];
 };
 
-struct MEventBuffer_3120_Sub * sub_8143D58(void);
-struct MEventBuffer_32E0_Sub * sav1_get_mevent_buffer_1(void);
+struct MEventBuffer_3120_Sub * GetSavedWonderNews(void);
+struct MEventBuffer_32E0_Sub * GetSavedWonderCard(void);
 struct MEventBuffer_3430_Sub * sav1_get_mevent_buffer_2(void);
 struct MysteryEventStruct * sub_8143D94(void);
 bool32 sub_8143DC8(const struct MEventBuffer_3120_Sub * src);
-bool32 sub_8143E1C(void);
+bool32 ValidateReceivedWonderCard(void);
+bool32 ValidateReceivedWonderNews(void);
 bool32 sub_8143EF4(const u8 * src);
 bool32 sub_8143F68(const struct MEventBuffer_32E0_Sub * data);
 void sub_814410C(struct MEventBuffer_32E0_Sub * buffer);
@@ -49,5 +50,9 @@ u32 sub_8144418(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void *
 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);
+s32 FadeToWonderCardMenu(void);
+s32 FadeToWonderNewsMenu(void);
 
 #endif //GUARD_MEVENT_H
-- 
cgit v1.2.3


From 76a421f6f1787c013e8f8ba4403f5b995c648c41 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 25 Apr 2019 20:35:26 -0400
Subject: Port data from emerald

---
 include/list_menu.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/list_menu.h b/include/list_menu.h
index 393872017..8ff65da0b 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -60,5 +60,6 @@ void DestroyListMenu(u8, u16 *, u16 *);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8);
 void sub_8107D38(u8, u8);
 s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum);
+void ListMenuDefaultCursorMoveFunc(s32, u8, struct ListMenu *);
 
 #endif //GUARD_LIST_MENU_H
-- 
cgit v1.2.3


From 7b4e2ec05b269b2fa8b73ecf94bae1e63965fb43 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 26 Apr 2019 08:51:05 -0400
Subject: through mevent_message

---
 include/mevent.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/mevent.h b/include/mevent.h
index 7f5206359..5c3bfe86d 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -38,8 +38,8 @@ struct MEventBuffer_32E0_Sub * GetSavedWonderCard(void);
 struct MEventBuffer_3430_Sub * sav1_get_mevent_buffer_2(void);
 struct MysteryEventStruct * sub_8143D94(void);
 bool32 sub_8143DC8(const struct MEventBuffer_3120_Sub * src);
-bool32 ValidateReceivedWonderCard(void);
 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);
@@ -54,5 +54,11 @@ bool32 InitWonderCardResources(struct MEventBuffer_32E0_Sub * r5, struct MEventB
 bool32 InitWonderNewsResources(const struct MEventBuffer_3120_Sub * a0);
 s32 FadeToWonderCardMenu(void);
 s32 FadeToWonderNewsMenu(void);
+void DestroyWonderCard(void);
+void DestroyWonderNews(void);
+void DestroyWonderCardResources(void);
+void DestroyWonderNewsResources(void);
+s32 FadeOutFromWonderCard(bool32 flag);
+s32 FadeOutFromWonderNews(bool32 flag);
 
 #endif //GUARD_MEVENT_H
-- 
cgit v1.2.3


From 274151836b44d960ab357d861a4d79602a8722d5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 26 Apr 2019 12:49:08 -0400
Subject: Finish mystery_gift_menu.c

---
 include/link.h          |  2 +-
 include/link_rfu.h      |  6 ++++++
 include/menews_jisan.h  |  2 +-
 include/mevent.h        |  6 ++++++
 include/mevent_server.h | 18 +++++++++---------
 5 files changed, 23 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/link.h b/include/link.h
index 93ad9dfe1..a875149aa 100644
--- a/include/link.h
+++ b/include/link.h
@@ -204,7 +204,7 @@ bool8 sub_800AA48(void);
 void sub_800A5BC(void);
 void sub_800AA80(u8);
 void sub_80098D8(void);
-void sub_80098B8(void);
+void CloseLink(void);
 bool8 sub_800A4BC(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 9ce6f04bb..d076efae6 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -5,5 +5,11 @@ void AddTextPrinterToWindow1(const u8 *str);
 bool32 MG_PrintTextOnWindow1AndWaitButton(u8 * cmdPtr, const u8 * src);
 void sub_80FA190(void);
 void MG_DrawCheckerboardPattern(void);
+void task_add_05_task_del_08FA224_when_no_RfuFunc(void);
+bool8 IsNoOneConnected(void);
+void DestroyWirelessStatusIndicatorSprite(void);
+void MEvent_CreateTask_CardOrNewsWithFriend(u8);
+void MEvent_CreateTask_CardOrNewsOverWireless(u8);
+void MEvent_CreateTask_Leader(u8);
 
 #endif //GUARD_LINK_RFU_H
diff --git a/include/menews_jisan.h b/include/menews_jisan.h
index 4db5a7be2..ca09d4347 100644
--- a/include/menews_jisan.h
+++ b/include/menews_jisan.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-void sub_8146C30(u32 a0);
+void GenerateRandomNews(u32 a0);
 void sub_8146C88(void);
 void sub_8146CA4(void);
 
diff --git a/include/mevent.h b/include/mevent.h
index 5c3bfe86d..b9b17d8c0 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -60,5 +60,11 @@ void DestroyWonderCardResources(void);
 void DestroyWonderNewsResources(void);
 s32 FadeOutFromWonderCard(bool32 flag);
 s32 FadeOutFromWonderNews(bool32 flag);
+bool32 CheckReceivedGiftFromWonderCard(void);
+void MENews_AddScrollIndicatorArrowPair(void);
+void MENews_RemoveScrollIndicatorArrowPair(void);
+bool32 WonderNews_Test_Unk_02(void);
+bool32 WonderCard_Test_Unk_08_6(void);
+u32 MENews_GetInput(u16 input);
 
 #endif //GUARD_MEVENT_H
diff --git a/include/mevent_server.h b/include/mevent_server.h
index e593b5dbd..10ee96401 100644
--- a/include/mevent_server.h
+++ b/include/mevent_server.h
@@ -37,7 +37,7 @@ struct mevent_cmd_ish
     u32 parameter;
 };
 
-struct mevent_srv_ish
+struct mevent_client
 {
     u32 unk_00;
     u32 param;
@@ -83,13 +83,13 @@ void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recv
 void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void * src, u32 size);
 void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void * dest);
 
-void mevent_srv_ish_do_init(void);
-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);
-void mevent_srv_common_do_init_1(void);
-void mevent_srv_common_do_init_2(void);
-u32 mevent_srv_init_do_exec(u16 * a0);
+void mevent_client_do_init(void);
+u32 mevent_client_do_exec(u16 * a0);
+void mevent_client_inc_flag(void);
+void * mevent_client_get_buffer(void);
+void mevent_client_set_param(u32 a0);
+void mevent_srv_init_wnews(void);
+void mevent_srv_new_wcard(void);
+u32 mevent_srv_common_do_exec(u16 * a0);
 
 #endif //GUARD_MEVENT_SERVER_H
-- 
cgit v1.2.3