diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-02 21:03:52 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-02 21:03:52 -0700 |
commit | 08e6fb5382bb4e2104d370783d15b4a2a3c65a2a (patch) | |
tree | 9c71b110b696c3e0c285d1a5278c69cf78610369 /include/pokemon.h | |
parent | d783f420001b67c19f8d81bbc94d266af98e89ad (diff) | |
parent | 24b1dee67f5d91272f432cd2aee4ee92125fcbcb (diff) |
Merge pull request #453 from huderlem/battle_tower
Decompile battle_tower
Diffstat (limited to 'include/pokemon.h')
-rw-r--r-- | include/pokemon.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 0fbc325c3..572862b8f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -288,29 +288,29 @@ struct Pokemon 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; + /*0x00*/u16 species; + /*0x02*/u16 heldItem; + /*0x04*/u16 moves[4]; + /*0x0C*/u8 level; + /*0x0D*/u8 ppBonuses; + /*0x0E*/u8 hpEV; + /*0x0F*/u8 attackEV; + /*0x10*/u8 defenseEV; + /*0x11*/u8 speedEV; + /*0x12*/u8 spAttackEV; + /*0x13*/u8 spDefenseEV; + /*0x14*/u32 otId; + /*0x18*/u32 hpIV:5; + /*0x18*/u32 attackIV:5; + /*0x19*/u32 defenseIV:5; + /*0x19*/u32 speedIV:5; + /*0x1A*/u32 spAttackIV:5; + /*0x1A*/u32 spDefenseIV:5; + /*0x1B*/u32 gap:1; + /*0x1B*/u32 altAbility:1; + /*0x1C*/u32 personality; + /*0x20*/u8 nickname[POKEMON_NAME_LENGTH + 1]; + /*0x2B*/u8 friendship; }; struct BattlePokemon |