diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/battle.h | 19 | ||||
-rw-r--r-- | include/pokemon.h | 67 |
2 files changed, 53 insertions, 33 deletions
diff --git a/include/battle.h b/include/battle.h new file mode 100644 index 000000000..06daeb081 --- /dev/null +++ b/include/battle.h @@ -0,0 +1,19 @@ +#ifndef GUARD_BATTLE_H +#define GUARD_BATTLE_H + +struct Trainer +{ + /*0x00*/ u8 partyFlags; + /*0x01*/ u8 trainerClass; + /*0x02*/ u8 encounterMusic:7; + /*0x02*/ u8 gender:1; + /*0x03*/ u8 trainerPic; + /*0x04*/ u8 trainerName[12]; + /*0x10*/ u16 items[4]; + /*0x18*/ bool8 doubleBattle; + /*0x1C*/ u32 aiFlags; + /*0x20*/ u8 partySize; + /*0x24*/ void *party; +}; + +#endif // GUARD_BATTLE_H diff --git a/include/pokemon.h b/include/pokemon.h index 219447f8f..a1042b0c0 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -242,39 +242,40 @@ struct UnknownPokemonStruct struct BattlePokemon { - u16 species; - u16 attack; - u16 defense; - u16 speed; - u16 spAttack; - u16 spDefense; - u16 moves[4]; - u32 hpIV:5; - u32 attackIV:5; - u32 defenseIV:5; - u32 speedIV:5; - u32 spAttackIV:5; - u32 spDefenseIV:5; - u32 isEgg:1; - u32 altAbility:1; - s8 statStages[8]; - u8 ability; - u8 type1, type2; - u8 unknown; - u8 pp[4]; - u16 hp; - u8 level; - u8 friendship; - u16 maxHP; - u16 item; - u8 nickname[POKEMON_NAME_LENGTH + 1]; - u8 ppBonuses; - u8 otName[8]; - u32 experience; - u32 personality; - u32 status1; - u32 status2; - u32 otId; + /*0x00*/ u16 species; + /*0x02*/ u16 attack; + /*0x04*/ u16 defense; + /*0x06*/ u16 speed; + /*0x08*/ u16 spAttack; + /*0x0A*/ u16 spDefense; + /*0x0C*/ u16 moves[4]; + /*0x14*/ u32 hpIV:5; + u32 attackIV:5; + u32 defenseIV:5; + u32 speedIV:5; + u32 spAttackIV:5; + u32 spDefenseIV:5; + u32 isEgg:1; + u32 altAbility:1; + /*0x18*/ s8 statStages[8]; + /*0x20*/ u8 ability; + /*0x21*/ u8 type1; + /*0x22*/ u8 type2; + /*0x23*/ u8 unknown; + /*0x24*/ u8 pp[4]; + /*0x28*/ u16 hp; + /*0x2A*/ u8 level; + /*0x2B*/ u8 friendship; + /*0x2C*/ u16 maxHP; + /*0x2E*/ u16 item; + /*0x30*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; + /*0x3B*/ u8 ppBonuses; + /*0x3C*/ u8 otName[8]; + /*0x44*/ u32 experience; + /*0x48*/ u32 personality; + /*0x4C*/ u32 status1; + /*0x50*/ u32 status2; + /*0x54*/ u32 otId; }; struct BaseStats |