diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 28ba1a5d48..3976d4375a 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -173,8 +173,8 @@
 #define VARIOUS_DESTROY_ABILITY_POPUP           102
 #define VARIOUS_TOTEM_BOOST                     103
 #define VARIOUS_TRY_ACTIVATE_GRIM_NEIGH         104
-#define VARIOUS_PHOTON_GEYSER_CHECK          105
-#define VARIOUS_SHELL_SIDE_ARM_CHECK          106
+#define VARIOUS_PHOTON_GEYSER_CHECK             105
+#define VARIOUS_SHELL_SIDE_ARM_CHECK            106
 
 // Cmd_manipulatedamage
 #define DMG_CHANGE_SIGN            0
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 1e72e3fead..1dadeadb1d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -54,6 +54,7 @@
 #include "constants/rgb.h"
 #include "data.h"
 #include "constants/party_menu.h"
+#include "src/battle_util.c"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
@@ -4780,7 +4781,7 @@ static void Cmd_moveend(void)
         switch (gBattleScripting.moveendState)
         {
         case MOVEEND_PROTECT_LIKE_EFFECT:
-            if (gBattleMoves[gCurrentMove].flags & FLAG_MAKES_CONTACT) // needs to be IsMoveMakingContact, but this file does not reference include/battle_util.h or src/battle_util.c
+            if (IsMoveMakingContact(move, gBattlerAttacker))
             {
                 if (gProtectStructs[gBattlerTarget].spikyShielded && GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD)
                 {
diff --git a/src/battle_util.c b/src/battle_util.c
index 43c8319ebe..fb95bd2723 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -8510,7 +8510,7 @@ u8 GetBattleMoveSplit(u32 moveId)
 {
     if (gSwapDamageCategory == TRUE)  // Photon Geyser, Shell Side Arm, Light That Burns the Sky
         return SPLIT_PHYSICAL;
-    if (IS_MOVE_STATUS(moveId) || B_PHYSICAL_SPECIAL_SPLIT >= GEN_4)
+    else if (IS_MOVE_STATUS(moveId) || B_PHYSICAL_SPECIAL_SPLIT >= GEN_4)
         return gBattleMoves[moveId].split;
     else if (gBattleMoves[moveId].type < TYPE_MYSTERY)
         return SPLIT_PHYSICAL;