Warnings Fixes

Author: WuBoytH

dynamic/src/ext.rs

@@ -909,7 +909,7 @@ impl BomaExt for BattleObjectModuleAccessor {
 
     unsafe fn handle_waveland(&mut self, require_airdodge: bool) -> bool {
         // MotionModule::frame(self) > 5.0 && !WorkModule::is_flag(self, *FIGHTER_STATUS_ESCAPE_FLAG_HIT_XLU);
-        if (require_airdodge && !self.is_status_one_of(&[*FIGHTER_STATUS_KIND_ESCAPE_AIR, *FIGHTER_STATUS_KIND_ESCAPE_AIR_SLIDE])) {
+        if require_airdodge && !self.is_status_one_of(&[*FIGHTER_STATUS_KIND_ESCAPE_AIR, *FIGHTER_STATUS_KIND_ESCAPE_AIR_SLIDE]) {
             return false;
         }
 
@@ -1128,8 +1128,8 @@ impl BomaExt for BattleObjectModuleAccessor {
         //let p2_x = -9.6;
         //let p2_y = 9.0;
 
-        self.set_front_cliff_hangdata(p1_x, (p1_y - p2_y));
-        self.set_back_cliff_hangdata((p2_x * -1.0), (p1_y - p2_y));
+        self.set_front_cliff_hangdata(p1_x, p1_y - p2_y);
+        self.set_back_cliff_hangdata(p2_x * -1.0, p1_y - p2_y);
         self.set_center_cliff_hangdata(0.0, p2_y);
     }
 
@@ -1406,6 +1406,7 @@ pub struct ControllerMapping {
 }
 
 /// Controller class used internally by the game
+#[allow(non_snake_case)]
 #[repr(C)]
 pub struct Controller {
     pub vtable: *const u64,

dynamic/src/frame_info.rs

@@ -1,21 +1,10 @@
 use smash::{
-  app::{
-      self,
-      sv_animcmd::{
-          frame,
-          wait
-      },
-      lua_bind::*
-  },
+  app::lua_bind::*,
   lib::lua_const::*,
   lib::L2CAgent,
   lua2cpp::*,
   phx::*
 };
-use smash_script::{
-  *,
-  macros::*
-};
 use crate::{
   *,
   consts::*,

dynamic/src/ui.rs

@@ -54,6 +54,7 @@ extern "C" {
     fn ui_manager_set_robot_meter_info(entry_id: u32, current: f32, max: f32, per_level: f32);
 }
 
+#[allow(non_snake_case)]
 pub mod UiManager {
     pub fn set_dk_barrel_enable(entry_id: u32, enable: bool) {
         unsafe {

dynamic/src/util.rs

@@ -2,9 +2,9 @@ use smash::app::{BattleObject, BattleObjectModuleAccessor};
 use smash::lua2cpp::L2CFighterCommon;
 use crate::offsets;
 use crate::ext::*;
-use std::arch::asm;
+// use std::arch::asm;
 use smash::phx::Vector2f;
-use crate::se;
+// use crate::se;
 
 #[macro_export]
 macro_rules! dump_trace {
@@ -168,7 +168,7 @@ pub fn get_active_battle_object_id_from_entry_id(entry_id: u32) -> Option<u32> {
 pub unsafe fn get_all_active_battle_object_ids() -> Vec<u32> {
     use smash::lib::lua_const::*;
     use smash::app::lua_bind::*;
-    use super::ext::*;
+    // use super::ext::*;
     let mut vec: Vec<u32> = Vec::new();
     for entry_id in 0..8 {
         // get the active battle object id and add it to the list
@@ -253,8 +253,8 @@ struct SomeControllerStruct {
 pub unsafe fn get_controller_from_id(player: usize) -> &'static Controller {
     let base = *((skyline::hooks::getRegionAddress(skyline::hooks::Region::Text) as *mut u8)
         .add(0x5339860) as *const u64);
-    let uVar3 = *((base + 0x298 + (4 * (player as u64))) as *const u32);
-    let controller_struct = ((base + (0x8 * (uVar3 as i32)) as u64) as *mut SomeControllerStruct);
+    let uvar3 = *((base + 0x298 + (4 * (player as u64))) as *const u32);
+    let controller_struct = (base + (0x8 * (uvar3 as i32)) as u64) as *mut SomeControllerStruct;
     (*controller_struct).controller
 }
 

fighters/bayonetta/src/status/specialairs.rs

@@ -132,20 +132,20 @@ unsafe extern "C" fn bullet_movement(fighter: &mut L2CFighterCommon) -> L2CValue
                 let y_reset = fighter.get_float(*FIGHTER_BAYONETTA_STATUS_WORK_ID_SPECIAL_AIR_S_U_FLOAT_MOTION_SPEED_Y);
                 let initial_x = fighter.get_param_float("param_special_s", "ab_u_shooting_speed_x_mul");
                 let initial_y = fighter.get_param_float("param_special_s", "ab_u_shooting_speed_y_mul");
-                let mut stop_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_STOP) as *mut KineticEnergy; //272
-                let mut gravity_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_GRAVITY) as *mut KineticEnergy; //288
-                let mut motion_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_MOTION) as *mut KineticEnergy;
+                let mut stop_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_STOP) as *mut app::KineticEnergy; //272
+                let mut gravity_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_GRAVITY) as *mut app::KineticEnergy; //288
+                let mut motion_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_MOTION) as *mut app::KineticEnergy;
                 //motion to stop energy
-                app::lua_bind::KineticEnergy::reset_energy(stop_energy as _, *ENERGY_STOP_RESET_TYPE_AIR, &Vector2f { x: x_reset * initial_x, y: 0.0 }, &Vector3f::zero(), fighter.module_accessor);
-                lua_bind::KineticEnergyNormal::set_accel(stop_energy as *mut smash::app::KineticEnergyNormal, &Vector2f { x: 0.0, y: 0.0 });
-                lua_bind::KineticEnergyNormal::set_brake(stop_energy as *mut smash::app::KineticEnergyNormal, &Vector2f { x: fighter.get_param_float("param_special_s", "ab_u_shooting_brake_speed_x"), y: 0.0 });
-                lua_bind::KineticEnergyNormal::set_stable_speed(stop_energy as *mut smash::app::KineticEnergyNormal, &Vector2f { x: fighter.get_param_float("param_special_s", "ab_u_shooting_stable_speed_x"), y: 0.0 });
-                lua_bind::KineticEnergyNormal::set_limit_speed(stop_energy as *mut smash::app::KineticEnergyNormal, &Vector2f { x: -1.0, y: -1.0 });
+                lua_bind::KineticEnergy::reset_energy(stop_energy as _, *ENERGY_STOP_RESET_TYPE_AIR, &Vector2f { x: x_reset * initial_x, y: 0.0 }, &Vector3f::zero(), fighter.module_accessor);
+                lua_bind::KineticEnergyNormal::set_accel(stop_energy as *mut app::KineticEnergyNormal, &Vector2f { x: 0.0, y: 0.0 });
+                lua_bind::KineticEnergyNormal::set_brake(stop_energy as *mut app::KineticEnergyNormal, &Vector2f { x: fighter.get_param_float("param_special_s", "ab_u_shooting_brake_speed_x"), y: 0.0 });
+                lua_bind::KineticEnergyNormal::set_stable_speed(stop_energy as *mut app::KineticEnergyNormal, &Vector2f { x: fighter.get_param_float("param_special_s", "ab_u_shooting_stable_speed_x"), y: 0.0 });
+                lua_bind::KineticEnergyNormal::set_limit_speed(stop_energy as *mut app::KineticEnergyNormal, &Vector2f { x: -1.0, y: -1.0 });
                 KineticModule::enable_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_STOP);
                 //motion to gravity
-                app::lua_bind::KineticEnergy::reset_energy(gravity_energy as _, *ENERGY_GRAVITY_RESET_TYPE_GRAVITY, &Vector2f { x: 0.0, y: initial_y }, &Vector3f::zero(), fighter.module_accessor);
-                smash::app::lua_bind::FighterKineticEnergyGravity::set_accel(gravity_energy as *mut FighterKineticEnergyGravity, -fighter.get_param_float("param_special_s", "ab_u_shooting_accel_y"));
-                smash::app::lua_bind::FighterKineticEnergyGravity::set_stable_speed(gravity_energy as *mut FighterKineticEnergyGravity, fighter.get_param_float("param_special_s", "ab_u_shooting_max_speed_y"));
+                lua_bind::KineticEnergy::reset_energy(gravity_energy as _, *ENERGY_GRAVITY_RESET_TYPE_GRAVITY, &Vector2f { x: 0.0, y: initial_y }, &Vector3f::zero(), fighter.module_accessor);
+                lua_bind::FighterKineticEnergyGravity::set_accel(gravity_energy as *mut app::FighterKineticEnergyGravity, -fighter.get_param_float("param_special_s", "ab_u_shooting_accel_y"));
+                lua_bind::FighterKineticEnergyGravity::set_stable_speed(gravity_energy as *mut app::FighterKineticEnergyGravity, fighter.get_param_float("param_special_s", "ab_u_shooting_max_speed_y"));
                 KineticModule::enable_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_GRAVITY);
                 KineticModule::unable_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_MOTION);
                 fighter.off_flag(*FIGHTER_BAYONETTA_STATUS_WORK_ID_SPECIAL_AIR_S_FLAG_WALL_CHECK);
@@ -161,7 +161,7 @@ unsafe extern "C" fn bullet_movement(fighter: &mut L2CFighterCommon) -> L2CValue
         }
     } else if fighter.get_int(*FIGHTER_BAYONETTA_STATUS_WORK_ID_SPECIAL_AIR_S_U_INT_STEP) == *FIGHTER_BAYONETTA_SHOOTING_STEP_SHOOTING { //shooting 
         if fighter.get_int(*FIGHTER_BAYONETTA_INSTANCE_WORK_ID_INT_SHOOTING_STEP) != *FIGHTER_BAYONETTA_SHOOTING_STEP_SHOOTING {
-            let stop_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_STOP) as *mut KineticEnergy;
+            let stop_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_STOP) as *mut app::KineticEnergy;
             let speed = Vector2f{
                 x: lua_bind::KineticEnergy::get_speed_x(stop_energy),
                 y: lua_bind::KineticEnergy::get_speed_y(stop_energy)

fighters/chrom/src/opff.rs

@@ -181,10 +181,10 @@ unsafe fn soaring_slash(fighter: &mut L2CFighterCommon) {
 }
 
 pub unsafe fn double_edge_dance_vertical_momentum(fighter: &mut L2CFighterCommon){
-    let fighter_gravity = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_GRAVITY) as *mut FighterKineticEnergyGravity;
+    let fighter_gravity = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_GRAVITY) as *mut app::FighterKineticEnergyGravity;
     if fighter.is_status_one_of(&[*FIGHTER_STATUS_KIND_SPECIAL_S, *FIGHTER_ROY_STATUS_KIND_SPECIAL_S2]) && fighter.is_situation(*SITUATION_KIND_AIR) {
-        smash::app::lua_bind::FighterKineticEnergyGravity::set_accel(fighter_gravity, -0.072);
-        smash::app::lua_bind::FighterKineticEnergyGravity::set_stable_speed(fighter_gravity, -2.0);
+        lua_bind::FighterKineticEnergyGravity::set_accel(fighter_gravity, -0.072);
+        lua_bind::FighterKineticEnergyGravity::set_stable_speed(fighter_gravity, -2.0);
     }
 
     if fighter.is_situation(*SITUATION_KIND_GROUND) && VarModule::is_flag(fighter.battle_object, vars::common::instance::SPECIAL_STALL_USED) {

fighters/chrom/src/status.rs

@@ -3,7 +3,7 @@ use globals::*;
 // status script import
 
 
-pub fn set_gravity_delay_resume_frame(energy: *mut FighterKineticEnergyGravity, frames: i32) {
+pub fn set_gravity_delay_resume_frame(energy: *mut app::FighterKineticEnergyGravity, frames: i32) {
     unsafe {
       *(energy as *mut i32).add(0x50 / 4) = frames;
       *(energy as *mut bool).add(0x5C) = false;
@@ -15,9 +15,9 @@ pub unsafe extern "C" fn special_s_init(fighter: &mut L2CFighterCommon) -> L2CVa
     let customize_special_hi_no = WorkModule::get_int(fighter.module_accessor, *FIGHTER_INSTANCE_WORK_ID_INT_CUSTOMIZE_SPECIAL_HI_NO);
     let start_spd_x_mul = WorkModule::get_param_float(fighter.module_accessor, hash40("param_special_s"), hash40("start_spd_x_mul"));
     let air_spd_y = WorkModule::get_param_float(fighter.module_accessor, hash40("param_special_s"), hash40("air_spd_y"));
-    let mut stop_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_STOP) as *mut KineticEnergy;
-    let mut gravity_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_GRAVITY) as *mut KineticEnergy;
-    let mut motion_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_MOTION) as *mut KineticEnergy;
+    let mut stop_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_STOP) as *mut app::KineticEnergy;
+    let mut gravity_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_GRAVITY) as *mut app::KineticEnergy;
+    let mut motion_energy = KineticModule::get_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_MOTION) as *mut app::KineticEnergy;
 
     let mut aerial_y_speed = 0.0;
     let mut aerial_x_speed = KineticModule::get_sum_speed_x(fighter.module_accessor, *KINETIC_ENERGY_RESERVE_ATTRIBUTE_MAIN) * start_spd_x_mul;
@@ -36,8 +36,8 @@ pub unsafe extern "C" fn special_s_init(fighter: &mut L2CFighterCommon) -> L2CVa
     // alStack208 = motion energy
     if [*FIGHTER_STATUS_KIND_SPECIAL_S, *FIGHTER_ROY_STATUS_KIND_SPECIAL_S2].contains(&current_status_kind) {
         if current_situation_kind == *SITUATION_KIND_GROUND {
-            let reset_speed_2f = smash::phx::Vector2f { x: 0.0, y: 0.0 };
-            let reset_speed_3f = smash::phx::Vector3f { x: 0.0, y: 0.0, z: 0.0 };
+            let reset_speed_2f = Vector2f { x: 0.0, y: 0.0 };
+            let reset_speed_3f = Vector3f { x: 0.0, y: 0.0, z: 0.0 };
             smash::app::lua_bind::KineticEnergy::reset_energy(motion_energy, *ENERGY_MOTION_RESET_TYPE_GROUND_TRANS_IGNORE_NORMAL, &reset_speed_2f, &reset_speed_3f, fighter.module_accessor);
             smash::app::lua_bind::KineticEnergy::enable(motion_energy);
             smash::app::lua_bind::KineticModule::unable_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_STOP);
@@ -52,9 +52,9 @@ pub unsafe extern "C" fn special_s_init(fighter: &mut L2CFighterCommon) -> L2CVa
             else{
                 aerial_y_speed = 0.0;
             }
-            let reset_speed_2f = smash::phx::Vector2f { x: aerial_x_speed, y: 0.0 };
-            let reset_speed_gravity_2f = smash::phx::Vector2f { x: 0.0, y: aerial_y_speed };
-            let reset_speed_3f = smash::phx::Vector3f { x: 0.0, y: 0.0, z: 0.0 };
+            let reset_speed_2f = Vector2f { x: aerial_x_speed, y: 0.0 };
+            let reset_speed_gravity_2f = Vector2f { x: 0.0, y: aerial_y_speed };
+            let reset_speed_3f = Vector3f { x: 0.0, y: 0.0, z: 0.0 };
             smash::app::lua_bind::KineticEnergy::reset_energy(stop_energy, *ENERGY_STOP_RESET_TYPE_AIR, &reset_speed_2f, &reset_speed_3f, fighter.module_accessor);
             smash::app::lua_bind::KineticEnergy::reset_energy(gravity_energy, *ENERGY_GRAVITY_RESET_TYPE_GRAVITY, &reset_speed_gravity_2f, &reset_speed_3f, fighter.module_accessor);
             smash::app::lua_bind::KineticEnergy::enable(stop_energy);
@@ -64,16 +64,16 @@ pub unsafe extern "C" fn special_s_init(fighter: &mut L2CFighterCommon) -> L2CVa
     }
     if [*FIGHTER_ROY_STATUS_KIND_SPECIAL_S3, *FIGHTER_ROY_STATUS_KIND_SPECIAL_S4].contains(&current_status_kind) {
         if current_situation_kind == *SITUATION_KIND_GROUND {
-            let reset_speed_2f = smash::phx::Vector2f { x: 0.0, y: 0.0 };
-            let reset_speed_3f = smash::phx::Vector3f { x: 0.0, y: 0.0, z: 0.0 };
+            let reset_speed_2f = Vector2f { x: 0.0, y: 0.0 };
+            let reset_speed_3f = Vector3f { x: 0.0, y: 0.0, z: 0.0 };
             smash::app::lua_bind::KineticEnergy::reset_energy(motion_energy, *ENERGY_MOTION_RESET_TYPE_GROUND_TRANS_IGNORE_NORMAL, &reset_speed_2f, &reset_speed_3f, fighter.module_accessor);
             smash::app::lua_bind::KineticEnergy::enable(motion_energy);
             smash::app::lua_bind::KineticModule::unable_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_STOP);
             smash::app::lua_bind::KineticModule::unable_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_GRAVITY);
         }
         else if current_situation_kind == *SITUATION_KIND_AIR {
-            let reset_speed_2f = smash::phx::Vector2f { x: 0.0, y: 0.0 };
-            let reset_speed_3f = smash::phx::Vector3f { x: 0.0, y: 0.0, z: 0.0 };
+            let reset_speed_2f = Vector2f { x: 0.0, y: 0.0 };
+            let reset_speed_3f = Vector3f { x: 0.0, y: 0.0, z: 0.0 };
             smash::app::lua_bind::KineticEnergy::reset_energy(stop_energy, *ENERGY_STOP_RESET_TYPE_AIR, &reset_speed_2f, &reset_speed_3f, fighter.module_accessor);
             smash::app::lua_bind::KineticEnergy::reset_energy(gravity_energy, *ENERGY_GRAVITY_RESET_TYPE_GRAVITY, &reset_speed_2f, &reset_speed_3f, fighter.module_accessor);
             smash::app::lua_bind::KineticEnergy::enable(stop_energy);

fighters/common/src/function_hooks/aura.rs

@@ -109,10 +109,10 @@ pub unsafe extern "C" fn lucario_set_effect_scale(vtable: u64, fighter: &mut Fig
         let right = WorkModule::get_int(module_accessor, *FIGHTER_LUCARIO_INSTANCE_WORK_ID_INT_EF_ID_RHADOU) as u32;
         let scale = 0.0;
         if left != 0 {
-            EffectModule::set_scale(module_accessor, left, &smash::phx::Vector3f{x: scale, y: scale, z: scale});
+            EffectModule::set_scale(module_accessor, left, &Vector3f{x: scale, y: scale, z: scale});
         }
         if right != 0 {
-            EffectModule::set_scale(module_accessor, right, &smash::phx::Vector3f{x: scale, y: scale, z: scale});
+            EffectModule::set_scale(module_accessor, right, &Vector3f{x: scale, y: scale, z: scale});
         }
     }
 }

fighters/common/src/function_hooks/collision.rs

@@ -145,7 +145,7 @@ unsafe fn groundcollision__processgroundcollisioninfo_check_landing(groundcollis
 }
 // Sets GroundCollisionLine
 #[skyline::hook(offset = 0x52d920)]
-unsafe fn groundcollision__processgroundcollisioninfo_check_landing_sub(groundcollision: u64, arg2: *mut u64, prev_ecb_bottom_pos: *mut smash::phx::Vector2f, ecb_bottom_translation: *mut smash::phx::Vector2f, arg5: u64, arg6: u64, arg7: *mut u64) -> *mut GroundCollisionLine {
+unsafe fn groundcollision__processgroundcollisioninfo_check_landing_sub(groundcollision: u64, arg2: *mut u64, prev_ecb_bottom_pos: *mut Vector2f, ecb_bottom_translation: *mut Vector2f, arg5: u64, arg6: u64, arg7: *mut u64) -> *mut GroundCollisionLine {
     if *((groundcollision + 0x39f) as *mut bool) {
         // Ignore ground collision
         return 0 as *mut GroundCollisionLine;

fighters/common/src/function_hooks/effect.rs

@@ -326,7 +326,7 @@ unsafe fn DOWN_EFFECT_hook(lua_state: u64) {
 }
 
 #[skyline::hook(replace=EffectModule::req_on_joint)]
-unsafe fn req_on_joint_hook(boma: &mut BattleObjectModuleAccessor, effHash: smash::phx::Hash40, boneHash: smash::phx::Hash40, pos: &smash::phx::Vector3f, rot: &smash::phx::Vector3f, size: f32, arg7: &smash::phx::Vector3f, arg8: &smash::phx::Vector3f, arg9: bool, arg10: u32, arg11: i32, arg12: i32) -> u64 {
+unsafe fn req_on_joint_hook(boma: &mut BattleObjectModuleAccessor, effHash: smash::phx::Hash40, boneHash: smash::phx::Hash40, pos: &Vector3f, rot: &Vector3f, size: f32, arg7: &Vector3f, arg8: &Vector3f, arg9: bool, arg10: u32, arg11: i32, arg12: i32) -> u64 {
     let mut eff_size = size;
     if SHOCKWAVE_FX.contains(&effHash.hash) {
         eff_size = size * 0.7;
@@ -335,7 +335,7 @@ unsafe fn req_on_joint_hook(boma: &mut BattleObjectModuleAccessor, effHash: smas
 }
 
 #[skyline::hook(replace=EffectModule::req_follow)]
-unsafe fn req_follow(boma: &mut BattleObjectModuleAccessor, effHash: smash::phx::Hash40, boneHash: smash::phx::Hash40, pos: &smash::phx::Vector3f, rot: &smash::phx::Vector3f, size: f32, arg7: bool, arg8: u32, arg9: i32, arg10: i32, arg11: i32, arg12: i32, arg13: bool, arg14: bool) -> u64 {
+unsafe fn req_follow(boma: &mut BattleObjectModuleAccessor, effHash: smash::phx::Hash40, boneHash: smash::phx::Hash40, pos: &Vector3f, rot: &Vector3f, size: f32, arg7: bool, arg8: u32, arg9: i32, arg10: i32, arg11: i32, arg12: i32, arg13: bool, arg14: bool) -> u64 {
     let mut eff_size = size;
     // Shrink knockback smoke effect by 25%
     if effHash.hash == hash40("sys_flyroll_smoke") as u64 {  // hash for kb smoke
@@ -363,7 +363,7 @@ unsafe fn preset_lifetime_rate_partial_hook(boma: &mut BattleObjectModuleAccesso
 }
 
 #[skyline::hook(replace=EffectModule::get_dead_effect_scale)]
-unsafe fn get_dead_effect_scale_hook(boma: &mut BattleObjectModuleAccessor, arg1: &smash::phx::Vector3f, arg2: f32, arg3: bool) -> f32 {
+unsafe fn get_dead_effect_scale_hook(boma: &mut BattleObjectModuleAccessor, arg1: &Vector3f, arg2: f32, arg3: bool) -> f32 {
     // Shrink KO gfx by 25%
     original!()(boma, arg1, arg2, arg3) * 0.75
 }