diff --git a/fighters/kirby/src/status/mod.rs b/fighters/kirby/src/status/mod.rs index 937b988b58..4e65279257 100644 --- a/fighters/kirby/src/status/mod.rs +++ b/fighters/kirby/src/status/mod.rs @@ -175,7 +175,8 @@ pub unsafe extern "C" fn throw_kirby_map_correction(fighter: &mut L2CFighterComm /// Prevents side b from being used again in air when it has been disabled by up-b fall unsafe extern "C" fn ganon_should_use_special_n_callback(fighter: &mut L2CFighterCommon) -> L2CValue { - if fighter.is_situation(*SITUATION_KIND_AIR) && VarModule::is_flag(fighter.battle_object, vars::ganon::instance::DISABLE_SPECIAL_N) { + if WorkModule::get_int(fighter.module_accessor, *FIGHTER_KIRBY_INSTANCE_WORK_ID_INT_COPY_CHARA) == *FIGHTER_KIND_GANON + && fighter.is_situation(*SITUATION_KIND_AIR) && VarModule::is_flag(fighter.battle_object, vars::ganon::instance::DISABLE_SPECIAL_N) { false.into() } else { true.into() @@ -183,7 +184,8 @@ unsafe extern "C" fn ganon_should_use_special_n_callback(fighter: &mut L2CFighte } unsafe extern "C" fn trail_should_use_special_n_callback(fighter: &mut L2CFighterCommon) -> L2CValue { - if VarModule::is_flag(fighter.battle_object, vars::trail::instance::DISABLE_SPECIAL_N) { + if WorkModule::get_int(fighter.module_accessor, *FIGHTER_KIRBY_INSTANCE_WORK_ID_INT_COPY_CHARA) == *FIGHTER_KIND_TRAIL + && VarModule::is_flag(fighter.battle_object, vars::trail::instance::DISABLE_SPECIAL_N) { false.into() } else { true.into()