dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1525 from GriffinRichards/doc-recmix

Browse Source 
Document remainder of Record Mixing
This commit is contained in:
GriffinR
2021-10-26 14:18:38 -04:00
committed by GitHub
parent 4f7f6c1082 7a89ad98c3
commit d6571f2355
28 changed files with 678 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mystery_event_script.c
View File

@@ -302,7 +302,7 @@ bool8 MEScrCmd_setrecordmixinggift(struct ScriptContext *ctx)
bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
{
struct MailStruct mail;
struct Mail mail;
struct Pokemon pokemon;
u16 species;
u16 heldItem;
@@ -326,7 +326,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
else
{
memcpy(&gPlayerParty[PARTY_SIZE - 1], pokemonPtr, sizeof(struct Pokemon));
memcpy(&mail, mailPtr, sizeof(struct MailStruct));
memcpy(&mail, mailPtr, sizeof(struct Mail));
if (species != SPECIES_EGG)
{
@@ -337,7 +337,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
heldItem = GetMonData(&gPlayerParty[PARTY_SIZE - 1], MON_DATA_HELD_ITEM);
if (ItemIsMail(heldItem))
GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &mail);
GiveMailToMon(&gPlayerParty[PARTY_SIZE - 1], &mail);
CompactPartySlots();
CalculatePlayerPartyCount();
StringExpandPlaceholders(gStringVar4, gText_MysteryEventSentOver);