Skip to content

Commit a3909d2

Browse files
committed
Free Giga Bowser
1 parent 48c045e commit a3909d2

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ default = [
258258
"ken",
259259
"kirby",
260260
"koopa",
261-
# "koopag",
261+
"koopag",
262262
"koopajr",
263263
"krool",
264264
"link",

fighters/koopag/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/koopag/src/opff.rs

+9-6
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@ use globals::*;
77
pub unsafe fn moveset(boma: &mut BattleObjectModuleAccessor, id: usize, cat: [i32 ; 4], status_kind: i32, situation_kind: i32, motion_kind: u64, stick_x: f32, stick_y: f32, facing: f32, frame: f32) {
88
}
99

10-
#[utils::opff(FIGHTER_KIND_KOOPAG )]
11-
pub fn koopag_frame_wrapper(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
12-
unsafe {
13-
common::opff::fighter_common_opff(fighter);
14-
koopag_frame(fighter)
15-
}
10+
pub unsafe extern "C" fn koopag_frame_wrapper(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
11+
common::opff::fighter_common_opff(fighter);
12+
koopag_frame(fighter)
1613
}
1714

1815
pub unsafe fn koopag_frame(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
1916
if let Some(info) = FrameInfo::update_and_get(fighter) {
2017
moveset(&mut *info.boma, info.id, info.cat, info.status_kind, info.situation_kind, info.motion_kind.hash, info.stick_x, info.stick_y, info.facing, info.frame);
2118
}
19+
}
20+
21+
pub fn install() {
22+
smashline::Agent::new("koopag")
23+
.on_line(Main, koopag_frame_wrapper)
24+
.install();
2225
}

0 commit comments

Comments
 (0)