diff options
| author | ultima-soul <33333039+ultima-soul@users.noreply.github.com> | 2018-08-26 11:12:22 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-08-26 13:12:22 -0500 |
| commit | 3f1288e3e055013e0ab847ba5fea4b566bc31996 (patch) | |
| tree | 2d674bed66c39c1a6f8a2a5c0251142785f294a6 /src/birch_pc.c | |
| parent | 56868d92501b11e22b79aabb3ba11f2715e8f733 (diff) | |
Add Defines for Pokedex Related Numbers and Fixed Comment in birch_pc.c (#680)
* Changed pokedex_orders.h to use defines from species.h
* Fixed leading white space by converting tabs to 4 spaces.
* Removed comments as they are redundant.
* Added German comments back.
* Added defines for Pokedex Count and Species Count related numbers
* Fix a comment in birch_pc.c
* Added HOENN_DEX_COUNT to birch_pc.
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; } |