dont overwrite gbattlerAttacker in TryChangeBattleTerrain, update Bat…

…tleScript_ActivateTerrainAbilities loop iterator
rh-hideout · Feb 28, 2023 · 5a740c7 · 5a740c7
1 parent 86144c6
commit 5a740c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
@@ -8803,14 +8803,14 @@ BattleScript_ActivateSwitchInAbilities_Increment:
 	return
 
 BattleScript_ActivateTerrainAbilities:
-	copybyte sBATTLER, gBattlerAttacker
-	setbyte gBattlerAttacker, 0
+	savetarget
+	setbyte gBattlerTarget, 0
 BattleScript_ActivateTerrainAbilities_Loop:
 	activateterrainchangeabilities BS_ATTACKER
 BattleScript_ActivateTerrainAbilities_Increment:
-	addbyte gBattlerAttacker, 1
-	jumpifbytenotequal gBattlerAttacker, gBattlersCount, BattleScript_ActivateTerrainAbilities_Loop
-	copybyte gBattlerAttacker, sBATTLER
+	addbyte gBattlerTarget, 1
+	jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_ActivateTerrainAbilities_Loop
+	restoretarget
 	return
 
 BattleScript_ElectricSurgeActivates::

diff --git a/src/battle_util.c b/src/battle_util.c
@@ -4205,7 +4205,7 @@ static bool32 TryChangeBattleTerrain(u32 battler, u32 statusFlag, u8 *timer)
         else
             *timer = 5;
 
-        gBattlerAttacker = gBattleScripting.battler = battler;
+        gBattleScripting.battler = battler;
         return TRUE;
     }