Updated HasAllMons to account for all Pokémon

This commit is contained in:
Eduardo Quezada 2022-08-30 12:36:40 -04:00
parent 925384eedc
commit c2c18444b1

View File

@ -4377,26 +4377,12 @@ bool16 HasAllMons(void)
{
u16 i;
// -1 excludes Mew
for (i = 0; i < KANTO_DEX_COUNT - 1; i++)
for (i = 1; i < NATIONAL_DEX_COUNT + 1; i++)
{
if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT))
if (!(gBaseStats[i].flags & FLAG_MYTHICAL) && !GetSetPokedexFlag(i, FLAG_GET_CAUGHT))
return FALSE;
}
// -3 excludes Lugia, Ho-Oh, and Celebi
for (i = KANTO_DEX_COUNT; i < JOHTO_DEX_COUNT - 3; i++)
{
if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT))
return FALSE;
}
// -2 excludes Jirachi and Deoxys
for (i = JOHTO_DEX_COUNT; i < NATIONAL_DEX_COUNT - 2; i++)
{
if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT))
return FALSE;
}
return TRUE;
}