diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-15 01:24:44 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-15 01:24:44 +0100 |
| commit | 6d2302637dbc7dfd597c7f95de780b1a21079f15 (patch) | |
| tree | b1e67e0043114a0ecad9dfb1a59d636cbc16083d /include/pokemon.h | |
| parent | 8602ff770030d84d2d18cccd961c07f195dc0a17 (diff) | |
| parent | 20de25004946139a601cd2965afc2e9645a56b96 (diff) | |
Merge remote-tracking branch 'upstream/master' into various_data
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 71b35e65c..539323bdb 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); |