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

Implemented Stalwart

Browse source
This commit is contained in:
LOuroboros 2020-12-05 14:14:26 -03:00
parent 6a0fee9c56
commit c83c67ff8e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/battle_util.c
View file

@ -141,7 +141,8 @@ void HandleAction_UseMove(void)
&& 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) && (GetBattlerAbility(gBattlerAttacker) != ABILITY_PROPELLER_TAIL
|| GetBattlerAbility(gBattlerAttacker) != ABILITY_STALWART))
{ {
gBattlerTarget = gSideTimers[side].followmeTarget; gBattlerTarget = gSideTimers[side].followmeTarget;
} }
@ -161,7 +162,8 @@ void HandleAction_UseMove(void)
&& ((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) && (GetBattlerAbility(gBattlerAttacker) != ABILITY_PROPELLER_TAIL
|| GetBattlerAbility(gBattlerAttacker) != ABILITY_STALWART))
{ {
var = GetBattlerTurnOrderNum(gActiveBattler); var = GetBattlerTurnOrderNum(gActiveBattler);
} }