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 | |
| parent | 2a2a0805b481b8425b4d1047d868fb1159993e6c (diff) | |
Renamed some boolean move functions
| -rw-r--r-- | asm/code_8057144.s | 4 | ||||
| -rw-r--r-- | asm/code_8057824.s | 2 | ||||
| -rw-r--r-- | include/moves.h | 2 | ||||
| -rw-r--r-- | src/dungeon_ai_attack.c | 2 | ||||
| -rw-r--r-- | src/moves.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/asm/code_8057144.s b/asm/code_8057144.s index 899bf52..efe2728 100644 --- a/asm/code_8057144.s +++ b/asm/code_8057144.s @@ -392,7 +392,7 @@ IsMoveUsable_2: cmp r1, 0x5 bne _08057414 adds r0, r4, 0 - bl GetMoveDealsDirectDamage + bl MoveDealsDirectDamage lsls r0, 24 cmp r0, 0 beq _0805743E @@ -460,7 +460,7 @@ sub_805744C: cmp r1, 0x5 bne _0805748E adds r0, r4, 0 - bl GetMoveDealsDirectDamage + bl MoveDealsDirectDamage lsls r0, 24 cmp r0, 0 beq _080574B6 diff --git a/asm/code_8057824.s b/asm/code_8057824.s index d07bd29..fc57de4 100644 --- a/asm/code_8057824.s +++ b/asm/code_8057824.s @@ -10965,7 +10965,7 @@ CanUseWithStatusChecker_2: cmp r0, 0x1 bne _0805CEE0 adds r0, r7, 0 - bl GetMoveCannotHitFrozen + bl MoveCannotHitFrozen lsls r0, 24 cmp r0, 0 beq _0805CEE0 diff --git a/include/moves.h b/include/moves.h index d301b0a..22f7ba6 100644 --- a/include/moves.h +++ b/include/moves.h @@ -14,6 +14,6 @@ s32 GetMovePower(struct PokemonMove *move); // 0x92BF4 u32 GetMoveMaxPP(struct PokemonMove *move); // 0x92C54 -bool8 GetMoveDealsDirectDamage(struct PokemonMove *move); +bool8 MoveDealsDirectDamage(struct PokemonMove *move); #endif 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; } |