Skip to content

Commit 6131933

Browse files
LunchablesTXLunchablesTX
committed
Merge branch 'dev' into PMRoyProject
2 parents 1ef223e + a2467b8 commit 6131933

File tree

526 files changed

+16929
-10002
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

526 files changed

+16929
-10002
lines changed

‎dynamic/src/consts.rs

+106-41
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ pub mod vars {
178178

179179
pub const IS_ATTACK_CANCEL: i32 = 0x0063;
180180

181+
pub const DISABLE_CSTICK_BUFFER_ROLL_OOS: i32 = 0x0064;
182+
181183
// ints
182184

183185
pub const LAST_ATTACK_RECEIVER_ENTRY_ID: i32 = 0x0000;
@@ -209,6 +211,8 @@ pub mod vars {
209211
pub const LEFT_STICK_FLICK_X: i32 = 0x000F;
210212
pub const LEFT_STICK_FLICK_Y: i32 = 0x0010;
211213

214+
pub const LEDGE_ID: i32 = 0x0011;
215+
212216
// floats
213217

214218
pub const LAST_ATTACK_DAMAGE_DEALT: i32 = 0x0000;
@@ -223,10 +227,10 @@ pub mod vars {
223227
pub const CURRENT_MOMENTUM_SPECIALS: i32 = 0x0007;
224228
pub const DOUBLE_JUMP_TIMER: i32 = 0x0008; // Only used by Lucas, and it's commented out, goes unused.
225229
pub const ROLL_SPEED: i32 = 0x0009;
226-
pub const LEDGE_POS: i32 = 0x000A;
227-
pub const LEDGE_POS_X: i32 = 0x000A;
228-
pub const LEDGE_POS_Y: i32 = 0x000B;
229-
pub const LEDGE_POS_Z: i32 = 0x000C;
230+
// pub const LEDGE_POS: i32 = 0x000A;
231+
// pub const LEDGE_POS_X: i32 = 0x000A;
232+
// pub const LEDGE_POS_Y: i32 = 0x000B;
233+
// pub const LEDGE_POS_Z: i32 = 0x000C;
230234
pub const GET_DIST_TO_FLOOR: i32 = 0x000D;
231235
pub const ECB_BOTTOM_Y_OFFSET: i32 = 0x000E;
232236
pub const CURR_DASH_SPEED: i32 = 0x000F;
@@ -300,14 +304,12 @@ pub mod vars {
300304

301305
// ints
302306
pub const NUM_RECOVERY_RESOURCE_USED: i32 = 0x0100;
303-
pub const NUM_CANCEL_THIS_AIRTIME: i32 = 0x0101;
307+
pub const FAIR_STATE: i32 = 0x0101;
308+
pub const SPECIAL_S_FRAME: i32 = 0x0102;
304309
}
305310
pub mod status {
306-
// flags
307-
pub const IS_ACTIVATE: i32 = 0x1100;
308-
pub const DIRECT_HIT: i32 = 0x1101;
309311
// floats
310-
pub const ABK_ANGLE: i32 = 0x1102;
312+
pub const ABK_ANGLE: i32 = 0x1100;
311313
}
312314
}
313315

@@ -411,6 +413,7 @@ pub mod vars {
411413
pub mod diddy {
412414
pub mod instance {
413415
pub const DISABLE_SPECIAL_S: i32 = 0x0100;
416+
pub const NO_CAP: i32 = 0x0101;
414417
}
415418
pub mod status {
416419
// ints
@@ -515,6 +518,14 @@ pub mod vars {
515518

516519
// flags
517520
pub const IS_INVALID_TELEPORT: i32 = 0x1101;
521+
pub const GROUNDED_TELEPORT: i32 = 0x1102;
522+
}
523+
}
524+
525+
pub mod edge {
526+
pub mod instance {
527+
// flags
528+
pub const SPECIAL_HI_BLADE_DASH_NO_HITBOX: i32 = 0x1000;
518529
}
519530
}
520531

@@ -627,6 +638,13 @@ pub mod vars {
627638
}
628639
}
629640

641+
pub mod jack {
642+
pub mod instance {
643+
// flags
644+
pub const GROUNDED_DOYLE_DASH: i32 = 0x0100;
645+
}
646+
}
647+
630648
pub mod kamui {
631649
pub mod status {
632650
// floats
@@ -642,14 +660,16 @@ pub mod vars {
642660
// copy ability
643661
// flags
644662
pub const SHOULD_CYCLE_MATERIAL: i32 = 0x01F4;
663+
pub use super::super::ridley::instance::SPECIAL_N_EXPLODE;
645664

646665
// ints
647666
pub const MATERIAL_INDEX: i32 = 0x01F5;
648667
}
649668
pub mod status {
650669
// copy ability
651670
// flags
652-
pub use super::super::mario::status::IS_SPECIAL_N_FIREBRAND;
671+
pub use super::super::mario::status::FIREBRAND;
672+
pub use super::super::luigi::status::THUNDERHAND;
653673
pub use super::super::mariod::status::CHILL_PILL;
654674
pub const MINING_TIMER: i32 = 0x11F4;
655675
}
@@ -675,6 +695,8 @@ pub mod vars {
675695
pub mod instance {
676696
// flags
677697
pub const DISABLE_SPECIAL_S: i32 = 0x0100;
698+
pub const DISABLE_MECHAKOOPA: i32 = 0x0101;
699+
pub const MECHAKOOPA_IS_COOLDOWN: i32 = 0x0102;
678700
}
679701
}
680702

@@ -725,6 +747,7 @@ pub mod vars {
725747
pub const SPECIAL_HI_ATTACK_IS_LEAVE_WALL: i32 = 0x1101;
726748
pub const SPECIAL_HI_ATTACK_IS_FLIPPED_MOMENTUM_AFTER_WALLTOUCH: i32 = 0x1102;
727749
pub const SPECIAL_HI_ATTACK_IS_SET_WALL_LEAVE_MOMENTUM: i32 = 0x1103;
750+
pub const THUNDER_LOOSE: i32 = 0x1104;
728751

729752
// float
730753
/// 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 +764,10 @@ pub mod vars {
741764

742765
pub mod lucina {
743766
pub mod instance {
744-
//int
767+
// flag
768+
pub const EQUIP_MASK: i32 = 0x0100;
769+
770+
// int
745771
/// This int stores damage received from an attack during quick riposte
746772
pub const CURRENT_DAMAGE: i32 = 0x0100;
747773
}
@@ -776,19 +802,16 @@ pub mod vars {
776802
}
777803
pub mod status {
778804
// flag
779-
pub use super::super::mario::status::IS_SPECIAL_N_DOUBLE_FIREBALL;
780-
pub use super::super::mario::status::IS_SPECIAL_N_FIREBRAND;
805+
pub const THUNDERHAND: i32 = 0x1100;
781806
}
782807
}
783808

784809
pub mod mario {
785810
pub mod instance {
786811
// flags
787812
pub const NOKNOK_SHELL: i32 = 0x0100;
788-
pub const CAN_INPUT_SPECIAL_N_DOUBLE_FIREBALL: i32 = 0x0101;
789-
pub const SPECIAL_N_DOUBLE_FIREBALL_NOTIFY_FLAG: i32 = 0x0102;
790-
pub const DISABLE_DSPECIAL_STALL: i32 = 0x0103;
791-
pub const SPECIAL_S_DISABLE_STALL: i32 = 0x0104;
813+
pub const DISABLE_DSPECIAL_STALL: i32 = 0x0101;
814+
pub const SPECIAL_S_DISABLE_STALL: i32 = 0x0102;
792815
}
793816

794817
pub mod status {
@@ -797,8 +820,7 @@ pub mod vars {
797820
pub const AERIAL_COMMAND_RISING: i32 = 0x1101;
798821
pub const AERIAL_COMMAND_RISEN: i32 = 0x1102;
799822

800-
pub const IS_SPECIAL_N_FIREBRAND: i32 = 0x1100;
801-
pub const IS_SPECIAL_N_DOUBLE_FIREBALL: i32 = 0x1101;
823+
pub const FIREBRAND: i32 = 0x1100;
802824
}
803825
}
804826

@@ -834,6 +856,13 @@ pub mod vars {
834856
}
835857
}
836858

859+
pub mod ness {
860+
pub mod status {
861+
// flags
862+
pub const THUNDER_LOOSE: i32 = 0x1100;
863+
}
864+
}
865+
837866
pub mod pickel {
838867
pub mod instance {
839868
// flags
@@ -872,8 +901,15 @@ pub mod vars {
872901

873902
pub mod pikmin {
874903
pub mod instance {
904+
// flags
875905
pub const SPECIAL_HI_CANCEL_ESCAPE_AIR: i32 = 0x0100;
876906
}
907+
pub mod status {
908+
// flags
909+
pub const SPECIAL_S_PIKMIN_DETONATE_IS_ATTACK_LAST_FRAME: i32 = 0x1100;
910+
// ints
911+
pub const SPECIAL_S_PIKMIN_DETONATE_TIMER: i32 = 0x1101;
912+
}
877913
}
878914

879915
pub mod ptrainer {
@@ -938,6 +974,13 @@ pub mod vars {
938974
}
939975
}
940976

977+
pub mod rockman_airshooter {
978+
pub mod status {
979+
// flags
980+
pub const MOVE : i32 = 0x1100;
981+
}
982+
}
983+
941984
pub mod roy {
942985
pub mod instance {
943986
// flags
@@ -1002,8 +1045,12 @@ pub mod vars {
10021045

10031046
pub mod sonic {
10041047
pub mod instance {
1048+
// flags
10051049
pub const USED_AIR_ACTION: i32 = 0x0100;
10061050
pub const UP_SPECIAL_FREEFALL: i32 = 0x0101;
1051+
1052+
// ints
1053+
pub const SPECIAL_N_POSE: i32 = 0x0100;
10071054
}
10081055
pub mod status {
10091056
// flags
@@ -1057,6 +1104,10 @@ pub mod vars {
10571104
pub const COMBO_PLUS_GROUND: i32 = 0x0101;
10581105
pub const COMBO_PLUS_AIR: i32 = 0x0102;
10591106
pub const CYCLE_MAGIC: i32 = 0x0103; // used to properly cycle Sora's HUD to fire in training mode
1107+
pub const ATTACK_LW4_REBOUND: i32 = 0x0104;
1108+
1109+
// floats
1110+
pub const JUMP_CANCEL_MOMENTUM_HANDLER: i32 = 0x0100;
10601111
}
10611112
pub mod status {
10621113
// flags
@@ -1075,8 +1126,12 @@ pub mod vars {
10751126

10761127
pub const UP_SPECIAL_HIT: i32 = 0x1100;
10771128

1129+
// ints
1130+
pub const ATTACK_LW4_TIMER: i32 = 0x1100;
1131+
10781132
// floats
10791133
pub const SONIC_BLADE_Y: i32 = 0x1100;
1134+
pub const DACUS_SPEED_Y: i32 = 0x1101;
10801135
}
10811136
}
10821137

@@ -1103,6 +1158,9 @@ pub mod vars {
11031158
// flags
11041159
pub const AIRTIME_BAIR: i32 = 0x0100;
11051160
pub const AIRTIME_SIDEB: i32 = 0x0101;
1161+
pub const IS_INIT_METER: i32 = 0x0102;
1162+
pub const GROUNDED_UPB: i32 = 0x0103;
1163+
pub const UPB_CANCEL: i32 = 0x0104;
11061164
// ints
11071165
pub const PASSIVE_FUEL_INDICATOR_EFFECT_HANDLE: i32 = 0x0100;
11081166
pub const PREV_FUEL_THRESHOLD: i32 = 0x0101;
@@ -1176,6 +1234,7 @@ pub mod vars {
11761234
// flags
11771235
pub const LUNAR_LAUNCH_AIR_USED: i32 = 0x0100;
11781236
pub const DETONATE_READY: i32 = 0x0101;
1237+
pub const BOOSTED_DAIR_AIRTIME: i32 = 0x0102;
11791238

11801239
// ints
11811240
pub const LUNAR_LAUNCH_EFF_HANDLER: i32 = 0x0100;
@@ -1211,23 +1270,31 @@ pub mod vars {
12111270
}
12121271

12131272
pub mod littlemac {
1214-
pub mod status {
1273+
pub mod instance {
12151274
// flags
12161275
pub const IS_DREAMLAND_EXPRESS: i32 = 0x0100;
12171276
pub const IS_LATE_DLE_INPUT: i32 = 0x0101;
1277+
pub const KO_MOTION_AIRTIME: i32 = 0x0102;
1278+
1279+
// floats
1280+
pub const CURRENT_DAMAGE: i32 = 0x0100;
1281+
}
1282+
pub mod status {
1283+
// flags
1284+
pub const LIMIT_METER_GAIN: i32 = 0x102;
12181285

12191286
// ints
1220-
pub const SPECIAL_N_CANCEL_TYPE: i32 = 0x1100;
1287+
pub const SPECIAL_LW_CANCEL_TYPE: i32 = 0x1100;
12211288
}
12221289

1223-
pub const SPECIAL_N_CANCEL_TYPE_NONE: i32 = 0x0;
1224-
pub const SPECIAL_N_CANCEL_TYPE_GROUND_JUMP: i32 = 0x1;
1225-
pub const SPECIAL_N_CANCEL_TYPE_JUMP_AERIAL: i32 = 0x2;
1226-
pub const SPECIAL_N_CANCEL_TYPE_GUARD: i32 = 0x3;
1227-
pub const SPECIAL_N_CANCEL_TYPE_ESCAPE: i32 = 0x4;
1228-
pub const SPECIAL_N_CANCEL_TYPE_ESCAPE_AIR: i32 = 0x5;
1229-
pub const SPECIAL_N_CANCEL_TYPE_ESCAPE_F: i32 = 0x6;
1230-
pub const SPECIAL_N_CANCEL_TYPE_ESCAPE_B: i32 = 0x7;
1290+
pub const SPECIAL_LW_CANCEL_TYPE_NONE: i32 = 0x0;
1291+
pub const SPECIAL_LW_CANCEL_TYPE_GROUND_JUMP: i32 = 0x1;
1292+
pub const SPECIAL_LW_CANCEL_TYPE_JUMP_AERIAL: i32 = 0x2;
1293+
pub const SPECIAL_LW_CANCEL_TYPE_GUARD: i32 = 0x3;
1294+
pub const SPECIAL_LW_CANCEL_TYPE_ESCAPE: i32 = 0x4;
1295+
pub const SPECIAL_LW_CANCEL_TYPE_ESCAPE_AIR: i32 = 0x5;
1296+
pub const SPECIAL_LW_CANCEL_TYPE_ESCAPE_F: i32 = 0x6;
1297+
pub const SPECIAL_LW_CANCEL_TYPE_ESCAPE_B: i32 = 0x7;
12311298
}
12321299

12331300
pub mod pichu {
@@ -1288,6 +1355,7 @@ pub mod vars {
12881355
pub const SPECIAL_LW_ENABLE_LANDING: i32 = 0x0102;
12891356
pub const SPECIAL_LW_IS_LANDING: i32 = 0x0103;
12901357
pub const SPECIAL_LW_ENABLE_BOUNCE: i32 = 0x0104;
1358+
pub const SPECIAL_N_EXPLODE: i32 = 0x0105;
12911359

12921360
// floats
12931361
pub const SPECIAL_LW_BOUNCE_PREV_POS: i32 = 0x0100; //vector, requires two indexes
@@ -1322,10 +1390,10 @@ pub mod vars {
13221390
pub const STANCE_REVERSE: i32 = 0x0103;
13231391

13241392
// floats
1325-
pub const PTOOIE_SCALE: i32 = 0x0100;
1393+
pub const PTOOIE_SCALE: i32 = 0x01BF;
13261394

13271395
// ints
1328-
pub const CURRENT_STANCE: i32 = 0x0100; // 0 = Normal, 1 = Putrid, 2 = Prickly
1396+
pub const CURRENT_STANCE: i32 = 0x01BE; // 0 = Normal, 1 = Putrid, 2 = Prickly
13291397
pub const STANCE_STATUS: i32 = 0x0101;
13301398
}
13311399
pub mod status {
@@ -1399,14 +1467,6 @@ pub mod vars {
13991467
pub const RING_SECOND_COLOR: i32 = 0x108;
14001468
}
14011469
}
1402-
1403-
pub mod jack {
1404-
pub mod instance {
1405-
// flags
1406-
pub const GROUNDED_DOYLE_DASH: i32 = 0x0100;
1407-
}
1408-
}
1409-
14101470
}
14111471

14121472
pub mod statuses {
@@ -1440,8 +1500,8 @@ pub mod statuses {
14401500
}
14411501

14421502
pub mod littlemac {
1443-
pub const SPECIAL_N_CANCEL: i32 = 1;
1444-
pub const SPECIAL_N_CANCEL_JUMP: i32 = 2;
1503+
pub const SPECIAL_LW_CANCEL: i32 = 1;
1504+
pub const SPECIAL_LW_CANCEL_JUMP: i32 = 2;
14451505
}
14461506

14471507
pub mod wolf {
@@ -1470,4 +1530,9 @@ pub mod statuses {
14701530
pub const SPECIAL_N_O: i32 = 4;
14711531
pub const SPECIAL_N_G: i32 = 5;
14721532
}
1533+
1534+
pub mod bayonetta {
1535+
pub const SPECIAL_S_KICK: i32 = 0;
1536+
pub const SPECIAL_S_EDGE: i32 = 1;
1537+
}
14731538
}

0 commit comments

Comments
 (0)