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

Merge branch 'master' into contest

Browse Source
This commit is contained in:
PikalaxALT
2018-05-24 10:26:55 -04:00
parent 5539e282a3 de60bdf2fe
commit 6ae395a636
172 changed files with 3383 additions and 5911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tv.c
View File

@@ -3557,7 +3557,7 @@ void GetMomOrDadStringForTVMessage(void)
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F))
{
StringCopy(gStringVar1, gText_Mom);
VarSet(VAR_0x4003, 1);
VarSet(VAR_TEMP_3, 1);
}
}
else
@@ -3565,21 +3565,21 @@ void GetMomOrDadStringForTVMessage(void)
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_1F))
{
StringCopy(gStringVar1, gText_Mom);
VarSet(VAR_0x4003, 1);
VarSet(VAR_TEMP_3, 1);
}
}
}
if (VarGet(VAR_0x4003) == 1)
if (VarGet(VAR_TEMP_3) == 1)
{
StringCopy(gStringVar1, gText_Mom);
}
else if (VarGet(VAR_0x4003) == 2)
else if (VarGet(VAR_TEMP_3) == 2)
{
StringCopy(gStringVar1, gText_Dad);
}
else if (VarGet(VAR_0x4003) > 2)
else if (VarGet(VAR_TEMP_3) > 2)
{
if (VarGet(VAR_0x4003) % 2 == 0)
if (VarGet(VAR_TEMP_3) % 2 == 0)
StringCopy(gStringVar1, gText_Mom);
else
StringCopy(gStringVar1, gText_Dad);
@@ -3589,12 +3589,12 @@ void GetMomOrDadStringForTVMessage(void)
if (Random() % 2 != 0)
{
StringCopy(gStringVar1, gText_Mom);
VarSet(VAR_0x4003, 1);
VarSet(VAR_TEMP_3, 1);
}
else
{
StringCopy(gStringVar1, gText_Dad);
VarSet(VAR_0x4003, 2);
VarSet(VAR_TEMP_3, 2);
}
}
}