depreciate use of shared_syms

4 files changed, 7 insertions, 17 deletions

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 8d27750bd..4b75818b6 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -1537,7 +1537,7 @@ void sub_8010874(void)
         gUnknown_02024C5C[i] = 0xFF;
         gLockedMove[i] = 0;
         gUnknown_02024C2C[i] = 0;
-        ewram17100.arr[i] = 0;
+        eFlashFireArr.arr[i] = 0;
     }
 
     for (i = 0; i < 2; i++)
@@ -1699,7 +1699,7 @@ void SwitchInClearStructs(void)
     ewram160E8arr2(0, gActiveBank) = 0;
     ewram160E8arr2(1, gActiveBank) = 0;
 
-    ewram17100.arr[gActiveBank] = 0;
+    eFlashFireArr.arr[gActiveBank] = 0;
 
     gCurrentMove = 0;
 }
@@ -1763,7 +1763,7 @@ void UndoEffectsAfterFainting(void)
     ewram16100arr2(2, gActiveBank) = 0;
     ewram16100arr2(3, gActiveBank) = 0;
 
-    ewram17100.arr[gActiveBank] = 0;
+    eFlashFireArr.arr[gActiveBank] = 0;
 
     gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
     gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c
index 1d6784297..f37111af5 100644
--- a/src/battle/battle_3.c
+++ b/src/battle/battle_3.c
@@ -1718,14 +1718,14 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 case ABILITY_FLASH_FIRE:
                     if (moveType == TYPE_FIRE && !(gBattleMons[bank].status1 & STATUS_FREEZE))
                     {
-                        if (!(ewram17100.arr[bank] & 1))
+                        if (!(eFlashFireArr.arr[bank] & 1))
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                             if (gProtectStructs[gBankAttacker].notFirstStrike)
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost;
                             else
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
-                            ewram17100.arr[bank] |= 1;
+                            eFlashFireArr.arr[bank] |= 1;
                             effect = 2;
                         }
                         else
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 4ca1baa53..2a335ea63 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -20,16 +20,6 @@
 #include "gba/m4a_internal.h"
 #include "ewram.h"
 
-struct Struct2019348
-{
-    u8 filler0[2];
-    u16 unk2;
-    u8 filler4[4];
-    u32 unk8;
-    u32 unkC;
-    u32 unk10;
-};
-
 extern u8 gBattleBufferA[][0x200];
 extern u8 gActiveBank;
 extern u8 gNoOfAllBanks;
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c
index f5c679876..42c26dee0 100644
--- a/src/battle/calculate_base_damage.c
+++ b/src/battle/calculate_base_damage.c
@@ -11,8 +11,8 @@
 #include "species.h"
 #include "moves.h"
 #include "battle_move_effects.h"
+#include "ewram.h"
 
-extern u32 dword_2017100[];
 extern u16 gBattleTypeFlags;
 extern struct BattlePokemon gBattleMons[4];
 extern u16 gCurrentMove;
@@ -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;
     }