Merge branch 'dev' into gunner-shine

Author: WuBoytH

.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" }
@@ -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

@@ -180,38 +180,41 @@ pub mod vars {
 
             pub const DISABLE_CSTICK_BUFFER_ROLL_OOS: i32 = 0x0064;
 
+            pub const IS_INIT: i32 = 0x0065;
+
+            pub const IS_FLOAT: i32 = 0x0066;
+
             // ints
 
             pub const LAST_ATTACK_RECEIVER_ENTRY_ID: i32 = 0x0000;
 
             pub const COSTUME_SLOT_NUMBER: i32 = 0x0001; // Unironically why does this need to exist? We have WorkModule.
 
-            pub const FLOAT_TIMER: i32 = 0x0002;
-            pub const FLOAT_DURATION: i32 = 0x0003;
-            pub const FLOAT_STYLE: i32 = 0x0004;
+            pub const FLOAT_DURATION: i32 = 0x0002;
+            pub const FLOAT_STATUS_KIND: i32 = 0x0003;
 
-            pub const HITFALL_BUFFER: i32 = 0x0005;
+            pub const HITFALL_BUFFER: i32 = 0x0004;
 
-            pub const JUMP_SQUAT_FRAME: i32 = 0x0006;
+            pub const JUMP_SQUAT_FRAME: i32 = 0x0005;
 
-            pub const GIMMICK_TIMER: i32 = 0x0007;
+            pub const GIMMICK_TIMER: i32 = 0x0006;
 
-            pub const AIR_ESCAPE_MAGNET_FRAME: i32 = 0x0008;
+            pub const AIR_ESCAPE_MAGNET_FRAME: i32 = 0x0007;
 
-            pub const CSTICK_LIFE: i32 = 0x0009;
+            pub const CSTICK_LIFE: i32 = 0x0008;
 
-            pub const AGT_USED_COUNTER: i32 = 0x000A;
+            pub const AGT_USED_COUNTER: i32 = 0x0009;
 
-            pub const CLIFF_XLU_FRAME: i32 = 0x000B;
-            pub const LAST_ATTACK_HITBOX_ID: i32 = 0x000C;
-            pub const SHIELD_EFFECT_HANDLE: i32 = 0x000D;
+            pub const CLIFF_XLU_FRAME: i32 = 0x000A;
+            pub const LAST_ATTACK_HITBOX_ID: i32 = 0x000B;
+            pub const SHIELD_EFFECT_HANDLE: i32 = 0x000C;
 
-            pub const FRAME_COUNTER: i32 = 0x000E;
+            pub const FRAME_COUNTER: i32 = 0x000D;
 
-            pub const LEFT_STICK_FLICK_X: i32 = 0x000F;
-            pub const LEFT_STICK_FLICK_Y: i32 = 0x0010;
+            pub const LEFT_STICK_FLICK_X: i32 = 0x000E;
+            pub const LEFT_STICK_FLICK_Y: i32 = 0x000F;
 
-            pub const LEDGE_ID: i32 = 0x0011;
+            pub const LEDGE_ID: i32 = 0x0010;
 
             // floats
 
@@ -282,10 +285,16 @@ pub mod vars {
 
             pub const CSTICK_IRAR: i32 = 0x1000;
 
+            pub const FLOAT_INHERIT_AERIAL: i32 = 0x1000;
+
             // ints
 
             pub const DOWN_STAND_FB_KIND: i32 = 0x1000;
 
+            pub const FLOAT_FRAME: i32 = 0x1000;
+            pub const FLOAT_ENABLE_UNIQ: i32 = 0x1001;
+            pub const FLOAT_MTRANS: i32 = 0x1002;
+
             // floats
 
             pub const INITIAL_KNOCKBACK_VEL_X: i32 = 0x1000;
@@ -374,10 +383,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;
         }
     }
@@ -525,7 +534,12 @@ pub mod vars {
     pub mod edge {
         pub mod instance {
             // flags
-            pub const SPECIAL_HI_BLADE_DASH_NO_HITBOX: i32 = 0x1000;
+            pub const SPECIAL_HI_BLADE_DASH_NO_HITBOX: i32 = 0x0100;
+        }
+        pub mod status {
+            // flags
+            pub const FLASH_HOLD: i32 = 0x1101;
+            pub const SPECIAL_N_FIRE: i32 = 0x1102;
         }
     }
 
@@ -672,6 +686,8 @@ pub mod vars {
             pub use super::super::luigi::status::THUNDERHAND;
             pub use super::super::mariod::status::CHILL_PILL;
             pub const MINING_TIMER: i32 = 0x11F4;
+            pub const KO_PUNCH_GRAVITY: i32 = 0x11F5;
+            pub const KO_PUNCH_GRAVITY_END: i32 = 0x11F6;
         }
     }
 
@@ -809,9 +825,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 {
@@ -903,6 +918,7 @@ pub mod vars {
         pub mod instance {
             // flags
             pub const SPECIAL_HI_CANCEL_ESCAPE_AIR: i32 = 0x0100;
+            pub const SPECIAL_S_PIKMIN_DETONATE_IS_DETACH_FOR_DETONATE: i32 = 0x0101;
         }
         pub mod status {
             // flags
@@ -948,9 +964,12 @@ pub mod vars {
             pub const ELWIND1_CANCEL: i32 = 0x1100;
         }
         pub mod instance {
-            //flags
+            // flags
             pub const THUNDER_CHARGE: i32 = 0x0100;
             pub const UP_SPECIAL_FREEFALL: i32 = 0x0101;
+
+            // ints
+            pub const LEVIN_AERIAL_LENIENCY: i32 = 0x0100;
         }
     }
 
@@ -986,6 +1005,10 @@ pub mod vars {
             // flags
             pub const TRAIL_EFFECT: i32 = 0x0100;
         }
+        pub mod status {
+            // flags
+            pub const SIDE_B_REVERSE : i32 = 0x1150;
+        }
     }
 
     pub mod shotos {
@@ -1099,8 +1122,7 @@ pub mod vars {
             pub const ATTACK_12_INTO_S3: i32 = 0x0100;
             pub const COMBO_PLUS_GROUND: i32 = 0x0101;
             pub const COMBO_PLUS_AIR: i32 = 0x0102;
-            pub const CYCLE_MAGIC: i32 = 0x0103; // used to properly cycle Sora's HUD to fire in training mode
-            pub const ATTACK_LW4_REBOUND: i32 = 0x0104;
+            pub const ATTACK_LW4_REBOUND: i32 = 0x0103;
 
             // floats
             pub const JUMP_CANCEL_MOMENTUM_HANDLER: i32 = 0x0100;
@@ -1467,68 +1489,85 @@ 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 samusd {
+        pub const FLOAT: i32 = 0x1F6;
     }
 
     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 mewtwo {
+        pub const FLOAT: i32 = 0x1E9;
+    }
+
+    pub mod reflet {
+        pub const FLOAT: i32 = 0x1FD;
     }
 
     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;
     }
 }