diff --git a/include/enums.h b/include/enums.h index d92b5bc20c..1747f112ef 100644 --- a/include/enums.h +++ b/include/enums.h @@ -6472,4 +6472,16 @@ enum Language { LANGUAGE_ES = 3, }; +enum IdleScriptState { + IDLE_SCRIPT_ENABLE, + IDLE_SCRIPT_DISABLE, + 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 07120dabfc..3630e05dc1 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, 0) + 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, 0) + 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, 1) + 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, 0) + 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/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index d9cb15444d..42da54eceb 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -173,7 +173,7 @@ EvtScript N(80225FD4) = { EvtScript N(handleEvent_802260D0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVarA) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -241,7 +241,7 @@ EvtScript N(handleEvent_802260D0) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -249,14 +249,14 @@ EvtScript N(handleEvent_802260D0) = { EvtScript N(takeTurn_802264AC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 60) EVT_EXEC_WAIT(N(80226558)) EVT_ELSE EVT_EXEC_WAIT(N(80226B88)) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c index 2723392615..c6a8530022 100644 --- a/src/battle/area/dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -146,7 +146,7 @@ EvtScript N(80218E60) = { EvtScript N(nextTurn_80218FB0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PHASE_PLAYER_BEGIN) @@ -176,7 +176,7 @@ EvtScript N(nextTurn_80218FB0) = { EVT_CALL(EnableBattleStatusBar, TRUE) EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -213,7 +213,7 @@ EvtScript N(802192E0) = { EvtScript N(handleEvent_80219338) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -288,7 +288,7 @@ EvtScript N(handleEvent_80219338) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -296,7 +296,7 @@ EvtScript N(handleEvent_80219338) = { EvtScript N(takeTurn_80219750) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -379,7 +379,7 @@ EvtScript N(takeTurn_80219750) = { EVT_ELSE EVT_EXEC_WAIT(N(8021A36C)) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index 7dc4e75b11..db519c9c43 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -167,7 +167,7 @@ EvtScript N(returnHome) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -236,7 +236,7 @@ EvtScript N(takeTurn) = { EVT_CALL(EnableBattleStatusBar, TRUE) EVT_END_IF EVT_EXEC_WAIT(N(attackBodyCrush)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/flo2/actor/monty_mole_boss.c b/src/battle/area/flo2/actor/monty_mole_boss.c index 4c8184f4bf..f3ba4e76fa 100644 --- a/src/battle/area/flo2/actor/monty_mole_boss.c +++ b/src/battle/area/flo2/actor/monty_mole_boss.c @@ -225,7 +225,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -345,7 +345,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(onDeath)) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -353,7 +353,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetBattlePhase, LVar0) @@ -400,7 +400,7 @@ EvtScript N(takeTurn) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -429,7 +429,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index 1a3da4d2a8..116e491533 100644 --- a/src/battle/area/flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -136,7 +136,7 @@ EvtScript N(returnHome) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -230,7 +230,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -238,7 +238,7 @@ EvtScript N(handleEvent) = { EvtScript N(attack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -343,7 +343,7 @@ EvtScript N(attack) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -370,7 +370,7 @@ EvtScript N(attack) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/flo2/actor/tuff_puff.c b/src/battle/area/flo2/actor/tuff_puff.c index 6a5bf20bd3..2d43756c13 100644 --- a/src/battle/area/flo2/actor/tuff_puff.c +++ b/src/battle/area/flo2/actor/tuff_puff.c @@ -389,8 +389,8 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index aa110975de..bacc04f2eb 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -162,7 +162,7 @@ EvtScript N(handleEvent_802191E0) = { EvtScript N(takeTurn_80219444) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 400) @@ -272,7 +272,7 @@ EvtScript N(takeTurn_80219444) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index 9d7c9bdaf3..92816ad0ce 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -327,7 +327,7 @@ EvtScript N(8021D890) = { EvtScript N(runAway) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, 57) @@ -344,7 +344,7 @@ EvtScript N(runAway) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) @@ -463,7 +463,7 @@ EvtScript N(8021E46C) = { EvtScript N(handleEvent_8021E6D8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -582,7 +582,7 @@ EvtScript N(handleEvent_8021E6D8) = { EVT_EXEC_WAIT(N(8021E46C)) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -590,7 +590,7 @@ EvtScript N(handleEvent_8021E6D8) = { EvtScript N(handleEvent_8021EDF0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_2, 255) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -731,7 +731,7 @@ EvtScript N(handleEvent_8021EDF0) = { EVT_EXEC_WAIT(N(8021E46C)) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -742,7 +742,7 @@ EvtScript N(healOne) = { EVT_CALL(SetActorVar, ACTOR_SELF, 11, 0) EVT_CALL(AddActorVar, ACTOR_SELF, 4, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -811,7 +811,7 @@ EvtScript N(healOne) = { EVT_CALL(MoveBattleCamOver, 10) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -822,7 +822,7 @@ EvtScript N(healAll) = { EVT_CALL(SetActorVar, ACTOR_SELF, 11, 1) EVT_CALL(AddActorVar, ACTOR_SELF, 3, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -910,7 +910,7 @@ EvtScript N(healAll) = { EVT_CALL(MoveBattleCamOver, 10) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1374,7 +1374,7 @@ EvtScript N(makeCopy) = { EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) EVT_SET(LVarA, LVar0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(EnableIdleScript, LVarA, 0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseIdleAnimation, LVarA, FALSE) @@ -1397,7 +1397,7 @@ EvtScript N(makeCopy) = { EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_WAIT(10) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(EnableIdleScript, LVar9, 1) EVT_WAIT(30) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1492,7 +1492,7 @@ EvtScript N(boostAttack) = { EVT_CALL(SetActorVar, ACTOR_SELF, 11, 4) EVT_CALL(AddActorVar, ACTOR_SELF, 5, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1557,7 +1557,7 @@ EvtScript N(boostAttack) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1604,7 +1604,7 @@ EvtScript N(boostDefense) = { EVT_CALL(SetActorVar, ACTOR_SELF, 11, 5) EVT_CALL(AddActorVar, ACTOR_SELF, 6, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1669,7 +1669,7 @@ EvtScript N(boostDefense) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1716,7 +1716,7 @@ EvtScript N(electrify) = { EVT_CALL(SetActorVar, ACTOR_SELF, 11, 6) EVT_CALL(AddActorVar, ACTOR_SELF, 7, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1786,7 +1786,7 @@ EvtScript N(electrify) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1833,7 +1833,7 @@ EvtScript N(vanish) = { EVT_CALL(SetActorVar, ACTOR_SELF, 11, 7) EVT_CALL(AddActorVar, ACTOR_SELF, 8, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1898,7 +1898,7 @@ EvtScript N(vanish) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/isk_part_2/actor/chain_chomp.c b/src/battle/area/isk_part_2/actor/chain_chomp.c index eaa6024a66..b5b71210b6 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -434,7 +434,7 @@ EvtScript N(EVS_UpdateChain) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SET(LVarF, LVar0) @@ -468,7 +468,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_ChainChomp_Hurt) EVT_EXEC_WAIT(N(EVS_Chomp_SpinSmashHit)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) @@ -524,7 +524,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_ChainChomp_Hurt) EVT_EXEC_WAIT(EVS_Enemy_AirLift) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(EVENT_BLOW_AWAY) @@ -588,7 +588,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_CALL(FallToGoal, ACTOR_SELF, 11) EVT_END_IF EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -680,7 +680,7 @@ EvtScript N(EVS_Chomp_SpinSmashHit) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -761,7 +761,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH @@ -845,7 +845,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_SWITCH EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, FALSE) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 25c2f89245..64c4fb9ead 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -326,7 +326,7 @@ EvtScript N(EVS_Idle) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) @@ -448,7 +448,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -528,7 +528,7 @@ EvtScript N(EVS_TemporaryKnockout) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_LABEL(0) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Stunned, LVar0) EVT_IF_EQ(LVar0, FALSE) @@ -537,7 +537,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_NextSummonTime, LVar0) EVT_IF_EQ(LVar0, 0) EVT_EXEC_WAIT(N(EVS_Move_SummonChomp)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_ELSE @@ -574,7 +574,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_NextAttack, AVAL_TRY_TOSS_NEXT) EVT_EXEC_WAIT(N(EVS_Attack_DropDebris)) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_ELSE @@ -584,7 +584,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_EXEC_WAIT(N(EVS_LevitateToHomePos)) EVT_GOTO(0) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_RETURN diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index 3d25bc935a..f6afea4f3c 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -263,7 +263,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2) @@ -289,7 +289,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) EVT_EXEC_WAIT(N(EVS_Attack_GrappleDrop)) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -517,7 +517,7 @@ EvtScript N(EVS_Attack_WindBlast) = { EvtScript N(EVS_Attack_FeatherFling) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) @@ -636,7 +636,7 @@ EvtScript N(EVS_Attack_FeatherFling) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_EXEC_WAIT(N(EVS_FlyToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -717,7 +717,7 @@ EvtScript N(EVS_Attack_FeatherFling) = { EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -768,7 +768,7 @@ EvtScript N(EVS_LiftMario) = { EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -824,7 +824,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_EXEC_WAIT(N(EVS_FlyToHome_GrappleFail)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -873,7 +873,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(EVS_FlyToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_DEFAULT @@ -954,7 +954,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_WAIT(8) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(EVS_FlyToHome_GrappleFail)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -1009,7 +1009,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1017,7 +1017,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -1071,7 +1071,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_EXEC_WAIT(N(EVS_FlyToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1125,7 +1125,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index 331714d9a5..38cd6aa5bf 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -311,7 +311,7 @@ EvtScript N(80219668) = { EvtScript N(handleEvent_802197FC) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -396,7 +396,7 @@ EvtScript N(handleEvent_802197FC) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -430,7 +430,7 @@ EvtScript N(80219D68) = { EvtScript N(handleEvent_80219ED4) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -495,7 +495,7 @@ EvtScript N(handleEvent_80219ED4) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -561,7 +561,7 @@ EvtScript N(8021A2E8) = { EvtScript N(8021A6D8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -619,7 +619,7 @@ EvtScript N(8021A6D8) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(80219668)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -679,7 +679,7 @@ EvtScript N(8021A6D8) = { EVT_EXEC_WAIT(N(80219668)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -727,7 +727,7 @@ EvtScript N(8021B008) = { EvtScript N(8021B22C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -796,7 +796,7 @@ EvtScript N(8021B22C) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(80219668)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -906,7 +906,7 @@ EvtScript N(8021B22C) = { EVT_EXEC_WAIT(N(80219668)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -914,7 +914,7 @@ EvtScript N(8021B22C) = { EvtScript N(8021C004) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) @@ -936,7 +936,7 @@ EvtScript N(8021C004) = { EVT_END_THREAD EVT_CALL(WaitForBuffDone) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kkj/actor/kammy_koopa.c b/src/battle/area/kkj/actor/kammy_koopa.c index 3f80b5ae3c..7301622fc5 100644 --- a/src/battle/area/kkj/actor/kammy_koopa.c +++ b/src/battle/area/kkj/actor/kammy_koopa.c @@ -490,7 +490,7 @@ EvtScript N(speakOnHit) = { }; EvtScript N(onDeath) = { - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c index f91f5c225f..57a6f901b3 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c @@ -171,7 +171,7 @@ EvtScript N(idle_80219A98) = { EvtScript N(handleEvent_80219D74) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -280,7 +280,7 @@ EvtScript N(handleEvent_80219D74) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -290,7 +290,7 @@ EvtScript N(handleEvent_80219D74) = { EvtScript N(takeTurn_8021A5A0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -388,7 +388,7 @@ EvtScript N(takeTurn_8021A5A0) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -454,7 +454,7 @@ EvtScript N(takeTurn_8021A5A0) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c index e37e151907..1ae889c606 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c @@ -167,7 +167,7 @@ EvtScript N(idle_8021D5E8) = { EvtScript N(handleEvent_8021D8C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -276,7 +276,7 @@ EvtScript N(handleEvent_8021D8C4) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -286,7 +286,7 @@ EvtScript N(handleEvent_8021D8C4) = { EvtScript N(takeTurn_8021E0F0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -384,7 +384,7 @@ EvtScript N(takeTurn_8021E0F0) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -450,7 +450,7 @@ EvtScript N(takeTurn_8021E0F0) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_2/actor/goomba_king.c b/src/battle/area/kmr_part_2/actor/goomba_king.c index 0984e11795..a0d786bc15 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -239,7 +239,7 @@ EvtScript N(80220DB0) = { EvtScript N(handleEvent_80220F34) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -338,7 +338,7 @@ EvtScript N(handleEvent_80220F34) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -346,7 +346,7 @@ EvtScript N(handleEvent_80220F34) = { EvtScript N(takeTurn_80221530) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -435,7 +435,7 @@ EvtScript N(80221680) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Run) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -459,7 +459,7 @@ EvtScript N(80221680) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Idle) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -559,7 +559,7 @@ EvtScript N(80221CD4) = { EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0x80000000, 0, 0, 0) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -632,7 +632,7 @@ EvtScript N(80221CD4) = { EVT_CASE_EQ(10) EVT_RETURN EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -640,7 +640,7 @@ EvtScript N(80221CD4) = { EvtScript N(nextTurn_802229C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) @@ -690,7 +690,7 @@ EvtScript N(nextTurn_802229C4) = { EVT_CALL(EnableBattleStatusBar, TRUE) EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c index 1697bf6920..d83a8683b0 100644 --- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -176,7 +176,7 @@ EvtScript N(idle_80223678) = { EvtScript N(handleEvent_80223688) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -201,7 +201,7 @@ EvtScript N(handleEvent_80223688) = { EVT_CASE_EQ(53) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -216,7 +216,7 @@ EvtScript N(takeTurn_80223804) = { EVT_CASE_EQ(0) EVT_CASE_EQ(10) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_1.c b/src/battle/area/kmr_part_2/actor/red_goomba_1.c index 87f54e2fd0..7eb6d4742b 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_1.c @@ -171,7 +171,7 @@ EvtScript N(idle_8021B8A8) = { EvtScript N(handleEvent_8021BB84) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -280,7 +280,7 @@ EvtScript N(handleEvent_8021BB84) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -290,7 +290,7 @@ EvtScript N(handleEvent_8021BB84) = { EvtScript N(takeTurn_8021C3B0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -388,7 +388,7 @@ EvtScript N(takeTurn_8021C3B0) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -454,7 +454,7 @@ EvtScript N(takeTurn_8021C3B0) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_2.c b/src/battle/area/kmr_part_2/actor/red_goomba_2.c index 3c283a2ee9..60ac8a6f76 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_2.c @@ -167,7 +167,7 @@ EvtScript N(idle_8021EFE8) = { EvtScript N(handleEvent_8021F2C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -276,7 +276,7 @@ EvtScript N(handleEvent_8021F2C4) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -286,7 +286,7 @@ EvtScript N(handleEvent_8021F2C4) = { EvtScript N(takeTurn_8021FAF0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -384,7 +384,7 @@ EvtScript N(takeTurn_8021FAF0) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -450,7 +450,7 @@ EvtScript N(takeTurn_8021FAF0) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c index 58d25d3fdb..c5b48dd580 100644 --- a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c @@ -235,7 +235,7 @@ extern EvtScript N(802251CC); EvtScript N(handleEvent_80224B58) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(9) @@ -330,7 +330,7 @@ EvtScript N(handleEvent_80224B58) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -380,7 +380,7 @@ EvtScript N(802251CC) = { EvtScript N(takeTurn_80225314) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_OPEN_SHELL) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) EVT_WAIT(20) @@ -483,7 +483,7 @@ EvtScript N(takeTurn_80225314) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) EVT_EXEC_WAIT(N(80224964)) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -491,7 +491,7 @@ EvtScript N(takeTurn_80225314) = { EvtScript N(nextTurn_80225B4C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) @@ -518,7 +518,7 @@ EvtScript N(nextTurn_80225B4C) = { EVT_END_IF EVT_CASE_EQ(12) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c index d77c748de1..d8c320829f 100644 --- a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c @@ -391,7 +391,7 @@ extern EvtScript N(80232170); EvtScript N(handleEvent_8022D1C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVarA) EVT_SWITCH(LVarA) EVT_CASE_EQ(9) @@ -515,7 +515,7 @@ EvtScript N(handleEvent_8022D1C4) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -609,7 +609,7 @@ EvtScript N(takeTurn_8022D920) = { EvtScript N(8022DD48) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) @@ -637,7 +637,7 @@ EvtScript N(8022DD48) = { EvtScript N(8022DF54) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) @@ -668,7 +668,7 @@ EvtScript N(8022DF54) = { EvtScript N(8022E198) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -718,7 +718,7 @@ EvtScript N(8022E198) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(6) @@ -759,7 +759,7 @@ EvtScript N(8022E198) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -806,7 +806,7 @@ EvtScript N(8022E198) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Run) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -814,7 +814,7 @@ EvtScript N(8022E198) = { EvtScript N(8022ED10) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -901,7 +901,7 @@ EvtScript N(8022ED10) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpikedParaJrTroopa_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -911,7 +911,7 @@ API_CALLABLE(N(CalculateArcsinDeg)); EvtScript N(8022F468) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -987,7 +987,7 @@ EvtScript N(8022F468) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1043,7 +1043,7 @@ EvtScript N(8022F468) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1053,7 +1053,7 @@ EvtScript N(8022F468) = { EvtScript N(80230034) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -1099,7 +1099,7 @@ EvtScript N(80230034) = { EVT_ADD(LVar1, LVar7) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 30, 0) EVT_WAIT(35) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(5) @@ -1120,7 +1120,7 @@ EvtScript N(80230034) = { EVT_WAIT(20) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_WAIT(40) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -1144,7 +1144,7 @@ EvtScript N(80230034) = { EVT_WAIT(15) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, 8, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1158,7 +1158,7 @@ EvtScript N(80230034) = { EvtScript N(80230794) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_MageJrTroopa_RaiseStaff) @@ -1214,7 +1214,7 @@ EvtScript N(80230794) = { EVT_GOTO(2) EVT_END_IF EVT_WAIT(20) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(5) @@ -1252,7 +1252,7 @@ EvtScript N(80230794) = { EVT_GOTO(2) EVT_END_IF EVT_WAIT(20) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -1271,7 +1271,7 @@ EvtScript N(80230794) = { EVT_GOTO(2) EVT_END_IF EVT_WAIT(20) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1279,7 +1279,7 @@ EvtScript N(80230794) = { EvtScript N(8023106C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) @@ -1329,7 +1329,7 @@ EvtScript N(8023106C) = { EVT_CALL(FreezeBattleState, FALSE) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1337,7 +1337,7 @@ EvtScript N(8023106C) = { EvtScript N(nextTurn_8023147C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) @@ -1355,7 +1355,7 @@ EvtScript N(nextTurn_8023147C) = { EVT_CASE_EQ(11) EVT_CASE_EQ(10) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_3/actor/jr_troopa.c b/src/battle/area/kmr_part_3/actor/jr_troopa.c index 56d61e236e..0a582d8c14 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -235,7 +235,7 @@ EvtScript N(8022325C) = { EvtScript N(handleEvent_80223290) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar1) @@ -268,7 +268,7 @@ EvtScript N(handleEvent_80223290) = { EVT_END_CASE_GROUP EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -276,7 +276,7 @@ EvtScript N(handleEvent_80223290) = { EvtScript N(takeTurn_802234A4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(AddActorVar, ACTOR_SELF, 0, 1) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) @@ -289,7 +289,7 @@ EvtScript N(takeTurn_802234A4) = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(ActorSpeak, MSG_CH0_00B1, ACTOR_SELF, PRT_MAIN, 0x00210016, 0x00210003) EVT_END_IF EVT_END_IF @@ -380,7 +380,7 @@ EvtScript N(takeTurn_802234A4) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -388,7 +388,7 @@ EvtScript N(takeTurn_802234A4) = { EvtScript N(nextTurn_80223D2C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) @@ -475,7 +475,7 @@ EvtScript N(nextTurn_80223D2C) = { EVT_END_IF EVT_END_IF EVT_END_SWITCH -EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) +EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c index 18d4a2f8d5..8b908e5f30 100644 --- a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c @@ -246,7 +246,7 @@ extern EvtScript N(8022BF1C); EvtScript N(handleEvent_8022ADD8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(9) @@ -363,7 +363,7 @@ EvtScript N(handleEvent_8022ADD8) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -371,7 +371,7 @@ EvtScript N(handleEvent_8022ADD8) = { EvtScript N(takeTurn_8022B4F0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MageJrTroopa_RaiseStaff) @@ -420,7 +420,7 @@ EvtScript N(takeTurn_8022B4F0) = { EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -454,7 +454,7 @@ EvtScript N(takeTurn_8022B4F0) = { EVT_END_IF EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -462,7 +462,7 @@ EvtScript N(takeTurn_8022B4F0) = { EvtScript N(nextTurn_8022BB44) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) @@ -517,7 +517,7 @@ EvtScript N(nextTurn_8022BB44) = { EVT_EXEC_WAIT(N(8022AC40)) EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c index bbe7d766be..ec7ea7ef98 100644 --- a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c @@ -245,7 +245,7 @@ extern EvtScript N(80227E1C); EvtScript N(handleEvent_802266B0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -357,7 +357,7 @@ EvtScript N(handleEvent_802266B0) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -392,7 +392,7 @@ EvtScript N(80226D4C) = { EvtScript N(takeTurn_80226F58) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -488,7 +488,7 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ParaJrTroopa_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -496,7 +496,7 @@ EvtScript N(takeTurn_80226F58) = { EvtScript N(nextTurn_80227724) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVarF) EVT_SWITCH(LVarF) EVT_CASE_EQ(10) @@ -528,7 +528,7 @@ EvtScript N(nextTurn_80227724) = { EVT_END_IF EVT_CASE_EQ(12) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c index db4c52a687..e4364f4438 100644 --- a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c @@ -241,7 +241,7 @@ extern EvtScript N(8022A480); EvtScript N(handleEvent_802287D0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(9) @@ -376,7 +376,7 @@ EvtScript N(handleEvent_802287D0) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -441,7 +441,7 @@ EvtScript N(80229160) = { EvtScript N(takeTurn_8022936C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -537,7 +537,7 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedParaJrTroopa_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -561,7 +561,7 @@ API_CALLABLE(func_802189DC_447E1C) { EvtScript N(nextTurn_80229B38) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) @@ -626,7 +626,7 @@ EvtScript N(nextTurn_80229B38) = { EVT_END_IF EVT_CASE_EQ(12) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c index 10043e4a62..02653a9252 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c @@ -261,7 +261,7 @@ extern EvtScript N(8021D614); EvtScript N(handleEvent_8021C808) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -365,7 +365,7 @@ EvtScript N(handleEvent_8021C808) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -373,7 +373,7 @@ EvtScript N(handleEvent_8021C808) = { EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -434,7 +434,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_EXEC_WAIT(N(8021C790)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -477,7 +477,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_EXEC_WAIT(N(8021C790)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -644,7 +644,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent_8021DF5C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -753,7 +753,7 @@ EvtScript N(handleEvent_8021DF5C) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -763,7 +763,7 @@ EvtScript N(handleEvent_8021DF5C) = { EvtScript N(takeTurn_8021E788) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -861,7 +861,7 @@ EvtScript N(takeTurn_8021E788) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -927,7 +927,7 @@ EvtScript N(takeTurn_8021E788) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c index 5791476b22..49b7021338 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c @@ -168,7 +168,7 @@ EvtScript N(idle_8021A578) = { EvtScript N(handleEvent_8021A854) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -292,7 +292,7 @@ EvtScript N(handleEvent_8021A854) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -302,7 +302,7 @@ EvtScript N(handleEvent_8021A854) = { EvtScript N(takeTurn_8021B19C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -400,7 +400,7 @@ EvtScript N(takeTurn_8021B19C) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -472,7 +472,7 @@ EvtScript N(takeTurn_8021B19C) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kpa2/actor/bowser_phase_1.c b/src/battle/area/kpa2/actor/bowser_phase_1.c index d933fc33de..394e18dea0 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_1.c +++ b/src/battle/area/kpa2/actor/bowser_phase_1.c @@ -232,7 +232,7 @@ EvtScript N(nextTurn) = { EVT_CALL(EnableBattleStatusBar, TRUE) EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kpa2/actor/bowser_phase_3.c b/src/battle/area/kpa2/actor/bowser_phase_3.c index 45d4ed0785..0488f9f969 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_3.c +++ b/src/battle/area/kpa2/actor/bowser_phase_3.c @@ -581,7 +581,7 @@ EvtScript N(onDeath) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF EVT_END_THREAD - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(MakeLerp, 0, 0x00001950, 100, EASING_COS_IN_OUT) EVT_LABEL(2) EVT_CALL(UpdateLerp) @@ -591,7 +591,7 @@ EvtScript N(onDeath) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(2) EVT_END_IF - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_HurtStill) EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2129) diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index c8ebf8d5c0..40008a8b0a 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -153,7 +153,7 @@ EvtScript N(explode) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -225,7 +225,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -233,7 +233,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) diff --git a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c index 794a86aa5e..764ce2b73a 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c +++ b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c @@ -113,7 +113,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -167,7 +167,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -175,7 +175,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) @@ -183,7 +183,7 @@ EvtScript N(takeTurn) = { EVT_CASE_EQ(1) EVT_EXEC_WAIT(N(wait)) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kzn2/actor/lava_bud.c b/src/battle/area/kzn2/actor/lava_bud.c index c61c5814a5..a0c38ca6e8 100644 --- a/src/battle/area/kzn2/actor/lava_bud.c +++ b/src/battle/area/kzn2/actor/lava_bud.c @@ -256,7 +256,7 @@ EvtScript N(playModelAnimation) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) EVT_CALL(GetLastElement, LVarE) @@ -313,7 +313,7 @@ EvtScript N(handleEvent) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 1) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -404,7 +404,7 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 11, LVar0) EVT_IF_LE(LVar0, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -461,7 +461,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(playModelAnimation)) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_END_IF EVT_END_IF EVT_END_IF @@ -594,7 +594,7 @@ EvtScript N(summonPetitPiranha) = { EVT_END_IF EVT_CALL(LoadBattleDmaData, 31) EVT_EXEC_WAIT(N(playModelAnimation)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1083,7 +1083,7 @@ EvtScript N(attackPetitSpit) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index b929a05d4c..b34cf3efb7 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -659,7 +659,7 @@ EvtScript N(nextTurn) = { EvtScript N(spawnColorado) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(EnableBattleStatusBar, FALSE) EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, -1, -1, 0, MSG_CH5_0104) EVT_THREAD @@ -720,7 +720,7 @@ EvtScript N(spawnColorado) = { EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(6.0)) EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -300, 0, 0) EVT_CALL(EnableBattleStatusBar, TRUE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -948,7 +948,7 @@ EvtScript N(initVines) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) @@ -1023,7 +1023,7 @@ EvtScript N(handleEvent) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_STOP) EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 1) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1086,7 +1086,7 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 11, LVar0) EVT_IF_LE(LVar0, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, 80, 70, 0) EVT_CALL(SetBattleCamZoom, 300) @@ -1112,7 +1112,7 @@ EvtScript N(takeTurn) = { EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) EVT_CALL(LoadBattleDmaData, 0) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_END_IF EVT_END_IF EVT_END_SWITCH @@ -1182,7 +1182,7 @@ EvtScript N(attackFlameSpew) = { EVT_END_IF EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1206,7 +1206,7 @@ EvtScript N(attackFlameSpew) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1266,7 +1266,7 @@ EvtScript N(attackFireStream) = { EVT_END_IF EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1288,7 +1288,7 @@ EvtScript N(attackFireStream) = { EVT_RETURN EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1640,7 +1640,7 @@ EvtScript N(onDeath) = { EVT_CALL(GetEnemyMaxHP, ACTOR_ENEMY2, LVar0) EVT_CALL(SetEnemyHP, ACTOR_ENEMY2, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_ELSE EVT_CALL(HideHealthBar, ACTOR_ENEMY1) diff --git a/src/battle/area/kzn2/actor/petit_piranha.c b/src/battle/area/kzn2/actor/petit_piranha.c index e59ef77661..9300b47a1a 100644 --- a/src/battle/area/kzn2/actor/petit_piranha.c +++ b/src/battle/area/kzn2/actor/petit_piranha.c @@ -119,7 +119,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE) @@ -205,7 +205,7 @@ EvtScript N(handleEvent) = { EVT_WAIT(1000) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -250,7 +250,7 @@ API_CALLABLE(N(SetFlameX)) { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_IF_GE(LVar1, 41) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PetitPiranha_Anim04) diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index 167ee23ddc..dedde44e0c 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -151,7 +151,7 @@ EvtScript N(80219F4C) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_END_IF EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -217,7 +217,7 @@ EvtScript N(8021A12C) = { EvtScript N(handleEvent_8021A560) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(9) @@ -299,7 +299,7 @@ EvtScript N(handleEvent_8021A560) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -322,7 +322,7 @@ s32 N(intTable_8021AA6C)[] = { EvtScript N(handleEvent_8021AAB8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -541,7 +541,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_END_IF EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -549,7 +549,7 @@ EvtScript N(handleEvent_8021AAB8) = { EvtScript N(takeTurn_8021B81C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 16) @@ -637,7 +637,7 @@ EvtScript N(takeTurn_8021B81C) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -682,7 +682,7 @@ EvtScript N(takeTurn_8021B81C) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_LABEL(10) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -690,7 +690,7 @@ EvtScript N(takeTurn_8021B81C) = { EvtScript N(takeTurn_Chan) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 2) EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) @@ -718,7 +718,7 @@ EvtScript N(takeTurn_Chan) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021A11C))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -782,7 +782,7 @@ EvtScript N(takeTurn_Chan) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_ExitShell) EVT_WAIT(10) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -818,7 +818,7 @@ EvtScript N(takeTurn_Chan) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -841,7 +841,7 @@ EvtScript N(init_8021CCDC) = { EvtScript N(nextTurn_8021CD7C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) @@ -889,7 +889,7 @@ EvtScript N(nextTurn_8021CD7C) = { EVT_BREAK_SWITCH EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -920,7 +920,7 @@ EvtScript N(handleEvent_8021D0CC) = { EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(30) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 2) @@ -937,7 +937,7 @@ EvtScript N(handleEvent_8021D0CC) = { EVT_END_SWITCH EVT_CALL(SetActorVar, ACTOR_SELF, 1, LVar0) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_END_SWITCH EVT_RETURN diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index 39b36db452..fd955c2a44 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -163,7 +163,7 @@ EvtScript N(8021D5C4) = { EvtScript N(handleEvent_8021D600) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -252,7 +252,7 @@ EvtScript N(handleEvent_8021D600) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -260,7 +260,7 @@ EvtScript N(handleEvent_8021D600) = { EvtScript N(flyingTackle) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -296,7 +296,7 @@ EvtScript N(flyingTackle) = { EVT_EXEC_WAIT(N(8021D5C4)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -333,7 +333,7 @@ EvtScript N(flyingTackle) = { EVT_EXEC_WAIT(N(8021D5C4)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -559,7 +559,7 @@ EvtScript N(idle_8021EB14) = { EvtScript N(handleEvent_8021EB24) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -654,7 +654,7 @@ EvtScript N(handleEvent_8021EB24) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -820,7 +820,7 @@ API_CALLABLE(func_80218100_464590) { EvtScript N(EVS_Move_Headbonk) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_EXEC_WAIT(N(8021F514)) EVT_EXEC_WAIT(N(8021F5F8)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -860,7 +860,7 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_WAIT(20) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(8021F08C)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -914,10 +914,10 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(UnkFunc62), LVarA, 3) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CASE_EQ(2) EVT_THREAD EVT_WAIT(4) @@ -938,10 +938,10 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(UnkFunc62), LVarA, 3) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_END_SWITCH EVT_CHILD_THREAD EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) @@ -969,7 +969,7 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_EXEC_WAIT(N(8021F08C)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1002,7 +1002,7 @@ API_CALLABLE(N(CloseTattleWindow)) { EvtScript N(EVS_Move_Tattle) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1036,7 +1036,7 @@ EvtScript N(EVS_Move_Tattle) = { EVT_WAIT(32) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TATTLE_OPEN, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1221,7 +1221,7 @@ s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, EvtScript N(handleEvent_80220908) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -1366,7 +1366,7 @@ EvtScript N(handleEvent_80220908) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1376,7 +1376,7 @@ EvtScript N(handleEvent_80220908) = { EvtScript N(takeTurn_80221200) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_IF_EQ(LVar0, 1) @@ -1419,7 +1419,7 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -2, 38) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PRT_MAIN, -3, -9) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -1524,7 +1524,7 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.5)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1572,7 +1572,7 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1706,7 +1706,7 @@ EvtScript N(idle_80222458) = { EvtScript N(handleEvent_80222468) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -1800,7 +1800,7 @@ EvtScript N(handleEvent_80222468) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1812,7 +1812,7 @@ EvtScript N(handleEvent_80222468) = { EvtScript N(takeTurn_802229C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1863,7 +1863,7 @@ EvtScript N(takeTurn_802229C4) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1926,7 +1926,7 @@ EvtScript N(takeTurn_802229C4) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -2072,7 +2072,7 @@ EvtScript N(idle_80223574) = { EvtScript N(handleEvent_80223584) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -2175,7 +2175,7 @@ EvtScript N(handleEvent_80223584) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -2183,7 +2183,7 @@ EvtScript N(handleEvent_80223584) = { EvtScript N(80223B74) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -2209,7 +2209,7 @@ EvtScript N(80223B74) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 15, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, EASING_QUARTIC_OUT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2005) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Dive) EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) @@ -2229,7 +2229,7 @@ EvtScript N(80223B74) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(20) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) @@ -2237,12 +2237,12 @@ EvtScript N(80223B74) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_PostDive) EVT_WAIT(1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) @@ -2282,7 +2282,7 @@ EvtScript N(80223B74) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -2434,7 +2434,7 @@ EvtScript N(idle_802245FC) = { EvtScript N(handleEvent_8022460C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -2549,7 +2549,7 @@ EvtScript N(handleEvent_8022460C) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -2557,7 +2557,7 @@ EvtScript N(handleEvent_8022460C) = { EvtScript N(takeTurn_80224CA0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(10) EVT_THREAD EVT_SET(LVar0, 200) @@ -2646,7 +2646,7 @@ EvtScript N(takeTurn_80224CA0) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -2739,7 +2739,7 @@ EvtScript N(takeTurn_80224CA0) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -3352,7 +3352,7 @@ EvtScript N(idle_80226B44) = { EvtScript N(handleEvent_80226B54) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -3447,7 +3447,7 @@ EvtScript N(handleEvent_80226B54) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -3455,7 +3455,7 @@ EvtScript N(handleEvent_80226B54) = { EvtScript N(takeTurn_802270BC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -3574,7 +3574,7 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -3692,7 +3692,7 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -3843,7 +3843,7 @@ EvtScript N(idle_80228604) = { EvtScript N(handleEvent_80228614) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -3938,7 +3938,7 @@ EvtScript N(handleEvent_80228614) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -3946,7 +3946,7 @@ EvtScript N(handleEvent_80228614) = { EvtScript N(takeTurn_80228B78) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -4048,7 +4048,7 @@ EvtScript N(takeTurn_80228B78) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -4087,7 +4087,7 @@ EvtScript N(takeTurn_80228B78) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -4162,7 +4162,7 @@ API_CALLABLE(func_80219824_465CB4) { EvtScript N(copyPartner) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 15) @@ -4275,7 +4275,7 @@ EvtScript N(copyPartner) = { EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -4298,7 +4298,7 @@ EvtScript N(takeTurn_80229F9C) = { EvtScript N(nextTurn_8022A038) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) @@ -4328,7 +4328,7 @@ EvtScript N(nextTurn_8022A038) = { EVT_BREAK_SWITCH EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index 095c680295..e93d5bb3a3 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -118,7 +118,7 @@ EvtScript N(idle_8022A494) = { EvtScript N(8022A4A4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -212,7 +212,7 @@ EvtScript N(8022A4A4) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -220,7 +220,7 @@ EvtScript N(8022A4A4) = { EvtScript N(takeTurn_8022AA54) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -270,7 +270,7 @@ EvtScript N(takeTurn_8022AA54) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Run) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -300,7 +300,7 @@ EvtScript N(takeTurn_8022AA54) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Run) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -308,7 +308,7 @@ EvtScript N(takeTurn_8022AA54) = { EvtScript N(nextTurn_8022B06C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) @@ -341,7 +341,7 @@ EvtScript N(nextTurn_8022B06C) = { EVT_BREAK_SWITCH EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -387,7 +387,7 @@ EvtScript N(handleEvent_8022B2CC) = { EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_IF_EQ(LVarA, 1) EVT_IF_GT(LVarB, 2) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -400,7 +400,7 @@ EvtScript N(handleEvent_8022B2CC) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(ActorSpeak, MSG_MAC_Gate_002F, ACTOR_SELF, PRT_MAIN, 0x00A20009, 0x00A20005) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index 72fd9c993b..6edccc2624 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -128,7 +128,7 @@ EvtScript N(idle_8022B8B0) = { EvtScript N(8022B8C0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -222,7 +222,7 @@ EvtScript N(8022B8C0) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -255,12 +255,12 @@ EvtScript N(singleStrike2) = { EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -274,11 +274,11 @@ EvtScript N(singleStrike2) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) @@ -325,7 +325,7 @@ EvtScript N(singleStrike2) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -352,13 +352,13 @@ EvtScript N(doubleStrike2) = { EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -372,12 +372,12 @@ EvtScript N(doubleStrike2) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.0)) @@ -394,11 +394,11 @@ EvtScript N(doubleStrike2) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9)) EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_END_THREAD EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) @@ -455,7 +455,7 @@ EvtScript N(doubleStrike2) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -463,7 +463,7 @@ EvtScript N(doubleStrike2) = { EvtScript N(takeTurn_8022CF48) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(RandInt, 100, LVar0) EVT_SWITCH(LVar0) EVT_CASE_LT(20) @@ -471,7 +471,7 @@ EvtScript N(takeTurn_8022CF48) = { EVT_CASE_DEFAULT EVT_EXEC_WAIT(N(singleStrike2)) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -479,7 +479,7 @@ EvtScript N(takeTurn_8022CF48) = { EvtScript N(nextTurn_8022CFFC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) @@ -564,7 +564,7 @@ EvtScript N(nextTurn_8022CFFC) = { EVT_BREAK_SWITCH EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -610,7 +610,7 @@ EvtScript N(handleEvent_8022D634) = { EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_IF_EQ(LVarA, 1) EVT_IF_GT(LVarB, 2) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -623,7 +623,7 @@ EvtScript N(handleEvent_8022D634) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(ActorSpeak, MSG_MAC_Gate_0034, ACTOR_SELF, PRT_MAIN, 0x00A2000A, 0x00A20006) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index e557927d66..b6c2036502 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -142,7 +142,7 @@ EvtScript N(idle_8022DC34) = { EvtScript N(8022DC44) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -249,7 +249,7 @@ EvtScript N(8022DC44) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -282,12 +282,12 @@ EvtScript N(singleStrike3) = { EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -301,11 +301,11 @@ EvtScript N(singleStrike3) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) @@ -352,7 +352,7 @@ EvtScript N(singleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -379,13 +379,13 @@ EvtScript N(doubleStrike3) = { EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -399,12 +399,12 @@ EvtScript N(doubleStrike3) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.0)) @@ -421,11 +421,11 @@ EvtScript N(doubleStrike3) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9)) EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_END_THREAD EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) @@ -482,7 +482,7 @@ EvtScript N(doubleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -510,13 +510,13 @@ EvtScript N(tripleStrike3) = { EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -530,12 +530,12 @@ EvtScript N(tripleStrike3) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.0)) @@ -551,13 +551,13 @@ EvtScript N(tripleStrike3) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_THREAD - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5)) EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_END_THREAD EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) @@ -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, 1) + 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, 0) + EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_END_THREAD EVT_WAIT(15) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -607,11 +607,11 @@ EvtScript N(tripleStrike3) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedKick) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 3, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(3.0)) @@ -672,7 +672,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -695,13 +695,13 @@ EvtScript N(80230240) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) EVT_WAIT(15) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, 90, 0, EASING_COS_IN_OUT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -722,7 +722,7 @@ EvtScript N(80230240) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -772,7 +772,7 @@ EvtScript N(8023059C) = { EVT_CASE_OR_EQ(2) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -805,7 +805,7 @@ EvtScript N(80230914) = { EVT_CASE_OR_EQ(2) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -813,7 +813,7 @@ EvtScript N(80230914) = { EvtScript N(takeTurn_80230B20) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) @@ -850,7 +850,7 @@ EvtScript N(takeTurn_80230B20) = { EVT_EXEC_WAIT(N(8023059C)) EVT_END_SWITCH EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -858,7 +858,7 @@ EvtScript N(takeTurn_80230B20) = { EvtScript N(nextTurn_80230D44) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) @@ -949,7 +949,7 @@ EvtScript N(nextTurn_80230D44) = { EVT_BREAK_SWITCH EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -995,7 +995,7 @@ EvtScript N(handleEvent_80231408) = { EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_IF_EQ(LVarA, 1) EVT_IF_GT(LVarB, 2) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -1008,7 +1008,7 @@ EvtScript N(handleEvent_80231408) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(ActorSpeak, MSG_MAC_Gate_0039, ACTOR_SELF, PRT_MAIN, 0x00A2000A, 0x00A20006) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index 112a8b2c82..4c68d1850f 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -267,13 +267,13 @@ EvtScript N(EVS_Init) = { EvtScript N(EVS_HandlePhase) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PHASE_PLAYER_BEGIN) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_FlipResistance, 2) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -289,7 +289,7 @@ EvtScript N(EVS_Idle) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVarD) EVT_SWITCH(LVarD) @@ -499,7 +499,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_END_IF EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -513,7 +513,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_IsFlipped, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(SetBattleCamOffsetZ, 20) @@ -535,7 +535,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_ELSE @@ -611,7 +611,7 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_Attack_ShellToss) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 200) @@ -660,7 +660,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_WAIT(8) EVT_CALL(YieldTurn) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_DEFAULT @@ -761,7 +761,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_WAIT(8) EVT_CALL(YieldTurn) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_ELSE @@ -816,7 +816,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim04) EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -824,7 +824,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EvtScript N(EVS_Attack_HeavyStomp) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 280) @@ -920,7 +920,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1007,7 +1007,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_CASE_EQ(HIT_RESULT_3) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c index a885218c6a..9d9612002c 100644 --- a/src/battle/area/omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -143,12 +143,12 @@ s32 N(IdleAnimations3)[] = { EvtScript N(nextTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PHASE_PLAYER_BEGIN) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -295,7 +295,7 @@ EvtScript N(takeTurn) = { EvtScript N(attack_throw_bomb) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_15) @@ -346,7 +346,7 @@ EvtScript N(attack_throw_bomb) = { EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(HIT_RESULT_LUCKY) @@ -372,7 +372,7 @@ EvtScript N(attack_throw_bomb) = { EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -407,7 +407,7 @@ EvtScript N(attack_throw_bomb) = { EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -415,7 +415,7 @@ EvtScript N(attack_throw_bomb) = { EvtScript N(attack_lightning_shot) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -488,7 +488,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(HIT_RESULT_LUCKY) @@ -517,7 +517,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -565,7 +565,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index 19e8571332..7f3cebb22f 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -456,7 +456,7 @@ EvtScript N(init) = { EvtScript N(nextTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PHASE_PLAYER_BEGIN) @@ -512,7 +512,7 @@ EvtScript N(nextTurn) = { EVT_END_IF EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1113,7 +1113,7 @@ EvtScript N(onDeath) = { EvtScript N(attack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1215,7 +1215,7 @@ EvtScript N(attack) = { EVT_EXEC_WAIT(N(move_squad_to_home)) EVT_SET(LVar1, ANIM_ShySquadGuy_Anim01) EVT_EXEC_WAIT(N(set_alive_guys_animation)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1272,7 +1272,7 @@ EvtScript N(attack) = { EVT_EXEC_WAIT(N(move_squad_to_home)) EVT_SET(LVar1, ANIM_ShySquadGuy_Anim01) EVT_EXEC_WAIT(N(set_alive_guys_animation)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index f7fb34466a..d6277ec1d6 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -253,7 +253,7 @@ EvtScript N(init) = { EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, PRT_4, ACTOR_PART_TARGET_FLAG_1, TRUE) EVT_CALL(SetPartSize, ACTOR_SELF, PRT_MAIN, 24, 30) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_8, 0, 13, 0) EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_7, 0, 13, 0) EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_6, 0, 13, 0) @@ -435,7 +435,7 @@ EvtScript N(init) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) @@ -650,7 +650,7 @@ EvtScript N(takeTurn) = { EvtScript N(attack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamOffsetZ, 40) @@ -703,7 +703,7 @@ EvtScript N(attack) = { EVT_EXEC_WAIT(N(return_home)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -741,7 +741,7 @@ EvtScript N(attack) = { EVT_EXEC_WAIT(N(return_home)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1061,7 +1061,7 @@ EvtScript N(shy_guy_handleEvent) = { EvtScript N(shy_guy_attack1) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1112,7 +1112,7 @@ EvtScript N(shy_guy_attack1) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1148,7 +1148,7 @@ EvtScript N(shy_guy_attack1) = { EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(shy_guy_return_home)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1156,7 +1156,7 @@ EvtScript N(shy_guy_attack1) = { EvtScript N(shy_guy_attack2) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1223,7 +1223,7 @@ EvtScript N(shy_guy_attack2) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1309,7 +1309,7 @@ EvtScript N(shy_guy_attack2) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index 3acd14c942..e6339908e4 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -361,7 +361,7 @@ EvtScript N(init) = { EVT_CALL(SetActorVar, ACTOR_SELF, 6, ANIM_ShyStackGuy_Anim1B) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET(LVar0, 10) @@ -489,7 +489,7 @@ EvtScript N(init) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_14, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_END_THREAD EVT_ELSE @@ -628,7 +628,7 @@ EvtScript N(init) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_14, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 2, 4) EVT_END_THREAD @@ -1259,7 +1259,7 @@ EvtScript N(80235168) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1344,7 +1344,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(15) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/omo2_5/actor/shy_squad_dup.c b/src/battle/area/omo2_5/actor/shy_squad_dup.c index 83bddee5da..327ce2556d 100644 --- a/src/battle/area/omo2_5/actor/shy_squad_dup.c +++ b/src/battle/area/omo2_5/actor/shy_squad_dup.c @@ -1074,7 +1074,7 @@ EvtScript N(run_away) = { EvtScript N(attack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -1148,7 +1148,7 @@ EvtScript N(attack) = { EVT_EXEC_WAIT(N(run_squad_to_pos)) EVT_SET(LVar1, ANIM_TankGuy_Anim01) EVT_EXEC_WAIT(N(set_squad_animation)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1190,7 +1190,7 @@ EvtScript N(attack) = { EVT_EXEC_WAIT(N(run_squad_to_pos)) EVT_SET(LVar1, ANIM_TankGuy_Anim01) EVT_EXEC_WAIT(N(set_squad_animation)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index c146b5360f..c61ad24376 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -530,7 +530,7 @@ EvtScript N(attackHeavyJump) = { EVT_EXEC_WAIT(N(checkExtinguish)) EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 260) @@ -581,7 +581,7 @@ EvtScript N(attackHeavyJump) = { EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(returnHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -630,7 +630,7 @@ EvtScript N(attackHeavyJump) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -640,7 +640,7 @@ EvtScript N(attackLightBeam) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_MOVE_ID), N(MOVE_HEAVY_JUMP)) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LIGHT_BEAM_COUNTER), 3) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) EVT_CALL(SetBattleCamZoom, 240) @@ -734,7 +734,7 @@ EvtScript N(attackLightBeam) = { EVT_WAIT(60) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(returnHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -745,7 +745,7 @@ EvtScript N(extinguish) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_6), 1000) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_MOVE_ID), N(MOVE_LIGHT_BEAM)) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SPEAK_FLAGS), LVar0) EVT_IF_NOT_FLAG(LVar0, 2) EVT_BITWISE_OR_CONST(LVar0, 2) @@ -803,7 +803,7 @@ EvtScript N(extinguish) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01) EVT_EXEC_WAIT(N(setGhostNoTarget)) EVT_WAIT(30) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index 03da43c309..e8a408b904 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -330,7 +330,7 @@ EvtScript N(FlyWithClones) = { }; EvtScript N(RemoveClone) = { - EVT_CALL(EnableActorBlur, LVar9, 1) + EVT_CALL(EnableActorBlur, LVar9, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorFlagBits, LVar9, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_THREAD EVT_CALL(GetActorPartOpacity, LVar9, 1, LVar3) @@ -543,7 +543,7 @@ EvtScript N(OnDeath) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) EVT_BITWISE_OR_CONST(LVar0, N(FLAG_NOT_IDLE)) EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) @@ -795,7 +795,7 @@ EvtScript N(handleEvent) = { EVT_CALL(GetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) EVT_BITWISE_AND_CONST(LVar0, ~N(FLAG_NOT_IDLE)) EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -931,7 +931,7 @@ EvtScript N(takeTurn) = { EvtScript N(AttackIcyBreath) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -986,7 +986,7 @@ EvtScript N(AttackIcyBreath) = { EVT_END_IF EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -1020,7 +1020,7 @@ EvtScript N(AttackIcyBreath) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1028,7 +1028,7 @@ EvtScript N(AttackIcyBreath) = { EvtScript N(AttackIceBolt) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1095,7 +1095,7 @@ EvtScript N(AttackIceBolt) = { EVT_END_IF EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -1147,7 +1147,7 @@ EvtScript N(AttackIceBolt) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1285,11 +1285,11 @@ EvtScript N(MakeIllusions) = { EVT_CALL(SetAnimation, LVar0, 1, ANIM_CrystalKing_Anim09) EVT_CALL(UseIdleAnimation, LVar0, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DF) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVar0) - EVT_CALL(EnableActorBlur, LVar0, 1) + EVT_CALL(EnableActorBlur, LVar0, IDLE_SCRIPT_DISABLE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE2_ID), LVar0) - EVT_CALL(EnableActorBlur, LVar0, 1) + EVT_CALL(EnableActorBlur, LVar0, IDLE_SCRIPT_DISABLE) EVT_THREAD EVT_CALL(MakeLerp, 0, 0x00001AB8, 210, EASING_COS_IN_OUT) EVT_LABEL(0) @@ -1389,17 +1389,17 @@ EvtScript N(MakeIllusions) = { EVT_WAIT(90) EVT_WAIT(30) EVT_WAIT(30) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVarA) - EVT_CALL(EnableActorBlur, LVarA, 0) + EVT_CALL(EnableActorBlur, LVarA, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVarA) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE2_ID), LVarA) - EVT_CALL(EnableActorBlur, LVarA, 0) + EVT_CALL(EnableActorBlur, LVarA, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVarA) @@ -1450,7 +1450,7 @@ EvtScript N(CrystalBitAppear) = { EVT_CALL(SetPartAlpha, LVar0, 1, 0) EVT_THREAD EVT_WAIT(30) - EVT_CALL(EnableActorBlur, LVar0, 1) + EVT_CALL(EnableActorBlur, LVar0, IDLE_SCRIPT_DISABLE) EVT_SET(LVar9, LVar0) EVT_CALL(MakeLerp, 0, 255, 90, EASING_LINEAR) EVT_LABEL(0) @@ -1475,14 +1475,14 @@ EvtScript N(CrystalBitAppear) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(EnableActorBlur, ArrayVar(0), 0) + EVT_CALL(EnableActorBlur, ArrayVar(0), IDLE_SCRIPT_ENABLE) EVT_RETURN EVT_END }; EvtScript N(SummonCrystalBits) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 15) @@ -1537,7 +1537,7 @@ EvtScript N(SummonCrystalBits) = { EVT_CALL(ForceHomePos, LVar0, 42, 85, -10) EVT_CALL(HPBarToHome, LVar0) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1846,7 +1846,7 @@ EvtScript N(AttackWithCrystalBit) = { EvtScript N(NormalAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1927,7 +1927,7 @@ EvtScript N(NormalAttack) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(30) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -1964,7 +1964,7 @@ EvtScript N(NormalAttack) = { EVT_WAIT(1) EVT_GOTO(4) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1985,7 +1985,7 @@ EvtScript N(Heal) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, LVarA, FALSE) EVT_CALL(EnableIdleScript, LVarA, 0) @@ -2059,7 +2059,7 @@ EvtScript N(Heal) = { EVT_END_IF EVT_CALL(WaitForBuffDone) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(EnableIdleScript, LVarA, 1) diff --git a/src/battle/area/tik2/actor/blooper.c b/src/battle/area/tik2/actor/blooper.c index 9e15216635..7f29765f21 100644 --- a/src/battle/area/tik2/actor/blooper.c +++ b/src/battle/area/tik2/actor/blooper.c @@ -282,7 +282,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -357,7 +357,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -388,7 +388,7 @@ EvtScript N(takeTurn) = { EvtScript N(attackSpinDrop) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -441,7 +441,7 @@ EvtScript N(attackSpinDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -478,7 +478,7 @@ EvtScript N(attackSpinDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -489,7 +489,7 @@ EvtScript N(attackSpinDrop) = { EvtScript N(attackInkBlast) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -569,7 +569,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -583,7 +583,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index a5ab84e804..a3005ef507 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -306,7 +306,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -383,7 +383,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -398,7 +398,7 @@ EvtScript N(onDeath) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -430,7 +430,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -449,7 +449,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -673,7 +673,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index ee947dd925..ef453a8bad 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -383,7 +383,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -473,7 +473,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -517,7 +517,7 @@ EvtScript N(takeTurn) = { EvtScript N(electricCharge) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 65) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -541,7 +541,7 @@ EvtScript N(electricCharge) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(N(UnfadeBackgroundToBlack)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_RETURN @@ -550,7 +550,7 @@ EvtScript N(electricCharge) = { EvtScript N(attackSpinDrop) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -603,7 +603,7 @@ EvtScript N(attackSpinDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -640,7 +640,7 @@ EvtScript N(attackSpinDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -648,7 +648,7 @@ EvtScript N(attackSpinDrop) = { EvtScript N(attackElectricDrop) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) @@ -700,7 +700,7 @@ EvtScript N(attackElectricDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -740,7 +740,7 @@ EvtScript N(attackElectricDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -748,7 +748,7 @@ EvtScript N(attackElectricDrop) = { EvtScript N(attackInkBlast) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -828,7 +828,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -842,7 +842,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/tik2/actor/super_blooper.c b/src/battle/area/tik2/actor/super_blooper.c index f717d891fe..f9a0ba708c 100644 --- a/src/battle/area/tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -339,7 +339,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -427,7 +427,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -496,7 +496,7 @@ EvtScript N(takeTurn) = { EvtScript N(attackSpinDrop) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SET(LVar1, 100) @@ -531,7 +531,7 @@ EvtScript N(attackSpinDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -566,7 +566,7 @@ EvtScript N(attackSpinDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -574,7 +574,7 @@ EvtScript N(attackSpinDrop) = { EvtScript N(attackInkBlast) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -644,7 +644,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -658,7 +658,7 @@ EvtScript N(attackInkBlast) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -666,7 +666,7 @@ EvtScript N(attackInkBlast) = { EvtScript N(makeBabies) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07) @@ -727,7 +727,7 @@ EvtScript N(makeBabies) = { EVT_WAIT(2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0C) EVT_CALL(N(UnfadeBackgroundToBlack)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_RETURN @@ -736,7 +736,7 @@ EvtScript N(makeBabies) = { EvtScript N(getEnraged) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07) @@ -761,7 +761,7 @@ EvtScript N(getEnraged) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(N(UnfadeBackgroundToBlack)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_RETURN @@ -770,7 +770,7 @@ EvtScript N(getEnraged) = { EvtScript N(attackEnragedDrops) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SET(LVar1, 100) @@ -806,7 +806,7 @@ EvtScript N(attackEnragedDrops) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -866,7 +866,7 @@ EvtScript N(attackEnragedDrops) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_EXEC_WAIT(N(unEnrage)) EVT_EXEC_WAIT(N(FloatToHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c b/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c index e2f530b95b..f1f0843228 100644 --- a/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c +++ b/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c @@ -607,7 +607,7 @@ EvtScript N(HandleCommand) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(4) @@ -621,7 +621,7 @@ EvtScript N(HandleCommand) = { EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) EVT_SET(LVar0, 0) @@ -688,7 +688,7 @@ EvtScript N(HandleCommand) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 60) EVT_WAIT(60) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(AVAL_Koopa_State_PosD) @@ -703,7 +703,7 @@ EvtScript N(HandleCommand) = { EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) EVT_SET(LVar0, 0) @@ -799,13 +799,13 @@ EvtScript N(HandleCommand) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) EVT_SET(LVar0, 0) @@ -871,7 +871,7 @@ s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -974,7 +974,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/area/trd_part_3/actor/eldstar.c b/src/battle/area/trd_part_3/actor/eldstar.c index 59ef0123cd..93d530b004 100644 --- a/src/battle/area/trd_part_3/actor/eldstar.c +++ b/src/battle/area/trd_part_3/actor/eldstar.c @@ -209,10 +209,10 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(ActorSpeak, MSG_CH1_0114, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_THREAD - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalPos, ACTOR_SELF, -110, 100, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_WAIT(10) @@ -221,9 +221,9 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(N(StopBlinkingSP)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(ActorSpeak, MSG_CH1_0115, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) @@ -279,10 +279,10 @@ EvtScript N(EVS_ManageTutorial) = { EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_THREAD - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalPos, ACTOR_SELF, -110, 100, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_WAIT(10) @@ -293,9 +293,9 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(ActorSpeak, MSG_CH1_011A, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) EVT_CALL(ActorSpeak, MSG_CH1_011B, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) diff --git a/src/battle/btl_evt_library.c b/src/battle/btl_evt_library.c index cb0c15e5bb..99c5387345 100644 --- a/src/battle/btl_evt_library.c +++ b/src/battle/btl_evt_library.c @@ -1785,7 +1785,7 @@ EvtScript EVS_Enemy_ScareAway = { EVT_WAIT(17) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_WAIT(3) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_ADD(LVarA, 300) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) diff --git a/src/battle/common/actor/albino_dino.inc.c b/src/battle/common/actor/albino_dino.inc.c index 94bb171aa7..3a45505ba1 100644 --- a/src/battle/common/actor/albino_dino.inc.c +++ b/src/battle/common/actor/albino_dino.inc.c @@ -135,7 +135,7 @@ EvtScript N(returnHome) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -222,7 +222,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -252,7 +252,7 @@ EvtScript N(stamp) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -292,7 +292,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -331,7 +331,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/amazy_dayzee.inc.c b/src/battle/common/actor/amazy_dayzee.inc.c index 50906190b0..163f47595e 100644 --- a/src/battle/common/actor/amazy_dayzee.inc.c +++ b/src/battle/common/actor/amazy_dayzee.inc.c @@ -346,13 +346,13 @@ EvtScript N(flee) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Amazy_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0)) EVT_ADD(LVar0, 200) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(RemoveActor, ACTOR_SELF) diff --git a/src/battle/common/actor/anti_guy.inc.c b/src/battle/common/actor/anti_guy.inc.c index fcdf4736b1..d5d9cc185a 100644 --- a/src/battle/common/actor/anti_guy.inc.c +++ b/src/battle/common/actor/anti_guy.inc.c @@ -242,7 +242,7 @@ EvtScript N(handleEvent_80221C20) = { EvtScript N(802220FC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -293,7 +293,7 @@ EvtScript N(802220FC) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -329,7 +329,7 @@ EvtScript N(802220FC) = { EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(80221BBC)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -337,7 +337,7 @@ EvtScript N(802220FC) = { EvtScript N(80222824) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -404,7 +404,7 @@ EvtScript N(80222824) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -490,7 +490,7 @@ EvtScript N(80222824) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index 4bf10c015b..483e6eb985 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -296,7 +296,7 @@ EvtScript N(EVS_DropCoin) = { EVT_END_IF EVT_GOTO(5) EVT_LABEL(10) - EVT_CALL(EnableActorBlur, LVarA, 1) + EVT_CALL(EnableActorBlur, LVarA, IDLE_SCRIPT_DISABLE) EVT_CALL(SetTargetActor, LVarA, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, LVarA) EVT_CALL(JumpToGoal, LVarA, 15, FALSE, FALSE, FALSE) @@ -314,7 +314,7 @@ EvtScript N(EVS_DropCoin) = { EvtScript N(EVS_HandleEvent) = { EVT_USE_ARRAY(EVT_PTR(N(DropCoinScript))) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -492,7 +492,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bandit_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -500,7 +500,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) // if carrying a coin, run away EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_HasCoin, LVar0) @@ -577,7 +577,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bandit_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -699,7 +699,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/bill_blaster.inc.c b/src/battle/common/actor/bill_blaster.inc.c index 7b112e406e..1a2b0a385c 100644 --- a/src/battle/common/actor/bill_blaster.inc.c +++ b/src/battle/common/actor/bill_blaster.inc.c @@ -131,7 +131,7 @@ EvtScript N(EVS_Idle) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -185,7 +185,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -193,7 +193,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_HasBullet, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) @@ -201,7 +201,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CASE_EQ(1) EVT_EXEC_WAIT(N(EVS_Move_CheckForBullet)) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/blue_shy_guy.inc.c b/src/battle/common/actor/blue_shy_guy.inc.c index 17681c717c..b83078e613 100644 --- a/src/battle/common/actor/blue_shy_guy.inc.c +++ b/src/battle/common/actor/blue_shy_guy.inc.c @@ -231,7 +231,7 @@ EvtScript N(handleEvent_8021B028) = { EvtScript N(8021B504) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -282,7 +282,7 @@ EvtScript N(8021B504) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -318,7 +318,7 @@ EvtScript N(8021B504) = { EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(8021AFC4)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -326,7 +326,7 @@ EvtScript N(8021B504) = { EvtScript N(8021BC2C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -393,7 +393,7 @@ EvtScript N(8021BC2C) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -479,7 +479,7 @@ EvtScript N(8021BC2C) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/bob_omb.inc.c b/src/battle/common/actor/bob_omb.inc.c index a9e5d00f25..1bc300350f 100644 --- a/src/battle/common/actor/bob_omb.inc.c +++ b/src/battle/common/actor/bob_omb.inc.c @@ -231,7 +231,7 @@ EvtScript N(EVS_Explode) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -371,7 +371,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -379,7 +379,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_HandleEvent_Ignited) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -503,7 +503,7 @@ EvtScript N(EVS_HandleEvent_Ignited) = { EVT_EXEC_WAIT(N(EVS_Defuse)) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -687,7 +687,7 @@ EvtScript N(EVS_Attack_Blast) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Ignited, LVar0) EVT_IF_FALSE(LVar0) EVT_EXEC_WAIT(N(EVS_Attack_Tackle)) @@ -695,7 +695,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_EXEC_WAIT(N(EVS_Attack_Blast)) EVT_RETURN EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/bony_beetle.inc.c b/src/battle/common/actor/bony_beetle.inc.c index 5168a81f15..45f2709556 100644 --- a/src/battle/common/actor/bony_beetle.inc.c +++ b/src/battle/common/actor/bony_beetle.inc.c @@ -210,7 +210,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_STATE), LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(N(STATE_NORMAL)) @@ -230,7 +230,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_WAS_HIT), 0) EVT_END_IF EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -414,7 +414,7 @@ EvtScript N(handleEvent_normal) = { EvtScript N(attackShellToss) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -471,7 +471,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim04) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -508,7 +508,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim04) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -651,7 +651,7 @@ EvtScript N(handleEvent_spiky) = { EvtScript N(attackSpikeBounce) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -773,7 +773,7 @@ EvtScript N(attackSpikeBounce) = { EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -853,7 +853,7 @@ EvtScript N(attackSpikeBounce) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -989,7 +989,7 @@ EvtScript N(handleEvent_flipped) = { EvtScript N(standUp) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), LVar0) EVT_SUB(LVar0, 1) @@ -1019,7 +1019,7 @@ EvtScript N(standUp) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1122,7 +1122,7 @@ EvtScript N(handleEvent_spiky_flipped) = { EvtScript N(standUp_spiky) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), LVar0) EVT_SUB(LVar0, 1) @@ -1153,7 +1153,7 @@ EvtScript N(standUp_spiky) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/bullet_bill.inc.c b/src/battle/common/actor/bullet_bill.inc.c index ff41a445e3..3c970745ee 100644 --- a/src/battle/common/actor/bullet_bill.inc.c +++ b/src/battle/common/actor/bullet_bill.inc.c @@ -161,7 +161,7 @@ EvtScript N(EVS_Explode) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -233,7 +233,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -241,7 +241,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index b47974f7da..5027bd62a2 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -153,7 +153,7 @@ EvtScript N(init) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_END_IF EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -219,7 +219,7 @@ EvtScript N(fallOff) = { EvtScript N(handleEvent_ceiling) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -301,7 +301,7 @@ EvtScript N(handleEvent_ceiling) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -320,7 +320,7 @@ s32 N(FlipPosOffsets)[] = { 7, 13, 17, 21, 23, 24, 23, 21, 17, 13, 7, 0, 4, 7, EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -539,7 +539,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -547,7 +547,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn_ceiling) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 16) @@ -635,7 +635,7 @@ EvtScript N(takeTurn_ceiling) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim01) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -680,7 +680,7 @@ EvtScript N(takeTurn_ceiling) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_LABEL(10) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -688,7 +688,7 @@ EvtScript N(takeTurn_ceiling) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 2) EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) @@ -716,7 +716,7 @@ EvtScript N(takeTurn) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -780,7 +780,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim0D) EVT_WAIT(10) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -816,7 +816,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index 922b9adb18..f8f05c4b86 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -219,7 +219,7 @@ EvtScript N(returnHome) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -321,7 +321,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -329,7 +329,7 @@ EvtScript N(handleEvent) = { EvtScript N(attackThornStab) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -367,7 +367,7 @@ EvtScript N(attackThornStab) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -395,7 +395,7 @@ EvtScript N(attackThornStab) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -469,7 +469,7 @@ EvtScript N(8021B77C) = { EvtScript N(attackSwarmSting) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -614,7 +614,7 @@ EvtScript N(attackSwarmSting) = { EVT_WAIT(30) EVT_CALL(StopSound, SOUND_358) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -725,7 +725,7 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/cleft.inc.c b/src/battle/common/actor/cleft.inc.c index ce4f2bc65e..66d4ea3692 100644 --- a/src/battle/common/actor/cleft.inc.c +++ b/src/battle/common/actor/cleft.inc.c @@ -176,7 +176,7 @@ EvtScript N(80218944) = { EvtScript N(handleEvent_80218C3C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -372,7 +372,7 @@ EvtScript N(handleEvent_80218C3C) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -380,7 +380,7 @@ EvtScript N(handleEvent_80218C3C) = { EvtScript N(802197AC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(3.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim03) @@ -426,7 +426,7 @@ EvtScript N(802197AC) = { EVT_CALL(N(SetSpinSmashable), 1) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -434,7 +434,7 @@ EvtScript N(802197AC) = { EvtScript N(80219BA0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -497,7 +497,7 @@ EvtScript N(80219BA0) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim02) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -534,7 +534,7 @@ EvtScript N(80219BA0) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim02) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index d41d0d6dd0..fa14f1d2b6 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -109,7 +109,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -199,7 +199,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -207,7 +207,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -256,7 +256,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -283,7 +283,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/crazee_dayzee.inc.c b/src/battle/common/actor/crazee_dayzee.inc.c index ee91a985fa..c05ba79bbd 100644 --- a/src/battle/common/actor/crazee_dayzee.inc.c +++ b/src/battle/common/actor/crazee_dayzee.inc.c @@ -339,13 +339,13 @@ EvtScript N(flee) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0)) EVT_ADD(LVar0, 200) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(RemoveActor, ACTOR_SELF) diff --git a/src/battle/common/actor/dark_koopa.inc.c b/src/battle/common/actor/dark_koopa.inc.c index f889676673..a8c3308801 100644 --- a/src/battle/common/actor/dark_koopa.inc.c +++ b/src/battle/common/actor/dark_koopa.inc.c @@ -347,7 +347,7 @@ s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) @@ -565,7 +565,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -573,7 +573,7 @@ EvtScript N(handleEvent) = { EvtScript N(attackShellToss) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -642,7 +642,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -678,7 +678,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -692,7 +692,7 @@ EvtScript N(attackDizzyTornado) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -784,7 +784,7 @@ EvtScript N(attackDizzyTornado) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Scramble) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -792,7 +792,7 @@ EvtScript N(attackDizzyTornado) = { EvtScript N(standUp) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) @@ -846,7 +846,7 @@ EvtScript N(standUp) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_active))) EVT_END_SWITCH EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/dark_paratroopa.inc.c b/src/battle/common/actor/dark_paratroopa.inc.c index 72680a9b74..9f34ce40a2 100644 --- a/src/battle/common/actor/dark_paratroopa.inc.c +++ b/src/battle/common/actor/dark_paratroopa.inc.c @@ -295,7 +295,7 @@ EvtScript N(returnHome) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -422,7 +422,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -430,7 +430,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) @@ -512,7 +512,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -564,7 +564,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -899,7 +899,7 @@ s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, EvtScript N(handleEvent_koopa) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) @@ -1117,7 +1117,7 @@ EvtScript N(handleEvent_koopa) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1125,7 +1125,7 @@ EvtScript N(handleEvent_koopa) = { EvtScript N(koopa_attackShellToss) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -1194,7 +1194,7 @@ EvtScript N(koopa_attackShellToss) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1230,7 +1230,7 @@ EvtScript N(koopa_attackShellToss) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1244,7 +1244,7 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -1336,7 +1336,7 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Scramble) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1344,7 +1344,7 @@ EvtScript N(koopa_attackDizzyTornado) = { EvtScript N(koopa_standUp) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) @@ -1398,7 +1398,7 @@ EvtScript N(koopa_standUp) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_koopa_active))) EVT_END_SWITCH EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/dry_bones.inc.c b/src/battle/common/actor/dry_bones.inc.c index 6f932b3540..471ac5cf21 100644 --- a/src/battle/common/actor/dry_bones.inc.c +++ b/src/battle/common/actor/dry_bones.inc.c @@ -288,7 +288,7 @@ EvtScript N(reassemble) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -403,7 +403,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -423,7 +423,7 @@ EvtScript N(rotateBone) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -462,7 +462,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(10) EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -509,7 +509,7 @@ EvtScript N(takeTurn) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -541,7 +541,7 @@ EvtScript N(takeTurn) = { EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index 5efb933c9a..6fd2e6ec00 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -146,7 +146,7 @@ EvtScript N(returnHome) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -235,7 +235,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -243,7 +243,7 @@ EvtScript N(handleEvent) = { EvtScript N(attack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -277,7 +277,7 @@ EvtScript N(attack) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -314,7 +314,7 @@ EvtScript N(attack) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -610,7 +610,7 @@ API_CALLABLE(N(CopyPriority)) { EvtScript N(copyPartner) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_WAIT(15) @@ -720,7 +720,7 @@ EvtScript N(copyPartner) = { EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/duplighost/ghost_bombette.inc.c b/src/battle/common/actor/duplighost/ghost_bombette.inc.c index 36d1c81c72..1e768cad7c 100644 --- a/src/battle/common/actor/duplighost/ghost_bombette.inc.c +++ b/src/battle/common/actor/duplighost/ghost_bombette.inc.c @@ -121,7 +121,7 @@ EvtScript N(bombette_playEffects) = { EvtScript N(bombette_handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -234,7 +234,7 @@ EvtScript N(bombette_handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -244,7 +244,7 @@ EvtScript N(bombette_handleEvent) = { EvtScript N(bombette_takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -295,7 +295,7 @@ EvtScript N(bombette_takeTurn) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -358,7 +358,7 @@ EvtScript N(bombette_takeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/duplighost/ghost_bow.inc.c b/src/battle/common/actor/duplighost/ghost_bow.inc.c index 3e96a8bd34..5376d31701 100644 --- a/src/battle/common/actor/duplighost/ghost_bow.inc.c +++ b/src/battle/common/actor/duplighost/ghost_bow.inc.c @@ -119,7 +119,7 @@ EvtScript N(bow_idle) = { EvtScript N(bow_handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -220,7 +220,7 @@ EvtScript N(bow_handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -228,7 +228,7 @@ EvtScript N(bow_handleEvent) = { EvtScript N(bow_takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_APPEAR) EVT_THREAD @@ -321,7 +321,7 @@ EvtScript N(bow_takeTurn) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -415,7 +415,7 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/duplighost/ghost_goombario.inc.c b/src/battle/common/actor/duplighost/ghost_goombario.inc.c index 1cd9d7a135..9f5e076533 100644 --- a/src/battle/common/actor/duplighost/ghost_goombario.inc.c +++ b/src/battle/common/actor/duplighost/ghost_goombario.inc.c @@ -131,7 +131,7 @@ EvtScript N(goombario_idle) = { EvtScript N(goombario_handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -230,7 +230,7 @@ EvtScript N(goombario_handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -331,7 +331,7 @@ EvtScript N(goombario_8021C7FC) = { EvtScript N(EVS_Move_Headbonk) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_EXEC_WAIT(N(goombario_runToPlayer)) EVT_EXEC_WAIT(N(goombario_8021C7FC)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -373,7 +373,7 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_WAIT(20) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(goombario_returnBack)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -428,11 +428,11 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_281) EVT_CALL(N(UnkFunc62), LVarA, 3) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CASE_EQ(2) EVT_THREAD EVT_WAIT(4) @@ -453,11 +453,11 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_281) EVT_CALL(N(UnkFunc62), LVarA, 3) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_END_SWITCH EVT_CHILD_THREAD EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) @@ -485,7 +485,7 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_EXEC_WAIT(N(goombario_returnBack)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -493,7 +493,7 @@ EvtScript N(EVS_Move_Headbonk) = { EvtScript N(EVS_Move_Tattle) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -529,7 +529,7 @@ EvtScript N(EVS_Move_Tattle) = { EVT_CALL(EnableBattleStatusBar, TRUE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TATTLE_OPEN, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/duplighost/ghost_kooper.inc.c b/src/battle/common/actor/duplighost/ghost_kooper.inc.c index c86e5cd931..afcff4b9ad 100644 --- a/src/battle/common/actor/duplighost/ghost_kooper.inc.c +++ b/src/battle/common/actor/duplighost/ghost_kooper.inc.c @@ -172,7 +172,7 @@ s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, EvtScript N(kooper_handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -325,7 +325,7 @@ EvtScript N(kooper_handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -333,7 +333,7 @@ EvtScript N(kooper_handleEvent) = { EvtScript N(kooper_takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_IF_EQ(LVar0, 1) @@ -376,7 +376,7 @@ EvtScript N(kooper_takeTurn) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -2, 38) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PRT_MAIN, -3, -9) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -481,7 +481,7 @@ EvtScript N(kooper_takeTurn) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.5)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -529,7 +529,7 @@ EvtScript N(kooper_takeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c index 12053c52f2..79512c4e9f 100644 --- a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c +++ b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c @@ -124,7 +124,7 @@ EvtScript N(lakilester_idle) = { EvtScript N(lakilester_handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -227,7 +227,7 @@ EvtScript N(lakilester_handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -235,7 +235,7 @@ EvtScript N(lakilester_handleEvent) = { EvtScript N(lakilester_takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -337,7 +337,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -376,7 +376,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c index 395fb2f672..36e6b56007 100644 --- a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c +++ b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c @@ -119,7 +119,7 @@ EvtScript N(parakarry_idle) = { EvtScript N(parakarry_handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -226,7 +226,7 @@ EvtScript N(parakarry_handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -234,7 +234,7 @@ EvtScript N(parakarry_handleEvent) = { EvtScript N(parakarry_doTakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -260,7 +260,7 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 15, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, EASING_QUARTIC_OUT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2005) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Dive) EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) @@ -280,7 +280,7 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(20) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) @@ -288,12 +288,12 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_PostDive) EVT_WAIT(1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) @@ -333,7 +333,7 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/duplighost/ghost_sushie.inc.c b/src/battle/common/actor/duplighost/ghost_sushie.inc.c index de07245b3f..10886969dc 100644 --- a/src/battle/common/actor/duplighost/ghost_sushie.inc.c +++ b/src/battle/common/actor/duplighost/ghost_sushie.inc.c @@ -103,7 +103,7 @@ EvtScript N(sushie_idle) = { EvtScript N(sushie_handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -202,7 +202,7 @@ EvtScript N(sushie_handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -210,7 +210,7 @@ EvtScript N(sushie_handleEvent) = { EvtScript N(sushie_takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -329,7 +329,7 @@ EvtScript N(sushie_takeTurn) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -447,7 +447,7 @@ EvtScript N(sushie_takeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index 8405cd94ae..0a4f5f2f80 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -344,7 +344,7 @@ EvtScript N(split) = { EvtScript N(handleEvent_8021B8BC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(9) @@ -444,7 +444,7 @@ EvtScript N(handleEvent_8021B8BC) = { EVT_CASE_EQ(61) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -452,7 +452,7 @@ EvtScript N(handleEvent_8021B8BC) = { EvtScript N(8021BE64) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -502,7 +502,7 @@ EvtScript N(8021BE64) = { EVT_EXEC_WAIT(N(8021B2FC)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -527,7 +527,7 @@ EvtScript N(8021BE64) = { EVT_EXEC_WAIT(N(8021B2FC)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -570,7 +570,7 @@ EvtScript N(8021C5F8) = { EvtScript N(8021C654) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -621,7 +621,7 @@ EvtScript N(8021C654) = { EVT_WAIT(20) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -646,7 +646,7 @@ EvtScript N(8021C654) = { EVT_EXEC_WAIT(N(8021B2FC)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -654,7 +654,7 @@ EvtScript N(8021C654) = { EvtScript N(8021CBC8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -701,7 +701,7 @@ EvtScript N(8021CBC8) = { EVT_EXEC_WAIT(N(8021B2FC)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -738,7 +738,7 @@ EvtScript N(8021CBC8) = { EVT_EXEC_WAIT(N(8021B2FC)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/forest_fuzzy.inc.c b/src/battle/common/actor/forest_fuzzy.inc.c index 8d0fe93d2e..6151e5474b 100644 --- a/src/battle/common/actor/forest_fuzzy.inc.c +++ b/src/battle/common/actor/forest_fuzzy.inc.c @@ -113,7 +113,7 @@ EvtScript N(idle_80218574) = { EvtScript N(handleEvent_80218584) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) @@ -230,7 +230,7 @@ EvtScript N(handleEvent_80218584) = { EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -238,7 +238,7 @@ EvtScript N(handleEvent_80218584) = { EvtScript N(80218C48) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2) @@ -289,7 +289,7 @@ EvtScript N(80218C48) = { EVT_CASE_EQ(1) EVT_CALL(SetActorVar, LVar0, 0, 2) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -299,7 +299,7 @@ EvtScript N(80218C48) = { EvtScript N(80219054) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -374,7 +374,7 @@ EvtScript N(80219054) = { EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -504,7 +504,7 @@ EvtScript N(80219054) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/frost_piranha.inc.c b/src/battle/common/actor/frost_piranha.inc.c index 22cb4fb8c5..14a3587f2d 100644 --- a/src/battle/common/actor/frost_piranha.inc.c +++ b/src/battle/common/actor/frost_piranha.inc.c @@ -140,7 +140,7 @@ EvtScript N(return_home) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -226,7 +226,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -255,7 +255,7 @@ EvtScript N(takeTurn) = { EvtScript N(attack_bite) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -348,7 +348,7 @@ EvtScript N(attack_bite) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -389,7 +389,7 @@ EvtScript N(attack_bite) = { EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -399,7 +399,7 @@ EvtScript N(attack_bite) = { EvtScript N(attack_icy_breath) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -457,7 +457,7 @@ EvtScript N(attack_icy_breath) = { EVT_EXEC_WAIT(N(return_home)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -478,7 +478,7 @@ EvtScript N(attack_icy_breath) = { EVT_EXEC_WAIT(N(return_home)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index ba2e4e8d7a..eb595672aa 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -116,7 +116,7 @@ EvtScript N(EVS_Idle) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -227,7 +227,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -237,7 +237,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -312,7 +312,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -446,7 +446,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/gloomba.inc.c b/src/battle/common/actor/gloomba.inc.c index 91abcdeae9..7ed5814d1e 100644 --- a/src/battle/common/actor/gloomba.inc.c +++ b/src/battle/common/actor/gloomba.inc.c @@ -169,7 +169,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -278,7 +278,7 @@ EvtScript N(handleEvent) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Dark_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -288,7 +288,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -386,7 +386,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -452,7 +452,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index e679fb1c1c..7cfd92895d 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -180,7 +180,7 @@ EvtScript N(EVS_Idle) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -289,7 +289,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -299,7 +299,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -397,7 +397,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -463,7 +463,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index 423b4fc222..97b7923afd 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -226,7 +226,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -310,7 +310,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -418,7 +418,7 @@ EvtScript N(knockOff) = { EvtScript N(handleEvent_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -523,7 +523,7 @@ EvtScript N(handleEvent_flying) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -531,7 +531,7 @@ EvtScript N(handleEvent_flying) = { EvtScript N(attackMagicBlast) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -585,7 +585,7 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -616,7 +616,7 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -624,7 +624,7 @@ EvtScript N(attackMagicBlast) = { EvtScript N(attackWandStrike) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -688,7 +688,7 @@ EvtScript N(attackWandStrike) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -720,7 +720,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -728,7 +728,7 @@ EvtScript N(attackWandStrike) = { EvtScript N(flee) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, EVENT_SCARE_AWAY) @@ -745,7 +745,7 @@ EvtScript N(flee) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) @@ -829,7 +829,7 @@ EvtScript N(takeTurn) = { EVT_RETURN EVT_LABEL(100) // make ally invisible EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -894,7 +894,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index 74fb1b4c71..45fdc7bd5c 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -228,7 +228,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -312,7 +312,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -420,7 +420,7 @@ EvtScript N(knockOff) = { EvtScript N(handleEvent_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -525,7 +525,7 @@ EvtScript N(handleEvent_flying) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -533,7 +533,7 @@ EvtScript N(handleEvent_flying) = { EvtScript N(attackMagicBlast) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -587,7 +587,7 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -618,7 +618,7 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -626,7 +626,7 @@ EvtScript N(attackMagicBlast) = { EvtScript N(attackWandStrike) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -690,7 +690,7 @@ EvtScript N(attackWandStrike) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -722,7 +722,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -730,7 +730,7 @@ EvtScript N(attackWandStrike) = { EvtScript N(flee) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, EVENT_SCARE_AWAY) @@ -747,7 +747,7 @@ EvtScript N(flee) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) @@ -831,7 +831,7 @@ EvtScript N(takeTurn) = { EVT_RETURN EVT_LABEL(100) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -896,7 +896,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/green_shy_guy.inc.c b/src/battle/common/actor/green_shy_guy.inc.c index d7b2e1aca7..b7c7320ee0 100644 --- a/src/battle/common/actor/green_shy_guy.inc.c +++ b/src/battle/common/actor/green_shy_guy.inc.c @@ -231,7 +231,7 @@ EvtScript N(handleEvent_80220128) = { EvtScript N(80220604) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -282,7 +282,7 @@ EvtScript N(80220604) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -318,7 +318,7 @@ EvtScript N(80220604) = { EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(802200C4)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -326,7 +326,7 @@ EvtScript N(80220604) = { EvtScript N(80220D2C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -393,7 +393,7 @@ EvtScript N(80220D2C) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -479,7 +479,7 @@ EvtScript N(80220D2C) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/groove_guy.inc.c b/src/battle/common/actor/groove_guy.inc.c index d8810d93cd..83d7f7beaf 100644 --- a/src/battle/common/actor/groove_guy.inc.c +++ b/src/battle/common/actor/groove_guy.inc.c @@ -149,7 +149,7 @@ EvtScript N(80224CAC) = { EvtScript N(handleEvent_80224D10) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -241,7 +241,7 @@ EvtScript N(handleEvent_80224D10) = { EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -249,7 +249,7 @@ EvtScript N(handleEvent_80224D10) = { EvtScript N(basicAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -295,7 +295,7 @@ EvtScript N(basicAttack) = { EVT_EXEC_WAIT(N(80224CAC)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -333,7 +333,7 @@ EvtScript N(basicAttack) = { EVT_EXEC_WAIT(N(80224CAC)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -341,7 +341,7 @@ EvtScript N(basicAttack) = { EvtScript N(sleepySpin) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -379,7 +379,7 @@ EvtScript N(sleepySpin) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(80224CAC)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -438,7 +438,7 @@ EvtScript N(sleepySpin) = { EVT_EXEC_WAIT(N(80224CAC)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -705,7 +705,7 @@ EvtScript N(8022671C) = { EvtScript N(80226C00) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_EXEC_WAIT(N(8022671C)) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802273A8)), FALSE) EVT_SET(LVarB, LVar0) @@ -725,7 +725,7 @@ EvtScript N(80226C00) = { EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVarB) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -733,7 +733,7 @@ EvtScript N(80226C00) = { EvtScript N(80226DEC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_EXEC_WAIT(N(8022671C)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -773,7 +773,7 @@ EvtScript N(80226DEC) = { EVT_WAIT(25) EVT_CALL(SetAnimation, LVarB, PRT_MAIN, ANIM_GrooveGuy_Anim01) EVT_CALL(HPBarToHome, LVarB) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_SWITCH(LVar0) @@ -788,7 +788,7 @@ EvtScript N(80226DEC) = { EvtScript N(802271A0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_EXEC_WAIT(N(8022671C)) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802273E0)), FALSE) EVT_SET(LVarB, LVar0) @@ -809,7 +809,7 @@ EvtScript N(802271A0) = { EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVarB) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/gulpit.inc.c b/src/battle/common/actor/gulpit.inc.c index 8fcb21638f..cfcac885d6 100644 --- a/src/battle/common/actor/gulpit.inc.c +++ b/src/battle/common/actor/gulpit.inc.c @@ -155,7 +155,7 @@ EvtScript N(returnHome) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -242,7 +242,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -250,7 +250,7 @@ EvtScript N(handleEvent) = { EvtScript N(attack_lick) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -297,7 +297,7 @@ EvtScript N(attack_lick) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -313,7 +313,7 @@ EvtScript N(attack_lick) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -322,7 +322,7 @@ EvtScript N(attack_lick) = { EvtScript N(attack_rock) = { EVT_SET(LVarA, LVar0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -386,7 +386,7 @@ EvtScript N(attack_rock) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -424,7 +424,7 @@ EvtScript N(attack_rock) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/gulpit_rocks.inc.c b/src/battle/common/actor/gulpit_rocks.inc.c index 7698473a51..9501ecc696 100644 --- a/src/battle/common/actor/gulpit_rocks.inc.c +++ b/src/battle/common/actor/gulpit_rocks.inc.c @@ -131,7 +131,7 @@ EvtScript N(setAnim) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -176,7 +176,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/hammer_bro.inc.c b/src/battle/common/actor/hammer_bro.inc.c index af84546793..6a58f8994c 100644 --- a/src/battle/common/actor/hammer_bro.inc.c +++ b/src/battle/common/actor/hammer_bro.inc.c @@ -199,7 +199,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -287,7 +287,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -295,7 +295,7 @@ EvtScript N(handleEvent) = { EvtScript N(attackHammerThrow) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -374,7 +374,7 @@ EvtScript N(attackHammerThrow) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -403,7 +403,7 @@ EvtScript N(attackHammerThrow) = { EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -464,7 +464,7 @@ EvtScript N(hammerHit) = { EvtScript N(attackHammerSurge) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_THREAD EVT_SET(LVar0, 0) @@ -532,7 +532,7 @@ EvtScript N(attackHammerSurge) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -576,7 +576,7 @@ EvtScript N(attackHammerSurge) = { EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/hurt_plant.inc.c b/src/battle/common/actor/hurt_plant.inc.c index 7efa6489aa..c402b41104 100644 --- a/src/battle/common/actor/hurt_plant.inc.c +++ b/src/battle/common/actor/hurt_plant.inc.c @@ -142,7 +142,7 @@ EvtScript N(8021DBFC) = { EvtScript N(handleEvent_8021DCF4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -248,7 +248,7 @@ EvtScript N(handleEvent_8021DCF4) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -256,7 +256,7 @@ EvtScript N(handleEvent_8021DCF4) = { EvtScript N(takeTurn_8021E33C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -321,7 +321,7 @@ EvtScript N(takeTurn_8021E33C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_EXEC_WAIT(N(8021DBFC)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -344,7 +344,7 @@ EvtScript N(takeTurn_8021E33C) = { EVT_EXEC_WAIT(N(8021DBFC)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/hyper_cleft.inc.c b/src/battle/common/actor/hyper_cleft.inc.c index aa49fd453a..7a921d2392 100644 --- a/src/battle/common/actor/hyper_cleft.inc.c +++ b/src/battle/common/actor/hyper_cleft.inc.c @@ -134,7 +134,7 @@ EvtScript N(nextTurn_80220D3C) = { EvtScript N(80220DC0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) @@ -167,7 +167,7 @@ EvtScript N(80220DC0) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80220C60))) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -233,7 +233,7 @@ EvtScript N(80220DC0) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80221CD4))) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -294,7 +294,7 @@ EvtScript N(80220DC0) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80221CD4))) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -437,7 +437,7 @@ EvtScript N(80221DE0) = { EvtScript N(handleEvent_80222140) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -662,7 +662,7 @@ EvtScript N(handleEvent_80222140) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -670,7 +670,7 @@ EvtScript N(handleEvent_80222140) = { EvtScript N(80222F1C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(3.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Hyper_Anim03) @@ -716,7 +716,7 @@ EvtScript N(80222F1C) = { EVT_CALL(N(SetSpinSmashable), 1) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -724,7 +724,7 @@ EvtScript N(80222F1C) = { EvtScript N(80223310) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -787,7 +787,7 @@ EvtScript N(80223310) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Hyper_Anim02) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -824,7 +824,7 @@ EvtScript N(80223310) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Hyper_Anim02) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/hyper_goomba.inc.c b/src/battle/common/actor/hyper_goomba.inc.c index 555ff6f803..764342f303 100644 --- a/src/battle/common/actor/hyper_goomba.inc.c +++ b/src/battle/common/actor/hyper_goomba.inc.c @@ -125,7 +125,7 @@ EvtScript N(nextTurn_80218950) = { EvtScript N(802189D4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -157,7 +157,7 @@ EvtScript N(802189D4) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_WAIT(2) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -220,7 +220,7 @@ EvtScript N(802189D4) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80219818))) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -277,7 +277,7 @@ EvtScript N(802189D4) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80219818))) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -413,7 +413,7 @@ EvtScript N(idle_802198FC) = { EvtScript N(handleEvent_80219BD8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -546,7 +546,7 @@ EvtScript N(handleEvent_80219BD8) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -556,7 +556,7 @@ EvtScript N(handleEvent_80219BD8) = { EvtScript N(takeTurn_8021A628) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -654,7 +654,7 @@ EvtScript N(takeTurn_8021A628) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -720,7 +720,7 @@ EvtScript N(takeTurn_8021A628) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/hyper_paragoomba.inc.c b/src/battle/common/actor/hyper_paragoomba.inc.c index 56e0348274..9abbfda65e 100644 --- a/src/battle/common/actor/hyper_paragoomba.inc.c +++ b/src/battle/common/actor/hyper_paragoomba.inc.c @@ -204,7 +204,7 @@ EvtScript N(nextTurn_8021B5F4) = { EvtScript N(8021B678) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) @@ -228,7 +228,7 @@ EvtScript N(8021B678) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_8021B518))) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -316,7 +316,7 @@ EvtScript N(8021B678) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_8021C594))) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -366,7 +366,7 @@ EvtScript N(8021B678) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_8021C594))) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -520,7 +520,7 @@ EvtScript N(8021C94C) = { EvtScript N(handleEvent_8021C9C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -648,7 +648,7 @@ EvtScript N(handleEvent_8021C9C4) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -656,7 +656,7 @@ EvtScript N(handleEvent_8021C9C4) = { EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -717,7 +717,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_EXEC_WAIT(N(8021C94C)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -760,7 +760,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_EXEC_WAIT(N(8021C94C)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -894,7 +894,7 @@ EvtScript N(nextTurn_8021E194) = { EvtScript N(8021E218) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -926,7 +926,7 @@ EvtScript N(8021E218) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_WAIT(2) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -989,7 +989,7 @@ EvtScript N(8021E218) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8021F05C))) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1046,7 +1046,7 @@ EvtScript N(8021E218) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8021F05C))) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1182,7 +1182,7 @@ EvtScript N(idle_8021F140) = { EvtScript N(handleEvent_8021F41C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -1315,7 +1315,7 @@ EvtScript N(handleEvent_8021F41C) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1325,7 +1325,7 @@ EvtScript N(handleEvent_8021F41C) = { EvtScript N(takeTurn_8021FE6C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1423,7 +1423,7 @@ EvtScript N(takeTurn_8021FE6C) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1489,7 +1489,7 @@ EvtScript N(takeTurn_8021FE6C) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/jungle_fuzzy.inc.c b/src/battle/common/actor/jungle_fuzzy.inc.c index 7a2b3910b8..6904d0b584 100644 --- a/src/battle/common/actor/jungle_fuzzy.inc.c +++ b/src/battle/common/actor/jungle_fuzzy.inc.c @@ -117,7 +117,7 @@ EvtScript N(idle_8021EB8C) = { EvtScript N(handleEvent_8021EB9C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) @@ -234,7 +234,7 @@ EvtScript N(handleEvent_8021EB9C) = { EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -242,7 +242,7 @@ EvtScript N(handleEvent_8021EB9C) = { EvtScript N(divide) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2) @@ -293,7 +293,7 @@ EvtScript N(divide) = { EVT_CASE_EQ(1) EVT_CALL(SetActorVar, LVar0, 0, 2) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -303,7 +303,7 @@ EvtScript N(divide) = { EvtScript N(leechAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -378,7 +378,7 @@ EvtScript N(leechAttack) = { EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -679,7 +679,7 @@ EvtScript N(leechAttack) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index afb198fda1..ebf8f8ea2e 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -257,7 +257,7 @@ s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -442,7 +442,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -450,7 +450,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -502,7 +502,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -577,7 +577,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -613,7 +613,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index 3daabe1743..3aa535ce05 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -330,7 +330,7 @@ s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -626,7 +626,7 @@ EvtScript N(handleEvent) = { EVT_END_SWITCH EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -634,7 +634,7 @@ EvtScript N(handleEvent) = { EvtScript N(attackShellToss) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -686,7 +686,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -762,7 +762,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -798,7 +798,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -806,7 +806,7 @@ EvtScript N(attackShellToss) = { EvtScript N(attackShellMissile) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_STATE), LVar0) @@ -845,7 +845,7 @@ EvtScript N(attackShellMissile) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_RETURN EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -914,7 +914,7 @@ EvtScript N(attackShellMissile) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations))) EVT_WAIT(10) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -977,7 +977,7 @@ EvtScript N(attackShellMissile) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations))) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1053,7 +1053,7 @@ Formation N(summon_formation) = { EvtScript N(summonFriend) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) @@ -1130,7 +1130,7 @@ EvtScript N(summonFriend) = { EVT_ADD(LVar0, 1) EVT_CALL(SetBattleVar, 7, LVar0) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/lakitu.inc.c b/src/battle/common/actor/lakitu.inc.c index 404d86441b..a6790f5ffb 100644 --- a/src/battle/common/actor/lakitu.inc.c +++ b/src/battle/common/actor/lakitu.inc.c @@ -161,7 +161,7 @@ EvtScript N(returnHome) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -255,7 +255,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -263,7 +263,7 @@ EvtScript N(handleEvent) = { EvtScript N(attackSpinyFlip) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -340,7 +340,7 @@ EvtScript N(attackSpinyFlip) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -373,7 +373,7 @@ EvtScript N(attackSpinyFlip) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -387,7 +387,7 @@ Formation N(formation_spiny) = { EvtScript N(summonSpiny) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -498,7 +498,7 @@ EvtScript N(summonSpiny) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_ADD(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/lava_bubble.inc.c b/src/battle/common/actor/lava_bubble.inc.c index b097770789..8ce804a3ea 100644 --- a/src/battle/common/actor/lava_bubble.inc.c +++ b/src/battle/common/actor/lava_bubble.inc.c @@ -244,7 +244,7 @@ EvtScript N(80219464) = { EvtScript N(handleEvent_80219500) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -341,7 +341,7 @@ EvtScript N(handleEvent_80219500) = { EVT_CASE_EQ(EVENT_UP_AND_AWAY) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -349,7 +349,7 @@ EvtScript N(handleEvent_80219500) = { EvtScript N(fireTackle) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -399,7 +399,7 @@ EvtScript N(fireTackle) = { EVT_EXEC_WAIT(N(80219464)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -424,7 +424,7 @@ EvtScript N(fireTackle) = { EVT_EXEC_WAIT(N(80219464)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -467,7 +467,7 @@ EvtScript N(8021A218) = { EvtScript N(fireballs_Partner) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -518,7 +518,7 @@ EvtScript N(fireballs_Partner) = { EVT_WAIT(20) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -543,7 +543,7 @@ EvtScript N(fireballs_Partner) = { EVT_EXEC_WAIT(N(80219464)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -551,7 +551,7 @@ EvtScript N(fireballs_Partner) = { EvtScript N(fireballs_Player) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -598,7 +598,7 @@ EvtScript N(fireballs_Player) = { EVT_EXEC_WAIT(N(80219464)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -635,7 +635,7 @@ EvtScript N(fireballs_Player) = { EVT_EXEC_WAIT(N(80219464)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/m_bush.inc.c b/src/battle/common/actor/m_bush.inc.c index de8de4c5f6..c9f807794f 100644 --- a/src/battle/common/actor/m_bush.inc.c +++ b/src/battle/common/actor/m_bush.inc.c @@ -121,7 +121,7 @@ EvtScript N(802219E4) = { EvtScript N(handleEvent_80221A74) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -210,7 +210,7 @@ EvtScript N(handleEvent_80221A74) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -218,7 +218,7 @@ EvtScript N(handleEvent_80221A74) = { EvtScript N(takeTurn_80221F78) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -261,7 +261,7 @@ EvtScript N(takeTurn_80221F78) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(802219E4)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -291,7 +291,7 @@ EvtScript N(takeTurn_80221F78) = { EVT_EXEC_WAIT(N(802219E4)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 0bdde4a3e2..f40b7d72b7 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -382,7 +382,7 @@ EvtScript N(knockOff) = { EvtScript N(flee) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, EVENT_SCARE_AWAY) @@ -399,7 +399,7 @@ EvtScript N(flee) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) @@ -514,7 +514,7 @@ EvtScript N(removeClone) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -633,7 +633,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(removeClone)) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -641,7 +641,7 @@ EvtScript N(handleEvent) = { EvtScript N(handleEvent_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_2, 255) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -782,7 +782,7 @@ EvtScript N(handleEvent_flying) = { EVT_EXEC_WAIT(N(removeClone)) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -793,7 +793,7 @@ EvtScript N(healOne) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LAST_ACTION), N(ACTION_HEAL_ONE)) EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_HEAL_ONE_COUNTER), 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -862,7 +862,7 @@ EvtScript N(healOne) = { EVT_CALL(MoveBattleCamOver, 10) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -873,7 +873,7 @@ EvtScript N(healAll) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LAST_ACTION), N(ACTION_HEAL_ALL)) EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_HEAL_ALL_COUNTER), 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -961,7 +961,7 @@ EvtScript N(healAll) = { EVT_CALL(MoveBattleCamOver, 10) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1425,7 +1425,7 @@ EvtScript N(makeClone) = { EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_CLONE_ID), LVar0) EVT_SET(LVarA, LVar0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(EnableIdleScript, LVarA, 0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseIdleAnimation, LVarA, FALSE) @@ -1448,7 +1448,7 @@ EvtScript N(makeClone) = { EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_WAIT(10) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(EnableIdleScript, LVar9, 1) EVT_WAIT(30) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1543,7 +1543,7 @@ EvtScript N(boostAttack) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LAST_ACTION), N(ACTION_BOOST_ATTACK)) EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_BOOST_ATTACK_COUNTER), 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1608,7 +1608,7 @@ EvtScript N(boostAttack) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1655,7 +1655,7 @@ EvtScript N(boostDefense) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LAST_ACTION), N(ACTION_BOOST_DEFENSE)) EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_BOOST_DEFENSE_COUNTER), 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1720,7 +1720,7 @@ EvtScript N(boostDefense) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1767,7 +1767,7 @@ EvtScript N(electrify) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LAST_ACTION), N(ACTION_ELECTRIFY)) EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_ELECTRIFY_COUNTER), 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1837,7 +1837,7 @@ EvtScript N(electrify) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1884,7 +1884,7 @@ EvtScript N(makeTransparent) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LAST_ACTION), N(ACTION_MAKE_TRANSPARENT)) EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_MAKE_TRANSPARENT_COUNTER), 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1949,7 +1949,7 @@ EvtScript N(makeTransparent) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index 0442b12c23..58728aba9d 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -146,7 +146,7 @@ EvtScript N(returnHome) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -244,7 +244,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -252,7 +252,7 @@ EvtScript N(handleEvent) = { EvtScript N(flyingAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -312,7 +312,7 @@ EvtScript N(flyingAttack) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -354,7 +354,7 @@ EvtScript N(flyingAttack) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -363,7 +363,7 @@ EvtScript N(flyingAttack) = { EvtScript N(healOneAlly) = { EVT_SET(LVarA, LVar0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(GetOwnerID, LVar0) @@ -397,7 +397,7 @@ EvtScript N(healOneAlly) = { EVT_END_THREAD EVT_CALL(WaitForBuffDone) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/monty_mole.inc.c b/src/battle/common/actor/monty_mole.inc.c index fec99772e0..7b3da3cd2e 100644 --- a/src/battle/common/actor/monty_mole.inc.c +++ b/src/battle/common/actor/monty_mole.inc.c @@ -225,7 +225,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -345,7 +345,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(makeHole)) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -353,7 +353,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetBattlePhase, LVar0) @@ -400,7 +400,7 @@ EvtScript N(takeTurn) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -429,7 +429,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/paragloomba.inc.c b/src/battle/common/actor/paragloomba.inc.c index eba03276ad..d28b0ae588 100644 --- a/src/battle/common/actor/paragloomba.inc.c +++ b/src/battle/common/actor/paragloomba.inc.c @@ -266,7 +266,7 @@ EvtScript N(returnHome) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -370,7 +370,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -378,7 +378,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -439,7 +439,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -482,7 +482,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -643,7 +643,7 @@ EvtScript N(idle_gloomba) = { EvtScript N(handleEvent_gloomba) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -752,7 +752,7 @@ EvtScript N(handleEvent_gloomba) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Dark_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -762,7 +762,7 @@ EvtScript N(handleEvent_gloomba) = { EvtScript N(takeTurn_gloomba) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -860,7 +860,7 @@ EvtScript N(takeTurn_gloomba) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -926,7 +926,7 @@ EvtScript N(takeTurn_gloomba) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 6027ef28cd..eabb94f7cf 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -268,7 +268,7 @@ EvtScript N(EVS_Paragoomba_GoHome) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -372,7 +372,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -380,7 +380,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -441,7 +441,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_EXEC_WAIT(N(EVS_Paragoomba_GoHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_FLYING, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -484,7 +484,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_EXEC_WAIT(N(EVS_Paragoomba_GoHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 361a3428b4..f1aabb435e 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -306,7 +306,7 @@ EvtScript N(EVS_FlyHome) = { EvtScript N(EVS_Flying_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -433,7 +433,7 @@ EvtScript N(EVS_Flying_HandleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -441,7 +441,7 @@ EvtScript N(EVS_Flying_HandleEvent) = { EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) @@ -523,7 +523,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_EXEC_WAIT(N(EVS_FlyHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_FLYING, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -575,7 +575,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_EXEC_WAIT(N(EVS_FlyHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -814,7 +814,7 @@ s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, EvtScript N(EVS_Downed_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -999,7 +999,7 @@ EvtScript N(EVS_Downed_HandleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_END_IF EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1007,7 +1007,7 @@ EvtScript N(EVS_Downed_HandleEvent) = { EvtScript N(EVS_Downed_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -1059,7 +1059,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -1134,7 +1134,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_DOWNED, 0) EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_DOWNED, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1170,7 +1170,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DOWNED, ANIM_KoopaTroopa_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/pink_shy_guy.inc.c b/src/battle/common/actor/pink_shy_guy.inc.c index eed0b4d2b2..62f56f8ea3 100644 --- a/src/battle/common/actor/pink_shy_guy.inc.c +++ b/src/battle/common/actor/pink_shy_guy.inc.c @@ -231,7 +231,7 @@ EvtScript N(handleEvent_8021E628) = { EvtScript N(8021EB04) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -282,7 +282,7 @@ EvtScript N(8021EB04) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -318,7 +318,7 @@ EvtScript N(8021EB04) = { EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(8021E5C4)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -326,7 +326,7 @@ EvtScript N(8021EB04) = { EvtScript N(8021F22C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -393,7 +393,7 @@ EvtScript N(8021F22C) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -479,7 +479,7 @@ EvtScript N(8021F22C) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/piranha_plant.inc.c b/src/battle/common/actor/piranha_plant.inc.c index 37cb3d938a..fc9ee768f9 100644 --- a/src/battle/common/actor/piranha_plant.inc.c +++ b/src/battle/common/actor/piranha_plant.inc.c @@ -137,7 +137,7 @@ EvtScript N(8021D4F4) = { EvtScript N(handleEvent_8021D60C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -251,7 +251,7 @@ EvtScript N(handleEvent_8021D60C) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -259,7 +259,7 @@ EvtScript N(handleEvent_8021D60C) = { EvtScript N(takeTurn_8021DCD4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -338,7 +338,7 @@ EvtScript N(takeTurn_8021DCD4) = { EVT_CALL(YieldTurn) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_EXEC_WAIT(N(8021D4F4)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -366,7 +366,7 @@ EvtScript N(takeTurn_8021DCD4) = { EVT_EXEC_WAIT(N(8021D4F4)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index 607cb55814..16c4a26b5e 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -251,7 +251,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Anim_Throw, ANIM_Pokey_Throw3) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Anim_BurnHurt, ANIM_Pokey_BurnHurt4) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Anim_BurnStill, ANIM_Pokey_BurnStill4) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -264,7 +264,7 @@ EvtScript N(EVS_Idle) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -484,7 +484,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -492,7 +492,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_Attack_GroundSmash) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -596,7 +596,7 @@ EvtScript N(EVS_Attack_GroundSmash) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Idle2) EVT_END_SWITCH EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -649,7 +649,7 @@ EvtScript N(EVS_Attack_GroundSmash) = { EVT_END_SWITCH EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -732,7 +732,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_IF // throw a body part EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -845,7 +845,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_PROJECTILE, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -916,7 +916,7 @@ Formation N(SummonFormation) = { EvtScript N(EVS_SummonBackup) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1030,7 +1030,7 @@ EvtScript N(EVS_SummonBackup) = { EVT_END_IF EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Idle4) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1038,7 +1038,7 @@ EvtScript N(EVS_SummonBackup) = { EvtScript N(EVS_Attack_SinglePartLeap) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_2EC, SOUND_2EC) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EC, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -1165,7 +1165,7 @@ EvtScript N(EVS_Attack_SinglePartLeap) = { EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Idle1) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/pokey_mummy.inc.c b/src/battle/common/actor/pokey_mummy.inc.c index 38db041665..162a3c1550 100644 --- a/src/battle/common/actor/pokey_mummy.inc.c +++ b/src/battle/common/actor/pokey_mummy.inc.c @@ -222,7 +222,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0x00310111) EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0x00310118) EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0x00310119) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -235,7 +235,7 @@ EvtScript N(idle_80219040) = { EvtScript N(handleEvent_80219050) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -459,7 +459,7 @@ EvtScript N(handleEvent_80219050) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -472,7 +472,7 @@ EvtScript N(takeTurn_80219D88) = { EVT_RETURN EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -585,7 +585,7 @@ EvtScript N(takeTurn_80219D88) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -593,7 +593,7 @@ EvtScript N(takeTurn_80219D88) = { EvtScript N(8021A6C8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_2EC, SOUND_2EC) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EC, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) @@ -720,7 +720,7 @@ EvtScript N(8021A6C8) = { EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Mummy_Idle1) EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index 39a0e391c9..7ff2097b67 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -137,7 +137,7 @@ EvtScript N(8021B354) = { EvtScript N(handleEvent_8021B3D0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -223,7 +223,7 @@ EvtScript N(handleEvent_8021B3D0) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -247,7 +247,7 @@ EvtScript N(takeTurn_8021B8A8) = { EvtScript N(bite) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -341,7 +341,7 @@ EvtScript N(bite) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -382,7 +382,7 @@ EvtScript N(bite) = { EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -392,7 +392,7 @@ EvtScript N(bite) = { EvtScript N(breath) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -450,7 +450,7 @@ EvtScript N(breath) = { EVT_EXEC_WAIT(N(8021B354)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -471,7 +471,7 @@ EvtScript N(breath) = { EVT_EXEC_WAIT(N(8021B354)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index 34ee30200a..6043dafe88 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -226,7 +226,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -310,7 +310,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -418,7 +418,7 @@ EvtScript N(knockOff) = { EvtScript N(handleEvent_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -523,7 +523,7 @@ EvtScript N(handleEvent_flying) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -531,7 +531,7 @@ EvtScript N(handleEvent_flying) = { EvtScript N(attackMagicBlast) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -585,7 +585,7 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -616,7 +616,7 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -624,7 +624,7 @@ EvtScript N(attackMagicBlast) = { EvtScript N(attackWandStrike) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -688,7 +688,7 @@ EvtScript N(attackWandStrike) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -720,7 +720,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -728,7 +728,7 @@ EvtScript N(attackWandStrike) = { EvtScript N(flee) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, EVENT_SCARE_AWAY) @@ -745,7 +745,7 @@ EvtScript N(flee) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) @@ -829,7 +829,7 @@ EvtScript N(takeTurn) = { EVT_RETURN EVT_LABEL(100) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -894,7 +894,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/red_shy_guy.inc.c b/src/battle/common/actor/red_shy_guy.inc.c index c43dc13187..51cc09ec46 100644 --- a/src/battle/common/actor/red_shy_guy.inc.c +++ b/src/battle/common/actor/red_shy_guy.inc.c @@ -231,7 +231,7 @@ EvtScript N(handleEvent) = { EvtScript N(bumpAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -282,7 +282,7 @@ EvtScript N(bumpAttack) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -318,7 +318,7 @@ EvtScript N(bumpAttack) = { EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(returnHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -326,7 +326,7 @@ EvtScript N(bumpAttack) = { EvtScript N(acrobaticAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -393,7 +393,7 @@ EvtScript N(acrobaticAttack) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -479,7 +479,7 @@ EvtScript N(acrobaticAttack) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/ruff_puff.inc.c b/src/battle/common/actor/ruff_puff.inc.c index 2deb8d5ed3..9d1c408c19 100644 --- a/src/battle/common/actor/ruff_puff.inc.c +++ b/src/battle/common/actor/ruff_puff.inc.c @@ -132,7 +132,7 @@ EvtScript N(returnHome) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -226,7 +226,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -234,7 +234,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -296,7 +296,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -339,7 +339,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/sky_guy.inc.c b/src/battle/common/actor/sky_guy.inc.c index 249ba73ed8..b6f7692582 100644 --- a/src/battle/common/actor/sky_guy.inc.c +++ b/src/battle/common/actor/sky_guy.inc.c @@ -510,7 +510,7 @@ EvtScript N(handleEvent_8022A398) = { EvtScript N(takeTurn_8022A9D0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetBattlePhase, LVar0) @@ -543,7 +543,7 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2, 0, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_EXEC_WAIT(N(80229C40)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(HIT_RESULT_LUCKY) @@ -565,7 +565,7 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2, 0, 15, EASING_LINEAR) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_EXEC_WAIT(N(80229C40)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -593,7 +593,7 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_EXEC_WAIT(N(80229C40)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -747,7 +747,7 @@ EvtScript N(handleEvent_8022B310) = { EvtScript N(8022B7EC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -798,7 +798,7 @@ EvtScript N(8022B7EC) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -834,7 +834,7 @@ EvtScript N(8022B7EC) = { EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(8022B2AC)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -842,7 +842,7 @@ EvtScript N(8022B7EC) = { EvtScript N(8022BF14) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -909,7 +909,7 @@ EvtScript N(8022BF14) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -995,7 +995,7 @@ EvtScript N(8022BF14) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/spear_guy.inc.c b/src/battle/common/actor/spear_guy.inc.c index 5e621b5ad5..5cc770c229 100644 --- a/src/battle/common/actor/spear_guy.inc.c +++ b/src/battle/common/actor/spear_guy.inc.c @@ -308,7 +308,7 @@ EvtScript N(80218D7C) = { EvtScript N(handleEvent_80218E3C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -508,7 +508,7 @@ EvtScript N(handleEvent_80218E3C) = { EVT_WAIT(20) EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -516,7 +516,7 @@ EvtScript N(handleEvent_80218E3C) = { EvtScript N(spearStab) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -565,7 +565,7 @@ EvtScript N(spearStab) = { EVT_EXEC_WAIT(N(80218D7C)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -584,7 +584,7 @@ EvtScript N(spearStab) = { EVT_EXEC_WAIT(N(80218D7C)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -592,7 +592,7 @@ EvtScript N(spearStab) = { EvtScript N(summonBackup) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 15) @@ -724,7 +724,7 @@ EvtScript N(summonBackup) = { EVT_CALL(SetActorVar, LVarB, 1, 2) EVT_END_SWITCH EVT_CALL(SetActorVar, ACTOR_SELF, 1, 3) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -793,7 +793,7 @@ EvtScript N(becomeShyGuy) = { EvtScript N(spearThrow) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpearGuy_Anim06) @@ -873,7 +873,7 @@ EvtScript N(spearThrow) = { EVT_WAIT(10) EVT_EXEC_WAIT(N(becomeShyGuy)) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -925,7 +925,7 @@ EvtScript N(spearThrow) = { EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1243,7 +1243,7 @@ EvtScript N(handleEvent_8021C14C) = { EvtScript N(8021C628) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1294,7 +1294,7 @@ EvtScript N(8021C628) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1330,7 +1330,7 @@ EvtScript N(8021C628) = { EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(8021C0E8)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1338,7 +1338,7 @@ EvtScript N(8021C628) = { EvtScript N(8021CD50) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1405,7 +1405,7 @@ EvtScript N(8021CD50) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1491,7 +1491,7 @@ EvtScript N(8021CD50) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index 16b5958b72..5f93640e20 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -153,7 +153,7 @@ EvtScript N(init) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_END_IF EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -219,7 +219,7 @@ EvtScript N(spikeTop_FallDown) = { EvtScript N(spikeTop_HandleEvent_Ceiling) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -301,7 +301,7 @@ EvtScript N(spikeTop_HandleEvent_Ceiling) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -324,7 +324,7 @@ s32 N(intTable_8021D5CC)[] = { EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -545,7 +545,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_END_IF EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -553,7 +553,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EvtScript N(spikeTop_TakeTurn_Ceiling) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 24) @@ -641,7 +641,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikeTop_Anim03) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -686,7 +686,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_LABEL(10) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -694,7 +694,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 2) EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) @@ -723,7 +723,7 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -787,7 +787,7 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikeTop_Anim0C) EVT_WAIT(10) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -823,7 +823,7 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikeTop_Anim03) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/spiked_gloomba.inc.c b/src/battle/common/actor/spiked_gloomba.inc.c index 197e006c66..8fd6c14dbc 100644 --- a/src/battle/common/actor/spiked_gloomba.inc.c +++ b/src/battle/common/actor/spiked_gloomba.inc.c @@ -170,7 +170,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -294,7 +294,7 @@ EvtScript N(handleEvent) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Dark_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -304,7 +304,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -402,7 +402,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -474,7 +474,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index a0a3aa93f5..b8d7d9d364 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -174,7 +174,7 @@ EvtScript N(EVS_Idle) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -298,7 +298,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -308,7 +308,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -406,7 +406,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -478,7 +478,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index 182533c045..855ed35e5d 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -178,7 +178,7 @@ s32 N(bounceArray)[] = { 7, 13, 17, 21, 23, 24, 23, 21, 17, 13, 7, 0, 4, 7, 6, 4 EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -360,7 +360,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -368,7 +368,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) @@ -394,7 +394,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_200000, TRUE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF @@ -420,7 +420,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(5) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Lakitu_Anim0C) @@ -454,7 +454,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) @@ -487,14 +487,14 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar0, 10) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(YieldTurn) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(returnHome)) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/spy_guy.inc.c b/src/battle/common/actor/spy_guy.inc.c index fddd296468..e11de046e8 100644 --- a/src/battle/common/actor/spy_guy.inc.c +++ b/src/battle/common/actor/spy_guy.inc.c @@ -331,7 +331,7 @@ EvtScript N(handleEvent_80227ABC) = { EvtScript N(slingshotAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -383,7 +383,7 @@ EvtScript N(slingshotAttack) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(15) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -407,7 +407,7 @@ EvtScript N(slingshotAttack) = { EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -458,7 +458,7 @@ EvtScript N(80228778) = { EvtScript N(hammerAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -504,7 +504,7 @@ EvtScript N(hammerAttack) = { EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -598,7 +598,7 @@ EvtScript N(hammerAttack) = { EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/stone_chomp.inc.c b/src/battle/common/actor/stone_chomp.inc.c index 9335107cad..3454980698 100644 --- a/src/battle/common/actor/stone_chomp.inc.c +++ b/src/battle/common/actor/stone_chomp.inc.c @@ -467,7 +467,7 @@ EvtScript N(EVS_UpdateChain) = { EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -511,7 +511,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_StoneChomp_Hurt) EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) @@ -609,7 +609,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_StoneChomp_Hurt) EVT_EXEC_WAIT(EVS_Enemy_AirLift) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(EVENT_BLOW_AWAY) @@ -635,7 +635,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_CALL(FallToGoal, ACTOR_SELF, 11) EVT_END_IF EVT_END_IF - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -645,7 +645,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, TRUE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) @@ -702,7 +702,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH @@ -762,7 +762,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_SWITCH EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, FALSE) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index bceef1e67a..8e6e083d22 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -152,7 +152,7 @@ EvtScript N(returnHome) = { EvtScript N(hadleEvent_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -232,7 +232,7 @@ EvtScript N(hadleEvent_flying) = { EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_RETURN EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -289,7 +289,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -415,7 +415,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_ScareAway) EVT_RETURN EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -423,7 +423,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -475,7 +475,7 @@ EvtScript N(takeTurn_flying) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -509,7 +509,7 @@ EvtScript N(takeTurn_flying) = { EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -522,7 +522,7 @@ EvtScript N(takeTurn) = { EVT_RETURN EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -560,7 +560,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -591,10 +591,10 @@ EvtScript N(takeTurn) = { EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index e80dfbbe2f..640facfb15 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -154,7 +154,7 @@ EvtScript N(returnHome) = { EvtScript N(hadleEvent_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -234,7 +234,7 @@ EvtScript N(hadleEvent_flying) = { EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_RETURN EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -293,7 +293,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -419,7 +419,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(EVS_Enemy_ScareAway) EVT_RETURN EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -429,7 +429,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -481,7 +481,7 @@ EvtScript N(takeTurn_flying) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -882,7 +882,7 @@ EvtScript N(takeTurn_flying) = { EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -895,7 +895,7 @@ EvtScript N(takeTurn) = { EVT_RETURN EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -933,7 +933,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1187,10 +1187,10 @@ EvtScript N(takeTurn) = { EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/whacka.inc.c b/src/battle/common/actor/whacka.inc.c index 9ae2473ee1..adb5e61be5 100644 --- a/src/battle/common/actor/whacka.inc.c +++ b/src/battle/common/actor/whacka.inc.c @@ -129,7 +129,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -271,7 +271,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -305,7 +305,7 @@ EvtScript N(spawnWhackasBump) = { EvtScript N(die) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Whacka_Burrow) EVT_WAIT(40) diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index ad753ec63d..b65aabf412 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -111,7 +111,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -201,7 +201,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -209,7 +209,7 @@ EvtScript N(handleEvent) = { EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -257,7 +257,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -344,7 +344,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index 4810e5f7ca..ca8b5c46c1 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -231,7 +231,7 @@ EvtScript N(idle_80223E14) = { EvtScript N(handleEvent_80223E24) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -315,7 +315,7 @@ EvtScript N(handleEvent_80223E24) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -423,7 +423,7 @@ EvtScript N(knockOff) = { EvtScript N(handleEvent_80224A44) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -528,7 +528,7 @@ EvtScript N(handleEvent_80224A44) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -536,7 +536,7 @@ EvtScript N(handleEvent_80224A44) = { EvtScript N(wMagikoopa_ShapeSpell) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -590,7 +590,7 @@ EvtScript N(wMagikoopa_ShapeSpell) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -621,7 +621,7 @@ EvtScript N(wMagikoopa_ShapeSpell) = { EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -629,7 +629,7 @@ EvtScript N(wMagikoopa_ShapeSpell) = { EvtScript N(wMagikoopa_WandStrike) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -693,7 +693,7 @@ EvtScript N(wMagikoopa_WandStrike) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -725,7 +725,7 @@ EvtScript N(wMagikoopa_WandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -733,7 +733,7 @@ EvtScript N(wMagikoopa_WandStrike) = { EvtScript N(run_away) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, EVENT_SCARE_AWAY) @@ -750,7 +750,7 @@ EvtScript N(run_away) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) @@ -941,7 +941,7 @@ EvtScript N(healOne) = { EVT_RETURN EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1009,7 +1009,7 @@ EvtScript N(healOne) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -1027,7 +1027,7 @@ EvtScript N(healAll) = { EVT_RETURN EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1114,7 +1114,7 @@ EvtScript N(healAll) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index 66ccd6163d..9318793ce4 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -225,7 +225,7 @@ EvtScript N(idle) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) @@ -309,7 +309,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -417,7 +417,7 @@ EvtScript N(knockOff) = { EvtScript N(handleEvent_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) @@ -522,7 +522,7 @@ EvtScript N(handleEvent_flying) = { EVT_RETURN EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -530,7 +530,7 @@ EvtScript N(handleEvent_flying) = { EvtScript N(attackMagicBlast) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -584,7 +584,7 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -615,7 +615,7 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -623,7 +623,7 @@ EvtScript N(attackMagicBlast) = { EvtScript N(attackWandStrike) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -687,7 +687,7 @@ EvtScript N(attackWandStrike) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -719,7 +719,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -727,7 +727,7 @@ EvtScript N(attackWandStrike) = { EvtScript N(flee) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, EVENT_SCARE_AWAY) @@ -744,7 +744,7 @@ EvtScript N(flee) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) @@ -828,7 +828,7 @@ EvtScript N(takeTurn) = { EVT_RETURN EVT_LABEL(100) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -898,7 +898,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(10) EVT_CALL(YieldTurn) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/yellow_shy_guy.inc.c b/src/battle/common/actor/yellow_shy_guy.inc.c index 0a0d4424ce..874907531e 100644 --- a/src/battle/common/actor/yellow_shy_guy.inc.c +++ b/src/battle/common/actor/yellow_shy_guy.inc.c @@ -232,7 +232,7 @@ EvtScript N(handleEvent_8021CB28) = { EvtScript N(8021D004) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -283,7 +283,7 @@ EvtScript N(8021D004) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Yellow_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -319,7 +319,7 @@ EvtScript N(8021D004) = { EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(8021CAC4)) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END @@ -327,7 +327,7 @@ EvtScript N(8021D004) = { EvtScript N(8021D72C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -394,7 +394,7 @@ EvtScript N(8021D72C) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Yellow_Anim01) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -480,7 +480,7 @@ EvtScript N(8021D72C) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Yellow_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/common/move/HammerSupport.inc.c b/src/battle/common/move/HammerSupport.inc.c index 93958c8c33..3d6aad4f98 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, -1) + 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, -1) + 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, -1) + 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 504c14ab61..ca4b5360d4 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, -1) + 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, -1) + 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, -1) + 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, -1) + 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, -1) + 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, -1) + 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 f86f0170e1..2bbfdd17e5 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, 1) + 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, 0) + 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 59efed6cd3..b1b655ae11 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, 1) + 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, 0) + 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, 0) + 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 04cf3a2a1b..1e0ff3c840 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, 1) + 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, 0) + 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 bfc75064b9..4f54dece51 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, 1) + 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, -1) + 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, 1) + 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, -1) + 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, 1) + 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, -1) + 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, 1) + 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, -1) + 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 4ae8dda900..93777210e8 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, 1) + 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, 0) + 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, 1) + 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, 0) + 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 0b7183e675..411edab365 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, 1) + 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, 0) + 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 8d9f05b878..58df5dd3d8 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, 1) + 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, 0) + 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, 1) + 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, 0) + 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 30d698f26b..f454db09e0 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, 1) + 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, 0) + 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, 1) + 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, 0) + 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 9f9b6ac90d..fb830fad8c 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, 1) + 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, 0) + 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, 1) + 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, 0) + 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 8daf7f9d3c..c5676eb631 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, 1) + 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, 0) + 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, 1) + 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, 0) + 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 82dc010d38..d85865cc8d 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, 1) + 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, 0) + 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 0c4a37c274..55216873ba 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, 1) + 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, 0) + 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 46a2f7ee7a..110dc7db1e 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, 1) + 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, 0) + 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, 1) + 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, 0) + 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 82abbab739..34d6abf72c 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, 1) + 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, 0) + 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 b5e44ad979..42566805f0 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, 1) + 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, 0) + 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, 1) + 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, 0) + 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 4c25827bab..769b3b87f9 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, 1) + 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, 0) + 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, 1) + 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, 0) + 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 4ae15caffe..061281e105 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, 1) + 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, 0) + EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_RETURN EVT_END }; diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 153eb0d0bf..935556b103 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -1113,11 +1113,11 @@ EvtScript N(headbonk2) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_281) EVT_CALL(N(JumpOnTarget), LVarA, 3) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, -1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_RESTART) EVT_CHILD_THREAD EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) @@ -1229,11 +1229,11 @@ EvtScript N(headbonk3) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_281) EVT_CALL(N(JumpOnTarget), LVarA, 3) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, -1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_RESTART) EVT_CHILD_THREAD EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) @@ -1370,11 +1370,11 @@ EvtScript N(multibonk) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_281) EVT_CALL(N(JumpOnTarget), LVarA, 3) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, -1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_RESTART) EVT_SUB(LVarD, 1) EVT_CALL(N(AdjustPowerBounceChance)) EVT_IF_GE(LVarF, LVar0) diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index 0fd9c7fd85..9d098bc86f 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -943,7 +943,7 @@ EvtScript N(dizzyShell) = { EVT_DIVF(LVarB, LVarA) EVT_THREAD EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_ZERO, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 350) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -958,7 +958,7 @@ EvtScript N(dizzyShell) = { EVT_CALL(AddGoalPos, ACTOR_PARTNER, 40, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(12.0)) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, EASING_QUARTIC_OUT) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_END_THREAD EVT_THREAD @@ -1191,7 +1191,7 @@ EvtScript N(fireShell) = { EVT_CASE_EQ(4) EVT_CALL(ModifyActorDecoration, ACTOR_PARTNER, -1, 1, 300, 0, 0, 0) EVT_END_SWITCH - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 350) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1207,7 +1207,7 @@ EvtScript N(fireShell) = { EVT_CALL(AddGoalPos, ACTOR_PARTNER, 40, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(12.0)) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, EASING_QUARTIC_OUT) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_END_THREAD EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) @@ -1370,7 +1370,7 @@ EvtScript N(shellTossOnFirstStrike) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_Run) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_Idle) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) + EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index bcfa03b41e..f065361584 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -961,7 +961,7 @@ EvtScript N(skyDive) = { EVT_CALL(AddGoalPos, ACTOR_PARTNER, -26, 25, 0) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2005) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -10, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Dive) @@ -976,7 +976,7 @@ EvtScript N(skyDive) = { EVT_CALL(AddGoalPos, ACTOR_PARTNER, 40, 10, 0) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -20, EASING_QUADRATIC_OUT) EVT_WAIT(20) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) @@ -984,7 +984,7 @@ EvtScript N(skyDive) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Walk) EVT_RETURN EVT_END_IF - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_PostDive) EVT_WAIT(2) EVT_CALL(GetActionCommandResult, LVar0) @@ -1031,38 +1031,38 @@ EvtScript N(shellShot) = { EVT_CASE_EQ(1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(MoveBattleCamOver, 5) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, EASING_LINEAR) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_CASE_EQ(-1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(MoveBattleCamOver, 5) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 50, -50, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, 0x00000064) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_CASE_EQ(0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(MoveBattleCamOver, 5) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 50, 50, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, EASING_LINEAR) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_CASE_EQ(-2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(MoveBattleCamOver, 5) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 40, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, EASING_LINEAR) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_END_SWITCH EVT_CALL(N(GetShellShotDamage)) EVT_SWITCH(LVar0) @@ -1234,7 +1234,7 @@ EvtScript N(airRaid) = { EVT_WAIT(2) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CHILD_THREAD EVT_LOOP(5) EVT_WAIT(18) @@ -1251,7 +1251,7 @@ EvtScript N(airRaid) = { EVT_END_CHILD_THREAD EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) EVT_CALL(N(FlyAround)) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(GetActionResult, LVar0) diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index d5b2539a4c..bbf0876c33 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -1190,10 +1190,10 @@ EvtScript N(tidalWave) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 5) EVT_WAIT(10) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(N(ProcessTidalWave)) EVT_CALL(SetActorPos, ACTOR_PARTNER, -220, 0, 0) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index bd3a7ecc41..8e0e2297b3 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -248,7 +248,7 @@ EvtScript N(executeAction) = { EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarF) EVT_IF_GT(LVarF, 1) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_207E) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) @@ -265,7 +265,7 @@ EvtScript N(executeAction) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 150, 100, 0) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 20, EASING_LINEAR) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_LOOP(0) diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 8e3b8c5f9d..979ee8afe9 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -1117,7 +1117,7 @@ EvtScript N(8023AE8C) = { EVT_CALL(MoveBattleCamOver, 100 * DT) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_THREAD - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) EVT_CALL(N(TurboChargeUnwindWatt), 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) @@ -1125,7 +1125,7 @@ EvtScript N(8023AE8C) = { EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_WAIT(10) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_END_THREAD EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28B) @@ -1200,7 +1200,7 @@ EvtScript N(8023B450) = { EVT_CALL(MoveBattleCamOver, 100 * DT) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) EVT_THREAD - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) EVT_CALL(N(TurboChargeUnwindWatt), 1) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) @@ -1208,7 +1208,7 @@ EvtScript N(8023B450) = { EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_WAIT(10) - EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) + EVT_CALL(EnableActorBlur, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE) EVT_END_THREAD EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28B)