From d3057e7ae686750f561a6b23552a072f53dd8f63 Mon Sep 17 00:00:00 2001 From: PikalaxALT 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/mevent.h') 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 7b4e2ec05b269b2fa8b73ecf94bae1e63965fb43 Mon Sep 17 00:00:00 2001 From: PikalaxALT 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/mevent.h') 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 Date: Fri, 26 Apr 2019 12:49:08 -0400 Subject: Finish mystery_gift_menu.c --- include/mevent.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/mevent.h') 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 -- cgit v1.2.3 From e07368e90b1c0804dc4e4f2269ce9dc5fb632999 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 14 Jun 2019 18:23:27 -0400 Subject: cereader_tool and ereader_helpers --- include/mevent.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/mevent.h') diff --git a/include/mevent.h b/include/mevent.h index b9b17d8c0..b61fa732d 100644 --- a/include/mevent.h +++ b/include/mevent.h @@ -23,9 +23,9 @@ struct MEventStruct_Unk1442CC struct MEvent_Str_1 { - u16 unk_000; - size_t unk_004; - const void * unk_008; + u16 status; + size_t size; + const void * data; }; struct MEvent_Str_2 -- cgit v1.2.3