mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-03-20 04:28:33 +01:00
IS_BATTLER_OF_TYPE
This commit is contained in:
parent
866d916f2f
commit
99fbad92e2
@ -446,9 +446,7 @@ static bool8 ShouldSwitch(void)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
if (ABILITY_ON_FIELD2(ABILITY_MAGNET_PULL))
|
if (ABILITY_ON_FIELD2(ABILITY_MAGNET_PULL))
|
||||||
{
|
{
|
||||||
if (gBattleMons[gActiveBattler].type1 == TYPE_STEEL)
|
if (IS_BATTLER_OF_TYPE(gActiveBattler, TYPE_STEEL))
|
||||||
return FALSE;
|
|
||||||
if (gBattleMons[gActiveBattler].type2 == TYPE_STEEL)
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
|
if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user