From ece475a4804a64790cfa86dfa0ba577a732adee8 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 13 Feb 2022 23:17:46 -0500 Subject: Renamed some boolean move functions --- src/dungeon_ai_attack.c | 2 +- src/moves.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/dungeon_ai_attack.c b/src/dungeon_ai_attack.c index 6e202b5..30e5d3a 100644 --- a/src/dungeon_ai_attack.c +++ b/src/dungeon_ai_attack.c @@ -348,7 +348,7 @@ s32 FindMoveTarget(struct MoveTargetResults *moveTargetResults, struct DungeonEn targetingFlags = GetMoveTargetingFlagsForPokemon(pokemon, move, TRUE); hasStatusChecker = HasIQSkill(pokemon, IQ_SKILL_STATUS_CHECKER); moveTargetResults->moveUsable = FALSE; - if ((pokemonData->volatileStatus == VOLATILE_STATUS_TAUNTED && !GetMoveDealsDirectDamage(move)) || + if ((pokemonData->volatileStatus == VOLATILE_STATUS_TAUNTED && !MoveDealsDirectDamage(move)) || (hasStatusChecker && !CanUseWithStatusChecker(pokemon, move))) { return 1; diff --git a/src/moves.c b/src/moves.c index b7c8ad8..0874f00 100644 --- a/src/moves.c +++ b/src/moves.c @@ -271,12 +271,12 @@ u8 GetMoveCriticalHitChance(struct PokemonMove *move) return gMovesData[move->moveID].criticalHitChance; } -bool8 GetMoveCannotHitFrozen(struct PokemonMove *move) +bool8 MoveCannotHitFrozen(struct PokemonMove *move) { return gMovesData[move->moveID].cannotHitFrozen; } -bool8 GetMoveDealsDirectDamage(struct PokemonMove *move) +bool8 MoveDealsDirectDamage(struct PokemonMove *move) { return gMovesData[move->moveID].dealsDirectDamage; } -- cgit v1.2.3