mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-16 00:22:10 +01:00
Sky Drop check in IsBattlerTrapped
This commit is contained in:
parent
343e685537
commit
76f5926743
@ -617,7 +617,7 @@ bool32 IsBattlerTrapped(u8 battler, bool8 checkSwitch)
|
|||||||
{
|
{
|
||||||
if (gBattleMons[battler].status2 & (STATUS2_ESCAPE_PREVENTION | STATUS2_WRAPPED)
|
if (gBattleMons[battler].status2 & (STATUS2_ESCAPE_PREVENTION | STATUS2_WRAPPED)
|
||||||
|| IsAbilityPreventingEscape(battler)
|
|| IsAbilityPreventingEscape(battler)
|
||||||
|| gStatuses3[battler] & (STATUS3_ROOTED) // TODO: sky drop target in air
|
|| gStatuses3[battler] & (STATUS3_ROOTED | STATUS3_SKY_DROPPED)
|
||||||
|| (gFieldStatuses & STATUS_FIELD_FAIRY_LOCK))
|
|| (gFieldStatuses & STATUS_FIELD_FAIRY_LOCK))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user