From a9b5977d4ca6c0aeedea966a0165b625a4c2dbab Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sat, 5 Feb 2022 20:23:01 -0500 Subject: Decomped MoveMatchesChargingStatus --- src/dungeon_ai_attack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dungeon_ai_attack.c') diff --git a/src/dungeon_ai_attack.c b/src/dungeon_ai_attack.c index e695422..0c48f24 100644 --- a/src/dungeon_ai_attack.c +++ b/src/dungeon_ai_attack.c @@ -8,6 +8,7 @@ #include "constants/status.h" #include "constants/tactic.h" #include "constants/type.h" +#include "charge_move.h" #include "dungeon_action.h" #include "dungeon_ai.h" #include "dungeon_capabilities_1.h" @@ -29,7 +30,6 @@ struct MoveTargetResults s32 moveWeight; }; -extern bool8 IsChargeMove(struct DungeonEntity*, struct PokemonMove*); extern void TargetTileInFront(struct DungeonEntity*); extern s32 FindMoveTarget(struct MoveTargetResults*, struct DungeonEntity*, struct PokemonMove*); extern bool8 IsMoveUsable(struct DungeonEntity*, s32, bool8); @@ -63,7 +63,7 @@ void DecideAttack(struct DungeonEntity *pokemon) for (i = 0; i < MAX_MON_MOVES; i++) { if (pokemonData->moves[i].moveFlags & MOVE_FLAG_EXISTS && - IsChargeMove(pokemon, &pokemonData->moves[i]) && + MoveMatchesChargingStatus(pokemon, &pokemonData->moves[i]) && pokemonData->chargingStatusMoveIndex == i) { s32 chosenMoveIndex; -- cgit v1.2.3