Document mail
This commit is contained in:
@@ -24,7 +24,7 @@ void ClearMailStruct(struct MailStruct *mail)
|
||||
for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++)
|
||||
mail->playerName[i] = EOS;
|
||||
|
||||
for (i = 0; i < 4; i++)
|
||||
for (i = 0; i < TRAINER_ID_LENGTH; i++)
|
||||
mail->trainerId[i] = 0;
|
||||
|
||||
mail->species = SPECIES_BULBASAUR;
|
||||
@@ -34,7 +34,7 @@ void ClearMailStruct(struct MailStruct *mail)
|
||||
bool8 MonHasMail(struct Pokemon *mon)
|
||||
{
|
||||
u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM);
|
||||
if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF)
|
||||
if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != MAIL_NONE)
|
||||
return TRUE;
|
||||
else
|
||||
return FALSE;
|
||||
@@ -52,12 +52,12 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
|
||||
|
||||
for (id = 0; id < PARTY_SIZE; id++)
|
||||
{
|
||||
if (gSaveBlock1Ptr->mail[id].itemId == 0)
|
||||
if (gSaveBlock1Ptr->mail[id].itemId == ITEM_NONE)
|
||||
{
|
||||
for (i = 0; i < MAIL_WORDS_COUNT; i++)
|
||||
gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF;
|
||||
|
||||
for (i = 0; i < PLAYER_NAME_LENGTH + 1 - 1; i++)
|
||||
for (i = 0; i < PLAYER_NAME_LENGTH; i++)
|
||||
gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i];
|
||||
gSaveBlock1Ptr->mail[id].playerName[i] = EOS;
|
||||
PadNameString(gSaveBlock1Ptr->mail[id].playerName, CHAR_SPACE);
|
||||
@@ -75,7 +75,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
|
||||
}
|
||||
}
|
||||
|
||||
return 0xFF;
|
||||
return MAIL_NONE;
|
||||
}
|
||||
|
||||
u16 SpeciesToMailSpecies(u16 species, u32 personality)
|
||||
@@ -93,7 +93,7 @@ u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *buffer)
|
||||
{
|
||||
u16 result;
|
||||
|
||||
if (mailSpecies >= 30000 && mailSpecies < (30000 + UNOWN_FORM_COUNT))
|
||||
if (mailSpecies >= 30000 && mailSpecies < (30000 + NUM_UNOWN_FORMS))
|
||||
{
|
||||
result = SPECIES_UNOWN;
|
||||
*buffer = mailSpecies - 30000;
|
||||
@@ -112,8 +112,8 @@ u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail)
|
||||
u16 itemId = mail->itemId;
|
||||
u8 mailId = GiveMailToMon(mon, itemId);
|
||||
|
||||
if (mailId == 0xFF)
|
||||
return 0xFF;
|
||||
if (mailId == MAIL_NONE)
|
||||
return MAIL_NONE;
|
||||
|
||||
gSaveBlock1Ptr->mail[mailId] = *mail;
|
||||
|
||||
@@ -141,7 +141,7 @@ void TakeMailFromMon(struct Pokemon *mon)
|
||||
{
|
||||
mailId = GetMonData(mon, MON_DATA_MAIL);
|
||||
gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE;
|
||||
mailId = 0xFF;
|
||||
mailId = MAIL_NONE;
|
||||
heldItem[0] = ITEM_NONE;
|
||||
heldItem[1] = ITEM_NONE << 8;
|
||||
SetMonData(mon, MON_DATA_MAIL, &mailId);
|
||||
@@ -162,7 +162,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon)
|
||||
|
||||
newHeldItem[0] = ITEM_NONE;
|
||||
newHeldItem[1] = ITEM_NONE << 8;
|
||||
newMailId = 0xFF;
|
||||
newMailId = MAIL_NONE;
|
||||
|
||||
for (i = PARTY_SIZE; i < MAIL_COUNT; i++)
|
||||
{
|
||||
@@ -176,7 +176,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon)
|
||||
}
|
||||
}
|
||||
|
||||
return 0xFF;
|
||||
return MAIL_NONE;
|
||||
}
|
||||
|
||||
bool8 ItemIsMail(u16 itemId)
|
||||
|
||||
Reference in New Issue
Block a user