dungeon file externs

include/dungeon_ai_attack.h

@@ -21,5 +21,8 @@ bool8 IsAITargetEligible(s32 targetingFlags, Entity *user, Entity *target, Move
 s32 WeightMove(Entity *user, s32 targetingFlags, Entity *target, u32 moveType);
 bool8 TargetRegularAttack(Entity *pokemon, u32 *targetDir, bool8 checkPetrified);
 bool8 IsTargetInRange(Entity *pokemon, Entity *targetPokemon, s32 direction, s32 maxRange);
+void HandleUseMoveAIAction(Entity *target);
+void HandleUseOrbAction(Entity *pokemon);
+s16 GetMoveTargetAndRangeForPokemon(Entity *pokemon, Move *move, bool32 isAI);
 
 #endif

include/dungeon_ai_items.h

@@ -8,5 +8,9 @@ void AIDecideUseItem(Entity *pokemon);
 void GetPossibleAIThrownItemDirections(Entity *pokemon, s32 thrownAIFlag, Item *item, bool8 ignoreRollChance);
 void GetPossibleAIArcItemTargets(Entity *pokemon, Item *item, DungeonPos potentialTargets[], bool8 ignoreRollChance);
 void TargetThrownItem(Entity *pokemon, Entity *targetPokemon, Item *item, s32 targetingFlags, bool8 ignoreRollChance);
+void HandleEatAIAction(Entity *pokemon);
+void HandleThrowItemAIAction(Entity *pokemon);
+void HandlePickUpAIAction(Entity *pokemon);
+void MonTryPickUpItem(Entity *entity);
 
 #endif

include/dungeon_util.h

@@ -35,6 +35,7 @@ bool8 sub_8045AAC(Entity *entity, DungeonPos *pos);
 bool8 CanTargetPosition(Entity *entity, DungeonPos *pos);
 void SubstitutePlaceholderStringTags(u8 *buffer, Entity *entity, u32 param_3);
 void sub_8045ACC(void);
+s32 GetTeamMemberEntityIndex(Entity *pokemon);
 
 extern u8 gUnknown_202EE70[MAX_TEAM_BODY_SIZE];
 extern u8 gUnknown_202EE76[DUNGEON_MAX_WILD_POKEMON_BODY_SIZE];

include/status_checks.h

@@ -3,8 +3,7 @@
 
 #include "structs/dungeon_entity.h"
 
-extern const s16 gConfusedAttackChance;
-
 bool8 HasStatusThatPreventsActing(Entity *pokemon);
+bool8 sub_80701A4(Entity *pokemon);
 
 #endif

include/targeting_flags.h

@@ -1,9 +0,0 @@
-#ifndef GUARD_TARGETING_FLAGS_H
-#define GUARD_TARGETING_FLAGS_H
-
-#include "constants/move.h"
-#include "structs/dungeon_entity.h"
-
-s16 GetMoveTargetAndRangeForPokemon(Entity *pokemon, Move *move, bool32 isAI);
-
-#endif

src/dungeon_action_execution.c

@@ -39,17 +39,14 @@
 #include "move_orb_effects_1.h"
 #include "move_orb_effects_3.h"
 #include "dungeon_entity_movement.h"
+#include "dungeon_ai_items.h"
+#include "dungeon_ai_attack.h"
 
 void sub_8075BA4(Entity *param_1, u8 param_2);
 void nullsub_95(Entity *);
-void HandleUseMoveAIAction(Entity *target);
 void sub_8041888(u8 param_1);
 void sub_805EFB4(Entity *, u8);
-void HandleUseOrbAction(Entity *);
 void sub_806A1E8(Entity *pokemon);
-void HandlePickUpAIAction(Entity *pokemon);
-void HandleThrowItemAIAction(Entity *pokemon);
-void HandleEatAIAction(Entity *pokemon);
 
 EWRAM_DATA u8 gUnknown_202F32C = 0;
 EWRAM_DATA u8 gUnknown_202F32D = 0;

src/dungeon_ai_attack.c

@@ -27,7 +27,6 @@
 #include "position_util.h"
 #include "status_checks.h"
 #include "structs/str_dungeon.h"
-#include "targeting_flags.h"
 #include "dungeon_misc.h"
 #include "dungeon_pos_data.h"
 #include "dungeon_engine.h"
@@ -45,8 +44,6 @@ EWRAM_DATA u8 gPotentialAttackTargetDirections[NUM_DIRECTIONS] = {0};
 EWRAM_DATA s32 gPotentialAttackTargetWeights[NUM_DIRECTIONS] = {0};
 EWRAM_DATA Entity *gPotentialTargets[NUM_DIRECTIONS] = {0};
 
-extern void sub_806A1B0(Entity *);
-
 void ChooseAIMove(Entity *pokemon)
 {
     EntityInfo *pokemonInfo = GetEntInfo(pokemon);

src/dungeon_ai_items.c

@@ -43,10 +43,6 @@ EWRAM_DATA u32 gAIThrownItemDirections[NUM_DIRECTIONS] = {0};
 EWRAM_DATA bool8 gAIThrownItemDirectionIsUsed[NUM_DIRECTIONS] = {0};
 EWRAM_DATA u32 gAIThrownItemProbabilities[NUM_DIRECTIONS] = {0};
 
-extern TeamInventory *gTeamInventoryRef;
-
-void sub_8073D14(Entity *);
-
 void AIDecideUseItem(Entity *pokemon)
 {
     EntityInfo *pokemonInfo = GetEntInfo(pokemon);
@@ -427,10 +423,10 @@ void HandleThrowItemAIAction(Entity *pokemon)
 
 void HandlePickUpAIAction(Entity *pokemon)
 {
-    sub_8073D14(pokemon);
+    MonTryPickUpItem(pokemon);
 }
 
-void sub_8073D14(Entity *entity)
+void MonTryPickUpItem(Entity *entity)
 {
     Item *groundItem;
     EntityInfo *_entityInfo;

src/dungeon_entity_movement.c

@@ -53,6 +53,7 @@
 #include "dungeon_tilemap.h"
 #include "run_dungeon.h"
 #include "dungeon_8041AD0.h"
+#include "dungeon_ai_items.h"
 
 static EWRAM_DATA s32 sSpeedMultiplier = 0;
 
@@ -60,8 +61,6 @@ static void sub_8075050(EntityInfo *info, Unk_Entity_x184 *strPtr);
 static void nullsub_97(Entity *entity);
 static void TryInteractWithTile(Entity *entity);
 
-extern void sub_8073D14(Entity *entity);
-
 static inline void SetSpeedMultiplier(void)
 {
     if (gGameOptionsRef->dungeonSpeed != 0)
@@ -392,7 +391,7 @@ static void TryInteractWithTile(Entity *entity)
             break;
         }
         case ENTITY_ITEM:
-            sub_8073D14(entity);
+            MonTryPickUpItem(entity);
             break;
         case ENTITY_NOTHING:
         case ENTITY_MONSTER:

src/dungeon_main.c

@@ -61,16 +61,9 @@
 #include "dungeon_strings.h"
 #include "dungeon_entity_movement.h"
 #include "dungeon_8041AD0.h"
+#include "status_checks.h"
 
-void TryPointCameraToMonster(Entity *a0, u8 a1);
-bool8 sub_80701A4(Entity *a0);
-void ClearUnpaidFlagFromAllItems(void);
-void sub_806A914(u8 a0, u8 a1, u8 a2);
-u16 GetLeaderActionId(void);
 void sub_80978C8(s16 a0);
-s32 GetTeamMemberEntityIndex(Entity *pokemon);
-bool8 sub_8070F80(Entity * pokemon, s32 direction);
-extern bool8 sub_8071A8C(Entity *pokemon);
 
 static EWRAM_DATA bool8 sInDiagonalMode = 0;
 static EWRAM_DATA bool8 sInRotateMode = 0;

src/dungeon_menu_moves.c

@@ -30,11 +30,6 @@
 #include "text_2.h"
 #include "text_3.h"
 
-extern s32 GetTeamMemberEntityIndex(Entity *pokemon);
-extern void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 a1);
-extern bool8 sub_8071A8C(Entity *pokemon);
-
-
 static void ShowMovesMenuWindows(Entity *entity, EntityInfo *entInfo, bool8 redColorForChargingMoves, WindowTemplates *windows, WindowHeader *header, u8 *arg5, s32 arg6, s32 arg7);
 static void AddMovesSubMenuOptions(Entity *entity, bool8 addLinkOptions, bool8 addUseMove);
 static void SetSubMenuOptionAction(ActionContainer *a0, s32 a1, s32 a2);

src/dungeon_move.c

@@ -38,11 +38,11 @@
 #include "position_util.h"
 #include "sprite.h"
 #include "weather.h"
-#include "targeting_flags.h"
 #include "text_util.h"
 #include "dungeon_pos_data.h"
 #include "dungeon_engine.h"
 #include "warp_target.h"
+#include "dungeon_ai_attack.h"
 
 extern s16 GetDungeonExitReasonFromMoveOrItem(Move *move, s32 itemID);
 extern void sub_806A1E8(Entity *pokemon);

src/dungeon_move_util.c

@@ -36,7 +36,7 @@
 #include "move_orb_effects_3.h"
 #include "move_orb_effects_5.h"
 #include "weather.h"
-#include "targeting_flags.h"
+#include "dungeon_ai_attack.h"
 #include "pokemon_types.h"
 #include "dungeon_run_end.h"
 #include "dungeon_pos_data.h"

src/dungeon_recruit_release_menu.c

@@ -7,7 +7,6 @@
 #include "dungeon_tilemap.h"
 #include "dungeon_8041AD0.h"
 #include "dungeon_action.h"
-#include "code_8066D04.h"
 #include "dungeon_mon_sprite_render.h"
 #include "run_dungeon.h"
 #include "dungeon_items.h"

src/friend_rescue.c

@@ -31,9 +31,6 @@
 
 extern void SetFriendRescueMenuState(u32);
 
-extern TeamInventory *gTeamInventoryRef;
-
-
 // NOTE: MenuItems and WindowTemplate defined in here..
 #include "data/friend_rescue_menus.h"