baton pass status4_xx_sport
This commit is contained in:
parent
5c52abd856
commit
95ad508868
1 changed files with 2 additions and 3 deletions
|
@ -2975,7 +2975,7 @@ void SwitchInClearSetData(void)
|
||||||
gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BATTLER | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED
|
gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BATTLER | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED
|
||||||
| STATUS3_GASTRO_ACID | STATUS3_EMBARGO | STATUS3_TELEKINESIS | STATUS3_MAGNET_RISE | STATUS3_HEAL_BLOCK
|
| STATUS3_GASTRO_ACID | STATUS3_EMBARGO | STATUS3_TELEKINESIS | STATUS3_MAGNET_RISE | STATUS3_HEAL_BLOCK
|
||||||
| STATUS3_AQUA_RING | STATUS3_POWER_TRICK);
|
| STATUS3_AQUA_RING | STATUS3_POWER_TRICK);
|
||||||
|
gStatuses4[gActiveBattler] &= (STATUS4_MUD_SPORT | STATUS4_WATER_SPORT);
|
||||||
for (i = 0; i < gBattlersCount; i++)
|
for (i = 0; i < gBattlersCount; i++)
|
||||||
{
|
{
|
||||||
if (GetBattlerSide(gActiveBattler) != GetBattlerSide(i)
|
if (GetBattlerSide(gActiveBattler) != GetBattlerSide(i)
|
||||||
|
@ -2993,10 +2993,9 @@ void SwitchInClearSetData(void)
|
||||||
{
|
{
|
||||||
gBattleMons[gActiveBattler].status2 = 0;
|
gBattleMons[gActiveBattler].status2 = 0;
|
||||||
gStatuses3[gActiveBattler] = 0;
|
gStatuses3[gActiveBattler] = 0;
|
||||||
|
gStatuses4[gActiveBattler] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
gStatuses4[gActiveBattler] = 0;
|
|
||||||
|
|
||||||
for (i = 0; i < gBattlersCount; i++)
|
for (i = 0; i < gBattlersCount; i++)
|
||||||
{
|
{
|
||||||
if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBattler))
|
if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBattler))
|
||||||
|
|
Loading…
Reference in a new issue