From 9e8913c69831190cb7decc9d47f7240fd57390e4 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 2 Dec 2020 23:23:34 -0300 Subject: [PATCH] Implemented Propeller Tail --- src/battle_util.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index cb22de62e1..62dc7977fb 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -140,7 +140,8 @@ void HandleAction_UseMove(void) if (gSideTimers[side].followmeTimer != 0 && gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gSideTimers[side].followmeTarget) - && gBattleMons[gSideTimers[side].followmeTarget].hp != 0) + && gBattleMons[gSideTimers[side].followmeTarget].hp != 0 + && GetBattlerAbility(gBattlerAttacker) != ABILITY_PROPELLER_TAIL) { gBattlerTarget = gSideTimers[side].followmeTarget; } @@ -158,9 +159,9 @@ void HandleAction_UseMove(void) if (side != GetBattlerSide(gActiveBattler) && *(gBattleStruct->moveTarget + gBattlerAttacker) != gActiveBattler && ((GetBattlerAbility(gActiveBattler) == ABILITY_LIGHTNING_ROD && moveType == TYPE_ELECTRIC) - || (GetBattlerAbility(gActiveBattler) == ABILITY_STORM_DRAIN && moveType == TYPE_WATER) - ) - && GetBattlerTurnOrderNum(gActiveBattler) < var) + || (GetBattlerAbility(gActiveBattler) == ABILITY_STORM_DRAIN && moveType == TYPE_WATER)) + && GetBattlerTurnOrderNum(gActiveBattler) < var + && GetBattlerAbility(gBattlerAttacker) != ABILITY_PROPELLER_TAIL) { var = GetBattlerTurnOrderNum(gActiveBattler); }