From 0062edb50969e4007c91ce3105f2334c7cb98790 Mon Sep 17 00:00:00 2001 From: Rainchus Date: Sat, 29 Jul 2023 20:43:23 -0500 Subject: [PATCH] create new enum for EnablePlayerBlur --- include/enums.h | 6 ++++++ src/18F340.c | 8 ++++---- src/battle/area/mac/actor/master3.c | 4 ++-- src/battle/common/move/HammerSupport.inc.c | 6 +++--- src/battle/common/move/JumpSupport.inc.c | 12 ++++++------ src/battle/move/hammer/mega_smash.c | 4 ++-- src/battle/move/hammer/power_smash.c | 6 +++--- src/battle/move/hammer/super_smash.c | 4 ++-- src/battle/move/jump/attack.c | 16 ++++++++-------- src/battle/move/jump/auto_jump.c | 8 ++++---- src/battle/move/jump/auto_multibounce.c | 4 ++-- src/battle/move/jump/d_down_jump.c | 8 ++++---- src/battle/move/jump/demo_power_bounce.c | 8 ++++---- src/battle/move/jump/dizzy_stomp.c | 8 ++++---- src/battle/move/jump/earthquake_jump.c | 8 ++++---- src/battle/move/jump/mega_jump.c | 4 ++-- src/battle/move/jump/multibounce.c | 4 ++-- src/battle/move/jump/power_bounce.c | 8 ++++---- src/battle/move/jump/power_jump.c | 4 ++-- src/battle/move/jump/shrink_stomp.c | 8 ++++---- src/battle/move/jump/sleep_stomp.c | 8 ++++---- src/battle/move/jump/super_jump.c | 4 ++-- 22 files changed, 78 insertions(+), 72 deletions(-) diff --git a/include/enums.h b/include/enums.h index d0a9591d780..1747f112efe 100644 --- 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 index 247f5b8ec5f..09c3d6d5cea 100644 --- 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 index 82416ff758d..b6c20365023 100644 --- 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 index 01e42ca82ab..3d6aad4f980 100644 --- 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 index af0d14a504e..ca4b5360d4e 100644 --- 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 index e6fca395382..2bbfdd17e51 100644 --- 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 index 85ed38db06d..b1b655ae11c 100644 --- 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 index ca4360b1701..1e0ff3c8400 100644 --- 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 index eb20af58cdc..4f54dece517 100644 --- 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 index 08500a23b57..93777210e86 100644 --- 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 index 2a7d677dd9e..411edab365f 100644 --- 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 index c05b2f6a84f..58df5dd3d80 100644 --- 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 index 999935f41e2..f454db09e0d 100644 --- 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 index d67ddcf865a..fb830fad8ca 100644 --- 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) diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index f7250d0908d..c5676eb6318 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -377,7 +377,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_SWITCH EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) 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) @@ -387,7 +387,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_CHILD_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) @@ -602,14 +602,14 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, LVarA, 5) EVT_END_SWITCH EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - 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_CHILD_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) diff --git a/src/battle/move/jump/mega_jump.c b/src/battle/move/jump/mega_jump.c index 5b1fc3ffb89..d85865cc8d8 100644 --- a/src/battle/move/jump/mega_jump.c +++ b/src/battle/move/jump/mega_jump.c @@ -11,7 +11,7 @@ extern EvtScript N(EVS_UseMove_ImplB); extern EvtScript N(EVS_UseMove_ImplC); 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) @@ -22,7 +22,7 @@ EvtScript N(EVS_UseMove) = { EVT_CASE_EQ(2) EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) 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/multibounce.c b/src/battle/move/jump/multibounce.c index 57455938da2..55216873ba4 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -259,7 +259,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) @@ -269,7 +269,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/power_bounce.c b/src/battle/move/jump/power_bounce.c index 3c10e3d4934..110dc7db1e9 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -289,7 +289,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) @@ -299,7 +299,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) @@ -430,14 +430,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/power_jump.c b/src/battle/move/jump/power_jump.c index 4fd5adcbdb2..34d6abf72c6 100644 --- a/src/battle/move/jump/power_jump.c +++ b/src/battle/move/jump/power_jump.c @@ -11,7 +11,7 @@ extern EvtScript N(EVS_UseMove_ImplB); extern EvtScript N(EVS_UseMove_ImplC); 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) @@ -22,7 +22,7 @@ EvtScript N(EVS_UseMove) = { EVT_CASE_EQ(2) EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) 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/shrink_stomp.c b/src/battle/move/jump/shrink_stomp.c index cef03085ebb..42566805f0c 100644 --- a/src/battle/move/jump/shrink_stomp.c +++ b/src/battle/move/jump/shrink_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(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15B) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 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(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15C) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 3, 224) diff --git a/src/battle/move/jump/sleep_stomp.c b/src/battle/move/jump/sleep_stomp.c index ccb39387fed..769b3b87f9c 100644 --- a/src/battle/move/jump/sleep_stomp.c +++ b/src/battle/move/jump/sleep_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_SLEEP, 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_15B, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 3, 224) diff --git a/src/battle/move/jump/super_jump.c b/src/battle/move/jump/super_jump.c index b4ac7489974..061281e1053 100644 --- a/src/battle/move/jump/super_jump.c +++ b/src/battle/move/jump/super_jump.c @@ -11,7 +11,7 @@ extern EvtScript N(EVS_UseMove_ImplB); extern EvtScript N(EVS_UseMove_ImplC); 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) @@ -22,7 +22,7 @@ EvtScript N(EVS_UseMove) = { EVT_CASE_EQ(2) EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) EVT_END_SWITCH - EVT_CALL(EnablePlayerBlur, IDLE_SCRIPT_ENABLE) + EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_RETURN EVT_END };