From 66faa6aa1575736cfd91b4a33a0f4d92322001c9 Mon Sep 17 00:00:00 2001
From: W1serV1ser <1prefertheaircauseimanairnomad@gmail.com>
Date: Tue, 4 Jan 2022 12:33:31 -0800
Subject: [PATCH] Follow Me/Rage Powder effect on target goes away once
 affected by Sky Drop

---
 src/battle_script_commands.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index d71c93bca..748d6d982 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -9060,6 +9060,11 @@ static void Cmd_various(void)
         gBattleMons[gBattlerTarget].status2 &= ~(STATUS2_BIDE);
         gDisableStructs[gBattlerTarget].rolloutTimer = 0;
         gDisableStructs[gBattlerTarget].furyCutterCounter = 0;
+        
+        // End any Follow Me/Rage Powder effects caused by the target
+        if (gSideTimers[GetBattlerSide(gBattlerTarget)].followmeTimer != 0 && gSideTimers[GetBattlerSide(gBattlerTarget)].followmeTarget == gBattlerTarget)
+            SideTimers[GetBattlerSide(gBattlerTarget)].followmeTimer = 0;
+
         break;
     case VARIOUS_CLEAR_SKY_DROP:
         // Check to see if the initial target of this Sky Drop fainted before the 2nd turn of Sky Drop.