mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-15 16:12:12 +01:00
Merge pull request #2203 from AsparagusEduardo/BE_ghostEscapeAiFix
Ghost Escape config AI fix
This commit is contained in:
commit
2fc15ab779
@ -606,7 +606,7 @@ bool32 AtMaxHp(u8 battlerId)
|
||||
bool32 IsBattlerTrapped(u8 battler, bool8 checkSwitch)
|
||||
{
|
||||
u8 holdEffect = AI_DATA->holdEffects[battler];
|
||||
if (IS_BATTLER_OF_TYPE(battler, TYPE_GHOST)
|
||||
if ((B_GHOSTS_ESCAPE >= GEN_6 && IS_BATTLER_OF_TYPE(battler, TYPE_GHOST))
|
||||
|| (checkSwitch && holdEffect == HOLD_EFFECT_SHED_SHELL)
|
||||
|| (!checkSwitch && GetBattlerAbility(battler) == ABILITY_RUN_AWAY)
|
||||
|| (!checkSwitch && holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN))
|
||||
|
Loading…
x
Reference in New Issue
Block a user