create new enum for EnablePlayerBlur

pmret · Jul 30, 2023 · 0062edb · 0062edb
1 parent 35fdad6
commit 0062edb
Show file tree

Hide file tree

Showing 22 changed files with 78 additions and 72 deletions.
diff --git a/include/enums.h b/include/enums.h
@@ -6478,4 +6478,10 @@ enum IdleScriptState {
     IDLE_SCRIPT_RESTART = -1,
 };
 
+enum BlurState {
+    BLUR_ENABLE,
+    BLUR_DISABLE,
+    BLUR_RESET = -1,
+};
+
 #endif
diff --git a/src/18F340.c b/src/18F340.c
@@ -793,7 +793,7 @@ EvtScript EVS_ExecuteMarioAction = {
             EVT_CALL(LoadStarPowerScript)
             EVT_EXEC_WAIT(LVar0)
     EVT_END_SWITCH
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
     EVT_RETURN
     EVT_END
@@ -823,7 +823,7 @@ EvtScript EVS_PlayerFirstStrike = {
             EVT_CALL(LoadMoveScript)
             EVT_EXEC_WAIT(LVar0)
     EVT_END_SWITCH
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
     EVT_RETURN
     EVT_END
@@ -1285,7 +1285,7 @@ EvtScript EVS_PlayerDies = {
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Dying)
     EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_24)
     EVT_WAIT(15)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_371)
     EVT_SET(LVar0, 0)
     EVT_LOOP(30)
@@ -1299,7 +1299,7 @@ EvtScript EVS_PlayerDies = {
         EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0)
         EVT_WAIT(1)
     EVT_END_LOOP
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_WAIT(30)
     EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3FB)
     EVT_SET(LVar0, 0)

diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c
@@ -572,13 +572,13 @@ EvtScript N(tripleStrike3) = {
     EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, 0)
     EVT_THREAD
         EVT_WAIT(5)
-        EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+        EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
         EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.3))
         EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
         EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt)
         EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
         EVT_CALL(func_80273444, 50, 0, 0)
-        EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+        EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_END_THREAD
     EVT_WAIT(15)
     EVT_CALL(SetGoalToTarget, ACTOR_SELF)

diff --git a/src/battle/common/move/HammerSupport.inc.c b/src/battle/common/move/HammerSupport.inc.c
@@ -169,7 +169,7 @@ EvtScript N(EVS_Hammer_ReturnHome_A) = {
     EVT_CALL(MoveBattleCamOver, 5)
     EVT_CALL(func_802693F0)
     EVT_WAIT(20)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle)
     EVT_WAIT(5)
     EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
@@ -185,7 +185,7 @@ EvtScript N(EVS_Hammer_ReturnHome_B) = {
     EVT_CALL(PlayerYieldTurn)
     EVT_CALL(func_802693F0)
     EVT_WAIT(20)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle)
     EVT_WAIT(5)
     EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
@@ -202,7 +202,7 @@ EvtScript N(EVS_Hammer_ReturnHome_C) = {
     EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29)
     EVT_CALL(func_802693F0)
     EVT_WAIT(20)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle)
     EVT_WAIT(5)
     EVT_CALL(SetGoalToHome, ACTOR_PLAYER)

diff --git a/src/battle/common/move/JumpSupport.inc.c b/src/battle/common/move/JumpSupport.inc.c
@@ -120,7 +120,7 @@ EvtScript N(EVS_JumpSupport_E) = {
     EVT_CALL(func_80273444, 6, 0, 2)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land)
     EVT_WAIT(5)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
     EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0))
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run)
@@ -149,7 +149,7 @@ EvtScript N(EVS_JumpSupport_F) = {
     EVT_CALL(func_80273444, 6, 0, 2)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land)
     EVT_WAIT(2)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
     EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0))
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run)
@@ -178,7 +178,7 @@ EvtScript N(EVS_JumpSupport_G) = {
     EVT_CALL(func_80273444, 6, 0, 2)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land)
     EVT_WAIT(2)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
     EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0))
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run)
@@ -207,7 +207,7 @@ EvtScript N(EVS_JumpSupport_H) = {
     EVT_CALL(func_80273444, 6, 0, 2)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land)
     EVT_WAIT(2)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
     EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0))
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run)
@@ -220,7 +220,7 @@ EvtScript N(EVS_JumpSupport_H) = {
 EvtScript N(EVS_JumpSupport_I) = {
     EVT_CALL(PlayerYieldTurn)
     EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03)
     EVT_CALL(func_802693F0)
     EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
@@ -269,7 +269,7 @@ EvtScript N(EVS_JumpSupport_Miss) = {
     EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE)
     EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03)
     EVT_CALL(func_802693F0)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_CALL(PlayerYieldTurn)
     EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
     EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0))

diff --git a/src/battle/move/hammer/mega_smash.c b/src/battle/move/hammer/mega_smash.c
@@ -8,7 +8,7 @@
 extern EvtScript N(UseMove_Impl);
 
 EvtScript N(EVS_UseMove) = {
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(ShowActionHud, TRUE)
     EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2)
     EVT_SWITCH(LVar1)
@@ -28,7 +28,7 @@ EvtScript N(EVS_UseMove) = {
             EVT_SET(LVarF, 10)
             EVT_EXEC_WAIT(N(UseMove_Impl))
     EVT_END_SWITCH
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_RETURN
     EVT_END
 };

diff --git a/src/battle/move/hammer/power_smash.c b/src/battle/move/hammer/power_smash.c
@@ -8,7 +8,7 @@
 extern EvtScript N(UseMove_Impl);
 
 EvtScript N(EVS_UseMove) = {
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(ShowActionHud, TRUE)
     EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2)
     EVT_SWITCH(LVar1)
@@ -28,7 +28,7 @@ EvtScript N(EVS_UseMove) = {
             EVT_SET(LVarF, 8)
             EVT_EXEC_WAIT(N(UseMove_Impl))
     EVT_END_SWITCH
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_RETURN
     EVT_END
 };
@@ -61,7 +61,7 @@ EvtScript N(UseMove_Impl) = {
     EVT_EXEC_WAIT(N(EVS_802A3188))
     EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16)
     EVT_IF_EQ(LVar0, HIT_RESULT_MISS)
-        EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+        EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
         EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C))
         EVT_RETURN
     EVT_END_IF

diff --git a/src/battle/move/hammer/super_smash.c b/src/battle/move/hammer/super_smash.c
@@ -8,7 +8,7 @@
 extern EvtScript N(UseMove_Impl);
 
 EvtScript N(EVS_UseMove) = {
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(ShowActionHud, TRUE)
     EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2)
     EVT_SWITCH(LVar1)
@@ -28,7 +28,7 @@ EvtScript N(EVS_UseMove) = {
             EVT_SET(LVarF, 9)
             EVT_EXEC_WAIT(N(UseMove_Impl))
     EVT_END_SWITCH
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_RETURN
     EVT_END
 };

diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c
@@ -155,12 +155,12 @@ EvtScript N(EVS_UseMove0_ImplB) = {
     EVT_CALL(ShowActionHud, FALSE)
     EVT_CALL(action_command_jump_start, 37, 3)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
     EVT_CALL(func_802752AC, 20, 4)
     EVT_WAIT(7)
     EVT_CALL(func_802752AC, 3, 5)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_WAIT(1)
     EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0)
     EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224)
@@ -210,10 +210,10 @@ EvtScript N(EVS_UseMove0_ImplC) = {
     EVT_CALL(ShowActionHud, FALSE)
     EVT_CALL(action_command_jump_start, 25, 3)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)
     EVT_CALL(func_80275F00, 25, 4)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_WAIT(1)
     EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0)
     EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224)
@@ -425,12 +425,12 @@ EvtScript N(EVS_UseMove2_ImplB) = {
     EVT_CALL(ShowActionHud, FALSE)
     EVT_CALL(action_command_jump_start, 37, 3)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
     EVT_CALL(func_802752AC, 20, 4)
     EVT_WAIT(7)
     EVT_CALL(func_802752AC, 3, 5)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_WAIT(1)
     EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0)
     EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224)
@@ -482,10 +482,10 @@ EvtScript N(EVS_UseMove2_ImplC) = {
     EVT_CALL(ShowActionHud, FALSE)
     EVT_CALL(action_command_jump_start, 25, 3)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)
     EVT_CALL(func_80275F00, 25, 4)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_RESTART)
+    EVT_CALL(EnablePlayerBlur, BLUR_RESET)
     EVT_WAIT(1)
     EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0)
     EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224)

diff --git a/src/battle/move/jump/auto_jump.c b/src/battle/move/jump/auto_jump.c
@@ -130,12 +130,12 @@ EvtScript N(EVS_UseMove_ImplB) = {
     EVT_CALL(ShowActionHud, FALSE)
     EVT_CALL(action_command_jump_start, 37, 3)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
     EVT_CALL(func_802752AC, 20, 4)
     EVT_WAIT(7)
     EVT_CALL(func_802752AC, 3, 5)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_WAIT(1)
     EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0)
     EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224)
@@ -185,10 +185,10 @@ EvtScript N(EVS_UseMove_ImplC) = {
     EVT_CALL(ShowActionHud, FALSE)
     EVT_CALL(action_command_jump_start, 25, 3)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)
     EVT_CALL(func_80275F00, 25, 4)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_WAIT(1)
     EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0)
     EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224)

diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c
@@ -237,7 +237,7 @@ EvtScript N(EVS_UseMove_ImplB) = {
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_IF_EQ(LVarF, 1)
         EVT_CALL(func_802752AC, 20, 3)
         EVT_WAIT(7)
@@ -247,7 +247,7 @@ EvtScript N(EVS_UseMove_ImplB) = {
         EVT_WAIT(7)
         EVT_CALL(func_802752AC, 3, 5)
     EVT_END_IF
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0)
     EVT_IF_EQ(LVar0, HIT_RESULT_MISS)
         EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss))

diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c
@@ -145,12 +145,12 @@ EvtScript N(EVS_UseMove_ImplB) = {
     EVT_CALL(ShowActionHud, FALSE)
     EVT_CALL(action_command_jump_start, 37, 3)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
     EVT_CALL(func_802752AC, 20, 4)
     EVT_WAIT(7)
     EVT_CALL(func_802752AC, 3, 5)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
     EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2)
     EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210B)
@@ -206,10 +206,10 @@ EvtScript N(EVS_UseMove_ImplC) = {
     EVT_CALL(ShowActionHud, FALSE)
     EVT_CALL(action_command_jump_start, 25, 3)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)
     EVT_CALL(func_80275F00, 25, 4)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
     EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2)
     EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210C)

diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c
@@ -263,7 +263,7 @@ EvtScript N(EVS_UseMove_ImplB) = {
     EVT_SUB(LVarD, 1)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_IF_EQ(LVarF, 0)
         EVT_CALL(func_802752AC, 20, 3)
         EVT_WAIT(7)
@@ -273,7 +273,7 @@ EvtScript N(EVS_UseMove_ImplB) = {
         EVT_WAIT(7)
         EVT_CALL(func_802752AC, 3, 5)
     EVT_END_IF
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_CALL(GetCommandAutoSuccess, LVar1)
     EVT_IF_EQ(LVar1, 1)
         EVT_IF_GT(LVarF, 3)
@@ -398,14 +398,14 @@ EvtScript N(EVS_UseMove_ImplC) = {
     EVT_END_SWITCH
     EVT_SUB(LVarD, 1)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)
     EVT_IF_EQ(LVarF, 0)
         EVT_CALL(func_80275F00, 25, 2)
     EVT_ELSE
         EVT_CALL(func_80275F00, 25, 4)
     EVT_END_IF
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_CALL(GetCommandAutoSuccess, LVar1)
     EVT_IF_EQ(LVar1, 1)
         EVT_IF_GT(LVarF, 3)

diff --git a/src/battle/move/jump/dizzy_stomp.c b/src/battle/move/jump/dizzy_stomp.c
@@ -117,12 +117,12 @@ EvtScript N(EVS_UseMove_ImplB) = {
     EVT_CALL(ShowActionHud, FALSE)
     EVT_CALL(action_command_jump_start, 37, 3)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
     EVT_CALL(func_802752AC, 20, 4)
     EVT_WAIT(7)
     EVT_CALL(func_802752AC, 3, 5)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_WAIT(1)
     EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0)
     EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 2, 224)
@@ -172,10 +172,10 @@ EvtScript N(EVS_UseMove_ImplC) = {
     EVT_CALL(ShowActionHud, FALSE)
     EVT_CALL(action_command_jump_start, 25, 3)
     EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_DISABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
     EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)
     EVT_CALL(func_80275F00, 25, 4)
-    EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE)
+    EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
     EVT_WAIT(1)
     EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0)
     EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 3, 224)