ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-07 20:50:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightning rod no longer redirects mold braker

Browse Source
This commit is contained in:
DizzyEggg 2020-07-02 11:58:48 +02:00
parent 08a5ba0db2
commit 52c63cd671
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_main.c
View File

@ -5174,8 +5174,8 @@ static void HandleAction_UseMove(void)
{ {
if (side != GetBattlerSide(gActiveBattler) if (side != GetBattlerSide(gActiveBattler)
&& *(gBattleStruct->moveTarget + gBattlerAttacker) != gActiveBattler && *(gBattleStruct->moveTarget + gBattlerAttacker) != gActiveBattler
&& ((gBattleMons[gActiveBattler].ability == ABILITY_LIGHTNING_ROD && moveType == TYPE_ELECTRIC) && ((GetBattlerAbility(gActiveBattler) == ABILITY_LIGHTNING_ROD && moveType == TYPE_ELECTRIC)
|| (gBattleMons[gActiveBattler].ability == ABILITY_STORM_DRAIN && moveType == TYPE_WATER) || (GetBattlerAbility(gActiveBattler) == ABILITY_STORM_DRAIN && moveType == TYPE_WATER)
) )
&& GetBattlerTurnOrderNum(gActiveBattler) < var) && GetBattlerTurnOrderNum(gActiveBattler) < var)
{ {