Skip to content

Commit 20aa2c9

Browse files
blu-devWuBoytH
blu-dev
authored and
WuBoytH
committed
moar
1 parent a73e40e commit 20aa2c9

File tree

159 files changed

+3689
-3014
lines changed

Some content is hidden

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

159 files changed

+3689
-3014
lines changed

‎Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -247,16 +247,16 @@ default = [
247247
"elight",
248248
"falco",
249249
"fox",
250-
# "gamewatch",
251-
# "ganon",
252-
# "gaogaen",
253-
# "gekkouga",
254-
# "ike",
255-
# "inkling",
256-
# "jack",
257-
# "kamui",
258-
# "ken",
259-
# "kirby",
250+
"gamewatch",
251+
"ganon",
252+
"gaogaen",
253+
"gekkouga",
254+
"ike",
255+
"inkling",
256+
"jack",
257+
"kamui",
258+
"ken",
259+
"kirby",
260260
# "koopa",
261261
# "koopag",
262262
# "koopajr",

‎dynamic/src/consts.rs

+5
Original file line numberDiff line numberDiff line change
@@ -1506,6 +1506,11 @@ pub mod statuses {
15061506

15071507
pub mod kirby {
15081508
pub const SPECIAL_HI_H: i32 = 0x3E6; //Weird value to avoid conflicts with copy ability values
1509+
pub const GANON_SPECIAL_N_FLOAT: i32 = 0x3E7;
1510+
pub const LITTLEMAC_SPECIAL_N_CANCEL: i32 = 0x3E8;
1511+
pub const LITTLEMAC_SPECIAL_N_CANCEL_JUMP: i32 = 0x3E9;
1512+
pub const DIDDY_SPECIAL_N_CANCEL: i32 = 0x3EA;
1513+
pub const DIDDY_SPECIAL_N_CANCEL_JUMP: i32 = 0x3EB;
15091514
}
15101515

15111516
pub mod krool {

‎fighters/elight/src/status.rs

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ pub fn install() {
108108
special_hi_attack::install();
109109
special_hi_jump::install();
110110
special_hi_finish::install();
111+
special_hi_finish2::install();
111112
special_hi::install();
112113
smashline::Agent::new("elight")
113114
.on_init(elight_init)

‎fighters/gamewatch/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ utils = { package = "dynamic", path = "../../dynamic" }
1010
skyline = "0.2.1"
1111
skyline_smash = { git = "https://github.com/blu-dev/skyline-smash", features = ["weak_l2cvalue"] }
1212
smash_script = { git = "https://github.com/blu-dev/smash-script", branch = "development" }
13-
smashline = { git = "https://github.com/blu-dev/smashline", branch = "development" }
13+
smashline = { git = "https://github.com/HDR-Development/smashline" }

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

+48-42
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::*;
22

3-
#[acmd_script( agent = "gamewatch", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
4-
unsafe fn gamewatch_attack_air_n_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn gamewatch_attack_air_n_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
if is_excute(fighter) {
@@ -75,8 +75,8 @@ unsafe fn gamewatch_attack_air_n_game(fighter: &mut L2CAgentBase) {
7575

7676
}
7777

78-
#[acmd_script( agent = "gamewatch", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
79-
unsafe fn gamewatch_attack_air_f_game(fighter: &mut L2CAgentBase) {
78+
79+
unsafe extern "C" fn gamewatch_attack_air_f_game(fighter: &mut L2CAgentBase) {
8080
let lua_state = fighter.lua_state_agent;
8181
let boma = fighter.boma();
8282
if is_excute(fighter) {
@@ -115,8 +115,8 @@ unsafe fn gamewatch_attack_air_f_game(fighter: &mut L2CAgentBase) {
115115

116116
}
117117

118-
#[acmd_script( agent = "gamewatch", script = "game_landingairf" , category = ACMD_GAME , low_priority)]
119-
unsafe fn gamewatch_landing_air_f_game(fighter: &mut L2CAgentBase) {
118+
119+
unsafe extern "C" fn gamewatch_landing_air_f_game(fighter: &mut L2CAgentBase) {
120120
let lua_state = fighter.lua_state_agent;
121121
let boma = fighter.boma();
122122
if is_excute(fighter) {
@@ -125,8 +125,8 @@ unsafe fn gamewatch_landing_air_f_game(fighter: &mut L2CAgentBase) {
125125

126126
}
127127

128-
#[acmd_script( agent = "gamewatch", script = "expression_attackairf", category = ACMD_EXPRESSION, low_priority )]
129-
unsafe fn gamewatch_attack_air_f_expression(fighter: &mut L2CAgentBase) {
128+
129+
unsafe extern "C" fn gamewatch_attack_air_f_expression(fighter: &mut L2CAgentBase) {
130130
let lua_state = fighter.lua_state_agent;
131131
let boma = fighter.boma();
132132
if is_excute(fighter) {
@@ -143,8 +143,8 @@ unsafe fn gamewatch_attack_air_f_expression(fighter: &mut L2CAgentBase) {
143143
}
144144
}
145145

146-
#[acmd_script( agent = "gamewatch", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
147-
unsafe fn gamewatch_attack_air_b_game(fighter: &mut L2CAgentBase) {
146+
147+
unsafe extern "C" fn gamewatch_attack_air_b_game(fighter: &mut L2CAgentBase) {
148148
let lua_state = fighter.lua_state_agent;
149149
let boma = fighter.boma();
150150
if is_excute(fighter) {
@@ -205,8 +205,8 @@ unsafe fn gamewatch_attack_air_b_game(fighter: &mut L2CAgentBase) {
205205

206206
}
207207

208-
#[acmd_script( agent = "gamewatch", script = "game_landingairb" , category = ACMD_GAME , low_priority)]
209-
unsafe fn gamewatch_landing_air_b_game(fighter: &mut L2CAgentBase) {
208+
209+
unsafe extern "C" fn gamewatch_landing_air_b_game(fighter: &mut L2CAgentBase) {
210210
let lua_state = fighter.lua_state_agent;
211211
let boma = fighter.boma();
212212
if is_excute(fighter) {
@@ -215,8 +215,8 @@ unsafe fn gamewatch_landing_air_b_game(fighter: &mut L2CAgentBase) {
215215

216216
}
217217

218-
#[acmd_script( agent = "gamewatch", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
219-
unsafe fn gamewatch_attack_air_hi_game(fighter: &mut L2CAgentBase) {
218+
219+
unsafe extern "C" fn gamewatch_attack_air_hi_game(fighter: &mut L2CAgentBase) {
220220
let lua_state = fighter.lua_state_agent;
221221
let boma = fighter.boma();
222222
frame(lua_state, 1.0);
@@ -240,8 +240,8 @@ unsafe fn gamewatch_attack_air_hi_game(fighter: &mut L2CAgentBase) {
240240

241241
}
242242

243-
#[acmd_script( agent = "gamewatch", script = "sound_attackairhi" , category = ACMD_SOUND , low_priority)]
244-
unsafe fn gamewatch_attack_air_hi_sound(fighter: &mut L2CAgentBase) {
243+
244+
unsafe extern "C" fn gamewatch_attack_air_hi_sound(fighter: &mut L2CAgentBase) {
245245
let lua_state = fighter.lua_state_agent;
246246
let boma = fighter.boma();
247247
frame(lua_state, 9.0);
@@ -250,15 +250,15 @@ unsafe fn gamewatch_attack_air_hi_sound(fighter: &mut L2CAgentBase) {
250250
}
251251
}
252252

253-
#[acmd_script( agent = "gamewatch_breath", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
254-
unsafe fn gamewatch_breath_attack_air_hi_game(fighter: &mut L2CAgentBase) {
253+
254+
unsafe extern "C" fn gamewatch_breath_attack_air_hi_game(fighter: &mut L2CAgentBase) {
255255
let lua_state = fighter.lua_state_agent;
256256
let boma = fighter.boma();
257257

258258
}
259259

260-
#[acmd_script( agent = "gamewatch", script = "expression_attackairhi", category = ACMD_EXPRESSION, low_priority )]
261-
unsafe fn gamewatch_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
260+
261+
unsafe extern "C" fn gamewatch_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
262262
let lua_state = fighter.lua_state_agent;
263263
let boma = fighter.boma();
264264
if is_excute(fighter) {
@@ -276,8 +276,8 @@ unsafe fn gamewatch_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
276276
}
277277
}
278278

279-
#[acmd_script( agent = "gamewatch", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
280-
unsafe fn gamewatch_attack_air_lw_game(fighter: &mut L2CAgentBase) {
279+
280+
unsafe extern "C" fn gamewatch_attack_air_lw_game(fighter: &mut L2CAgentBase) {
281281
let lua_state = fighter.lua_state_agent;
282282
let boma = fighter.boma();
283283
frame(lua_state, 6.0);
@@ -316,15 +316,15 @@ unsafe fn gamewatch_attack_air_lw_game(fighter: &mut L2CAgentBase) {
316316

317317
}
318318

319-
#[acmd_script( agent = "gamewatch", script = "game_landingairlw" , category = ACMD_GAME , low_priority)]
320-
unsafe fn gamewatch_landing_air_lw_game(fighter: &mut L2CAgentBase) {
319+
320+
unsafe extern "C" fn gamewatch_landing_air_lw_game(fighter: &mut L2CAgentBase) {
321321
let lua_state = fighter.lua_state_agent;
322322
let boma = fighter.boma();
323323

324324
}
325325

326-
#[acmd_script( agent = "gamewatch", script = "expression_landingairlw" , category = ACMD_EXPRESSION , low_priority)]
327-
unsafe fn gamewatch_landing_air_lw_expression(fighter: &mut L2CAgentBase) {
326+
327+
unsafe extern "C" fn gamewatch_landing_air_lw_expression(fighter: &mut L2CAgentBase) {
328328
let lua_state = fighter.lua_state_agent;
329329
let boma = fighter.boma();
330330
if is_excute(fighter) {
@@ -338,20 +338,26 @@ unsafe fn gamewatch_landing_air_lw_expression(fighter: &mut L2CAgentBase) {
338338

339339
}
340340

341+
341342
pub fn install() {
342-
install_acmd_scripts!(
343-
gamewatch_attack_air_n_game,
344-
gamewatch_attack_air_f_game,
345-
gamewatch_landing_air_f_game,
346-
gamewatch_attack_air_f_expression,
347-
gamewatch_attack_air_b_game,
348-
gamewatch_landing_air_b_game,
349-
gamewatch_attack_air_hi_game,
350-
gamewatch_attack_air_hi_sound,
351-
gamewatch_breath_attack_air_hi_game,
352-
gamewatch_attack_air_hi_expression,
353-
gamewatch_attack_air_lw_game,
354-
gamewatch_landing_air_lw_game,
355-
gamewatch_landing_air_lw_expression,
356-
);
357-
}
343+
smashline::Agent::new("gamewatch_breath")
344+
.acmd("game_attackairhi", gamewatch_breath_attack_air_hi_game)
345+
.install();
346+
smashline::Agent::new("gamewatch")
347+
.acmd("game_attackairn", gamewatch_attack_air_n_game)
348+
.acmd("game_attackairf", gamewatch_attack_air_f_game)
349+
.acmd("game_landingairf", gamewatch_landing_air_f_game)
350+
.acmd("expression_attackairf", gamewatch_attack_air_f_expression)
351+
.acmd("game_attackairb", gamewatch_attack_air_b_game)
352+
.acmd("game_landingairb", gamewatch_landing_air_b_game)
353+
.acmd("game_attackairhi", gamewatch_attack_air_hi_game)
354+
.acmd("sound_attackairhi", gamewatch_attack_air_hi_sound)
355+
.acmd("expression_attackairhi", gamewatch_attack_air_hi_expression)
356+
.acmd("game_attackairlw", gamewatch_attack_air_lw_game)
357+
.acmd("game_landingairlw", gamewatch_landing_air_lw_game)
358+
.acmd(
359+
"expression_landingairlw",
360+
gamewatch_landing_air_lw_expression,
361+
)
362+
.install();
363+
}

‎fighters/gamewatch/src/acmd/ground.rs

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::*;
22

3-
#[acmd_script( agent = "gamewatch", script = "game_attack11", category = ACMD_GAME, low_priority)]
4-
unsafe fn gamewatch_attack_11_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn gamewatch_attack_11_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
frame(lua_state, 2.0);
@@ -28,8 +28,8 @@ unsafe fn gamewatch_attack_11_game(fighter: &mut L2CAgentBase) {
2828

2929
}
3030

31-
#[acmd_script( agent = "gamewatch", script = "game_attack100end", category = ACMD_GAME, low_priority )]
32-
unsafe fn gamewatch_attack_100_end_game(fighter: &mut L2CAgentBase) {
31+
32+
unsafe extern "C" fn gamewatch_attack_100_end_game(fighter: &mut L2CAgentBase) {
3333
let lua_state = fighter.lua_state_agent;
3434
let boma = fighter.boma();
3535
if is_excute(fighter) {
@@ -47,8 +47,8 @@ unsafe fn gamewatch_attack_100_end_game(fighter: &mut L2CAgentBase) {
4747
}
4848
}
4949

50-
#[acmd_script( agent = "gamewatch", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
51-
unsafe fn gamewatch_attack_dash_game(fighter: &mut L2CAgentBase) {
50+
51+
unsafe extern "C" fn gamewatch_attack_dash_game(fighter: &mut L2CAgentBase) {
5252
let lua_state = fighter.lua_state_agent;
5353
let boma = fighter.boma();
5454
FT_MOTION_RATE(fighter, 0.6);
@@ -77,10 +77,11 @@ unsafe fn gamewatch_attack_dash_game(fighter: &mut L2CAgentBase) {
7777

7878
}
7979

80+
8081
pub fn install() {
81-
install_acmd_scripts!(
82-
gamewatch_attack_11_game,
83-
gamewatch_attack_100_end_game,
84-
gamewatch_attack_dash_game,
85-
);
86-
}
82+
smashline::Agent::new("gamewatch")
83+
.acmd("game_attack11", gamewatch_attack_11_game)
84+
.acmd("game_attack100end", gamewatch_attack_100_end_game)
85+
.acmd("game_attackdash", gamewatch_attack_dash_game)
86+
.install();
87+
}

‎fighters/gamewatch/src/acmd/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ mod specials;
77
mod throws;
88
mod ground;
99

10+
1011
pub fn install() {
1112
aerials::install();
1213
tilts::install();
@@ -15,4 +16,4 @@ pub fn install() {
1516
specials::install();
1617
throws::install();
1718
ground::install();
18-
}
19+
}

0 commit comments

Comments
 (0)