From bc11a4a9f4233ce5795f5181729862b26d899f60 Mon Sep 17 00:00:00 2001 From: Meowsy Date: Sat, 15 Dec 2018 15:12:28 -0500 Subject: Document various things relating to the Pokedex. --- src/birch_pc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/birch_pc.c') diff --git a/src/birch_pc.c b/src/birch_pc.c index 3148832be..5080de410 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -66,19 +66,19 @@ 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) + if (count == HOENN_DEX_COUNT) return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, even though the hoenn dex count is 210. return gBirchDexRatingText_LessThan10; } -- cgit v1.2.3 From 8f168add219e5bd86c6115c79c41e8ac973c61ac Mon Sep 17 00:00:00 2001 From: Meowsy Date: Sat, 15 Dec 2018 15:25:45 -0500 Subject: Remove incorrect comment. --- src/birch_pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/birch_pc.c') diff --git a/src/birch_pc.c b/src/birch_pc.c index 5080de410..5179b1920 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -79,7 +79,7 @@ const u8 *GetPokedexRatingText(u16 count) return gBirchDexRatingText_DexCompleted; } if (count == HOENN_DEX_COUNT) - return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, even though the hoenn dex count is 210. + return gBirchDexRatingText_DexCompleted; return gBirchDexRatingText_LessThan10; } -- cgit v1.2.3