atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Form height order

Browse source
This commit is contained in:
Eduardo Quezada 2022-10-17 00:38:34 -03:00
parent 911a9aaf02
commit bde28f33a1
2 changed files with 1081 additions and 1072 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2129
src/data/pokemon/pokedex_orders.h
View file

File diff suppressed because it is too large Load diff

24
src/pokedex.c
View file

@ -2376,14 +2376,16 @@ static void CreatePokedexList(u8 dexMode, u8 order, bool8 showForms)
case ORDER_TALLEST: case ORDER_TALLEST:
for (i = ARRAY_COUNT(gPokedexOrder_Height) - 1; i >= 0; i--) for (i = ARRAY_COUNT(gPokedexOrder_Height) - 1; i >= 0; i--)
{ {
u16 seenSpecies; u16 species = gPokedexOrder_Height[i];
temp_dexNum = gPokedexOrder_Height[i]; bool8 speciesFlag = GetSetPokedexSeenFlag(species, FLAG_GET_SEEN);
seenSpecies = GetPokedexFlagFirstSeen(temp_dexNum); temp_dexNum = SpeciesToNationalPokedexNum(species);
if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexCaughtFlag(temp_dexNum, FLAG_GET_CAUGHT)) if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0)
&& GetSetPokedexCaughtFlag(temp_dexNum, FLAG_GET_CAUGHT)
&& GetSetPokedexSeenFlag(species, FLAG_GET_SEEN))
{ {
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seenSpecies = seenSpecies; sPokedexView->pokedexList[sPokedexView->pokemonListCount].seenSpecies = species;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = TRUE; sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = TRUE;
sPokedexView->pokemonListCount++; sPokedexView->pokemonListCount++;
} }
@ -2392,14 +2394,16 @@ static void CreatePokedexList(u8 dexMode, u8 order, bool8 showForms)
case ORDER_SMALLEST: case ORDER_SMALLEST:
for (i = 0; i < ARRAY_COUNT(gPokedexOrder_Height); i++) for (i = 0; i < ARRAY_COUNT(gPokedexOrder_Height); i++)
{ {
u16 seenSpecies; u16 species = gPokedexOrder_Height[i];
temp_dexNum = gPokedexOrder_Height[i]; bool8 speciesFlag = GetSetPokedexSeenFlag(species, FLAG_GET_SEEN);
seenSpecies = GetPokedexFlagFirstSeen(temp_dexNum); temp_dexNum = SpeciesToNationalPokedexNum(species);
if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexCaughtFlag(temp_dexNum, FLAG_GET_CAUGHT)) if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0)
&& GetSetPokedexCaughtFlag(temp_dexNum, FLAG_GET_CAUGHT)
&& GetSetPokedexSeenFlag(species, FLAG_GET_SEEN))
{ {
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seenSpecies = seenSpecies; sPokedexView->pokedexList[sPokedexView->pokemonListCount].seenSpecies = species;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = TRUE; sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = TRUE;
sPokedexView->pokemonListCount++; sPokedexView->pokemonListCount++;
} }