Skip to content

Commit 822e4f8

Browse files
SuddyNSuddyN
committed
Merge branch 'dev' into shield-mechanics
2 parents 7fb60f2 + 4d92652 commit 822e4f8

File tree

49 files changed

+608
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+608
-529
lines changed

‎dynamic/src/consts.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ pub mod vars {
211211
pub const LEFT_STICK_FLICK_X: i32 = 0x000F;
212212
pub const LEFT_STICK_FLICK_Y: i32 = 0x0010;
213213

214+
pub const LEDGE_ID: i32 = 0x0011;
215+
214216
// floats
215217

216218
pub const LAST_ATTACK_DAMAGE_DEALT: i32 = 0x0000;
@@ -225,10 +227,10 @@ pub mod vars {
225227
pub const CURRENT_MOMENTUM_SPECIALS: i32 = 0x0007;
226228
pub const DOUBLE_JUMP_TIMER: i32 = 0x0008; // Only used by Lucas, and it's commented out, goes unused.
227229
pub const ROLL_SPEED: i32 = 0x0009;
228-
pub const LEDGE_POS: i32 = 0x000A;
229-
pub const LEDGE_POS_X: i32 = 0x000A;
230-
pub const LEDGE_POS_Y: i32 = 0x000B;
231-
pub const LEDGE_POS_Z: i32 = 0x000C;
230+
// pub const LEDGE_POS: i32 = 0x000A;
231+
// pub const LEDGE_POS_X: i32 = 0x000A;
232+
// pub const LEDGE_POS_Y: i32 = 0x000B;
233+
// pub const LEDGE_POS_Z: i32 = 0x000C;
232234
pub const GET_DIST_TO_FLOOR: i32 = 0x000D;
233235
pub const ECB_BOTTOM_Y_OFFSET: i32 = 0x000E;
234236
pub const CURR_DASH_SPEED: i32 = 0x000F;
@@ -1489,4 +1491,8 @@ pub mod statuses {
14891491
pub const SPECIAL_N_O: i32 = 4;
14901492
pub const SPECIAL_N_G: i32 = 5;
14911493
}
1494+
1495+
pub mod bayonetta {
1496+
pub const SPECIAL_S_KICK: i32 = 0;
1497+
}
14921498
}

‎fighters/bayonetta/src/acmd/aerials.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ unsafe fn bayonetta_attack_air_lw_game(fighter: &mut L2CAgentBase) {
380380
FT_MOTION_RATE_RANGE(fighter, 1.0, 25.0, 15.0);
381381
if is_excute(fighter) {
382382
WorkModule::on_flag(boma, *FIGHTER_INSTANCE_WORK_ID_FLAG_NO_SPEED_OPERATION_CHK);
383-
SET_SPEED_EX(fighter, 0, 1.0, *KINETIC_ENERGY_RESERVE_ATTRIBUTE_MAIN);
383+
SET_SPEED_EX(fighter, 0, 0.5, *KINETIC_ENERGY_RESERVE_ATTRIBUTE_MAIN);
384384
WorkModule::off_flag(boma, *FIGHTER_INSTANCE_WORK_ID_FLAG_NO_SPEED_OPERATION_CHK);
385385
KineticModule::suspend_energy(boma, *FIGHTER_KINETIC_ENERGY_ID_CONTROL);
386386
WorkModule::on_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_GRAVITY_STABLE_UNABLE);

‎fighters/bayonetta/src/acmd/specials.rs

+22-22
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,29 @@ unsafe fn bayonetta_special_s_game(fighter: &mut L2CAgentBase) {
3636
}
3737
frame(lua_state, 15.0);
3838
if is_excute(fighter) {
39-
fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_ACTION);
39+
//fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_ACTION);
4040
GroundModule::set_correct(boma, app::GroundCorrectKind(*GROUND_CORRECT_KIND_GROUND));
41-
ATTACK(fighter, 0, 0, Hash40::new("footr"), 8.0, 42, 8, 0, 101, 4.0, 0.0, 0.0, 0.0, Some(-8.0), Some(0.0), Some(0.0), 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_NO_FLOOR, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
41+
ATTACK(fighter, 0, 0, Hash40::new("footr"), 8.0, 42, 8, 0, 95, 4.0, 0.0, 0.0, 0.0, Some(-8.0), Some(0.0), Some(0.0), 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_NO_FLOOR, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
4242
}
4343
frame(lua_state, 17.0);
4444
if is_excute(fighter) {
45-
ATTACK(fighter, 0, 0, Hash40::new("footr"), 8.0, 47, 8, 0, 95, 4.0, 0.0, 0.0, 0.0, Some(-8.0), Some(0.0), Some(0.0), 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_NO_FLOOR, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
45+
ATTACK(fighter, 0, 0, Hash40::new("footr"), 8.0, 47, 8, 0, 90, 4.0, 0.0, 0.0, 0.0, Some(-8.0), Some(0.0), Some(0.0), 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_NO_FLOOR, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
4646
}
4747
frame(lua_state, 19.0);
4848
if is_excute(fighter) {
4949
fighter.on_flag(*FIGHTER_BAYONETTA_STATUS_WORK_ID_SPECIAL_S_FLAG_WALL_CHECK);
50-
ATTACK(fighter, 0, 0, Hash40::new("footr"), 7.5, 50, 8, 0, 83, 4.0, 0.0, 0.0, 0.0, Some(-8.0), Some(0.0), Some(0.0), 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_NO_FLOOR, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
50+
ATTACK(fighter, 0, 0, Hash40::new("footr"), 7.5, 50, 8, 0, 79, 4.0, 0.0, 0.0, 0.0, Some(-8.0), Some(0.0), Some(0.0), 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_NO_FLOOR, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
5151
}
5252
frame(lua_state, 25.0);
5353
if is_excute(fighter) {
54-
ATTACK(fighter, 0, 0, Hash40::new("footr"), 7.0, 62, 8, 0, 68, 4.0, 0.0, 0.0, 0.0, Some(-8.0), Some(0.0), Some(0.0), 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_NO_FLOOR, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
54+
ATTACK(fighter, 0, 0, Hash40::new("footr"), 7.0, 62, 8, 0, 69, 4.0, 0.0, 0.0, 0.0, Some(-8.0), Some(0.0), Some(0.0), 0.9, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_NO_FLOOR, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
5555
}
56-
frame(lua_state, 40.0); //61faf
57-
FT_MOTION_RATE_RANGE(fighter, 40.0, 63.0, 21.0);
56+
frame(lua_state, 40.0); //57faf
57+
FT_MOTION_RATE_RANGE(fighter, 40.0, 62.0, 17.0);
5858
if is_excute(fighter) {
5959
AttackModule::clear_all(boma);
60-
fighter.set_int(*FIGHTER_BAYONETTA_SHOOTING_STEP_WAIT_END, *FIGHTER_BAYONETTA_INSTANCE_WORK_ID_INT_SHOOTING_STEP);
61-
fighter.off_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_ACTION);
60+
//fighter.set_int(*FIGHTER_BAYONETTA_SHOOTING_STEP_WAIT_END, *FIGHTER_BAYONETTA_INSTANCE_WORK_ID_INT_SHOOTING_STEP);
61+
//fighter.off_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_ACTION);
6262
fighter.off_flag(*FIGHTER_BAYONETTA_STATUS_WORK_ID_SPECIAL_S_FLAG_WALL_CHECK);
6363
}
6464
}
@@ -68,17 +68,17 @@ unsafe fn bayonetta_special_s_hold_end_game(fighter: &mut L2CAgentBase) {
6868
let lua_state = fighter.lua_state_agent;
6969
let boma = fighter.boma();
7070
frame(lua_state, 1.0);
71-
FT_MOTION_RATE_RANGE(fighter, 1.0, 34.5, 10.0);
71+
FT_MOTION_RATE_RANGE(fighter, 1.0, 34.5, 11.0);
7272
if is_excute(fighter) {
7373
notify_event_msc_cmd!(fighter, Hash40::new_raw(0x2d51fcdb09), *FIGHTER_BAYONETTA_SHOOTING_SLOT_R_LEG, false, false, true, 2, 0, 0, 0, false);
7474
ATTACK(fighter, 0, 0, Hash40::new("footr"), 7.0, 70, 8, 0, 50, 4.0, 0.5, 0.0, 0.0, Some(-8.0), Some(0.0), Some(0.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_NO_FLOOR, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
75-
fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_ACTION);
75+
//fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_ACTION);
7676
}
7777
frame(lua_state, 23.0);
7878
if is_excute(fighter) {
79-
fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_CHECK_END);
79+
//fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_CHECK_END);
8080
AttackModule::clear_all(fighter.module_accessor);
81-
fighter.on_flag(*FIGHTER_BAYONETTA_STATUS_WORK_ID_SPECIAL_S_FLAG_END_SPECIAL_S);
81+
//fighter.on_flag(*FIGHTER_BAYONETTA_STATUS_WORK_ID_SPECIAL_S_FLAG_END_SPECIAL_S);
8282
}
8383
frame(lua_state, 34.5);
8484
FT_MOTION_RATE(fighter, 1.0);
@@ -92,7 +92,7 @@ unsafe fn bayonetta_special_s_hold_end_game(fighter: &mut L2CAgentBase) {
9292
frame(lua_state, 40.0);
9393
FT_MOTION_RATE_RANGE(fighter, 40.0, 44.0, 2.0);
9494
frame(lua_state, 44.0);
95-
FT_MOTION_RATE_RANGE(fighter, 44.0, 61.0, 15.0); //61 faf
95+
FT_MOTION_RATE_RANGE(fighter, 44.0, 61.0, 15.0); //35 faf kick
9696
if is_excute(fighter) {
9797
AttackModule::clear_all(boma);
9898
}
@@ -127,21 +127,21 @@ unsafe fn bayonetta_special_air_s_u_game(fighter: &mut L2CAgentBase) {
127127
if is_excute(fighter) {
128128
ATTACK(fighter, 0, 0, Hash40::new("kneer"), 7.7, 47, 100, 65, 0, 4.5, 4.0, 0.0, 0.0, Some(-2.5), Some(0.0), Some(0.0), 1.1, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
129129
}
130-
frame(lua_state, 23.0);
130+
frame(lua_state, 22.0);
131131
if is_excute(fighter) {
132132
ATTACK(fighter, 0, 0, Hash40::new("kneer"), 7.7, 51, 100, 50, 0, 4.5, 4.0, 0.0, 0.0, Some(-2.5), Some(0.0), Some(0.0), 1.1, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, true, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_KICK, *ATTACK_REGION_KICK);
133-
fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_ACTION);
134-
fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_MOTION_STOP);
135-
fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_CHECK_END);
136133
}
137-
frame(lua_state, 25.0);
134+
frame(lua_state, 24.0);
138135
if is_excute(fighter) {
139-
JostleModule::set_status(boma, true);
140-
AttackModule::clear_all(boma);
141-
fighter.off_flag(*FIGHTER_BAYONETTA_STATUS_WORK_ID_SPECIAL_AIR_S_FLAG_WALL_CHECK);
142136
if !VarModule::is_flag(fighter.battle_object, vars::bayonetta::instance::IS_HIT) {
143137
VarModule::inc_int(boma.object(), vars::bayonetta::instance::NUM_RECOVERY_RESOURCE_USED);
144138
}
139+
JostleModule::set_status(boma, true);
140+
AttackModule::clear_all(boma);
141+
fighter.off_flag(*FIGHTER_BAYONETTA_STATUS_WORK_ID_SPECIAL_AIR_S_FLAG_WALL_CHECK);
142+
fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_ACTION);
143+
fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_MOTION_STOP);
144+
fighter.on_flag(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_FLAG_SHOOTING_CHECK_END);
145145
}
146146
frame(lua_state, 32.0); //28
147147
if is_excute(fighter) {

‎fighters/bayonetta/src/acmd/throws.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ unsafe fn bayonetta_throw_f_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
if is_excute(fighter) {
8-
ATTACK_ABS(fighter, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 4.0, 45, 165, 0, 60, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW);
8+
ATTACK_ABS(fighter, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 4.0, 45, 165, 0, 50, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW);
99
ATTACK_ABS(fighter, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 60, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW);
1010
}
1111
frame(lua_state, 14.0);
@@ -33,7 +33,7 @@ unsafe fn bayonetta_throw_hi_game(fighter: &mut L2CAgentBase) {
3333
let lua_state = fighter.lua_state_agent;
3434
let boma = fighter.boma();
3535
if is_excute(fighter) {
36-
ATTACK_ABS(fighter, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 4.5, 85, 78, 0, 55, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW);
36+
ATTACK_ABS(fighter, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW, 0, 4.5, 85, 78, 0, 60, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW);
3737
ATTACK_ABS(fighter, *FIGHTER_ATTACK_ABSOLUTE_KIND_CATCH, 0, 3.0, 361, 100, 0, 40, 0.0, 1.0, *ATTACK_LR_CHECK_F, 0.0, true, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_THROW);
3838
}
3939
frame(lua_state, 9.0);

‎fighters/bayonetta/src/lib.rs

+8
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,12 @@ pub fn install(is_runtime: bool) {
4242
acmd::install();
4343
status::install();
4444
opff::install(is_runtime);
45+
46+
if !is_runtime || is_hdr_available() {
47+
status::add_statuses();
48+
}
49+
}
50+
51+
pub fn delayed_install() {
52+
status::add_statuses();
4553
}

‎fighters/bayonetta/src/opff.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ unsafe fn aerial_cancels(fighter: &mut L2CFighterCommon, boma: &mut BattleObject
2424
new_status = *FIGHTER_STATUS_KIND_SPECIAL_S;
2525
}
2626
}
27-
fighter.check_airdodge_cancel();
27+
if !fighter.is_motion(Hash40::new("attack_air_lw")) {fighter.check_airdodge_cancel(); }
2828
if is_input_cancel && VarModule::get_int(fighter.battle_object, vars::bayonetta::instance::NUM_RECOVERY_RESOURCE_USED) < 2 {
2929
StatusModule::change_status_force(boma, new_status, true);
3030
} //special cancel
@@ -59,7 +59,7 @@ unsafe fn reset_flags(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectMod
5959
VarModule::set_int(boma.object(), vars::bayonetta::instance::FAIR_STATE, 0);
6060
}
6161
//resets flags if hit
62-
if StopModule::is_stop(boma) {
62+
if StopModule::is_stop(boma) || StopModule::is_damage(boma) {
6363
if VarModule::get_int(fighter.battle_object, vars::bayonetta::instance::NUM_RECOVERY_RESOURCE_USED) > 1 {
6464
VarModule::set_int(fighter.battle_object, vars::bayonetta::instance::NUM_RECOVERY_RESOURCE_USED, 1);
6565
VarModule::off_flag(fighter.battle_object, vars::common::instance::SIDE_SPECIAL_CANCEL);

‎fighters/bayonetta/src/status/mod.rs

+4
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@ pub fn install() {
1717
specialairs::install();
1818
specials::install();
1919
jumpaerial::install();
20+
}
21+
22+
pub fn add_statuses() {
23+
specials::install_custom();
2024
}

‎fighters/bayonetta/src/status/specialairs.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub fn install() {
99
);
1010
}
1111

12-
// FIGHTER_KINETIC_TYPE_BAYONETTA_SPECIAL_AIR_S_D //
12+
// FIGHTER_BAYONETTA_STATUS_KIND_SPECIAL_AIR_S_D //
1313

1414
#[status_script(agent = "bayonetta", status = FIGHTER_BAYONETTA_STATUS_KIND_SPECIAL_AIR_S_D, condition = LUA_SCRIPT_STATUS_FUNC_STATUS_MAIN)]
1515
unsafe fn bayonetta_specialairs_d_main(fighter: &mut L2CFighterCommon) -> L2CValue {
@@ -47,7 +47,7 @@ unsafe extern "C" fn bayonetta_special_air_s_d_main_loop(fighter: &mut L2CFighte
4747
0.into()
4848
}
4949

50-
// FIGHTER_KINETIC_TYPE_BAYONETTA_SPECIAL_AIR_S_U //
50+
// FIGHTER_BAYONETTA_STATUS_KIND_SPECIAL_AIR_S_U //
5151

5252
#[status_script(agent = "bayonetta", status = FIGHTER_BAYONETTA_STATUS_KIND_SPECIAL_AIR_S_U, condition = LUA_SCRIPT_STATUS_FUNC_STATUS_MAIN)]
5353
unsafe fn bayonetta_specialairs_u_main(fighter: &mut L2CFighterCommon) -> L2CValue {

0 commit comments

Comments
 (0)