ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
&& 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);
}