atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implemented Propeller Tail

Browse source
This commit is contained in:
LOuroboros 2020-12-02 23:23:34 -03:00
parent 9e1d7cc827
commit 9e8913c698
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/battle_util.c
View file

@ -140,7 +140,8 @@ void HandleAction_UseMove(void)
if (gSideTimers[side].followmeTimer != 0 if (gSideTimers[side].followmeTimer != 0
&& gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED && gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gSideTimers[side].followmeTarget) && 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; gBattlerTarget = gSideTimers[side].followmeTarget;
} }
@ -158,9 +159,9 @@ void HandleAction_UseMove(void)
if (side != GetBattlerSide(gActiveBattler) if (side != GetBattlerSide(gActiveBattler)
&& *(gBattleStruct->moveTarget + gBattlerAttacker) != gActiveBattler && *(gBattleStruct->moveTarget + gBattlerAttacker) != gActiveBattler
&& ((GetBattlerAbility(gActiveBattler) == ABILITY_LIGHTNING_ROD && moveType == TYPE_ELECTRIC) && ((GetBattlerAbility(gActiveBattler) == ABILITY_LIGHTNING_ROD && moveType == TYPE_ELECTRIC)
|| (GetBattlerAbility(gActiveBattler) == ABILITY_STORM_DRAIN && moveType == TYPE_WATER) || (GetBattlerAbility(gActiveBattler) == ABILITY_STORM_DRAIN && moveType == TYPE_WATER))
) && GetBattlerTurnOrderNum(gActiveBattler) < var
&& GetBattlerTurnOrderNum(gActiveBattler) < var) && GetBattlerAbility(gBattlerAttacker) != ABILITY_PROPELLER_TAIL)
{ {
var = GetBattlerTurnOrderNum(gActiveBattler); var = GetBattlerTurnOrderNum(gActiveBattler);
} }