Skip to content

Commit f15d739

Browse files
4Lukaska4Lukaska
committed
remove up b walljump
rip
1 parent 9e5a3da commit f15d739

File tree

2 files changed

+30
-51
lines changed

2 files changed

+30
-51
lines changed

‎fighters/mario/src/opff.rs

+30-41
Original file line numberDiff line numberDiff line change
@@ -71,43 +71,35 @@ unsafe fn dair_mash_rise(fighter: &mut L2CFighterCommon, boma: &mut BattleObject
7171
}
7272
}
7373

74-
//Super Jump Punch Wall Jump
75-
unsafe fn up_b_wall_jump(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectModuleAccessor, id: usize, status_kind: i32, situation_kind: i32, cat1: i32, frame: f32) {
76-
if StatusModule::is_changing(boma) {
77-
return;
78-
}
79-
if status_kind == *FIGHTER_STATUS_KIND_SPECIAL_HI {
80-
if situation_kind == *SITUATION_KIND_AIR {
81-
if frame == 25.0 {
82-
if !VarModule::is_flag(boma.object(), vars::common::instance::SPECIAL_WALL_JUMP) && !VarModule::is_flag(boma.object(), vars::mario::instance::DISABLE_JUMPMAN_POWERS){
83-
if GroundModule::is_wall_touch_line(boma, *GROUND_TOUCH_FLAG_RIGHT_SIDE as u32) {
84-
if boma.is_cat_flag(Cat1::TurnDash) {
85-
VarModule::on_flag(boma.object(), vars::common::instance::SPECIAL_WALL_JUMP);
86-
StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_WALL_JUMP, true);
87-
//VarModule::on_flag(fighter.battle_object, vars::common::instance::UP_SPECIAL_CANCEL);
88-
VarModule::on_flag(fighter.battle_object, vars::mario::instance::DISABLE_D_SPECIAL);
89-
}
90-
}
91-
if GroundModule::is_wall_touch_line(boma, *GROUND_TOUCH_FLAG_LEFT_SIDE as u32) {
92-
if boma.is_cat_flag(Cat1::TurnDash) {
93-
VarModule::on_flag(boma.object(), vars::common::instance::SPECIAL_WALL_JUMP);
94-
StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_WALL_JUMP, true);
95-
//VarModule::on_flag(fighter.battle_object, vars::common::instance::UP_SPECIAL_CANCEL);
96-
VarModule::on_flag(fighter.battle_object, vars::mario::instance::DISABLE_D_SPECIAL);
97-
}
98-
}
99-
}
100-
}
101-
}
102-
}
103-
if fighter.is_situation(*SITUATION_KIND_GROUND)
104-
|| fighter.is_situation(*SITUATION_KIND_CLIFF)
105-
|| fighter.is_status_one_of(&[*FIGHTER_STATUS_KIND_REBIRTH, *FIGHTER_STATUS_KIND_DEAD])
106-
|| fighter.is_situation(*SITUATION_KIND_LADDER) {
107-
VarModule::off_flag(fighter.battle_object, vars::mario::instance::DISABLE_D_SPECIAL);
108-
VarModule::off_flag(fighter.battle_object, vars::mario::instance::DISABLE_JUMPMAN_POWERS);
109-
}
110-
}
74+
// Super Jump Punch Wall Jump
75+
// unsafe fn up_b_wall_jump(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectModuleAccessor, id: usize, status_kind: i32, situation_kind: i32, cat1: i32, frame: f32) {
76+
// if StatusModule::is_changing(boma) {
77+
// return;
78+
// }
79+
// if status_kind == *FIGHTER_STATUS_KIND_SPECIAL_HI {
80+
// if situation_kind == *SITUATION_KIND_AIR {
81+
// if frame >= 22.0 && frame <= 35.0 {
82+
// if !VarModule::is_flag(boma.object(), vars::common::instance::SPECIAL_WALL_JUMP) {
83+
// if GroundModule::is_wall_touch_line(boma, *GROUND_TOUCH_FLAG_RIGHT_SIDE as u32) {
84+
// if boma.is_cat_flag(Cat1::TurnDash) {
85+
// VarModule::on_flag(boma.object(), vars::common::instance::SPECIAL_WALL_JUMP);
86+
// StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_WALL_JUMP, true);
87+
// VarModule::on_flag(fighter.battle_object, vars::common::instance::UP_SPECIAL_CANCEL);
88+
// }
89+
// }
90+
// if GroundModule::is_wall_touch_line(boma, *GROUND_TOUCH_FLAG_LEFT_SIDE as u32) {
91+
// if boma.is_cat_flag(Cat1::TurnDash) {
92+
// VarModule::on_flag(boma.object(), vars::common::instance::SPECIAL_WALL_JUMP);
93+
// StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_WALL_JUMP, true);
94+
// VarModule::on_flag(fighter.battle_object, vars::common::instance::UP_SPECIAL_CANCEL);
95+
// }
96+
// }
97+
// }
98+
// }
99+
// }
100+
// }
101+
// }
102+
111103
unsafe fn dspecial_cancels(boma: &mut BattleObjectModuleAccessor, status_kind: i32, situation_kind: i32, cat1: i32) {
112104
//PM-like down-b canceling
113105
if status_kind == *FIGHTER_STATUS_KIND_SPECIAL_LW {
@@ -174,7 +166,6 @@ unsafe fn galaxy_spin_rise(fighter: &mut L2CFighterCommon, boma: &mut BattleObje
174166
if frame >= 50.0 {
175167
smash::app::lua_bind::FighterKineticEnergyGravity::set_accel(fighter_gravity, -0.095);
176168
VarModule::on_flag(fighter.battle_object, vars::mario::instance::DISABLE_DSPECIAL_STALL);
177-
VarModule::on_flag(fighter.battle_object, vars::mario::instance::DISABLE_JUMPMAN_POWERS);
178169
}
179170
}
180171
}
@@ -186,14 +177,12 @@ unsafe fn galaxy_spin_rise(fighter: &mut L2CFighterCommon, boma: &mut BattleObje
186177
*FIGHTER_STATUS_KIND_DAMAGE_FLY_METEOR])
187178
&& StatusModule::prev_status_kind(boma, 0) == *FIGHTER_MARIO_STATUS_KIND_SPECIAL_LW_SHOOT {
188179
VarModule::on_flag(fighter.battle_object, vars::mario::instance::DISABLE_DSPECIAL_STALL);
189-
VarModule::on_flag(fighter.battle_object, vars::mario::instance::DISABLE_JUMPMAN_POWERS);
190180
}
191181
if fighter.is_situation(*SITUATION_KIND_GROUND)
192182
|| fighter.is_situation(*SITUATION_KIND_CLIFF)
193183
|| fighter.is_status_one_of(&[*FIGHTER_STATUS_KIND_REBIRTH, *FIGHTER_STATUS_KIND_DEAD])
194184
|| fighter.is_situation(*SITUATION_KIND_LADDER) {
195185
VarModule::off_flag(fighter.battle_object, vars::mario::instance::DISABLE_DSPECIAL_STALL);
196-
VarModule::off_flag(fighter.battle_object, vars::mario::instance::DISABLE_JUMPMAN_POWERS);
197186
}
198187
}
199188

@@ -292,7 +281,7 @@ unsafe fn fastfall_specials(fighter: &mut L2CFighterCommon) {
292281

293282
pub unsafe fn moveset(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectModuleAccessor, id: usize, cat: [i32 ; 4], status_kind: i32, situation_kind: i32, motion_kind: u64, stick_x: f32, stick_y: f32, facing: f32, frame: f32) {
294283
//dair_mash_rise(fighter, boma, id, motion_kind, situation_kind, frame);
295-
up_b_wall_jump(fighter, boma, id, status_kind, situation_kind, cat[0], frame);
284+
//up_b_wall_jump(fighter, boma, id, status_kind, situation_kind, cat[0], frame);
296285
dspecial_cancels(boma, status_kind, situation_kind, cat[0]);
297286
//double_fireball(fighter, boma);
298287
galaxy_spin_poc(fighter, boma, status_kind);

‎fighters/mario/src/status.rs

-10
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ use globals::*;
33

44
mod special_n;
55

6-
// Prevents downB from being used if upB walljump cancel has been used
7-
unsafe extern "C" fn should_use_special_lw_callback(fighter: &mut L2CFighterCommon) -> L2CValue {
8-
if fighter.is_situation(*SITUATION_KIND_AIR) && VarModule::is_flag(fighter.battle_object, vars::mario::instance::DISABLE_D_SPECIAL) {
9-
false.into()
10-
} else {
11-
true.into()
12-
}
13-
}
14-
156
unsafe extern "C" fn change_status_callback(fighter: &mut L2CFighterCommon) -> L2CValue {
167
// Reset cape stall flag on landing or ledgegrab
178
if [*SITUATION_KIND_GROUND, *SITUATION_KIND_CLIFF].contains(&fighter.global_table[SITUATION_KIND].get_i32())
@@ -25,7 +16,6 @@ unsafe extern "C" fn change_status_callback(fighter: &mut L2CFighterCommon) -> L
2516
fn mario_init(fighter: &mut L2CFighterCommon) {
2617
unsafe {
2718
if fighter.kind() == *FIGHTER_KIND_MARIO {
28-
fighter.global_table[globals::USE_SPECIAL_LW_CALLBACK].assign(&L2CValue::Ptr(should_use_special_lw_callback as *const () as _));
2919
fighter.global_table[globals::STATUS_CHANGE_CALLBACK].assign(&L2CValue::Ptr(change_status_callback as *const () as _));
3020
}
3121
}

0 commit comments

Comments
 (0)