3 files changed, 12 insertions, 15 deletions
diff --git a/include/dungeon_ai_attack.h b/include/dungeon_ai_attack.h
index 1878889..bd874a4 100644
--- a/include/dungeon_ai_attack.h
+++ b/include/dungeon_ai_attack.h
@@ -3,6 +3,8 @@
 
 #include "dungeon_entity.h"
 
+#define RANGED_ATTACK_RANGE 10
+
 struct MoveTargetResults
 {
     bool8 moveUsable;
@@ -14,5 +16,13 @@ struct MoveTargetResults
 void DecideAttack(struct DungeonEntity *pokemon);
 // 0x7C04C
 s32 FindMoveTarget(struct MoveTargetResults *moveTargetResults, struct DungeonEntity *pokemon, struct PokemonMove *move);
+// 0x7C4A0
+bool8 IsTargetInLineRange(struct DungeonEntity *user, struct DungeonEntity *target, s32 range);
+// 0x7C580
+s32 WeightMoveIfUsable(s32 numPotentialTargets, s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, u32 hasStatusChecker);
+// 0x7C648
+bool8 CanUseStatusMove(s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, bool32 hasStatusChecker);
+// 0x7C7AC
+s32 WeightMove(struct DungeonEntity *user, s32 targetingFlags, struct DungeonEntity *target, u32 moveType);
 
 #endif
diff --git a/include/dungeon_ai_attack_1.h b/include/dungeon_ai_attack_1.h
index 160c32e..89a1f0d 100644
--- a/include/dungeon_ai_attack_1.h
+++ b/include/dungeon_ai_attack_1.h
@@ -3,11 +3,7 @@
 
 #include "dungeon_entity.h"
 
-// 0x7C580
-s32 WeightMoveIfUsable(s32 numPotentialTargets, s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, u32 hasStatusChecker);
-// 0x7C648
-bool8 CanUseStatusMove(s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, bool32 hasStatusChecker);
-// 0x7C7AC
-s32 WeightMove(struct DungeonEntity *user, s32 targetingFlags, struct DungeonEntity *target, u32 moveType);
+// 0x7C9F8
+bool8 IsTargetStraightAhead(struct DungeonEntity *pokemon, struct DungeonEntity *targetPokemon, s32 facingDir, s32 maxRange);
 
 #endif
diff --git a/include/dungeon_ai_attack_2.h b/include/dungeon_ai_attack_2.h
deleted file mode 100644
index 00711b6..0000000
--- a/include/dungeon_ai_attack_2.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#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