diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 17:43:11 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 17:43:11 -0500 |
| commit | e86234ff99ffa4b60df180d462c2af0f1ed4d447 (patch) | |
| tree | 0d7240ce350146c6fa2189bf89aa96b08f3a6fdc /include/pokemon.h | |
| parent | 1ff1e8ce9547d646b17b135b3013a516d17f35db (diff) | |
| parent | 7e3495747035d13f72ba869195b21f4e61ee283a (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index af65599f8..8624270f1 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -502,8 +502,8 @@ extern struct Pokemon gEnemyParty[PARTY_SIZE]; extern const u8 *const gItemEffectTable[]; extern const struct BaseStats gBaseStats[]; extern const u32 gExperienceTables[][101]; -extern const u16 *const gLevelUpLearnsets[]; -extern const struct EvolutionData gEvolutionTable[]; +extern const u16 *gLevelUpLearnsets[]; +extern struct Evolution gEvolutionTable[][5]; extern struct PokemonStorage gPokemonStorage; void ZeroBoxMonData(struct BoxPokemon *boxMon); |