Merge pull request #201 from AsparagusEduardo/PokedexOrders
Updated Alphabetical, Weight and Height orders.
This commit is contained in:
commit
ab2de0342b
2 changed files with 1772 additions and 357 deletions
File diff suppressed because it is too large
Load diff
|
@ -1958,7 +1958,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
|
||||||
{
|
{
|
||||||
temp_dexNum = gPokedexOrder_Alphabetical[i];
|
temp_dexNum = gPokedexOrder_Alphabetical[i];
|
||||||
|
|
||||||
if (NationalToHoennOrder(temp_dexNum) != 0 && GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN))
|
if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN))
|
||||||
{
|
{
|
||||||
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
|
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
|
||||||
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
|
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
|
||||||
|
@ -1972,7 +1972,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
|
||||||
{
|
{
|
||||||
temp_dexNum = gPokedexOrder_Weight[i];
|
temp_dexNum = gPokedexOrder_Weight[i];
|
||||||
|
|
||||||
if (NationalToHoennOrder(temp_dexNum) != 0 && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
|
if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
|
||||||
{
|
{
|
||||||
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
|
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
|
||||||
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
|
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
|
||||||
|
@ -1986,7 +1986,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
|
||||||
{
|
{
|
||||||
temp_dexNum = gPokedexOrder_Weight[i];
|
temp_dexNum = gPokedexOrder_Weight[i];
|
||||||
|
|
||||||
if (NationalToHoennOrder(temp_dexNum) != 0 && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
|
if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
|
||||||
{
|
{
|
||||||
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
|
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
|
||||||
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
|
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
|
||||||
|
@ -2000,7 +2000,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
|
||||||
{
|
{
|
||||||
temp_dexNum = gPokedexOrder_Height[i];
|
temp_dexNum = gPokedexOrder_Height[i];
|
||||||
|
|
||||||
if (NationalToHoennOrder(temp_dexNum) != 0 && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
|
if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
|
||||||
{
|
{
|
||||||
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
|
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
|
||||||
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
|
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
|
||||||
|
@ -2014,7 +2014,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
|
||||||
{
|
{
|
||||||
temp_dexNum = gPokedexOrder_Height[i];
|
temp_dexNum = gPokedexOrder_Height[i];
|
||||||
|
|
||||||
if (NationalToHoennOrder(temp_dexNum) != 0 && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
|
if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
|
||||||
{
|
{
|
||||||
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
|
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
|
||||||
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
|
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
|
||||||
|
|
Loading…
Reference in a new issue