From 62c4379a217d10ea0224f31d83c89177be119822 Mon Sep 17 00:00:00 2001 From: Meowsy Date: Mon, 17 Dec 2018 12:28:11 -0500 Subject: Remove magic numbers. --- src/pokemon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/pokemon.c') diff --git a/src/pokemon.c b/src/pokemon.c index 8e32479a1..50f0a1ac2 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5935,13 +5935,13 @@ u16 HoennToNationalOrder(u16 hoennNum) u16 SpeciesToCryId(u16 species) { - if (species <= 250) + if (species <= SPECIES_CELEBI - 1) return species; - if (species < 276) + if (species < SPECIES_TREECKO - 1) return 200; - return gSpeciesIdToCryId[species - 276]; + return gSpeciesIdToCryId[species - (SPECIES_TREECKO - 1)]; } void sub_806D544(u16 species, u32 personality, u8 *dest) -- cgit v1.2.3 From 9ca27f1332dd2c700292cfdcefc5c9412847fc0e Mon Sep 17 00:00:00 2001 From: Meowsy Date: Tue, 18 Dec 2018 09:20:43 -0500 Subject: Document return value. --- src/pokemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pokemon.c') diff --git a/src/pokemon.c b/src/pokemon.c index 50f0a1ac2..004dac0d5 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5939,7 +5939,7 @@ u16 SpeciesToCryId(u16 species) return species; if (species < SPECIES_TREECKO - 1) - return 200; + return SPECIES_UNOWN - 1; return gSpeciesIdToCryId[species - (SPECIES_TREECKO - 1)]; } -- cgit v1.2.3