pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

use enum for EnableActorBlur, EnablePlayerBlur, EnableIdleScript args (#1104)

Browse Source 
* use enum for EnableActorBlur, EnablePlayerBlur, EnableIdleScript

* create new enum for EnablePlayerBlur
This commit is contained in:
Rainchus 2023-08-02 22:17:33 -05:00 committed by GitHub
parent a3f35fe27a
commit f8d6ccddc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
158 changed files with 1225 additions and 1213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/enums.h
View File

@ -6472,4 +6472,16 @@ enum Language {
LANGUAGE_ES = 3, 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 #endif

8
src/18F340.c
View File

@ -793,7 +793,7 @@ EvtScript EVS_ExecuteMarioAction = {
EVT_CALL(LoadStarPowerScript) EVT_CALL(LoadStarPowerScript)
EVT_EXEC_WAIT(LVar0) EVT_EXEC_WAIT(LVar0)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnablePlayerBlur, 0) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -823,7 +823,7 @@ EvtScript EVS_PlayerFirstStrike = {
EVT_CALL(LoadMoveScript) EVT_CALL(LoadMoveScript)
EVT_EXEC_WAIT(LVar0) EVT_EXEC_WAIT(LVar0)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnablePlayerBlur, 0) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1285,7 +1285,7 @@ EvtScript EVS_PlayerDies = {
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Dying) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Dying)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_24) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_24)
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(EnablePlayerBlur, 1) EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_371) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_371)
EVT_SET(LVar0, 0) EVT_SET(LVar0, 0)
EVT_LOOP(30) EVT_LOOP(30)
@ -1299,7 +1299,7 @@ EvtScript EVS_PlayerDies = {
EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0) EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0)
EVT_WAIT(1) EVT_WAIT(1)
EVT_END_LOOP EVT_END_LOOP
EVT_CALL(EnablePlayerBlur, 0) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3FB) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3FB)
EVT_SET(LVar0, 0) EVT_SET(LVar0, 0)

8
src/battle/area/arn/actor/tubba_blubba.c
View File

@ -173,7 +173,7 @@ EvtScript N(80225FD4) = {
EvtScript N(handleEvent_802260D0) = { EvtScript N(handleEvent_802260D0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVarA)
EVT_SWITCH(LVarA) EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -241,7 +241,7 @@ EvtScript N(handleEvent_802260D0) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -249,14 +249,14 @@ EvtScript N(handleEvent_802260D0) = {
EvtScript N(takeTurn_802264AC) = { EvtScript N(takeTurn_802264AC) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(RandInt, 100, LVar0)
EVT_IF_LT(LVar0, 60) EVT_IF_LT(LVar0, 60)
EVT_EXEC_WAIT(N(80226558)) EVT_EXEC_WAIT(N(80226558))
EVT_ELSE EVT_ELSE
EVT_EXEC_WAIT(N(80226B88)) EVT_EXEC_WAIT(N(80226B88))
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/area/dgb/actor/tubba_blubba.c
View File

@ -146,7 +146,7 @@ EvtScript N(80218E60) = {
EvtScript N(nextTurn_80218FB0) = { EvtScript N(nextTurn_80218FB0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(PHASE_PLAYER_BEGIN) EVT_CASE_EQ(PHASE_PLAYER_BEGIN)
@ -176,7 +176,7 @@ EvtScript N(nextTurn_80218FB0) = {
EVT_CALL(EnableBattleStatusBar, TRUE) EVT_CALL(EnableBattleStatusBar, TRUE)
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -213,7 +213,7 @@ EvtScript N(802192E0) = {
EvtScript N(handleEvent_80219338) = { EvtScript N(handleEvent_80219338) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -288,7 +288,7 @@ EvtScript N(handleEvent_80219338) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -296,7 +296,7 @@ EvtScript N(handleEvent_80219338) = {
EvtScript N(takeTurn_80219750) = { EvtScript N(takeTurn_80219750) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS)
@ -379,7 +379,7 @@ EvtScript N(takeTurn_80219750) = {
EVT_ELSE EVT_ELSE
EVT_EXEC_WAIT(N(8021A36C)) EVT_EXEC_WAIT(N(8021A36C))
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

4
src/battle/area/dig/actor/tubba_blubba.c
View File

@ -167,7 +167,7 @@ EvtScript N(returnHome) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS)
@ -236,7 +236,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(EnableBattleStatusBar, TRUE) EVT_CALL(EnableBattleStatusBar, TRUE)
EVT_END_IF EVT_END_IF
EVT_EXEC_WAIT(N(attackBodyCrush)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/area/flo2/actor/monty_mole_boss.c
View File

@ -225,7 +225,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(GetLastElement, LVarE)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -345,7 +345,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(N(onDeath)) EVT_EXEC_WAIT(N(onDeath))
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -353,7 +353,7 @@ EvtScript N(handleEvent) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetBattlePhase, LVar0) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -429,7 +429,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_3, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/area/flo2/actor/spike.c
View File

@ -136,7 +136,7 @@ EvtScript N(returnHome) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -230,7 +230,7 @@ EvtScript N(handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -238,7 +238,7 @@ EvtScript N(handleEvent) = {
EvtScript N(attack) = { EvtScript N(attack) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -343,7 +343,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -370,7 +370,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

4
src/battle/area/flo2/actor/tuff_puff.c
View File

@ -389,8 +389,8 @@ EvtScript N(handleEvent) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

4
src/battle/area/hos/actor/goombario_tutor.c
View File

@ -162,7 +162,7 @@ EvtScript N(handleEvent_802191E0) = {
EvtScript N(takeTurn_80219444) = { EvtScript N(takeTurn_80219444) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(SetBattleCamZoom, 400) EVT_CALL(SetBattleCamZoom, 400)
@ -272,7 +272,7 @@ EvtScript N(takeTurn_80219444) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Idle)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

40
src/battle/area/hos/actor/magikoopa.c
View File

@ -327,7 +327,7 @@ EvtScript N(8021D890) = {
EvtScript N(runAway) = { EvtScript N(runAway) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(HideHealthBar, ACTOR_SELF)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_IF_NE(LVar0, 57) EVT_IF_NE(LVar0, 57)
@ -344,7 +344,7 @@ EvtScript N(runAway) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180) 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(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 200) EVT_ADD(LVar0, 200)
@ -463,7 +463,7 @@ EvtScript N(8021E46C) = {
EvtScript N(handleEvent_8021E6D8) = { EvtScript N(handleEvent_8021E6D8) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -582,7 +582,7 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_EXEC_WAIT(N(8021E46C)) EVT_EXEC_WAIT(N(8021E46C))
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -590,7 +590,7 @@ EvtScript N(handleEvent_8021E6D8) = {
EvtScript N(handleEvent_8021EDF0) = { EvtScript N(handleEvent_8021EDF0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetPartAlpha, ACTOR_SELF, PRT_2, 255)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -731,7 +731,7 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_EXEC_WAIT(N(8021E46C)) EVT_EXEC_WAIT(N(8021E46C))
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -742,7 +742,7 @@ EvtScript N(healOne) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 11, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 11, 0)
EVT_CALL(AddActorVar, ACTOR_SELF, 4, 1) EVT_CALL(AddActorVar, ACTOR_SELF, 4, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -811,7 +811,7 @@ EvtScript N(healOne) = {
EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(MoveBattleCamOver, 10)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -822,7 +822,7 @@ EvtScript N(healAll) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 11, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 11, 1)
EVT_CALL(AddActorVar, ACTOR_SELF, 3, 1) EVT_CALL(AddActorVar, ACTOR_SELF, 3, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -910,7 +910,7 @@ EvtScript N(healAll) = {
EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(MoveBattleCamOver, 10)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1374,7 +1374,7 @@ EvtScript N(makeCopy) = {
EVT_END_IF EVT_END_IF
EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0)
EVT_SET(LVarA, 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(EnableIdleScript, LVarA, 0)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(UseIdleAnimation, LVarA, FALSE) EVT_CALL(UseIdleAnimation, LVarA, FALSE)
@ -1397,7 +1397,7 @@ EvtScript N(makeCopy) = {
EVT_END_IF EVT_END_IF
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(EnableIdleScript, LVar9, 1) EVT_CALL(EnableIdleScript, LVar9, 1)
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -1492,7 +1492,7 @@ EvtScript N(boostAttack) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 11, 4) EVT_CALL(SetActorVar, ACTOR_SELF, 11, 4)
EVT_CALL(AddActorVar, ACTOR_SELF, 5, 1) EVT_CALL(AddActorVar, ACTOR_SELF, 5, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -1557,7 +1557,7 @@ EvtScript N(boostAttack) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1604,7 +1604,7 @@ EvtScript N(boostDefense) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 11, 5) EVT_CALL(SetActorVar, ACTOR_SELF, 11, 5)
EVT_CALL(AddActorVar, ACTOR_SELF, 6, 1) EVT_CALL(AddActorVar, ACTOR_SELF, 6, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -1669,7 +1669,7 @@ EvtScript N(boostDefense) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1716,7 +1716,7 @@ EvtScript N(electrify) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 11, 6) EVT_CALL(SetActorVar, ACTOR_SELF, 11, 6)
EVT_CALL(AddActorVar, ACTOR_SELF, 7, 1) EVT_CALL(AddActorVar, ACTOR_SELF, 7, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -1786,7 +1786,7 @@ EvtScript N(electrify) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1833,7 +1833,7 @@ EvtScript N(vanish) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 11, 7) EVT_CALL(SetActorVar, ACTOR_SELF, 11, 7)
EVT_CALL(AddActorVar, ACTOR_SELF, 8, 1) EVT_CALL(AddActorVar, ACTOR_SELF, 8, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -1898,7 +1898,7 @@ EvtScript N(vanish) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

14
src/battle/area/isk_part_2/actor/chain_chomp.c
View File

@ -434,7 +434,7 @@ EvtScript N(EVS_UpdateChain) = {
EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_HandleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SET(LVarF, LVar0) EVT_SET(LVarF, LVar0)
@ -468,7 +468,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_Hurt) EVT_SET_CONST(LVar1, ANIM_ChainChomp_Hurt)
EVT_EXEC_WAIT(N(EVS_Chomp_SpinSmashHit)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_CASE_EQ(EVENT_SHOCK_HIT)
@ -524,7 +524,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_Hurt) EVT_SET_CONST(LVar1, ANIM_ChainChomp_Hurt)
EVT_EXEC_WAIT(EVS_Enemy_AirLift) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_CASE_EQ(EVENT_BLOW_AWAY)
@ -588,7 +588,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_CALL(FallToGoal, ACTOR_SELF, 11) EVT_CALL(FallToGoal, ACTOR_SELF, 11)
EVT_END_IF EVT_END_IF
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -680,7 +680,7 @@ EvtScript N(EVS_Chomp_SpinSmashHit) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, TRUE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -761,7 +761,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, FALSE) 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_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
@ -845,7 +845,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_EnableChainSounds, FALSE)
EVT_CALL(HPBarToHome, ACTOR_SELF) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/area/isk_part_2/actor/tutankoopa.c
View File

@ -326,7 +326,7 @@ EvtScript N(EVS_Idle) = {
EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_HandleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastElement, LVarE)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
@ -448,7 +448,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -528,7 +528,7 @@ EvtScript N(EVS_TemporaryKnockout) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_LABEL(0) EVT_LABEL(0)
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Stunned, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Stunned, LVar0)
EVT_IF_EQ(LVar0, FALSE) EVT_IF_EQ(LVar0, FALSE)
@ -537,7 +537,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_NextSummonTime, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_NextSummonTime, LVar0)
EVT_IF_EQ(LVar0, 0) EVT_IF_EQ(LVar0, 0)
EVT_EXEC_WAIT(N(EVS_Move_SummonChomp)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_ELSE EVT_ELSE
@ -574,7 +574,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_NextAttack, AVAL_TRY_TOSS_NEXT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_NextAttack, AVAL_TRY_TOSS_NEXT)
EVT_EXEC_WAIT(N(EVS_Attack_DropDebris)) EVT_EXEC_WAIT(N(EVS_Attack_DropDebris))
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_ELSE EVT_ELSE
@ -584,7 +584,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_EXEC_WAIT(N(EVS_LevitateToHomePos)) EVT_EXEC_WAIT(N(EVS_LevitateToHomePos))
EVT_GOTO(0) EVT_GOTO(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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_RETURN EVT_RETURN

26
src/battle/area/iwa/actor/buzzar.c
View File

@ -263,7 +263,7 @@ EvtScript N(EVS_HandleEvent) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK)
EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2)
@ -289,7 +289,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0)
EVT_EXEC_WAIT(N(EVS_Attack_GrappleDrop)) EVT_EXEC_WAIT(N(EVS_Attack_GrappleDrop))
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -517,7 +517,7 @@ EvtScript N(EVS_Attack_WindBlast) = {
EvtScript N(EVS_Attack_FeatherFling) = { EvtScript N(EVS_Attack_FeatherFling) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_EXEC_WAIT(N(EVS_FlyToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -717,7 +717,7 @@ EvtScript N(EVS_Attack_FeatherFling) = {
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_EXEC_WAIT(N(EVS_FlyToHome))
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -768,7 +768,7 @@ EvtScript N(EVS_LiftMario) = {
EvtScript N(EVS_Attack_GrappleDrop) = { EvtScript N(EVS_Attack_GrappleDrop) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_EXEC_WAIT(N(EVS_FlyToHome_GrappleFail)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -873,7 +873,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(EVS_FlyToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
@ -954,7 +954,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
EVT_WAIT(8) EVT_WAIT(8)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(EVS_FlyToHome_GrappleFail)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -1009,7 +1009,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_EXEC_WAIT(N(EVS_FlyToHome))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1017,7 +1017,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
EvtScript N(EVS_Attack_ClawSwipe) = { EvtScript N(EVS_Attack_ClawSwipe) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_EXEC_WAIT(N(EVS_FlyToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1125,7 +1125,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = {
EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_EXEC_WAIT(N(EVS_FlyToHome))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

24
src/battle/area/kgr/actor/fuzzipede.c
View File

@ -311,7 +311,7 @@ EvtScript N(80219668) = {
EvtScript N(handleEvent_802197FC) = { EvtScript N(handleEvent_802197FC) = {
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) 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(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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -396,7 +396,7 @@ EvtScript N(handleEvent_802197FC) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -430,7 +430,7 @@ EvtScript N(80219D68) = {
EvtScript N(handleEvent_80219ED4) = { EvtScript N(handleEvent_80219ED4) = {
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) 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(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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -495,7 +495,7 @@ EvtScript N(handleEvent_80219ED4) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -561,7 +561,7 @@ EvtScript N(8021A2E8) = {
EvtScript N(8021A6D8) = { EvtScript N(8021A6D8) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -619,7 +619,7 @@ EvtScript N(8021A6D8) = {
EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT)
EVT_EXEC_WAIT(N(80219668)) EVT_EXEC_WAIT(N(80219668))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_SWITCH EVT_END_SWITCH
@ -679,7 +679,7 @@ EvtScript N(8021A6D8) = {
EVT_EXEC_WAIT(N(80219668)) EVT_EXEC_WAIT(N(80219668))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -727,7 +727,7 @@ EvtScript N(8021B008) = {
EvtScript N(8021B22C) = { EvtScript N(8021B22C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -796,7 +796,7 @@ EvtScript N(8021B22C) = {
EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT)
EVT_EXEC_WAIT(N(80219668)) EVT_EXEC_WAIT(N(80219668))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -906,7 +906,7 @@ EvtScript N(8021B22C) = {
EVT_EXEC_WAIT(N(80219668)) EVT_EXEC_WAIT(N(80219668))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -914,7 +914,7 @@ EvtScript N(8021B22C) = {
EvtScript N(8021C004) = { EvtScript N(8021C004) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(MoveBattleCamOver, 20)
@ -936,7 +936,7 @@ EvtScript N(8021C004) = {
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(WaitForBuffDone) EVT_CALL(WaitForBuffDone)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

2
src/battle/area/kkj/actor/kammy_koopa.c
View File

@ -490,7 +490,7 @@ EvtScript N(speakOnHit) = {
}; };
EvtScript N(onDeath) = { EvtScript N(onDeath) = {
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(HideHealthBar, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)

10
src/battle/area/kmr_part_2/actor/blue_goomba_1.c
View File

@ -171,7 +171,7 @@ EvtScript N(idle_80219A98) = {
EvtScript N(handleEvent_80219D74) = { EvtScript N(handleEvent_80219D74) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -280,7 +280,7 @@ EvtScript N(handleEvent_80219D74) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -290,7 +290,7 @@ EvtScript N(handleEvent_80219D74) = {
EvtScript N(takeTurn_8021A5A0) = { EvtScript N(takeTurn_8021A5A0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -388,7 +388,7 @@ EvtScript N(takeTurn_8021A5A0) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -454,7 +454,7 @@ EvtScript N(takeTurn_8021A5A0) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/area/kmr_part_2/actor/blue_goomba_2.c
View File

@ -167,7 +167,7 @@ EvtScript N(idle_8021D5E8) = {
EvtScript N(handleEvent_8021D8C4) = { EvtScript N(handleEvent_8021D8C4) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -276,7 +276,7 @@ EvtScript N(handleEvent_8021D8C4) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -286,7 +286,7 @@ EvtScript N(handleEvent_8021D8C4) = {
EvtScript N(takeTurn_8021E0F0) = { EvtScript N(takeTurn_8021E0F0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -384,7 +384,7 @@ EvtScript N(takeTurn_8021E0F0) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -450,7 +450,7 @@ EvtScript N(takeTurn_8021E0F0) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

18
src/battle/area/kmr_part_2/actor/goomba_king.c
View File

@ -239,7 +239,7 @@ EvtScript N(80220DB0) = {
EvtScript N(handleEvent_80220F34) = { EvtScript N(handleEvent_80220F34) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -338,7 +338,7 @@ EvtScript N(handleEvent_80220F34) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -346,7 +346,7 @@ EvtScript N(handleEvent_80220F34) = {
EvtScript N(takeTurn_80221530) = { EvtScript N(takeTurn_80221530) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -435,7 +435,7 @@ EvtScript N(80221680) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Run) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Run)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -459,7 +459,7 @@ EvtScript N(80221680) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Idle)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -559,7 +559,7 @@ EvtScript N(80221CD4) = {
EVT_IF_EQ(LVarA, 5) EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0x80000000, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0x80000000, 0, 0, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -632,7 +632,7 @@ EvtScript N(80221CD4) = {
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
EVT_RETURN EVT_RETURN
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -640,7 +640,7 @@ EvtScript N(80221CD4) = {
EvtScript N(nextTurn_802229C4) = { EvtScript N(nextTurn_802229C4) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
@ -690,7 +690,7 @@ EvtScript N(nextTurn_802229C4) = {
EVT_CALL(EnableBattleStatusBar, TRUE) EVT_CALL(EnableBattleStatusBar, TRUE)
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

6
src/battle/area/kmr_part_2/actor/goomnut_tree.c
View File

@ -176,7 +176,7 @@ EvtScript N(idle_80223678) = {
EvtScript N(handleEvent_80223688) = { EvtScript N(handleEvent_80223688) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(GetLastElement, LVarE)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -201,7 +201,7 @@ EvtScript N(handleEvent_80223688) = {
EVT_CASE_EQ(53) EVT_CASE_EQ(53)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -216,7 +216,7 @@ EvtScript N(takeTurn_80223804) = {
EVT_CASE_EQ(0) EVT_CASE_EQ(0)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/area/kmr_part_2/actor/red_goomba_1.c
View File

@ -171,7 +171,7 @@ EvtScript N(idle_8021B8A8) = {
EvtScript N(handleEvent_8021BB84) = { EvtScript N(handleEvent_8021BB84) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -280,7 +280,7 @@ EvtScript N(handleEvent_8021BB84) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -290,7 +290,7 @@ EvtScript N(handleEvent_8021BB84) = {
EvtScript N(takeTurn_8021C3B0) = { EvtScript N(takeTurn_8021C3B0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -388,7 +388,7 @@ EvtScript N(takeTurn_8021C3B0) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -454,7 +454,7 @@ EvtScript N(takeTurn_8021C3B0) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/area/kmr_part_2/actor/red_goomba_2.c
View File

@ -167,7 +167,7 @@ EvtScript N(idle_8021EFE8) = {
EvtScript N(handleEvent_8021F2C4) = { EvtScript N(handleEvent_8021F2C4) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -276,7 +276,7 @@ EvtScript N(handleEvent_8021F2C4) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -286,7 +286,7 @@ EvtScript N(handleEvent_8021F2C4) = {
EvtScript N(takeTurn_8021FAF0) = { EvtScript N(takeTurn_8021FAF0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -384,7 +384,7 @@ EvtScript N(takeTurn_8021FAF0) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -450,7 +450,7 @@ EvtScript N(takeTurn_8021FAF0) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/area/kmr_part_3/actor/egg_jr_troopa.c
View File

@ -235,7 +235,7 @@ extern EvtScript N(802251CC);
EvtScript N(handleEvent_80224B58) = { EvtScript N(handleEvent_80224B58) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(9) EVT_CASE_EQ(9)
@ -330,7 +330,7 @@ EvtScript N(handleEvent_80224B58) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -380,7 +380,7 @@ EvtScript N(802251CC) = {
EvtScript N(takeTurn_80225314) = { EvtScript N(takeTurn_80225314) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_OPEN_SHELL)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle)
EVT_WAIT(20) EVT_WAIT(20)
@ -483,7 +483,7 @@ EvtScript N(takeTurn_80225314) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle)
EVT_EXEC_WAIT(N(80224964)) EVT_EXEC_WAIT(N(80224964))
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -491,7 +491,7 @@ EvtScript N(takeTurn_80225314) = {
EvtScript N(nextTurn_80225B4C) = { EvtScript N(nextTurn_80225B4C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
@ -518,7 +518,7 @@ EvtScript N(nextTurn_80225B4C) = {
EVT_END_IF EVT_END_IF
EVT_CASE_EQ(12) EVT_CASE_EQ(12)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

50
src/battle/area/kmr_part_3/actor/final_jr_troopa.c
View File

@ -391,7 +391,7 @@ extern EvtScript N(80232170);
EvtScript N(handleEvent_8022D1C4) = { EvtScript N(handleEvent_8022D1C4) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVarA)
EVT_SWITCH(LVarA) EVT_SWITCH(LVarA)
EVT_CASE_EQ(9) EVT_CASE_EQ(9)
@ -515,7 +515,7 @@ EvtScript N(handleEvent_8022D1C4) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -609,7 +609,7 @@ EvtScript N(takeTurn_8022D920) = {
EvtScript N(8022DD48) = { EvtScript N(8022DD48) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(MoveBattleCamOver, 20)
@ -637,7 +637,7 @@ EvtScript N(8022DD48) = {
EvtScript N(8022DF54) = { EvtScript N(8022DF54) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(MoveBattleCamOver, 20)
@ -668,7 +668,7 @@ EvtScript N(8022DF54) = {
EvtScript N(8022E198) = { EvtScript N(8022E198) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -718,7 +718,7 @@ EvtScript N(8022E198) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_CASE_EQ(6) EVT_CASE_EQ(6)
@ -759,7 +759,7 @@ EvtScript N(8022E198) = {
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_SWITCH EVT_END_SWITCH
@ -806,7 +806,7 @@ EvtScript N(8022E198) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Run) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Run)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -814,7 +814,7 @@ EvtScript N(8022E198) = {
EvtScript N(8022ED10) = { EvtScript N(8022ED10) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -901,7 +901,7 @@ EvtScript N(8022ED10) = {
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpikedParaJrTroopa_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -911,7 +911,7 @@ API_CALLABLE(N(CalculateArcsinDeg));
EvtScript N(8022F468) = { EvtScript N(8022F468) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -987,7 +987,7 @@ EvtScript N(8022F468) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1043,7 +1043,7 @@ EvtScript N(8022F468) = {
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1053,7 +1053,7 @@ EvtScript N(8022F468) = {
EvtScript N(80230034) = { EvtScript N(80230034) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -1099,7 +1099,7 @@ EvtScript N(80230034) = {
EVT_ADD(LVar1, LVar7) EVT_ADD(LVar1, LVar7)
EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 30, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 30, 0)
EVT_WAIT(35) EVT_WAIT(35)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_CASE_EQ(5) EVT_CASE_EQ(5)
@ -1120,7 +1120,7 @@ EvtScript N(80230034) = {
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_WAIT(40) EVT_WAIT(40)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_SWITCH EVT_END_SWITCH
@ -1144,7 +1144,7 @@ EvtScript N(80230034) = {
EVT_WAIT(15) 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(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(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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1158,7 +1158,7 @@ EvtScript N(80230034) = {
EvtScript N(80230794) = { EvtScript N(80230794) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_MageJrTroopa_RaiseStaff) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_MageJrTroopa_RaiseStaff)
@ -1214,7 +1214,7 @@ EvtScript N(80230794) = {
EVT_GOTO(2) EVT_GOTO(2)
EVT_END_IF EVT_END_IF
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_CASE_EQ(5) EVT_CASE_EQ(5)
@ -1252,7 +1252,7 @@ EvtScript N(80230794) = {
EVT_GOTO(2) EVT_GOTO(2)
EVT_END_IF EVT_END_IF
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_SWITCH EVT_END_SWITCH
@ -1271,7 +1271,7 @@ EvtScript N(80230794) = {
EVT_GOTO(2) EVT_GOTO(2)
EVT_END_IF EVT_END_IF
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1279,7 +1279,7 @@ EvtScript N(80230794) = {
EvtScript N(8023106C) = { EvtScript N(8023106C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
@ -1329,7 +1329,7 @@ EvtScript N(8023106C) = {
EVT_CALL(FreezeBattleState, FALSE) EVT_CALL(FreezeBattleState, FALSE)
EVT_END_THREAD EVT_END_THREAD
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1337,7 +1337,7 @@ EvtScript N(8023106C) = {
EvtScript N(nextTurn_8023147C) = { EvtScript N(nextTurn_8023147C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
@ -1355,7 +1355,7 @@ EvtScript N(nextTurn_8023147C) = {
EVT_CASE_EQ(11) EVT_CASE_EQ(11)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

14
src/battle/area/kmr_part_3/actor/jr_troopa.c
View File

@ -235,7 +235,7 @@ EvtScript N(8022325C) = {
EvtScript N(handleEvent_80223290) = { EvtScript N(handleEvent_80223290) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetActorVar, ACTOR_SELF, 2, LVar0)
EVT_IF_EQ(LVar0, 0) EVT_IF_EQ(LVar0, 0)
EVT_CALL(GetLastDamage, ACTOR_SELF, LVar1) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar1)
@ -268,7 +268,7 @@ EvtScript N(handleEvent_80223290) = {
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -276,7 +276,7 @@ EvtScript N(handleEvent_80223290) = {
EvtScript N(takeTurn_802234A4) = { EvtScript N(takeTurn_802234A4) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(AddActorVar, ACTOR_SELF, 0, 1)
EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0)
EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1)
@ -289,7 +289,7 @@ EvtScript N(takeTurn_802234A4) = {
EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(ActorSpeak, MSG_CH0_00B1, ACTOR_SELF, PRT_MAIN, 0x00210016, 0x00210003)
EVT_END_IF EVT_END_IF
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_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Idle)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -388,7 +388,7 @@ EvtScript N(takeTurn_802234A4) = {
EvtScript N(nextTurn_80223D2C) = { EvtScript N(nextTurn_80223D2C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
@ -475,7 +475,7 @@ EvtScript N(nextTurn_80223D2C) = {
EVT_END_IF EVT_END_IF
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

14
src/battle/area/kmr_part_3/actor/mage_jr_troopa.c
View File

@ -246,7 +246,7 @@ extern EvtScript N(8022BF1C);
EvtScript N(handleEvent_8022ADD8) = { EvtScript N(handleEvent_8022ADD8) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(9) EVT_CASE_EQ(9)
@ -363,7 +363,7 @@ EvtScript N(handleEvent_8022ADD8) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -371,7 +371,7 @@ EvtScript N(handleEvent_8022ADD8) = {
EvtScript N(takeTurn_8022B4F0) = { EvtScript N(takeTurn_8022B4F0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MageJrTroopa_RaiseStaff) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MageJrTroopa_RaiseStaff)
@ -420,7 +420,7 @@ EvtScript N(takeTurn_8022B4F0) = {
EVT_IF_EQ(LVarA, 5) EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -454,7 +454,7 @@ EvtScript N(takeTurn_8022B4F0) = {
EVT_END_IF EVT_END_IF
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -462,7 +462,7 @@ EvtScript N(takeTurn_8022B4F0) = {
EvtScript N(nextTurn_8022BB44) = { EvtScript N(nextTurn_8022BB44) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(12) EVT_CASE_EQ(12)
@ -517,7 +517,7 @@ EvtScript N(nextTurn_8022BB44) = {
EVT_EXEC_WAIT(N(8022AC40)) EVT_EXEC_WAIT(N(8022AC40))
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/area/kmr_part_3/actor/para_jr_troopa.c
View File

@ -245,7 +245,7 @@ extern EvtScript N(80227E1C);
EvtScript N(handleEvent_802266B0) = { EvtScript N(handleEvent_802266B0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -357,7 +357,7 @@ EvtScript N(handleEvent_802266B0) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -392,7 +392,7 @@ EvtScript N(80226D4C) = {
EvtScript N(takeTurn_80226F58) = { EvtScript N(takeTurn_80226F58) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) 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_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ParaJrTroopa_Idle)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -496,7 +496,7 @@ EvtScript N(takeTurn_80226F58) = {
EvtScript N(nextTurn_80227724) = { EvtScript N(nextTurn_80227724) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVarF)
EVT_SWITCH(LVarF) EVT_SWITCH(LVarF)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
@ -528,7 +528,7 @@ EvtScript N(nextTurn_80227724) = {
EVT_END_IF EVT_END_IF
EVT_CASE_EQ(12) EVT_CASE_EQ(12)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c
View File

@ -241,7 +241,7 @@ extern EvtScript N(8022A480);
EvtScript N(handleEvent_802287D0) = { EvtScript N(handleEvent_802287D0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(9) EVT_CASE_EQ(9)
@ -376,7 +376,7 @@ EvtScript N(handleEvent_802287D0) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -441,7 +441,7 @@ EvtScript N(80229160) = {
EvtScript N(takeTurn_8022936C) = { EvtScript N(takeTurn_8022936C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) 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_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedParaJrTroopa_Idle)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -561,7 +561,7 @@ API_CALLABLE(func_802189DC_447E1C) {
EvtScript N(nextTurn_80229B38) = { EvtScript N(nextTurn_80229B38) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
@ -626,7 +626,7 @@ EvtScript N(nextTurn_80229B38) = {
EVT_END_IF EVT_END_IF
EVT_CASE_EQ(12) EVT_CASE_EQ(12)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

20
src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c
View File

@ -261,7 +261,7 @@ extern EvtScript N(8021D614);
EvtScript N(handleEvent_8021C808) = { EvtScript N(handleEvent_8021C808) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -365,7 +365,7 @@ EvtScript N(handleEvent_8021C808) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -373,7 +373,7 @@ EvtScript N(handleEvent_8021C808) = {
EvtScript N(takeTurn_8021CDFC) = { EvtScript N(takeTurn_8021CDFC) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
@ -434,7 +434,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_EXEC_WAIT(N(8021C790)) EVT_EXEC_WAIT(N(8021C790))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -477,7 +477,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_EXEC_WAIT(N(8021C790)) EVT_EXEC_WAIT(N(8021C790))
EVT_END_CASE_GROUP 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -644,7 +644,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent_8021DF5C) = { EvtScript N(handleEvent_8021DF5C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -753,7 +753,7 @@ EvtScript N(handleEvent_8021DF5C) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -763,7 +763,7 @@ EvtScript N(handleEvent_8021DF5C) = {
EvtScript N(takeTurn_8021E788) = { EvtScript N(takeTurn_8021E788) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -861,7 +861,7 @@ EvtScript N(takeTurn_8021E788) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -927,7 +927,7 @@ EvtScript N(takeTurn_8021E788) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c
View File

@ -168,7 +168,7 @@ EvtScript N(idle_8021A578) = {
EvtScript N(handleEvent_8021A854) = { EvtScript N(handleEvent_8021A854) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -292,7 +292,7 @@ EvtScript N(handleEvent_8021A854) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -302,7 +302,7 @@ EvtScript N(handleEvent_8021A854) = {
EvtScript N(takeTurn_8021B19C) = { EvtScript N(takeTurn_8021B19C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -400,7 +400,7 @@ EvtScript N(takeTurn_8021B19C) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -472,7 +472,7 @@ EvtScript N(takeTurn_8021B19C) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

2
src/battle/area/kpa2/actor/bowser_phase_1.c
View File

@ -232,7 +232,7 @@ EvtScript N(nextTurn) = {
EVT_CALL(EnableBattleStatusBar, TRUE) EVT_CALL(EnableBattleStatusBar, TRUE)
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

4
src/battle/area/kpa2/actor/bowser_phase_3.c
View File

@ -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_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_END_IF EVT_END_IF
EVT_END_THREAD 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_CALL(MakeLerp, 0, 0x00001950, 100, EASING_COS_IN_OUT)
EVT_LABEL(2) EVT_LABEL(2)
EVT_CALL(UpdateLerp) EVT_CALL(UpdateLerp)
@ -591,7 +591,7 @@ EvtScript N(onDeath) = {
EVT_IF_EQ(LVar1, 1) EVT_IF_EQ(LVar1, 1)
EVT_GOTO(2) EVT_GOTO(2)
EVT_END_IF 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_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_HurtStill)
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2129) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2129)

6
src/battle/area/kpa4/actor/bombshell_bill.c
View File

@ -153,7 +153,7 @@ EvtScript N(explode) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -225,7 +225,7 @@ EvtScript N(handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -233,7 +233,7 @@ EvtScript N(handleEvent) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)

8
src/battle/area/kpa4/actor/bombshell_bill_blaster.c
View File

@ -113,7 +113,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -167,7 +167,7 @@ EvtScript N(handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -175,7 +175,7 @@ EvtScript N(handleEvent) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetActorVar, ACTOR_SELF, 8, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(0) EVT_CASE_EQ(0)
@ -183,7 +183,7 @@ EvtScript N(takeTurn) = {
EVT_CASE_EQ(1) EVT_CASE_EQ(1)
EVT_EXEC_WAIT(N(wait)) EVT_EXEC_WAIT(N(wait))
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/area/kzn2/actor/lava_bud.c
View File

@ -256,7 +256,7 @@ EvtScript N(playModelAnimation) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0)
EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastElement, LVarE)
@ -313,7 +313,7 @@ EvtScript N(handleEvent) = {
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 1) EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 1)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -404,7 +404,7 @@ EvtScript N(takeTurn) = {
EVT_SUB(LVar0, 1) EVT_SUB(LVar0, 1)
EVT_CALL(SetActorVar, ACTOR_SELF, 11, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 11, LVar0)
EVT_IF_LE(LVar0, 0) 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_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 1) EVT_IF_EQ(LVar0, 1)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19)
@ -461,7 +461,7 @@ EvtScript N(takeTurn) = {
EVT_EXEC_WAIT(N(playModelAnimation)) EVT_EXEC_WAIT(N(playModelAnimation))
EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0)
EVT_CALL(SetEnemyHP, 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 EVT_END_IF
EVT_END_IF EVT_END_IF
@ -594,7 +594,7 @@ EvtScript N(summonPetitPiranha) = {
EVT_END_IF EVT_END_IF
EVT_CALL(LoadBattleDmaData, 31) EVT_CALL(LoadBattleDmaData, 31)
EVT_EXEC_WAIT(N(playModelAnimation)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1083,7 +1083,7 @@ EvtScript N(attackPetitSpit) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

22
src/battle/area/kzn2/actor/lava_piranha.c
View File

@ -659,7 +659,7 @@ EvtScript N(nextTurn) = {
EvtScript N(spawnColorado) = { EvtScript N(spawnColorado) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(EnableBattleStatusBar, FALSE)
EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, -1, -1, 0, MSG_CH5_0104) EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, -1, -1, 0, MSG_CH5_0104)
EVT_THREAD EVT_THREAD
@ -720,7 +720,7 @@ EvtScript N(spawnColorado) = {
EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(6.0)) EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(6.0))
EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -300, 0, 0) EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -300, 0, 0)
EVT_CALL(EnableBattleStatusBar, TRUE) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -948,7 +948,7 @@ EvtScript N(initVines) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0)
EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastElement, LVarE)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
@ -1023,7 +1023,7 @@ EvtScript N(handleEvent) = {
EVT_IF_FLAG(LVar0, STATUS_FLAG_STOP) EVT_IF_FLAG(LVar0, STATUS_FLAG_STOP)
EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 1) EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 1)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1086,7 +1086,7 @@ EvtScript N(takeTurn) = {
EVT_SUB(LVar0, 1) EVT_SUB(LVar0, 1)
EVT_CALL(SetActorVar, ACTOR_SELF, 11, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 11, LVar0)
EVT_IF_LE(LVar0, 0) 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(UseBattleCamPreset, BTL_CAM_PRESET_19)
EVT_CALL(SetBattleCamTarget, 80, 70, 0) EVT_CALL(SetBattleCamTarget, 80, 70, 0)
EVT_CALL(SetBattleCamZoom, 300) EVT_CALL(SetBattleCamZoom, 300)
@ -1112,7 +1112,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE)
EVT_CALL(LoadBattleDmaData, 0) EVT_CALL(LoadBattleDmaData, 0)
EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) 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_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
@ -1182,7 +1182,7 @@ EvtScript N(attackFlameSpew) = {
EVT_END_IF EVT_END_IF
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1206,7 +1206,7 @@ EvtScript N(attackFlameSpew) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1266,7 +1266,7 @@ EvtScript N(attackFireStream) = {
EVT_END_IF EVT_END_IF
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1288,7 +1288,7 @@ EvtScript N(attackFireStream) = {
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1640,7 +1640,7 @@ EvtScript N(onDeath) = {
EVT_CALL(GetEnemyMaxHP, ACTOR_ENEMY2, LVar0) EVT_CALL(GetEnemyMaxHP, ACTOR_ENEMY2, LVar0)
EVT_CALL(SetEnemyHP, ACTOR_ENEMY2, LVar0) EVT_CALL(SetEnemyHP, ACTOR_ENEMY2, LVar0)
EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_ELSE EVT_ELSE
EVT_CALL(HideHealthBar, ACTOR_ENEMY1) EVT_CALL(HideHealthBar, ACTOR_ENEMY1)

6
src/battle/area/kzn2/actor/petit_piranha.c
View File

@ -119,7 +119,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE) EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
@ -205,7 +205,7 @@ EvtScript N(handleEvent) = {
EVT_WAIT(1000) EVT_WAIT(1000)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -250,7 +250,7 @@ API_CALLABLE(N(SetFlameX)) {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_IF_GE(LVar1, 41) EVT_IF_GE(LVar1, 41)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PetitPiranha_Anim04) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PetitPiranha_Anim04)

32
src/battle/area/mac/actor/chan.c
View File

@ -151,7 +151,7 @@ EvtScript N(80219F4C) = {
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_END_IF EVT_END_IF
EVT_CALL(HPBarToHome, ACTOR_SELF) 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(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -217,7 +217,7 @@ EvtScript N(8021A12C) = {
EvtScript N(handleEvent_8021A560) = { EvtScript N(handleEvent_8021A560) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(9) EVT_CASE_EQ(9)
@ -299,7 +299,7 @@ EvtScript N(handleEvent_8021A560) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -322,7 +322,7 @@ s32 N(intTable_8021AA6C)[] = {
EvtScript N(handleEvent_8021AAB8) = { EvtScript N(handleEvent_8021AAB8) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -541,7 +541,7 @@ EvtScript N(handleEvent_8021AAB8) = {
EVT_END_IF EVT_END_IF
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -549,7 +549,7 @@ EvtScript N(handleEvent_8021AAB8) = {
EvtScript N(takeTurn_8021B81C) = { EvtScript N(takeTurn_8021B81C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1)
EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 16) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_Idle)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -682,7 +682,7 @@ EvtScript N(takeTurn_8021B81C) = {
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_LABEL(10) EVT_LABEL(10)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -690,7 +690,7 @@ EvtScript N(takeTurn_8021B81C) = {
EvtScript N(takeTurn_Chan) = { EvtScript N(takeTurn_Chan) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetActorVar, ACTOR_SELF, 8, LVar0)
EVT_IF_EQ(LVar0, 2) EVT_IF_EQ(LVar0, 2)
EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) 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(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021A11C)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -782,7 +782,7 @@ EvtScript N(takeTurn_Chan) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_ExitShell) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_ExitShell)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -818,7 +818,7 @@ EvtScript N(takeTurn_Chan) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_Idle)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -841,7 +841,7 @@ EvtScript N(init_8021CCDC) = {
EvtScript N(nextTurn_8021CD7C) = { EvtScript N(nextTurn_8021CD7C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
@ -889,7 +889,7 @@ EvtScript N(nextTurn_8021CD7C) = {
EVT_BREAK_SWITCH EVT_BREAK_SWITCH
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -920,7 +920,7 @@ EvtScript N(handleEvent_8021D0CC) = {
EVT_BREAK_SWITCH EVT_BREAK_SWITCH
EVT_END_IF EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0)
EVT_IF_EQ(LVar0, 2) EVT_IF_EQ(LVar0, 2)
@ -937,7 +937,7 @@ EvtScript N(handleEvent_8021D0CC) = {
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetActorVar, ACTOR_SELF, 1, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, LVar0)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_END_SWITCH EVT_END_SWITCH
EVT_RETURN EVT_RETURN

108
src/battle/area/mac/actor/lee.c
View File

@ -163,7 +163,7 @@ EvtScript N(8021D5C4) = {
EvtScript N(handleEvent_8021D600) = { EvtScript N(handleEvent_8021D600) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -252,7 +252,7 @@ EvtScript N(handleEvent_8021D600) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -260,7 +260,7 @@ EvtScript N(handleEvent_8021D600) = {
EvtScript N(flyingTackle) = { EvtScript N(flyingTackle) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorVar, ACTOR_SELF, 8, 0)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
@ -296,7 +296,7 @@ EvtScript N(flyingTackle) = {
EVT_EXEC_WAIT(N(8021D5C4)) EVT_EXEC_WAIT(N(8021D5C4))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -333,7 +333,7 @@ EvtScript N(flyingTackle) = {
EVT_EXEC_WAIT(N(8021D5C4)) EVT_EXEC_WAIT(N(8021D5C4))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -559,7 +559,7 @@ EvtScript N(idle_8021EB14) = {
EvtScript N(handleEvent_8021EB24) = { EvtScript N(handleEvent_8021EB24) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -654,7 +654,7 @@ EvtScript N(handleEvent_8021EB24) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -820,7 +820,7 @@ API_CALLABLE(func_80218100_464590) {
EvtScript N(EVS_Move_Headbonk) = { EvtScript N(EVS_Move_Headbonk) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(8021F514))
EVT_EXEC_WAIT(N(8021F5F8)) EVT_EXEC_WAIT(N(8021F5F8))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA)
@ -860,7 +860,7 @@ EvtScript N(EVS_Move_Headbonk) = {
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_EXEC_WAIT(N(8021F08C)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -914,10 +914,10 @@ EvtScript N(EVS_Move_Headbonk) = {
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(SetGoalToTarget, ACTOR_SELF) 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(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk)
EVT_CALL(N(UnkFunc62), LVarA, 3) 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_CASE_EQ(2)
EVT_THREAD EVT_THREAD
EVT_WAIT(4) EVT_WAIT(4)
@ -938,10 +938,10 @@ EvtScript N(EVS_Move_Headbonk) = {
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(SetGoalToTarget, ACTOR_SELF) 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(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk)
EVT_CALL(N(UnkFunc62), LVarA, 3) EVT_CALL(N(UnkFunc62), LVarA, 3)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CHILD_THREAD EVT_CHILD_THREAD
EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) 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_EXEC_WAIT(N(8021F08C))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1002,7 +1002,7 @@ API_CALLABLE(N(CloseTattleWindow)) {
EvtScript N(EVS_Move_Tattle) = { EvtScript N(EVS_Move_Tattle) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, 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_WAIT(32)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TATTLE_OPEN, FALSE) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END 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) = { EvtScript N(handleEvent_80220908) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -1366,7 +1366,7 @@ EvtScript N(handleEvent_80220908) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1376,7 +1376,7 @@ EvtScript N(handleEvent_80220908) = {
EvtScript N(takeTurn_80221200) = { EvtScript N(takeTurn_80221200) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0)
EVT_IF_EQ(LVar0, 1) EVT_IF_EQ(LVar0, 1)
@ -1419,7 +1419,7 @@ EvtScript N(takeTurn_80221200) = {
EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -2, 38) EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -2, 38)
EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PRT_MAIN, -3, -9) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PRT_MAIN, -3, -9)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -1524,7 +1524,7 @@ EvtScript N(takeTurn_80221200) = {
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.5)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.5))
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1572,7 +1572,7 @@ EvtScript N(takeTurn_80221200) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1706,7 +1706,7 @@ EvtScript N(idle_80222458) = {
EvtScript N(handleEvent_80222468) = { EvtScript N(handleEvent_80222468) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -1800,7 +1800,7 @@ EvtScript N(handleEvent_80222468) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1812,7 +1812,7 @@ EvtScript N(handleEvent_80222468) = {
EvtScript N(takeTurn_802229C4) = { EvtScript N(takeTurn_802229C4) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -1863,7 +1863,7 @@ EvtScript N(takeTurn_802229C4) = {
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1926,7 +1926,7 @@ EvtScript N(takeTurn_802229C4) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -2072,7 +2072,7 @@ EvtScript N(idle_80223574) = {
EvtScript N(handleEvent_80223584) = { EvtScript N(handleEvent_80223584) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -2175,7 +2175,7 @@ EvtScript N(handleEvent_80223584) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -2183,7 +2183,7 @@ EvtScript N(handleEvent_80223584) = {
EvtScript N(80223B74) = { EvtScript N(80223B74) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -2209,7 +2209,7 @@ EvtScript N(80223B74) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 15, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 15, 0)
EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, EASING_QUARTIC_OUT) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, EASING_QUARTIC_OUT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2005) 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(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Dive) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Dive)
EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
@ -2237,12 +2237,12 @@ EvtScript N(80223B74) = {
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run)
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH 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_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_PostDive)
EVT_WAIT(1) EVT_WAIT(1)
EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9)
@ -2282,7 +2282,7 @@ EvtScript N(80223B74) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -2434,7 +2434,7 @@ EvtScript N(idle_802245FC) = {
EvtScript N(handleEvent_8022460C) = { EvtScript N(handleEvent_8022460C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -2549,7 +2549,7 @@ EvtScript N(handleEvent_8022460C) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -2557,7 +2557,7 @@ EvtScript N(handleEvent_8022460C) = {
EvtScript N(takeTurn_80224CA0) = { EvtScript N(takeTurn_80224CA0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_WAIT(10) EVT_WAIT(10)
EVT_THREAD EVT_THREAD
EVT_SET(LVar0, 200) EVT_SET(LVar0, 200)
@ -2646,7 +2646,7 @@ EvtScript N(takeTurn_80224CA0) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_END_LOOP EVT_END_LOOP
EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -2739,7 +2739,7 @@ EvtScript N(takeTurn_80224CA0) = {
EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -3352,7 +3352,7 @@ EvtScript N(idle_80226B44) = {
EvtScript N(handleEvent_80226B54) = { EvtScript N(handleEvent_80226B54) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -3447,7 +3447,7 @@ EvtScript N(handleEvent_80226B54) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -3455,7 +3455,7 @@ EvtScript N(handleEvent_80226B54) = {
EvtScript N(takeTurn_802270BC) = { EvtScript N(takeTurn_802270BC) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) 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(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -3692,7 +3692,7 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -3843,7 +3843,7 @@ EvtScript N(idle_80228604) = {
EvtScript N(handleEvent_80228614) = { EvtScript N(handleEvent_80228614) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -3938,7 +3938,7 @@ EvtScript N(handleEvent_80228614) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -3946,7 +3946,7 @@ EvtScript N(handleEvent_80228614) = {
EvtScript N(takeTurn_80228B78) = { EvtScript N(takeTurn_80228B78) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run)
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -4087,7 +4087,7 @@ EvtScript N(takeTurn_80228B78) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -4162,7 +4162,7 @@ API_CALLABLE(func_80219824_465CB4) {
EvtScript N(copyPartner) = { EvtScript N(copyPartner) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(MoveBattleCamOver, 15)
@ -4275,7 +4275,7 @@ EvtScript N(copyPartner) = {
EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION)
EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(HPBarToHome, ACTOR_SELF)
EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -4298,7 +4298,7 @@ EvtScript N(takeTurn_80229F9C) = {
EvtScript N(nextTurn_8022A038) = { EvtScript N(nextTurn_8022A038) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(12) EVT_CASE_EQ(12)
@ -4328,7 +4328,7 @@ EvtScript N(nextTurn_8022A038) = {
EVT_BREAK_SWITCH EVT_BREAK_SWITCH
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

18
src/battle/area/mac/actor/master1.c
View File

@ -118,7 +118,7 @@ EvtScript N(idle_8022A494) = {
EvtScript N(8022A4A4) = { EvtScript N(8022A4A4) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -212,7 +212,7 @@ EvtScript N(8022A4A4) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -220,7 +220,7 @@ EvtScript N(8022A4A4) = {
EvtScript N(takeTurn_8022AA54) = { EvtScript N(takeTurn_8022AA54) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Run)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -300,7 +300,7 @@ EvtScript N(takeTurn_8022AA54) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Run) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Run)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -308,7 +308,7 @@ EvtScript N(takeTurn_8022AA54) = {
EvtScript N(nextTurn_8022B06C) = { EvtScript N(nextTurn_8022B06C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
@ -341,7 +341,7 @@ EvtScript N(nextTurn_8022B06C) = {
EVT_BREAK_SWITCH EVT_BREAK_SWITCH
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -387,7 +387,7 @@ EvtScript N(handleEvent_8022B2CC) = {
EVT_BREAK_SWITCH EVT_BREAK_SWITCH
EVT_END_IF EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_EQ(LVarA, 1)
EVT_IF_GT(LVarB, 2) EVT_IF_GT(LVarB, 2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -400,7 +400,7 @@ EvtScript N(handleEvent_8022B2CC) = {
EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_002F, ACTOR_SELF, PRT_MAIN, 0x00A20009, 0x00A20005) EVT_CALL(ActorSpeak, MSG_MAC_Gate_002F, ACTOR_SELF, PRT_MAIN, 0x00A20009, 0x00A20005)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH

40
src/battle/area/mac/actor/master2.c
View File

@ -128,7 +128,7 @@ EvtScript N(idle_8022B8B0) = {
EvtScript N(8022B8C0) = { EvtScript N(8022B8C0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -222,7 +222,7 @@ EvtScript N(8022B8C0) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -255,12 +255,12 @@ EvtScript N(singleStrike2) = {
EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0)
EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) 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_WAIT(10)
EVT_IF_EQ(LVarA, 5) EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -274,11 +274,11 @@ EvtScript N(singleStrike2) = {
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0)
EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) 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_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2) EVT_WAIT(2)
@ -325,7 +325,7 @@ EvtScript N(singleStrike2) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -352,13 +352,13 @@ EvtScript N(doubleStrike2) = {
EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance)
EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) 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_WAIT(10)
EVT_IF_EQ(LVarA, 5) EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -372,12 +372,12 @@ EvtScript N(doubleStrike2) = {
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance)
EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_THREAD EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0))
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.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_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9))
EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE) 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_END_THREAD
EVT_THREAD EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -463,7 +463,7 @@ EvtScript N(doubleStrike2) = {
EvtScript N(takeTurn_8022CF48) = { EvtScript N(takeTurn_8022CF48) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(RandInt, 100, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_LT(20) EVT_CASE_LT(20)
@ -471,7 +471,7 @@ EvtScript N(takeTurn_8022CF48) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_EXEC_WAIT(N(singleStrike2)) EVT_EXEC_WAIT(N(singleStrike2))
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -479,7 +479,7 @@ EvtScript N(takeTurn_8022CF48) = {
EvtScript N(nextTurn_8022CFFC) = { EvtScript N(nextTurn_8022CFFC) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
@ -564,7 +564,7 @@ EvtScript N(nextTurn_8022CFFC) = {
EVT_BREAK_SWITCH EVT_BREAK_SWITCH
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -610,7 +610,7 @@ EvtScript N(handleEvent_8022D634) = {
EVT_BREAK_SWITCH EVT_BREAK_SWITCH
EVT_END_IF EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_EQ(LVarA, 1)
EVT_IF_GT(LVarB, 2) EVT_IF_GT(LVarB, 2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -623,7 +623,7 @@ EvtScript N(handleEvent_8022D634) = {
EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0034, ACTOR_SELF, PRT_MAIN, 0x00A2000A, 0x00A20006) EVT_CALL(ActorSpeak, MSG_MAC_Gate_0034, ACTOR_SELF, PRT_MAIN, 0x00A2000A, 0x00A20006)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH

72
src/battle/area/mac/actor/master3.c
View File

@ -142,7 +142,7 @@ EvtScript N(idle_8022DC34) = {
EvtScript N(8022DC44) = { EvtScript N(8022DC44) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -249,7 +249,7 @@ EvtScript N(8022DC44) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -282,12 +282,12 @@ EvtScript N(singleStrike3) = {
EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0)
EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) 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_WAIT(10)
EVT_IF_EQ(LVarA, 5) EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -301,11 +301,11 @@ EvtScript N(singleStrike3) = {
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0)
EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) 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_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2) EVT_WAIT(2)
@ -352,7 +352,7 @@ EvtScript N(singleStrike3) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -379,13 +379,13 @@ EvtScript N(doubleStrike3) = {
EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance)
EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) 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_WAIT(10)
EVT_IF_EQ(LVarA, 5) EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -399,12 +399,12 @@ EvtScript N(doubleStrike3) = {
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance)
EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_THREAD EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0))
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.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_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9))
EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE) 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_END_THREAD
EVT_THREAD EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -510,13 +510,13 @@ EvtScript N(tripleStrike3) = {
EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(5)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance)
EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) 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_WAIT(10)
EVT_IF_EQ(LVarA, 5) EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -530,12 +530,12 @@ EvtScript N(tripleStrike3) = {
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPalmStance)
EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_THREAD EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0))
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.0))
@ -551,13 +551,13 @@ EvtScript N(tripleStrike3) = {
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD EVT_THREAD
EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_WAIT(5) EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5))
EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE) 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_END_THREAD
EVT_THREAD EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) 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_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, 0)
EVT_THREAD EVT_THREAD
EVT_WAIT(5) EVT_WAIT(5)
EVT_CALL(EnablePlayerBlur, 1) EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.3)) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.3))
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) 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(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt)
EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(func_80273444, 50, 0, 0) EVT_CALL(func_80273444, 50, 0, 0)
EVT_CALL(EnablePlayerBlur, 0) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
EVT_END_THREAD EVT_END_THREAD
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -607,11 +607,11 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedKick) 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(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0)
EVT_CALL(RunToGoal, ACTOR_SELF, 3, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 3, FALSE)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_THREAD EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0))
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(3.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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedRun)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -695,13 +695,13 @@ EvtScript N(80230240) = {
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedDownwardStance)
EVT_WAIT(15) 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_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 50) EVT_ADD(LVar1, 50)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedIdle)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(FlyToGoal, ACTOR_SELF, 90, 0, EASING_COS_IN_OUT) 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(HPBarToHome, ACTOR_SELF)
@ -722,7 +722,7 @@ EvtScript N(80230240) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_END_LOOP EVT_END_LOOP
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -772,7 +772,7 @@ EvtScript N(8023059C) = {
EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(2)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -805,7 +805,7 @@ EvtScript N(80230914) = {
EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(2)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -813,7 +813,7 @@ EvtScript N(80230914) = {
EvtScript N(takeTurn_80230B20) = { EvtScript N(takeTurn_80230B20) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetActorVar, ACTOR_SELF, 1, LVar0)
EVT_IF_EQ(LVar0, 0) EVT_IF_EQ(LVar0, 0)
EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0)
@ -850,7 +850,7 @@ EvtScript N(takeTurn_80230B20) = {
EVT_EXEC_WAIT(N(8023059C)) EVT_EXEC_WAIT(N(8023059C))
EVT_END_SWITCH EVT_END_SWITCH
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -858,7 +858,7 @@ EvtScript N(takeTurn_80230B20) = {
EvtScript N(nextTurn_80230D44) = { EvtScript N(nextTurn_80230D44) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(10) EVT_CASE_EQ(10)
@ -949,7 +949,7 @@ EvtScript N(nextTurn_80230D44) = {
EVT_BREAK_SWITCH EVT_BREAK_SWITCH
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -995,7 +995,7 @@ EvtScript N(handleEvent_80231408) = {
EVT_BREAK_SWITCH EVT_BREAK_SWITCH
EVT_END_IF EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_EQ(LVarA, 1)
EVT_IF_GT(LVarB, 2) EVT_IF_GT(LVarB, 2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -1008,7 +1008,7 @@ EvtScript N(handleEvent_80231408) = {
EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(ActorSpeak, MSG_MAC_Gate_0039, ACTOR_SELF, PRT_MAIN, 0x00A2000A, 0x00A20006) EVT_CALL(ActorSpeak, MSG_MAC_Gate_0039, ACTOR_SELF, PRT_MAIN, 0x00A2000A, 0x00A20006)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH

26
src/battle/area/nok/actor/kent_c_koopa.c
View File

@ -267,13 +267,13 @@ EvtScript N(EVS_Init) = {
EvtScript N(EVS_HandlePhase) = { EvtScript N(EVS_HandlePhase) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(PHASE_PLAYER_BEGIN) EVT_CASE_EQ(PHASE_PLAYER_BEGIN)
EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_FlipResistance, 2) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_FlipResistance, 2)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -289,7 +289,7 @@ EvtScript N(EVS_Idle) = {
EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_HandleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(GetLastElement, LVarE)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVarD) EVT_CALL(GetLastEvent, ACTOR_SELF, LVarD)
EVT_SWITCH(LVarD) EVT_SWITCH(LVarD)
@ -499,7 +499,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_END_IF EVT_END_IF
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -513,7 +513,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_IsFlipped, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_IsFlipped, LVar0)
EVT_IF_EQ(LVar0, 1) EVT_IF_EQ(LVar0, 1)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(SetBattleCamOffsetZ, 20) 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(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_ELSE EVT_ELSE
@ -611,7 +611,7 @@ EvtScript N(EVS_TakeTurn) = {
EvtScript N(EVS_Attack_ShellToss) = { EvtScript N(EVS_Attack_ShellToss) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(SetBattleCamZoom, 200)
@ -660,7 +660,7 @@ EvtScript N(EVS_Attack_ShellToss) = {
EVT_WAIT(8) EVT_WAIT(8)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
@ -761,7 +761,7 @@ EvtScript N(EVS_Attack_ShellToss) = {
EVT_WAIT(8) EVT_WAIT(8)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_ELSE EVT_ELSE
@ -816,7 +816,7 @@ EvtScript N(EVS_Attack_ShellToss) = {
EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim04) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_EXEC_WAIT(EVS_Enemy_ReturnHome)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -824,7 +824,7 @@ EvtScript N(EVS_Attack_ShellToss) = {
EvtScript N(EVS_Attack_HeavyStomp) = { EvtScript N(EVS_Attack_HeavyStomp) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(SetBattleCamZoom, 280) EVT_CALL(SetBattleCamZoom, 280)
@ -920,7 +920,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_END_LOOP EVT_END_LOOP
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1007,7 +1007,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = {
EVT_CASE_EQ(HIT_RESULT_3) EVT_CASE_EQ(HIT_RESULT_3)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

20
src/battle/area/omo2/actor/general_guy.c
View File

@ -143,12 +143,12 @@ s32 N(IdleAnimations3)[] = {
EvtScript N(nextTurn) = { EvtScript N(nextTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(PHASE_PLAYER_BEGIN) EVT_CASE_EQ(PHASE_PLAYER_BEGIN)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -295,7 +295,7 @@ EvtScript N(takeTurn) = {
EvtScript N(attack_throw_bomb) = { EvtScript N(attack_throw_bomb) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_15) 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(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch))
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_CASE_EQ(HIT_RESULT_LUCKY) 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(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch))
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_SWITCH 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(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch))
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -415,7 +415,7 @@ EvtScript N(attack_throw_bomb) = {
EvtScript N(attack_lightning_shot) = { EvtScript N(attack_lightning_shot) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) 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(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch))
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_CASE_EQ(HIT_RESULT_LUCKY) 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(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch))
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_SWITCH 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(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch))
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_MAIN, SOUND_206B) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/area/omo2_1/actor/shy_squad.c
View File

@ -456,7 +456,7 @@ EvtScript N(init) = {
EvtScript N(nextTurn) = { EvtScript N(nextTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(PHASE_PLAYER_BEGIN) EVT_CASE_EQ(PHASE_PLAYER_BEGIN)
@ -512,7 +512,7 @@ EvtScript N(nextTurn) = {
EVT_END_IF EVT_END_IF
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1113,7 +1113,7 @@ EvtScript N(onDeath) = {
EvtScript N(attack) = { EvtScript N(attack) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
@ -1215,7 +1215,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(move_squad_to_home)) EVT_EXEC_WAIT(N(move_squad_to_home))
EVT_SET(LVar1, ANIM_ShySquadGuy_Anim01) EVT_SET(LVar1, ANIM_ShySquadGuy_Anim01)
EVT_EXEC_WAIT(N(set_alive_guys_animation)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1272,7 +1272,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(move_squad_to_home)) EVT_EXEC_WAIT(N(move_squad_to_home))
EVT_SET(LVar1, ANIM_ShySquadGuy_Anim01) EVT_SET(LVar1, ANIM_ShySquadGuy_Anim01)
EVT_EXEC_WAIT(N(set_alive_guys_animation)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

22
src/battle/area/omo2_2/actor/stilt_guy.c
View File

@ -253,7 +253,7 @@ EvtScript N(init) = {
EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, PRT_4, ACTOR_PART_TARGET_FLAG_1, TRUE) EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, PRT_4, ACTOR_PART_TARGET_FLAG_1, TRUE)
EVT_CALL(SetPartSize, ACTOR_SELF, PRT_MAIN, 24, 30) EVT_CALL(SetPartSize, ACTOR_SELF, PRT_MAIN, 24, 30)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_8, 0, 13, 0)
EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_7, 0, 13, 0) EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_7, 0, 13, 0)
EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_6, 0, 13, 0) EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_6, 0, 13, 0)
@ -435,7 +435,7 @@ EvtScript N(init) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_END_LOOP EVT_END_LOOP
EVT_CALL(HPBarToHome, ACTOR_SELF) 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(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 1) EVT_IF_EQ(LVar0, 1)
@ -650,7 +650,7 @@ EvtScript N(takeTurn) = {
EvtScript N(attack) = { EvtScript N(attack) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(SetBattleCamOffsetZ, 40) EVT_CALL(SetBattleCamOffsetZ, 40)
@ -703,7 +703,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(return_home)) EVT_EXEC_WAIT(N(return_home))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -741,7 +741,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(return_home)) EVT_EXEC_WAIT(N(return_home))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1061,7 +1061,7 @@ EvtScript N(shy_guy_handleEvent) = {
EvtScript N(shy_guy_attack1) = { EvtScript N(shy_guy_attack1) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -1112,7 +1112,7 @@ EvtScript N(shy_guy_attack1) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1148,7 +1148,7 @@ EvtScript N(shy_guy_attack1) = {
EVT_WAIT(8) EVT_WAIT(8)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_EXEC_WAIT(N(shy_guy_return_home)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1156,7 +1156,7 @@ EvtScript N(shy_guy_attack1) = {
EvtScript N(shy_guy_attack2) = { EvtScript N(shy_guy_attack2) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -1223,7 +1223,7 @@ EvtScript N(shy_guy_attack2) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP 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_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim01)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/area/omo2_3/actor/shy_stack.c
View File

@ -361,7 +361,7 @@ EvtScript N(init) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 6, ANIM_ShyStackGuy_Anim1B) EVT_CALL(SetActorVar, ACTOR_SELF, 6, ANIM_ShyStackGuy_Anim1B)
EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 0) EVT_IF_EQ(LVar0, 0)
EVT_SET(LVar0, 10) 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_14, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, FALSE)
EVT_CALL(HPBarToHome, ACTOR_SELF) 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(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_END_THREAD EVT_END_THREAD
EVT_ELSE 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_14, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, FALSE)
EVT_CALL(HPBarToHome, ACTOR_SELF) 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(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_CALL(SetActorVar, ACTOR_ENEMY1, 2, 4) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 2, 4)
EVT_END_THREAD EVT_END_THREAD
@ -1259,7 +1259,7 @@ EvtScript N(80235168) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -1344,7 +1344,7 @@ EvtScript N(takeTurn) = {
EVT_WAIT(15) EVT_WAIT(15)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

6
src/battle/area/omo2_5/actor/shy_squad_dup.c
View File

@ -1074,7 +1074,7 @@ EvtScript N(run_away) = {
EvtScript N(attack) = { EvtScript N(attack) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
@ -1148,7 +1148,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(run_squad_to_pos)) EVT_EXEC_WAIT(N(run_squad_to_pos))
EVT_SET(LVar1, ANIM_TankGuy_Anim01) EVT_SET(LVar1, ANIM_TankGuy_Anim01)
EVT_EXEC_WAIT(N(set_squad_animation)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1190,7 +1190,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(run_squad_to_pos)) EVT_EXEC_WAIT(N(run_squad_to_pos))
EVT_SET(LVar1, ANIM_TankGuy_Anim01) EVT_SET(LVar1, ANIM_TankGuy_Anim01)
EVT_EXEC_WAIT(N(set_squad_animation)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

14
src/battle/area/omo3/actor/big_lantern_ghost.c
View File

@ -530,7 +530,7 @@ EvtScript N(attackHeavyJump) = {
EVT_EXEC_WAIT(N(checkExtinguish)) EVT_EXEC_WAIT(N(checkExtinguish))
EVT_END_IF EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(SetBattleCamZoom, 260) EVT_CALL(SetBattleCamZoom, 260)
@ -581,7 +581,7 @@ EvtScript N(attackHeavyJump) = {
EVT_END_IF EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(returnHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -630,7 +630,7 @@ EvtScript N(attackHeavyJump) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END 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_MOVE_ID), N(MOVE_HEAVY_JUMP))
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LIGHT_BEAM_COUNTER), 3) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LIGHT_BEAM_COUNTER), 3)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13)
EVT_CALL(SetBattleCamZoom, 240) EVT_CALL(SetBattleCamZoom, 240)
@ -734,7 +734,7 @@ EvtScript N(attackLightBeam) = {
EVT_WAIT(60) EVT_WAIT(60)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(returnHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END 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_6), 1000)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_MOVE_ID), N(MOVE_LIGHT_BEAM)) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_MOVE_ID), N(MOVE_LIGHT_BEAM))
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetActorVar, ACTOR_SELF, N(VAR_SPEAK_FLAGS), LVar0)
EVT_IF_NOT_FLAG(LVar0, 2) EVT_IF_NOT_FLAG(LVar0, 2)
EVT_BITWISE_OR_CONST(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_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01)
EVT_EXEC_WAIT(N(setGhostNoTarget)) EVT_EXEC_WAIT(N(setGhostNoTarget))
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

48
src/battle/area/pra2/actor/crystal_king.c
View File

@ -330,7 +330,7 @@ EvtScript N(FlyWithClones) = {
}; };
EvtScript N(RemoveClone) = { 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_CALL(SetActorFlagBits, LVar9, ACTOR_FLAG_NO_DMG_APPLY, TRUE)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorPartOpacity, LVar9, 1, LVar3) EVT_CALL(GetActorPartOpacity, LVar9, 1, LVar3)
@ -543,7 +543,7 @@ EvtScript N(OnDeath) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0)
EVT_BITWISE_OR_CONST(LVar0, N(FLAG_NOT_IDLE)) EVT_BITWISE_OR_CONST(LVar0, N(FLAG_NOT_IDLE))
EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) 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_CALL(GetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0)
EVT_BITWISE_AND_CONST(LVar0, ~N(FLAG_NOT_IDLE)) EVT_BITWISE_AND_CONST(LVar0, ~N(FLAG_NOT_IDLE))
EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -931,7 +931,7 @@ EvtScript N(takeTurn) = {
EvtScript N(AttackIcyBreath) = { EvtScript N(AttackIcyBreath) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -986,7 +986,7 @@ EvtScript N(AttackIcyBreath) = {
EVT_END_IF EVT_END_IF
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_SWITCH EVT_END_SWITCH
@ -1020,7 +1020,7 @@ EvtScript N(AttackIcyBreath) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1028,7 +1028,7 @@ EvtScript N(AttackIcyBreath) = {
EvtScript N(AttackIceBolt) = { EvtScript N(AttackIceBolt) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -1095,7 +1095,7 @@ EvtScript N(AttackIceBolt) = {
EVT_END_IF EVT_END_IF
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_SWITCH EVT_END_SWITCH
@ -1147,7 +1147,7 @@ EvtScript N(AttackIceBolt) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1285,11 +1285,11 @@ EvtScript N(MakeIllusions) = {
EVT_CALL(SetAnimation, LVar0, 1, ANIM_CrystalKing_Anim09) EVT_CALL(SetAnimation, LVar0, 1, ANIM_CrystalKing_Anim09)
EVT_CALL(UseIdleAnimation, LVar0, TRUE) EVT_CALL(UseIdleAnimation, LVar0, TRUE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DF) 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(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(GetActorVar, ACTOR_SELF, N(VAR_CLONE2_ID), LVar0)
EVT_CALL(EnableActorBlur, LVar0, 1) EVT_CALL(EnableActorBlur, LVar0, IDLE_SCRIPT_DISABLE)
EVT_THREAD EVT_THREAD
EVT_CALL(MakeLerp, 0, 0x00001AB8, 210, EASING_COS_IN_OUT) EVT_CALL(MakeLerp, 0, 0x00001AB8, 210, EASING_COS_IN_OUT)
EVT_LABEL(0) EVT_LABEL(0)
@ -1389,17 +1389,17 @@ EvtScript N(MakeIllusions) = {
EVT_WAIT(90) EVT_WAIT(90)
EVT_WAIT(30) EVT_WAIT(30)
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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(HPBarToHome, ACTOR_SELF)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVarA) 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(GetActorPos, LVarA, LVar0, LVar1, LVar2)
EVT_CALL(ForceHomePos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarA, LVar0, LVar1, LVar2)
EVT_CALL(HPBarToHome, LVarA) EVT_CALL(HPBarToHome, LVarA)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE2_ID), 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(GetActorPos, LVarA, LVar0, LVar1, LVar2)
EVT_CALL(ForceHomePos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarA, LVar0, LVar1, LVar2)
EVT_CALL(HPBarToHome, LVarA) EVT_CALL(HPBarToHome, LVarA)
@ -1450,7 +1450,7 @@ EvtScript N(CrystalBitAppear) = {
EVT_CALL(SetPartAlpha, LVar0, 1, 0) EVT_CALL(SetPartAlpha, LVar0, 1, 0)
EVT_THREAD EVT_THREAD
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(EnableActorBlur, LVar0, 1) EVT_CALL(EnableActorBlur, LVar0, IDLE_SCRIPT_DISABLE)
EVT_SET(LVar9, LVar0) EVT_SET(LVar9, LVar0)
EVT_CALL(MakeLerp, 0, 255, 90, EASING_LINEAR) EVT_CALL(MakeLerp, 0, 255, 90, EASING_LINEAR)
EVT_LABEL(0) EVT_LABEL(0)
@ -1475,14 +1475,14 @@ EvtScript N(CrystalBitAppear) = {
EVT_IF_EQ(LVar1, 1) EVT_IF_EQ(LVar1, 1)
EVT_GOTO(1) EVT_GOTO(1)
EVT_END_IF EVT_END_IF
EVT_CALL(EnableActorBlur, ArrayVar(0), 0) EVT_CALL(EnableActorBlur, ArrayVar(0), IDLE_SCRIPT_ENABLE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };
EvtScript N(SummonCrystalBits) = { EvtScript N(SummonCrystalBits) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(MoveBattleCamOver, 15)
@ -1537,7 +1537,7 @@ EvtScript N(SummonCrystalBits) = {
EVT_CALL(ForceHomePos, LVar0, 42, 85, -10) EVT_CALL(ForceHomePos, LVar0, 42, 85, -10)
EVT_CALL(HPBarToHome, LVar0) EVT_CALL(HPBarToHome, LVar0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1846,7 +1846,7 @@ EvtScript N(AttackWithCrystalBit) = {
EvtScript N(NormalAttack) = { EvtScript N(NormalAttack) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_SWITCH EVT_END_SWITCH
@ -1964,7 +1964,7 @@ EvtScript N(NormalAttack) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_GOTO(4) EVT_GOTO(4)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1985,7 +1985,7 @@ EvtScript N(Heal) = {
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_IF_EQ(LFlag0, TRUE)
EVT_CALL(UseIdleAnimation, LVarA, FALSE) EVT_CALL(UseIdleAnimation, LVarA, FALSE)
EVT_CALL(EnableIdleScript, LVarA, 0) EVT_CALL(EnableIdleScript, LVarA, 0)
@ -2059,7 +2059,7 @@ EvtScript N(Heal) = {
EVT_END_IF EVT_END_IF
EVT_CALL(WaitForBuffDone) EVT_CALL(WaitForBuffDone)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_IF_EQ(LFlag0, TRUE) EVT_IF_EQ(LFlag0, TRUE)
EVT_CALL(EnableIdleScript, LVarA, 1) EVT_CALL(EnableIdleScript, LVarA, 1)

16
src/battle/area/tik2/actor/blooper.c
View File

@ -282,7 +282,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -357,7 +357,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -388,7 +388,7 @@ EvtScript N(takeTurn) = {
EvtScript N(attackSpinDrop) = { EvtScript N(attackSpinDrop) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) 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(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -478,7 +478,7 @@ EvtScript N(attackSpinDrop) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -489,7 +489,7 @@ EvtScript N(attackSpinDrop) = {
EvtScript N(attackInkBlast) = { EvtScript N(attackInkBlast) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) 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(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -583,7 +583,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/area/tik2/actor/blooper_baby.c
View File

@ -306,7 +306,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -383,7 +383,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -398,7 +398,7 @@ EvtScript N(onDeath) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) 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(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -449,7 +449,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -673,7 +673,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

26
src/battle/area/tik2/actor/electro_blooper.c
View File

@ -383,7 +383,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -473,7 +473,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -517,7 +517,7 @@ EvtScript N(takeTurn) = {
EvtScript N(electricCharge) = { EvtScript N(electricCharge) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 65) EVT_ADD(LVar1, 65)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19)
@ -541,7 +541,7 @@ EvtScript N(electricCharge) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(N(UnfadeBackgroundToBlack)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_RETURN EVT_RETURN
@ -550,7 +550,7 @@ EvtScript N(electricCharge) = {
EvtScript N(attackSpinDrop) = { EvtScript N(attackSpinDrop) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) 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(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -640,7 +640,7 @@ EvtScript N(attackSpinDrop) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -648,7 +648,7 @@ EvtScript N(attackSpinDrop) = {
EvtScript N(attackElectricDrop) = { EvtScript N(attackElectricDrop) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) 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(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -740,7 +740,7 @@ EvtScript N(attackElectricDrop) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -748,7 +748,7 @@ EvtScript N(attackElectricDrop) = {
EvtScript N(attackInkBlast) = { EvtScript N(attackInkBlast) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) 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(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -842,7 +842,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

30
src/battle/area/tik2/actor/super_blooper.c
View File

@ -339,7 +339,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -427,7 +427,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -496,7 +496,7 @@ EvtScript N(takeTurn) = {
EvtScript N(attackSpinDrop) = { EvtScript N(attackSpinDrop) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 100) EVT_SET(LVar1, 100)
@ -531,7 +531,7 @@ EvtScript N(attackSpinDrop) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -566,7 +566,7 @@ EvtScript N(attackSpinDrop) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -574,7 +574,7 @@ EvtScript N(attackSpinDrop) = {
EvtScript N(attackInkBlast) = { EvtScript N(attackInkBlast) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) 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(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -658,7 +658,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -666,7 +666,7 @@ EvtScript N(attackInkBlast) = {
EvtScript N(makeBabies) = { EvtScript N(makeBabies) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
@ -727,7 +727,7 @@ EvtScript N(makeBabies) = {
EVT_WAIT(2) EVT_WAIT(2)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0C) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0C)
EVT_CALL(N(UnfadeBackgroundToBlack)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_RETURN EVT_RETURN
@ -736,7 +736,7 @@ EvtScript N(makeBabies) = {
EvtScript N(getEnraged) = { EvtScript N(getEnraged) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_07)
@ -761,7 +761,7 @@ EvtScript N(getEnraged) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(N(UnfadeBackgroundToBlack)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_RETURN EVT_RETURN
@ -770,7 +770,7 @@ EvtScript N(getEnraged) = {
EvtScript N(attackEnragedDrops) = { EvtScript N(attackEnragedDrops) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 100) EVT_SET(LVar1, 100)
@ -806,7 +806,7 @@ EvtScript N(attackEnragedDrops) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -866,7 +866,7 @@ EvtScript N(attackEnragedDrops) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_EXEC_WAIT(N(unEnrage)) EVT_EXEC_WAIT(N(unEnrage))
EVT_EXEC_WAIT(N(FloatToHome)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

16
src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c
View File

@ -607,7 +607,7 @@ EvtScript N(HandleCommand) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) 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_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(4) EVT_CASE_EQ(4)
@ -621,7 +621,7 @@ EvtScript N(HandleCommand) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) 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_THREAD
EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0)
EVT_SET(LVar0, 0) EVT_SET(LVar0, 0)
@ -688,7 +688,7 @@ EvtScript N(HandleCommand) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 60) EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 60)
EVT_WAIT(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_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(AVAL_Koopa_State_PosD) EVT_CASE_EQ(AVAL_Koopa_State_PosD)
@ -703,7 +703,7 @@ EvtScript N(HandleCommand) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) 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_THREAD
EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0)
EVT_SET(LVar0, 0) EVT_SET(LVar0, 0)
@ -799,13 +799,13 @@ EvtScript N(HandleCommand) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) 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(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) 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_THREAD
EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0)
EVT_SET(LVar0, 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) = { EvtScript N(EVS_HandleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -974,7 +974,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

16
src/battle/area/trd_part_3/actor/eldstar.c
View File

@ -209,10 +209,10 @@ EvtScript N(EVS_ManageTutorial) = {
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE)
EVT_CALL(ActorSpeak, MSG_CH1_0114, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_CALL(ActorSpeak, MSG_CH1_0114, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle)
EVT_THREAD 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(SetGoalPos, ACTOR_SELF, -110, 100, 0)
EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) 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_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp)
EVT_END_THREAD EVT_END_THREAD
EVT_WAIT(10) EVT_WAIT(10)
@ -221,9 +221,9 @@ EvtScript N(EVS_ManageTutorial) = {
EVT_CALL(N(StopBlinkingSP)) EVT_CALL(N(StopBlinkingSP))
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(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(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_CALL(ActorSpeak, MSG_CH1_0115, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp)
@ -279,10 +279,10 @@ EvtScript N(EVS_ManageTutorial) = {
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE)
EVT_THREAD 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(SetGoalPos, ACTOR_SELF, -110, 100, 0)
EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) 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_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp)
EVT_END_THREAD EVT_END_THREAD
EVT_WAIT(10) 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(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle)
EVT_CALL(SetGoalToHome, ACTOR_SELF) 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(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_CALL(ActorSpeak, MSG_CH1_011A, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(ActorSpeak, MSG_CH1_011B, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_CALL(ActorSpeak, MSG_CH1_011B, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle)

2
src/battle/btl_evt_library.c
View File

@ -1785,7 +1785,7 @@ EvtScript EVS_Enemy_ScareAway = {
EVT_WAIT(17) EVT_WAIT(17)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_WAIT(3) 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_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0))
EVT_ADD(LVarA, 300) EVT_ADD(LVarA, 300)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)

10
src/battle/common/actor/albino_dino.inc.c
View File

@ -135,7 +135,7 @@ EvtScript N(returnHome) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -222,7 +222,7 @@ EvtScript N(handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -252,7 +252,7 @@ EvtScript N(stamp) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -292,7 +292,7 @@ EvtScript N(takeTurn) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -331,7 +331,7 @@ EvtScript N(takeTurn) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

4
src/battle/common/actor/amazy_dayzee.inc.c
View File

@ -346,13 +346,13 @@ EvtScript N(flee) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Amazy_Anim04)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0))
EVT_ADD(LVar0, 200) EVT_ADD(LVar0, 200)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) 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(SetBattleFlagBits, BS_FLAGS1_BATTLE_FLED, TRUE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_CALL(RemoveActor, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF)

12
src/battle/common/actor/anti_guy.inc.c
View File

@ -242,7 +242,7 @@ EvtScript N(handleEvent_80221C20) = {
EvtScript N(802220FC) = { EvtScript N(802220FC) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -293,7 +293,7 @@ EvtScript N(802220FC) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -329,7 +329,7 @@ EvtScript N(802220FC) = {
EVT_WAIT(8) EVT_WAIT(8)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_EXEC_WAIT(N(80221BBC)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -337,7 +337,7 @@ EvtScript N(802220FC) = {
EvtScript N(80222824) = { EvtScript N(80222824) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -404,7 +404,7 @@ EvtScript N(80222824) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -490,7 +490,7 @@ EvtScript N(80222824) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim01) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim01)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/common/actor/bandit.inc.c
View File

@ -296,7 +296,7 @@ EvtScript N(EVS_DropCoin) = {
EVT_END_IF EVT_END_IF
EVT_GOTO(5) EVT_GOTO(5)
EVT_LABEL(10) EVT_LABEL(10)
EVT_CALL(EnableActorBlur, LVarA, 1) EVT_CALL(EnableActorBlur, LVarA, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetTargetActor, LVarA, ACTOR_PLAYER) EVT_CALL(SetTargetActor, LVarA, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, LVarA) EVT_CALL(SetGoalToTarget, LVarA)
EVT_CALL(JumpToGoal, LVarA, 15, FALSE, FALSE, FALSE) EVT_CALL(JumpToGoal, LVarA, 15, FALSE, FALSE, FALSE)
@ -314,7 +314,7 @@ EvtScript N(EVS_DropCoin) = {
EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_HandleEvent) = {
EVT_USE_ARRAY(EVT_PTR(N(DropCoinScript))) EVT_USE_ARRAY(EVT_PTR(N(DropCoinScript)))
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -492,7 +492,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bandit_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -500,7 +500,7 @@ EvtScript N(EVS_HandleEvent) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
// if carrying a coin, run away // if carrying a coin, run away
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_HasCoin, LVar0) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bandit_Idle)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -699,7 +699,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

8
src/battle/common/actor/bill_blaster.inc.c
View File

@ -131,7 +131,7 @@ EvtScript N(EVS_Idle) = {
EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_HandleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -185,7 +185,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -193,7 +193,7 @@ EvtScript N(EVS_HandleEvent) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetActorVar, ACTOR_SELF, AVAR_HasBullet, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(0) EVT_CASE_EQ(0)
@ -201,7 +201,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CASE_EQ(1) EVT_CASE_EQ(1)
EVT_EXEC_WAIT(N(EVS_Move_CheckForBullet)) EVT_EXEC_WAIT(N(EVS_Move_CheckForBullet))
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/common/actor/blue_shy_guy.inc.c
View File

@ -231,7 +231,7 @@ EvtScript N(handleEvent_8021B028) = {
EvtScript N(8021B504) = { EvtScript N(8021B504) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -282,7 +282,7 @@ EvtScript N(8021B504) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -318,7 +318,7 @@ EvtScript N(8021B504) = {
EVT_WAIT(8) EVT_WAIT(8)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_EXEC_WAIT(N(8021AFC4)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -326,7 +326,7 @@ EvtScript N(8021B504) = {
EvtScript N(8021BC2C) = { EvtScript N(8021BC2C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -393,7 +393,7 @@ EvtScript N(8021BC2C) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -479,7 +479,7 @@ EvtScript N(8021BC2C) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim01) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim01)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/common/actor/bob_omb.inc.c
View File

@ -231,7 +231,7 @@ EvtScript N(EVS_Explode) = {
EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_HandleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -371,7 +371,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -379,7 +379,7 @@ EvtScript N(EVS_HandleEvent) = {
EvtScript N(EVS_HandleEvent_Ignited) = { EvtScript N(EVS_HandleEvent_Ignited) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -503,7 +503,7 @@ EvtScript N(EVS_HandleEvent_Ignited) = {
EVT_EXEC_WAIT(N(EVS_Defuse)) EVT_EXEC_WAIT(N(EVS_Defuse))
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -687,7 +687,7 @@ EvtScript N(EVS_Attack_Blast) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetActorVar, ACTOR_SELF, AVAR_Ignited, LVar0)
EVT_IF_FALSE(LVar0) EVT_IF_FALSE(LVar0)
EVT_EXEC_WAIT(N(EVS_Attack_Tackle)) EVT_EXEC_WAIT(N(EVS_Attack_Tackle))
@ -695,7 +695,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_EXEC_WAIT(N(EVS_Attack_Blast)) EVT_EXEC_WAIT(N(EVS_Attack_Blast))
EVT_RETURN EVT_RETURN
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

24
src/battle/common/actor/bony_beetle.inc.c
View File

@ -210,7 +210,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetActorVar, ACTOR_SELF, N(VAR_STATE), LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(N(STATE_NORMAL)) EVT_CASE_EQ(N(STATE_NORMAL))
@ -230,7 +230,7 @@ EvtScript N(handleEvent) = {
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_WAS_HIT), 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_WAS_HIT), 0)
EVT_END_IF EVT_END_IF
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -414,7 +414,7 @@ EvtScript N(handleEvent_normal) = {
EvtScript N(attackShellToss) = { EvtScript N(attackShellToss) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim04)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -508,7 +508,7 @@ EvtScript N(attackShellToss) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim04) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim04)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -651,7 +651,7 @@ EvtScript N(handleEvent_spiky) = {
EvtScript N(attackSpikeBounce) = { EvtScript N(attackSpikeBounce) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
@ -773,7 +773,7 @@ EvtScript N(attackSpikeBounce) = {
EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_EXEC_WAIT(EVS_Enemy_ReturnHome)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -853,7 +853,7 @@ EvtScript N(attackSpikeBounce) = {
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -989,7 +989,7 @@ EvtScript N(handleEvent_flipped) = {
EvtScript N(standUp) = { EvtScript N(standUp) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), LVar0)
EVT_SUB(LVar0, 1) EVT_SUB(LVar0, 1)
@ -1019,7 +1019,7 @@ EvtScript N(standUp) = {
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE)
EVT_END_IF EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1122,7 +1122,7 @@ EvtScript N(handleEvent_spiky_flipped) = {
EvtScript N(standUp_spiky) = { EvtScript N(standUp_spiky) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), LVar0)
EVT_SUB(LVar0, 1) EVT_SUB(LVar0, 1)
@ -1153,7 +1153,7 @@ EvtScript N(standUp_spiky) = {
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE)
EVT_END_IF EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

6
src/battle/common/actor/bullet_bill.inc.c
View File

@ -161,7 +161,7 @@ EvtScript N(EVS_Explode) = {
EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_HandleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -233,7 +233,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -241,7 +241,7 @@ EvtScript N(EVS_HandleEvent) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)

24
src/battle/common/actor/buzzy_beetle.inc.c
View File

@ -153,7 +153,7 @@ EvtScript N(init) = {
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_END_IF EVT_END_IF
EVT_CALL(HPBarToHome, ACTOR_SELF) 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(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -219,7 +219,7 @@ EvtScript N(fallOff) = {
EvtScript N(handleEvent_ceiling) = { EvtScript N(handleEvent_ceiling) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -301,7 +301,7 @@ EvtScript N(handleEvent_ceiling) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END 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) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -539,7 +539,7 @@ EvtScript N(handleEvent) = {
EVT_END_IF EVT_END_IF
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -547,7 +547,7 @@ EvtScript N(handleEvent) = {
EvtScript N(takeTurn_ceiling) = { EvtScript N(takeTurn_ceiling) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1)
EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 16) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim01)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -680,7 +680,7 @@ EvtScript N(takeTurn_ceiling) = {
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_LABEL(10) EVT_LABEL(10)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -688,7 +688,7 @@ EvtScript N(takeTurn_ceiling) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetActorVar, ACTOR_SELF, 8, LVar0)
EVT_IF_EQ(LVar0, 2) EVT_IF_EQ(LVar0, 2)
EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) 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(BindIdle, ACTOR_SELF, EVT_PTR(N(idle)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -780,7 +780,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim0D) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim0D)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -816,7 +816,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim01) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim01)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

16
src/battle/common/actor/bzzap.inc.c
View File

@ -219,7 +219,7 @@ EvtScript N(returnHome) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -321,7 +321,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_EXEC_WAIT(EVS_Enemy_BlowAway)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -329,7 +329,7 @@ EvtScript N(handleEvent) = {
EvtScript N(attackThornStab) = { EvtScript N(attackThornStab) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -367,7 +367,7 @@ EvtScript N(attackThornStab) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -395,7 +395,7 @@ EvtScript N(attackThornStab) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -469,7 +469,7 @@ EvtScript N(8021B77C) = {
EvtScript N(attackSwarmSting) = { EvtScript N(attackSwarmSting) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -614,7 +614,7 @@ EvtScript N(attackSwarmSting) = {
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(StopSound, SOUND_358) EVT_CALL(StopSound, SOUND_358)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -725,7 +725,7 @@ EvtScript N(attackSwarmSting) = {
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

14
src/battle/common/actor/cleft.inc.c
View File

@ -176,7 +176,7 @@ EvtScript N(80218944) = {
EvtScript N(handleEvent_80218C3C) = { EvtScript N(handleEvent_80218C3C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -372,7 +372,7 @@ EvtScript N(handleEvent_80218C3C) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -380,7 +380,7 @@ EvtScript N(handleEvent_80218C3C) = {
EvtScript N(802197AC) = { EvtScript N(802197AC) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(3.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(3.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim03) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim03)
@ -426,7 +426,7 @@ EvtScript N(802197AC) = {
EVT_CALL(N(SetSpinSmashable), 1) EVT_CALL(N(SetSpinSmashable), 1)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -434,7 +434,7 @@ EvtScript N(802197AC) = {
EvtScript N(80219BA0) = { EvtScript N(80219BA0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim02)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -534,7 +534,7 @@ EvtScript N(80219BA0) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim02) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim02)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/common/actor/clubba.inc.c
View File

@ -109,7 +109,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -199,7 +199,7 @@ EvtScript N(handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -207,7 +207,7 @@ EvtScript N(handleEvent) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -256,7 +256,7 @@ EvtScript N(takeTurn) = {
EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_EXEC_WAIT(EVS_Enemy_ReturnHome)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -283,7 +283,7 @@ EvtScript N(takeTurn) = {
EVT_EXEC_WAIT(EVS_Enemy_ReturnHome) EVT_EXEC_WAIT(EVS_Enemy_ReturnHome)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

4
src/battle/common/actor/crazee_dayzee.inc.c
View File

@ -339,13 +339,13 @@ EvtScript N(flee) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Anim04)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0))
EVT_ADD(LVar0, 200) EVT_ADD(LVar0, 200)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) 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(SetBattleFlagBits, BS_FLAGS1_BATTLE_FLED, TRUE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_CALL(RemoveActor, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF)

18
src/battle/common/actor/dark_koopa.inc.c
View File

@ -347,7 +347,7 @@ s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0,
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0)
@ -565,7 +565,7 @@ EvtScript N(handleEvent) = {
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -573,7 +573,7 @@ EvtScript N(handleEvent) = {
EvtScript N(attackShellToss) = { EvtScript N(attackShellToss) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Idle)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -678,7 +678,7 @@ EvtScript N(attackShellToss) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Idle)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -692,7 +692,7 @@ EvtScript N(attackDizzyTornado) = {
EVT_GOTO(10) EVT_GOTO(10)
EVT_END_IF EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) 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_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Scramble)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -792,7 +792,7 @@ EvtScript N(attackDizzyTornado) = {
EvtScript N(standUp) = { EvtScript N(standUp) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) 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_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_active)))
EVT_END_SWITCH EVT_END_SWITCH
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

28
src/battle/common/actor/dark_paratroopa.inc.c
View File

@ -295,7 +295,7 @@ EvtScript N(returnHome) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -422,7 +422,7 @@ EvtScript N(handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -430,7 +430,7 @@ EvtScript N(handleEvent) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05)
@ -512,7 +512,7 @@ EvtScript N(takeTurn) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -564,7 +564,7 @@ EvtScript N(takeTurn) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_END_CASE_GROUP 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END 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) = { EvtScript N(handleEvent_koopa) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0)
@ -1117,7 +1117,7 @@ EvtScript N(handleEvent_koopa) = {
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1125,7 +1125,7 @@ EvtScript N(handleEvent_koopa) = {
EvtScript N(koopa_attackShellToss) = { EvtScript N(koopa_attackShellToss) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Idle)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1230,7 +1230,7 @@ EvtScript N(koopa_attackShellToss) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Idle)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1244,7 +1244,7 @@ EvtScript N(koopa_attackDizzyTornado) = {
EVT_GOTO(10) EVT_GOTO(10)
EVT_END_IF EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) 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_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Scramble)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1344,7 +1344,7 @@ EvtScript N(koopa_attackDizzyTornado) = {
EvtScript N(koopa_standUp) = { EvtScript N(koopa_standUp) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) 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_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_koopa_active)))
EVT_END_SWITCH EVT_END_SWITCH
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/common/actor/dry_bones.inc.c
View File

@ -288,7 +288,7 @@ EvtScript N(reassemble) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -403,7 +403,7 @@ EvtScript N(handleEvent) = {
EVT_END_IF EVT_END_IF
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -423,7 +423,7 @@ EvtScript N(rotateBone) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
@ -462,7 +462,7 @@ EvtScript N(takeTurn) = {
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -509,7 +509,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT)
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -541,7 +541,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

14
src/battle/common/actor/duplighost.inc.c
View File

@ -146,7 +146,7 @@ EvtScript N(returnHome) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -235,7 +235,7 @@ EvtScript N(handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -243,7 +243,7 @@ EvtScript N(handleEvent) = {
EvtScript N(attack) = { EvtScript N(attack) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -277,7 +277,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -314,7 +314,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -610,7 +610,7 @@ API_CALLABLE(N(CopyPriority)) {
EvtScript N(copyPartner) = { EvtScript N(copyPartner) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_WAIT(15) EVT_WAIT(15)
@ -720,7 +720,7 @@ EvtScript N(copyPartner) = {
EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION)
EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(HPBarToHome, ACTOR_SELF)
EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/common/actor/duplighost/ghost_bombette.inc.c
View File

@ -121,7 +121,7 @@ EvtScript N(bombette_playEffects) = {
EvtScript N(bombette_handleEvent) = { EvtScript N(bombette_handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -234,7 +234,7 @@ EvtScript N(bombette_handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -244,7 +244,7 @@ EvtScript N(bombette_handleEvent) = {
EvtScript N(bombette_takeTurn) = { EvtScript N(bombette_takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -295,7 +295,7 @@ EvtScript N(bombette_takeTurn) = {
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -358,7 +358,7 @@ EvtScript N(bombette_takeTurn) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/common/actor/duplighost/ghost_bow.inc.c
View File

@ -119,7 +119,7 @@ EvtScript N(bow_idle) = {
EvtScript N(bow_handleEvent) = { EvtScript N(bow_handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -220,7 +220,7 @@ EvtScript N(bow_handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -228,7 +228,7 @@ EvtScript N(bow_handleEvent) = {
EvtScript N(bow_takeTurn) = { EvtScript N(bow_takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_APPEAR) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_APPEAR)
EVT_THREAD EVT_THREAD
@ -321,7 +321,7 @@ EvtScript N(bow_takeTurn) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_END_LOOP EVT_END_LOOP
EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -415,7 +415,7 @@ EvtScript N(bow_takeTurn) = {
EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

22
src/battle/common/actor/duplighost/ghost_goombario.inc.c
View File

@ -131,7 +131,7 @@ EvtScript N(goombario_idle) = {
EvtScript N(goombario_handleEvent) = { EvtScript N(goombario_handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -230,7 +230,7 @@ EvtScript N(goombario_handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -331,7 +331,7 @@ EvtScript N(goombario_8021C7FC) = {
EvtScript N(EVS_Move_Headbonk) = { EvtScript N(EVS_Move_Headbonk) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_runToPlayer))
EVT_EXEC_WAIT(N(goombario_8021C7FC)) EVT_EXEC_WAIT(N(goombario_8021C7FC))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA)
@ -373,7 +373,7 @@ EvtScript N(EVS_Move_Headbonk) = {
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_EXEC_WAIT(N(goombario_returnBack)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -428,11 +428,11 @@ EvtScript N(EVS_Move_Headbonk) = {
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(SetGoalToTarget, ACTOR_SELF) 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(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_281) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_281)
EVT_CALL(N(UnkFunc62), LVarA, 3) 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_CASE_EQ(2)
EVT_THREAD EVT_THREAD
EVT_WAIT(4) EVT_WAIT(4)
@ -453,11 +453,11 @@ EvtScript N(EVS_Move_Headbonk) = {
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(SetGoalToTarget, ACTOR_SELF) 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(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_281) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_281)
EVT_CALL(N(UnkFunc62), LVarA, 3) EVT_CALL(N(UnkFunc62), LVarA, 3)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CHILD_THREAD EVT_CHILD_THREAD
EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) 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_EXEC_WAIT(N(goombario_returnBack))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -493,7 +493,7 @@ EvtScript N(EVS_Move_Headbonk) = {
EvtScript N(EVS_Move_Tattle) = { EvtScript N(EVS_Move_Tattle) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, 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(EnableBattleStatusBar, TRUE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TATTLE_OPEN, FALSE) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/common/actor/duplighost/ghost_kooper.inc.c
View File

@ -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) = { EvtScript N(kooper_handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -325,7 +325,7 @@ EvtScript N(kooper_handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -333,7 +333,7 @@ EvtScript N(kooper_handleEvent) = {
EvtScript N(kooper_takeTurn) = { EvtScript N(kooper_takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0)
EVT_IF_EQ(LVar0, 1) EVT_IF_EQ(LVar0, 1)
@ -376,7 +376,7 @@ EvtScript N(kooper_takeTurn) = {
EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -2, 38) EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -2, 38)
EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PRT_MAIN, -3, -9) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PRT_MAIN, -3, -9)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -481,7 +481,7 @@ EvtScript N(kooper_takeTurn) = {
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.5)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.5))
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -529,7 +529,7 @@ EvtScript N(kooper_takeTurn) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/common/actor/duplighost/ghost_lakilester.inc.c
View File

@ -124,7 +124,7 @@ EvtScript N(lakilester_idle) = {
EvtScript N(lakilester_handleEvent) = { EvtScript N(lakilester_handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -227,7 +227,7 @@ EvtScript N(lakilester_handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -235,7 +235,7 @@ EvtScript N(lakilester_handleEvent) = {
EvtScript N(lakilester_takeTurn) = { EvtScript N(lakilester_takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_Run)
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -376,7 +376,7 @@ EvtScript N(lakilester_takeTurn) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

16
src/battle/common/actor/duplighost/ghost_parakarry.inc.c
View File

@ -119,7 +119,7 @@ EvtScript N(parakarry_idle) = {
EvtScript N(parakarry_handleEvent) = { EvtScript N(parakarry_handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -226,7 +226,7 @@ EvtScript N(parakarry_handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -234,7 +234,7 @@ EvtScript N(parakarry_handleEvent) = {
EvtScript N(parakarry_doTakeTurn) = { EvtScript N(parakarry_doTakeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -260,7 +260,7 @@ EvtScript N(parakarry_doTakeTurn) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 15, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 15, 0)
EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, EASING_QUARTIC_OUT) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, EASING_QUARTIC_OUT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2005) 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(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Dive) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Dive)
EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
@ -288,12 +288,12 @@ EvtScript N(parakarry_doTakeTurn) = {
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Run)
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH 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_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_PostDive)
EVT_WAIT(1) EVT_WAIT(1)
EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) 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_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/common/actor/duplighost/ghost_sushie.inc.c
View File

@ -103,7 +103,7 @@ EvtScript N(sushie_idle) = {
EvtScript N(sushie_handleEvent) = { EvtScript N(sushie_handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -202,7 +202,7 @@ EvtScript N(sushie_handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -210,7 +210,7 @@ EvtScript N(sushie_handleEvent) = {
EvtScript N(sushie_takeTurn) = { EvtScript N(sushie_takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) 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(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -447,7 +447,7 @@ EvtScript N(sushie_takeTurn) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

22
src/battle/common/actor/ember.inc.c
View File

@ -344,7 +344,7 @@ EvtScript N(split) = {
EvtScript N(handleEvent_8021B8BC) = { EvtScript N(handleEvent_8021B8BC) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(9)
@ -444,7 +444,7 @@ EvtScript N(handleEvent_8021B8BC) = {
EVT_CASE_EQ(61) EVT_CASE_EQ(61)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -452,7 +452,7 @@ EvtScript N(handleEvent_8021B8BC) = {
EvtScript N(8021BE64) = { EvtScript N(8021BE64) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -502,7 +502,7 @@ EvtScript N(8021BE64) = {
EVT_EXEC_WAIT(N(8021B2FC)) EVT_EXEC_WAIT(N(8021B2FC))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -527,7 +527,7 @@ EvtScript N(8021BE64) = {
EVT_EXEC_WAIT(N(8021B2FC)) EVT_EXEC_WAIT(N(8021B2FC))
EVT_END_CASE_GROUP 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -570,7 +570,7 @@ EvtScript N(8021C5F8) = {
EvtScript N(8021C654) = { EvtScript N(8021C654) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -621,7 +621,7 @@ EvtScript N(8021C654) = {
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -646,7 +646,7 @@ EvtScript N(8021C654) = {
EVT_EXEC_WAIT(N(8021B2FC)) EVT_EXEC_WAIT(N(8021B2FC))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -654,7 +654,7 @@ EvtScript N(8021C654) = {
EvtScript N(8021CBC8) = { EvtScript N(8021CBC8) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -701,7 +701,7 @@ EvtScript N(8021CBC8) = {
EVT_EXEC_WAIT(N(8021B2FC)) EVT_EXEC_WAIT(N(8021B2FC))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -738,7 +738,7 @@ EvtScript N(8021CBC8) = {
EVT_EXEC_WAIT(N(8021B2FC)) EVT_EXEC_WAIT(N(8021B2FC))
EVT_END_CASE_GROUP 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

14
src/battle/common/actor/forest_fuzzy.inc.c
View File

@ -113,7 +113,7 @@ EvtScript N(idle_80218574) = {
EvtScript N(handleEvent_80218584) = { EvtScript N(handleEvent_80218584) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(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(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
@ -230,7 +230,7 @@ EvtScript N(handleEvent_80218584) = {
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -238,7 +238,7 @@ EvtScript N(handleEvent_80218584) = {
EvtScript N(80218C48) = { EvtScript N(80218C48) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_PRESET_19)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2) EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2)
@ -289,7 +289,7 @@ EvtScript N(80218C48) = {
EVT_CASE_EQ(1) EVT_CASE_EQ(1)
EVT_CALL(SetActorVar, LVar0, 0, 2) EVT_CALL(SetActorVar, LVar0, 0, 2)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -299,7 +299,7 @@ EvtScript N(80218C48) = {
EvtScript N(80219054) = { EvtScript N(80219054) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) 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_EXEC_WAIT(EVS_Enemy_HopToPos)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -504,7 +504,7 @@ EvtScript N(80219054) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_EXEC_WAIT(EVS_Enemy_HopToPos)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

16
src/battle/common/actor/frost_piranha.inc.c
View File

@ -140,7 +140,7 @@ EvtScript N(return_home) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -226,7 +226,7 @@ EvtScript N(handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -255,7 +255,7 @@ EvtScript N(takeTurn) = {
EvtScript N(attack_bite) = { EvtScript N(attack_bite) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) 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(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -389,7 +389,7 @@ EvtScript N(attack_bite) = {
EVT_END_IF EVT_END_IF
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -399,7 +399,7 @@ EvtScript N(attack_bite) = {
EvtScript N(attack_icy_breath) = { EvtScript N(attack_icy_breath) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -457,7 +457,7 @@ EvtScript N(attack_icy_breath) = {
EVT_EXEC_WAIT(N(return_home)) EVT_EXEC_WAIT(N(return_home))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -478,7 +478,7 @@ EvtScript N(attack_icy_breath) = {
EVT_EXEC_WAIT(N(return_home)) EVT_EXEC_WAIT(N(return_home))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/common/actor/fuzzy.inc.c
View File

@ -116,7 +116,7 @@ EvtScript N(EVS_Idle) = {
EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_HandleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -227,7 +227,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -237,7 +237,7 @@ EvtScript N(EVS_HandleEvent) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -312,7 +312,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_EXEC_WAIT(EVS_Enemy_HopToPos)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -446,7 +446,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Idle)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/common/actor/gloomba.inc.c
View File

@ -169,7 +169,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -278,7 +278,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Dark_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -288,7 +288,7 @@ EvtScript N(handleEvent) = {
EvtScript N(takeTurn) = { EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -386,7 +386,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -452,7 +452,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/common/actor/goomba.inc.c
View File

@ -180,7 +180,7 @@ EvtScript N(EVS_Idle) = {
EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_HandleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -289,7 +289,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -299,7 +299,7 @@ EvtScript N(EVS_HandleEvent) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -397,7 +397,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -463,7 +463,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

28
src/battle/common/actor/gray_magikoopa.inc.c
View File

@ -226,7 +226,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -310,7 +310,7 @@ EvtScript N(handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -418,7 +418,7 @@ EvtScript N(knockOff) = {
EvtScript N(handleEvent_flying) = { EvtScript N(handleEvent_flying) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -523,7 +523,7 @@ EvtScript N(handleEvent_flying) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -531,7 +531,7 @@ EvtScript N(handleEvent_flying) = {
EvtScript N(attackMagicBlast) = { EvtScript N(attackMagicBlast) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) 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_CALL(AddActorDecoration, ACTOR_SELF, PRT_2, 0, ACTOR_DECORATION_SWEAT)
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -616,7 +616,7 @@ EvtScript N(attackMagicBlast) = {
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -624,7 +624,7 @@ EvtScript N(attackMagicBlast) = {
EvtScript N(attackWandStrike) = { EvtScript N(attackWandStrike) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -688,7 +688,7 @@ EvtScript N(attackWandStrike) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_END_LOOP EVT_END_LOOP
EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -720,7 +720,7 @@ EvtScript N(attackWandStrike) = {
EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -728,7 +728,7 @@ EvtScript N(attackWandStrike) = {
EvtScript N(flee) = { EvtScript N(flee) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(HideHealthBar, ACTOR_SELF)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_IF_NE(LVar0, EVENT_SCARE_AWAY) EVT_IF_NE(LVar0, EVENT_SCARE_AWAY)
@ -745,7 +745,7 @@ EvtScript N(flee) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180) 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(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 200) EVT_ADD(LVar0, 200)
@ -829,7 +829,7 @@ EvtScript N(takeTurn) = {
EVT_RETURN EVT_RETURN
EVT_LABEL(100) // make ally invisible EVT_LABEL(100) // make ally invisible
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -894,7 +894,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

28
src/battle/common/actor/green_magikoopa.inc.c
View File

@ -228,7 +228,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -312,7 +312,7 @@ EvtScript N(handleEvent) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -420,7 +420,7 @@ EvtScript N(knockOff) = {
EvtScript N(handleEvent_flying) = { EvtScript N(handleEvent_flying) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CASE_EQ(EVENT_HIT_COMBO)
@ -525,7 +525,7 @@ EvtScript N(handleEvent_flying) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -533,7 +533,7 @@ EvtScript N(handleEvent_flying) = {
EvtScript N(attackMagicBlast) = { EvtScript N(attackMagicBlast) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) 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_CALL(AddActorDecoration, ACTOR_SELF, PRT_2, 0, ACTOR_DECORATION_SWEAT)
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -618,7 +618,7 @@ EvtScript N(attackMagicBlast) = {
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -626,7 +626,7 @@ EvtScript N(attackMagicBlast) = {
EvtScript N(attackWandStrike) = { EvtScript N(attackWandStrike) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -690,7 +690,7 @@ EvtScript N(attackWandStrike) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_END_LOOP EVT_END_LOOP
EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -722,7 +722,7 @@ EvtScript N(attackWandStrike) = {
EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255) EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -730,7 +730,7 @@ EvtScript N(attackWandStrike) = {
EvtScript N(flee) = { EvtScript N(flee) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(HideHealthBar, ACTOR_SELF)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_IF_NE(LVar0, EVENT_SCARE_AWAY) EVT_IF_NE(LVar0, EVENT_SCARE_AWAY)
@ -747,7 +747,7 @@ EvtScript N(flee) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180) 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(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 200) EVT_ADD(LVar0, 200)
@ -831,7 +831,7 @@ EvtScript N(takeTurn) = {
EVT_RETURN EVT_RETURN
EVT_LABEL(100) EVT_LABEL(100)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -896,7 +896,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/common/actor/green_shy_guy.inc.c
View File

@ -231,7 +231,7 @@ EvtScript N(handleEvent_80220128) = {
EvtScript N(80220604) = { EvtScript N(80220604) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -282,7 +282,7 @@ EvtScript N(80220604) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -318,7 +318,7 @@ EvtScript N(80220604) = {
EVT_WAIT(8) EVT_WAIT(8)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_EXEC_WAIT(N(802200C4)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -326,7 +326,7 @@ EvtScript N(80220604) = {
EvtScript N(80220D2C) = { EvtScript N(80220D2C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -393,7 +393,7 @@ EvtScript N(80220D2C) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim01) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -479,7 +479,7 @@ EvtScript N(80220D2C) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim01) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim01)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

28
src/battle/common/actor/groove_guy.inc.c
View File

@ -149,7 +149,7 @@ EvtScript N(80224CAC) = {
EvtScript N(handleEvent_80224D10) = { EvtScript N(handleEvent_80224D10) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -241,7 +241,7 @@ EvtScript N(handleEvent_80224D10) = {
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -249,7 +249,7 @@ EvtScript N(handleEvent_80224D10) = {
EvtScript N(basicAttack) = { EvtScript N(basicAttack) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -295,7 +295,7 @@ EvtScript N(basicAttack) = {
EVT_EXEC_WAIT(N(80224CAC)) EVT_EXEC_WAIT(N(80224CAC))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -333,7 +333,7 @@ EvtScript N(basicAttack) = {
EVT_EXEC_WAIT(N(80224CAC)) EVT_EXEC_WAIT(N(80224CAC))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -341,7 +341,7 @@ EvtScript N(basicAttack) = {
EvtScript N(sleepySpin) = { EvtScript N(sleepySpin) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -379,7 +379,7 @@ EvtScript N(sleepySpin) = {
EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_EXEC_WAIT(N(80224CAC)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -438,7 +438,7 @@ EvtScript N(sleepySpin) = {
EVT_EXEC_WAIT(N(80224CAC)) EVT_EXEC_WAIT(N(80224CAC))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -705,7 +705,7 @@ EvtScript N(8022671C) = {
EvtScript N(80226C00) = { EvtScript N(80226C00) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_EXEC_WAIT(N(8022671C))
EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802273A8)), FALSE) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802273A8)), FALSE)
EVT_SET(LVarB, LVar0) EVT_SET(LVarB, LVar0)
@ -725,7 +725,7 @@ EvtScript N(80226C00) = {
EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2)
EVT_CALL(ForceHomePos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarB, LVar0, LVar1, LVar2)
EVT_CALL(HPBarToHome, LVarB) 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(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -733,7 +733,7 @@ EvtScript N(80226C00) = {
EvtScript N(80226DEC) = { EvtScript N(80226DEC) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_EXEC_WAIT(N(8022671C))
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -773,7 +773,7 @@ EvtScript N(80226DEC) = {
EVT_WAIT(25) EVT_WAIT(25)
EVT_CALL(SetAnimation, LVarB, PRT_MAIN, ANIM_GrooveGuy_Anim01) EVT_CALL(SetAnimation, LVarB, PRT_MAIN, ANIM_GrooveGuy_Anim01)
EVT_CALL(HPBarToHome, LVarB) 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(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -788,7 +788,7 @@ EvtScript N(80226DEC) = {
EvtScript N(802271A0) = { EvtScript N(802271A0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_EXEC_WAIT(N(8022671C))
EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802273E0)), FALSE) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802273E0)), FALSE)
EVT_SET(LVarB, LVar0) EVT_SET(LVarB, LVar0)
@ -809,7 +809,7 @@ EvtScript N(802271A0) = {
EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2)
EVT_CALL(ForceHomePos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarB, LVar0, LVar1, LVar2)
EVT_CALL(HPBarToHome, LVarB) 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(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

16
src/battle/common/actor/gulpit.inc.c
View File

@ -155,7 +155,7 @@ EvtScript N(returnHome) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -242,7 +242,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_EXEC_WAIT(EVS_Enemy_BlowAway)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -250,7 +250,7 @@ EvtScript N(handleEvent) = {
EvtScript N(attack_lick) = { EvtScript N(attack_lick) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -297,7 +297,7 @@ EvtScript N(attack_lick) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -313,7 +313,7 @@ EvtScript N(attack_lick) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -322,7 +322,7 @@ EvtScript N(attack_lick) = {
EvtScript N(attack_rock) = { EvtScript N(attack_rock) = {
EVT_SET(LVarA, LVar0) EVT_SET(LVarA, LVar0)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) 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_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT)
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -424,7 +424,7 @@ EvtScript N(attack_rock) = {
EVT_EXEC_WAIT(N(returnHome)) EVT_EXEC_WAIT(N(returnHome))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

4
src/battle/common/actor/gulpit_rocks.inc.c
View File

@ -131,7 +131,7 @@ EvtScript N(setAnim) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -176,7 +176,7 @@ EvtScript N(handleEvent) = {
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

16
src/battle/common/actor/hammer_bro.inc.c
View File

@ -199,7 +199,7 @@ EvtScript N(idle) = {
EvtScript N(handleEvent) = { EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -287,7 +287,7 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -295,7 +295,7 @@ EvtScript N(handleEvent) = {
EvtScript N(attackHammerThrow) = { EvtScript N(attackHammerThrow) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) 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_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT)
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -403,7 +403,7 @@ EvtScript N(attackHammerThrow) = {
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -464,7 +464,7 @@ EvtScript N(hammerHit) = {
EvtScript N(attackHammerSurge) = { EvtScript N(attackHammerSurge) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_THREAD EVT_THREAD
EVT_SET(LVar0, 0) EVT_SET(LVar0, 0)
@ -532,7 +532,7 @@ EvtScript N(attackHammerSurge) = {
EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT)
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -576,7 +576,7 @@ EvtScript N(attackHammerSurge) = {
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

10
src/battle/common/actor/hurt_plant.inc.c
View File

@ -142,7 +142,7 @@ EvtScript N(8021DBFC) = {
EvtScript N(handleEvent_8021DCF4) = { EvtScript N(handleEvent_8021DCF4) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -248,7 +248,7 @@ EvtScript N(handleEvent_8021DCF4) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -256,7 +256,7 @@ EvtScript N(handleEvent_8021DCF4) = {
EvtScript N(takeTurn_8021E33C) = { EvtScript N(takeTurn_8021E33C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
@ -321,7 +321,7 @@ EvtScript N(takeTurn_8021E33C) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
EVT_EXEC_WAIT(N(8021DBFC)) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -344,7 +344,7 @@ EvtScript N(takeTurn_8021E33C) = {
EVT_EXEC_WAIT(N(8021DBFC)) EVT_EXEC_WAIT(N(8021DBFC))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

22
src/battle/common/actor/hyper_cleft.inc.c
View File

@ -134,7 +134,7 @@ EvtScript N(nextTurn_80220D3C) = {
EvtScript N(80220DC0) = { EvtScript N(80220DC0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 0) 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(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80220C60)))
EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -233,7 +233,7 @@ EvtScript N(80220DC0) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80221CD4))) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -294,7 +294,7 @@ EvtScript N(80220DC0) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80221CD4))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80221CD4)))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -437,7 +437,7 @@ EvtScript N(80221DE0) = {
EvtScript N(handleEvent_80222140) = { EvtScript N(handleEvent_80222140) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -662,7 +662,7 @@ EvtScript N(handleEvent_80222140) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -670,7 +670,7 @@ EvtScript N(handleEvent_80222140) = {
EvtScript N(80222F1C) = { EvtScript N(80222F1C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT)
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(3.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(3.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Hyper_Anim03) 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(N(SetSpinSmashable), 1)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -724,7 +724,7 @@ EvtScript N(80222F1C) = {
EvtScript N(80223310) = { EvtScript N(80223310) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) 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(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Hyper_Anim02)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -824,7 +824,7 @@ EvtScript N(80223310) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Hyper_Anim02) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Hyper_Anim02)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

18
src/battle/common/actor/hyper_goomba.inc.c
View File

@ -125,7 +125,7 @@ EvtScript N(nextTurn_80218950) = {
EvtScript N(802189D4) = { EvtScript N(802189D4) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -157,7 +157,7 @@ EvtScript N(802189D4) = {
EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE)
EVT_WAIT(2) EVT_WAIT(2)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -220,7 +220,7 @@ EvtScript N(802189D4) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80219818))) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -277,7 +277,7 @@ EvtScript N(802189D4) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80219818))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80219818)))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -413,7 +413,7 @@ EvtScript N(idle_802198FC) = {
EvtScript N(handleEvent_80219BD8) = { EvtScript N(handleEvent_80219BD8) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -546,7 +546,7 @@ EvtScript N(handleEvent_80219BD8) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -556,7 +556,7 @@ EvtScript N(handleEvent_80219BD8) = {
EvtScript N(takeTurn_8021A628) = { EvtScript N(takeTurn_8021A628) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -654,7 +654,7 @@ EvtScript N(takeTurn_8021A628) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -720,7 +720,7 @@ EvtScript N(takeTurn_8021A628) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

36
src/battle/common/actor/hyper_paragoomba.inc.c
View File

@ -204,7 +204,7 @@ EvtScript N(nextTurn_8021B5F4) = {
EvtScript N(8021B678) = { EvtScript N(8021B678) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 0) 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(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_8021B518)))
EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -316,7 +316,7 @@ EvtScript N(8021B678) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_8021C594))) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -366,7 +366,7 @@ EvtScript N(8021B678) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_8021C594))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_8021C594)))
EVT_END_CASE_GROUP 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -520,7 +520,7 @@ EvtScript N(8021C94C) = {
EvtScript N(handleEvent_8021C9C4) = { EvtScript N(handleEvent_8021C9C4) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
@ -648,7 +648,7 @@ EvtScript N(handleEvent_8021C9C4) = {
EVT_RETURN EVT_RETURN
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -656,7 +656,7 @@ EvtScript N(handleEvent_8021C9C4) = {
EvtScript N(takeTurn_8021D1DC) = { EvtScript N(takeTurn_8021D1DC) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
@ -717,7 +717,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_EXEC_WAIT(N(8021C94C)) EVT_EXEC_WAIT(N(8021C94C))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_2, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -760,7 +760,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_EXEC_WAIT(N(8021C94C)) EVT_EXEC_WAIT(N(8021C94C))
EVT_END_CASE_GROUP 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -894,7 +894,7 @@ EvtScript N(nextTurn_8021E194) = {
EvtScript N(8021E218) = { EvtScript N(8021E218) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
@ -926,7 +926,7 @@ EvtScript N(8021E218) = {
EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE)
EVT_WAIT(2) EVT_WAIT(2)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -989,7 +989,7 @@ EvtScript N(8021E218) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8021F05C))) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1046,7 +1046,7 @@ EvtScript N(8021E218) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8021F05C))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8021F05C)))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1182,7 +1182,7 @@ EvtScript N(idle_8021F140) = {
EvtScript N(handleEvent_8021F41C) = { EvtScript N(handleEvent_8021F41C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -1315,7 +1315,7 @@ EvtScript N(handleEvent_8021F41C) = {
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -1325,7 +1325,7 @@ EvtScript N(handleEvent_8021F41C) = {
EvtScript N(takeTurn_8021FE6C) = { EvtScript N(takeTurn_8021FE6C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
@ -1423,7 +1423,7 @@ EvtScript N(takeTurn_8021FE6C) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -1489,7 +1489,7 @@ EvtScript N(takeTurn_8021FE6C) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

14
src/battle/common/actor/jungle_fuzzy.inc.c
View File

@ -117,7 +117,7 @@ EvtScript N(idle_8021EB8C) = {
EvtScript N(handleEvent_8021EB9C) = { EvtScript N(handleEvent_8021EB9C) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(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(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
@ -234,7 +234,7 @@ EvtScript N(handleEvent_8021EB9C) = {
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -242,7 +242,7 @@ EvtScript N(handleEvent_8021EB9C) = {
EvtScript N(divide) = { EvtScript N(divide) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_PRESET_19)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2) EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2)
@ -293,7 +293,7 @@ EvtScript N(divide) = {
EVT_CASE_EQ(1) EVT_CASE_EQ(1)
EVT_CALL(SetActorVar, LVar0, 0, 2) EVT_CALL(SetActorVar, LVar0, 0, 2)
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -303,7 +303,7 @@ EvtScript N(divide) = {
EvtScript N(leechAttack) = { EvtScript N(leechAttack) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) 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_EXEC_WAIT(EVS_Enemy_HopToPos)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -679,7 +679,7 @@ EvtScript N(leechAttack) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_EXEC_WAIT(EVS_Enemy_HopToPos)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Idle) 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/battle/common/actor/koopa_troopa.inc.c
View File

@ -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) = { EvtScript N(EVS_HandleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
@ -442,7 +442,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
EVT_END_IF EVT_END_IF
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -450,7 +450,7 @@ EvtScript N(EVS_HandleEvent) = {
EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_TakeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) 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(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(GetBattlePhase, LVar0) EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) 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(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE)
EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP)
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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
@ -577,7 +577,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 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_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
@ -613,7 +613,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Idle)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END

Some files were not shown because too many files have changed in this diff Show More