diff options
| author | garak <garakmon@gmail.com> | 2018-12-19 21:35:32 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-19 21:35:32 -0500 |
| commit | af208a6bbb671cbf471d08856994470e707c5051 (patch) | |
| tree | 9a57703eecf8c18f444454f2fae8f5dccf19d408 /src/birch_pc.c | |
| parent | 7e170a06cc3155a6a8785af0b910434e5ab43d2b (diff) | |
| parent | f801eed3a84862d88af0d5e43c6b6754e36001f2 (diff) | |
Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff
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; } |