summaryrefslogtreecommitdiff
path: root/src/mevent2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mevent2.c')
-rwxr-xr-xsrc/mevent2.c252
1 files changed, 126 insertions, 126 deletions
diff --git a/src/mevent2.c b/src/mevent2.c
index c7035ae8f..fd3ec7a67 100755
--- a/src/mevent2.c
+++ b/src/mevent2.c
@@ -14,73 +14,75 @@
static EWRAM_DATA bool32 gUnknown_02022C70 = FALSE;
static void sub_801B180(void);
-static void s_DestroyWonderNews(void);
-static bool32 sub_801B114(const struct WonderNews *data);
-static bool32 ValidateWonderCardData(const struct WonderCard *data);
-static void sub_801B330(void);
+static void ClearSavedWonderNewsInternal(void);
+static bool32 ValidateWonderNews(const struct WonderNews *news);
+static bool32 ValidateWonderCard(const struct WonderCard *card);
+static void InitSavedWonderCard(void);
static void sub_801B368(void);
static void sub_801B9F8(void);
static void sub_801BA8C(u32 a0, u32 a1, u32 *a2, int a3);
+#define CALC_CRC(data) CalcCRC16WithTable((void *)&(data), sizeof(data))
+
void sub_801AFD8(void)
{
- CpuFill32(0, &gSaveBlock1Ptr->unk_322C, sizeof(gSaveBlock1Ptr->unk_322C));
+ CpuFill32(0, &gSaveBlock1Ptr->mysteryGift, sizeof(gSaveBlock1Ptr->mysteryGift));
sub_801B180();
InitQuestionnaireWords();
}
struct WonderNews *GetSavedWonderNews(void)
{
- return &gSaveBlock1Ptr->unk_322C.wonderNews.data;
+ return &gSaveBlock1Ptr->mysteryGift.news;
}
struct WonderCard *GetSavedWonderCard(void)
{
- return &gSaveBlock1Ptr->unk_322C.wonderCard.data;
+ return &gSaveBlock1Ptr->mysteryGift.card;
}
-struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void)
+struct MEventBuffer_3430 *sav1_get_mevent_buffer_2(void)
{
- return &gSaveBlock1Ptr->unk_322C.buffer_310.data;
+ return &gSaveBlock1Ptr->mysteryGift.unk_3430;
}
struct MysteryEventStruct *sub_801B044(void)
{
- return &gSaveBlock1Ptr->unk_322C.unk_340;
+ return &gSaveBlock1Ptr->mysteryGift.unk_340;
}
u16 *GetQuestionnaireWordsPtr(void)
{
- return gSaveBlock1Ptr->unk_322C.questionnaireWords;
+ return gSaveBlock1Ptr->mysteryGift.questionnaireWords;
}
-void DestroyWonderNews(void)
+void ClearSavedWonderNews(void)
{
- s_DestroyWonderNews();
+ ClearSavedWonderNewsInternal();
}
-bool32 sub_801B078(const struct WonderNews *src)
+bool32 SaveWonderNews(const struct WonderNews *news)
{
- if (!sub_801B114(src))
+ if (!ValidateWonderNews(news))
return FALSE;
- s_DestroyWonderNews();
- gSaveBlock1Ptr->unk_322C.wonderNews.data = *src;
- gSaveBlock1Ptr->unk_322C.wonderNews.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.wonderNews.data, sizeof(struct WonderNews));
+ ClearSavedWonderNewsInternal();
+ gSaveBlock1Ptr->mysteryGift.news = *news;
+ gSaveBlock1Ptr->mysteryGift.newsCrc = CALC_CRC(gSaveBlock1Ptr->mysteryGift.news);
return TRUE;
}
-bool32 ValidateReceivedWonderNews(void)
+bool32 ValidateSavedWonderNews(void)
{
- if (CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.wonderNews.data, sizeof(struct WonderNews)) != gSaveBlock1Ptr->unk_322C.wonderNews.crc)
+ if (CALC_CRC(gSaveBlock1Ptr->mysteryGift.news) != gSaveBlock1Ptr->mysteryGift.newsCrc)
return FALSE;
- if (!sub_801B114(&gSaveBlock1Ptr->unk_322C.wonderNews.data))
+ if (!ValidateWonderNews(&gSaveBlock1Ptr->mysteryGift.news))
return FALSE;
return TRUE;
}
-static bool32 sub_801B114(const struct WonderNews *data)
+static bool32 ValidateWonderNews(const struct WonderNews *data)
{
if (data->unk_00 == 0)
return FALSE;
@@ -90,17 +92,17 @@ static bool32 sub_801B114(const struct WonderNews *data)
bool32 WonderNews_Test_Unk_02(void)
{
- const struct WonderNews *data = &gSaveBlock1Ptr->unk_322C.wonderNews.data;
+ const struct WonderNews *data = &gSaveBlock1Ptr->mysteryGift.news;
if (data->unk_02 == 0)
return FALSE;
return TRUE;
}
-static void s_DestroyWonderNews(void)
+static void ClearSavedWonderNewsInternal(void)
{
- CpuFill32(0, GetSavedWonderNews(), sizeof(gSaveBlock1Ptr->unk_322C.wonderNews.data));
- gSaveBlock1Ptr->unk_322C.wonderNews.crc = 0;
+ CpuFill32(0, GetSavedWonderNews(), sizeof(gSaveBlock1Ptr->mysteryGift.news));
+ gSaveBlock1Ptr->mysteryGift.newsCrc = 0;
}
static void sub_801B180(void)
@@ -111,9 +113,9 @@ static void sub_801B180(void)
bool32 sub_801B1A4(const u8 *src)
{
- const u8 *r5 = (const u8 *)&gSaveBlock1Ptr->unk_322C.wonderNews.data;
+ const u8 *r5 = (const u8 *)&gSaveBlock1Ptr->mysteryGift.news;
u32 i;
- if (!ValidateReceivedWonderNews())
+ if (!ValidateSavedWonderNews())
return FALSE;
for (i = 0; i < sizeof(struct WonderNews); i++)
@@ -125,9 +127,9 @@ bool32 sub_801B1A4(const u8 *src)
return TRUE;
}
-void DestroyWonderCard(void)
+void ClearSavedWonderCard(void)
{
- sub_801B330();
+ InitSavedWonderCard();
sub_801B368();
sub_801B9F8();
ClearRamScript();
@@ -136,27 +138,25 @@ void DestroyWonderCard(void)
ClearEReaderTrainer(&gSaveBlock2Ptr->frontier.ereaderTrainer);
}
-bool32 sub_801B21C(const struct WonderCard *data)
+bool32 SaveWonderCard(const struct WonderCard *card)
{
- struct MEventBuffer_3430_Sub *r2;
- struct WonderCard *r1;
- if (!ValidateWonderCardData(data))
+ struct MEventBuffer_3430 *r2;
+ if (!ValidateWonderCard(card))
return FALSE;
- DestroyWonderCard();
- memcpy(&gSaveBlock1Ptr->unk_322C.wonderCard.data, data, sizeof(struct WonderCard));
- gSaveBlock1Ptr->unk_322C.wonderCard.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.wonderCard.data, sizeof(struct WonderCard));
- r2 = &gSaveBlock1Ptr->unk_322C.buffer_310.data;
- r1 = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
- r2->unk_06 = r1->unk_02;
+ ClearSavedWonderCard();
+ memcpy(&gSaveBlock1Ptr->mysteryGift.card, card, sizeof(struct WonderCard));
+ gSaveBlock1Ptr->mysteryGift.cardCrc = CALC_CRC(gSaveBlock1Ptr->mysteryGift.card);
+ r2 = &gSaveBlock1Ptr->mysteryGift.unk_3430;
+ r2->unk_06 = (&gSaveBlock1Ptr->mysteryGift.card)->unk_02;
return TRUE;
}
-bool32 ValidateReceivedWonderCard(void)
+bool32 ValidateSavedWonderCard(void)
{
- if (gSaveBlock1Ptr->unk_322C.wonderCard.crc != CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.wonderCard.data, sizeof(struct WonderCard)))
+ if (gSaveBlock1Ptr->mysteryGift.cardCrc != CALC_CRC(gSaveBlock1Ptr->mysteryGift.card))
return FALSE;
- if (!ValidateWonderCardData(&gSaveBlock1Ptr->unk_322C.wonderCard.data))
+ if (!ValidateWonderCard(&gSaveBlock1Ptr->mysteryGift.card))
return FALSE;
if (!ValidateSavedRamScript())
return FALSE;
@@ -164,17 +164,17 @@ bool32 ValidateReceivedWonderCard(void)
return TRUE;
}
-static bool32 ValidateWonderCardData(const struct WonderCard *data)
+static bool32 ValidateWonderCard(const struct WonderCard *card)
{
- if (data->unk_00 == 0)
+ if (card->flagId == 0)
return FALSE;
- if (data->unk_08_0 > 2)
+ if (card->unk_08_0 > 2)
return FALSE;
- if (!(data->unk_08_6 == 0 || data->unk_08_6 == 1 || data->unk_08_6 == 2))
+ if (!(card->unk_08_6 == 0 || card->unk_08_6 == 1 || card->unk_08_6 == 2))
return FALSE;
- if (data->bgType >= NUM_WONDER_BGS)
+ if (card->bgType >= NUM_WONDER_BGS)
return FALSE;
- if (data->unk_09 > 7)
+ if (card->unk_09 > 7)
return FALSE;
return TRUE;
@@ -182,29 +182,29 @@ static bool32 ValidateWonderCardData(const struct WonderCard *data)
bool32 WonderCard_Test_Unk_08_6(void)
{
- const struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
- if (data->unk_08_6 == 0)
+ const struct WonderCard *card = &gSaveBlock1Ptr->mysteryGift.card;
+ if (card->unk_08_6 == 0)
return FALSE;
return TRUE;
}
-static void sub_801B330(void)
+static void InitSavedWonderCard(void)
{
- CpuFill32(0, &gSaveBlock1Ptr->unk_322C.wonderCard.data, sizeof(struct WonderCard));
- gSaveBlock1Ptr->unk_322C.wonderCard.crc = 0;
+ CpuFill32(0, &gSaveBlock1Ptr->mysteryGift.card, sizeof(gSaveBlock1Ptr->mysteryGift.card));
+ gSaveBlock1Ptr->mysteryGift.cardCrc = 0;
}
static void sub_801B368(void)
{
CpuFill32(0, sav1_get_mevent_buffer_2(), 18 *sizeof(u16));
- gSaveBlock1Ptr->unk_322C.buffer_310.crc = 0;
+ gSaveBlock1Ptr->mysteryGift.unkCrc = 0;
}
u16 GetWonderCardFlagID(void)
{
- if (ValidateReceivedWonderCard())
- return gSaveBlock1Ptr->unk_322C.wonderCard.data.unk_00;
+ if (ValidateSavedWonderCard())
+ return gSaveBlock1Ptr->mysteryGift.card.flagId;
return 0;
}
@@ -215,9 +215,9 @@ void WonderCard_ResetInternalReceivedFlag(struct WonderCard *buffer)
buffer->unk_08_6 = 0;
}
-static bool32 IsWonderCardFlagIDInValidRange(u16 a0)
+static bool32 IsWonderCardFlagIDInValidRange(u16 flagId)
{
- if (a0 >= 1000 && a0 < 1020)
+ if (flagId >= 1000 && flagId < 1000 + NUM_MYSTERY_GIFT_FLAGS)
return TRUE;
return FALSE;
@@ -228,23 +228,23 @@ static const u16 sMysteryGiftFlags[] =
FLAG_RECEIVED_AURORA_TICKET,
FLAG_RECEIVED_MYSTIC_TICKET,
FLAG_RECEIVED_OLD_SEA_MAP,
- FLAG_UNUSED_MYSTERY_GIFT_0x13D,
- FLAG_UNUSED_MYSTERY_GIFT_0x13E,
- FLAG_UNUSED_MYSTERY_GIFT_0x13F,
- FLAG_UNUSED_MYSTERY_GIFT_0x140,
- FLAG_UNUSED_MYSTERY_GIFT_0x141,
- FLAG_UNUSED_MYSTERY_GIFT_0x142,
- FLAG_UNUSED_MYSTERY_GIFT_0x143,
- FLAG_UNUSED_MYSTERY_GIFT_0x144,
- FLAG_UNUSED_MYSTERY_GIFT_0x145,
- FLAG_UNUSED_MYSTERY_GIFT_0x146,
- FLAG_UNUSED_MYSTERY_GIFT_0x147,
- FLAG_UNUSED_MYSTERY_GIFT_0x148,
- FLAG_UNUSED_MYSTERY_GIFT_0x149,
- FLAG_UNUSED_MYSTERY_GIFT_0x14A,
- FLAG_UNUSED_MYSTERY_GIFT_0x14B,
- FLAG_UNUSED_MYSTERY_GIFT_0x14C,
- FLAG_UNUSED_MYSTERY_GIFT_0x14D,
+ FLAG_MYSTERY_GIFT_UNUSED_1,
+ FLAG_MYSTERY_GIFT_UNUSED_2,
+ FLAG_MYSTERY_GIFT_UNUSED_3,
+ FLAG_MYSTERY_GIFT_UNUSED_4,
+ FLAG_MYSTERY_GIFT_UNUSED_5,
+ FLAG_MYSTERY_GIFT_UNUSED_6,
+ FLAG_MYSTERY_GIFT_UNUSED_7,
+ FLAG_MYSTERY_GIFT_UNUSED_8,
+ FLAG_MYSTERY_GIFT_UNUSED_9,
+ FLAG_MYSTERY_GIFT_UNUSED_10,
+ FLAG_MYSTERY_GIFT_UNUSED_11,
+ FLAG_MYSTERY_GIFT_UNUSED_12,
+ FLAG_MYSTERY_GIFT_UNUSED_13,
+ FLAG_MYSTERY_GIFT_UNUSED_14,
+ FLAG_MYSTERY_GIFT_UNUSED_15,
+ FLAG_MYSTERY_GIFT_UNUSED_16,
+ FLAG_MYSTERY_GIFT_UNUSED_17,
};
bool32 CheckReceivedGiftFromWonderCard(void)
@@ -259,7 +259,7 @@ bool32 CheckReceivedGiftFromWonderCard(void)
return TRUE;
}
-static int sub_801B438(const struct MEventBuffer_3430_Sub *data, int size)
+static int sub_801B438(const struct MEventBuffer_3430 *data, int size)
{
int r3 = 0;
int i;
@@ -272,7 +272,7 @@ static int sub_801B438(const struct MEventBuffer_3430_Sub *data, int size)
return r3;
}
-static bool32 sub_801B460(const struct MEventBuffer_3430_Sub *data1, const u16 *data2, int size)
+static bool32 sub_801B460(const struct MEventBuffer_3430 *data1, const u16 *data2, int size)
{
int i;
for (i = 0; i < size; i++)
@@ -300,33 +300,33 @@ static bool32 sub_801B4A4(const u16 *data)
static int sub_801B4CC(void)
{
struct WonderCard *data;
- if (!ValidateReceivedWonderCard())
+ if (!ValidateSavedWonderCard())
return 0;
- data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
+ data = &gSaveBlock1Ptr->mysteryGift.card;
if (data->unk_08_0 != 1)
return 0;
- return sub_801B438(&gSaveBlock1Ptr->unk_322C.buffer_310.data, data->unk_09);
+ return sub_801B438(&gSaveBlock1Ptr->mysteryGift.unk_3430, data->unk_09);
}
bool32 sub_801B508(const u16 *data)
{
- struct WonderCard *buffer = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
+ struct WonderCard *buffer = &gSaveBlock1Ptr->mysteryGift.card;
int size = buffer->unk_09;
int i;
if (!sub_801B4A4(data))
return FALSE;
- if (sub_801B460(&gSaveBlock1Ptr->unk_322C.buffer_310.data, data, size))
+ if (sub_801B460(&gSaveBlock1Ptr->mysteryGift.unk_3430, data, size))
return FALSE;
for (i = 0; i < size; i++)
{
- if (gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_08[1][i] == 0 && gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_08[0][i] == 0)
+ if (gSaveBlock1Ptr->mysteryGift.unk_3430.unk_08[1][i] == 0 && gSaveBlock1Ptr->mysteryGift.unk_3430.unk_08[0][i] == 0)
{
- gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_08[1][i] = data[1];
- gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_08[0][i] = data[0];
+ gSaveBlock1Ptr->mysteryGift.unk_3430.unk_08[1][i] = data[1];
+ gSaveBlock1Ptr->mysteryGift.unk_3430.unk_08[0][i] = data[0];
return TRUE;
}
}
@@ -334,7 +334,7 @@ bool32 sub_801B508(const u16 *data)
return FALSE;
}
-void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1)
+void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 isWonderNews)
{
int i;
CpuFill32(0, data, sizeof(struct MEventStruct_Unk1442CC));
@@ -342,20 +342,20 @@ void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1)
data->unk_04 = 1;
data->unk_08 = 1;
- if (a1)
+ if (isWonderNews)
{
data->unk_0C = 5;
data->unk_10 = 0x0201;
}
- else
+ else // Wonder Card
{
data->unk_0C = 4;
data->unk_10 = 0x0200;
}
- if (ValidateReceivedWonderCard())
+ if (ValidateSavedWonderCard())
{
- data->unk_14 = GetSavedWonderCard()->unk_00;
+ data->unk_14 = GetSavedWonderCard()->flagId;
data->unk_20 = *sav1_get_mevent_buffer_2();
data->unk_44 = GetSavedWonderCard()->unk_09;
}
@@ -365,15 +365,15 @@ void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1)
}
for (i = 0; i < NUM_QUESTIONNAIRE_WORDS; i++)
- data->unk_16[i] = gSaveBlock1Ptr->unk_322C.questionnaireWords[i];
+ data->questionnaireWords[i] = gSaveBlock1Ptr->mysteryGift.questionnaireWords[i];
- CopyTrainerId(data->unk_4C, gSaveBlock2Ptr->playerTrainerId);
- StringCopy(data->unk_45, gSaveBlock2Ptr->playerName);
- for (i = 0; i < 6; i++)
- data->unk_50[i] = gSaveBlock1Ptr->easyChatProfile[i];
+ CopyTrainerId(data->playerTrainerId, gSaveBlock2Ptr->playerTrainerId);
+ StringCopy(data->playerName, gSaveBlock2Ptr->playerName);
+ for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
+ data->easyChatProfile[i] = gSaveBlock1Ptr->easyChatProfile[i];
- memcpy(data->unk_5C, RomHeaderGameCode, 4);
- data->unk_60 = RomHeaderSoftwareVersion;
+ memcpy(data->romHeaderGameCode, RomHeaderGameCode, 4);
+ data->romHeaderSoftwareVersion = RomHeaderSoftwareVersion;
}
bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1)
@@ -422,12 +422,12 @@ u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, const vo
return 2;
}
-bool32 MEventStruct_Unk1442CC_CompareField_unk_16(const struct MEventStruct_Unk1442CC *a0, const u16 *a1)
+bool32 MysteryGift_DoesQuestionnaireMatch(const struct MEventStruct_Unk1442CC *data, const u16 *words)
{
int i;
for (i = 0; i < NUM_QUESTIONNAIRE_WORDS; i++)
{
- if (a0->unk_16[i] != a1[i])
+ if (data->questionnaireWords[i] != words[i])
return FALSE;
}
@@ -461,20 +461,20 @@ u16 MEventStruct_Unk1442CC_GetValueNFrom_unk_20(const struct MEventStruct_Unk144
static void sub_801B7D8(u32 command)
{
- struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
+ struct WonderCard *data = &gSaveBlock1Ptr->mysteryGift.card;
if (data->unk_08_0 == 2)
{
u16 *dest = NULL;
switch (command)
{
case 0:
- dest = &gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_00;
+ dest = &gSaveBlock1Ptr->mysteryGift.unk_3430.unk_00;
break;
case 1:
- dest = &gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_02;
+ dest = &gSaveBlock1Ptr->mysteryGift.unk_3430.unk_02;
break;
case 2:
- dest = &gSaveBlock1Ptr->unk_322C.buffer_310.data.unk_04;
+ dest = &gSaveBlock1Ptr->mysteryGift.unk_3430.unk_04;
break;
case 3:
break;
@@ -499,46 +499,46 @@ u16 mevent_081445C0(u32 command)
{
case GET_CARD_BATTLES_WON_INTERNAL:
{
- struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
- if (data->unk_08_0 == 2)
+ struct WonderCard *card = &gSaveBlock1Ptr->mysteryGift.card;
+ if (card->unk_08_0 == 2)
{
- struct MEventBuffer_3430_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_310.data;
+ struct MEventBuffer_3430 *buffer = &gSaveBlock1Ptr->mysteryGift.unk_3430;
return buffer->unk_00;
}
break;
}
case 1: // Never occurs
{
- struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
- if (data->unk_08_0 == 2)
+ struct WonderCard *card = &gSaveBlock1Ptr->mysteryGift.card;
+ if (card->unk_08_0 == 2)
{
- struct MEventBuffer_3430_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_310.data;
+ struct MEventBuffer_3430 *buffer = &gSaveBlock1Ptr->mysteryGift.unk_3430;
return buffer->unk_02;
}
break;
}
case 2: // Never occurs
{
- struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
- if (data->unk_08_0 == 2)
+ struct WonderCard *card = &gSaveBlock1Ptr->mysteryGift.card;
+ if (card->unk_08_0 == 2)
{
- struct MEventBuffer_3430_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_310.data;
+ struct MEventBuffer_3430 *buffer = &gSaveBlock1Ptr->mysteryGift.unk_3430;
return buffer->unk_04;
}
break;
}
case GET_NUM_STAMPS_INTERNAL:
{
- struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
- if (data->unk_08_0 == 1)
+ struct WonderCard *card = &gSaveBlock1Ptr->mysteryGift.card;
+ if (card->unk_08_0 == 1)
return sub_801B4CC();
break;
}
case GET_MAX_STAMPS_INTERNAL:
{
- struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
- if (data->unk_08_0 == 1)
- return data->unk_09;
+ struct WonderCard *card = &gSaveBlock1Ptr->mysteryGift.card;
+ if (card->unk_08_0 == 1)
+ return card->unk_09;
break;
}
}
@@ -552,16 +552,16 @@ void ResetReceivedWonderCardFlag(void)
gUnknown_02022C70 = FALSE;
}
-bool32 MEventHandleReceivedWonderCard(u16 a0)
+bool32 MEventHandleReceivedWonderCard(u16 flagId)
{
gUnknown_02022C70 = FALSE;
- if (a0 == 0)
+ if (flagId == 0)
return FALSE;
- if (!ValidateReceivedWonderCard())
+ if (!ValidateSavedWonderCard())
return FALSE;
- if (gSaveBlock1Ptr->unk_322C.wonderCard.data.unk_00 != a0)
+ if (gSaveBlock1Ptr->mysteryGift.card.flagId != flagId)
return FALSE;
gUnknown_02022C70 = TRUE;
@@ -575,13 +575,13 @@ void RecordIdOfWonderCardSenderByEventType(u32 a0, u32 a1)
switch (a0)
{
case 2:
- sub_801BA8C(2, a1, gSaveBlock1Ptr->unk_322C.unk_344[1], 5);
+ sub_801BA8C(2, a1, gSaveBlock1Ptr->mysteryGift.unk_344[1], 5);
break;
case 0:
- sub_801BA8C(0, a1, gSaveBlock1Ptr->unk_322C.unk_344[0], 5);
+ sub_801BA8C(0, a1, gSaveBlock1Ptr->mysteryGift.unk_344[0], 5);
break;
case 1:
- sub_801BA8C(1, a1, gSaveBlock1Ptr->unk_322C.unk_344[0], 5);
+ sub_801BA8C(1, a1, gSaveBlock1Ptr->mysteryGift.unk_344[0], 5);
break;
default:
AGB_ASSERT(0);
@@ -591,7 +591,7 @@ void RecordIdOfWonderCardSenderByEventType(u32 a0, u32 a1)
static void sub_801B9F8(void)
{
- CpuFill32(0, gSaveBlock1Ptr->unk_322C.unk_344, sizeof(gSaveBlock1Ptr->unk_322C.unk_344));
+ CpuFill32(0, gSaveBlock1Ptr->mysteryGift.unk_344, sizeof(gSaveBlock1Ptr->mysteryGift.unk_344));
}
static bool32 sub_801BA24(u32 a0, u32 *a1, int size)