Skip to content

Commit 8a32110

Browse files
WuBoytHWuBoytH
authored
Merge branch 'dev' into kirby
2 parents 06f36ed + 9835b20 commit 8a32110

File tree

437 files changed

+9377
-5375
lines changed

Some content is hidden

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

437 files changed

+9377
-5375
lines changed

‎Cargo.toml

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
members = ["crates/*", "dynamic", "fighters/*", "hdr-macros", "utils"]
2+
members = ["dynamic", "fighters/*", "hdr-macros", "utils"]
33

44
resolver = "2"
55

@@ -226,10 +226,6 @@ smashline.workspace = true
226226
skyline-web = { workspace = true, optional = true }
227227
utils.workspace = true
228228

229-
[build-dependencies]
230-
build-tools = { path = "crates/build-tools" }
231-
hdr-macros.workspace = true
232-
233229
[features]
234230
default = [
235231
"bayonetta",

‎build.rs

-15
This file was deleted.

‎crates/build-tools/Cargo.toml

-12
This file was deleted.

‎crates/build-tools/src/lib.rs

-48
This file was deleted.

‎crates/build-tools/src/main.rs

-7
This file was deleted.

‎dynamic/src/consts.rs

+55-4
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;
@@ -301,6 +305,7 @@ pub mod vars {
301305
// ints
302306
pub const NUM_RECOVERY_RESOURCE_USED: i32 = 0x0100;
303307
pub const FAIR_STATE: i32 = 0x0101;
308+
pub const SPECIAL_S_FRAME: i32 = 0x0102;
304309
}
305310
pub mod status {
306311
// floats
@@ -513,6 +518,14 @@ pub mod vars {
513518

514519
// flags
515520
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;
516529
}
517530
}
518531

@@ -647,6 +660,7 @@ pub mod vars {
647660
// copy ability
648661
// flags
649662
pub const SHOULD_CYCLE_MATERIAL: i32 = 0x01F4;
663+
pub use super::super::ridley::instance::SPECIAL_N_EXPLODE;
650664

651665
// ints
652666
pub const MATERIAL_INDEX: i32 = 0x01F5;
@@ -844,6 +858,13 @@ pub mod vars {
844858
}
845859
}
846860

861+
pub mod ness {
862+
pub mod status {
863+
// flags
864+
pub const THUNDER_LOOSE: i32 = 0x1100;
865+
}
866+
}
867+
847868
pub mod pickel {
848869
pub mod instance {
849870
// flags
@@ -882,8 +903,15 @@ pub mod vars {
882903

883904
pub mod pikmin {
884905
pub mod instance {
906+
// flags
885907
pub const SPECIAL_HI_CANCEL_ESCAPE_AIR: i32 = 0x0100;
886908
}
909+
pub mod status {
910+
// flags
911+
pub const SPECIAL_S_PIKMIN_DETONATE_IS_ATTACK_LAST_FRAME: i32 = 0x1100;
912+
// ints
913+
pub const SPECIAL_S_PIKMIN_DETONATE_TIMER: i32 = 0x1101;
914+
}
887915
}
888916

889917
pub mod ptrainer {
@@ -948,6 +976,13 @@ pub mod vars {
948976
}
949977
}
950978

979+
pub mod rockman_airshooter {
980+
pub mod status {
981+
// flags
982+
pub const MOVE : i32 = 0x1100;
983+
}
984+
}
985+
951986
pub mod roy {
952987
pub mod instance {
953988
// flags
@@ -1067,6 +1102,10 @@ pub mod vars {
10671102
pub const COMBO_PLUS_GROUND: i32 = 0x0101;
10681103
pub const COMBO_PLUS_AIR: i32 = 0x0102;
10691104
pub const CYCLE_MAGIC: i32 = 0x0103; // used to properly cycle Sora's HUD to fire in training mode
1105+
pub const ATTACK_LW4_REBOUND: i32 = 0x0104;
1106+
1107+
// floats
1108+
pub const JUMP_CANCEL_MOMENTUM_HANDLER: i32 = 0x0100;
10701109
}
10711110
pub mod status {
10721111
// flags
@@ -1085,8 +1124,12 @@ pub mod vars {
10851124

10861125
pub const UP_SPECIAL_HIT: i32 = 0x1100;
10871126

1127+
// ints
1128+
pub const ATTACK_LW4_TIMER: i32 = 0x1100;
1129+
10881130
// floats
10891131
pub const SONIC_BLADE_Y: i32 = 0x1100;
1132+
pub const DACUS_SPEED_Y: i32 = 0x1101;
10901133
}
10911134
}
10921135

@@ -1189,6 +1232,7 @@ pub mod vars {
11891232
// flags
11901233
pub const LUNAR_LAUNCH_AIR_USED: i32 = 0x0100;
11911234
pub const DETONATE_READY: i32 = 0x0101;
1235+
pub const BOOSTED_DAIR_AIRTIME: i32 = 0x0102;
11921236

11931237
// ints
11941238
pub const LUNAR_LAUNCH_EFF_HANDLER: i32 = 0x0100;
@@ -1228,6 +1272,7 @@ pub mod vars {
12281272
// flags
12291273
pub const IS_DREAMLAND_EXPRESS: i32 = 0x0100;
12301274
pub const IS_LATE_DLE_INPUT: i32 = 0x0101;
1275+
pub const KO_MOTION_AIRTIME: i32 = 0x0102;
12311276

12321277
// floats
12331278
pub const CURRENT_DAMAGE: i32 = 0x0100;
@@ -1308,6 +1353,7 @@ pub mod vars {
13081353
pub const SPECIAL_LW_ENABLE_LANDING: i32 = 0x0102;
13091354
pub const SPECIAL_LW_IS_LANDING: i32 = 0x0103;
13101355
pub const SPECIAL_LW_ENABLE_BOUNCE: i32 = 0x0104;
1356+
pub const SPECIAL_N_EXPLODE: i32 = 0x0105;
13111357

13121358
// floats
13131359
pub const SPECIAL_LW_BOUNCE_PREV_POS: i32 = 0x0100; //vector, requires two indexes
@@ -1482,4 +1528,9 @@ pub mod statuses {
14821528
pub const SPECIAL_N_O: i32 = 4;
14831529
pub const SPECIAL_N_G: i32 = 5;
14841530
}
1531+
1532+
pub mod bayonetta {
1533+
pub const SPECIAL_S_KICK: i32 = 0;
1534+
pub const SPECIAL_S_EDGE: i32 = 1;
1535+
}
14851536
}

‎dynamic/src/game_modes.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ pub enum CustomMode {
88
TurboMode = 1,
99
HitfallMode = 2,
1010
AirdashMode = 3,
11+
Smash64Mode = 4,
1112
}
1213

1314
impl fmt::Display for CustomMode {
@@ -17,6 +18,7 @@ impl fmt::Display for CustomMode {
1718
CustomMode::TurboMode => write!(f, "Turbo"),
1819
CustomMode::HitfallMode => write!(f, "Hitfall"),
1920
CustomMode::AirdashMode => write!(f, "Airdash"),
21+
CustomMode::Smash64Mode => write!(f, "Smash64"),
2022
}
2123
}
2224
}
@@ -31,6 +33,7 @@ impl FromStr for CustomMode {
3133
"turbo" => Ok(CustomMode::TurboMode),
3234
"hitfall" => Ok(CustomMode::HitfallMode),
3335
"airdash" => Ok(CustomMode::AirdashMode),
36+
"smash64" => Ok(CustomMode::Smash64Mode),
3437
_ => Err(()),
3538
}
3639
}

‎fighters/bayonetta/src/acmd/aerials.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ unsafe fn bayonetta_attack_air_lw_game(fighter: &mut L2CAgentBase) {
380380
FT_MOTION_RATE_RANGE(fighter, 1.0, 25.0, 15.0);
381381
if is_excute(fighter) {
382382
WorkModule::on_flag(boma, *FIGHTER_INSTANCE_WORK_ID_FLAG_NO_SPEED_OPERATION_CHK);
383-
SET_SPEED_EX(fighter, 0, 1.0, *KINETIC_ENERGY_RESERVE_ATTRIBUTE_MAIN);
383+
SET_SPEED_EX(fighter, 0, 0.5, *KINETIC_ENERGY_RESERVE_ATTRIBUTE_MAIN);
384384
WorkModule::off_flag(boma, *FIGHTER_INSTANCE_WORK_ID_FLAG_NO_SPEED_OPERATION_CHK);
385385
KineticModule::suspend_energy(boma, *FIGHTER_KINETIC_ENERGY_ID_CONTROL);
386386
WorkModule::on_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_GRAVITY_STABLE_UNABLE);

0 commit comments

Comments
 (0)