Merge pull request #572 from GriffinRichards/sync-mgfitview

Sync wonder card / news screens

include/constants/mystery_gift.h

@@ -0,0 +1,47 @@
+#ifndef GUARD_CONSTANTS_MYSTERY_GIFT_H
+#define GUARD_CONSTANTS_MYSTERY_GIFT_H
+
+#define GET_NUM_STAMPS        0
+#define GET_MAX_STAMPS        1
+#define GET_CARD_BATTLES_WON  2
+#define GET_CARD_BATTLES_LOST 3
+#define GET_CARD_NUM_TRADES   4
+
+#define CARD_STAT_BATTLES_WON   0
+#define CARD_STAT_BATTLES_LOST  1
+#define CARD_STAT_NUM_TRADES    2
+#define CARD_STAT_NUM_STAMPS    3
+#define CARD_STAT_MAX_STAMPS    4
+
+// Values for the type field of Wonder Card
+#define CARD_TYPE_GIFT       0 // Normal "Wonder Card"
+#define CARD_TYPE_STAMP      1 // "Stamp Card"
+#define CARD_TYPE_LINK_STAT  2 // Referred to as the "Battle Card", shows battle and trade stats
+#define CARD_TYPE_COUNT      3
+
+// Values for the sendType field of Wonder Card/News
+#define SEND_TYPE_DISALLOWED     0
+#define SEND_TYPE_ALLOWED        1
+#define SEND_TYPE_ALLOWED_ALWAYS 2
+
+// Return values for MysteryGift_CompareCardFlags, handled by gMysteryGiftServerScript_SendWonderCard
+#define HAS_NO_CARD   0
+#define HAS_SAME_CARD 1
+#define HAS_DIFF_CARD 2
+
+// The number of battles needed to be recorded on a Battle Card to win a prize
+#define REQUIRED_CARD_BATTLES 3
+
+// Stamps are 32 bits. The first 16 bits are the species
+// and the second 16 bits are a number (presumably an ID of some kind)
+#define STAMP_SPECIES 0
+#define STAMP_ID      1
+
+// Number of different types/colors of Wonder Card and News backgrounds
+#define NUM_WONDER_BGS 8
+
+#define MAX_WONDER_CARD_STAT 999
+
+#define WONDER_CARD_FLAG_OFFSET 1000
+
+#endif //GUARD_CONSTANTS_MYSTERY_GIFT_H

include/mevent.h

@@ -9,6 +9,14 @@
 #define CARD_STAT_NUM_STAMPS    3
 #define CARD_STAT_MAX_STAMPS    4
 
+enum {
+    NEWS_INPUT_A,
+    NEWS_INPUT_B,
+    NEWS_INPUT_SCROLL_UP,
+    NEWS_INPUT_SCROLL_DOWN,
+    NEWS_INPUT_NONE = 0xFF
+};
+
 struct MEventClientHeaderStruct
 {
     u32 unk_00;
@@ -39,12 +47,12 @@ struct MEvent_Str_2
     u8 fill_00[0x40];
 };
 
-struct UnkStruct_8467FB8
+struct WonderGraphics
 {
-    u8 textPal1:4;
-    u8 textPal2:4;
-    u8 textPal3:4;
-    u8 index:4;
+    u8 titleTextPal:4;
+    u8 bodyTextPal:4;
+    u8 footerTextPal:4;
+    u8 stampShadowPal:4;
     const u8 * tiles;
     const u8 * map;
     const u16 * pal;
@@ -73,22 +81,22 @@ u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void
 u32 MEvent_CanPlayerReceiveDistributionMon(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 WonderCard * r5, struct WonderCardMetadata * r6);
-bool32 InitWonderNewsResources(const struct WonderNews * a0);
-s32 FadeToWonderCardMenu(void);
-s32 FadeToWonderNewsMenu(void);
+bool32 WonderCard_Init(struct WonderCard * card, struct WonderCardMetadata * metadata);
+bool32 WonderNews_Init(const struct WonderNews * news);
+s32 WonderCard_Enter(void);
+s32 WonderNews_Enter(void);
 void DestroyWonderCard(void);
 void DestroyWonderNews(void);
-void DestroyWonderCardResources(void);
-void DestroyWonderNewsResources(void);
-s32 FadeOutFromWonderCard(bool32 flag);
-s32 FadeOutFromWonderNews(bool32 flag);
+void WonderCard_Destroy(void);
+void WonderNews_Destroy(void);
+s32 WonderCard_Exit(bool32 flag);
+s32 WonderNews_Exit(bool32 flag);
 bool32 CheckReceivedGiftFromWonderCard(void);
-void MENews_AddScrollIndicatorArrowPair(void);
-void MENews_RemoveScrollIndicatorArrowPair(void);
+void WonderNews_AddScrollIndicatorArrowPair(void);
+void WonderNews_RemoveScrollIndicatorArrowPair(void);
 bool32 WonderNews_Test_Unk_02(void);
 bool32 WonderCard_Test_Unk_08_6(void);
-u32 MENews_GetInput(u16 input);
+u32 WonderNews_GetInput(u16 input);
 void InitMEventData(void);
 u16 MEvent_GetBattleCardCount(u32 command);
 void MysteryGift_TryIncrementStat(u32 eventId, u32 trainerId);