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

IsMoveAffectedByParentalBond supports dynamic move targeting

Browse Source 
Update IsMoveAffectedByParentalBond to properly handle Expanding Force.
This commit is contained in:
BuffelSaft 2022-05-07 14:37:02 +12:00
parent 57003c62fd
commit 3e645b1839
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_script_commands.c
View File

@ -14477,7 +14477,7 @@ bool8 IsMoveAffectedByParentalBond(u16 move, u8 battlerId)
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
switch (gBattleMoves[move].target)
switch (GetBattlerMoveTargetType(battlerId, move))
{
case MOVE_TARGET_BOTH:
if (CountAliveMonsInBattle(BATTLE_ALIVE_DEF_SIDE) >= 2) // Check for single target
@ -14487,12 +14487,12 @@ bool8 IsMoveAffectedByParentalBond(u16 move, u8 battlerId)
if (CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) >= 2) // Count mons on both sides; ignore attacker
return FALSE;
break;
default:
break;
}
}
return TRUE;
}
return FALSE;
}