From e3fd3b8a2ef8728f83562f44d70d57cb29a104ad Mon Sep 17 00:00:00 2001 From: z64a Date: Sun, 22 Sep 2024 22:04:17 -0400 Subject: [PATCH] player jump states --- src/battle/common/move/JumpSupport.inc.c | 14 +-- src/battle/dmg_player.c | 118 ++++++++++++++--------- src/battle/move/jump/attack.c | 30 +++--- src/battle/move/jump/auto_jump.c | 8 +- src/battle/move/jump/auto_multibounce.c | 16 +-- src/battle/move/jump/d_down_jump.c | 8 +- src/battle/move/jump/demo_power_bounce.c | 22 ++--- src/battle/move/jump/dizzy_stomp.c | 8 +- src/battle/move/jump/earthquake_jump.c | 22 ++--- src/battle/move/jump/multibounce.c | 22 ++--- src/battle/move/jump/power_bounce.c | 22 ++--- src/battle/move/jump/shrink_stomp.c | 8 +- src/battle/move/jump/sleep_stomp.c | 8 +- 13 files changed, 167 insertions(+), 139 deletions(-) diff --git a/src/battle/common/move/JumpSupport.inc.c b/src/battle/common/move/JumpSupport.inc.c index cd338fd025..94a6f5a043 100644 --- a/src/battle/common/move/JumpSupport.inc.c +++ b/src/battle/common/move/JumpSupport.inc.c @@ -315,7 +315,7 @@ EvtScript N(EVS_JumpSupport_ApproachAndJump) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Return End }; @@ -333,14 +333,14 @@ EvtScript N(EVS_JumpSupport_UnusedSuper) = { 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) - Call(PlayerSuperJumpToGoal, LVarA, 0) + Call(PlayerSuperJumpToGoal, LVarA, PLAYER_SUPER_JUMP_0) Wait(7) Call(GetPlayerActionSuccess, LVar0) Switch(LVar0) CaseGt(0) - Call(PlayerSuperJumpToGoal, 3, 1) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_1) CaseDefault - Call(PlayerSuperJumpToGoal, 5, 1) + Call(PlayerSuperJumpToGoal, 5, PLAYER_SUPER_JUMP_1) EndSwitch Return End @@ -359,7 +359,7 @@ EvtScript N(EVS_JumpSupport_UnusedUltra) = { 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) - Call(PlayerUltraJumpToGoal, LVarA, 0) + Call(PlayerUltraJumpToGoal, LVarA, PLAYER_ULTRA_JUMP_0) Call(CloseActionCommandInfo) Set(LVar9, 0) Call(GetPlayerActionSuccess, LVar0) @@ -374,13 +374,13 @@ EvtScript N(EVS_JumpSupport_UnusedUltra) = { Call(action_command_jump_init) Call(action_command_jump_start, 13, 3) Call(UseBattleCamPreset, BTL_CAM_PLAYER_UNUSED_ULTRA_JUMP) - Call(PlayerUltraJumpToGoal, 15, 2) + 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, 3) - Call(PlayerUltraJumpToGoal, 4, 1) + Call(PlayerUltraJumpToGoal, 4, PLAYER_ULTRA_JUMP_1) Goto(10) EndIf Label(10) diff --git a/src/battle/dmg_player.c b/src/battle/dmg_player.c index ffb59dddbe..3939391832 100644 --- a/src/battle/dmg_player.c +++ b/src/battle/dmg_player.c @@ -1796,17 +1796,24 @@ API_CALLABLE(PlayerBasicJumpToGoal) { f64 acc1, acc2; f64 acc3, acc4; + enum { + BASIC_STATE_00 = 0, + BASIC_STATE_01 = 1, + BASIC_STATE_02 = 2, + BASIC_STATE_03 = 3, + }; + if (isInitialCall) { player->state.moveTime = evt_get_variable(script, *args++); player->state.moveArcAmplitude = evt_get_variable(script, *args++); script->functionTemp[1] = 0; - script->functionTemp[0] = 0; + script->functionTemp[0] = BASIC_STATE_00; if (player->state.moveArcAmplitude == 1) { - script->functionTemp[0] = 2; + script->functionTemp[0] = BASIC_STATE_02; } } - if (script->functionTemp[0] == 0) { + if (script->functionTemp[0] == BASIC_STATE_00) { playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -1870,11 +1877,11 @@ API_CALLABLE(PlayerBasicJumpToGoal) { } set_actor_anim(0, 0, playerState->animJumpRise); sfx_play_sound_at_position(SOUND_LONG_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); - script->functionTemp[0] = 1; + script->functionTemp[0] = BASIC_STATE_01; } switch (script->functionTemp[0]) { - case 1: + case BASIC_STATE_01: if (playerState->vel > PI_S / 2) { set_actor_anim(ACTOR_PLAYER, 0, playerState->animJumpFall); } @@ -1909,7 +1916,7 @@ API_CALLABLE(PlayerBasicJumpToGoal) { return ApiStatus_DONE1; } break; - case 2: + case BASIC_STATE_02: if (battleStatus->actionCommandMode == ACTION_COMMAND_MODE_NOT_LEARNED) { return ApiStatus_DONE2; } @@ -1922,9 +1929,9 @@ API_CALLABLE(PlayerBasicJumpToGoal) { playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; - script->functionTemp[0] = 3; + script->functionTemp[0] = BASIC_STATE_03; // fallthrough - case 3: + case BASIC_STATE_03: temp_f20_2 = playerState->curPos.x; playerState->curPos.x = temp_f20_2 + ((playerState->bounceDivisor * sin_rad(DEG_TO_RAD(playerState->unk_24))) / 33.0); playerState->curPos.y -= (playerState->bounceDivisor * sin_rad(DEG_TO_RAD(playerState->unk_24))); @@ -1963,23 +1970,33 @@ API_CALLABLE(PlayerSuperJumpToGoal) { f64 acc5, acc6; f64 acc7, acc8; + enum { + SUPER_STATE_00 = 0, + SUPER_STATE_01 = 1, + SUPER_STATE_02 = 2, + SUPER_STATE_10 = 10, + SUPER_STATE_11 = 11, + SUPER_STATE_20 = 20, + SUPER_STATE_21 = 21, + }; + if (isInitialCall) { player->state.moveTime = evt_get_variable(script, *args++); player->state.moveArcAmplitude = evt_get_variable(script, *args++); - script->functionTemp[0] = 0; - if (player->state.moveArcAmplitude == 1 || - player->state.moveArcAmplitude == 5 || - player->state.moveArcAmplitude == 6) + script->functionTemp[0] = SUPER_STATE_00; + if (player->state.moveArcAmplitude == PLAYER_SUPER_JUMP_1 || + player->state.moveArcAmplitude == PLAYER_SUPER_JUMP_5 || + player->state.moveArcAmplitude == PLAYER_SUPER_JUMP_6) { - script->functionTemp[0] = 10; + script->functionTemp[0] = SUPER_STATE_10; } - if (playerState->moveArcAmplitude == 2) { - script->functionTemp[0] = 20; + if (playerState->moveArcAmplitude == PLAYER_SUPER_JUMP_2) { + script->functionTemp[0] = SUPER_STATE_20; } } switch (script->functionTemp[0]) { - case 0: + case SUPER_STATE_00: playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -2028,9 +2045,9 @@ API_CALLABLE(PlayerSuperJumpToGoal) { acc2 = playerState->acceleration; playerState->vel = (vel2 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.01 * acc2) + acc2)); } - script->functionTemp[0] = 1; + script->functionTemp[0] = SUPER_STATE_01; break; - case 10: + case SUPER_STATE_10: playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -2077,9 +2094,9 @@ API_CALLABLE(PlayerSuperJumpToGoal) { playerState->vel = (vel4 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.01 * acc4) + acc4)); } playerState->curPos.y = player->curPos.y - playerState->bounceDivisor; - script->functionTemp[0] = 11; + script->functionTemp[0] = SUPER_STATE_11; break; - case 20: + case SUPER_STATE_20: playerState->moveTime = 1; playerState->unk_24 = 90.0f; playerState->bounceDivisor = (fabsf(playerState->unk_18.x - playerState->unk_18.y) / 16.5); @@ -2087,12 +2104,12 @@ API_CALLABLE(PlayerSuperJumpToGoal) { playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; - script->functionTemp[0] = 21; + script->functionTemp[0] = SUPER_STATE_21; break; } switch (script->functionTemp[0]) { - case 1: + case SUPER_STATE_01: if (playerState->moveArcAmplitude == 0) { vel5 = playerState->vel; acc5 = playerState->acceleration; @@ -2119,10 +2136,10 @@ API_CALLABLE(PlayerSuperJumpToGoal) { player->rotPivotOffset.y = 14; player->rot.z -= 66.0f; playerState->moveTime = 7; - script->functionTemp[0] = 2; + script->functionTemp[0] = SUPER_STATE_02; } break; - case 2: + case SUPER_STATE_02: player->rotPivotOffset.y = 14; player->rot.z -= 66.0f; playerState->moveTime--; @@ -2133,7 +2150,7 @@ API_CALLABLE(PlayerSuperJumpToGoal) { return ApiStatus_DONE1; } break; - case 11: + case SUPER_STATE_11: playerState->curPos.x += playerState->velStep.x; playerState->curPos.y += playerState->velStep.y; playerState->curPos.z += playerState->velStep.z; @@ -2165,7 +2182,7 @@ API_CALLABLE(PlayerSuperJumpToGoal) { return ApiStatus_DONE1; } break; - case 21: + case SUPER_STATE_21: temp_f20 = playerState->curPos.x; temp_f20 += (playerState->bounceDivisor * sin_rad(DEG_TO_RAD(playerState->unk_24))) / 33.0; playerState->curPos.x = temp_f20; @@ -2212,24 +2229,35 @@ API_CALLABLE(PlayerUltraJumpToGoal) { f64 temp_f22_6; f64 temp_f22_7; + enum { + ULTRA_STATE_00 = 0, + ULTRA_STATE_01 = 1, + ULTRA_STATE_10 = 10, + ULTRA_STATE_11 = 11, + ULTRA_STATE_20 = 20, + ULTRA_STATE_21 = 21, + ULTRA_STATE_30 = 30, + ULTRA_STATE_31 = 31, + }; + if (isInitialCall) { player->state.moveTime = evt_get_variable(script, *args++); player->state.moveArcAmplitude = evt_get_variable(script, *args++); script->functionTemp[1] = 0; - script->functionTemp[0] = 0; - if (player->state.moveArcAmplitude == 1) { - script->functionTemp[0] = 11; + script->functionTemp[0] = ULTRA_STATE_00; + if (player->state.moveArcAmplitude == PLAYER_ULTRA_JUMP_1) { + script->functionTemp[0] = ULTRA_STATE_11; } - if (player->state.moveArcAmplitude == 3) { - script->functionTemp[0] = 20; + if (player->state.moveArcAmplitude == PLAYER_ULTRA_JUMP_3) { + script->functionTemp[0] = ULTRA_STATE_20; } - if (player->state.moveArcAmplitude == 2 || player->state.moveArcAmplitude == 4) { - script->functionTemp[0] = 30; + if (player->state.moveArcAmplitude == PLAYER_ULTRA_JUMP_2 || player->state.moveArcAmplitude == PLAYER_ULTRA_JUMP_4) { + script->functionTemp[0] = ULTRA_STATE_30; } } switch (script->functionTemp[0]) { - case 0: + case ULTRA_STATE_00: playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -2270,9 +2298,9 @@ API_CALLABLE(PlayerUltraJumpToGoal) { temp_f22 = playerState->acceleration; playerState->unk_28 = 360 / playerState->moveTime; playerState->vel = temp_f20 + (((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53) * temp_f22) + temp_f22); - script->functionTemp[0] = 1; + script->functionTemp[0] = ULTRA_STATE_01; break; - case 10: + case ULTRA_STATE_10: playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -2314,9 +2342,9 @@ API_CALLABLE(PlayerUltraJumpToGoal) { playerState->unk_28 = 360 / playerState->moveTime; playerState->vel = temp_f20_2 + (((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53) * temp_f22_2) + temp_f22_2); - script->functionTemp[0] = 11; + script->functionTemp[0] = ULTRA_STATE_11; break; - case 20: + case ULTRA_STATE_20: playerState->moveTime = 1; set_actor_anim(ACTOR_PLAYER, 1, ANIM_Mario1_SpinFall); player->rot.y = 0.0f; @@ -2326,9 +2354,9 @@ API_CALLABLE(PlayerUltraJumpToGoal) { playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; - script->functionTemp[0] = 21; + script->functionTemp[0] = ULTRA_STATE_21; break; - case 30: + case ULTRA_STATE_30: playerState->curPos.x = player->curPos.x; playerState->curPos.y = player->curPos.y; playerState->curPos.z = player->curPos.z; @@ -2366,12 +2394,12 @@ API_CALLABLE(PlayerUltraJumpToGoal) { temp_f22_7 = playerState->vel; temp_f22_7 = temp_f22_7 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53 * temp_f22_3) + temp_f22_3); playerState->vel = temp_f22_7; - script->functionTemp[0] = 31; + script->functionTemp[0] = ULTRA_STATE_31; break; } switch (script->functionTemp[0]) { - case 1: + case ULTRA_STATE_01: temp_f22_4 = playerState->vel; temp_f20_4 = playerState->acceleration; playerState->vel = temp_f22_4 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53 * temp_f20_4) + temp_f20_4); @@ -2395,7 +2423,7 @@ API_CALLABLE(PlayerUltraJumpToGoal) { return ApiStatus_DONE1; } break; - case 11: + case ULTRA_STATE_11: temp_f22_6 = playerState->vel; temp_f20_7 = playerState->acceleration; playerState->vel = temp_f22_6 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53 * temp_f20_7) + temp_f20_7); @@ -2426,7 +2454,7 @@ API_CALLABLE(PlayerUltraJumpToGoal) { return ApiStatus_DONE1; } break; - case 21: + case ULTRA_STATE_21: temp_f20_5 = playerState->curPos.x; temp_f20_5 += (playerState->bounceDivisor * sin_rad(DEG_TO_RAD(playerState->unk_24))) / 33.0; playerState->curPos.x = temp_f20_5; @@ -2444,7 +2472,7 @@ API_CALLABLE(PlayerUltraJumpToGoal) { return ApiStatus_DONE1; } break; - case 31: + case ULTRA_STATE_31: temp_f22_5 = playerState->vel; temp_f20_6 = playerState->acceleration; playerState->vel = temp_f22_5 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.53 * temp_f20_6) + temp_f20_6); diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c index 348b47fd24..bec60ece4c 100644 --- a/src/battle/move/jump/attack.c +++ b/src/battle/move/jump/attack.c @@ -107,7 +107,7 @@ EvtScript N(EVS_UseMove_Normal) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) @@ -159,9 +159,9 @@ EvtScript N(EVS_UseMove_Super) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) @@ -214,7 +214,7 @@ EvtScript N(EVS_UseMove_Ultra) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) @@ -264,7 +264,7 @@ EvtScript N(EVS_FirstStrike_Normal) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetActorJumpGravity, ACTOR_PLAYER, Float(1.0)) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(N(GetJumpDamage)) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) @@ -284,9 +284,9 @@ EvtScript N(EVS_FirstStrike_Super) = { 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) - Call(PlayerSuperJumpToGoal, LVarA, 0) + Call(PlayerSuperJumpToGoal, LVarA, PLAYER_SUPER_JUMP_0) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 1) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_1) Call(SetGoalToTarget, ACTOR_PLAYER) Call(UseBattleCamPresetImmediately, BTL_CAM_PLAYER_JUMP_MIDAIR) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) @@ -307,9 +307,9 @@ EvtScript N(EVS_FirstStrike_Ultra) = { Call(UseBattleCamPreset, BTL_CAM_PLAYER_ULTRA_JUMP_MIDAIR) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp) - Call(PlayerUltraJumpToGoal, LVarA, 0) + Call(PlayerUltraJumpToGoal, LVarA, PLAYER_ULTRA_JUMP_0) Set(LVarA, 4) - Call(PlayerUltraJumpToGoal, LVarA, 1) + Call(PlayerUltraJumpToGoal, LVarA, PLAYER_ULTRA_JUMP_1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) ExecWait(N(EVS_JumpSupport_Rebound)) @@ -377,7 +377,7 @@ EvtScript N(EVS_UseBerserker_Normal) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) @@ -429,9 +429,9 @@ EvtScript N(EVS_UseBerserker_Super) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) @@ -486,7 +486,7 @@ EvtScript N(EVS_UseBerserker_Ultra) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_RESET) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) @@ -507,7 +507,7 @@ EvtScript N(EVS_UseMove_Tutorial) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(AddGoalPos, ACTOR_PLAYER, -5, 10, 0) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(GetActionCommandMode, LVar0) IfEq(LVar0, 2) Call(SetActionCommandMode, 3) @@ -561,7 +561,7 @@ EvtScript N(EVS_UseMove_Tutorial) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) diff --git a/src/battle/move/jump/auto_jump.c b/src/battle/move/jump/auto_jump.c index b57ac86c41..13b9585543 100644 --- a/src/battle/move/jump/auto_jump.c +++ b/src/battle/move/jump/auto_jump.c @@ -80,7 +80,7 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) @@ -132,9 +132,9 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) @@ -187,7 +187,7 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c index 74cd65e505..2993498ff7 100644 --- a/src/battle/move/jump/auto_multibounce.c +++ b/src/battle/move/jump/auto_multibounce.c @@ -97,9 +97,9 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) IfEq(LVarF, 1) - Call(PlayerBasicJumpToGoal, LVarA, 3) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_3) Else - Call(PlayerBasicJumpToGoal, LVarA, 4) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_4) EndIf Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) @@ -239,13 +239,13 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) IfEq(LVarF, 1) - Call(PlayerSuperJumpToGoal, 20, 3) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_3) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 6) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_6) Else - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) @@ -384,9 +384,9 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) IfEq(LVarF, 1) - Call(PlayerUltraJumpToGoal, 25, 2) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_2) Else - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) EndIf Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c index 9b58d53b7b..74a3c75434 100644 --- a/src/battle/move/jump/d_down_jump.c +++ b/src/battle/move/jump/d_down_jump.c @@ -89,7 +89,7 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_1) @@ -147,9 +147,9 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) @@ -208,7 +208,7 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) Call(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index 2e9478dd3a..e2f24065b5 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -70,7 +70,7 @@ EvtScript N(EVS_UseMove_ImplA) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -134,9 +134,9 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) Call(SetGoalToTarget, ACTOR_PLAYER) IfEq(LVarF, 0) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Else - Call(PlayerBasicJumpToGoal, 24, 4) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_4) EndIf Call(GetCommandAutoSuccess, LVar1) IfEq(LVar1, 1) @@ -206,7 +206,7 @@ EvtScript N(EVS_UseMove_ImplB) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -265,13 +265,13 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) IfEq(LVarF, 0) - Call(PlayerSuperJumpToGoal, 20, 3) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_3) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 6) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_6) Else - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetCommandAutoSuccess, LVar1) @@ -342,7 +342,7 @@ EvtScript N(EVS_UseMove_ImplC) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -401,9 +401,9 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) IfEq(LVarF, 0) - Call(PlayerUltraJumpToGoal, 25, 2) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_2) Else - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetCommandAutoSuccess, LVar1) diff --git a/src/battle/move/jump/dizzy_stomp.c b/src/battle/move/jump/dizzy_stomp.c index b8cfacb394..cf635bbf08 100644 --- a/src/battle/move/jump/dizzy_stomp.c +++ b/src/battle/move/jump/dizzy_stomp.c @@ -67,7 +67,7 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) @@ -119,9 +119,9 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) @@ -174,7 +174,7 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index 3f122aa8c6..01c932372b 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -69,7 +69,7 @@ EvtScript N(EVS_UseMove_ImplA) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) ChildThread Call(ShakeCam, CAM_BATTLE, 0, 2, Float(0.2)) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(1.0)) @@ -158,9 +158,9 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) Call(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) IfEq(LVarF, 0) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Else - Call(PlayerBasicJumpToGoal, 24, 4) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_4) EndIf ChildThread Call(ShakeCam, CAM_BATTLE, 0, 2, Float(0.2)) @@ -289,7 +289,7 @@ EvtScript N(EVS_UseMove_ImplB) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) ChildThread Call(ShakeCam, CAM_BATTLE, 0, 2, Float(0.2)) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(1.0)) @@ -379,13 +379,13 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) IfEq(LVarF, 0) - Call(PlayerSuperJumpToGoal, 20, 3) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_3) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 6) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_6) Else - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) ChildThread @@ -515,7 +515,7 @@ EvtScript N(EVS_UseMove_ImplC) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) ChildThread Call(ShakeCam, CAM_BATTLE, 0, 2, Float(0.2)) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(1.0)) @@ -605,9 +605,9 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) IfEq(LVarF, 0) - Call(PlayerUltraJumpToGoal, 25, 2) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_2) Else - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) ChildThread diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c index 4b42081026..666c2de200 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -41,7 +41,7 @@ EvtScript N(EVS_UseMove_Basic) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -110,9 +110,9 @@ EvtScript N(EVS_UseMove_Basic) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) IfEq(LVarF, 1) - Call(PlayerBasicJumpToGoal, LVarA, 3) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_3) Else - Call(PlayerBasicJumpToGoal, LVarA, 4) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_4) EndIf Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) @@ -192,7 +192,7 @@ EvtScript N(EVS_UseMove_Super) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -261,13 +261,13 @@ EvtScript N(EVS_UseMove_Super) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) IfEq(LVarF, 1) - Call(PlayerSuperJumpToGoal, 20, 3) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_3) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 6) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_6) Else - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) @@ -348,7 +348,7 @@ EvtScript N(EVS_UseMove_Ultra) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -415,9 +415,9 @@ EvtScript N(EVS_UseMove_Ultra) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) IfEq(LVarF, 1) - Call(PlayerUltraJumpToGoal, 25, 2) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_2) Else - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) EndIf Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) diff --git a/src/battle/move/jump/power_bounce.c b/src/battle/move/jump/power_bounce.c index 5425c3e04c..29751acc0c 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -89,7 +89,7 @@ EvtScript N(EVS_UseMove_ImplA) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -154,9 +154,9 @@ EvtScript N(EVS_UseMove_ImplA) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) Call(SetGoalToTarget, ACTOR_PLAYER) IfEq(LVarF, 0) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Else - Call(PlayerBasicJumpToGoal, 24, 4) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_4) EndIf Call(GetCommandAutoSuccess, LVar1) IfEq(LVar1, 1) @@ -231,7 +231,7 @@ EvtScript N(EVS_UseMove_ImplB) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -291,13 +291,13 @@ EvtScript N(EVS_UseMove_ImplB) = { Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) IfEq(LVarF, 0) - Call(PlayerSuperJumpToGoal, 20, 3) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_3) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 6) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_6) Else - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetCommandAutoSuccess, LVar1) @@ -373,7 +373,7 @@ EvtScript N(EVS_UseMove_ImplC) = { 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) - Call(PlayerBasicJumpToGoal, LVarA, 0) + Call(PlayerBasicJumpToGoal, LVarA, PLAYER_BASIC_JUMP_0) Call(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) IfEq(LVar0, HIT_RESULT_MISS) ExecWait(N(EVS_JumpSupport_Miss)) @@ -433,9 +433,9 @@ EvtScript N(EVS_UseMove_ImplC) = { Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) IfEq(LVarF, 0) - Call(PlayerUltraJumpToGoal, 25, 2) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_2) Else - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) EndIf Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Call(GetCommandAutoSuccess, LVar1) diff --git a/src/battle/move/jump/shrink_stomp.c b/src/battle/move/jump/shrink_stomp.c index 6c500151a7..ec53c4ff2f 100644 --- a/src/battle/move/jump/shrink_stomp.c +++ b/src/battle/move/jump/shrink_stomp.c @@ -67,7 +67,7 @@ EvtScript N(EVS_UseMove_Basic) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_1) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) @@ -119,9 +119,9 @@ EvtScript N(EVS_UseMove_Super) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_2) @@ -174,7 +174,7 @@ EvtScript N(EVS_UseMove_Ultra) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_3) diff --git a/src/battle/move/jump/sleep_stomp.c b/src/battle/move/jump/sleep_stomp.c index 0b6c2b96f2..4c79b3a801 100644 --- a/src/battle/move/jump/sleep_stomp.c +++ b/src/battle/move/jump/sleep_stomp.c @@ -67,7 +67,7 @@ EvtScript N(EVS_UseMove_Basic) = { Call(action_command_jump_start, 24, 3) Call(SetGoalToTarget, ACTOR_PLAYER) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - Call(PlayerBasicJumpToGoal, 24, 3) + Call(PlayerBasicJumpToGoal, 24, PLAYER_BASIC_JUMP_3) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) Call(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) @@ -119,9 +119,9 @@ EvtScript N(EVS_UseMove_Super) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) - Call(PlayerSuperJumpToGoal, 20, 4) + Call(PlayerSuperJumpToGoal, 20, PLAYER_SUPER_JUMP_4) Wait(7) - Call(PlayerSuperJumpToGoal, 3, 5) + Call(PlayerSuperJumpToGoal, 3, PLAYER_SUPER_JUMP_5) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) @@ -174,7 +174,7 @@ EvtScript N(EVS_UseMove_Ultra) = { Call(SetGoalToTarget, ACTOR_PLAYER) Call(EnablePlayerBlur, ACTOR_BLUR_ENABLE) Call(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) - Call(PlayerUltraJumpToGoal, 25, 4) + Call(PlayerUltraJumpToGoal, 25, PLAYER_ULTRA_JUMP_4) Call(EnablePlayerBlur, ACTOR_BLUR_DISABLE) Wait(1) Call(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE)