Merge pull request #2336 from ghoulslash/be/aiswitch

fix natural cure, shed skin, early bird check in ShouldSwitchIfGameSt…
rh-hideout · Sep 19, 2022 · 6e0481e · 6e0481e
2 parents f3ac3e4 + add3625
commit 6e0481e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
@@ -312,7 +312,9 @@ static bool8 ShouldSwitchIfGameStatePrompt(void)
  switchMon = FALSE;
 
  //Checks to see if active Pokemon can do something against sleep
- if (monAbility == (ABILITY_NATURAL_CURE | ABILITY_SHED_SKIN | ABILITY_EARLY_BIRD)
+ if ((monAbility == ABILITY_NATURAL_CURE
+ || monAbility == ABILITY_SHED_SKIN
+ || monAbility == ABILITY_EARLY_BIRD)
  || holdEffect == (HOLD_EFFECT_CURE_SLP | HOLD_EFFECT_CURE_STATUS)
  || HasMove(gActiveBattler, MOVE_SLEEP_TALK)
  || (HasMoveEffect(gActiveBattler, MOVE_SNORE) && AI_GetTypeEffectiveness(MOVE_SNORE, gActiveBattler, opposingBattler) >= UQ_4_12(1.0))