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/birch_pc.c | |
| parent | 6a7b3033eadef95b9fb8788b3bf7251bc4ee27ae (diff) | |
| parent | 3f1288e3e055013e0ab847ba5fea4b566bc31996 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby into flying
Diffstat (limited to 'src/birch_pc.c')
| -rw-r--r-- | src/birch_pc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/birch_pc.c b/src/birch_pc.c index 4b0025504..2a76b3c8c 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -87,24 +87,24 @@ const u8 *GetPokedexRatingText(u16 count) return gBirchDexRatingText_LessThan180; if (count < 190) return gBirchDexRatingText_LessThan190; - if (count < 200) + if (count < HOENN_DEX_COUNT - 2) return gBirchDexRatingText_LessThan200; - if (count == 200) + if (count == HOENN_DEX_COUNT - 2) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), 1) || GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), 1)) // Jirachi or Deoxys is not counted towards the dex completion. If either of these flags are enabled, it means the actual count is less than 200. return gBirchDexRatingText_LessThan200; return gBirchDexRatingText_DexCompleted; } - if (count == 201) + if (count == HOENN_DEX_COUNT - 1) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), 1) && GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), 1)) // If both of these flags are enabled, it means the actual count is less than 200. return gBirchDexRatingText_LessThan200; return gBirchDexRatingText_DexCompleted; } - if (count == 202) - return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, even though the hoenn dex count is 210. + if (count == HOENN_DEX_COUNT) + return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, a count of 202 means Jirachi and Deoxys are obtained return gBirchDexRatingText_LessThan10; } |