diff options
| author | who-knows-who <j.williams.8@warwick.ac.uk> | 2018-08-28 00:26:14 +0100 |
|---|---|---|
| committer | who-knows-who <j.williams.8@warwick.ac.uk> | 2018-08-28 00:26:14 +0100 |
| commit | 70bb9b8f6f9a3169b83b98b266baa3e9923fba3e (patch) | |
| tree | 27c6ef336e50779dd090a6468cbf73ad7f39c7a9 /src/pokedex.c | |
| parent | 6a7b3033eadef95b9fb8788b3bf7251bc4ee27ae (diff) | |
| parent | 3f1288e3e055013e0ab847ba5fea4b566bc31996 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby into flying
Diffstat (limited to 'src/pokedex.c')
| -rw-r--r-- | src/pokedex.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index eb4d1d918..caa6a1565 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -26,7 +26,6 @@ #include "scanline_effect.h" #include "ewram.h" -#define NATIONAL_DEX_COUNT 386 struct PokedexListItem { @@ -1971,7 +1970,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode) { default: case DEX_MODE_HOENN: - vars[0] = 202; + vars[0] = HOENN_DEX_COUNT; vars[1] = 1; break; case DEX_MODE_NATIONAL: @@ -1982,7 +1981,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode) } else { - vars[0] = 202; + vars[0] = HOENN_DEX_COUNT; vars[1] = 1; } break; @@ -2028,7 +2027,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode) } break; case 1: - for (i = 0; i < 411; i++) + for (i = 0; i < POKEMON_SLOTS_NUMBER - 1; i++) { vars[2] = gPokedexOrder_Alphabetical[i]; @@ -4060,7 +4059,7 @@ u16 GetHoennPokedexCount(u8 caseID) u16 count = 0; u16 i; - for (i = 0; i < 202; i++) + for (i = 0; i < HOENN_DEX_COUNT; i++) { switch (caseID) { |