diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/move_util.h | 1 | ||||
| -rw-r--r-- | include/moves.h | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/move_util.h b/include/move_util.h index d4deda3..2bfc1c6 100644 --- a/include/move_util.h +++ b/include/move_util.h @@ -4,5 +4,6 @@ #include "dungeon_entity.h" bool8 IsMoveIndexUsable(struct DungeonEntity *pokemon, s32 moveIndex, bool8 hasPPChecker); +bool8 IsMoveUsable(struct DungeonEntity *pokemon, struct PokemonMove *move, bool8 hasPPChecker); #endif diff --git a/include/moves.h b/include/moves.h index b612e69..a811f0b 100644 --- a/include/moves.h +++ b/include/moves.h @@ -18,14 +18,14 @@ s32 GetMoveAccuracy(struct PokemonMove *move, u32 accuracyType); u32 GetMoveMaxPP(struct PokemonMove *move); u8 GetMoveUnk12(struct PokemonMove *move); u8 GetMoveCriticalHitChance(struct PokemonMove *move); -u8 MoveCannotHitFrozen(struct PokemonMove *move); -u8 MoveDealsDirectDamage(struct PokemonMove *move); +bool8 MoveCannotHitFrozen(struct PokemonMove *move); +bool8 MoveDealsDirectDamage(struct PokemonMove *move); u32 GetMoveRangeType(struct PokemonMove *move); void sub_8092C84(u8 *buffer, u16 moveID); u8 *GetMoveUseText(u16 moveID); -u8 GetMoveAffectedByMagicCoat(u16 moveID); -u8 GetMoveTargetsUser(u16 moveID); -u8 GetMoveAffectedByMuzzled(u16 moveID); +bool8 GetMoveAffectedByMagicCoat(u16 moveID); +bool8 GetMoveTargetsUser(u16 moveID); +bool8 GetMoveAffectedByMuzzled(u16 moveID); bool8 IsBlockedBySoundproof(struct PokemonMove *move); bool8 DoesMoveCharge(u16 move); |