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

make record mixing compile

Browse Source
This commit is contained in:
DizzyEggg
2018-05-26 00:37:03 +02:00
parent 9e7965fab0
commit dd1c7c741a
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/egg_hatch.c
+5 -5
View File
@@ -390,13 +390,13 @@ static bool8 sub_807158C(struct DayCare *daycare, u8 daycareId)
struct DaycareMon *daycareMon = &daycare->mons[daycareId]; struct DaycareMon *daycareMon = &daycare->mons[daycareId];
GetBoxMonNick(&daycareMon->mon, nick); GetBoxMonNick(&daycareMon->mon, nick);
if (daycareMon->misc.mail.itemId != 0 if (daycareMon->mail.message.itemId != 0
&& (StringCompareWithoutExtCtrlCodes(nick, daycareMon->misc.monName) != 0 && (StringCompareWithoutExtCtrlCodes(nick, daycareMon->mail.monName) != 0
|| StringCompareWithoutExtCtrlCodes(gSaveBlock2Ptr->playerName, daycareMon->misc.OT_name) != 0)) || StringCompareWithoutExtCtrlCodes(gSaveBlock2Ptr->playerName, daycareMon->mail.OT_name) != 0))
{ {
StringCopy(gStringVar1, nick); StringCopy(gStringVar1, nick);
TVShowConvertInternationalString(gStringVar2, daycareMon->misc.OT_name, daycareMon->misc.gameLanguage); TVShowConvertInternationalString(gStringVar2, daycareMon->mail.OT_name, daycareMon->mail.gameLanguage);
TVShowConvertInternationalString(gStringVar3, daycareMon->misc.monName, daycareMon->misc.monLanguage); TVShowConvertInternationalString(gStringVar3, daycareMon->mail.monName, daycareMon->mail.monLanguage);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
src/new_game.c
+3 -4
View File
@@ -119,11 +119,10 @@ void ClearAllContestWinnerPics(void)
void sub_8084400(void) void sub_8084400(void)
{ {
// probably clearing one struct for battle frontier // 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[0][0] = EOS;
gSaveBlock2Ptr->field_EE1 = 0xFF; gSaveBlock2Ptr->field_EE1[1][0] = EOS;
gSaveBlock2Ptr->field_EE9 = 0xFF;
} }
void WarpToTruck(void) void WarpToTruck(void)