Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use enum for EnableActorBlur, EnablePlayerBlur, EnableIdleScript args #1104

Merged
merged 2 commits into from
Aug 3, 2023
Merged

use enum for EnableActorBlur, EnablePlayerBlur, EnableIdleScript args #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35fdad6
use enum for EnableActorBlur, EnablePlayerBlur, EnableIdleScript
Rainchus Jul 29, 2023
0062edb
create new enum for EnablePlayerBlur
Rainchus Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions include/enums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6472,4 +6472,16 @@ enum Language {
LANGUAGE_ES = 3,
};

enum IdleScriptState {
Copy link
Member

@ethteck ethteck Jul 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per the original issue, I think we wanted this one in script_api.h

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've considered renaming them in the past, but decided against it because the vast, vast majority of calls do not use the RESET/RESTART options (3/117) for EnableActorBlur and (67/1060) for EnableIdleScript. I haven't found any alternative names to be a sufficiently compelling improvement over EnableX for a function which is nearly always used to enable and disable.

IDLE_SCRIPT_ENABLE,
IDLE_SCRIPT_DISABLE,
IDLE_SCRIPT_RESTART = -1,
};

enum BlurState {
BLUR_ENABLE,
BLUR_DISABLE,
BLUR_RESET = -1,
};

#endif
8 changes: 4 additions & 4 deletions src/18F340.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ EvtScript EVS_ExecuteMarioAction = {
EVT_CALL(LoadStarPowerScript)
EVT_EXEC_WAIT(LVar0)
EVT_END_SWITCH
EVT_CALL(EnablePlayerBlur, 0)
EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
EVT_RETURN
EVT_END
Expand Down Expand Up @@ -823,7 +823,7 @@ EvtScript EVS_PlayerFirstStrike = {
EVT_CALL(LoadMoveScript)
EVT_EXEC_WAIT(LVar0)
EVT_END_SWITCH
EVT_CALL(EnablePlayerBlur, 0)
EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
EVT_RETURN
EVT_END
Expand Down Expand Up @@ -1285,7 +1285,7 @@ EvtScript EVS_PlayerDies = {
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Dying)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_24)
EVT_WAIT(15)
EVT_CALL(EnablePlayerBlur, 1)
EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_371)
EVT_SET(LVar0, 0)
EVT_LOOP(30)
Expand All @@ -1299,7 +1299,7 @@ EvtScript EVS_PlayerDies = {
EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(EnablePlayerBlur, 0)
EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3FB)
EVT_SET(LVar0, 0)
Expand Down
8 changes: 4 additions & 4 deletions src/battle/area/arn/actor/tubba_blubba.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ EvtScript N(80225FD4) = {

EvtScript N(handleEvent_802260D0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVarA)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
Expand Down Expand Up @@ -241,22 +241,22 @@ EvtScript N(handleEvent_802260D0) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
};

EvtScript N(takeTurn_802264AC) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(RandInt, 100, LVar0)
EVT_IF_LT(LVar0, 60)
EVT_EXEC_WAIT(N(80226558))
EVT_ELSE
EVT_EXEC_WAIT(N(80226B88))
EVT_END_IF
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
Expand Down
12 changes: 6 additions & 6 deletions src/battle/area/dgb/actor/tubba_blubba.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ EvtScript N(80218E60) = {

EvtScript N(nextTurn_80218FB0) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(GetBattlePhase, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(PHASE_PLAYER_BEGIN)
Expand Down Expand Up @@ -176,7 +176,7 @@ EvtScript N(nextTurn_80218FB0) = {
EVT_CALL(EnableBattleStatusBar, TRUE)
EVT_END_IF
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
Expand Down Expand Up @@ -213,7 +213,7 @@ EvtScript N(802192E0) = {

EvtScript N(handleEvent_80219338) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
Expand Down Expand Up @@ -288,15 +288,15 @@ EvtScript N(handleEvent_80219338) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_DEFAULT
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
};

EvtScript N(takeTurn_80219750) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_IF_EQ(LVar0, HIT_RESULT_MISS)
Expand Down Expand Up @@ -379,7 +379,7 @@ EvtScript N(takeTurn_80219750) = {
EVT_ELSE
EVT_EXEC_WAIT(N(8021A36C))
EVT_END_IF
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
Expand Down
4 changes: 2 additions & 2 deletions src/battle/area/dig/actor/tubba_blubba.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ EvtScript N(returnHome) = {

EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_IF_EQ(LVar0, HIT_RESULT_MISS)
Expand Down Expand Up @@ -236,7 +236,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(EnableBattleStatusBar, TRUE)
EVT_END_IF
EVT_EXEC_WAIT(N(attackBodyCrush))
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
Expand Down
10 changes: 5 additions & 5 deletions src/battle/area/flo2/actor/monty_mole_boss.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ EvtScript N(idle) = {

EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(GetLastElement, LVarE)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0)
Expand Down Expand Up @@ -345,15 +345,15 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(N(onDeath))
EVT_CASE_DEFAULT
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
};

EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetBattlePhase, LVar0)
Expand Down Expand Up @@ -400,7 +400,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END_CASE_GROUP
Expand Down Expand Up @@ -429,7 +429,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_3, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
Expand Down
10 changes: 5 additions & 5 deletions src/battle/area/flo2/actor/spike.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ EvtScript N(returnHome) = {

EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
Expand Down Expand Up @@ -230,15 +230,15 @@ EvtScript N(handleEvent) = {
EVT_RETURN
EVT_CASE_DEFAULT
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
};

EvtScript N(attack) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
Expand Down Expand Up @@ -343,7 +343,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(returnHome))
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END_CASE_GROUP
Expand All @@ -370,7 +370,7 @@ EvtScript N(attack) = {
EVT_EXEC_WAIT(N(returnHome))
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
Expand Down
4 changes: 2 additions & 2 deletions src/battle/area/flo2/actor/tuff_puff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,8 @@ EvtScript N(handleEvent) = {

EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
Expand Down
4 changes: 2 additions & 2 deletions src/battle/area/hos/actor/goombario_tutor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ EvtScript N(handleEvent_802191E0) = {

EvtScript N(takeTurn_80219444) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(SetBattleCamZoom, 400)
Expand Down Expand Up @@ -272,7 +272,7 @@ EvtScript N(takeTurn_80219444) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Idle)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END
Expand Down
Loading
Loading