Merge pull request #2171 from stingers135/peach-parasol-fix

Peach Parasol Improvements

Author: moklmaru

fighters/peach/src/opff.rs

@@ -36,7 +36,7 @@ unsafe fn wall_bounce(boma: &mut BattleObjectModuleAccessor, status_kind: i32) {
 }
 
 unsafe fn up_special_freefall_land_cancel(fighter: &mut L2CFighterCommon) {
-    if fighter.is_prev_status(*FIGHTER_STATUS_KIND_FALL_SPECIAL)
+    if (fighter.is_prev_status(*FIGHTER_STATUS_KIND_FALL_SPECIAL) || fighter.is_prev_status(*FIGHTER_PEACH_STATUS_KIND_SPECIAL_HI_AIR_END)) 
     && fighter.is_status(*FIGHTER_STATUS_KIND_LANDING_FALL_SPECIAL) {
         fighter.change_status_req(*FIGHTER_STATUS_KIND_LANDING, false);
     }

fighters/peach/src/status/mod.rs

@@ -3,6 +3,7 @@ use smashline::*;
 
 mod attack_air;
 mod jump_aerial;
+mod special_hi;
 mod special_s;
 mod special_lw;
 
@@ -54,6 +55,7 @@ pub fn install() {
     smashline::install_agent_init_callbacks!(peach_init);
     attack_air::install();
     jump_aerial::install();
+    special_hi::install();
     special_s::install();
     special_lw::install();
 }

fighters/peach/src/status/special_hi.rs

@@ -0,0 +1,25 @@
+use super::*;
+use globals::*;
+
+#[status_script(agent = "peach", status = FIGHTER_PEACH_STATUS_KIND_SPECIAL_HI_AIR_END, condition = LUA_SCRIPT_STATUS_FUNC_STATUS_MAIN)]
+unsafe fn special_hi_air_end_main(fighter: &mut L2CFighterCommon) -> L2CValue {
+    if !StopModule::is_stop(fighter.module_accessor) {
+        special_hi_substatus(fighter, false.into());
+    }
+    fighter.global_table[SUB_STATUS].assign(&L2CValue::Ptr(special_hi_substatus as *const () as _));
+    original!(fighter)
+}
+
+unsafe extern "C" fn special_hi_substatus(fighter: &mut L2CFighterCommon, param_1: L2CValue) -> L2CValue {
+    if fighter.is_situation(*SITUATION_KIND_AIR)
+    && param_1.get_bool() {
+        fighter.sub_air_check_dive();
+    }
+    0.into()
+}
+
+pub fn install() {
+    smashline::install_status_scripts!(
+        special_hi_air_end_main
+    );
+}