diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-05-30 16:51:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 16:51:30 -0700 |
| commit | dd28854a226753e2da53b35dcf1f67b142b75b77 (patch) | |
| tree | 61864daf48aad5dfcf697c36e8acac88ce9f4d4c /src/egg_hatch.c | |
| parent | f6350bc00373dc824a02522b6c6c9e4695534884 (diff) | |
| parent | 42731e4b88115bada3aed8ebc3b2c3dabecbb020 (diff) | |
Merge pull request #255 from DizzyEggg/decomp_record_mixing
Fix pika's Record Mixing PR
Also closes #107.
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 8914d6ff3..1ed38c67e 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -390,13 +390,13 @@ static bool8 sub_807158C(struct DayCare *daycare, u8 daycareId) struct DaycareMon *daycareMon = &daycare->mons[daycareId]; GetBoxMonNick(&daycareMon->mon, nick); - if (daycareMon->misc.mail.itemId != 0 - && (StringCompareWithoutExtCtrlCodes(nick, daycareMon->misc.monName) != 0 - || StringCompareWithoutExtCtrlCodes(gSaveBlock2Ptr->playerName, daycareMon->misc.OT_name) != 0)) + if (daycareMon->mail.message.itemId != 0 + && (StringCompareWithoutExtCtrlCodes(nick, daycareMon->mail.monName) != 0 + || StringCompareWithoutExtCtrlCodes(gSaveBlock2Ptr->playerName, daycareMon->mail.OT_name) != 0)) { StringCopy(gStringVar1, nick); - TVShowConvertInternationalString(gStringVar2, daycareMon->misc.OT_name, daycareMon->misc.gameLanguage); - TVShowConvertInternationalString(gStringVar3, daycareMon->misc.monName, daycareMon->misc.monLanguage); + TVShowConvertInternationalString(gStringVar2, daycareMon->mail.OT_name, daycareMon->mail.gameLanguage); + TVShowConvertInternationalString(gStringVar3, daycareMon->mail.monName, daycareMon->mail.monLanguage); return TRUE; } return FALSE; |