diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/dungeon_ai_attack_1.h | 4 | ||||
-rw-r--r-- | include/dungeon_ai_attack_2.h | 9 | ||||
-rw-r--r-- | include/moves.h | 2 | ||||
-rw-r--r-- | include/targeting_flags.h | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/include/dungeon_ai_attack_1.h b/include/dungeon_ai_attack_1.h index 89a1f0d..19969f2 100644 --- a/include/dungeon_ai_attack_1.h +++ b/include/dungeon_ai_attack_1.h @@ -3,7 +3,7 @@ #include "dungeon_entity.h" -// 0x7C9F8 -bool8 IsTargetStraightAhead(struct DungeonEntity *pokemon, struct DungeonEntity *targetPokemon, s32 facingDir, s32 maxRange); +// 0x7C580 +s32 WeightMoveIfUsable(s32 numPotentialTargets, s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, u32 hasStatusChecker); #endif diff --git a/include/dungeon_ai_attack_2.h b/include/dungeon_ai_attack_2.h new file mode 100644 index 0000000..00711b6 --- /dev/null +++ b/include/dungeon_ai_attack_2.h @@ -0,0 +1,9 @@ +#ifndef GUARD_DUNGEON_AI_ATTACK_2_H +#define GUARD_DUNGEON_AI_ATTACK_2_H + +#include "dungeon_entity.h" + +// 0x7C9F8 +bool8 IsTargetStraightAhead(struct DungeonEntity *pokemon, struct DungeonEntity *targetPokemon, s32 facingDir, s32 maxRange); + +#endif diff --git a/include/moves.h b/include/moves.h index 22f7ba6..ad68320 100644 --- a/include/moves.h +++ b/include/moves.h @@ -6,7 +6,7 @@ // 0x92A88 void InitPokemonMove(struct PokemonMove *move, u16 moveID); // 0x92AE0 -s16 GetMoveTargetingFlags(struct PokemonMove *move, u32 isAI); +s16 GetMoveTargetingFlags(struct PokemonMove *move, bool32 isAI); u8 GetMoveType(struct PokemonMove *move); // 0x92B90 u8 GetMoveWeight(struct PokemonMove *move); diff --git a/include/targeting_flags.h b/include/targeting_flags.h index 54e7063..d7d4737 100644 --- a/include/targeting_flags.h +++ b/include/targeting_flags.h @@ -5,6 +5,6 @@ #include "dungeon_entity.h" // 0x7CD64 -s16 GetMoveTargetingFlagsForPokemon(struct DungeonEntity *pokemon, struct PokemonMove *move, u32 isAI); +s16 GetMoveTargetingFlagsForPokemon(struct DungeonEntity *pokemon, struct PokemonMove *move, bool32 isAI); #endif |