NokNok it's Mario (Gone)

Author: WuBoytH

dynamic/src/consts.rs

@@ -816,9 +816,8 @@ pub mod vars {
     pub mod mario {
         pub mod instance {
             // flags
-            pub const NOKNOK_SHELL: i32 = 0x0100;
-            pub const DISABLE_DSPECIAL_STALL: i32 = 0x0101;
-            pub const SPECIAL_S_DISABLE_STALL: i32 = 0x0102;
+            pub const DISABLE_DSPECIAL_STALL: i32 = 0x0100;
+            pub const SPECIAL_S_DISABLE_STALL: i32 = 0x0101;
         }
 
         pub mod status {

fighters/mario/src/acmd/other.rs

@@ -116,38 +116,6 @@ unsafe extern "C" fn damageflytop_sound(fighter: &mut L2CAgentBase) {
     }
 }
 
-unsafe extern "C" fn mario_utauntr(fighter: &mut L2CAgentBase) {
-    let lua_state = fighter.lua_state_agent;
-    let boma = fighter.boma();
-    frame(lua_state, 7.0);
-    if is_excute(fighter) {
-        if  !VarModule::is_flag(fighter.battle_object, vars::mario::instance::NOKNOK_SHELL) {
-            if ControlModule::check_button_on(boma, *CONTROL_PAD_BUTTON_SPECIAL) || ControlModule::check_button_on(boma, *CONTROL_PAD_BUTTON_SPECIAL_RAW) {
-                ItemModule::have_item(boma, app::ItemKind(*ITEM_KIND_GREENSHELL), 0, 0, false, false);
-                VarModule::on_flag(fighter.battle_object, vars::mario::instance::NOKNOK_SHELL);
-                VarModule::set_int(fighter.battle_object, vars::common::instance::GIMMICK_TIMER, 1);
-            }
-        }
-    }
-
-}
-
-unsafe extern "C" fn mario_utauntl(fighter: &mut L2CAgentBase) {
-    let lua_state = fighter.lua_state_agent;
-    let boma = fighter.boma();
-    frame(lua_state, 7.0);
-    if is_excute(fighter) {
-        if  !VarModule::is_flag(fighter.battle_object, vars::mario::instance::NOKNOK_SHELL) {
-            if ControlModule::check_button_on(boma, *CONTROL_PAD_BUTTON_SPECIAL) || ControlModule::check_button_on(boma, *CONTROL_PAD_BUTTON_SPECIAL_RAW) {
-                ItemModule::have_item(boma, app::ItemKind(*ITEM_KIND_GREENSHELL), 0, 0, false, false);
-                VarModule::on_flag(fighter.battle_object, vars::mario::instance::NOKNOK_SHELL);
-                VarModule::set_int(fighter.battle_object, vars::common::instance::GIMMICK_TIMER, 1);
-            }
-        }
-    }
-
-}
-
 unsafe extern "C" fn dash_game(fighter: &mut L2CAgentBase) {
     let lua_state = fighter.lua_state_agent;
     let boma = fighter.boma();
@@ -371,8 +339,6 @@ pub fn install() {
         .sound_acmd("sound_damageflyn", damageflyn_sound)
         .sound_acmd("sound_damageflyroll", damageflyroll_sound)
         .sound_acmd("sound_damageflytop", damageflytop_sound)
-        .game_acmd("game_appealhir", mario_utauntr)
-        .game_acmd("game_appealhil", mario_utauntl)
         .game_acmd("game_dash", dash_game)
         .sound_acmd("sound_dash", dash_sound)
         .game_acmd("game_turndash", turn_dash_game)

fighters/mario/src/opff.rs

@@ -212,43 +212,6 @@ extern "Rust" {
     fn gimmick_flash(boma: &mut BattleObjectModuleAccessor);
 }
 
-// NokNok Shell Timer Count
-unsafe fn noknok_timer(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectModuleAccessor, id: usize) {
-    let gimmick_timerr = VarModule::get_int(fighter.battle_object, vars::common::instance::GIMMICK_TIMER);
-    if gimmick_timerr > 0 && gimmick_timerr < 1801 {
-        if gimmick_timerr > 1799 {
-            VarModule::off_flag(boma.object(), vars::mario::instance::NOKNOK_SHELL);
-            VarModule::set_int(fighter.battle_object, vars::common::instance::GIMMICK_TIMER, 0);
-            gimmick_flash(boma);
-        } else {
-            VarModule::set_int(fighter.battle_object, vars::common::instance::GIMMICK_TIMER, gimmick_timerr + 1);
-        }
-    }
-}
-
-// NokNok shell flag reset
-unsafe fn noknok_reset(fighter: &mut L2CFighterCommon, id: usize, status_kind: i32) {
-    if VarModule::is_flag(fighter.battle_object, vars::mario::instance::NOKNOK_SHELL) {
-        if [*FIGHTER_STATUS_KIND_DEAD,
-            *FIGHTER_STATUS_KIND_REBIRTH,
-            *FIGHTER_STATUS_KIND_WIN,
-            *FIGHTER_STATUS_KIND_LOSE,
-            *FIGHTER_STATUS_KIND_ENTRY].contains(&status_kind) {
-                VarModule::off_flag(fighter.battle_object, vars::mario::instance::NOKNOK_SHELL);
-        }
-    }
-}
-
-// TRAINING MODE
-// NokNok shell flag reset via taunt
-unsafe fn noknok_training(fighter: &mut L2CFighterCommon, id: usize, status_kind: i32) {
-    if is_training_mode() {
-        if status_kind == *FIGHTER_STATUS_KIND_APPEAL {
-            VarModule::off_flag(fighter.battle_object, vars::mario::instance::NOKNOK_SHELL);
-        }
-    }
-}
-
 unsafe fn fastfall_specials(fighter: &mut L2CFighterCommon) {
     if !fighter.is_in_hitlag()
     && !StatusModule::is_changing(fighter.module_accessor)
@@ -287,9 +250,6 @@ pub unsafe fn moveset(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectMod
     galaxy_spin_poc(fighter, boma, status_kind);
     galaxy_spin_rise(fighter, boma, status_kind, motion_kind, situation_kind, frame);
     galaxy_spin_move(fighter, boma, status_kind, motion_kind, situation_kind, frame, stick_x, facing);
-    noknok_timer(fighter, boma, id);
-    noknok_reset(fighter, id, status_kind);
-    noknok_training(fighter, id, status_kind);
     fastfall_specials(fighter);
 }