diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/dungeon_pokemon_attributes.h | 16 | ||||
| -rw-r--r-- | include/dungeon_pokemon_attributes_1.h | 21 | ||||
| -rw-r--r-- | include/moves.h | 2 | ||||
| -rw-r--r-- | include/pokemon_3.h | 2 |
4 files changed, 20 insertions, 21 deletions
diff --git a/include/dungeon_pokemon_attributes.h b/include/dungeon_pokemon_attributes.h index 941c966..40b13ee 100644 --- a/include/dungeon_pokemon_attributes.h +++ b/include/dungeon_pokemon_attributes.h @@ -5,5 +5,21 @@ // 0x71824 bool8 HasAbility(struct DungeonEntity *pokemon, u8 ability); +// 0x71858 +bool8 HasType(struct DungeonEntity *pokemon, u8 type); +// 0x71884 +bool8 CanSeeInvisible(struct DungeonEntity *pokemon); +// 0x718AC +bool8 HasTactic(struct DungeonEntity *pokemon, u8 tactic); +// 0x718D8 +bool8 HasIQSkill(struct DungeonEntity *pokemon, u8 IQSkill); + +void LoadIQSkills(struct DungeonEntity *pokemon); +bool8 CanSeeTeammate(struct DungeonEntity * pokemon); +u8 GetMoveTypeForPokemon(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove); + +// 0x71A44 +s32 CalculateMovePower(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove); +bool8 ToolboxEnabled(struct DungeonEntityData *pokemon); #endif diff --git a/include/dungeon_pokemon_attributes_1.h b/include/dungeon_pokemon_attributes_1.h deleted file mode 100644 index c81c4b9..0000000 --- a/include/dungeon_pokemon_attributes_1.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef GUARD_DUNGEON_POKEMON_ATTRIBUTES_1_H -#define GUARD_DUNGEON_POKEMON_ATTRIBUTES_1_H - -#include "dungeon_entity.h" - -// 0x71884 -bool8 CanSeeInvisible(struct DungeonEntity *pokemon); -// 0x718AC -bool8 HasTactic(struct DungeonEntity *pokemon, u8 tactic); -// 0x718D8 -bool8 HasIQSkill(struct DungeonEntity *pokemon, u8 IQSkill); - -void LoadIQSkills(struct DungeonEntity *pokemon); -bool8 CanSeeTeammate(struct DungeonEntity * pokemon); -u8 GetMoveTypeForPokemon(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove); - -// 0x71A44 -s32 CalculateMovePower(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove); -bool8 ToolboxEnabled(struct DungeonEntityData *pokemon); - -#endif diff --git a/include/moves.h b/include/moves.h index dca2ac4..d301b0a 100644 --- a/include/moves.h +++ b/include/moves.h @@ -7,8 +7,10 @@ void InitPokemonMove(struct PokemonMove *move, u16 moveID); // 0x92AE0 s16 GetMoveTargetingFlags(struct PokemonMove *move, u32 isAI); +u8 GetMoveType(struct PokemonMove *move); // 0x92B90 u8 GetMoveWeight(struct PokemonMove *move); +s32 GetMovePower(struct PokemonMove *move); // 0x92BF4 u32 GetMoveMaxPP(struct PokemonMove *move); // 0x92C54 diff --git a/include/pokemon_3.h b/include/pokemon_3.h index 968e2ef..c68da39 100644 --- a/include/pokemon_3.h +++ b/include/pokemon_3.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEMON_3_H #define GUARD_POKEMON_3_H +bool8 HasIQForSkill(s32 pokeIQ, u8 IQSkillIndex); +void SetIQSkill(u8 *param_1, u32 skillIndex); bool8 IsIQSkillSet(u8 *IQSkillsEnabled, u32 IQSkill); #endif |