diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-26 00:37:03 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-26 00:37:03 +0200 |
| commit | dd1c7c741a0f6931915ed620bce71127a593ef5a (patch) | |
| tree | 9d9cb32d10d485ad3fc1aaf7ae8c09d6f8a5cfa6 /src | |
| parent | 9e7965fab085a06f700756f448fbc072ee7e0095 (diff) | |
make record mixing compile
Diffstat (limited to 'src')
| -rw-r--r-- | src/egg_hatch.c | 10 | ||||
| -rw-r--r-- | src/new_game.c | 7 |
2 files changed, 8 insertions, 9 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; diff --git a/src/new_game.c b/src/new_game.c index 37336016e..c387bce65 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -119,11 +119,10 @@ void ClearAllContestWinnerPics(void) void sub_8084400(void) { // probably clearing one struct for battle frontier - CpuFill32(0, gSaveBlock2Ptr->field_64C, 2272); + CpuFill32(0, &gSaveBlock2Ptr->battleTower, 2272); - // those look like strings - gSaveBlock2Ptr->field_EE1 = 0xFF; - gSaveBlock2Ptr->field_EE9 = 0xFF; + gSaveBlock2Ptr->field_EE1[0][0] = EOS; + gSaveBlock2Ptr->field_EE1[1][0] = EOS; } void WarpToTruck(void) |