Merge several EWRAM definitions into gBattleStruct

1 files changed, 2 insertions, 2 deletions

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index a98a0eae0..270151d17 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -12806,7 +12806,7 @@ static void atkD2_tryswapitems(void)
         else {
             u16 oldItemAtk, *newItemAtk;
 
-            newItemAtk = (u16 *)(ewram160F0 + 2 * gBattlerAttacker);
+            newItemAtk = (u16 *)(gBattleStruct->changedItems + gBattlerAttacker);
             oldItemAtk = gBattleMons[gBattlerAttacker].item;
             *newItemAtk = gBattleMons[gBattlerTarget].item;
 
@@ -13094,7 +13094,7 @@ static void atkE1_trygetintimidatetarget(void)
 {
     u8 side;
 
-    gBattleStruct->scriptingActive = ewram160DD;
+    gBattleStruct->scriptingActive = gBattleStruct->intimidateBank;
     side = GetBattlerSide(gBattleStruct->scriptingActive);
     gBattleTextBuff1[0] = 0xFD;
     gBattleTextBuff1[1] = 9;