Skip to content

Commit b602e9c

Browse files
WuBoytHWuBoytH
committed
fuck you job
1 parent 97b9686 commit b602e9c

File tree

103 files changed

+378
-63
lines changed

Some content is hidden

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

103 files changed

+378
-63
lines changed

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -689,12 +689,8 @@ unsafe fn game_catchattack(agent: &mut L2CAgentBase) {
689689
#[acmd_script( agent = "bayonetta", script = "effect_landingheavy", category = ACMD_EFFECT, low_priority )]
690690
unsafe fn bayonetta_landing_heavy_effect(fighter: &mut L2CAgentBase) {
691691
if is_excute(fighter) {
692-
if fighter.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
693-
EFFECT(fighter, Hash40::new("bayonetta_jump_circle"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false);
694-
} else {
695-
LANDING_EFFECT(fighter, Hash40::new("sys_landing_smoke"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 0.9, 0, 0, 0, 0, 0, 0, false);
696-
EFFECT(fighter, Hash40::new("bayonetta_butterfly_landing"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false);
697-
}
692+
LANDING_EFFECT(fighter, Hash40::new("sys_landing_smoke"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 0.9, 0, 0, 0, 0, 0, 0, false);
693+
EFFECT(fighter, Hash40::new("bayonetta_butterfly_landing"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false);
698694
}
699695
}
700696

‎fighters/common/src/function_hooks/change_motion.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ unsafe fn change_motion_hook(boma: &mut BattleObjectModuleAccessor, motion_hash:
1616
if boma.is_fighter() {
1717
// Starts landing animations on frame 2
1818
// This is a purely aesthetic change, makes for snappier landings
19-
if [Hash40::new("landing_air_n"),
19+
if [Hash40::new("landing_heavy"),
20+
Hash40::new("landing_air_n"),
2021
Hash40::new("landing_air_f"),
2122
Hash40::new("landing_air_b"),
2223
Hash40::new("landing_air_hi"),
@@ -25,9 +26,6 @@ unsafe fn change_motion_hook(boma: &mut BattleObjectModuleAccessor, motion_hash:
2526
{
2627
start_frame = 1.0;
2728
}
28-
else if motion_hash == Hash40::new("landing_heavy") {
29-
start_frame = 3.0;
30-
}
3129

3230
// Allows a frame-perfect edge canceled waveland to still generate landing smoke GFX
3331
if VarModule::is_flag(boma.object(), vars::common::instance::FLUSH_EFFECT_ACMD)

‎fighters/common/src/function_hooks/controls.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1136,14 +1136,6 @@ unsafe fn reset_flick_y(boma: &mut BattleObjectModuleAccessor) {
11361136
call_original!(boma);
11371137
}
11381138

1139-
#[skyline::hook(replace=ControlModule::set_rumble)]
1140-
unsafe fn set_rumble_hook(boma: &mut BattleObjectModuleAccessor, kind: smash::phx::Hash40, arg3: i32, arg4: bool, arg5: u32) {
1141-
if boma.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
1142-
return;
1143-
}
1144-
call_original!(boma, kind, arg3, arg4, arg5);
1145-
}
1146-
11471139
fn nro_hook(info: &skyline::nro::NroInfo) {
11481140
if info.name == "common" {
11491141
skyline::install_hook!(is_throw_stick);
@@ -1189,7 +1181,6 @@ pub fn install() {
11891181
exec_command_reset_attack_air_kind_hook,
11901182
reset_flick_x,
11911183
reset_flick_y,
1192-
set_rumble_hook,
11931184
);
11941185
skyline::nro::add_hook(nro_hook);
11951186
}

‎fighters/common/src/function_hooks/effect.rs

-6
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,6 @@ unsafe fn FOOT_EFFECT_FLIP_hook(lua_state: u64) {
232232
#[skyline::hook(replace=smash::app::sv_animcmd::LANDING_EFFECT)]
233233
unsafe fn LANDING_EFFECT_hook(lua_state: u64) {
234234
let boma = smash::app::sv_system::battle_object_module_accessor(lua_state);
235-
if boma.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
236-
return;
237-
}
238235

239236
let mut l2c_agent: L2CAgent = L2CAgent::new(lua_state);
240237

@@ -268,9 +265,6 @@ unsafe fn LANDING_EFFECT_hook(lua_state: u64) {
268265
#[skyline::hook(replace=smash::app::sv_animcmd::LANDING_EFFECT_FLIP)]
269266
unsafe fn LANDING_EFFECT_FLIP_hook(lua_state: u64) {
270267
let boma = smash::app::sv_system::battle_object_module_accessor(lua_state);
271-
if boma.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
272-
return;
273-
}
274268

275269
let mut l2c_agent: L2CAgent = L2CAgent::new(lua_state);
276270

‎fighters/common/src/function_hooks/get_param.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ pub unsafe fn get_param_float_hook(x0 /*boma*/: u64, x1 /*param_type*/: u64, x2
149149
// Coupled with "landing_heavy" change in change_motion hook
150150
// Because we start heavy landing anims on f2 rather than f1, we need to push back the heavy landing FAF by 1 frame so it is accurate to the defined per-character param
151151
if x1 == hash40("landing_frame") {
152-
return original!()(x0, hash40("landing_frame"), 0) + 3.0;
152+
return original!()(x0, hash40("landing_frame"), 0) + 1.0;
153153
}
154154

155155
// Ken aerial hadouken modified offsets for aerial version

‎fighters/common/src/function_hooks/sound.rs

-22
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,6 @@ use super::*;
22
use globals::*;
33
use utils::*;
44

5-
#[skyline::hook(replace=smash::app::sv_animcmd::PLAY_LANDING_SE)]
6-
unsafe fn PLAY_LANDING_SE_hook(lua_state: u64) {
7-
let boma = smash::app::sv_system::battle_object_module_accessor(lua_state);
8-
if boma.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
9-
return;
10-
}
11-
12-
original!()(lua_state);
13-
}
14-
15-
#[skyline::hook(replace=smash::app::sv_animcmd::PLAY_SE)]
16-
unsafe fn PLAY_SE_hook(lua_state: u64) {
17-
let boma = smash::app::sv_system::battle_object_module_accessor(lua_state);
18-
if boma.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
19-
return;
20-
}
21-
22-
original!()(lua_state);
23-
}
24-
255
#[skyline::hook(offset = 0x4cf6a0)]
266
unsafe fn soundmodule__play_se_hook(sound_module: u64, se: smash::phx::Hash40, arg2: bool, arg3: bool, arg4: bool, arg5: bool, se_type: smash::app::enSEType) -> u64 {
277
let handle = original!()(sound_module, se, arg2, arg3, arg4, arg5, se_type);
@@ -57,8 +37,6 @@ unsafe fn PLAY_SEQUENCE_hook(lua_state: u64) {
5737

5838
pub fn install() {
5939
skyline::install_hooks!(
60-
PLAY_LANDING_SE_hook,
61-
PLAY_SE_hook,
6240
soundmodule__play_se_hook,
6341
PLAY_SEQUENCE_hook,
6442
);

‎fighters/common/src/general_statuses/jumpsquat.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -438,12 +438,17 @@ unsafe fn sub_jump_squat_uniq_process_init_param(fighter: &mut L2CFighterCommon,
438438
let jump_squat_frame = WorkModule::get_param_int(fighter.module_accessor, hash40("jump_squat_frame"), 0) as f32;
439439
// This cuts a single frame off of the end of the specified characters' jumpsquat animations
440440
// This is a purely aesthetic change, makes for snappier jumps
441-
let end_frame = MotionModule::end_frame_from_hash(fighter.module_accessor, Hash40::new("landing_heavy")) * 0.25;
441+
let mut end_frame = MotionModule::end_frame_from_hash(fighter.module_accessor, motion_hash.get_hash());
442+
let mut start_frame = 0.0;
443+
if motion_hash.get_hash().hash == hash40("jump_squat") {
444+
end_frame *= 0.25;
445+
start_frame = 3.0;
446+
}
442447

443448
// vanilla logic
444449
let mut motion_rate = end_frame / jump_squat_frame;
445450
if motion_rate < 1.0 {
446451
motion_rate += 0.001;
447452
}
448-
MotionModule::change_motion(fighter.module_accessor, Hash40::new("landing_heavy"), 3.0, motion_rate, false, 0.0, false, false);
453+
MotionModule::change_motion(fighter.module_accessor, motion_hash.get_hash(), start_frame, motion_rate, false, 0.0, false, false);
449454
}

‎fighters/dedede/src/acmd/other.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ unsafe fn expression_landingheavy(fighter: &mut L2CAgentBase) {
128128
if is_excute(fighter) {
129129
ControlModule::set_rumble(boma, Hash40::new("rbkind_landl"), 0, false, 0x50000000 /* default value */);
130130
slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE, *SLOPE_STATUS_LR);
131-
if !fighter.is_prev_status(*FIGHTER_STATUS_KIND_ESCAPE_AIR)
132-
&& !fighter.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
131+
if !fighter.is_prev_status(*FIGHTER_STATUS_KIND_ESCAPE_AIR) {
133132
QUAKE(fighter, *CAMERA_QUAKE_KIND_S);
134133
}
135134
}

‎fighters/donkey/src/acmd/other.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ unsafe fn expression_landingheavy(fighter: &mut L2CAgentBase) {
128128
if is_excute(fighter) {
129129
ControlModule::set_rumble(boma, Hash40::new("rbkind_landl"), 0, false, 0x50000000 /* default value */);
130130
slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE, *SLOPE_STATUS_LR);
131-
if !fighter.is_prev_status(*FIGHTER_STATUS_KIND_ESCAPE_AIR)
132-
&& !fighter.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
131+
if !fighter.is_prev_status(*FIGHTER_STATUS_KIND_ESCAPE_AIR) {
133132
QUAKE(fighter, *CAMERA_QUAKE_KIND_S);
134133
}
135134
}

‎fighters/kirby/src/acmd/other.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,7 @@ unsafe fn landingheavy_effect(fighter: &mut L2CAgentBase) {
192192
let boma = fighter.boma();
193193
if is_excute(fighter) {
194194
LANDING_EFFECT(fighter, Hash40::new("sys_landing_smoke"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 0.8, 0, 0, 0, 0, 0, 0, false);
195-
if !fighter.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
196-
EFFECT(fighter, Hash40::new("kirby_star"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false);
197-
}
195+
EFFECT(fighter, Hash40::new("kirby_star"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, false);
198196
}
199197
}
200198

‎fighters/koopa/src/acmd/other.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ unsafe fn expression_landingheavy(fighter: &mut L2CAgentBase) {
127127
if is_excute(fighter) {
128128
ControlModule::set_rumble(boma, Hash40::new("rbkind_landl"), 0, false, 0x50000000 /* default value */);
129129
slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE, *SLOPE_STATUS_LR);
130-
if !fighter.is_prev_status(*FIGHTER_STATUS_KIND_ESCAPE_AIR)
131-
&& !fighter.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
130+
if !fighter.is_prev_status(*FIGHTER_STATUS_KIND_ESCAPE_AIR) {
132131
QUAKE(fighter, *CAMERA_QUAKE_KIND_S);
133132
}
134133
}

‎fighters/plizardon/src/acmd/other.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,7 @@ unsafe fn expression_landingheavy(fighter: &mut L2CAgentBase) {
266266
if is_excute(fighter) {
267267
ControlModule::set_rumble(boma, Hash40::new("rbkind_landl"), 0, false, 0x50000000 /* default value */);
268268
slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE, *SLOPE_STATUS_LR);
269-
if !fighter.is_prev_status(*FIGHTER_STATUS_KIND_ESCAPE_AIR)
270-
&& !fighter.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
269+
if !fighter.is_prev_status(*FIGHTER_STATUS_KIND_ESCAPE_AIR) {
271270
QUAKE(fighter, *CAMERA_QUAKE_KIND_S);
272271
}
273272
}

‎fighters/ridley/src/acmd/other.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ unsafe fn expression_landingheavy(fighter: &mut L2CAgentBase) {
128128
if is_excute(fighter) {
129129
ControlModule::set_rumble(boma, Hash40::new("rbkind_landl"), 0, false, 0x50000000 /* default value */);
130130
slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE, *SLOPE_STATUS_LR);
131-
if !fighter.is_prev_status(*FIGHTER_STATUS_KIND_ESCAPE_AIR)
132-
&& !fighter.is_status(*FIGHTER_STATUS_KIND_JUMP_SQUAT) {
131+
if !fighter.is_prev_status(*FIGHTER_STATUS_KIND_ESCAPE_AIR) {
133132
QUAKE(fighter, *CAMERA_QUAKE_KIND_S);
134133
}
135134
}

‎romfs/source/fighter/bayonetta/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/brave/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/buddy/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/captain/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/chrom/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/cloud/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
catch:

‎romfs/source/fighter/daisy/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/dedede/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_f:

‎romfs/source/fighter/demon/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/diddy/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
guard_off:

‎romfs/source/fighter/dolly/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/donkey/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/duckhunt/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
guard_off:

‎romfs/source/fighter/edge/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/eflame/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/elight/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/falco/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
guard_off:

‎romfs/source/fighter/fox/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
throw_lw:

‎romfs/source/fighter/gamewatch/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
guard_off:
26
extra:
37
cancel_frame: 12

‎romfs/source/fighter/ganon/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/gaogaen/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
guard_off:

‎romfs/source/fighter/gekkouga/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_f:

‎romfs/source/fighter/ike/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

‎romfs/source/fighter/inkling/motion/body/motion_patch.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
jump_squat:
2+
blend_frames: 0
3+
animations:
4+
- name: a05landingheavy.nuanmb
15
fall:
26
blend_frames: 5
37
fall_aerial:

0 commit comments

Comments
 (0)