diff options
| author | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-02-13 23:17:46 -0500 |
|---|---|---|
| committer | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-02-13 23:17:46 -0500 |
| commit | ece475a4804a64790cfa86dfa0ba577a732adee8 (patch) | |
| tree | 4237c0ab086005ea05539b8de7c10b867eec43db /src | |
| parent | 2a2a0805b481b8425b4d1047d868fb1159993e6c (diff) | |
Renamed some boolean move functions
Diffstat (limited to 'src')
| -rw-r--r-- | src/dungeon_ai_attack.c | 2 | ||||
| -rw-r--r-- | src/moves.c | 4 |
2 files changed, 3 insertions, 3 deletions
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; } |