diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index c03d78df75..307b902198 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -356,11 +356,8 @@
 	.4byte \param0
 	.endm
 
-	.macro jumpiftype2 bank, type, param2
+	.macro jumpiftype2
 	.byte 0x42
-	.byte \bank
-	.byte \type
-	.4byte \param2
 	.endm
 
 	.macro jumpifabilitypresent ability, param1
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 0f9b0ec819..a79ecff5d0 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1508,7 +1508,7 @@ BattleScript_EffectMinimize::
 	goto BattleScript_EffectStatUpAfterAtkCanceler
 
 BattleScript_EffectCurse::
-	jumpiftype2 BS_ATTACKER, TYPE_GHOST, BattleScript_GhostCurse
+	jumpiftype BS_ATTACKER, TYPE_GHOST, BattleScript_GhostCurse
 	attackcanceler
 	attackstring
 	ppreduce
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 8f17d488e5..b1fdcf35a5 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -502,7 +502,10 @@ static void Task_ClearBitWhenSpecialAnimDone(u8 taskId)
 // Great function to include newly added moves that don't have animation yet.
 bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn)
 {
-    return FALSE;
+    if (moveId >= (MOVES_COUNT_GEN3 - 1))
+        return TRUE;
+    else
+        return FALSE;
 }
 
 bool8 mplay_80342A4(u8 battlerId)
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 07cd56af1d..6e1c93e749 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -156,7 +156,7 @@ static void atk3E_end2(void);
 static void atk3F_end3(void);
 static void atk40_jumpifaffectedbyprotect(void);
 static void atk41_call(void);
-static void atk42_jumpiftype2(void);
+static void atk42_nop(void);
 static void atk43_jumpifabilitypresent(void);
 static void atk44_endselectionscript(void);
 static void atk45_playanimation(void);
@@ -408,7 +408,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk3F_end3,
     atk40_jumpifaffectedbyprotect,
     atk41_call,
-    atk42_jumpiftype2,
+    atk42_nop,
     atk43_jumpifabilitypresent,
     atk44_endselectionscript,
     atk45_playanimation,
@@ -4265,14 +4265,9 @@ static void atk41_call(void)
     gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
-static void atk42_jumpiftype2(void)
+static void atk42_nop(void)
 {
-    u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
-
-    if (gBattlescriptCurrInstr[2] == gBattleMons[battlerId].type1 || gBattlescriptCurrInstr[2] == gBattleMons[battlerId].type2)
-        gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3);
-    else
-        gBattlescriptCurrInstr += 7;
+    gBattlescriptCurrInstr++;
 }
 
 static void atk43_jumpifabilitypresent(void)