diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-09 17:47:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-09 17:47:01 -0500 |
| commit | 99d0b4bbfd3fd05ba67aed1e7cf1b500b3ab594f (patch) | |
| tree | 958dc97128c47cc0fce7f0a37fff5c1cac098802 /include/pokemon.h | |
| parent | 368a63d5a74dee114797218d443b2cb0db68b9ea (diff) | |
| parent | 387dbf48d0bbb22dc16158a1ee0d373c166c8438 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index f5d1683a2..ce3074a0b 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -510,18 +510,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 struct PokemonStorage* gPokemonStoragePtr; extern const u32 gExperienceTables[][MAX_MON_LEVEL + 1]; extern const u16 *const gLevelUpLearnsets[]; |