From a165f9926d430ab7866d5faebcdc09a87a5257b6 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Sun, 23 Jan 2022 13:46:30 -0500
Subject: [PATCH] canbestatused for psycho shift

---
 src/battle_script_commands.c | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 478dba5d2..43280a729 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -8661,19 +8661,13 @@ static void Cmd_various(void)
         i = TRUE;
         if (gBattleMons[gBattlerAttacker].status1 & STATUS1_PARALYSIS)
         {
-            if (targetAbility == ABILITY_LIMBER)
+            if (!(CanBeParalyzed(gBattlerTarget)))
             {
                 gBattlerAbility = gBattlerTarget;
                 BattleScriptPush(T1_READ_PTR(gBattlescriptCurrInstr + 3));
                 gBattlescriptCurrInstr = BattleScript_PRLZPrevention;
                 i = FALSE;
             }
-            else if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_ELECTRIC))
-            {
-                BattleScriptPush(T1_READ_PTR(gBattlescriptCurrInstr + 3));
-                gBattlescriptCurrInstr = BattleScript_PRLZPrevention;
-                i = FALSE;
-            }
             else
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = 3;
@@ -8681,19 +8675,13 @@ static void Cmd_various(void)
         }
         else if (gBattleMons[gBattlerAttacker].status1 & STATUS1_PSN_ANY)
         {
-            if (targetAbility == ABILITY_IMMUNITY)
+            if (!CanBePoisoned(gBattlerTarget, targetAbility))
             {
                 gBattlerAbility = gBattlerTarget;
                 BattleScriptPush(T1_READ_PTR(gBattlescriptCurrInstr + 3));
                 gBattlescriptCurrInstr = BattleScript_PSNPrevention;
                 i = FALSE;
             }
-            else if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_POISON) || IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_STEEL))
-            {
-                BattleScriptPush(T1_READ_PTR(gBattlescriptCurrInstr + 3));
-                gBattlescriptCurrInstr = BattleScript_PSNPrevention;
-                i = FALSE;
-            }
             else
             {
                 if (gBattleMons[gBattlerAttacker].status1 & STATUS1_POISON)
@@ -8704,20 +8692,13 @@ static void Cmd_various(void)
         }
         else if (gBattleMons[gBattlerAttacker].status1 & STATUS1_BURN)
         {
-            if (targetAbility == ABILITY_WATER_VEIL
-             || targetAbility == ABILITY_WATER_BUBBLE)
+            if (!CanBeBurned(gBattlerTarget))
             {
                 gBattlerAbility = gBattlerTarget;
                 BattleScriptPush(T1_READ_PTR(gBattlescriptCurrInstr + 3));
                 gBattlescriptCurrInstr = BattleScript_BRNPrevention;
                 i = FALSE;
             }
-            else if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_FIRE))
-            {
-                BattleScriptPush(T1_READ_PTR(gBattlescriptCurrInstr + 3));
-                gBattlescriptCurrInstr = BattleScript_BRNPrevention;
-                i = FALSE;
-            }
             else
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
@@ -8725,7 +8706,7 @@ static void Cmd_various(void)
         }
         else if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP)
         {
-            if (targetAbility == ABILITY_INSOMNIA || targetAbility == ABILITY_VITAL_SPIRIT)
+            if (!CanSleep(gBattlerTarget))
             {
                 gBattlerAbility = gBattlerTarget;
                 // BattleScriptPush(T1_READ_PTR(gBattlescriptCurrInstr + 3));