1 files changed, 12 insertions, 12 deletions
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c
index f5c679876..5c91b3657 100644
--- a/src/battle/calculate_base_damage.c
+++ b/src/battle/calculate_base_damage.c
@@ -1,18 +1,18 @@
 #include "global.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "battle.h"
 #include "berry.h"
 #include "data2.h"
 #include "event_data.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "pokemon.h"
-#include "species.h"
-#include "moves.h"
-#include "battle_move_effects.h"
+#include "constants/species.h"
+#include "constants/moves.h"
+#include "constants/battle_move_effects.h"
+#include "ewram.h"
 
-extern u32 dword_2017100[];
 extern u16 gBattleTypeFlags;
 extern struct BattlePokemon gBattleMons[4];
 extern u16 gCurrentMove;
@@ -90,7 +90,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             && gTrainerBattleOpponent != 1024
-            && FlagGet(BADGE01_GET)
+            && FlagGet(FLAG_BADGE01_GET)
             && !GetBankSide(bankAtk))
             attack = (110 * attack) / 100;
     }
@@ -98,7 +98,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             && gTrainerBattleOpponent != 1024
-            && FlagGet(BADGE05_GET)
+            && FlagGet(FLAG_BADGE05_GET)
             && !GetBankSide(bankDef))
             defense = (110 * defense) / 100;
     }
@@ -106,7 +106,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             && gTrainerBattleOpponent != 1024
-            && FlagGet(BADGE07_GET)
+            && FlagGet(FLAG_BADGE07_GET)
             && !GetBankSide(bankAtk))
             spAttack = (110 * spAttack) / 100;
     }
@@ -114,7 +114,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             && gTrainerBattleOpponent != 1024
-            && FlagGet(BADGE07_GET)
+            && FlagGet(FLAG_BADGE07_GET)
             && !GetBankSide(bankDef))
             spDefense = (110 * spDefense) / 100;
     }
@@ -301,7 +301,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
         }
 
         // flash fire triggered
-        if ((dword_2017100[bankAtk] & 1) && type == TYPE_FIRE)
+        if ((eFlashFireArr.arr[bankAtk] & 1) && type == TYPE_FIRE)
             damage = (15 * damage) / 10;
     }