diff --git a/include/battle.h b/include/battle.h index 89a38254a5..09a53c8a0b 100644 --- a/include/battle.h +++ b/include/battle.h @@ -3,9 +3,9 @@ // should they be included here or included individually by every file? #include "constants/battle.h" +#include "battle_main.h" #include "battle_util.h" #include "battle_script_commands.h" -#include "battle_main.h" #include "battle_ai_switch_items.h" #include "battle_gfx_sfx_util.h" #include "battle_util2.h" diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 9dfbd07233..5426cc7740 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -9,7 +9,6 @@ #include "util.h" #include "constants/items.h" -extern const u8 gTypeEffectiveness[]; extern const u8 * const gItemEffectTable[]; // todo: fix once struct is declared // this file's functions