Skip to content

Commit 757bf0a

Browse files
blu-devblu-dev
committed
wiifit, wario, sora
1 parent 80389dc commit 757bf0a

Some content is hidden

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

57 files changed

+1216
-1080
lines changed

‎Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -313,13 +313,13 @@ default = [
313313
# "szerosuit",
314314
# "tantan",
315315
# "toonlink",
316-
# "trail",
317-
# "wario",
318-
# "wiifit",
316+
"trail",
317+
"wario",
318+
"wiifit",
319319
"wolf",
320320
"yoshi",
321321
"younglink",
322-
# "zelda",
322+
"zelda",
323323
]
324324
dev = ["utils/no-offset-search"]
325325
main_nro = ["skyline-web", "common"]

‎fighters/trail/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/trail/src/acmd/aerials.rs

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

3-
#[acmd_script( agent = "trail", script = "game_attackairn" , category = ACMD_GAME , low_priority)]
4-
unsafe fn sora_attack_air_n_game(fighter: &mut L2CAgentBase) {
3+
4+
unsafe extern "C" fn sora_attack_air_n_game(fighter: &mut L2CAgentBase) {
55
let lua_state = fighter.lua_state_agent;
66
let boma = fighter.boma();
77
frame(lua_state, 1.0);
@@ -69,8 +69,8 @@ unsafe fn sora_attack_air_n_game(fighter: &mut L2CAgentBase) {
6969

7070
}
7171

72-
#[acmd_script( agent = "trail", script = "effect_attackairn" , category = ACMD_EFFECT , low_priority)]
73-
unsafe fn sora_attack_air_n_effect(fighter: &mut L2CAgentBase) {
72+
73+
unsafe extern "C" fn sora_attack_air_n_effect(fighter: &mut L2CAgentBase) {
7474
let lua_state = fighter.lua_state_agent;
7575
let boma = fighter.boma();
7676
frame(lua_state, 5.0);
@@ -101,8 +101,8 @@ unsafe fn sora_attack_air_n_effect(fighter: &mut L2CAgentBase) {
101101

102102
}
103103

104-
#[acmd_script( agent = "trail", script = "sound_attackairn" , category = ACMD_SOUND , low_priority)]
105-
unsafe fn sora_attack_air_n_sound(fighter: &mut L2CAgentBase) {
104+
105+
unsafe extern "C" fn sora_attack_air_n_sound(fighter: &mut L2CAgentBase) {
106106
let lua_state = fighter.lua_state_agent;
107107
let boma = fighter.boma();
108108
frame(lua_state, 1.0);
@@ -120,8 +120,8 @@ unsafe fn sora_attack_air_n_sound(fighter: &mut L2CAgentBase) {
120120
}
121121
}
122122

123-
#[acmd_script( agent = "trail", script = "game_attackairf" , category = ACMD_GAME , low_priority)]
124-
unsafe fn sora_attack_air_f_game(fighter: &mut L2CAgentBase) {
123+
124+
unsafe extern "C" fn sora_attack_air_f_game(fighter: &mut L2CAgentBase) {
125125
let lua_state = fighter.lua_state_agent;
126126
let boma = fighter.boma();
127127

@@ -171,8 +171,8 @@ unsafe fn sora_attack_air_f_game(fighter: &mut L2CAgentBase) {
171171

172172
}
173173

174-
#[acmd_script( agent = "trail", script = "game_attackairf2" , category = ACMD_GAME , low_priority)]
175-
unsafe fn sora_attack_air_f2_game(fighter: &mut L2CAgentBase) {
174+
175+
unsafe extern "C" fn sora_attack_air_f2_game(fighter: &mut L2CAgentBase) {
176176
let lua_state = fighter.lua_state_agent;
177177
let boma = fighter.boma();
178178
if is_excute(fighter) {
@@ -241,8 +241,8 @@ unsafe fn sora_attack_air_f2_game(fighter: &mut L2CAgentBase) {
241241

242242
}
243243

244-
#[acmd_script( agent = "trail", script = "game_attackairf3" , category = ACMD_GAME , low_priority)]
245-
unsafe fn sora_attack_air_f3_game(fighter: &mut L2CAgentBase) {
244+
245+
unsafe extern "C" fn sora_attack_air_f3_game(fighter: &mut L2CAgentBase) {
246246
let lua_state = fighter.lua_state_agent;
247247
let boma = fighter.boma();
248248
if is_excute(fighter) {
@@ -273,8 +273,8 @@ unsafe fn sora_attack_air_f3_game(fighter: &mut L2CAgentBase) {
273273
}
274274
}
275275

276-
#[acmd_script( agent = "trail", script = "effect_attackairf3" , category = ACMD_EFFECT , low_priority)]
277-
unsafe fn sora_attack_air_f3_effect(fighter: &mut L2CAgentBase) {
276+
277+
unsafe extern "C" fn sora_attack_air_f3_effect(fighter: &mut L2CAgentBase) {
278278
let lua_state = fighter.lua_state_agent;
279279
let boma = fighter.boma();
280280
frame(lua_state, 6.0);
@@ -289,8 +289,8 @@ unsafe fn sora_attack_air_f3_effect(fighter: &mut L2CAgentBase) {
289289
}
290290
}
291291

292-
#[acmd_script( agent = "trail", script = "game_attackairb" , category = ACMD_GAME , low_priority)]
293-
unsafe fn sora_attack_air_b_game(fighter: &mut L2CAgentBase) {
292+
293+
unsafe extern "C" fn sora_attack_air_b_game(fighter: &mut L2CAgentBase) {
294294
let lua_state = fighter.lua_state_agent;
295295
let boma = fighter.boma();
296296
frame(lua_state, 1.0);
@@ -331,8 +331,8 @@ unsafe fn sora_attack_air_b_game(fighter: &mut L2CAgentBase) {
331331

332332
}
333333

334-
#[acmd_script( agent = "trail", script = "game_attackairhi" , category = ACMD_GAME , low_priority)]
335-
unsafe fn sora_attack_air_hi_game(fighter: &mut L2CAgentBase) {
334+
335+
unsafe extern "C" fn sora_attack_air_hi_game(fighter: &mut L2CAgentBase) {
336336
let lua_state = fighter.lua_state_agent;
337337
let boma = fighter.boma();
338338
frame(lua_state, 1.0);
@@ -383,8 +383,8 @@ unsafe fn sora_attack_air_hi_game(fighter: &mut L2CAgentBase) {
383383

384384
}
385385

386-
#[acmd_script( agent = "trail", script = "effect_attackairhi" , category = ACMD_EFFECT , low_priority)]
387-
unsafe fn sora_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
386+
387+
unsafe extern "C" fn sora_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
388388
let lua_state = fighter.lua_state_agent;
389389
let boma = fighter.boma();
390390
frame(lua_state, 8.0);
@@ -399,8 +399,8 @@ unsafe fn sora_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
399399
}
400400
}
401401

402-
#[acmd_script( agent = "trail", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
403-
unsafe fn sora_attack_air_lw_game(fighter: &mut L2CAgentBase) {
402+
403+
unsafe extern "C" fn sora_attack_air_lw_game(fighter: &mut L2CAgentBase) {
404404
let lua_state = fighter.lua_state_agent;
405405
let boma = fighter.boma();
406406
let attack_start_frame = 15.5;
@@ -488,8 +488,8 @@ unsafe fn sora_attack_air_lw_game(fighter: &mut L2CAgentBase) {
488488

489489
}
490490

491-
#[acmd_script( agent = "trail", script = "effect_attackairlw" , category = ACMD_EFFECT , low_priority)]
492-
unsafe fn sora_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
491+
492+
unsafe extern "C" fn sora_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
493493
let lua_state = fighter.lua_state_agent;
494494
let boma = fighter.boma();
495495
frame(lua_state, 10.0);
@@ -509,8 +509,8 @@ unsafe fn sora_attack_air_lw_effect(fighter: &mut L2CAgentBase) {
509509
}
510510
}
511511

512-
#[acmd_script( agent = "trail", script = "sound_attackairlw" , category = ACMD_SOUND , low_priority)]
513-
unsafe fn sora_attack_air_lw_sound(fighter: &mut L2CAgentBase) {
512+
513+
unsafe extern "C" fn sora_attack_air_lw_sound(fighter: &mut L2CAgentBase) {
514514
let lua_state = fighter.lua_state_agent;
515515
let boma = fighter.boma();
516516
frame(lua_state, 12.0);
@@ -520,8 +520,8 @@ unsafe fn sora_attack_air_lw_sound(fighter: &mut L2CAgentBase) {
520520
}
521521
}
522522

523-
#[acmd_script( agent = "trail", script = "expression_attackairlw", category = ACMD_EXPRESSION, low_priority )]
524-
unsafe fn sora_attack_air_lw_expression(fighter: &mut L2CAgentBase) {
523+
524+
unsafe extern "C" fn sora_attack_air_lw_expression(fighter: &mut L2CAgentBase) {
525525
let lua_state = fighter.lua_state_agent;
526526
let boma = fighter.boma();
527527
frame(lua_state, 13.5);
@@ -534,23 +534,23 @@ unsafe fn sora_attack_air_lw_expression(fighter: &mut L2CAgentBase) {
534534
}
535535
}
536536

537-
#[acmd_script( agent = "trail", script = "game_landingairlw" , category = ACMD_GAME , low_priority)]
538-
unsafe fn sora_landing_air_lw_game(fighter: &mut L2CAgentBase) {
537+
538+
unsafe extern "C" fn sora_landing_air_lw_game(fighter: &mut L2CAgentBase) {
539539
let lua_state = fighter.lua_state_agent;
540540
let boma = fighter.boma();
541541
}
542542

543-
#[acmd_script( agent = "trail", script = "effect_landingairlw" , category = ACMD_EFFECT , low_priority)]
544-
unsafe fn sora_landing_air_lw_effect(fighter: &mut L2CAgentBase) {
543+
544+
unsafe extern "C" fn sora_landing_air_lw_effect(fighter: &mut L2CAgentBase) {
545545
let lua_state = fighter.lua_state_agent;
546546
let boma = fighter.boma();
547547
if is_excute(fighter) {
548548
LANDING_EFFECT(fighter, Hash40::new("sys_landing_smoke"), Hash40::new("top"), 0, 0, 0, 0, 0, 0, 0.9, 0, 0, 0, 0, 0, 0, false);
549549
}
550550
}
551551

552-
#[acmd_script( agent = "trail", script = "sound_landingairlw" , category = ACMD_SOUND , low_priority)]
553-
unsafe fn sora_landing_air_lw_sound(fighter: &mut L2CAgentBase) {
552+
553+
unsafe extern "C" fn sora_landing_air_lw_sound(fighter: &mut L2CAgentBase) {
554554
let lua_state = fighter.lua_state_agent;
555555
let boma = fighter.boma();
556556
frame(lua_state, 2.0);
@@ -559,8 +559,8 @@ unsafe fn sora_landing_air_lw_sound(fighter: &mut L2CAgentBase) {
559559
}
560560
}
561561

562-
#[acmd_script( agent = "trail", script = "expression_landingairlw" , category = ACMD_EXPRESSION , low_priority)]
563-
unsafe fn sora_landing_air_lw_expression(fighter: &mut L2CAgentBase) {
562+
563+
unsafe extern "C" fn sora_landing_air_lw_expression(fighter: &mut L2CAgentBase) {
564564
let lua_state = fighter.lua_state_agent;
565565
let boma = fighter.boma();
566566
if is_excute(fighter) {
@@ -584,26 +584,28 @@ unsafe fn sora_landing_air_lw_expression(fighter: &mut L2CAgentBase) {
584584
}
585585

586586

587+
588+
589+
587590
pub fn install() {
588-
install_acmd_scripts!(
589-
sora_attack_air_n_game,
590-
sora_attack_air_n_effect,
591-
sora_attack_air_n_sound,
592-
sora_attack_air_f_game,
593-
sora_attack_air_f2_game,
594-
sora_attack_air_f3_game,
595-
sora_attack_air_f3_effect,
596-
sora_attack_air_b_game,
597-
sora_attack_air_hi_game,
598-
sora_attack_air_hi_effect,
599-
sora_attack_air_lw_game,
600-
sora_attack_air_lw_effect,
601-
sora_attack_air_lw_sound,
602-
sora_attack_air_lw_expression,
603-
sora_landing_air_lw_game,
604-
sora_landing_air_lw_effect,
605-
sora_landing_air_lw_sound,
606-
sora_landing_air_lw_expression,
607-
);
591+
smashline::Agent::new("trail")
592+
.acmd("game_attackairn", sora_attack_air_n_game)
593+
.acmd("effect_attackairn", sora_attack_air_n_effect)
594+
.acmd("sound_attackairn", sora_attack_air_n_sound)
595+
.acmd("game_attackairf", sora_attack_air_f_game)
596+
.acmd("game_attackairf2", sora_attack_air_f2_game)
597+
.acmd("game_attackairf3", sora_attack_air_f3_game)
598+
.acmd("effect_attackairf3", sora_attack_air_f3_effect)
599+
.acmd("game_attackairb", sora_attack_air_b_game)
600+
.acmd("game_attackairhi", sora_attack_air_hi_game)
601+
.acmd("effect_attackairhi", sora_attack_air_hi_effect)
602+
.acmd("game_attackairlw", sora_attack_air_lw_game)
603+
.acmd("effect_attackairlw", sora_attack_air_lw_effect)
604+
.acmd("sound_attackairlw", sora_attack_air_lw_sound)
605+
.acmd("expression_attackairlw", sora_attack_air_lw_expression)
606+
.acmd("game_landingairlw", sora_landing_air_lw_game)
607+
.acmd("effect_landingairlw", sora_landing_air_lw_effect)
608+
.acmd("sound_landingairlw", sora_landing_air_lw_sound)
609+
.acmd("expression_landingairlw", sora_landing_air_lw_expression)
610+
.install();
608611
}
609-

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

+26-24
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
use super::*;
33

4-
#[acmd_script( agent = "trail", script = "game_attack11" , category = ACMD_GAME , low_priority)]
5-
unsafe fn sora_attack_11_game(fighter: &mut L2CAgentBase) {
4+
5+
unsafe extern "C" fn sora_attack_11_game(fighter: &mut L2CAgentBase) {
66
let lua_state = fighter.lua_state_agent;
77
let boma = fighter.boma();
88
frame(lua_state, 1.0);
@@ -66,8 +66,8 @@ unsafe fn sora_attack_11_game(fighter: &mut L2CAgentBase) {
6666
}
6767
}
6868

69-
#[acmd_script( agent = "trail", script = "effect_attack11" , category = ACMD_EFFECT , low_priority)]
70-
unsafe fn sora_attack_11_effect(fighter: &mut L2CAgentBase) {
69+
70+
unsafe extern "C" fn sora_attack_11_effect(fighter: &mut L2CAgentBase) {
7171
let lua_state = fighter.lua_state_agent;
7272
let boma = fighter.boma();
7373
frame(lua_state, 7.0);
@@ -83,8 +83,8 @@ unsafe fn sora_attack_11_effect(fighter: &mut L2CAgentBase) {
8383
}
8484
}
8585

86-
#[acmd_script( agent = "trail", script = "game_attack12" , category = ACMD_GAME , low_priority)]
87-
unsafe fn sora_attack_12_game(fighter: &mut L2CAgentBase) {
86+
87+
unsafe extern "C" fn sora_attack_12_game(fighter: &mut L2CAgentBase) {
8888
let lua_state = fighter.lua_state_agent;
8989
let boma = fighter.boma();
9090
frame(lua_state, 1.0);
@@ -127,8 +127,8 @@ unsafe fn sora_attack_12_game(fighter: &mut L2CAgentBase) {
127127
}
128128
}
129129

130-
#[acmd_script( agent = "trail", script = "effect_attack12" , category = ACMD_EFFECT , low_priority)]
131-
unsafe fn sora_attack_12_effect(fighter: &mut L2CAgentBase) {
130+
131+
unsafe extern "C" fn sora_attack_12_effect(fighter: &mut L2CAgentBase) {
132132
let lua_state = fighter.lua_state_agent;
133133
let boma = fighter.boma();
134134
frame(lua_state, 6.0);
@@ -147,8 +147,8 @@ unsafe fn sora_attack_12_effect(fighter: &mut L2CAgentBase) {
147147
}
148148
}
149149

150-
#[acmd_script( agent = "trail", script = "game_attack13" , category = ACMD_GAME , low_priority)]
151-
unsafe fn sora_attack_13_game(fighter: &mut L2CAgentBase) {
150+
151+
unsafe extern "C" fn sora_attack_13_game(fighter: &mut L2CAgentBase) {
152152
let lua_state = fighter.lua_state_agent;
153153
let boma = fighter.boma();
154154
frame(lua_state, 1.0);
@@ -173,8 +173,8 @@ unsafe fn sora_attack_13_game(fighter: &mut L2CAgentBase) {
173173

174174
}
175175

176-
#[acmd_script( agent = "trail", script = "effect_attack13" , category = ACMD_EFFECT , low_priority)]
177-
unsafe fn sora_attack_13_effect(fighter: &mut L2CAgentBase) {
176+
177+
unsafe extern "C" fn sora_attack_13_effect(fighter: &mut L2CAgentBase) {
178178
let lua_state = fighter.lua_state_agent;
179179
let boma = fighter.boma();
180180
frame(lua_state, 9.0);
@@ -192,8 +192,8 @@ unsafe fn sora_attack_13_effect(fighter: &mut L2CAgentBase) {
192192
}
193193
}
194194

195-
#[acmd_script( agent = "trail", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
196-
unsafe fn sora_attack_dash_game(fighter: &mut L2CAgentBase) {
195+
196+
unsafe extern "C" fn sora_attack_dash_game(fighter: &mut L2CAgentBase) {
197197
let lua_state = fighter.lua_state_agent;
198198
let boma = fighter.boma();
199199
sv_kinetic_energy!(set_speed_mul, fighter, FIGHTER_KINETIC_ENERGY_ID_MOTION, 0.9);
@@ -247,15 +247,17 @@ unsafe fn sora_attack_dash_game(fighter: &mut L2CAgentBase) {
247247

248248
}
249249

250+
251+
252+
250253
pub fn install() {
251-
install_acmd_scripts!(
252-
sora_attack_11_game,
253-
sora_attack_11_effect,
254-
sora_attack_12_game,
255-
sora_attack_12_effect,
256-
sora_attack_13_game,
257-
sora_attack_13_effect,
258-
sora_attack_dash_game,
259-
);
254+
smashline::Agent::new("trail")
255+
.acmd("game_attack11", sora_attack_11_game)
256+
.acmd("effect_attack11", sora_attack_11_effect)
257+
.acmd("game_attack12", sora_attack_12_game)
258+
.acmd("effect_attack12", sora_attack_12_effect)
259+
.acmd("game_attack13", sora_attack_13_game)
260+
.acmd("effect_attack13", sora_attack_13_effect)
261+
.acmd("game_attackdash", sora_attack_dash_game)
262+
.install();
260263
}
261-

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ mod specials;
77
mod smashes;
88
mod throws;
99

10+
1011
pub fn install() {
1112
aerials::install();
1213
tilts::install();
13-
ground::install();
1414
other::install();
15-
specials::install();
1615
smashes::install();
16+
specials::install();
1717
throws::install();
18-
}
18+
ground::install();
19+
}

0 commit comments

Comments
 (0)