ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-29 13:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Follow Me/Rage Powder effect on target goes away once affected by Sky Drop

Browse Source
This commit is contained in:
W1serV1ser 2022-01-04 12:33:31 -08:00
parent e0f7e7a2d9
commit 66faa6aa15
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_script_commands.c
View File

@ -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.