diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-17 02:40:30 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-17 02:40:30 -0500 |
| commit | 076d07f6fe24691d6d9d8872c049b18e2e16fa57 (patch) | |
| tree | fe67ff21237b8e988484e2a53eecaa50f01844ab /src/birch_pc.c | |
| parent | 71a7a8a0759373a8dafcccee82fa2d37cb285b85 (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/birch_pc.c')
| -rw-r--r-- | src/birch_pc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/birch_pc.c b/src/birch_pc.c index 3148832be..5179b1920 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -66,20 +66,20 @@ const u8 *GetPokedexRatingText(u16 count) return gBirchDexRatingText_LessThan200; if (count == 200) { - 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. + if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), FLAG_GET_CAUGHT) + || GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), FLAG_GET_CAUGHT)) // 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. + if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), FLAG_GET_CAUGHT) + && GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), FLAG_GET_CAUGHT)) // 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; return gBirchDexRatingText_LessThan10; } |