From 31138455ded2fd6d711777b4ee19cadd5245e1b2 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 22 Feb 2023 09:28:12 +0100
Subject: [PATCH] remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS

---
 asm/macros/battle_script.inc               |  5 -----
 data/battle_scripts_1.s                    |  1 -
 include/constants/battle_script_commands.h |  7 +++----
 src/battle_script_commands.c               | 16 ----------------
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 7c94f06ff..03a4d6222 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -2049,11 +2049,6 @@
 	various \battler, VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES
 	.endm
 
-	.macro jumpifnovalidtargets jumpInstr:req
-	various BS_ATTACKER, VARIOUS_JUMP_IF_NO_VALID_TARGETS
-	.4byte \jumpInstr
-	.endm
-
 @ helpful macros
 	.macro setstatchanger stat:req, stages:req, down:req
 	setbyte sSTATCHANGER, \stat | \stages << 3 | \down << 7
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 239d22109..036d662e8 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -8573,7 +8573,6 @@ BattleScript_TryAdrenalineOrbRet:
 	return
 
 BattleScript_IntimidateActivates::
-	jumpifnovalidtargets BattleScript_IntimidateEnd
 	showabilitypopup BS_ATTACKER
 	pause B_WAIT_TIME_LONG
 	destroyabilitypopup
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 0b71c22db..9699a2921 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -255,10 +255,9 @@
 #define VARIOUS_TRY_WIND_RIDER_POWER                163
 #define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES   164
 #define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES   165
-#define VARIOUS_JUMP_IF_NO_VALID_TARGETS            166
-#define VARIOUS_JUMP_IF_EMERGENCY_EXITED            167
-#define VARIOUS_STORE_HEALING_WISH                  168
-#define VARIOUS_HIT_SWITCH_TARGET_FAILED            169
+#define VARIOUS_JUMP_IF_EMERGENCY_EXITED            166
+#define VARIOUS_STORE_HEALING_WISH                  167
+#define VARIOUS_HIT_SWITCH_TARGET_FAILED            168
 
 // Cmd_manipulatedamage
 #define DMG_CHANGE_SIGN            0
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 344c5091b..e0f0116ff 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -11068,22 +11068,6 @@ static void Cmd_various(void)
         AbilityBattleEffects(ABILITYEFFECT_ON_TERRAIN, gActiveBattler, 0, 0, 0);
         return;
     }
-    case VARIOUS_JUMP_IF_NO_VALID_TARGETS:
-    {
-        VARIOUS_ARGS(const u8 *jumpInstr);
-        u32 count = 0;
-
-        for (i = 0; i < gBattlersCount; i++)
-        {
-            if (GetBattlerSide(i) != GetBattlerSide(gBattlerAttacker) && IsBattlerAlive(i))
-                count++;
-        }
-        if (count == 0)
-            gBattlescriptCurrInstr = cmd->jumpInstr;
-        else
-            gBattlescriptCurrInstr = cmd->nextInstr;
-        return;
-    }
     case VARIOUS_JUMP_IF_EMERGENCY_EXITED:
     {
         VARIOUS_ARGS(const u8 *jumpInstr);