falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename ActionCommandDifficulty enum members (#1232)

This commit is contained in:
cloph 2025-03-13 16:52:16 +00:00 committed by GitHub
parent da808bbd17
commit 6425e51b64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
32 changed files with 171 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle/action_cmd.c
View File

@ -103,11 +103,11 @@ s32 adjust_action_command_difficulty(s32 difficultyLevel) {
difficultyLevel -= is_ability_active(ABILITY_DODGE_MASTER) * 3;
}
if (difficultyLevel < 0) {
difficultyLevel = 0;
if (difficultyLevel < AC_DIFFICULTY_EASIEST) {
difficultyLevel = AC_DIFFICULTY_EASIEST;
}
if (difficultyLevel > 7) {
difficultyLevel = 7;
if (difficultyLevel > AC_DIFFICULTY_HARDEST) {
difficultyLevel = AC_DIFFICULTY_HARDEST;
}
return difficultyLevel;

16
src/battle/action_cmd.h
View File

@ -39,14 +39,14 @@ enum {
};
enum ActionCommandDifficulty {
AC_DIFFICULTY_0 = 0, // easiest
AC_DIFFICULTY_1 = 1, // very easy
AC_DIFFICULTY_2 = 2, // easy
AC_DIFFICULTY_3 = 3, // standard
AC_DIFFICULTY_4 = 4, // harder
AC_DIFFICULTY_5 = 5, // hard
AC_DIFFICULTY_6 = 6, // very hard
AC_DIFFICULTY_7 = 7, // hardest
AC_DIFFICULTY_EASIEST,
AC_DIFFICULTY_VERY_EASY,
AC_DIFFICULTY_EASY,
AC_DIFFICULTY_STANDARD,
AC_DIFFICULTY_HARDER,
AC_DIFFICULTY_HARD,
AC_DIFFICULTY_VERY_HARD,
AC_DIFFICULTY_HARDEST,
};
enum MashMeterColorModes {

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

@ -1823,7 +1823,7 @@ EvtScript N(EVS_Move_HurricaneBreath) = {
Call(SetupMashMeter, 5, 20, 40, 60, 80, 100)
Wait(10)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(action_command_whirlwind_start, 0, 200 * DT, AC_DIFFICULTY_3)
Call(action_command_whirlwind_start, 0, 200 * DT, AC_DIFFICULTY_STANDARD)
Thread
Call(GetActorVar, ACTOR_SELF, AVAR_ScaleX, LVar2)
Set(LVar3, LVar2)
@ -2987,7 +2987,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = {
Call(SetupMashMeter, 1, 25, 0, 0, 0, 0)
Wait(10)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(action_command_stop_leech_start, 0, AC_LEECH_MAX_TIME, AC_DIFFICULTY_3)
Call(action_command_stop_leech_start, 0, AC_LEECH_MAX_TIME, AC_DIFFICULTY_STANDARD)
Set(LVarB, LVarA)
Div(LVarB, 2)
Wait(LVarB)

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

@ -210,7 +210,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(action_command_jump_init)
Call(ShowActionHud, TRUE)
Wait(10)
Call(action_command_jump_start, 12, AC_DIFFICULTY_3)
Call(action_command_jump_start, 12, AC_DIFFICULTY_STANDARD)
EndThread
Call(PlaySound, SOUND_ACTOR_JUMP)
Call(JumpToGoal, ACTOR_SELF, 22, FALSE, TRUE, FALSE)

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

@ -395,7 +395,7 @@ EvtScript N(EVS_Attack_WindBlast) = {
Wait(6)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(action_command_whirlwind_start, 0, 88 * DT, AC_DIFFICULTY_3)
Call(action_command_whirlwind_start, 0, 88 * DT, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -25, 60, 0)
Call(SetBattleCamDist, 460)
@ -460,7 +460,7 @@ EvtScript N(EVS_Attack_WindBlast) = {
Wait(6)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(action_command_whirlwind_start, 0, 88 * DT, AC_DIFFICULTY_3)
Call(action_command_whirlwind_start, 0, 88 * DT, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_REPOSITION)
Call(SetBattleCamTarget, -25, 60, 0)
Call(SetBattleCamDist, 460)
@ -952,7 +952,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = {
Call(MoveBattleCamOver, 60)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(ShowActionHud, TRUE)
Call(action_command_break_free_start, 0, 60 * DT, 30, AC_DIFFICULTY_3)
Call(action_command_break_free_start, 0, 60 * DT, 30, AC_DIFFICULTY_STANDARD)
ExecGetTID(N(EVS_LiftMario), LVarA)
Wait(62)
Call(GetMashActionQuality, LVar0)

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

@ -487,7 +487,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetupMashMeter, 1, 15, 0, 0, 0, 0)
Wait(10)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(action_command_stop_leech_start, 0, AC_LEECH_MAX_TIME, AC_DIFFICULTY_3)
Call(action_command_stop_leech_start, 0, AC_LEECH_MAX_TIME, AC_DIFFICULTY_STANDARD)
Loop(5)
Call(UseIdleAnimation, ACTOR_PLAYER, FALSE)
Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching)

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

@ -446,7 +446,7 @@ EvtScript N(EVS_Attack_Leech) = {
Call(SetupMashMeter, 1, 23, 0, 0, 0, 0)
Wait(10)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(action_command_stop_leech_start, 0, AC_LEECH_MAX_TIME, AC_DIFFICULTY_3)
Call(action_command_stop_leech_start, 0, AC_LEECH_MAX_TIME, AC_DIFFICULTY_STANDARD)
Set(LVarD, 0)
Loop(5)
Call(UseIdleAnimation, ACTOR_PLAYER, FALSE)

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

@ -571,7 +571,7 @@ EvtScript N(EVS_Flying_TakeTurn) = {
Call(SetupMashMeter, 1, 30, 0, 0, 0, 0)
Wait(10)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(action_command_stop_leech_start, 0, AC_LEECH_MAX_TIME, AC_DIFFICULTY_3)
Call(action_command_stop_leech_start, 0, AC_LEECH_MAX_TIME, AC_DIFFICULTY_STANDARD)
Set(LVarD, 0)
Loop(MAX_LEECH_COUNT)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02)
@ -1021,7 +1021,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetupMashMeter, 1, 30, 0, 0, 0, 0)
Wait(10)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(action_command_stop_leech_start, 0, AC_LEECH_MAX_TIME, AC_DIFFICULTY_3)
Call(action_command_stop_leech_start, 0, AC_LEECH_MAX_TIME, AC_DIFFICULTY_STANDARD)
Set(LVarD, 0)
Loop(MAX_LEECH_COUNT)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02)

20
src/battle/common/move/HammerSupport.inc.c
View File

@ -157,7 +157,7 @@ EvtScript N(EVS_HammerSupport_F) = {
Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HAMMER_WINDUP)
Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PullBack)
Wait(4)
Call(action_command_hammer_start, 0, 36, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, 36, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold1)
Set(LVar1, 0)
@ -271,7 +271,7 @@ EvtScript N(EVS_UseBasicHammer) = {
EndIf
EndIf
Add(LVarD, 6)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Set(LVar1, 0)
Loop(30)
@ -298,7 +298,7 @@ EvtScript N(EVS_UseBasicHammer) = {
EndIf
EndIf
Else
Call(action_command_hammer_start, 0, LVar1, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVar1, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold1)
Sub(LVar1, 10)
@ -354,7 +354,7 @@ EvtScript N(EVS_UseSuperHammer) = {
EndLoop
EndIf
Add(LVarD, 6)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Set(LVar1, 0)
Loop(30)
@ -378,7 +378,7 @@ EvtScript N(EVS_UseSuperHammer) = {
Goto(0)
EndIf
Else
Call(action_command_hammer_start, 0, LVar1, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVar1, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Hold1)
Sub(LVar1, 10)
@ -423,7 +423,7 @@ EvtScript N(EVS_UseUltraHammer) = {
EndLoop
EndIf
Add(LVarD, 6)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Set(LVar1, 0)
Loop(30)
@ -447,7 +447,7 @@ EvtScript N(EVS_UseUltraHammer) = {
Goto(0)
EndIf
Else
Call(action_command_hammer_start, 0, LVar1, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVar1, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Hold1)
Sub(LVar1, 10)
@ -490,7 +490,7 @@ EvtScript N(EVS_Hammer_UseBasicQuake) = {
EndLoop
EndIf
Add(LVarD, 6)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Set(LVar1, 0)
Loop(30)
@ -548,7 +548,7 @@ EvtScript N(EVS_Hammer_UseSuperQuake) = {
EndLoop
EndIf
Add(LVarD, 6)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_STANDARD)
Loop(60)
Wait(1)
Call(CheckButtonDown, BUTTON_STICK_LEFT, LVar0)
@ -597,7 +597,7 @@ EvtScript N(EVS_Hammer_UseUltraQuake) = {
EndLoop
EndIf
Add(LVarD, 6)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_STANDARD)
Loop(60)
Wait(1)
Call(CheckButtonDown, BUTTON_STICK_LEFT, LVar0)

10
src/battle/common/move/JumpSupport.inc.c
View File

@ -311,7 +311,7 @@ EvtScript N(EVS_JumpSupport_ApproachAndJump) = {
Call(action_command_jump_init)
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp)
@ -329,7 +329,7 @@ EvtScript N(EVS_JumpSupport_UnusedSuper) = {
Set(LVarB, LVarA)
Add(LVarB, 14)
Add(LVarB, -3)
Call(action_command_jump_start, LVarB, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarB, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_SUPER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
@ -355,7 +355,7 @@ EvtScript N(EVS_JumpSupport_UnusedUltra) = {
Set(LVarB, LVarA)
Sub(LVarB, 4)
Add(LVarB, -3)
Call(action_command_jump_start, LVarB, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarB, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_ULTRA_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioW2_Carried, ANIM_MarioB1_Stomp)
@ -372,14 +372,14 @@ EvtScript N(EVS_JumpSupport_UnusedUltra) = {
Call(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(action_command_jump_start, 13, AC_DIFFICULTY_3)
Call(action_command_jump_start, 13, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_UNUSED_ULTRA_JUMP)
Call(PlayerUltraJumpToGoal, 15, PLAYER_ULTRA_JUMP_2)
Goto(10)
Else
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(action_command_jump_start, 2, AC_DIFFICULTY_3)
Call(action_command_jump_start, 2, AC_DIFFICULTY_STANDARD)
Call(PlayerUltraJumpToGoal, 4, PLAYER_ULTRA_JUMP_1)
Goto(10)
EndIf

2
src/battle/move/hammer/hammer_throw.c
View File

@ -206,7 +206,7 @@ EvtScript N(EVS_UseMove_Impl) = {
EndLoop
EndIf
Add(LVarD, 6)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Set(LVar1, 0)
Loop(30)

6
src/battle/move/hammer/spin_smash.c
View File

@ -107,7 +107,7 @@ EvtScript N(EVS_UseMove1_Impl) = {
EndIf
EndLoop
EndIf
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Set(LVar1, 0)
Loop(30)
@ -229,7 +229,7 @@ EvtScript N(EVS_UseMove2_Impl) = {
EndIf
EndLoop
EndIf
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Set(LVar1, 0)
Loop(30)
@ -349,7 +349,7 @@ EvtScript N(EVS_UseMove3_Impl) = {
EndIf
EndLoop
EndIf
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, LVarD, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Set(LVar1, 0)
Loop(30)

16
src/battle/move/jump/attack.c
View File

@ -104,7 +104,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3)
@ -155,7 +155,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 37, AC_DIFFICULTY_3)
Call(action_command_jump_start, 37, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
@ -210,7 +210,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 25, AC_DIFFICULTY_3)
Call(action_command_jump_start, 25, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)
@ -374,7 +374,7 @@ EvtScript N(EVS_UseBerserker_Normal) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3)
@ -425,7 +425,7 @@ EvtScript N(EVS_UseBerserker_Super) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 37, AC_DIFFICULTY_3)
Call(action_command_jump_start, 37, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
@ -482,7 +482,7 @@ EvtScript N(EVS_UseBerserker_Ultra) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 25, AC_DIFFICULTY_3)
Call(action_command_jump_start, 25, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)
@ -502,7 +502,7 @@ EvtScript N(EVS_UseMove_Tutorial) = {
Call(action_command_jump_init)
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(AddGoalPos, ACTOR_PLAYER, -5, 10, 0)
@ -558,7 +558,7 @@ EvtScript N(EVS_UseMove_Tutorial) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3)

6
src/battle/move/jump/auto_jump.c
View File

@ -77,7 +77,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3)
@ -128,7 +128,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 37, AC_DIFFICULTY_3)
Call(action_command_jump_start, 37, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
@ -183,7 +183,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 25, AC_DIFFICULTY_3)
Call(action_command_jump_start, 25, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)

6
src/battle/move/jump/auto_multibounce.c
View File

@ -93,7 +93,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(SetGoalToTarget, ACTOR_PLAYER)
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Add(LVarA, 5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
IfEq(LVarF, 1)
@ -232,7 +232,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(ShowActionHud, FALSE)
EndIf
Call(UseBattleCamPreset, BTL_CAM_PLAYER_MULTIBOUNCE)
Call(action_command_jump_start, 37, AC_DIFFICULTY_3)
Call(action_command_jump_start, 37, AC_DIFFICULTY_STANDARD)
Call(ChooseNextTarget, ITER_NEXT, LVar0)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_PLAYER)
@ -379,7 +379,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(ShowActionHud, FALSE)
EndIf
Call(UseBattleCamPreset, BTL_CAM_PLAYER_MULTIBOUNCE)
Call(action_command_jump_start, 25, AC_DIFFICULTY_3)
Call(action_command_jump_start, 25, AC_DIFFICULTY_STANDARD)
Call(ChooseNextTarget, ITER_NEXT, LVar0)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)

6
src/battle/move/jump/d_down_jump.c
View File

@ -86,7 +86,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3)
@ -143,7 +143,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 37, AC_DIFFICULTY_3)
Call(action_command_jump_start, 37, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
@ -204,7 +204,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 25, AC_DIFFICULTY_3)
Call(action_command_jump_start, 25, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)

36
src/battle/move/jump/demo_power_bounce.c
View File

@ -66,7 +66,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(SetActionDifficultyTable, Ref(N(DifficultyTable)))
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp)
@ -120,15 +120,15 @@ EvtScript N(EVS_UseMove_Basic) = {
Set(LVarA, 24)
Switch(LVarF)
CaseEq(0)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
CaseEq(1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_EASY)
CaseEq(2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseDefault
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARD)
EndSwitch
Sub(LVarD, 1)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
@ -202,7 +202,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(SetActionDifficultyTable, Ref(N(DifficultyTable)))
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp)
@ -250,15 +250,15 @@ EvtScript N(EVS_UseMove_Super) = {
Set(LVarA, 37)
Switch(LVarF)
CaseEq(0)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
CaseEq(1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_EASY)
CaseEq(2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseDefault
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARD)
EndSwitch
Sub(LVarD, 1)
Call(SetGoalToTarget, ACTOR_PLAYER)
@ -338,7 +338,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(SetActionDifficultyTable, Ref(N(DifficultyTable)))
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp)
@ -386,15 +386,15 @@ EvtScript N(EVS_UseMove_Ultra) = {
Set(LVarA, 25)
Switch(LVarF)
CaseEq(0)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
CaseEq(1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_EASY)
CaseEq(2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseDefault
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARD)
EndSwitch
Sub(LVarD, 1)
Call(SetGoalToTarget, ACTOR_PLAYER)

6
src/battle/move/jump/dizzy_stomp.c
View File

@ -64,7 +64,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3)
@ -115,7 +115,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 37, AC_DIFFICULTY_3)
Call(action_command_jump_start, 37, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
@ -170,7 +170,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 25, AC_DIFFICULTY_3)
Call(action_command_jump_start, 25, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)

36
src/battle/move/jump/earthquake_jump.c
View File

@ -65,7 +65,7 @@ EvtScript N(EVS_UseMove_Basic) = {
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Set(LVarB, LVarA)
Add(LVarB, 2)
Call(action_command_jump_start, LVarB, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarB, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp)
@ -145,15 +145,15 @@ EvtScript N(EVS_UseMove_Basic) = {
Set(LVarA, 26)
Switch(LVarF)
CaseEq(0)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseEq(3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseDefault
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARD)
EndSwitch
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0)
@ -285,7 +285,7 @@ EvtScript N(EVS_UseMove_Super) = {
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Set(LVarB, LVarA)
Add(LVarB, 2)
Call(action_command_jump_start, LVarB, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarB, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp)
@ -365,15 +365,15 @@ EvtScript N(EVS_UseMove_Super) = {
Set(LVarA, 39)
Switch(LVarF)
CaseEq(0)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseEq(3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseDefault
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARD)
EndSwitch
Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
@ -511,7 +511,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Set(LVarB, LVarA)
Add(LVarB, 2)
Call(action_command_jump_start, LVarB, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarB, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp)
@ -591,15 +591,15 @@ EvtScript N(EVS_UseMove_Ultra) = {
Set(LVarA, 27)
Switch(LVarF)
CaseEq(0)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseEq(3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseDefault
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARD)
EndSwitch
Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)

12
src/battle/move/jump/multibounce.c
View File

@ -37,7 +37,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(SetActionDifficultyTable, Ref(N(DifficultyTable)))
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp)
@ -106,7 +106,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(SetGoalToTarget, ACTOR_PLAYER)
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Add(LVarA, 5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
IfEq(LVarF, 1)
@ -188,7 +188,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(SetActionDifficultyTable, Ref(N(DifficultyTable)))
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp)
@ -254,7 +254,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(ShowActionHud, FALSE)
EndIf
Call(UseBattleCamPreset, BTL_CAM_PLAYER_MULTIBOUNCE)
Call(action_command_jump_start, 37, AC_DIFFICULTY_3)
Call(action_command_jump_start, 37, AC_DIFFICULTY_STANDARD)
Call(ChooseNextTarget, ITER_NEXT, LVar0)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetGoalToTarget, ACTOR_PLAYER)
@ -344,7 +344,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(SetActionDifficultyTable, Ref(N(DifficultyTable)))
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp)
@ -410,7 +410,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(ShowActionHud, FALSE)
EndIf
Call(UseBattleCamPreset, BTL_CAM_PLAYER_MULTIBOUNCE)
Call(action_command_jump_start, 25, AC_DIFFICULTY_3)
Call(action_command_jump_start, 25, AC_DIFFICULTY_STANDARD)
Call(ChooseNextTarget, ITER_NEXT, LVar0)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)

36
src/battle/move/jump/power_bounce.c
View File

@ -85,7 +85,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(SetActionDifficultyTable, Ref(N(DifficultyTable)))
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp)
@ -140,15 +140,15 @@ EvtScript N(EVS_UseMove_Basic) = {
Set(LVarA, 24)
Switch(LVarF)
CaseEq(0)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
CaseEq(1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_EASY)
CaseEq(2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseDefault
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARD)
EndSwitch
Sub(LVarD, 1)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
@ -227,7 +227,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(SetActionDifficultyTable, Ref(N(DifficultyTable)))
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp)
@ -276,15 +276,15 @@ EvtScript N(EVS_UseMove_Super) = {
Set(LVarA, 37)
Switch(LVarF)
CaseEq(0)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
CaseEq(1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_EASY)
CaseEq(2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseDefault
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARD)
EndSwitch
Sub(LVarD, 1)
Call(SetGoalToTarget, ACTOR_PLAYER)
@ -369,7 +369,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(SetActionDifficultyTable, Ref(N(DifficultyTable)))
ExecWait(N(EVS_JumpSupport_Approach))
ExecWait(N(EVS_JumpSupport_CalcJumpTime))
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
Call(UseBattleCamPreset, BTL_CAM_PLAYER_JUMP_MIDAIR)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp)
@ -418,15 +418,15 @@ EvtScript N(EVS_UseMove_Ultra) = {
Set(LVarA, 25)
Switch(LVarF)
CaseEq(0)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
CaseEq(1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_EASY)
CaseEq(2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseDefault
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARD)
EndSwitch
Sub(LVarD, 1)
Call(SetGoalToTarget, ACTOR_PLAYER)

6
src/battle/move/jump/shrink_stomp.c
View File

@ -64,7 +64,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3)
@ -115,7 +115,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 37, AC_DIFFICULTY_3)
Call(action_command_jump_start, 37, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
@ -170,7 +170,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 25, AC_DIFFICULTY_3)
Call(action_command_jump_start, 25, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)

6
src/battle/move/jump/sleep_stomp.c
View File

@ -64,7 +64,7 @@ EvtScript N(EVS_UseMove_Basic) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall)
Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3)
@ -115,7 +115,7 @@ EvtScript N(EVS_UseMove_Super) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 37, AC_DIFFICULTY_3)
Call(action_command_jump_start, 37, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump)
@ -170,7 +170,7 @@ EvtScript N(EVS_UseMove_Ultra) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 25, AC_DIFFICULTY_3)
Call(action_command_jump_start, 25, AC_DIFFICULTY_STANDARD)
Call(SetGoalToTarget, ACTOR_PLAYER)
Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE)
Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall)

12
src/battle/partner/bombette.c
View File

@ -824,7 +824,7 @@ EvtScript N(EVS_Attack_BodySlam) = {
EndLoop
Call(MoveBattleCamOver, 65)
IfEq(LF_MashStarted, 1)
Call(action_command_body_slam_start, 0, 92, AC_DIFFICULTY_3, ACV_SLAM_BOMBETTE)
Call(action_command_body_slam_start, 0, 92, AC_DIFFICULTY_STANDARD, ACV_SLAM_BOMBETTE)
Set(LF_MashEnded, 0)
ExecGetTID(N(runToTarget), LVarA)
Loop(35)
@ -875,7 +875,7 @@ EvtScript N(EVS_Attack_BodySlam) = {
Call(CheckButtonDown, BUTTON_A, LVar0)
IfNe(LVar0, FALSE)
IfEq(LF_MashStarted, 0)
Call(action_command_body_slam_start, 0, 92, AC_DIFFICULTY_3, ACV_SLAM_BOMBETTE)
Call(action_command_body_slam_start, 0, 92, AC_DIFFICULTY_STANDARD, ACV_SLAM_BOMBETTE)
Set(LF_MashStarted, 1)
EndIf
EndIf
@ -897,7 +897,7 @@ EvtScript N(EVS_Attack_BodySlam) = {
Call(CheckButtonDown, BUTTON_A, LVar0)
IfNe(LVar0, FALSE)
IfEq(LF_MashStarted, 0)
Call(action_command_body_slam_start, 0, 92, AC_DIFFICULTY_3, ACV_SLAM_BOMBETTE)
Call(action_command_body_slam_start, 0, 92, AC_DIFFICULTY_STANDARD, ACV_SLAM_BOMBETTE)
Set(LF_MashStarted, 1)
EndIf
EndIf
@ -1064,11 +1064,11 @@ EvtScript N(EVS_Attack_Bomb) = {
Call(GetMenuSelection, LVar0, LVar1, LVar2)
Switch(LVar2)
CaseEq(MOVE_BOMB)
Call(action_command_bomb_start, 0, 57 * DT, AC_DIFFICULTY_3, ACV_BOMB_BASIC)
Call(action_command_bomb_start, 0, 57 * DT, AC_DIFFICULTY_STANDARD, ACV_BOMB_BASIC)
CaseEq(MOVE_POWER_BOMB)
Call(action_command_bomb_start, 0, 73 * DT - 1, AC_DIFFICULTY_3, ACV_BOMB_SUPER)
Call(action_command_bomb_start, 0, 73 * DT - 1, AC_DIFFICULTY_STANDARD, ACV_BOMB_SUPER)
CaseEq(MOVE_MEGA_BOMB)
Call(action_command_bomb_start, 0, 87 * DT, AC_DIFFICULTY_3, ACV_BOMB_ULTRA)
Call(action_command_bomb_start, 0, 87 * DT, AC_DIFFICULTY_STANDARD, ACV_BOMB_ULTRA)
EndSwitch
Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LRAW_BOMBETTE_FUSE)
ChildThread

6
src/battle/partner/bow.c
View File

@ -489,7 +489,7 @@ EvtScript N(smack) = {
Wait(10)
Set(LVar0, LVarB)
Add(LVar0, -3)
Call(action_command_smack_start, 0, LVar0, AC_DIFFICULTY_3, ACV_SMACK_HAND)
Call(action_command_smack_start, 0, LVar0, AC_DIFFICULTY_STANDARD, ACV_SMACK_HAND)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
EndThread
Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A)
@ -795,7 +795,7 @@ EvtScript N(spook) = {
Call(SetActorDispOffset, ACTOR_PARTNER, 0, 0, 0)
EndThread
Call(N(AverageSpookChance))
Call(action_command_spook_start, 0, 87 * DT, AC_DIFFICULTY_3, LVar0)
Call(action_command_spook_start, 0, 87 * DT, AC_DIFFICULTY_STANDARD, LVar0)
Call(GetActionProgress, LVar1)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Conceal)
Set(LVar1, 0)
@ -1001,7 +1001,7 @@ EvtScript N(fanSmack) = {
Wait(10)
Set(LVar0, LVarB)
Add(LVar0, -3)
Call(action_command_smack_start, 0, LVar0, AC_DIFFICULTY_3, ACV_SMACK_FAN)
Call(action_command_smack_start, 0, LVar0, AC_DIFFICULTY_STANDARD, ACV_SMACK_FAN)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
EndThread
Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A)

24
src/battle/partner/goombario.c
View File

@ -936,7 +936,7 @@ EvtScript N(EVS_Attack_Headbonk1) = {
Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0)
Wait(1)
Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk)
Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0)
@ -997,7 +997,7 @@ EvtScript N(EVS_Attack_Headbonk1) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Set(LVarA, 24)
Thread
Wait(4)
@ -1041,7 +1041,7 @@ EvtScript N(EVS_Attack_Headbonk2) = {
Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0)
Wait(1)
Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk)
Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0)
@ -1102,7 +1102,7 @@ EvtScript N(EVS_Attack_Headbonk2) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Set(LVarA, 24)
Thread
Wait(4)
@ -1148,7 +1148,7 @@ EvtScript N(EVS_Attack_Headbonk3) = {
Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0)
Wait(1)
Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk)
Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0)
@ -1209,7 +1209,7 @@ EvtScript N(EVS_Attack_Headbonk3) = {
Call(LoadActionCommand, ACTION_COMMAND_JUMP)
Call(action_command_jump_init)
Call(ShowActionHud, FALSE)
Call(action_command_jump_start, 24, AC_DIFFICULTY_3)
Call(action_command_jump_start, 24, AC_DIFFICULTY_STANDARD)
Set(LVarA, 24)
Thread
Wait(4)
@ -1268,7 +1268,7 @@ EvtScript N(EVS_Move_Multibonk) = {
Call(SetActorDispOffset, ACTOR_PARTNER, 0, 19, 0)
Wait(1)
Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk)
Call(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0)
@ -1342,15 +1342,15 @@ EvtScript N(EVS_Move_Multibonk) = {
Set(LVarA, 24)
Switch(LVarF)
CaseEq(0)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_VERY_EASY)
CaseEq(1)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_EASY)
CaseEq(2)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_STANDARD)
CaseEq(3)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_4)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARDER)
CaseDefault
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_5)
Call(action_command_jump_start, LVarA, AC_DIFFICULTY_HARD)
EndSwitch
Thread
Wait(4)

8
src/battle/partner/kooper.c
View File

@ -567,7 +567,7 @@ EvtScript N(shellToss) = {
BreakLoop
EndIf
EndLoop
Call(action_command_hammer_start, 0, 50 * DT - 3, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, 50 * DT - 3, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest)
Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_KOOPER_SHELL_SPINUP)
@ -737,7 +737,7 @@ EvtScript N(powerShell) = {
EndIf
EndLoop
Call(UseBattleCamPreset, BTL_CAM_PARTNER_CLOSE_UP)
Call(action_command_hammer_start, 0, 47, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, 47, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest)
Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_KOOPER_SHELL_SPINUP)
@ -903,7 +903,7 @@ EvtScript N(dizzyShell) = {
Set(LVarA, LVarD)
Add(LVarA, -3)
Call(N(AverageTargetDizzyChance))
Call(action_command_dizzy_shell_start, 0, LVarA, AC_DIFFICULTY_3, LVar0)
Call(action_command_dizzy_shell_start, 0, LVarA, AC_DIFFICULTY_STANDARD, LVar0)
Call(SetActionProgress, 0)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest)
Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_KOOPER_SHELL_SPINUP)
@ -1074,7 +1074,7 @@ EvtScript N(fireShell) = {
Set(LVarD, 75 * DT)
Set(LVarC, LVarD)
Add(LVarC, -3)
Call(action_command_fire_shell_start, 0, LVarC, AC_DIFFICULTY_3)
Call(action_command_fire_shell_start, 0, LVarC, AC_DIFFICULTY_STANDARD)
Call(SetActorVar, ACTOR_SELF, AVAR_Unk_1, 0)
Set(LVarA, Float(8.0))
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest)

8
src/battle/partner/lakilester.c
View File

@ -999,7 +999,7 @@ EvtScript N(EVS_Move_SpinySurge) = {
EndSwitch
Set(LVarB, LVarA)
Add(LVarB, -3)
Call(action_command_spiny_surge_start, 0, LVarB, AC_DIFFICULTY_3)
Call(action_command_spiny_surge_start, 0, LVarB, AC_DIFFICULTY_STANDARD)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(InitTargetIterator)
Call(SetActorVar, ACTOR_PARTNER, AVAR_Unk_0, 0)
@ -1161,7 +1161,7 @@ EvtScript N(cloudNine_normal) = {
Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FightingStance)
Wait(3)
Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle)
Call(action_command_three_chances_start, 0, 97, AC_DIFFICULTY_3)
Call(action_command_three_chances_start, 0, 97, AC_DIFFICULTY_STANDARD)
Call(AddBattleCamDist, -75)
Call(MoveBattleCamOver, 100)
Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE)
@ -1276,7 +1276,7 @@ EvtScript N(cloudNine_immobile) = {
Add(LVar1, 40)
Call(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
Call(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_COS_IN_OUT)
Call(action_command_three_chances_start, 0, 97, AC_DIFFICULTY_3)
Call(action_command_three_chances_start, 0, 97, AC_DIFFICULTY_STANDARD)
Call(AddBattleCamDist, -75)
Call(MoveBattleCamOver, 100)
Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE)
@ -1729,7 +1729,7 @@ EvtScript N(EVS_Move_Hurricane) = {
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle)
Wait(15)
Call(N(InitHurricane))
Call(action_command_hurricane_start, 0, 147 * DT, AC_DIFFICULTY_3, LVar0)
Call(action_command_hurricane_start, 0, 147 * DT, AC_DIFFICULTY_STANDARD, LVar0)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Call(SetActorRotationOffset, ACTOR_PARTNER, 0, 20, 0)
Call(UseBattleCamPreset, BTL_CAM_REPOSITION)

6
src/battle/partner/parakarry.c
View File

@ -945,7 +945,7 @@ EvtScript N(skyDive) = {
Call(FlyToGoal, ACTOR_PARTNER, 0, -10, EASING_COS_IN_OUT)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Still)
Wait(3)
Call(action_command_jump_start, 32, AC_DIFFICULTY_3)
Call(action_command_jump_start, 32, AC_DIFFICULTY_STANDARD)
Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_PREDIVE)
Call(UseBattleCamPreset, BTL_CAM_PARTNER_MIDAIR)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_FlyFast)
@ -1147,7 +1147,7 @@ EvtScript N(airLift) = {
Call(PartnerTestEnemy, LVar0, DAMAGE_TYPE_AIR_LIFT, SUPPRESS_EVENT_SPIKY_FRONT, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS)
Call(N(AirLiftChance))
IfNe(LVar0, -1)
Call(action_command_air_lift_start, 0, 87 * DT, AC_DIFFICULTY_3, 0)
Call(action_command_air_lift_start, 0, 87 * DT, AC_DIFFICULTY_STANDARD, 0)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
ChildThread
Wait(1)
@ -1220,7 +1220,7 @@ EvtScript N(airRaid) = {
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run)
Call(FlyToGoal, ACTOR_PARTNER, 15, -2, EASING_LINEAR)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Idle)
Call(action_command_air_raid_start, 0, 90 * DT, AC_DIFFICULTY_3)
Call(action_command_air_raid_start, 0, 90 * DT, AC_DIFFICULTY_STANDARD)
Call(SetBattleFlagBits, BS_FLAGS1_4000, FALSE)
Wait(2)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_PreDive)

8
src/battle/partner/sushie.c
View File

@ -744,7 +744,7 @@ EvtScript N(EVS_Move_BellyFlop) = {
BreakLoop
EndIf
EndLoop
Call(action_command_hammer_start, 0, 57, AC_DIFFICULTY_3)
Call(action_command_hammer_start, 0, 57, AC_DIFFICULTY_STANDARD)
Call(SetActionProgress, 0)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Tense1)
Call(UseBattleCamPreset, BTL_CAM_PARTNER_CLOSE_UP)
@ -963,7 +963,7 @@ EvtScript N(EVS_Move_Squirt) = {
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Inhale)
Call(AddBattleCamDist, -80)
Call(MoveBattleCamOver, 90 * DT)
Call(action_command_squirt_start, 0, 87 * DT, AC_DIFFICULTY_3)
Call(action_command_squirt_start, 0, 87 * DT, AC_DIFFICULTY_STANDARD)
Loop(90 * DT)
Call(GetActionProgress, LVar0)
IfEq(LVar0, 0)
@ -1058,7 +1058,7 @@ EvtScript N(EVS_Move_WaterBlock) = {
Wait(1)
EndLoop
Wait(4)
Call(action_command_three_chances_start, 0, 100, AC_DIFFICULTY_3)
Call(action_command_three_chances_start, 0, 100, AC_DIFFICULTY_STANDARD)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_HoldWater)
Wait(110)
Call(GetPartnerActionQuality, LVar0)
@ -1158,7 +1158,7 @@ EvtScript N(EVS_Move_TidalWave) = {
Call(JumpToGoal, ACTOR_PARTNER, 15, FALSE, TRUE, FALSE)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Idle)
Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_HoldWater)
Call(action_command_tidal_wave_start, 0, 100, AC_DIFFICULTY_3)
Call(action_command_tidal_wave_start, 0, 100, AC_DIFFICULTY_STANDARD)
Call(SetActorRotationOffset, ACTOR_PARTNER, 0, 12, 0)
Thread
Wait(54)

14
src/battle/partner/watt.c
View File

@ -790,7 +790,7 @@ EvtScript N(EVS_Attack_ElectroDash) = {
EndLoop
Call(MoveBattleCamOver, 75)
IfEq(LFlag2, TRUE)
Call(action_command_body_slam_start, 0, 102, AC_DIFFICULTY_3, ACV_SLAM_WATT)
Call(action_command_body_slam_start, 0, 102, AC_DIFFICULTY_STANDARD, ACV_SLAM_WATT)
Set(LFlag0, FALSE)
ExecGetTID(N(dashToTarget), LVarA)
Loop(20)
@ -842,7 +842,7 @@ EvtScript N(EVS_Attack_ElectroDash) = {
Call(CheckButtonDown, BUTTON_A, LVar0)
IfNe(LVar0, 0)
IfEq(LFlag2, FALSE)
Call(action_command_body_slam_start, 0, 92, AC_DIFFICULTY_3, ACV_SLAM_WATT)
Call(action_command_body_slam_start, 0, 92, AC_DIFFICULTY_STANDARD, ACV_SLAM_WATT)
Set(LFlag2, TRUE)
EndIf
EndIf
@ -865,7 +865,7 @@ EvtScript N(EVS_Attack_ElectroDash) = {
Call(CheckButtonDown, BUTTON_A, LVar0)
IfNe(LVar0, 0)
IfEq(LFlag2, FALSE)
Call(action_command_body_slam_start, 0, 92, AC_DIFFICULTY_3, ACV_SLAM_WATT)
Call(action_command_body_slam_start, 0, 92, AC_DIFFICULTY_STANDARD, ACV_SLAM_WATT)
Set(LFlag2, TRUE)
EndIf
EndIf
@ -989,7 +989,7 @@ EvtScript N(EVS_Attack_PowerShock) = {
Call(MoveBattleCamOver, 80)
Call(N(WattFXDisable))
Call(N(TargetParalyzeChance))
Call(action_command_power_shock_start, 0, 75 * DT - 3, AC_DIFFICULTY_3, LVar0)
Call(action_command_power_shock_start, 0, 75 * DT - 3, AC_DIFFICULTY_STANDARD, LVar0)
Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
Add(LVar1, 15)
Add(LVar2, 5)
@ -1112,7 +1112,7 @@ EvtScript N(EVS_TurboCharge_HealthyPlayer) = {
Wait(1)
Call(SetActorYaw, ACTOR_PARTNER, 180)
Wait(10)
Call(action_command_three_chances_start, 0, 100 * DT, AC_DIFFICULTY_3)
Call(action_command_three_chances_start, 0, 100 * DT, AC_DIFFICULTY_STANDARD)
Call(AddBattleCamDist, -75)
Call(MoveBattleCamOver, 100 * DT)
Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE)
@ -1195,7 +1195,7 @@ EvtScript N(EVS_TurboCharge_ImmobilePlayer) = {
Wait(1)
Call(SetActorYaw, ACTOR_PARTNER, 180)
Wait(10)
Call(action_command_three_chances_start, 0, 100 * DT, AC_DIFFICULTY_3)
Call(action_command_three_chances_start, 0, 100 * DT, AC_DIFFICULTY_STANDARD)
Call(AddBattleCamDist, -100)
Call(MoveBattleCamOver, 100 * DT)
Call(SetBattleCamTargetingModes, BTL_CAM_YADJ_NONE, BTL_CAM_XADJ_NONE, TRUE)
@ -1283,7 +1283,7 @@ EvtScript N(EVS_Attack_MegaShock) = {
EndLoop
EndThread
Call(N(AverageTargetParalyzeChance))
Call(action_command_mega_shock_start, 0, 87 * DT, AC_DIFFICULTY_3, LVar0)
Call(action_command_mega_shock_start, 0, 87 * DT, AC_DIFFICULTY_STANDARD, LVar0)
Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
Add(LVar1, 15)
Add(LVar2, 5)

2
src/battle/player_events.c
View File

@ -1260,7 +1260,7 @@ EvtScript EVS_RunAwayStart = {
Wait(1)
Call(SetActorYaw, ACTOR_PLAYER, 180)
Wait(5)
Call(action_command_flee_start, 0, 60, AC_DIFFICULTY_3)
Call(action_command_flee_start, 0, 60, AC_DIFFICULTY_STANDARD)
Call(func_80260E5C)
Wait(5)
Call(AddActorPos, ACTOR_PLAYER, 2, 0, 0)