From 27fa3361ca1eb5c31d8b320e94883bc7bc2e007b Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 30 Sep 2019 23:53:26 -0300 Subject: [PATCH] Orders searchable for National Dex. --- src/pokedex.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pokedex.c b/src/pokedex.c index e16a17a31f..378d121775 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -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;