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

Orders searchable for National Dex.

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2019-09-30 23:53:26 -03:00
parent e52eb48929
commit 27fa3361ca
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/pokedex.c
View file

@ -1958,7 +1958,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
{
temp_dexNum = gPokedexOrder_Alphabetical[i];
if (NationalToHoennOrder(temp_dexNum) != 0 && GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN))
if ((NationalToHoennOrder(temp_dexNum) != 0 || !temp_isHoennDex) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN))
{
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
@ -1972,7 +1972,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
{
temp_dexNum = gPokedexOrder_Weight[i];
if (NationalToHoennOrder(temp_dexNum) != 0 && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
if ((NationalToHoennOrder(temp_dexNum) != 0 || !temp_isHoennDex) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
{
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
@ -1986,7 +1986,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
{
temp_dexNum = gPokedexOrder_Weight[i];
if (NationalToHoennOrder(temp_dexNum) != 0 && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
if ((NationalToHoennOrder(temp_dexNum) != 0 || !temp_isHoennDex) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
{
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
@ -2000,7 +2000,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
{
temp_dexNum = gPokedexOrder_Height[i];
if (NationalToHoennOrder(temp_dexNum) != 0 && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
if ((NationalToHoennOrder(temp_dexNum) != 0 || !temp_isHoennDex) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
{
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
@ -2014,7 +2014,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
{
temp_dexNum = gPokedexOrder_Height[i];
if (NationalToHoennOrder(temp_dexNum) != 0 && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
if ((NationalToHoennOrder(temp_dexNum) != 0 || !temp_isHoennDex) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
{
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;