Merge remote-tracking branch 'upstream/dev' into mewtwo-tp-jump

Author: jaccob101

.github/workflows/pr_build.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     branches:
       - dev
-    types: [opened, reopened, synchronize, ready_for_review, edited]
+    types: [opened, reopened, synchronize, ready_for_review]
 
 jobs:
   pr_build:

Cargo.toml

@@ -12,7 +12,7 @@ edition = "2021"
 skyline = "0.2"
 skyline_smash = { git =  "https://github.com/blu-dev/skyline-smash", features = ["weak_l2cvalue"] }
 skyline-web = { git = "https://github.com/skyline-rs/skyline-web" }
-smashline = { git = "https://github.com/blu-dev/smashline", branch = "development" }
+smashline = { git = "https://github.com/HDR-Development/smashline" }
 
 dynamic = { path = "dynamic" }
 hdr-macros = { path = "hdr-macros" }
@@ -258,7 +258,7 @@ default = [
     "ken",
     "kirby",
     "koopa",
-    "koopag",
+    # "koopag",
     "koopajr",
     "krool",
     "link",
@@ -323,7 +323,6 @@ default = [
 ]
 dev = ["utils/no-offset-search"]
 main_nro = ["skyline-web", "common"]
-add_status = []
 runtime = []
 
 [patch.'https://github.com/jam1garner/smash-arc']

dynamic/src/consts.rs

@@ -374,10 +374,10 @@ pub mod vars {
         pub mod instance {
             // flags
             pub use super::super::roy::instance::TRAIL_EFFECT;
+            pub const SOARING_SLASH_HIT: i32 = 0x0100;
         }
         pub mod status {
             // flags
-            pub const SOARING_SLASH_HIT: i32 = 0x1100;
             pub const SOARING_SLASH_CANCEL: i32 = 0x1101;
         }
     }
@@ -1474,68 +1474,73 @@ pub mod vars {
 
 pub mod statuses {
     pub mod elight {
-        pub const SPECIAL_HI_FINISH2: i32 = 0;
+        pub const SPECIAL_HI_FINISH2: i32 = 0x1F1;
     }
 
     pub mod falco {
-        pub const SPECIAL_LW_LOOP: i32 = 0;
-        pub const SPECIAL_LW_END: i32 = 1;
+        pub const SPECIAL_LW_LOOP: i32 = 0x1e8;
+        pub const SPECIAL_LW_END: i32 = 0x1e9;
     }
 
     pub mod gamewatch {
-        pub const SPECIAL_HI_OPEN: i32 = 0;
+        pub const SPECIAL_HI_OPEN: i32 = 0x205;
     }
 
     pub mod ganon {
-        pub const SPECIAL_N_FLOAT: i32 = 0;
+        pub const SPECIAL_N_FLOAT: i32 = 0x1EC;
     }
 
     pub mod ryu {
-        pub const AIR_DASH: i32 = 0;
+        pub const AIR_DASH: i32 = 0x202;
     }
 
     pub mod ken {
-        pub const ATTACK_COMMAND_4: i32 = 0;
+        pub const ATTACK_COMMAND_4: i32 = 0x202;
     }
 
     pub mod buddy {
-        pub const BUDDY_BAYONET_END: i32 = 0;
+        pub const BUDDY_BAYONET_END: i32 = 0x1FB;
     }
 
     pub mod littlemac {
-        pub const SPECIAL_LW_CANCEL: i32 = 1;
-        pub const SPECIAL_LW_CANCEL_JUMP: i32 = 2;
+        pub const SPECIAL_LW_CANCEL: i32 = 0x1F4;
+        pub const SPECIAL_LW_CANCEL_JUMP: i32 = 0x1F5;
     }
 
     pub mod wolf {
-        pub const SPECIAL_S_RUSH: i32 = 0;
-        pub const SPECIAL_S_END: i32 = 1;
+        pub const SPECIAL_S_RUSH: i32 = 0x1EA;
+        pub const SPECIAL_S_END: i32 = 0x1EB;
     }
 
     pub mod diddy {
-        pub const SPECIAL_N_CANCEL: i32 = 3;
-        pub const SPECIAL_N_CANCEL_JUMP: i32 = 4;
+        pub const SPECIAL_N_CANCEL: i32 = 0x1FF;
+        pub const SPECIAL_N_CANCEL_JUMP: i32 = 0x200;
     }
 
     pub mod kirby {
-        pub const SPECIAL_HI_H: i32 = 69; //Weird value to avoid conflicts with copy ability values
+        pub const SPECIAL_HI_H: i32 = 0x3E6; //Weird value to avoid conflicts with copy ability values
+        pub const GANON_SPECIAL_N_FLOAT: i32 = 0x3E7; 
+        pub const LITTLEMAC_SPECIAL_N_CANCEL: i32 = 0x3E8; 
+        pub const LITTLEMAC_SPECIAL_N_CANCEL_JUMP: i32 = 0x3E9; 
+        pub const DIDDY_SPECIAL_N_CANCEL: i32 = 0x3EA; 
+        pub const DIDDY_SPECIAL_N_CANCEL_JUMP: i32 = 0x3EB; 
     }
 
     pub mod krool {
-        pub const SPECIAL_LW_GUT: i32 = 0;
+        pub const SPECIAL_LW_GUT: i32 = 0x1F9;
     }
 
     pub mod palutena {
-        pub const SPECIAL_N_R: i32 = 0;
-        pub const SPECIAL_N_B: i32 = 1;
-        pub const SPECIAL_N_Y: i32 = 2;
-        pub const SPECIAL_N_P: i32 = 3;
-        pub const SPECIAL_N_O: i32 = 4;
-        pub const SPECIAL_N_G: i32 = 5;
+        pub const SPECIAL_N_R: i32 = 0x1E9;
+        pub const SPECIAL_N_B: i32 = 0x1EA;
+        pub const SPECIAL_N_Y: i32 = 0x1EB;
+        pub const SPECIAL_N_P: i32 = 0x1EC;
+        pub const SPECIAL_N_O: i32 = 0x1ED;
+        pub const SPECIAL_N_G: i32 = 0x1EE;
     }
 
     pub mod bayonetta {
-        pub const SPECIAL_S_KICK: i32 = 0;
-        pub const SPECIAL_S_EDGE: i32 = 1;
+        pub const SPECIAL_S_KICK: i32 = 0x1F2;
+        pub const SPECIAL_S_EDGE: i32 = 0x1F3;
     }
 }

dynamic/src/ext.rs

@@ -376,7 +376,6 @@ pub trait FastShift {
         &mut self,
         new_main: unsafe extern "C" fn(&mut L2CFighterBase) -> L2CValue,
     ) -> L2CValue;
-    fn change_to_custom_status(&mut self, id: i32, clear_cat: bool, common: bool);
 }
 
 impl MainShift for L2CFighterCommon {
@@ -395,18 +394,6 @@ impl FastShift for L2CFighterBase {
     ) -> L2CValue {
         unsafe { self.fastshift(L2CValue::Ptr(new_main as *const () as _)) }
     }
-
-    fn change_to_custom_status(&mut self, id: i32, clear_cat: bool, common: bool) {
-        use crate::CustomStatusModule;
-
-        let kind = if common {
-            CustomStatusModule::get_common_status_kind(self.battle_object, id)
-        } else {
-            CustomStatusModule::get_agent_status_kind(self.battle_object, id)
-        };
-
-        unsafe { self.change_status(kind.into(), clear_cat.into()) }
-    }
 }
 
 pub trait BomaExt {
@@ -922,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;
         }
 
@@ -1141,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);
     }
 
@@ -1419,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,28 +1,16 @@
 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::*,
   ext::*
 };
 
-
 #[repr(C)]
 pub struct FrameInfo {
   pub lua_state: u64,

dynamic/src/modules.rs

@@ -1,11 +1,9 @@
 mod var;
 mod param;
 mod input;
-mod status;
 mod meter;
 
 pub use var::*;
 pub use param::*;
 pub use input::*;
-pub use status::*;
 pub use meter::*;

dynamic/src/modules/status.rs

@@ -69,7 +69,6 @@ extern "C" {
     fn offsets_analog_trigger_r() -> usize;
 }
 
-
 pub fn exec_command() -> usize {
     unsafe {
         offsets_exec_command()

dynamic/src/offsets.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/ui.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
 }
 
@@ -308,7 +308,6 @@ pub unsafe fn x_motion_vec(val: f32, stick_x: f32) -> smash::phx::Vector3f {
     smash::phx::Vector3f{x: val * stick_x.signum(), y: 0.0, z: 0.0}
 }
 
-
 extern "C"{
     /// gets whether we are in training mode
     #[link_name = "\u{1}_ZN3app9smashball16is_training_modeEv"]

dynamic/src/util.rs

@@ -10,4 +10,4 @@ utils = { package = "dynamic", path = "../../dynamic" }
 skyline = "0.2.1"
 skyline_smash = { git = "https://github.com/blu-dev/skyline-smash", features = ["weak_l2cvalue"] }
 smash_script = { git = "https://github.com/blu-dev/smash-script", branch = "development" }
-smashline = { git = "https://github.com/blu-dev/smashline", branch = "development" }
+smashline = { git = "https://github.com/HDR-Development/smashline" }