diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 9bff248651..e5d8fc58c8 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -1366,8 +1366,8 @@
 	.byte \battler
 	.endm
 
-	.macro setoctolock battler:req, failInstr:req
-	callnative BS_Octolock
+	.macro trysetoctolock battler:req, failInstr:req
+	callnative BS_TrySetOctolock
 	.byte \battler
 	.4byte \failInstr
 	.endm
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index a279a8f0bc..bc0a7a7fa3 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1057,7 +1057,7 @@ BattleScript_EffectOctolock:
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
 	attackstring
 	ppreduce
-	setoctolock BS_TARGET, BattleScript_ButItFailed
+	trysetoctolock BS_TARGET, BattleScript_ButItFailed
 	attackanimation
 	waitanimation
 	printstring STRINGID_CANTESCAPEBECAUSEOFCURRENTMOVE
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 8e5db2fd6e..088546991e 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -15697,7 +15697,7 @@ static bool8 IsFinalStrikeEffect(u16 move)
     return FALSE;
 }
 
-static bool8 CanAbilityPreventStatLoss(u16 abilityDef, bool8 isIntimidate)
+static bool8 CanAbilityPreventStatLoss(u16 abilityDef, bool8 byIntimidate)
 {
     switch (abilityDef)
     {
@@ -15709,7 +15709,7 @@ static bool8 CanAbilityPreventStatLoss(u16 abilityDef, bool8 isIntimidate)
     case ABILITY_SCRAPPY:
     case ABILITY_OWN_TEMPO:
     case ABILITY_OBLIVIOUS:
-        if (isIntimidate && (B_UPDATED_INTIMIDATE >= GEN_8))
+        if (byIntimidate && (B_UPDATED_INTIMIDATE >= GEN_8))
             return TRUE;
         break;
     }
@@ -16238,7 +16238,7 @@ void BS_JumpIfTerrainAffected(void)
         gBattlescriptCurrInstr = cmd->nextInstr;
 }
 
-void BS_Octolock(void)
+void BS_TrySetOctolock(void)
 {
     NATIVE_ARGS(u8 battler, const u8 *failInstr);
     u32 battler = GetBattlerForBattleScript(cmd->battler);