Merge branch 'dev' into roy-fair-and-others

Author: SkewedAskew

dynamic/src/consts.rs

@@ -287,6 +287,8 @@ pub mod vars {
 
             pub const FLOAT_INHERIT_AERIAL: i32 = 0x1000;
 
+            pub const ENABLE_SPECIAL_WALLJUMP: i32 = 0x1050;
+
             // ints
 
             pub const DOWN_STAND_FB_KIND: i32 = 0x1000;
@@ -591,6 +593,7 @@ pub mod vars {
             // flags
             pub const SET_ATTACK: i32 = 0x1100;
             pub const SET_EFFECT: i32 = 0x1101;
+            pub const REFLECTOR_CONTINUE: i32 = 0x1102;
 
             // ints
             pub const SPECIAL_LW_STOP_Y_FRAME: i32 = 0x1100;
@@ -1653,6 +1656,7 @@ pub mod statuses {
     pub mod falco {
         pub const SPECIAL_LW_LOOP: i32 = 0x1e8;
         pub const SPECIAL_LW_END: i32 = 0x1e9;
+        pub const SPECIAL_LW_HIT: i32 = 0x1ea;
     }
 
     pub mod gamewatch {

dynamic/src/ext.rs

@@ -1,4 +1,4 @@
-use crate::consts::globals::*;
+use crate::consts::{globals::*, vars};
 use bitflags::bitflags;
 use modular_bitfield::specifiers::*;
 use smash::app::{
@@ -511,6 +511,8 @@ pub trait BomaExt {
     unsafe fn check_airdodge_cancel(&mut self) -> bool;
     // Checks for status and enables transition to dash
     unsafe fn check_dash_cancel(&mut self) -> bool;
+    // Checks for status and enables transition to wall jump
+    unsafe fn check_wall_jump_cancel(&mut self) -> bool;
 
     /// check for hitfall (should be called once per frame)
     unsafe fn check_hitfall(&mut self);
@@ -1052,6 +1054,20 @@ impl BomaExt for BattleObjectModuleAccessor {
         false
     }
 
+    unsafe fn check_wall_jump_cancel(&mut self) -> bool {
+        if crate::VarModule::is_flag(self.object(), vars::common::instance::SPECIAL_WALL_JUMP) {
+            return false;
+        }
+        crate::VarModule::on_flag(self.object(), vars::common::status::ENABLE_SPECIAL_WALLJUMP);
+        let fighter = crate::util::get_fighter_common_from_accessor(self);
+        if fighter.sub_transition_group_check_air_wall_jump().get_bool() {
+            crate::VarModule::on_flag(self.object(), vars::common::instance::SPECIAL_WALL_JUMP);
+            return true;
+        }
+        crate::VarModule::off_flag(self.object(), vars::common::status::ENABLE_SPECIAL_WALLJUMP);
+        false
+    }
+
     /// Sets the position of the front/red ledge-grab box (see [`set_center_cliff_hangdata`](BomaExt::set_center_cliff_hangdata) for more information)
     ///
     /// # Arguments
@@ -1225,7 +1241,11 @@ impl BomaExt for BattleObjectModuleAccessor {
             );
         }
 
-        CancelModule::enable_cancel(self);
+        if self.motion_frame() >= 4.0
+        && !CancelModule::is_enable_cancel(self) {
+            CancelModule::enable_cancel(self);
+        }
+
         if self.is_situation(*SITUATION_KIND_AIR) {
             let fighter = crate::util::get_fighter_common_from_accessor(self);
             fighter.sub_air_check_fall_common();

fighters/chrom/src/acmd/specials.rs

@@ -541,10 +541,10 @@ pub unsafe extern "C" fn game_specialhi1(agent: &mut L2CAgentBase) {
         ATTACK(agent, 1, 0, Hash40::new("top"), 6.0, 89, 100, 150, 0, 4.8, 0.0, 5.0, 8.0, None, None, None, 1.2, 2.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, 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_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
         ATTACK(agent, 2, 0, Hash40::new("top"), 6.0, 90, 100, 145, 0, 4.8, 0.0, 12.5, 8.0, None, None, None, 1.2, 2.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, 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_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
         ATTACK(agent, 3, 0, Hash40::new("top"), 6.0, 91, 100, 145, 0, 4.8, 0.0, 12.5, 16.0, None, None, None, 1.2, 2.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, 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_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
-        AttackModule::set_vec_target_pos(boma, 0, Hash40::new("top"), &Vector2f::new(5.0, 60.0), 15, false);
-        AttackModule::set_vec_target_pos(boma, 1, Hash40::new("top"), &Vector2f::new(5.0, 60.0), 15, false);
-        AttackModule::set_vec_target_pos(boma, 2, Hash40::new("top"), &Vector2f::new(5.0, 60.0), 15, false);
-        AttackModule::set_vec_target_pos(boma, 3, Hash40::new("top"), &Vector2f::new(5.0, 60.0), 15, false);
+        AttackModule::set_vec_target_pos(boma, 0, Hash40::new("top"), &Vector2f::new(10.0, 55.0), 15, false);
+        AttackModule::set_vec_target_pos(boma, 1, Hash40::new("top"), &Vector2f::new(10.0, 55.0), 15, false);
+        AttackModule::set_vec_target_pos(boma, 2, Hash40::new("top"), &Vector2f::new(10.0, 55.0), 15, false);
+        AttackModule::set_vec_target_pos(boma, 3, Hash40::new("top"), &Vector2f::new(10.0, 55.0), 15, false);
         AttackModule::set_no_damage_fly_smoke_all(boma, true, false);
     }
     frame(lua_state, 18.0);
@@ -657,11 +657,7 @@ pub unsafe extern "C" fn expression_specialhi2(agent: &mut L2CAgentBase) {
 }
 
 pub unsafe extern "C" fn game_specialhi3start(agent: &mut L2CAgentBase) {
-    let lua_state = agent.lua_state_agent;
-    let boma = agent.boma();
-    if is_excute(agent) {
-        notify_event_msc_cmd!(agent, Hash40::new_raw(0x2127e37c07), *GROUND_CLIFF_CHECK_KIND_NONE);
-    }
+    
 }
 
 pub unsafe extern "C" fn effect_specialhi3start(agent: &mut L2CAgentBase) {
@@ -695,10 +691,8 @@ pub unsafe extern "C" fn game_specialhi3(agent: &mut L2CAgentBase) {
     let lua_state = agent.lua_state_agent;
     let boma = agent.boma();
     if is_excute(agent) {
-        ATTACK(agent, 0, 0, Hash40::new("rot"), 1.1, 365, 50, 85, 50, 10.0, 0.0, 2.0, 2.25, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, true, 0, 0.0, 7, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
+        ATTACK(agent, 0, 0, Hash40::new("rot"), 1.1, 366, 100, 85, 0, 10.0, 0.0, 2.0, 2.25, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, true, 0, 0.0, 7, false, false, false, false, true, *COLLISION_SITUATION_MASK_A, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
         ATTACK(agent, 1, 0, Hash40::new("rot"), 1.1, 20, 50, 125, 50, 10.0, 0.0, 2.0, 2.25, None, None, None, 0.5, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, true, 0, 0.0, 7, false, false, false, false, true, *COLLISION_SITUATION_MASK_G, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
-        AttackModule::set_add_reaction_frame(boma, 0, 3.0, false);
-        AttackModule::set_add_reaction_frame(boma, 1, 3.0, false);
         AttackModule::set_no_damage_fly_smoke_all(boma, true, false);
     }
     frame(lua_state, 5.0); 
@@ -756,11 +750,15 @@ pub unsafe extern "C" fn game_specialhi3_attack(agent: &mut L2CAgentBase) {
     if is_excute(agent){
         AttackModule::clear_all(boma);
     }
+    frame(lua_state, 2.0);
+    if is_excute(agent) {
+        ATTACK(agent, 0, 0, Hash40::new("sword1"), 10.0, 361, 85, 0, 70, 3.8, 0.0, 0.0, 1.5, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 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_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
+        ATTACK(agent, 1, 0, Hash40::new("sword1"), 10.0, 361, 85, 0, 70, 3.2, 0.0, 0.0, 7.4, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 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_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
+        ATTACK(agent, 2, 0, Hash40::new("hip"), 10.0, 361, 85, 0, 70, 5.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 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_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
+    }
     frame(lua_state, 3.0);
     if is_excute(agent) {
-        ATTACK(agent, 0, 0, Hash40::new("top"), 10.0, 361, 85, 0, 70, 9.0, 0.0, 10.0, 10.2, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 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_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
-        ATTACK(agent, 1, 0, Hash40::new("sword1"), 10.0, 361, 85, 0, 70, 3.8, 0.0, 0.0, 1.5, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 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_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
-        ATTACK(agent, 2, 0, Hash40::new("sword1"), 10.0, 361, 85, 0, 70, 3.2, 0.0, 0.0, 7.4, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 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_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
+        ATTACK(agent, 3, 0, Hash40::new("top"), 10.0, 361, 85, 0, 70, 9.0, 0.0, 10.0, 10.2, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_THRU, *ATTACK_LR_CHECK_F, false, 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_cutup"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_CHROM_HIT, *ATTACK_REGION_SWORD);
     }
     frame(lua_state, 6.0);
     if is_excute(agent){
@@ -806,7 +804,7 @@ pub unsafe extern "C" fn expression_specialhi3_attack(agent: &mut L2CAgentBase)
     if is_excute(agent) {
         ItemModule::set_have_item_visibility(boma, false, 0);
     }
-    frame(lua_state, 3.0);
+    frame(lua_state, 2.0);
     if is_excute(agent) {
         RUMBLE_HIT(agent, Hash40::new("rbkind_slashm"), 8);
         ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitm"), 5, false, *BATTLE_OBJECT_ID_INVALID as u32);

fighters/chrom/src/status/special_hi.rs

@@ -239,9 +239,15 @@ pub unsafe extern "C" fn special_hi_end(fighter: &mut L2CFighterCommon) -> L2CVa
 }
 
 pub unsafe extern "C" fn special_hi_exit(fighter: &mut L2CFighterCommon) -> L2CValue {
-    fighter.clear_lua_stack();
-    lua_args!(fighter, MA_MSC_CMD_EFFECT_AFTER_IMAGE_OFF, 0);
-    sv_module_access::effect(fighter.lua_state_agent);
+    if !(&[
+        *FIGHTER_STATUS_KIND_SPECIAL_HI,
+        *FIGHTER_ROY_STATUS_KIND_SPECIAL_HI_2,
+        *FIGHTER_ROY_STATUS_KIND_SPECIAL_HI_3,
+        statuses::chrom::SPECIAL_HI_FLIP,
+        statuses::chrom::SPECIAL_HI_DIVE
+    ]).contains(&StatusModule::status_kind_next(fighter.module_accessor)) {
+        EffectModule::remove_all_after_image(fighter.module_accessor, 0, 0);
+    }
     WorkModule::inc_int(fighter.module_accessor, *FIGHTER_ROY_INSTANCE_WORK_ID_INT_SPECIAL_HI_CLIFF_NUM);
     0.into()
 }
@@ -252,7 +258,7 @@ pub unsafe extern "C" fn special_hi_2_pre(fighter: &mut L2CFighterCommon) -> L2C
         app::SituationKind(*SITUATION_KIND_AIR),
         *FIGHTER_KINETIC_TYPE_UNIQ,
         *GROUND_CORRECT_KIND_AIR as u32,
-        app::GroundCliffCheckKind(*GROUND_CLIFF_CHECK_KIND_ALWAYS),
+        app::GroundCliffCheckKind(*GROUND_CLIFF_CHECK_KIND_NONE),
         true,
         *FIGHTER_STATUS_WORK_KEEP_FLAG_ALL_FLAG,
         *FIGHTER_STATUS_WORK_KEEP_FLAG_ALL_INT,
@@ -345,7 +351,6 @@ pub unsafe extern "C" fn special_hi_3_main(fighter: &mut L2CFighterCommon) -> L2
     let landing_frame = ParamModule::get_float(fighter.battle_object, ParamType::Agent, "param_special_hi.dive_landing_frame");
     WorkModule::set_float(fighter.module_accessor, landing_frame, *FIGHTER_INSTANCE_WORK_ID_FLOAT_LANDING_FRAME);
 
-    fighter.sub_fighter_cliff_check(L2CValue::I32(*GROUND_CLIFF_CHECK_KIND_ON_DROP));
     fighter.sub_shift_status_main(L2CValue::Ptr(special_hi_3_main_loop as *const () as _))
 }
 
@@ -403,7 +408,9 @@ pub fn install(agent: &mut smashline::Agent) {
     agent.status(Init, statuses::chrom::SPECIAL_HI_FLIP, special_hi_2_init);
     agent.status(Main, statuses::chrom::SPECIAL_HI_FLIP, special_hi_2_main);
     agent.status(Exec, statuses::chrom::SPECIAL_HI_FLIP, special_hi_2_exec);
+    agent.status(Exit, statuses::chrom::SPECIAL_HI_FLIP, special_hi_exit);
 
+    agent.status(Pre, statuses::chrom::SPECIAL_HI_DIVE, special_hi_2_pre);
     agent.status(Init, statuses::chrom::SPECIAL_HI_DIVE, special_hi_3_init);
     agent.status(Main, statuses::chrom::SPECIAL_HI_DIVE, special_hi_3_main);
     agent.status(CheckAttack, statuses::chrom::SPECIAL_HI_DIVE, special_hi_3_attack);

fighters/common/src/general_statuses/mod.rs

@@ -114,6 +114,7 @@ fn nro_hook(info: &skyline::nro::NroInfo) {
             status_pre_landing_fall_special,
             sub_air_transition_group_check_air_attack_hook,
             sub_transition_group_check_air_lasso,
+            sub_transition_group_check_air_wall_jump,
             sub_transition_group_check_ground_jump_mini_attack,
             change_status_jump_mini_attack,
             sub_transition_group_check_ground_attack,
@@ -243,6 +244,39 @@ unsafe fn sub_transition_group_check_air_lasso(fighter: &mut L2CFighterCommon) -
     return false.into();
 }
 
+#[skyline::hook(replace = L2CFighterCommon_sub_transition_group_check_air_wall_jump)]
+unsafe fn sub_transition_group_check_air_wall_jump(fighter: &mut L2CFighterCommon) -> L2CValue {
+    if fighter.global_table[0x31].get_bool() {
+        let callable: extern "C" fn(&mut L2CFighterCommon) -> L2CValue = std::mem::transmute(fighter.global_table[0x31].get_ptr());
+        if callable(fighter).get_bool() {
+            return true.into();
+        }
+    }
+
+    // basic validity checks
+    if fighter.global_table[SITUATION_KIND].get_i32() != *SITUATION_KIND_AIR {
+        return false.into();
+    }
+
+    // unused since we removed wall clings but y'know just in case
+    let attach_wall_type = WorkModule::get_param_int(fighter.module_accessor, hash40("attach_wall_type"), 0);
+    if attach_wall_type == *FIGHTER_ATTACH_WALL_TYPE_NORMAL
+    && fighter.sub_fighter_general_term_is_can_attach_wall().get_bool() {
+        fighter.change_status(FIGHTER_STATUS_KIND_ATTACH_WALL.into(), true.into());
+        return true.into();
+    }
+
+    let wall_jump_type = WorkModule::get_param_int(fighter.module_accessor, hash40("wall_jump_type"), 0);
+    if (wall_jump_type == *FIGHTER_WALL_JUMP_TYPE_NORMAL
+    || VarModule::is_flag(fighter.battle_object, vars::common::status::ENABLE_SPECIAL_WALLJUMP))
+    && fighter.sub_fighter_general_term_is_can_wall_jump().get_bool() {
+        fighter.change_status(FIGHTER_STATUS_KIND_WALL_JUMP.into(), true.into());
+        return true.into();
+    }
+
+    return false.into();
+}
+
 #[skyline::hook(replace = L2CFighterCommon_sub_transition_group_check_ground_jump_mini_attack)]
 unsafe fn sub_transition_group_check_ground_jump_mini_attack(fighter: &mut L2CFighterCommon) -> L2CValue {
     if fighter.global_table[SITUATION_KIND].get_i32() == *SITUATION_KIND_GROUND {