diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2020-10-18 18:16:28 -0500 |
|---|---|---|
| committer | Seth Barberee <seth.barberee@gmail.com> | 2020-10-18 18:16:28 -0500 |
| commit | 1b0fc9f3745f119e2ec363bef89e48d6edeeac41 (patch) | |
| tree | f3ea5eaf00b3b1e5e7baedc48a63fe447e5fa6d5 /include | |
| parent | 01dde719bb7d6ac4d68c6d43ec2570db52f2e037 (diff) | |
decomp an evolve func for pokemon
Diffstat (limited to 'include')
| -rw-r--r-- | include/pokemon.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 0b408e3..6c18f7d 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -1,6 +1,18 @@ #ifndef POKEMON_H #define POKEMON_H +struct EvolveStruct1 +{ + u16 evolve_from; + u16 evolve_type; +}; + +struct EvolveNeeds +{ + u16 evolve_need1; + u16 evolve_need2; +}; + struct gPokemon { /* 0x0 */ u8* species; @@ -36,10 +48,8 @@ struct gPokemon /* 0x31 */ u8 unk31; /* 0x32 */ u8 unk32; /* 0x33 */ bool8 unk33; - /* 0x34 */ u16 evolve_from; //verified - /* 0x36 */ u16 evolve_type; - /* 0x38 */ u16 evolve_need1; // verified - /* 0x3A */ u16 evolve_need2; // verified + /* 0x34 */ struct EvolveStruct1 pre; + /* 0x38 */ struct EvolveNeeds need; /* 0x3C */ u16 dexNo; /* 0x3E */ u16 internalNo; // verified /* 0x40 */ s16 base_recruit; // verified |