From 5cc54f5c96d760d27ccea1b65e8a30b61955f824 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Sun, 24 Dec 2023 17:19:59 -0500 Subject: [PATCH] fix cotton down overwriting gBattlerAttacker (#3783) Co-authored-by: ghoulslash Co-authored-by: Bassoonian --- data/battle_scripts_1.s | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 2202adb2e8..bffc79a303 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8016,6 +8016,7 @@ BattleScript_IllusionOff:: return BattleScript_CottonDownActivates:: + copybyte sSAVED_BATTLER, gBattlerAttacker showabilitypopup BS_TARGET pause B_WAIT_TIME_LONG destroyabilitypopup @@ -8040,6 +8041,7 @@ BattleScript_CottonDownLoopIncrement: jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_CottonDownLoop BattleScript_CottonDownReturn: swapattackerwithtarget + copybyte gBattlerAttacker, sSAVED_BATTLER return BattleScript_AnticipationActivates::