Merge branch 'dev' into feature/smashline-2

Author: WuBoytH

fighters/marth/src/acmd/specials.rs

@@ -18,7 +18,7 @@ unsafe extern "C" fn marth_special_s1_game(fighter: &mut L2CAgentBase) {
         ATTACK(fighter, 1, 0, Hash40::new("top"), 4.0, 92, 60, 0, 25, 7.5, 0.0, 9.5, 16.5, None, None, None, 1.0, 0.8, *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_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MARTH_SWORD, *ATTACK_REGION_SWORD);
         ATTACK(fighter, 2, 0, Hash40::new("top"), 4.0, 20, 60, 0, 25, 4.5, 0.0, 9.5, 3.0, None, None, None, 1.0, 0.8, *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_cutup"), *ATTACK_SOUND_LEVEL_S, *COLLISION_SOUND_ATTR_CUTUP, *ATTACK_REGION_SWORD);
     }
-    frame(lua_state, 7.0);
+    frame(lua_state, 10.0);
     if is_excute(fighter) {
         AttackModule::clear_all(boma);
         WorkModule::on_flag(boma, *FIGHTER_MARTH_STATUS_SPECIAL_S_FLAG_MOTION_CHANGE_ENABLE);

fighters/rockman/src/status/rockbuster/shoot_jump_squat.rs

@@ -58,7 +58,7 @@ unsafe extern "C" fn rockman_rockbuster_shoot_jump_squat_main(fighter: &mut L2CF
     rockman_rockbuster_main_helper(fighter, false.into(), true.into(), L2CValue::Void(), L2CValue::Void());
     MotionModule::change_motion(
         fighter.module_accessor,
-        Hash40::new("jump_squat"),
+        Hash40::new("jump_squat_buster"),
         0.0,
         1.0,
         false,

fighters/rockman/src/vtable_hook.rs

@@ -315,7 +315,8 @@ pub fn install() {
     skyline::patching::Patch::in_text(0x10839cc).nop();
 
     // Patches which status to compare to for Metal Blade.
-    skyline::patching::Patch::in_text(0x1080264).data(0x7107741Fu32);
+    skyline::patching::Patch::in_text(0x1080264).nop();
+    skyline::patching::Patch::in_text(0x1080268).nop();
 
     skyline::install_hooks!(
         rockman_vtable_func,

fighters/sheik/src/acmd/aerials.rs

@@ -144,7 +144,7 @@ unsafe extern "C" fn expression_attackairhi(agent: &mut L2CAgentBase) {
     if is_excute(agent) {
         ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitm"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
     }
-    frame(lua_state, 5.0);
+    frame(lua_state, 4.0);
     if is_excute(agent) {
         RUMBLE_HIT(agent, Hash40::new("rbkind_attackm"), 0);
     }

romfs/source/fighter/rockman/motion/body/motion_patch.yaml

@@ -468,6 +468,36 @@ buster_walk_fast:
     xlu_end: 0
     cancel_frame: 0
     no_stop_intp: false
+jump_squat_buster:
+  game_script: game_jumpsquat
+  flags:
+    turn: false
+    loop: false
+    move: false
+    fix_trans: false
+    fix_rot: false
+    fix_scale: false
+    unk_40: false
+    unk_80: true
+    unk_100: false
+    unk_200: false
+    unk_400: false
+    unk_800: false
+    unk_1000: false
+    unk_2000: false
+  blend_frames: 0
+  animations:
+    - name: a03jumpsquat.nuanmb
+      unk: 0
+  scripts:
+    - expression_jumpsquat
+    - sound_jumpsquat
+    - effect_jumpsquat
+  extra:
+    xlu_start: 0
+    xlu_end: 0
+    cancel_frame: 0
+    no_stop_intp: false
 attack_s3_s:
   game_script: game_attacks3melee
   flags:

romfs/source/fighter/sonic/motion/body/motion_patch.yaml

@@ -90,7 +90,7 @@ special_n_hit:
   extra:
     intangible_start_frame: 0
     intangible_end_frame: 0
-    cancel_frame: 15
+    cancel_frame: 22
     freeze_during_hitstop: false    
 special_n_hit1:
   game_script: game_specialnhit
@@ -119,7 +119,7 @@ special_n_hit1:
   extra:
     intangible_start_frame: 0
     intangible_end_frame: 0
-    cancel_frame: 15
+    cancel_frame: 22
     freeze_during_hitstop: false  
 special_n_hit2:
   game_script: game_specialnhit
@@ -148,7 +148,7 @@ special_n_hit2:
   extra:
     intangible_start_frame: 0
     intangible_end_frame: 0
-    cancel_frame: 15
+    cancel_frame: 22
     freeze_during_hitstop: false  
 special_n_hit3:
   game_script: game_specialnhit
@@ -177,7 +177,7 @@ special_n_hit3:
   extra:
     intangible_start_frame: 0
     intangible_end_frame: 0
-    cancel_frame: 15
+    cancel_frame: 22
     freeze_during_hitstop: false  
 special_n_hit4:
   game_script: game_specialnhit
@@ -206,7 +206,7 @@ special_n_hit4:
   extra:
     intangible_start_frame: 0
     intangible_end_frame: 0
-    cancel_frame: 15
+    cancel_frame: 22
     freeze_during_hitstop: false  
 special_n_hit5:
   game_script: game_specialnhit
@@ -235,7 +235,7 @@ special_n_hit5:
   extra:
     intangible_start_frame: 0
     intangible_end_frame: 0
-    cancel_frame: 15
+    cancel_frame: 22
     freeze_during_hitstop: false  
 special_n_hit6:
   game_script: game_specialnhit
@@ -264,7 +264,7 @@ special_n_hit6:
   extra:
     intangible_start_frame: 0
     intangible_end_frame: 0
-    cancel_frame: 15
+    cancel_frame: 22
     freeze_during_hitstop: false  
 special_n_hit7:
   game_script: game_specialnhit
@@ -293,7 +293,7 @@ special_n_hit7:
   extra:
     intangible_start_frame: 0
     intangible_end_frame: 0
-    cancel_frame: 15
+    cancel_frame: 22
     freeze_during_hitstop: false
 special_n_hit8:
   game_script: game_specialnhit
@@ -322,7 +322,7 @@ special_n_hit8:
   extra:
     intangible_start_frame: 0
     intangible_end_frame: 0
-    cancel_frame: 15
+    cancel_frame: 22
     freeze_during_hitstop: false  
 special_s_boost:
   game_script: game_specialsboost