diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-05-30 16:51:30 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-30 16:51:30 -0700 |
commit | dd28854a226753e2da53b35dcf1f67b142b75b77 (patch) | |
tree | 61864daf48aad5dfcf697c36e8acac88ce9f4d4c /include/pokemon.h | |
parent | f6350bc00373dc824a02522b6c6c9e4695534884 (diff) | |
parent | 42731e4b88115bada3aed8ebc3b2c3dabecbb020 (diff) |
Merge pull request #255 from DizzyEggg/decomp_record_mixing
Fix pika's Record Mixing PR
Also closes #107.
Diffstat (limited to 'include/pokemon.h')
-rw-r--r-- | include/pokemon.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index b6b0d6d36..37028821a 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -240,33 +240,6 @@ struct PokemonStorage /*0x83C2*/ u8 boxWallpapers[14]; }; -struct UnknownPokemonStruct -{ - u16 species; - u16 heldItem; - u16 moves[4]; - u8 level; - u8 ppBonuses; - u8 hpEV; - u8 attackEV; - u8 defenseEV; - u8 speedEV; - u8 spAttackEV; - u8 spDefenseEV; - u32 otId; - u32 hpIV:5; - u32 attackIV:5; - u32 defenseIV:5; - u32 speedIV:5; - u32 spAttackIV:5; - u32 spDefenseIV:5; - u32 gap:1; - u32 altAbility:1; - u32 personality; - u8 nickname[POKEMON_NAME_LENGTH + 1]; - u8 friendship; -}; - struct UnknownPokemonSubStruct2 { u16 species; |