Merge pull request #452 from Meowsy/pokemon-adding-easer

Add macros to simplify defining front animations and still pics.
2018-12-18 14:27:01 -06:00
parent c74468fd11 d6b31346c3
commit 2c7948bae8
9 changed files with 904 additions and 898 deletions
@@ -5929,13 +5929,13 @@ u16 HoennToNationalOrder(u16 hoennNum)

 u16 SpeciesToCryId(u16 species)
 {
-    if (species <= 250)
+    if (species <= SPECIES_CELEBI - 1)
        return species;

-    if (species < 276)
-        return 200;
+    if (species < SPECIES_TREECKO - 1)
+        return SPECIES_UNOWN - 1;

-    return gSpeciesIdToCryId[species - 276];
+    return gSpeciesIdToCryId[species - (SPECIES_TREECKO - 1)];
 }

 void sub_806D544(u16 species, u32 personality, u8 *dest)