diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-26 14:18:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-26 14:18:38 -0400 |
| commit | d6571f2355d356431809668e8e905606a28ce7cf (patch) | |
| tree | 9961920c8d686f8e06cd3c050c0ee8bd536b09c4 /src/mystery_event_script.c | |
| parent | 4f7f6c1082ff759967b42741050534dfbc175361 (diff) | |
| parent | 7a89ad98c38cee231a2659135ef487bb5fc5ad9d (diff) | |
Merge pull request #1525 from GriffinRichards/doc-recmix
Document remainder of Record Mixing
Diffstat (limited to 'src/mystery_event_script.c')
| -rw-r--r-- | src/mystery_event_script.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index f80240006..18a1a0d07 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -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); |