diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 0e2113abe..d0e609448 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -266,8 +266,4 @@ #define SKIP_FRONT_ANIM (1 << 7) -#define NUM_TYPE_SLOTS 2 -#define NUM_EGG_GROUP_SLOTS 2 -#define NUM_ABILITY_SLOTS 2 - #endif // GUARD_CONSTANTS_POKEMON_H diff --git a/include/pokemon.h b/include/pokemon.h index 5ee8b8ade..ab102000a 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -295,7 +295,7 @@ struct SpeciesInfo /* 0x03 */ u8 baseSpeed; /* 0x04 */ u8 baseSpAttack; /* 0x05 */ u8 baseSpDefense; - /* 0x06 */ u8 types[NUM_TYPE_SLOTS]; + /* 0x06 */ u8 types[2]; /* 0x08 */ u8 catchRate; /* 0x09 */ u8 expYield; /* 0x0A */ u16 evYield_HP:2; @@ -310,8 +310,8 @@ struct SpeciesInfo /* 0x11 */ u8 eggCycles; /* 0x12 */ u8 friendship; /* 0x13 */ u8 growthRate; - /* 0x14 */ u8 eggGroups[NUM_EGG_GROUP_SLOTS]; - /* 0x16 */ u8 abilities[NUM_ABILITY_SLOTS]; + /* 0x14 */ u8 eggGroups[2]; + /* 0x16 */ u8 abilities[2]; /* 0x18 */ u8 safariZoneFleeRate; /* 0x19 */ u8 bodyColor : 7; u8 noFlip : 1;