summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/iq_skill.h3
-rw-r--r--include/constants/tactic.h4
-rw-r--r--include/pokemon.h4
3 files changed, 7 insertions, 4 deletions
diff --git a/include/constants/iq_skill.h b/include/constants/iq_skill.h
index 759c350..f36cee0 100644
--- a/include/constants/iq_skill.h
+++ b/include/constants/iq_skill.h
@@ -25,7 +25,8 @@ enum IQSkill
IQ_SKILL_LAVA_EVADER = 0x14,
IQ_SKILL_DEDICATED_TRAVELER = 0x15,
IQ_SKILL_ITEM_MASTER = 0x16,
- IQ_SKILL_EXCLUSIVE_MOVE_USER = 0x17
+ IQ_SKILL_EXCLUSIVE_MOVE_USER = 0x17,
+ NUM_IQ_SKILLS = 0x18
};
#endif
diff --git a/include/constants/tactic.h b/include/constants/tactic.h
index 4d24b01..33e9d84 100644
--- a/include/constants/tactic.h
+++ b/include/constants/tactic.h
@@ -13,7 +13,9 @@ enum Tactic
TACTIC_BE_PATIENT = 0x7,
TACTIC_KEEP_YOUR_DISTANCE = 0x8,
TACTIC_WAIT_THERE = 0x9,
- TACTIC_GET_AWAY = 0xA
+ TACTIC_GET_AWAY = 0xA,
+ TACTIC_UNUSED = 0xB,
+ NUM_TACTICS = 0xC
};
#endif
diff --git a/include/pokemon.h b/include/pokemon.h
index f24eb84..9f78706 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -44,7 +44,7 @@ struct PokemonStruct
/* 0x16 */ u16 pokeHP; // HP
/* 0x18 */ struct Offense offense;
u32 unk1C;
- u32 unk20;
+ u32 IQSkills;
u8 unk24;
u8 fill25[3];
struct HeldItem heldItem;
@@ -91,7 +91,7 @@ struct PokemonStruct2
/* 40 */ struct ItemSlot itemSlot; // heldItem
u32 unk44; // some struct
u32 unk48; // some struct (same type as 44)
- u32 unk4C; // unk20
+ u32 IQSkills; // unk20
u8 unk50; // unk24
u8 fill51[3];
struct unkStruct_808E6F4 unk54;