Clean up mevent2

4 files changed, 29 insertions, 23 deletions

diff --git a/src/cable_club.c b/src/cable_club.c
index e9100b011..69fcb660b 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -1004,10 +1004,10 @@ void CB2_ReturnFromCableClubBattle(void)
             switch (gBattleOutcome)
             {
             case B_OUTCOME_WON:
-                TryIncrementMysteryGiftStat(CARD_STAT_BATTLES_WON, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
+                MysteryGift_TryIncrementStat(CARD_STAT_BATTLES_WON, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
                 break;
             case B_OUTCOME_LOST:
-                TryIncrementMysteryGiftStat(CARD_STAT_BATTLES_LOST, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
+                MysteryGift_TryIncrementStat(CARD_STAT_BATTLES_LOST, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
                 break;
             }
         }
diff --git a/src/mevent2.c b/src/mevent2.c
index d781e2119..36652f44e 100755
--- a/src/mevent2.c
+++ b/src/mevent2.c
@@ -83,9 +83,9 @@ bool32 ValidateSavedWonderNews(void)
     return TRUE;
 }
 
-static bool32 ValidateWonderNews(const struct WonderNews *data)
+static bool32 ValidateWonderNews(const struct WonderNews *news)
 {
-    if (data->unk_00 == 0)
+    if (news->id == 0)
         return FALSE;
 
     return TRUE;
@@ -93,8 +93,8 @@ static bool32 ValidateWonderNews(const struct WonderNews *data)
 
 bool32 IsSendingSavedWonderNewsAllowed(void)
 {
-    const struct WonderNews *data = &gSaveBlock1Ptr->mysteryGift.news;
-    if (data->sendType == SEND_TYPE_DISALLOWED)
+    const struct WonderNews *news = &gSaveBlock1Ptr->mysteryGift.news;
+    if (news->sendType == SEND_TYPE_DISALLOWED)
         return FALSE;
 
     return TRUE;
@@ -177,7 +177,7 @@ static bool32 ValidateWonderCard(const struct WonderCard *card)
         return FALSE;
     if (card->bgType >= NUM_WONDER_BGS)
         return FALSE;
-    if (card->maxStamps > MAX_CARD_STAMPS)
+    if (card->maxStamps > MAX_STAMP_CARD_STAMPS)
         return FALSE;
 
     return TRUE;
@@ -339,23 +339,29 @@ bool32 MysteryGift_TrySaveStamp(const u16 *stamp)
     return FALSE;
 }
 
+#define GAME_DATA_VALID_VAR 0x101
+#define GAME_DATA_VALID_GIFT_TYPE_1 (1 << 2)
+#define GAME_DATA_VALID_GIFT_TYPE_2 (1 << 9)
+
 void MysteryGift_LoadLinkGameData(struct MysteryGiftLinkGameData *data, bool32 isWonderNews)
 {
     int i;
     CpuFill32(0, data, sizeof(*data));
-    data->unk_00 = 0x101;
-    data->unk_04 = 1;
-    data->unk_08 = 1;
+    data->validationVar = GAME_DATA_VALID_VAR;
+    data->validationFlag1 = 1;
+    data->validationFlag2 = 1;
 
     if (isWonderNews)
     {
-        data->unk_0C = 5;
-        data->unk_10 = 0x0201;
+        // Despite setting these for News, they are
+        // only ever checked for Cards
+        data->validationGiftType1 = GAME_DATA_VALID_GIFT_TYPE_1 | 1;
+        data->validationGiftType2 = GAME_DATA_VALID_GIFT_TYPE_2 | 1;
     }
     else // Wonder Card
     {
-        data->unk_0C = 4;
-        data->unk_10 = 0x0200;
+        data->validationGiftType1 = GAME_DATA_VALID_GIFT_TYPE_1;
+        data->validationGiftType2 = GAME_DATA_VALID_GIFT_TYPE_2;
     }
 
     if (ValidateSavedWonderCard())
@@ -383,21 +389,21 @@ void MysteryGift_LoadLinkGameData(struct MysteryGiftLinkGameData *data, bool32 i
 
 bool32 MysteryGift_ValidateLinkGameData(const struct MysteryGiftLinkGameData *data, bool32 forNews)
 {
-    if (data->unk_00 != 0x101)
+    if (data->validationVar != GAME_DATA_VALID_VAR)
         return FALSE;
 
-    if (!(data->unk_04 & 1))
+    if (!(data->validationFlag1 & 1))
         return FALSE;
 
-    if (!(data->unk_08 & 1))
+    if (!(data->validationFlag2 & 1))
         return FALSE;
 
     if (!forNews)
     {
-        if (!(data->unk_0C & 4))
+        if (!(data->validationGiftType1 & GAME_DATA_VALID_GIFT_TYPE_1))
             return FALSE;
 
-        if (!(data->unk_10 & 0x380))
+        if (!(data->validationGiftType2 & (GAME_DATA_VALID_GIFT_TYPE_2 | 0x180)))
             return FALSE;
     }
 
@@ -581,7 +587,7 @@ bool32 MysteryGift_TryEnableStatsByFlagId(u16 flagId)
     return TRUE;
 }
 
-void TryIncrementMysteryGiftStat(u32 stat, u32 trainerId)
+void MysteryGift_TryIncrementStat(u32 stat, u32 trainerId)
 {
     if (sStatsEnabled)
     {
diff --git a/src/trade.c b/src/trade.c
index f51a9f6e9..acae292e5 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -4655,7 +4655,7 @@ static void CB2_SaveAndEndTrade(void)
         if (!InUnionRoom())
             IncrementGameStat(GAME_STAT_POKEMON_TRADES);
         if (gWirelessCommType)
-            TryIncrementMysteryGiftStat(CARD_STAT_NUM_TRADES, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
+            MysteryGift_TryIncrementStat(CARD_STAT_NUM_TRADES, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
 
         SetContinueGameWarpStatusToDynamicWarp();
         sub_8153380();
diff --git a/src/wonder_transfer.c b/src/wonder_transfer.c
index efabc460e..d958b8aef 100644
--- a/src/wonder_transfer.c
+++ b/src/wonder_transfer.c
@@ -57,7 +57,7 @@ struct WonderCardData
     /*0175*/ u8 statFooterWidth;
     /*0176*/ u16 windowIds[CARD_WIN_COUNT];
     /*017C*/ u8 monIconSpriteId;
-    /*017D*/ u8 stampSpriteIds[MAX_CARD_STAMPS][2]; // 2 sprites each, 1 for the shadw and 1 for the Pokémon
+    /*017D*/ u8 stampSpriteIds[MAX_STAMP_CARD_STAMPS][2]; // 2 sprites each, 1 for the shadw and 1 for the Pokémon
     /*018B*/ u8 titleText[WONDER_CARD_TEXT_LENGTH + 1];
     /*01B4*/ u8 subtitleText[WONDER_CARD_TEXT_LENGTH + 1];
     /*01DD*/ u8 idNumberText[7];
@@ -196,7 +196,7 @@ bool32 WonderCard_Init(struct WonderCard * card, struct WonderCardMetadata * met
         sWonderCardData->card.bgType = 0;
     if (sWonderCardData->card.type >= CARD_TYPE_COUNT)
         sWonderCardData->card.type = 0;
-    if (sWonderCardData->card.maxStamps > MAX_CARD_STAMPS)
+    if (sWonderCardData->card.maxStamps > MAX_STAMP_CARD_STAMPS)
         sWonderCardData->card.maxStamps = 0;
     sWonderCardData->gfx = &sCardGraphics[sWonderCardData->card.bgType];
     return TRUE;