Clean up mystery gift headers

3 files changed, 13 insertions, 13 deletions

diff --git a/include/mevent.h b/include/mevent.h
index c3e14f1f3..be7f5f8e6 100755
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -36,17 +36,17 @@ bool32 SaveWonderNews(const struct WonderNews *news);
 bool32 SaveWonderCard(const struct WonderCard *card);
 bool32 ValidateSavedWonderNews(void);
 bool32 ValidateSavedWonderCard(void);
-bool32 IsWonderNewsSameAsSaved(const u8 *src);
+bool32 IsWonderNewsSameAsSaved(const u8 *news);
 bool32 IsSendingSavedWonderNewsAllowed(void);
 bool32 IsSendingSavedWonderCardAllowed(void);
 u16 GetWonderCardFlagID(void);
 void DisableWonderCardSending(struct WonderCard *card);
 bool32 IsSavedWonderCardGiftNotReceived(void);
 bool32 MysteryGift_TrySaveStamp(const u16 *stamp);
-void MysteryGift_LoadLinkGameData(struct MysteryGiftLinkGameData *data, bool32 a1);
-bool32 MysteryGift_ValidateLinkGameData(const struct MysteryGiftLinkGameData *data, bool32 a1);
-u32 MysteryGift_CompareCardFlags(const u16 *a0, const struct MysteryGiftLinkGameData *data, const void *unused);
-u32 MysteryGift_CheckStamps(const u16 *a0, const struct MysteryGiftLinkGameData *data, const void *unused);
+void MysteryGift_LoadLinkGameData(struct MysteryGiftLinkGameData *data, bool32 isWonderNews);
+bool32 MysteryGift_ValidateLinkGameData(const struct MysteryGiftLinkGameData *data, bool32 isWonderNews);
+u32 MysteryGift_CompareCardFlags(const u16 *flagId, const struct MysteryGiftLinkGameData *data, const void *unused);
+u32 MysteryGift_CheckStamps(const u16 *stamp, const struct MysteryGiftLinkGameData *data, const void *unused);
 bool32 MysteryGift_DoesQuestionnaireMatch(const struct MysteryGiftLinkGameData *data, const u16 *words);
 u16 MysteryGift_GetCardStatFromLinkData(const struct MysteryGiftLinkGameData *data, u32 stat);
 u16 MysteryGift_GetCardStat(u32 stat);
diff --git a/include/mevent_server_helpers.h b/include/mevent_server_helpers.h
index 77d966447..e8556419d 100644
--- a/include/mevent_server_helpers.h
+++ b/include/mevent_server_helpers.h
@@ -34,16 +34,16 @@ struct MysteryGiftLink
     u16 sendCounter;
     u16 sendCRC;
     u16 sendSize;
-    void * recvBfr;
-    const void * sendBfr;
+    void * recvBuffer;
+    const void * sendBuffer;
     u32 (*recvFunc)(struct MysteryGiftLink *);
     u32 (*sendFunc)(struct MysteryGiftLink *);
 };
 
-void MysteryGiftLink_Init(struct MysteryGiftLink *, u32, u32);
-void MysteryGiftLink_InitSend(struct MysteryGiftLink * manager, u32 ident, const void * src, u32 size);
-bool32 MysteryGiftLink_Recv(struct MysteryGiftLink * manager);
-bool32 MysteryGiftLink_Send(struct MysteryGiftLink * manager);
-void MysteryGiftLink_InitRecv(struct MysteryGiftLink *, u32, void *);
+void MysteryGiftLink_Init(struct MysteryGiftLink * link, u32 sendPlayerId, u32 recvPlayerId);
+void MysteryGiftLink_InitSend(struct MysteryGiftLink * link, u32 ident, const void * src, u32 size);
+bool32 MysteryGiftLink_Recv(struct MysteryGiftLink * link);
+bool32 MysteryGiftLink_Send(struct MysteryGiftLink * link);
+void MysteryGiftLink_InitRecv(struct MysteryGiftLink * link, u32 ident, void * dest);
 
 #endif //GUARD_MEVENT_SERVER_HELPERS_H
diff --git a/include/wonder_transfer.h b/include/wonder_transfer.h
index 398a2b37b..a9e80b1c7 100644
--- a/include/wonder_transfer.h
+++ b/include/wonder_transfer.h
@@ -9,7 +9,7 @@ enum {
     NEWS_INPUT_NONE = 0xFF
 };
 
-bool32 WonderCard_Init(struct WonderCard * card, struct WonderCardMetadata * r6);
+bool32 WonderCard_Init(struct WonderCard * card, struct WonderCardMetadata * metadata);
 bool32 WonderNews_Init(const struct WonderNews * news);
 s32 WonderCard_Enter(void);
 s32 WonderNews_Enter(void);