Merge branch 'dev' into lucina-adjustments

Author: yoonikoo

dynamic/src/consts.rs

@@ -300,14 +300,11 @@ pub mod vars {
 
             // ints
             pub const NUM_RECOVERY_RESOURCE_USED: i32 = 0x0100;
-            pub const NUM_CANCEL_THIS_AIRTIME: i32 = 0x0101;
+            pub const FAIR_STATE: i32 = 0x0101;
         }
         pub mod status {
-            // flags
-            pub const IS_ACTIVATE: i32 = 0x1100;
-            pub const DIRECT_HIT: i32 = 0x1101;
             // floats
-            pub const ABK_ANGLE: i32 = 0x1102;
+            pub const ABK_ANGLE: i32 = 0x1100;
         }
     }
 
@@ -411,6 +408,7 @@ pub mod vars {
     pub mod diddy {
         pub mod instance {
             pub const DISABLE_SPECIAL_S: i32 = 0x0100;
+            pub const NO_CAP: i32 = 0x0101;
         }
         pub mod status {
             // ints
@@ -627,6 +625,13 @@ pub mod vars {
         }
     }
 
+    pub mod jack {
+        pub mod instance {
+            // flags
+            pub const GROUNDED_DOYLE_DASH: i32 = 0x0100;
+        }
+    }
+
     pub mod kamui {
         pub mod status {
             // floats
@@ -649,7 +654,8 @@ pub mod vars {
         pub mod status {
             // copy ability
             // flags
-            pub use super::super::mario::status::IS_SPECIAL_N_FIREBRAND;
+            pub use super::super::mario::status::FIREBRAND;
+            pub use super::super::luigi::status::THUNDERHAND;
             pub use super::super::mariod::status::CHILL_PILL;
             pub const MINING_TIMER: i32 = 0x11F4;
         }
@@ -675,6 +681,8 @@ pub mod vars {
         pub mod instance {
             // flags
             pub const DISABLE_SPECIAL_S: i32 = 0x0100;
+            pub const DISABLE_MECHAKOOPA: i32 = 0x0101;
+            pub const MECHAKOOPA_IS_COOLDOWN: i32 = 0x0102;
         }
     }
 
@@ -725,6 +733,7 @@ pub mod vars {
             pub const SPECIAL_HI_ATTACK_IS_LEAVE_WALL: i32 = 0x1101;
             pub const SPECIAL_HI_ATTACK_IS_FLIPPED_MOMENTUM_AFTER_WALLTOUCH: i32 = 0x1102;
             pub const SPECIAL_HI_ATTACK_IS_SET_WALL_LEAVE_MOMENTUM: i32 = 0x1103;
+            pub const THUNDER_LOOSE: i32 = 0x1104;
 
             // float
             /// Holds the initial y velocity you have during up b to compare once you've touched a wall to reflect your speed the other direction if it changes
@@ -741,7 +750,10 @@ pub mod vars {
 
     pub mod lucina {
         pub mod instance {
-            //int
+            // flag
+            pub const EQUIP_MASK: i32 = 0x0100;
+            
+            // int
             /// This int stores damage received from an attack during quick riposte
             pub const CURRENT_DAMAGE: i32 = 0x0100;
         }
@@ -776,19 +788,16 @@ pub mod vars {
         }
         pub mod status {
             // flag
-            pub use super::super::mario::status::IS_SPECIAL_N_DOUBLE_FIREBALL;
-            pub use super::super::mario::status::IS_SPECIAL_N_FIREBRAND;
+            pub const THUNDERHAND: i32 = 0x1100;
         }
     }
 
     pub mod mario {
         pub mod instance {
             // flags
             pub const NOKNOK_SHELL: i32 = 0x0100;
-            pub const CAN_INPUT_SPECIAL_N_DOUBLE_FIREBALL:   i32 = 0x0101;
-            pub const SPECIAL_N_DOUBLE_FIREBALL_NOTIFY_FLAG: i32 = 0x0102;
-            pub const DISABLE_DSPECIAL_STALL:                i32 = 0x0103;
-            pub const SPECIAL_S_DISABLE_STALL:               i32 = 0x0104;
+            pub const DISABLE_DSPECIAL_STALL: i32 = 0x0101;
+            pub const SPECIAL_S_DISABLE_STALL: i32 = 0x0102;
         }
 
         pub mod status {
@@ -797,8 +806,7 @@ pub mod vars {
             pub const AERIAL_COMMAND_RISING: i32 = 0x1101;
             pub const AERIAL_COMMAND_RISEN: i32 = 0x1102;
 
-            pub const IS_SPECIAL_N_FIREBRAND: i32 = 0x1100;
-            pub const IS_SPECIAL_N_DOUBLE_FIREBALL: i32 = 0x1101;
+            pub const FIREBRAND: i32 = 0x1100;
         }
     }
 
@@ -998,8 +1006,12 @@ pub mod vars {
 
     pub mod sonic {
         pub mod instance {
+            // flags
             pub const USED_AIR_ACTION: i32 = 0x0100;
             pub const UP_SPECIAL_FREEFALL: i32 = 0x0101;
+
+            // ints
+            pub const SPECIAL_N_POSE: i32 = 0x0100;
         }
         pub mod status {
             // flags
@@ -1099,6 +1111,9 @@ pub mod vars {
             // flags
             pub const AIRTIME_BAIR: i32 = 0x0100;
             pub const AIRTIME_SIDEB: i32 = 0x0101;
+            pub const IS_INIT_METER: i32 = 0x0102;
+            pub const GROUNDED_UPB: i32 = 0x0103;
+            pub const UPB_CANCEL: i32 = 0x0104;
             // ints
             pub const PASSIVE_FUEL_INDICATOR_EFFECT_HANDLE: i32 = 0x0100;
             pub const PREV_FUEL_THRESHOLD: i32 = 0x0101;
@@ -1318,10 +1333,10 @@ pub mod vars {
             pub const STANCE_REVERSE: i32 = 0x0103;
 
             // floats
-            pub const PTOOIE_SCALE: i32 = 0x0100;
+            pub const PTOOIE_SCALE: i32 = 0x01BF;
 
             // ints
-            pub const CURRENT_STANCE: i32 = 0x0100; // 0 = Normal, 1 = Putrid, 2 = Prickly
+            pub const CURRENT_STANCE: i32 = 0x01BE; // 0 = Normal, 1 = Putrid, 2 = Prickly
             pub const STANCE_STATUS: i32 = 0x0101;
         }
         pub mod status {
@@ -1395,14 +1410,6 @@ pub mod vars {
             pub const RING_SECOND_COLOR: i32 = 0x108;
         }
     }
-
-    pub mod jack {
-        pub mod instance {
-            // flags
-            pub const GROUNDED_DOYLE_DASH: i32 = 0x0100;
-        }    
-    }
-
 }
 
 pub mod statuses {