summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2016-11-14 22:28:20 -0500
committerYamaArashi <YamaArashi@users.noreply.github.com>2016-11-14 19:28:20 -0800
commita07e8aa2f473ffe4217e0d48c20c14c67b9e9d99 (patch)
treecbf6e3e9bb51a3495df47a93ebb8dbb0bf744e4d /include
parentc293f7966e4e991e404631dd445d29ce1f43542b (diff)
Start decompiling battle_ai.c cmd functions (#100)
* begin decompiling battle AI macros * decompile more battle AI macros * nonmatching function * decompile BattleAICmd_get_ability * current nonmatching work * get BattleAICmd_unk_30 a bit closer * get battle_ai.c into a mergable state.
Diffstat (limited to 'include')
-rw-r--r--include/pokemon.h133
1 files changed, 62 insertions, 71 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index a1042b0c0..450a8174f 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -242,81 +242,72 @@ struct UnknownPokemonStruct
struct BattlePokemon
{
- /*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;
+ /* 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;
+ /* 0x14 */ u32 attackIV:5;
+ /* 0x15 */ u32 defenseIV:5;
+ /* 0x15 */ u32 speedIV:5;
+ /* 0x16 */ u32 spAttackIV:5;
+ /* 0x17 */ u32 spDefenseIV:5;
+ /* 0x17 */ u32 isEgg:1;
+ /* 0x17 */ 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
{
- u8 baseHP;
- u8 baseAttack;
- u8 baseDefense;
- u8 baseSpeed;
- u8 baseSpAttack;
- u8 baseSpDefense;
-
- u8 type1, type2;
-
- u8 catchRate;
-
- u8 expYield;
-
- u16 evYield_HP:2;
- u16 evYield_Attack:2;
- u16 evYield_Defense:2;
- u16 evYield_Speed:2;
- u16 evYield_SpAttack:2;
- u16 evYield_SpDefense:2;
-
- u16 item1, item2;
-
- u8 genderRatio;
-
- u8 eggCycles;
-
- u8 friendship;
-
- u8 growthRate;
-
- u8 eggGroup1, eggGroup2;
-
- u8 ability1, ability2;
-
- u8 safariZoneFleeRate;
-
- u8 bodyColor;
+ /* 0x00 */ u8 baseHP;
+ /* 0x01 */ u8 baseAttack;
+ /* 0x02 */ u8 baseDefense;
+ /* 0x03 */ u8 baseSpeed;
+ /* 0x04 */ u8 baseSpAttack;
+ /* 0x05 */ u8 baseSpDefense;
+ /* 0x06 */ u8 type1;
+ /* 0x07 */ u8 type2;
+ /* 0x08 */ u8 catchRate;
+ /* 0x09 */ u8 expYield;
+ /* 0x0A */ u16 evYield_HP:2;
+ /* 0x0A */ u16 evYield_Attack:2;
+ /* 0x0A */ u16 evYield_Defense:2;
+ /* 0x0A */ u16 evYield_Speed:2;
+ /* 0x0B */ u16 evYield_SpAttack:2;
+ /* 0x0B */ u16 evYield_SpDefense:2;
+ /* 0x0C */ u16 item1;
+ /* 0x0E */ u16 item2;
+ /* 0x10 */ u8 genderRatio;
+ /* 0x11 */ u8 eggCycles;
+ /* 0x12 */ u8 friendship;
+ /* 0x13 */ u8 growthRate;
+ /* 0x14 */ u8 eggGroup1;
+ /* 0x15 */ u8 eggGroup2;
+ /* 0x16 */ u8 ability1;
+ /* 0x17 */ u8 ability2;
+ /* 0x18 */ u8 safariZoneFleeRate;
+ /* 0x19 */ u8 bodyColor;
};
struct BattleMove