diff --git a/src/code_8066D04.c b/src/code_8066D04.c index 30c4ea857..b70ae2035 100644 --- a/src/code_8066D04.c +++ b/src/code_8066D04.c @@ -12,7 +12,6 @@ #include "code_8077274_1.h" #include "code_807CD9C.h" #include "code_8084778.h" -#include "dungeon_logic.h" #include "run_dungeon.h" #include "dungeon_items.h" #include "dungeon_leader.h" diff --git a/src/code_8069E0C.c b/src/code_8069E0C.c index f7891b70a..89e9395fa 100644 --- a/src/code_8069E0C.c +++ b/src/code_8069E0C.c @@ -21,7 +21,6 @@ #include "dungeon_map_access.h" #include "dungeon_misc.h" #include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_message.h" #include "dungeon_util.h" diff --git a/src/code_806CD90.c b/src/code_806CD90.c index 482a921b1..4db335dab 100644 --- a/src/code_806CD90.c +++ b/src/code_806CD90.c @@ -13,7 +13,6 @@ #include "code_804267C.h" #include "code_805D8C8.h" #include "code_806CD90.h" -#include "dungeon_logic.h" #include "dungeon_config.h" #include "dungeon_items.h" #include "dungeon_map_access.h" diff --git a/src/code_80718D8.c b/src/code_80718D8.c index 2d6480dba..8955961fa 100644 --- a/src/code_80718D8.c +++ b/src/code_80718D8.c @@ -2,7 +2,6 @@ #include "globaldata.h" #include "constants/tactic.h" #include "dungeon_config.h" -#include "dungeon_logic.h" #include "dungeon_leader.h" #include "dungeon_message.h" #include "code_8041AD0.h" diff --git a/src/code_8073CF0.c b/src/code_8073CF0.c index 98068ecc8..9acd21354 100644 --- a/src/code_8073CF0.c +++ b/src/code_8073CF0.c @@ -4,7 +4,6 @@ #include "items.h" #include "status.h" #include "weather.h" -#include "dungeon_logic.h" #include "structs/dungeon_entity.h" #include "structs/map.h" #include "structs/str_moves.h" @@ -13,7 +12,6 @@ #include "dungeon_map_access.h" #include "code_803E46C.h" #include "code_806CD90.h" -#include "dungeon_logic.h" #include "game_options.h" #include "dungeon_items.h" #include "moves.h" diff --git a/src/code_8077274_1.c b/src/code_8077274_1.c index d002c9931..94d2cd4b0 100644 --- a/src/code_8077274_1.c +++ b/src/code_8077274_1.c @@ -12,8 +12,6 @@ #include "constants/status.h" #include "constants/type.h" #include "dungeon_items.h" -#include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_util.h" #include "move_effects_target.h" diff --git a/src/dungeon_8067A80.c b/src/dungeon_8067A80.c index 54c6bfaf3..3bc816fa5 100644 --- a/src/dungeon_8067A80.c +++ b/src/dungeon_8067A80.c @@ -12,7 +12,6 @@ #include "code_8077274_1.h" #include "code_807CD9C.h" #include "code_8084778.h" -#include "dungeon_logic.h" #include "run_dungeon.h" #include "dungeon_items.h" #include "dungeon_leader.h" diff --git a/src/dungeon_8071B48.c b/src/dungeon_8071B48.c index f33fd01ab..490c20dd0 100644 --- a/src/dungeon_8071B48.c +++ b/src/dungeon_8071B48.c @@ -2,7 +2,6 @@ #include "globaldata.h" #include "constants/tactic.h" #include "dungeon_config.h" -#include "dungeon_logic.h" #include "dungeon_leader.h" #include "dungeon_message.h" #include "code_8041AD0.h" diff --git a/src/dungeon_8072CF4.c b/src/dungeon_8072CF4.c index 2e55e0b54..80363700b 100644 --- a/src/dungeon_8072CF4.c +++ b/src/dungeon_8072CF4.c @@ -19,8 +19,6 @@ #include "dungeon_logic.h" #include "dungeon_items.h" #include "dungeon_leader.h" -#include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_util.h" #include "move_util.h" diff --git a/src/dungeon_ai.c b/src/dungeon_ai.c index 0c6838e1d..7ef3cf44c 100644 --- a/src/dungeon_ai.c +++ b/src/dungeon_ai.c @@ -18,7 +18,6 @@ #include "dungeon_ai_attack.h" #include "dungeon_ai_items.h" #include "dungeon_ai_movement.h" -#include "dungeon_logic.h" #include "dungeon_items.h" #include "dungeon_leader.h" #include "dungeon_map_access.h" diff --git a/src/dungeon_ai_attack.c b/src/dungeon_ai_attack.c index 77ee2dcd4..c41ca3859 100644 --- a/src/dungeon_ai_attack.c +++ b/src/dungeon_ai_attack.c @@ -13,7 +13,6 @@ #include "constants/targeting.h" #include "constants/type.h" #include "dungeon_action.h" -#include "dungeon_logic.h" #include "dungeon_ai.h" #include "dungeon_config.h" #include "run_dungeon.h" diff --git a/src/dungeon_ai_item_weight.c b/src/dungeon_ai_item_weight.c index f87412f90..edfa6a92c 100644 --- a/src/dungeon_ai_item_weight.c +++ b/src/dungeon_ai_item_weight.c @@ -3,7 +3,6 @@ #include "dungeon_ai_item_weight.h" #include "constants/status.h" #include "constants/targeting.h" -#include "dungeon_logic.h" #include "dungeon_map_access.h" #include "dungeon_logic.h" #include "dungeon_util.h" diff --git a/src/dungeon_ai_items.c b/src/dungeon_ai_items.c index a8fef26ec..7ebcefafd 100644 --- a/src/dungeon_ai_items.c +++ b/src/dungeon_ai_items.c @@ -9,7 +9,6 @@ #include "dungeon_ai_attack.h" #include "dungeon_ai_item_weight.h" #include "dungeon_ai_items.h" -#include "dungeon_logic.h" #include "structs/dungeon_entity.h" #include "structs/str_dungeon.h" #include "dungeon_map_access.h" diff --git a/src/dungeon_ai_movement.c b/src/dungeon_ai_movement.c index 06c39dc1f..edc07dca0 100644 --- a/src/dungeon_ai_movement.c +++ b/src/dungeon_ai_movement.c @@ -12,8 +12,6 @@ #include "dungeon_logic.h" #include "structs/str_dungeon.h" #include "dungeon_map_access.h" -#include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_range.h" #include "dungeon_util.h" diff --git a/src/dungeon_engine.c b/src/dungeon_engine.c index e7075b19e..69498e5af 100644 --- a/src/dungeon_engine.c +++ b/src/dungeon_engine.c @@ -6,7 +6,6 @@ #include "dungeon_ai_leader.h" #include "dungeon_ai.h" #include "dungeon_leader.h" -#include "dungeon_logic.h" #include "dungeon_util.h" #include "structs/dungeon_entity.h" #include "structs/str_dungeon.h" diff --git a/src/dungeon_item_action.c b/src/dungeon_item_action.c index 3e5330a50..6037e86d1 100644 --- a/src/dungeon_item_action.c +++ b/src/dungeon_item_action.c @@ -14,7 +14,6 @@ #include "dungeon_action.h" #include "dungeon_items.h" #include "dungeon_music.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_util.h" #include "move_effects_target.h" diff --git a/src/dungeon_kecleon_shop.c b/src/dungeon_kecleon_shop.c index f92c52df9..b4d1e5927 100644 --- a/src/dungeon_kecleon_shop.c +++ b/src/dungeon_kecleon_shop.c @@ -13,10 +13,7 @@ #include "dungeon_message.h" #include "dungeon_logic.h" #include "string_format.h" -#include "dungeon_logic.h" #include "dungeon_map_access.h" -#include "dungeon_logic.h" -#include "dungeon_logic.h" #include "position_util.h" #include "dungeon_ai.h" #include "code_806CD90.h" diff --git a/src/dungeon_logic.c b/src/dungeon_logic.c index 2a5694638..25cf204b6 100644 --- a/src/dungeon_logic.c +++ b/src/dungeon_logic.c @@ -11,7 +11,6 @@ #include "dungeon_items.h" #include "structs/str_dungeon.h" #include "dungeon_map_access.h" -#include "dungeon_logic.h" #include "dungeon_util.h" #include "pokemon.h" #include "weather.h" diff --git a/src/dungeon_main.c b/src/dungeon_main.c index f32d5d3ee..b21dc9381 100644 --- a/src/dungeon_main.c +++ b/src/dungeon_main.c @@ -36,9 +36,7 @@ #include "dungeon_message.h" #include "dungeon_message_log.h" #include "dungeon_misc.h" -#include "dungeon_logic.h" #include "dungeon_music.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_util.h" #include "game_options.h" diff --git a/src/dungeon_map_access.c b/src/dungeon_map_access.c index 4519c8fa5..1dfa0ecb0 100644 --- a/src/dungeon_map_access.c +++ b/src/dungeon_map_access.c @@ -8,7 +8,6 @@ #include "code_8009804.h" #include "decompress_at.h" #include "def_filearchives.h" -#include "run_dungeon.h" #include "dungeon_leader.h" #include "dungeon_map.h" #include "dungeon_logic.h" diff --git a/src/dungeon_menu_items.c b/src/dungeon_menu_items.c index 7137029fa..9c88939b4 100644 --- a/src/dungeon_menu_items.c +++ b/src/dungeon_menu_items.c @@ -26,7 +26,6 @@ #include "text_1.h" #include "code_8044CC8.h" #include "code_801B3C0.h" -#include "dungeon_logic.h" extern void PlayDungeonCancelSE(void); extern void PlayDungeonConfirmationSE(void); diff --git a/src/dungeon_menu_moves.c b/src/dungeon_menu_moves.c index 874cb4d2d..383d6331f 100644 --- a/src/dungeon_menu_moves.c +++ b/src/dungeon_menu_moves.c @@ -27,7 +27,6 @@ #include "text_1.h" #include "text_2.h" #include "text_3.h" -#include "dungeon_logic.h" extern void PlayDungeonCancelSE(void); extern void PlayDungeonConfirmationSE(void); diff --git a/src/dungeon_menu_team.c b/src/dungeon_menu_team.c index 5cfeff2cb..f32bb7e89 100644 --- a/src/dungeon_menu_team.c +++ b/src/dungeon_menu_team.c @@ -25,7 +25,6 @@ #include "dungeon_misc.h" #include "dungeon_logic.h" #include "dungeon_music.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_submenu.h" #include "dungeon_util.h" @@ -42,7 +41,6 @@ #include "string_format.h" #include "text_2.h" #include "weather.h" -#include "dungeon_logic.h" extern bool8 sub_8048A68(Entity *param_1,Item *item); extern bool8 sub_8048950(Entity *param_1,Item *item); diff --git a/src/dungeon_misc.c b/src/dungeon_misc.c index 4129df4f0..f1a141221 100644 --- a/src/dungeon_misc.c +++ b/src/dungeon_misc.c @@ -29,8 +29,6 @@ #include "constants/weather.h" #include "code_806CD90.h" #include "code_8077274_1.h" -#include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_util.h" #include "exclusive_pokemon.h" #include "dungeon_config.h" diff --git a/src/dungeon_move.c b/src/dungeon_move.c index 328789f38..b59185341 100644 --- a/src/dungeon_move.c +++ b/src/dungeon_move.c @@ -26,7 +26,6 @@ #include "dungeon_map_access.h" #include "dungeon_message.h" #include "dungeon_misc.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_strings.h" #include "dungeon_util.h" diff --git a/src/dungeon_move_util.c b/src/dungeon_move_util.c index 0f79023f8..b9f104eb5 100644 --- a/src/dungeon_move_util.c +++ b/src/dungeon_move_util.c @@ -26,7 +26,6 @@ #include "dungeon_message.h" #include "dungeon_misc.h" #include "dungeon_move.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_strings.h" #include "dungeon_util.h" diff --git a/src/dungeon_util.c b/src/dungeon_util.c index 9a9147779..e54d23143 100644 --- a/src/dungeon_util.c +++ b/src/dungeon_util.c @@ -23,7 +23,6 @@ #include "dungeon_message.h" #include "dungeon_music.h" #include "dungeon_map.h" -#include "dungeon_logic.h" #include "string_format.h" #include "items.h" #include "trap.h" diff --git a/src/move_checks.c b/src/move_checks.c index 6c2ac79cb..0b395bc22 100644 --- a/src/move_checks.c +++ b/src/move_checks.c @@ -19,7 +19,6 @@ #include "trap.h" #include "weather.h" #include "dungeon_config.h" -#include "dungeon_logic.h" bool8 CanUseOnSelfWithStatusChecker(Entity *pokemon, Move *move) { diff --git a/src/move_orb_actions_1.c b/src/move_orb_actions_1.c index ef4274958..e27fac8ed 100644 --- a/src/move_orb_actions_1.c +++ b/src/move_orb_actions_1.c @@ -16,8 +16,6 @@ #include "dungeon_items.h" #include "dungeon_map_access.h" #include "dungeon_message.h" -#include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_util.h" #include "dungeon_move.h" diff --git a/src/move_orb_actions_2.c b/src/move_orb_actions_2.c index f6f310b4a..a4136ffd0 100644 --- a/src/move_orb_actions_2.c +++ b/src/move_orb_actions_2.c @@ -16,8 +16,6 @@ #include "dungeon_items.h" #include "dungeon_map_access.h" #include "dungeon_message.h" -#include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_util.h" #include "dungeon_move.h" diff --git a/src/move_orb_actions_3.c b/src/move_orb_actions_3.c index 6d7f26eca..c70bfbb75 100644 --- a/src/move_orb_actions_3.c +++ b/src/move_orb_actions_3.c @@ -20,9 +20,7 @@ #include "dungeon_message.h" #include "dungeon_misc.h" #include "dungeon_move.h" -#include "dungeon_logic.h" #include "dungeon_move_util.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_strings.h" #include "dungeon_util.h" diff --git a/src/move_orb_actions_4.c b/src/move_orb_actions_4.c index 0d519ac82..8c15430f5 100644 --- a/src/move_orb_actions_4.c +++ b/src/move_orb_actions_4.c @@ -19,7 +19,6 @@ #include "dungeon_items.h" #include "dungeon_map_access.h" #include "dungeon_misc.h" -#include "dungeon_logic.h" #include "dungeon_util.h" #include "move_util.h" #include "moves.h" diff --git a/src/move_orb_effects_2.c b/src/move_orb_effects_2.c index a8e5c4f54..0e2d836e0 100644 --- a/src/move_orb_effects_2.c +++ b/src/move_orb_effects_2.c @@ -13,8 +13,6 @@ #include "dungeon_items.h" #include "dungeon_map_access.h" #include "dungeon_message.h" -#include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_util.h" #include "math.h" #include "move_effects_target.h" diff --git a/src/move_orb_effects_3.c b/src/move_orb_effects_3.c index c452d64a7..95f0be70c 100644 --- a/src/move_orb_effects_3.c +++ b/src/move_orb_effects_3.c @@ -13,7 +13,6 @@ #include "constants/type.h" #include "dungeon_items.h" #include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_util.h" #include "move_effects_target.h" @@ -27,7 +26,6 @@ #include "dungeon_map_access.h" #include "structs/str_806B7F8.h" #include "dungeon_config.h" -#include "dungeon_logic.h" #include "dungeon_strings.h" extern void sub_8041BD0(Entity *r0, u8 r1); diff --git a/src/move_orb_effects_4.c b/src/move_orb_effects_4.c index 2a1762fff..41ac68895 100644 --- a/src/move_orb_effects_4.c +++ b/src/move_orb_effects_4.c @@ -13,7 +13,6 @@ #include "constants/type.h" #include "dungeon_items.h" #include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_util.h" #include "move_effects_target.h" @@ -27,7 +26,6 @@ #include "dungeon_map_access.h" #include "structs/str_806B7F8.h" #include "dungeon_config.h" -#include "dungeon_logic.h" #include "dungeon_strings.h" extern void ShowWholeRevealedDungeonMap(); diff --git a/src/move_orb_effects_5.c b/src/move_orb_effects_5.c index a52f9aafe..6643ff8e8 100644 --- a/src/move_orb_effects_5.c +++ b/src/move_orb_effects_5.c @@ -12,8 +12,6 @@ #include "constants/status.h" #include "constants/type.h" #include "dungeon_items.h" -#include "dungeon_logic.h" -#include "dungeon_logic.h" #include "dungeon_random.h" #include "dungeon_util.h" #include "move_effects_target.h" diff --git a/src/run_dungeon.c b/src/run_dungeon.c index dbbd7355b..e8ae65257 100644 --- a/src/run_dungeon.c +++ b/src/run_dungeon.c @@ -25,7 +25,6 @@ #include "dungeon.h" #include "dungeon_ai.h" #include "dungeon_config.h" -#include "run_dungeon.h" #include "dungeon_engine.h" #include "dungeon_generation.h" #include "dungeon_items.h" diff --git a/src/weather.c b/src/weather.c index 35049a51c..1e666aedd 100644 --- a/src/weather.c +++ b/src/weather.c @@ -15,12 +15,9 @@ #include "pokemon.h" #include "structs/map.h" #include "dungeon_message.h" -#include "dungeon_logic.h" #include "string_format.h" #include "dungeon_logic.h" #include "dungeon_map_access.h" -#include "dungeon_logic.h" -#include "dungeon_logic.h" #include "position_util.h" #include "dungeon_ai.h" #include "code_806CD90.h"