diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 1 | ||||
| -rw-r--r-- | include/pokemon.h | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/global.h b/include/global.h index fac7e1354..ba681d570 100644 --- a/include/global.h +++ b/include/global.h @@ -28,6 +28,7 @@ char* strcpy(char *dst0, const char *src0); // Converts a number to Q4.12 fixed-point format #define Q_4_12(n) ((s16)((n) * 4096)) +#define POKEMON_SLOTS_NUMBER 412 #define POKEMON_NAME_LENGTH 10 #define OT_NAME_LENGTH 7 diff --git a/include/pokemon.h b/include/pokemon.h index 2a8dc9c7d..e15172dd5 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -511,18 +511,13 @@ struct Evolution #define EVOS_PER_MON 5 -struct EvolutionData -{ - struct Evolution evolutions[EVOS_PER_MON]; -}; - extern u8 gPlayerPartyCount; extern struct Pokemon gPlayerParty[PARTY_SIZE]; extern u8 gEnemyPartyCount; extern struct Pokemon gEnemyParty[PARTY_SIZE]; extern const struct BaseStats gBaseStats[]; extern const u8 *const gItemEffectTable[]; -extern const struct EvolutionData gEvolutionTable[]; +extern const struct Evolution gEvolutionTable[][EVOS_PER_MON]; extern const u8 gStatStageRatios[][2]; extern struct SpriteTemplate gMultiuseSpriteTemplate; extern struct PokemonStorage* gPokemonStoragePtr; |