Skip to content

Commit f1f76a3

Browse files
authored
Merge pull request #2324 from zrksyd/rename-cracked-hashes
More confirmed hashes
2 parents 446a085 + afdd131 commit f1f76a3

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

fighters/demon/src/acmd/throws.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ unsafe extern "C" fn demon_throw_command_game(fighter: &mut L2CAgentBase) {
178178
if !WorkModule::is_flag(boma, *FIGHTER_DEMON_INSTANCE_WORK_ID_FLAG_DISABLE_THROW_MOTION_CAMERA) {
179179
if !WorkModule::is_flag(boma, *FIGHTER_INSTANCE_WORK_ID_FLAG_DISABLE_FINAL_START_CAMERA) {
180180
if is_excute(fighter) {
181-
REQ_MOTION_CAMERA(fighter, Hash40::new_raw(0x163d9703b0), false);
181+
REQ_MOTION_CAMERA(fighter, Hash40::new("e01throwcommand.nuanmb"), false);
182182
}
183183
}
184184
}

fighters/edge/src/status/special_n.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ unsafe extern "C" fn special_n_main_loop(fighter: &mut L2CFighterCommon) -> L2CV
3838
if cancel_start_frame > fighter.status_frame() {
3939
if fighter.is_situation(*SITUATION_KIND_AIR) {
4040
let mut speed_y = KineticModule::get_sum_speed_y(fighter.module_accessor, *KINETIC_ENERGY_RESERVE_ATTRIBUTE_MAIN);
41-
let unk1 = WorkModule::get_param_float(fighter.module_accessor, hash40("param_special_n"), 0x18ecc76f9d);
42-
if unk1 < speed_y {
43-
speed_y = unk1;
41+
let air_invoke_speed_y_limit = WorkModule::get_param_float(fighter.module_accessor, hash40("param_special_n"), hash40("air_invoke_speed_y_limit"));
42+
if air_invoke_speed_y_limit < speed_y {
43+
speed_y = air_invoke_speed_y_limit;
4444
}
4545
sv_kinetic_energy!(set_speed, fighter, FIGHTER_KINETIC_ENERGY_ID_GRAVITY, speed_y);
4646
}

fighters/kirby/src/status/edge_special_n.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ unsafe extern "C" fn special_n_main_loop(fighter: &mut L2CFighterCommon) -> L2CV
3838
if cancel_start_frame > fighter.status_frame() {
3939
if fighter.is_situation(*SITUATION_KIND_AIR) {
4040
let mut speed_y = KineticModule::get_sum_speed_y(fighter.module_accessor, *KINETIC_ENERGY_RESERVE_ATTRIBUTE_MAIN);
41-
let unk1 = WorkModule::get_param_float(fighter.module_accessor, hash40("param_special_n"), 0x18ecc76f9d);
42-
if unk1 < speed_y {
43-
speed_y = unk1;
41+
let air_invoke_speed_y_limit = WorkModule::get_param_float(fighter.module_accessor, hash40("param_special_n"), hash40("air_invoke_speed_y_limit"));
42+
if air_invoke_speed_y_limit < speed_y {
43+
speed_y = air_invoke_speed_y_limit;
4444
}
4545
sv_kinetic_energy!(set_speed, fighter, FIGHTER_KINETIC_ENERGY_ID_GRAVITY, speed_y);
4646
}

fighters/kirby/src/status/littlemac_special_n.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ unsafe extern "C" fn littlemac_special_n_end(fighter: &mut L2CFighterCommon) ->
135135
let kirb = fighter.battle_object.cast::<Fighter>();
136136
copy_ability_reset(kirb, false);
137137
EffectModule::req_on_joint(fighter.module_accessor, Hash40::new("kirby_star"), Hash40::new("top"), &Vector3f::zero(), &Vector3f::zero(), 1.0, &Vector3f::zero(), &Vector3f::zero(), false, 0, 0, 0);
138-
PLAY_SE(fighter, Hash40::new_raw(0x14cad4d75e));
138+
PLAY_SE(fighter, Hash40::new("se_kirby_special_n05"));
139139
return 0.into()
140140
}
141141

fighters/koopa/src/status/special_s.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ unsafe extern "C" fn specials_ejected(fighter: &mut L2CFighterCommon) {
250250
}
251251
else {
252252
WorkModule::on_flag(fighter.module_accessor,*FIGHTER_KOOPA_INSTANCE_WORK_ID_FLAG_THROW_NO_CHANGE);
253-
notify_event_msc_cmd!(fighter, Hash40::new_raw(0x31dbed6513), Hash40::new_raw(0xbefb89abe),Hash40::new_raw(0x7fb997a80));
253+
notify_event_msc_cmd!(fighter, Hash40::new_raw(0x31dbed6513), Hash40::new("koopa_dived"), Hash40::new("invalid"));
254254
}
255255
WorkModule::off_flag(fighter.module_accessor,*FIGHTER_KOOPA_STATUS_SPECIAL_S_FLAG_CAPTURE);
256256
}
@@ -335,7 +335,7 @@ unsafe extern "C" fn specials_landing_init(fighter: &mut L2CFighterCommon) -> L2
335335
//Unable energies
336336
if LinkModule::is_linked(fighter.module_accessor, *LINK_NO_CAPTURE){
337337
if VarModule::get_int(fighter.battle_object, vars::koopa::instance::SPECIAL_S_THROW_TYPE) == -2 {
338-
notify_event_msc_cmd!(fighter, Hash40::new_raw(0x329eb012b6), Hash40::new_raw(0xbefb89abe),Hash40::new_raw(0xbefb89abe));
338+
notify_event_msc_cmd!(fighter, Hash40::new_raw(0x329eb012b6), Hash40::new("koopa_dived"), Hash40::new("koopa_dived"));
339339
}
340340
}
341341
WorkModule::off_flag(fighter.module_accessor, *FIGHTER_KOOPA_STATUS_SPECIAL_S_FLAG_HIT);
@@ -457,7 +457,7 @@ unsafe extern "C" fn specials_landing_exec(fighter: &mut L2CFighterCommon) -> L2
457457
if WorkModule::is_flag(fighter.module_accessor, *FIGHTER_KOOPA_STATUS_SPECIAL_S_FLAG_HIT) {
458458
if WorkModule::is_flag(fighter.module_accessor, *FIGHTER_KOOPA_STATUS_SPECIAL_S_FLAG_CAPTURE) {
459459
let capture_id = LinkModule::get_node_object_id(fighter.module_accessor, *LINK_NO_CAPTURE);
460-
notify_event_msc_cmd!(fighter, Hash40::new_raw(0x31dbed6513), Hash40::new("throw"),Hash40::new_raw(0x7fb997a80));
460+
notify_event_msc_cmd!(fighter, Hash40::new_raw(0x31dbed6513), Hash40::new("throw"), Hash40::new("invalid"));
461461
if capture_id != 0x50000000 {
462462
AttackModule::hit_absolute_joint(fighter.module_accessor, *FIGHTER_ATTACK_ABSOLUTE_KIND_THROW,capture_id as u32,Hash40::new("throw"), 0, 0);
463463
}

fighters/mariod/src/acmd/specials.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ unsafe extern "C" fn mariod_special_s_game(fighter: &mut L2CAgentBase) {
129129
frame(lua_state, 12.0);
130130
if is_excute(fighter) {
131131
WorkModule::on_flag(boma, *FIGHTER_MARIOD_STATUS_SPECIAL_S_FLAG_SPECIAL_FALL);
132-
ATTACK(fighter, 0, 0, Hash40::new("top"), 12.0, 110, 100, 80, 0, 4.5, 0.0, 13.0, 8.0, Some(0.0), Some(1.0), Some(8.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 4, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new_raw(0x13c64f9fca), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MARIOD_MANT, *ATTACK_REGION_OBJECT);
133-
ATTACK(fighter, 1, 0, Hash40::new("top"), 12.0, 110, 100, 80, 0, 5.0, 0.0, 6.7, 5.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 4, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new_raw(0x13c64f9fca), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MARIOD_MANT, *ATTACK_REGION_OBJECT);
132+
ATTACK(fighter, 0, 0, Hash40::new("top"), 12.0, 110, 100, 80, 0, 4.5, 0.0, 13.0, 8.0, Some(0.0), Some(1.0), Some(8.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 4, 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_turn"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MARIOD_MANT, *ATTACK_REGION_OBJECT);
133+
ATTACK(fighter, 1, 0, Hash40::new("top"), 12.0, 110, 100, 80, 0, 5.0, 0.0, 6.7, 5.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 4, 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_turn"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MARIOD_MANT, *ATTACK_REGION_OBJECT);
134134
ATTACK(fighter, 2, 0, Hash40::new("top"), 0.0, 35, 100, 45, 0, 10, 0.0, 8.0, 8.0, Some(0.0), Some(8.0), Some(13.0), 0.0, 0.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, true, true, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_OBJECT);
135135
}
136136
frame(lua_state, 15.0);
@@ -209,8 +209,8 @@ unsafe extern "C" fn mariod_special_air_s_game(fighter: &mut L2CAgentBase) {
209209
WorkModule::on_flag(boma, *FIGHTER_MARIOD_STATUS_SPECIAL_S_FLAG_SPECIAL_FALL);
210210
VarModule::on_flag(fighter.battle_object, vars::mariod::instance::SPECIAL_S_DISABLE_STALL);
211211
}
212-
ATTACK(fighter, 0, 0, Hash40::new("top"), 12.0, 110, 100, 80, 0, 4.5, 0.0, 13.0, 8.0, Some(0.0), Some(1.0), Some(8.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 4, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new_raw(0x13c64f9fca), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MARIOD_MANT, *ATTACK_REGION_OBJECT);
213-
ATTACK(fighter, 1, 0, Hash40::new("top"), 12.0, 110, 100, 80, 0, 5.0, 0.0, 6.7, 5.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 4, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new_raw(0x13c64f9fca), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MARIOD_MANT, *ATTACK_REGION_OBJECT);
212+
ATTACK(fighter, 0, 0, Hash40::new("top"), 12.0, 110, 100, 80, 0, 4.5, 0.0, 13.0, 8.0, Some(0.0), Some(1.0), Some(8.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 4, 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_turn"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MARIOD_MANT, *ATTACK_REGION_OBJECT);
213+
ATTACK(fighter, 1, 0, Hash40::new("top"), 12.0, 110, 100, 80, 0, 5.0, 0.0, 6.7, 5.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 4, 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_turn"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_MARIOD_MANT, *ATTACK_REGION_OBJECT);
214214
ATTACK(fighter, 2, 0, Hash40::new("top"), 0.0, 35, 100, 45, 0, 10, 0.0, 8.0, 8.0, Some(0.0), Some(8.0), Some(13.0), 0.0, 0.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, true, true, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_normal"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_NONE, *ATTACK_REGION_OBJECT);
215215
}
216216
frame(lua_state, 15.0);

fighters/pikmin/src/status/attack_air.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ unsafe extern "C" fn pikmin_attack_air_handle_pikmin(fighter: &mut L2CFighterCom
9292
let mut link_event = FighterPikminLinkEventWeaponPikminConstraint__new_l2c_table();
9393
link_event["link_event_kind_"].assign(&L2CValue::Hash40(Hash40::new("fighter_pikmin_link_event_weapon_pikmin_constraint")));
9494
link_event[0xf2a5bf2beu64].assign(&L2CValue::Hash40(Hash40::new("top")));
95-
link_event[0x92820810du64].assign(&L2CValue::Hash40(Hash40::new("top")));
95+
link_event["joint_id_"].assign(&L2CValue::Hash40(Hash40::new("top")));
9696
let object_id = fighter.global_table[OBJECT_ID].get_u32();
9797
link_event[0xaa79e68a2u64].assign(&L2CValue::U32(object_id));
9898
link_event_store_l2c_table(fighter, FIGHTER_PIKMIN_LINK_NO_PIKMIN.into(), link_event);

fighters/pit/src/acmd/specials.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ unsafe extern "C" fn pit_special_lw_start_effect(fighter: &mut L2CAgentBase) {
121121
let facing = PostureModule::lr(boma);
122122
let rot1 = if facing > 0.0 { 240 } else { 300 };
123123
let rot2 = if facing > 0.0 { 120 } else { 60 };
124-
EFFECT_FOLLOW(fighter, Hash40::new("pit_guardian_shield"), Hash40::new_raw(0x10489b2b69), 2.0 * facing, 1, 0, 0, rot1, 0, 1.5, true);
125-
EFFECT_FOLLOW(fighter, Hash40::new("pit_guardian_shield"), Hash40::new_raw(0x104ff6ef70), 2.0 * facing, 1, 0, 0, rot2, 0, 1.5, true);
124+
EFFECT_FOLLOW(fighter, Hash40::new("pit_guardian_shield"), Hash40::new("virtualguardianf"), 2.0 * facing, 1, 0, 0, rot1, 0, 1.5, true);
125+
EFFECT_FOLLOW(fighter, Hash40::new("pit_guardian_shield"), Hash40::new("virtualguardianb"), 2.0 * facing, 1, 0, 0, rot2, 0, 1.5, true);
126126
if fighter.is_situation(*SITUATION_KIND_GROUND) {
127127
LANDING_EFFECT(fighter, Hash40::new("sys_landing_smoke"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 0.85, 0, 0, 0, 0, 0, 0, false);
128128
}
@@ -136,8 +136,8 @@ unsafe extern "C" fn pit_special_lw_end_effect(fighter: &mut L2CAgentBase) {
136136
let facing = PostureModule::lr(boma);
137137
let rot1 = if facing > 0.0 { 240 } else { 300 };
138138
let rot2 = if facing > 0.0 { 120 } else { 60 };
139-
EFFECT(fighter, Hash40::new("pit_guardian_shield_end"), Hash40::new_raw(0x10489b2b69), 2.0 * facing, 1, 0, 0, rot1, 0, 1.3, 0, 0, 0, 0, 0, 0, true);
140-
EFFECT(fighter, Hash40::new("pit_guardian_shield_end"), Hash40::new_raw(0x104ff6ef70), 2.0 * facing, 1, 0, 0, rot2, 0, 1.3, 0, 0, 0, 0, 0, 0, true);
139+
EFFECT(fighter, Hash40::new("pit_guardian_shield_end"), Hash40::new("virtualguardianf"), 2.0 * facing, 1, 0, 0, rot1, 0, 1.3, 0, 0, 0, 0, 0, 0, true);
140+
EFFECT(fighter, Hash40::new("pit_guardian_shield_end"), Hash40::new("virtualguardianb"), 2.0 * facing, 1, 0, 0, rot2, 0, 1.3, 0, 0, 0, 0, 0, 0, true);
141141
}
142142
frame(lua_state, 3.0);
143143
if is_excute(fighter) {

fighters/pitb/src/acmd/specials.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ unsafe extern "C" fn pitb_special_lw_start_effect(fighter: &mut L2CAgentBase) {
134134
let facing = PostureModule::lr(boma);
135135
let rot1 = if facing > 0.0 { 240 } else { 300 };
136136
let rot2 = if facing > 0.0 { 120 } else { 60 };
137-
EFFECT_FOLLOW(fighter, Hash40::new("pitb_guardian_shield"), Hash40::new_raw(0x10489b2b69), 2.0 * facing, 3, -2, 0, rot1, 0, 1.3, true);
138-
EFFECT_FOLLOW(fighter, Hash40::new("pitb_guardian_shield"), Hash40::new_raw(0x104ff6ef70), 2.0 * facing, 3, 2, 0, rot2, 0, 1.3, true);
137+
EFFECT_FOLLOW(fighter, Hash40::new("pitb_guardian_shield"), Hash40::new("virtualguardianf"), 2.0 * facing, 3, -2, 0, rot1, 0, 1.3, true);
138+
EFFECT_FOLLOW(fighter, Hash40::new("pitb_guardian_shield"), Hash40::new("virtualguardianb"), 2.0 * facing, 3, 2, 0, rot2, 0, 1.3, true);
139139
if fighter.is_situation(*SITUATION_KIND_GROUND) {
140140
LANDING_EFFECT(fighter, Hash40::new("sys_landing_smoke"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 0.85, 0, 0, 0, 0, 0, 0, false);
141141
}

fighters/roy/src/acmd/specials.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -983,9 +983,9 @@ unsafe extern "C" fn game_speciallwhit(fighter: &mut L2CAgentBase) {
983983
AttackModule::set_force_reaction(boma, 1, true, false);
984984
AttackModule::set_force_reaction(boma, 2, true, false);
985985
if WorkModule::is_flag(boma, *FIGHTER_ROY_STATUS_SPECIAL_LW_FLAG_SPECIAL_EFFECT) {
986-
AttackModule::set_optional_hit_sound(boma, 0, smash::phx::Hash40::new_raw(0x12813fe196));
987-
AttackModule::set_optional_hit_sound(boma, 1, smash::phx::Hash40::new_raw(0x12813fe196));
988-
AttackModule::set_optional_hit_sound(boma, 2, smash::phx::Hash40::new_raw(0x12813fe196));
986+
AttackModule::set_optional_hit_sound(boma, 0, smash::phx::Hash40::new("se_roy_criticalhit"));
987+
AttackModule::set_optional_hit_sound(boma, 1, smash::phx::Hash40::new("se_roy_criticalhit"));
988+
AttackModule::set_optional_hit_sound(boma, 2, smash::phx::Hash40::new("se_roy_criticalhit"));
989989
}
990990
}
991991
frame(lua_state, 7.0);

0 commit comments

Comments
 (0)